Merged revisions 76484-76766 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk

4747 files changed, 77953 insertions, 133056 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a6458f7be8a..6cb4ebf71fa 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3131 +1,293 @@
-Mon Jan 15 21:54:47 UTC 2007  Steve Huston  <shuston@riverace.com>
+Tue Jan 30 16:26:43 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * ace/SOCK_Stream.h: Corrected Doxygen tags.
+        * bin/sets-manager.py:
+        
+          Modified to pin the version of MPC at the time of branching/tagging
+          under modules/ACE/MPC.  Note:  This does not branch OR tag MPC,
+          it simply causes the branch/tag to check out a specific
+          revision of MPC.
 
-Mon Jan 15 10:15:47 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jan 30 13:51:32 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/config-rtems.h:
-          Improved rtems 4.7 support
-
-Fri Jan 12 20:09:47 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-g++-common.h:
-          Fixed incorrect macro
-
-Thu Jan 11 21:42:47 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * ace/Message_Block.h: Comment typos.
-        * ace/SOCK_Stream.h: Corrected documentation for what the
-          _n() variants do with timeouts.
-
-Thu Jan 11 15:27:27 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * docs/ACE-guidelines.html:
-          Fixed formatting.
-
-Wed Jan 10 20:31:52 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * docs/ACE-guidelines.html:
-          Added some text making explicit the use of "#if defined (FOO)"
-          rather than "#if FOO" so as to avoid trouble with Doxygen.
-
-Wed Jan 10 16:08:32 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/CDR_Array_Test.cpp:
-
-          Added a work-around for an issue with gcc 4.1.1 (and possibly
-          later versions) where certain variables are optimized away while
-          they are still needed.
-
-Wed Jan 10 15:19:02 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * NEWS: Noted that Windows 95, 98, Me, etc. prior to NT4 SP2 are
-          no longer supported. The code for this is described at
-          Sat Jan  6 00:06:52 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * ACE-INSTALL.html: Corrected Pharlap references.
-
-Wed Jan 10 14:16:04 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/svn/config:
-        * docs/svn/svn-prefs.reg:
-          Added .vxe to global ignore list
-
-Wed Jan 10 11:40:04 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Don't run 1482 with VxWorks RTP
-
-Wed Jan 10 07:55:04 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Reverted my change below. It worked in terms that it compiled on
-        all platforms but it resulted in a big footprint increase (about 1.5%)
-        for a full application and that is just too much.
-
-        Tue Jan  9 11:21:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-        * ace/String_Base.cpp:
-        * ace/String_Base.h:
-          Moved the members of String_Base_Const to String_Base and
-          removed String_Base_Const
-
-        * ace/String_Base_Const.cpp:
-        * ace/String_Base_Const.h:
-          Remove String_Base_Const. It was there as workaround for an old
-          sun compiler which we don't support anymore. Fixes bugzilla bug
-          2588.
-
-        * ace/ace.mpc:
-        * ace/ace_for_tao.mpc:
-        * ace/Makefile.am:
-          Removed String_Base_Const.{h,cpp}
-
-Wed Jan 10 02:01:04 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * bin/MakeProjectCreator/config: Added "default.features" to
-          svn:ignore property.
-
-        * tests: Re-generated the svn:ignore property.
-
-Wed Jan 10 00:22:01 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * ace/POSIX_Proactor.cpp: Fixed some spelling and logging issues.
-
-Tue Jan  9 22:57:24 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * tests/SOCK_Send_Recv_Test.cpp: Added a check to make sure nonblocking
-          recv() works without blocking; this feature is relied on by later
-          tests, and is also the subject of a customer report.
-          Also, removed all the ACE_ASSERTS - tests should never do asserts.
-          It kills the program without any legit idea of what went on, and they
-          disappear in Release builds.
-
-Tue Jan  9 15:36:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.cpp:
-        * ace/Thread_Manager.{h,cpp,inl}:
-          Removed ACE_USE_ONESHOT_AT_THREAD_EXIT checks, that define
-          is not set in any config file
-
-Tue Jan  9 14:17:50 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/msvc_static_order.lst:
-
-          Added TAO/tao/TC to the end of the TAO library list.
-
-Tue Jan  9 12:47:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Record.cpp:
-          Const improvement and initialise pointer with 0
-
-        * ace/Process_Manager.h:
-          Doxygen improvements
-
-        * ace/String_Base.cpp:
-          Added missing typename to get the npos compiling with all compilers
-
-Tue Jan  9 11:21:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/String_Base.cpp:
-        * ace/String_Base.h:
-          Moved the members of String_Base_Const to String_Base and
-          removed String_Base_Const
-
-        * ace/String_Base_Const.cpp:
-        * ace/String_Base_Const.h:
-          Remove String_Base_Const. It was there as workaround for an old
-          sun compiler which we don't support anymore. Fixes bugzilla bug
-          2588.
-
-        * ace/ace.mpc:
-        * ace/ace_for_tao.mpc:
-        * ace/Makefile.am:
-          Removed String_Base_Const.{h,cpp}
-
-Tue Jan  9 09:11:44 UTC 2007  Krishnakumar B  <kitty@dre.vanderbilt.edu>
-
-        * docs/svn/config (enable-auto-props):
-        * docs/svn/svn-prefs.reg:
-
-          Added .clo to the list of extensions that we want metadata to be
-          associated with.  Fixed a bunch of unmatched quotes in
-          svn-prefs.reg, and updated the mime-type of pdf to be
-          application/pdf as opposed to application/postscript.
-
-Tue Jan  9 08:12:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.cpp:
-          Initialise pointers with 0
-
-        * ace/config-hpux-11.00.h:
-          Fixed defines to work with wchar builds
-
-Tue Jan  9 03:46:14 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add ACE_LACKS_STRNLEN_PROTOTYPE feature test.
-
-Mon Jan  8 19:55:31 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ace/SString.cpp:
-
-          When creating a substring, only allocate the ACE_SString in the
-          return statement to avoid needless memory allocation and possibly
-          leaking memory.
-
-        * tests/SString_Test.cpp:
-
-          Specialized memory cleanup for the particular usage pattern of
-          ACE_SString near the end of the test.
-
-Mon Jan  8 19:48:50 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-lite.h (ACE_DECLARE_STL_REVERSE_ITERATOR): The
-          non-standard declaration is only needed on Windows when VC7.1
-          and the 64-bit SDK are used.
-
-Mon Jan  8 18:54:55 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Bug_1890_Regression_Test.cpp:
-        * tests/Bug_2540_Regression_Test.cpp:
-
-          Reverted my previous changes where the ACE_Select_Reactor was
-          explicitly chosen.  The bug reports specifically talk about the
-          select reactor, but they actually apply to others as well.
-
-Mon Jan  8 18:50:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/os_string.h:
-          Added ACE_LACKS_STRNLEN_PROTOTYPE to define strnlen prototype,
-          seems to lack with RedHat 6.2 Thanks to Nelson Filipe Ferreira Gonçalves
-          <ngoncalves at isr dot ist dot utl dot pt> for delivering the
-          autoconf log
-
-        * ace/config-linux-common.h:
-          Glibc 2.1 and lower don't have a strnlen prototype
-
-Mon Jan  8 18:43:36 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Bug_2540_Regression_Test.cpp:
-
-          This test had the same problem as Bug_1890_Regression_Test.cpp.
-          Explicitly use the ACE_Select_Reactor.
-
-Mon Jan  8 17:58:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Bug_1890_Regression_Test.cpp:
-
-          Bug 1890 is specifically targeted for the Select Reactor.  So,
-          instead of relying on ACE_Reactor::instance() being an
-          ACE_Select_Reactor, explicitly use the ACE_Select_Reactor impl.
-          This will fix this test on Windows.
-
-Mon Jan  8 16:51:55 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
-
-        * tests/Bug_2368_Regression_Test.cpp:
-
-          Improved the test output to show the failure caused by the
-          unresolved bug is expected.
-
-Mon Jan  8 13:48:17 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * examples/APG/Logging/Trace.h:
-
-          Undefine TRACE before defining it to avoid warnings from vc71.
-
-Mon Jan  8 12:41:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/TP_Reactor.cpp:
-          Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT in the constructors
-
-Mon Jan  8 12:00:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Select_Reactor_T.cpp:
-          Const improvement
-
-        * ace/Select_Reactor_T.h :
-          Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT in the constructors
-
-Mon Jan  8 11:23:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Select_Reactor_T.h (open):
-          Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT as default for disable_notify_pipe
-
-        * ace/Select_Reactor_T.h:
-          Doxygen improvements
-
-Mon Jan  8 10:45:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Select_Reactor_Base.h:
-          Doxygen improvements
-
-        * ace/Select_Reactor_Base.h:
-          Changed the way we set the default for the
-          ACE_Select_Reactor_Notify::open call, instead of just hardcoding
-          the default 0, use the ACE_DISABLE_NOTIFY_PIPE_DEFAULT define
-          which is set by default to 0, but which we can set from a
-          config file to 1 to disable the notification pipe.
-
-        * ace/config-posix-nonetworking.h:
-          Set ACE_DISABLE_NOTIFY_PIPE_DEFAULT to 1. The notification pipe
-          doesn't work when networking is fully disabled.
-
-Mon Jan  8 00:10:52 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Adding "!MINIMUM" for the TransportCurrent tests, since it
-          precludes the use of the TC functionality.
-
-Sun Jan  7 19:02:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-hpux-11.00.h:
-          Don't set ACE_SIZEOF_WCHAR, let Basic_Types just do this. Fixes
-          the difference between ACE_SIZEOF_WCHAR and sizeof(wchar_t) on
-          the HP aCC test on the IA64 aCC build which runs on the Sep 2006
-          version of HPUX
-
-Sat Jan  6 04:41:30 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * include/makeinclude/macros.GNU:
-        * include/makeinclude/rules.common.GNU:
-        * include/makeinclude/rules.local.GNU:
-
-          Added new phony target, "svnignore", which takes a good guess at
-          what files are generated in a directory and adds them to
-          svn:ignore property on the containing directory.
-
-        * apps/gperf/src:
-        * apps/gperf/tests:
-        * bin:
-        * examples/APG/Active_Objects:
-        * examples/APG/Config:
-        * examples/APG/Containers:
-        * examples/APG/Logging:
-        * examples/APG/Misc_IPC:
-        * examples/APG/Naming:
-        * examples/APG/Proactor:
-        * examples/APG/Processes:
-        * examples/APG/Reactor:
-        * examples/APG/Shared_Memory:
-        * examples/APG/Signals:
-        * examples/APG/Sockets:
-        * examples/APG/Streams:
-        * examples/APG/Svc_Config:
-        * examples/APG/ThreadManagement:
-        * examples/APG/ThreadPools:
-        * examples/APG/ThreadSafety:
-        * examples/APG/Threads:
-        * examples/APG/Timers:
-        * examples/ASX:
-        * examples/ASX/CCM_App:
-        * examples/ASX/Message_Queue:
-        * examples/Bounded_Packet_Relay:
-        * examples/C++NPv1:
-        * examples/C++NPv2:
-        * examples/Connection/blocking:
-        * examples/Connection/misc:
-        * examples/Connection/non_blocking:
-        * examples/DLL:
-        * examples/Export:
-        * examples/IOStream/client:
-        * examples/IOStream/server:
-        * examples/IPC_SAP/ATM_SAP:
-        * examples/IPC_SAP/DEV_SAP/reader:
-        * examples/IPC_SAP/DEV_SAP/writer:
-        * examples/IPC_SAP/FIFO_SAP:
-        * examples/IPC_SAP/FILE_SAP:
-        * examples/IPC_SAP/SOCK_SAP:
-        * examples/IPC_SAP/SPIPE_SAP:
-        * examples/IPC_SAP/TLI_SAP:
-        * examples/IPC_SAP/UPIPE_SAP:
-        * examples/Log_Msg:
-        * examples/Logger/Acceptor-server:
-        * examples/Logger/client:
-        * examples/Logger/simple-server:
-        * examples/Mem_Map/IO-tests:
-        * examples/Mem_Map/file-reverse:
-        * examples/Misc:
-        * examples/Naming:
-        * examples/OS/Process:
-        * examples/Reactor/Dgram:
-        * examples/Reactor/FIFO:
-        * examples/Reactor/Misc:
-        * examples/Reactor/Multicast:
-        * examples/Reactor/Ntalker:
-        * examples/Reactor/Proactor:
-        * examples/Service_Configurator/IPC-tests/client:
-        * examples/Service_Configurator/IPC-tests/server:
-        * examples/Service_Configurator/Misc:
-        * examples/Shared_Malloc:
-        * examples/Shared_Memory:
-        * examples/Smart_Pointers:
-        * examples/Synch:
-        * examples/System_V_IPC/SV_Message_Queues:
-        * examples/System_V_IPC/SV_Semaphores:
-        * examples/Threads:
-        * examples/Timer_Queue:
-        * examples/Web_Crawler:
-        * protocols/examples/RMCast/Send_Msg:
-        * protocols/examples/TMCast/Member:
-        * protocols/tests/HTBP/Reactor_Tests:
-        * protocols/tests/HTBP/Send_Large_Msg:
-        * protocols/tests/HTBP/Send_Recv_Tests:
-        * protocols/tests/HTBP/ping:
-        * protocols/tests/RMCast:
-        * tests:
-        * tests/log:
-
-          Added subversion svn:ignore properties on all these directories
-          comparable to the values previously in the vertigial .cvsignore
-          files, as well as updated them commensurate with the new svnignore
-          gnuace make target.
-
-        * apps/gperf/src/.cvsignore:
-        * apps/gperf/tests/.cvsignore:
-        * examples/APG/Active_Objects/.cvsignore:
-        * examples/APG/Config/.cvsignore:
-        * examples/APG/Containers/.cvsignore:
-        * examples/APG/Logging/.cvsignore:
-        * examples/APG/Misc_IPC/.cvsignore:
-        * examples/APG/Naming/.cvsignore:
-        * examples/APG/Proactor/.cvsignore:
-        * examples/APG/Processes/.cvsignore:
-        * examples/APG/Reactor/.cvsignore:
-        * examples/APG/Shared_Memory/.cvsignore:
-        * examples/APG/Signals/.cvsignore:
-        * examples/APG/Sockets/.cvsignore:
-        * examples/APG/Streams/.cvsignore:
-        * examples/APG/Svc_Config/.cvsignore:
-        * examples/APG/ThreadManagement/.cvsignore:
-        * examples/APG/ThreadPools/.cvsignore:
-        * examples/APG/ThreadSafety/.cvsignore:
-        * examples/APG/Threads/.cvsignore:
-        * examples/APG/Timers/.cvsignore:
-        * examples/ASX/.cvsignore:
-        * examples/ASX/CCM_App/.cvsignore:
-        * examples/ASX/Message_Queue/.cvsignore:
-        * examples/Bounded_Packet_Relay/.cvsignore:
-        * examples/C++NPv1/.cvsignore:
-        * examples/C++NPv2/.cvsignore:
-        * examples/Connection/blocking/.cvsignore:
-        * examples/Connection/misc/.cvsignore:
-        * examples/Connection/non_blocking/.cvsignore:
-        * examples/DLL/.cvsignore:
-        * examples/Export/.cvsignore:
-        * examples/IOStream/client/.cvsignore:
-        * examples/IOStream/server/.cvsignore:
-        * examples/IPC_SAP/ATM_SAP/.cvsignore:
-        * examples/IPC_SAP/DEV_SAP/reader/.cvsignore:
-        * examples/IPC_SAP/DEV_SAP/writer/.cvsignore:
-        * examples/IPC_SAP/FIFO_SAP/.cvsignore:
-        * examples/IPC_SAP/FILE_SAP/.cvsignore:
-        * examples/IPC_SAP/SOCK_SAP/.cvsignore:
-        * examples/IPC_SAP/SPIPE_SAP/.cvsignore:
-        * examples/IPC_SAP/TLI_SAP/.cvsignore:
-        * examples/IPC_SAP/UPIPE_SAP/.cvsignore:
-        * examples/Log_Msg/.cvsignore:
-        * examples/Logger/Acceptor-server/.cvsignore:
-        * examples/Logger/client/.cvsignore:
-        * examples/Logger/simple-server/.cvsignore:
-        * examples/Mem_Map/IO-tests/.cvsignore:
-        * examples/Mem_Map/file-reverse/.cvsignore:
-        * examples/Misc/.cvsignore:
-        * examples/Naming/.cvsignore:
-        * examples/OS/Process/.cvsignore:
-        * examples/Reactor/Dgram/.cvsignore:
-        * examples/Reactor/FIFO/.cvsignore:
-        * examples/Reactor/Misc/.cvsignore:
-        * examples/Reactor/Multicast/.cvsignore:
-        * examples/Reactor/Ntalker/.cvsignore:
-        * examples/Reactor/Proactor/.cvsignore:
-        * examples/Service_Configurator/IPC-tests/client/.cvsignore:
-        * examples/Service_Configurator/IPC-tests/server/.cvsignore:
-        * examples/Service_Configurator/Misc/.cvsignore:
-        * examples/Shared_Malloc/.cvsignore:
-        * examples/Shared_Memory/.cvsignore:
-        * examples/Smart_Pointers/.cvsignore:
-        * examples/Synch/.cvsignore:
-        * examples/System_V_IPC/SV_Message_Queues/.cvsignore:
-        * examples/System_V_IPC/SV_Semaphores/.cvsignore:
-        * examples/Threads/.cvsignore:
-        * examples/Timer_Queue/.cvsignore:
-        * examples/Web_Crawler/.cvsignore:
-        * protocols/examples/TMCast/Member/.cvsignore:
-        * protocols/tests/HTBP/Reactor_Tests/.cvsignore:
-        * protocols/tests/HTBP/Send_Large_Msg/.cvsignore:
-        * protocols/tests/HTBP/Send_Recv_Tests/.cvsignore:
-        * protocols/tests/HTBP/ping/.cvsignore:
-        * tests/.cvsignore:
-        * tests/log/.cvsignore:
-
-          Removed these files in favor of svn:ignore properties on the
-          parent directory.
-
-Sat Jan  6 00:06:52 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-WinCE.h: Removed the ACE_HAS_WINNT4 stuff.
-
-        * ace/config-pharlap.h: Removed the ACE_HAS_WINNT4 stuff and added
-          ACE_LACKS_WIN32_SECURITY_DESCRIPTORS and ACE_LACKS_WIN32_MOVEFILEEX.
-          Added ACE_HAS_IP_MULTICAST.
-          Thanks to David Hauck for helping with these changes.
-
-        * ace/config-lite.h: Removed another vestige of MSVC 6 support.
-
-        * ace/Default_Constants.h:
-        * ace/config-win32-common.h: Moved the Win32 ACE_DEFAULT_FILE_PERMS
-          settings to config-win32-common.h
-          Also removed all the pre-NT4 stuff from config-win32-common.h.
-
-        * ace/Asynch_Acceptor.{h cpp}:
-        * ace/Asynch_IO.{h cpp}:
-        * ace/Asynch_IO_Impl.{h cpp}:
-        * ace/Message_Queue.{h cpp inl}:
-        * ace/Message_Queue_T.{h cpp}:
-        * ace/Proactor.{h cpp}:
-        * ace/Proactor_Impl.{h cpp}:
-        * ace/WIN32_Asynch_IO.{h cpp}:
-        * ace/WIN32_Proactor.{h cpp}:
-          ACE_Message_Queue_NT and ACE_Asynch_IO switched from using
-          ACE_HAS_WINNT4==1 and maybe some other platforms to using the new
-          ACE_HAS_WIN32_OVERLAPPED_IO setting. It's now incumbent on the
-          config maintainer to keep config-win32-*.h, config-WinCE.h,
-          config-pharlap.h, etc. up to date on these features as the
-          various versions do or don't support them.
-
-        * ace/config-win32-mingw.h: Removed ACE_HAS_WINNT4 section.
-
-        * ace/Configuration.cpp (ACE_Configuration_Win32Registry::remove_section):
-          Removed the pre-NT4 section that checked for non-empty section.
-
-        * ace/Mem_Map.cpp: Removed all the support for ACE_USE_MAPPING_NAME
-          since it was used only for pre-NT4 Windows.
-
-        * ace/Msg_WFMO_Reactor.cpp (wait_for_multiple_events): Removed the
-          pre-NT4 code block that switched to MsgWaitForMultipleObjectsEx.
-          All Win platforms without ACE_LACKS_MSG_WMFO can do this now.
-
-        * ace/OS_NS_stdio.inl (rename):
-        * tests/OS_Test.cpp: The ability to rename a file to one that exists
-          without removing the 'to' file first is now detected by the new
-          feature macro ACE_LACKS_WIN32_MOVEFILEEX instead of ACE_HAS_WINNT4.
-
-        * ace/OS_NS_unistd.cpp (pread, pwrite): The Windows code that can do
-          overlapped is now built based on ACE_HAS_WIN32_OVERLAPPED_IO instead
-          of ACE_HAS_WINNT4.
-
-        * ace/Pagefile_Memory_Pool.cpp: Setting up a security descriptor for
-          the file mapping is now determined by the lack of
-          ACE_LACKS_WIN32_SECURITY_DESCRIPTORS, not ACE_HAS_WINNT4.
-
-        * ace/README: Added descriptions for ACE_HAS_WIN32_OVERLAPPED_IO,
-          ACE_HAS_WIN32_NAMED_PIPES, ACE_LACKS_WIN32_SECURITY_DESCRIPTORS,
-          ACE_LACKS_WIN32_MOVEFILEEX.
-
-        * ace/Sock_Connect.cpp: Removed all the code that rummaged through
-          the registry looking for net interfaces on Windows. Getting
-          interface info now requires WinCE, Pharlap, or Winsock2. This removes
-          support for Win95, Win98, etc.
-
-        * ace/SPIPE_Acceptor.{cpp h} (ACE_SPIPE_Acceptor): Now useable on
-          Windows when ACE_HAS_WIN32_NAMED_PIPES is set, not ACE_HAS_WINNT4.
-          Similar to above with ACE_HAS_WIN32_OVERLAPPED_IO - config
-          maintainers need to manage this setting.
-
-        * ace/OS_NS_Thread.cpp (sched_params): Fix mis-aligned #if block
-          for ACE_HAS_PHARLAP_RT. Also, for scope == ACE_SCOPE_PROCESS, return
-          -1, ENOTSUP for Pharlap; it doesn't have SetPriorityClass().
-
-        * ACE-INSTALL.html: Removed mention of ACE_HAS_WINNT4 and building
-          for Win95/98/Me - ACE now requires WinNT 4 or later.
-          Updated the information for building for Pharlap ETS.
-
-        * tests/CDR_File_Test.cpp:
-        * tests/Svc_Handler_Test.cpp: Removed the check for NT4 or better when
-          setting TEST_CAN_UNLINK_IN_ADVANCE. VxWorks is the only case
-          remaining where this needs to be set.
-
-        * tests/Malloc_Test.cpp: Removed the Win NT4 case checks for setting
-          ACE_TEST_REMAP_ON_FAULT; Win9x is no longer supported. Also, when
-          deciding address ranges for testing, decide at run time based on
-          GetVersionInfo() on Windows, not on preprocessor checks.
-
-        * tests/Message_Queue_Test.cpp: Use ACE_HAS_WIN32_OVERLAPPED_IO to
-          decide whether or not to test ACE_Message_Queue_NT.
+        * ace/Module.h:
+        * ace/Module.cpp:
 
-        * tests/Proactor_Scatter_Gather_Test.cpp: Decide whether or not to
-          run this test based on ACE_HAS_WIN32_OVERLAPPED_IO instead of
-          ACE_HAS_WINNT4.
+          There was no way to distinguish between flags not being set and
+          flags to indicate that tasks should not be deleted.  I have
+          changed the M_DELETE_NONE enum value to 4 and added a new enum
+          value for use in flag initialization.  With this change, the
+          close() method can determine if it needs to use the flags passed
+          in or the internal flags.  This fixes Bugzilla #2497.
 
-        * ace/Proactor_Timer_Test.cpp: Run this test on Windows based on
-          ACE_HAS_WIN32_OVERLAPPED_IO instead of !ACE_HAS_WINCE.
+Tue Jan 30 11:35:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/SPIPE_Test.cpp:
-        * tests/UPIPE_SAP_Test.cpp: Manage which features to test on Windows
-          based on ACE_HAS_WIN32_NAMED_PIPES instead of ACE_HAS_WINNT4.
+        * ace/Countdown_Time.{h,cpp}:
+          Readded destructor, missed that it updates the max_wait_time
+          passed to the constructor
 
-        * ace/Dev_Poll_Reactor.cpp: Fixed spelling error in a comment.
-
-Fri Jan  5 21:46:16 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
-
-        * ace/Process.cpp:
-
-         Improved the implementation of ACE_Process_Options::setenv(...)
-         to address the potential buffer overflow when invoking
-         sprintf and/or vsprintf. This fixes bug 2660 and 2762. More
-         discussions have been accumulated in RT 9198.
-
-Fri Jan  5 19:06:17 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/msvc_static_order.lst:
-
-          Added project names to correct the build order for
-          TAO/tests/Collocation and TAO/tests/TransportCurrent.
-
-Fri Jan  5 14:03:12 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * apps/JAWS2/HTTPU/http_headers.h:
-
-          For the sake of compiling on HP-UX, #undef SERVER if it's defined.
-
-Fri Jan  5 13:34:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_stdio.cpp:
-        * ace/config-hpux-11.00.h:
-          Disable ACE_HAS_VFWPRINTF again for HPUX, takes more time,
-          something for the future
-
-Fri Jan  5 13:15:16 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/INET_Addr.cpp:
-
-          Replaced #if ACE_HAS_IPV6 with #if defined () to avoid confusing
-          doxygen.
-
-Fri Jan  5 12:59:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Manual_Event_Test.cpp:
-          Removed n_iterations variable, it is not used at all
-
-Fri Jan  5 12:44:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_stdio.cpp:
-          When ACE_HAS_WCHAR is defined include os_wchar.h to get the
-          wchar methods which is needed on for example HPUX
-
-        * ace/config-linux-common.h:
-        * ace/config-vxworks6.2.h:
-        * ace/config-vxworks6.3.h:
-        * ace/config-vxworks6.4.h:
-          Added ACE_HAS_VFWPRINTF
-
-        * ace/config-win32-common.h:
-          Removed ACE_HAS_VSWPRINTF, isn't used anymore
-
-Fri Jan  5 11:09:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-hpux-11.00.h:
-          Moved ACE_SIZEOF_LONG outside the aCC specific block, this is
-          also needed with GCC
-
-Fri Jan  5 10:40:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Thread_Creation_Threshold_Test.cpp:
-          Removed not needed semicolon after namespace closure
-
-Fri Jan  5 10:30:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * contrib/minizip/unzip.c:
-        * contrib/minizip/zip.c:
-          Fixed unitialized warnings
-
-Fri Jan  5 10:04:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-g++-common.h:
-          A change related to my commit of:
-          Thu Jan  4 08:55:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-          With FC6 a bug in GCC has been fixed. This is then fixed in
-          GCC 4.1.1 but only in the RedHat codebase, not in other
-          GCC 4.x compilers. The HP GCC 4.1.1 compiler hasn't this
-          fix but also the SuSE 10.2 GCC 4.1.2 compiler has not this
-          fix. We assume at this moment that GCC 4.2 will have this
-          fix. If you have FC6 you must add the following define to
-          your config.h file:
-          ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
-
-Fri Jan  5 07:05:18 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
-
-          Remove "-Ge 1" from initial TAO_IDLFLAGS definition.
-
-Fri Jan  5 03:34:00 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/INET_Addr.cpp:
-
-          Refactored the addr_to_string() method to format numeric IPv6
-          addresses using [addr]:port to disambiguate addresses such as
-          [fe80::1:2:3]:12345. This should be benign as string_to_addr()
-          already parses [ipv6addr]:port formatted strings.
-
-Fri Jan  5 00:51:22 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/INET_Addr.h:
-        * ace/INET_Addr.inl:
-
-          Added a new method, is_multicast(), to assist applications in
-          determining if the inet address is or is not a multicast address
-          regardless of it being an IPv4 or IPv6 format.
-
-        * ace/Timer_Queue_Adapters.cpp:
-
-          Fixed a bug in
-          ACE_Async_Timer_Queue_Adapter<TQ>::schedule_ualarm() wherein the
-          time value for the alarm was computed using
-          ACE_OS::gettimeofday() rather than using the timer queue's
-          gettimeofday implementation. Thus situations where an alternate
-          time source were used, the scheduled alarm would be wrong.
-
-Thu Jan  4 15:51:41 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tests/Thread_Creation_Threshold_Test.cpp: Changed name of
-          anonymous namespace constant from DEBUG to PRINT_DEBUG_MSGS to
-          avoid potential conflicts with #defines.  This should clean up
-          at least one Windows build, and possibly others as well.
-
-Thu Jan  4 15:33:08 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Check <sys/time.h> instead of <time.h> for gettimeofday()
-          prototype.  Also use AC_CHECK_DECL instead of AC_EGREP_CPP.
-          This fixes bugzilla bug 2764.
-
-Thu Jan  4 13:53:33 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ACEXML/tests/Makefile.am:
-        * ACEXML/tests/util/Makefile.am:
-        * ACEXML/apps/svcconf/Makefile.am:
-        * ACEXML/common/Makefile.am:
-        * ACEXML/examples/SAXPrint/Makefile.am:
-
-          Tweak to use ACE_{ZLIB,ZZIP}_{CPPFLAGS,LDFLAGS,LIBS}
-          instead of -I${ZLIB_ROOT}/include, etc.  The former
-          are substituted by the configure script.
-
-        * m4/ace.m4:
-
-          Add ACE_PATH_ZLIB and ACE_PATH_ZZIP autoconf macros.
-          zlib and zzip can now be enabled at configure time
-          with --with-zlib and --with-zzip.
-
-Thu Jan  4 12:45:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ace/Basic_Stats.cpp:
-        * ace/Parse_Node.cpp:
-        * ace/Sample_History.cpp:
-        * ace/Service_Repository.cpp:
-
-          Remove build warnings when ACE_NLOGGING is defined.
-
-Thu Jan  4 08:55:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-g++-common.h:
-          With gcc 4.{0,1} we couldn't use visibility attributes for singletons
-          because of a bug in GCC. This has been fixed in GCC 4.1.1 that
-          gets shipped with FC6. This change enables the visibily
-          attributes again for GCC 4.1.1 or newer.
-
-        * ace/Obstack.h:
-          Reverted the change below, it is an incorrect change
-          Wed Nov 22 09:07:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
-          on FC6. Thanks to Ken Sedgwick <ken at bonsai dot com> for
-          reporting this and testing out the patch.
-
-Wed Jan  3 22:31:05 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-          This entry merges in changes from OCITAO 1.4a which were
-          originally part of RT 8678.
-
-        * ace/README:
-        * ace/config-sunos5.9.h:
-
-          Added new compiler macro, ACE_LACKS_THR_CONCURRENCY_FUNCS, to
-          accomodate the deprecation of thr_concurrency() in Solaris 9
-          onwards.  The functions still exist, but the call semantics have
-          changed slightly such that values for which they would
-          previously succeed now fail despite the fact that they are
-          effectively no-ops in Solaris >= 9.  This would cause
-          thr_create(THR_NEW_LWP) to fail in a process when invoked for
-          the 65536th (or greater) time.
-
-          Currently this macro is only defined on Solaris 9+, but, since I
-          believ this function was only ever present on Solaris anyway, it
-          could probably be defined in general, and simply #undef'd on
-          Solaris 8 and prior.
-
-        * ace/OS_NS_Thread.cpp (thr_create):
-
-          Conditionally removed THR_NEW_LWP section when
-          ACE_LACKS_THR_CONCURRENCY_FUNCS is defined.
-
-        * tests/Thread_Creation_Threshold_Test.cpp:
-        * tests/run_test.lst:
-        * tests/tests.mpc:
-
-          Added a new test to check the threshold of thread creation.
-          This simply verifies that more than 2^15 threads can be created
-          sequentially (not simultaneously).
-
-Wed Jan  3 22:10:54 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * ace/CDR_Stream.inl (adjust):
-
-          Reverted one-line change committed in r76279 and as part of
-          entry from "Wed Jan 3 05:53:04 UTC 2007 Chris Cleeland
-          <cleeland_c@ociweb.com>".  After getting some questions from
-          Johnny and posing them to the originators of the change, the
-          originators indicated that, over time, the problem may have been
-          application-related as they could never isolate a test case that
-          provoked it.
-
-Wed Jan  3 19:52:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Run the compression test when ZLIB is part of the config list
-
-Wed Jan  3 19:34:47 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          TAO/tests/Any/Recursive also does not work when the build is
-          static.  It uses ACE_Dynamic_Service to locate the
-          TAO_TypeCodeFactory_Adapter which fails.
-
-Wed Jan  3 18:35:02 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Do not run TAO/tests/Any/Recursive if minimum_corba,
-          corba_e_compact or corba_e_micro are enabled.  Not all portions of
-          the test build with any one of these enabled.
-
-Wed Jan  3 15:50:39 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * ACEXML/apps/svcconf/svcconf.mpc:
-        * ACEXML/common/common.mpc:
-        * ACEXML/parser/parser/parser.mpc:
-        * Kokyu/Kokyu.mpc:
-        * ace/QoS/qos.mpc:
-        * ace/SSL/ssl.mpc:
-        * ace/SSL/ssl_for_tao.mpc:
-        * ace/ace.mpc:
-        * ace/ace_flreactor.mpc:
-        * ace/ace_for_tao.mpc:
-        * ace/ace_qtreactor.mpc:
-        * ace/ace_tkreactor.mpc:
-        * ace/ace_xtreactor.mpc:
-        * apps/gperf/src/gperf.mpc:
-        * protocols/ace/HTBP/HTBP.mpc:
-        * protocols/ace/RMCast/RMCast.mpc:
-        * protocols/ace/TMCast/TMCast.mpc:
-
-          Use the install base project instead of the deprecated core base
-          project.
-
-Wed Jan  3 15:25:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Added new PI test
-
-Wed Jan  3 14:57:49 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/config/ipv6.mpb:
-
-          The cbx project type was replaced by the bds4 project type.
-
-Wed Jan 03 14:20:00 UTC 2007  Simon Massey  <sma@prismtech.com>
-
-        * ace/CORBA_macros.h:
-          With MFC, must delete any caught and eaten "out of memory" exceptions.
-
-Wed Jan  3 13:25:06 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/msvc_static_order.lst:
-
-          Build the TAO/tests/Smart_Proxies/Collocation/SP_Collocation_Idl
-          project before SP_Collocation_TestStubsLib.
-
-Wed Jan  3 13:16:16 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-
-          Added !NO_MCAST to those tests that use multicast.
-
-        * tests/Unload_libACE.cpp:
-        * tests/tests.mpc:
-        * tests/unload_libace.mpb:
-
-          Added support for running this test when ace_for_tao is enabled.
-
-Wed Jan  3 12:33:33 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+Tue Jan 30 10:44:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * include/makeinclude/wrapper_macros.GNU:
+          When pipes is set to 1, also add -pipe to the CCFLAGS
 
-          Since the zzip base project now 'requires' zlib, we can default
-          zlib to 1.  This will cause no harm to those that do not have zlib
-          since zlib is a "feature" project and will not be included in any
-          project unless it is explicitly enabled.
-
-Wed Jan  3 09:36:13 UTC 2007  Olli Savia  <ops@iki.fi>
-
-        * include/makeinclude/wrapper_macros.GNU:
-        * ace/OS_NS_stdio.inl:
-        * tests/OS_Test.cpp:
-
-          Added the ability to use trio (http://sourceforge.net/projects/ctrio/)
-          if platform lacks decent support for vsnprintf. trio support is
-          enabled by defining trio=1 in plaform_macros.GNU
-
-Wed Jan  3 07:52:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Reverted my change below, it breaks the singleton on windows, the EXPORT
-        should not be there, seems we need a different way to resolve this
-        problem with FC6.
-
-        Tue Jan  2 14:27:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-        * ace/Based_Pointer_Repository.h:
-          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
-          on FC6. Thanks to Olli Savia  <ops@iki.fi> for
-          reporting this and testing out the patch.
-
-Wed Jan  3 07:47:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ASNMP/tests/test_config.h:
-          Only define ACE_START_TEST and ACE_END_TEST when they are not
-          defined yet. Removed some old code at the same time
-
-Wed Jan  3 06:47:58 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added feature test for ACE_LACKS_REALPATH.  Fixes bugzilla bug
-          2613.
-
-Wed Jan  3 06:09:39 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added feature test for ACE_HAS_SIGVAL_SIGVAL_INT and, for
-          completeness, ACE_HAS_SIGVAL_SIGVAL_PTR.  Fixes bugzilla bug
-          2716.
-
-Wed Jan  3 05:53:04 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-          This entry documents the merge of several small bug fixes from
-          the OCI distribution.
-
-        * ace/QtReactor/QtReactor.cpp:
-
-          Merged in a change from OCITAO 1.4a that fixed a bug in
-          ACE_QtReactor::QtWaitForMultipleEvents() where
-          the two select() calls in that function might select on different
-          handler sets. The problem is the dispatch_set/wait_set can be
-          changed during the two select() calls. This could happen while
-          waiting for an event, another event is handled and dispatched
-          which changes the dispatch_set/wait_set.
-
-          This bug was found on a single thread Qt application [RT 8751].
-
-        * ace/CDR_Stream.inl (adjust):
-
-          Applied a one-line change from Dan Troesser <troesser_d at
-          ociweb dot com>, originally committed to OCITAO 1.4a.  VC8
-          detected that memory around a buffer was being modified.
-          Changed a boundary check from <= check to < that some believed
-          was causing a write past the end of the buffer.  After the
-          change, there were no compilation problems with VC8 and all the
-          ACE CDR-related tests passed.
-
-        * bin/tao_orb_tests.lst:
-
-          Add in Bug_2702_Regression test.
-
-        * bin/auto_run_tests.pl:
-
-          Change the search logic for listed tests so that the script
-          "finds" tests even when the layout isn't using the "traditional"
-          layout where $TAO_ROOT == $ACE_ROOT/TAO.
-
-        * NEWS: Updated to reflect these changes.
-
-Wed Jan  3 05:26:07 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added feature test for ACE_LACKS_SIGVAL_T.  Fixes bugzilla bug
-          2761.
-
-Tue Jan  2 16:02:25 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
-
-          Use the MakeWorkspaceBase module to reduce the amount of
-          duplicated code.
-
-Tue Jan  2 14:27:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Based_Pointer_Repository.h:
-          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
-          on FC6. Thanks to Olli Savia  <ops@iki.fi> for
-          reporting this and testing out the patch.
-
-Tue Jan  2 12:38:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-rtems.h:
-          Added ACE_LACKS_THREAD_PROCESS_SCOPING, rtems only supports
-          PTHREAD_SCOPE_PROCESS, setting another value will result in a
-          notsup error
+        * include/makeinclude/platform_rtems.x_g++.GNU:
+          Set pipes to 1, set DCCFLAGS
 
-        * ace/OS_NS_Thread.cpp:
-          Removed some old FSU thread code
+Tue Jan 30 10:14:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Jan  2 11:38:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Unbounded_Set.cpp:
+          Initialise pointer with 0.
 
+        * ace/OS_NS_unistd.inl (getpagesize):
         * ace/config-rtems.h:
-          Removed ACE_LACKS_MKFIFO, rtems has this API
+          RTEMS does define _SC_PAGESIZE, but using sysconf with _SC_PAGESIZE
+          results in -1. Added a new define ACE_HAS_BROKEN_SC_PAGESIZE to be
+          able to disable the usage of sysconf (_SC_PAGESIZE) for rtems 4.6,
+          the ::getpagesize() function returns a correct value.
 
-        * ace/config-win32-borland.h:
-        * ace/OS_NS_stdio.inl:
-          Removed support for the Borland C++ preview compiler that shipped
-          with CBuilderX
+Tue Jan 30 09:46:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/os_include/os_signal.h:
-          Removed Borland C++ preview support and fixed ACE_NSIG define
-          for rtems
+        * tests/OS_Test.cpp:
+          Added a test for ACE_OS::getpagesize(), it should return a value
+          bigger then 0 else the memory pools don't work
 
-Tue Jan  2 11:18:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jan 30 00:25:00 UTC 2007  Steve Huston  <shuston@riverace.com>
 
-        * ace/config-macosx-panther.h:
-        * ace/config-macosx-tiger.h:
-          Added ACE_LACKS_SIGVAL_T
+        * ace/config-hpux-11.00.h: If the user sets RWSTD_NO_NAMESPACE to
+          keep a lot of the standard C++ library out of the std namespace,
+          avoid setting ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB, and also
+          hoist everything else from std into the global namespace. This is
+          necessary because RW wasn't consistent with using their internal
+          _RWSTD_NO_NAMESPACE and the user-settable RWSTD_NO_NAMESPACE and
+          some things end up in std and some not; so get the ones that ended
+          up in std out to global with the rest of them.
 
-Tue Jan  2 11:15:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Jan 29 19:48:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * config-rtems.h:
-          Removed ACE_LACKS_PUTENV, rtems has this method, fixes the
-          Env_Value_Test failure
-
-Tue Jan  2 11:06:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Based_Pointer_Repository.cpp:
+        * ace/Basic_Stats.cpp:
+        * ace/Codeset_Registry.cpp:
+        * ace/FILE.cpp:
+        * ace/FILE_Addr.cpp:
+          Layout improvements
 
-        * ace/ARGV.cpp:
-          Fixed constructor that combines two argv arrays to handle
-          an empty array as we can have with embedded platforms like
-          VxWorks and RTEMS
+Mon Jan 29 19:07:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Jan  2 10:49:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * etc/ciao.doxygen:
+        * etc/ciao_config_handlers.doxygen:
+        * etc/ciao_DAnCE.doxygen:
+          Removed CIAO_NAMESPACE
 
-        * tests/run_test.lst:
-          Added missing ARGV_Test
+Mon Jan 29 18:58:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Jan  2 10:23:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Argv_Type_Converter.cpp:
+        * ace/Asynch_Pseudo_Task.cpp:
+        * ace/Cached_Connect_Strategy_T.cpp:
+          Layout changes, result of experimenting with a code
+          beautifier
 
         * ace/config-rtems.h:
-          RTEMS does have aio support but there are several errors in the
-          rtems header files and it looks also that the behaviour is not
-          correct, reported this to the rtems maintainers and for the
-          rtems 4.6 version we disable the AIO support in ACE
-
-Tue Jan  2 09:44:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/ARGV_Test.cpp:
-          Fixed compile errors in unicode build
-
-Mon Jan  1 21:56:50 UTC 2007  James H. Hill  <hillj@isis.vanderbilt.edu>
-
-        * docs/ace_guidelines.vsmacros:
-
-          Fixed bug that was causing the previous find and replace
-          values to be used when the current document is being saved.
-
-Mon Jan  1 18:51:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/os_errno.h:
-          Defined ECANCELED when it has not been defined yet, fixes problems
-          with rtems
+          Improved rtems port, added support for building with
+          threads=0
 
-Mon Jan  1 18:39:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/config-sco-5.0.0.h:
+          Removed commented out define
 
-        * ace/POSIX_CB_Proactor.h:
-          Introduced new ACE_LACKS_SIGVAL_T, when this is defined then ACE
-          does a typedef for sigval_t
-
-        * ace/config-aix-5.x.h:
-        * ace/config-macosx.h:
-        * ace/config-rtems.h:
-        * ace/config-sunos5.4-g++.h:
-        * ace/config-sunos5.4-sunc++-4.x.h:
-        * ace/config-sunos5.5.h:
-        * ace/config-vxworks5.x.h:
-        * ace/config-vxworks6.2.h:
-        * ace/config-vxworks6.3.h:
         * ace/config-vxworks6.4.h:
-          Added ACE_LACKS_SIGVAL_T
-
-        * ace/POSIX_Asynch_IO.h:
-          Doxygen improvement
-
-Sun Dec 31 22:33:14 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/SV_Shared_Memory_Test.cpp:
-
-          Check and exit if allocator was not successfully initialized
-          (other processes could be using all the kernel's SysV shared
-          memory pages).  Otherwise the test's child process will be stuck
-          in a spinloop while filling up the filesystem with log messages.
-
-Sun Dec 31 18:56:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/svn/config:
-        * docs/svn/svn-prefs.reg:
-          Added some more file extensions
-
-        * bin/generate_doxygen.pl:
-        * etc/tao_compression.doxygen:
-        * etc/tao_transportcurrent.doxygen:
-        * html/index.html:
-          Added doxygen generations for transport current and compression
-
-Sun Dec 31 16:11:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ACEXML/common/Makefile.am:
-
-          Fix stray trailing \ introduced in:
-          Sat Dec 30 06:20:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-Sat Dec 30 06:23:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * */Makefile.am:
-
-          Baseline regeneration to match recent MPC, *.mpc, and *.mpb
-          changes.
-
-Sat Dec 30 06:20:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ACEXML/tests/Makefile.am:
-        * ACEXML/tests/util/Makefile.am:
-        * ACEXML/apps/svcconf/Makefile.am:
-        * ACEXML/common/Makefile.am:
-        * ACEXML/examples/SAXPrint/Makefile.am:
-
-          Hand-add automake conditionals for BUILD_ZZIP and BUILD_ZLIB.
-          Unfortunately MPC resolves options, files, etc. set by
-          "features" at project generation time, but we want them to be
-          configure time options.
-
-Sat Dec 30 06:16:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefiles for new subdirectory.
-
-        * apps/JAWS2/Makefile.am:
-
-          Regenerate to descend into HTTPU subdirectory.
-
-        * apps/JAWS2/HTTPU/Makefile.am:
-
-          New Makefile.am.
-
-Sat Dec 30 06:12:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/ace.m4:
-
-          Add placeholder automake conditionals for BUILD_ZLIB and
-          BUILD_ZZIP.
-
-        * bin/MakeProjectCreator/acexml.mpb:
-
-          Derive from both zlib and zzip.
-
-Fri Dec 29 16:57:10 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/SOCK_Dgram.cpp (recv): Corrected a "can't delete void*" warning
-          that entered with
-          Thu Dec 28 22:47:05 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-Fri Dec 29 08:41:35 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * tests/Proactor_Timer_Test.cpp:
-          Fixed compile error on LynxOS with 2.95.3.
-
-Fri Dec 29 08:31:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/os_signal.h:
-          Did some cleanup in this file, removed old stuff
-
-Fri Dec 29 07:33:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/automake.features:
-
-          Set java, zlib, and zzip.  We'll use automake conditionals to
-          defer these options to configure time.
-
-Thu Dec 28 22:47:05 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/SOCK_IO.{h, inl}: Changed the
-          recvv(iovec[], size_t, const ACE_Time_Value* = 0) and
-          sendv (const iovec[], size_t, const ACE_Time_Value*=0) methods
-          to specify the iovec count argument as int instead of size_t
-          since it gets reduced to int in the underlying OS calls (usually).
-          Removed the following deprecated methods:
-
-            ssize_t recv (iovec iov[],
-                          size_t n,
-                          const ACE_Time_Value *timeout = 0) const;
-
-            ssize_t recv (iovec *io_vec,
-                          const ACE_Time_Value *timeout = 0) const;
-
-            ssize_t send (const iovec iov[],
-                          size_t n,
-                          const ACE_Time_Value *timeout = 0) const;
-
-          These were previously replaced with more specific ...v() methods.
-
-        * ace/SOCK_Dgram.cpp (recv): Resolved ssize_t to u_long truncation
-          warning.
-
-        * ace/Service_Repository.{h cpp} (find, find_i): Changed the
-          ignore_suspended argument from int to bool to reflect it's true/false
-          nature.
-          Changed find_i() to return the located name's index in a size_t
-          argument when located - this allows it to pass indices as big as the
-          table can hold. The return value -1, -2 is not changed, but >= 0
-          is no longer returned; it's == 0 for success, and the caller needs
-          to get the index from the 'slot' argument. This should cause no
-          issues since find_i() is private and internal use has been adjusted
-          to match; callers of find() have no use for an index value for a
-          table internal to ACE_Service_Repository.
-
-        * ace/Service_Gestalt.cpp (~ACE_Service_Type_Dynamic_Guard): Use of
-          ACE_Service_Repository::find_i() adjusted per above.
-
-        * ace/Msg_WFMO_Reactor.cpp: Resolve truncation warning for 64-bit.
+          putenv fails with VxWorks 6.4 with a pentium target
 
-        * NEWS: Updated with API changes noted above.
+        * ace/Countdown_Time.{h,cpp}:
+          Use bool, removed return value from most methods, it was
+          meaningless, removed destructor, not needed to update members
+          in a destructor
 
-Thu Dec 28 20:56:28 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * ace/Dev_Poll_Reactor.h:
+          Export Token_Guard, fixes bugzilla 2786, thanks to
+          <sailzeng at tencent dot com> for reporting this
 
-        * bin/tao_orb_tests.lst:
+        * OS_NS_pwd.inl (getpwnam_r):
+          Initialize pointer with 0, simplified this a little
 
-          Updated to enable TAO/tests/TransportCurrent/Framework for
-          static builds.
-
-Thu Dec 28 19:11:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Reverted my change below this broke a lot of builds, seems
-        the settings in MPC are not used for ACE/TAO/CIAO so we need
-        to have them also in ACE duplicated
-
-        Thu Dec 28 12:57:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/global.features:
-          Removed the settings that are already set in the MPC
-          global.features file, no need to duplicate that info.
-
-Thu Dec 28 15:35:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add ACE_HAS_3_PARAM_READDIR_R feature test.
-
-Thu Dec 28 14:54:00 UTC 2006  Pavel Zaichenko <zpf at ivl dot ua>
-
-        * ace/OS_NS_unistd.cpp,
-        * ace/ARGV.cpp,
-        * ace/ARGV.h: Completed the integration of the quote_args feature
-          throughout the code.
-
-Thu Dec 28 14:49:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/ARGV.inl (argc): This method now first calls argv() before
-          returning the argc count.
-
-Thu Dec 28 12:57:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/global.features:
-          Removed the settings that are already set in the MPC
-          global.features file, no need to duplicate that info.
-
-Thu Dec 28 12:37:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/DLL_Manager.cpp (get_handle):
-          Simplified this method a little
-
-        * ace/Dynamic_Service_Base.cpp:
-          Layout change
-
-        * ace/os_include/net/os_if.h:
-          Include ws2tcpip.h on windows as we do in the other files, this
-          way we don't get redefinitions on windows
-
-        * ace/Service_Gestalt.cpp (process_directive):
-          No need to use an intermediate variable
-
-        * tests/ARGV_Test.cpp:
-          Fixed deprecated conversion warnings
-
-        * tests/Time_Value_Test.cpp:
-          Added another test
-
-Thu Dec 28 11:13:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-aix-5.x.h:
-          Define ACE_HAS_3_PARAM_READDIR_R always independent of the compiler
-          used.
-
-Wed Dec 27 21:15:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/ARGV.{h,cpp} Generalized the constructor for ACE_ARGV_T so
-          that it can optionally be directed to quote args or not, which
-          is consistent with the ACE_ARGV_T<CHAR_TYPE>::add() method
-          described below.
-
-        * ace/OS_NS_unistd.{h,cpp}: ACE_OS::argv_to_string() was updated
-          to implement the feature described above.
-
-Wed Dec 27 21:19:57 UTC 2006  Pavel Zaichenko <zpf at ivl dot ua>
-
-        * ace/OS_NS_stdlib.cpp: ACE_OS::strenvdup() now correctly expands
-          environment variables are correctly expanded in strings of form
-          "$ACE_ROOT/subdir", "/some/dir/$ARCH/subdir" as well as
-          "$ACE_ROOT".
-
-        * ace/OS_NS_unistd.cpp: ACE_OS::argv_to_string() and
-          ACE_OS::string_to_argv() now converts arguments list argv[] to
-          string and vice versa. Double quotes (") are correctly
-          quoted/unquoted during conversion.
-
-        * ace/ARGV.{h,inl,cpp}: Made the following enhancements:
-
-          ACE_ARGV_T<CHAR_TYPE>::add(const CHAR_TYPE *next_arg, bool quote_arg = false)
-          Now takes an additional argument
-          * @param quote_arg   The argument @a next_arg need to be quoted while
-          *                    adding to the vector.
-          which is queued in the queue_ as well as next_arg for farther usage.
-
-          ACE_ARGV_T<CHAR_TYPE>::add(CHAR_TYPE *argv[])
-          Each entry argv[i] of the argument list is interpreted as a single argument
-          (white spaces are preserved).
-
-          ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue()
-          Creates a command line using arguments (next_arg, quote_arg) queued
-          with add() method. Quotes double quote symbols (") if needed.
-
-Wed Dec 27 21:14:34 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/ARGV.{h,cpp}: Removed the
-
-          int argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf);
-
-          method since it's redundant with what's in ACE_OS::argv_to_string().
-
-Wed Dec 27 20:27:29 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_stdlib.{h,inl,cpp}: There's no need for the
-          strenvdup() method to be defined as
-          ACE_NAMESPACE_INLINE_FUNCTION.
-
-Wed Dec 27 15:12:12 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Map_Manager.{h,inl}: Added a default constructor for
-          ACE_Map_Entry to initialize the data members.  Thanks to Dieter
-          Knueppel <Dieter dot Knueppel at batm dot de> for this fix.
-
-Wed Dec 27 16:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/netinet/os_in.h:
-          Define IPPROTO_TCP when not defined yet
-
-        * ace/os_include/netinet/os_tcp.h:
-          Define TCP_NODELAY when not defined yet
-
-Wed Dec 27 16:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/net/os_if.h:
-          Only define the IFF_x defines when ACE_LACKS_NETWORKING is
-          defined to resolve redefinition warnings on windows
-
-Wed Dec 27 14:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-posix-nonetworking.h:
-          Added ACE_LACKS_GETHOSTENT
-
-Wed Dec 27 12:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Atomic_Op_T.h:
-          Doxygen improvements
-
-Wed Dec 27 11:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_socket.h:
-          Define SO_ERROR when it is not defined yet
-
-Wed Dec 27 10:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_socket.h:
-          Added ACE_LACKS_LINGER support
-
-        * ace/config-posix-nonetworking.h:
-          Added ACE_LACKS_LINGER
+        * docs/ACE-guidelines.html:
+          Updated example with doxygen style of documentation
 
-Wed Dec 27 10:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Sun Jan 28 19:59:14 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * ace/os_include/sys/os_socket.h:
-          Define SOCK_SEQPACKET when it is not defined yet
+        * ACE version 5.5.6 released.
 
-Wed Dec 27 10:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Fri Jan 26 10:03:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ace/config-posix-nonetworking.h:
-          Added ACE_LACKS_IFCONF
+        * ace/Cached_Connect_Strategy_T.cpp
+        * ace/Event_Handler_T.inl
+        * ace/Future.cpp
+        * ace/Future_Set.cpp
+        * examples/C++NPv2/Reactor_Logging_Server_T.cpp
+          Use typename
 
-        * ace/os_include/net/os_if.h:
-          Added some more types that need to be defined by ACE when
-          we compile without network support
+Thu Jan 25 19:59:23 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-        * ace/SOCK_Dgram.cpp:
-          Removed check for ACE_LACKS_IFREQ
+        * bin/MakeProjectCreator/templates/gnu.mpd:
 
-        * ace/SOCK_Dgram_Bcast.cpp:
-          Layout changes
+          The include of rules.cia.GNU must come before the include of
+          rules.tao.GNU in order for CIAO libraries to have the correct
+          version numbers.
 
-Wed Dec 27 10:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/auto_run_tests.pl:
 
-        * ace/os_include/sys/os_socket.h:
-          Define SO_BROADCAST when it is not defined yet
+          Fixed the -l option to use the correct variable name and corrected
+          a bug where the script changed to the wrong directory if the -l
+          option was used.
 
-Wed Dec 27 10:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * bin/clean_sems.sh:
 
-        * ace/os_include/netinet/os_in.h:
-          Add sockaddr_un when ACE_LACKS_SOCKADDR_UN is defined
+          Support the ngvipc command to clean up semaphores on MacOS X.
 
-        * ace/config-posix-nonetworking.h:
-          Added ACE_LACKS_SOCKADDR_UN
+        * bin/rm_exception_macros.pl:
 
-Wed Dec 27 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          A new script to assist users in the removal of all ACE related
+          exception macros.
 
-        * ace/Name_Request_Reply.cpp:
-          Use ACE_NTOHS so that this file compiles without network support
+Thu Jan 25 19:24:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Dec 27 09:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * etc/*.doxygen:
+          Removed ACE_ENV macros
 
-        * tests/ARGV_Test.cpp:
-          Fixed deprecated conversion warnings
+Thu Jan 25 11:00:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Dec 27 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/CDR_Stream.h:
+          Fixed typo, fixes part of bugzilla bug 2780, thanks to
+          <sailzeng at tencent dot com> for reporting this.
 
-        * ace/OS_NS_dirent.cpp:
-          Removed workaround for vc6
+        * docs/Download.html:
+          Enabled links for source only packages, they are available
+          from x.5.5
 
-        * ace/OS_NS_dirent.inl:
-          Layout change
+Thu Jan 25 07:50:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Dec 27 09:27:06 UTC 2006  Olli Savia  <ops@iki.fi>
+        * ace/Containers_T.cpp:
+          Use typename
 
-        * tests/Log_Msg_Test.cpp:
-          Updated comment.
+Wed Jan 24 12:25:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Wed Dec 27 09:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Acceptor.h:
+        * ace/Cached_Connect_Strategy_T.h:
+        * ace/Connector.h:
+          Use typename instead of ACE_TYPENAME which is now
+          deprecated
 
-        * ace/OS_NS_dirent.inl (readdir_r):
-          Simplified the OS checks in this method, use the new
-          define ACE_HAS_3_PARAM_READDIR_R. This is then set in the
-          config files below, maybe it has to be set in more, but the
-          scoreboard will show that.
+        * ace/Codeset_IBM1047.cpp:
+          Added missing includes
 
         * ace/config-aix-5.x.h:
-        * ace/config-cygwin32.h:
-        * ace/config-freebsd.h:
+        * ace/config-borland-common.h:
+        * ace/config-cxx-common.h:
+        * ace/config-g++-common.h:
         * ace/config-hpux-11.00.h:
+        * ace/config-icc-common.h:
+        * ace/config-irix6.x-sgic++.h:
         * ace/config-linux-common.h:
+        * ace/config-lynxos.h:
         * ace/config-netbsd.h:
-        * ace/config-rtems.h:
+        * ace/config-suncc-common.h:
         * ace/config-sunos5.5.h:
-        * ace/config-vxworks6.4.h:
-          Added ACE_HAS_3_PARAM_READDIR_R
-
-        * ace/config-linux-common.h:
-          Added new ACE_LACKS_LINUX_VERSION_H around include of linux/version.h.
-          This file isn't present with BlueCAT 4 Linux from LynuxWorks.
-
-        * ace/config-posix.h:
-          Layout changes
-
-        * ACE-INSTALL.html:
-          Updated supported platforms by Remedy IT
-
-        * ace/INET_Addr.cpp:
-          Use the ACE_NTOHL macro and remove the check for ACE_LACKS_NTOHL
-
-        * ace/Map_Manager.{h,cpp}:
-          Changed free_ to a real bool
-
-        * ace/Name_Proxy.cpp:
-        * ace/Name_Request_Reply.cpp:
-        * ace/Time_Request_Reply.cpp
-          Use the ACE_NTOHL macro so that this file compiles without networking
-          support
-
-Wed Dec 27 09:10:27 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/Process.cpp:
-          Changed to use ACE_LACKS_VSNPRINTF instead of ACE_HAS_SNPRINTF.
-
-Tue Dec 26 22:47:57 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_unistd.cpp: Reverted the changes to ACE_OS::argv_to_string()
-          from here:
-
-          Sun Dec 24 22:29:24 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-          so that Signal_Test.cpp tests don't break.  In a nutshell, each
-          argv[i] argument to ACE_ARGV is not supposed to be quoted.
-          Thanks to Steve Huston for reporting this.
-
-Tue Dec 26 22:46:34 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/ARGV_Test.cpp (run_main): Updated the test to test how the
-          conversion from char *argv[] to a char * works.
-
-Mon Dec 25 16:19:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * Merry Christmas everyone!!!
-
-Sun Dec 24 23:13:37 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/ARGV_Test.cpp: Updated the test to ensure that Pavel's
-          patches work properly.
-
-Sun Dec 24 22:29:24 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_stdlib.inl,
-        * ace/OS_NS_unistd.cpp: Modified ACE_OS::strenvdup() and
-          ACE_OS::argv_to_string() so they split the arguments containing
-          spaces in accordance with the documentation.  Thanks to Pavel
-          Zaichenko <zpf at ivl dot ua> for these patches.
-
-Fri Dec 22 17:35:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/OS_NS_dirent.inl:
-
-          Add a __NetBSD__ to the preprocessor conditional to select the
-          three argument version of readdir_r.  While this what was done
-          for FreeBSD, HPUX, etc., it really points out a need for a new
-          feature test macro.
-
-        * ace/config-netbsd.h:
-
-          Only define thread-related feature test macros if ACE_MT_SAFE is
-          defined (with a non-zero value).
-
-Fri Dec 22 13:56:15 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS2/HTTPU/http_heders.cpp:
-        * apps/JAWS2/HTTPU/http_status.cpp: Specify type and class separately
-          for each static member instance to allow HP aC++ 03.* (PA-RISC
-          compiler) to grok it. At least the Itanium compilers could handle
-          this... there's hope.
-
-Fri Dec 22 12:52:05 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * include/makeinclude/platform_lynxos.GNU:
-          Build shared libs by default.
-
-Fri Dec 22 09:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Service_Manager.h:
-          Improved doxygen documentation, thanks to Stefan Naewe
-          <stefan at naewe dot de> for delivering the patch
-
-Thu Dec 21 21:54:51 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/config-freebsd.h: Added support for SCTP in FreeBSD version
-          700028 and greater.  Thanks to Craig Rodrigues <rodrigc at
-          crodrigues dot org> for reporting this.
-
-Thu Dec 21 20:19:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          Use prefix increment and made get_interfaces working with rtems
-
-Thu Dec 21 16:12:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Fixing the condition for running the Transport::Current tests
-          (note that ST = Single Threaded, not STATIC).
-
-Thu Dec 21 14:31:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Sock_Connect.cpp:
-          Added support for get_interfaces for rtems
-
-Thu Dec 21 13:32:08 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * include/makeinclude/platform_lynxos.GNU:
-          Moved macro definitions from CFLAGS to CPPFLAGS.
-
-Thu Dec 21 12:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/rules.bin.GNU:
-          Removed old chorus rules
-
-Thu Dec 21 10:17:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/UUID.cpp:
-          Fixed initialisation warning
-
-Thu Dec 21 09:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * ace/OS_TLI.inl:
-        * ace/OS_NS_signal.h:
-
-          Updated some HPUX Acc version bug fixes.....
-
-Thu Dec 21 08:47:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/HPPTU/http_headers.{h,inl}:
-          Fixed const warnings with Intel C++
-
-Wed Dec 20 22:06:14 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * tests/OS_Test.cpp:
-          HP-UX has broken vsnprintf function. Changed the test not
-          to fail on HP-UX.
-
-Wed Dec 20 16:35:53 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          These are fixes correcting scoreboard issues pertaining to the
-          checkin from Tue Dec 19 22:09:34 UTC 2006.
-
-        * bin/tao_orb_tests.lst:
-
-          Added the two Transport::Current tests to the scoreboard.
-
-        * bin/MakeProjectCreator/config/tc.mpb:
-
-          Moved this file to $TAO_ROOT/MPC/config where it belongs.
-
-Wed Dec 20 12:31:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/test_config.h:
-          Only define ACE_START_TEST and ACE_END_TEST when they are not
-          defined yet. This way we can set our own define in the config.h
-          file and for example just do logging to stdout instead of a file
-          which can be problematic when the test target doesn't have a
-          file system
-
-Wed Dec 20 04:52:04 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ACE-INSTALL.html:
-        * docs/Download.html:
-
-          Fleshed out SVN instructions a bit more, corrected link mistake in
-          Download.html.
-
-          Thanks to Craig Rodrigues <rodrigc at crodrigues dot org> for the patch.
-
-Tue Dec 19 22:09:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/MakeProjectCreator/config/tc.mpb:
-
-          Added a new project type for projects using the Transport
-          Current functionality.
-
-Tue Dec 19 20:05:42 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/Download.html:
-          Added link to SVN documentation.
-
-Tue Dec 19 14:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_rtems.x_g++.GNU:
-          Set load address
-
-Tue Dec 19 14:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Object_Manager_Base.cpp (print_error_message):
-          Fixed invalid filename
-
-Tue Dec 19 13:16:38 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Log_Msg_NT_Event_Log.cpp (log): Changed the loop iterator to
-          be size_t rather than long to silence a warning about comparing
-          signed and unsigned values.  Thanks to Johnny for reporting
-          this.
-
-Tue Dec 19 09:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.inl (readdir_r):
-          Refactored this method to make it easier to maintain and at the
-          same moment fixed compile error when building ACE on VxWorks 6.4
-          in kernel mode without pthread support
-
-Mon Dec 18 22:28:48 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Log_Msg_NT_Event_Log.cpp (log): Iterate for i <
-          log_record.msg_data_len() rather than i < log_record.length ()
-          to avoid nasty overrun errors.  Thanks to Paxton Mason <PMason
-          at wolve dot com> for reporting this.  This fixes bugid 2754.
-
-Mon Dec 18 22:28:18 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Log_Record.h: Clarify the meaning of length() in the
-          comments.  Thanks to Paxton Mason <PMason at wolve dot com> for
-          motivating this.
-
-Mon Dec 18 13:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACEXML/common/common.mpc:
-        * bin/MakeProjectCreator/configs/acexml.mpb:
-          Added zzip as base, this project really uses zzip
-
-        * bin/MakeProjectCreator/configs/acedefaults.mpb:
-          Removed zzip and zlib as base projects. Any project that uses
-          zzip or zlib should derive from the correct project, but not
-          acedefaults. When making them a base from acedefaults any
-          project links with zzip/zlib even when they don't use it.
-
-          This fixes bugzilla bug 2751.
-
-Mon Dec 18 10:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/JAWS2/HTTPU/parse_url.h:
-          Added prefix to the members of the URL_ERROR enum, NONE is a macro
-          on some platforms like VxWorks
-
-Mon Dec 18 10:04:19 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * tests/OS_Test.cpp:
-          Do not execute snprintf test if ACE_LACKS_VSNPRINTF is defined.
-
-Fri Dec 15 23:09:29 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS2/JAWS/Makefile.am: Removed JAWS.h; see
-          Thu Dec 14 21:08:19 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-Fri Dec 15 15:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_vxworks6.3.GNU:
-        * include/makeinclude/platform_vxworks6.4.GNU:
-        * ace/config-vxworks6.4.h:
-        * ace/config-vxworks6.3.h:
-        * ace/OS_NS_unistd.inl:
-        * ace/OS_NS_arpa_inet.cpp:
-        * ace/os_include/os_stdio.h:
-        * ace/os_include/sys/os_types.h:
-          Added support for VxWorks 6.4
-
-Thu Dec 14 21:08:19 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS2/JAWS/jaws2.mpc: Corrected compiler defines to add
-          JAWS_BUILD_DLL, not replace previous.
-
-        * apps/JAWS2/JAWS/Export.h: Replaced contents with new content
-          generated from generate_export_file.pl. Previous content was
-          generated from GenerateExportH.BAT and was missing lots of
-          stuff, some of which prevented generation of .lib, .exp files.
-
-        * apps/JAWS2/JAWS/JAWS.h: Removed; it only had JAWS_TRACE defined
-          which is properly defined in Export.h now.
-
-        * apps/JAWS2/JAWS/Pipeline_Tasks.cpp:
-        * apps/JAWS2/JAWS/IO_Handler.cpp:
-        * apps/JAWS2/JAWS/IO.cpp:
-        * apps/JAWS2/JAWS/Concurrency.cpp: Removed #include "JAWS/JAWS.h"
-
-Thu Dec 14 12:36:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-qnx-neutrino.h:
-          Added several missing defines to build with QNX
-
-Thu Dec 14 11:57:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_qnx_neutrino.GNU:
-          Set all tools using ?= so that we can override the name
-          from the platform_macros.GNU file
-
-Thu Dec 14 00:12:49 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS_NS_Thread.cpp (event_init): Solaris's shm_open() requires a
-          single '/' on the name argument. I opted to put that logic here
-          rather than the lower-level ACE_OS::shm_open(), but that point
-          is debatable. In any case, look for a leading / on the name if
-          ACE_SHM_OPEN_REQUIRES_ONE_SLASH is defined; if it's not there,
-          add it.
-
-        * ace/config-sunos5.8.h: Added ACE_SHM_OPEN_REQUIRES_ONE_SLASH.
-
-        * ace/README: Add description of ACE_SHM_OPEN_REQUIRES_ONE_SLASH.
-
-        * configure.ac: Added check for ACE_SHM_OPEN_REQUIRES_ONE_SLASH.
-          Fixed check for ACE_LACKS_NUMERIC_LIMITS to display the findings
-          when configuring.
-
-        * m4/config_h.m4: Added ACE_SHM_OPEN_REQUIRES_ONE_SLASH and
-          ACE_LACKS_NUMERIC_LIMITS.
-
-Wed Dec 13 15:04:57 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Updated the configuration for ORB_Local_Config/Bug_2612 to
-          require a multithreaded build to reflect the design goals of the
-          test.
-
-Tue Dec 12 23:50:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * NEWS:
-
-          Document --enable-ace-reactor-notification-queue.
-
-        * m4/ace.m4:
-
-          Add autoconf support for --enable-ace-reactor-notification-queue.
-          Configuring with this option sets ACE_HAS_REACTOR_NOTIFICATION_QUEUE
-          in config.h.
-
-Wed Dec 13 01:41:19 UTC 2006  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
-
-        * ace/UUID.cpp:
-
-          Fixed a potential memory leak. Dynamic memory was allocated but
-          not freed under special circumstances. For details, check BUGID
-          2746. This closes BUGID 2746.
-
-Tue Dec 12 22:38:06 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS2/HTTPU/parse_url.h: Made the char* members const to
-          resolve compile warnings about assignment of char* literals.
-
-Tue Dec 12 19:54:05 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS2/HTTPU/httpu.mpc: Must build HTTPU after JAWS2.
-
-Tue Dec 12 19:54:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/fuzz.pl:
-
-          Changed the regular expression to recognize #include's of files
-          with double quotes within a version block.
-
-Tue Dec 12 19:31:39 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/fuzz.pl:
-
-          Corrected a bug where a non-ACE/TAO/CIAO file included within a
-          version block was being marked as an error.
-
-Tue Dec 12 17:01:42 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/MPC.cfg:
-
-          Added $DDS_ROOT/MPC/config to the includes, since the
-          .mpb files in DDS have been moved to this location, making
-          them consistent with the location of similar files in
-          TAO and CIAO.
-
-Tue Dec 12 15:08:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/tao_other_tests.lst:
-
-          Added the Trading unit test to the list.
-
-Tue Dec 12 13:47:44 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS2/HTTPU/httpu.mpc: Corrected build flags and added required
-          link library JAWS2.
-
-Tue Dec 12 06:05:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add ACE_HAS_ISASTREAM_PROTOTYPE feature test.
-
-Tue Dec 12 06:00:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE feature test.
-
-Tue Dec 12 05:13:33 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Add ACE_LACKS_MKTEMP_PROTOTYPE and ACE_LACKS_MKSTEMP_PROTOTYPE
-          feature tests.
-
-        * ace/README:
-
-          Document ACE_LACKS_MKSTEMP feature test macro.
-
-Mon Dec 11 20:51:59 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * apps/JAWS2/HTTPU/httpu.mpc: Added a new MPC file.  Thanks to
-          Sergey for this.
-
-        * apps/JAWS2/HTTPU/http_base.cpp (receive): Made this work with
-          HTTPU.  Thanks to Sergey Kosenko <sergey dot kosenko at gmail
-          dot com> for these patches.
-
-Mon Dec 11 20:21:14 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/CDR_Stream.{h cpp} (ACE_OutputCDR): Added a new method, int
-          consolidate (void) which consolidates any continuation message
-          blocks into the start block, ensuring that all data is located
-          in one block on return. This is useful for situations which
-          require the entire encoded stream to be available in one buffer,
-          regardless of length.
-
-        * tests/CDR_Test.cpp: Added a test for consolidate().
-
-        * NEWS: Added notice for new consolidate() method.
-
-        Thanks to Howard Finer <hfiner at sonusnet dot com> for supplying
-        the new ACE_OutputCDR::consolidate() method.
-
-Mon Dec 11 20:03:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          Changed the template to use the words "make macros" instead of
-          features.  There may have be some confusion with MPC features.
-
-Mon Dec 11 17:39:46 UTC 2006  James H. Hill  <hillj@isis.vanderbilt.edu>
-
-        * docs/ace_guidelines.vsmacros:
-
-          Fixed macros specification so the same file can be used
-          with both VS.NET 2003 and VS.NET 2005 development
-          environments.
-
-Mon Dec 11 15:23:08 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/config/MPC.cfg:
-        * bin/mpc.pl:
-        * bin/mwc.pl:
-
-          Removed the code that specifically added the gnuace and borland
-          project types and rely on the dynamic_types directive in the
-          MPC.cfg to have the MPC core add them.
-
-Sat Dec  9 19:13:52 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/config-vxworks5.x.h:
-          Added ACE_LACKS_VSNPRINTF.
-
-Fri Dec  8 20:20:09 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Config.cpp (parse_args_i):
-
-          Moving the "default:" label outside the block that handles the
-          "case 's':". Even though it should work correctly on allmost any
-          compiler, things like this are bad form. Thanks to Aaron
-          Scamehorn <Aaron dot Scamehorn at cogcap dot com> for noticing.
-
-Fri Dec  8 20:15:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * THANKS: Add Ray Lischner.
-
-Fri Dec  8 16:39:51 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/Null_Mutex.h: Added ACE_Export to the class declarations.
-          Although they are probably inlined, VS .NET 2005 (VC8) complains
-          in some cases when a dll-interface class inherits from a
-          non-dll-interface class.
-
-Fri Dec  8 15:36:23 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tests/run_test.lst:
-          Bug_2659_Regression_Test cannot run in a single threaded build.
-
-Fri Dec  8 05:21:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Changed code to extract version number from ace/Version.h to be
-          more resilient to leading whitespace like was added by a bug in
-          the release script in the last beta.  Thanks to Ray Lischner
-          <rlischner at proteus-technologies dot com> for this patch.
-          Also thanks to Paul Riley <paul at riley dot net> for reporting
-          this problem.
-
-Thu Dec  7 14:13:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/DLL_Manager.cpp:
-          Made error message dependent on ACE::debug. Thanks to David Faure
-          <dfaure at klaralvdalens-datakonsult dot se> for reporting this.
-
-Thu Dec  7 14:09:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/ciao_tests.lst:
-          Added RTCMM test
-
-Thu Dec  7 12:47:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Read_Buffer.h:
-          Doxygen improvements
-
-        * ace/Read_Buffer.cpp:
-          Initialise pointer with 0 and use prefix increment
-
-Thu Dec  7 09:47:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Improved rtems documentation
-
-        * MakeProjectCreator/config/avoids_ace_for_tao.mpb:
-          New base project for avoids ace_for_tao
-
-        * bin/ciao_tests.lst
-        * bin/tao_orb_tests.lst
-        * bin/tao_other_tests.lst
-          Disabled all tests that are disabled in a minimum_corba build also
-          when using CORBA/e compact and micro
-
-Thu Dec  7 07:49:24 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * ace/OS_NS_stdio.h:
-        * ace/OS_NS_stdio.inl:
-        * ace/OS_NS_stdio.cpp:
-
-          Implemented ACE_OS::snprintf() by using ACE_OS::vsnprintf().
-          Removed duplicate code and made maintaining easier.
+        * ace/config-sunos5.6.h:
+        * ace/config-tandem-nsk-mips-v2.h:
+        * ace/config-tandem-nsk-mips-v3.h:
+        * ace/config-unixware-7.1.0.udk.h:
+        * ace/config-win32-dmc.h:
+        * ace/config-win32-ghs.h:
+        * ace/config-win32-interix.h:
+        * ace/config-win32-msvc-7.h:
+        * ace/config-win32-msvc-8.h:
+        * ace/config-win32-visualage.h:
+          Removed ACE_HAS_TYPENAME_KEYWORD, we do require that each
+          compiler supports typename
 
-        * ace/README:
         * ace/config-cygwin32.h:
-        * ace/config-freebsd.h:
         * ace/config-hpux-11.00.h:
-        * ace/config-irix6.x-common.h:
-        * ace/config-linux-common.h:
         * ace/config-lynxos.h:
         * ace/config-macosx-panther.h:
         * ace/config-macosx-tiger.h:
         * ace/config-macosx.h:
         * ace/config-netbsd.h:
-        * ace/config-openbsd.h:
         * ace/config-openvms.h:
-        * ace/config-posix.h:
-        * ace/config-qnx-rtp-62x.h:
-        * ace/config-sunos5.7.h:
-        * ace/config-tru64.h:
-        * ace/config-vxworks6.2.h:
-        * ace/config-vxworks6.3.h:
-        * ace/config-win32-common.h:
-        * ace/config-win32-interix.h:
-
-          Removed ACE_HAS_SNPRINTF and added ACE_LACKS_VSNPRINTF
-          if necessary (I probably missed some platforms, need to recheck
-          after next scoreboard round).
-
-Thu Dec  7 00:27:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/config_h.m4:
-        * configure.ac:
-
-          Remove obsolete ACE_HAS_UNION_WAIT feature test.
-
-Wed Dec  6 21:06:37 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tests/Bug_2659_Regression_Test.cpp:
-          Compile failure on RTEMS due to non-ANSI signal API on the
-          platform. Fixed by casting function ptr to proper type.
-
-Wed Dec  6 14:49:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * m4/config_h.m4:
-        * configure.ac:
-
-          Remove obsolete ACE_LACKS_CMSG_DATA_MACRO and
-          ACE_LACKS_CMSG_DATA_MEMBER feature test.
-
-Wed Dec  6 11:07:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-mit-pthread.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-          Removed MIT pthread config files, not supported for years
-          anymore
-
-        * ace/config-mklinux.h:
-          Removed, this linux version hasn't been maintained for years
-
-        * ace/ACE.cpp:
-          Removed all mit-pthread specific code
-
-        * configure.ac:
-          Removed mit-pthread checks
-
-        * ace/WFMO_Reactor.cpp:
-          Const/bool change
-
-Wed Dec  6 07:57:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/ciao_tests.lst:
-        * bin/tao_orb_tests.lst:
-        * bin/tao_other_tests.lst:
-          Disabled all tests that are disabled in a minimum_corba build also
-          when using CORBA/e compact and micro
-
-Tue Dec  5 23:53:34 UTC 2006  Ciju John  <johnc@ociweb.com>
-
-        * tests/Bug_2659_Regression_Test.cpp:
-        * tests/run_test.lst:
-        * tests/tests.mpc:
-          Adding regression test for Bug 2659.
-
-Tue Dec  5 19:44:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-freebsd.h:
-          Simplified ACE_HAS_SNPRINTF setting
-
-        * ace/config-irix6.x-common.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-        * ace/config-tru64.h:
-          Removed commented out defines, makes it easier to search whether
-          a macro is defined in any config file or not
-
+        * ace/config-rtems.h:
+        * ace/config-sunos5.5.h:
+        * ace/config-tandem-nsk-mips-v3.h:
         * ace/config-tru64.h:
-          Use config-posix.h
-
-        * ace/Read_Buffer.{h,cpp}:
-          Changed close_on_delete to a real bool
-
-        * ace/Service_Config.{h,inl}:
-        * ace/Service_Gestalt.{h,cpp,inl}:
-          Use bool for the ignore arguments
-
-        * ace/SOCK_Dgram.inl:
-          Const change
-
-Tue Dec  5 15:47:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/makeinclude/platform_osf1_3.2_cxx.GNU:
-        * include/makeinclude/makeinclude/platform_osf1_4.x_cxx.GNU:
-        * include/makeinclude/makeinclude/platform_osf1_4.x_g++.GNU:
-        * include/makeinclude/makeinclude/platform_osf1_4.x_rcc.GNU:
-          Removed, very old
+          Removed ACE_HAS_MEMCHR
 
-        * include/makeinclude/makeinclude/platform_tru64_cxx.GNU:
-        * include/makeinclude/makeinclude/platform_tru64_g++.GNU:
-          We should be able to build on tru64 but it isn't really maintained,
-          moved the contents of the osf files into these files
+        * ace/config-doxygen.h:
+          Enabled COIOP and Transport Current
 
-Tue Dec  5 15:22:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/config-macros.h:
+          Deprecated ACE_TYPENAME, users can still use it, but in some builds
+          on the daily scoreboard it now can't be used anymore
 
-        * include/makeinclude/makeinclude/platform_aix4_cset++.GNU:
-        * include/makeinclude/makeinclude/platform_aix.GNU:
-          Moved contents of cset++ method into the aix one, the aix
-          file just included the first one
+        * ace/config-mvs.h:
+          Improved MVS support
 
-        * include/makeinclude/makeinclude/platform_aix4.2.GNU:
-          Removed, old
-
-        * ace/config-aix-4.x.h:
-        * ace/config-aix-5.x.h:
-          Moved contents of 4.x.h file into the 5.x.h file. Removed a lot
-          of old checks for AIX 4 so that we can maintain things easier.
-
-        * ace/ACE.cpp:
-        * ace/OS_NS_sys_wait.inl:
-          Removed ACE_HAS_UNION_WAIT, was only set for aix4
+        * ace/Global_Macros.h:
+        * ace/Malloc_T.h:
+        * ace/Map_T.h:
+        * ace/Strategies_T.h:
+          Use typename
 
         * ace/Log_Msg.cpp:
-        * ace/OS_NS_Thread.cpp:
-          Removed code for AIX 4.x to handle pthread_t
-
-        * ace/os_include/sys/os_socket.h:
-          Removed ACE_HAS_AIX_BROKEN_SOCKET_HEADER, was only set for aix 4
-
-Tue Dec  5 15:08:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-aix-4.1.x.h:
-        * ace/config-aix-4.2.x.h:
-        * ace/config-aix-4.3.x.h:
-          Removed, these AIX versions aren't supported anymore
-
-Tue Dec  5 14:33:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-irix6.x-sgic++-nothreads.h:
-          Removed
-
-Tue Dec  5 14:30:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-sunos5.4-centerline-2.x.h:
-        * include/makeinclude/platform_sunos5_centerline.GNU:
-          Removed centerline support
-
-Tue Dec  5 14:07:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_sunos4_g++.GNU:
-        * include/makeinclude/platform_sunos4_lucid.GNU:
-        * include/makeinclude/platform_sunos4_sunc++3.x.GNU:
-        * include/makeinclude/platform_sunos4_sunc++4.x.GNU:
-          Removed, not supported anymore
-
-Tue Dec  5 13:59:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-sco-5.0.0-fsu-pthread.h:
-          Deleted, fsu pthread is already removed some time ago.
-
-Tue Dec  5 13:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-sco-4.2-nothread.h:
-          Deleted, ancient
-
-Tue Dec  5 13:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-dgux-4.11-epc.h:
-        * ace/config-dgux-4.x-ghs.h:
-        * include/makeinclude/platform_dgux4_epc.GNU:
-        * include/makeinclude/platform_dgux4_ghs.GNU:
-          Deleted
-
-        * ace/OS_NS_Thread.cpp:
-          Removed dgux support. Fixes bugzilla 2011
-
-Tue Dec  5 13:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-irix5.2.h:
-        * ace/config-irix5.3-g++.h:
-        * ace/config-irix5.3-sgic++.h:
-        * include/makeinclude/platform_irix5.2.GNU:
-        * include/makeinclude/platform_irix5.3_g++.GNU:
-        * include/makeinclude/platform_irix5.3_sgic++.GNU:
-          Deleted
-
-        * include/makeinclude/platform_irix6.x_common.GNU:
-          Use operator ?=
-
-        * ace/os_include/os_signal.h:
-          Removed Irix 5 support, fixes bugzilla 2013.
-
-Tue Dec  5 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-m88k.h:
-        * include/makeinclude/platform_m88k.GNU:
-          Deleted
-
-        * ace/os_include/os_signal.h:
-        * ace/os_include/sys/os_resource.h:
-        * ace/os_include/sys/os_time.h:
-          Removed support for m88k which isn't maintained for years now.
-          Fixes bugzilla 2012
-
-Tue Dec  5 13:28:10 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-
-          If the gendir setting for the custom file is '.', then ommit the
-          gendir setting.  This is required for version 3.4.45 of MPC.
-
-Tue Dec  5 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/sys/os_socket.h:
-          Removed check for ACE_LACKS_CMSG_DATA_MACRO which wasn't
-          set in any configuration file. This also resulted in the
-          removal of ACE_LACKS_CMSG_DATA_MEMBER because this define
-          was never checked
-
-        * ace/config-qnx-neutrino.h:
-        * ace/config-qnx-rtp-62x.h:
-        * ace/config-qnx-rtp-pre62x.h:
-        * ace/config-tandem-nsk-mips-v2.h:
-        * ace/config-tandem-nsk-mips-v3.h:
-          Removed ACE_LACKS_CMSG_DATA_MEMBER, it has no impact at all
-
-Tue Dec  5 11:25:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * ace/SStringfwd.h:
-
-          Provide for annoying HP aCC 3.xx template bug.
-
-Tue Dec  5 10:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-lynxos.h:
-
-          Improved LynxOS 4.2 support
-
-Mon Dec  4 23:13:12 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * ace/Service_Gestalt.cpp (init_i):
-
-          Fixed bug#2735 and eliminated a potential memory leak of the
-          list of already processed static services. The failure scenario
-          is based on a case where static initializers register a bunch of
-          service objects and then later the gestalt::open() is called. At
-          that point, the abovementioned list is reinitialized and its
-          contents was lost. See also the other failure scenario
-          (bug#2701) for which a fix was put in on Nov 9 2006.
-
-Mon Dec  4 18:00:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Added a regression test for bug#2612
-
-Mon Dec  4 15:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config:
-          Moved TAO base projects to $TAO_ROOT/MPC/config
-
-Mon Dec  4 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/MPC.cfg:
-          Set includes so that TAO and CIAO base projects could be
-          under TAO_ROOT and CIAO_ROOT
-
-        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_component_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb:
-        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb:
-        * bin/MakeProjectCreator/config/ciao_container_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_events_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodeapplication.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_noop_configurator.mpb:
-        * bin/MakeProjectCreator/config/ciao_plan_generator.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_component.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_default.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_monitor.mpb:
-        * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb:
-        * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_xml_utils.mpb:
-        * bin/MakeProjectCreator/config/ciaocidldefaults.mpb:
-        * bin/MakeProjectCreator/config/cidlc.mpb:
-        * bin/MakeProjectCreator/config/dance_extension_stub.mpb:
-          Moved to $CIAO_ROOT/MPC/config
-
-Mon Dec  4 13:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Don't run Bug_2709_Regression with ACE_FOR_TAO
-
-Mon Dec  4 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Basic_Types.h:
-          Added check for __ia64__, then we assume we have little endian,
-          this define is set by the HP OpenVMS compiler
-
-Mon Dec  4 12:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb:
-          New base project
-
-Mon Dec  4 11:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ciao_nodeapplication.mpb:
-          New base project for nodeapplication library
-
-        * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb:
-          Derive from ciao_nodeapplication
-
-        * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb:
-        * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_default.mpb:
-        * bin/MakeProjectCreator/config/ciao_race_monitor.mpb:
-        * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb:
-          Fixed incorrect id tag
-
-        * bin/MakeProjectCreator/config/ciao_noop_configurator.mpb:
-          New base project
-
-Mon Dec  4 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Corrected the expression to fill the files_mpc array and
-          enabled the Id check again
-
-Fri Dec  1 13:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * Kokyu/docs/Kokyu.html:
-          Updated download location of ACE/TAO/CIAO
-
-Wed Nov 29 15:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_unistd.cpp (num_processors*):
-          Check the return value of sysctl, if it returns -1 then
-          also return the method with -1
-
-Wed Nov 29 12:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
-          Simplified this file
-
-Wed Nov 29 11:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Malloc_T.{h,cpp}:
-          Changed delete_lock_ to a real bool
-
-Wed Nov 29 07:09:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * Makefile.am:
-        * configure.ac:
-
-          If ACEXML, ASNMP, or protocols subdirectories are not present,
-          don't try to configure or build them.  Thanks to Stephen Torri
-          <storri at cse dot wustl dot edu> for reporting this.
-
-Tue Nov 28 21:02:25 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/WIN32_Asynch_IO.cpp (ACE_WIN32_Asynch_Connect::post_result):
-          The 'result' pointer is invalid upon return from post_completion()
-          regardless of whether or not it succeeds. This fix prevents
-          dereferencing result on failure of post_completion(), such as at
-          proactor shutdown. Thank you to Ken Kane <kenneth dot kane at
-          ironmountain dot com> for the analysis and fix.
-
-        * THANKS: Updated Ken Kane's email address.
-
-Tue Nov 28 20:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/auto_run_tests.pl:
-          Added \n after the message when we can't chdir to a certain
-          directory to prevent detecting the wrong test because this
-          message is then on the same line as the next test.
-
-Tue Nov 28 20:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
-          Removed include path that didn't exist anymore
-
-Tue Nov 28 16:04:45 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb
-        * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb
-
-          Fix for linker warnings/errors on OS X.
-
-Tue Nov 28 14:08:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/msvc_mpc_auto_compile.pl:
-
-          Reorder @ace_core_dirs so that protocols follows tests, as
-          the HTBP protocol tests depend on the Test_Output library.
-
-Tue Nov 28 13:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/event.mpb:
-        * bin/MakeProjectCreator/config/event_serv.mpb:
-        * bin/MakeProjectCreator/config/event_skel.mpb:
-        * bin/MakeProjectCreator/config/ftorbutils.mpb:
-        * bin/MakeProjectCreator/config/ftrtevent.mpb:
-        * bin/MakeProjectCreator/config/ifrservice.mpb:
-        * bin/MakeProjectCreator/config/imr_locator.mpb:
-        * bin/MakeProjectCreator/config/portablegroup.mpb:
-        * bin/MakeProjectCreator/config/rtcorbacommon.mpb:
-          Added avoids_corba_e_compact as base project, if we have CORBA/e
-          compact we don't have the needed features available to build these
-          projects.
-
-Tue Nov 28 13:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb:
-        * bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb:
-          Fixed incorrect feature name
-
-        * bin/MakeProjectCreator/config/global.features:
-          Removed duplicate minimum_corba
-
-Tue Nov 28 09:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
-        * bin/MakeProjectCreator/config/ciao_events_dnc.mpb:
-          Removed security as base, for the moment we decoupled from
-          the security service.
-
-Tue Nov 28 00:28:28 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * protocols/tests/HTBP/htbptest.mpb:
-
-          Add dependency on Test_Output.
-
-Mon Nov 27 12:30:28 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Bug_2653_Regression_Test.cpp:
-
-          When a thread is started, you must wait() on it before exiting the
-          process to avoid a core dump.
-
-        * tests/run_test.pl:
-
-          Print out the test header before checking for the executable.  If
-          the executable is not there, it will appear as if the previous
-          test failed.
-
-Mon Nov 27 08:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-sunos5.5.h:
-          Fixed compile problem on solaris x86 when _FILE_OFFSET_BITS=64
-          is set. Thanks to Michael Klein <michael dot klein at fazi dot de>
-          for reporting this. Fixed bugzilla bug 2693.
-
-Mon Nov 27 08:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/minimum_corba.mpb:
-        * bin/MakeProjectCreator/config/avoids_minimum_corba.mpb:
-          Renames minimum_corba to avoids_minimum_corba. Fixes bugzilla
-          2589.
-
-        * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb:
-          Fixed this file and made corba_e_compact its parent, when
-          we can't build a project in corba_e_compact then corba_e_micro
-          is also not an option.
-
-        * bin/MakeProjectCreator/config/event.mpb:
-        * bin/MakeProjectCreator/config/event_serv.mpb:
-        * bin/MakeProjectCreator/config/event_skel.mpb:
-        * bin/MakeProjectCreator/config/ftorbutils.mpb:
-        * bin/MakeProjectCreator/config/ftrtevent.mpb:
-        * bin/MakeProjectCreator/config/ifrservice.mpb:
-        * bin/MakeProjectCreator/config/imr_locator.mpb:
-        * bin/MakeProjectCreator/config/portablegroup.mpb:
-        * bin/MakeProjectCreator/config/rtcorbacommon.mpb:
-          Updated for rename of minimum_corba
-
-Mon Nov 27 06:05:38 UTC 2006  Olli Savia  <ops@iki.fi>
-
-        * tests/OS_Test.cpp:
-          Fixed compile error on VxWorks. Thanks to Johnny Willemsen
-          for pointing out the problem and suggesting a fix.
-
-Fri Nov 24 13:27:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * bin/MakeProjectCreator/config/automake.features:
+        * ace/os_include/sys/os_types.h:
+        * ace/Task.cpp:
+          Added support for MVS
 
-          Set stl and boost.  We'll use automake conditionals to defer
-          these options to configure time.
+        * ace/OS_NS_string.{h,cpp,inl}:
+          Replaced ACE_HAS_MEMCHR with ACE_LACKS_MEMCHR, this way a platform that
+          lacks this method has to set an explicit define, maybe it now shows
+          that all platforms have this method and we don't need an emulation
+          anymore. Also removed several emulations that are not needed anymore
 
-Fri Nov 24 13:05:01 UTC 2006  Olli Savia  <ops@iki.fi>
+        * ace/OS_NS_Thread.inl:
+          Layout changes
 
-        * tests/OS_Test.cpp:
-          Added ACE_OS::snprintf test.
+        * ace/OS_NS_wchar.{h,cpp}:
+          Changed second argument of wcschr_emulation to wchar_t, that way we don't
+          need a cast anymore
 
-Fri Nov 24 10:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Rtems_init.c:
+          Improved this file
 
         * ace/Sock_Connect.cpp:
-          Fixed compile errors when building on linux with no
-          networking support
-
-Thu Nov 23 17:06:17 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * ace/OS_Errno.h:
-        * ace/OS_Errno.cpp:
-
-          Fix compile errors with g++ on Solaris with NDEBUG.
-
-Thu Nov 23 14:09:17 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/rules.lib.GNU: Corrected error introduced by
-          Wed Nov 22 21:53:17 UTC 2006  Steve Huston  <shuston@riverace.com>.
-
-Thu Nov 23 06:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/ace_for_tao.mpb:
-          Added ACE_LACKS_MSG_WFMO as define, that prevents other projects
-          to try to use the msg wfmo reactor which is not available in the
-          ace_for_tao configuration
-
-Thu Nov 23 03:14:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Integer_Truncate_Test.cpp:
-        * apps/JAWS/clients/WebSTONE/src/README:
-
-          Removed svn:executable property.
-
-Wed Nov 22 23:16:22 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * examples/Timer_Queue/Async_Timer_Queue_Test.cpp: Ignore SIGQUIT code
-          for platforms with ACE_LACKS_UNIX_SIGNALS. Fixes WinCE build error.
-
-Wed Nov 22 21:58:16 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * tests/RB_Tree_Test.cpp: Don't use ACE_ASSERT for code - it doesn't
-          get executed in Release builds.
-
-        Pulled these in from the 5.5 stream:
-
-        Mon Nov 20 21:26:24 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-win32-msvc.h:
-        * ace/OS_Memory.h:
-          The MFC new/exception code needed the ability to delete a caught
-          CMemoryException object to prevent memory leaks (see
-          http://msdn2.microsoft.com/de-de/library/0e5twxsh(VS.80).aspx).
-          This necessitates that every platform other than Windows/MFC gets
-          an empty define for ACE_del_bad_alloc, and the ACE_NEW... macros
-          have ACE_del_bad_alloc expanded in the catch block.
-          For past history of this issue, see the trail starting at:
-          Tue Aug  8 09:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        Thu Nov 16 16:14:32 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/String_Base.{h inl}: Added a capacity() method that returns
-          the number of allocated CHAR units in the string object. Thanks to
-          Kelly Hickel <kfh at mqsoftware dot com> for supplying this.
-
-        * NEWS: Updated with recent ACE_String_Base and build additions.
-
-        Mon Nov 13 17:40:58 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * ace/String_Base.{h cpp}: Added a fast_resize(size_t) method to
-          manage the sizing/reallocating of the string, but doesn't do the
-          memory setting of resize(). Changed resize() to call fast_resize()
-          then do the memory setting.
-          Thank you to Kelly Hickel <kfh at mqsoftware dot com> for these
-          additions.
-
-
-Wed Nov 22 21:53:17 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        Pulled these in from the 5.5 stream:
-
-        Thu Nov 16 21:56:37 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/rules.local.GNU: For creating the object file
-          directories (e.g., VDIR and VSHDIR, and their subdirectories), change
-          from using the directory as a prerequisite and make that prereq
-          a PHONY target to embed the command(s) to check and create the
-          directory if needed. This accomplishes two things: 1) allows the
-          make to work with clearmake in GNU compatibility mode (clearmake
-          always saw the PHONY target as remade and remade every file in the
-          project), and 2) avoids using a PHONY target as a prerequisite,
-          something the GNU make manual says to avoid. Thank you to Howard
-          Finer <hfiner at sonusnet dot com> for motivating and assisting
-          in this effort.
-
-        Tue Nov 14 22:33:03 UTC 2006  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/rules.lib.GNU: Change VLOBJS and VSHOBJS to
-          use $(patsubst) instead of $(if) to look for entries that have
-          relative directories in them (../). Avoids $(if) which does not
-          work in Clearcase's clearmake GNU compatibility mode.
-
-Wed Nov 22 19:52:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Select_Reactor_T.inl:
-
-          Add #include of "Log_Msg.h".  This is required to bring things
-          into scope on systems where ACE_TEMPLATES_REQUIRE_SOURCE isn't
-          defined/needed.
-
-Wed Nov 22 18:27:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am:
-
-          Regenerated.
-
-        * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc:
-
-          Add automake specific includes definition to find headers
-          relative to source directory.
-
-Wed Nov 22 16:57:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am:
+          Initialise some pointers with 0
 
-          Regenerated.
+        * bin/cvslog:
+          Removed, not needed anymore
 
-        * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc:
-
-          Add automake specific includes definition to find headers
-          relative to source directory.
-
-Wed Nov 22 16:48:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * Makefile.am:
-
-          Hand tweak, HTBP tests depend on Test_Output library.  This
-          requires changing the build order so that the protocols dir
-          is built after tests.
-
-        * apps/gperf/tests/Makefile.am:
-
-          Hand tweak to find gperf executable on automake builds.  Chad
-          has given me info to make MPC generation work, which I'll add
-          in the near future.
-
-        * m4/ace.m4:
-
-          Placeholder for a BUILD_WXWINDOWS feature test.  For now it
-          always returns false.
-
-        * configure.ac:
-
-          Configure examples/ConfigViewer/Makefile.
-
-Wed Nov 22 15:34:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Version.h:
-
-          Remove extraneous whitespace from ACE_VERSION macro definition.
-
-        * ace/Makefile.am:
-
-          Hand tweak.
-
-        * ace/QoS/Makefile.am:
-
-          Revert to earlier version until MPC generation issues are
-          resolved.
-
-        * apps/JAWS2/JAWS/Makefile.am:
-        * apps/JAWS3/jaws3/Makefile.am:
-
-          Regenerated.
-
-        * apps/JAWS2/JAWS/jaws2.mpc:
-        * apps/JAWS3/jaws3/jaws3.mpc:
-
-          Add automake specific includes definition to find headers
-          relative to source directory.
-
-Wed Nov 22 14:24:31 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ace/Makefile.am:
-
-          Regenerated.
-
-        * ace/ace_xtreactor.mpc:
-        * ace/ace_tkreactor.mpc:
-        * ace/ace_flreactor.mpc:
-        * ace/ace_qtreactor.mpc:
-
-          Changed to specify full name of pkgconfig template file,
-          the MPC Custom spec does not automatically match *.pc.in
-          files.
-
-Wed Nov 22 14:16:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/ConfigViewer/Makefile.am:
-
-          New file.
-
-Wed Nov 22 14:10:08 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * protocols/tests/RMCast/Makefile.am:
-        * protocols/tests/Makefile.am:
-        * protocols/tests/HTBP/Reactor_Tests/Makefile.am:
-        * protocols/tests/HTBP/Send_Large_Msg/Makefile.am:
-        * protocols/tests/HTBP/Makefile.am:
-        * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am:
-        * protocols/tests/HTBP/ping/Makefile.am:
-        * protocols/ace/RMCast/Makefile.am:
-        * protocols/ace/Makefile.am:
-        * protocols/ace/TMCast/Makefile.am:
-        * protocols/ace/HTBP/Makefile.am:
-        * protocols/examples/RMCast/Send_Msg/Makefile.am:
-        * protocols/examples/RMCast/Makefile.am:
-        * protocols/examples/Makefile.am:
-        * protocols/examples/TMCast/Member/Makefile.am:
-        * protocols/examples/TMCast/Makefile.am:
-        * ace/Makefile.am:
-        * ace/SSL/Makefile.am:
-        * ace/QoS/Makefile.am:
-        * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am:
-        * performance-tests/Synch-Benchmarks/Makefile.am:
-        * performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am:
-        * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am:
-        * performance-tests/Server_Concurrency/Leader_Follower/Makefile.am:
-        * performance-tests/Server_Concurrency/Makefile.am:
-        * performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am:
-        * performance-tests/TCP/Makefile.am:
-        * performance-tests/UDP/Makefile.am:
-        * performance-tests/SCTP/Makefile.am:
-        * performance-tests/Makefile.am:
-        * performance-tests/Misc/Makefile.am:
-        * Kokyu/tests/FIFO/Makefile.am:
-        * Kokyu/tests/DSRT_MIF/Makefile.am:
-        * Kokyu/tests/Makefile.am:
-        * Kokyu/tests/EDF/Makefile.am:
-        * Kokyu/Makefile.am:
-        * tests/SSL/Makefile.am:
-        * tests/Makefile.am:
-        * apps/Gateway/Gateway/Makefile.am:
-        * apps/Gateway/Makefile.am:
-        * apps/Gateway/Peer/Makefile.am:
-        * apps/mkcsregdb/Makefile.am:
-        * apps/drwho/Makefile.am:
-        * apps/gperf/tests/Makefile.am:
-        * apps/gperf/src/Makefile.am:
-        * apps/gperf/Makefile.am:
-        * apps/JAWS/clients/Blobby/Makefile.am:
-        * apps/JAWS/clients/Makefile.am:
-        * apps/JAWS/clients/Caching/Makefile.am:
-        * apps/JAWS/server/Makefile.am:
-        * apps/JAWS/Makefile.am:
-        * apps/JAWS2/JAWS/Makefile.am:
-        * apps/JAWS2/Makefile.am:
-        * apps/JAWS3/jaws3/Makefile.am:
-        * apps/JAWS3/Makefile.am:
-        * apps/soreduce/Makefile.am:
-        * bin/Makefile.am:
-        * ACEXML/tests/Makefile.am:
-        * ACEXML/tests/util/Makefile.am:
-        * ACEXML/apps/svcconf/Makefile.am:
-        * ACEXML/apps/Makefile.am:
-        * ACEXML/common/Makefile.am:
-        * ACEXML/Makefile.am:
-        * ACEXML/parser/Makefile.am:
-        * ACEXML/parser/parser/Makefile.am:
-        * ACEXML/examples/SAXPrint/Makefile.am:
-        * ACEXML/examples/Makefile.am:
-        * websvcs/tests/Makefile.am:
-        * websvcs/lib/Makefile.am:
-        * websvcs/Makefile.am:
-        * netsvcs/clients/Logger/Makefile.am:
-        * netsvcs/clients/Tokens/rw_lock/Makefile.am:
-        * netsvcs/clients/Tokens/mutex/Makefile.am:
-        * netsvcs/clients/Tokens/deadlock/Makefile.am:
-        * netsvcs/clients/Tokens/collection/Makefile.am:
-        * netsvcs/clients/Tokens/invariant/Makefile.am:
-        * netsvcs/clients/Tokens/manual/Makefile.am:
-        * netsvcs/clients/Naming/Dump_Restore/Makefile.am:
-        * netsvcs/clients/Naming/Makefile.am:
-        * netsvcs/clients/Naming/Client/Makefile.am:
-        * netsvcs/clients/Makefile.am:
-        * netsvcs/lib/Makefile.am:
-        * netsvcs/servers/Makefile.am:
-        * netsvcs/Makefile.am:
-        * ASNMP/tests/Makefile.am:
-        * ASNMP/Makefile.am:
-        * ASNMP/agent/Makefile.am:
-        * ASNMP/asnmp/Makefile.am:
-        * ASNMP/examples/get/Makefile.am:
-        * ASNMP/examples/trap/Makefile.am:
-        * ASNMP/examples/Makefile.am:
-        * ASNMP/examples/set/Makefile.am:
-        * ASNMP/examples/next/Makefile.am:
-        * ASNMP/examples/walk/Makefile.am:
-        * examples/OS/Makefile.am:
-        * examples/OS/Process/Makefile.am:
-        * examples/Synch/Makefile.am:
-        * examples/Timer_Queue/Makefile.am:
-        * examples/Log_Msg/Makefile.am:
-        * examples/Misc/Makefile.am:
-        * examples/ASX/CCM_App/Makefile.am:
-        * examples/ASX/Event_Server/Transceiver/Makefile.am:
-        * examples/ASX/Event_Server/Event_Server/Makefile.am:
-        * examples/ASX/Event_Server/Makefile.am:
-        * examples/ASX/Message_Queue/Makefile.am:
-        * examples/ASX/UPIPE_Event_Server/Makefile.am:
-        * examples/ASX/Makefile.am:
-        * examples/Web_Crawler/Makefile.am:
-        * examples/Shared_Malloc/Makefile.am:
-        * examples/QOS/Change_Sender_TSpec/Makefile.am:
-        * examples/QOS/Diffserv/Makefile.am:
-        * examples/QOS/Simple/Makefile.am:
-        * examples/QOS/Change_Receiver_FlowSpec/Makefile.am:
-        * examples/Bounded_Packet_Relay/Makefile.am:
-        * examples/System_V_IPC/SV_Message_Queues/Makefile.am:
-        * examples/System_V_IPC/Makefile.am:
-        * examples/System_V_IPC/SV_Semaphores/Makefile.am:
-        * examples/Map_Manager/Makefile.am:
-        * examples/APG/Svc_Config/Makefile.am:
-        * examples/APG/ThreadSafety/Makefile.am:
-        * examples/APG/ThreadPools/Makefile.am:
-        * examples/APG/Active_Objects/Makefile.am:
-        * examples/APG/Logging/Makefile.am:
-        * examples/APG/Misc_IPC/Makefile.am:
-        * examples/APG/Proactor/Makefile.am:
-        * examples/APG/Threads/Makefile.am:
-        * examples/APG/Shared_Memory/Makefile.am:
-        * examples/APG/Reactor/Makefile.am:
-        * examples/APG/Signals/Makefile.am:
-        * examples/APG/Timers/Makefile.am:
-        * examples/APG/ThreadManagement/Makefile.am:
-        * examples/APG/Config/Makefile.am:
-        * examples/APG/Containers/Makefile.am:
-        * examples/APG/Processes/Makefile.am:
-        * examples/APG/Naming/Makefile.am:
-        * examples/APG/Makefile.am:
-        * examples/APG/Sockets/Makefile.am:
-        * examples/APG/Streams/Makefile.am:
-        * examples/Registry/Makefile.am:
-        * examples/Smart_Pointers/Makefile.am:
-        * examples/DLL/Makefile.am:
-        * examples/IPC_SAP/DEV_SAP/reader/Makefile.am:
-        * examples/IPC_SAP/DEV_SAP/Makefile.am:
-        * examples/IPC_SAP/DEV_SAP/writer/Makefile.am:
-        * examples/IPC_SAP/FILE_SAP/Makefile.am:
-        * examples/IPC_SAP/SOCK_SAP/Makefile.am:
-        * examples/IPC_SAP/SPIPE_SAP/Makefile.am:
-        * examples/IPC_SAP/ATM_SAP/Makefile.am:
-        * examples/IPC_SAP/SSL_SAP/Makefile.am:
-        * examples/IPC_SAP/UPIPE_SAP/Makefile.am:
-        * examples/IPC_SAP/FIFO_SAP/Makefile.am:
-        * examples/IPC_SAP/Makefile.am:
-        * examples/IPC_SAP/TLI_SAP/Makefile.am:
-        * examples/Logger/Acceptor-server/Makefile.am:
-        * examples/Logger/Makefile.am:
-        * examples/Logger/simple-server/Makefile.am:
-        * examples/Logger/client/Makefile.am:
-        * examples/Export/Makefile.am:
-        * examples/Service_Configurator/Makefile.am:
-        * examples/Service_Configurator/IPC-tests/server/Makefile.am:
-        * examples/Service_Configurator/IPC-tests/Makefile.am:
-        * examples/Service_Configurator/IPC-tests/client/Makefile.am:
-        * examples/Service_Configurator/Misc/Makefile.am:
-        * examples/IOStream/server/Makefile.am:
-        * examples/IOStream/Makefile.am:
-        * examples/IOStream/client/Makefile.am:
-        * examples/Threads/Makefile.am:
-        * examples/Shared_Memory/Makefile.am:
-        * examples/Reactor/Ntalker/Makefile.am:
-        * examples/Reactor/TP_Reactor/Makefile.am:
-        * examples/Reactor/FIFO/Makefile.am:
-        * examples/Reactor/Multicast/Makefile.am:
-        * examples/Reactor/WFMO_Reactor/Makefile.am:
-        * examples/Reactor/Proactor/Makefile.am:
-        * examples/Reactor/Makefile.am:
-        * examples/Reactor/Dgram/Makefile.am:
-        * examples/Reactor/Misc/Makefile.am:
-        * examples/Connection/non_blocking/Makefile.am:
-        * examples/Connection/blocking/Makefile.am:
-        * examples/Connection/Makefile.am:
-        * examples/Connection/misc/Makefile.am:
-        * examples/NT_Service/Makefile.am:
-        * examples/Naming/Makefile.am:
-        * examples/Makefile.am:
-        * examples/Mem_Map/IO-tests/Makefile.am:
-        * examples/Mem_Map/file-reverse/Makefile.am:
-        * examples/Mem_Map/Makefile.am:
-        * examples/C++NPv1/Makefile.am:
-        * examples/C++NPv2/Makefile.am:
-
-          Regenerated.
-
-Wed Nov 22 13:45:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Update for HTBP unit test and TMCast example move.
-
-        * protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc:
-        * protocols/tests/HTBP/Reactor_Tests/client.cpp:
-        * protocols/tests/HTBP/Reactor_Tests/inside.conf:
-        * protocols/tests/HTBP/Reactor_Tests/server.cpp:
-        * protocols/tests/HTBP/Reactor_Tests/Makefile.am:
-        * protocols/tests/HTBP/Reactor_Tests/test_config.h:
-        * protocols/tests/HTBP/Reactor_Tests/run_test.pl:
-        * protocols/tests/HTBP/HTBP_Config.conf:
-        * protocols/tests/HTBP/Send_Large_Msg/client.cpp:
-        * protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc:
-        * protocols/tests/HTBP/Send_Large_Msg/server.cpp:
-        * protocols/tests/HTBP/Send_Large_Msg/Makefile.am:
-        * protocols/tests/HTBP/Send_Large_Msg/run_test.pl:
-        * protocols/tests/HTBP/Makefile.am:
-        * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc:
-        * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am:
-        * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp:
-        * protocols/tests/HTBP/htbptest.mpb:
-        * protocols/tests/HTBP/ping/client.cpp:
-        * protocols/tests/HTBP/ping/server.cpp:
-        * protocols/tests/HTBP/ping/Makefile.am:
-        * protocols/tests/HTBP/ping/ping.mpc:
-        * protocols/tests/HTBP/ping/run_test.pl:
-        * protocols/tests/HTBP/README:
-
-          Move HTBP unit tests to protocols/tests/HTBP...
-
-        * tests/HTBP/Reactor_Tests/Reactor_Tests.mpc:
-        * tests/HTBP/Reactor_Tests/client.cpp:
-        * tests/HTBP/Reactor_Tests/inside.conf:
-        * tests/HTBP/Reactor_Tests/server.cpp:
-        * tests/HTBP/Reactor_Tests/Makefile.am:
-        * tests/HTBP/Reactor_Tests/test_config.h:
-        * tests/HTBP/Reactor_Tests/run_test.pl:
-        * tests/HTBP/HTBP_Config.conf:
-        * tests/HTBP/Send_Large_Msg/client.cpp:
-        * tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc:
-        * tests/HTBP/Send_Large_Msg/server.cpp:
-        * tests/HTBP/Send_Large_Msg/Makefile.am:
-        * tests/HTBP/Send_Large_Msg/run_test.pl:
-        * tests/HTBP/Makefile.am:
-        * tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc:
-        * tests/HTBP/Send_Recv_Tests/Makefile.am:
-        * tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp:
-        * tests/HTBP/htbptest.mpb:
-        * tests/HTBP/ping/client.cpp:
-        * tests/HTBP/ping/server.cpp:
-        * tests/HTBP/ping/Makefile.am:
-        * tests/HTBP/ping/ping.mpc:
-        * tests/HTBP/ping/run_test.pl:
-        * tests/HTBP/README:
-
-          ...from tests/HTBP.
-
-        * protocols/examples/TMCast/Member/Member.mpc:
-        * protocols/examples/TMCast/Member/member.cpp:
-        * protocols/examples/TMCast/Member/Makefile.am:
-        * protocols/examples/TMCast/Member/README:
-        * protocols/examples/TMCast/Makefile.am:
-
-          Moved TMCast examples to protocols/examples/TMCast...
-
-        * examples/TMCast/Member/Member.mpc:
-        * examples/TMCast/Member/member.cpp:
-        * examples/TMCast/Member/Makefile.am:
-        * examples/TMCast/Member/README:
-        * examples/TMCast/Makefile.am:
-
-          ...from examples/TMCast.
-
-Wed Nov 22 13:25:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ace_for_tao.mpc:
-          Add uuid as base project. For building COIOP as part of the
-          TAO strategies library we need uuid. The nicest solution would
-          be to make the uuid feature dependent on the ace_for_tao
-          feature and let the user overrule this but that is not
-          possible yet. If you are using ace_for_tao and don't want
-          to have uuid pulled in, set uuid explicitly to 0 in your
-          default.features file.
-
-Wed Nov 22 10:48:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Log_Msg.cpp:
-          Refactored handling of %W. Added a check for a nill pointer
-          as we have for ascii strings. Fixes bugzilla 2277.
-
-        * tests/Log_Msg_Test.cpp:
-          Added test for %W with a string as argument and with a
-          nill pointer. Fixes bugzilla 2715.
-
-Wed Nov 22 10:38:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Misc/test_XtReactor1.cpp:
-        * examples/Misc/test_XtReactor2.cpp:
-        * tests/FlReactor_Test.cpp:
-        * tests/XtReactor_Test.cpp:
-        * tests/TkReactor_Test.cpp:
-        * tests/QtReactor_Test.cpp:
-          Updated because of move below.
-
-Wed Nov 22 10:35:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/QtReactor*.*:
-        * ace/FlReactor*.*:
-        * ace/XtReactor*.*:
-        * ace/TkReactor*.*:
-          Moved these reactors to their own subdirectories to make
-          maintenance a lot easier.
-
-Wed Nov 22 10:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/core_anytypecode.mpb:
-          Removed svn:executable property
-
-        * bin/MakeProjectCreator/config/core_strategies.mpb
-          New base project for the strategies library when build in
-          ace_for_tao configuration
-
-        * bin/MakeProjectCreator/config/orbsvcslib.mpb:
-          Removed -GT so that we also don't generate TIE files for the
-          orbsvcs anymore. Will speedup builds and simplify other mpc
-          files
-
-        * bin/MakeProjectCreator/config/strategies.mpb
-          Derive from core_strategies. Now the strategies library
-          does get build in an ace_for_tao configuration but
-          shmiop and uiop are not build at all, other protocols
-          can be build. This way we can build COIOP in an ace_for_tao
-          setup
-
-        * bin/make_release:
-          Removed dsp/dsw reference, corrected naming of the ACE
-          packages when the version number gets added.
-
-        * include/makeinclude/platform_hpux_aCC.GNU:
-          Removed HPUX 10.20 support
-
-        * include/makeinclude/platform_lynxos.GNU:
-          ACE_HAS_BROKEN_THREAD_KEYFREE is now set in the config file
-
-        * include/makeinclude/wrapper_macros.GNU:
-          Removed ACE_HAS_GNUG_PRE_2_8 checks
-
-Wed Nov 22 09:07:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/run_test.txt:
-          Document ACE_RUN_VX_TGT_HOST
-
-        * docs/bczar/bczar.html:
-          Updated this file
-
-        * ace/config-freebsd.h:
-        * ace/POSIX_Proactor.cpp:
-          Added ACE_HAS_SIGVAL_SIGVAL_INT, this fixes bugzilla
-          bug 2716. Thanks to Craig Rodrigues
-          <rodrigc at crodrigues dot org> for reporting this.
-
-        * ace/ace.mpc:
-          Added missing OS.inl. This fixes bugzilla bug 2705.
-          Thanks to Daniel Black <dragonheart at gentoo dot org>
-          for reporting this.
-
-        * Release:
-          Removed dsw files
+        * bin/fuzz.pl:
+          Removed checks for emulated exception macros
 
-        * ace/config-rtems.h:
-        * ace/config-posix-nonetworking.h:
-          Moved the configuration to build without no networking
-          support to its own file so that we can reuse this for
-          example on linux
+        * examples/Export/run_test.pl:
+          Use ACE_ROOT
 
-        * ace/config-rtems.h:
-          Added support for rtems 4.7
-
-        * ace/config-unixware-7.1.0.udk.h:
-          Cleanup
+        * examples/Misc/test_read_buffer.cpp:
+          Initialise pointer with 0
 
-        * ace/config-lyxos.h:
-          Added support for LynxOS 4.2
+        * include/makeinclude/platform_mvs.GNU:
+          Improved support
 
-        * ace/config-linux.h:
-        * ace/config-linux-common.h:
-          Moved ACE_HAS_GETIFADDRS to the common file and added
-          support for ACE_LACKS_NETWORKING on linux
+        * netsvcs/servers/servers.mpc:
+          Simplified
 
-        * ace/INET_Addr.cpp:
-        * ace/OS_NS_netdb.cpp
-          Fixed compile problem when using ACE_LACKS_NETWORKING on
-          linux
+        * performance-tests/UDP/udp_test.cpp:
+        * tests/Cached_Allocator_Test.cpp:
+        * tests/Env_Value_Test.cpp:
+        * tests/Handle_Set_Test.cpp:
+          Removed ACE_LACKS_FLOATING_POINT check
 
-        * ace/Obstack.h:
-          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
-          on FC6. Thanks to Ken Sedgwick <ken at bonsai dot com> for
-          reporting this and testing out the patch.
+        * tests/Thread_Creation_Threshold_Test.cpp:
+          Added missing \n
 
-        * ace/OS_NS_string.inl:
-          Initialise pointer with 0
+Mon Jan 22 23:14:56 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-Mon Nov 20 08:16:34 2006  Simon McQueen  <sm@prismtech.com>
+        * ACE version 5.5.5 released.
 
-        * ACE version 5.5.4 released.
 
 Local Variables:
 mode: change-log
diff --git a/ACE/ChangeLogs/ChangeLog-07a b/ACE/ChangeLogs/ChangeLog-07a
new file mode 100644
index 00000000000..b70a051d787
--- /dev/null
+++ b/ACE/ChangeLogs/ChangeLog-07a
@@ -0,0 +1,3198 @@
+Mon Jan 22 23:14:56 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ACE version 5.5.5 released.
+
+Thu Jan 18 16:45:31 UTC 2007  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/README: Added ACE_HAS_EBCDIC.  
+  
+        * ace/Codeset_IBM1047.{h,cpp}: Changed ACE_MVS to ACE_HAS_EBCDIC
+          in these files so that EBCDIC support can be enabled for non-MVS
+          platforms.  Thanks to Harry Goldschmitt <harry at hgac dot com>
+          for this suggestion.
+
+Fri Jan 19 12:35:42 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl should not run
+          when built as ACE_FOR_TAO.
+
+Thu Jan 18 19:22:41 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * NEWS:
+
+          Documented this change.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Provide a __prebuild__ target that performs the prebuild step or
+          nothing if a prebuild step wasn't supplied.
+
+        * include/makeinclude/rules.common.GNU:
+
+          Added the __prebuild__ target to the front of the all
+          dependencies.
+
+          This change fixes Bugzilla #2713.
+
+Wed Jan 17 15:55:06 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+          Making sure the Transport::Current tests are not ran when the
+          functionality is disabled.
+
+Wed Jan 17 15:10:12 UTC 2007  Johnny willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-g++-common.h:
+          Make sure that we don't set visibility for singletons
+          when visibility is turned off completely
+
+Wed Jan 17 12:20:57 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/PerlACE/Run_Test.pm:
+
+          Added a function to check for the privileges required to set
+          thread priority on HP-UX.  For all other platforms, it is a noop.
+
+Tue Jan 16 21:00:20 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.cpp:
+
+          Fixing a memory leak of a gestalt instance, caused by an
+          incorrect re-initialization.
+
+Mon Jan 15 21:54:47 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/SOCK_Stream.h: Corrected Doxygen tags.
+
+Mon Jan 15 10:15:47 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-rtems.h:
+          Improved rtems 4.7 support
+
+Fri Jan 12 20:09:47 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-g++-common.h:
+          Fixed incorrect macro
+
+Thu Jan 11 21:42:47 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Message_Block.h: Comment typos.
+        * ace/SOCK_Stream.h: Corrected documentation for what the
+          _n() variants do with timeouts.
+
+Thu Jan 11 15:27:27 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * docs/ACE-guidelines.html:
+          Fixed formatting.
+
+Wed Jan 10 20:31:52 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * docs/ACE-guidelines.html:
+          Added some text making explicit the use of "#if defined (FOO)"
+          rather than "#if FOO" so as to avoid trouble with Doxygen.
+
+Wed Jan 10 16:08:32 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/CDR_Array_Test.cpp:
+
+          Added a work-around for an issue with gcc 4.1.1 (and possibly
+          later versions) where certain variables are optimized away while
+          they are still needed.
+
+Wed Jan 10 15:19:02 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * NEWS: Noted that Windows 95, 98, Me, etc. prior to NT4 SP2 are
+          no longer supported. The code for this is described at
+          Sat Jan  6 00:06:52 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ACE-INSTALL.html: Corrected Pharlap references.
+
+Wed Jan 10 14:16:04 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/svn/config:
+        * docs/svn/svn-prefs.reg:
+          Added .vxe to global ignore list
+
+Wed Jan 10 11:40:04 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Don't run 1482 with VxWorks RTP
+
+Wed Jan 10 07:55:04 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Reverted my change below. It worked in terms that it compiled on
+        all platforms but it resulted in a big footprint increase (about 1.5%)
+        for a full application and that is just too much.
+
+        Tue Jan  9 11:21:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/String_Base.cpp:
+        * ace/String_Base.h:
+          Moved the members of String_Base_Const to String_Base and
+          removed String_Base_Const
+
+        * ace/String_Base_Const.cpp:
+        * ace/String_Base_Const.h:
+          Remove String_Base_Const. It was there as workaround for an old
+          sun compiler which we don't support anymore. Fixes bugzilla bug
+          2588.
+
+        * ace/ace.mpc:
+        * ace/ace_for_tao.mpc:
+        * ace/Makefile.am:
+          Removed String_Base_Const.{h,cpp}
+
+Wed Jan 10 02:01:04 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config: Added "default.features" to
+          svn:ignore property.
+
+        * tests: Re-generated the svn:ignore property.
+
+Wed Jan 10 00:22:01 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/POSIX_Proactor.cpp: Fixed some spelling and logging issues.
+
+Tue Jan  9 22:57:24 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * tests/SOCK_Send_Recv_Test.cpp: Added a check to make sure nonblocking
+          recv() works without blocking; this feature is relied on by later
+          tests, and is also the subject of a customer report.
+          Also, removed all the ACE_ASSERTS - tests should never do asserts.
+          It kills the program without any legit idea of what went on, and they
+          disappear in Release builds.
+
+Tue Jan  9 15:36:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Msg.cpp:
+        * ace/Thread_Manager.{h,cpp,inl}:
+          Removed ACE_USE_ONESHOT_AT_THREAD_EXIT checks, that define
+          is not set in any config file
+
+Tue Jan  9 14:17:50 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/msvc_static_order.lst:
+
+          Added TAO/tao/TC to the end of the TAO library list.
+
+Tue Jan  9 12:47:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Record.cpp:
+          Const improvement and initialise pointer with 0
+
+        * ace/Process_Manager.h:
+          Doxygen improvements
+
+        * ace/String_Base.cpp:
+          Added missing typename to get the npos compiling with all compilers
+
+Tue Jan  9 11:21:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/String_Base.cpp:
+        * ace/String_Base.h:
+          Moved the members of String_Base_Const to String_Base and
+          removed String_Base_Const
+
+        * ace/String_Base_Const.cpp:
+        * ace/String_Base_Const.h:
+          Remove String_Base_Const. It was there as workaround for an old
+          sun compiler which we don't support anymore. Fixes bugzilla bug
+          2588.
+
+        * ace/ace.mpc:
+        * ace/ace_for_tao.mpc:
+        * ace/Makefile.am:
+          Removed String_Base_Const.{h,cpp}
+
+Tue Jan  9 09:11:44 UTC 2007  Krishnakumar B  <kitty@dre.vanderbilt.edu>
+
+        * docs/svn/config (enable-auto-props):
+        * docs/svn/svn-prefs.reg:
+
+          Added .clo to the list of extensions that we want metadata to be
+          associated with.  Fixed a bunch of unmatched quotes in
+          svn-prefs.reg, and updated the mime-type of pdf to be
+          application/pdf as opposed to application/postscript.
+
+Tue Jan  9 08:12:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Msg.cpp:
+          Initialise pointers with 0
+
+        * ace/config-hpux-11.00.h:
+          Fixed defines to work with wchar builds
+
+Tue Jan  9 03:46:14 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Add ACE_LACKS_STRNLEN_PROTOTYPE feature test.
+
+Mon Jan  8 19:55:31 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/SString.cpp:
+
+          When creating a substring, only allocate the ACE_SString in the
+          return statement to avoid needless memory allocation and possibly
+          leaking memory.
+
+        * tests/SString_Test.cpp:
+
+          Specialized memory cleanup for the particular usage pattern of
+          ACE_SString near the end of the test.
+
+Mon Jan  8 19:48:50 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-lite.h (ACE_DECLARE_STL_REVERSE_ITERATOR): The
+          non-standard declaration is only needed on Windows when VC7.1
+          and the 64-bit SDK are used.
+
+Mon Jan  8 18:54:55 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_1890_Regression_Test.cpp:
+        * tests/Bug_2540_Regression_Test.cpp:
+
+          Reverted my previous changes where the ACE_Select_Reactor was
+          explicitly chosen.  The bug reports specifically talk about the
+          select reactor, but they actually apply to others as well.
+
+Mon Jan  8 18:50:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/os_string.h:
+          Added ACE_LACKS_STRNLEN_PROTOTYPE to define strnlen prototype,
+          seems to lack with RedHat 6.2 Thanks to Nelson Filipe Ferreira Gonçalves
+          <ngoncalves at isr dot ist dot utl dot pt> for delivering the
+          autoconf log
+
+        * ace/config-linux-common.h:
+          Glibc 2.1 and lower don't have a strnlen prototype
+
+Mon Jan  8 18:43:36 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_2540_Regression_Test.cpp:
+
+          This test had the same problem as Bug_1890_Regression_Test.cpp.
+          Explicitly use the ACE_Select_Reactor.
+
+Mon Jan  8 17:58:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_1890_Regression_Test.cpp:
+
+          Bug 1890 is specifically targeted for the Select Reactor.  So,
+          instead of relying on ACE_Reactor::instance() being an
+          ACE_Select_Reactor, explicitly use the ACE_Select_Reactor impl.
+          This will fix this test on Windows.
+
+Mon Jan  8 16:51:55 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * tests/Bug_2368_Regression_Test.cpp:
+
+          Improved the test output to show the failure caused by the
+          unresolved bug is expected.
+
+Mon Jan  8 13:48:17 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/APG/Logging/Trace.h:
+
+          Undefine TRACE before defining it to avoid warnings from vc71.
+
+Mon Jan  8 12:41:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/TP_Reactor.cpp:
+          Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT in the constructors
+
+Mon Jan  8 12:00:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Select_Reactor_T.cpp:
+          Const improvement
+
+        * ace/Select_Reactor_T.h :
+          Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT in the constructors
+
+Mon Jan  8 11:23:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Select_Reactor_T.h (open):
+          Also use ACE_DISABLE_NOTIFY_PIPE_DEFAULT as default for disable_notify_pipe
+
+        * ace/Select_Reactor_T.h:
+          Doxygen improvements
+
+Mon Jan  8 10:45:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Select_Reactor_Base.h:
+          Doxygen improvements
+
+        * ace/Select_Reactor_Base.h:
+          Changed the way we set the default for the
+          ACE_Select_Reactor_Notify::open call, instead of just hardcoding
+          the default 0, use the ACE_DISABLE_NOTIFY_PIPE_DEFAULT define
+          which is set by default to 0, but which we can set from a
+          config file to 1 to disable the notification pipe.
+
+        * ace/config-posix-nonetworking.h:
+          Set ACE_DISABLE_NOTIFY_PIPE_DEFAULT to 1. The notification pipe
+          doesn't work when networking is fully disabled.
+
+Mon Jan  8 00:10:52 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Adding "!MINIMUM" for the TransportCurrent tests, since it
+          precludes the use of the TC functionality.
+
+Sun Jan  7 19:02:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-hpux-11.00.h:
+          Don't set ACE_SIZEOF_WCHAR, let Basic_Types just do this. Fixes
+          the difference between ACE_SIZEOF_WCHAR and sizeof(wchar_t) on
+          the HP aCC test on the IA64 aCC build which runs on the Sep 2006
+          version of HPUX
+
+Sat Jan  6 04:41:30 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * include/makeinclude/macros.GNU:
+        * include/makeinclude/rules.common.GNU:
+        * include/makeinclude/rules.local.GNU:
+
+          Added new phony target, "svnignore", which takes a good guess at
+          what files are generated in a directory and adds them to
+          svn:ignore property on the containing directory.
+
+        * apps/gperf/src:
+        * apps/gperf/tests:
+        * bin:
+        * examples/APG/Active_Objects:
+        * examples/APG/Config:
+        * examples/APG/Containers:
+        * examples/APG/Logging:
+        * examples/APG/Misc_IPC:
+        * examples/APG/Naming:
+        * examples/APG/Proactor:
+        * examples/APG/Processes:
+        * examples/APG/Reactor:
+        * examples/APG/Shared_Memory:
+        * examples/APG/Signals:
+        * examples/APG/Sockets:
+        * examples/APG/Streams:
+        * examples/APG/Svc_Config:
+        * examples/APG/ThreadManagement:
+        * examples/APG/ThreadPools:
+        * examples/APG/ThreadSafety:
+        * examples/APG/Threads:
+        * examples/APG/Timers:
+        * examples/ASX:
+        * examples/ASX/CCM_App:
+        * examples/ASX/Message_Queue:
+        * examples/Bounded_Packet_Relay:
+        * examples/C++NPv1:
+        * examples/C++NPv2:
+        * examples/Connection/blocking:
+        * examples/Connection/misc:
+        * examples/Connection/non_blocking:
+        * examples/DLL:
+        * examples/Export:
+        * examples/IOStream/client:
+        * examples/IOStream/server:
+        * examples/IPC_SAP/ATM_SAP:
+        * examples/IPC_SAP/DEV_SAP/reader:
+        * examples/IPC_SAP/DEV_SAP/writer:
+        * examples/IPC_SAP/FIFO_SAP:
+        * examples/IPC_SAP/FILE_SAP:
+        * examples/IPC_SAP/SOCK_SAP:
+        * examples/IPC_SAP/SPIPE_SAP:
+        * examples/IPC_SAP/TLI_SAP:
+        * examples/IPC_SAP/UPIPE_SAP:
+        * examples/Log_Msg:
+        * examples/Logger/Acceptor-server:
+        * examples/Logger/client:
+        * examples/Logger/simple-server:
+        * examples/Mem_Map/IO-tests:
+        * examples/Mem_Map/file-reverse:
+        * examples/Misc:
+        * examples/Naming:
+        * examples/OS/Process:
+        * examples/Reactor/Dgram:
+        * examples/Reactor/FIFO:
+        * examples/Reactor/Misc:
+        * examples/Reactor/Multicast:
+        * examples/Reactor/Ntalker:
+        * examples/Reactor/Proactor:
+        * examples/Service_Configurator/IPC-tests/client:
+        * examples/Service_Configurator/IPC-tests/server:
+        * examples/Service_Configurator/Misc:
+        * examples/Shared_Malloc:
+        * examples/Shared_Memory:
+        * examples/Smart_Pointers:
+        * examples/Synch:
+        * examples/System_V_IPC/SV_Message_Queues:
+        * examples/System_V_IPC/SV_Semaphores:
+        * examples/Threads:
+        * examples/Timer_Queue:
+        * examples/Web_Crawler:
+        * protocols/examples/RMCast/Send_Msg:
+        * protocols/examples/TMCast/Member:
+        * protocols/tests/HTBP/Reactor_Tests:
+        * protocols/tests/HTBP/Send_Large_Msg:
+        * protocols/tests/HTBP/Send_Recv_Tests:
+        * protocols/tests/HTBP/ping:
+        * protocols/tests/RMCast:
+        * tests:
+        * tests/log:
+
+          Added subversion svn:ignore properties on all these directories
+          comparable to the values previously in the vertigial .cvsignore
+          files, as well as updated them commensurate with the new svnignore
+          gnuace make target.
+
+        * apps/gperf/src/.cvsignore:
+        * apps/gperf/tests/.cvsignore:
+        * examples/APG/Active_Objects/.cvsignore:
+        * examples/APG/Config/.cvsignore:
+        * examples/APG/Containers/.cvsignore:
+        * examples/APG/Logging/.cvsignore:
+        * examples/APG/Misc_IPC/.cvsignore:
+        * examples/APG/Naming/.cvsignore:
+        * examples/APG/Proactor/.cvsignore:
+        * examples/APG/Processes/.cvsignore:
+        * examples/APG/Reactor/.cvsignore:
+        * examples/APG/Shared_Memory/.cvsignore:
+        * examples/APG/Signals/.cvsignore:
+        * examples/APG/Sockets/.cvsignore:
+        * examples/APG/Streams/.cvsignore:
+        * examples/APG/Svc_Config/.cvsignore:
+        * examples/APG/ThreadManagement/.cvsignore:
+        * examples/APG/ThreadPools/.cvsignore:
+        * examples/APG/ThreadSafety/.cvsignore:
+        * examples/APG/Threads/.cvsignore:
+        * examples/APG/Timers/.cvsignore:
+        * examples/ASX/.cvsignore:
+        * examples/ASX/CCM_App/.cvsignore:
+        * examples/ASX/Message_Queue/.cvsignore:
+        * examples/Bounded_Packet_Relay/.cvsignore:
+        * examples/C++NPv1/.cvsignore:
+        * examples/C++NPv2/.cvsignore:
+        * examples/Connection/blocking/.cvsignore:
+        * examples/Connection/misc/.cvsignore:
+        * examples/Connection/non_blocking/.cvsignore:
+        * examples/DLL/.cvsignore:
+        * examples/Export/.cvsignore:
+        * examples/IOStream/client/.cvsignore:
+        * examples/IOStream/server/.cvsignore:
+        * examples/IPC_SAP/ATM_SAP/.cvsignore:
+        * examples/IPC_SAP/DEV_SAP/reader/.cvsignore:
+        * examples/IPC_SAP/DEV_SAP/writer/.cvsignore:
+        * examples/IPC_SAP/FIFO_SAP/.cvsignore:
+        * examples/IPC_SAP/FILE_SAP/.cvsignore:
+        * examples/IPC_SAP/SOCK_SAP/.cvsignore:
+        * examples/IPC_SAP/SPIPE_SAP/.cvsignore:
+        * examples/IPC_SAP/TLI_SAP/.cvsignore:
+        * examples/IPC_SAP/UPIPE_SAP/.cvsignore:
+        * examples/Log_Msg/.cvsignore:
+        * examples/Logger/Acceptor-server/.cvsignore:
+        * examples/Logger/client/.cvsignore:
+        * examples/Logger/simple-server/.cvsignore:
+        * examples/Mem_Map/IO-tests/.cvsignore:
+        * examples/Mem_Map/file-reverse/.cvsignore:
+        * examples/Misc/.cvsignore:
+        * examples/Naming/.cvsignore:
+        * examples/OS/Process/.cvsignore:
+        * examples/Reactor/Dgram/.cvsignore:
+        * examples/Reactor/FIFO/.cvsignore:
+        * examples/Reactor/Misc/.cvsignore:
+        * examples/Reactor/Multicast/.cvsignore:
+        * examples/Reactor/Ntalker/.cvsignore:
+        * examples/Reactor/Proactor/.cvsignore:
+        * examples/Service_Configurator/IPC-tests/client/.cvsignore:
+        * examples/Service_Configurator/IPC-tests/server/.cvsignore:
+        * examples/Service_Configurator/Misc/.cvsignore:
+        * examples/Shared_Malloc/.cvsignore:
+        * examples/Shared_Memory/.cvsignore:
+        * examples/Smart_Pointers/.cvsignore:
+        * examples/Synch/.cvsignore:
+        * examples/System_V_IPC/SV_Message_Queues/.cvsignore:
+        * examples/System_V_IPC/SV_Semaphores/.cvsignore:
+        * examples/Threads/.cvsignore:
+        * examples/Timer_Queue/.cvsignore:
+        * examples/Web_Crawler/.cvsignore:
+        * protocols/examples/TMCast/Member/.cvsignore:
+        * protocols/tests/HTBP/Reactor_Tests/.cvsignore:
+        * protocols/tests/HTBP/Send_Large_Msg/.cvsignore:
+        * protocols/tests/HTBP/Send_Recv_Tests/.cvsignore:
+        * protocols/tests/HTBP/ping/.cvsignore:
+        * tests/.cvsignore:
+        * tests/log/.cvsignore:
+
+          Removed these files in favor of svn:ignore properties on the
+          parent directory.
+
+Sat Jan  6 00:06:52 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-WinCE.h: Removed the ACE_HAS_WINNT4 stuff.
+
+        * ace/config-pharlap.h: Removed the ACE_HAS_WINNT4 stuff and added
+          ACE_LACKS_WIN32_SECURITY_DESCRIPTORS and ACE_LACKS_WIN32_MOVEFILEEX.
+          Added ACE_HAS_IP_MULTICAST.
+          Thanks to David Hauck for helping with these changes.
+
+        * ace/config-lite.h: Removed another vestige of MSVC 6 support.
+
+        * ace/Default_Constants.h:
+        * ace/config-win32-common.h: Moved the Win32 ACE_DEFAULT_FILE_PERMS
+          settings to config-win32-common.h
+          Also removed all the pre-NT4 stuff from config-win32-common.h.
+
+        * ace/Asynch_Acceptor.{h cpp}:
+        * ace/Asynch_IO.{h cpp}:
+        * ace/Asynch_IO_Impl.{h cpp}:
+        * ace/Message_Queue.{h cpp inl}:
+        * ace/Message_Queue_T.{h cpp}:
+        * ace/Proactor.{h cpp}:
+        * ace/Proactor_Impl.{h cpp}:
+        * ace/WIN32_Asynch_IO.{h cpp}:
+        * ace/WIN32_Proactor.{h cpp}:
+          ACE_Message_Queue_NT and ACE_Asynch_IO switched from using
+          ACE_HAS_WINNT4==1 and maybe some other platforms to using the new
+          ACE_HAS_WIN32_OVERLAPPED_IO setting. It's now incumbent on the
+          config maintainer to keep config-win32-*.h, config-WinCE.h,
+          config-pharlap.h, etc. up to date on these features as the
+          various versions do or don't support them.
+
+        * ace/config-win32-mingw.h: Removed ACE_HAS_WINNT4 section.
+
+        * ace/Configuration.cpp (ACE_Configuration_Win32Registry::remove_section):
+          Removed the pre-NT4 section that checked for non-empty section.
+
+        * ace/Mem_Map.cpp: Removed all the support for ACE_USE_MAPPING_NAME
+          since it was used only for pre-NT4 Windows.
+
+        * ace/Msg_WFMO_Reactor.cpp (wait_for_multiple_events): Removed the
+          pre-NT4 code block that switched to MsgWaitForMultipleObjectsEx.
+          All Win platforms without ACE_LACKS_MSG_WMFO can do this now.
+
+        * ace/OS_NS_stdio.inl (rename):
+        * tests/OS_Test.cpp: The ability to rename a file to one that exists
+          without removing the 'to' file first is now detected by the new
+          feature macro ACE_LACKS_WIN32_MOVEFILEEX instead of ACE_HAS_WINNT4.
+
+        * ace/OS_NS_unistd.cpp (pread, pwrite): The Windows code that can do
+          overlapped is now built based on ACE_HAS_WIN32_OVERLAPPED_IO instead
+          of ACE_HAS_WINNT4.
+
+        * ace/Pagefile_Memory_Pool.cpp: Setting up a security descriptor for
+          the file mapping is now determined by the lack of
+          ACE_LACKS_WIN32_SECURITY_DESCRIPTORS, not ACE_HAS_WINNT4.
+
+        * ace/README: Added descriptions for ACE_HAS_WIN32_OVERLAPPED_IO,
+          ACE_HAS_WIN32_NAMED_PIPES, ACE_LACKS_WIN32_SECURITY_DESCRIPTORS,
+          ACE_LACKS_WIN32_MOVEFILEEX.
+
+        * ace/Sock_Connect.cpp: Removed all the code that rummaged through
+          the registry looking for net interfaces on Windows. Getting
+          interface info now requires WinCE, Pharlap, or Winsock2. This removes
+          support for Win95, Win98, etc.
+
+        * ace/SPIPE_Acceptor.{cpp h} (ACE_SPIPE_Acceptor): Now useable on
+          Windows when ACE_HAS_WIN32_NAMED_PIPES is set, not ACE_HAS_WINNT4.
+          Similar to above with ACE_HAS_WIN32_OVERLAPPED_IO - config
+          maintainers need to manage this setting.
+
+        * ace/OS_NS_Thread.cpp (sched_params): Fix mis-aligned #if block
+          for ACE_HAS_PHARLAP_RT. Also, for scope == ACE_SCOPE_PROCESS, return
+          -1, ENOTSUP for Pharlap; it doesn't have SetPriorityClass().
+
+        * ACE-INSTALL.html: Removed mention of ACE_HAS_WINNT4 and building
+          for Win95/98/Me - ACE now requires WinNT 4 or later.
+          Updated the information for building for Pharlap ETS.
+
+        * tests/CDR_File_Test.cpp:
+        * tests/Svc_Handler_Test.cpp: Removed the check for NT4 or better when
+          setting TEST_CAN_UNLINK_IN_ADVANCE. VxWorks is the only case
+          remaining where this needs to be set.
+
+        * tests/Malloc_Test.cpp: Removed the Win NT4 case checks for setting
+          ACE_TEST_REMAP_ON_FAULT; Win9x is no longer supported. Also, when
+          deciding address ranges for testing, decide at run time based on
+          GetVersionInfo() on Windows, not on preprocessor checks.
+
+        * tests/Message_Queue_Test.cpp: Use ACE_HAS_WIN32_OVERLAPPED_IO to
+          decide whether or not to test ACE_Message_Queue_NT.
+
+        * tests/Proactor_Scatter_Gather_Test.cpp: Decide whether or not to
+          run this test based on ACE_HAS_WIN32_OVERLAPPED_IO instead of
+          ACE_HAS_WINNT4.
+
+        * ace/Proactor_Timer_Test.cpp: Run this test on Windows based on
+          ACE_HAS_WIN32_OVERLAPPED_IO instead of !ACE_HAS_WINCE.
+
+        * tests/SPIPE_Test.cpp:
+        * tests/UPIPE_SAP_Test.cpp: Manage which features to test on Windows
+          based on ACE_HAS_WIN32_NAMED_PIPES instead of ACE_HAS_WINNT4.
+
+        * ace/Dev_Poll_Reactor.cpp: Fixed spelling error in a comment.
+
+Fri Jan  5 21:46:16 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
+
+        * ace/Process.cpp:
+
+         Improved the implementation of ACE_Process_Options::setenv(...)
+         to address the potential buffer overflow when invoking
+         sprintf and/or vsprintf. This fixes bug 2660 and 2762. More
+         discussions have been accumulated in RT 9198.
+
+Fri Jan  5 19:06:17 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/msvc_static_order.lst:
+
+          Added project names to correct the build order for
+          TAO/tests/Collocation and TAO/tests/TransportCurrent.
+
+Fri Jan  5 14:03:12 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * apps/JAWS2/HTTPU/http_headers.h:
+
+          For the sake of compiling on HP-UX, #undef SERVER if it's defined.
+
+Fri Jan  5 13:34:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_stdio.cpp:
+        * ace/config-hpux-11.00.h:
+          Disable ACE_HAS_VFWPRINTF again for HPUX, takes more time,
+          something for the future
+
+Fri Jan  5 13:15:16 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/INET_Addr.cpp:
+
+          Replaced #if ACE_HAS_IPV6 with #if defined () to avoid confusing
+          doxygen.
+
+Fri Jan  5 12:59:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Manual_Event_Test.cpp:
+          Removed n_iterations variable, it is not used at all
+
+Fri Jan  5 12:44:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_stdio.cpp:
+          When ACE_HAS_WCHAR is defined include os_wchar.h to get the
+          wchar methods which is needed on for example HPUX
+
+        * ace/config-linux-common.h:
+        * ace/config-vxworks6.2.h:
+        * ace/config-vxworks6.3.h:
+        * ace/config-vxworks6.4.h:
+          Added ACE_HAS_VFWPRINTF
+
+        * ace/config-win32-common.h:
+          Removed ACE_HAS_VSWPRINTF, isn't used anymore
+
+Fri Jan  5 11:09:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-hpux-11.00.h:
+          Moved ACE_SIZEOF_LONG outside the aCC specific block, this is
+          also needed with GCC
+
+Fri Jan  5 10:40:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Thread_Creation_Threshold_Test.cpp:
+          Removed not needed semicolon after namespace closure
+
+Fri Jan  5 10:30:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * contrib/minizip/unzip.c:
+        * contrib/minizip/zip.c:
+          Fixed unitialized warnings
+
+Fri Jan  5 10:04:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-g++-common.h:
+          A change related to my commit of:
+          Thu Jan  4 08:55:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+          With FC6 a bug in GCC has been fixed. This is then fixed in
+          GCC 4.1.1 but only in the RedHat codebase, not in other
+          GCC 4.x compilers. The HP GCC 4.1.1 compiler hasn't this
+          fix but also the SuSE 10.2 GCC 4.1.2 compiler has not this
+          fix. We assume at this moment that GCC 4.2 will have this
+          fix. If you have FC6 you must add the following define to
+          your config.h file:
+          ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
+
+Fri Jan  5 07:05:18 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
+
+          Remove "-Ge 1" from initial TAO_IDLFLAGS definition.
+
+Fri Jan  5 03:34:00 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/INET_Addr.cpp:
+
+          Refactored the addr_to_string() method to format numeric IPv6
+          addresses using [addr]:port to disambiguate addresses such as
+          [fe80::1:2:3]:12345. This should be benign as string_to_addr()
+          already parses [ipv6addr]:port formatted strings.
+
+Fri Jan  5 00:51:22 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/INET_Addr.h:
+        * ace/INET_Addr.inl:
+
+          Added a new method, is_multicast(), to assist applications in
+          determining if the inet address is or is not a multicast address
+          regardless of it being an IPv4 or IPv6 format.
+
+        * ace/Timer_Queue_Adapters.cpp:
+
+          Fixed a bug in
+          ACE_Async_Timer_Queue_Adapter<TQ>::schedule_ualarm() wherein the
+          time value for the alarm was computed using
+          ACE_OS::gettimeofday() rather than using the timer queue's
+          gettimeofday implementation. Thus situations where an alternate
+          time source were used, the scheduled alarm would be wrong.
+
+Thu Jan  4 15:51:41 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * tests/Thread_Creation_Threshold_Test.cpp: Changed name of
+          anonymous namespace constant from DEBUG to PRINT_DEBUG_MSGS to
+          avoid potential conflicts with #defines.  This should clean up
+          at least one Windows build, and possibly others as well.
+
+Thu Jan  4 15:33:08 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Check <sys/time.h> instead of <time.h> for gettimeofday()
+          prototype.  Also use AC_CHECK_DECL instead of AC_EGREP_CPP.
+          This fixes bugzilla bug 2764.
+
+Thu Jan  4 13:53:33 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ACEXML/tests/Makefile.am:
+        * ACEXML/tests/util/Makefile.am:
+        * ACEXML/apps/svcconf/Makefile.am:
+        * ACEXML/common/Makefile.am:
+        * ACEXML/examples/SAXPrint/Makefile.am:
+
+          Tweak to use ACE_{ZLIB,ZZIP}_{CPPFLAGS,LDFLAGS,LIBS}
+          instead of -I${ZLIB_ROOT}/include, etc.  The former
+          are substituted by the configure script.
+
+        * m4/ace.m4:
+
+          Add ACE_PATH_ZLIB and ACE_PATH_ZZIP autoconf macros.
+          zlib and zzip can now be enabled at configure time
+          with --with-zlib and --with-zzip.
+
+Thu Jan  4 12:45:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/Basic_Stats.cpp:
+        * ace/Parse_Node.cpp:
+        * ace/Sample_History.cpp:
+        * ace/Service_Repository.cpp:
+
+          Remove build warnings when ACE_NLOGGING is defined.
+
+Thu Jan  4 08:55:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-g++-common.h:
+          With gcc 4.{0,1} we couldn't use visibility attributes for singletons
+          because of a bug in GCC. This has been fixed in GCC 4.1.1 that
+          gets shipped with FC6. This change enables the visibily
+          attributes again for GCC 4.1.1 or newer.
+
+        * ace/Obstack.h:
+          Reverted the change below, it is an incorrect change
+          Wed Nov 22 09:07:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
+          on FC6. Thanks to Ken Sedgwick <ken at bonsai dot com> for
+          reporting this and testing out the patch.
+
+Wed Jan  3 22:31:05 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+          This entry merges in changes from OCITAO 1.4a which were
+          originally part of RT 8678.
+
+        * ace/README:
+        * ace/config-sunos5.9.h:
+
+          Added new compiler macro, ACE_LACKS_THR_CONCURRENCY_FUNCS, to
+          accomodate the deprecation of thr_concurrency() in Solaris 9
+          onwards.  The functions still exist, but the call semantics have
+          changed slightly such that values for which they would
+          previously succeed now fail despite the fact that they are
+          effectively no-ops in Solaris >= 9.  This would cause
+          thr_create(THR_NEW_LWP) to fail in a process when invoked for
+          the 65536th (or greater) time.
+
+          Currently this macro is only defined on Solaris 9+, but, since I
+          believ this function was only ever present on Solaris anyway, it
+          could probably be defined in general, and simply #undef'd on
+          Solaris 8 and prior.
+
+        * ace/OS_NS_Thread.cpp (thr_create):
+
+          Conditionally removed THR_NEW_LWP section when
+          ACE_LACKS_THR_CONCURRENCY_FUNCS is defined.
+
+        * tests/Thread_Creation_Threshold_Test.cpp:
+        * tests/run_test.lst:
+        * tests/tests.mpc:
+
+          Added a new test to check the threshold of thread creation.
+          This simply verifies that more than 2^15 threads can be created
+          sequentially (not simultaneously).
+
+Wed Jan  3 22:10:54 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * ace/CDR_Stream.inl (adjust):
+
+          Reverted one-line change committed in r76279 and as part of
+          entry from "Wed Jan 3 05:53:04 UTC 2007 Chris Cleeland
+          <cleeland_c@ociweb.com>".  After getting some questions from
+          Johnny and posing them to the originators of the change, the
+          originators indicated that, over time, the problem may have been
+          application-related as they could never isolate a test case that
+          provoked it.
+
+Wed Jan  3 19:52:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Run the compression test when ZLIB is part of the config list
+
+Wed Jan  3 19:34:47 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          TAO/tests/Any/Recursive also does not work when the build is
+          static.  It uses ACE_Dynamic_Service to locate the
+          TAO_TypeCodeFactory_Adapter which fails.
+
+Wed Jan  3 18:35:02 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Do not run TAO/tests/Any/Recursive if minimum_corba,
+          corba_e_compact or corba_e_micro are enabled.  Not all portions of
+          the test build with any one of these enabled.
+
+Wed Jan  3 15:50:39 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ACEXML/apps/svcconf/svcconf.mpc:
+        * ACEXML/common/common.mpc:
+        * ACEXML/parser/parser/parser.mpc:
+        * Kokyu/Kokyu.mpc:
+        * ace/QoS/qos.mpc:
+        * ace/SSL/ssl.mpc:
+        * ace/SSL/ssl_for_tao.mpc:
+        * ace/ace.mpc:
+        * ace/ace_flreactor.mpc:
+        * ace/ace_for_tao.mpc:
+        * ace/ace_qtreactor.mpc:
+        * ace/ace_tkreactor.mpc:
+        * ace/ace_xtreactor.mpc:
+        * apps/gperf/src/gperf.mpc:
+        * protocols/ace/HTBP/HTBP.mpc:
+        * protocols/ace/RMCast/RMCast.mpc:
+        * protocols/ace/TMCast/TMCast.mpc:
+
+          Use the install base project instead of the deprecated core base
+          project.
+
+Wed Jan  3 15:25:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Added new PI test
+
+Wed Jan  3 14:57:49 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/ipv6.mpb:
+
+          The cbx project type was replaced by the bds4 project type.
+
+Wed Jan 03 14:20:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * ace/CORBA_macros.h:
+          With MFC, must delete any caught and eaten "out of memory" exceptions.
+
+Wed Jan  3 13:25:06 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/msvc_static_order.lst:
+
+          Build the TAO/tests/Smart_Proxies/Collocation/SP_Collocation_Idl
+          project before SP_Collocation_TestStubsLib.
+
+Wed Jan  3 13:16:16 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+
+          Added !NO_MCAST to those tests that use multicast.
+
+        * tests/Unload_libACE.cpp:
+        * tests/tests.mpc:
+        * tests/unload_libace.mpb:
+
+          Added support for running this test when ace_for_tao is enabled.
+
+Wed Jan  3 12:33:33 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Since the zzip base project now 'requires' zlib, we can default
+          zlib to 1.  This will cause no harm to those that do not have zlib
+          since zlib is a "feature" project and will not be included in any
+          project unless it is explicitly enabled.
+
+Wed Jan  3 09:36:13 UTC 2007  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/wrapper_macros.GNU:
+        * ace/OS_NS_stdio.inl:
+        * tests/OS_Test.cpp:
+
+          Added the ability to use trio (http://sourceforge.net/projects/ctrio/)
+          if platform lacks decent support for vsnprintf. trio support is
+          enabled by defining trio=1 in plaform_macros.GNU
+
+Wed Jan  3 07:52:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Reverted my change below, it breaks the singleton on windows, the EXPORT
+        should not be there, seems we need a different way to resolve this
+        problem with FC6.
+
+        Tue Jan  2 14:27:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ace/Based_Pointer_Repository.h:
+          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
+          on FC6. Thanks to Olli Savia  <ops@iki.fi> for
+          reporting this and testing out the patch.
+
+Wed Jan  3 07:47:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ASNMP/tests/test_config.h:
+          Only define ACE_START_TEST and ACE_END_TEST when they are not
+          defined yet. Removed some old code at the same time
+
+Wed Jan  3 06:47:58 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Added feature test for ACE_LACKS_REALPATH.  Fixes bugzilla bug
+          2613.
+
+Wed Jan  3 06:09:39 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Added feature test for ACE_HAS_SIGVAL_SIGVAL_INT and, for
+          completeness, ACE_HAS_SIGVAL_SIGVAL_PTR.  Fixes bugzilla bug
+          2716.
+
+Wed Jan  3 05:53:04 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+          This entry documents the merge of several small bug fixes from
+          the OCI distribution.
+
+        * ace/QtReactor/QtReactor.cpp:
+
+          Merged in a change from OCITAO 1.4a that fixed a bug in
+          ACE_QtReactor::QtWaitForMultipleEvents() where
+          the two select() calls in that function might select on different
+          handler sets. The problem is the dispatch_set/wait_set can be
+          changed during the two select() calls. This could happen while
+          waiting for an event, another event is handled and dispatched
+          which changes the dispatch_set/wait_set.
+
+          This bug was found on a single thread Qt application [RT 8751].
+
+        * ace/CDR_Stream.inl (adjust):
+
+          Applied a one-line change from Dan Troesser <troesser_d at
+          ociweb dot com>, originally committed to OCITAO 1.4a.  VC8
+          detected that memory around a buffer was being modified.
+          Changed a boundary check from <= check to < that some believed
+          was causing a write past the end of the buffer.  After the
+          change, there were no compilation problems with VC8 and all the
+          ACE CDR-related tests passed.
+
+        * bin/tao_orb_tests.lst:
+
+          Add in Bug_2702_Regression test.
+
+        * bin/auto_run_tests.pl:
+
+          Change the search logic for listed tests so that the script
+          "finds" tests even when the layout isn't using the "traditional"
+          layout where $TAO_ROOT == $ACE_ROOT/TAO.
+
+        * NEWS: Updated to reflect these changes.
+
+Wed Jan  3 05:26:07 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Added feature test for ACE_LACKS_SIGVAL_T.  Fixes bugzilla bug
+          2761.
+
+Tue Jan  2 16:02:25 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
+
+          Use the MakeWorkspaceBase module to reduce the amount of
+          duplicated code.
+
+Tue Jan  2 14:27:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Based_Pointer_Repository.h:
+          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
+          on FC6. Thanks to Olli Savia  <ops@iki.fi> for
+          reporting this and testing out the patch.
+
+Tue Jan  2 12:38:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-rtems.h:
+          Added ACE_LACKS_THREAD_PROCESS_SCOPING, rtems only supports
+          PTHREAD_SCOPE_PROCESS, setting another value will result in a
+          notsup error
+
+        * ace/OS_NS_Thread.cpp:
+          Removed some old FSU thread code
+
+Tue Jan  2 11:38:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-rtems.h:
+          Removed ACE_LACKS_MKFIFO, rtems has this API
+
+        * ace/config-win32-borland.h:
+        * ace/OS_NS_stdio.inl:
+          Removed support for the Borland C++ preview compiler that shipped
+          with CBuilderX
+
+        * ace/os_include/os_signal.h:
+          Removed Borland C++ preview support and fixed ACE_NSIG define
+          for rtems
+
+Tue Jan  2 11:18:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-macosx-panther.h:
+        * ace/config-macosx-tiger.h:
+          Added ACE_LACKS_SIGVAL_T
+
+Tue Jan  2 11:15:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * config-rtems.h:
+          Removed ACE_LACKS_PUTENV, rtems has this method, fixes the
+          Env_Value_Test failure
+
+Tue Jan  2 11:06:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ARGV.cpp:
+          Fixed constructor that combines two argv arrays to handle
+          an empty array as we can have with embedded platforms like
+          VxWorks and RTEMS
+
+Tue Jan  2 10:49:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/run_test.lst:
+          Added missing ARGV_Test
+
+Tue Jan  2 10:23:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-rtems.h:
+          RTEMS does have aio support but there are several errors in the
+          rtems header files and it looks also that the behaviour is not
+          correct, reported this to the rtems maintainers and for the
+          rtems 4.6 version we disable the AIO support in ACE
+
+Tue Jan  2 09:44:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/ARGV_Test.cpp:
+          Fixed compile errors in unicode build
+
+Mon Jan  1 21:56:50 UTC 2007  James H. Hill  <hillj@isis.vanderbilt.edu>
+
+        * docs/ace_guidelines.vsmacros:
+
+          Fixed bug that was causing the previous find and replace
+          values to be used when the current document is being saved.
+
+Mon Jan  1 18:51:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/os_errno.h:
+          Defined ECANCELED when it has not been defined yet, fixes problems
+          with rtems
+
+Mon Jan  1 18:39:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/POSIX_CB_Proactor.h:
+          Introduced new ACE_LACKS_SIGVAL_T, when this is defined then ACE
+          does a typedef for sigval_t
+
+        * ace/config-aix-5.x.h:
+        * ace/config-macosx.h:
+        * ace/config-rtems.h:
+        * ace/config-sunos5.4-g++.h:
+        * ace/config-sunos5.4-sunc++-4.x.h:
+        * ace/config-sunos5.5.h:
+        * ace/config-vxworks5.x.h:
+        * ace/config-vxworks6.2.h:
+        * ace/config-vxworks6.3.h:
+        * ace/config-vxworks6.4.h:
+          Added ACE_LACKS_SIGVAL_T
+
+        * ace/POSIX_Asynch_IO.h:
+          Doxygen improvement
+
+Sun Dec 31 22:33:14 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/SV_Shared_Memory_Test.cpp:
+
+          Check and exit if allocator was not successfully initialized
+          (other processes could be using all the kernel's SysV shared
+          memory pages).  Otherwise the test's child process will be stuck
+          in a spinloop while filling up the filesystem with log messages.
+
+Sun Dec 31 18:56:05 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/svn/config:
+        * docs/svn/svn-prefs.reg:
+          Added some more file extensions
+
+        * bin/generate_doxygen.pl:
+        * etc/tao_compression.doxygen:
+        * etc/tao_transportcurrent.doxygen:
+        * html/index.html:
+          Added doxygen generations for transport current and compression
+
+Sun Dec 31 16:11:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ACEXML/common/Makefile.am:
+
+          Fix stray trailing \ introduced in:
+          Sat Dec 30 06:20:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+Sat Dec 30 06:23:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * */Makefile.am:
+
+          Baseline regeneration to match recent MPC, *.mpc, and *.mpb
+          changes.
+
+Sat Dec 30 06:20:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ACEXML/tests/Makefile.am:
+        * ACEXML/tests/util/Makefile.am:
+        * ACEXML/apps/svcconf/Makefile.am:
+        * ACEXML/common/Makefile.am:
+        * ACEXML/examples/SAXPrint/Makefile.am:
+
+          Hand-add automake conditionals for BUILD_ZZIP and BUILD_ZLIB.
+          Unfortunately MPC resolves options, files, etc. set by
+          "features" at project generation time, but we want them to be
+          configure time options.
+
+Sat Dec 30 06:16:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefiles for new subdirectory.
+
+        * apps/JAWS2/Makefile.am:
+
+          Regenerate to descend into HTTPU subdirectory.
+
+        * apps/JAWS2/HTTPU/Makefile.am:
+
+          New Makefile.am.
+
+Sat Dec 30 06:12:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * m4/ace.m4:
+
+          Add placeholder automake conditionals for BUILD_ZLIB and
+          BUILD_ZZIP.
+
+        * bin/MakeProjectCreator/acexml.mpb:
+
+          Derive from both zlib and zzip.
+
+Fri Dec 29 16:57:10 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/SOCK_Dgram.cpp (recv): Corrected a "can't delete void*" warning
+          that entered with
+          Thu Dec 28 22:47:05 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+Fri Dec 29 08:41:35 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * tests/Proactor_Timer_Test.cpp:
+          Fixed compile error on LynxOS with 2.95.3.
+
+Fri Dec 29 08:31:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/os_signal.h:
+          Did some cleanup in this file, removed old stuff
+
+Fri Dec 29 07:33:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * bin/MakeProjectCreator/config/automake.features:
+
+          Set java, zlib, and zzip.  We'll use automake conditionals to
+          defer these options to configure time.
+
+Thu Dec 28 22:47:05 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/SOCK_IO.{h, inl}: Changed the
+          recvv(iovec[], size_t, const ACE_Time_Value* = 0) and
+          sendv (const iovec[], size_t, const ACE_Time_Value*=0) methods
+          to specify the iovec count argument as int instead of size_t
+          since it gets reduced to int in the underlying OS calls (usually).
+          Removed the following deprecated methods:
+
+            ssize_t recv (iovec iov[],
+                          size_t n,
+                          const ACE_Time_Value *timeout = 0) const;
+
+            ssize_t recv (iovec *io_vec,
+                          const ACE_Time_Value *timeout = 0) const;
+
+            ssize_t send (const iovec iov[],
+                          size_t n,
+                          const ACE_Time_Value *timeout = 0) const;
+
+          These were previously replaced with more specific ...v() methods.
+
+        * ace/SOCK_Dgram.cpp (recv): Resolved ssize_t to u_long truncation
+          warning.
+
+        * ace/Service_Repository.{h cpp} (find, find_i): Changed the
+          ignore_suspended argument from int to bool to reflect it's true/false
+          nature.
+          Changed find_i() to return the located name's index in a size_t
+          argument when located - this allows it to pass indices as big as the
+          table can hold. The return value -1, -2 is not changed, but >= 0
+          is no longer returned; it's == 0 for success, and the caller needs
+          to get the index from the 'slot' argument. This should cause no
+          issues since find_i() is private and internal use has been adjusted
+          to match; callers of find() have no use for an index value for a
+          table internal to ACE_Service_Repository.
+
+        * ace/Service_Gestalt.cpp (~ACE_Service_Type_Dynamic_Guard): Use of
+          ACE_Service_Repository::find_i() adjusted per above.
+
+        * ace/Msg_WFMO_Reactor.cpp: Resolve truncation warning for 64-bit.
+
+        * NEWS: Updated with API changes noted above.
+
+Thu Dec 28 20:56:28 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Updated to enable TAO/tests/TransportCurrent/Framework for
+          static builds.
+
+Thu Dec 28 19:11:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Reverted my change below this broke a lot of builds, seems
+        the settings in MPC are not used for ACE/TAO/CIAO so we need
+        to have them also in ACE duplicated
+
+        Thu Dec 28 12:57:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/global.features:
+          Removed the settings that are already set in the MPC
+          global.features file, no need to duplicate that info.
+
+Thu Dec 28 15:35:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Add ACE_HAS_3_PARAM_READDIR_R feature test.
+
+Thu Dec 28 14:54:00 UTC 2006  Pavel Zaichenko <zpf at ivl dot ua>
+
+        * ace/OS_NS_unistd.cpp,
+        * ace/ARGV.cpp,
+        * ace/ARGV.h: Completed the integration of the quote_args feature
+          throughout the code.
+
+Thu Dec 28 14:49:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/ARGV.inl (argc): This method now first calls argv() before
+          returning the argc count.
+
+Thu Dec 28 12:57:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/global.features:
+          Removed the settings that are already set in the MPC
+          global.features file, no need to duplicate that info.
+
+Thu Dec 28 12:37:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/DLL_Manager.cpp (get_handle):
+          Simplified this method a little
+
+        * ace/Dynamic_Service_Base.cpp:
+          Layout change
+
+        * ace/os_include/net/os_if.h:
+          Include ws2tcpip.h on windows as we do in the other files, this
+          way we don't get redefinitions on windows
+
+        * ace/Service_Gestalt.cpp (process_directive):
+          No need to use an intermediate variable
+
+        * tests/ARGV_Test.cpp:
+          Fixed deprecated conversion warnings
+
+        * tests/Time_Value_Test.cpp:
+          Added another test
+
+Thu Dec 28 11:13:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-aix-5.x.h:
+          Define ACE_HAS_3_PARAM_READDIR_R always independent of the compiler
+          used.
+
+Wed Dec 27 21:15:50 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/ARGV.{h,cpp} Generalized the constructor for ACE_ARGV_T so
+          that it can optionally be directed to quote args or not, which
+          is consistent with the ACE_ARGV_T<CHAR_TYPE>::add() method
+          described below.
+
+        * ace/OS_NS_unistd.{h,cpp}: ACE_OS::argv_to_string() was updated
+          to implement the feature described above.
+
+Wed Dec 27 21:19:57 UTC 2006  Pavel Zaichenko <zpf at ivl dot ua>
+
+        * ace/OS_NS_stdlib.cpp: ACE_OS::strenvdup() now correctly expands
+          environment variables are correctly expanded in strings of form
+          "$ACE_ROOT/subdir", "/some/dir/$ARCH/subdir" as well as
+          "$ACE_ROOT".
+
+        * ace/OS_NS_unistd.cpp: ACE_OS::argv_to_string() and
+          ACE_OS::string_to_argv() now converts arguments list argv[] to
+          string and vice versa. Double quotes (") are correctly
+          quoted/unquoted during conversion.
+
+        * ace/ARGV.{h,inl,cpp}: Made the following enhancements:
+
+          ACE_ARGV_T<CHAR_TYPE>::add(const CHAR_TYPE *next_arg, bool quote_arg = false)
+          Now takes an additional argument
+          * @param quote_arg   The argument @a next_arg need to be quoted while
+          *                    adding to the vector.
+          which is queued in the queue_ as well as next_arg for farther usage.
+
+          ACE_ARGV_T<CHAR_TYPE>::add(CHAR_TYPE *argv[])
+          Each entry argv[i] of the argument list is interpreted as a single argument
+          (white spaces are preserved).
+
+          ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue()
+          Creates a command line using arguments (next_arg, quote_arg) queued
+          with add() method. Quotes double quote symbols (") if needed.
+
+Wed Dec 27 21:14:34 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/ARGV.{h,cpp}: Removed the
+
+          int argv_to_string (CHAR_TYPE **argv, CHAR_TYPE *&buf);
+
+          method since it's redundant with what's in ACE_OS::argv_to_string().
+
+Wed Dec 27 20:27:29 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/OS_NS_stdlib.{h,inl,cpp}: There's no need for the
+          strenvdup() method to be defined as
+          ACE_NAMESPACE_INLINE_FUNCTION.
+
+Wed Dec 27 15:12:12 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Map_Manager.{h,inl}: Added a default constructor for
+          ACE_Map_Entry to initialize the data members.  Thanks to Dieter
+          Knueppel <Dieter dot Knueppel at batm dot de> for this fix.
+
+Wed Dec 27 16:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/netinet/os_in.h:
+          Define IPPROTO_TCP when not defined yet
+
+        * ace/os_include/netinet/os_tcp.h:
+          Define TCP_NODELAY when not defined yet
+
+Wed Dec 27 16:10:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/net/os_if.h:
+          Only define the IFF_x defines when ACE_LACKS_NETWORKING is
+          defined to resolve redefinition warnings on windows
+
+Wed Dec 27 14:06:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-posix-nonetworking.h:
+          Added ACE_LACKS_GETHOSTENT
+
+Wed Dec 27 12:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Atomic_Op_T.h:
+          Doxygen improvements
+
+Wed Dec 27 11:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_socket.h:
+          Define SO_ERROR when it is not defined yet
+
+Wed Dec 27 10:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_socket.h:
+          Added ACE_LACKS_LINGER support
+
+        * ace/config-posix-nonetworking.h:
+          Added ACE_LACKS_LINGER
+
+Wed Dec 27 10:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_socket.h:
+          Define SOCK_SEQPACKET when it is not defined yet
+
+Wed Dec 27 10:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-posix-nonetworking.h:
+          Added ACE_LACKS_IFCONF
+
+        * ace/os_include/net/os_if.h:
+          Added some more types that need to be defined by ACE when
+          we compile without network support
+
+        * ace/SOCK_Dgram.cpp:
+          Removed check for ACE_LACKS_IFREQ
+
+        * ace/SOCK_Dgram_Bcast.cpp:
+          Layout changes
+
+Wed Dec 27 10:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_socket.h:
+          Define SO_BROADCAST when it is not defined yet
+
+Wed Dec 27 10:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/netinet/os_in.h:
+          Add sockaddr_un when ACE_LACKS_SOCKADDR_UN is defined
+
+        * ace/config-posix-nonetworking.h:
+          Added ACE_LACKS_SOCKADDR_UN
+
+Wed Dec 27 10:05:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Name_Request_Reply.cpp:
+          Use ACE_NTOHS so that this file compiles without network support
+
+Wed Dec 27 09:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/ARGV_Test.cpp:
+          Fixed deprecated conversion warnings
+
+Wed Dec 27 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_dirent.cpp:
+          Removed workaround for vc6
+
+        * ace/OS_NS_dirent.inl:
+          Layout change
+
+Wed Dec 27 09:27:06 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * tests/Log_Msg_Test.cpp:
+          Updated comment.
+
+Wed Dec 27 09:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_dirent.inl (readdir_r):
+          Simplified the OS checks in this method, use the new
+          define ACE_HAS_3_PARAM_READDIR_R. This is then set in the
+          config files below, maybe it has to be set in more, but the
+          scoreboard will show that.
+
+        * ace/config-aix-5.x.h:
+        * ace/config-cygwin32.h:
+        * ace/config-freebsd.h:
+        * ace/config-hpux-11.00.h:
+        * ace/config-linux-common.h:
+        * ace/config-netbsd.h:
+        * ace/config-rtems.h:
+        * ace/config-sunos5.5.h:
+        * ace/config-vxworks6.4.h:
+          Added ACE_HAS_3_PARAM_READDIR_R
+
+        * ace/config-linux-common.h:
+          Added new ACE_LACKS_LINUX_VERSION_H around include of linux/version.h.
+          This file isn't present with BlueCAT 4 Linux from LynuxWorks.
+
+        * ace/config-posix.h:
+          Layout changes
+
+        * ACE-INSTALL.html:
+          Updated supported platforms by Remedy IT
+
+        * ace/INET_Addr.cpp:
+          Use the ACE_NTOHL macro and remove the check for ACE_LACKS_NTOHL
+
+        * ace/Map_Manager.{h,cpp}:
+          Changed free_ to a real bool
+
+        * ace/Name_Proxy.cpp:
+        * ace/Name_Request_Reply.cpp:
+        * ace/Time_Request_Reply.cpp
+          Use the ACE_NTOHL macro so that this file compiles without networking
+          support
+
+Wed Dec 27 09:10:27 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * ace/Process.cpp:
+          Changed to use ACE_LACKS_VSNPRINTF instead of ACE_HAS_SNPRINTF.
+
+Tue Dec 26 22:47:57 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/OS_NS_unistd.cpp: Reverted the changes to ACE_OS::argv_to_string()
+          from here:
+
+          Sun Dec 24 22:29:24 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+          so that Signal_Test.cpp tests don't break.  In a nutshell, each
+          argv[i] argument to ACE_ARGV is not supposed to be quoted.
+          Thanks to Steve Huston for reporting this.
+
+Tue Dec 26 22:46:34 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/ARGV_Test.cpp (run_main): Updated the test to test how the
+          conversion from char *argv[] to a char * works.
+
+Mon Dec 25 16:19:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * Merry Christmas everyone!!!
+
+Sun Dec 24 23:13:37 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/ARGV_Test.cpp: Updated the test to ensure that Pavel's
+          patches work properly.
+
+Sun Dec 24 22:29:24 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/OS_NS_stdlib.inl,
+        * ace/OS_NS_unistd.cpp: Modified ACE_OS::strenvdup() and
+          ACE_OS::argv_to_string() so they split the arguments containing
+          spaces in accordance with the documentation.  Thanks to Pavel
+          Zaichenko <zpf at ivl dot ua> for these patches.
+
+Fri Dec 22 17:35:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ace/OS_NS_dirent.inl:
+
+          Add a __NetBSD__ to the preprocessor conditional to select the
+          three argument version of readdir_r.  While this what was done
+          for FreeBSD, HPUX, etc., it really points out a need for a new
+          feature test macro.
+
+        * ace/config-netbsd.h:
+
+          Only define thread-related feature test macros if ACE_MT_SAFE is
+          defined (with a non-zero value).
+
+Fri Dec 22 13:56:15 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS2/HTTPU/http_heders.cpp:
+        * apps/JAWS2/HTTPU/http_status.cpp: Specify type and class separately
+          for each static member instance to allow HP aC++ 03.* (PA-RISC
+          compiler) to grok it. At least the Itanium compilers could handle
+          this... there's hope.
+
+Fri Dec 22 12:52:05 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/platform_lynxos.GNU:
+          Build shared libs by default.
+
+Fri Dec 22 09:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Service_Manager.h:
+          Improved doxygen documentation, thanks to Stefan Naewe
+          <stefan at naewe dot de> for delivering the patch
+
+Thu Dec 21 21:54:51 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/config-freebsd.h: Added support for SCTP in FreeBSD version
+          700028 and greater.  Thanks to Craig Rodrigues <rodrigc at
+          crodrigues dot org> for reporting this.
+
+Thu Dec 21 20:19:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Sock_Connect.cpp:
+          Use prefix increment and made get_interfaces working with rtems
+
+Thu Dec 21 16:12:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Fixing the condition for running the Transport::Current tests
+          (note that ST = Single Threaded, not STATIC).
+
+Thu Dec 21 14:31:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Sock_Connect.cpp:
+          Added support for get_interfaces for rtems
+
+Thu Dec 21 13:32:08 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/platform_lynxos.GNU:
+          Moved macro definitions from CFLAGS to CPPFLAGS.
+
+Thu Dec 21 12:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/rules.bin.GNU:
+          Removed old chorus rules
+
+Thu Dec 21 10:17:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/UUID.cpp:
+          Fixed initialisation warning
+
+Thu Dec 21 09:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * ace/OS_TLI.inl:
+        * ace/OS_NS_signal.h:
+
+          Updated some HPUX Acc version bug fixes.....
+
+Thu Dec 21 08:47:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/JAWS2/HPPTU/http_headers.{h,inl}:
+          Fixed const warnings with Intel C++
+
+Wed Dec 20 22:06:14 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * tests/OS_Test.cpp:
+          HP-UX has broken vsnprintf function. Changed the test not
+          to fail on HP-UX.
+
+Wed Dec 20 16:35:53 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          These are fixes correcting scoreboard issues pertaining to the
+          checkin from Tue Dec 19 22:09:34 UTC 2006.
+
+        * bin/tao_orb_tests.lst:
+
+          Added the two Transport::Current tests to the scoreboard.
+
+        * bin/MakeProjectCreator/config/tc.mpb:
+
+          Moved this file to $TAO_ROOT/MPC/config where it belongs.
+
+Wed Dec 20 12:31:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/test_config.h:
+          Only define ACE_START_TEST and ACE_END_TEST when they are not
+          defined yet. This way we can set our own define in the config.h
+          file and for example just do logging to stdout instead of a file
+          which can be problematic when the test target doesn't have a
+          file system
+
+Wed Dec 20 04:52:04 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ACE-INSTALL.html:
+        * docs/Download.html:
+
+          Fleshed out SVN instructions a bit more, corrected link mistake in
+          Download.html.
+
+          Thanks to Craig Rodrigues <rodrigc at crodrigues dot org> for the patch.
+
+Tue Dec 19 22:09:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/MakeProjectCreator/config/tc.mpb:
+
+          Added a new project type for projects using the Transport
+          Current functionality.
+
+Tue Dec 19 20:05:42 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/Download.html:
+          Added link to SVN documentation.
+
+Tue Dec 19 14:19:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_rtems.x_g++.GNU:
+          Set load address
+
+Tue Dec 19 14:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Object_Manager_Base.cpp (print_error_message):
+          Fixed invalid filename
+
+Tue Dec 19 13:16:38 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Msg_NT_Event_Log.cpp (log): Changed the loop iterator to
+          be size_t rather than long to silence a warning about comparing
+          signed and unsigned values.  Thanks to Johnny for reporting
+          this.
+
+Tue Dec 19 09:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_unistd.inl (readdir_r):
+          Refactored this method to make it easier to maintain and at the
+          same moment fixed compile error when building ACE on VxWorks 6.4
+          in kernel mode without pthread support
+
+Mon Dec 18 22:28:48 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Msg_NT_Event_Log.cpp (log): Iterate for i <
+          log_record.msg_data_len() rather than i < log_record.length ()
+          to avoid nasty overrun errors.  Thanks to Paxton Mason <PMason
+          at wolve dot com> for reporting this.  This fixes bugid 2754.
+
+Mon Dec 18 22:28:18 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Record.h: Clarify the meaning of length() in the
+          comments.  Thanks to Paxton Mason <PMason at wolve dot com> for
+          motivating this.
+
+Mon Dec 18 13:48:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACEXML/common/common.mpc:
+        * bin/MakeProjectCreator/configs/acexml.mpb:
+          Added zzip as base, this project really uses zzip
+
+        * bin/MakeProjectCreator/configs/acedefaults.mpb:
+          Removed zzip and zlib as base projects. Any project that uses
+          zzip or zlib should derive from the correct project, but not
+          acedefaults. When making them a base from acedefaults any
+          project links with zzip/zlib even when they don't use it.
+
+          This fixes bugzilla bug 2751.
+
+Mon Dec 18 10:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/JAWS2/HTTPU/parse_url.h:
+          Added prefix to the members of the URL_ERROR enum, NONE is a macro
+          on some platforms like VxWorks
+
+Mon Dec 18 10:04:19 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * tests/OS_Test.cpp:
+          Do not execute snprintf test if ACE_LACKS_VSNPRINTF is defined.
+
+Fri Dec 15 23:09:29 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS2/JAWS/Makefile.am: Removed JAWS.h; see
+          Thu Dec 14 21:08:19 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+Fri Dec 15 15:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks6.3.GNU:
+        * include/makeinclude/platform_vxworks6.4.GNU:
+        * ace/config-vxworks6.4.h:
+        * ace/config-vxworks6.3.h:
+        * ace/OS_NS_unistd.inl:
+        * ace/OS_NS_arpa_inet.cpp:
+        * ace/os_include/os_stdio.h:
+        * ace/os_include/sys/os_types.h:
+          Added support for VxWorks 6.4
+
+Thu Dec 14 21:08:19 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS2/JAWS/jaws2.mpc: Corrected compiler defines to add
+          JAWS_BUILD_DLL, not replace previous.
+
+        * apps/JAWS2/JAWS/Export.h: Replaced contents with new content
+          generated from generate_export_file.pl. Previous content was
+          generated from GenerateExportH.BAT and was missing lots of
+          stuff, some of which prevented generation of .lib, .exp files.
+
+        * apps/JAWS2/JAWS/JAWS.h: Removed; it only had JAWS_TRACE defined
+          which is properly defined in Export.h now.
+
+        * apps/JAWS2/JAWS/Pipeline_Tasks.cpp:
+        * apps/JAWS2/JAWS/IO_Handler.cpp:
+        * apps/JAWS2/JAWS/IO.cpp:
+        * apps/JAWS2/JAWS/Concurrency.cpp: Removed #include "JAWS/JAWS.h"
+
+Thu Dec 14 12:36:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-qnx-neutrino.h:
+          Added several missing defines to build with QNX
+
+Thu Dec 14 11:57:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_qnx_neutrino.GNU:
+          Set all tools using ?= so that we can override the name
+          from the platform_macros.GNU file
+
+Thu Dec 14 00:12:49 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/OS_NS_Thread.cpp (event_init): Solaris's shm_open() requires a
+          single '/' on the name argument. I opted to put that logic here
+          rather than the lower-level ACE_OS::shm_open(), but that point
+          is debatable. In any case, look for a leading / on the name if
+          ACE_SHM_OPEN_REQUIRES_ONE_SLASH is defined; if it's not there,
+          add it.
+
+        * ace/config-sunos5.8.h: Added ACE_SHM_OPEN_REQUIRES_ONE_SLASH.
+
+        * ace/README: Add description of ACE_SHM_OPEN_REQUIRES_ONE_SLASH.
+
+        * configure.ac: Added check for ACE_SHM_OPEN_REQUIRES_ONE_SLASH.
+          Fixed check for ACE_LACKS_NUMERIC_LIMITS to display the findings
+          when configuring.
+
+        * m4/config_h.m4: Added ACE_SHM_OPEN_REQUIRES_ONE_SLASH and
+          ACE_LACKS_NUMERIC_LIMITS.
+
+Wed Dec 13 15:04:57 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Updated the configuration for ORB_Local_Config/Bug_2612 to
+          require a multithreaded build to reflect the design goals of the
+          test.
+
+Tue Dec 12 23:50:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * NEWS:
+
+          Document --enable-ace-reactor-notification-queue.
+
+        * m4/ace.m4:
+
+          Add autoconf support for --enable-ace-reactor-notification-queue.
+          Configuring with this option sets ACE_HAS_REACTOR_NOTIFICATION_QUEUE
+          in config.h.
+
+Wed Dec 13 01:41:19 UTC 2006  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * ace/UUID.cpp:
+
+          Fixed a potential memory leak. Dynamic memory was allocated but
+          not freed under special circumstances. For details, check BUGID
+          2746. This closes BUGID 2746.
+
+Tue Dec 12 22:38:06 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS2/HTTPU/parse_url.h: Made the char* members const to
+          resolve compile warnings about assignment of char* literals.
+
+Tue Dec 12 19:54:05 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS2/HTTPU/httpu.mpc: Must build HTTPU after JAWS2.
+
+Tue Dec 12 19:54:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/fuzz.pl:
+
+          Changed the regular expression to recognize #include's of files
+          with double quotes within a version block.
+
+Tue Dec 12 19:31:39 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/fuzz.pl:
+
+          Corrected a bug where a non-ACE/TAO/CIAO file included within a
+          version block was being marked as an error.
+
+Tue Dec 12 17:01:42 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * bin/MakeProjectCreator/config/MPC.cfg:
+
+          Added $DDS_ROOT/MPC/config to the includes, since the
+          .mpb files in DDS have been moved to this location, making
+          them consistent with the location of similar files in
+          TAO and CIAO.
+
+Tue Dec 12 15:08:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+
+          Added the Trading unit test to the list.
+
+Tue Dec 12 13:47:44 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS2/HTTPU/httpu.mpc: Corrected build flags and added required
+          link library JAWS2.
+
+Tue Dec 12 06:05:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Add ACE_HAS_ISASTREAM_PROTOTYPE feature test.
+
+Tue Dec 12 06:00:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Add ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE feature test.
+
+Tue Dec 12 05:13:33 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Add ACE_LACKS_MKTEMP_PROTOTYPE and ACE_LACKS_MKSTEMP_PROTOTYPE
+          feature tests.
+
+        * ace/README:
+
+          Document ACE_LACKS_MKSTEMP feature test macro.
+
+Mon Dec 11 20:51:59 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * apps/JAWS2/HTTPU/httpu.mpc: Added a new MPC file.  Thanks to
+          Sergey for this.
+
+        * apps/JAWS2/HTTPU/http_base.cpp (receive): Made this work with
+          HTTPU.  Thanks to Sergey Kosenko <sergey dot kosenko at gmail
+          dot com> for these patches.
+
+Mon Dec 11 20:21:14 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/CDR_Stream.{h cpp} (ACE_OutputCDR): Added a new method, int
+          consolidate (void) which consolidates any continuation message
+          blocks into the start block, ensuring that all data is located
+          in one block on return. This is useful for situations which
+          require the entire encoded stream to be available in one buffer,
+          regardless of length.
+
+        * tests/CDR_Test.cpp: Added a test for consolidate().
+
+        * NEWS: Added notice for new consolidate() method.
+
+        Thanks to Howard Finer <hfiner at sonusnet dot com> for supplying
+        the new ACE_OutputCDR::consolidate() method.
+
+Mon Dec 11 20:03:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Changed the template to use the words "make macros" instead of
+          features.  There may have be some confusion with MPC features.
+
+Mon Dec 11 17:39:46 UTC 2006  James H. Hill  <hillj@isis.vanderbilt.edu>
+
+        * docs/ace_guidelines.vsmacros:
+
+          Fixed macros specification so the same file can be used
+          with both VS.NET 2003 and VS.NET 2005 development
+          environments.
+
+Mon Dec 11 15:23:08 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/MPC.cfg:
+        * bin/mpc.pl:
+        * bin/mwc.pl:
+
+          Removed the code that specifically added the gnuace and borland
+          project types and rely on the dynamic_types directive in the
+          MPC.cfg to have the MPC core add them.
+
+Sat Dec  9 19:13:52 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * ace/config-vxworks5.x.h:
+          Added ACE_LACKS_VSNPRINTF.
+
+Fri Dec  8 20:20:09 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.cpp (parse_args_i):
+
+          Moving the "default:" label outside the block that handles the
+          "case 's':". Even though it should work correctly on allmost any
+          compiler, things like this are bad form. Thanks to Aaron
+          Scamehorn <Aaron dot Scamehorn at cogcap dot com> for noticing.
+
+Fri Dec  8 20:15:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * THANKS: Add Ray Lischner.
+
+Fri Dec  8 16:39:51 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/Null_Mutex.h: Added ACE_Export to the class declarations.
+          Although they are probably inlined, VS .NET 2005 (VC8) complains
+          in some cases when a dll-interface class inherits from a
+          non-dll-interface class.
+
+Fri Dec  8 15:36:23 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tests/run_test.lst:
+          Bug_2659_Regression_Test cannot run in a single threaded build.
+
+Fri Dec  8 05:21:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Changed code to extract version number from ace/Version.h to be
+          more resilient to leading whitespace like was added by a bug in
+          the release script in the last beta.  Thanks to Ray Lischner
+          <rlischner at proteus-technologies dot com> for this patch.
+          Also thanks to Paul Riley <paul at riley dot net> for reporting
+          this problem.
+
+Thu Dec  7 14:13:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/DLL_Manager.cpp:
+          Made error message dependent on ACE::debug. Thanks to David Faure
+          <dfaure at klaralvdalens-datakonsult dot se> for reporting this.
+
+Thu Dec  7 14:09:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/ciao_tests.lst:
+          Added RTCMM test
+
+Thu Dec  7 12:47:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Read_Buffer.h:
+          Doxygen improvements
+
+        * ace/Read_Buffer.cpp:
+          Initialise pointer with 0 and use prefix increment
+
+Thu Dec  7 09:47:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+          Improved rtems documentation
+
+        * MakeProjectCreator/config/avoids_ace_for_tao.mpb:
+          New base project for avoids ace_for_tao
+
+        * bin/ciao_tests.lst
+        * bin/tao_orb_tests.lst
+        * bin/tao_other_tests.lst
+          Disabled all tests that are disabled in a minimum_corba build also
+          when using CORBA/e compact and micro
+
+Thu Dec  7 07:49:24 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * ace/OS_NS_stdio.h:
+        * ace/OS_NS_stdio.inl:
+        * ace/OS_NS_stdio.cpp:
+
+          Implemented ACE_OS::snprintf() by using ACE_OS::vsnprintf().
+          Removed duplicate code and made maintaining easier.
+
+        * ace/README:
+        * ace/config-cygwin32.h:
+        * ace/config-freebsd.h:
+        * ace/config-hpux-11.00.h:
+        * ace/config-irix6.x-common.h:
+        * ace/config-linux-common.h:
+        * ace/config-lynxos.h:
+        * ace/config-macosx-panther.h:
+        * ace/config-macosx-tiger.h:
+        * ace/config-macosx.h:
+        * ace/config-netbsd.h:
+        * ace/config-openbsd.h:
+        * ace/config-openvms.h:
+        * ace/config-posix.h:
+        * ace/config-qnx-rtp-62x.h:
+        * ace/config-sunos5.7.h:
+        * ace/config-tru64.h:
+        * ace/config-vxworks6.2.h:
+        * ace/config-vxworks6.3.h:
+        * ace/config-win32-common.h:
+        * ace/config-win32-interix.h:
+
+          Removed ACE_HAS_SNPRINTF and added ACE_LACKS_VSNPRINTF
+          if necessary (I probably missed some platforms, need to recheck
+          after next scoreboard round).
+
+Thu Dec  7 00:27:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * m4/config_h.m4:
+        * configure.ac:
+
+          Remove obsolete ACE_HAS_UNION_WAIT feature test.
+
+Wed Dec  6 21:06:37 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tests/Bug_2659_Regression_Test.cpp:
+          Compile failure on RTEMS due to non-ANSI signal API on the
+          platform. Fixed by casting function ptr to proper type.
+
+Wed Dec  6 14:49:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * m4/config_h.m4:
+        * configure.ac:
+
+          Remove obsolete ACE_LACKS_CMSG_DATA_MACRO and
+          ACE_LACKS_CMSG_DATA_MEMBER feature test.
+
+Wed Dec  6 11:07:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-mit-pthread.h:
+        * ace/config-sco-5.0.0-mit-pthread.h:
+          Removed MIT pthread config files, not supported for years
+          anymore
+
+        * ace/config-mklinux.h:
+          Removed, this linux version hasn't been maintained for years
+
+        * ace/ACE.cpp:
+          Removed all mit-pthread specific code
+
+        * configure.ac:
+          Removed mit-pthread checks
+
+        * ace/WFMO_Reactor.cpp:
+          Const/bool change
+
+Wed Dec  6 07:57:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/ciao_tests.lst:
+        * bin/tao_orb_tests.lst:
+        * bin/tao_other_tests.lst:
+          Disabled all tests that are disabled in a minimum_corba build also
+          when using CORBA/e compact and micro
+
+Tue Dec  5 23:53:34 UTC 2006  Ciju John  <johnc@ociweb.com>
+
+        * tests/Bug_2659_Regression_Test.cpp:
+        * tests/run_test.lst:
+        * tests/tests.mpc:
+          Adding regression test for Bug 2659.
+
+Tue Dec  5 19:44:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-freebsd.h:
+          Simplified ACE_HAS_SNPRINTF setting
+
+        * ace/config-irix6.x-common.h:
+        * ace/config-sco-5.0.0-mit-pthread.h:
+        * ace/config-tru64.h:
+          Removed commented out defines, makes it easier to search whether
+          a macro is defined in any config file or not
+
+        * ace/config-tru64.h:
+          Use config-posix.h
+
+        * ace/Read_Buffer.{h,cpp}:
+          Changed close_on_delete to a real bool
+
+        * ace/Service_Config.{h,inl}:
+        * ace/Service_Gestalt.{h,cpp,inl}:
+          Use bool for the ignore arguments
+
+        * ace/SOCK_Dgram.inl:
+          Const change
+
+Tue Dec  5 15:47:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/makeinclude/platform_osf1_3.2_cxx.GNU:
+        * include/makeinclude/makeinclude/platform_osf1_4.x_cxx.GNU:
+        * include/makeinclude/makeinclude/platform_osf1_4.x_g++.GNU:
+        * include/makeinclude/makeinclude/platform_osf1_4.x_rcc.GNU:
+          Removed, very old
+
+        * include/makeinclude/makeinclude/platform_tru64_cxx.GNU:
+        * include/makeinclude/makeinclude/platform_tru64_g++.GNU:
+          We should be able to build on tru64 but it isn't really maintained,
+          moved the contents of the osf files into these files
+
+Tue Dec  5 15:22:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/makeinclude/platform_aix4_cset++.GNU:
+        * include/makeinclude/makeinclude/platform_aix.GNU:
+          Moved contents of cset++ method into the aix one, the aix
+          file just included the first one
+
+        * include/makeinclude/makeinclude/platform_aix4.2.GNU:
+          Removed, old
+
+        * ace/config-aix-4.x.h:
+        * ace/config-aix-5.x.h:
+          Moved contents of 4.x.h file into the 5.x.h file. Removed a lot
+          of old checks for AIX 4 so that we can maintain things easier.
+
+        * ace/ACE.cpp:
+        * ace/OS_NS_sys_wait.inl:
+          Removed ACE_HAS_UNION_WAIT, was only set for aix4
+
+        * ace/Log_Msg.cpp:
+        * ace/OS_NS_Thread.cpp:
+          Removed code for AIX 4.x to handle pthread_t
+
+        * ace/os_include/sys/os_socket.h:
+          Removed ACE_HAS_AIX_BROKEN_SOCKET_HEADER, was only set for aix 4
+
+Tue Dec  5 15:08:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-aix-4.1.x.h:
+        * ace/config-aix-4.2.x.h:
+        * ace/config-aix-4.3.x.h:
+          Removed, these AIX versions aren't supported anymore
+
+Tue Dec  5 14:33:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-irix6.x-sgic++-nothreads.h:
+          Removed
+
+Tue Dec  5 14:30:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-sunos5.4-centerline-2.x.h:
+        * include/makeinclude/platform_sunos5_centerline.GNU:
+          Removed centerline support
+
+Tue Dec  5 14:07:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_sunos4_g++.GNU:
+        * include/makeinclude/platform_sunos4_lucid.GNU:
+        * include/makeinclude/platform_sunos4_sunc++3.x.GNU:
+        * include/makeinclude/platform_sunos4_sunc++4.x.GNU:
+          Removed, not supported anymore
+
+Tue Dec  5 13:59:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-sco-5.0.0-fsu-pthread.h:
+          Deleted, fsu pthread is already removed some time ago.
+
+Tue Dec  5 13:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-sco-4.2-nothread.h:
+          Deleted, ancient
+
+Tue Dec  5 13:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-dgux-4.11-epc.h:
+        * ace/config-dgux-4.x-ghs.h:
+        * include/makeinclude/platform_dgux4_epc.GNU:
+        * include/makeinclude/platform_dgux4_ghs.GNU:
+          Deleted
+
+        * ace/OS_NS_Thread.cpp:
+          Removed dgux support. Fixes bugzilla 2011
+
+Tue Dec  5 13:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-irix5.2.h:
+        * ace/config-irix5.3-g++.h:
+        * ace/config-irix5.3-sgic++.h:
+        * include/makeinclude/platform_irix5.2.GNU:
+        * include/makeinclude/platform_irix5.3_g++.GNU:
+        * include/makeinclude/platform_irix5.3_sgic++.GNU:
+          Deleted
+
+        * include/makeinclude/platform_irix6.x_common.GNU:
+          Use operator ?=
+
+        * ace/os_include/os_signal.h:
+          Removed Irix 5 support, fixes bugzilla 2013.
+
+Tue Dec  5 13:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-m88k.h:
+        * include/makeinclude/platform_m88k.GNU:
+          Deleted
+
+        * ace/os_include/os_signal.h:
+        * ace/os_include/sys/os_resource.h:
+        * ace/os_include/sys/os_time.h:
+          Removed support for m88k which isn't maintained for years now.
+          Fixes bugzilla 2012
+
+Tue Dec  5 13:28:10 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          If the gendir setting for the custom file is '.', then ommit the
+          gendir setting.  This is required for version 3.4.45 of MPC.
+
+Tue Dec  5 12:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/sys/os_socket.h:
+          Removed check for ACE_LACKS_CMSG_DATA_MACRO which wasn't
+          set in any configuration file. This also resulted in the
+          removal of ACE_LACKS_CMSG_DATA_MEMBER because this define
+          was never checked
+
+        * ace/config-qnx-neutrino.h:
+        * ace/config-qnx-rtp-62x.h:
+        * ace/config-qnx-rtp-pre62x.h:
+        * ace/config-tandem-nsk-mips-v2.h:
+        * ace/config-tandem-nsk-mips-v3.h:
+          Removed ACE_LACKS_CMSG_DATA_MEMBER, it has no impact at all
+
+Tue Dec  5 11:25:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * ace/SStringfwd.h:
+
+          Provide for annoying HP aCC 3.xx template bug.
+
+Tue Dec  5 10:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-lynxos.h:
+
+          Improved LynxOS 4.2 support
+
+Mon Dec  4 23:13:12 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Gestalt.cpp (init_i):
+
+          Fixed bug#2735 and eliminated a potential memory leak of the
+          list of already processed static services. The failure scenario
+          is based on a case where static initializers register a bunch of
+          service objects and then later the gestalt::open() is called. At
+          that point, the abovementioned list is reinitialized and its
+          contents was lost. See also the other failure scenario
+          (bug#2701) for which a fix was put in on Nov 9 2006.
+
+Mon Dec  4 18:00:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Added a regression test for bug#2612
+
+Mon Dec  4 15:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config:
+          Moved TAO base projects to $TAO_ROOT/MPC/config
+
+Mon Dec  4 13:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/MPC.cfg:
+          Set includes so that TAO and CIAO base projects could be
+          under TAO_ROOT and CIAO_ROOT
+
+        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_component_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_config_handlers.mpb:
+        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb:
+        * bin/MakeProjectCreator/config/ciao_container_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_deployment_stub.mpb:
+        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
+        * bin/MakeProjectCreator/config/ciao_domainapplicationmanager_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_events_base_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_events_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_executionmanager_stub.mpb:
+        * bin/MakeProjectCreator/config/ciao_nodeapplication.mpb:
+        * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb:
+        * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb:
+        * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb:
+        * bin/MakeProjectCreator/config/ciao_noop_configurator.mpb:
+        * bin/MakeProjectCreator/config/ciao_plan_generator.mpb:
+        * bin/MakeProjectCreator/config/ciao_race_component.mpb:
+        * bin/MakeProjectCreator/config/ciao_race_default.mpb:
+        * bin/MakeProjectCreator/config/ciao_race_monitor.mpb:
+        * bin/MakeProjectCreator/config/ciao_rtevent_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_servant_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_server_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_static_dnc_app.mpb:
+        * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb:
+        * bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb:
+        * bin/MakeProjectCreator/config/ciao_xml_utils.mpb:
+        * bin/MakeProjectCreator/config/ciaocidldefaults.mpb:
+        * bin/MakeProjectCreator/config/cidlc.mpb:
+        * bin/MakeProjectCreator/config/dance_extension_stub.mpb:
+          Moved to $CIAO_ROOT/MPC/config
+
+Mon Dec  4 13:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Don't run Bug_2709_Regression with ACE_FOR_TAO
+
+Mon Dec  4 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Basic_Types.h:
+          Added check for __ia64__, then we assume we have little endian,
+          this define is set by the HP OpenVMS compiler
+
+Mon Dec  4 12:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_targetmanager_svnt.mpb:
+          New base project
+
+Mon Dec  4 11:27:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_nodeapplication.mpb:
+          New base project for nodeapplication library
+
+        * bin/MakeProjectCreator/config/ciao_nodeapplicationmanager.mpb:
+          Derive from ciao_nodeapplication
+
+        * bin/MakeProjectCreator/config/ciao_nodemanager_stub.mpb:
+        * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb:
+        * bin/MakeProjectCreator/config/ciao_race_default.mpb:
+        * bin/MakeProjectCreator/config/ciao_race_monitor.mpb:
+        * bin/MakeProjectCreator/config/ciao_targetmanager_stub.mpb:
+          Fixed incorrect id tag
+
+        * bin/MakeProjectCreator/config/ciao_noop_configurator.mpb:
+          New base project
+
+Mon Dec  4 11:26:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Corrected the expression to fill the files_mpc array and
+          enabled the Id check again
+
+Fri Dec  1 13:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Kokyu/docs/Kokyu.html:
+          Updated download location of ACE/TAO/CIAO
+
+Wed Nov 29 15:40:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_unistd.cpp (num_processors*):
+          Check the return value of sysctl, if it returns -1 then
+          also return the method with -1
+
+Wed Nov 29 12:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
+          Simplified this file
+
+Wed Nov 29 11:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Malloc_T.{h,cpp}:
+          Changed delete_lock_ to a real bool
+
+Wed Nov 29 07:09:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+        * configure.ac:
+
+          If ACEXML, ASNMP, or protocols subdirectories are not present,
+          don't try to configure or build them.  Thanks to Stephen Torri
+          <storri at cse dot wustl dot edu> for reporting this.
+
+Tue Nov 28 21:02:25 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/WIN32_Asynch_IO.cpp (ACE_WIN32_Asynch_Connect::post_result):
+          The 'result' pointer is invalid upon return from post_completion()
+          regardless of whether or not it succeeds. This fix prevents
+          dereferencing result on failure of post_completion(), such as at
+          proactor shutdown. Thank you to Ken Kane <kenneth dot kane at
+          ironmountain dot com> for the analysis and fix.
+
+        * THANKS: Updated Ken Kane's email address.
+
+Tue Nov 28 20:36:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/auto_run_tests.pl:
+          Added \n after the message when we can't chdir to a certain
+          directory to prevent detecting the wrong test because this
+          message is then on the same line as the next test.
+
+Tue Nov 28 20:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb:
+          Removed include path that didn't exist anymore
+
+Tue Nov 28 16:04:45 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/MakeProjectCreator/config/ciao_config_handlers_base.mpb
+        * bin/MakeProjectCreator/config/ciao_nodemanager_svnt.mpb
+
+          Fix for linker warnings/errors on OS X.
+
+Tue Nov 28 14:08:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * bin/msvc_mpc_auto_compile.pl:
+
+          Reorder @ace_core_dirs so that protocols follows tests, as
+          the HTBP protocol tests depend on the Test_Output library.
+
+Tue Nov 28 13:30:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/event.mpb:
+        * bin/MakeProjectCreator/config/event_serv.mpb:
+        * bin/MakeProjectCreator/config/event_skel.mpb:
+        * bin/MakeProjectCreator/config/ftorbutils.mpb:
+        * bin/MakeProjectCreator/config/ftrtevent.mpb:
+        * bin/MakeProjectCreator/config/ifrservice.mpb:
+        * bin/MakeProjectCreator/config/imr_locator.mpb:
+        * bin/MakeProjectCreator/config/portablegroup.mpb:
+        * bin/MakeProjectCreator/config/rtcorbacommon.mpb:
+          Added avoids_corba_e_compact as base project, if we have CORBA/e
+          compact we don't have the needed features available to build these
+          projects.
+
+Tue Nov 28 13:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb:
+        * bin/MakeProjectCreator/config/avoids_corba_e_compact.mpb:
+          Fixed incorrect feature name
+
+        * bin/MakeProjectCreator/config/global.features:
+          Removed duplicate minimum_corba
+
+Tue Nov 28 09:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ciao_client_dnc.mpb:
+        * bin/MakeProjectCreator/config/ciao_events_dnc.mpb:
+          Removed security as base, for the moment we decoupled from
+          the security service.
+
+Tue Nov 28 00:28:28 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * protocols/tests/HTBP/htbptest.mpb:
+
+          Add dependency on Test_Output.
+
+Mon Nov 27 12:30:28 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_2653_Regression_Test.cpp:
+
+          When a thread is started, you must wait() on it before exiting the
+          process to avoid a core dump.
+
+        * tests/run_test.pl:
+
+          Print out the test header before checking for the executable.  If
+          the executable is not there, it will appear as if the previous
+          test failed.
+
+Mon Nov 27 08:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-sunos5.5.h:
+          Fixed compile problem on solaris x86 when _FILE_OFFSET_BITS=64
+          is set. Thanks to Michael Klein <michael dot klein at fazi dot de>
+          for reporting this. Fixed bugzilla bug 2693.
+
+Mon Nov 27 08:09:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/minimum_corba.mpb:
+        * bin/MakeProjectCreator/config/avoids_minimum_corba.mpb:
+          Renames minimum_corba to avoids_minimum_corba. Fixes bugzilla
+          2589.
+
+        * bin/MakeProjectCreator/config/avoids_corba_e_micro.mpb:
+          Fixed this file and made corba_e_compact its parent, when
+          we can't build a project in corba_e_compact then corba_e_micro
+          is also not an option.
+
+        * bin/MakeProjectCreator/config/event.mpb:
+        * bin/MakeProjectCreator/config/event_serv.mpb:
+        * bin/MakeProjectCreator/config/event_skel.mpb:
+        * bin/MakeProjectCreator/config/ftorbutils.mpb:
+        * bin/MakeProjectCreator/config/ftrtevent.mpb:
+        * bin/MakeProjectCreator/config/ifrservice.mpb:
+        * bin/MakeProjectCreator/config/imr_locator.mpb:
+        * bin/MakeProjectCreator/config/portablegroup.mpb:
+        * bin/MakeProjectCreator/config/rtcorbacommon.mpb:
+          Updated for rename of minimum_corba
+
+Mon Nov 27 06:05:38 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * tests/OS_Test.cpp:
+          Fixed compile error on VxWorks. Thanks to Johnny Willemsen
+          for pointing out the problem and suggesting a fix.
+
+Fri Nov 24 13:27:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * bin/MakeProjectCreator/config/automake.features:
+
+          Set stl and boost.  We'll use automake conditionals to defer
+          these options to configure time.
+
+Fri Nov 24 13:05:01 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * tests/OS_Test.cpp:
+          Added ACE_OS::snprintf test.
+
+Fri Nov 24 10:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Sock_Connect.cpp:
+          Fixed compile errors when building on linux with no
+          networking support
+
+Thu Nov 23 17:06:17 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * ace/OS_Errno.h:
+        * ace/OS_Errno.cpp:
+
+          Fix compile errors with g++ on Solaris with NDEBUG.
+
+Thu Nov 23 14:09:17 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.lib.GNU: Corrected error introduced by
+          Wed Nov 22 21:53:17 UTC 2006  Steve Huston  <shuston@riverace.com>.
+
+Thu Nov 23 06:53:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/ace_for_tao.mpb:
+          Added ACE_LACKS_MSG_WFMO as define, that prevents other projects
+          to try to use the msg wfmo reactor which is not available in the
+          ace_for_tao configuration
+
+Thu Nov 23 03:14:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Integer_Truncate_Test.cpp:
+        * apps/JAWS/clients/WebSTONE/src/README:
+
+          Removed svn:executable property.
+
+Wed Nov 22 23:16:22 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * examples/Timer_Queue/Async_Timer_Queue_Test.cpp: Ignore SIGQUIT code
+          for platforms with ACE_LACKS_UNIX_SIGNALS. Fixes WinCE build error.
+
+Wed Nov 22 21:58:16 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/RB_Tree_Test.cpp: Don't use ACE_ASSERT for code - it doesn't
+          get executed in Release builds.
+
+        Pulled these in from the 5.5 stream:
+
+        Mon Nov 20 21:26:24 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-win32-msvc.h:
+        * ace/OS_Memory.h:
+          The MFC new/exception code needed the ability to delete a caught
+          CMemoryException object to prevent memory leaks (see
+          http://msdn2.microsoft.com/de-de/library/0e5twxsh(VS.80).aspx).
+          This necessitates that every platform other than Windows/MFC gets
+          an empty define for ACE_del_bad_alloc, and the ACE_NEW... macros
+          have ACE_del_bad_alloc expanded in the catch block.
+          For past history of this issue, see the trail starting at:
+          Tue Aug  8 09:15:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        Thu Nov 16 16:14:32 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/String_Base.{h inl}: Added a capacity() method that returns
+          the number of allocated CHAR units in the string object. Thanks to
+          Kelly Hickel <kfh at mqsoftware dot com> for supplying this.
+
+        * NEWS: Updated with recent ACE_String_Base and build additions.
+
+        Mon Nov 13 17:40:58 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * ace/String_Base.{h cpp}: Added a fast_resize(size_t) method to
+          manage the sizing/reallocating of the string, but doesn't do the
+          memory setting of resize(). Changed resize() to call fast_resize()
+          then do the memory setting.
+          Thank you to Kelly Hickel <kfh at mqsoftware dot com> for these
+          additions.
+
+
+Wed Nov 22 21:53:17 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        Pulled these in from the 5.5 stream:
+
+        Thu Nov 16 21:56:37 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.local.GNU: For creating the object file
+          directories (e.g., VDIR and VSHDIR, and their subdirectories), change
+          from using the directory as a prerequisite and make that prereq
+          a PHONY target to embed the command(s) to check and create the
+          directory if needed. This accomplishes two things: 1) allows the
+          make to work with clearmake in GNU compatibility mode (clearmake
+          always saw the PHONY target as remade and remade every file in the
+          project), and 2) avoids using a PHONY target as a prerequisite,
+          something the GNU make manual says to avoid. Thank you to Howard
+          Finer <hfiner at sonusnet dot com> for motivating and assisting
+          in this effort.
+
+        Tue Nov 14 22:33:03 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.lib.GNU: Change VLOBJS and VSHOBJS to
+          use $(patsubst) instead of $(if) to look for entries that have
+          relative directories in them (../). Avoids $(if) which does not
+          work in Clearcase's clearmake GNU compatibility mode.
+
+Wed Nov 22 19:52:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ace/Select_Reactor_T.inl:
+
+          Add #include of "Log_Msg.h".  This is required to bring things
+          into scope on systems where ACE_TEMPLATES_REQUIRE_SOURCE isn't
+          defined/needed.
+
+Wed Nov 22 18:27:39 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am:
+
+          Regenerated.
+
+        * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc:
+
+          Add automake specific includes definition to find headers
+          relative to source directory.
+
+Wed Nov 22 16:57:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am:
+
+          Regenerated.
+
+        * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc:
+
+          Add automake specific includes definition to find headers
+          relative to source directory.
+
+Wed Nov 22 16:48:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+
+          Hand tweak, HTBP tests depend on Test_Output library.  This
+          requires changing the build order so that the protocols dir
+          is built after tests.
+
+        * apps/gperf/tests/Makefile.am:
+
+          Hand tweak to find gperf executable on automake builds.  Chad
+          has given me info to make MPC generation work, which I'll add
+          in the near future.
+
+        * m4/ace.m4:
+
+          Placeholder for a BUILD_WXWINDOWS feature test.  For now it
+          always returns false.
+
+        * configure.ac:
+
+          Configure examples/ConfigViewer/Makefile.
+
+Wed Nov 22 15:34:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ace/Version.h:
+
+          Remove extraneous whitespace from ACE_VERSION macro definition.
+
+        * ace/Makefile.am:
+
+          Hand tweak.
+
+        * ace/QoS/Makefile.am:
+
+          Revert to earlier version until MPC generation issues are
+          resolved.
+
+        * apps/JAWS2/JAWS/Makefile.am:
+        * apps/JAWS3/jaws3/Makefile.am:
+
+          Regenerated.
+
+        * apps/JAWS2/JAWS/jaws2.mpc:
+        * apps/JAWS3/jaws3/jaws3.mpc:
+
+          Add automake specific includes definition to find headers
+          relative to source directory.
+
+Wed Nov 22 14:24:31 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ace/Makefile.am:
+
+          Regenerated.
+
+        * ace/ace_xtreactor.mpc:
+        * ace/ace_tkreactor.mpc:
+        * ace/ace_flreactor.mpc:
+        * ace/ace_qtreactor.mpc:
+
+          Changed to specify full name of pkgconfig template file,
+          the MPC Custom spec does not automatically match *.pc.in
+          files.
+
+Wed Nov 22 14:16:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/ConfigViewer/Makefile.am:
+
+          New file.
+
+Wed Nov 22 14:10:08 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * protocols/tests/RMCast/Makefile.am:
+        * protocols/tests/Makefile.am:
+        * protocols/tests/HTBP/Reactor_Tests/Makefile.am:
+        * protocols/tests/HTBP/Send_Large_Msg/Makefile.am:
+        * protocols/tests/HTBP/Makefile.am:
+        * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am:
+        * protocols/tests/HTBP/ping/Makefile.am:
+        * protocols/ace/RMCast/Makefile.am:
+        * protocols/ace/Makefile.am:
+        * protocols/ace/TMCast/Makefile.am:
+        * protocols/ace/HTBP/Makefile.am:
+        * protocols/examples/RMCast/Send_Msg/Makefile.am:
+        * protocols/examples/RMCast/Makefile.am:
+        * protocols/examples/Makefile.am:
+        * protocols/examples/TMCast/Member/Makefile.am:
+        * protocols/examples/TMCast/Makefile.am:
+        * ace/Makefile.am:
+        * ace/SSL/Makefile.am:
+        * ace/QoS/Makefile.am:
+        * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am:
+        * performance-tests/Synch-Benchmarks/Makefile.am:
+        * performance-tests/Synch-Benchmarks/Synch_Lib/Makefile.am:
+        * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am:
+        * performance-tests/Server_Concurrency/Leader_Follower/Makefile.am:
+        * performance-tests/Server_Concurrency/Makefile.am:
+        * performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile.am:
+        * performance-tests/TCP/Makefile.am:
+        * performance-tests/UDP/Makefile.am:
+        * performance-tests/SCTP/Makefile.am:
+        * performance-tests/Makefile.am:
+        * performance-tests/Misc/Makefile.am:
+        * Kokyu/tests/FIFO/Makefile.am:
+        * Kokyu/tests/DSRT_MIF/Makefile.am:
+        * Kokyu/tests/Makefile.am:
+        * Kokyu/tests/EDF/Makefile.am:
+        * Kokyu/Makefile.am:
+        * tests/SSL/Makefile.am:
+        * tests/Makefile.am:
+        * apps/Gateway/Gateway/Makefile.am:
+        * apps/Gateway/Makefile.am:
+        * apps/Gateway/Peer/Makefile.am:
+        * apps/mkcsregdb/Makefile.am:
+        * apps/drwho/Makefile.am:
+        * apps/gperf/tests/Makefile.am:
+        * apps/gperf/src/Makefile.am:
+        * apps/gperf/Makefile.am:
+        * apps/JAWS/clients/Blobby/Makefile.am:
+        * apps/JAWS/clients/Makefile.am:
+        * apps/JAWS/clients/Caching/Makefile.am:
+        * apps/JAWS/server/Makefile.am:
+        * apps/JAWS/Makefile.am:
+        * apps/JAWS2/JAWS/Makefile.am:
+        * apps/JAWS2/Makefile.am:
+        * apps/JAWS3/jaws3/Makefile.am:
+        * apps/JAWS3/Makefile.am:
+        * apps/soreduce/Makefile.am:
+        * bin/Makefile.am:
+        * ACEXML/tests/Makefile.am:
+        * ACEXML/tests/util/Makefile.am:
+        * ACEXML/apps/svcconf/Makefile.am:
+        * ACEXML/apps/Makefile.am:
+        * ACEXML/common/Makefile.am:
+        * ACEXML/Makefile.am:
+        * ACEXML/parser/Makefile.am:
+        * ACEXML/parser/parser/Makefile.am:
+        * ACEXML/examples/SAXPrint/Makefile.am:
+        * ACEXML/examples/Makefile.am:
+        * websvcs/tests/Makefile.am:
+        * websvcs/lib/Makefile.am:
+        * websvcs/Makefile.am:
+        * netsvcs/clients/Logger/Makefile.am:
+        * netsvcs/clients/Tokens/rw_lock/Makefile.am:
+        * netsvcs/clients/Tokens/mutex/Makefile.am:
+        * netsvcs/clients/Tokens/deadlock/Makefile.am:
+        * netsvcs/clients/Tokens/collection/Makefile.am:
+        * netsvcs/clients/Tokens/invariant/Makefile.am:
+        * netsvcs/clients/Tokens/manual/Makefile.am:
+        * netsvcs/clients/Naming/Dump_Restore/Makefile.am:
+        * netsvcs/clients/Naming/Makefile.am:
+        * netsvcs/clients/Naming/Client/Makefile.am:
+        * netsvcs/clients/Makefile.am:
+        * netsvcs/lib/Makefile.am:
+        * netsvcs/servers/Makefile.am:
+        * netsvcs/Makefile.am:
+        * ASNMP/tests/Makefile.am:
+        * ASNMP/Makefile.am:
+        * ASNMP/agent/Makefile.am:
+        * ASNMP/asnmp/Makefile.am:
+        * ASNMP/examples/get/Makefile.am:
+        * ASNMP/examples/trap/Makefile.am:
+        * ASNMP/examples/Makefile.am:
+        * ASNMP/examples/set/Makefile.am:
+        * ASNMP/examples/next/Makefile.am:
+        * ASNMP/examples/walk/Makefile.am:
+        * examples/OS/Makefile.am:
+        * examples/OS/Process/Makefile.am:
+        * examples/Synch/Makefile.am:
+        * examples/Timer_Queue/Makefile.am:
+        * examples/Log_Msg/Makefile.am:
+        * examples/Misc/Makefile.am:
+        * examples/ASX/CCM_App/Makefile.am:
+        * examples/ASX/Event_Server/Transceiver/Makefile.am:
+        * examples/ASX/Event_Server/Event_Server/Makefile.am:
+        * examples/ASX/Event_Server/Makefile.am:
+        * examples/ASX/Message_Queue/Makefile.am:
+        * examples/ASX/UPIPE_Event_Server/Makefile.am:
+        * examples/ASX/Makefile.am:
+        * examples/Web_Crawler/Makefile.am:
+        * examples/Shared_Malloc/Makefile.am:
+        * examples/QOS/Change_Sender_TSpec/Makefile.am:
+        * examples/QOS/Diffserv/Makefile.am:
+        * examples/QOS/Simple/Makefile.am:
+        * examples/QOS/Change_Receiver_FlowSpec/Makefile.am:
+        * examples/Bounded_Packet_Relay/Makefile.am:
+        * examples/System_V_IPC/SV_Message_Queues/Makefile.am:
+        * examples/System_V_IPC/Makefile.am:
+        * examples/System_V_IPC/SV_Semaphores/Makefile.am:
+        * examples/Map_Manager/Makefile.am:
+        * examples/APG/Svc_Config/Makefile.am:
+        * examples/APG/ThreadSafety/Makefile.am:
+        * examples/APG/ThreadPools/Makefile.am:
+        * examples/APG/Active_Objects/Makefile.am:
+        * examples/APG/Logging/Makefile.am:
+        * examples/APG/Misc_IPC/Makefile.am:
+        * examples/APG/Proactor/Makefile.am:
+        * examples/APG/Threads/Makefile.am:
+        * examples/APG/Shared_Memory/Makefile.am:
+        * examples/APG/Reactor/Makefile.am:
+        * examples/APG/Signals/Makefile.am:
+        * examples/APG/Timers/Makefile.am:
+        * examples/APG/ThreadManagement/Makefile.am:
+        * examples/APG/Config/Makefile.am:
+        * examples/APG/Containers/Makefile.am:
+        * examples/APG/Processes/Makefile.am:
+        * examples/APG/Naming/Makefile.am:
+        * examples/APG/Makefile.am:
+        * examples/APG/Sockets/Makefile.am:
+        * examples/APG/Streams/Makefile.am:
+        * examples/Registry/Makefile.am:
+        * examples/Smart_Pointers/Makefile.am:
+        * examples/DLL/Makefile.am:
+        * examples/IPC_SAP/DEV_SAP/reader/Makefile.am:
+        * examples/IPC_SAP/DEV_SAP/Makefile.am:
+        * examples/IPC_SAP/DEV_SAP/writer/Makefile.am:
+        * examples/IPC_SAP/FILE_SAP/Makefile.am:
+        * examples/IPC_SAP/SOCK_SAP/Makefile.am:
+        * examples/IPC_SAP/SPIPE_SAP/Makefile.am:
+        * examples/IPC_SAP/ATM_SAP/Makefile.am:
+        * examples/IPC_SAP/SSL_SAP/Makefile.am:
+        * examples/IPC_SAP/UPIPE_SAP/Makefile.am:
+        * examples/IPC_SAP/FIFO_SAP/Makefile.am:
+        * examples/IPC_SAP/Makefile.am:
+        * examples/IPC_SAP/TLI_SAP/Makefile.am:
+        * examples/Logger/Acceptor-server/Makefile.am:
+        * examples/Logger/Makefile.am:
+        * examples/Logger/simple-server/Makefile.am:
+        * examples/Logger/client/Makefile.am:
+        * examples/Export/Makefile.am:
+        * examples/Service_Configurator/Makefile.am:
+        * examples/Service_Configurator/IPC-tests/server/Makefile.am:
+        * examples/Service_Configurator/IPC-tests/Makefile.am:
+        * examples/Service_Configurator/IPC-tests/client/Makefile.am:
+        * examples/Service_Configurator/Misc/Makefile.am:
+        * examples/IOStream/server/Makefile.am:
+        * examples/IOStream/Makefile.am:
+        * examples/IOStream/client/Makefile.am:
+        * examples/Threads/Makefile.am:
+        * examples/Shared_Memory/Makefile.am:
+        * examples/Reactor/Ntalker/Makefile.am:
+        * examples/Reactor/TP_Reactor/Makefile.am:
+        * examples/Reactor/FIFO/Makefile.am:
+        * examples/Reactor/Multicast/Makefile.am:
+        * examples/Reactor/WFMO_Reactor/Makefile.am:
+        * examples/Reactor/Proactor/Makefile.am:
+        * examples/Reactor/Makefile.am:
+        * examples/Reactor/Dgram/Makefile.am:
+        * examples/Reactor/Misc/Makefile.am:
+        * examples/Connection/non_blocking/Makefile.am:
+        * examples/Connection/blocking/Makefile.am:
+        * examples/Connection/Makefile.am:
+        * examples/Connection/misc/Makefile.am:
+        * examples/NT_Service/Makefile.am:
+        * examples/Naming/Makefile.am:
+        * examples/Makefile.am:
+        * examples/Mem_Map/IO-tests/Makefile.am:
+        * examples/Mem_Map/file-reverse/Makefile.am:
+        * examples/Mem_Map/Makefile.am:
+        * examples/C++NPv1/Makefile.am:
+        * examples/C++NPv2/Makefile.am:
+
+          Regenerated.
+
+Wed Nov 22 13:45:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Update for HTBP unit test and TMCast example move.
+
+        * protocols/tests/HTBP/Reactor_Tests/Reactor_Tests.mpc:
+        * protocols/tests/HTBP/Reactor_Tests/client.cpp:
+        * protocols/tests/HTBP/Reactor_Tests/inside.conf:
+        * protocols/tests/HTBP/Reactor_Tests/server.cpp:
+        * protocols/tests/HTBP/Reactor_Tests/Makefile.am:
+        * protocols/tests/HTBP/Reactor_Tests/test_config.h:
+        * protocols/tests/HTBP/Reactor_Tests/run_test.pl:
+        * protocols/tests/HTBP/HTBP_Config.conf:
+        * protocols/tests/HTBP/Send_Large_Msg/client.cpp:
+        * protocols/tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc:
+        * protocols/tests/HTBP/Send_Large_Msg/server.cpp:
+        * protocols/tests/HTBP/Send_Large_Msg/Makefile.am:
+        * protocols/tests/HTBP/Send_Large_Msg/run_test.pl:
+        * protocols/tests/HTBP/Makefile.am:
+        * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc:
+        * protocols/tests/HTBP/Send_Recv_Tests/Makefile.am:
+        * protocols/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp:
+        * protocols/tests/HTBP/htbptest.mpb:
+        * protocols/tests/HTBP/ping/client.cpp:
+        * protocols/tests/HTBP/ping/server.cpp:
+        * protocols/tests/HTBP/ping/Makefile.am:
+        * protocols/tests/HTBP/ping/ping.mpc:
+        * protocols/tests/HTBP/ping/run_test.pl:
+        * protocols/tests/HTBP/README:
+
+          Move HTBP unit tests to protocols/tests/HTBP...
+
+        * tests/HTBP/Reactor_Tests/Reactor_Tests.mpc:
+        * tests/HTBP/Reactor_Tests/client.cpp:
+        * tests/HTBP/Reactor_Tests/inside.conf:
+        * tests/HTBP/Reactor_Tests/server.cpp:
+        * tests/HTBP/Reactor_Tests/Makefile.am:
+        * tests/HTBP/Reactor_Tests/test_config.h:
+        * tests/HTBP/Reactor_Tests/run_test.pl:
+        * tests/HTBP/HTBP_Config.conf:
+        * tests/HTBP/Send_Large_Msg/client.cpp:
+        * tests/HTBP/Send_Large_Msg/Send_Large_Msg.mpc:
+        * tests/HTBP/Send_Large_Msg/server.cpp:
+        * tests/HTBP/Send_Large_Msg/Makefile.am:
+        * tests/HTBP/Send_Large_Msg/run_test.pl:
+        * tests/HTBP/Makefile.am:
+        * tests/HTBP/Send_Recv_Tests/SendRecv_Test.mpc:
+        * tests/HTBP/Send_Recv_Tests/Makefile.am:
+        * tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp:
+        * tests/HTBP/htbptest.mpb:
+        * tests/HTBP/ping/client.cpp:
+        * tests/HTBP/ping/server.cpp:
+        * tests/HTBP/ping/Makefile.am:
+        * tests/HTBP/ping/ping.mpc:
+        * tests/HTBP/ping/run_test.pl:
+        * tests/HTBP/README:
+
+          ...from tests/HTBP.
+
+        * protocols/examples/TMCast/Member/Member.mpc:
+        * protocols/examples/TMCast/Member/member.cpp:
+        * protocols/examples/TMCast/Member/Makefile.am:
+        * protocols/examples/TMCast/Member/README:
+        * protocols/examples/TMCast/Makefile.am:
+
+          Moved TMCast examples to protocols/examples/TMCast...
+
+        * examples/TMCast/Member/Member.mpc:
+        * examples/TMCast/Member/member.cpp:
+        * examples/TMCast/Member/Makefile.am:
+        * examples/TMCast/Member/README:
+        * examples/TMCast/Makefile.am:
+
+          ...from examples/TMCast.
+
+Wed Nov 22 13:25:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ace_for_tao.mpc:
+          Add uuid as base project. For building COIOP as part of the
+          TAO strategies library we need uuid. The nicest solution would
+          be to make the uuid feature dependent on the ace_for_tao
+          feature and let the user overrule this but that is not
+          possible yet. If you are using ace_for_tao and don't want
+          to have uuid pulled in, set uuid explicitly to 0 in your
+          default.features file.
+
+Wed Nov 22 10:48:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Msg.cpp:
+          Refactored handling of %W. Added a check for a nill pointer
+          as we have for ascii strings. Fixes bugzilla 2277.
+
+        * tests/Log_Msg_Test.cpp:
+          Added test for %W with a string as argument and with a
+          nill pointer. Fixes bugzilla 2715.
+
+Wed Nov 22 10:38:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Misc/test_XtReactor1.cpp:
+        * examples/Misc/test_XtReactor2.cpp:
+        * tests/FlReactor_Test.cpp:
+        * tests/XtReactor_Test.cpp:
+        * tests/TkReactor_Test.cpp:
+        * tests/QtReactor_Test.cpp:
+          Updated because of move below.
+
+Wed Nov 22 10:35:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/QtReactor*.*:
+        * ace/FlReactor*.*:
+        * ace/XtReactor*.*:
+        * ace/TkReactor*.*:
+          Moved these reactors to their own subdirectories to make
+          maintenance a lot easier.
+
+Wed Nov 22 10:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/core_anytypecode.mpb:
+          Removed svn:executable property
+
+        * bin/MakeProjectCreator/config/core_strategies.mpb
+          New base project for the strategies library when build in
+          ace_for_tao configuration
+
+        * bin/MakeProjectCreator/config/orbsvcslib.mpb:
+          Removed -GT so that we also don't generate TIE files for the
+          orbsvcs anymore. Will speedup builds and simplify other mpc
+          files
+
+        * bin/MakeProjectCreator/config/strategies.mpb
+          Derive from core_strategies. Now the strategies library
+          does get build in an ace_for_tao configuration but
+          shmiop and uiop are not build at all, other protocols
+          can be build. This way we can build COIOP in an ace_for_tao
+          setup
+
+        * bin/make_release:
+          Removed dsp/dsw reference, corrected naming of the ACE
+          packages when the version number gets added.
+
+        * include/makeinclude/platform_hpux_aCC.GNU:
+          Removed HPUX 10.20 support
+
+        * include/makeinclude/platform_lynxos.GNU:
+          ACE_HAS_BROKEN_THREAD_KEYFREE is now set in the config file
+
+        * include/makeinclude/wrapper_macros.GNU:
+          Removed ACE_HAS_GNUG_PRE_2_8 checks
+
+Wed Nov 22 09:07:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/run_test.txt:
+          Document ACE_RUN_VX_TGT_HOST
+
+        * docs/bczar/bczar.html:
+          Updated this file
+
+        * ace/config-freebsd.h:
+        * ace/POSIX_Proactor.cpp:
+          Added ACE_HAS_SIGVAL_SIGVAL_INT, this fixes bugzilla
+          bug 2716. Thanks to Craig Rodrigues
+          <rodrigc at crodrigues dot org> for reporting this.
+
+        * ace/ace.mpc:
+          Added missing OS.inl. This fixes bugzilla bug 2705.
+          Thanks to Daniel Black <dragonheart at gentoo dot org>
+          for reporting this.
+
+        * Release:
+          Removed dsw files
+
+        * ace/config-rtems.h:
+        * ace/config-posix-nonetworking.h:
+          Moved the configuration to build without no networking
+          support to its own file so that we can reuse this for
+          example on linux
+
+        * ace/config-rtems.h:
+          Added support for rtems 4.7
+
+        * ace/config-unixware-7.1.0.udk.h:
+          Cleanup
+
+        * ace/config-lyxos.h:
+          Added support for LynxOS 4.2
+
+        * ace/config-linux.h:
+        * ace/config-linux-common.h:
+          Moved ACE_HAS_GETIFADDRS to the common file and added
+          support for ACE_LACKS_NETWORKING on linux
+
+        * ace/INET_Addr.cpp:
+        * ace/OS_NS_netdb.cpp
+          Fixed compile problem when using ACE_LACKS_NETWORKING on
+          linux
+
+        * ace/Obstack.h:
+          Use ACE_EXPORT_SINGLETON_DECLARATION to resolve link errors
+          on FC6. Thanks to Ken Sedgwick <ken at bonsai dot com> for
+          reporting this and testing out the patch.
+
+        * ace/OS_NS_string.inl:
+          Initialise pointer with 0
+
+Mon Nov 20 08:16:34 2006  Simon McQueen  <sm@prismtech.com>
+
+        * ACE version 5.5.4 released.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/ACE/NEWS b/ACE/NEWS
index c618fb09cb8..b8ab049dcb0 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -3,7 +3,7 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 
 . (Remedy) OpenVMS 8.3 on IA64 port
 
-PLANNED CHANGES FOR "ACE-5.5.6"
+PLANNED CHANGES FOR "ACE-5.5.7"
 ===============================
 
 . (OO) Minor 64 bit file offset fixes for ACE AIO classes on HP-UX.
@@ -12,9 +12,24 @@ PLANNED CHANGES FOR "ACE-5.5.6"
 
 . (Riverace) Pharlap ETS 13 qualification.
 
+USER VISIBLE CHANGES BETWEEN ACE-5.5.5 and ACE-5.5.6
+====================================================
+
+. The ACE_TYPENAME macro has been added to those that are not
+  available when the ACE_LACKS_DEPRECATED_MACROS config option is set
+  (it is not set by default). You are encouraged to replace the use of
+  ACE_TYPENAME with the C++ typename keyword before the ACE_TYPENAME
+  macros is removed from ACE in the future.
+
+. A new script, rm_exception_macros.pl, has been added to help users
+  remove the use of the ACE exception macros from their own code.
+
 USER VISIBLE CHANGES BETWEEN ACE-5.5.4 and ACE-5.5.5
 ====================================================
 
+. The prebuild MPC keyword is now supported by the gnuace project type.
+  This fixes Bugzilla #2713.
+
 . Support for Windows earlier than NT 4 SP2 was removed. ACE will not build
   for Windows 95, 98, Me, etc. out of the box any longer.
 
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 9eccbd1eab0..cca00b4130e 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -43,7 +43,7 @@
 To: ace-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 5.5.4
+    ACE VERSION: 5.5.6
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/THANKS b/ACE/THANKS
index a44741d0f3b..eab28e75749 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2169,6 +2169,8 @@ Sergey Kosenko <sergey dot kosenko at gmail dot com>
 Pavel Zaichenko <zpf at ivl dot ua>
 Paul Riley <paul at riley dot net>
 Nelson Filipe Ferreira Gonçalves <ngoncalves at isr dot ist dot utl dot pt>
+Harry Goldschmitt <harry at hgac dot com>
+<sailzeng at tencent dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ACE/VERSION b/ACE/VERSION
index 91fcb538a9c..db938626298 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.5.4, released Mon Nov 20 08:16:34 2006.
+This is ACE version 5.5.6, released Sun Jan 28 19:59:14 2007.
 
 If you have any problems with or questions about ACE, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h
index 4b2c236b6f6..df71f9fead6 100644
--- a/ACE/ace/Acceptor.h
+++ b/ACE/ace/Acceptor.h
@@ -55,10 +55,10 @@ class ACE_Acceptor : public ACE_Service_Object
 public:
 
   // Useful STL-style traits.
-  typedef ACE_PEER_ACCEPTOR_ADDR                 addr_type;
-  typedef ACE_PEER_ACCEPTOR                      acceptor_type;
-  typedef SVC_HANDLER                            handler_type;
-  typedef ACE_TYPENAME SVC_HANDLER::stream_type  stream_type;
+  typedef ACE_PEER_ACCEPTOR_ADDR            addr_type;
+  typedef ACE_PEER_ACCEPTOR                 acceptor_type;
+  typedef SVC_HANDLER                       handler_type;
+  typedef typename SVC_HANDLER::stream_type stream_type;
 
   /// "Do-nothing" constructor.
   ACE_Acceptor (ACE_Reactor * = 0,
@@ -523,10 +523,10 @@ class ACE_Oneshot_Acceptor : public ACE_Service_Object
 public:
 
   // Useful STL-style traits.
-  typedef ACE_PEER_ACCEPTOR_ADDR                 addr_type;
-  typedef ACE_PEER_ACCEPTOR                      acceptor_type;
-  typedef SVC_HANDLER                            handler_type;
-  typedef ACE_TYPENAME SVC_HANDLER::stream_type  stream_type;
+  typedef ACE_PEER_ACCEPTOR_ADDR            addr_type;
+  typedef ACE_PEER_ACCEPTOR                 acceptor_type;
+  typedef SVC_HANDLER                       handler_type;
+  typedef typename SVC_HANDLER::stream_type stream_type;
 
   /// Constructor.
   ACE_Oneshot_Acceptor (void);
diff --git a/ACE/ace/Argv_Type_Converter.cpp b/ACE/ace/Argv_Type_Converter.cpp
index e12bda80ff3..2f18574a0a2 100644
--- a/ACE/ace/Argv_Type_Converter.cpp
+++ b/ACE/ace/Argv_Type_Converter.cpp
@@ -33,7 +33,7 @@ ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, wchar_t** argv)
 #endif  // ACE_USES_WCHAR
 
 
-ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, char** argv)
+ACE_Argv_Type_Converter::ACE_Argv_Type_Converter (int &argc, char **argv)
   : saved_argc_(argc),
     char_argv_(argv)
 #if defined (ACE_USES_WCHAR)
@@ -71,7 +71,7 @@ ACE_Argv_Type_Converter::~ACE_Argv_Type_Converter (void)
   else
     {
       // if original type is char
-      if (this->wchar_passed_) 
+      if (this->wchar_passed_)
         this->align_char_with_wchar ();
 
       for (int i = 0; i < this->before_pass_argc_; ++i)
@@ -87,7 +87,7 @@ void
 ACE_Argv_Type_Converter::initialize (void)
 {
   if (this->original_type_)
-    {  
+    {
       // Make a copy of argv in 'char'. type Create one more argv entry
       // than original argc for the NULL.
       ACE_NEW (char_argv_,
@@ -96,9 +96,9 @@ ACE_Argv_Type_Converter::initialize (void)
                                           // always a NULL
     }
   else
-    {  
+    {
       // make a copy of argv in 'wchar_t' type
-      ACE_NEW (this->wchar_argv_, 
+      ACE_NEW (this->wchar_argv_,
                wchar_t*[this->saved_argc_ + 1]);
       this->wchar_argv_[saved_argc_] = 0;
     }
diff --git a/ACE/ace/Asynch_Pseudo_Task.cpp b/ACE/ace/Asynch_Pseudo_Task.cpp
index b3e25ef0298..b9dd61a1f5f 100644
--- a/ACE/ace/Asynch_Pseudo_Task.cpp
+++ b/ACE/ace/Asynch_Pseudo_Task.cpp
@@ -9,15 +9,15 @@ ACE_RCSID(ace, Asynch_Pseudo_Task, "$Id$")
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Asynch_Pseudo_Task::ACE_Asynch_Pseudo_Task()
+ACE_Asynch_Pseudo_Task::ACE_Asynch_Pseudo_Task ()
   : select_reactor_ (),               // should be initialized before reactor_
     reactor_ (&select_reactor_, 0)    // don't delete implementation
 {
 }
 
-ACE_Asynch_Pseudo_Task::~ACE_Asynch_Pseudo_Task()
+ACE_Asynch_Pseudo_Task::~ACE_Asynch_Pseudo_Task ()
 {
-  this->stop();
+  this->stop ();
 }
 
 int
@@ -63,7 +63,7 @@ ACE_Asynch_Pseudo_Task::svc (void)
                 ACE_LIB_TEXT ("pthread_sigmask")));
 #endif
 
-  reactor_.owner (ACE_Thread::self());
+  reactor_.owner (ACE_Thread::self ());
   reactor_.run_reactor_event_loop ();
 
   return 0;
@@ -92,8 +92,7 @@ ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle,
         ((LM_ERROR,
           ACE_LIB_TEXT ("%N:%l:%p\n"),
           ACE_LIB_TEXT ("register_io_handler (suspended)")));
-      this->reactor_.remove_handler (handle,
-                                     ACE_Event_Handler::ALL_EVENTS_MASK
+      this->reactor_.remove_handler (handle, ACE_Event_Handler::ALL_EVENTS_MASK
                                      | ACE_Event_Handler::DONT_CALL);
       return -1;
     }
@@ -104,7 +103,7 @@ ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle,
 int
 ACE_Asynch_Pseudo_Task::remove_io_handler (ACE_HANDLE handle)
 {
-  return this->reactor_.remove_handler (handle ,
+  return this->reactor_.remove_handler (handle,
                                         ACE_Event_Handler::ALL_EVENTS_MASK
                                         | ACE_Event_Handler::DONT_CALL);
 }
@@ -112,8 +111,7 @@ ACE_Asynch_Pseudo_Task::remove_io_handler (ACE_HANDLE handle)
 int
 ACE_Asynch_Pseudo_Task::remove_io_handler (ACE_Handle_Set &set)
 {
-  return this->reactor_.remove_handler (set,
-                                        ACE_Event_Handler::ALL_EVENTS_MASK
+  return this->reactor_.remove_handler (set, ACE_Event_Handler::ALL_EVENTS_MASK
                                         | ACE_Event_Handler::DONT_CALL);
 }
 
diff --git a/ACE/ace/Based_Pointer_Repository.cpp b/ACE/ace/Based_Pointer_Repository.cpp
index 74ea8994c6d..a76d3dbcbd3 100644
--- a/ACE/ace/Based_Pointer_Repository.cpp
+++ b/ACE/ace/Based_Pointer_Repository.cpp
@@ -23,7 +23,7 @@ class ACE_Based_Pointer_Repository_Rep
 public:
   // Useful typedefs.
   typedef ACE_Map_Manager <void *, size_t, ACE_Null_Mutex> MAP_MANAGER;
-  typedef ACE_Map_Iterator < void *, size_t, ACE_Null_Mutex> MAP_ITERATOR;
+  typedef ACE_Map_Iterator <void *, size_t, ACE_Null_Mutex> MAP_ITERATOR;
   typedef ACE_Map_Entry <void *, size_t> MAP_ENTRY;
 
   /// Keeps track of the mapping between addresses and their associated
@@ -50,8 +50,7 @@ ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository (void)
 // Search for appropriate base address in repository
 
 int
-ACE_Based_Pointer_Repository::find (void *addr,
-                                    void *&base_addr)
+ACE_Based_Pointer_Repository::find (void *addr, void *&base_addr)
 {
   ACE_TRACE ("ACE_Based_Pointer_Repository::find");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->rep_->lock_, -1);
@@ -62,7 +61,7 @@ ACE_Based_Pointer_Repository::find (void *addr,
        iter.advance ())
     // Check to see if <addr> is within any of the regions.
     if (addr >= ce->ext_id_
-        && addr < ((char *) ce->ext_id_ + ce->int_id_))
+        && addr < ((char *)ce->ext_id_ + ce->int_id_))
       {
         // Assign the base address.
         base_addr = ce->ext_id_;
@@ -78,8 +77,7 @@ ACE_Based_Pointer_Repository::find (void *addr,
 // existing entry.
 
 int
-ACE_Based_Pointer_Repository::bind (void *addr,
-                                    size_t size)
+ACE_Based_Pointer_Repository::bind (void *addr, size_t size)
 {
   ACE_TRACE ("ACE_Based_Pointer_Repository::bind");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->rep_->lock_, -1);
@@ -105,7 +103,7 @@ ACE_Based_Pointer_Repository::unbind (void *addr)
       // Check to see if <addr> is within any of the regions and if
       // so, unbind the key from the map.
       if (addr >= ce->ext_id_
-          && addr < ((char *) ce->ext_id_ + ce->int_id_))
+          && addr < ((char *)ce->ext_id_ + ce->int_id_))
         // Unbind base address.
         return this->rep_->addr_map_.unbind (ce->ext_id_);
     }
diff --git a/ACE/ace/Basic_Stats.cpp b/ACE/ace/Basic_Stats.cpp
index 0f00f5b7332..cfe8ca320b0 100644
--- a/ACE/ace/Basic_Stats.cpp
+++ b/ACE/ace/Basic_Stats.cpp
@@ -46,8 +46,7 @@ ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs)
 }
 
 void
-ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg,
-                               ACE_UINT32 sf) const
+ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, ACE_UINT32 sf) const
 {
 #ifndef ACE_NLOGGING
   if (this->samples_count () == 0u)
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index 40504e1a2cf..ce0d9b91e65 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -484,7 +484,7 @@ private:
   /// The current block in the chain where we are writing.
   ACE_Message_Block *current_;
 
-#if !defined (ACE_LACKS_CDR_IALIGNMENT)
+#if !defined (ACE_LACKS_CDR_ALIGNMENT)
   /**
    * The current alignment as measured from the start of the buffer.
    * Usually this coincides with the alignment of the buffer in
diff --git a/ACE/ace/CORBA_macros.h b/ACE/ace/CORBA_macros.h
index 4a7a3c44bf0..b7a3d1c01a9 100644
--- a/ACE/ace/CORBA_macros.h
+++ b/ACE/ace/CORBA_macros.h
@@ -413,7 +413,7 @@
       } while (0); \
     } while (0)
 
-#endif /* ! ACE_CORBA_HAS_EXCEPTIONS */
+#endif /* ! ACE_USES_NATIVE_EXCEPTIONS */
 
 // ACE_HAS_EXCEPTIONS is not the same as ACE_NEW_THROWS_EXCEPTIONS.
 #if defined(ACE_NEW_THROWS_EXCEPTIONS)
@@ -545,7 +545,7 @@
 #  define ACE_ENV_RAISE(ex) ACE_TRY_ENV.exception (ex)
 #else
 #  define ACE_ENV_RAISE(ex) (ex)->_raise ()
-#endif /* ACE_CORBA_HAS_EXCEPTIONS */
+#endif /* ACE_USES_NATIVE_EXCEPTIONS */
 
 // ============================================================
 
diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp
index 706142c640d..9906cd0a2f5 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.cpp
+++ b/ACE/ace/Cached_Connect_Strategy_T.cpp
@@ -67,7 +67,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
   found = 0;
 
   // Get the recycling act for the svc_handler
-  CONNECTION_CACHE_ENTRY *possible_entry = (CONNECTION_CACHE_ENTRY *) sh->recycling_act ();
+  CONNECTION_CACHE_ENTRY *possible_entry =
+    (CONNECTION_CACHE_ENTRY *) sh->recycling_act ();
 
   // Check to see if the hint svc_handler has been closed down
   if (possible_entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED)
@@ -529,8 +530,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup (void)
   ACE_GUARD (MUTEX, ace_mon, *this->lock_);
 
   // Close down all cached service handlers.
-  ACE_TYPENAME CONNECTION_CACHE::ITERATOR iter =
-    this->connection_cache_.begin ();
+  typename CONNECTION_CACHE::ITERATOR iter = this->connection_cache_.begin ();
   while (iter != this->connection_cache_.end ())
     {
       if ((*iter).second () != 0)
@@ -544,7 +544,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup (void)
           (*iter).second ()->close ();
 
           // remember next iter
-          ACE_TYPENAME CONNECTION_CACHE::ITERATOR next_iter = iter;
+          typename CONNECTION_CACHE::ITERATOR next_iter = iter;
           ++next_iter;
 
           // purge the item from the hash
diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h
index fe7f6df2d6a..4c0937490a5 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.h
+++ b/ACE/ace/Cached_Connect_Strategy_T.h
@@ -85,9 +85,9 @@ public:
                                     CACHING_STRATEGY,
                                     ATTRIBUTES>
           CONNECTION_CACHE;
-  typedef ACE_TYPENAME CONNECTION_CACHE::CACHE_ENTRY CONNECTION_CACHE_ENTRY;
-  typedef ACE_TYPENAME CONNECTION_CACHE::key_type KEY;
-  typedef ACE_TYPENAME CONNECTION_CACHE::mapped_type VALUE;
+  typedef typename CONNECTION_CACHE::CACHE_ENTRY CONNECTION_CACHE_ENTRY;
+  typedef typename CONNECTION_CACHE::key_type KEY;
+  typedef typename CONNECTION_CACHE::mapped_type VALUE;
 
   typedef ACE_Recyclable_Handler_Cleanup_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
                                                   ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,
diff --git a/ACE/ace/Codeset_IBM1047.cpp b/ACE/ace/Codeset_IBM1047.cpp
index 469c15089c4..d69857c558c 100644
--- a/ACE/ace/Codeset_IBM1047.cpp
+++ b/ACE/ace/Codeset_IBM1047.cpp
@@ -19,13 +19,14 @@
 
 #include "ace/Codeset_IBM1047.h"
 
-#if defined(ACE_MVS)
+#if defined (ACE_HAS_EBCDIC)
 
 ACE_RCSID (ace,
            Codeset_IBM1047,
            "$Id$")
 
-// ****************************************************************
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
 
 namespace
 {
@@ -172,7 +173,7 @@ ACE_IBM1047_ISO8859::write_char_array (ACE_OutputCDR& out,
                                        const ACE_CDR::Char* x,
                                        ACE_CDR::ULong len)
 {
-  char *buf;
+  char *buf = 0;
   if (this->adjust (out, len, 1, buf) == 0)
     {
       ACE_OS::memcpy (buf, x, len);
@@ -209,7 +210,6 @@ ACE_ISO8859_IBM1047::tcs ()
   return 0x10020417;
 }
 
-
 ACE_CDR::Boolean
 ACE_ISO8859_IBM1047::read_char (ACE_InputCDR& in,
                                 ACE_CDR::Char& x)
@@ -291,7 +291,7 @@ ACE_ISO8859_IBM1047::write_char_array (ACE_OutputCDR &out,
                                        const ACE_CDR::Char *x,
                                        ACE_CDR::ULong len)
 {
-  char *buf;
+  char *buf = 0;
 
   if (this->adjust (out, len, 1, buf) == 0)
     {
@@ -309,9 +309,7 @@ ACE_ISO8859_IBM1047::write_char_array (ACE_OutputCDR &out,
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-// ****************************************************************
-
 #elif defined (__HP_aCC)
 // Make aC++ stop complaining about an empty translation unit
 static int const shut_up_aCC = 0;
-#endif /* ACE_MVS */
+#endif /* ACE_HAS_EBCDIC */
diff --git a/ACE/ace/Codeset_IBM1047.h b/ACE/ace/Codeset_IBM1047.h
index 88f7dc8f609..c5bfdafcd49 100644
--- a/ACE/ace/Codeset_IBM1047.h
+++ b/ACE/ace/Codeset_IBM1047.h
@@ -25,7 +25,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined(ACE_MVS)
+#if defined (ACE_HAS_EBCDIC)
 
 #include "ace/CDR_Stream.h"
 
@@ -121,7 +121,7 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* ACE_MVS */
+#endif /* ACE_EBCDIC */
 
 #include /**/ "ace/post.h"
 
diff --git a/ACE/ace/Codeset_Registry.cpp b/ACE/ace/Codeset_Registry.cpp
index 5d3c6abb59b..b98a1dd7e89 100644
--- a/ACE/ace/Codeset_Registry.cpp
+++ b/ACE/ace/Codeset_Registry.cpp
@@ -33,9 +33,9 @@ ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale,
                                             ACE_CDR::UShort *num_sets,
                                             ACE_CDR::UShort **char_sets)
 {
-  registry_entry const * element = 0;
+  registry_entry const *element = 0;
   for (size_t i = 0; element == 0 && i < num_registry_entries_; i++)
-    if (ACE_OS::strcmp(registry_db_[i].loc_name_,locale.c_str()) == 0)
+    if (ACE_OS::strcmp (registry_db_[i].loc_name_, locale.c_str ()) == 0)
       element = &registry_db_[i];
   if (element == 0)
     return 0;
@@ -45,8 +45,7 @@ ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale,
   if (char_sets != 0)
     {
       ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0);
-      ACE_OS::memcpy (*char_sets,
-                      element->char_sets_,
+      ACE_OS::memcpy (*char_sets, element->char_sets_,
                       element->num_sets_ * sizeof (ACE_CDR::UShort));
     }
   return 1;
@@ -58,20 +57,19 @@ ACE_Codeset_Registry::registry_to_locale_i (ACE_CDR::ULong codeset_id,
                                             ACE_CDR::UShort *num_sets,
                                             ACE_CDR::UShort **char_sets)
 {
-  registry_entry const * element = 0;
+  registry_entry const *element = 0;
   for (size_t i = 0; element == 0 && i < num_registry_entries_; i++)
     if (codeset_id == registry_db_[i].codeset_id_)
       element = &registry_db_[i];
   if (element == 0)
     return 0;
-  locale.set(element->loc_name_);
+  locale.set (element->loc_name_);
   if (num_sets != 0)
     *num_sets = element->num_sets_;
   if (char_sets != 0)
     {
       ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0);
-      ACE_OS::memcpy (*char_sets,
-                      element->char_sets_,
+      ACE_OS::memcpy (*char_sets, element->char_sets_,
                       element->num_sets_ * sizeof (ACE_CDR::UShort));
     }
   return 1;
@@ -81,8 +79,8 @@ int
 ACE_Codeset_Registry::is_compatible_i (ACE_CDR::ULong codeset_id,
                                        ACE_CDR::ULong other)
 {
-  registry_entry const * lhs = 0;
-  registry_entry const * rhs = 0;
+  registry_entry const *lhs = 0;
+  registry_entry const *rhs = 0;
   for (size_t i = 0; (lhs == 0 || rhs == 0) && i < num_registry_entries_; i++)
     {
       if (codeset_id == registry_db_[i].codeset_id_)
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index 41a2e688c1e..f92ebea99a9 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -156,18 +156,12 @@ class ACE_Connector : public ACE_Connector_Base<SVC_HANDLER>, public ACE_Service
 public:
 
   // Useful STL-style traits.
-  typedef ACE_TYPENAME SVC_HANDLER::addr_type    addr_type;
+  typedef typename SVC_HANDLER::addr_type        addr_type;
   typedef ACE_PEER_CONNECTOR                     connector_type;
   typedef SVC_HANDLER                            handler_type;
-  typedef ACE_TYPENAME SVC_HANDLER::stream_type  stream_type;
-
-  // typedef ACE_TYPENAME ACE_PEER_CONNECTOR_ADDR PEER_ADDR;
-#if defined (ACE_HAS_TYPENAME_KEYWORD)
-  typedef ACE_PEER_CONNECTOR_ADDR ACE_PEER_ADDR_TYPEDEF;
-#endif /* ACE_HAS_TYPENAME_KEYWORD */
-
-  typedef ACE_TYPENAME _ACE_PEER_CONNECTOR::PEER_ADDR
-  ACE_TYPENAME_ACE_PEER_CONNECTOR_PEER_ADDR;
+  typedef typename SVC_HANDLER::stream_type      stream_type;
+  typedef typename ACE_PEER_CONNECTOR::PEER_ADDR peer_addr_type;
+  typedef ACE_PEER_CONNECTOR_ADDR                ACE_PEER_ADDR_TYPEDEF;
 
   /**
    * Initialize a connector.  @a flags indicates how <SVC_HANDLER>'s
@@ -207,7 +201,7 @@ public:
                        const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                        const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
                        const ACE_PEER_CONNECTOR_ADDR &local_addr
-                       = (ACE_TYPENAME_ACE_PEER_CONNECTOR_PEER_ADDR &) ACE_PEER_CONNECTOR_ADDR_ANY,
+                       = (peer_addr_type &) ACE_PEER_CONNECTOR_ADDR_ANY,
                        int reuse_addr = 0,
                        int flags = O_RDWR,
                        int perms = 0);
@@ -227,7 +221,7 @@ public:
                        const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                        const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
                        const ACE_PEER_CONNECTOR_ADDR &local_addr
-                       = (ACE_TYPENAME_ACE_PEER_CONNECTOR_PEER_ADDR &) ACE_PEER_CONNECTOR_ADDR_ANY,
+                       = (peer_addr_type &) ACE_PEER_CONNECTOR_ADDR_ANY,
                        int reuse_addr = 0,
                        int flags = O_RDWR,
                        int perms = 0);
@@ -235,7 +229,7 @@ public:
   /**
    * Initiate connection of @a n @a svc_handlers to peers at
    * @a remote_addrs using @a synch_options.  Returns -1 if failure
-   * occurs and 0 otherwise.  If <failed_svc_handlers> is non-NULL, a
+   * occurs and 0 otherwise.  If @a failed_svc_handlers is non-NULL, a
    * 1 is placed in the corresponding index of <failed_svc_handler>
    * for each <svc_handlers[i]> that failed to connect, else a 0 is
    * placed in that index.
@@ -297,8 +291,8 @@ protected:
   virtual int make_svc_handler (SVC_HANDLER *&sh);
 
   /**
-   * Bridge method for connecting the <svc_handler> to the
-   * <remote_addr>.  The default behavior delegates to the
+   * Bridge method for connecting the @a svc_handler to the
+   * @a remote_addr.  The default behavior delegates to the
    * <PEER_CONNECTOR::connect>.
    */
   virtual int connect_svc_handler (SVC_HANDLER *&svc_handler,
@@ -318,7 +312,7 @@ protected:
                                    int perms);
 
   /**
-   * Bridge method for activating a <svc_handler> with the appropriate
+   * Bridge method for activating a @a svc_handler with the appropriate
    * concurrency strategy.  The default behavior of this method is to
    * activate the SVC_HANDLER by calling its <open> method (which
    * allows the SVC_HANDLER to define its own concurrency strategy).
@@ -356,7 +350,7 @@ protected:
   virtual int fini (void);
 
   /// Default version returns address info in <buf>.
-  virtual int info (ACE_TCHAR **, size_t) const;
+  virtual int info (ACE_TCHAR **strp, size_t length) const;
 
   // = Service management hooks.
   /// Default version does no work and returns -1.  Must be overloaded
diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp
index 4ae7d970f6f..5c2dd1da01f 100644
--- a/ACE/ace/Containers_T.cpp
+++ b/ACE/ace/Containers_T.cpp
@@ -1243,7 +1243,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (void)
   ACE_TRACE ("ACE_Bounded_Set<T>::ACE_Bounded_Set");
 
   ACE_NEW (this->search_structure_,
-           ACE_TYPENAME ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
+           typename ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
 
   for (size_t i = 0; i < this->max_size_; ++i)
     this->search_structure_[i].is_free_ = 1;
@@ -1264,7 +1264,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (const ACE_Bounded_Set<T> &bs)
   ACE_TRACE ("ACE_Bounded_Set<T>::ACE_Bounded_Set");
 
   ACE_NEW (this->search_structure_,
-           ACE_TYPENAME ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
+           typename ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
 
   for (size_t i = 0; i < this->cur_size_; i++)
     this->search_structure_[i] = bs.search_structure_[i];
@@ -1281,7 +1281,7 @@ ACE_Bounded_Set<T>::operator= (const ACE_Bounded_Set<T> &bs)
         {
           delete [] this->search_structure_;
           ACE_NEW (this->search_structure_,
-                   ACE_TYPENAME ACE_Bounded_Set<T>::Search_Structure[bs.cur_size_]);
+                   typename ACE_Bounded_Set<T>::Search_Structure[bs.cur_size_]);
           this->max_size_ = bs.cur_size_;
         }
 
@@ -1299,7 +1299,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (size_t size)
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::ACE_Bounded_Set");
   ACE_NEW (this->search_structure_,
-           ACE_TYPENAME ACE_Bounded_Set<T>::Search_Structure[size]);
+           typename ACE_Bounded_Set<T>::Search_Structure[size]);
 
   for (size_t i = 0; i < this->max_size_; i++)
     this->search_structure_[i].is_free_ = 1;
diff --git a/ACE/ace/Countdown_Time.cpp b/ACE/ace/Countdown_Time.cpp
index fb03f0465e0..4c95e2acfa1 100644
--- a/ACE/ace/Countdown_Time.cpp
+++ b/ACE/ace/Countdown_Time.cpp
@@ -9,7 +9,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time)
   : max_wait_time_ (max_wait_time),
-    stopped_ (0)
+    stopped_ (false)
 {
   this->start ();
 }
@@ -19,48 +19,48 @@ ACE_Countdown_Time::~ACE_Countdown_Time (void)
   this->stop ();
 }
 
-int
+void
 ACE_Countdown_Time::start (void)
 {
   if (this->max_wait_time_ != 0)
     {
       this->start_time_ = ACE_OS::gettimeofday ();
-      this->stopped_ = 0;
+      this->stopped_ = false;
     }
-  return 0;
 }
 
-int
+bool
 ACE_Countdown_Time::stopped (void) const
 {
   return stopped_;
 }
 
-int
+void
 ACE_Countdown_Time::stop (void)
 {
-  if (this->max_wait_time_ != 0 && this->stopped_ == 0)
+  if (this->max_wait_time_ != 0 && this->stopped_ == false)
     {
-      ACE_Time_Value elapsed_time =
-        ACE_OS::gettimeofday () - this->start_time_;
+      ACE_Time_Value elapsed_time = ACE_OS::gettimeofday () - this->start_time_;
 
       if (*this->max_wait_time_ > elapsed_time)
-        *this->max_wait_time_ -= elapsed_time;
+        {
+          *this->max_wait_time_ -= elapsed_time;
+        }
       else
         {
           // Used all of timeout.
           *this->max_wait_time_ = ACE_Time_Value::zero;
           // errno = ETIME;
         }
-      this->stopped_ = 1;
+      this->stopped_ = true;
     }
-  return 0;
 }
 
-int
+void
 ACE_Countdown_Time::update (void)
 {
-  return this->stop () == 0 && this->start ();
+  this->stop ();
+  this->start ();
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Countdown_Time.h b/ACE/ace/Countdown_Time.h
index bb7dff364d7..58f74c235e9 100644
--- a/ACE/ace/Countdown_Time.h
+++ b/ACE/ace/Countdown_Time.h
@@ -30,7 +30,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief Keeps track of the amount of elapsed time.
  *
- * This class has a side-effect on the <max_wait_time> -- every
+ * This class has a side-effect on the @c max_wait_time -- every
  * time the <stop> method is called the <max_wait_time> is
  * updated.
  */
@@ -38,25 +38,26 @@ class ACE_Export ACE_Countdown_Time
 {
 public:
   // = Initialization and termination methods.
-  /// Cache the <max_wait_time> and call <start>.
+  /// Cache the @a max_wait_time and call @c start().
   ACE_Countdown_Time (ACE_Time_Value *max_wait_time);
 
-  /// Call <stop>.
+  /// Destructor, makes sure the max_wait_time that got passed as pointer
+  /// to the constructor is updated with the time elapsed.
   ~ACE_Countdown_Time (void);
 
   /// Cache the current time and enter a start state.
-  int start (void);
+  void start (void);
 
   /// Subtract the elapsed time from max_wait_time_ and enter a stopped
   /// state.
-  int stop (void);
+  void stop (void);
 
   /// Calls stop and then start.  max_wait_time_ is modified by the
   /// call to stop.
-  int update (void);
+  void update (void);
 
-  /// Returns 1 if we've already been stopped, else 0.
-  int stopped (void) const;
+  /// Returns true if we've already been stopped, else false.
+  bool stopped (void) const;
 
 private:
   /// Maximum time we were willing to wait.
@@ -66,7 +67,7 @@ private:
   ACE_Time_Value start_time_;
 
   /// Keeps track of whether we've already been stopped.
-  int stopped_;
+  bool stopped_;
 
   // Prevent copying
   ACE_Countdown_Time (const ACE_Countdown_Time &);
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 41132201f01..933de62dd94 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -1171,7 +1171,7 @@ protected:
    * @brief A helper class that helps grabbing, releasing and waiting
    * on tokens for a thread that needs access to the reactor's token.
    */
-  class Token_Guard
+  class ACE_Export Token_Guard
   {
   public:
 
diff --git a/ACE/ace/Event_Handler_T.inl b/ACE/ace/Event_Handler_T.inl
index 5d2e31ab81e..c3facd7e25f 100644
--- a/ACE/ace/Event_Handler_T.inl
+++ b/ACE/ace/Event_Handler_T.inl
@@ -20,7 +20,7 @@ ACE_Event_Handler_T<T>::op_handler (void)
   return this->op_handler_;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::GET_HANDLE
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::GET_HANDLE
 ACE_Event_Handler_T<T>::handle_get (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_get");
@@ -28,13 +28,13 @@ ACE_Event_Handler_T<T>::handle_get (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::handle_get (ACE_TYPENAME ACE_Event_Handler_T<T>::GET_HANDLE h)
+ACE_Event_Handler_T<T>::handle_get (typename ACE_Event_Handler_T<T>::GET_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_get");
   this->get_handle_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::SET_HANDLE
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::SET_HANDLE
 ACE_Event_Handler_T<T>::handle_set (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_set");
@@ -42,13 +42,13 @@ ACE_Event_Handler_T<T>::handle_set (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::handle_set (ACE_TYPENAME ACE_Event_Handler_T<T>::SET_HANDLE h)
+ACE_Event_Handler_T<T>::handle_set (typename ACE_Event_Handler_T<T>::SET_HANDLE h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::handle_set");
   this->set_handle_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::IO_HANDLER
 ACE_Event_Handler_T<T>::input_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::input_handler");
@@ -56,13 +56,13 @@ ACE_Event_Handler_T<T>::input_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::input_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::input_handler (typename ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::input_handler");
   this->input_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::IO_HANDLER
 ACE_Event_Handler_T<T>::output_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::output_handler");
@@ -70,13 +70,13 @@ ACE_Event_Handler_T<T>::output_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::output_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::output_handler (typename ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::output_handler");
   this->output_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::IO_HANDLER
 ACE_Event_Handler_T<T>::except_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::except_handler");
@@ -84,13 +84,13 @@ ACE_Event_Handler_T<T>::except_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::except_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::IO_HANDLER h)
+ACE_Event_Handler_T<T>::except_handler (typename ACE_Event_Handler_T<T>::IO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::except_handler");
   this->except_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::TO_HANDLER
 ACE_Event_Handler_T<T>::to_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::to_handler");
@@ -98,13 +98,13 @@ ACE_Event_Handler_T<T>::to_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::to_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::TO_HANDLER h)
+ACE_Event_Handler_T<T>::to_handler (typename ACE_Event_Handler_T<T>::TO_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::to_handler");
   this->to_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::CL_HANDLER
 ACE_Event_Handler_T<T>::cl_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::cl_handler");
@@ -112,13 +112,13 @@ ACE_Event_Handler_T<T>::cl_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::cl_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::CL_HANDLER h)
+ACE_Event_Handler_T<T>::cl_handler (typename ACE_Event_Handler_T<T>::CL_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::cl_handler");
   this->cl_handler_ = h;
 }
 
-template<class T> ACE_INLINE ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER
+template<class T> ACE_INLINE typename ACE_Event_Handler_T<T>::SIG_HANDLER
 ACE_Event_Handler_T<T>::sig_handler (void)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::sig_handler");
@@ -126,7 +126,7 @@ ACE_Event_Handler_T<T>::sig_handler (void)
 }
 
 template<class T> ACE_INLINE void
-ACE_Event_Handler_T<T>::sig_handler (ACE_TYPENAME ACE_Event_Handler_T<T>::SIG_HANDLER h)
+ACE_Event_Handler_T<T>::sig_handler (typename ACE_Event_Handler_T<T>::SIG_HANDLER h)
 {
   ACE_TRACE ("ACE_Event_Handler_T<T>::sig_handler");
   this->sig_handler_ = h;
diff --git a/ACE/ace/FILE.cpp b/ACE/ace/FILE.cpp
index 91ed5511e08..93fa7e417cd 100644
--- a/ACE/ace/FILE.cpp
+++ b/ACE/ace/FILE.cpp
@@ -57,8 +57,7 @@ ACE_FILE::get_info (ACE_FILE_Info *finfo)
   ACE_TRACE ("ACE_FILE::get_info");
   ACE_stat filestatus;
 
-  int const result = ACE_OS::fstat (this->get_handle (),
-                                    &filestatus);
+  int const result = ACE_OS::fstat (this->get_handle (), &filestatus);
 
   if (result == 0)
     {
@@ -82,15 +81,13 @@ int
 ACE_FILE::truncate (ACE_OFF_T length)
 {
   ACE_TRACE ("ACE_FILE::truncate");
-  return ACE_OS::ftruncate (this->get_handle(), length);
+  return ACE_OS::ftruncate (this->get_handle (), length);
 }
 
 ACE_OFF_T
 ACE_FILE::seek (ACE_OFF_T offset, int startpos)
 {
-  return ACE_OS::lseek (this->get_handle (),
-                        offset,
-                        startpos);
+  return ACE_OS::lseek (this->get_handle (), offset, startpos);
 }
 
 ACE_OFF_T
diff --git a/ACE/ace/FILE_Addr.cpp b/ACE/ace/FILE_Addr.cpp
index 09d87c0d9b1..79d92c49ad9 100644
--- a/ACE/ace/FILE_Addr.cpp
+++ b/ACE/ace/FILE_Addr.cpp
@@ -33,8 +33,7 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
       ACE_OS::strcpy (this->filename_,
                       ACE_DEFAULT_TEMP_FILE);
 #else /* ACE_DEFAULT_TEMP_FILE */
-      if (ACE::get_temp_dir (this->filename_,
-                                      MAXPATHLEN - 15) == -1)
+      if (ACE::get_temp_dir (this->filename_, MAXPATHLEN - 15) == -1)
         // -15 for ace-file-XXXXXX
         {
           ACE_ERROR ((LM_ERROR,
@@ -55,12 +54,9 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
     }
   else
     {
-      (void) ACE_OS::strsncpy (this->filename_,
-                               sa.filename_,
-                               sa.get_size ());
+      (void)ACE_OS::strsncpy (this->filename_, sa.filename_, sa.get_size ());
 
-      this->base_set (sa.get_type (),
-                      sa.get_size ());
+      this->base_set (sa.get_type (), sa.get_size ());
     }
   return 0;
 }
@@ -111,7 +107,7 @@ ACE_FILE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
 void *
 ACE_FILE_Addr::get_addr (void) const
 {
-  return (void *) &this->filename_;
+  return (void *)&this->filename_;
 }
 
 void
diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp
index 3ca6f8225ba..ae8bdeed457 100644
--- a/ACE/ace/Future.cpp
+++ b/ACE/ace/Future.cpp
@@ -183,10 +183,10 @@ ACE_Future_Rep<T>::set (const T &r,
                           -1);
 
           // Remove and notify all subscribed observers.
-          ACE_TYPENAME OBSERVER_COLLECTION::iterator iterator =
+          typename OBSERVER_COLLECTION::iterator iterator =
             this->observer_collection_.begin ();
 
-          ACE_TYPENAME OBSERVER_COLLECTION::iterator end =
+          typename OBSERVER_COLLECTION::iterator end =
             this->observer_collection_.end ();
 
           while (iterator != end)
diff --git a/ACE/ace/Future_Set.cpp b/ACE/ace/Future_Set.cpp
index d9b9e2a1ac9..a87770d5528 100644
--- a/ACE/ace/Future_Set.cpp
+++ b/ACE/ace/Future_Set.cpp
@@ -31,10 +31,10 @@ template <class T>
 ACE_Future_Set<T>::~ACE_Future_Set (void)
 {
   // Detach ourselves from all remaining futures, if any, in our map.
-  ACE_TYPENAME FUTURE_HASH_MAP::iterator iterator =
+  typename FUTURE_HASH_MAP::iterator iterator =
     this->future_map_.begin ();
 
-  ACE_TYPENAME FUTURE_HASH_MAP::iterator end =
+  typename FUTURE_HASH_MAP::iterator end =
     this->future_map_.end ();
 
   for (;
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h
index cad13eab24d..754e31f2a42 100644
--- a/ACE/ace/Global_Macros.h
+++ b/ACE/ace/Global_Macros.h
@@ -945,56 +945,34 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC
 // Handle ACE_Message_Queue.
 #   define ACE_SYNCH_DECL class _ACE_SYNCH
 #   define ACE_SYNCH_USE _ACE_SYNCH
-#   define ACE_SYNCH_MUTEX_T ACE_TYPENAME _ACE_SYNCH::MUTEX
-#   define ACE_SYNCH_CONDITION_T ACE_TYPENAME _ACE_SYNCH::CONDITION
-#   define ACE_SYNCH_SEMAPHORE_T ACE_TYPENAME _ACE_SYNCH::SEMAPHORE
+#   define ACE_SYNCH_MUTEX_T typename _ACE_SYNCH::MUTEX
+#   define ACE_SYNCH_CONDITION_T typename _ACE_SYNCH::CONDITION
+#   define ACE_SYNCH_SEMAPHORE_T typename _ACE_SYNCH::SEMAPHORE
 
 // Handle ACE_Malloc*
 #   define ACE_MEM_POOL_1 class _ACE_MEM_POOL
 #   define ACE_MEM_POOL_2 _ACE_MEM_POOL
 #   define ACE_MEM_POOL _ACE_MEM_POOL
-#   define ACE_MEM_POOL_OPTIONS ACE_TYPENAME _ACE_MEM_POOL::OPTIONS
+#   define ACE_MEM_POOL_OPTIONS typename _ACE_MEM_POOL::OPTIONS
 
 // Handle ACE_Svc_Handler
 #   define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM
 #   define ACE_PEER_STREAM_2 _ACE_PEER_STREAM
 #   define ACE_PEER_STREAM _ACE_PEER_STREAM
-#   define ACE_PEER_STREAM_ADDR ACE_TYPENAME _ACE_PEER_STREAM::PEER_ADDR
+#   define ACE_PEER_STREAM_ADDR typename _ACE_PEER_STREAM::PEER_ADDR
 
 // Handle ACE_Acceptor
 #   define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR
 #   define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR
 #   define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR
-#   define ACE_PEER_ACCEPTOR_ADDR ACE_TYPENAME _ACE_PEER_ACCEPTOR::PEER_ADDR
+#   define ACE_PEER_ACCEPTOR_ADDR typename _ACE_PEER_ACCEPTOR::PEER_ADDR
 
 // Handle ACE_Connector
 #   define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR
 #   define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR
 #   define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR
-#   define ACE_PEER_CONNECTOR_ADDR ACE_TYPENAME _ACE_PEER_CONNECTOR::PEER_ADDR
-#   if !defined(ACE_HAS_TYPENAME_KEYWORD)
-#     define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_CONNECTOR_ADDR::sap_any
-#   else
-    //
-    // If the compiler supports 'typename' we cannot use
-    //
-    // PEER_CONNECTOR::PEER_ADDR::sap_any
-    //
-    // because PEER_CONNECTOR::PEER_ADDR is not considered a type. But:
-    //
-    // typename PEER_CONNECTOR::PEER_ADDR::sap_any
-    //
-    // will not work either, because now we are declaring sap_any a
-    // type, further:
-    //
-    // (typename PEER_CONNECTOR::PEER_ADDR)::sap_any
-    //
-    // is considered a casting expression. All I can think of is using a
-    // typedef, I tried PEER_ADDR but that was a source of trouble on
-    // some platforms. I will try:
-    //
-#     define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_ADDR_TYPEDEF::sap_any
-#   endif /* ACE_HAS_TYPENAME_KEYWORD */
+#   define ACE_PEER_CONNECTOR_ADDR typename ACE_PEER_CONNECTOR::PEER_ADDR
+#   define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_ADDR_TYPEDEF::sap_any
 
 // Handle ACE_SOCK_*
 #   define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index ee93388b055..98042117a80 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -60,7 +60,16 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg)
 # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \
     defined (ACE_HAS_TSS_EMULATION)
 
-static ACE_thread_key_t the_log_msg_tss_key = 0;
+#if defined (ACE_MVS)
+  static ACE_thread_key_t the_log_msg_tss_key =
+  #if !defined(_LP64)
+      { '\0','\0','\0','\0' };
+  #else
+      { '\0','\0','\0','\0','\0','\0','\0','\0' };
+  #endif
+#else
+  static ACE_thread_key_t the_log_msg_tss_key = 0;
+#endif /* defined (ACE_MVS) */
 
 ACE_thread_key_t *log_msg_tss_key (void)
 {
diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h
index a8c11e4d0fa..7ae6d4fceb7 100644
--- a/ACE/ace/Malloc_T.h
+++ b/ACE/ace/Malloc_T.h
@@ -217,7 +217,7 @@ public:
 #if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
   // The following code will break C++ compilers that don't support
   // template typedefs correctly.
-  typedef const ACE_TYPENAME MALLOC::MEMORY_POOL_OPTIONS *MEMORY_POOL_OPTIONS;
+  typedef const typename MALLOC::MEMORY_POOL_OPTIONS *MEMORY_POOL_OPTIONS;
 #else
   typedef const void *MEMORY_POOL_OPTIONS;
 #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
@@ -436,8 +436,8 @@ public:
   friend class ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>;
   typedef ACE_MEM_POOL MEMORY_POOL;
   typedef ACE_MEM_POOL_OPTIONS MEMORY_POOL_OPTIONS;
-  typedef ACE_TYPENAME ACE_CB::ACE_Name_Node NAME_NODE;
-  typedef ACE_TYPENAME ACE_CB::ACE_Malloc_Header MALLOC_HEADER;
+  typedef typename ACE_CB::ACE_Name_Node NAME_NODE;
+  typedef typename ACE_CB::ACE_Malloc_Header MALLOC_HEADER;
 
   // = Initialization and termination methods.
   /**
@@ -701,8 +701,8 @@ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
 class ACE_Malloc_LIFO_Iterator_T
 {
 public:
-  typedef ACE_TYPENAME ACE_CB::ACE_Name_Node NAME_NODE;
-  typedef ACE_TYPENAME ACE_CB::ACE_Malloc_Header MALLOC_HEADER;
+  typedef typename ACE_CB::ACE_Name_Node NAME_NODE;
+  typedef typename ACE_CB::ACE_Malloc_Header MALLOC_HEADER;
 
   // = Initialization method.
   /// If @a name = 0 it will iterate through everything else only
@@ -769,8 +769,8 @@ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
 class ACE_Malloc_FIFO_Iterator_T
 {
 public:
-  typedef ACE_TYPENAME ACE_CB::ACE_Name_Node NAME_NODE;
-  typedef ACE_TYPENAME ACE_CB::ACE_Malloc_Header MALLOC_HEADER;
+  typedef typename ACE_CB::ACE_Name_Node NAME_NODE;
+  typedef typename ACE_CB::ACE_Malloc_Header MALLOC_HEADER;
 
   // = Initialization method.
   /// If @a name = 0 it will iterate through everything else only
diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h
index 6f982ecf6f3..3f4e14cf70d 100644
--- a/ACE/ace/Map_T.h
+++ b/ACE/ace/Map_T.h
@@ -549,9 +549,9 @@ class ACE_Map_Impl : public ACE_Map<KEY, VALUE>
 public:
 
   // = Traits.
-  typedef ACE_Map_Impl_Iterator_Adapter<ACE_TYPENAME ACE_Map<KEY, VALUE>::value_type, ITERATOR, ENTRY>
+  typedef ACE_Map_Impl_Iterator_Adapter<typename ACE_Map<KEY, VALUE>::value_type, ITERATOR, ENTRY>
           iterator_impl;
-  typedef ACE_Map_Impl_Reverse_Iterator_Adapter<ACE_TYPENAME ACE_Map<KEY, VALUE>::value_type, REVERSE_ITERATOR, ENTRY>
+  typedef ACE_Map_Impl_Reverse_Iterator_Adapter<typename ACE_Map<KEY, VALUE>::value_type, REVERSE_ITERATOR, ENTRY>
           reverse_iterator_impl;
 
   typedef IMPLEMENTATION
@@ -738,7 +738,7 @@ class ACE_Active_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T>
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::iterator
+  typedef typename ACE_Active_Map_Manager<VALUE>::iterator
           implementation;
 
   /// Constructor.
@@ -784,7 +784,7 @@ class ACE_Active_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Itera
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::reverse_iterator
+  typedef typename ACE_Active_Map_Manager<VALUE>::reverse_iterator
           implementation;
 
   /// Constructor.
@@ -1034,7 +1034,7 @@ class ACE_Hash_Map_Manager_Ex_Iterator_Adapter : public ACE_Iterator_Impl<T>
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::iterator
+  typedef typename ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::iterator
           implementation;
 
   /// Constructor.
@@ -1080,7 +1080,7 @@ class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter : public ACE_Reverse_Iter
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::reverse_iterator
+  typedef typename ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::reverse_iterator
           implementation;
 
   /// Constructor.
@@ -1320,7 +1320,7 @@ class ACE_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T>
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::iterator
+  typedef typename ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::iterator
           implementation;
 
   /// Constructor.
@@ -1366,7 +1366,7 @@ class ACE_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Imp
 public:
 
   // = Traits.
-  typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::reverse_iterator
+  typedef typename ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::reverse_iterator
           implementation;
 
   /// Constructor.
diff --git a/ACE/ace/Module.cpp b/ACE/ace/Module.cpp
index 20e5638e367..2a588f1616d 100644
--- a/ACE/ace/Module.cpp
+++ b/ACE/ace/Module.cpp
@@ -158,7 +158,7 @@ ACE_Module<ACE_SYNCH_USE>::sibling (ACE_Task<ACE_SYNCH_USE> *orig)
 
 template <ACE_SYNCH_DECL>
 ACE_Module<ACE_SYNCH_USE>::ACE_Module (void)
-  : flags_ (0)
+  : flags_ (M_FLAGS_NOT_SET)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::ACE_Module");
   this->name (ACE_LIB_TEXT ("<unknown>"));
@@ -183,7 +183,7 @@ ACE_Module<ACE_SYNCH_USE>::ACE_Module (const ACE_TCHAR *mod_name,
                                        ACE_Task<ACE_SYNCH_USE> *reader_q,
                                        void *args,
                                        int flags /* = M_DELETE */)
-  : flags_ (0)
+  : flags_ (M_FLAGS_NOT_SET)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::ACE_Module");
 
@@ -205,7 +205,7 @@ ACE_Module<ACE_SYNCH_USE>::close (int flags /* = M_DELETE_NONE */)
 
   // Only pay attention to the flags parameter if we haven't already
   // set the task delete policies.
-  if (this->flags_ == 0)
+  if (this->flags_ == M_FLAGS_NOT_SET)
     ACE_SET_BITS (flags_, flags);
 
   if (this->close_i (0, flags_) == -1)
diff --git a/ACE/ace/Module.h b/ACE/ace/Module.h
index e1130d25b8b..3999e41cdf2 100644
--- a/ACE/ace/Module.h
+++ b/ACE/ace/Module.h
@@ -40,8 +40,8 @@ class ACE_Export ACE_Module_Base
 public:
   enum
   {
-    /// Indicates that <close> should not delete any Tasks.
-    M_DELETE_NONE = 0,
+    /// Indicates that the flags have not been set
+    M_FLAGS_NOT_SET = 0,
 
     /// Indicates that <close> should delete the writer Task.
     M_DELETE_READER = 1,
@@ -56,7 +56,10 @@ public:
      * The <M_DELETE_READER> and <M_DELETE_WRITER> flags may be or'ed
      * together.
      */
-    M_DELETE = 3
+    M_DELETE = 3,
+
+    /// Indicates that <close> should not delete any Tasks.
+    M_DELETE_NONE = 4,
   };
 };
 
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index d9372f5ddb0..193a3262f2b 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -3312,16 +3312,16 @@ ACE_OS::thr_sigsetmask (int how,
     case SIG_UNBLOCK:
       {
         // get the old mask
-                old_mask = ::sigsetmask (*nsm);
+        old_mask = ::sigsetmask (*nsm);
         // create a new mask:  the following assumes that sigset_t is 4 bytes,
         // which it is on VxWorks 5.2, so bit operations are done simply . . .
         ::sigsetmask (how == SIG_BLOCK ? (old_mask |= *nsm) : (old_mask &= ~*nsm));
-                if (osm)
+        if (osm)
           *osm = old_mask;
         break;
       }
     case SIG_SETMASK:
-          old_mask = ::sigsetmask (*nsm);
+      old_mask = ::sigsetmask (*nsm);
       if (osm)
         *osm = old_mask;
       break;
diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl
index c0a3d61d3ae..0c05d61d23f 100644
--- a/ACE/ace/OS_NS_pwd.inl
+++ b/ACE/ace/OS_NS_pwd.inl
@@ -42,10 +42,9 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent,
                     char *buffer, int buflen)
 {
 #if defined (ACE_HAS_POSIX_GETPWNAM_R)
-  struct passwd *result;
-  int status;
+  struct passwd *result = 0;
 
-  status = ::getpwnam_r (name, pwent, buffer, buflen, &result);
+  int const status = ::getpwnam_r (name, pwent, buffer, buflen, &result);
 
   if (status != 0)
   {
diff --git a/ACE/ace/OS_NS_string.cpp b/ACE/ace/OS_NS_string.cpp
index b7b7049a07e..0dd7d0880ba 100644
--- a/ACE/ace/OS_NS_string.cpp
+++ b/ACE/ace/OS_NS_string.cpp
@@ -22,7 +22,7 @@ ACE_RCSID (ace,
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if !defined (ACE_HAS_MEMCHR)
+#if defined (ACE_LACKS_MEMCHR)
 const void *
 ACE_OS::memchr_emulation (const void *s, int c, size_t len)
 {
@@ -37,7 +37,7 @@ ACE_OS::memchr_emulation (const void *s, int c, size_t len)
 
   return 0;
 }
-#endif /*ACE_HAS_MEMCHR*/
+#endif /* ACE_LACKS_MEMCHR */
 
 #if (defined (ACE_LACKS_STRDUP) && !defined (ACE_STRDUP_EQUIVALENT)) \
   || defined (ACE_HAS_STRDUP_EMULATION)
@@ -172,14 +172,14 @@ const char *
 ACE_OS::strnstr (const char *s1, const char *s2, size_t len2)
 {
   // Substring length
-  const size_t len1 = ACE_OS::strlen (s1);
+  size_t const len1 = ACE_OS::strlen (s1);
 
   // Check if the substring is longer than the string being searched.
   if (len2 > len1)
     return 0;
 
   // Go upto <len>
-  const size_t len = len1 - len2;
+  size_t const len = len1 - len2;
 
   for (size_t i = 0; i <= len; i++)
     {
@@ -245,25 +245,6 @@ ACE_OS::fast_memcpy (void *t, const void *s, size_t len)
 }
 #endif /* ACE_HAS_MEMCPY_LOOP_UNROLL */
 
-#if defined (ACE_LACKS_STRPBRK)
-char *
-ACE_OS::strpbrk_emulation (const char *string,
-                           const char *charset)
-{
-  const char *scanp;
-  int c, sc;
-
-  while ((c = *string++) != 0)
-    {
-      for (scanp = charset; (sc = *scanp++) != 0;)
-        if (sc == c)
-          return const_cast<char *> (string - 1);
-    }
-
-  return 0;
-}
-#endif /* ACE_LACKS_STRPBRK */
-
 #if defined (ACE_LACKS_STRRCHR)
 char *
 ACE_OS::strrchr_emulation (char *s, int c)
@@ -342,25 +323,6 @@ ACE_OS::strsncpy (ACE_WCHAR_T *dst, const ACE_WCHAR_T *src, size_t maxlen)
   return dst;
 }
 
-#if defined (ACE_LACKS_STRSPN)
-size_t
-ACE_OS::strspn_emulation (const char *string,
-                          const char *charset)
-{
-  const char *p = string;
-  const char *spanp;
-  wchar_t c, sc;
-
-  // Skip any characters in charset, excluding the terminating \0.
- cont:
-  c = *p++;
-  for (spanp = charset; (sc = *spanp++) != 0;)
-    if (sc == c)
-      goto cont;
-  return (p - 1 - string);
-}
-#endif /* ACE_LACKS_STRSPN */
-
 #if !defined (ACE_HAS_REENTRANT_FUNCTIONS) || defined (ACE_LACKS_STRTOK_R)
 char *
 ACE_OS::strtok_r_emulation (char *s, const char *tokens, char **lasts)
diff --git a/ACE/ace/OS_NS_string.h b/ACE/ace/OS_NS_string.h
index 552a9f5ea1e..0c5214c06de 100644
--- a/ACE/ace/OS_NS_string.h
+++ b/ACE/ace/OS_NS_string.h
@@ -55,11 +55,11 @@ namespace ACE_OS {
   ACE_NAMESPACE_INLINE_FUNCTION
   void *memchr (void *s, int c, size_t len);
 
-#if !defined (ACE_HAS_MEMCHR)
+#if defined (ACE_LACKS_MEMCHR)
   /// Emulated memchr - Finds a character in a buffer.
   extern ACE_Export
   const void *memchr_emulation (const void *s, int c, size_t len);
-#endif /* ACE_HAS_MEMCHR */
+#endif /* ACE_LACKS_MEMCHR */
 
   /// Compares two buffers.
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -311,13 +311,6 @@ namespace ACE_OS {
   wchar_t *strpbrk (wchar_t *s1, const wchar_t *s2);
 #endif /* ACE_HAS_WCHAR */
 
-#if defined (ACE_LACKS_STRPBRK)
-  /// Emulated strpbrk - Searches for characters in a string.
-  extern ACE_Export
-  char *strpbrk_emulation (const char *string,
-                           const char *charset);
-#endif /* ACE_LACKS_STRPBRK */
-
   /// Finds the last occurance of a character in a string (const char
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
@@ -406,13 +399,6 @@ namespace ACE_OS {
   size_t strspn (const wchar_t *s1, const wchar_t *s2);
 #endif /* ACE_HAS_WCHAR */
 
-#if defined (ACE_LACKS_STRSPN)
-  /// Emulated wcsspn.
-  extern ACE_Export
-  size_t strspn_emulation (const char *string,
-                           const char *charset);
-#endif /* ACE_LACKS_STRSPN */
-
   /// Finds the first occurance of a substring in a string (const char
   /// version).
   ACE_NAMESPACE_INLINE_FUNCTION
diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl
index 204ea5db435..8f25a46615c 100644
--- a/ACE/ace/OS_NS_string.inl
+++ b/ACE/ace/OS_NS_string.inl
@@ -12,11 +12,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE const void *
 ACE_OS::memchr (const void *s, int c, size_t len)
 {
-#if defined (ACE_HAS_MEMCHR)
+#if !defined (ACE_LACKS_MEMCHR)
   return ::memchr (s, c, len);
-#else /* ACE_HAS_MEMCHR */
+#else /* ACE_LACKS_MEMCHR */
   return ACE_OS::memchr_emulation (s, c, len);
-#endif /* ACE_HAS_MEMCHR */
+#endif /* !ACE_LACKS_MEMCHR */
 }
 
 ACE_INLINE void *
@@ -125,11 +125,7 @@ ACE_OS::strcat (wchar_t *s, const wchar_t *t)
 ACE_INLINE const char *
 ACE_OS::strchr (const char *s, int c)
 {
-#if defined (ACE_LACKS_STRCHR)
-  return ACE_OS::strchr_emulation (s, c);
-#else  /* ! ACE_LACKS_STRCHR */
-  return (const char *) ::strchr (s, c);
-#endif /* ACE_LACKS_STRCHR */
+  return const_cast <const char *> (::strchr (s, c));
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -357,7 +353,8 @@ ACE_OS::strnlen (const ACE_WCHAR_T *s, size_t maxlen)
 ACE_INLINE char *
 ACE_OS::strnstr (char *s, const char *t, size_t len)
 {
-  return (char *) ACE_OS::strnstr ((const char *) s, t, len);
+  return
+    const_cast <char *> (ACE_OS::strnstr (const_cast <const char *> (s), t, len));
 }
 
 ACE_INLINE ACE_WCHAR_T *
@@ -373,11 +370,7 @@ ACE_OS::strnstr (ACE_WCHAR_T *s, const ACE_WCHAR_T *t, size_t len)
 ACE_INLINE const char *
 ACE_OS::strpbrk (const char *s1, const char *s2)
 {
-#if defined (ACE_LACKS_STRPBRK)
-  return ACE_OS::strpbrk_emulation (s1, s2);
-#else  /* ACE_LACKS_STRPBRK */
-  return (const char *) ::strpbrk (s1, s2);
-#endif /* ACE_LACKS_STRPBRK */
+  return const_cast <const char *> (::strpbrk (s1, s2));
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -395,11 +388,7 @@ ACE_OS::strpbrk (const wchar_t *s, const wchar_t *t)
 ACE_INLINE char *
 ACE_OS::strpbrk (char *s1, const char *s2)
 {
-#if defined (ACE_LACKS_STRPBRK)
-  return ACE_OS::strpbrk_emulation (s1, s2);
-#else /* ACE_LACKS_STRPBRK */
   return ::strpbrk (s1, s2);
-#endif /* ACE_LACKS_STRPBRK */
 }
 
 #if defined (ACE_HAS_WCHAR)
@@ -455,11 +444,7 @@ ACE_OS::strrchr (wchar_t *s, wchar_t c)
 ACE_INLINE size_t
 ACE_OS::strspn (const char *s, const char *t)
 {
-#if defined (ACE_LACKS_STRSPN)
-  return ACE_OS::strspn_emulation (s, t);
-#else /* ACE_LACKS_STRSPN */
   return ::strspn (s, t);
-#endif /* ACE_LACKS_STRSPN */
 }
 
 #if defined (ACE_HAS_WCHAR)
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index 5883dc4cf6f..b243a44fd5c 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -95,7 +95,7 @@ ACE_OS::getpagesize (void)
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
   return (long) sys_info.dwPageSize;
-#elif defined (_SC_PAGESIZE)
+#elif defined (_SC_PAGESIZE) && !defined (ACE_HAS_BROKEN_SC_PAGESIZE)
   return ::sysconf (_SC_PAGESIZE);
 #elif defined (ACE_HAS_GETPAGESIZE)
   return ::getpagesize ();
diff --git a/ACE/ace/OS_NS_wchar.cpp b/ACE/ace/OS_NS_wchar.cpp
index b6ef12f912c..194e4a9a1da 100644
--- a/ACE/ace/OS_NS_wchar.cpp
+++ b/ACE/ace/OS_NS_wchar.cpp
@@ -67,10 +67,10 @@ ACE_OS::wcscat_emulation (wchar_t *destination,
 
 #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCHR)
 wchar_t *
-ACE_OS::wcschr_emulation (const wchar_t *string, wint_t c)
+ACE_OS::wcschr_emulation (const wchar_t *string, wchar_t c)
 {
   for (;*string ; ++string)
-    if (*string == static_cast<wchar_t> (c))
+    if (*string == c)
       return const_cast<wchar_t *> (string);
 
   return 0;
@@ -105,8 +105,8 @@ ACE_OS::wcscpy_emulation (wchar_t *destination,
 size_t
 ACE_OS::wcscspn_emulation (const wchar_t *s, const wchar_t *reject)
 {
-  const wchar_t *scan;
-  const wchar_t *rej_scan;
+  const wchar_t *scan = 0;
+  const wchar_t *rej_scan = 0;
   int count = 0;
 
   for (scan = s; *scan; scan++)
diff --git a/ACE/ace/OS_NS_wchar.h b/ACE/ace/OS_NS_wchar.h
index 8042d1176c5..9cfa3b4bb65 100644
--- a/ACE/ace/OS_NS_wchar.h
+++ b/ACE/ace/OS_NS_wchar.h
@@ -59,7 +59,7 @@ namespace ACE_OS
 #if defined (ACE_HAS_WCHAR) && defined (ACE_LACKS_WCSCHR)
   /// Emulated wcschr - Finds a character in a string.
   extern ACE_Export
-  wchar_t *wcschr_emulation (const wchar_t *string, wint_t c);
+  wchar_t *wcschr_emulation (const wchar_t *string, wchar_t c);
 #endif /* ACE_HAS_WCHAR && ACE_LACKS_WCSCHR */
 
 #if !defined (ACE_HAS_WCHAR) || defined (ACE_LACKS_WCSCMP)
diff --git a/ACE/ace/README b/ACE/ace/README
index 13743b8c708..c973ff2df66 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -310,6 +310,8 @@ ACE_HAS_DLFCN_H_BROKEN_EXTERN_C         For platforms, e.g., RedHat
                                         extern "C" in dlfcn.h.
 ACE_HAS_DLL                             Build ACE using the frigging
                                         PC DLL nonsense...
+ACE_HAS_EBCDIC                          Compile in the ACE code set classes
+                                        that support EBCDIC.
 ACE_HAS_EXCEPTIONS                      Compiler supports C++
                                         exception handling
 ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS    Compiler does not call
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index 4d2492daac2..8757e54c8b2 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -283,6 +283,7 @@ ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size,
   , no_static_svcs_ (no_static_svcs)
   , svc_queue_ (0)
   , svc_conf_file_queue_ (0)
+  , repo_ (0)
   , static_svcs_ (0)
   , processed_static_svcs_ (0)
 {
@@ -297,22 +298,29 @@ ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size,
 }
 
 /// Performs the common initialization tasks for a new or previously
-/// closed instance. Must not be virtual, as it is called from the
-/// constructor.
+/// closed instance. Must not be virtual, as it is also called from
+/// the constructor.
 int
 ACE_Service_Gestalt::init_i (void)
 {
-  if (this->svc_repo_is_owned_)
-    {
-      ACE_NEW_NORETURN (this->repo_,
-                        ACE_Service_Repository (this->svc_repo_size_));
-    }
-  else
+  // Only initialize the repo_ if (a) we are being constructed, or;
+  // (b) we're being open()-ed, perhaps after previously having been
+  // close()-ed. In both cases: repo_ == 0 and we need a repository.
+  if (this->repo_ == 0)
     {
-      this->repo_ =
-        ACE_Service_Repository::instance (this->svc_repo_size_);
+      if (this->svc_repo_is_owned_)
+        {
+          ACE_NEW_NORETURN (this->repo_,
+                            ACE_Service_Repository (this->svc_repo_size_));
+          if (this->repo_ == 0)
+            return -1;
+        }
+      else
+        {
+          this->repo_ =
+            ACE_Service_Repository::instance (this->svc_repo_size_);
+        }
     }
-
   return 0;
 }
 
@@ -1299,14 +1307,6 @@ ACE_Service_Gestalt::close (void)
   delete this->svc_conf_file_queue_;
   this->svc_conf_file_queue_ = 0;
 
-#ifndef ACE_NLOGGING
-  // Delete the dynamically allocated static_svcs instance.
-  if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_LIB_TEXT ("ACE (%P|%t) SG::close - this=%@, repo=%@, pss = %@\n"),
-                this, this->repo_, this->processed_static_svcs_));
-#endif
-
   if (this->processed_static_svcs_ &&
       !this->processed_static_svcs_->is_empty())
     {
@@ -1321,18 +1321,17 @@ ACE_Service_Gestalt::close (void)
   delete this->processed_static_svcs_;
   this->processed_static_svcs_ = 0;
 
-  if (this->svc_repo_is_owned_)
-      delete this->repo_;
-
 #ifndef ACE_NLOGGING
   if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
-                ACE_LIB_TEXT ("ACE (%P|%t) SG::close - complete this=%@, repo=%@\n"),
-                this, this->repo_));
+                ACE_LIB_TEXT ("ACE (%P|%t) SG::close - complete this=%@, repo=%@, owned=%d\n"),
+                this, this->repo_, this->svc_repo_is_owned_));
 #endif
 
-  this->repo_ = 0;
+  if (this->svc_repo_is_owned_)
+      delete this->repo_;
 
+  this->repo_ = 0;
   return 0;
 
 } /* close () */
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 6dd4e67f624..038e68a85f7 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -837,8 +837,8 @@ get_ip_interfaces_getifaddrs (size_t &count,
 {
   // Take advantage of the BSD getifaddrs function that simplifies
   // access to connected interfaces.
-  struct ifaddrs *ifap;
-  struct ifaddrs *p_if;
+  struct ifaddrs *ifap = 0;
+  struct ifaddrs *p_if = 0;
 
   if (::getifaddrs (&ifap) != 0)
     return -1;
@@ -1227,12 +1227,9 @@ ACE::get_ip_interfaces (size_t &count,
   return get_ip_interfaces_aix (count, addrs);
 #elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)
   return get_ip_interfaces_vxworks_lt600 (count, addrs);
-
 #elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
   // COMMON (SVR4 and BSD) UNIX CODE
 
-  size_t num_ifs, num_ifs_found;
-
   // Call specific routine as necessary.
   ACE_HANDLE handle = ACE::get_handle();
 
@@ -1242,6 +1239,8 @@ ACE::get_ip_interfaces (size_t &count,
                        ACE_LIB_TEXT ("ACE::get_ip_interfaces:open")),
                       -1);
 
+  size_t num_ifs, num_ifs_found;
+
   if (ACE::count_interfaces (handle, num_ifs))
     {
       ACE_OS::close (handle);
diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h
index b9e7e6b9139..9985b194353 100644
--- a/ACE/ace/Strategies_T.h
+++ b/ACE/ace/Strategies_T.h
@@ -51,9 +51,9 @@ class ACE_Recycling_Strategy
 public:
 
   // Useful STL-style traits.
-  typedef ACE_TYPENAME SVC_HANDLER::addr_type    addr_type;
-  typedef SVC_HANDLER                            handler_type;
-  typedef ACE_TYPENAME SVC_HANDLER::stream_type  stream_type;
+  typedef typename SVC_HANDLER::addr_type    addr_type;
+  typedef SVC_HANDLER                        handler_type;
+  typedef typename SVC_HANDLER::stream_type  stream_type;
 
   /// Virtual Destructor
   virtual ~ACE_Recycling_Strategy (void);
@@ -86,9 +86,9 @@ class ACE_Creation_Strategy
 public:
 
   // Useful STL-style traits.
-  typedef ACE_TYPENAME SVC_HANDLER::addr_type    addr_type;
-  typedef SVC_HANDLER                            handler_type;
-  typedef ACE_TYPENAME SVC_HANDLER::stream_type  stream_type;
+  typedef typename SVC_HANDLER::addr_type    addr_type;
+  typedef SVC_HANDLER                        handler_type;
+  typedef typename SVC_HANDLER::stream_type  stream_type;
 
   // = Initialization and termination methods.
 
@@ -253,9 +253,9 @@ class ACE_Concurrency_Strategy
 public:
 
   // Useful STL-style traits.
-  typedef ACE_TYPENAME SVC_HANDLER::addr_type    addr_type;
-  typedef SVC_HANDLER                            handler_type;
-  typedef ACE_TYPENAME SVC_HANDLER::stream_type  stream_type;
+  typedef typename SVC_HANDLER::addr_type    addr_type;
+  typedef SVC_HANDLER                        handler_type;
+  typedef typename SVC_HANDLER::stream_type  stream_type;
 
   /// Constructor
   ACE_Concurrency_Strategy (int flags = 0);
@@ -500,10 +500,10 @@ class ACE_Accept_Strategy
 public:
 
   // Useful STL-style traits.
-  typedef ACE_PEER_ACCEPTOR_ADDR                 addr_type;
-  typedef ACE_PEER_ACCEPTOR                      acceptor_type;
-  typedef SVC_HANDLER                            handler_type;
-  typedef ACE_TYPENAME SVC_HANDLER::stream_type  stream_type;
+  typedef ACE_PEER_ACCEPTOR_ADDR             addr_type;
+  typedef ACE_PEER_ACCEPTOR                  acceptor_type;
+  typedef SVC_HANDLER                        handler_type;
+  typedef typename SVC_HANDLER::stream_type  stream_type;
 
   // = Initialization and termination methods.
   /// Default constructor.
@@ -567,10 +567,10 @@ class ACE_Connect_Strategy
 public:
 
   // Useful STL-style traits.
-  typedef ACE_PEER_CONNECTOR_ADDR                addr_type;
-  typedef ACE_PEER_CONNECTOR                     connector_type;
-  typedef SVC_HANDLER                            handler_type;
-  typedef ACE_TYPENAME SVC_HANDLER::stream_type  stream_type;
+  typedef ACE_PEER_CONNECTOR_ADDR            addr_type;
+  typedef ACE_PEER_CONNECTOR                 connector_type;
+  typedef SVC_HANDLER                        handler_type;
+  typedef typename SVC_HANDLER::stream_type  stream_type;
 
   // = Initialization and termination methods.
   /// Default constructor.
@@ -633,9 +633,9 @@ class ACE_Scheduling_Strategy
 public:
 
   // Useful STL-style traits.
-  typedef ACE_TYPENAME SVC_HANDLER::addr_type    addr_type;
-  typedef SVC_HANDLER                            handler_type;
-  typedef ACE_TYPENAME SVC_HANDLER::stream_type  stream_type;
+  typedef typename SVC_HANDLER::addr_type    addr_type;
+  typedef SVC_HANDLER                        handler_type;
+  typedef typename SVC_HANDLER::stream_type  stream_type;
 
   // = Initialization and termination methods.
 
@@ -948,8 +948,8 @@ public:
   typedef ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Null_Mutex>
           CONNECTION_MAP;
 
-  typedef ACE_TYPENAME CONNECTION_MAP::ITERATOR CONNECTION_MAP_ITERATOR;
-  typedef ACE_TYPENAME CONNECTION_MAP::ENTRY CONNECTION_MAP_ENTRY;
+  typedef typename CONNECTION_MAP::ITERATOR CONNECTION_MAP_ITERATOR;
+  typedef typename CONNECTION_MAP::ENTRY CONNECTION_MAP_ENTRY;
 
   typedef ACE_Reverse_Lock<MUTEX> REVERSE_MUTEX;
 
diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp
index 4e77018e5d1..ce16da60754 100644
--- a/ACE/ace/Task.cpp
+++ b/ACE/ace/Task.cpp
@@ -12,16 +12,20 @@ ACE_RCSID (ace,
            Task,
            "$Id$")
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man)
   : thr_count_ (0),
     thr_mgr_ (thr_man),
     flags_ (0),
-    grp_id_ (-1),
-    last_thread_id_ (0)
+    grp_id_ (-1)
+#if !defined (ACE_MVS)
+    ,last_thread_id_ (0)
+#endif /* !defined (ACE_MVS) */
 {
+#if defined (ACE_MVS)
+   ACE_OS::memset( &this->last_thread_id_, '\0', sizeof( this->last_thread_id_ ));
+#endif /* defined (ACE_MVS) */
 }
 
 ACE_Task_Base::~ACE_Task_Base (void)
@@ -192,7 +196,11 @@ ACE_Task_Base::activate (long flags,
   if (this->grp_id_ == -1)
     this->grp_id_ = grp_spawned;
 
+#if defined (ACE_MVS)
+  ACE_OS::memcpy( &this->last_thread_id_, '\0', sizeof(this->last_thread_id_));
+#else
   this->last_thread_id_ = 0;    // Reset to prevent inadvertant match on ID
+#endif /* defined (ACE_MVS) */
 
   return 0;
 
diff --git a/ACE/ace/Unbounded_Set.cpp b/ACE/ace/Unbounded_Set.cpp
index c3a444ccd8a..480fd404407 100644
--- a/ACE/ace/Unbounded_Set.cpp
+++ b/ACE/ace/Unbounded_Set.cpp
@@ -30,7 +30,7 @@ template <class T> int
 ACE_Unbounded_Set<T>::insert_tail (const T &item)
 {
   // ACE_TRACE ("ACE_Unbounded_Set<T>::insert_tail");
-  ACE_Node<T> *temp;
+  ACE_Node<T> *temp = 0;
 
   // Insert <item> into the old dummy node location.
   this->head_->item_ = item;
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 3cede3b8bba..aeb1b7fd001 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -5,5 +5,5 @@
 
 #define ACE_MAJOR_VERSION 5
 #define ACE_MINOR_VERSION 5 
-#define ACE_BETA_VERSION 4 
-#define ACE_VERSION "5.5.4"
+#define ACE_BETA_VERSION 6 
+#define ACE_VERSION "5.5.6"
diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h
index 36d31fb2900..cb1af37a18a 100644
--- a/ACE/ace/config-aix-5.x.h
+++ b/ACE/ace/config-aix-5.x.h
@@ -73,7 +73,6 @@
    // These are for Visual Age C++ only
 #  if defined (__IBMCPP__) && (__IBMCPP__ >= 400)
 #    define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
-#    define ACE_HAS_TYPENAME_KEYWORD
      // When using -qtempinc, we don't need to see template implementation
      // source (though we do need a pragma to find the correct source file).
      // However, without -qtempinc (either -qnotempinc or -qtemplateregistry)
diff --git a/ACE/ace/config-borland-common.h b/ACE/ace/config-borland-common.h
index 46829114990..3e082e86446 100644
--- a/ACE/ace/config-borland-common.h
+++ b/ACE/ace/config-borland-common.h
@@ -53,7 +53,6 @@
 # define ACE_HAS_STRING_CLASS 1
 # define ACE_HAS_TEMPLATE_SPECIALIZATION 1
 # define ACE_HAS_TEMPLATE_TYPEDEFS 1
-# define ACE_HAS_TYPENAME_KEYWORD 1
 # define ACE_HAS_USER_MODE_MASKS 1
 # define ACE_LACKS_ACE_IOSTREAM 1
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
diff --git a/ACE/ace/config-cxx-common.h b/ACE/ace/config-cxx-common.h
index f4549840c55..5b5c814e278 100644
--- a/ACE/ace/config-cxx-common.h
+++ b/ACE/ace/config-cxx-common.h
@@ -36,7 +36,6 @@
 #   define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #   define ACE_HAS_TEMPLATE_SPECIALIZATION
 #   define ACE_HAS_TEMPLATE_TYPEDEFS
-#   define ACE_HAS_TYPENAME_KEYWORD
 
 #   define ACE_ENDLESS_LOOP \
       unsigned int ace_endless_loop____ = 0; if (ace_endless_loop____) break;
diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h
index 215ffb8e37f..81296abdd65 100644
--- a/ACE/ace/config-cygwin32.h
+++ b/ACE/ace/config-cygwin32.h
@@ -75,7 +75,6 @@
 //#define ACE_HAS_SYSV_IPC
 #define ACE_HAS_VOIDPTR_MMAP
 #define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_MEMCHR 1
 #define ACE_HAS_POLL
 #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
 #define ACE_HAS_SOCKADDR_MSG_NAME 1
diff --git a/ACE/ace/config-doxygen.h b/ACE/ace/config-doxygen.h
index 4f9618be7c9..30f3e9fafb6 100644
--- a/ACE/ace/config-doxygen.h
+++ b/ACE/ace/config-doxygen.h
@@ -78,6 +78,8 @@
 #define TAO_HAS_AMI 1
 #define TAO_HAS_INTERCEPTORS 1
 #define TAO_HAS_SCIOP 1
+#define TAO_HAS_COIOP 1
+#define TAO_HAS_TRANSPORT_CURRENT 1
 
 /// Generate token library documentation
 #define ACE_HAS_TOKENS_LIBRARY
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index 2fef303fa45..131f1832b3d 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -13,7 +13,6 @@
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_STDCPP_STL_INCLUDES
 #define ACE_HAS_TEMPLATE_TYPEDEFS
-#define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
@@ -71,6 +70,10 @@
 
 # if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0
 #  undef ACE_HAS_CUSTOM_EXPORT_MACROS
+#  if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS)
+#    undef ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS
+#  endif /* ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS */
+#  define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 0
 # else
 #  ifndef ACE_HAS_CUSTOM_EXPORT_MACROS
 #    define ACE_HAS_CUSTOM_EXPORT_MACROS
@@ -78,7 +81,7 @@
 #  define ACE_Proper_Export_Flag __attribute__ ((visibility("default")))
 #  define ACE_Proper_Import_Flag
 
-# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
+#  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
 // Sadly, G++ 4.x silently ignores visibility attributes on
 // template instantiations, which breaks singletons.
 // As a workaround, we use the GCC visibility pragmas.
@@ -87,10 +90,10 @@
 // This has been fixed in GCC 4.1.1 with FC6 but not with SuSE 10.2
 // that gets shipped with GCC 4.1.2 so we assume that with GCC 4.2
 // this will be fixed on the head. With FC6 just set this define yourself
-#  ifndef ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS
-#    define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
+#   ifndef ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS
+#     define ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS 1
+#   endif
 #  endif
-# endif
 
 #  if defined (ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS) && ACE_GCC_HAS_TEMPLATE_INSTANTIATION_VISIBILITY_ATTRS == 1
 #   define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T
@@ -108,8 +111,8 @@
 
 // Note that the "__extension__" is needed to prevent g++ from issuing
 // an error when using its "-pedantic" command line flag.
-#  define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T
-#  define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>;
+# define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T
+# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>;
 
 # endif  /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */
 #endif  /* __GNU__ >= 4 */
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index a8626a180bb..f5b9bf8826c 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -100,13 +100,15 @@
 #      if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
 #        undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
 #      endif
-#      define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#      if defined (RWSTD_NO_NAMESPACE)
+         namespace std {} using namespace std;
+#      else
+#        define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+#      endif /* RWSTD_NO_NAMESPACE */
 #    else
 #      define ACE_USES_OLD_IOSTREAMS
 #    endif /* _HP_NAMESPACE_STD */
 
-#    define ACE_HAS_TYPENAME_KEYWORD
-
 // Compiler implements templates that support typedefs inside of classes
 // used as formal arguments to a template class.
 #    define ACE_HAS_TEMPLATE_TYPEDEFS
@@ -267,9 +269,6 @@
 /* Platform defines MAP_FAILED as a long constant. */
 #define ACE_HAS_LONG_MAP_FAILED 1
 
-/* Define to 1 if platform has memchr(). */
-#define ACE_HAS_MEMCHR 1
-
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
 
diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h
index bd9424612f0..379cb040eae 100644
--- a/ACE/ace/config-icc-common.h
+++ b/ACE/ace/config-icc-common.h
@@ -9,7 +9,6 @@
 # define ACE_HAS_CPLUSPLUS_HEADERS
 # define ACE_HAS_STDCPP_STL_INCLUDES
 # define ACE_HAS_TEMPLATE_TYPEDEFS
-# define ACE_HAS_TYPENAME_KEYWORD
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_HAS_TEMPLATE_SPECIALIZATION
 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
diff --git a/ACE/ace/config-irix6.x-sgic++.h b/ACE/ace/config-irix6.x-sgic++.h
index 16e7d5e04fe..318596ea76d 100644
--- a/ACE/ace/config-irix6.x-sgic++.h
+++ b/ACE/ace/config-irix6.x-sgic++.h
@@ -17,9 +17,6 @@
 #if _COMPILER_VERSION >= 720
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-# ifdef _STANDARD_C_PLUS_PLUS
-#   define ACE_HAS_TYPENAME_KEYWORD
-# endif /* _STANDARD_C_PLUS_PLUS */
 #else
 #define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 #endif /* _COMPILER_VERSION >= 720 */
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 2fa08aa430d..0232d20cb1c 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -195,7 +195,6 @@
 # define ACE_HAS_CPLUSPLUS_HEADERS
 # define ACE_HAS_STDCPP_STL_INCLUDES
 # define ACE_HAS_TEMPLATE_TYPEDEFS
-# define ACE_HAS_TYPENAME_KEYWORD
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 # define ACE_LACKS_SWAB
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index 3d2ec76c8d5..d07d13a273d 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -51,7 +51,6 @@
 #define ACE_HAS_ICMP_SUPPORT 1
 #define ACE_HAS_IP_MULTICAST
 #define ACE_HAS_LYNXOS_SIGNALS
-#define ACE_HAS_MEMCHR
 #define ACE_HAS_MSG
 #define ACE_HAS_NONCONST_CLOCK_SETTIME
 #define ACE_HAS_NONCONST_MSGSND
@@ -76,7 +75,6 @@
 #define ACE_HAS_SYS_SOCKIO_H
 #define ACE_HAS_TERMIOS
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
-#define ACE_HAS_TYPENAME_KEYWORD
 #define ACE_LACKS_CONST_TIMESPEC_PTR
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_MADVISE
diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h
index 840d6a8f28a..ebb4189e109 100644
--- a/ACE/ace/config-macosx-panther.h
+++ b/ACE/ace/config-macosx-panther.h
@@ -32,8 +32,6 @@
 
 //#define ACE_HAS_SVR4_TLI
 
-#define ACE_HAS_MEMCHR
-
 #define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_WCHAR_H
 
diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h
index 4201ac8ddb6..42d4928ab52 100644
--- a/ACE/ace/config-macosx-tiger.h
+++ b/ACE/ace/config-macosx-tiger.h
@@ -48,8 +48,6 @@
 //#define ACE_HAS_SVR4_TLI
 #define ACE_HAS_SUNOS4_GETTIMEOFDAY
 
-#define ACE_HAS_MEMCHR
-
 #define ACE_LACKS_STROPTS_H
 
 // Wcharness....
diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h
index 215894604c6..3dfe3f5eaa5 100644
--- a/ACE/ace/config-macosx.h
+++ b/ACE/ace/config-macosx.h
@@ -31,8 +31,6 @@
 
 //#define ACE_HAS_SVR4_TLI
 
-#define ACE_HAS_MEMCHR
-
 #define ACE_LACKS_STROPTS_H
 #define ACE_LACKS_WCHAR_H
 
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index d6c073423c4..c2fcaafa03b 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -96,11 +96,13 @@
 #   define ACE_USING using
 #endif /* !ACE_LACKS_DEPRECATED_MACROS */
 
-# if defined (ACE_HAS_TYPENAME_KEYWORD)
-#   define ACE_TYPENAME typename
-# else
-#   define ACE_TYPENAME
-# endif /* ACE_HAS_TYPENAME_KEYWORD */
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+/**
+ * @deprecated The @c ACE_TYPENAME macros is deprecated.  Use standard
+ *             C++ keyword typename instead.
+ */
+# define ACE_TYPENAME typename
+#endif /* !ACE_LACKS_DEPRECATED_MACROS */
 
 #if !defined (ACE_LACKS_DEPRECATED_MACROS)
 /**
diff --git a/ACE/ace/config-mvs.h b/ACE/ace/config-mvs.h
index 7f490764501..c7354e28eb1 100644
--- a/ACE/ace/config-mvs.h
+++ b/ACE/ace/config-mvs.h
@@ -38,11 +38,13 @@
 # define ACE_LACKS_LONGLONG_T
 #endif /* __COMPILER_VER__ < 0x22060000 */
 
+#define ERRMAX __sys_nerr
+
+#define ACE_HAS_3_PARAM_WCSTOK
 #define ACE_HAS_BROKEN_CTIME
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_DIRENT
-#define ACE_HAS_EXCEPTIONS
 #define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_GETRUSAGE
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
@@ -65,9 +67,11 @@
 #define ACE_HAS_SIZET_SOCKET_LEN
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STRERROR
+#define ACE_HAS_STRBUF_T
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SYSV_IPC
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
+#define ACE_HAS_TEMPLATE_TYPEDEFS
 #define ACE_HAS_THREADS
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_THR_C_DEST
@@ -80,20 +84,30 @@
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
 
 #define ACE_LACKS_CONDATTR_PSHARED
+#define ACE_LACKS_INET_ATON
+#define ACE_LACKS_MSGBUF_T
 #define ACE_LACKS_MUTEXATTR_PSHARED
 #define ACE_LACKS_IOSTREAM_FX
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MALLOC_H
+#define ACE_LACKS_PARAM_H
 #define ACE_LACKS_SYS_PARAM_H
 #define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 #define ACE_LACKS_READDIR_R
 #define ACE_LACKS_RWLOCK_T
+#define ACE_LACKS_SCHED_H
 #define ACE_LACKS_SETSCHED
+#define ACE_LACKS_SEMAPHORE_H
 #define ACE_LACKS_SIGINFO_H
-#define ACE_LACKS_STRRECVFD
+#define ACE_LACKS_STDINT_H
+#define ACE_LACKS_SYS_NERR
+#define ACE_LACKS_SYS_SELECT_H
+#define ACE_LACKS_SYS_SYSCTL_H
+#define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_NETINET_TCP_H
+#define ACE_LACKS_TCP_H
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_LACKS_THREAD_STACK_ADDR
 #define ACE_LACKS_TIMESPEC_T
@@ -107,8 +121,11 @@
 #define ACE_SIZEOF_FLOAT 4
 #define ACE_SIZEOF_DOUBLE 8
 #define ACE_SIZEOF_LONG_DOUBLE 16
+#define ACE_HAS_EBCDIC
 
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
+#define IN_CLASSD(a) ((((in_addr_t)(a)) & 0xf0000000) == 0xe0000000)
+#define IN_MULTICAST(a) IN_CLASSD(a)
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h
index 931b473102e..f613692f5f0 100644
--- a/ACE/ace/config-netbsd.h
+++ b/ACE/ace/config-netbsd.h
@@ -42,7 +42,6 @@
 #define ACE_HAS_GPERF 1
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1
 #define ACE_HAS_IP_MULTICAST 1
-#define ACE_HAS_MEMCHR 1
 #define ACE_HAS_MSG 1
 #define ACE_HAS_NEW_NOTHROW 1
 #define ACE_HAS_NEW_NO_H 1
@@ -88,7 +87,6 @@
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE 1
 #define ACE_HAS_TIMEZONE 1
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY 1
-#define ACE_HAS_TYPENAME_KEYWORD 1
 #define ACE_HAS_UALARM 1
 #define ACE_HAS_UCONTEXT_T 1
 #define ACE_HAS_VOIDPTR_MMAP 1
diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h
index 24eaceceb3c..8281f85f773 100644
--- a/ACE/ace/config-openvms.h
+++ b/ACE/ace/config-openvms.h
@@ -91,7 +91,6 @@
 #define ACE_HAS_VOIDPTR_GETTIMEOFDAY 1
 #define ACE_HAS_DIRENT 1
 #define ACE_HAS_GETPAGESIZE 1
-#define ACE_HAS_MEMCHR 1
 #define ACE_HAS_MSG
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R 1
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index bed53e2724a..9e1da93377f 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -63,19 +63,22 @@
 // rtems 4.6.6.
 #define ACE_LACKS_WCHAR_H
 
-// Yes, we do have threads.
-#define ACE_HAS_THREADS
-// And they're even POSIX pthreads (MIT implementation)
-#define ACE_HAS_PTHREADS
-// ... and the final standard even!
-#define ACE_HAS_PTHREADS_STD
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-#define ACE_HAS_PTHREAD_SCHEDPARAM
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
-
-// XXX thread defines go here
+#if !defined (ACE_MT_SAFE)
 #define ACE_MT_SAFE 1
-#define ACE_PAGE_SIZE 4096
+#endif
+
+#if ACE_MT_SAFE
+# define ACE_HAS_THREADS
+# define ACE_HAS_PTHREADS
+# define ACE_HAS_PTHREADS_STD
+# define ACE_HAS_THREAD_SPECIFIC_STORAGE
+# define ACE_HAS_PTHREAD_SCHEDPARAM
+# define ACE_LACKS_THREAD_PROCESS_SCOPING
+#else
+# define ACE_HAS_POSIX_GETPWNAM_R
+# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+#endif
+
 #define ACE_HAS_ALT_CUSERID
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_3_PARAM_READDIR_R
@@ -83,10 +86,10 @@
 #define ACE_HAS_CLOCK_SETTIME
 #define ACE_HAS_DIRENT
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_MEMCHR
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_MKTIME
 #define ACE_HAS_NONCONST_READV
+#define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_REENTRANT_FUNCTIONS
@@ -142,6 +145,7 @@
 #if (__RTEMS_MAJOR__ > 4) || (__RTEMS_MAJOR__ == 4 && __RTEMS_MINOR__ > 6)
 # define ACE_HAS_UALARM
 #else
+# define ACE_HAS_BROKEN_SC_PAGESIZE
 # define ACE_LACKS_SUSECONDS_T
 # define ACE_LACKS_INTPTR_T
 # undef ACE_HAS_SHM_OPEN
diff --git a/ACE/ace/config-sco-5.0.0.h b/ACE/ace/config-sco-5.0.0.h
index c155651a29a..519b74a2ead 100644
--- a/ACE/ace/config-sco-5.0.0.h
+++ b/ACE/ace/config-sco-5.0.0.h
@@ -25,9 +25,6 @@
 
 #define ACE_DEFAULT_CLOSE_ALL_HANDLES 0
 
-// Compiler doesn't support static data member templates.
-//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
 #define ACE_HAS_NONCONST_MSGSND
diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h
index 707d93ca83d..953b04fd2a0 100644
--- a/ACE/ace/config-suncc-common.h
+++ b/ACE/ace/config-suncc-common.h
@@ -9,7 +9,6 @@
 # define ACE_HAS_CPLUSPLUS_HEADERS
 # define ACE_HAS_STDCPP_STL_INCLUDES
 # define ACE_HAS_TEMPLATE_TYPEDEFS
-# define ACE_HAS_TYPENAME_KEYWORD
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_HAS_TEMPLATE_SPECIALIZATION
 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index 5fe33487e16..d877d19af67 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -33,8 +33,6 @@
 # if (__SUNPRO_CC >= 0x500)
     // string.h and memory.h conflict for memchr definitions
 #   define ACE_LACKS_MEMORY_H
-    // Sun C++ 5.0 supports the `using' and `typename' keywords.
-#   define ACE_HAS_TYPENAME_KEYWORD
     // If -compat=4 is turned on, the old 4.2 settings for iostreams are used,
     // but the newer, explicit instantiation is used (above)
 #   if (__SUNPRO_CC_COMPAT >= 5)
@@ -366,7 +364,6 @@
 
 #define ACE_HAS_GPERF
 #define ACE_HAS_DIRENT
-#define ACE_HAS_MEMCHR
 
 #if defined (__SUNPRO_CC)
 # define ACE_CC_NAME ACE_LIB_TEXT ("SunPro C++")
diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h
index 59eb8661926..69ced888e04 100644
--- a/ACE/ace/config-sunos5.6.h
+++ b/ACE/ace/config-sunos5.6.h
@@ -50,9 +50,6 @@
 #if __SUNPRO_CC == 0x540
 #undef ACE_HAS_TEMPLATE_TYPEDEFS
 #endif
-#ifndef ACE_HAS_TYPENAME_KEYWORD
-#define ACE_HAS_TYPENAME_KEYWORD                1
-#endif /* ACE_HAS_TYPENAME_KEYWORD */
 #ifndef ACE_HAS_THR_C_DEST
 #define ACE_HAS_THR_C_DEST                      1
 #endif /* ACE_HAS_THR_C_DEST */
diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h
index 102092a9ea5..6b6678e6804 100644
--- a/ACE/ace/config-tandem-nsk-mips-v2.h
+++ b/ACE/ace/config-tandem-nsk-mips-v2.h
@@ -103,9 +103,6 @@ typedef enum CMA_T_SCHED_POLICY {
 // Platform lacks streambuf "linebuffered ()".  [C++ iostream]
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
-// Use native implementation of memchr.
-#define ACE_HAS_MEMCHR
-
 // Platform supports recvmsg and sendmsg
 #define ACE_HAS_MSG
 
diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h
index f975a979561..f4a122d462d 100644
--- a/ACE/ace/config-tandem-nsk-mips-v3.h
+++ b/ACE/ace/config-tandem-nsk-mips-v3.h
@@ -104,9 +104,6 @@ typedef enum CMA_T_SCHED_POLICY {
 // Platform lacks streambuf "linebuffered ()".  [C++ iostream]
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
-// Use native implementation of memchr.
-#define ACE_HAS_MEMCHR
-
 // Platform supports recvmsg and sendmsg
 #define ACE_HAS_MSG
 
@@ -411,9 +408,6 @@ extern int cma_sigwait  (sigset_t *);
 // Following will not be needed if use standard c library (G06.20 and later)
 #define ACE_LACKS_SIGNED_CHAR
 
-// Compiler supports the typename keyword for templates
-#define ACE_HAS_TYPENAME_KEYWORD
-
 // Compiler can handle any operators in namespace
 #define ACE_ANY_OPS_USE_NAMESPACE
 
diff --git a/ACE/ace/config-tru64.h b/ACE/ace/config-tru64.h
index d34d7e0f68a..2c17fb18350 100644
--- a/ACE/ace/config-tru64.h
+++ b/ACE/ace/config-tru64.h
@@ -53,7 +53,6 @@
     // Exceptions are enabled by platform_osf1_4.0_rcc.GNU.
 # define ACE_HAS_STDCPP_STL_INCLUDES
 # define ACE_HAS_TEMPLATE_SPECIALIZATION
-# define ACE_HAS_TYPENAME_KEYWORD
 #else
 #  ifdef __cplusplus  /* Let it slide for C compilers. */
 #   error unsupported compiler on Digital Unix
diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h
index 33f4205fb04..ed3e0ee576d 100644
--- a/ACE/ace/config-unixware-7.1.0.udk.h
+++ b/ACE/ace/config-unixware-7.1.0.udk.h
@@ -343,9 +343,6 @@
 /* Platform has <utime.h> header file */
 #define ACE_HAS_UTIME 1
 
-/* Compiler supports the C++ typename keyword */
-#define ACE_HAS_TYPENAME_KEYWORD 1
-
 /* Prints out console message in ACE_NOTSUP.  Useful for tracking down origin
    of ACE_NOTSUP. */
 /* #undef ACE_HAS_VERBOSE_NOTSUP */
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index fbc957b9b85..c1372dd1fcf 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -54,6 +54,22 @@
 #  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! ghs */
 
+// Needed include to get all VxWorks CPU types
+#include "types/vxCpu.h"
+#if defined __RTP__
+  #if defined (_VX_CPU) && (_VX_CPU == _VX_PENTIUM || _VX_CPU == _VX_PENTIUM2 || _VX_CPU == _VX_PENTIUM3 || _VX_CPU == _VX_PENTIUM4)
+    // If running an Intel Pentium the
+    // ACE_OS::gethrtime () can use the RDTSC instruction.
+    # define ACE_HAS_PENTIUM
+  #endif
+#else
+  #if defined (CPU) && (CPU == PENTIUM || CPU == PENTIUM2 || CPU == PENTIUM3 || CPU == PENTIUM4)
+   // If running an Intel Pentium the
+   // ACE_OS::gethrtime () can use the RDTSC instruction.
+    # define ACE_HAS_PENTIUM
+  #endif
+#endif
+
 // OS-specific configuration
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_3_PARAM_READDIR_R
@@ -174,6 +190,10 @@
   #define ACE_HAS_SVR4_DYNAMIC_LINKING
   #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
   #define ACE_LACKS_REGEX_H
+  #if defined ACE_HAS_PENTIUM
+  // Bug to workaround VxWorks 6.4 x86
+  #  define ACE_LACKS_PUTENV
+  #endif
   #define ACE_HAS_SETENV
   #define ACE_HAS_3_PARAM_WCSTOK
   #define ACE_HAS_WCHAR
@@ -272,22 +292,6 @@
 # define ACE_MT_SAFE 1
 #endif
 
-// Needed include to get all VxWorks CPU types
-#include "types/vxCpu.h"
-#if defined __RTP__
-  #if defined (_VX_CPU) && (_VX_CPU == _VX_PENTIUM || _VX_CPU == _VX_PENTIUM2 || _VX_CPU == _VX_PENTIUM3 || _VX_CPU == _VX_PENTIUM4)
-    // If running an Intel Pentium the
-    // ACE_OS::gethrtime () can use the RDTSC instruction.
-    # define ACE_HAS_PENTIUM
-  #endif
-#else
-  #if defined (CPU) && (CPU == PENTIUM || CPU == PENTIUM2 || CPU == PENTIUM3 || CPU == PENTIUM4)
-   // If running an Intel Pentium the
-   // ACE_OS::gethrtime () can use the RDTSC instruction.
-    # define ACE_HAS_PENTIUM
-  #endif
-#endif
-
 // VxWorks defines the CPU define MAP, undef it to prevent problems with
 // application code
 #if defined (MAP)
diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h
index b320901221f..2571f0df277 100644
--- a/ACE/ace/config-win32-dmc.h
+++ b/ACE/ace/config-win32-dmc.h
@@ -56,7 +56,6 @@
 # define ACE_HAS_STRING_CLASS 1
 # define ACE_HAS_TEMPLATE_SPECIALIZATION 1
 # define ACE_HAS_TEMPLATE_TYPEDEFS 1
-# define ACE_HAS_TYPENAME_KEYWORD 1
 //# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 # define ACE_HAS_USER_MODE_MASKS 1
 //# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h
index af8de96c541..998129a7312 100644
--- a/ACE/ace/config-win32-ghs.h
+++ b/ACE/ace/config-win32-ghs.h
@@ -64,7 +64,6 @@
 # define ACE_HAS_STRING_CLASS 1
 # define ACE_HAS_TEMPLATE_SPECIALIZATION 1
 # define ACE_HAS_TEMPLATE_TYPEDEFS 1
-# define ACE_HAS_TYPENAME_KEYWORD 1
 //# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 # define ACE_HAS_USER_MODE_MASKS 1
 # define ACE_LACKS_ACE_IOSTREAM 1
diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h
index 954bc24cc45..95513020e33 100644
--- a/ACE/ace/config-win32-interix.h
+++ b/ACE/ace/config-win32-interix.h
@@ -21,7 +21,6 @@
 # define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS    // Don't have gethostbyaddr_r and friends.
 # define ACE_HAS_DIRENT
 # define ACE_HAS_STDCPP_STL_INCLUDES
-# define ACE_HAS_TYPENAME_KEYWORD
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 # define ACE_HAS_NONCONST_SELECT_TIMEVAL
diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h
index 78c36b503f1..5332d4537a1 100644
--- a/ACE/ace/config-win32-msvc-7.h
+++ b/ACE/ace/config-win32-msvc-7.h
@@ -37,8 +37,6 @@
 #define ACE_AUTO_PTR_LACKS_RESET
 #endif
 
-#define ACE_HAS_TYPENAME_KEYWORD
-
 #define ACE_HAS_ITOA
 
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
diff --git a/ACE/ace/config-win32-msvc-8.h b/ACE/ace/config-win32-msvc-8.h
index 9fc2529dec0..13f6d7d233d 100644
--- a/ACE/ace/config-win32-msvc-8.h
+++ b/ACE/ace/config-win32-msvc-8.h
@@ -32,8 +32,6 @@
 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #endif
 
-#define ACE_HAS_TYPENAME_KEYWORD
-
 #define ACE_HAS_ITOA
 
 #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
diff --git a/ACE/ace/config-win32-visualage.h b/ACE/ace/config-win32-visualage.h
index 62cc24037b1..2bd490d74eb 100644
--- a/ACE/ace/config-win32-visualage.h
+++ b/ACE/ace/config-win32-visualage.h
@@ -63,7 +63,6 @@
 #define ACE_HAS_STRING_CLASS 1
 #define ACE_HAS_TEMPLATE_SPECIALIZATION 1
 #define ACE_HAS_TEMPLATE_TYPEDEFS 1
-#define ACE_HAS_TYPENAME_KEYWORD 1
 #define ACE_LACKS_ACE_IOSTREAM 1
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
 #define ACE_LACKS_STRPTIME 1
diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h
index d9895abdecc..2ece5f6d901 100644
--- a/ACE/ace/os_include/sys/os_types.h
+++ b/ACE/ace/os_include/sys/os_types.h
@@ -81,7 +81,7 @@ typedef double ACE_timer_t;
 #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8
    typedef off_t ACE_LOFF_T;
 #elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || \
-  (defined (ACE_OPENVMS) && defined (_LARGEFILE))
+  (defined (ACE_OPENVMS) && defined (_LARGEFILE)) || defined(ACE_MVS)
    typedef off_t ACE_LOFF_T;
 #elif defined (__sgi) || defined (AIX) || defined (HPUX) || defined (__QNX__)
    typedef off64_t ACE_LOFF_T;
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index 72812a24622..75f07eadbf5 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -148,13 +148,13 @@ VSHDIR = <%targetoutdir%>.shobj/
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 ## We don't need the ACELIB setting from wrapper_macros.GNU
 ACELIB =
+<%if(ciao)%>
+include $(CIAO_ROOT)/rules.ciao.GNU
+<%endif%>
 <%if(tao)%>
 tao_dont_use_idl_make_rule = 1
 include $(TAO_ROOT)/rules.tao.GNU
 <%endif%>
-<%if(ciao)%>
-include $(CIAO_ROOT)/rules.ciao.GNU
-<%endif%>
 <%if(version)%>
 
 ifeq ($(versioned_so),1)
@@ -634,6 +634,13 @@ ifneq ($(GENERATED_DIRTY),)
 	-$(RM) -r $(GENERATED_DIRTY)
 endif
 
+__prebuild__:
+<%if(prebuild)%>
+	@<%eval(prebuild)%>
+<%else%>
+	@-:
+<%endif%>
+
 <%if(postbuild)%>
 all: __postbuild__
 
diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm
index a6d1253f0e9..8138887c377 100644
--- a/ACE/bin/PerlACE/Run_Test.pm
+++ b/ACE/bin/PerlACE/Run_Test.pm
@@ -190,6 +190,31 @@ sub add_lib_path {
 
 }
 
+sub check_privilege_group {
+  if ($^O eq 'hpux') {
+    my($access) = 'RTSCHED';
+    my($status) = 0;
+    my($getprivgrp) = '/bin/getprivgrp';
+
+    if (-x $getprivgrp) {
+      if (open(GPG, "$getprivgrp |")) {
+        while(<GPG>) {
+          if (index($_, $access) >= 0) {
+            $status = 1;
+          }
+        }
+        close(GPG);
+      }
+    }
+
+    if (!$status) {
+      print STDERR "WARNING: You must have $access privileges to run this test.\n",
+                   "         Run \"man 1m setprivgrp\" for more information.\n";
+      exit(0);
+    }
+  }
+}
+
 $sleeptime = 5;
 
 1;
diff --git a/ACE/bin/auto_run_tests.pl b/ACE/bin/auto_run_tests.pl
index 6c7a98aae67..4f23f6f8bd1 100755
--- a/ACE/bin/auto_run_tests.pl
+++ b/ACE/bin/auto_run_tests.pl
@@ -89,7 +89,7 @@ foreach my $test_lst (@file_list) {
       $config_list->load ($ACE_ROOT.$test_lst);
     }
     elsif (-r "$startdir/$test_list") {
-      $config_list->load ("$stardir/$test_lst");
+      $config_list->load ("$startdir/$test_lst");
     }
     else {
       $config_list->load ($test_list);
@@ -118,21 +118,20 @@ foreach my $test_lst (@file_list) {
             print "auto_run_tests: $test\n";
         }
 
+        my($orig_dir) = $directory;
         if ($directory =~ m:^TAO/(.*):) {
           $directory = $1;
         }
 
         $status = undef;
         foreach my $path ($ACE_ROOT."/$directory",
+                          $TAO_ROOT."/$directory",
                           $startdir."/$directory",
-                          $TAO_ROOT."/$directory" )
-          {
-          if (-d $path) {
-            $status = chdir ($path);
+                          $startdir."/$orig_dir") {
+          if (-d $path && ($status = chdir ($path))) {
             last;
           }
         }
-        $status = chdir ($directory) if (! defined($status));
 
         if (!$status) {
           print STDERR "ERROR: Cannot chdir to $ACE_ROOT/$directory\n";
diff --git a/ACE/bin/clean_sems.sh b/ACE/bin/clean_sems.sh
index 57fbf3e9c06..0409ce83960 100755
--- a/ACE/bin/clean_sems.sh
+++ b/ACE/bin/clean_sems.sh
@@ -1,18 +1,26 @@
 #!/bin/sh
 
-if [ -z "$USER" ]; then
+SYSTEM=`uname -s`
+IPCS="ipcs"
+IPCRM="ipcrm -s"
+
+if [ "$SYSTEM" = "Darwin" ]; then
+  USER=`id | sed 's/(.*//; s/uid=//'`
+  IPCS="ngvipc -s"
+  IPCRM="ngvipc -s -R"
+elif [ -z "$USER" ]; then
   USER=`id | sed 's/).*//; s/.*(//'`
 fi
 
-SYSTEM=`uname -s`
+
 case "$SYSTEM" in
   "Linux" )
     ipcs -a | grep $USER | awk '{ print ($2) }' | xargs ipcrm sem;
     ;;
   * )
-    semids=`ipcs | grep "^s" | grep $USER | awk '{ print ($2) }'`
+    semids=`$IPCS | grep "^s" | grep $USER | awk '{ print ($2) }'`
     for p in $semids
-      do ipcrm -s $p
+      do $IPCRM $p
     done
     ;;
 esac
diff --git a/ACE/bin/cvslog b/ACE/bin/cvslog
deleted file mode 100755
index 1330db622f8..00000000000
--- a/ACE/bin/cvslog
+++ /dev/null
@@ -1,169 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-#
-# Wraps cvs log, and substitutes messages of form "ChangeLogTag"
-# with their corresponding ChangeLog entries.
-#
-# Authors:  Luther J. Baker and David L. Levine
-
-####
-#### global
-####
-use strict;
-my $dir_sep = $^O eq 'MSWin32'  ?  '\\'  :  '/';
-my $cvs_log_options = '';
-my @changelogs = ();
-my %changelog_hash = ();
-
-
-####
-#### main (I do this for reading clarity)
-####
-{
-  ####
-  #### Save any command line options (beginning with -), to pass to cvs log.
-  ####
-  while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
-    $cvs_log_options .= $cvs_log_options  ?  " " . shift  :  shift;
-  }
-
-  ####
-  #### Build up the array of ChangeLog files to search,
-  ####
-  &find_changelogs($ARGV[0]);
-
-  ####
-  #### Build the hash table of key=tags value=entry
-  ####
-  &build_changelog_hash();
-
-
-  ####
-  #### Print the cvs log for each filename argument.
-  #### Inserting expanded entries after ChangeLog tags
-  ####
-  foreach my $arg (@ARGV) {
-    &print_log ($arg);
-  }
-}
-
-
-####
-#### Function surrounding cvs log
-####
-sub print_log () {
-  my $file = shift;
-
-  open (CVSLOG, "cvs log $cvs_log_options $file |")  ||
-    die "$0: unable to open cvs log\n";
-
-  while (<CVSLOG>) {
-
-    if (/ChangeLog(Tag)?: *(.*)/i  ||
-        /ChangeLog( *Entry)?: *(.*)/i) {
-
-      chomp;
-      print "$_:\n";
-
-      # An array reference HAS to be defined, the following will NOT work
-      # print "$changelog_hash{$2})" || "ChangeLogTag NOT FOUND!!!!\n";
-
-      if (defined $changelog_hash{$2}) {
-        print "@{$changelog_hash{$2}}";
-      } else {
-        print "\n\tChangeLogTag \"$2\" NOT FOUND!!!!\n\n";
-      }
-
-    } else {
-      print;
-    }
-  }
-
-  close CVSLOG;
-}
-
-
-####
-#### Build the hash
-####
-sub build_changelog_hash () {
-  my $key = 0;
-  my @entry = ();
-
-  foreach my $changelog_file (@changelogs) {
-
-    open (CHANGELOG, $changelog_file)  ||
-      die "$0: unable to open '$changelog_file'\n";
-
-    while (<CHANGELOG>) {
-      if (/^\w/) {
-        if ($key) {
-          if (defined $changelog_hash{$key}) {
-            #### Deal with multiple identical ChangeLogTags.
-            push @{$changelog_hash{$key}}, @entry;
-          } else {
-            $changelog_hash{$key} = [ @entry ];
-          }
-        }
-        @entry = ();
-        chomp;
-        $key = $_;
-      }
-      else {
-        push @entry, $_;
-      }
-    }
-
-    close CHANGELOG;
-  }
-}
-
-
-####
-#### Find the ChangeLog(s) associated with the file.
-####
-sub find_changelogs () {
-  my $file = shift;
-
-  if ($#changelogs >= 0) {
-    @changelogs;
-  } else {
-    my $pwd = &basename ($file)  ||  '.';
-
-    #### The [C] ensures that the glob will actually look for the file.
-    while (! (@changelogs =
-              glob ("$pwd/[C]hangeLog " .
-                    "$pwd/[C]hangeLog-97 " .   #### ACE_wrappers/TAO
-                    "$pwd/[C]hangeLog-97b " .  #### ACE_wrappers
-                    "$pwd/ChangeLog-9[89]* " .
-                    "$pwd/ChangeLog-0*"))) {
-      if ($pwd !~ m%^${dir_sep}%) {
-        #### We're starting with a relative path.  Get the
-        #### absolute path.
-        chomp ($pwd = `pwd`);
-        $pwd .= "/$file";
-      }
-
-      $pwd = &basename ($pwd);
-
-      if ($pwd eq '') {
-        warn "$0: ChangeLog NOT FOUND for '$file'!!!!\n";
-        return ();
-      }
-    }
-  }
-}
-
-
-####
-#### Return directory component of a filename, without trailing $dir_sep.
-#### Return '' if there is no directory component.
-####
-sub basename () {
-  my $filename = shift;
-
-  $filename =~ s%[${dir_sep}][^${dir_sep}]+$%%  ?  $filename  :  '';
-}
diff --git a/ACE/bin/rm_exception_macros.pl b/ACE/bin/rm_exception_macros.pl
new file mode 100755
index 00000000000..1f671cf154f
--- /dev/null
+++ b/ACE/bin/rm_exception_macros.pl
@@ -0,0 +1,292 @@
+eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
+    & eval 'exec perl -w -S $0 $argv:q'
+    if 0;
+
+# ******************************************************************
+#      Author: Chad Elliott
+#        Date: 1/24/2007
+#         $Id$
+# Description: This script attempts to remove the ACE related exception
+#              macros from source code provided on the comand line.  It
+#              is not perfect, but does handle a large number of cases.
+#              You may need to hand edit files after running this
+#              script.
+# ******************************************************************
+
+# ******************************************************************
+# Pragma Section
+# ******************************************************************
+
+use strict;
+use FileHandle;
+use File::Basename;
+
+# ******************************************************************
+# Data Section
+# ******************************************************************
+
+my(%macros) = ('ACE_ENV_TYPE'                  => 'CORBA::Environment',
+               'ACE_TRY_ENV'                   => '_ACE_CORBA_Environment_variable',
+               'ACE_EXCEPTION_TYPE'            => 'CORBA::Exception',
+               'ACE_DEFAULT_GET_ENV_METHOD'    => 'TAO_default_environment',
+               'ACE_DECLARE_NEW_ENV'           => '',
+               'ACE_DECLARE_NEW_CORBA_ENV'     => '',
+               'ACE_CHECK *\(.*\)'             => '',
+               'ACE_CHECK'                     => '',
+               'ACE_CHECK_RETURN *\(.*\)'      => '',
+               'ACE_THROW_INT *\((.*)\)'       => 'throw $1',
+               'ACE_THROW *\((.*)\)'           => 'throw $1',
+#               'ACE_THROW_RETURN *\((.*),.+\)' => 'throw $1',
+               'ACE_TRY'                       => 'try',
+               'ACE_TRY_NEW_ENV'               => 'try',
+               'ACE_TRY_EX *\([^\)]+\)'        => 'try',
+               'ACE_TRY_CHECK'                 => '',
+               'ACE_TRY_CHECK_EX *\([^\)]+\)'  => '',
+               'ACE_TRY_THROW *\((.*)\)'       => 'throw $1',
+               'ACE_TRY_THROW_EX *\((.*),.+\)' => 'throw $1',
+               'ACE_CATCH *\((.*),(.+)\)'      => 'catch (const $1& $2)',
+               'ACE_CATCHANY'                  => 'catch (const CORBA::Exception& ex)',
+               'ACE_CATCHALL'                  => 'catch (...)',
+               'ACE_RETHROW'                   => 'throw',
+               'ACE_RE_THROW'                  => 'throw',
+               'ACE_RE_THROW_EX *\(.+\)'       => 'throw',
+               'ACE_ENDTRY'                    => '',
+               'ACE_ENV_RAISE *\((.+)\)'       => '$1->_raise ()',
+               'ACE_PRINT_TAO_EXCEPTION *\(([^,]+),(.+)\)' => '$1._tao_print_exception ($2)',
+               'ACE_PRINT_EXCEPTION *\(([^,]+),(.+)\)'     => '$1._tao_print_exception ($2)',
+               'TAO_INTERCEPTOR_CHECK_RETURN *\(.*\)'      => '',
+               'TAO_INTERCEPTOR_CHECK'                     => '',
+              );
+my(@keys)   = sort { length($b) <=> length($a) } keys %macros;
+
+# ******************************************************************
+# Subroutine Section
+# ******************************************************************
+
+sub process_file {
+  my($file)   = shift;
+  my($fh)     = new FileHandle();
+  my($status) = 0;
+
+  if (open($fh, $file)) {
+    my(@lines) = ();
+    my($mod)   = undef;
+    my($line)  = '';
+    my($cont_until_semicolon) = undef;
+    while(<$fh>) {
+      my($part) = $_;
+      $part =~ s/\s+$//;
+
+      if ($cont_until_semicolon) {
+        if ($part =~ s/^\s+// && $line =~ /[,\)]$/) {
+          $part = ' ' . $part;
+        }
+        $line .= $part;
+        if (index($part, ';') >= 0) {
+          $cont_until_semicolon = undef;
+        }
+        else {
+          next;
+        }
+      }
+      else {
+        $line = $part;
+      }
+
+      my($skip_blank) = undef;
+      foreach my $key (@keys) {
+        my($base) = undef;
+        if ($key =~ /^([^\s]+\s\*\\\()/) {
+          $base = $1;
+        }
+        if ($line =~ /^(\s*)?($key\s*[;]?)/) {
+          my($space)  = $1;
+          my($rest)   = $2;
+          my($first)  = $3 || '';
+          my($second) = $4 || '';
+          my($val)    = $macros{$key};
+          while($val =~ /\$(\d+)/) {
+            my($num) = $1;
+            if ($num == 1) {
+              $first =~ s/^\s+//;
+              $first =~ s/\s+$//;
+              $val =~ s/\$1/$first/;
+            }
+            elsif ($num == 2) {
+              $second =~ s/^\s+//;
+              $second =~ s/\s+$//;
+              $val =~ s/\$2/$second/;
+            }
+            else {
+              $val =~ s/\$\d+//;
+            }
+          }
+
+          $line =~ s/^(\s*)?($key\s*[;]?)//;
+          $val .= ';' if ($val ne '' && $rest =~ /;$/);
+          $line = $space . $val . $line;
+          $line =~ s/^\s+$//;
+
+          ## Fix up problems where ACE_TRY_THROW is used
+          ## on a line by itself with the parenthesis following
+          ## on the second line.  The parser gets confused and
+          ## thinks it needs to replace the ACE_TRY
+          if ($key eq 'ACE_TRY') {
+            $line =~ s/try_THROW/throw/g;
+          }
+
+          my($len) = length($line);
+          if ($len > 78 || $line =~ /""/) {
+            my($level) = 0;
+            my($indouble) = 0;
+            my($pch) = '';
+            my($fix_ace_text) = undef;
+            for(my $i = 0; $i < $len; $i++) {
+              my($ch) = substr($line, $i, 1);
+              if ($ch eq '"' && $pch ne '\\') {
+                $indouble ^= 1;
+              }
+              if (!$indouble) {
+                my($nch) = substr($line, $i + 1, 1);
+                if ($ch eq ',' || ($ch eq '"' && $nch eq '"') || $ch eq '(') {
+                  $level++ if ($ch eq '(');
+                  $fix_ace_text = (substr($line, 0, $i) =~ /ACE_TEXT\s*$/);
+                  if ($nch ne ')' && !$fix_ace_text) {
+                    my($add) = "\n" . $space . ('  ' x $level);
+                    my($start) = 0;
+                    while(substr($line, $i + 1 + $start, 1) =~ /\s/) {
+                      $start++;
+                    }
+                    substr($line, $i + 1, $start) = $add;
+                    $i += length($add) - $start;
+                    $len += length($add) - $start;
+                  }
+                }
+                elsif ($ch eq ')') {
+                  $level--;
+                  if ($fix_ace_text) {
+                    if (substr($line, $i) =~ /ACE_TEXT/) {
+                      my($add) = "\n" . $space . ('  ' x $level);
+                      my($start) = 0;
+                      while(substr($line, $i + 1 + $start, 1) =~ /\s/) {
+                        $start++;
+                      }
+                      substr($line, $i + 1, $start) = $add;
+                      $i += length($add) - $start;
+                      $len += length($add) - $start;
+                    }
+                    $fix_ace_text = undef;
+                  }
+                }
+              }
+              $pch = $ch;
+            }
+          }
+
+          $mod = 1;
+          $skip_blank = 1;
+          last;
+        }
+        elsif (defined $base &&
+               index($line, ';') == -1 && $line =~ /^(\s*)?$base/) {
+          $cont_until_semicolon = 1;
+          last;
+        }
+      }
+
+      if ($line =~ s/ACE_ANY_EXCEPTION/ex/g) {
+        $mod = 1;
+      }
+      if (!$cont_until_semicolon) {
+        if ($line =~ s/(\s*)ACE_ENV(_SINGLE)?_ARG_DECL_WITH_DEFAULTS// ||
+            $line =~ s/(\s*)ACE_ENV(_SINGLE)?_ARG_DECL_NOT_USED// ||
+            $line =~ s/(\s*)ACE_ENV(_SINGLE)?_ARG_DECL// ||
+            $line =~ s/(\s*)ACE_ENV(_SINGLE)?_ARG_(PARAMETER|NOT_USED)//) {
+          my($sp) = $1;
+          if ($line =~ /^\)/) {
+            if ($lines[$#lines] =~ /\/\/.*$/ ||
+                $lines[$#lines] =~ /\/\*.*\*\/$/) {
+              $line = $sp . $line;
+            }
+            else {
+              $lines[$#lines] .= $line;                          
+              $line = '';
+            }
+          }
+          $mod = 1;
+          $skip_blank = 1;
+        }
+        push(@lines, $line) if ($line ne '' || !$skip_blank);
+      }
+    }
+    close($fh);
+
+    if ($mod) {
+      if (open($fh, ">$file")) {
+        foreach my $line (@lines) {
+          print $fh $line, "\n";
+        }
+        close($fh);
+      }
+      else {
+        print "ERROR: Unable to write to $file\n";
+        $status++;
+      }
+    }
+  }
+  else {
+    print "ERROR: Unable to open $file\n";
+    $status++;
+  }
+
+  return $status;
+}
+
+sub process {
+  my($arg)    = shift;
+  my($status) = 0;
+
+  if (-d $arg) {
+    my($fh)  = new FileHandle();
+    if (opendir($fh, $arg)) {
+      foreach my $file (grep(!/^\.\.?$/, readdir($fh))) {
+        if ($file ne '.svn') {
+          $status += process($arg . '/' . $file);
+        }
+      }
+      closedir($fh);
+    }
+  }
+  elsif ($arg =~ /\.(h|hh|hpp|hxx|hh|cpp|cxx|cc|c|C|i|ipp|inl)$/) {
+    $status += process_file($arg);
+  }
+
+  return $status;
+}
+
+sub usageAndExit {
+  print "Usage: ", basename($0), " [directories or files]\n\n",
+        "Removes all exception related ACE macros.\n";
+  exit(0);
+}
+
+# ******************************************************************
+# Main Section
+# ******************************************************************
+
+my($status) = 0;
+
+if ($#ARGV == -1) {
+  usageAndExit();
+}
+
+foreach my $arg (@ARGV) {
+  if (index($arg, '-') == 0) {
+    usageAndExit();
+  }
+  else {
+    $status += process($arg);
+  }
+}
+
+exit($status);
diff --git a/ACE/bin/sets-manager.py b/ACE/bin/sets-manager.py
index 78056cac9f8..2806efe1c82 100755
--- a/ACE/bin/sets-manager.py
+++ b/ACE/bin/sets-manager.py
@@ -83,14 +83,43 @@ def svn_mkdir_local (path):
                         path])
     execute (command)
 
+def get_head_revision (url):
+    command = " ".join ([opts.svn,
+                         "info",
+                         url])
+
+    import re
+    lineregex = re.compile ("Last Changed Rev: (\d+)")
+    
+    for line in os.popen (command).readlines ():
+        match = lineregex.match (line)
+        if (match is not None):
+            return int(match.group (1))
+
+    print "ERROR: Unable to find current MPC head revision"
+    raise Exception
+
 def branch_ACE ():
     # Perform branching
     destination = opts.repo + opts.dest
     svn_copy (opts.repo + opts.source + "/ACE",
               destination + "modules/ACE")
+
+    # pin MPC revision
+    # Need local copy of the ACE directory to to the propset
+#    execute ("svn up -N " + opts.repo + path + "/modules/ACE sets_manager_temp/module_ACE")
+    execute ("svn up -N sets_manager_temp/modules/ACE")
+    mpc_rev = get_head_revision ("svn://svn.dre.vanderbilt.edu/DOC/MPC/trunk")
+    
+    svn_propset ("sets_manager_temp/modules/ACE",
+                 "svn:externals",
+                 "%s\t-r %d %s" % ("MPC",
+                                   mpc_rev,
+                                   "svn://svn.dre.vanderbilt.edu/DOC/MPC/trunk"))
+    
     #Create the set
-    svn_mkdir_local ("sets/ACE")
-    svn_propset ("sets/ACE",
+    svn_mkdir_local ("sets_manager_temp/sets/ACE")
+    svn_propset ("sets_manager_temp/sets/ACE",
                  "svn:externals",
                  "%s\t%s" % ("ACE_wrappers",
                              destination + "modules/ACE"))
@@ -104,8 +133,8 @@ def branch_TAO ():
               destination + "modules/TAO")
 
     #Create the set
-    svn_mkdir_local ("sets/ACE+TAO")
-    svn_propset ("sets/ACE+TAO",
+    svn_mkdir_local ("sets_manager_temp/sets/ACE+TAO")
+    svn_propset ("sets_manager_temp/sets/ACE+TAO",
                  "svn:externals",
                  "%s\t%s\n%s\t%s" % ("ACE_wrappers",
                                      destination + "modules/ACE",
@@ -121,8 +150,8 @@ def branch_CIAO ():
               destination + "modules/CIAO")
 
     # Create the set
-    svn_mkdir_local ("sets/ACE+TAO+CIAO")
-    svn_propset ("sets/ACE+TAO+CIAO",
+    svn_mkdir_local ("sets_manager_temp/sets/ACE+TAO+CIAO")
+    svn_propset ("sets_manager_temp/sets/ACE+TAO+CIAO",
                  "svn:externals",
                  "%s\t%s\n%s\t%s\n%s\t%s" %
                  ("ACE_wrappers",
@@ -147,14 +176,15 @@ def main (opts, args):
     # Make branch/tag directory
     svn_mkdir (opts.repo + path)
 
+    execute ("svn co " + opts.repo + path + " sets_manager_temp")
+    
     # Make modules and sets subdirectory
-    svn_mkdir (opts.repo + path + "/modules")
-    svn_mkdir (opts.repo + path + "/sets")
-
-    # We need a local copy of the sets directory, as svn:externals
-    # can only be modified locally
-    execute ("svn co " + opts.repo + path + "/sets")
-
+    svn_mkdir_local ("sets_manager_temp/modules")
+    svn_mkdir_local ("sets_manager_temp/sets")
+    
+    # commit the new directories
+    execute ('svn commit -m "branching/tagging" sets_manager_temp')
+    
     # opts.dest should now be set to path, all of the branching
     # functions assume dest now points to the branch/tag in which
     # the copies should be places
@@ -165,10 +195,10 @@ def main (opts, args):
      'ciao': branch_CIAO}[opts.project] ()
 
     # Commit the sets directory
-    execute ('svn commit -m "branching/tagging" sets')
+    execute ('svn commit -m "branching/tagging" sets_manager_temp')
 
     # remove the sets directory
-    for root, dirs, files in os.walk ('sets', False):
+    for root, dirs, files in os.walk ('sets_manager_temp', False):
         for name in files:
             os.remove (os.path.join (root, name))
         for name in dirs:
diff --git a/ACE/bin/tao_orb_tests.lst b/ACE/bin/tao_orb_tests.lst
index 4d00d43acfe..42b013b144a 100644
--- a/ACE/bin/tao_orb_tests.lst
+++ b/ACE/bin/tao_orb_tests.lst
@@ -12,7 +12,7 @@
 
 TAO/tests/Bug_2702_Regression/run_test.pl:
 TAO/tests/ORB_Local_Config/Bunch/run_test.pl:
-TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl: SSL !STATIC
+TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl: SSL !STATIC !ACE_FOR_TAO
 TAO/tests/ORB_Local_Config/Bug_2612/run_test.pl: !ST !STATIC !ACE_FOR_TAO
 TAO/tests/ORB_Local_Config/Separation/run_test.pl:
 TAO/tests/ORB_Local_Config/Service_Dependency/run_test.pl: !ST !STATIC
@@ -229,10 +229,10 @@ TAO/tests/Portable_Interceptors/Redirection/run_test.pl: !MINIMUM !CORBA_E_COMPA
 TAO/tests/ORT/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/Object_Loader/run_test.pl: !VxWorks !STATIC
 TAO/tests/Two_Objects/run_test.pl: !ST
-TAO/tests/TransportCurrent/Framework/run_test.pl -dynamic: !STATIC !DISABLE_INTERCEPTORS !MINIMUM
-TAO/tests/TransportCurrent/Framework/run_test.pl -static: STATIC !DISABLE_INTERCEPTORS !MINIMUM
-TAO/tests/TransportCurrent/IIOP/run_test.pl -dynamic: !STATIC !DISABLE_INTERCEPTORS !MINIMUM
-TAO/tests/TransportCurrent/IIOP/run_test.pl -static: STATIC !DISABLE_INTERCEPTORS !MINIMUM
+TAO/tests/TransportCurrent/Framework/run_test.pl -dynamic: !DISABLE_TRANSPORT_CURRENT !STATIC !DISABLE_INTERCEPTORS !MINIMUM
+TAO/tests/TransportCurrent/Framework/run_test.pl -static: !DISABLE_TRANSPORT_CURRENT STATIC !DISABLE_INTERCEPTORS !MINIMUM
+TAO/tests/TransportCurrent/IIOP/run_test.pl -dynamic: !DISABLE_TRANSPORT_CURRENT !STATIC !DISABLE_INTERCEPTORS !MINIMUM
+TAO/tests/TransportCurrent/IIOP/run_test.pl -static: !DISABLE_TRANSPORT_CURRENT STATIC !DISABLE_INTERCEPTORS !MINIMUM
 TAO/tests/UNKNOWN_Exception/run_test.pl: Exceptions
 TAO/tests/Native_Exceptions/run_test.pl: Exceptions
 TAO/tests/Servant_To_Reference_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html
index f54c5f76707..c4c226c279e 100644
--- a/ACE/docs/ACE-guidelines.html
+++ b/ACE/docs/ACE-guidelines.html
@@ -569,11 +569,11 @@ Foo::bar ()
     <li>Mutators and accessors should be of this form:<p>
 
         <pre>
+        /// Sets @c object_addr_ cache from @c host and @c port.
         void object_addr (const ACE_INET_Addr &);
-        // Sets &lt;object_addr_&gt; cache from &lt;host&gt; and &lt;port&gt;.
 
+        /// Returns the ACE_INET_Addr for this profile.
         const ACE_INET_Addr &object_addr const (void);
-        // Returns the &lt;ACE_INET_Addr&gt; for this profile.
         </pre><p>
 
         instead of the "set_" and "get_" form.<p>
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index b2f5f49cfc1..ba2278aa560 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -82,66 +82,54 @@ of the ACE, TAO, and CIAO beta kit is available for
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO.tar.gz">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO.tar.gz">FTP</A>]
       </TD>
-<!--
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.tar.gz">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.tar.gz">FTP</A>]
       </TD>
--->
   </TR>
   <TR><TD>ACE+TAO+CIAO.tar.bz2</TD>
       <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD>
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO.tar.bz2">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO.tar.bz2">FTP</A>]
       </TD>
-<!--
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.tar.bz2">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.tar.bz2">FTP</A>]
       </TD>
--->
   </TR>
   <TR><TD>ACE+TAO+CIAO.zip</TD>
       <TD>ACE+TAO+CIAO (zip format)</TD>
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO.zip">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO.zip">FTP</A>]
       </TD>
-<!--
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.zip">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO+CIAO-src.zip">FTP</A>]
       </TD>
--->
   </TR>
   <TR><TD>ACE+TAO.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO.tar.gz">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO.tar.gz">FTP</A>]
       </TD>
-<!--
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO-src.tar.gz">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO-src.tar.gz">FTP</A>]
       </TD>
--->
   </TR>
   <TR><TD>ACE+TAO.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO.tar.bz2">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO.tar.bz2">FTP</A>]
       </TD>
-<!--
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO-src.tar.bz2">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO-src.tar.bz2">FTP</A>]
       </TD>
--->
   </TR>
   <TR><TD>ACE+TAO.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO.zip">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO.zip">FTP</A>]
       </TD>
-<!--
       <TD>[<A HREF="http://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO-src.zip">HTTP</A>]
           [<A HREF="ftp://download.dre.vanderbilt.edu/ACE+TAO-distribution/ACE+TAO-src.zip">FTP</A>]
       </TD>
--->
   </TR>
   <TR><TD>ACE-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+gzip format)</TD>
diff --git a/ACE/etc/ciao.doxygen b/ACE/etc/ciao.doxygen
index 94bc05ed9f1..3321e0d948e 100644
--- a/ACE/etc/ciao.doxygen
+++ b/ACE/etc/ciao.doxygen
@@ -123,16 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER \
-                        CIAO_NAMESPACE
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/ciao_DAnCE.doxygen b/ACE/etc/ciao_DAnCE.doxygen
index 35ea9157f1c..dd828a8a62b 100644
--- a/ACE/etc/ciao_DAnCE.doxygen
+++ b/ACE/etc/ciao_DAnCE.doxygen
@@ -122,16 +122,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER \
-                        CIAO_NAMESPACE
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/ciao_config_handlers.doxygen b/ACE/etc/ciao_config_handlers.doxygen
index 3b00e676ef3..0b2bbec9dc6 100644
--- a/ACE/etc/ciao_config_handlers.doxygen
+++ b/ACE/etc/ciao_config_handlers.doxygen
@@ -122,16 +122,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER \
-                        CIAO_NAMESPACE
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao.doxygen b/ACE/etc/tao.doxygen
index 63cb843e609..4ccd5c93df4 100644
--- a/ACE/etc/tao.doxygen
+++ b/ACE/etc/tao.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
 			ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_anytypecode.doxygen b/ACE/etc/tao_anytypecode.doxygen
index 20c75cace9d..ceeb6ec6b97 100644
--- a/ACE/etc/tao_anytypecode.doxygen
+++ b/ACE/etc/tao_anytypecode.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_av.doxygen b/ACE/etc/tao_av.doxygen
index e30a764d347..e5fb9bcf8c2 100644
--- a/ACE/etc/tao_av.doxygen
+++ b/ACE/etc/tao_av.doxygen
@@ -126,15 +126,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_compression.doxygen b/ACE/etc/tao_compression.doxygen
index 5ab55ee5206..83b1a8b6030 100644
--- a/ACE/etc/tao_compression.doxygen
+++ b/ACE/etc/tao_compression.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_cosevent.doxygen b/ACE/etc/tao_cosevent.doxygen
index c28454c193c..5b461cb1310 100644
--- a/ACE/etc/tao_cosevent.doxygen
+++ b/ACE/etc/tao_cosevent.doxygen
@@ -126,15 +126,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_cosnaming.doxygen b/ACE/etc/tao_cosnaming.doxygen
index 0e0fa1db034..2feb7676733 100644
--- a/ACE/etc/tao_cosnaming.doxygen
+++ b/ACE/etc/tao_cosnaming.doxygen
@@ -124,15 +124,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_cosnotification.doxygen b/ACE/etc/tao_cosnotification.doxygen
index e6654476984..0710726f421 100644
--- a/ACE/etc/tao_cosnotification.doxygen
+++ b/ACE/etc/tao_cosnotification.doxygen
@@ -131,15 +131,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_costime.doxygen b/ACE/etc/tao_costime.doxygen
index f0e7f636eb2..c696362829f 100644
--- a/ACE/etc/tao_costime.doxygen
+++ b/ACE/etc/tao_costime.doxygen
@@ -124,15 +124,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_costrader.doxygen b/ACE/etc/tao_costrader.doxygen
index 81a20988499..76be5b0cd31 100644
--- a/ACE/etc/tao_costrader.doxygen
+++ b/ACE/etc/tao_costrader.doxygen
@@ -127,15 +127,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_dynamicany.doxygen b/ACE/etc/tao_dynamicany.doxygen
index eb61f5dfa06..f4e63f2fe8f 100644
--- a/ACE/etc/tao_dynamicany.doxygen
+++ b/ACE/etc/tao_dynamicany.doxygen
@@ -124,15 +124,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_dynamicinterface.doxygen b/ACE/etc/tao_dynamicinterface.doxygen
index 2cb0e22ae6f..af32db0b4d8 100644
--- a/ACE/etc/tao_dynamicinterface.doxygen
+++ b/ACE/etc/tao_dynamicinterface.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_esf.doxygen b/ACE/etc/tao_esf.doxygen
index bae5a24f6db..65fa10ea1ce 100644
--- a/ACE/etc/tao_esf.doxygen
+++ b/ACE/etc/tao_esf.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_ifr.doxygen b/ACE/etc/tao_ifr.doxygen
index 13795bc12d4..4a708e39a59 100644
--- a/ACE/etc/tao_ifr.doxygen
+++ b/ACE/etc/tao_ifr.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_implrepo.doxygen b/ACE/etc/tao_implrepo.doxygen
index 997b068c5e2..99633483ca6 100644
--- a/ACE/etc/tao_implrepo.doxygen
+++ b/ACE/etc/tao_implrepo.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_iormanip.doxygen b/ACE/etc/tao_iormanip.doxygen
index c27171d3eb5..ee37cf2a4b5 100644
--- a/ACE/etc/tao_iormanip.doxygen
+++ b/ACE/etc/tao_iormanip.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_iortable.doxygen b/ACE/etc/tao_iortable.doxygen
index a2d192a6d1c..0d5dac7db89 100644
--- a/ACE/etc/tao_iortable.doxygen
+++ b/ACE/etc/tao_iortable.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_pi.doxygen b/ACE/etc/tao_pi.doxygen
index 3e6d197376c..23290991fb8 100644
--- a/ACE/etc/tao_pi.doxygen
+++ b/ACE/etc/tao_pi.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_pi_server.doxygen b/ACE/etc/tao_pi_server.doxygen
index d73bbf3f429..1675300518a 100644
--- a/ACE/etc/tao_pi_server.doxygen
+++ b/ACE/etc/tao_pi_server.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_portablegroup.doxygen b/ACE/etc/tao_portablegroup.doxygen
index dd743fbb387..22efcd8b343 100644
--- a/ACE/etc/tao_portablegroup.doxygen
+++ b/ACE/etc/tao_portablegroup.doxygen
@@ -126,15 +126,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_portableserver.doxygen b/ACE/etc/tao_portableserver.doxygen
index 82eca0651a0..5c40b2f529a 100644
--- a/ACE/etc/tao_portableserver.doxygen
+++ b/ACE/etc/tao_portableserver.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_pss.doxygen b/ACE/etc/tao_pss.doxygen
index 7838e5e144e..f69f6fb19a2 100644
--- a/ACE/etc/tao_pss.doxygen
+++ b/ACE/etc/tao_pss.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_rtcorba.doxygen b/ACE/etc/tao_rtcorba.doxygen
index 29614063d12..3f0a3bd43c8 100644
--- a/ACE/etc/tao_rtcorba.doxygen
+++ b/ACE/etc/tao_rtcorba.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_rtevent.doxygen b/ACE/etc/tao_rtevent.doxygen
index 25c752c2988..979fb778ae1 100644
--- a/ACE/etc/tao_rtevent.doxygen
+++ b/ACE/etc/tao_rtevent.doxygen
@@ -132,15 +132,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_rtportableserver.doxygen b/ACE/etc/tao_rtportableserver.doxygen
index 13c604ea6da..8803ab7b784 100644
--- a/ACE/etc/tao_rtportableserver.doxygen
+++ b/ACE/etc/tao_rtportableserver.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_security.doxygen b/ACE/etc/tao_security.doxygen
index 3aacf619a91..5c1469901e7 100644
--- a/ACE/etc/tao_security.doxygen
+++ b/ACE/etc/tao_security.doxygen
@@ -128,15 +128,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_smartproxies.doxygen b/ACE/etc/tao_smartproxies.doxygen
index 3f8c0a01773..ff96c0f7e9e 100644
--- a/ACE/etc/tao_smartproxies.doxygen
+++ b/ACE/etc/tao_smartproxies.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_ssliop.doxygen b/ACE/etc/tao_ssliop.doxygen
index 070d70944e5..f54271c8b55 100644
--- a/ACE/etc/tao_ssliop.doxygen
+++ b/ACE/etc/tao_ssliop.doxygen
@@ -128,15 +128,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_strategies.doxygen b/ACE/etc/tao_strategies.doxygen
index aafd686f177..2fb3561d55e 100644
--- a/ACE/etc/tao_strategies.doxygen
+++ b/ACE/etc/tao_strategies.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/etc/tao_transportcurrent.doxygen b/ACE/etc/tao_transportcurrent.doxygen
index 9db09e4d6d8..959489dd056 100644
--- a/ACE/etc/tao_transportcurrent.doxygen
+++ b/ACE/etc/tao_transportcurrent.doxygen
@@ -123,15 +123,7 @@ PREDEFINED            =
 EXPAND_AS_DEFINED     = ACE_RCSID \
                         ACE_UNIMPLEMENTED_FUNC \
                         ACE_CACHE_MAP_MANAGER \
-                        ACE_THROW_SPEC \
-                        ACE_ENV_ARG_DECL_NOT_USED \
-                        ACE_ENV_SINGLE_ARG_DECL_NOT_USED \
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-                        ACE_ENV_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_DECL \
-                        ACE_ENV_SINGLE_ARG_PARAMETER \
-                        ACE_ENV_ARG_PARAMETER
+                        ACE_THROW_SPEC
 
 #---------------------------------------------------------------------------
 # Configuration::addtions related to external references
diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.cpp b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.cpp
index 3e25be39373..45929b722df 100644
--- a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.cpp
+++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.cpp
@@ -11,7 +11,7 @@ Reactor_Logging_Server<ACCEPTOR>::Reactor_Logging_Server
   (int argc, char *argv[], ACE_Reactor *reactor)
   : ACCEPTOR (reactor) {
   u_short logger_port = argc > 0 ? atoi (argv[0]) : 0;
-  ACE_TYPENAME ACCEPTOR::PEER_ADDR server_addr;
+  typename ACCEPTOR::PEER_ADDR server_addr;
   int result;
 
   if (logger_port != 0)
diff --git a/ACE/examples/Export/run_test.pl b/ACE/examples/Export/run_test.pl
index 7c84078d8ff..11e98b17b94 100755
--- a/ACE/examples/Export/run_test.pl
+++ b/ACE/examples/Export/run_test.pl
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "../../bin";
+use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $TEST = new PerlACE::Process ("test");
diff --git a/ACE/examples/Misc/test_read_buffer.cpp b/ACE/examples/Misc/test_read_buffer.cpp
index 1c24aec98b7..5c53b37b637 100644
--- a/ACE/examples/Misc/test_read_buffer.cpp
+++ b/ACE/examples/Misc/test_read_buffer.cpp
@@ -23,7 +23,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   ACE_Read_Buffer rb (handle);
 
-  char *buf;
+  char *buf = 0;
 
   while ((buf = rb.read (term, search, replace)) != 0)
     {
diff --git a/ACE/include/makeinclude/platform_mvs.GNU b/ACE/include/makeinclude/platform_mvs.GNU
index aedc5be3f48..99449f8b319 100644
--- a/ACE/include/makeinclude/platform_mvs.GNU
+++ b/ACE/include/makeinclude/platform_mvs.GNU
@@ -7,7 +7,8 @@ debug = 0
 CXX           = cxx
 DCFLAGS	      += -g
 DCCFLAGS      += -g
-CPPFLAGS      += -+
+CPPFLAGS      += -+ -W "c,langlvl(LONGLONG)" -W c,xplink -W "c,rtti(dynamiccast)"
+LDFLAGS       += -W l,xplink
 DEFFLAGS      = -D_ALL_SOURCE -DNDEBUG
 CC            = $(CXX)
 LD            = $(CXX)
@@ -15,7 +16,7 @@ DLD           = $(CXX)
 AR            = ar
 ARFLAGS       = ruv
 RANLIB        = echo
-#LDFLAGS      = -W l,p,map
+#LDFLAGS      += -W l,p,map
 
 # MVCMD needed because cxx does not use the -o option to place objects
 MVCMD         = @test ! -s $(@F) || mv $(@F) $(@D)/$(@F)
@@ -29,6 +30,6 @@ ACELIB_DLL    = $(ACE_ROOT)/lib/libACE.x
 # set accordingly to build either static or shared executables
 ACELIB        = $(ACELIB_DLL)
 
-SOFLAGS       += -W l,dll
+SOFLAGS       += -W l,dll 
 PIC           = -W c,exportall
 static_libs   = 1
diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
index 00813ebcffd..2f74d549406 100644
--- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU
+++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU
@@ -9,6 +9,7 @@ optimize ?= 1
 exceptions ?= 1
 rtti ?= 1
 threads ?= 1
+pipes ?= 1
 
 shared_libs =
 static_libs = 1
@@ -34,12 +35,13 @@ ifeq (no,$(RTEMS_HAS_NETWORKING))
  CCFLAGS += -DACE_LACKS_NETWORKING
 endif
 
-CFLAGS          += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
-CCFLAGS         += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile $(PIPE_OPT) -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
+CFLAGS          += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
+CCFLAGS         += -specs bsp_specs -qrtems -D_REENTRANT -fasm -fno-builtin -fno-defer-pop -fvolatile -W -Wall -DACE_HAS_RTEMS -B$(RTEMS_MAKEFILE_PATH)/lib
 ifeq (0,$(rtti))
   CCFLAGS += -fno-rtti -DACE_LACKS_RTTI
 endif # rtti
 DCFLAGS         += -g
+DCCFLAGS        += -g
 DLD             = $(LD)
 INCLDIRS        +=
 
diff --git a/ACE/include/makeinclude/rules.common.GNU b/ACE/include/makeinclude/rules.common.GNU
index dd354e41a3f..d1f13955bbc 100644
--- a/ACE/include/makeinclude/rules.common.GNU
+++ b/ACE/include/makeinclude/rules.common.GNU
@@ -6,7 +6,7 @@
 #	Common targets
 #----------------------------------------------------------------------------
 
-all:              all.nested all.local
+all:              __prebuild__ all.nested all.local
 debug:	          debug.nested debug.local
 profile:          profile.nested profile.local
 install:          install.nested install.local
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index e3f13eb7363..cbd5501bb72 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -781,6 +781,7 @@ pipes ?= 0
 # platform_macros.GNU file.
 ifeq ($(pipes),1)
    CFLAGS += -pipe
+   CCFLAGS += -pipe
 endif # pipes
 
 # RMCast is turned on by default
diff --git a/ACE/netsvcs/servers/servers.mpc b/ACE/netsvcs/servers/servers.mpc
index 7cbbee9e5b2..1884e4a419a 100644
--- a/ACE/netsvcs/servers/servers.mpc
+++ b/ACE/netsvcs/servers/servers.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Netsvcs_server) : aceexe {
-  avoids   += ace_for_tao
+project(Netsvcs_server) : aceexe, avoids_ace_for_tao {
   exename  = main
   libs     += netsvcs
   after    += netsvcs
diff --git a/ACE/performance-tests/UDP/udp_test.cpp b/ACE/performance-tests/UDP/udp_test.cpp
index 449c998f3ae..4f2815fd39a 100644
--- a/ACE/performance-tests/UDP/udp_test.cpp
+++ b/ACE/performance-tests/UDP/udp_test.cpp
@@ -208,14 +208,10 @@ Client::run (void)
   ACE_High_Res_Timer timer;
   ACE_hrtime_t sample;
 
-#if defined (ACE_LACKS_FLOATING_POINT)
-  ACE_hrtime_t sample_mean;
-#else  /* ! ACE_LACKS_FLOATING_POINT */
   int d;
   double std_dev = 0.0;
   double std_err = 0.0;
   double sample_mean = 0.0;
-#endif /* ! ACE_LACKS_FLOATING_POINT */
 
   int                tracking_last_over = 0;
   ACE_High_Res_Timer since_over;
@@ -336,11 +332,7 @@ Client::run (void)
         }
     }
 
-#if defined (ACE_LACKS_FLOATING_POINT)
-  sample_mean = sum / nsamples;
-#else  /* ! ACE_LACKS_FLOATING_POINT */
   sample_mean = ((double) ACE_U64_TO_U32 (sum)) / (double) nsamples;
-#endif /* ! ACE_LACKS_FLOATING_POINT */
 
   if (logfile)
     {
@@ -381,7 +373,6 @@ Client::run (void)
                                        sizeof (u_int));
     }
 
-#if ! defined (ACE_LACKS_FLOATING_POINT)
   for (i = 0; i < (ACE_INT32) nsamples; i++)
     {
       std_dev += ((double) ACE_U64_TO_U32 (Samples[i]) - sample_mean) *
@@ -402,7 +393,6 @@ Client::run (void)
                          "%u\n",
                          ACE_U64_TO_U32 (Samples[i]));
     }
-#endif /* ACE_LACKS_FLOATING_POINT */
 
   if (logfile)
     {
@@ -419,19 +409,6 @@ Client::run (void)
         }
     }
 
-#if defined (ACE_LACKS_FLOATING_POINT)
-  ACE_DEBUG ((LM_DEBUG,
-              "\nResults for %i samples (usec):\n"
-              "\tSample Mean = %u,\n"
-              "\tSample Max = %u, Max index = %u,\n"
-              "\tSample Min = %u, Min index = %u,\n",
-              nsamples,
-              (ACE_UINT32) (sample_mean / (ACE_UINT32) 1000),
-              (ACE_UINT32) (max / (ACE_UINT32) 1000),
-              maxindx,
-              (ACE_UINT32) (min / (ACE_UINT32) 1000),
-              minindx));
-#else  /* ! ACE_LACKS_FLOATING_POINT */
   std_dev = (double) sqrt (std_dev / (double) (nsamples - 1.0));
   std_err = (double) std_dev / sqrt ((double) nsamples);
 
@@ -478,7 +455,6 @@ Client::run (void)
                        std_dev / 1000.0,
                        std_err / 1000.0);
     }
-#endif /* ! ACE_LACKS_FLOATING_POINT */
 
   return 0;
 }
diff --git a/ACE/tests/Cached_Allocator_Test.cpp b/ACE/tests/Cached_Allocator_Test.cpp
index fd8aeabd33d..c55cc4f44b0 100644
--- a/ACE/tests/Cached_Allocator_Test.cpp
+++ b/ACE/tests/Cached_Allocator_Test.cpp
@@ -31,12 +31,10 @@ typedef ACE_Dynamic_Cached_Allocator<ACE_SYNCH_NULL_MUTEX> DYNAMIC_ALLOCATOR;
 static int
 speed_test (ACE_UINT32 loops)
 {
-#ifndef ACE_LACKS_FLOATING_POINT
   double tt    = 0.0,
     ut    = 0.0,
     utus  = 0.0,
     speed = 0.0;
-#endif /* ACE_LACKS_FLOATING_POINT */
 
   ACE_Time_Value tc;
   void *ptr = 0;
@@ -66,10 +64,6 @@ speed_test (ACE_UINT32 loops)
   timer.elapsed_time (tc);
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Iterations : %d\n"), loops));
-#ifdef ACE_LACKS_FLOATING_POINT
-  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Total time : %d s, %d us\n"),
-              tc.sec (), tc.usec ()));
-#elif !defined ACE_LACKS_FLOATING_POINT
   tt    = tc.sec () + tc.usec ()*1.0e-6;
   ut    = tt/loops;
   utus  = ut*1.0e6;
@@ -79,8 +73,6 @@ speed_test (ACE_UINT32 loops)
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Unit time  : %.6g [us]\n"), utus));
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Speed      : %.6g [1/s]\n"), speed));
 
-#endif /* !defined ACE_LACKS_FLOATING_POINT */
-
   return 0;
 }
 
@@ -91,12 +83,10 @@ static int
 stdspeed_test (ACE_UINT32 loops)
 {
 
-#ifndef ACE_LACKS_FLOATING_POINT
   double tt    = 0.0,
     ut    = 0.0,
     utus  = 0.0,
     speed = 0.0;
-#endif /* ACE_LACKS_FLOATING_POINT */
 
   ACE_Time_Value tc;
   void *ptr = 0;
@@ -123,10 +113,6 @@ stdspeed_test (ACE_UINT32 loops)
   timer.elapsed_time (tc);
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Iterations : %d\n"), loops));
-#ifdef ACE_LACKS_FLOATING_POINT
-  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Total time : %d s, %d us\n"),
-              tc.sec (), tc.usec ()));
-#elif !defined ACE_LACKS_FLOATING_POINT
   tt    = tc.sec () + tc.usec ()*1.0e-6;
   ut    = tt/loops;
   utus  = ut*1.0e6;
@@ -136,8 +122,6 @@ stdspeed_test (ACE_UINT32 loops)
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Unit time  : %.6g [us]\n"), utus));
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Speed      : %.6g [1/s]\n"), speed));
 
-#endif /* !defined ACE_LACKS_FLOATING_POINT */
-
   return 0;
 }
 
diff --git a/ACE/tests/Env_Value_Test.cpp b/ACE/tests/Env_Value_Test.cpp
index c7a81909aa9..b9c318169fd 100644
--- a/ACE/tests/Env_Value_Test.cpp
+++ b/ACE/tests/Env_Value_Test.cpp
@@ -90,18 +90,14 @@ run_main (int argc, ACE_TCHAR * [], ACE_TCHAR *envp[])
     ACE_START_TEST (ACE_TEXT ("Env_Value_Test"));
 
       TEST_THIS (int, ACE_TEXT ("TEST_VALUE_POSITIVE"), 4, 10);
-#if !defined (ACE_LACKS_FLOATING_POINT)
       TEST_THIS (double, ACE_TEXT ("TEST_VALUE_POSITIVE"), -1.0, 10.2);
-#endif /* ! ACE_LACKS_FLOATING_POINT */
       TEST_THIS (long, ACE_TEXT ("TEST_VALUE_POSITIVE"), 0, 10);
       TEST_THIS (unsigned long, ACE_TEXT ("TEST_VALUE_POSITIVE"), 0, 10);
       TEST_THIS (short, ACE_TEXT ("TEST_VALUE_POSITIVE"), 0, 10);
       TEST_THIS (unsigned short, ACE_TEXT ("TEST_VALUE_POSITIVE"), 0, 10);
 
       TEST_THIS (int, ACE_TEXT ("TEST_VALUE_NEGATIVE"), 4, -10);
-#if !defined (ACE_LACKS_FLOATING_POINT)
       TEST_THIS (double, ACE_TEXT ("TEST_VALUE_NEGATIVE"), -1.0, -10.2);
-#endif /* ! ACE_LACKS_FLOATING_POINT */
       TEST_THIS (long, ACE_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10L);
       TEST_THIS (unsigned long, ACE_TEXT ("TEST_VALUE_NEGATIVE"), 0, (unsigned long) -10);
       TEST_THIS (short, ACE_TEXT ("TEST_VALUE_NEGATIVE"), 0, -10);
diff --git a/ACE/tests/Handle_Set_Test.cpp b/ACE/tests/Handle_Set_Test.cpp
index e28226fd838..61e48e0a2c4 100644
--- a/ACE/tests/Handle_Set_Test.cpp
+++ b/ACE/tests/Handle_Set_Test.cpp
@@ -195,16 +195,6 @@ test_performance (size_t max_handles,
 
   timer.elapsed_time (et);
 
-#if defined (ACE_LACKS_FLOATING_POINT)
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("real time = %u usecs\n"),
-              et.real_time));
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("time per each of the %d calls = %u usecs\n"),
-              count,
-              et.real_time / count));
-#else  /* ! ACE_LACKS_FLOATING_POINT */
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("real time = %f secs, user time = %f secs, ")
                 ACE_TEXT ("system time = %f secs\n"),
@@ -216,7 +206,6 @@ test_performance (size_t max_handles,
               ACE_TEXT ("time per each of the %d calls = %f usecs\n"),
               count,
               et.real_time / double (count) * 1000000));
-#endif /* ! ACE_LACKS_FLOATING_POINT */
 }
 
 int
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index d270a19d66c..68258c690c2 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -895,6 +895,29 @@ cpu_info_test (void)
 }
 
 int
+pagesize_test (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Testing getpagesize method\n")));
+
+  long const pagesize = ACE_OS::getpagesize ();
+  if (pagesize <= 0)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error, pagesize should return a value bigger ")
+                            ACE_TEXT ("then zero, it returned %d\n"), pagesize));
+      return 1;
+    }
+  else
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Pagesize returned %d\n"),
+                  pagesize));
+    }
+  return 0;
+}
+
+
+int
 run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("OS_Test"));
@@ -925,6 +948,9 @@ run_main (int, ACE_TCHAR *[])
   if ((result = cpu_info_test ()) != 0)
       status = result;
 
+  if ((result = pagesize_test ()) != 0)
+      status = result;
+
   ACE_END_TEST;
   return status;
 }
diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp
index c31e7ec2223..2fc6fd8a0f1 100644
--- a/ACE/tests/Thread_Creation_Threshold_Test.cpp
+++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp
@@ -156,7 +156,7 @@ Thread_Pool::open (void *)
 {
   if (PRINT_DEBUG_MSGS)
     ACE_DEBUG ((LM_DEBUG,
-		ACE_TEXT ("(%P|%t) pool start %d threads..."),
+    ACE_TEXT ("(%P|%t) pool start %d threads...\n"),
 		this->n_threads_));
 
   if (this->total_activated_threads_ >= (65534 - this->n_threads_))
diff --git a/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp b/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
index ff92670ee23..1f0c850f25e 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.hpp
@@ -894,7 +894,7 @@ namespace CCF
         }
 
         void
-        set_right_node (Const& n)
+        set_right_node (Const&)
         {
         }
 
diff --git a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp
index abe474dc8eb..374446661df 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.cpp
@@ -202,6 +202,10 @@ namespace CCF
       //
       int const name_printer_index = std::ios_base::xalloc ();
 
+      NamePrinter::~NamePrinter ()
+      {
+      }
+
       void NamePrinter::
       print (std::ostream& os, Name const& n)
       {
diff --git a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp
index 93285e4f266..50dd752aa6a 100644
--- a/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp
+++ b/CIAO/CCF/CCF/IDL2/SemanticGraph/Name.hpp
@@ -208,6 +208,8 @@ namespace CCF
       //
       struct NamePrinter
       {
+        virtual ~NamePrinter ();
+
         virtual void
         print (std::ostream&, SimpleName const&) = 0;
 
diff --git a/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp b/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp
index a4cac55a729..8e111874251 100644
--- a/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp
+++ b/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp
@@ -57,7 +57,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -74,7 +74,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -103,7 +103,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -120,7 +120,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -151,7 +151,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -168,7 +168,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -185,7 +185,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -216,7 +216,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -233,7 +233,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -250,7 +250,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -268,7 +268,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -285,7 +285,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -302,7 +302,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -333,7 +333,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -350,7 +350,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -367,7 +367,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -398,7 +398,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -415,7 +415,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -432,7 +432,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -463,7 +463,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -480,7 +480,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -497,7 +497,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -515,7 +515,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -532,7 +532,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -549,7 +549,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -580,7 +580,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -597,7 +597,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -614,7 +614,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -646,7 +646,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -663,7 +663,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -680,7 +680,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
@@ -712,7 +712,7 @@ namespace CCF
         }
 
         virtual void
-        pre (Type& n)
+        pre (Type&)
         {
         }
 
@@ -729,7 +729,7 @@ namespace CCF
         }
 
         virtual void
-        sign (Type& n)
+        sign (Type&)
         {
         }
 
@@ -746,7 +746,7 @@ namespace CCF
         }
 
         virtual void
-        post (Type& n)
+        post (Type&)
         {
         }
       };
diff --git a/CIAO/CIDLC/AttributeHeaderEmitters.cpp b/CIAO/CIDLC/AttributeHeaderEmitters.cpp
index 2442ef3f958..d5794a889f5 100644
--- a/CIAO/CIDLC/AttributeHeaderEmitters.cpp
+++ b/CIAO/CIDLC/AttributeHeaderEmitters.cpp
@@ -31,8 +31,7 @@ WriteAttributeHeaderEmitter::name (SemanticGraph::ReadWriteAttribute& a)
 
   Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
 
-  os << " " << a.name () << endl
-     << STRS[ENV_HDR] << ")" << endl;
+  os << " " << a.name () << ")" << endl;
 }
 
 void
@@ -99,8 +98,7 @@ AttributeHeaderEmitter::pre (SemanticGraph::ReadWriteAttribute& a)
 void
 AttributeHeaderEmitter::name (SemanticGraph::ReadWriteAttribute& a)
 {
-  os << a.name () << " (" << endl
-     << STRS[ENV_SNGL_HDR] << ")" << endl;
+  os << a.name () << " ()" << endl;
 }
 
 void
@@ -157,8 +155,7 @@ AttributeHeaderEmitter::pre (SemanticGraph::ReadAttribute& a)
 void
 AttributeHeaderEmitter::name (SemanticGraph::ReadAttribute& a)
 {
-  os << a.name () << " (" << endl
-     << STRS[ENV_SNGL_HDR] << ")" << endl;
+  os << a.name () << " ()" << endl;
 }
 
 void
diff --git a/CIAO/CIDLC/AttributeSourceEmitters_T.hpp b/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
index 6dc1aa1bb37..9f601d27de7 100644
--- a/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
+++ b/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
@@ -39,8 +39,8 @@ struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute,
   virtual void
   gen_swapping_set ()
   {
-    os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-       << "ACE_CHECK;" << endl;
+    os << "this->activate_component (" << ");"
+       << endl;
   }
 
   virtual void
@@ -61,7 +61,6 @@ struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute,
     os << (exec_src_ ? " /* " : " ")
        << a.name ()
        << (exec_src_ ? " */" : "") << endl
-       << (exec_src_ ? STRS[ENV_SRC_NOTUSED] : STRS[ENV_SRC])
        << ")" << endl;
   }
 
@@ -107,7 +106,7 @@ struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute,
 
         os << "this->executor_->" << a.name () << " (" << endl
            << a.name () << endl
-           << STRS[ENV_ARG] << ");" << endl;
+           << ");" << endl;
       }
 
     os << "}";
@@ -142,12 +141,10 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
       read_type_name_emitter_ (c),
       type_name_emitter_ (c),
       return_emitter_ (c),
-      ace_check_return_emitter_ (c),
       exec_src_ (exec_src)
   {
     read_belongs_.node_traverser (read_type_name_emitter_);
     return_belongs_.node_traverser (return_emitter_);
-    ace_check_return_belongs_.node_traverser (ace_check_return_emitter_);
     edge_traverser (get_raises_);
     get_raises_.node_traverser (type_name_emitter_);
   }
@@ -159,7 +156,7 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
   virtual void
   gen_swapping_get (SemanticGraph::ReadWriteAttribute& a)
   {
-    os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
+    os << "this->activate_component ();";
 
     Traversal::ReadWriteAttribute::belongs (a, ace_check_return_belongs_);
 
@@ -192,7 +189,6 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
     os << scope_.name ()
        << (exec_src_ ? "_exec_i::" : "_Servant::")
        << a.name () << " (" << endl
-       << (exec_src_ ? STRS[ENV_SNGL_SRC_NOTUSED] : STRS[ENV_SNGL_SRC])
        << ")" << endl;
   }
 
@@ -243,8 +239,7 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
           this->gen_swapping_get (a);
         }
 
-        os << "return this->executor_->" << a.name () << " (" << endl
-           << STRS[ENV_SNGL_ARG] << ");";
+        os << "return this->executor_->" << a.name () << " ();";
       }
 
     os << "}";
@@ -265,7 +260,7 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
   virtual void
   gen_swapping_get (SemanticGraph::ReadAttribute& a)
   {
-    os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
+    os << "this->activate_component ();";
 
     Traversal::ReadAttribute::belongs (a, ace_check_return_belongs_);
 
@@ -286,7 +281,6 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
     os << scope_.name ()
        << (exec_src_ ? "_exec_i::" : "_Servant::")
        << a.name () << " (" << endl
-       << (exec_src_ ? STRS[ENV_SNGL_SRC_NOTUSED] : STRS[ENV_SNGL_SRC])
        << ")" << endl;
   }
 
@@ -337,8 +331,7 @@ struct AttributeSourceEmitter : Traversal::ReadAttribute,
           this->gen_swapping_get (a);
         }
 
-        os << "return this->executor_->" << a.name () << " (" << endl
-           << STRS[ENV_SNGL_ARG] << ");";
+        os << "return this->executor_->" << a.name () << " ();";
       }
 
     os << "}";
@@ -357,7 +350,6 @@ private:
   ReturnTypeNameEmitter read_type_name_emitter_;
   FullTypeNameEmitter type_name_emitter_;
   NullReturnEmitter return_emitter_;
-  AceCheckReturnEmitter ace_check_return_emitter_;
   Traversal::Belongs read_belongs_;
   Traversal::Belongs return_belongs_;
   Traversal::Belongs ace_check_return_belongs_;
diff --git a/CIAO/CIDLC/CorbaTypeNameEmitters.cpp b/CIAO/CIDLC/CorbaTypeNameEmitters.cpp
index eb9b514fcf8..84507c151b6 100644
--- a/CIAO/CIDLC/CorbaTypeNameEmitters.cpp
+++ b/CIAO/CIDLC/CorbaTypeNameEmitters.cpp
@@ -1154,227 +1154,6 @@ NullReturnEmitter::traverse (SemanticGraph::Home& h)
 }
 
 // ====================================================================
-
-AceCheckReturnEmitter::AceCheckReturnEmitter (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-void
-AceCheckReturnEmitter::traverse (Void&)
-{
-  os << "ACE_CHECK;";
-}
-
-void
-AceCheckReturnEmitter::traverse (Boolean&)
-{
-  os << STRS[ACE_CR] << " (false);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Octet&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Char&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Wchar&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Short&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (UnsignedShort&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Long&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (UnsignedLong&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (LongLong&)
-{
-  os << STRS[ACE_CR] << " (ACE_CDR_LONGLONG_INITIALIZER);";
-}
-
-void
-AceCheckReturnEmitter::traverse (UnsignedLongLong&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Float&)
-{
-  os << STRS[ACE_CR] << " (0.0f);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Double&)
-{
-  os << STRS[ACE_CR] << " (0.0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (String&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::BoundedString&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Wstring&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Object&)
-{
-  os << STRS[ACE_CR] << " (::CORBA::Object::_nil ());";
-}
-
-void
-AceCheckReturnEmitter::traverse (ValueBase&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Any&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Array&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Enum& e)
-{
-  os << e.scoped_name () << " retval;"
-     << STRS[ACE_UA] << " (retval);"
-     << STRS[ACE_CR] << " (retval);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Struct& s)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = s.context ().get<bool> (STRS[VAR_SIZE]);
-
-  if (var_size)
-  {
-    os << STRS[ACE_CR] << " (0);";
-  }
-  else
-  {
-    os << s.scoped_name () << " retval;"
-       << STRS[ACE_UA] << " (retval);"
-       << STRS[ACE_CR] << " (retval);";
-  }
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Union& u)
-{
-  // This should always be in the context, since the SizeTypeCalculator
-  // is executed before the servant code generators.
-  bool var_size = u.context ().get<bool> (STRS[VAR_SIZE]);
-
-  if (var_size)
-  {
-    os << STRS[ACE_CR] << " (0);";
-  }
-  else
-  {
-    os << u.scoped_name () << " retval;"
-       << STRS[ACE_UA] << " (retval);"
-       << STRS[ACE_CR] << " (retval);";
-  }
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::BoundedSequence&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Interface& i)
-{
-  os << STRS[ACE_CR] << " (" << i.scoped_name () << "::_nil ());";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::ValueType&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::EventType&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Component& c)
-{
-  os << STRS[ACE_CR] << " (" << c.scoped_name () << "::_nil ());";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::Home& h)
-{
-  os << STRS[ACE_CR] << " (" << h.scoped_name () << "::_nil ());";
-}
-
-// ====================================================================
 /* Not currently used, but it was at one time and may be useful again.
 
 NullRHSEmitter::NullRHSEmitter (Context& c)
diff --git a/CIAO/CIDLC/CorbaTypeNameEmitters.hpp b/CIAO/CIDLC/CorbaTypeNameEmitters.hpp
index 8a5a088f00c..b0aa8ea7dd8 100644
--- a/CIAO/CIDLC/CorbaTypeNameEmitters.hpp
+++ b/CIAO/CIDLC/CorbaTypeNameEmitters.hpp
@@ -291,48 +291,6 @@ public:
   virtual void traverse (SemanticGraph::Home&);
 };
 
-// Generates 'return' plus the appropriate NULL return value,
-// including no output for Void.
-//
-//
-class AceCheckReturnEmitter : public CorbaTypeNameEmitter
-{
-public:
-  AceCheckReturnEmitter (Context&);
-
-  virtual void traverse (Void&);
-  virtual void traverse (Boolean&);
-  virtual void traverse (Octet&);
-  virtual void traverse (Char&);
-  virtual void traverse (Wchar&);
-  virtual void traverse (Short&);
-  virtual void traverse (UnsignedShort&);
-  virtual void traverse (Long&);
-  virtual void traverse (UnsignedLong&);
-  virtual void traverse (LongLong&);
-  virtual void traverse (UnsignedLongLong&);
-  virtual void traverse (Float&);
-  virtual void traverse (Double&);
-  virtual void traverse (String&);
-  virtual void traverse (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  virtual void traverse (SemanticGraph::UnboundedSequence&);
-  virtual void traverse (SemanticGraph::Interface&);
-  virtual void traverse (SemanticGraph::ValueType&);
-  virtual void traverse (SemanticGraph::EventType&);
-  virtual void traverse (SemanticGraph::Component&);
-  virtual void traverse (SemanticGraph::Home&);
-};
-
 /* Not currently used, but it was at one time and may be useful again.
 
 // Generates the appropriate NULL value, including the assignment operator,
diff --git a/CIAO/CIDLC/ExecImplHeaderGenerator.cpp b/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
index e9b2c70e569..6ee4899a4df 100644
--- a/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
+++ b/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
@@ -135,7 +135,7 @@ namespace
 
       os << "_ptr" << endl
          << "get_" << p.name () << " (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << ";" << endl;
     }
 
@@ -148,7 +148,7 @@ namespace
       Traversal::ConsumerData::belongs (c, belongs_);
 
       os << " *ev" << endl
-         << STRS[ENV_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << ";" << endl;
    }
 
@@ -307,42 +307,42 @@ namespace
       os << "virtual void" << endl
          << "set_session_context (" << endl
          << STRS[COMP_SC] << "_ptr ctx" << endl
-         << STRS[ENV_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "));" << endl;
 
       os << "virtual void" << endl
          << "ciao_preactivate (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "));" << endl;
 
       os << "virtual void" << endl
          << "ciao_postactivate (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "));" << endl;
 
       os << "virtual void" << endl
          << "ccm_activate (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "));" << endl;
 
       os << "virtual void" << endl
          << "ccm_passivate (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "));" << endl;
 
       os << "virtual void" << endl
          << "ccm_remove (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "));" << endl;
@@ -591,7 +591,7 @@ namespace
       os << "// Implicit operations." << endl << endl
          << "virtual " << STRS[COMP_EC] << "_ptr" << endl
          << "create (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "));" << endl;
diff --git a/CIAO/CIDLC/ExecImplSourceGenerator.cpp b/CIAO/CIDLC/ExecImplSourceGenerator.cpp
index 5242e5dd212..1f36dd99248 100644
--- a/CIAO/CIDLC/ExecImplSourceGenerator.cpp
+++ b/CIAO/CIDLC/ExecImplSourceGenerator.cpp
@@ -47,14 +47,13 @@ namespace
     virtual void
     receives_none (Type&)
     {
-      os << " (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl;
+      os << " ()" << endl;
     }
 
     virtual void
     receives_post (Type&)
     {
-      os << endl << STRS[ENV_SRC_NOTUSED] << ")" << endl;
+      os << endl << ")" << endl;
     }
 
     virtual void
@@ -229,8 +228,7 @@ namespace
 
       os << "_ptr" << endl
          << scope_.name () << "_exec_i::get_"
-         << p.name () << " (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+         << p.name () << " ()" << endl
          << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[YCH] << endl
@@ -256,7 +254,7 @@ namespace
       Traversal::ConsumerData::belongs (c, belongs_);
 
       os << " * /* ev */" << endl
-         << STRS[ENV_SRC_NOTUSED] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[YCH] << endl
@@ -443,7 +441,7 @@ namespace
       os << "void" << endl
          << t.name () << "_exec_i::set_session_context (" << endl
          << STRS[COMP_SC] << "_ptr ctx" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -451,18 +449,17 @@ namespace
          << "this->context_ =" << endl
          << "  " << t.name () << "_Context::_narrow (" << endl
          << "  ctx" << endl
-         << "  " << STRS[ENV_ARG] <<");"
-         << "ACE_CHECK;" << endl;
+         << "  " <<");"
+         << endl;
 
       os << "if (this->context_ == 0)" << endl
          << "{"
-         << "ACE_THROW ( ::CORBA::INTERNAL ());"
+         << "throw ::CORBA::INTERNAL ();"
          << "}"
          << "}";
 
       os << "void" << endl
-         << t.name () << "_exec_i::ciao_preactivate (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+         << t.name () << "_exec_i::ciao_preactivate ()" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -471,8 +468,7 @@ namespace
          << "}";
 
       os << "void" << endl
-         << t.name () << "_exec_i::ciao_postactivate (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+         << t.name () << "_exec_i::ciao_postactivate ()" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -481,8 +477,7 @@ namespace
          << "}";
 
       os << "void" << endl
-         << t.name () << "_exec_i::ccm_activate (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+         << t.name () << "_exec_i::ccm_activate ()" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -491,8 +486,7 @@ namespace
          << "}";
 
       os << "void" << endl
-         << t.name () << "_exec_i::ccm_passivate (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+         << t.name () << "_exec_i::ccm_passivate ()" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -501,8 +495,7 @@ namespace
          << "}";
 
       os << "void" << endl
-         << t.name () << "_exec_i::ccm_remove (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+         << t.name () << "_exec_i::ccm_remove ()" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -571,8 +564,7 @@ namespace
     virtual void
     receives_none (SemanticGraph::HomeFactory&)
     {
-      os << " (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl;
+      os << " ()" << endl;
     }
 
     virtual void
@@ -584,7 +576,7 @@ namespace
     virtual void
     receives_post (SemanticGraph::HomeFactory&)
     {
-      os << endl << STRS[ENV_SRC_NOTUSED] << ")" << endl;
+      os << endl << ")" << endl;
     }
 
     virtual void
@@ -665,8 +657,7 @@ namespace
     virtual void
     receives_none (SemanticGraph::HomeFinder&)
     {
-      os << " (" << endl
-         << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl;
+      os << " ()" << endl;
     }
 
     virtual void
@@ -678,7 +669,7 @@ namespace
     virtual void
     receives_post (SemanticGraph::HomeFinder&)
     {
-      os << endl << STRS[ENV_SRC_NOTUSED] << ")" << endl;
+      os << endl << ")" << endl;
     }
 
     virtual void
@@ -982,8 +973,7 @@ namespace
 
       os << "// Implicit operations." << endl << endl
          << STRS[COMP_EC] << "_ptr" << endl
-         << t.name () << "_exec_i::create (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << t.name () << "_exec_i::create ()" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
@@ -1005,8 +995,7 @@ namespace
 
        os << "_exec_i," << endl
           << "::CORBA::NO_MEMORY ());"
-          << STRS[ACE_CR] << " (" << STRS[COMP_EC]
-          << "::_nil ());" << endl
+          << endl
           << "return retval;"
           << "}";
     }
diff --git a/CIAO/CIDLC/Literals.cpp b/CIAO/CIDLC/Literals.cpp
index 634aebfd864..0ed8f8e9699 100644
--- a/CIAO/CIDLC/Literals.cpp
+++ b/CIAO/CIDLC/Literals.cpp
@@ -30,16 +30,6 @@ namespace StringLiterals
 
   char const* const STRS[LIT_SIZE] =
   {
-    // ACE Environment portability macros.
-    "ACE_ENV_ARG_DECL_WITH_DEFAULTS",                     // ENV_HDR
-    "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS",              // ENV_SNGL_HDR
-    "ACE_ENV_ARG_DECL",                                   // ENV_SRC
-    "ACE_ENV_ARG_DECL_NOT_USED",                          // ENV_SRC_NOTUSED
-    "ACE_ENV_SINGLE_ARG_DECL",                            // ENV_SNGL_SRC
-    "ACE_ENV_SINGLE_ARG_DECL_NOT_USED",                   // ENV_SNGL_SRC_NOTUSED
-    "ACE_ENV_ARG_PARAMETER",                              // ENV_ARG
-    "ACE_ENV_SINGLE_ARG_PARAMETER",                       // ENV_SNGL_ARG
-
     // Common CORBA and all Components exceptions.
     "ACE_THROW_SPEC (( ::CORBA::SystemException))",       // EXCP_SNGL
     "ACE_THROW_SPEC ((",                                  // EXCP_START
@@ -85,9 +75,6 @@ namespace StringLiterals
     "_ciao_extract_val",                                  // EXTRACT
     "_ciao_extract_tmp",                                  // EXTRACT_TMP
     "ACE_UNUSED_ARG",                                     // ACE_UA
-    "ACE_CHECK",                                          // ACE_CK
-    "ACE_CHECK_RETURN",                                   // ACE_CR
-    "ACE_THROW",                                          // ACE_TH
     "ACE_THROW_RETURN"                                    // ACE_TR
   };
 }
diff --git a/CIAO/CIDLC/Literals.hpp b/CIAO/CIDLC/Literals.hpp
index 78b22f8651e..09e2a8cb7c4 100644
--- a/CIAO/CIDLC/Literals.hpp
+++ b/CIAO/CIDLC/Literals.hpp
@@ -12,14 +12,6 @@ namespace StringLiterals
   // Index into the string array in Literals.cpp.
   enum
   {
-    ENV_HDR,
-    ENV_SNGL_HDR,
-    ENV_SRC,
-    ENV_SRC_NOTUSED,
-    ENV_SNGL_SRC,
-    ENV_SNGL_SRC_NOTUSED,
-    ENV_ARG,
-    ENV_SNGL_ARG,
     EXCP_SNGL,
     EXCP_START,
     EXCP_SYS,
@@ -56,9 +48,6 @@ namespace StringLiterals
     EXTRACT,
     EXTRACT_TMP,
     ACE_UA,
-    ACE_CK,
-    ACE_CR,
-    ACE_TH,
     ACE_TR,
     LIT_SIZE
   };
diff --git a/CIAO/CIDLC/OperationHeaderEmitters.cpp b/CIAO/CIDLC/OperationHeaderEmitters.cpp
index 6644e8102e6..e41e3d6d023 100644
--- a/CIAO/CIDLC/OperationHeaderEmitters.cpp
+++ b/CIAO/CIDLC/OperationHeaderEmitters.cpp
@@ -33,14 +33,13 @@ OperationEmitter::receives_pre (Type&)
 void
 OperationEmitter::receives_none (Type&)
 {
-  os << " (" << endl
-      << STRS[ENV_SNGL_HDR] << ")" << endl;
+  os << " ()" << endl;
 }
 
 void
 OperationEmitter::receives_post (Type&)
 {
-  os << endl << STRS[ENV_HDR] << ")" << endl;
+  os << endl << ")" << endl;
 }
 
 void
@@ -131,8 +130,7 @@ FactoryOperationEmitter::name (SemanticGraph::HomeFactory& t)
 void
 FactoryOperationEmitter::receives_none (SemanticGraph::HomeFactory&)
 {
-  os << " (" << endl
-      << STRS[ENV_SNGL_HDR] << ")" << endl;
+  os << " ()" << endl;
 }
 
 void
@@ -144,7 +142,7 @@ FactoryOperationEmitter::receives_pre (SemanticGraph::HomeFactory&)
 void
 FactoryOperationEmitter::receives_post (SemanticGraph::HomeFactory&)
 {
-  os << endl << STRS[ENV_HDR] << ")" << endl;
+  os << endl << ")" << endl;
 }
 
 void
@@ -218,8 +216,7 @@ FinderOperationEmitter::name (SemanticGraph::HomeFinder& t)
 void
 FinderOperationEmitter::receives_none (SemanticGraph::HomeFinder&)
 {
-  os << " (" << endl
-      << STRS[ENV_SNGL_HDR] << ")" << endl;
+  os << " ()" << endl;
 }
 
 void
@@ -231,7 +228,7 @@ FinderOperationEmitter::receives_pre (SemanticGraph::HomeFinder&)
 void
 FinderOperationEmitter::receives_post (SemanticGraph::HomeFinder&)
 {
-  os << endl << STRS[ENV_HDR] << ")" << endl;
+  os << endl << ")" << endl;
 }
 
 void
diff --git a/CIAO/CIDLC/ServantHeaderGenerator.cpp b/CIAO/CIDLC/ServantHeaderGenerator.cpp
index f6ec8840e48..6676db3e77d 100644
--- a/CIAO/CIDLC/ServantHeaderGenerator.cpp
+++ b/CIAO/CIDLC/ServantHeaderGenerator.cpp
@@ -122,8 +122,7 @@ namespace
 
       os << "// Get component implementation." << endl
          << "virtual CORBA::Object_ptr" << endl
-         << "_get_component (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << "_get_component ()" << endl
          << STRS[EXCP_SNGL] << ";" << endl
          << "protected:" << endl
          << "// Facet executor." << endl
@@ -174,8 +173,7 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "ev" << endl
-            << STRS[ENV_HDR] << ")" << endl
+        os << "ev)" << endl
             << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -188,8 +186,7 @@ namespace
 
         os << endl
             << "get_connection_" << u.name ()
-            << " (" << endl
-            << STRS[ENV_SNGL_HDR] << ")" << endl
+            << " ()" << endl
             << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -198,8 +195,7 @@ namespace
       {
         os << "virtual " << u.scoped_name () << "Connections *" << endl
            << "get_connections_" << u.name ()
-           << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << " ()" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -212,8 +208,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "ev" << endl
-            << STRS[ENV_HDR] << ")" << endl
+        os << "ev)" << endl
             << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -243,8 +238,7 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "Consumer_ptr c" << endl
-           << STRS[ENV_HDR] << ")" << endl
+        os << "Consumer_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "));" << endl;
@@ -254,8 +248,7 @@ namespace
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr" << endl
-           << "disconnect_" << e.name () << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << "disconnect_" << e.name () << " ()" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "));" << endl;
@@ -269,8 +262,7 @@ namespace
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "_ptr" << endl
-           << STRS[ENV_HDR] << ")" << endl
+        os << "_ptr)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
@@ -281,8 +273,7 @@ namespace
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr" << endl
-           << "disconnect_" << u.name () << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << "disconnect_" << u.name () << " ()" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "));" << endl;
@@ -296,8 +287,7 @@ namespace
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
-        os << "_ptr" << endl
-           << STRS[ENV_HDR] << ")" << endl
+        os << "_ptr)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
@@ -309,8 +299,7 @@ namespace
 
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
-           << "::Components::Cookie * ck" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << "::Components::Cookie * ck)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "));" << endl;
@@ -324,8 +313,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_ptr c" << endl
-           << STRS[ENV_HDR] << ")" << endl
+        os << "Consumer_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "));" << endl;
@@ -333,8 +321,7 @@ namespace
         os << "// CIAO-specific." << endl
            << STRS[COMP_CK] << " *" << endl
            << "subscribe_" << p.name () << "_generic (" << endl
-           << STRS[COMP_ECB] << "_ptr c" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << STRS[COMP_ECB] << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "));" << endl;
@@ -345,8 +332,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << "unsubscribe_" << p.name () << " (" << endl
-           << STRS[COMP_CK] << " *ck" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << STRS[COMP_CK] << " *ck)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "));" << endl;
@@ -491,8 +477,7 @@ namespace
 
         os << "virtual " << STRS[COMP_CD] << " *" << endl
            << "get_registered_consumers (" << endl
-           << "const char *publisher_name" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << "const char *publisher_name)" << endl
            << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IN] << "," << endl
@@ -503,8 +488,7 @@ namespace
 
       os << "static " << t.name () << "_Context *" << endl
          << "_narrow (" << endl
-         << STRS[COMP_SC] << "_ptr p" << endl
-         << STRS[ENV_HDR] << ");" << endl;
+         << STRS[COMP_SC] << "_ptr p);" << endl;
 
       os << "protected:" << endl
          << "// Methods that manage this component's connections"
@@ -592,7 +576,7 @@ namespace
 
         os << "_ptr" << endl
            << "provide_" << p.name () << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -604,8 +588,7 @@ namespace
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "_ptr c" << endl
-           << STRS[ENV_HDR] << ")" << endl
+        os << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
@@ -616,8 +599,7 @@ namespace
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_ptr" << endl
-           << "disconnect_" << u.name () << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << "disconnect_" << u.name () << " ()" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "));" << endl;
@@ -628,7 +610,7 @@ namespace
 
         os << "_ptr" << endl
            << "get_connection_" << u.name () << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -640,8 +622,7 @@ namespace
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
-        os << "_ptr c" << endl
-           << STRS[ENV_HDR] << ")" << endl
+        os << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
@@ -653,15 +634,14 @@ namespace
 
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
-           << "::Components::Cookie * ck" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << "::Components::Cookie * ck)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "));" << endl;
 
         os << "virtual " << u.scoped_name () << "Connections *" << endl
            << "get_connections_" << u.name () << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -711,13 +691,12 @@ namespace
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << " *evt" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
 
         os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
            << "virtual void" << endl
-           << "push_event ( ::Components::EventBase *ev" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << "push_event ( ::Components::EventBase *ev)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_BET] << "));" << endl;
@@ -728,8 +707,7 @@ namespace
            << "virtual void" << endl
            << "ciao_push_event ( ::Components::EventBase *ev," << endl
            << "const char * source_id," << endl
-           << "::CORBA::TypeCode_ptr tc" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << "::CORBA::TypeCode_ptr tc)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_BET] << "));" << endl;
@@ -738,13 +716,13 @@ namespace
            << "virtual CORBA::Boolean" << endl
            << "ciao_is_substitutable (" << endl
            << "const char *event_repo_id" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
 
         os << "// Get component implementation." << endl
            << "virtual CORBA::Object_ptr" << endl
            << "_get_component (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
 
         os << "protected:" << endl
@@ -766,7 +744,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << "get_consumer_" << c.name () << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -778,8 +756,7 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "Consumer_ptr c" << endl
-           << STRS[ENV_HDR] << ")" << endl
+        os << "Consumer_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "));" << endl;
@@ -789,8 +766,7 @@ namespace
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr" << endl
-           << "disconnect_" << e.name () << " (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << "disconnect_" << e.name () << " ()" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "));" << endl;
@@ -804,8 +780,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_ptr c" << endl
-           << STRS[ENV_HDR] << ")" << endl
+        os << "Consumer_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "));" << endl;
@@ -813,8 +788,7 @@ namespace
         os << "// CIAO-specific." << endl
            << STRS[COMP_CK] << " *" << endl
            << "subscribe_" << p.name () << "_generic (" << endl
-           << STRS[COMP_ECB] << "_ptr c" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << STRS[COMP_ECB] << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "));" << endl;
@@ -825,8 +799,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << "unsubscribe_" << p.name () << " (" << endl
-           << STRS[COMP_CK] << " *ck" << endl
-           << STRS[ENV_HDR] << ")" << endl
+           << STRS[COMP_CK] << " *ck)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "));" << endl;
@@ -899,7 +872,7 @@ namespace
       {
         os << "::CORBA::Object_ptr" << endl
            << "provide_" << p.name () << "_i (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -918,7 +891,7 @@ namespace
       {
         os << "::Components::EventConsumerBase_ptr" << endl
            << "get_consumer_" << c.name () << "_i (" << endl
-           << STRS[ENV_SNGL_HDR] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << ";" << endl;
       }
 
@@ -975,7 +948,7 @@ namespace
       os << "virtual void" << endl
          << "set_attributes (" << endl
          << "const ::Components::ConfigValues &descr" << endl
-         << STRS[ENV_SRC] << ");" << endl;
+         << ");" << endl;
 
       os << "// Supported operations." << endl << endl;
 
@@ -1084,8 +1057,7 @@ namespace
       os << "virtual " << STRS[COMP_CK] << " *" << endl
          << "connect (" << endl
          << "const char *name," << endl
-         << "CORBA::Object_ptr connection" << endl
-         << STRS[ENV_HDR] << ")" << endl
+         << "CORBA::Object_ptr connection)" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -1096,8 +1068,7 @@ namespace
       os << "virtual CORBA::Object_ptr" << endl
          << "disconnect (" << endl
          << "const char *name," << endl
-         << STRS[COMP_CK] << " *ck" << endl
-         << STRS[ENV_HDR] << ")" << endl
+         << STRS[COMP_CK] << " *ck)" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -1107,7 +1078,7 @@ namespace
 
       os << "virtual " << STRS[COMP_RD] << " *" << endl
          << "get_all_receptacles (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << ";" << endl;
 
       os << "// Operations for Events interface." << endl << endl;
@@ -1115,8 +1086,7 @@ namespace
       os << "virtual " << STRS[COMP_CK] << " *" << endl
          << "subscribe (" << endl
          << "const char *publisher_name," << endl
-         << STRS[COMP_ECB] << "_ptr subscriber" << endl
-         << STRS[ENV_HDR] << ")" << endl
+         << STRS[COMP_ECB] << "_ptr subscriber)" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -1126,8 +1096,7 @@ namespace
       os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
          << "unsubscribe (" << endl
          << "const char *publisher_name," << endl
-         << STRS[COMP_CK] << " *ck" << endl
-         << STRS[ENV_HDR] << ")" << endl
+         << STRS[COMP_CK] << " *ck)" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -1136,8 +1105,7 @@ namespace
       os << "virtual void" << endl
          << "connect_consumer (" << endl
          << "const char *emitter_name," << endl
-         << STRS[COMP_ECB] << "_ptr consumer" << endl
-         << STRS[ENV_HDR] << ")" << endl
+         << STRS[COMP_ECB] << "_ptr consumer)" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -1146,8 +1114,7 @@ namespace
 
       os << "virtual " << STRS[COMP_ECB] << "_ptr" << endl
          << "disconnect_consumer (" << endl
-         << "const char *source_name" << endl
-         << STRS[ENV_HDR] << ")" << endl
+         << "const char *source_name)" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -1155,19 +1122,18 @@ namespace
 
       os << "virtual " << STRS[COMP_PD] << " *" << endl
          << "get_all_publishers (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << ";" << endl;
 
       os << "virtual " << STRS[COMP_ED] << " *" << endl
          << "get_all_emitters (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << ";" << endl;
 
       os << "// CIAO specific operations on the servant. " << endl
          << "CORBA::Object_ptr" << endl
          << "get_facet_executor (" << endl
-         << "const char *name" << endl
-         << STRS[ENV_HDR] << ")" << endl
+         << "const char *name)" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS]<< "));" << endl;
 
@@ -1195,7 +1161,7 @@ namespace
       os << "private:" << endl << endl
          << "void" << endl
          << "populate_port_tables (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << ";" << endl;
 
       // Generate private operations for ports.
@@ -1479,7 +1445,7 @@ namespace
          << "::Components::HomeExecutorBase_ptr p," << endl
          << "CIAO::Session_Container *c," << endl
          << "const char *ins_name" << endl
-         << STRS[ENV_HDR] << ");" << endl;
+         << ");" << endl;
     }
 
   private:
diff --git a/CIAO/CIDLC/ServantSourceGenerator.cpp b/CIAO/CIDLC/ServantSourceGenerator.cpp
index 25562a84b7b..f4d715b523d 100644
--- a/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -99,14 +99,13 @@ namespace
     virtual void
     receives_none (Type&)
     {
-      os << " (" << endl
-         << STRS[ENV_SNGL_ARG] << ");";
+      os << " ();";
     }
 
     virtual void
     receives_post (Type&)
     {
-      os << endl << STRS[ENV_ARG] << ");";
+      os << endl << ");";
     }
 
     /// If we don't do this, the comma() method just below
@@ -174,10 +173,8 @@ namespace
     OperationEmitter (Context& c,
                       T& scope)
       : EmitterBase (c),
-        scope_ (scope),
-        ace_check_return_emitter_ (c)
+        scope_ (scope)
     {
-      ace_check_returns_.node_traverser (ace_check_return_emitter_);
     }
 
     // Overridden by facet and home operation emitters to do nothing.
@@ -189,11 +186,7 @@ namespace
 
       if (swapping)
         {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");";
-
-          Traversal::Operation::returns (o, ace_check_returns_);
-
-          os << endl;
+          os << "this->activate_component ();" << endl;
         }
     }
 
@@ -213,14 +206,13 @@ namespace
     virtual void
     receives_none (Type&)
     {
-      os << " (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl;
+      os << " ()" << endl;
     }
 
     virtual void
     receives_post (Type&)
     {
-      os << endl << STRS[ENV_SRC] << ")" << endl;
+      os << endl << ")" << endl;
     }
 
     virtual void
@@ -275,8 +267,6 @@ namespace
 
   protected:
     T& scope_;
-    AceCheckReturnEmitter ace_check_return_emitter_;
-    Traversal::Returns ace_check_returns_;
   };
 
   struct FacetEmitter : Traversal::UnconstrainedInterface,
@@ -345,7 +335,7 @@ namespace
         Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
 
         os << " " << a.name () << endl
-           << STRS[ENV_SRC] << ")" << endl;
+           << ")" << endl;
       }
     };
 
@@ -387,7 +377,7 @@ namespace
       {
         os << scope_.name () << "_Servant_T<T>::"
            << a.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl;
+           << ")" << endl;
       }
 
       // ReadAttribute
@@ -412,7 +402,7 @@ namespace
       {
         os << scope_.name () << "_Servant_T<T>::"
            << a.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl;
+           << ")" << endl;
       }
     };
 
@@ -507,28 +497,28 @@ namespace
       os << "template <typename T>" << endl
          << "::CORBA::Object_ptr" << endl
          << i.name () << "_Servant_T<T>::_get_component (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[COMP_SC] << "_var sc =" << endl
          << "  " << STRS[COMP_SC] << "::_narrow (" << endl
          << "  this->ctx_.in ()" << endl
-         << "  " << STRS[ENV_ARG] << ");"
-         << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl
+         << "  " << ");"
+         << endl
          << "if (! ::CORBA::is_nil (sc.in ()))" << endl
          << "{"
          << "return sc->get_CCM_object (" << endl
-         << STRS[ENV_SNGL_ARG] << ");"
+         << ");"
          << "}"
          << "::Components::EntityContext_var ec =" << endl
          << "::Components::EntityContext::_narrow (" << endl
          << "this->ctx_.in ()" << endl
-         << STRS[ENV_ARG] << ");"
-         << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl
+         << ");"
+         << endl
          << "if (! ::CORBA::is_nil (ec.in ()))" << endl
          << "{"
          << "return ec->get_CCM_object (" << endl
-         << STRS[ENV_SNGL_ARG] << ");"
+         << ");"
          << "}"
          << STRS[ACE_TR] << " ( ::CORBA::INTERNAL (), 0);" << endl
          << "}" << endl;
@@ -574,7 +564,7 @@ namespace
         os << "_ptr" << endl
            << scope_.name () << "_Context::get_connection_"
            << u.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "return ";
@@ -592,8 +582,7 @@ namespace
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+        os << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
@@ -602,11 +591,11 @@ namespace
            << "if (! ::CORBA::is_nil (this->ciao_uses_"
            << u.name () << "_.in ()))" << endl
            << "{"
-           << "ACE_THROW ( " << STRS[EXCP_AC] << " ());"
+           << "throw " << STRS[EXCP_AC] << " ();"
            << "}"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << "ACE_THROW ( " << STRS[EXCP_IC] << " ());"
+           << "throw " << STRS[EXCP_IC] << " ();"
            << "}"
            << "this->ciao_uses_" << u.name () << "_ =" << endl
            << "  ";
@@ -620,8 +609,7 @@ namespace
 
         os << "_ptr" << endl
            << scope_.name () << "_Context::disconnect_"
-           << u.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << u.name () << " ()" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
@@ -647,7 +635,7 @@ namespace
         os << u.scoped_name () << "Connections *" << endl
            << scope_.name () << "_Context::get_connections_"
            << u.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << u.scoped_name () << "Connections *tmp_retv = 0;"
@@ -686,8 +674,8 @@ namespace
 
         os << "::_narrow (" << endl
            << "entry.int_id_.in ()" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl;
+           << ");"
+           << endl;
 
         os << "ACE_NEW_THROW_EX ("
            << "retv[i].ck.inout ()," << endl
@@ -705,8 +693,7 @@ namespace
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
-        os << "_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+        os << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
@@ -751,8 +738,7 @@ namespace
         os << "_ptr" << endl
            << scope_.name () << "_Context::disconnect_"
            << u.name () << " (" << endl
-           << STRS[COMP_CK] << " * ck" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << STRS[COMP_CK] << " * ck)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
@@ -799,7 +785,7 @@ namespace
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << " *ev" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "for (ACE_Active_Map_Manager< " << endl
@@ -820,8 +806,7 @@ namespace
 
         os << " (" << endl
            << "ev" << endl
-           << STRS[ENV_ARG] << ");"
-           << "ACE_CHECK;" << endl
+           << ");" << endl
            << "}";
 
         // @@ GD Modified Code Below
@@ -850,8 +835,7 @@ namespace
         Traversal::PublisherData::belongs (p, simple_belongs_);
 
         os << endl
-           << STRS[ENV_ARG] << ");"
-           << "ACE_CHECK;" << endl
+           << ");" << endl
            << "}"
            << "}";
 
@@ -861,8 +845,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+        os << "Consumer_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "))" << endl
@@ -895,8 +878,7 @@ namespace
         os << STRS[COMP_CK] << " *" << endl
            << scope_.name () << "_Context::subscribe_"
            << p.name () << "_generic (" << endl
-           << STRS[COMP_ECB] << "_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << STRS[COMP_ECB] << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "))" << endl
@@ -925,8 +907,7 @@ namespace
         os << "Consumer_ptr" << endl
            << scope_.name () << "_Context::unsubscribe_"
            << p.name () << " (" << endl
-           << STRS[COMP_CK] << " *ck" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << STRS[COMP_CK] << " *ck)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
@@ -982,7 +963,7 @@ namespace
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << " *ev" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "this->ciao_emits_" << e.name ()
@@ -992,7 +973,7 @@ namespace
 
         os << " (" << endl
            << "ev" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}";
 
         os << "void" << endl
@@ -1001,20 +982,19 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "Consumer_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+        os << "Consumer_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "))" << endl
            << "{"
            << "if ( ::CORBA::is_nil (c))" << endl
            << "{"
-           << "ACE_THROW ( ::CORBA::BAD_PARAM ());" << endl
+           << "throw ::CORBA::BAD_PARAM ();" << endl
            << "}"
            << "if (! ::CORBA::is_nil (this->ciao_emits_" << e.name ()
            << "_consumer_.in ()))" << endl
            << "{"
-           << "ACE_THROW ( " << STRS[EXCP_AC] << " ());" << endl
+           << "throw " << STRS[EXCP_AC] << " ();" << endl
            << "}"
            << "this->ciao_emits_" << e.name ()
            << "_consumer_ = " << endl;
@@ -1028,8 +1008,7 @@ namespace
 
         os << "Consumer_ptr" << endl
            << scope_.name () << "_Context::disconnect_"
-           << e.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << e.name () << " ()" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
@@ -1116,8 +1095,8 @@ namespace
 
         os << "Consumer::_narrow (" << endl
            << "e.int_id_.in ()" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl
+           << ");"
+           << endl
            << "if ( ::CORBA::is_nil (c.in ()))"
            << "{"
            << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
@@ -1226,8 +1205,7 @@ namespace
 
         os << STRS[COMP_CD] << " *" << endl
            << t.name () << "_Context::get_registered_consumers (" << endl
-           << "const char *publisher_name" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << "const char *publisher_name)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IN] << "," << endl
@@ -1272,7 +1250,7 @@ namespace
       os << t.name () << "_Context *" << endl
          << t.name () << "_Context::_narrow (" << endl
          << STRS[COMP_SC] << "_ptr p" << endl
-         << STRS[ENV_SRC_NOTUSED] << ")" << endl
+         << ")" << endl
          << "{"
          << "return dynamic_cast<" << t.name () << "_Context *> (p);"
          << endl
@@ -1315,17 +1293,16 @@ namespace
 
         os << "Consumer::_narrow (" << endl
            << "  consumer" << endl
-           << "  " << STRS[ENV_ARG] << ");"
-           << "ACE_CHECK;" << endl
+           << "  " << ");" << endl
            << "if ( ::CORBA::is_nil (_ciao_consumer.in ()))" << endl
            << "{"
-           << "ACE_THROW ( " << STRS[EXCP_IC] << " ());"
+           << "throw " << STRS[EXCP_IC] << " ();"
            << endl
            << "}"
            << "this->connect_" << t.name ()
            << " (" << endl
            << "_ciao_consumer.in ()" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "return;"
            << "}";
       }
@@ -1350,7 +1327,7 @@ namespace
            << t.name ().unescaped_str () << "\") == 0)" << endl
            << "{"
            << "return this->disconnect_" << t.name ()
-           << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
+           << " ();" << endl
            << "}";
       }
     };
@@ -1369,7 +1346,7 @@ namespace
            << t.name ().unescaped_str () << "\") == 0)" << endl
            << "{"
            << "return this->executor_->get_" << t.name ()
-           << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
+           << " ();" << endl
            << "}";
       }
     };
@@ -1395,8 +1372,7 @@ namespace
 
         Traversal::PublisherData::belongs (p, belongs_);
 
-        os << "Consumer_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+        os << "Consumer_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "))" << endl
@@ -1407,21 +1383,20 @@ namespace
 
         if (swapping)
           {
-            os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-               << STRS[ACE_CR] << " (0);" << endl;
+            os << "this->activate_component ();"
+               << endl;
           }
 
         os << "return this->context_->subscribe_" << p.name ()
            << " (" << endl
            << "c" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}";
 
         os << STRS[COMP_CK] << " *" << endl
            << scope_.name ()
            << "_Servant::subscribe_" << p.name () << "_generic (" << endl
-           << STRS[COMP_ECB] << "_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << STRS[COMP_ECB] << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "))" << endl
@@ -1429,14 +1404,14 @@ namespace
 
         if (swapping)
           {
-            os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-               << STRS[ACE_CR] << " (0);" << endl;
+            os << "this->activate_component ();"
+               << endl;
           }
 
         os << "return this->context_->subscribe_" << p.name ()
            << "_generic (" << endl
            << "c" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}";
 
         Traversal::PublisherData::belongs (p, belongs_);
@@ -1444,8 +1419,7 @@ namespace
         os << "Consumer_ptr" << endl
            << scope_.name ()
            << "_Servant::unsubscribe_" << p.name () << " (" << endl
-           << STRS[COMP_CK] << " *ck" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << STRS[COMP_CK] << " *ck)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
@@ -1453,18 +1427,14 @@ namespace
 
         if (swapping)
         {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " ( ";
-
-            Traversal::PublisherData::belongs (p, belongs_);
-
-            os << "Consumer::_nil ());" << endl;
+          os << "this->activate_component ();"
+             << endl;
           }
 
         os << "return this->context_->unsubscribe_"
            << p.name () << " (" << endl
            << "ck" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}";
       }
 
@@ -1500,8 +1470,8 @@ namespace
 
         os << "::_narrow (" << endl
            << "connection" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl
+           << ");"
+           << endl
            << "if ( ::CORBA::is_nil (_ciao_conn.in ()))" << endl
            << "{"
            << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
@@ -1510,8 +1480,8 @@ namespace
            << "// Simplex connect." << endl
            << "this->connect_" << u.name () << " (" << endl
            << "_ciao_conn.in ()" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl
+           << ");"
+           << endl
            << "return 0;" << endl
            << "}";
       }
@@ -1531,8 +1501,8 @@ namespace
 
         os << "::_narrow (" << endl
            << "connection" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl
+           << ");"
+           << endl
            << "if ( ::CORBA::is_nil (_ciao_conn.in ()))" << endl
            << "{"
            << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);"
@@ -1541,7 +1511,7 @@ namespace
            << "// Multiplex connect." << endl
            << "return this->connect_" << u.name () << " (" << endl
            << "_ciao_conn.in ()" << endl
-           << STRS[ENV_ARG] << ");"
+           << ");"
            << "}";
       }
 
@@ -1567,7 +1537,7 @@ namespace
            << "{"
            << "// Simplex disconnect." << endl
            << "return this->disconnect_" << u.name ()
-           << " (" << STRS[ENV_SNGL_ARG] << ");" << endl
+           << " ();" << endl
            << "}";
       }
 
@@ -1586,7 +1556,7 @@ namespace
            << "}"
            << "return this->disconnect_" << u.name () << " (" << endl
            << "ck" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}";
       }
     };
@@ -1612,8 +1582,7 @@ namespace
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
-        os << "_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+        os << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
@@ -1622,7 +1591,7 @@ namespace
            << "this->context_->connect_" << u.name () << " ("
            << endl
            << "c" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "this->add_receptacle (\"" << u.name ().unescaped_str ()
            << "\", c, 0);" << endl
            << "}";
@@ -1631,15 +1600,14 @@ namespace
 
         os << "_ptr" << endl
            << scope_.name () << "_Servant::disconnect_"
-           << u.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << u.name () << " ()" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "return this->context_->disconnect_" << u.name ()
            << " (" << endl
-           << STRS[ENV_SNGL_ARG] << ");" << endl
+           << ");" << endl
            << "}";
 
         Traversal::SingleUserData::belongs (u, belongs_);
@@ -1648,12 +1616,12 @@ namespace
            << scope_.name ()
            << "_Servant::get_connection_" << u.name ()
            << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "return this->context_->get_connection_"
            << u.name () << " (" << endl
-           << STRS[ENV_SNGL_ARG] << ");" << endl
+           << ");" << endl
            << "}";
       }
 
@@ -1666,8 +1634,7 @@ namespace
 
         Traversal::MultiUserData::belongs (u, belongs_);
 
-        os << "_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+        os << "_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
@@ -1677,7 +1644,7 @@ namespace
           "this->context_->connect_" << u.name () << " ("
            << endl
            << "c" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "this->add_receptacle (\"" << u.name ().unescaped_str ()
            << "\", c, cookie);" << endl
            << "return cookie;" << endl
@@ -1688,8 +1655,7 @@ namespace
         os << "_ptr" << endl
            << scope_.name () << "_Servant::disconnect_"
            << u.name () << " (" << endl
-           << STRS[COMP_CK] << " * ck" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << STRS[COMP_CK] << " * ck)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
@@ -1697,19 +1663,19 @@ namespace
            << "return this->context_->disconnect_" << u.name ()
            << " (" << endl
            << "ck" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}";
 
         os << u.scoped_name () << "Connections *" << endl
            << scope_.name ()
            << "_Servant::get_connections_" << u.name ()
            << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "return this->context_->get_connections_"
            << u.name () << " (" << endl
-           << STRS[ENV_SNGL_ARG] << ");" << endl
+           << ");" << endl
            << "}";
       }
 
@@ -1745,8 +1711,8 @@ namespace
 
         os << "Consumer::_narrow (" << endl
            << "subscribe" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl;
+           << ");"
+           << endl;
 
         os << "if ( ::CORBA::is_nil (sub.in ()))" << endl
            << "{"
@@ -1757,14 +1723,14 @@ namespace
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "::_tao_obv_static_repository_id ()" << endl
-           << "  " << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (0);" << endl;
+           << "  " << ");"
+           << endl;
 
         os << "if (substitutable)" << endl
            << "{"
            << "return this->subscribe_" << p.name () << "_generic (" << endl
            << "subscribe" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}"
            << "else" << endl
            << "{"
@@ -1775,7 +1741,7 @@ namespace
            << "{"
            << "return this->subscribe_" << p.name () << " (" << endl
            << "sub.in ()" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}"
            << "}";
       }
@@ -1801,7 +1767,7 @@ namespace
            << "return this->unsubscribe_" << p.name ()
            << " (" << endl
            << "ck" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}";
       }
     };
@@ -1826,8 +1792,7 @@ namespace
 
         Traversal::EmitterData::belongs (e, belongs_);
 
-        os << "Consumer_ptr c" << endl
-           << STRS[ENV_SRC] << ")" << endl
+        os << "Consumer_ptr c)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "))" << endl
@@ -1835,22 +1800,21 @@ namespace
            << "this->context_->connect_" << e.name ()
            << " (" << endl
            << "c" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}";
 
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer_ptr" << endl
            << scope_.name () << "_Servant::disconnect_"
-           << e.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << e.name () << " ()" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
            << "{"
            << "return this->context_->disconnect_"
            << e.name () << " (" << endl
-           << STRS[ENV_SNGL_ARG] << ");" << endl
+           << ");" << endl
            << "}";
       }
 
@@ -1907,7 +1871,7 @@ namespace
         os << "_ptr" << endl
            << scope_.name ()
            << "_Servant::provide_" << p.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{";
 
@@ -1917,12 +1881,8 @@ namespace
         if (swapping)
 
         {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " ( ";
-
-            Traversal::ProviderData::belongs (p, belongs_);
-
-            os << "::_nil ());" << endl;
+          os << "this->activate_component ();"
+             << endl;
           }
 
         os << "if (! ::CORBA::is_nil (this->provide_"
@@ -1937,12 +1897,8 @@ namespace
 
         os << "::CORBA::Object_var obj =" << endl
            << "  this->provide_" << p.name () << "_i ("
-           << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
-
-        Traversal::ProviderData::belongs (p, belongs_);
-
-        os << "::_nil ());" << endl;
+           << ");"
+           << endl;
 
         ScopedName scoped (scope_.scoped_name ());
         Name stripped (scoped.begin () + 1, scoped.end ());
@@ -1956,12 +1912,8 @@ namespace
 
         os << "::_narrow ("
            << "obj.in ()" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
-
-        Traversal::ProviderData::belongs (p, belongs_);
-
-        os << "::_nil ());" << endl
+           << ");"
+           << endl
            << "this->provide_" << p.name () << "_ = fo;"
            << "return ";
 
@@ -1976,7 +1928,7 @@ namespace
         os << "::CORBA::Object_ptr" << endl
            << scope_.name ()
            << "_Servant::provide_" << p.name () << "_i (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "::CORBA::Object_ptr ret =" << endl
@@ -2068,21 +2020,13 @@ namespace
 
         os << "," << endl
            << "  ::CIAO::Container::Facet_Consumer" << endl
-           << "  " << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
-
-        Traversal::ProviderData::belongs (p, belongs_);
-
-        os << "::_nil ());" << endl
+           << "  " << ");"
+           << endl
            << "this->add_facet (\""
            << p.name ().unescaped_str () << "\"," << endl
            << "obj.in ()" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
-
-        Traversal::ProviderData::belongs (p, belongs_);
-
-        os << "::_nil ());" << endl;
+           << ");"
+           << endl;
 
         os << "return obj._retn ();" << endl
            << "}";
@@ -2170,11 +2114,11 @@ namespace
 
         os << "Consumer_" << c.name ()
            << "_Servant::_get_component (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "return this->ctx_->get_CCM_object "
-           << "(" << STRS[ENV_SNGL_ARG] << ");" << endl
+           << "();" << endl
            << "}";
 
         os << "void" << endl
@@ -2192,13 +2136,13 @@ namespace
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << " *evt" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "this->executor_->push_" << c.name ()
            << " (" << endl
            << "evt" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "}";
 
         os << "// Inherited from " << STRS[COMP_ECB] << "." << endl
@@ -2209,8 +2153,7 @@ namespace
 
         os << "Consumer_" << c.name ()
            << "_Servant::push_event (" << endl
-           << "::Components::EventBase *ev" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << "::Components::EventBase *ev)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_BET] << "))" << endl
@@ -2232,10 +2175,10 @@ namespace
 
         os << " (" << endl
            << "ev_type" << endl
-           << STRS[ENV_ARG] << ");" << endl
+           << ");" << endl
            << "return;" << endl
            << "}"
-           << "ACE_THROW ( " << STRS[EXCP_BET] << " ());" << endl
+           << "throw " << STRS[EXCP_BET] << " ();" << endl
            << "}";
 
         // GD Added below code
@@ -2251,8 +2194,7 @@ namespace
            << "_Servant::ciao_push_event (" << endl
            << "::Components::EventBase *ev," << endl
            << "const char * /* source_id */," << endl
-           << "::CORBA::TypeCode_ptr /* tc */" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << "::CORBA::TypeCode_ptr /* tc */)" << endl
            << STRS[EXCP_START] << " "
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_BET] << "))" << endl
@@ -2270,7 +2212,7 @@ namespace
         os << "Consumer_" << c.name ()
            << "_Servant::ciao_is_substitutable (" << endl
            << "const char * event_repo_id" << endl
-           << STRS[ENV_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "if (event_repo_id == 0)" << endl
@@ -2280,8 +2222,8 @@ namespace
            << scope_.name () << "_Context *ctx =" << endl
            << "  " << scope_.name () << "_Context::_narrow (" << endl
            << "  this->ctx_.in ()" << endl
-           << "  " << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (false);" << endl;
+           << "  " << ");"
+           << endl;
 
         os << "CORBA::ORB_ptr orb = ctx->_ciao_the_Container ()->the_ORB ();"
            << endl;
@@ -2289,16 +2231,16 @@ namespace
         os << "CORBA::ValueFactory f =" << endl
            << "  orb->lookup_value_factory (" << endl
            << "  event_repo_id" << endl
-           << "  " << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " (false);" << endl;
+           << "  " << ");"
+           << endl;
 
         os << "if (f == 0)" << endl
            << "{"
            << "return false;" << endl
            << "}"
            << "CORBA::ValueBase_var v =" << endl
-           << "  f->create_for_unmarshal (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " (false);" << endl;
+           << "  f->create_for_unmarshal ();"
+           << endl;
 
         os << "f->_remove_ref ();" << endl;
 
@@ -2319,7 +2261,7 @@ namespace
         os << "Consumer_ptr" << endl
            << scope_.name  () << "_Servant::"
            << "get_consumer_" << c.name () << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "if (! ::CORBA::is_nil (this->consumes_" << c.name ()
@@ -2335,12 +2277,8 @@ namespace
 
         os << "::Components::EventConsumerBase_var obj =" << endl
            << "  this->get_consumer_" << c.name () << "_i (" << endl
-           << "  " << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
-
-        Traversal::ConsumerData::belongs (c, belongs_);
-
-        os << "Consumer::_nil ());" << endl;
+           << "  " << ");"
+           << endl;
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
@@ -2351,12 +2289,8 @@ namespace
 
         os << "Consumer::_narrow (" << endl
            << "  obj.in ()" << endl
-           << "  " << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
-
-        Traversal::ConsumerData::belongs (c, belongs_);
-
-        os << "Consumer::_nil ());" << endl
+           << "  " << ");"
+           << endl
            << "this->consumes_" << c.name () << "_ = eco;"
            << "return ";
 
@@ -2371,7 +2305,7 @@ namespace
         os << "::Components::EventConsumerBase_ptr" << endl
            << scope_.name  () << "_Servant::"
            << "get_consumer_" << c.name () << "_i (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl
+           << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
            << "::Components::EventConsumerBase_ptr ret =" << endl
@@ -2453,32 +2387,20 @@ namespace
 
         os << "," << endl
            << "  ::CIAO::Container::Facet_Consumer" << endl
-           << "  " << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
-
-        Traversal::ConsumerData::belongs (c, belongs_);
-
-        os << "Consumer::_nil ());" << endl;
+           << "  " << ");"
+           << endl;
 
         os << "::Components::EventConsumerBase_var ecb =" << endl
            << "  ::Components::EventConsumerBase::_narrow (" << endl
            << "  obj.in ()" << endl
-           << "  " << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
-
-        Traversal::ConsumerData::belongs (c, belongs_);
-
-        os << "Consumer::_nil ());" << endl;
+           << "  " << ");"
+           << endl;
 
         os << "this->add_consumer (\""
            << c.name ().unescaped_str () << "\"," << endl
            << "ecb.in ()" << endl
-           << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
-
-        Traversal::ConsumerData::belongs (c, belongs_);
-
-        os << "Consumer::_nil ());" << endl;
+           << ");"
+           << endl;
 
         os << "return ecb._retn ();" << endl
            << "}";
@@ -2693,8 +2615,7 @@ namespace
       {
         os << "obj_var =" << endl
            << "  this->provide_" << p.name () << "_i (" << endl
-           << "  " << STRS[ENV_SNGL_ARG] << ");"
-           << "ACE_CHECK;" << endl;
+           << "  " << ");" << endl;
       }
 
       virtual void
@@ -2717,8 +2638,7 @@ namespace
       {
         os << "ecb_var =" << endl
            << "  this->get_consumer_" << p.name () << "_i (" << endl
-           <<  "  " << STRS[ENV_SNGL_ARG] << ");"
-           << "ACE_CHECK;" << endl;
+           <<  "  " << ");" << endl;
       }
     };
 
@@ -3015,28 +2935,25 @@ namespace
           component_emitter.traverse (t);
         }
 
-      os << "ACE_TRY_NEW_ENV" << endl
+      os << "try" << endl
          << "{"
          << "::Components::SessionComponent_var scom =" << endl
          << "  ::Components::SessionComponent::_narrow (" << endl
          << "  exe" << endl
-         << "  " << STRS[ENV_ARG] << ");"
-         << "ACE_TRY_CHECK;" << endl
+         << "  " << ");" << endl
          << "if (! ::CORBA::is_nil (scom.in ()))" << endl
          << "{"
          << "scom->set_session_context (" << endl
          << "this->context_" << endl
-         << STRS[ENV_ARG] << ");"
-         << "ACE_TRY_CHECK;"
+         << ");"
          << "}"
          << "this->populate_port_tables (" << endl
-         << STRS[ENV_SNGL_ARG] << ");"
-         << "ACE_TRY_CHECK;"
+         << ");"
          << "}"
-         << "ACE_CATCHANY" << endl
+         << "catch (const CORBA::Exception&)" << endl
          << "{"
          << "}"
-         << "ACE_ENDTRY;" << endl
+         << endl
          << "}";
 
       // Servant Destructor
@@ -3049,17 +2966,16 @@ namespace
       os << "void" << endl
          << t.name () << "_Servant::set_attributes (" << endl
          << "const ::Components::ConfigValues &descr" << endl
-         << STRS[ENV_SRC] << ")" << endl
-         << "{"
-         << "ACE_ENV_EMIT_CODE (ACE_UNUSED_ARG (ACE_TRY_ENV));" << endl;
+         << ")" << endl
+         << "{" << endl;
 
       string swap_option = ctx.cl ().get_value ("custom-container", "");
       bool swapping = (swap_option == "upgradeable");
 
       if (swapping)
         {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << "ACE_CHECK;" << endl;
+          os << "this->activate_component ();"
+             << endl;
         }
 
       os << "for ( ::CORBA::ULong i = 0; i < descr.length (); ++i)" << endl
@@ -3146,7 +3062,7 @@ namespace
          << t.name () << "_Servant::connect (" << endl
          << "const char *name," << endl
          << "::CORBA::Object_ptr connection" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -3157,8 +3073,8 @@ namespace
 
       if (swapping)
         {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (0);" << endl;
+          os << "this->activate_component ();"
+             << endl;
         }
 
       os << "// If the component has no receptacles, this will be unused."
@@ -3193,7 +3109,7 @@ namespace
          << t.name () << "_Servant::disconnect (" << endl
          << "const char *name," << endl
          << STRS[COMP_CK] << " * ck" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -3205,8 +3121,8 @@ namespace
 
       if (swapping)
       {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl;
+        os << "this->activate_component ();"
+           << endl;
       }
 
       os << "if (name == 0)" << endl
@@ -3240,7 +3156,7 @@ namespace
 
       os << STRS[COMP_RD] << " *" << endl
          << t.name () << "_Servant::get_all_receptacles (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[COMP_RD] << " *retval = 0;"
@@ -3312,7 +3228,7 @@ namespace
          << endl
          << "const char * emitter_name," << endl
          << STRS[COMP_ECB] << "_ptr consumer" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -3322,13 +3238,13 @@ namespace
 
       if (swapping)
       {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CK] << ";" << endl;
+        os << "this->activate_component ();"
+           << endl;
       }
 
       os << "if (emitter_name == 0)" << endl
          << "{"
-         << STRS[ACE_TH] << " ( " << STRS[EXCP_BP] << ");" << endl
+         << "throw " << STRS[EXCP_BP] << ";" << endl
          << "}";
 
       // Generate an IF block for each 'emits' declaration.
@@ -3349,14 +3265,14 @@ namespace
       }
 
       os << STRS[ACE_UA] << " (consumer);"
-         << STRS[ACE_TH] << " ( "
-         << STRS[EXCP_IN] << " ());" << endl
+         << "throw "
+         << STRS[EXCP_IN] << " ();" << endl
          << "}";
 
       os << STRS[COMP_ECB] << "_ptr" << endl
          << t.name () << "_Servant::disconnect_consumer (" << endl
          << "const char *source_name" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -3365,9 +3281,8 @@ namespace
 
       if (swapping)
       {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " ( "
-           << STRS[COMP_ECB] << "::_nil ());" << endl;
+        os << "this->activate_component ();"
+           << endl;
       }
 
       os << "if (source_name == 0)" << endl
@@ -3400,7 +3315,7 @@ namespace
 
       os << STRS[COMP_PD] << " *" << endl
          << t.name () << "_Servant::get_all_publishers (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[COMP_PD] << " *retval = 0;"
@@ -3450,7 +3365,7 @@ namespace
 
       os << STRS[COMP_ED] << " *" << endl
          << t.name () << "_Servant::get_all_emitters (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << endl
          << "{"
          << STRS[COMP_ED] << " *retval = 0;"
@@ -3502,7 +3417,7 @@ namespace
          << t.name () << "_Servant::subscribe (" << endl
          << "const char *publisher_name," << endl
          << STRS[COMP_ECB] << "_ptr subscribe" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -3512,8 +3427,8 @@ namespace
 
       if (swapping)
         {
-          os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-             << STRS[ACE_CR] << " (0);" << endl;
+          os << "this->activate_component ();"
+             << endl;
         }
 
       os << "// Just in case there are no if blocks" << endl
@@ -3549,7 +3464,7 @@ namespace
          << endl
          << "const char *publisher_name," << endl
          << STRS[COMP_CK] << " *ck" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
@@ -3558,9 +3473,8 @@ namespace
 
       if (swapping)
       {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " ( " << STRS[COMP_ECB]
-           << "::_nil ());" << endl;
+        os << "this->activate_component ();"
+           << endl;
       }
 
       os << "// Just in case there are no if blocks" << endl
@@ -3615,15 +3529,15 @@ namespace
          << t.name ()
          << "_Servant::get_facet_executor (" << endl
          << "const char *name" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_START] << " "
          << STRS[EXCP_SYS] << "))" << endl
          << "{";
 
       if (swapping)
       {
-        os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
-           << STRS[ACE_CR] << " ( ::CORBA::Object::_nil ());" << endl;
+        os << "this->activate_component ();"
+           << endl;
       }
 
       os << "if (name == 0)" << endl
@@ -3739,10 +3653,10 @@ namespace
 
       os << "void" << endl
          << t.name () << "_Servant::populate_port_tables (" << endl
-         << STRS[ENV_SNGL_SRC] << ")" << endl
+         << ")" << endl
          << STRS[EXCP_SNGL] << endl
          << "{"
-         << "ACE_ENV_ARG_NOT_USED;"
+         << ";"
          << "::CORBA::Object_var obj_var;"
          << "::Components::EventConsumerBase_var ecb_var;" << endl;
 
@@ -3868,7 +3782,7 @@ namespace
       receives_none (SemanticGraph::HomeFactory&)
       {
         os << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl;
+           << ")" << endl;
       }
 
       virtual void
@@ -3880,7 +3794,7 @@ namespace
       virtual void
       receives_post (SemanticGraph::HomeFactory&)
       {
-        os << endl << STRS[ENV_SRC] << ")" << endl;
+        os << endl << ")" << endl;
       }
 
       virtual void
@@ -3928,12 +3842,6 @@ namespace
           operation_emitter.traverse (hf);
         }
 
-        os << STRS[ACE_CR] << " ( ";
-
-        Traversal::Home::manages (scope_, manages_);
-
-        os << "::_nil ());" << endl;
-
         Traversal::Home::manages (scope_, enclosing_manages_);
 
         os << "::CCM_";
@@ -3950,17 +3858,11 @@ namespace
 
         os << "::_narrow (" << endl
            << "_ciao_ec.in ()" << endl
-           << STRS[ENV_ARG] << ");" << endl;
-
-        os << STRS[ACE_CR] << " ( ";
-
-        Traversal::Home::manages (scope_, manages_);
-
-        os << "::_nil ());" << endl;
+           << ");" << endl;
 
         os << "return this->_ciao_activate_component (" << endl
            << "_ciao_comp.in ()" << endl
-           << STRS[ENV_ARG] << ");" << endl;
+           << ");" << endl;
 
         os << "}";
       }
@@ -4019,7 +3921,7 @@ namespace
       receives_none (SemanticGraph::HomeFinder&)
       {
         os << " (" << endl
-           << STRS[ENV_SNGL_SRC] << ")" << endl;
+           << ")" << endl;
       }
 
       virtual void
@@ -4031,7 +3933,7 @@ namespace
       virtual void
       receives_post (SemanticGraph::HomeFinder&)
       {
-        os << endl << STRS[ENV_SRC] << ")" << endl;
+        os << endl << ")" << endl;
       }
 
       virtual void
@@ -4337,7 +4239,7 @@ namespace
          << "::Components::HomeExecutorBase_ptr p," << endl
          << "::CIAO::Session_Container *c," << endl
          << "const char *ins_name" << endl
-         << STRS[ENV_SRC] << ")" << endl
+         << ")" << endl
          << "{"
          << "if (p == 0)" << endl
          << "{"
@@ -4348,8 +4250,8 @@ namespace
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
          << "::_narrow (" << endl
          << "p" << endl
-         << STRS[ENV_ARG] << ");"
-         << STRS[ACE_CR] << " (0);" << endl
+         << ");"
+         << endl
          << "if (::CORBA::is_nil (x.in ()))" << endl
          << "{"
          << "return 0;" << endl
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index b68c6fa36cf..8282ac25cde 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,1112 +1,49 @@
-Wed Jan 10 21:35:25 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+Tue Jan 30 11:27:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * NEWS:
+        * ciao/Server_init.{h,cpp}:
+          Change argument of BindObjectPath to a _ptr. Fixes bugzilla
+          2779. Thanks to Abdullah Sowayan <abdullah.sowayan@lmco.com>
+          for reporting this.
 
-          Updated with my changes since 0.5.4.
+Mon Jan 29 19:23:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Jan  8 20:01:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * RACE/common/RACE_common.idl:
-          Use the CORBA::StringSeq to reduce footprint
-
-Tue Jan  8 19:43:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_CCMException.idl:
-        * ciao/CCM_Context.idl:
-          Added some commented out IDL that is part of the QoS4CCM spec
-
-Sun Jan  7 18:44:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplicationManager/URL_Parser.cpp:
-          No need to set members to 0 in destructor
-
-        * DAnCE/RepositoryManager/URL_Parser.cpp:
-          Fixed conversion warning and memory leak
-
-Sun Jan  7 12:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_ClientContainerInterceptor.idl:
-        * ciao/CCM_ClientContainerInterceptorRegistration.idl:
-        * ciao/CCM_ContainerClientRequestInfo.idl:
-        * ciao/CCM_ContainerInterceptor.idl:
-        * ciao/CCM_ContainerRequestInfo.idl:
-        * ciao/CCM_ContainerServantRequestInfo.idl:
-        * ciao/CCM_ContainerServerRequestInfo.idl:
-        * ciao/CCM_ContainerStubRequestInfo.idl:
-        * ciao/CCM_ExtensionComponent.idl:
-        * ciao/CCM_ExtensionContext.idl:
-        * ciao/CCM_InvalidRegistration.idl:
-        * ciao/CCM_QoS.idl:
-        * ciao/CCM_ServantContainerInterceptor.idl:
-        * ciao/CCM_ServantContainerInterceptorRegistration.idl:
-        * ciao/CCM_ServerContainerInterceptor.idl:
-        * ciao/CCM_ServerContainerInterceptorRegistration.idl:
-        * ciao/CCM_StubContainerInterceptor.idl:
-        * ciao/CCM_StubContainerInterceptorRegistration.idl:
-          Added interfaces from QoS for CCM spec (OMG 06-04-15). We
-          don't have an implementation yet, just the interfaces at
-          this moment
-
-Fri Jan  5 12:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-          Fixed conversion warnings
-
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-        * DAnCE/RepositoryManager/URL_Parser.cpp:
-          Improved layout and documentation
-
-Wed Jan  3 19:32:05 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * CIAO_TAO_DAnCE.mwc:
-
-          Added $(ACE_ROOT)/contrib/minizip since the RepositoryManager can
-          use minizip if the zlib feature is enabled.
-
-Wed Jan  3 07:01:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-          Fixed conversion warnings
-
-        * DAnCE/RepositoryManager/URL_Parser.cpp:
-          Initialise pointer with 0
-
-Wed Jan  3 16:18:36 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
-
-          Use the install base project instead of the deprecated core base
-          project.
-
-Thu Dec 28 12:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-          Doxygen improvements
-
-Mon Dec 25 16:19:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * Merry Christmas everyone!!!
-
-Wed Dec 20 06:37:27 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * MPC/config/ciao_rtevent_dnc.mpb:
-        * MPC/config/ciao_events_dnc.mpb:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
-        * ciao/CCM_Core.mpc:
-
-          Fixed linking errors on OS X.
-
-Wed Dec 13 08:35:48 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp:
-
-          Fixed warnings on NoInterceptors_Core build related to
-          type conversion.
-
-Wed Dec 13 07:57:02 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp:
-
-          Fixed a fuzz error.
-
-Wed Dec 13 07:29:10 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
-
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
-
-          Fixed Debian_GCC_4.0 compilation error by removing
-          unnecessary common for enum definition.
-
-Wed Dec 13 07:19:13 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h:
-
-          Fixed a compilation error in Win2003_VC71_Versioned_Namespace
-          build by removing the unnecessary declaration.
-
-Wed Dec 13 06:45:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Swapping/Sender/Sender_exec.h:
-          Fixed include because of file name changes
-
-Tue Dec 12 20:55:02 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp:
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h:
-
-          Modified the ciao_push_event() in this base class to fix
-          BCC warnings.
-
-Tue Dec 12 20:21:03 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h:
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
-
-          Fixed the fuzz errors.
-
-Tue Dec 12 20:15:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Component.idl:
-        * ciao/CCM_Core.mpc:
-        * ciao/CCM_EventBase.idl:
-        * ciao/CCM_EventConsumerBase.idl:
-        * ciao/CCM_HomeConfiguration.idl:
-        * ciao/CCM_HomeConfigurator.idl:
-        * ciao/CCM_Object.idl:
-        * ciao/CCM_PrimaryKeyBase.idl:
-        * ciao/CCM_SessionComponent.idl:
-        * ciao/CCM_StateIdFactory.idl:
-        * ciao/Servant_Impl_Base.h:
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl:
-        * DAnCE/TargetManager/DomainEvents.idl:
-          Added remarks about compliance and another set of splitting
-          idl files in smaller ones
-
-        * ciao/CCM_Event.idl:
-        * ciao/CCM_Events.idl:
-          Renamed Event to Events
-
-        * ciao/CCM_HomeConfigurator.idl:
-        * ciao/CCM_HomeConfiguration.idl:
-          Renamed Configurator to Configuration
-
-Tue Dec 12 14:48:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Base.idl:
-        * ciao/CCM_CCM2Context.idl:
-        * ciao/CCM_ComponentId.idl:
-        * ciao/CCM_Configurator.idl:
-        * ciao/CCM_Container.idl:
-        * ciao/CCM_Container_Ex.idl:
-        * ciao/CCM_Core.mpc:
-        * ciao/CCM_Entity2Context.idl:
-        * ciao/CCM_Event.idl:
-        * ciao/CCM_ExecutorLocator.idl:
-        * ciao/CCM_HomeConfigurator.idl:
-        * ciao/CCM_SessionComponent.idl:
-        * ciao/CCM_SessionContext.idl:
-        * ciao/CCM_StandardConfigurator.idl:
-        * ciao/CCM_StateIdFactory.idl:
-        * ciao/Deployment_NodeApplication.idl:
-          Moved more interfaces to their own file
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
-          Removed virtual keywords, not needed
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-          Const changes and improved some messages
-
-        * DAnCE/Plan_Generator/PCVisitor.h:
-        * DAnCE/Plan_Generator/PCVisitorBase.h:
-          Doxygen changes
-
-        * tools/Config_Handlers/DynAny_Handler.mpc:
-          layout changes
-
-Tue Dec 12 10:08:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/taoidl3toidl2defaults.mpb:
-          Moved from TAO to here
-
-Mon Dec  11 20:55:39 UTC 2006  Gan Deng <gan.deng@vanderbilt.edu>
-
-        * ciao/CCM_Event.idl:
-
-          Modified the "ciao_push_event" operation to pass in "source_id",
-          which is used to identify the sources of the publisher ports to
-          support event filtering mechanism.
-
-        * ciao/Deployment_Events.idl:
-
-          Added new IDL definitions to support RTEC federation, such as
-          AddrServer, UDPSender, UPDReceiver, etc.
-
-        * ciao/Deployment_NodeApplication.idl:
-
-          Modified the "install_es" operation to install one service object
-          per invocation, instead of a sequence of objects.
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        * DAnCE/NodeApplication/NodeApplication_Impl.h:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h:
-
-          Modified to accomodate the changes made above by adding only
-          one ciao event service object reference to the map.
-
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl:
-
-          Removed the inheritance relationship between Consumer_Config and
-          Supplier_Config object. The reason why it was there is because
-          of a tightly coupled design long time ago.
-
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp:
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h:
-
-          Added a virtual function "ciao_push_event" and provides a
-          default implementation, which is essentially a no_op impl.
-
-        * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp:
-        * ciaosvcs/Events/CIAO_EventService_Factory_impl.h:
-
-          Modified the factory method "create" by passing in the
-          string identifier for the service object.
-
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl:
-
-          Added new operations to create gateways object to support
-          event channel federations.
-
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h:
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc:
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp:
-        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h:
-
-          Added the implementation and MPC files to support event
-          channel federations in CIAO_Event_Service.
-
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-
-          Automatically generate the implementation code of
-          ciao_push_event for component in the servant code.
-
-        * DAnCE/NodeApplication/NodeApplication.cpp:
-
-          Explicitly add the init_svcs() operation to the
-          NA component server implementation. We should figure
-          out a way to see whether we can avoid doing this at
-          this level.
-
-        * DAnCE/NodeManager/Node_Manager.cpp:
-
-          Enhanced NM to pass in service configuration file explicitly.
-          Also fixed a bug about controlling ORBDebugLevel.
-
-        * docs/schema/CIAOEvents.xsd:
-
-          Enhanced the CIAOEvents schema to support event channel
-          federation configuration.
-
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp:
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp:
-
-          Config handlers enhancement to support the above
-          schema changes.
-
-        * DAnCE/tests/NodeApplicationTest/run_test.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
-
-          Modified to use environment variables instead of relative paths.
-
-        * examples/Hello/Sender/Sender_exec.cpp:
-        * examples/Hello/Receiver/Receiver_exec.cpp:
-
-          Modified to explicitly print out the contents of the received msgs.
-
-        * examples/Hello/descriptors_events/ciao-events-example-collocated.ced:
-        * examples/Hello/descriptors_events/ciao-events-example-with-federation.ced:
-        * examples/Hello/descriptors_events/ciao-events-example-with-filters.ced:
-        * examples/Hello/descriptors_events/ciao-events-example.ced:
-        * examples/Hello/descriptors_events/ciao-events-federation-mcast.ced:
-        * examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced:
-        * examples/Hello/descriptors_events/ciao-events-federation-udp-two-hosts.ced:
-        * examples/Hello/descriptors_events/ciao-events-federation-udp.ced:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp:
-        * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp:
-        * examples/Hello/descriptors_events/NodeManagerMap.dat:
-        * examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat:
-        * examples/Hello/descriptors_events/rtec.conf:
-        * examples/Hello/descriptors_events/run_NodeDaemons.pl:
-        * examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl:
-        * examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl:
-
-          Added a bunch of test cases for CIAO Event Service.
-
-Fri Dec  8 22:59:14 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/tools.mwc:
-
-          Added IDL3_to_IDL2 directory to the list.
-
-Fri Dec  8 000:09:04 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * bin/generate_component_mpc.pl:
-
-          Another typo found by Abdullah Sowayan <abdullah.sowayan@lmco.com>.
-
-Thu Dec  7 20:22:57 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * bin/generate_component_mpc.pl:
-
-          Fixed bug that omits necessary space between items in 'after'
-          line, if it contains more than one item. Thanks to Abdullah
-          Sowayan <abdullah.sowayan@lmco.com> for reporting the bug.
-
-Thu Dec  7 19:15:04 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * bin/generate_component_mpc.pl:
-
-          Fixed typo, had 'ciao_server_dnc', should have been
-          'ciao_servant_dnc'. Thanks to Abdullah Sowayan
-          <abdullah.sowayan@lmco.com> for reporting the mistake.
-
-Thu Dec  7 19:04:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/Config_Handlers/DynAny_Handler.mpc:
-
-          Removed taolib and anytypecode base projects, since they are
-          already pulled in by typecodefactory.
-
-Thu Dec  7 13:47:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration (init):
-          Use ACE_Read_Buffer to read the file and parse it contents. This way
-          we are independent of a fixed buffer length, especially on systems
-          with multiple network cards and IPv6 enabled the IORs can get huge.
-
-Thu Dec  7 11:48:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Core.mpc:
-        * MPC/config/ciao_server_dnc.mpb:
-          Don't build DnC server with minimum corba and CORBA/e, this was
-          disabled in the past implicitly because we used security as
-          MPC base project but because that has been removed we now
-          have to explicitly disable this project
-
-Thu Dec  7 11:34:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
-          Added some todo's, check whether the narrow on the NamingContext
-          did succeed, use CORBA::ULong for the sequence index
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
-          Use a CORBA::String_var to store the uuid string
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-          Added some todo's, check whether the narrow on the NamingContext
-          did succeed, layout changes, fixed bugzilla bug 2729, thanks to Abdul
-          for reporting that.
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
-          Doxygen improvements
-
-Wed Dec  6 11:26:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CIAO_ServerResources.idl:
-        * ciao/Deployment_NodeApplicationManager.idl:
-        * DAnCE/NodeApplication/NodeApplication_Impl.h:
-        * DAnCE/NodeManager/MonitorCB.h:
-        * DAnCE/NodeManager/MonitorController.h:
-        * DAnCE/TargetManager/DomainDataManager.h:
-        * tools/Config_Handlers/DD_Handler.h:
-          Doxygen documentation updates
-
-        * MPC/config/ciao_container_dnc.mpb:
-        * ciao/CCM_Core.mpc:
-          Added avoids_corba_e_compact as base project
-
-Tue Dec  5 11:45:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Core.mpc:
-        * MPC/config/ciao_container_dnc.mpb:
-          Don't build Dnc_Container with corba/e compact has been enabled
-
-        * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc:
-          Simplified this MPC file
-
-Mon Dec  4 12:14:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/*:
-          All CIAO base projects are moved from
-          ACE_wrappers/bin/MakeProjectCreator/config to this directory
-
-Mon Dec  4 12:35:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/TargetManager/TM_Client.mpc:
-          Simplified this file using more base projects
-
-Mon Dec  4 12:29:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/TargetManager/DomainDataManager.h:
-          Documentation changes
-
-        * DAnCE/TargetManager/TargetManager.mpc:
-          Simplified this file using more base projects
-
-Mon Dec  4 12:24:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC
-        * MPC/config
-          New directory for the base projects specifically for CIAO
-
-Mon Dec  4 12:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
-          Use include from CIAO_ROOT and removed using namespace
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
-          Simplified this file
-
-Mon Dec  4 11:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-          Simplified by using the base projects
-
-Mon Dec  4 11:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-          Converted the NodeApplication into a library and build
-          an exe using this library. Will prevent duplicate compilation
-          of part of the code. Fixes bugzilla bug 2739.
-
-        * DAnCE/NodeApplication/CIAO_NodeApplication_export.h:
-          New export file:
-
-        * DAnCE/NodeApplication/Configurator_Factory.h:
-        * DAnCE/NodeApplication/Container_Impl.h:
-        * DAnCE/NodeApplication/NodeApplication_Core.h:
-        * DAnCE/NodeApplication/NodeApplication_Impl.h:
-          Added export macro to export the class from the new NodeApplication
-          library.
-
-        * DAnCE/NodeApplication/NodeApplication.mpc:
-          Added new library project and use this in the executable.
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-          Use the new NodeApplication library and the new base projects
-          I added for CIAO
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.{h,cpp,inl}:
-          Moved destructor from inline to cpp method and small code improvements
-
-        * DAnCE/NodeManager/NodeManager.mpc:
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
-          Simplified by using the new base projects
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Small improvements
-
-Mon Dec  4 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO-INSTALL.html:
-          Updated build instructions
-
-        * ciao/Dynamic_Component_Activator.cpp:
-          Removed not needed return statements in a void method
-
-        * ciao/Dynamic_Component_Activator.h:
-          Changed guard in file to match filename
-
-        * ciao/Home_Servant_Impl_T.cpp:
+        * ciao/Swapping_Servant_Home_Impl_Base.{h,cpp}:
+        * ciao/Upgradeable_Context_Impl_T.cpp:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
           Layout changes
 
-        * ciao/Port_Activator.{h,cpp}:
-          The name methods did really change oid, so renamed name
-          to oid and added a new name method to return the name
-          member
-
-        * ciao/Servant_Activator.cpp:
-          Const changes and updated for Port Activator changes
-
-        * ciao/Servant_Impl_Base.cpp:
-          Small code improvements
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-          Const changes
-
-        * DAnCE/NodeApplication/Container_Impl.cpp:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-          Throw NO_MEMORY when allocation fails
-
-        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
-          Throw BAD_PARAM when an incorrect method parameter has been passed
-
-        * DAnCE/NodeManager/BaseMonitor.h:
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-        * DAnCE/NodeManager/NodeManager_Impl.h:
-          Doxygen changes
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Fixed a comment
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
-          Use true/false for bool
-
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-          Layout changes
-
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Removed not needed includes, made messages dependent
-          on the debug level, added missing duplicate
-
-        * DAnCE/TargetManager/TargetManager_exec.h:
-          Don't use std:: for auto_ptr
-
-        * DAnCE/TargetManager/TargetManagerExt.idl:
-          Removed commented out include
-
-        * DAnCE/TargetManager/TargetManagerImpl.idl:
-          Removed empty lines
-
-        * DAnCE/tests/NodeApplicationTest/run_test.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
-        * DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
-        * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl:
-        * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl:
-        * examples/Display/descriptors/basicNodeDaemon.pl:
-        * examples/Display/descriptors/run_NodeDaemons.pl:
-        * examples/Hello/descriptors/run_NodeDaemons.pl:
-          Use $ACE_ROOT/bin with use lib. This fixes bugzilla bug 2737,
-          thanks for Abdul for reporting this.
-
-        * docs/tutorials/Quoter/Simple/01.html:
-          Update from Abdul
-
-Fri Dec  1 16:27:34 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * bin/generate_component_mpc.pl:
-
-          Fixed generation of export files. Thanks to Abdullah
-          Sowayan <abdullah.sowayan@lmco.com> for reporting
-          the problem.
-
-Fri Dec  1 13:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/tutorials/CoSMIC/index.html:
-        * docs/tutorials/Quoter/Simple/index.html:
-          Updated download location of ACE/TAO/CIAO
-
-Fri Dec  1 11:26:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ExecutionManager/Execution_Manager.cpp:
-          Fixed invalid check whether we have a nil POA or not
-
-Fri Dec  1 11:17:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/TargetManager/Deployment_Configuration.{h,cpp}:
-          Removed these files, not used in the mpc file
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.{h,cpp}:
-          Close the file handle, part of the fix for bugzilla bug 2733
-
-        * DAnCE/TargetManager/DomainDataManager.{h,cpp}:
-          Const changes, sequences have a CORBA::ULong as length, not int.
-          Added some todo's and use a little bit more ACE
-
-        * DAnCE/TargetManager/TargetManager.cidl:
-          Removed empty line
-
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Fixed memory management and the way we check for a nil
-          reference
-
-Fri Dec  1 09:01:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_component_mpc.pl:
-          Layout improvements, thanks to Abdul for making this
-          update.
-
-Thu Nov 30 12:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ExecutionManager/Execution_Manager.cpp:
-          Removed not needed ACE_TRY_CHECK
-
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
-          Const improvement
-
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-          Initialise pointer with 0, removed code after return
-          added added a todo
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-          Doxygen improvement
-
-        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
-          Lot of layout changes to make the code a little bit more
-          readable, more has to be done to this file
-
-        * DAnCE/RepositoryManager/ZIP_Wrapper.h:
-          Doyxgen improvements and removed not needed include
-
-        * DAnCE/TargetManager/CmpClient.cpp:
-          Use true/false for a bool
-
-        * DAnCE/TargetManager/Deployment_Configuration.cpp:
-          Use bool and use 0 instead of NULL
-
-        * DAnCE/TargetManager/DomainDataManager.h:
-          Doxygen changes
-
-        * DAnCE/TargetManager/DomainEvents.idl:
-          Removed not needed include
-
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Layout changes
-
-        * DAnCE/TargetManager/TM_Client.mpc:
-          Removed not needed includes
-
-Wed Nov 29 21:26:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * docs/generate_component_mpc.html:
-
-          New file, documentation for the Perl script
-          generate_component_mpc.pl, in CIAO_ROOT/bin.
-
-        * bin/generate_component_mpc.pl:
-
-          Changes mainly to correct problems with MPC files
-          generated for non-component builds, i.e., from some IDL
-          file used in common by multiple component builds, such
-          as the definition of a port interface. Also made changes
-          and added a new command line option to help minimize the
-          amount of code generated from IDL and minimize the
-          dependencies of the generated makefile or project.
-
-Wed Nov 29 15:43:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-          Don't use plain new, fixes bugzilla bug 2732. Thanks to Abdul
-          for reporting this
-
-Wed Nov 29 12:48:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/*.idl:
-          Added ciao/ as prefix to the include path. This way it is clear
-          where we are including a file from.
-
-Tue Nov 28 21:38:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/RTNodeApplication:
-          Zapped, not used anymore
-
-Tue Nov 28 19:33:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Deployment_DomainApplicationManager.idl:
-          Added comments about more details which are not compliant according
-          to the spec
-
         * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-          Use native bool instead of int
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h:
-          Reordered includes and improved doxygen documentation
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-          Const changes, use ACE_ERROR for error messages
-
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-          Const changes, use more ACE and little cleanup
-
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-          Doxygen improvement
-
-        * DAnCE/NodeManager/MonitorCB.cpp:
-          Code layout changes
-
-        * DAnCE/NodeManager/MonitorCB.h:
-          Doxygen changes and added some todo's
-
-        * DAnCE/NodeManager/MonitorController.cpp:
-          Use bool and small improvements
-
-        * DAnCE/NodeManager/Node_Manager.cpp:
-          Use the correct value for the lenght of the buffer passed
-          to hostname
+          Fixed parsing of node manager file
 
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Small improvements and added some todo's
+        * examples/BasicSP/descriptors/run_test.pl:
+          New script to run this example automatically
 
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
-          Cleanup
+        * exampls/BasicSP/README.html:
+          Fixed incorrect path and mpc generation command
 
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
-          Made some debug lines dependent on a debug level
+Sun Jan 28 19:59:14 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-Tue Nov 28 16:11:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+        * CIAO version 0.5.6 released.
 
-        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-        * DAnCE/NodeManager/Monitor.mpc
+Thu Jan 25 18:18:58 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-          Fixes for link errors in OS X.
+        * *.{h,cpp,inl}:
 
-Tue Nov 28 11:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Removed the majority of the ACE exception macros.  The
+          ACE_THROW_RETURN's were left in to avoid warnings from aCC.
 
-        * CIDLC/ExecutorMappingGenerator.cpp:
-          Updated because of idl file rename
+Wed Jan 24 13:00:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Nov 28 10:42:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * *.{h,cpp,inl}:
+          Removed part of the environment macros
 
-        * ciao/*:
-        * *:
-          Renamed a lot of idl files, if the file contains interfaces/types
-          from the DAnCE spec, added Deployment_ as prefix, if they are
-          containing CIAO specific interfaces, added CIAO_. This way we can
-          more easily see if we have spec compliant IDL or not.
+Mon Jan 22 23:14:56 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-Tue Nov 28 09:50:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * CIAO version 0.5.5 released.
 
-        * ciao/CCM_Home.idl:
-        * ciao/CCM_Object.idl:
-          Moved CCMHome again to its own file
-
-        * ciao/Security.idl:
-          CIAO uses an interface of the security service but we don't
-          do a thing with it, so just define a local interface within
-          CIAO and use that for the moment, saves 250Kb of footprint
-
-        * ciao/CCM_Context.idl:
-          Use the local security interface
-
-        * ciao/ExectionManager.idl:
-          Added todo
-
-        * ciao/CCM_Core.idl:
-          Added new file
-
-Mon Nov 27 18:34:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/NodeApplicationManager.idl:
-        * ciao/Deployment_ApplicationManager.idl:
-          Moved ApplicationManager interface to its own file
-
-        * ciao/CCM_Core.mpc:
-          Added new file
-
-        * ciao/DomainApplicationManager.idl:
-        * ciao/TargetManager.idl:
-          Updated includes
-
-        * ciao/Target_Data.idl:
-          Moved ResourceNotAvailable also to the new
-          Deyloyment_ApplicationManger file
-
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-          Removed include of memory, not portable and not used.
-          Fixes bugzilla bug 2730. Thanks to Abdul for reporting
-          this.
-
-Mon Nov 27 15:41:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Deployment_Core.idl:
-        * ciao/Deployment_Container.idl:
-        * ciao/Deployment_NodeApplication.idl:
-          Moved types from Core to the other files and added remarks
-          to all CIAO specific types
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h:
-        * DAnCE/NodeApplicationManager/ImplementationInfo.h:
-          Updated includes because of the move above
-
-Mon Nov 27 14:55:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Core.mpc:
-          Added new Deployment_DeploymentPlan
-
-        * ciao/Deployment_Data.idl
-        * ciao/Deployment_DeploymentPlan.idl:
-          Moved types related to DeploymentPlan to their own file
-
-        * ciao/Deployment_Data.idl
-          Removed RequirementSatisfier, it is superfluous.
-
-        * ciao/Deployment.idl:
-          No need to include Deployment_Data
-
-        * ciao/Target_Data.idl:
-          Removed not needed include
-
-        * ciao/Deployment_Connection.idl:
-        * ciao/TargetManager.idl:
-        * RACE/Output_Adapters/Interface/PlanEgress.idl:
-        * RACE/Plan_Analyzer/Interface/PlanIngress.idl:
-        * RACE/Planner_Manager/Interface/Planner_Manager_I.idl:
-        * RACE/Planners/Interface/Planner_I.idl:
-          Updated include because of move above
-
-        * tools/Config_Handlers/DnC_Dump.{h,cpp}:
-          Removed RequirementSatisfier
-
-Mon Nov 27 14:11:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Deployment.idl:
-          Removed LastConfiguration, it is not used and has been zapped
-          from the DAnCE spec
-
-Mon Nov 27 14:04:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Deployment_Core.idl:
-        * ciao/Deployment_NodeApplication.idl:
-          Moved ESInstallationInfo to NodeApplication file
-
-        * ciao/Deployment.idl:
-          LastConfiguration doesn't seem used, added a comment to that
-          exception.
-
-        * ciao/NodeApplicationManager.idl:
-          Doxygen improvement
-
-Mon Nov 27 13:23:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/NodeApplicationManager.idl:
-          Doxygen improvement
-
-        * ciao/Deployment_Core.idl:
-          Removed InvalidLocation exception, not used and not in the DAnCE
-          spec
-
-Mon Nov 27 13:10:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Deployment_Core.idl
-        * ciao/Deployment_Container.idl
-        * ciao/Deployment_NodeApplication.idl
-          Moved some interfaces from Core to their own files
-
-        * ciao/CCM_Core.mpc:
-          Updated because of split above and added some more flags to
-          reduce the amount of generated files
-
-        * ciao/DomainApplicationManager.idl:
-        * ciao/NodeApplication_CallBack.idl
-          Updated include
-
-        * DAnCE/NodeApplication/Container_Impl.h:
-        * DAnCENodeApplication/NodeApplication_Impl.h:
-        * DAnCEtests/NodeApplicationTest/NodeApp_test_client.cpp:
-        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp:
-        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
-        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_simple.cpp:
-          Updated includes because of refactoring above
-
-Mon Nov 27 09:40:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-          Instead of the http files in this library, use the HTTP
-          classes from the TAO lib
-
-        * DAnCE/RepositoryManager/HTTP_Client.cpp
-        * DAnCE/RepositoryManager/HTTP_Client.h
-        * DAnCE/RepositoryManager/HTTP_Handler.cpp
-        * DAnCE/RepositoryManager/HTTP_Handler.h
-          Removed, not needed anymore, these files did move to the TAO
-          lib to support http:// ior and we are reusing them now in
-          CIAO
-
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-          Removed the files above
-
-Mon Nov 27 09:36:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-          Instead of the http files in this library, use the HTTP
-          classes from the TAO lib
-
-        * DAnCE/NodeApplicationManager/URL_Parser.h:
-          Doxygen improvements
-
-        * DAnCE/NodeApplicationManager/HTTP_Client.cpp:
-        * DAnCE/NodeApplicationManager/HTTP_Client.h:
-        * DAnCE/NodeApplicationManager/HTTP_Handler.cpp:
-        * DAnCE/NodeApplicationManager/HTTP_Handler.h:
-          Removed, not needed anymore, these files did move to the TAO
-          lib to support http:// ior and we are reusing them now in
-          CIAO
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-          Removed the files above
-
-Mon Nov 27 09:33:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Removed include of errno.h. It is not portable, but it seems
-          it isn't needed at all. Thanks to Abdul for reporting this,
-          this fixes bugzilla bug 2726.
-
-Mon Nov 27 08:59:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/tutorials/Quoter:
-          Extended this tutorial with more documentations. Thanks to
-          Abdul for delivering these files. This fixes bugzilla 2717
-
-Fri Nov 24 13:59:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
-          Added check whether we got a valid NodeImplementationInfo back
-          and not a nill pointer. Fixes bugzilla bug 2692 finally.
-          Thanks to Abdul for pointing out the need for this check
-
-Fri Nov 24 09:41:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc:
-          Don't build this project in ace_for_tao configuration
-
-Thu Nov 23 12:34:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Home.idl:
-        * ciao/CCM_Object.idl:
-          Moved CCMHome again to its own file now the idl compiler has
-          been fixed to handle this correctly
-
-Wed Nov 22 20:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Dynamic_Component_Servant_Base.h:
-          Removed the character c from the first line which drove the
-          compilers really crazy
-
-Wed Nov 22 19:31:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Home.idl:
-        * ciao/CCM_Object.idl:
-          Moved CCMHome to CCMObject, when these are in seperate files
-          the generated code for components is not correct. We want to have
-          these interfaces in seperate files but we can sort out this
-          later.
-
-Wed Nov 22 14:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Dynamic_Component_Servant_Base.h:
-          Fixed pragme once warning
-
-Wed Nov 22 11:05:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Base.idl
-        * ciao/CCM_CCM2Context.idl
-        * ciao/CCM_CCMException.idl
-        * ciao/CCM_Component.idl
-        * ciao/CCM_Configurator.idl
-        * ciao/CCM_Container.idl
-        * ciao/CCM_Container_Ex.idl
-        * ciao/CCM_Context.idl
-        * ciao/CCM_Cookie.idl
-        * ciao/CCM_Core.mpc
-        * ciao/CCM_EnterpriseComponent.idl
-        * ciao/CCM_EntityComponent.idl
-        * ciao/CCM_EntityContext.idl
-        * ciao/CCM_Enumeration.idl
-        * ciao/CCM_Event.idl
-        * ciao/CCM_Home.idl
-        * ciao/CCM_HomeConfigurator.idl
-        * ciao/CCM_HomeExecutorBase.idl
-        * ciao/CCM_HomeFinder.idl
-        * ciao/CCM_HomeRegistration.idl
-        * ciao/CCM_KeylessCCMHome.idl
-        * ciao/CCM_Navigation.idl
-        * ciao/CCM_Object.idl
-        * ciao/CCM_ProxyHomeRegistration.idl
-        * ciao/CCM_Receptacle.idl
-        * ciao/CCM_Session2Context.idl
-        * ciao/CCM_SessionSynchronization.idl
-        * ciao/CCM_StandardConfigurator.idl
-        * ciao/Client_init.cpp
-        * ciao/Components.idl
-        * ciao/Cookies.h
-        * ciao/CosPersistentState.idl
-        * ciao/Deployment.idl
-        * ciao/Deployment_Application.idl
-        * ciao/Deployment_Base.idl
-        * ciao/Deployment_Connection.idl
-        * ciao/Deployment_Core.idl
-        * ciao/Deployment_Data.idl
-        * ciao/Deployment_TargetData.idl
-        * ciao/DomainApplicationManager.idl
-        * ciao/Home_Servant_Impl_Base.h
-        * ciao/NodeApplicationManager.idl
-        * ciao/NodeManager.idl
-        * ciao/Servant_Impl_Base.h
-        * ciao/Servant_Impl_T.cpp
-        * ciao/Server_init.cpp
-        * ciao/StandardConfigurator_Impl.h
-        * ciao/SwapExec.idl
-        * ciao/Swapping_Servant_Home_Impl_Base.h
-        * ciao/Target_Data.idl
-        * ciao/TargetManager.idl
-        * ciao/UpgradeableContext.idl
-          Splitted the huge idl files into smaller parts. The CCM files are almost done,
-          the Deployment files do need some more iterations to get smaller files that
-          contain an interface with the types they need. This way the linker can optimize
-          objects out during a static compilation
-
-        * ciao/CIAO_Value.idl:
-        * ciao/Container_Base.pidl:
-          Removed, not used at all
-
-        * ciao/ComponentsC.h:
-        * ciao/ComponentsS.h:
-          Removed, will be generated by tao_idl
-
-        * DAnCE/Interfaces/NodeManagerDaemon.idl
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
-        * DAnCE/NodeManager/MonitorController.h
-        * DAnCE/TargetManager/CmpClient.cpp
-        * DAnCE/TargetManager/DomainDataManager.h
-        * DAnCE/TargetManager/DomainEvents.idl
-        * DAnCE/TargetManager/TargetManager.cidl
-        * DAnCE/TargetManager/TargetManager.mpc
-        * tools/Config_Handlers/DD_Handler.cpp
-        * tools/Config_Handlers/DnC_Dump.h
-        * examples/Hello/Sender/starter.cpp
-          Updated because of rename above
-
-        * DAnCE/TargetManager/TargetManager.idl:
-          Renamed to TargetManagerImpl.idl, this is the interface
-          it contains.
-
-        * DAnCE/NodeApplication/Container_Impl.cpp
-        * DAnCE/NodeApplication/Container_Impl.h
-          Removed get_homes(), it is not in the base idl
-
-        * examples/Display/Display_Base/Display_Base.mpc
-        * examples/Display/GPS/GPS.mpc
-        * examples/Display/NavDisplay/NavDisplay.mpc
-        * examples/Display/RateGen/RateGen.mpc
-        * RACE/common/RACE_common.mpc
-        * RACE/Input_Adapters/Base/Input_Adapter.mpc
-        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
-        * RACE/Output_Adapters/Base/Output_Adapter.mpc
-        * RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
-        * RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
-        * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
-        * RACE/Planner_Manager/Component/Planner_Manager.mpc
-        * RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
-        * RACE/Planners/Base/Planner.mpc
-        * RACE/Planners/Interface/Planner_Interface.mpc
-        * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
-        * tests/IDL3/ImpliedIDL/All/all.mpc
-        * tests/IDL3/Lookup/lookup_test.mpc
-        * tests/Minimum/Minimum_Base/Minimum.mpc
-        * tests/Minimum/Receiver/Receiver.mpc
-        * tests/Minimum/Sender/Sender.mpc
-          Simplified these mpc files, the -GT option is not added by
-          orbsvcslib anymore and -Sc is deprecated
-
-        * tests/IDL3/Events/Any/main.cpp:
-        * tests/IDL3/Events/Any/README:
-        * tests/IDL3/Events/Any/run_test.pl:
-          Updated this test to reproduce a problem with valuetype
-          insertion into an any. This test will now fail until
-          Jeff Parsons commits some idl compiler changes
-
-Mon Nov 20 08:16:34 2006  Simon McQueen  <sm@prismtech.com>
-
-        * CIAO version 0.5.4 released.
 
 Local Variables:
 mode: change-log
 add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
 indent-tabs-mode: nil
 End:
-
diff --git a/CIAO/ChangeLogs/ChangeLog-07a b/CIAO/ChangeLogs/ChangeLog-07a
new file mode 100644
index 00000000000..613da3f1e4c
--- /dev/null
+++ b/CIAO/ChangeLogs/ChangeLog-07a
@@ -0,0 +1,1122 @@
+Mon Jan 22 23:14:56 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * CIAO version 0.5.5 released.
+
+Thu Jan 18 17:49:00 UTC 2007    Gan Deng <gan.deng@vanderbilt.edu>
+
+        * docs/index.html:
+        
+          Fixed broken links to doxygen.
+
+Wed Jan 10 21:35:25 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * NEWS:
+
+          Updated with my changes since 0.5.4.
+
+Tue Jan  8 20:01:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * RACE/common/RACE_common.idl:
+          Use the CORBA::StringSeq to reduce footprint
+
+Tue Jan  8 19:43:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_CCMException.idl:
+        * ciao/CCM_Context.idl:
+          Added some commented out IDL that is part of the QoS4CCM spec
+
+Sun Jan  7 18:44:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeApplicationManager/URL_Parser.cpp:
+          No need to set members to 0 in destructor
+
+        * DAnCE/RepositoryManager/URL_Parser.cpp:
+          Fixed conversion warning and memory leak
+
+Sun Jan  7 12:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_ClientContainerInterceptor.idl:
+        * ciao/CCM_ClientContainerInterceptorRegistration.idl:
+        * ciao/CCM_ContainerClientRequestInfo.idl:
+        * ciao/CCM_ContainerInterceptor.idl:
+        * ciao/CCM_ContainerRequestInfo.idl:
+        * ciao/CCM_ContainerServantRequestInfo.idl:
+        * ciao/CCM_ContainerServerRequestInfo.idl:
+        * ciao/CCM_ContainerStubRequestInfo.idl:
+        * ciao/CCM_ExtensionComponent.idl:
+        * ciao/CCM_ExtensionContext.idl:
+        * ciao/CCM_InvalidRegistration.idl:
+        * ciao/CCM_QoS.idl:
+        * ciao/CCM_ServantContainerInterceptor.idl:
+        * ciao/CCM_ServantContainerInterceptorRegistration.idl:
+        * ciao/CCM_ServerContainerInterceptor.idl:
+        * ciao/CCM_ServerContainerInterceptorRegistration.idl:
+        * ciao/CCM_StubContainerInterceptor.idl:
+        * ciao/CCM_StubContainerInterceptorRegistration.idl:
+          Added interfaces from QoS for CCM spec (OMG 06-04-15). We
+          don't have an implementation yet, just the interfaces at
+          this moment
+
+Fri Jan  5 12:14:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/RepositoryManager/RepositoryManager.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+          Fixed conversion warnings
+
+        * DAnCE/RepositoryManager/PC_Updater.cpp:
+        * DAnCE/RepositoryManager/RMadmin.cpp:
+        * DAnCE/RepositoryManager/URL_Parser.cpp:
+          Improved layout and documentation
+
+Wed Jan  3 19:32:05 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * CIAO_TAO_DAnCE.mwc:
+
+          Added $(ACE_ROOT)/contrib/minizip since the RepositoryManager can
+          use minizip if the zlib feature is enabled.
+
+Wed Jan  3 07:01:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/RepositoryManager/RepositoryManager.cpp:
+          Fixed conversion warnings
+
+        * DAnCE/RepositoryManager/URL_Parser.cpp:
+          Initialise pointer with 0
+
+Wed Jan  3 16:18:36 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tools/IDL3_to_IDL2/IDL3_to_IDL2.mpc:
+
+          Use the install base project instead of the deprecated core base
+          project.
+
+Thu Dec 28 12:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+          Doxygen improvements
+
+Mon Dec 25 16:19:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * Merry Christmas everyone!!!
+
+Wed Dec 20 06:37:27 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * MPC/config/ciao_rtevent_dnc.mpb:
+        * MPC/config/ciao_events_dnc.mpb:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
+        * ciao/CCM_Core.mpc:
+
+          Fixed linking errors on OS X.
+
+Wed Dec 13 08:35:48 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp:
+
+          Fixed warnings on NoInterceptors_Core build related to
+          type conversion.
+
+Wed Dec 13 07:57:02 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+
+        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp:
+
+          Fixed a fuzz error.
+
+Wed Dec 13 07:29:10 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
+
+          Fixed Debian_GCC_4.0 compilation error by removing
+          unnecessary common for enum definition.
+
+Wed Dec 13 07:19:13 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+
+        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h:
+
+          Fixed a compilation error in Win2003_VC71_Versioned_Namespace
+          build by removing the unnecessary declaration.
+
+Wed Dec 13 06:45:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Swapping/Sender/Sender_exec.h:
+          Fixed include because of file name changes
+
+Tue Dec 12 20:55:02 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp:
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h:
+
+          Modified the ciao_push_event() in this base class to fix
+          BCC warnings.
+
+Tue Dec 12 20:21:03 UTC 2006    Gan Deng <gan.deng@vanderbilt.edu>
+
+        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h:
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
+
+          Fixed the fuzz errors.
+
+Tue Dec 12 20:15:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Component.idl:
+        * ciao/CCM_Core.mpc:
+        * ciao/CCM_EventBase.idl:
+        * ciao/CCM_EventConsumerBase.idl:
+        * ciao/CCM_HomeConfiguration.idl:
+        * ciao/CCM_HomeConfigurator.idl:
+        * ciao/CCM_Object.idl:
+        * ciao/CCM_PrimaryKeyBase.idl:
+        * ciao/CCM_SessionComponent.idl:
+        * ciao/CCM_StateIdFactory.idl:
+        * ciao/Servant_Impl_Base.h:
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl:
+        * DAnCE/TargetManager/DomainEvents.idl:
+          Added remarks about compliance and another set of splitting
+          idl files in smaller ones
+
+        * ciao/CCM_Event.idl:
+        * ciao/CCM_Events.idl:
+          Renamed Event to Events
+
+        * ciao/CCM_HomeConfigurator.idl:
+        * ciao/CCM_HomeConfiguration.idl:
+          Renamed Configurator to Configuration
+
+Tue Dec 12 14:48:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Base.idl:
+        * ciao/CCM_CCM2Context.idl:
+        * ciao/CCM_ComponentId.idl:
+        * ciao/CCM_Configurator.idl:
+        * ciao/CCM_Container.idl:
+        * ciao/CCM_Container_Ex.idl:
+        * ciao/CCM_Core.mpc:
+        * ciao/CCM_Entity2Context.idl:
+        * ciao/CCM_Event.idl:
+        * ciao/CCM_ExecutorLocator.idl:
+        * ciao/CCM_HomeConfigurator.idl:
+        * ciao/CCM_SessionComponent.idl:
+        * ciao/CCM_SessionContext.idl:
+        * ciao/CCM_StandardConfigurator.idl:
+        * ciao/CCM_StateIdFactory.idl:
+        * ciao/Deployment_NodeApplication.idl:
+          Moved more interfaces to their own file
+
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
+          Removed virtual keywords, not needed
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+          Const changes and improved some messages
+
+        * DAnCE/Plan_Generator/PCVisitor.h:
+        * DAnCE/Plan_Generator/PCVisitorBase.h:
+          Doxygen changes
+
+        * tools/Config_Handlers/DynAny_Handler.mpc:
+          layout changes
+
+Tue Dec 12 10:08:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/taoidl3toidl2defaults.mpb:
+          Moved from TAO to here
+
+Mon Dec  11 20:55:39 UTC 2006  Gan Deng <gan.deng@vanderbilt.edu>
+
+        * ciao/CCM_Event.idl:
+
+          Modified the "ciao_push_event" operation to pass in "source_id",
+          which is used to identify the sources of the publisher ports to
+          support event filtering mechanism.
+
+        * ciao/Deployment_Events.idl:
+
+          Added new IDL definitions to support RTEC federation, such as
+          AddrServer, UDPSender, UPDReceiver, etc.
+
+        * ciao/Deployment_NodeApplication.idl:
+
+          Modified the "install_es" operation to install one service object
+          per invocation, instead of a sequence of objects.
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+        * DAnCE/NodeApplication/NodeApplication_Impl.h:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h:
+
+          Modified to accomodate the changes made above by adding only
+          one ciao event service object reference to the map.
+
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl:
+
+          Removed the inheritance relationship between Consumer_Config and
+          Supplier_Config object. The reason why it was there is because
+          of a tightly coupled design long time ago.
+
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp:
+        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h:
+
+          Added a virtual function "ciao_push_event" and provides a
+          default implementation, which is essentially a no_op impl.
+
+        * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp:
+        * ciaosvcs/Events/CIAO_EventService_Factory_impl.h:
+
+          Modified the factory method "create" by passing in the
+          string identifier for the service object.
+
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl:
+
+          Added new operations to create gateways object to support
+          event channel federations.
+
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h:
+        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc:
+        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp:
+        * ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h:
+
+          Added the implementation and MPC files to support event
+          channel federations in CIAO_Event_Service.
+
+        * CIDLC/ServantHeaderGenerator.cpp:
+        * CIDLC/ServantSourceGenerator.cpp:
+
+          Automatically generate the implementation code of
+          ciao_push_event for component in the servant code.
+
+        * DAnCE/NodeApplication/NodeApplication.cpp:
+
+          Explicitly add the init_svcs() operation to the
+          NA component server implementation. We should figure
+          out a way to see whether we can avoid doing this at
+          this level.
+
+        * DAnCE/NodeManager/Node_Manager.cpp:
+
+          Enhanced NM to pass in service configuration file explicitly.
+          Also fixed a bug about controlling ORBDebugLevel.
+
+        * docs/schema/CIAOEvents.xsd:
+
+          Enhanced the CIAOEvents schema to support event channel
+          federation configuration.
+
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp:
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
+        * tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp:
+
+          Config handlers enhancement to support the above
+          schema changes.
+
+        * DAnCE/tests/NodeApplicationTest/run_test.pl:
+        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
+        * DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
+
+          Modified to use environment variables instead of relative paths.
+
+        * examples/Hello/Sender/Sender_exec.cpp:
+        * examples/Hello/Receiver/Receiver_exec.cpp:
+
+          Modified to explicitly print out the contents of the received msgs.
+
+        * examples/Hello/descriptors_events/ciao-events-example-collocated.ced:
+        * examples/Hello/descriptors_events/ciao-events-example-with-federation.ced:
+        * examples/Hello/descriptors_events/ciao-events-example-with-filters.ced:
+        * examples/Hello/descriptors_events/ciao-events-example.ced:
+        * examples/Hello/descriptors_events/ciao-events-federation-mcast.ced:
+        * examples/Hello/descriptors_events/ciao-events-federation-udp-collocated.ced:
+        * examples/Hello/descriptors_events/ciao-events-federation-udp-two-hosts.ced:
+        * examples/Hello/descriptors_events/ciao-events-federation-udp.ced:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_events_collocated.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_mcast.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_collocated.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_federation_udp_two_hosts.cdp:
+        * examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp:
+        * examples/Hello/descriptors_events/NodeManagerMap.dat:
+        * examples/Hello/descriptors_events/NodeManagerMapTwoHosts.dat:
+        * examples/Hello/descriptors_events/rtec.conf:
+        * examples/Hello/descriptors_events/run_NodeDaemons.pl:
+        * examples/Hello/descriptors_events/run_NodeDaemons_svc_conf.pl:
+        * examples/Hello/descriptors_events/run_NodeDaemons_with_ip.pl:
+
+          Added a bunch of test cases for CIAO Event Service.
+
+Fri Dec  8 22:59:14 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/tools.mwc:
+
+          Added IDL3_to_IDL2 directory to the list.
+
+Fri Dec  8 000:09:04 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * bin/generate_component_mpc.pl:
+
+          Another typo found by Abdullah Sowayan <abdullah.sowayan@lmco.com>.
+
+Thu Dec  7 20:22:57 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * bin/generate_component_mpc.pl:
+
+          Fixed bug that omits necessary space between items in 'after'
+          line, if it contains more than one item. Thanks to Abdullah
+          Sowayan <abdullah.sowayan@lmco.com> for reporting the bug.
+
+Thu Dec  7 19:15:04 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * bin/generate_component_mpc.pl:
+
+          Fixed typo, had 'ciao_server_dnc', should have been
+          'ciao_servant_dnc'. Thanks to Abdullah Sowayan
+          <abdullah.sowayan@lmco.com> for reporting the mistake.
+
+Thu Dec  7 19:04:38 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tools/Config_Handlers/DynAny_Handler.mpc:
+
+          Removed taolib and anytypecode base projects, since they are
+          already pulled in by typecodefactory.
+
+Thu Dec  7 13:47:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/DomainApplicationManager/Deployment_Configuration (init):
+          Use ACE_Read_Buffer to read the file and parse it contents. This way
+          we are independent of a fixed buffer length, especially on systems
+          with multiple network cards and IPv6 enabled the IORs can get huge.
+
+Thu Dec  7 11:48:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Core.mpc:
+        * MPC/config/ciao_server_dnc.mpb:
+          Don't build DnC server with minimum corba and CORBA/e, this was
+          disabled in the past implicitly because we used security as
+          MPC base project but because that has been removed we now
+          have to explicitly disable this project
+
+Thu Dec  7 11:34:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
+          Added some todo's, check whether the narrow on the NamingContext
+          did succeed, use CORBA::ULong for the sequence index
+
+        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
+          Use a CORBA::String_var to store the uuid string
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
+          Added some todo's, check whether the narrow on the NamingContext
+          did succeed, layout changes, fixed bugzilla bug 2729, thanks to Abdul
+          for reporting that.
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
+          Doxygen improvements
+
+Wed Dec  6 11:26:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CIAO_ServerResources.idl:
+        * ciao/Deployment_NodeApplicationManager.idl:
+        * DAnCE/NodeApplication/NodeApplication_Impl.h:
+        * DAnCE/NodeManager/MonitorCB.h:
+        * DAnCE/NodeManager/MonitorController.h:
+        * DAnCE/TargetManager/DomainDataManager.h:
+        * tools/Config_Handlers/DD_Handler.h:
+          Doxygen documentation updates
+
+        * MPC/config/ciao_container_dnc.mpb:
+        * ciao/CCM_Core.mpc:
+          Added avoids_corba_e_compact as base project
+
+Tue Dec  5 11:45:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Core.mpc:
+        * MPC/config/ciao_container_dnc.mpb:
+          Don't build Dnc_Container with corba/e compact has been enabled
+
+        * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc:
+          Simplified this MPC file
+
+Mon Dec  4 12:14:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/*:
+          All CIAO base projects are moved from
+          ACE_wrappers/bin/MakeProjectCreator/config to this directory
+
+Mon Dec  4 12:35:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/TargetManager/TM_Client.mpc:
+          Simplified this file using more base projects
+
+Mon Dec  4 12:29:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/TargetManager/DomainDataManager.h:
+          Documentation changes
+
+        * DAnCE/TargetManager/TargetManager.mpc:
+          Simplified this file using more base projects
+
+Mon Dec  4 12:24:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC
+        * MPC/config
+          New directory for the base projects specifically for CIAO
+
+Mon Dec  4 12:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
+          Use include from CIAO_ROOT and removed using namespace
+
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
+          Simplified this file
+
+Mon Dec  4 11:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/ExecutionManager/ExecutionManager.mpc:
+          Simplified by using the base projects
+
+Mon Dec  4 11:37:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          Converted the NodeApplication into a library and build
+          an exe using this library. Will prevent duplicate compilation
+          of part of the code. Fixes bugzilla bug 2739.
+
+        * DAnCE/NodeApplication/CIAO_NodeApplication_export.h:
+          New export file:
+
+        * DAnCE/NodeApplication/Configurator_Factory.h:
+        * DAnCE/NodeApplication/Container_Impl.h:
+        * DAnCE/NodeApplication/NodeApplication_Core.h:
+        * DAnCE/NodeApplication/NodeApplication_Impl.h:
+          Added export macro to export the class from the new NodeApplication
+          library.
+
+        * DAnCE/NodeApplication/NodeApplication.mpc:
+          Added new library project and use this in the executable.
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
+          Use the new NodeApplication library and the new base projects
+          I added for CIAO
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.{h,cpp,inl}:
+          Moved destructor from inline to cpp method and small code improvements
+
+        * DAnCE/NodeManager/NodeManager.mpc:
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
+          Simplified by using the new base projects
+
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+          Small improvements
+
+Mon Dec  4 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO-INSTALL.html:
+          Updated build instructions
+
+        * ciao/Dynamic_Component_Activator.cpp:
+          Removed not needed return statements in a void method
+
+        * ciao/Dynamic_Component_Activator.h:
+          Changed guard in file to match filename
+
+        * ciao/Home_Servant_Impl_T.cpp:
+          Layout changes
+
+        * ciao/Port_Activator.{h,cpp}:
+          The name methods did really change oid, so renamed name
+          to oid and added a new name method to return the name
+          member
+
+        * ciao/Servant_Activator.cpp:
+          Const changes and updated for Port Activator changes
+
+        * ciao/Servant_Impl_Base.cpp:
+          Small code improvements
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+          Const changes
+
+        * DAnCE/NodeApplication/Container_Impl.cpp:
+        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
+          Throw NO_MEMORY when allocation fails
+
+        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
+          Throw BAD_PARAM when an incorrect method parameter has been passed
+
+        * DAnCE/NodeManager/BaseMonitor.h:
+        * DAnCE/NodeManager/CIAO_Monitor.h:
+        * DAnCE/NodeManager/NodeManager_Impl.h:
+          Doxygen changes
+
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+          Fixed a comment
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
+          Use true/false for bool
+
+        * DAnCE/TargetManager/DomainDataManager.cpp:
+          Layout changes
+
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Removed not needed includes, made messages dependent
+          on the debug level, added missing duplicate
+
+        * DAnCE/TargetManager/TargetManager_exec.h:
+          Don't use std:: for auto_ptr
+
+        * DAnCE/TargetManager/TargetManagerExt.idl:
+          Removed commented out include
+
+        * DAnCE/TargetManager/TargetManagerImpl.idl:
+          Removed empty lines
+
+        * DAnCE/tests/NodeApplicationTest/run_test.pl:
+        * DAnCE/tests/NodeApplicationTest/run_test_ex.pl:
+        * DAnCE/tests/NodeApplicationTest/run_test_simple.pl:
+        * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl:
+        * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl:
+        * examples/Display/descriptors/basicNodeDaemon.pl:
+        * examples/Display/descriptors/run_NodeDaemons.pl:
+        * examples/Hello/descriptors/run_NodeDaemons.pl:
+          Use $ACE_ROOT/bin with use lib. This fixes bugzilla bug 2737,
+          thanks for Abdul for reporting this.
+
+        * docs/tutorials/Quoter/Simple/01.html:
+          Update from Abdul
+
+Fri Dec  1 16:27:34 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * bin/generate_component_mpc.pl:
+
+          Fixed generation of export files. Thanks to Abdullah
+          Sowayan <abdullah.sowayan@lmco.com> for reporting
+          the problem.
+
+Fri Dec  1 13:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/tutorials/CoSMIC/index.html:
+        * docs/tutorials/Quoter/Simple/index.html:
+          Updated download location of ACE/TAO/CIAO
+
+Fri Dec  1 11:26:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/ExecutionManager/Execution_Manager.cpp:
+          Fixed invalid check whether we have a nil POA or not
+
+Fri Dec  1 11:17:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/TargetManager/Deployment_Configuration.{h,cpp}:
+          Removed these files, not used in the mpc file
+
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.{h,cpp}:
+          Close the file handle, part of the fix for bugzilla bug 2733
+
+        * DAnCE/TargetManager/DomainDataManager.{h,cpp}:
+          Const changes, sequences have a CORBA::ULong as length, not int.
+          Added some todo's and use a little bit more ACE
+
+        * DAnCE/TargetManager/TargetManager.cidl:
+          Removed empty line
+
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Fixed memory management and the way we check for a nil
+          reference
+
+Fri Dec  1 09:01:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_component_mpc.pl:
+          Layout improvements, thanks to Abdul for making this
+          update.
+
+Thu Nov 30 12:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/ExecutionManager/Execution_Manager.cpp:
+          Removed not needed ACE_TRY_CHECK
+
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp:
+        * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
+          Const improvement
+
+        * DAnCE/RepositoryManager/RepositoryManager.cpp:
+          Initialise pointer with 0, removed code after return
+          added added a todo
+
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
+          Doxygen improvement
+
+        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp:
+          Lot of layout changes to make the code a little bit more
+          readable, more has to be done to this file
+
+        * DAnCE/RepositoryManager/ZIP_Wrapper.h:
+          Doyxgen improvements and removed not needed include
+
+        * DAnCE/TargetManager/CmpClient.cpp:
+          Use true/false for a bool
+
+        * DAnCE/TargetManager/Deployment_Configuration.cpp:
+          Use bool and use 0 instead of NULL
+
+        * DAnCE/TargetManager/DomainDataManager.h:
+          Doxygen changes
+
+        * DAnCE/TargetManager/DomainEvents.idl:
+          Removed not needed include
+
+        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          Layout changes
+
+        * DAnCE/TargetManager/TM_Client.mpc:
+          Removed not needed includes
+
+Wed Nov 29 21:26:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * docs/generate_component_mpc.html:
+
+          New file, documentation for the Perl script
+          generate_component_mpc.pl, in CIAO_ROOT/bin.
+
+        * bin/generate_component_mpc.pl:
+
+          Changes mainly to correct problems with MPC files
+          generated for non-component builds, i.e., from some IDL
+          file used in common by multiple component builds, such
+          as the definition of a port interface. Also made changes
+          and added a new command line option to help minimize the
+          amount of code generated from IDL and minimize the
+          dependencies of the generated makefile or project.
+
+Wed Nov 29 15:43:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+          Don't use plain new, fixes bugzilla bug 2732. Thanks to Abdul
+          for reporting this
+
+Wed Nov 29 12:48:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/*.idl:
+          Added ciao/ as prefix to the include path. This way it is clear
+          where we are including a file from.
+
+Tue Nov 28 21:38:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/RTNodeApplication:
+          Zapped, not used anymore
+
+Tue Nov 28 19:33:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment_DomainApplicationManager.idl:
+          Added comments about more details which are not compliant according
+          to the spec
+
+        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
+          Use native bool instead of int
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h:
+          Reordered includes and improved doxygen documentation
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+          Const changes, use ACE_ERROR for error messages
+
+        * DAnCE/NodeManager/CIAO_Monitor.cpp:
+          Const changes, use more ACE and little cleanup
+
+        * DAnCE/NodeManager/CIAO_Monitor.h:
+          Doxygen improvement
+
+        * DAnCE/NodeManager/MonitorCB.cpp:
+          Code layout changes
+
+        * DAnCE/NodeManager/MonitorCB.h:
+          Doxygen changes and added some todo's
+
+        * DAnCE/NodeManager/MonitorController.cpp:
+          Use bool and small improvements
+
+        * DAnCE/NodeManager/Node_Manager.cpp:
+          Use the correct value for the lenght of the buffer passed
+          to hostname
+
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+          Small improvements and added some todo's
+
+        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
+          Cleanup
+
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
+          Made some debug lines dependent on a debug level
+
+Tue Nov 28 16:11:32 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+        * DAnCE/NodeManager/Monitor.mpc
+
+          Fixes for link errors in OS X.
+
+Tue Nov 28 11:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIDLC/ExecutorMappingGenerator.cpp:
+          Updated because of idl file rename
+
+Tue Nov 28 10:42:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/*:
+        * *:
+          Renamed a lot of idl files, if the file contains interfaces/types
+          from the DAnCE spec, added Deployment_ as prefix, if they are
+          containing CIAO specific interfaces, added CIAO_. This way we can
+          more easily see if we have spec compliant IDL or not.
+
+Tue Nov 28 09:50:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Home.idl:
+        * ciao/CCM_Object.idl:
+          Moved CCMHome again to its own file
+
+        * ciao/Security.idl:
+          CIAO uses an interface of the security service but we don't
+          do a thing with it, so just define a local interface within
+          CIAO and use that for the moment, saves 250Kb of footprint
+
+        * ciao/CCM_Context.idl:
+          Use the local security interface
+
+        * ciao/ExectionManager.idl:
+          Added todo
+
+        * ciao/CCM_Core.idl:
+          Added new file
+
+Mon Nov 27 18:34:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/NodeApplicationManager.idl:
+        * ciao/Deployment_ApplicationManager.idl:
+          Moved ApplicationManager interface to its own file
+
+        * ciao/CCM_Core.mpc:
+          Added new file
+
+        * ciao/DomainApplicationManager.idl:
+        * ciao/TargetManager.idl:
+          Updated includes
+
+        * ciao/Target_Data.idl:
+          Moved ResourceNotAvailable also to the new
+          Deyloyment_ApplicationManger file
+
+        * DAnCE/NodeManager/CIAO_Monitor.h:
+          Removed include of memory, not portable and not used.
+          Fixes bugzilla bug 2730. Thanks to Abdul for reporting
+          this.
+
+Mon Nov 27 15:41:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment_Core.idl:
+        * ciao/Deployment_Container.idl:
+        * ciao/Deployment_NodeApplication.idl:
+          Moved types from Core to the other files and added remarks
+          to all CIAO specific types
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.h:
+        * DAnCE/NodeApplicationManager/ImplementationInfo.h:
+          Updated includes because of the move above
+
+Mon Nov 27 14:55:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Core.mpc:
+          Added new Deployment_DeploymentPlan
+
+        * ciao/Deployment_Data.idl
+        * ciao/Deployment_DeploymentPlan.idl:
+          Moved types related to DeploymentPlan to their own file
+
+        * ciao/Deployment_Data.idl
+          Removed RequirementSatisfier, it is superfluous.
+
+        * ciao/Deployment.idl:
+          No need to include Deployment_Data
+
+        * ciao/Target_Data.idl:
+          Removed not needed include
+
+        * ciao/Deployment_Connection.idl:
+        * ciao/TargetManager.idl:
+        * RACE/Output_Adapters/Interface/PlanEgress.idl:
+        * RACE/Plan_Analyzer/Interface/PlanIngress.idl:
+        * RACE/Planner_Manager/Interface/Planner_Manager_I.idl:
+        * RACE/Planners/Interface/Planner_I.idl:
+          Updated include because of move above
+
+        * tools/Config_Handlers/DnC_Dump.{h,cpp}:
+          Removed RequirementSatisfier
+
+Mon Nov 27 14:11:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment.idl:
+          Removed LastConfiguration, it is not used and has been zapped
+          from the DAnCE spec
+
+Mon Nov 27 14:04:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment_Core.idl:
+        * ciao/Deployment_NodeApplication.idl:
+          Moved ESInstallationInfo to NodeApplication file
+
+        * ciao/Deployment.idl:
+          LastConfiguration doesn't seem used, added a comment to that
+          exception.
+
+        * ciao/NodeApplicationManager.idl:
+          Doxygen improvement
+
+Mon Nov 27 13:23:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/NodeApplicationManager.idl:
+          Doxygen improvement
+
+        * ciao/Deployment_Core.idl:
+          Removed InvalidLocation exception, not used and not in the DAnCE
+          spec
+
+Mon Nov 27 13:10:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment_Core.idl
+        * ciao/Deployment_Container.idl
+        * ciao/Deployment_NodeApplication.idl
+          Moved some interfaces from Core to their own files
+
+        * ciao/CCM_Core.mpc:
+          Updated because of split above and added some more flags to
+          reduce the amount of generated files
+
+        * ciao/DomainApplicationManager.idl:
+        * ciao/NodeApplication_CallBack.idl
+          Updated include
+
+        * DAnCE/NodeApplication/Container_Impl.h:
+        * DAnCENodeApplication/NodeApplication_Impl.h:
+        * DAnCEtests/NodeApplicationTest/NodeApp_test_client.cpp:
+        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp:
+        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
+        * DAnCEtests/NodeApplicationTest/NodeApp_test_client_simple.cpp:
+          Updated includes because of refactoring above
+
+Mon Nov 27 09:40:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+          Instead of the http files in this library, use the HTTP
+          classes from the TAO lib
+
+        * DAnCE/RepositoryManager/HTTP_Client.cpp
+        * DAnCE/RepositoryManager/HTTP_Client.h
+        * DAnCE/RepositoryManager/HTTP_Handler.cpp
+        * DAnCE/RepositoryManager/HTTP_Handler.h
+          Removed, not needed anymore, these files did move to the TAO
+          lib to support http:// ior and we are reusing them now in
+          CIAO
+
+        * DAnCE/RepositoryManager/RepositoryManager.mpc
+          Removed the files above
+
+Mon Nov 27 09:36:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
+          Instead of the http files in this library, use the HTTP
+          classes from the TAO lib
+
+        * DAnCE/NodeApplicationManager/URL_Parser.h:
+          Doxygen improvements
+
+        * DAnCE/NodeApplicationManager/HTTP_Client.cpp:
+        * DAnCE/NodeApplicationManager/HTTP_Client.h:
+        * DAnCE/NodeApplicationManager/HTTP_Handler.cpp:
+        * DAnCE/NodeApplicationManager/HTTP_Handler.h:
+          Removed, not needed anymore, these files did move to the TAO
+          lib to support http:// ior and we are reusing them now in
+          CIAO
+
+        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
+          Removed the files above
+
+Mon Nov 27 09:33:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeManager/NodeManager_Impl.cpp:
+          Removed include of errno.h. It is not portable, but it seems
+          it isn't needed at all. Thanks to Abdul for reporting this,
+          this fixes bugzilla bug 2726.
+
+Mon Nov 27 08:59:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/tutorials/Quoter:
+          Extended this tutorial with more documentations. Thanks to
+          Abdul for delivering these files. This fixes bugzilla 2717
+
+Fri Nov 24 13:59:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp:
+          Added check whether we got a valid NodeImplementationInfo back
+          and not a nill pointer. Fixes bugzilla bug 2692 finally.
+          Thanks to Abdul for pointing out the need for this check
+
+Fri Nov 24 09:41:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Benchmark/Multi_Threaded/Multi_Threaded.mpc:
+          Don't build this project in ace_for_tao configuration
+
+Thu Nov 23 12:34:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Home.idl:
+        * ciao/CCM_Object.idl:
+          Moved CCMHome again to its own file now the idl compiler has
+          been fixed to handle this correctly
+
+Wed Nov 22 20:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Dynamic_Component_Servant_Base.h:
+          Removed the character c from the first line which drove the
+          compilers really crazy
+
+Wed Nov 22 19:31:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Home.idl:
+        * ciao/CCM_Object.idl:
+          Moved CCMHome to CCMObject, when these are in seperate files
+          the generated code for components is not correct. We want to have
+          these interfaces in seperate files but we can sort out this
+          later.
+
+Wed Nov 22 14:45:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Dynamic_Component_Servant_Base.h:
+          Fixed pragme once warning
+
+Wed Nov 22 11:05:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/CCM_Base.idl
+        * ciao/CCM_CCM2Context.idl
+        * ciao/CCM_CCMException.idl
+        * ciao/CCM_Component.idl
+        * ciao/CCM_Configurator.idl
+        * ciao/CCM_Container.idl
+        * ciao/CCM_Container_Ex.idl
+        * ciao/CCM_Context.idl
+        * ciao/CCM_Cookie.idl
+        * ciao/CCM_Core.mpc
+        * ciao/CCM_EnterpriseComponent.idl
+        * ciao/CCM_EntityComponent.idl
+        * ciao/CCM_EntityContext.idl
+        * ciao/CCM_Enumeration.idl
+        * ciao/CCM_Event.idl
+        * ciao/CCM_Home.idl
+        * ciao/CCM_HomeConfigurator.idl
+        * ciao/CCM_HomeExecutorBase.idl
+        * ciao/CCM_HomeFinder.idl
+        * ciao/CCM_HomeRegistration.idl
+        * ciao/CCM_KeylessCCMHome.idl
+        * ciao/CCM_Navigation.idl
+        * ciao/CCM_Object.idl
+        * ciao/CCM_ProxyHomeRegistration.idl
+        * ciao/CCM_Receptacle.idl
+        * ciao/CCM_Session2Context.idl
+        * ciao/CCM_SessionSynchronization.idl
+        * ciao/CCM_StandardConfigurator.idl
+        * ciao/Client_init.cpp
+        * ciao/Components.idl
+        * ciao/Cookies.h
+        * ciao/CosPersistentState.idl
+        * ciao/Deployment.idl
+        * ciao/Deployment_Application.idl
+        * ciao/Deployment_Base.idl
+        * ciao/Deployment_Connection.idl
+        * ciao/Deployment_Core.idl
+        * ciao/Deployment_Data.idl
+        * ciao/Deployment_TargetData.idl
+        * ciao/DomainApplicationManager.idl
+        * ciao/Home_Servant_Impl_Base.h
+        * ciao/NodeApplicationManager.idl
+        * ciao/NodeManager.idl
+        * ciao/Servant_Impl_Base.h
+        * ciao/Servant_Impl_T.cpp
+        * ciao/Server_init.cpp
+        * ciao/StandardConfigurator_Impl.h
+        * ciao/SwapExec.idl
+        * ciao/Swapping_Servant_Home_Impl_Base.h
+        * ciao/Target_Data.idl
+        * ciao/TargetManager.idl
+        * ciao/UpgradeableContext.idl
+          Splitted the huge idl files into smaller parts. The CCM files are almost done,
+          the Deployment files do need some more iterations to get smaller files that
+          contain an interface with the types they need. This way the linker can optimize
+          objects out during a static compilation
+
+        * ciao/CIAO_Value.idl:
+        * ciao/Container_Base.pidl:
+          Removed, not used at all
+
+        * ciao/ComponentsC.h:
+        * ciao/ComponentsS.h:
+          Removed, will be generated by tao_idl
+
+        * DAnCE/Interfaces/NodeManagerDaemon.idl
+        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
+        * DAnCE/NodeManager/MonitorController.h
+        * DAnCE/TargetManager/CmpClient.cpp
+        * DAnCE/TargetManager/DomainDataManager.h
+        * DAnCE/TargetManager/DomainEvents.idl
+        * DAnCE/TargetManager/TargetManager.cidl
+        * DAnCE/TargetManager/TargetManager.mpc
+        * tools/Config_Handlers/DD_Handler.cpp
+        * tools/Config_Handlers/DnC_Dump.h
+        * examples/Hello/Sender/starter.cpp
+          Updated because of rename above
+
+        * DAnCE/TargetManager/TargetManager.idl:
+          Renamed to TargetManagerImpl.idl, this is the interface
+          it contains.
+
+        * DAnCE/NodeApplication/Container_Impl.cpp
+        * DAnCE/NodeApplication/Container_Impl.h
+          Removed get_homes(), it is not in the base idl
+
+        * examples/Display/Display_Base/Display_Base.mpc
+        * examples/Display/GPS/GPS.mpc
+        * examples/Display/NavDisplay/NavDisplay.mpc
+        * examples/Display/RateGen/RateGen.mpc
+        * RACE/common/RACE_common.mpc
+        * RACE/Input_Adapters/Base/Input_Adapter.mpc
+        * RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
+        * RACE/Output_Adapters/Base/Output_Adapter.mpc
+        * RACE/Output_Adapters/Interface/Output_Adapter_Interface.mpc
+        * RACE/Plan_Analyzer/Component/Plan_Analyzer.mpc
+        * RACE/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
+        * RACE/Planner_Manager/Component/Planner_Manager.mpc
+        * RACE/Planner_Manager/Interface/Planner_Manager_Interface.mpc
+        * RACE/Planners/Base/Planner.mpc
+        * RACE/Planners/Interface/Planner_Interface.mpc
+        * RACE/Planners/SimpleBinPacker/SimpleBinPacker.mpc
+        * tests/IDL3/ImpliedIDL/All/all.mpc
+        * tests/IDL3/Lookup/lookup_test.mpc
+        * tests/Minimum/Minimum_Base/Minimum.mpc
+        * tests/Minimum/Receiver/Receiver.mpc
+        * tests/Minimum/Sender/Sender.mpc
+          Simplified these mpc files, the -GT option is not added by
+          orbsvcslib anymore and -Sc is deprecated
+
+        * tests/IDL3/Events/Any/main.cpp:
+        * tests/IDL3/Events/Any/README:
+        * tests/IDL3/Events/Any/run_test.pl:
+          Updated this test to reproduce a problem with valuetype
+          insertion into an any. This test will now fail until
+          Jeff Parsons commits some idl compiler changes
+
+Mon Nov 20 08:16:34 2006  Simon McQueen  <sm@prismtech.com>
+
+        * CIAO version 0.5.4 released.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
+
diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
index 5f6e141f48f..83775494498 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
@@ -45,7 +45,7 @@ CIAO::Deployment_Configuration::init (const char *filename)
   char* string = 0;
 
   // Read from the file line by line
-  while ((string = reader.read ('\n', '\0')) != 0)
+  while ((string = reader.read ('\n')) != 0)
     {
       // Search from the right to the first space
       const char* ior_start = ACE_OS::strrchr (string, ' ');
@@ -54,7 +54,7 @@ CIAO::Deployment_Configuration::init (const char *filename)
       // The destination is first followed by some spaces
       ACE_CString destination (string, dest_end - string);
       // And then the IOR
-      ACE_CString ior (ior_start + 1, ACE_OS::strlen (ior_start + 1) - 1);
+      ACE_CString ior (ior_start + 1,  ACE_OS::strlen (ior_start + 1));
       if (this->deployment_info_.bind (destination.c_str (), ior.c_str ()) != 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -113,11 +113,10 @@ CIAO::Deployment_Configuration::get_default_node_manager_ior (void) const
 }
 
 ::Deployment::NodeManager_ptr
-CIAO::Deployment_Configuration::get_node_manager (const char *name
-                                                  ACE_ENV_ARG_DECL)
+CIAO::Deployment_Configuration::get_node_manager (const char *name)
 {
   if (name == 0)
-    return get_default_node_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return get_default_node_manager ();
 
   ACE_Hash_Map_Entry
     <ACE_CString,
@@ -135,44 +134,35 @@ CIAO::Deployment_Configuration::get_node_manager (const char *name
 
   if (CORBA::is_nil (entry->int_id_.node_manager_.in ()))
     {
-      ACE_TRY
+      try
         {
           CORBA::Object_var temp = this->orb_->string_to_object
-                                   (entry->int_id_.IOR_.c_str ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                   (entry->int_id_.IOR_.c_str ());
 
           entry->int_id_.node_manager_ =
-            ::Deployment::NodeManager::_narrow (temp.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+            ::Deployment::NodeManager::_narrow (temp.in ());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           ACE_ERROR ((LM_ERROR, "DANCE (%P|%t) Deployment_Configuration.cpp: "
                       "Error while contacting NodeManager %s\n", name));
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
   return ::Deployment::NodeManager::_duplicate
     (entry->int_id_.node_manager_.in ());
 }
 
 ::Deployment::NodeManager_ptr
-CIAO::Deployment_Configuration::get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::Deployment_Configuration::get_default_node_manager ()
 {
   if (CORBA::is_nil (this->default_node_manager_.node_manager_.in ()))
     {
       CORBA::Object_var temp = this->orb_->string_to_object
-        (this->default_node_manager_.IOR_.c_str ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        (this->default_node_manager_.IOR_.c_str ());
 
       this->default_node_manager_.node_manager_ =
-        ::Deployment::NodeManager::_narrow (temp.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        ::Deployment::NodeManager::_narrow (temp.in ());
     }
   return ::Deployment::NodeManager::_duplicate
     (this->default_node_manager_.node_manager_.in ());
diff --git a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
index 16b2edc85f4..af17d4357ed 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
+++ b/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
@@ -98,8 +98,7 @@ namespace CIAO
      * @retval nil if no valid name were found.
      */
     ::Deployment::NodeManager_ptr
-    get_node_manager (const char *name
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    get_node_manager (const char *name);
 
     /**
      * Return the reference to the default NodeManager the
@@ -109,7 +108,7 @@ namespace CIAO
      * @retval nil if no valid daemon is configured.
      */
     ::Deployment::NodeManager_ptr
-    get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    get_default_node_manager ();
 
   protected:
     CORBA::ORB_var orb_;
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 2ccae73ade2..89dd9a3179e 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -40,7 +40,6 @@ DomainApplicationManager_Impl (CORBA::ORB_ptr orb,
     is_redeployment_ (false),
     esd_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_NEW_THROW_EX (this->all_connections_,
                     Deployment::Connections (),
                     CORBA::NO_MEMORY ());
@@ -48,12 +47,10 @@ DomainApplicationManager_Impl (CORBA::ORB_ptr orb,
   ACE_NEW_THROW_EX (this->shared_,
                     Deployment::ComponentPlans (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   ACE_NEW_THROW_EX (this->esd_,
                     CIAO::DAnCE::EventServiceDeploymentDescriptions (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < this->plan_.infoProperty.length (); ++i)
     {
@@ -77,16 +74,13 @@ CIAO::DomainApplicationManager_Impl::~DomainApplicationManager_Impl ()
 }
 
 Deployment::NodeApplication_ptr
-CIAO::DomainApplicationManager_Impl::
-get_node_app (const char * node_name)
-  ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Deployment::NoSuchName))
+CIAO::DomainApplicationManager_Impl::get_node_app (const char * node_name)
+  ACE_THROW_SPEC ((::CORBA::SystemException, ::Deployment::NoSuchName))
 {
   // Get the NodeApplication object reference.
   ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
 
-  if (this->artifact_map_.find (node_name,
-                                entry) != 0)
+  if (this->artifact_map_.find (node_name, entry) != 0)
     {
       ACE_ERROR ((LM_ERROR,
                   "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
@@ -94,7 +88,7 @@ get_node_app (const char * node_name)
                   "ERROR while finding the node application "
                   "for the node [%s] \n",
                   node_name));
-      ACE_THROW (Deployment::NoSuchName ());
+      throw Deployment::NoSuchName ();
     }
 
   return
@@ -103,14 +97,13 @@ get_node_app (const char * node_name)
 }
 
 void
-CIAO::DomainApplicationManager_Impl::
-init (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::DomainApplicationManager_Impl::init ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::ResourceNotAvailable,
                    Deployment::StartError,
                    Deployment::PlanError))
 {
-  ACE_TRY
+  try
     {
 
       //Deployment::DnC_Dump::dump (this->plan_);
@@ -146,7 +139,7 @@ init (ACE_ENV_SINGLE_ARG_DECL)
                       "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
                       "CIAO::DomainApplicationManager_Impl::init -"
                       "ERROR while calling get_plan_info () \n"));
-          ACE_TRY_THROW (Deployment::PlanError ());
+          throw Deployment::PlanError ();
         }
 
       // Call split_plan()
@@ -156,7 +149,7 @@ init (ACE_ENV_SINGLE_ARG_DECL)
                       "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
                       "CIAO::DomainApplicationManager_Impl::init -"
                       "ERROR while calling split_plan () \n"));
-          ACE_TRY_THROW (Deployment::PlanError ());
+          throw Deployment::PlanError ();
         }
 
       // Invoke preparePlan on each NodeManager by giving child plan.
@@ -179,7 +172,7 @@ init (ACE_ENV_SINGLE_ARG_DECL)
                           "ERROR while finding the node specific plan "
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
-              ACE_TRY_THROW (Deployment::PlanError ());
+              throw Deployment::PlanError ();
             }
 
           Chained_Artifacts & artifacts = entry->int_id_;
@@ -188,15 +181,11 @@ init (ACE_ENV_SINGLE_ARG_DECL)
           // corresponding child plan as input, which returns a
           // NodeApplicationManager object reference.
           Deployment::ApplicationManager_var tmp_app_manager =
-            my_node_manager->preparePlan (artifacts.child_plan_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            my_node_manager->preparePlan (artifacts.child_plan_.in ());
 
           Deployment::NodeApplicationManager_var app_manager =
             Deployment::NodeApplicationManager::_narrow
-              (tmp_app_manager.in ()
-               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              (tmp_app_manager.in ());
 
           if (CORBA::is_nil (app_manager.in ()))
             {
@@ -211,29 +200,24 @@ init (ACE_ENV_SINGLE_ARG_DECL)
                                  reference for NodeApplicationManager\n");
 
               ACE_DEBUG ((LM_DEBUG, error.c_str ()));
-              ACE_TRY_THROW
+              throw
                  (Deployment::StartError ("DomainApplicationManager_Impl:init",
                                           error.c_str ()));
             }
-          ACE_TRY_CHECK;
 
           // Cache the NodeApplicationManager object reference.
           artifacts.node_application_manager_ = app_manager._retn ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DomainApplicationManager_Impl::init\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("DomainApplicationManager_Impl::init\t\n");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 bool
-CIAO::DomainApplicationManager_Impl::
-get_plan_info (void)
+CIAO::DomainApplicationManager_Impl::get_plan_info (void)
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_plan_info");
 
@@ -328,8 +312,7 @@ get_plan_info (void)
 //@@ We should ask those spec writers to look at the code below, hopefully
 //   They will realize some thing.
 int
-CIAO::DomainApplicationManager_Impl::
-split_plan (void)
+CIAO::DomainApplicationManager_Impl::split_plan (void)
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::split_plan");
 
@@ -509,8 +492,7 @@ add_connections (const Deployment::Connections & incoming_conn)
 void
 CIAO::DomainApplicationManager_Impl::
 startLaunch (const ::Deployment::Properties & configProperty,
-             ::CORBA::Boolean start
-             ACE_ENV_ARG_DECL)
+             ::CORBA::Boolean start)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Deployment::ResourceNotAvailable,
                    ::Deployment::StartError,
@@ -519,7 +501,7 @@ startLaunch (const ::Deployment::Properties & configProperty,
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::startLaunch");
   ACE_UNUSED_ARG (start);
 
-  ACE_TRY
+  try
     {
       // Clean up all cached connections first
       this->all_connections_->length (0);
@@ -546,7 +528,7 @@ startLaunch (const ::Deployment::Properties & configProperty,
                  ("Unable to resolve a reference to node manager: ");
               error += this->node_manager_names_[i];
 
-              ACE_TRY_THROW
+              throw
                  (Deployment::StartError
                     ("DomainApplicationManager_Impl:startLaunch",
                      error.c_str ()));
@@ -569,13 +551,12 @@ startLaunch (const ::Deployment::Properties & configProperty,
                   has a nil reference for NodeApplicationManager\n");
               ACE_DEBUG ((LM_DEBUG, error.c_str ()));
 
-              ACE_TRY_THROW
+              throw
                 (Deployment::StartError
                    ("DomainApplicationManager_Impl::startLaunch",
                      error.c_str ()));
             }
 
-          ACE_TRY_CHECK;
 
           ::Deployment::Connections_var retn_connections;
 
@@ -606,9 +587,7 @@ startLaunch (const ::Deployment::Properties & configProperty,
 
           // Narrow down to NodeApplication object reference
           ::Deployment::NodeApplication_var my_na =
-            ::Deployment::NodeApplication::_narrow (temp_application.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            ::Deployment::NodeApplication::_narrow (temp_application.in ());
 
           if (CORBA::is_nil (my_na.in ()))
             {
@@ -625,12 +604,11 @@ startLaunch (const ::Deployment::Properties & configProperty,
                  "startLaunch on NodeApplicationManager.\n");
               ACE_ERROR ((LM_ERROR, error.c_str ()));
 
-              ACE_TRY_THROW
+              throw
                 (Deployment::StartError
                    ("DomainApplicationManager_Impl::startLaunch",
                      error.c_str ()));
             }
-          ACE_TRY_CHECK;
 
           // Cache the returned set of connections into the list.
           this->add_connections (retn_connections.in ());
@@ -642,31 +620,28 @@ startLaunch (const ::Deployment::Properties & configProperty,
 
       this->synchronize_shared_components_with_node_managers ();
     }
-  ACE_CATCH (Deployment::StartError,ex)
+  catch (const Deployment::StartError& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "DAM_Impl:StartError: %s, %s\n",
       ex.name.in (),
       ex.reason.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DomainApplicationManager_Impl::startLaunch\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::startLaunch\t\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 
 void
-CIAO::DomainApplicationManager_Impl::
-install_all_es (void)
+CIAO::DomainApplicationManager_Impl::install_all_es (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
-  ACE_TRY
+  try
     {
       for (CORBA::ULong j = 0; j < this->esd_->length (); ++j)
         {
@@ -687,7 +662,7 @@ install_all_es (void)
                 ("Unable to resolve a reference to NodeManager: ");
               error += this->esd_[j].node.in ();
 
-              ACE_TRY_THROW
+              throw
                 (Deployment::StartError
                   ("DomainApplicationManager_Impl::install_all_es",
                     error.c_str ()));
@@ -704,15 +679,13 @@ install_all_es (void)
           this->add_es_to_map (this->esd_[j].name.in (), ciao_es.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
-                            "DomainApplicationManager_Impl::install_all_es.\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::install_all_es.\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 void
@@ -722,33 +695,30 @@ add_es_to_map (const char * node_name,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
-  ACE_TRY
+  try
     {
       this->es_map_.bind (
         node_name,
         CIAO::CIAO_Event_Service::_duplicate (ciao_es));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
-                            "DomainApplicationManager_Impl::add_es_to_map.\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::add_es_to_map.\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 void
 CIAO::DomainApplicationManager_Impl::
 finishLaunch (CORBA::Boolean start,
-              CORBA::Boolean is_ReDaC
-              ACE_ENV_ARG_DECL)
+              CORBA::Boolean is_ReDaC)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::finishLaunch");
-  ACE_TRY
+  try
     {
       // Install all the CIAO_Event_Services within the Deployment Plan
       this->install_all_es ();
@@ -761,7 +731,7 @@ finishLaunch (CORBA::Boolean start,
       for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
           // Get the NodeApplication object reference.
-          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> * entry;
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> * entry = 0;
 
           if (this->artifact_map_.find (this->node_manager_names_[i],
                                         entry) != 0)
@@ -777,7 +747,7 @@ finishLaunch (CORBA::Boolean start,
                  ("Unable to resolve a reference to NodeManager: ");
               error += this->node_manager_names_[i];
 
-              ACE_TRY_THROW
+              throw
                 (Deployment::StartError
                    ("DomainApplicationManager_Impl::finishLaunch",
                      error.c_str ()));
@@ -805,9 +775,7 @@ finishLaunch (CORBA::Boolean start,
               (entry->int_id_).child_plan_.in (),
               !is_ReDaC,
               true,  // we search *new* plan
-              DomainApplicationManager_Impl::Internal_Connections
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              DomainApplicationManager_Impl::Internal_Connections);
 
           if (my_connections == 0)
             {
@@ -818,7 +786,7 @@ finishLaunch (CORBA::Boolean start,
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_TRY_THROW
+              throw
                 (Deployment::StartError
                   ("DomainApplicationManager_Impl::finish_launch",
                     "There was some error establishing connections."));
@@ -844,8 +812,7 @@ finishLaunch (CORBA::Boolean start,
                  (*my_connections,
                   start,
                   true // "true" => establish new connections only
-                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                  );
             }
 
           //=============================================================
@@ -864,9 +831,7 @@ finishLaunch (CORBA::Boolean start,
                         (entry->int_id_).old_child_plan_.in (),
                         true, // yes, get *all* the connections
                         false, // search in the *old* plan
-                        DomainApplicationManager_Impl::Internal_Connections
-                                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                        DomainApplicationManager_Impl::Internal_Connections);
 
               // Pass in the "false" parameter to get *all* the connections in
               // the new deployment plan, regardless those in old plan
@@ -875,9 +840,7 @@ finishLaunch (CORBA::Boolean start,
                         (entry->int_id_).child_plan_.in (),
                         true, // yes, get *all* the connections
                         true,  // search in the *new* plan
-                        DomainApplicationManager_Impl::Internal_Connections
-                                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                        DomainApplicationManager_Impl::Internal_Connections);
 
               Deployment::Connections * unnecessary_connections =
                 this->subtract_connections (*connections_in_old_plan,
@@ -909,8 +872,7 @@ finishLaunch (CORBA::Boolean start,
                     (*unnecessary_connections,
                      start,
                      false  // false ==> remove unnecessary connections
-                     ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                     );
                 }
 
               //=============================================================
@@ -935,17 +897,16 @@ finishLaunch (CORBA::Boolean start,
       // Establish bindings on external/shared components of this deployment plan.
       this->post_finishLaunch ();
     }
-  ACE_CATCH (Deployment::StartError, ex)
+  catch (const Deployment::StartError& ex)
     {
       ACE_ERROR ((LM_ERROR, "DAM_Impl::finishLaunch - StartError: %s, %s\n",
       ex.name.in (),
       ex.reason.in ()));
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
-                            "DomainApplicationManager_Impl::finishLaunch: "
-                            "Killing NodeApplications.\n");
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::finishLaunch: ""Killing NodeApplications.\n");
 
       // Invoke destroyManager() operation on each cached
       // NodeManager object.
@@ -962,15 +923,11 @@ finishLaunch (CORBA::Boolean start,
           // Invoke destoryApplication() operation on the NodeApplicationManger.
           // Since we have the first arg is not used by NAM anyway.
           my_node_application_manager->destroyApplication
-             (0
-              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+             (0);
         }
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 void
@@ -979,7 +936,7 @@ post_finishLaunch (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
-  ACE_TRY
+  try
     {
       // For each "external" component...
       CORBA::ULong length = this->shared_->length ();
@@ -998,15 +955,13 @@ post_finishLaunch (void)
           delete binding;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
-                            "DomainApplicationManager_Impl::post_finishLaunch.\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::post_finishLaunch.\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 CIAO::Component_Binding_Info *
@@ -1124,7 +1079,7 @@ synchronize_shared_components_with_node_managers (void)
               ("Unable to resolve a reference to node manager: ");
           error += this->node_manager_names_[i];
 
-          ACE_TRY_THROW
+          throw
               (Deployment::StartError
                 ("DomainApplicationManager_Impl:startLaunch",
                   error.c_str ()));
@@ -1147,8 +1102,7 @@ CIAO::DomainApplicationManager_Impl::
 get_outgoing_connections (const Deployment::DeploymentPlan &plan,
                           bool is_getting_all_connections,
                           bool is_search_new_plan,
-                          Connection_Search_Type t
-                          ACE_ENV_ARG_DECL)
+                          Connection_Search_Type t)
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outgoing_connections");
   Deployment::Connections_var connections;
@@ -1169,8 +1123,7 @@ get_outgoing_connections (const Deployment::DeploymentPlan &plan,
     if (!get_outgoing_connections_i (plan.instance[i].name.in (),
                                      connections.inout (),
                                      is_getting_all_connections,
-                                     is_search_new_plan
-                                     ACE_ENV_ARG_PARAMETER))
+                                     is_search_new_plan))
       return 0;
   }
   return connections._retn ();
@@ -1183,8 +1136,7 @@ CIAO::DomainApplicationManager_Impl::
 get_outgoing_connections_i (const char * instname,
                             Deployment::Connections & retv,
                             bool is_getting_all_connections,
-                            bool is_search_new_plan
-                            ACE_ENV_ARG_DECL)
+                            bool is_search_new_plan)
   ACE_THROW_SPEC ((Deployment::StartError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outoing_connections_i");
@@ -1451,13 +1403,13 @@ handle_direct_connection (
 
 void
 CIAO::DomainApplicationManager_Impl::
-start (ACE_ENV_SINGLE_ARG_DECL)
+start ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Deployment::StartError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::start");
 
-  ACE_TRY
+  try
     {
       CORBA::ULong i;
 
@@ -1480,16 +1432,15 @@ start (ACE_ENV_SINGLE_ARG_DECL)
                 ("Unable to resolve a reference to node manager: ");
               error += this->node_manager_names_[i];
 
-              ACE_TRY_THROW (Deployment::StartError
-                ("DomainApplicationManager_Impl:startLaunch",
-                  error.c_str ()));
+              throw Deployment::StartError(
+                "DomainApplicationManager_Impl:startLaunch",
+                error.c_str ());
             }
 
           ::Deployment::NodeApplication_ptr my_na =
             (entry->int_id_).node_application_.in ();
 
-          my_na->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          my_na->ciao_preactivate ();
         }
 
       // Invoke start () operation on each cached NodeApplication object.
@@ -1508,14 +1459,13 @@ start (ACE_ENV_SINGLE_ARG_DECL)
                           "for the node [%s] \n",
                           this->node_manager_names_[i].c_str ()));
 
-              ACE_TRY_THROW (Deployment::StartError ());
+              throw Deployment::StartError ();
             }
 
           ::Deployment::NodeApplication_ptr my_na =
            (entry->int_id_).node_application_.in ();
 
-          my_na->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          my_na->start ();
         }
 
      // Invoke ciao_postctivate () operation on each
@@ -1540,37 +1490,33 @@ start (ACE_ENV_SINGLE_ARG_DECL)
                 ("Unable to resolve a reference to node manager: ");
               error += this->node_manager_names_[i];
 
-              ACE_TRY_THROW (Deployment::StartError
-                  ("DomainApplicationManager_Impl:startLaunch",
-                    error.c_str ()));
+              throw Deployment::StartError(
+                "DomainApplicationManager_Impl:startLaunch",
+                error.c_str ());
             }
 
           ::Deployment::NodeApplication_ptr my_na =
             (entry->int_id_).node_application_.in ();
 
-          my_na->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          my_na->ciao_postactivate ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DomainApplicationManager_Impl::start\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("DomainApplicationManager_Impl::start\t\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 void
 CIAO::DomainApplicationManager_Impl::
-destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
+destroyApplication ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Deployment::StopError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::destroyApplication");
-  ACE_TRY
+  try
     {
       // Passivate shared components also, which should delegate to EM to handle
       this->passivate_shared_components ();
@@ -1594,7 +1540,7 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
                  ("Unable to resolve a reference to NodeManager: ");
               error += this->node_manager_names_[i];
 
-              ACE_TRY_THROW
+              throw
                 (Deployment::StopError
                    ("DomainApplicationManager_Impl::destroyApplication",
                      error.c_str ()));
@@ -1621,9 +1567,7 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
               (entry->int_id_).child_plan_.in (),
               true,  // yes, get *all* the connections
               true,  // yes, we search the current plan
-              DomainApplicationManager_Impl::External_Connections
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              DomainApplicationManager_Impl::External_Connections);
 
           // Invoke finishLaunch() on NodeApplication to remove bindings.
           // If this NodeApplication is not within the control of this DAM,
@@ -1661,8 +1605,7 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
                 (connections.in (),
                  true, // "true" ==> start the components
                  false // "false" => remove connections
-                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                 );
             }
 
         }
@@ -1678,9 +1621,7 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
           Deployment::NodeManager_var
               my_node_manager = (entry->int_id_).node_manager_;
 
-          my_node_manager->destroyPlan ((entry->int_id_).child_plan_
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          my_node_manager->destroyPlan ((entry->int_id_).child_plan_);
         }
 
       // ??
@@ -1691,25 +1632,23 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
       // We should again activate those shared components
       this->activate_shared_components ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DomainApplicationManager_Impl::destroyApplication\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::destroyApplication\t\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 void
 CIAO::DomainApplicationManager_Impl::
-destroyManager (ACE_ENV_SINGLE_ARG_DECL)
+destroyManager ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StopError))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::destroyManager");
-  ACE_TRY
+  try
     {
       for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
@@ -1720,7 +1659,7 @@ destroyManager (ACE_ENV_SINGLE_ARG_DECL)
 
           if (this->artifact_map_.find (this->node_manager_names_[i],
                                         entry) != 0)
-            ACE_TRY_THROW (Deployment::StopError ()); // Should never happen!
+            throw Deployment::StopError (); // Should never happen!
 
           ::Deployment::NodeManager_var my_node_manager =
              (entry->int_id_).node_manager_;
@@ -1728,27 +1667,22 @@ destroyManager (ACE_ENV_SINGLE_ARG_DECL)
           ::Deployment::NodeApplicationManager_var my_nam =
               (entry->int_id_).node_application_manager_;
 
-          my_node_manager->destroyManager (my_nam.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          my_node_manager->destroyManager (my_nam.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DomainApplicationManager_Impl::destroyManager\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::destroyManager\t\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 void
 CIAO::DomainApplicationManager_Impl::
 perform_redeployment (
-  const Deployment::DeploymentPlan & plan
-  ACE_ENV_ARG_DECL)
+  const Deployment::DeploymentPlan & plan)
   ACE_THROW_SPEC ((CORBA::SystemException,
                     Deployment::PlanError,
                     Deployment::InstallationFailure,
@@ -1764,7 +1698,7 @@ perform_redeployment (
   this->is_redeployment_ = true;
   this->plan_ = plan;
 
-  ACE_TRY
+  try
     {
       // Call init() on the myself, which will validate/split the plan and
       // call preparePlan on each NodeManager, by this, we shall get
@@ -1793,22 +1727,20 @@ perform_redeployment (
 
       this->start ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "DomainApplicationManager_Impl::perform_redeployment\t\n");
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::perform_redeployment\t\n");
       this->plan_ = this->old_plan_;
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 
 // Returns the DeploymentPlan associated with this ApplicationManager.
 ::Deployment::DeploymentPlan *
 CIAO::DomainApplicationManager_Impl::
-getPlan (ACE_ENV_SINGLE_ARG_DECL)
+getPlan ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::getPlan");
@@ -1944,7 +1876,7 @@ passivate_shared_components (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
-  ACE_TRY
+  try
     {
       // For each "external" component...
       CORBA::ULong length = this->shared_->length ();
@@ -1963,15 +1895,13 @@ passivate_shared_components (void)
           delete binding;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
-                            "DomainApplicationManager_Impl::passivate_shared_components.\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::passivate_shared_components.\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 void
@@ -1980,7 +1910,7 @@ activate_shared_components (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
-  ACE_TRY
+  try
     {
       // For each "external" component...
       CORBA::ULong length = this->shared_->length ();
@@ -1999,15 +1929,13 @@ activate_shared_components (void)
           delete binding;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
-                            "DomainApplicationManager_Impl::activate_shared_components.\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "DomainApplicationManager_Impl::activate_shared_components.\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
 
 void
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index cf13d10250c..f9ebd9dba06 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -116,7 +116,7 @@ namespace CIAO
      *
      * @@ What else do we need to initialize here?
      */
-    void init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    void init ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::ResourceNotAvailable,
                        Deployment::StartError,
@@ -141,8 +141,7 @@ namespace CIAO
      * Fetch the NodeApplication object reference based on the NodeManager name.
      */
     virtual Deployment::NodeApplication_ptr get_node_app (
-        const char * node_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char * node_name)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Deployment::NoSuchName));
@@ -160,8 +159,7 @@ namespace CIAO
      */
     virtual void
       startLaunch (const ::Deployment::Properties & configProperty,
-                   ::CORBA::Boolean start
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                   ::CORBA::Boolean start)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Deployment::ResourceNotAvailable,
                        ::Deployment::StartError,
@@ -174,8 +172,7 @@ namespace CIAO
      * launching or starting the application fails.
      */
     virtual void finishLaunch (CORBA::Boolean start,
-                               CORBA::Boolean is_ReDAC
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               CORBA::Boolean is_ReDAC)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Deployment::StartError));
 
@@ -203,7 +200,7 @@ namespace CIAO
      * Starts the application. Raises the StartError exception if
      * starting the application fails.
      */
-    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void start ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Deployment::StartError));
 
@@ -213,14 +210,14 @@ namespace CIAO
      * InvalidReference exception if the appliction reference is
      * unknown.
      */
-    virtual void destroyApplication (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void destroyApplication ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Deployment::StopError));
 
     /**
      * Returns the DeploymentPlan associated with this ApplicationManager.
      */
-    virtual ::Deployment::DeploymentPlan * getPlan (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual ::Deployment::DeploymentPlan * getPlan ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -230,7 +227,7 @@ namespace CIAO
      * op invoked on it. This is part of the result for merging DAM
      * with DA.
      */
-    virtual void destroyManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void destroyManager ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StopError));
 
@@ -238,8 +235,7 @@ namespace CIAO
     // same UUID of the existing running plan.
     virtual void
     perform_redeployment (
-      const Deployment::DeploymentPlan & plan
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const Deployment::DeploymentPlan & plan)
       ACE_THROW_SPEC ((CORBA::SystemException,
                         Deployment::PlanError,
                         Deployment::InstallationFailure,
@@ -333,16 +329,14 @@ namespace CIAO
     get_outgoing_connections (const Deployment::DeploymentPlan &plan,
                               bool is_getting_all_connections = true,
                               bool is_search_new_plan = true,
-                              Connection_Search_Type t = Internal_Connections
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              Connection_Search_Type t = Internal_Connections);
 
     /// This is a helper function to find the connection for a component.
     bool
     get_outgoing_connections_i (const char * instname,
                                 Deployment::Connections & retv,
                                 bool is_ReDAC,
-                                bool is_search_new_plan
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                bool is_search_new_plan)
       ACE_THROW_SPEC ((Deployment::StartError));
 
     bool
diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp b/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
index 84e09e7cf96..350fb63d331 100644
--- a/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
+++ b/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
@@ -74,7 +74,7 @@ namespace CIAO
 
 
     Deployment::DomainApplicationManagers *
-    DAM_Map::get_dams (ACE_ENV_SINGLE_ARG_DECL)
+    DAM_Map::get_dams ()
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::get_dams");
       CORBA::ULong const sz =
@@ -85,7 +85,6 @@ namespace CIAO
       ACE_NEW_THROW_EX (list,
                         Deployment::DomainApplicationManagers (sz),
                         CORBA::NO_MEMORY());
-      ACE_CHECK_RETURN (0);
 
       // Add the manager to the list
       list->length (sz);
diff --git a/CIAO/DAnCE/ExecutionManager/DAM_Map.h b/CIAO/DAnCE/ExecutionManager/DAM_Map.h
index 73a1d97bed4..d69c9d10e9a 100644
--- a/CIAO/DAnCE/ExecutionManager/DAM_Map.h
+++ b/CIAO/DAnCE/ExecutionManager/DAM_Map.h
@@ -48,7 +48,7 @@ namespace CIAO
         ::Deployment::DomainApplicationManager_ptr tmp);
 
       Deployment::DomainApplicationManagers *
-      get_dams (ACE_ENV_SINGLE_ARG_DECL);
+      get_dams ();
 
       bool unbind_dam (const ACE_CString &str);
 
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 71d2280ef31..c7b5df7b96a 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -62,13 +62,10 @@ namespace CIAO
 
     bool
     write_ior_file (CORBA::ORB_ptr orb,
-                    CIAO::ExecutionManagerDaemon_ptr obj
-                    ACE_ENV_ARG_DECL)
+                    CIAO::ExecutionManagerDaemon_ptr obj)
     {
       CORBA::String_var ior =
-        orb->object_to_string (obj
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        orb->object_to_string (obj);
 
       FILE* ior_output_file_ =
         ACE_OS::fopen (ior_file_name_, "w");
@@ -105,14 +102,11 @@ namespace CIAO
 
     bool
     register_with_ns (CORBA::ORB_ptr orb,
-                      CIAO::ExecutionManagerDaemon_ptr obj
-                      ACE_ENV_ARG_DECL)
+                      CIAO::ExecutionManagerDaemon_ptr obj)
     {
       // Naming Service related operations
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow (naming_context_object.in ());
@@ -142,30 +136,23 @@ namespace CIAO
     int
     run_main (int argc, char *argv[])
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
-      ACE_TRY
+      try
         {
           CORBA::ORB_var orb =
             CORBA::ORB_init (argc,
                              argv,
-                             ""
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             "");
 
           if (!parse_args (argc, argv))
             return -1;
 
           // Get reference to Root POA.
           CORBA::Object_var obj
-            = orb->resolve_initial_references ("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            = orb->resolve_initial_references ("RootPOA");
 
           PortableServer::POA_var poa =
-            PortableServer::POA::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            PortableServer::POA::_narrow (obj.in ());
 
 
           if (CORBA::is_nil (poa.in ()))
@@ -195,18 +182,14 @@ namespace CIAO
             {
               retval =
                 register_with_ns (orb.in (),
-                                  daemon.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                  daemon.in ());
             }
 
           if (write_to_ior_)
             {
               retval =
                 write_ior_file (orb.in (),
-                                daemon.in ()
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                daemon.in ());
             }
 
           if (!retval)
@@ -214,8 +197,7 @@ namespace CIAO
 
           // Activate POA manager
           PortableServer::POAManager_var mgr =
-            poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            poa->the_POAManager ();
 
           if (mgr.in () == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -223,8 +205,7 @@ namespace CIAO
                                "Nil POA Manager error, returning \n"),
                               -1);
 
-          mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          mgr->activate ();
 
           // End Deployment part
           ACE_DEBUG ((LM_DEBUG,
@@ -233,28 +214,22 @@ namespace CIAO
           write_pid ();
 
           // Run the main event loop for the ORB.
-          orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run ();
 
           // Forget the pointer. The POA will take care of it during
           // destroy.
           (void) de.release ();
 
           poa->destroy (1,
-                        1
-                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                        1);
 
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "CIAO_ExecutionManager::main\t\n");
+          ex._tao_print_exception ("CIAO_ExecutionManager::main\t\n");
           return -1;
         }
-      ACE_ENDTRY;
 
       ACE_DEBUG ((LM_DEBUG,
                   "CIAO_ExecutionManager has closed\n"));
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
index 85f7ebd005d..8a93b2f5ef0 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
@@ -29,8 +29,7 @@ namespace CIAO
     Deployment::DomainApplicationManager_ptr
     Execution_Manager_Impl::preparePlan (
       const Deployment::DeploymentPlan &plan,
-      CORBA::Boolean
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::ResourceNotAvailable,
                        Deployment::PlanError,
@@ -90,7 +89,6 @@ namespace CIAO
       // our disposal already in this function.
       // Why did the creation of DAM fail in the first place?
       //
-      ACE_CHECK_RETURN (::Deployment::DomainApplicationManager::_nil ());
 
       // Standard owner transfer mechanisms.
       //
@@ -102,14 +100,13 @@ namespace CIAO
       // Node Application Managers.
       //
       ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) About to init...\n"));
-      dam_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
+      dam_servant->init ();
 
       // This is a wrong exception to be thrown here.
       // We already had a DAM servant, the DAM servant is
       // not NIL any more.
       // We need to throw the right exception here.
       //
-      ACE_CHECK_RETURN (::Deployment::DomainApplicationManager::_nil ());
 
       ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) About to set uuid on DAM...\n"));
       dam_servant->set_uuid (plan.UUID.in ());
@@ -129,19 +126,18 @@ namespace CIAO
     }
 
     Deployment::DomainApplicationManagers *
-    Execution_Manager_Impl::getManagers (ACE_ENV_SINGLE_ARG_DECL)
+    Execution_Manager_Impl::getManagers ()
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::getManagers");
 
       // TODO Need to check the return value.
       //
-      return this->map_.get_dams (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return this->map_.get_dams ();
     }
 
     Deployment::DomainApplicationManager_ptr
-    Execution_Manager_Impl::getManager (const char * plan_uuid
-                                        ACE_ENV_ARG_DECL)
+    Execution_Manager_Impl::getManager (const char * plan_uuid)
       ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanNotExist))
     {
       return this->map_.fetch_dam_reference (plan_uuid);
@@ -149,17 +145,15 @@ namespace CIAO
 
     void
     Execution_Manager_Impl::destroyManager (
-      Deployment::DomainApplicationManager_ptr manager
-      ACE_ENV_ARG_DECL)
+      Deployment::DomainApplicationManager_ptr manager)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StopError))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::destroyManagers");
-      ACE_TRY
+      try
         {
           ::Deployment::DeploymentPlan_var plan =
-              manager->getPlan (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              manager->getPlan ();
 
           // What if we still have components running within this plan?
           //
@@ -167,40 +161,32 @@ namespace CIAO
 
           // Where does the POA deactivate happen?
           //
-          manager->destroyManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          manager->destroyManager ();
 
 #if 0
           PortableServer::ObjectId_var oid =
-            this->poa_->reference_to_id (manager
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->poa_->reference_to_id (manager);
 
-          this->poa_->deactivate_object (oid.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->poa_->deactivate_object (oid.in ());
 #endif /*if 0*/
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Execution_Manager_Impl::destroyManager\t\n");
-          ACE_THROW (Deployment::StopError ());
+          ex._tao_print_exception (
+            "Execution_Manager_Impl::destroyManager\t\n");
+          throw Deployment::StopError ();
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
 
     void
     Execution_Manager_Impl::destroyManagerByPlan (
-      const char * plan_uuid
-      ACE_ENV_ARG_DECL)
+      const char * plan_uuid)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StopError))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::destroyManagerByPlan");
-      ACE_TRY
+      try
         {
           // Get DomainApplicationManager first
           if (! this->map_.is_plan_available (plan_uuid))
@@ -208,7 +194,7 @@ namespace CIAO
               ACE_ERROR ((LM_ERROR,
                           "Execution_Manager_Impl::destroyManagerByPlan - "
                           "Invalid plan uuid [%s]\n", plan_uuid));
-              ACE_THROW (Deployment::StopError ());
+              throw Deployment::StopError ();
             }
 
           Deployment::DomainApplicationManager_var
@@ -230,45 +216,36 @@ namespace CIAO
 
           // Where does the POA deactivate happen?
           //
-          dam->destroyManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          dam->destroyManager ();
 
 #if 0
           PortableServer::ObjectId_var oid =
-            this->poa_->reference_to_id (manager
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->poa_->reference_to_id (manager);
 
-          this->poa_->deactivate_object (oid.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->poa_->deactivate_object (oid.in ());
 #endif /*if 0*/
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Execution_Manager_Impl::destroyManager\t\n");
-          ACE_THROW (Deployment::StopError ());
+          ex._tao_print_exception (
+            "Execution_Manager_Impl::destroyManager\t\n");
+          throw Deployment::StopError ();
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
 
     void
-    Execution_Manager_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    Execution_Manager_Impl::shutdown ()
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       CIAO_TRACE("Execution_Manager::Execution_Manager_Impl::shutdown");
       // Shutdown the ORB on which it is runing
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->shutdown (0);
     }
 
     void
     Execution_Manager_Impl::perform_redeployment (
-      const Deployment::DeploymentPlan & plan
-      ACE_ENV_ARG_DECL)
+      const Deployment::DeploymentPlan & plan)
       ACE_THROW_SPEC ((::CORBA::SystemException,
                        ::Deployment::PlanError,
                        ::Deployment::InstallationFailure,
@@ -296,30 +273,27 @@ namespace CIAO
                       "DAnCE (%P|%t) ExecutionManager_Impl.cpp -"
                       "CIAO::Execution_Manager_Impl::perform_redeployment -"
                       "Invalid plan uuid: %s\n", plan.UUID.in ()));
-          ACE_THROW (Deployment::PlanError (
-                        "Execution_Manager_Impl::perform_redeployment",
-                        "Invalid plan uuid specified."));
+          throw Deployment::PlanError (
+            "Execution_Manager_Impl::perform_redeployment",
+            "Invalid plan uuid specified.");
         }
 
-      ACE_TRY
+      try
         {
           // Call perform_redeployment() on the DAM, which will do the
           // actual redeployment and reconfiguration on the dommain level.
           dam->perform_redeployment (plan);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Execution_Manager_Impl::perform_redeployment\t\n");
-          ACE_RE_THROW;
+          ex._tao_print_exception (
+            "Execution_Manager_Impl::perform_redeployment\t\n");
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
     Deployment::DeploymentPlan *
-    Execution_Manager_Impl::getPlan (const char * plan_uuid
-                                     ACE_ENV_ARG_DECL)
+    Execution_Manager_Impl::getPlan (const char * plan_uuid)
       ACE_THROW_SPEC ((::CORBA::SystemException))
     {
       Deployment::DomainApplicationManager_var dam;
@@ -334,21 +308,18 @@ namespace CIAO
                       "DAnCE (%P|%t) ExecutionManager_Impl.cpp -"
                       "CIAO::Execution_Manager_Impl::getPlan -"
                       "Invalid plan uuid: %s\n", plan_uuid));
-          ACE_THROW (::CORBA::BAD_PARAM ());
+          throw ::CORBA::BAD_PARAM ();
         }
 
-      ACE_TRY
+      try
         {
           return dam->getPlan ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Execution_Manager_Impl::getPlan\t\n");
-          ACE_RE_THROW;
+          ex._tao_print_exception ("Execution_Manager_Impl::getPlan\t\n");
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
     void
@@ -364,7 +335,7 @@ namespace CIAO
 
       // Find the NodeApplication hosting the component, and then call
       // <finishLaunch> on it
-      ACE_TRY
+      try
       {
         Deployment::NodeApplication_var
           node_app = this->find_node_application (binding);
@@ -374,7 +345,7 @@ namespace CIAO
             ACE_ERROR ((LM_ERROR,
                         "Execution_Manager_Impl::finalize_global_binding - "
                         "nil NodeApplication object reference.\n"));
-            ACE_THROW (Deployment::InvalidConnection ());
+            throw Deployment::InvalidConnection ();
           }
 
         node_app->finishLaunch (binding.providedReference_.in (),
@@ -387,13 +358,12 @@ namespace CIAO
         else
           this->remove_shared_component (binding);
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Execution_Manager_Impl::finalize_global_binding\t\n");
-          ACE_THROW (Deployment::InvalidConnection ());
+          ex._tao_print_exception (
+            "Execution_Manager_Impl::finalize_global_binding\t\n");
+          throw Deployment::InvalidConnection ();
         }
-      ACE_ENDTRY;
     }
 
     void
@@ -408,7 +378,7 @@ namespace CIAO
 
       // Find the NodeApplication hosting the component, and then call
       // <finishLaunch> on it
-      ACE_TRY
+      try
       {
         Deployment::NodeApplication_var
           node_app = this->find_node_application (binding);
@@ -418,18 +388,17 @@ namespace CIAO
             ACE_ERROR ((LM_ERROR,
                         "Execution_Manager_Impl::passivate_shared_components - "
                         "nil NodeApplication object reference.\n"));
-            ACE_THROW (Deployment::StartError ());
+            throw Deployment::StartError ();
           }
 
         node_app->passivate_component (binding.name_.c_str ());
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Execution_Manager_Impl::passivate_shared_components\t\n");
-          ACE_THROW (Deployment::StartError ());
+          ex._tao_print_exception (
+            "Execution_Manager_Impl::passivate_shared_components\t\n");
+          throw Deployment::StartError ();
         }
-      ACE_ENDTRY;
     }
 
     void
@@ -444,7 +413,7 @@ namespace CIAO
 
       // Find the NodeApplication hosting the component, and then call
       // <ciao_activate> on it
-      ACE_TRY
+      try
       {
         Deployment::NodeApplication_var
           node_app = this->find_node_application (binding);
@@ -454,18 +423,17 @@ namespace CIAO
             ACE_ERROR ((LM_ERROR,
                         "Execution_Manager_Impl::activate_shared_components - "
                         "nil NodeApplication object reference.\n"));
-            ACE_THROW (Deployment::StartError ());
+            throw Deployment::StartError ();
           }
 
         node_app->activate_component (binding.name_.c_str ());
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Execution_Manager_Impl::passivate_shared_components\t\n");
-          ACE_THROW (Deployment::StartError ());
+          ex._tao_print_exception (
+            "Execution_Manager_Impl::passivate_shared_components\t\n");
+          throw Deployment::StartError ();
         }
-      ACE_ENDTRY;
     }
 
 
@@ -490,7 +458,7 @@ namespace CIAO
                       "DAnCE (%P|%t) ExecutionManager_Impl.cpp -"
                       "CIAO::Execution_Manager_Impl::find_node_application -"
                       "Invalid plan uuid: %s\n", binding.plan_uuid_.c_str ()));
-          ACE_THROW (::CORBA::BAD_PARAM ());
+          throw ::CORBA::BAD_PARAM ();
         }
 
       // Find the NA based on the NodeName field of the binding
@@ -504,7 +472,7 @@ namespace CIAO
                       "DAnCE (%P|%t) ExecutionManager_Impl.cpp -"
                       "CIAO::Execution_Manager_Impl::find_node_application -"
                       "Invalid node name: %s!\n", binding.node_.c_str ()));
-          ACE_THROW (::CORBA::BAD_PARAM ());
+          throw ::CORBA::BAD_PARAM ();
         }
 
       return node_app._retn ();
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
index cbbdd3094a1..cf674d37fe9 100644
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.h
@@ -52,46 +52,41 @@ namespace CIAO
       /// $CIAO_ROOT/ciao/Deployment.idl for documentation
       virtual Deployment::DomainApplicationManager_ptr
       preparePlan (const Deployment::DeploymentPlan & plan,
-                   CORBA::Boolean commitResources
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                   CORBA::Boolean commitResources)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Deployment::ResourceNotAvailable,
                          Deployment::PlanError,
                          Deployment::StartError));
 
       virtual Deployment::DomainApplicationManagers *
-      getManagers (ACE_ENV_SINGLE_ARG_DECL)
+      getManagers ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       // Below method is CIAO specific extension
       virtual Deployment::DomainApplicationManager_ptr
-      getManager (const char * plan_uuid
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      getManager (const char * plan_uuid)
         ACE_THROW_SPEC ((CORBA::SystemException, Deployment::PlanNotExist));
 
       virtual void
-      destroyManager (Deployment::DomainApplicationManager_ptr manager
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      destroyManager (Deployment::DomainApplicationManager_ptr manager)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Deployment::StopError));
 
       // Below method is CIAO specific extension, please see the IDL
       // definition for more details.
       virtual void
-      destroyManagerByPlan (const char * plan_uuid
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      destroyManagerByPlan (const char * plan_uuid)
         ACE_THROW_SPEC ((::CORBA::SystemException,
                          ::Deployment::StopError));
 
-      virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      virtual void shutdown ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       // The input parameter is a *new_plan* which has the
       // same UUID of the existing running plan.
       virtual void
       perform_redeployment (
-          const Deployment::DeploymentPlan & plan
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          const Deployment::DeploymentPlan & plan)
         ACE_THROW_SPEC ((::CORBA::SystemException,
                          ::Deployment::PlanError,
                          ::Deployment::InstallationFailure,
@@ -102,8 +97,7 @@ namespace CIAO
                          ::Components::RemoveFailure));
 
       virtual Deployment::DeploymentPlan * getPlan (
-          const char * plan_uuid
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          const char * plan_uuid)
         ACE_THROW_SPEC ((::CORBA::SystemException));
 
     /// ****************** C++ Methods *************************
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
index 7b57887f458..89cab7af662 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
@@ -26,8 +26,7 @@ CIAO::Container_Impl::_default_POA (void)
   ///////////////////////////////////////////////////////////////
 
 CORBA::Long
-CIAO::Container_Impl::init (const CORBA::PolicyList *policies
-                            ACE_ENV_ARG_DECL)
+CIAO::Container_Impl::init (const CORBA::PolicyList *policies)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO_TRACE ("CIAO::Container_Impl::init");
@@ -46,7 +45,6 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies
       ACE_NEW_THROW_EX (this->container_,
                         CIAO::Session_Container (this->orb_.in (), this),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (-1);
     }
   else
     {
@@ -54,19 +52,16 @@ CIAO::Container_Impl::init (const CORBA::PolicyList *policies
                         CIAO::Session_Container (this->orb_.in (), this, 1,
                                                  this->static_entrypts_maps_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (-1);
     }
 
   return this->container_->init (0,
-                                 policies
-                                 ACE_ENV_ARG_PARAMETER);
+                                 policies);
 }
 
 
 Deployment::ComponentInfos *
 CIAO::Container_Impl::install (
     const ::Deployment::ContainerImplementationInfo & container_impl_info
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                   ::Deployment::UnknownImplId,
@@ -76,12 +71,11 @@ CIAO::Container_Impl::install (
 {
   CIAO_TRACE ("CIAO::Container_Impl::install");
   Deployment::ComponentInfos_var retv;
-  ACE_TRY
+  try
    {
      ACE_NEW_THROW_EX (retv,
                        Deployment::ComponentInfos,
                        CORBA::NO_MEMORY ());
-     ACE_TRY_CHECK;
 
      // Get the ComponentImplementationInfos from the
      // ContainerImplementationInfo
@@ -96,25 +90,20 @@ CIAO::Container_Impl::install (
        {
          // Install home
          Components::CCMHome_var home =
-           this->install_home (impl_infos[i]
-                               ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK;
+           this->install_home (impl_infos[i]);
 
          Components::KeylessCCMHome_var kh =
-           Components::KeylessCCMHome::_narrow (home.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK;
+           Components::KeylessCCMHome::_narrow (home.in ());
 
          if (CORBA::is_nil (kh.in ()))
-           ACE_TRY_THROW (Deployment::InstallationFailure ());
+           throw Deployment::InstallationFailure ();
 
          // Create component from home
          Components::CCMObject_var comp =
-           kh->create_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-         ACE_TRY_CHECK;
+           kh->create_component ();
 
          if (CORBA::is_nil (comp.in ()))
-           ACE_TRY_THROW (Deployment::InstallationFailure ());
+           throw Deployment::InstallationFailure ();
 
          if (this->component_map_.bind
                 (impl_infos[i].component_instance_name.in (),
@@ -126,7 +115,7 @@ CIAO::Container_Impl::install (
                          "error in binding component "
                          "instance name [%s] into the component map \n",
                          impl_infos[i].component_instance_name.in ()));
-             ACE_TRY_THROW (Deployment::InstallationFailure ());
+             throw Deployment::InstallationFailure ();
            }
 
          // Set the return value.
@@ -156,16 +145,14 @@ CIAO::Container_Impl::install (
                  impl_infos[i].component_config[prop_len].value >>= path;
 
                  CORBA::String_var ior =
-                   this->orb_->object_to_string (comp.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-                 ACE_TRY_CHECK;
+                   this->orb_->object_to_string (comp.in ());
 
                  if (CIAO::Utility::write_IOR (path, ior.in ()) != 0)
                    {
                      if (CIAO::debug_level () > 1)
                        ACE_DEBUG ((LM_DEBUG, "Failed to write the IOR.\n"));
 
-                     ACE_TRY_THROW (CORBA::INTERNAL ());
+                     throw CORBA::INTERNAL ();
                    }
                }
 
@@ -186,9 +173,7 @@ CIAO::Container_Impl::install (
                            naming_context,
                            this->orb_.in (),
                            Components::CCMObject::_duplicate (comp.in ())
-                           ACE_ENV_ARG_PARAMETER
                          );
-                 ACE_TRY_CHECK;
 
                  if (!result)
                    {
@@ -207,7 +192,7 @@ CIAO::Container_Impl::install (
                                      "error in binding component "
                                      "instance name [%s] into the naming map \n",
                                      impl_infos[i].component_instance_name.in ()));
-                         ACE_TRY_THROW (Deployment::InstallationFailure ());
+                         throw Deployment::InstallationFailure ();
                        }
                    }
 
@@ -241,20 +226,17 @@ CIAO::Container_Impl::install (
          }
        }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Container_Impl::install\t\n");
-     ACE_RE_THROW;
+     ex._tao_print_exception ("Container_Impl::install\t\n");
+     throw;
    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return retv._retn ();
 }
 
 ::Deployment::Properties *
-CIAO::Container_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::Container_Impl::properties ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO_TRACE ("CIAO::Container_Impl::properties");
@@ -263,7 +245,6 @@ CIAO::Container_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     ::Deployment::Properties,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   *retval = this->properties_;
 
@@ -271,7 +252,7 @@ CIAO::Container_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 ::Deployment::NodeApplication_ptr
-CIAO::Container_Impl::get_node_application (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CIAO::Container_Impl::get_node_application ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO_TRACE ("CIAO::Container_Impl::get_node_application");
@@ -280,8 +261,7 @@ CIAO::Container_Impl::get_node_application (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 ::Components::CCMHome_ptr
 CIAO::Container_Impl::install_home (
-    const ::Deployment::ComponentImplementationInfo & impl_info
-    ACE_ENV_ARG_DECL)
+    const ::Deployment::ComponentImplementationInfo & impl_info)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::UnknownImplId,
                    Deployment::ImplEntryPointNotFound,
@@ -304,9 +284,7 @@ CIAO::Container_Impl::install_home (
                                          impl_info.executor_entrypt.in (),
                                          impl_info.servant_dll.in (),
                                          impl_info.servant_entrypt.in (),
-                                         impl_info.component_instance_name.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Components::CCMHome::_nil ());
+                                         impl_info.component_instance_name.in ());
 
   if (CIAO::debug_level () > 9)
     {
@@ -341,8 +319,7 @@ CIAO::Container_Impl::install_home (
 
 
 void
-CIAO::Container_Impl::remove_home (const char * comp_ins_name
-                                   ACE_ENV_ARG_DECL)
+CIAO::Container_Impl::remove_home (const char * comp_ins_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
@@ -352,34 +329,31 @@ CIAO::Container_Impl::remove_home (const char * comp_ins_name
   ACE_CString str (comp_ins_name);
 
   if (this->home_map_.find (str, home) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // @@TODO We should remove all components created by this home as well.
   // This is not implemented yet.
 
-  this->container_->ciao_uninstall_home (home
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->container_->ciao_uninstall_home (home);
 
   // If the previous calls failed, what should we do here??
   CORBA::release (home);
 
   // @@ Still need to remove the home if the previous operation fails?
   if (this->home_map_.unbind (str) == -1)
-    ACE_THROW (::Components::RemoveFailure ());
+    throw ::Components::RemoveFailure ();
 }
 
 // Remove all homes and components
 void
-CIAO::Container_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::Container_Impl::remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
   CIAO_TRACE ("CIAO::Container_Impl::remove");
 
   // Remove all components first.
-  this->remove_components (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->remove_components ();
 
   // Even if above operation failed we should still remove homes.
   const Home_Iterator end = this->home_map_.end ();
@@ -387,9 +361,7 @@ CIAO::Container_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
        iter != end;
        ++iter)
     {
-      this->container_->ciao_uninstall_home ( (*iter).int_id_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->container_->ciao_uninstall_home ( (*iter).int_id_);
 
       CORBA::release ( (*iter).int_id_);
     }
@@ -406,7 +378,7 @@ CIAO::Container_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
 ////////////////////////////////////////////////////////////////////////
 
 void
-CIAO::Container_Impl::remove_components (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::Container_Impl::remove_components ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
@@ -423,11 +395,10 @@ CIAO::Container_Impl::remove_components (ACE_ENV_SINGLE_ARG_DECL)
     // on the home.
     Components::CCMHome_ptr home;
     if (this->home_map_.find ( (*iter).ext_id_, home) != 0)
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw CORBA::BAD_PARAM ();
 
     // This will call ccm_passivate on the component executor.
     home->remove_component (((*iter).int_id_).in ());
-    ACE_CHECK;
 
     //CORBA::release (((*iter).int_id_).in ());
   }
@@ -441,8 +412,7 @@ CIAO::Container_Impl::remove_components (ACE_ENV_SINGLE_ARG_DECL)
 
 // Below method is not used actually.
 void
-CIAO::Container_Impl::remove_component (const char * comp_ins_name
-                                        ACE_ENV_ARG_DECL)
+CIAO::Container_Impl::remove_component (const char * comp_ins_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
@@ -467,20 +437,19 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name
    */
 
   if (this->component_map_.find (str, comp) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   if (this->home_map_.find (str, home) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // This will call ccm_passivate on the component executor.
   home->remove_component (comp.in ());
-  ACE_CHECK;
 
   // If the previous calls failed, what should we do here??
 
   // @@ Still need to remove the home if the previous operation fails?
   if (this->component_map_.unbind (str) == -1)
-    ACE_THROW (::Components::RemoveFailure ());
+    throw ::Components::RemoveFailure ();
 
   if (this->naming_map_.find (str, naming_context) == 0)
     {
@@ -489,9 +458,7 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name
         unregister_with_ns (
                             naming_context.c_str (),
                             this->orb_.in ()
-                            ACE_ENV_ARG_PARAMETER
                             );
-      ACE_TRY_CHECK;
 
       if (!result)
         {
@@ -501,7 +468,7 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name
       else
         {
           if (this->naming_map_.unbind (str) == -1)
-            ACE_THROW (::Components::RemoveFailure ());
+            throw ::Components::RemoveFailure ();
         }
     }
 }
@@ -509,18 +476,15 @@ CIAO::Container_Impl::remove_component (const char * comp_ins_name
 bool
 CIAO::Container_Impl::register_with_ns (const char * s,
                                         CORBA::ORB_ptr orb,
-                                        Components::CCMObject_ptr obj
-                                        ACE_ENV_ARG_DECL)
+                                        Components::CCMObject_ptr obj)
 {
   CIAO_TRACE ("CIAO::Container_Impl::register_with_ns");
 
-  ACE_TRY
+  try
     {
     // Obtain the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -528,9 +492,7 @@ CIAO::Container_Impl::register_with_ns (const char * s,
                            false);
 
       CosNaming::NamingContextExt_var root =
-        CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContextExt::_narrow (naming_obj.in ());
 
       CosNaming::Name name (0);
       name.length (0);
@@ -571,33 +533,28 @@ CIAO::Container_Impl::register_with_ns (const char * s,
 
       return true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CIAO (%P|%t) Container_Impl.cpp -"
-                           "CIAO::Container_Impl::register_with_ns -"
-                           "NodeApplication: failed to register "
-                           "with naming service.");
+      ex._tao_print_exception ("CIAO (%P|%t) Container_Impl.cpp -"
+                               "CIAO::Container_Impl::register_with_ns -"
+                               "NodeApplication: failed to register "
+                               "with naming service.");
       return false;
     }
-  ACE_ENDTRY;
   return true;
 }
 
 bool
 CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL)
+                                          CORBA::ORB_ptr orb)
 {
   CIAO_TRACE ("CIAO::Container_Impl::unregister_with_ns");
 
-  ACE_TRY
+  try
     {
     // Obtain the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -605,9 +562,7 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
                           false);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (0);
       name.length (0);
@@ -638,20 +593,17 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
       ACE_DEBUG ((LM_DEBUG,
                   "Unregister component with the name server : %s!\n",
                   obj_name));
-      naming_context->unbind (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_context->unbind (name);
 
       return true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CIAO (%P|%t) Container_Impl.cpp -"
-                           "CIAO::Container_Impl::unregister_with_ns -"
-                           "NodeApplication: failed to unregister "
-                           "with naming service.");
+      ex._tao_print_exception ("CIAO (%P|%t) Container_Impl.cpp -"
+                               "CIAO::Container_Impl::unregister_with_ns -"
+                               "NodeApplication: failed to unregister "
+                               "with naming service.");
       return false;
     }
-  ACE_ENDTRY;
   return true;
 }
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.h b/CIAO/DAnCE/NodeApplication/Container_Impl.h
index 3a6c91ae2b5..7becc7b8e9e 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.h
@@ -62,14 +62,12 @@ namespace CIAO
     /*--------------------  IDL operations (idl) ------------------*/
 
     /// Initialize the container.
-    virtual CORBA::Long init (const CORBA::PolicyList *policies
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long init (const CORBA::PolicyList *policies)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Install all homes and components
     Deployment::ComponentInfos *
-      install (const ::Deployment::ContainerImplementationInfo & container_impl_info
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      install (const ::Deployment::ContainerImplementationInfo & container_impl_info)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Deployment::UnknownImplId,
                          Deployment::ImplEntryPointNotFound,
@@ -78,17 +76,17 @@ namespace CIAO
 
     /// Remove all homes and components
     virtual void
-      remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      remove ()
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Components::RemoveFailure));
 
     /// Deployment::Container interface defined attributes/operations.
     virtual ::Deployment::Properties *
-      properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      properties ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Deployment::NodeApplication_ptr
-      get_node_application (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      get_node_application ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     /*-------------------------------------------------------------*/
@@ -101,8 +99,7 @@ namespace CIAO
 
     // Install the home of this particular component
     virtual ::Components::CCMHome_ptr
-      install_home (const ::Deployment::ComponentImplementationInfo & impl_info
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      install_home (const ::Deployment::ComponentImplementationInfo & impl_info)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Deployment::UnknownImplId,
                          Deployment::ImplEntryPointNotFound,
@@ -122,39 +119,34 @@ namespace CIAO
      */
     // Remove the home of this particular component
     virtual void
-      remove_home (const char * comp_ins_name
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      remove_home (const char * comp_ins_name)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Components::RemoveFailure));
 
     bool
     register_with_ns (const char * obj_name,
                       CORBA::ORB_ptr orb,
-                      Components::CCMObject_ptr obj
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                      Components::CCMObject_ptr obj);
 
     bool
     unregister_with_ns (const char * obj_name,
-                        CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                        CORBA::ORB_ptr orb);
 
 
     // ------------------- CIAO Internal Operations ------------------------
     // These below two are helper methods to clean up components
     // should only be called when we are sure that there is no
     // active connection on this component.
-    virtual void remove_components (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void remove_components ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::RemoveFailure));
 
-    virtual void remove_component (const char * comp_ins_name
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void remove_component (const char * comp_ins_name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::RemoveFailure));
 
     /// Set the cached object reference.
-    void set_objref (Deployment::Container_ptr o
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    void set_objref (Deployment::Container_ptr o);
 
     /// Get the cached object reference.  This operation will invoke
     /// _this if there's no cached reference available.  Notice that
@@ -163,7 +155,7 @@ namespace CIAO
     /// @@ Gan, caller should own memory. In this case you shoudl
     /// return a duplicate OR add a const to the operation
     /// signature. This is simply bad programming.
-    Deployment::Container_ptr get_objref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    Deployment::Container_ptr get_objref ();
 
 protected:
     /// Keep a pointer to the managing ORB serving this servant.
diff --git a/CIAO/DAnCE/NodeApplication/Container_Impl.inl b/CIAO/DAnCE/NodeApplication/Container_Impl.inl
index e25d1e7e38e..85c17197070 100644
--- a/CIAO/DAnCE/NodeApplication/Container_Impl.inl
+++ b/CIAO/DAnCE/NodeApplication/Container_Impl.inl
@@ -14,26 +14,24 @@ CIAO::Container_Impl::Container_Impl (CORBA::ORB_ptr o,
 }
 
 ACE_INLINE void
-CIAO::Container_Impl::set_objref (Deployment::Container_ptr o
-                                  ACE_ENV_ARG_DECL)
+CIAO::Container_Impl::set_objref (Deployment::Container_ptr o)
 {
   CIAO_TRACE("CIAO::Container_Imp::set_objref");
 
   if (!CORBA::is_nil (this->objref_.in ()))
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw CORBA::BAD_INV_ORDER ();
 
   this->objref_ = Deployment::Container::_duplicate (o);
 }
 
 ACE_INLINE ::Deployment::Container_ptr
-CIAO::Container_Impl::get_objref (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::Container_Impl::get_objref ()
 {
   CIAO_TRACE("CIAO::Container_Imp::get_objref");
 
   if (CORBA::is_nil (this->objref_.in ()))
     {
-      this->objref_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->objref_ = this->_this ();
     }
   return this->objref_.in ();
 }
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
index 6cf23f00b58..021f1e5322c 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
@@ -16,7 +16,7 @@ void print_arg (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_EC_Default_Factory::init_svcs ();
 
@@ -39,13 +39,11 @@ main (int argc, char *argv[])
       // Run the main event loop for the ORB.
       nodeapp_core.run_orb ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeApp::main\t\n");
+      ex._tao_print_exception ("NodeApp::main\t\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (CIAO::debug_level () > 1)
     ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) - This NodeApplication is destroyed!\n"));
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
index 1b8516dcce8..eef577b2cfd 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
@@ -68,24 +68,18 @@ CIAO::NodeApplication_Core::svc ()
 {
   CIAO_TRACE ("CIAO::NodeApplication_Core::svc");
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // ...
       CIAO::NodeApplication_Impl *nodeapp_servant = 0;
@@ -100,18 +94,12 @@ CIAO::NodeApplication_Core::svc ()
 
       // Configuring NodeApplication.
       PortableServer::ObjectId_var nodeapp_oid
-        = root_poa->activate_object (nodeapp_servant
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->activate_object (nodeapp_servant);
 
-      object = root_poa->id_to_reference (nodeapp_oid.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = root_poa->id_to_reference (nodeapp_oid.in ());
 
       Deployment::NodeApplication_var nodeapp_obj =
-        Deployment::NodeApplication::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Deployment::NodeApplication::_narrow (object.in ());
 
       if (CORBA::is_nil (nodeapp_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -125,8 +113,7 @@ CIAO::NodeApplication_Core::svc ()
        * 1. call init remotely from NodeApplicationManager
        * 2. call init locally on the servant of NodeApplication.
        */
-      bool retval = nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      bool retval = nodeapp_servant->init ();
 
       if (retval)
         {
@@ -135,9 +122,7 @@ CIAO::NodeApplication_Core::svc ()
           return 1;
         }
 
-      CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in ());
 
       if (this->options_.write_ior_file ())
         CIAO::Utility::write_IOR (this->options_.ior_output_filename (),
@@ -155,42 +140,32 @@ CIAO::NodeApplication_Core::svc ()
 
       if (this->options_.use_callback ())
         {
-          object = this->orb_->string_to_object (this->options_.callback_ior ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          object = this->orb_->string_to_object (this->options_.callback_ior ());
 
           CIAO::NodeApplication_Callback_var nam_callback
-            = CIAO::NodeApplication_Callback::_narrow (object.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            = CIAO::NodeApplication_Callback::_narrow (object.in ());
 
           Deployment::Properties_out properties_out (prop.out ());
 
           nodeapp_man
             = nam_callback->register_node_application (nodeapp_obj.in (),
-                                                       properties_out
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                       properties_out);
         }
 
       ACE_DEBUG ((LM_DEBUG,
                   "Running NodeApplication...\n"));
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "Exiting NodeApplication...\n"));
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 02cc88b3830..afbb5c9bcc6 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -16,7 +16,7 @@ CIAO::NodeApplication_Impl::~NodeApplication_Impl (void)
 
 
 CORBA::Long
-CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CIAO::NodeApplication_Impl::init ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// @todo initialize this NodeApplication properties
@@ -26,7 +26,6 @@ CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 CORBA::Long
 CIAO::NodeApplication_Impl::create_all_containers (
     const ::Deployment::ContainerImplementationInfos & container_infos
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -61,8 +60,7 @@ void
 CIAO::NodeApplication_Impl::finishLaunch (
     const Deployment::Connections & providedReference,
     CORBA::Boolean start,
-    CORBA::Boolean add_connection
-    ACE_ENV_ARG_DECL)
+    CORBA::Boolean add_connection)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError,
                    Deployment::InvalidConnection))
@@ -78,15 +76,14 @@ void
 CIAO::NodeApplication_Impl::finishLaunch_i (
     const Deployment::Connections & connections,
     CORBA::Boolean start,
-    CORBA::Boolean add_connection
-    ACE_ENV_ARG_DECL)
+    CORBA::Boolean add_connection)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError,
                    Deployment::InvalidConnection))
 {
   ACE_UNUSED_ARG (start);
 
-  ACE_TRY
+  try
     {
       CORBA::ULong const length = connections.length ();
 
@@ -118,7 +115,7 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
                           "invalid port name [%s] in instance [%s] \n",
                           connections[i].portName.in (),
                           name.c_str ()));
-              ACE_TRY_THROW (Deployment::InvalidConnection ());
+              throw Deployment::InvalidConnection ();
             }
 
           Components::EventConsumerBase_var consumer;
@@ -166,22 +163,20 @@ CIAO::NodeApplication_Impl::finishLaunch_i (
                             "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
                             "CIAO::NodeApplication_Impl::finishLaunch_i: "
                             "Unsupported event port type encounted\n"));
-                ACE_TRY_THROW (CORBA::NO_IMPLEMENT ());
+                throw CORBA::NO_IMPLEMENT ();
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeApplication_Impl::finishLaunch\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("NodeApplication_Impl::finishLaunch\t\n");
+      throw;
     }
 
-  ACE_ENDTRY;
 }
 
 void
-CIAO::NodeApplication_Impl::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeApplication_Impl::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
@@ -192,8 +187,7 @@ CIAO::NodeApplication_Impl::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
   {
     if (((*iter).int_id_).state_ == NEW_BORN)
       {
-        ((*iter).int_id_).objref_->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        ((*iter).int_id_).objref_->ciao_preactivate ();
       }
 
     ((*iter).int_id_).state_ = PRE_ACTIVE;
@@ -201,7 +195,7 @@ CIAO::NodeApplication_Impl::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CIAO::NodeApplication_Impl::start (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeApplication_Impl::start ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
@@ -212,8 +206,7 @@ CIAO::NodeApplication_Impl::start (ACE_ENV_SINGLE_ARG_DECL)
   {
     if (((*iter).int_id_).state_ == PRE_ACTIVE)
       {
-        ((*iter).int_id_).objref_->ciao_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        ((*iter).int_id_).objref_->ciao_activate ();
       }
 
     ((*iter).int_id_).state_ = ACTIVE;
@@ -221,7 +214,7 @@ CIAO::NodeApplication_Impl::start (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CIAO::NodeApplication_Impl::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeApplication_Impl::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
 {
@@ -232,8 +225,7 @@ CIAO::NodeApplication_Impl::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
   {
     if (((*iter).int_id_).state_ == ACTIVE)
       {
-        ((*iter).int_id_).objref_->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        ((*iter).int_id_).objref_->ciao_postactivate ();
 
         ((*iter).int_id_).state_ = POST_ACTIVE;
       }
@@ -241,7 +233,7 @@ CIAO::NodeApplication_Impl::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CIAO::NodeApplication_Impl::ciao_passivate (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeApplication_Impl::ciao_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StopError))
 {
@@ -250,8 +242,7 @@ CIAO::NodeApplication_Impl::ciao_passivate (ACE_ENV_SINGLE_ARG_DECL)
        iter != end;
        ++iter)
   {
-    ((*iter).int_id_).objref_->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    ((*iter).int_id_).objref_->ciao_passivate ();
 
     ((*iter).int_id_).state_ = PASSIVE;
   }
@@ -260,8 +251,7 @@ CIAO::NodeApplication_Impl::ciao_passivate (ACE_ENV_SINGLE_ARG_DECL)
 
 Deployment::ComponentInfos *
 CIAO::NodeApplication_Impl::install (
-    const ::Deployment::NodeImplementationInfo & node_impl_info
-    ACE_ENV_ARG_DECL)
+    const ::Deployment::NodeImplementationInfo & node_impl_info)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::UnknownImplId,
                    Deployment::ImplEntryPointNotFound,
@@ -269,7 +259,7 @@ CIAO::NodeApplication_Impl::install (
                    Components::InvalidConfiguration))
 {
   Deployment::ComponentInfos_var retv;
-  ACE_TRY
+  try
     {
       // Extract ORB resource def here.
       this->configurator_.init_resource_manager (node_impl_info.nodeapp_config);
@@ -280,7 +270,6 @@ CIAO::NodeApplication_Impl::install (
       ACE_NEW_THROW_EX (retv,
                         Deployment::ComponentInfos,
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
 
       retv->length (0UL);
 
@@ -316,9 +305,7 @@ CIAO::NodeApplication_Impl::install (
         {
           Deployment::ComponentInfos_var comp_infos =
             this->container_set_.at(i+old_set_size)->
-                    install (container_infos[i]
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                    install (container_infos[i]);
 
           // Append the return sequence to the *big* return sequence
           CORBA::ULong curr_len = retv->length ();
@@ -354,27 +341,23 @@ CIAO::NodeApplication_Impl::install (
                         "error binding component instance [%s] "
                         "into the map. \n",
                         retv[len].component_instance_name.in ()));
-            ACE_TRY_THROW (
-               Deployment::InstallationFailure ("NodeApplication_Imp::install",
-                                       "Duplicate component instance name"));
+            throw Deployment::InstallationFailure (
+              "NodeApplication_Imp::install",
+              "Duplicate component instance name");
           }
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CIAO_NodeApplication::install error\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("CIAO_NodeApplication::install error\t\n");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return retv._retn ();
 }
 
 void
-CIAO::NodeApplication_Impl::remove_component (const char * inst_name
-                                              ACE_ENV_ARG_DECL)
+CIAO::NodeApplication_Impl::remove_component (const char * inst_name)
   ACE_THROW_SPEC ((::CORBA::SystemException,
                    ::Components::RemoveFailure))
 {
@@ -390,7 +373,7 @@ CIAO::NodeApplication_Impl::remove_component (const char * inst_name
                   "CIAO::NodeApplication_Impl::remove_component, "
                   "invalid instance [%s] in the component_container_map.\n",
                   inst_name));
-      ACE_TRY_THROW (::Components::RemoveFailure ());
+      throw ::Components::RemoveFailure ();
     }
 
   // Remove this component instance from the node application
@@ -401,8 +384,7 @@ CIAO::NodeApplication_Impl::remove_component (const char * inst_name
 }
 
 void
-CIAO::NodeApplication_Impl::passivate_component (const char * name
-                                                 ACE_ENV_ARG_DECL)
+CIAO::NodeApplication_Impl::passivate_component (const char * name)
   ACE_THROW_SPEC ((::CORBA::SystemException,
                    ::Components::RemoveFailure))
 {
@@ -415,7 +397,7 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name
                   "CIAO::NodeApplication_Impl::passivate_component, "
                   "invalid instance [%s] \n",
                    name));
-      ACE_TRY_THROW (Components::RemoveFailure ());
+      throw Components::RemoveFailure ();
     }
 
   if (CORBA::is_nil (comp_state.objref_.in ()))
@@ -424,13 +406,11 @@ CIAO::NodeApplication_Impl::passivate_component (const char * name
       throw Components::RemoveFailure ();
     }
 
-  comp_state.objref_->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  comp_state.objref_->ciao_passivate ();
 }
 
 void
-CIAO::NodeApplication_Impl::activate_component (const char * name
-                                                ACE_ENV_ARG_DECL)
+CIAO::NodeApplication_Impl::activate_component (const char * name)
   ACE_THROW_SPEC ((::CORBA::SystemException,
                    ::Deployment::StartError))
 {
@@ -443,7 +423,7 @@ CIAO::NodeApplication_Impl::activate_component (const char * name
                   "CIAO::NodeApplication_Impl::activate_component, "
                   "invalid instance [%s] \n",
                    name));
-      ACE_TRY_THROW (Deployment::StartError ());
+      throw Deployment::StartError ();
     }
 
   if (CORBA::is_nil (comp_state.objref_.in ()))
@@ -454,19 +434,16 @@ CIAO::NodeApplication_Impl::activate_component (const char * name
       throw Deployment::StartError ();
     }
 
-  comp_state.objref_->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  comp_state.objref_->ciao_preactivate ();
 
-  comp_state.objref_->ciao_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  comp_state.objref_->ciao_activate ();
 
-  comp_state.objref_->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  comp_state.objref_->ciao_postactivate ();
 }
 
 
 void
-CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeApplication_Impl::remove ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If we still have components installed, then do nothing
@@ -483,8 +460,7 @@ CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
           ACE_DEBUG ((LM_DEBUG, "NA: calling remove on container %i\n"));
         }
 
-      this->container_set_.at(i)->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->container_set_.at(i)->remove ();
     }
 
   // Remove all containers
@@ -504,7 +480,7 @@ CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
   // For static deployment, ORB will be shutdown in the Static_NodeManager
   if (this->static_entrypts_maps_ == 0)
     {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_->shutdown (0);
       ACE_DEBUG ((LM_DEBUG, "NA: shutdown\n"));
     }
 }
@@ -513,8 +489,7 @@ CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
 // Create a container interface, which will be hosted in this NodeApplication.
 ::Deployment::Container_ptr
 CIAO::NodeApplication_Impl::create_container (
-    const ::Deployment::Properties &properties
-    ACE_ENV_ARG_DECL)
+    const ::Deployment::Properties &properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   ::Components::CreateFailure,
                   ::Components::InvalidConfiguration))
@@ -533,7 +508,6 @@ CIAO::NodeApplication_Impl::create_container (
                                           this->get_objref (),
                                           this->static_entrypts_maps_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   PortableServer::ServantBase_var safe_servant (container_servant);
 
@@ -542,28 +516,19 @@ CIAO::NodeApplication_Impl::create_container (
   // suggest how to install the components.  Each such data stucture
   // should be correspond to one <process_collocation> tag  in the XML
   // file to describe the deployment plan.
-  container_servant->init (policies.ptr ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  container_servant->init (policies.ptr ());
 
   PortableServer::ObjectId_var oid
-    = this->poa_->activate_object (container_servant
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    = this->poa_->activate_object (container_servant);
 
   CORBA::Object_var obj
-    = this->poa_->id_to_reference (oid.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    = this->poa_->id_to_reference (oid.in ());
 
   ::Deployment::Container_var ci
-    = ::Deployment::Container::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    = ::Deployment::Container::_narrow (obj.in ());
 
   // Cached the objref in its servant.
-  container_servant->set_objref (ci.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  container_servant->set_objref (ci.in ());
 
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
@@ -579,8 +544,7 @@ CIAO::NodeApplication_Impl::create_container (
 
 // Remove a container interface.
 void
-CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref
-                                              ACE_ENV_ARG_DECL)
+CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   ::Components::RemoveFailure))
 {
@@ -589,26 +553,21 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref
 
   if (this->container_set_.object_in_set (cref) == 0)
     {
-      ACE_THROW (Components::RemoveFailure());
+      throw Components::RemoveFailure();
     }
 
-  cref->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  cref->remove ();
 
   // @@ Deactivate object.
   PortableServer::ObjectId_var oid
-    = this->poa_->reference_to_id (cref
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    = this->poa_->reference_to_id (cref);
 
-  this->poa_->deactivate_object (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->deactivate_object (oid.in ());
 
   // Should we remove the server still, even if the previous call failed.
   if (this->container_set_.remove (cref) == -1)
     {
-      ACE_THROW (::Components::RemoveFailure ());
+      throw ::Components::RemoveFailure ();
     }
 
   ACE_DEBUG ((LM_DEBUG, "LEAVING: NodeApplication_Impl::remove_container()\n"));
@@ -616,7 +575,7 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref
 
 // Get containers
 ::Deployment::Containers *
-CIAO::NodeApplication_Impl::get_containers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CIAO::NodeApplication_Impl::get_containers ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -624,12 +583,11 @@ CIAO::NodeApplication_Impl::get_containers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CIAO::CIAO_Event_Service *
 CIAO::NodeApplication_Impl::
-install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info
-            ACE_ENV_ARG_DECL)
+install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info)
 ACE_THROW_SPEC ((::CORBA::SystemException,
                  ::Deployment::InstallationFailure))
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "\nNodeApplication_Impl::install_es() called.\n\n"));
 
@@ -644,12 +602,12 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
             ::CIAO::CIAO_RT_Event_Service::_narrow (ciao_es.in ());
 
           if (CORBA::is_nil (ciao_rtes.in ()))
-            ACE_THROW (::Deployment::InstallationFailure ());
+            throw ::Deployment::InstallationFailure ();
 
           // Set up the event channel federations
           for (CORBA::ULong j = 0; j < es_info.addr_servs.length (); ++j)
 		        {
-			        bool retv = 
+			        bool retv =
 			        ciao_rtes->create_addr_serv (
 				        es_info.addr_servs[j].name.in (),
 				        es_info.addr_servs[j].port,
@@ -664,7 +622,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
 
 		      for (CORBA::ULong j = 0; j < es_info.senders.length (); ++j)
 		        {
-			        bool retv = 
+			        bool retv =
 			        ciao_rtes->create_sender (
 				        es_info.senders[j].addr_serv_id.in ());
 
@@ -677,7 +635,7 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
 
 		      for (CORBA::ULong j = 0; j < es_info.receivers.length (); ++j)
 		        {
-			        bool retv = 
+			        bool retv =
 			        ciao_rtes->create_receiver (
 				        es_info.receivers[j].addr_serv_id.in (),
 				        es_info.receivers[j].is_multicast,
@@ -692,14 +650,12 @@ ACE_THROW_SPEC ((::CORBA::SystemException,
         }
       return ciao_es._retn ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeApplication_Impl::finishLaunch\t\n");
+      ex._tao_print_exception ("NodeApplication_Impl::finishLaunch\t\n");
       ACE_THROW_RETURN (::Deployment::InstallationFailure (), 0);
     }
 
-  ACE_ENDTRY;
 }
 
 
@@ -745,9 +701,7 @@ handle_facet_receptable_connection (
     {
       ::Components::Cookie_var cookie =
         comp->connect (connection.portName.in (),
-                        connection.endpoint.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        connection.endpoint.in ());
 
       ACE_CString key = (*create_connection_key (connection));
       if (CIAO::debug_level () > 10)
@@ -779,7 +733,7 @@ handle_facet_receptable_connection (
       if (this->cookie_map_.find (key, cookie) != 0)
         {
           ACE_ERROR ((LM_ERROR, "Error: Cookie Not Found!\n"));
-          ACE_TRY_THROW (Deployment::InvalidConnection ());
+          throw Deployment::InvalidConnection ();
         }
 
       comp->disconnect (connection.portName.in (),
@@ -810,9 +764,7 @@ handle_emitter_consumer_connection (
                    Deployment::InvalidConnection))
 {
   Components::EventConsumerBase_var consumer =
-      Components::EventConsumerBase::_narrow (connection.endpoint.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+      Components::EventConsumerBase::_narrow (connection.endpoint.in ());
 
   if (CORBA::is_nil (consumer.in ()))
     {
@@ -823,7 +775,7 @@ handle_emitter_consumer_connection (
                   "there is an invalid endPoint. \n",
                   connection.portName.in (),
                   connection.instanceName.in ()));
-      ACE_TRY_THROW (Deployment::InvalidConnection ());
+      throw Deployment::InvalidConnection ();
     }
 
   if (CIAO::debug_level () > 11)
@@ -839,9 +791,7 @@ handle_emitter_consumer_connection (
   if (add_connection)
     {
       comp->connect_consumer (connection.portName.in (),
-                              consumer.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              consumer.in ());
 
       if (CIAO::debug_level () > 6)
         {
@@ -860,7 +810,7 @@ handle_emitter_consumer_connection (
 // Operation not implemented by the CIDLC.
 //                  comp->disconnect_consumer (connection.portName.in (),
 //                                             0
-//                                             ACE_ENV_ARG_PARAMETER);
+//);
 //                  ACE_TRY_CHECK;
 
       if (CIAO::debug_level () > 6)
@@ -888,9 +838,7 @@ handle_publisher_consumer_connection (
                    Deployment::InvalidConnection))
 {
   Components::EventConsumerBase_var consumer =
-      Components::EventConsumerBase::_narrow (connection.endpoint.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+      Components::EventConsumerBase::_narrow (connection.endpoint.in ());
 
   if (CORBA::is_nil (consumer.in ()))
     {
@@ -901,7 +849,7 @@ handle_publisher_consumer_connection (
                   "there is an invalid endPoint. \n",
                   connection.portName.in (),
                   connection.instanceName.in ()));
-      ACE_TRY_THROW (Deployment::InvalidConnection ());
+      throw Deployment::InvalidConnection ();
     }
 
   if (CIAO::debug_level () > 11)
@@ -918,9 +866,7 @@ handle_publisher_consumer_connection (
     {
       ::Components::Cookie_var cookie =
         comp->subscribe (connection.portName.in (),
-                          consumer.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          consumer.in ());
 
       ACE_CString key = (*create_connection_key (connection));
       this->cookie_map_.rebind (key, cookie);
@@ -948,13 +894,11 @@ handle_publisher_consumer_connection (
       if (this->cookie_map_.find (key, cookie) != 0)
         {
           ACE_ERROR ((LM_ERROR, "Error: Cookie Not Found!\n"));
-          ACE_TRY_THROW (Deployment::InvalidConnection ());
+          throw Deployment::InvalidConnection ();
         }
 
       comp->unsubscribe (connection.portName.in (),
-                        cookie.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        cookie.in ());
       this->cookie_map_.unbind (key);
 
       if (CIAO::debug_level () > 6)
@@ -987,7 +931,7 @@ handle_publisher_es_connection (
                   "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
                   "CIAO::NodeApplication_Impl::handle_publisher_es_connection: "
                   "Unsupported event connection type\n"));
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      throw CORBA::NO_IMPLEMENT ();
     }
 
   const CIAO::CIAO_Event_Service_ptr event_service =
@@ -996,7 +940,7 @@ handle_publisher_es_connection (
   if (CORBA::is_nil (event_service))
     {
       ACE_DEBUG ((LM_DEBUG, "Nil event_service\n"));
-      ACE_THROW (Deployment::InvalidConnection ());
+      throw Deployment::InvalidConnection ();
     }
 
   // supplier ID
@@ -1045,7 +989,7 @@ handle_publisher_es_connection (
       if (this->cookie_map_.find (key, cookie) != 0)
         {
           ACE_ERROR ((LM_ERROR, "Error: Cookie Not Found!\n"));
-          ACE_TRY_THROW (Deployment::InvalidConnection ());
+          throw Deployment::InvalidConnection ();
         }
 
       comp->unsubscribe (connection.portName.in (),
@@ -1082,7 +1026,7 @@ handle_es_consumer_connection (
                   "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
                   "CIAO::NodeApplication_Impl::handle_es_consumer_connection: "
                   "Unsupported event connection type\n"));
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      throw CORBA::NO_IMPLEMENT ();
     }
 
   // Get ES object
@@ -1095,7 +1039,7 @@ handle_es_consumer_connection (
                   "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
                   "CIAO::NodeApplication_Impl::handle_es_consumer_connection: "
                   "NIL event_service\n"));
-      ACE_THROW (Deployment::InvalidConnection ());
+      throw Deployment::InvalidConnection ();
     }
 
   // Get consumer object
@@ -1108,7 +1052,7 @@ handle_es_consumer_connection (
                   "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
                   "CIAO::NodeApplication_Impl::handle_es_consumer_connection: "
                   "Nil consumer port object reference\n"));
-      ACE_THROW (Deployment::InvalidConnection ());
+      throw Deployment::InvalidConnection ();
     }
 
   // consumer ID
@@ -1186,8 +1130,7 @@ handle_es_consumer_connection (
 void
 CIAO::NodeApplication_Impl::build_event_connection (
     const Deployment::Connection & connection,
-    bool add_or_remove
-    ACE_ENV_ARG_DECL)
+    bool add_or_remove)
   ACE_THROW_SPEC ((Deployment::InvalidConnection,
                    CORBA::SystemException))
 {
@@ -1217,14 +1160,12 @@ CIAO::NodeApplication_Impl::build_event_connection (
 
     // Get the consumer port object reference and put it into "consumer"
     Components::EventConsumerBase_var consumer =
-      Components::EventConsumerBase::_narrow (connection.endpoint.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      Components::EventConsumerBase::_narrow (connection.endpoint.in ());
 
     if (CORBA::is_nil (consumer.in ()))
       {
         ACE_DEBUG ((LM_DEBUG, "Nil consumer port object reference\n"));
-        ACE_THROW (Deployment::InvalidConnection ());
+        throw Deployment::InvalidConnection ();
       }
 
     // Get the supplier component object reference.
@@ -1235,7 +1176,7 @@ CIAO::NodeApplication_Impl::build_event_connection (
     if (this->component_state_map_.find (supplier_comp_name, comp_state) != 0)
       {
         ACE_DEBUG ((LM_DEBUG, "Nil source component object reference\n"));
-        ACE_THROW (Deployment::InvalidConnection ());
+        throw Deployment::InvalidConnection ();
       }
 
     // Get the consumer component object reference.
@@ -1246,7 +1187,7 @@ CIAO::NodeApplication_Impl::build_event_connection (
     if (CORBA::is_nil (event_service))
       {
         ACE_DEBUG ((LM_DEBUG, "Nil event_service\n"));
-        ACE_THROW (Deployment::InvalidConnection ());
+        throw Deployment::InvalidConnection ();
       }
 
     // supplier ID
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index d682b0a58c6..c412b1aa9f5 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -98,14 +98,13 @@ namespace CIAO
     virtual void
     finishLaunch (const Deployment::Connections & connections,
                   CORBA::Boolean start,
-                  CORBA::Boolean add_connection
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                  CORBA::Boolean add_connection)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StartError,
                        Deployment::InvalidConnection));
 
     virtual void
-    start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    start ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StartError));
 
@@ -114,28 +113,27 @@ namespace CIAO
      *-----------------------------------------------------------*/
 
     virtual void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StartError));
 
     virtual void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StartError));
 
     virtual void
-    ciao_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StopError));
 
     /// Initialize the NodeApplication
-    virtual CORBA::Long init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long init ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Start install homes and components.
     virtual ::Deployment::ComponentInfos *
-      install (const ::Deployment::NodeImplementationInfo & node_impl_info
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      install (const ::Deployment::NodeImplementationInfo & node_impl_info)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Deployment::UnknownImplId,
                        ::Deployment::ImplEntryPointNotFound,
@@ -144,59 +142,52 @@ namespace CIAO
 
     /// Install a number of CIAO_Event_Service objects within the NA
     virtual ::CIAO::CIAO_Event_Service *
-      install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info)
       ACE_THROW_SPEC ((::CORBA::SystemException,
                        ::Deployment::InstallationFailure));
 
     /// Get the object reference of the NodeApplicationManager.
     /// This might come in handy later.
     virtual ::CORBA::Object_ptr
-    get_node_application_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_node_application_manager ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Access the readonly attribute.
     virtual ::Deployment::Properties *
-    properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    properties ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Remove a component instance from the NodeApplication
-    virtual void remove_component (const char * inst_name
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void remove_component (const char * inst_name)
       ACE_THROW_SPEC ((::CORBA::SystemException,
                        ::Components::RemoveFailure));
 
-    virtual void activate_component (const char * name
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void activate_component (const char * name)
       ACE_THROW_SPEC ((::CORBA::SystemException,
                        ::Deployment::StartError));
 
-    virtual void passivate_component (const char * name
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void passivate_component (const char * name)
       ACE_THROW_SPEC ((::CORBA::SystemException,
                        ::Components::RemoveFailure));
 
     /// Remove everything inside including all components and homes.
-    virtual void remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void remove ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Create a container interface, which will be hosted in this NodeApplication.
     virtual ::Deployment::Container_ptr
-      create_container (const ::Deployment::Properties &properties
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      create_container (const ::Deployment::Properties &properties)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::CreateFailure,
                        ::Components::InvalidConfiguration));
 
     /// Remove a container interface.
-    virtual void remove_container (::Deployment::Container_ptr cref
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void remove_container (::Deployment::Container_ptr cref)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::RemoveFailure));
 
     /// Get all container object refs
-    virtual ::Deployment::Containers * get_containers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual ::Deployment::Containers * get_containers ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /*-------------  CIAO specific helper functions (C++)---------
@@ -210,7 +201,7 @@ namespace CIAO
     /// Return the cached object reference of this NodeApplication object.
     /// This operation does *NOT* increase the reference count.
     ::Deployment::NodeApplication_ptr
-    get_objref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    get_objref ();
 
     /*------- CIAO helper functions for pub/sub service -------
      *
@@ -224,8 +215,7 @@ namespace CIAO
     /// event connection.
     void build_event_connection (
         const Deployment::Connection & connection,
-        bool add_or_remove
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        bool add_or_remove)
       ACE_THROW_SPEC ((Deployment::InvalidConnection,
                        CORBA::SystemException));
 
@@ -235,8 +225,7 @@ namespace CIAO
     virtual void
     finishLaunch_i (const Deployment::Connections & connections,
                     CORBA::Boolean start,
-                    CORBA::Boolean add_connection
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                    CORBA::Boolean add_connection)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StartError,
                        Deployment::InvalidConnection));
@@ -291,8 +280,7 @@ namespace CIAO
 
     /// Create and initialize all the containers
     virtual CORBA::Long create_all_containers (
-        const ::Deployment::ContainerImplementationInfos & container_infos
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const ::Deployment::ContainerImplementationInfos & container_infos)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Create a "key" for the connection
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
index 45046110ba8..2fefdcc84d4 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
@@ -19,7 +19,7 @@ NodeApplication_Impl (CORBA::ORB_ptr o,
 // Access the readonly attribute
 ACE_INLINE
 Deployment::Properties *
-CIAO::NodeApplication_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeApplication_Impl::properties ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Deployment::Properties * tmp = 0;
@@ -27,7 +27,6 @@ CIAO::NodeApplication_Impl::properties (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (tmp,
                     Deployment::Properties (this->properties_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return tmp;
 }
@@ -42,8 +41,7 @@ CIAO::NodeApplication_Impl::_default_POA (void)
 
 ACE_INLINE
 CORBA::Object_ptr
-CIAO::NodeApplication_Impl::get_node_application_manager (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CIAO::NodeApplication_Impl::get_node_application_manager ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::CORBA::Object::_duplicate (this->node_app_manager_.in ());
@@ -54,13 +52,12 @@ ACE_INLINE void
 CIAO::NodeApplication_Impl::
 set_objref (Components::Deployment::ServerActivator_ptr act,
             const Components::ConfigValues &config,
-            Components::Deployment::ComponentServer_ptr cs
-            ACE_ENV_ARG_DECL)
+            Components::Deployment::ComponentServer_ptr cs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!CORBA::is_nil (this->node_app_manager_.in ()) ||
       !CORBA::is_nil (this->objref_.in ()))
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw CORBA::BAD_INV_ORDER ();
 
   this->config_ = new Components::ConfigValues (config);
   this->activator_ = Components::Deployment::ServerActivator::_duplicate (act);
@@ -70,12 +67,11 @@ set_objref (Components::Deployment::ServerActivator_ptr act,
 
 ACE_INLINE ::Deployment::NodeApplication_ptr
 CIAO::NodeApplication_Impl::
-get_objref (ACE_ENV_SINGLE_ARG_DECL)
+get_objref ()
 {
   if (CORBA::is_nil (this->objref_.in ()))
     {
-      this->objref_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->objref_ = this->_this ();
     }
 
   return this->objref_.in ();
diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
index 6b899bd345d..b0dfb8a9ac0 100644
--- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
+++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
@@ -16,8 +16,7 @@ CIAO::RTResource_Config_Manager::init (RTCORBA::RTORB_ptr rtorb)
 
 void
 CIAO::RTResource_Config_Manager::print_resources
-(const CIAO::DAnCE::ServerResource &server_resource
- ACE_ENV_ARG_DECL)
+(const CIAO::DAnCE::ServerResource &server_resource)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CIAO::DAnCE::ORBResource &orb_resource
@@ -103,8 +102,7 @@ CIAO::RTResource_Config_Manager::print_resources
 
 void
 CIAO::RTResource_Config_Manager::init_resources
-(const CIAO::DAnCE::ServerResource &server_resource
- ACE_ENV_ARG_DECL)
+(const CIAO::DAnCE::ServerResource &server_resource)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -114,7 +112,7 @@ CIAO::RTResource_Config_Manager::init_resources
     {
       ACE_ERROR ((LM_ERROR,
                   "RTResource_Config_Manager has not been properly initialized.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   this->print_resources (server_resource);
@@ -139,16 +137,15 @@ CIAO::RTResource_Config_Manager::init_resources
          orb_resource.threadpool_list[i].default_priority,
          orb_resource.threadpool_list[i].allow_request_buffering,
          orb_resource.threadpool_list[i].max_buffered_requests,
-         orb_resource.threadpool_list[i].max_request_buffer_size
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;                // Simply pass back the exception here
+         orb_resource.threadpool_list[i].max_request_buffer_size);
+                      // Simply pass back the exception here
                                 // for now.  We need to have a better way
                                 // to handle execption here.
       if (this->threadpool_map_.bind (orb_resource.threadpool_list[i].Id.in (),
                                       thr_id) != 0)
         {
           ACE_ERROR ((LM_ERROR, "Error binding thread pool Id: %s to map when initializing RTNodeApplication resources.\n", orb_resource.threadpool_list[i].Id.in ()));
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       else
         {
@@ -189,9 +186,8 @@ CIAO::RTResource_Config_Manager::init_resources
          orb_resource.threadpool_with_lanes_list[i].allow_borrowing,
          orb_resource.threadpool_with_lanes_list[i].allow_request_buffering,
          orb_resource.threadpool_with_lanes_list[i].max_buffered_requests,
-         orb_resource.threadpool_with_lanes_list[i].max_request_buffer_size
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;                // Simply pass back the exception here
+         orb_resource.threadpool_with_lanes_list[i].max_request_buffer_size);
+                      // Simply pass back the exception here
                                 // for now.  We need to have a better way
                                 // to handle execption here.
 
@@ -202,7 +198,7 @@ CIAO::RTResource_Config_Manager::init_resources
                       "Error binding thread pool name: %s to map when "
                       "initializing RTNodeApplication resources.\n",
                       orb_resource.threadpool_with_lanes_list[i].Id.in ()));
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       else
@@ -234,7 +230,7 @@ CIAO::RTResource_Config_Manager::init_resources
                       "Error binding priority bands name: %s to map "
                       "when initializing RTNodeApplication resources.\n",
                       orb_resource.connection_bands_list[i].Id.in ()));
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       else
         {
@@ -259,9 +255,7 @@ CIAO::RTResource_Config_Manager::init_resources
       // Create a list of policies
       for (CORBA::ULong pc = 0; pc < np; ++pc)
         {
-          policy_list[pc] = this->create_single_policy (sets[i].policies[pc]
-                                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          policy_list[pc] = this->create_single_policy (sets[i].policies[pc]);
         }
 
       // Bind the policy list to the name.  The bind operation should
@@ -273,7 +267,7 @@ CIAO::RTResource_Config_Manager::init_resources
           ACE_ERROR ((LM_ERROR,
                       "Error binding Policy_Set with name: %s\n",
                       sets[i].Id.in ()));
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       else
         {
@@ -285,7 +279,7 @@ CIAO::RTResource_Config_Manager::init_resources
 }
 
 void
-CIAO::RTResource_Config_Manager::fini (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::RTResource_Config_Manager::fini ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TP_MAP::ITERATOR iter = this->threadpool_map_.begin ();
@@ -293,16 +287,13 @@ CIAO::RTResource_Config_Manager::fini (ACE_ENV_SINGLE_ARG_DECL)
 
   for (; iter != end; ++iter)
     {
-      this->rtorb_->destroy_threadpool ((*iter).int_id_
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->rtorb_->destroy_threadpool ((*iter).int_id_);
     }
 
 }
 
 RTCORBA::ThreadpoolId
-CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name
-                                                          ACE_ENV_ARG_DECL)
+CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (name == 0)
@@ -327,8 +318,7 @@ CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name
 }
 
 RTCORBA::PriorityBands *
-CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name
-                                                              ACE_ENV_ARG_DECL)
+CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (name == 0)
@@ -354,8 +344,7 @@ CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name
 }
 
 CORBA::PolicyList *
-CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name
-                                                   ACE_ENV_ARG_DECL)
+CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (name == 0)
@@ -390,8 +379,7 @@ CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name
 
 CORBA::Policy_ptr
 CIAO::RTResource_Config_Manager::create_single_policy
-(const CIAO::DAnCE::PolicyDef &policy_def
- ACE_ENV_ARG_DECL)
+(const CIAO::DAnCE::PolicyDef &policy_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //  if (CIAO::debug_level () > 9)
@@ -409,9 +397,7 @@ CIAO::RTResource_Config_Manager::create_single_policy
           = policy_def.PriorityModelDef ();
 
         retv = this->rtorb_->create_priority_model_policy ((RTCORBA::PriorityModel) tmp.priority_model,
-                                                           tmp.server_priority
-                                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+                                                           tmp.server_priority);
 
         if (! CORBA::is_nil (retv.in ()))
           ACE_DEBUG ((LM_DEBUG,
@@ -423,13 +409,9 @@ CIAO::RTResource_Config_Manager::create_single_policy
     case RTCORBA::THREADPOOL_POLICY_TYPE:
       {
         RTCORBA::ThreadpoolId tpid =
-          this->find_threadpool_by_name (policy_def.ThreadpoolDef().Id.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+          this->find_threadpool_by_name (policy_def.ThreadpoolDef().Id.in ());
 
-        retv = this->rtorb_->create_threadpool_policy (tpid
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+        retv = this->rtorb_->create_threadpool_policy (tpid);
 
         if (! CORBA::is_nil (retv.in ()))
           ACE_DEBUG ((LM_DEBUG,
@@ -441,14 +423,10 @@ CIAO::RTResource_Config_Manager::create_single_policy
     case RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE:
       {
         RTCORBA::PriorityBands_var bands =
-          this->find_priority_bands_by_name (policy_def.PriorityBandedConnectionDef().Id.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+          this->find_priority_bands_by_name (policy_def.PriorityBandedConnectionDef().Id.in ());
 
         retv =
-          this->rtorb_->create_priority_banded_connection_policy (bands.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+          this->rtorb_->create_priority_banded_connection_policy (bands.in ());
 
         if (! CORBA::is_nil (retv.in ()))
           {
diff --git a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
index 6527b7f607d..514a13cb797 100644
--- a/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
+++ b/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
@@ -56,34 +56,29 @@ namespace CIAO
     void init (RTCORBA::RTORB_ptr rtorb);
 
     /// Initializing the RTResource_Config_Manager
-    void init_resources (const CIAO::DAnCE::ServerResource &info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    void init_resources (const CIAO::DAnCE::ServerResource &info)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Finalizing the RTResource_Config_Manager and the resources it
     /// manages.
-    void fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    void fini ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Query a policy set by name
-    CORBA::PolicyList *find_policies_by_name (const char *name
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    CORBA::PolicyList *find_policies_by_name (const char *name)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
-    void print_resources (const CIAO::DAnCE::ServerResource &info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    void print_resources (const CIAO::DAnCE::ServerResource &info)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Query a thread pool by name.
-    RTCORBA::ThreadpoolId find_threadpool_by_name (const char *name
-                                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    RTCORBA::ThreadpoolId find_threadpool_by_name (const char *name)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     /// Query a priority bands info by name.
-    RTCORBA::PriorityBands *find_priority_bands_by_name (const char *name
-                                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    RTCORBA::PriorityBands *find_priority_bands_by_name (const char *name)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -114,8 +109,7 @@ namespace CIAO
 
     /// create a single policy
     CORBA::Policy_ptr create_single_policy
-    (const CIAO::DAnCE::PolicyDef &policy_def
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    (const CIAO::DAnCE::PolicyDef &policy_def)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Hash_Map stuff.
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 82398062b5f..51f6cbdb50e 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -49,7 +49,7 @@ is_external_component (ACE_CString & name)
 
 Deployment::Connections *
 CIAO::NodeApplicationManager_Impl_Base::
-create_connections (ACE_ENV_SINGLE_ARG_DECL)
+create_connections ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::ResourceNotAvailable,
                    Deployment::StartError,
@@ -61,7 +61,6 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retv,
                     Deployment::Connections (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::ULong len = retv->length ();
 
@@ -89,7 +88,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
           ACE_DEBUG ((LM_DEBUG, "NAMImpl::create_connections: Component %s is not shared, getting and setting "
                       "all facets\n",
                       comp_name.c_str ()));
-          facets = ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
+          facets = ((*iter).int_id_)->get_all_facets ();
           this->node_manager_->set_all_facets (comp_name, facets);
         }
 
@@ -118,7 +117,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
                       "all facets\n",
                       comp_name.c_str ()));
           consumers =
-            ((*iter).int_id_)->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+            ((*iter).int_id_)->get_all_consumers ();
           this->node_manager_->set_all_consumers (comp_name, consumers);
         }
 
@@ -182,14 +181,13 @@ Deployment::Application_ptr
 CIAO::NodeApplicationManager_Impl_Base::
 startLaunch (const Deployment::Properties & configProperty,
              Deployment::Connections_out providedReference,
-             CORBA::Boolean start
-             ACE_ENV_ARG_DECL)
+             CORBA::Boolean start)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::ResourceNotAvailable,
                    Deployment::StartError,
                    Deployment::InvalidProperty))
 {
-  ACE_TRY
+  try
     {
       CIAO_TRACE("CIAO::NodeApplicationManager_Impl::startLaunch");
       ACE_UNUSED_ARG (configProperty);
@@ -227,7 +225,7 @@ startLaunch (const Deployment::Properties & configProperty,
                       "CIAO::NodeApplicationManager_Impl::startLaunch -"
                       "Failed to create Node Implementation Infos!\n"));
 
-          ACE_TRY_THROW
+          throw
             (Deployment::StartError ("NodeApplicationManager_Imp::startLaunch",
                                      "Unable to get node level infos"));
         }
@@ -272,8 +270,7 @@ startLaunch (const Deployment::Properties & configProperty,
         }
 
       Deployment::NodeApplication_var tmp =
-        create_node_application (cmd_option.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        create_node_application (cmd_option.c_str ());
 
       if (CIAO::debug_level () > 9)
         {
@@ -303,8 +300,7 @@ startLaunch (const Deployment::Properties & configProperty,
       Deployment::ComponentInfos_var comp_info;
 
       // This will install all homes and components.
-      comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      comp_info = this->nodeapp_->install (*node_info);
 
 
       // Now fill in the map we have for the "newly installed" components.
@@ -322,7 +318,7 @@ startLaunch (const Deployment::Properties & configProperty,
               ACE_CString error ("Duplicate component instance name ");
               error += comp_info[len].component_instance_name.in();
 
-              ACE_TRY_THROW
+              throw
                 (Deployment::StartError
                  ("NodeApplicationManager_Impl::startLaunch",
                   error.c_str ()));
@@ -342,7 +338,7 @@ startLaunch (const Deployment::Properties & configProperty,
               ACE_CString error ("Duplicate component instance name ");
               error += this->shared_components_[j].name.in();
 
-              ACE_TRY_THROW
+              throw
                 (Deployment::StartError
                  ("NodeApplicationManager_Impl::startLaunch",
                   error.c_str ()));
@@ -351,37 +347,34 @@ startLaunch (const Deployment::Properties & configProperty,
 
 
       providedReference =
-        this->create_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->create_connections ();
 
       if (providedReference == 0)
         {
-          ACE_TRY_THROW
+          throw
             (Deployment::StartError
              ("NodeApplicationManager_Impl::startLaunch",
               "Error creating connections for components during startLaunch."));
         }
     }
-  ACE_CATCH (Deployment::UnknownImplId, e)
+  catch (const Deployment::UnknownImplId& e)
     {
       ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
                                                 e.reason.in ()),
                         Deployment::Application::_nil());
     }
-  ACE_CATCH (Deployment::ImplEntryPointNotFound, e)
+  catch (const Deployment::ImplEntryPointNotFound& e)
     {
       ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
                                                 e.reason.in ()),
                         Deployment::Application::_nil());
     }
-  ACE_CATCH (Deployment::InstallationFailure,e)
+  catch (const Deployment::InstallationFailure& e)
     {
       ACE_THROW_RETURN (Deployment::StartError (e.name.in (),
                                                 e.reason.in ()),
                         Deployment::Application::_nil());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (Deployment::Application::_nil());
 
   return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
 }
@@ -392,8 +385,7 @@ CIAO::NodeApplicationManager_Impl_Base::
 perform_redeployment (const Deployment::Properties & configProperty,
                       Deployment::Connections_out providedReference,
                       CORBA::Boolean /*add_or_remove*/, // true means "add" only
-                      CORBA::Boolean start
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Boolean start)
   ACE_THROW_SPEC ((::CORBA::SystemException,
                    ::Deployment::PlanError,
                    ::Deployment::InstallationFailure,
@@ -432,7 +424,7 @@ perform_redeployment (const Deployment::Properties & configProperty,
   ACE_DEBUG ((LM_DEBUG,
               "CIAO (%P|%t) NodeApplicationManager_Impl_Base: "
               "invoked CIAO::NodeApplicationManager_Impl_Base::perform_redeployment \n"));
-  ACE_TRY
+  try
     {
       if (! CORBA::is_nil (this->nodeapp_.in ()))
         {
@@ -467,8 +459,7 @@ perform_redeployment (const Deployment::Properties & configProperty,
           // Install the components
           // This is what we will get back, a sequence of compoent object refs.
           Deployment::ComponentInfos_var comp_info;
-          comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          comp_info = this->nodeapp_->install (*node_info);
 
           // Now fill in the map we have for the components.
           const CORBA::ULong comp_len = comp_info->length ();
@@ -485,7 +476,7 @@ perform_redeployment (const Deployment::Properties & configProperty,
                   ACE_CString error ("Duplicate component instance name ");
                   error += comp_info[len].component_instance_name.in();
 
-                  ACE_TRY_THROW
+                  throw
                     (Deployment::PlanError
                      ("NodeApplicationManager_Impl::startLaunch",
                       error.c_str ()));
@@ -495,12 +486,11 @@ perform_redeployment (const Deployment::Properties & configProperty,
           // NOTE: We are propogating back "all" the facets/consumers object
           // references to the DAM, including the previous existing ones.
           providedReference =
-            this->create_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->create_connections ();
 
           if (providedReference == 0)
             {
-              ACE_TRY_THROW
+              throw
                 (Deployment::InstallationFailure
                   ("NodeApplicationManager_Impl::startLaunch",
                     "Error creating connections during startLaunch."));
@@ -511,31 +501,27 @@ perform_redeployment (const Deployment::Properties & configProperty,
         {
           this->startLaunch (configProperty,
                              providedReference,
-                             start
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             start);
         }
     }
-  ACE_CATCH (Deployment::UnknownImplId, e)
+  catch (const Deployment::UnknownImplId& e)
     {
       ACE_THROW_RETURN (Deployment::UnknownImplId (e.name.in (),
                                                    e.reason.in ()),
                         Deployment::Application::_nil());
     }
-  ACE_CATCH (Deployment::ImplEntryPointNotFound, e)
+  catch (const Deployment::ImplEntryPointNotFound& e)
     {
       ACE_THROW_RETURN (Deployment::ImplEntryPointNotFound (e.name.in (),
                                                             e.reason.in ()),
                         Deployment::Application::_nil());
     }
-  ACE_CATCH (Deployment::InstallationFailure,e)
+  catch (const Deployment::InstallationFailure& e)
     {
       ACE_THROW_RETURN (Deployment::InstallationFailure (e.name.in (),
                                                          e.reason.in ()),
                         Deployment::Application::_nil());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (Deployment::Application::_nil());
 
   return Deployment::NodeApplication::_duplicate (this->nodeapp_.in ());
 }
@@ -552,7 +538,7 @@ add_new_components ()
                    ::Deployment::InvalidConnection,
                    ::Deployment::InvalidProperty))
 {
-  ACE_TRY
+  try
     {
       // We ignored those components that are already in the <component_map_>, for
       // the rest ones, we pack them into NodeImplementationInfo.
@@ -588,7 +574,7 @@ add_new_components ()
                       "CIAO::NodeApplicationManager_Impl::perform_redeployment -"
                       "Failed to create Node Implementation Infos!\n"));
 
-          ACE_TRY_THROW
+          throw
             (Deployment::PlanError ("NodeApplicationManager_Imp::perform_redeployment",
                                     "Unable to get node level infos"));
         }
@@ -596,8 +582,7 @@ add_new_components ()
       // Install the components
       // This is what we will get back, a sequence of component object refs.
       Deployment::ComponentInfos_var comp_info;
-      comp_info = this->nodeapp_->install (*node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      comp_info = this->nodeapp_->install (*node_info);
 
       // Now fill in the map we have for the components.
       const CORBA::ULong comp_len = comp_info->length ();
@@ -614,20 +599,19 @@ add_new_components ()
               ACE_CString error ("Duplicate component instance name ");
               error += comp_info[len].component_instance_name.in();
 
-              ACE_TRY_THROW
+              throw
                 (Deployment::PlanError
                   ("NodeApplicationManager_Impl::startLaunch",
                     error.c_str ()));
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR, "NodeApplicationManager_Impl_Base::"
                   "add_new_components () exception caught.\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 
@@ -638,7 +622,7 @@ remove_existing_components ()
                    ::Deployment::PlanError,
                    ::Components::RemoveFailure))
 {
-  ACE_TRY
+  try
     {
       ACE_Vector<ACE_CString> gone_component_list;
 
@@ -661,13 +645,12 @@ remove_existing_components ()
         for (size_t i = 0; i < gone_component_list.size (); ++i)
           this->component_map_.unbind (gone_component_list[i]);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR, "NodeApplicationManager_Impl_Base::"
                   "remove_existing_components () exception caught.\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 bool
@@ -690,8 +673,7 @@ is_to_be_removed (const char * name)
 
 void
 CIAO::NodeApplicationManager_Impl_Base::
-set_shared_components (const Deployment::ComponentPlans & shared
-                       ACE_ENV_ARG_DECL)
+set_shared_components (const Deployment::ComponentPlans & shared)
   ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   this->shared_components_ = shared;
@@ -699,8 +681,7 @@ set_shared_components (const Deployment::ComponentPlans & shared
 
 void
 CIAO::NodeApplicationManager_Impl_Base::
-destroyApplication (Deployment::Application_ptr app
-                    ACE_ENV_ARG_DECL)
+destroyApplication (Deployment::Application_ptr app)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StopError))
 {
@@ -712,7 +693,7 @@ destroyApplication (Deployment::Application_ptr app
   //@@ Since we know there is only 1 nodeapp so the passed in
   //   parameter is ignored for now.
   if (CORBA::is_nil (this->nodeapp_.in () ))
-    ACE_THROW (Deployment::StopError ());
+    throw Deployment::StopError ();
 
   // Iterate over all the components within this NAM, and if it's
   // not a shared component, then remove it. If all the components
@@ -742,9 +723,8 @@ destroyApplication (Deployment::Application_ptr app
   // Call remove on NodeApplication, if all the components are removed,
   // then the NodeApplication will kill itself.
   ACE_DEBUG ((LM_DEBUG, "NAM: calling remove\n"));
-  this->nodeapp_->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->nodeapp_->remove ();
   ACE_DEBUG ((LM_DEBUG, "NAM: remove returned\n"));
-  ACE_CHECK;
 
   return;
 }
@@ -753,8 +733,7 @@ destroyApplication (Deployment::Application_ptr app
 ::CORBA::Long
 CIAO::NodeApplicationManager_Impl_Base::set_priority (
                                                       const char * cid,
-                                                      const ::Deployment::Sched_Params & params
-                                                      ACE_ENV_ARG_DECL)
+                                                      const ::Deployment::Sched_Params & params)
   ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   if (CIAO::debug_level () > 20)
@@ -843,14 +822,13 @@ CIAO::NodeApplicationManager_Impl::init (
                                          const CORBA::ULong delay,
                                          const Deployment::DeploymentPlan & plan,
                                          const PortableServer::POA_ptr callback_poa,
-                                         NodeManager_Impl_Base * nm
-                                         ACE_ENV_ARG_DECL)
+                                         NodeManager_Impl_Base * nm)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::InvalidProperty))
 {
   PortableServer::ObjectId_var oid;
 
-  ACE_TRY
+  try
     {
       if (nodeapp_location == 0)
         {
@@ -858,7 +836,7 @@ CIAO::NodeApplicationManager_Impl::init (
                       "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
                       "CIAO::NodeApplicationManager_Impl::init -"
                       "NULL NodeApplication location. \n"));
-          ACE_TRY_THROW (CORBA::BAD_PARAM ());
+          throw CORBA::BAD_PARAM ();
         }
 
       if (delay == 0)
@@ -868,7 +846,7 @@ CIAO::NodeApplicationManager_Impl::init (
                       "CIAO::NodeApplicationManager_Impl::init -"
                       "NodeManager must be started with a -d "
                       "of greter than zero.\n"));
-          ACE_TRY_THROW (CORBA::BAD_PARAM ());
+          throw CORBA::BAD_PARAM ();
         }
 
       this->nodeapp_path_.set (nodeapp_location);
@@ -883,20 +861,14 @@ CIAO::NodeApplicationManager_Impl::init (
       this->callback_poa_ = PortableServer::POA::_duplicate (callback_poa);
 
       // Activate the ourself.
-      oid = this->poa_->activate_object (this
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      oid = this->poa_->activate_object (this);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->id_to_reference (oid.in ());
 
       // And cache the object reference.
       this->objref_ =
-        Deployment::NodeApplicationManager::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Deployment::NodeApplicationManager::_narrow (obj.in ());
 
       // add the signal handler to the ACE_REACTOR
 
@@ -913,14 +885,11 @@ CIAO::NodeApplicationManager_Impl::init (
       */
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeApplicationManager_Impl_Base::init\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("NodeApplicationManager_Impl_Base::init\t\n");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   //return this object reference
   return oid.in ();
@@ -928,8 +897,7 @@ CIAO::NodeApplicationManager_Impl::init (
 
 Deployment::NodeApplication_ptr
 CIAO::NodeApplicationManager_Impl::
-create_node_application (const ACE_CString & options
-                         ACE_ENV_ARG_DECL)
+create_node_application (const ACE_CString & options)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::ResourceNotAvailable,
                    Deployment::StartError,
@@ -942,7 +910,6 @@ create_node_application (const ACE_CString & options
   ACE_NEW_THROW_EX (prop,
                     Deployment::Properties,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
 
   // @@ Create a new callback servant.
   CIAO::NodeApplication_Callback_Impl * callback_servant = 0;
@@ -952,35 +919,26 @@ create_node_application (const ACE_CString & options
                                                          this->objref_.in (),
                                                          prop.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
 
   PortableServer::ServantBase_var servant_var (callback_servant);
   PortableServer::ObjectId_var cb_id
-    = this->callback_poa_->activate_object (callback_servant
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
+    = this->callback_poa_->activate_object (callback_servant);
 
   ACE_Process_Options p_options;
   ACE_Process_Manager process_manager;
 
   process_manager.open (10, ACE_Reactor::instance ());
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var cb_obj =
-        this->callback_poa_->id_to_reference (cb_id.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->callback_poa_->id_to_reference (cb_id.in ());
 
       CIAO::NodeApplication_Callback_var cb =
-        CIAO::NodeApplication_Callback::_narrow (cb_obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CIAO::NodeApplication_Callback::_narrow (cb_obj.in ());
 
       CORBA::String_var cb_ior =
-        this->orb_->object_to_string (cb.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (cb.in ());
 
       // spawn the new NodeApplication.
       p_options.command_line ("%s -k %s "
@@ -1002,7 +960,7 @@ create_node_application (const ACE_CString & options
                           "Fail to spawn a NodeApplication process\n"));
             }
 
-          ACE_TRY_THROW
+          throw
             (Deployment::ResourceNotAvailable
              ("Failed to spawn process",
               "NodeApplication",
@@ -1019,9 +977,7 @@ create_node_application (const ACE_CString & options
 
       while (looping)
         {
-          this->orb_->perform_work (timeout
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->perform_work (timeout);
 
           retval = callback_servant->get_nodeapp_ref ();
 
@@ -1037,7 +993,7 @@ create_node_application (const ACE_CString & options
                           "Fail to acquire the NodeApplication object\n"));
             }
 
-          ACE_TRY_THROW (Deployment::ResourceNotAvailable ());
+          throw Deployment::ResourceNotAvailable ();
         }
 
       {
@@ -1046,18 +1002,14 @@ create_node_application (const ACE_CString & options
           Deployment::NodeApplication::_duplicate (retval.in ());
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       this->callback_poa_->deactivate_object (cb_id.in ());
-      ACE_TRY_CHECK;
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil ());
 
-  this->callback_poa_->deactivate_object (cb_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil ());
+  this->callback_poa_->deactivate_object (cb_id.in ());
 
   if (CIAO::debug_level () > 1)
     {
@@ -1116,8 +1068,7 @@ CIAO::Static_NodeApplicationManager_Impl::init (
                                                 const CORBA::ULong delay,
                                                 const Deployment::DeploymentPlan & plan,
                                                 const PortableServer::POA_ptr callback_poa,
-                                                NodeManager_Impl_Base * nm
-                                                ACE_ENV_ARG_DECL)
+                                                NodeManager_Impl_Base * nm)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::InvalidProperty))
 {
@@ -1128,7 +1079,7 @@ CIAO::Static_NodeApplicationManager_Impl::init (
   ACE_UNUSED_ARG (delay);
   ACE_UNUSED_ARG (callback_poa);
 
-  ACE_TRY
+  try
     {
       this->node_manager_ = nm;
 
@@ -1136,29 +1087,20 @@ CIAO::Static_NodeApplicationManager_Impl::init (
       this->plan_ =  plan;
 
       // Activate the ourself.
-      oid = this->poa_->activate_object (this
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      oid = this->poa_->activate_object (this);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->id_to_reference (oid.in ());
 
       // And cache the object reference.
       this->objref_ =
-        Deployment::NodeApplicationManager::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Deployment::NodeApplicationManager::_narrow (obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeApplicationManager_Impl_Base::init\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("NodeApplicationManager_Impl_Base::init\t\n");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   //return this object reference
   return oid.in ();
@@ -1166,8 +1108,7 @@ CIAO::Static_NodeApplicationManager_Impl::init (
 
 Deployment::NodeApplication_ptr
 CIAO::Static_NodeApplicationManager_Impl::
-create_node_application (const ACE_CString & options
-                         ACE_ENV_ARG_DECL)
+create_node_application (const ACE_CString & options)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::ResourceNotAvailable,
                    Deployment::StartError,
@@ -1186,29 +1127,22 @@ create_node_application (const ACE_CString & options
                                               this->static_config_entrypoints_maps_),
                   Deployment::NodeApplication::_nil ()
                   );
-  if (nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER))
+  if (nodeapp_servant->init ())
     {
       ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
                                initializing the session container!"));
       return Deployment::NodeApplication::_nil ();
     }
-  ACE_TRY_CHECK;
 
   // CONFIGURING NodeApplication
   PortableServer::ObjectId_var nodeapp_oid
-    = poa_->activate_object (nodeapp_servant
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    = poa_->activate_object (nodeapp_servant);
 
   CORBA::Object_var
-    obj = poa_->id_to_reference (nodeapp_oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    obj = poa_->id_to_reference (nodeapp_oid.in ());
 
   Deployment::NodeApplication_var nodeapp_obj =
-    Deployment::NodeApplication::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    Deployment::NodeApplication::_narrow (obj.in ());
 
   if (CORBA::is_nil (nodeapp_obj.in ()))
     {
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index fdaa59ba216..5ea55596f1b 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -64,16 +64,14 @@ namespace CIAO
     virtual Deployment::Application_ptr
     startLaunch (const Deployment::Properties & configProperty,
                  Deployment::Connections_out providedReference,
-                 CORBA::Boolean start
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                 CORBA::Boolean start)
       ACE_THROW_SPEC ((CORBA::SystemException,
                               Deployment::ResourceNotAvailable,
                               Deployment::StartError,
                               Deployment::InvalidProperty));
 
     //@@ Destroy the whole applicaton.
-    virtual void destroyApplication (Deployment::Application_ptr
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void destroyApplication (Deployment::Application_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                               Deployment::StopError));
 
@@ -81,8 +79,7 @@ namespace CIAO
     perform_redeployment (const Deployment::Properties & configProperty,
                           Deployment::Connections_out providedReference,
                           CORBA::Boolean add_or_remove,
-                          CORBA::Boolean start
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                          CORBA::Boolean start)
       ACE_THROW_SPEC ((::CORBA::SystemException,
                        ::Deployment::PlanError,
                        ::Deployment::InstallationFailure,
@@ -93,13 +90,11 @@ namespace CIAO
                        ::Components::RemoveFailure));
 
     virtual void
-    reset_plan (const ::Deployment::DeploymentPlan & plan
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    reset_plan (const ::Deployment::DeploymentPlan & plan)
       ACE_THROW_SPEC ((::CORBA::SystemException));
 
     virtual void
-    set_shared_components (const Deployment::ComponentPlans & shared
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    set_shared_components (const Deployment::ComponentPlans & shared)
       ACE_THROW_SPEC ((::CORBA::SystemException));
 
     /**
@@ -139,8 +134,7 @@ namespace CIAO
           const CORBA::ULong delay,
           const Deployment::DeploymentPlan & plan,
           const PortableServer::POA_ptr callback_poa,
-          NodeManager_Impl_Base * nm
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          NodeManager_Impl_Base * nm)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::InvalidProperty))=0;
 
@@ -150,8 +144,7 @@ namespace CIAO
     /// Set the priority of the NodeApplication process which this NAM manages
     virtual ::CORBA::Long set_priority (
         const char * cid,
-        const ::Deployment::Sched_Params & params
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const ::Deployment::Sched_Params & params)
       ACE_THROW_SPEC ((CORBA::SystemException ));
 
   protected:
@@ -183,8 +176,7 @@ namespace CIAO
 
     /// Internal help function to create new NodeApplicationProcess
     virtual Deployment::NodeApplication_ptr
-    create_node_application (const ACE_CString & options
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    create_node_application (const ACE_CString & options)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::ResourceNotAvailable,
                        Deployment::StartError,
@@ -192,7 +184,7 @@ namespace CIAO
 
     /// Helper function to get the connection.
     virtual Deployment::Connections *
-    create_connections (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create_connections ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::ResourceNotAvailable,
                        Deployment::StartError,
@@ -202,8 +194,7 @@ namespace CIAO
      * Find the configurations in the plan and prepare them to pass to the
      * NodeApplication, from command line probably.
      */
-    void parse_config_value (ACE_CString & str
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    void parse_config_value (ACE_CString & str)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::InvalidProperty));
 
@@ -331,8 +322,7 @@ namespace CIAO
           const CORBA::ULong delay,
           const Deployment::DeploymentPlan & plan,
           const PortableServer::POA_ptr callback_poa,
-          NodeManager_Impl_Base * nm
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          NodeManager_Impl_Base * nm)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::InvalidProperty));
 
@@ -343,8 +333,7 @@ namespace CIAO
     // Internal help function to create new NodeApplicationProcess
     // Here we override it to create an in-process NodeApplication object
     virtual Deployment::NodeApplication_ptr
-    create_node_application (const ACE_CString & options
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    create_node_application (const ACE_CString & options)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::ResourceNotAvailable,
                        Deployment::StartError,
@@ -384,8 +373,7 @@ namespace CIAO
           const CORBA::ULong delay,
           const Deployment::DeploymentPlan & plan,
           const PortableServer::POA_ptr callback_poa,
-          NodeManager_Impl_Base * nm
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          NodeManager_Impl_Base * nm)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::InvalidProperty));
 
@@ -396,8 +384,7 @@ namespace CIAO
     /// Internal help function to create new NodeApplicationProcess
     /// Here we override it to create an in-process NodeApplication object
     virtual Deployment::NodeApplication_ptr
-    create_node_application (const ACE_CString & options
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    create_node_application (const ACE_CString & options)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::ResourceNotAvailable,
                        Deployment::StartError,
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
index e744e953876..49bdc80098e 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
@@ -22,15 +22,14 @@ NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
 ACE_INLINE
 void
 CIAO::NodeApplicationManager_Impl_Base::
-parse_config_value (ACE_CString & str
-                    ACE_ENV_ARG_DECL)
+parse_config_value (ACE_CString & str)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::InvalidProperty))
 {
   // The unused arg is for future improvemnts.
   ACE_UNUSED_ARG (str);
 
-  ACE_THROW ( CORBA::NO_IMPLEMENT() );
+  throw CORBA::NO_IMPLEMENT();
 }
 
 ACE_INLINE
@@ -42,8 +41,7 @@ CIAO::NodeApplicationManager_Impl_Base::get_nodeapp_manager (void)
 
 ACE_INLINE void
 CIAO::NodeApplicationManager_Impl_Base::
-reset_plan (const ::Deployment::DeploymentPlan & plan
-            ACE_ENV_ARG_DECL)
+reset_plan (const ::Deployment::DeploymentPlan & plan)
   ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   this->plan_ = plan;
diff --git a/CIAO/DAnCE/NodeManager/MonitorCB.cpp b/CIAO/DAnCE/NodeManager/MonitorCB.cpp
index e7893327b8a..56a789a76a3 100644
--- a/CIAO/DAnCE/NodeManager/MonitorCB.cpp
+++ b/CIAO/DAnCE/NodeManager/MonitorCB.cpp
@@ -49,7 +49,7 @@ int CIAO::MonitorCB::update_data (::Deployment::Domain& data)
   catch (CORBA::Exception& )
     {
       //ACE_DEBUG ((LM_DEBUG, "CIAO::NM::MonitorCB::Unknown Exception\n"));
-      //ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NM::MonitorCB::updateDomain");
+      //ex._tao_print_exception ("NM::MonitorCB::updateDomain");
     }
   catch (...)
     {
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 7ef8a09de85..5e8fea451cd 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -26,31 +26,25 @@ CIAO::NodeManager_Impl_Base::~NodeManager_Impl_Base ()
 }
 
 void
-CIAO::NodeManager_Impl_Base::init (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeManager_Impl_Base::init ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       // Create the call back poa for NAM.
       PortableServer::POAManager_var mgr
-        = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = this->poa_->the_POAManager ();
 
       this->callback_poa_ =
         this->poa_->create_POA ("callback_poa",
                                 mgr.in (),
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeManager_Impl::init\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("NodeManager_Impl::init\t\n");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 PortableServer::POA_ptr
@@ -61,26 +55,24 @@ CIAO::NodeManager_Impl_Base::_default_POA (void)
 
 
 char *
-CIAO::NodeManager_Impl_Base::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CIAO::NodeManager_Impl_Base::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
-CIAO::NodeManager_Impl_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeManager_Impl_Base::shutdown ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 void
 CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain,
                                          Deployment::TargetManager_ptr target,
-                                         Deployment::Logger_ptr
-                                         ACE_ENV_ARG_DECL)
+                                         Deployment::Logger_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //  ACE_THROW (CORBA::NO_IMPLEMENT ());
@@ -111,7 +103,7 @@ CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain,
 }
 
 void
-CIAO::NodeManager_Impl_Base::leaveDomain (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeManager_Impl_Base::leaveDomain ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the monitor , this will also terminate the thread
@@ -123,7 +115,6 @@ CIAO::NodeManager_Impl_Base::set_priority (
                                            const char * plan_id,
                                            const char * cid,
                                            const ::Deployment::Sched_Params & nm_params
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                            )
   ACE_THROW_SPEC ((::CORBA::SystemException))
 
@@ -150,9 +141,8 @@ CIAO::NodeManager_Impl_Base::set_priority (
   catch (CORBA::Exception& ex)
     {
 
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) NodeManager_Impl::set_priority ()\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("(%P|%t) NodeManager_Impl::set_priority ()\t\n");
+      throw;
     }
 }
 
@@ -233,8 +223,7 @@ set_all_consumers (ACE_CString &name,
 
 Deployment::NodeApplicationManager_ptr
 CIAO::NodeManager_Impl_Base::
-preparePlan (const Deployment::DeploymentPlan &plan
-             ACE_ENV_ARG_DECL)
+preparePlan (const Deployment::DeploymentPlan &plan)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError,
                    Deployment::PlanError))
@@ -282,7 +271,7 @@ preparePlan (const Deployment::DeploymentPlan &plan
     }
 
   // Create/find NodeApplicationManager and set/reset plan on it
-  ACE_TRY
+  try
     {
       if (!this->map_.is_available (plan.UUID.in ()))
         {
@@ -295,9 +284,7 @@ preparePlan (const Deployment::DeploymentPlan &plan
 
           // Implementation undefined.
           CIAO::NodeApplicationManager_Impl_Base *node_app_mgr =
-            this->create_node_app_manager (this->orb_.in (), this->poa_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->create_node_app_manager (this->orb_.in (), this->poa_.in ());
 
           PortableServer::ServantBase_var safe (node_app_mgr);
 
@@ -311,14 +298,12 @@ preparePlan (const Deployment::DeploymentPlan &plan
                                 plan,
                                 this->callback_poa_.in (),
                                 this // pass in a copy of ourself (servant object)
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                );
 
           this->map_.insert_nam (plan.UUID.in (), oid.in ());
 
           CORBA::Object_var obj =
             this->poa_->id_to_reference (this->map_.get_nam (plan.UUID.in ()));
-          ACE_TRY_CHECK;
 
           // We should inform NAM about "shared" components, so they
           // won't be instantiated again
@@ -344,14 +329,11 @@ preparePlan (const Deployment::DeploymentPlan &plan
 
           CORBA::Object_var obj =
             this->poa_->id_to_reference (this->map_.get_nam (plan.UUID.in ()));
-          ACE_TRY_CHECK;
 
           Deployment::NodeApplicationManager_var nam =
             Deployment::NodeApplicationManager::_narrow (obj.in ());
-          ACE_TRY_CHECK;
 
           nam->reset_plan (plan);
-          ACE_TRY_CHECK;
 
           // Similarly, we should inform NAM about "shared" components, so
           // they won't be instantiated again
@@ -364,39 +346,33 @@ preparePlan (const Deployment::DeploymentPlan &plan
           return nam._retn ();
         }
     }
-  ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
+  catch (const PortableServer::POA::ObjectNotActive&)
     {
       ACE_THROW_RETURN (Deployment::StartError (),
                         Deployment::NodeApplicationManager::_nil ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) NodeManager_Impl::preparePlan\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("(%P|%t) NodeManager_Impl::preparePlan\t\n");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (Deployment::NodeApplicationManager::_nil ());
 
   return Deployment::NodeApplicationManager::_nil ();
 }
 
 void
 CIAO::NodeManager_Impl_Base::destroyManager
-(Deployment::NodeApplicationManager_ptr manager
- ACE_ENV_ARG_DECL)
+(Deployment::NodeApplicationManager_ptr manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StopError,
                    Deployment::InvalidReference))
 {
   CIAO_TRACE("CIAO::NodeManager_Impl::destroyManager");
-  ACE_TRY
+  try
     {
       // Deactivate this object
       PortableServer::ObjectId_var id =
-        this->poa_->reference_to_id (manager
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->reference_to_id (manager);
 
       if (!this->map_.remove_nam (id.in ()))
         {
@@ -405,38 +381,33 @@ CIAO::NodeManager_Impl_Base::destroyManager
                       "Unable to remove object from map!\n"));
         }
 
-      this->poa_->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_->deactivate_object (id.in ());
     }
-  ACE_CATCH (PortableServer::POA::WrongAdapter, ex)
+  catch (const PortableServer::POA::WrongAdapter&)
     {
       ACE_ERROR ((LM_ERROR,
                   "NodeManager_Impl::destroyManager: EXCEPTION -  "
                   "Invalid reference passed to destroyManager\n"));
 
-      ACE_THROW (::Deployment::InvalidReference ());
+      throw ::Deployment::InvalidReference ();
     }
-  ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
+  catch (const PortableServer::POA::ObjectNotActive&)
     {
       ACE_ERROR ((LM_ERROR,
                   "NodeManager_Impl::destroyManager: EXCEPTION - "
                   " asked to destroy an already inactive object.\n"));
-      ACE_THROW (::Deployment::InvalidReference ());
+      throw ::Deployment::InvalidReference ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeManager_Impl::destroyManager\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("NodeManager_Impl::destroyManager\t\n");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
 CIAO::NodeManager_Impl_Base::
-destroyPlan (const Deployment::DeploymentPlan & plan
-             ACE_ENV_ARG_DECL)
+destroyPlan (const Deployment::DeploymentPlan & plan)
   ACE_THROW_SPEC ((::CORBA::SystemException,
                    ::Deployment::StopError))
 {
@@ -474,7 +445,7 @@ destroyPlan (const Deployment::DeploymentPlan & plan
                   this->comp_consumers_map_.unbind (
                                                     plan.instance[i].name.in ()) != 0)
                 {
-                  ACE_TRY_THROW
+                  throw
                     (Deployment::StopError ("NodeManager_Impl_Base::destroyPlan ",
                                             "Unable to find component instance"));
                 }
@@ -504,7 +475,7 @@ destroyPlan (const Deployment::DeploymentPlan & plan
 
 Deployment::ComponentPlans *
 CIAO::NodeManager_Impl_Base::
-get_shared_components (ACE_ENV_SINGLE_ARG_DECL)
+get_shared_components ()
   ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   return this->get_shared_components_i ();
@@ -656,8 +627,7 @@ NodeManager_Impl (const char *name,
 ::CIAO::NodeApplicationManager_Impl_Base *
 CIAO::NodeManager_Impl::
 create_node_app_manager (CORBA::ORB_ptr orb,
-                         PortableServer::POA_ptr poa
-                         ACE_ENV_ARG_DECL)
+                         PortableServer::POA_ptr poa)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CIAO::NodeApplicationManager_Impl_Base *app_mgr = 0;
@@ -687,8 +657,7 @@ Static_NodeManager_Impl (const char *name,
 ::CIAO::NodeApplicationManager_Impl_Base *
 CIAO::Static_NodeManager_Impl::
 create_node_app_manager (CORBA::ORB_ptr orb,
-                         PortableServer::POA_ptr poa
-                         ACE_ENV_ARG_DECL)
+                         PortableServer::POA_ptr poa)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CIAO::debug_level () > 10)
@@ -707,28 +676,23 @@ create_node_app_manager (CORBA::ORB_ptr orb,
 
 void
 CIAO::Static_NodeManager_Impl::destroyManager
-(Deployment::NodeApplicationManager_ptr manager
- ACE_ENV_ARG_DECL)
+(Deployment::NodeApplicationManager_ptr manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StopError,
                    Deployment::InvalidReference))
 {
   CIAO_TRACE("CIAO::Static_NodeManager_Impl::destroyManager");
-  ACE_TRY
+  try
     {
-      CIAO::NodeManager_Impl_Base::destroyManager (manager ACE_ENV_ARG_PARAMETER);
+      CIAO::NodeManager_Impl_Base::destroyManager (manager);
 
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+      this->orb_->shutdown (0);
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Static_NodeManager_Impl::destroyManager\t\n");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Static_NodeManager_Impl::destroyManager\t\n");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK;
 }
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
index fbf9d42177d..cea98f0fa91 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
@@ -74,53 +74,49 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Initializes the NodeManager.
-    virtual void init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void init ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// POA operation..
     virtual PortableServer::POA_ptr _default_POA (void);
 
     /// CIAO::Daemon defined attributes/operations.
-    virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * name ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void shutdown ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void joinDomain (const Deployment::Domain & domain,
                              Deployment::TargetManager_ptr manager,
                              Deployment::Logger_ptr log
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS
                              )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void leaveDomain (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void leaveDomain ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Deployment::NodeApplicationManager_ptr
-    preparePlan (const Deployment::DeploymentPlan &plan
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    preparePlan (const Deployment::DeploymentPlan &plan)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StartError,
                        Deployment::PlanError));
 
     virtual void
-    destroyManager (Deployment::NodeApplicationManager_ptr appManager
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    destroyManager (Deployment::NodeApplicationManager_ptr appManager)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StopError,
                        Deployment::InvalidReference));
 
     /// CIAO specific extension, which is particularly useful for dealing with
     /// shared components issue
-    virtual void destroyPlan (const Deployment::DeploymentPlan & plan
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void destroyPlan (const Deployment::DeploymentPlan & plan)
       ACE_THROW_SPEC ((::CORBA::SystemException,
                        ::Deployment::StopError));
 
     /// CIAO specific extension, return a set of shared components
     virtual ::Deployment::ComponentPlans *
-    get_shared_components (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_shared_components ()
       ACE_THROW_SPEC ((::CORBA::SystemException));
 
     /// RACE specific extension. Modify the priority of a node application
@@ -130,8 +126,7 @@ namespace CIAO
     set_priority (
         const char * plan_id,
         const char * cid,
-        const ::Deployment::Sched_Params & nm_params
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const ::Deployment::Sched_Params & nm_params)
       ACE_THROW_SPEC ((::CORBA::SystemException));
 
     // ********* CIAO Specific Helper functions ************
@@ -180,8 +175,7 @@ namespace CIAO
 
     virtual ::CIAO::NodeApplicationManager_Impl_Base *
     create_node_app_manager (CORBA::ORB_ptr orb,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr poa)
       ACE_THROW_SPEC ((CORBA::SystemException))=0;
 
     /// Actual implementation of the @c get_shared_components IDL operation
@@ -289,8 +283,7 @@ namespace CIAO
 
     virtual ::CIAO::NodeApplicationManager_Impl_Base *
     create_node_app_manager (CORBA::ORB_ptr orb,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr poa)
       ACE_THROW_SPEC ((CORBA::SystemException));
   };
 
@@ -317,8 +310,7 @@ namespace CIAO
                             );
 
     void destroyManager
-    (Deployment::NodeApplicationManager_ptr manager
-     ACE_ENV_ARG_DECL)
+    (Deployment::NodeApplicationManager_ptr manager)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::StopError,
                        Deployment::InvalidReference));
@@ -333,8 +325,7 @@ namespace CIAO
 
     virtual ::CIAO::NodeApplicationManager_Impl_Base *
     create_node_app_manager (CORBA::ORB_ptr orb,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr poa)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     Static_Config_EntryPoints_Maps* static_config_entrypoints_maps_;
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index 2ee63eef187..7a10e719cc0 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -128,14 +128,11 @@ write_pid (void)
 bool
 register_with_ns (const char * name_context,
                   CORBA::ORB_ptr orb,
-                  CIAO::NodeManagerDaemon_ptr obj
-                  ACE_ENV_ARG_DECL)
+                  CIAO::NodeManagerDaemon_ptr obj)
 {
   // Naming Service related operations
   CORBA::Object_var naming_context_object =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var naming_context =
     CosNaming::NamingContext::_narrow (naming_context_object.in ());
@@ -162,15 +159,13 @@ register_with_ns (const char * name_context,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize orb
       // @@TODO: Add error checking. There is absoluteley none.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       CIAO::Server_init (orb.in ());
 
@@ -188,23 +183,16 @@ main (int argc, char *argv[])
 
       // Get reference to Root POA.
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -231,14 +219,10 @@ main (int argc, char *argv[])
         node_manager_servant->_this ();
 
       CORBA::String_var str =
-        orb->object_to_string (node_manager.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (node_manager.in ());
 
       adapter->bind ("NodeManager",
-                     str.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     str.in ());
 
       if (write_to_ior_)
         {
@@ -258,20 +242,16 @@ main (int argc, char *argv[])
           // Register this name with the Naming Service
           (void) register_with_ns (name,
                                    orb.in (),
-                                   node_manager.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                   node_manager.in ());
         }
 
       ACE_DEBUG ((LM_INFO, "CIAO_NodeManager IOR: %s\n", str.in ()));
 
       // Activate POA manager
       PortableServer::POAManager_var mgr
-        = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Here start the Monitor
       /*
@@ -290,22 +270,17 @@ main (int argc, char *argv[])
       write_pid ();
 
       // Run the main event loop for the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CIAO_NodeManager::main\t\n");
+      ex._tao_print_exception ("CIAO_NodeManager::main\t\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "CIAO_NodeManager has closed\n"));
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
index 10b0d3b0ee3..a1e5831e0af 100644
--- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
@@ -16,18 +16,13 @@ namespace CIAO
     // @todo make this a private method
     static CORBA::Object_ptr
     fetch_reference_naming (CORBA::ORB_ptr orb,
-                            const char *repoman_name = 0
-                            ACE_ENV_ARG_DECL)
+                            const char *repoman_name = 0)
     {
       CORBA::Object_var tmp =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var pns =
-        CosNaming::NamingContext::_narrow (tmp.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        CosNaming::NamingContext::_narrow (tmp.in ());
 
       if (CORBA::is_nil (pns.in ()))
         {
@@ -39,8 +34,7 @@ namespace CIAO
 
       name[0].id = CORBA::string_dup (repoman_name);
 
-      return pns->resolve (name
-                           ACE_ENV_ARG_PARAMETER);
+      return pns->resolve (name);
     }
 
     Plan_Generator_i::Plan_Generator_i ()
@@ -57,14 +51,14 @@ namespace CIAO
 
       if (rm_use_naming)
         {
-          obj = fetch_reference_naming (orb, rm_name ACE_ENV_ARG_PARAMETER);
+          obj = fetch_reference_naming (orb, rm_name);
         }
       else
         {
-          obj = orb->string_to_object (rm_name ACE_ENV_ARG_PARAMETER);
+          obj = orb->string_to_object (rm_name);
         }
 
-      this->rm_ = Deployment::RepositoryManager::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      this->rm_ = Deployment::RepositoryManager::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->rm_.in ()))
         {
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index 1d023c774bc..d5233cf870c 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -139,20 +139,16 @@ namespace CIAO
     }
 
     static ::Deployment::DomainApplicationManager_ptr
-    read_dap_ior (CORBA::ORB_ptr orb
-                  ACE_ENV_ARG_DECL)
+    read_dap_ior (CORBA::ORB_ptr orb)
     {
-      CORBA::Object_var obj = orb->string_to_object (dap_ior
-                                                     ACE_ENV_ARG_PARAMETER);
+      CORBA::Object_var obj = orb->string_to_object (dap_ior);
       return
-        Deployment::DomainApplicationManager::_narrow (obj.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+        Deployment::DomainApplicationManager::_narrow (obj.in ());
     }
 
     static int
     write_dap_ior (CORBA::ORB_ptr orb,
-                   ::Deployment::DomainApplicationManager_ptr dap
-                   ACE_ENV_ARG_DECL)
+                   ::Deployment::DomainApplicationManager_ptr dap)
     {
       CORBA::String_var ior = orb->object_to_string (dap);
 
@@ -172,16 +168,13 @@ namespace CIAO
     static int
     run_main_implementation (int argc, char *argv[])
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
-      ACE_TRY
+      try
         {
           CORBA::ORB_var orb =
             CORBA::ORB_init (argc,
                              argv,
-                             ""
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             "");
 
           if (parse_args (argc, argv) == false)
             return -1;
@@ -271,9 +264,7 @@ namespace CIAO
             }
           else if (mode == pl_mode_stop_by_dam) // tear down by DAM
             {
-              dapp_mgr = read_dap_ior (orb.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              dapp_mgr = read_dap_ior (orb.in ());
 
               if (CORBA::is_nil (dapp_mgr.in ()))
                 {
@@ -301,29 +292,25 @@ namespace CIAO
                 }
             }
 
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
         }
-      ACE_CATCH (Plan_Launcher_i::Deployment_Failure, ex)
+      catch (const Plan_Launcher_i::Deployment_Failure&)
         {
           ACE_ERROR ((LM_ERROR,
                       "Deployment failed. Plan_Launcher exiting.\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "(%P|%t) Plan_Launcher: ");
+          ex._tao_print_exception ("(%P|%t) Plan_Launcher: ");
 
           return -1;
         }
-      ACE_CATCHALL
+      catch (...)
         {
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) Plan_Launcher: Unknown exception.\n"));
           return -1;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
 
       return 0;
     }
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
index 73d1890288b..9afc6a69dc4 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
@@ -10,18 +10,13 @@ namespace CIAO
   {
     // @todo make this a private method
     static CORBA::Object_ptr
-    fetch_reference_naming (CORBA::ORB_ptr orb
-                            ACE_ENV_ARG_DECL)
+    fetch_reference_naming (CORBA::ORB_ptr orb)
     {
       CORBA::Object_var tmp =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var pns =
-        CosNaming::NamingContext::_narrow (tmp.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        CosNaming::NamingContext::_narrow (tmp.in ());
 
       if (CORBA::is_nil (pns.in ()))
         {
@@ -33,8 +28,7 @@ namespace CIAO
 
       name[0].id = CORBA::string_dup ("ExecutionManager");
 
-      return pns->resolve (name
-                           ACE_ENV_ARG_PARAMETER);
+      return pns->resolve (name);
     }
 
     Plan_Launcher_i::Plan_Launcher_i ()
@@ -47,8 +41,7 @@ namespace CIAO
                            CORBA::ORB_ptr orb,
                            bool use_repoman,
                            bool rm_use_naming,
-                           const char *rm_name
-                           ACE_ENV_ARG_DECL)
+                           const char *rm_name)
     {
       CORBA::Object_var obj;
 
@@ -62,8 +55,7 @@ namespace CIAO
           obj = orb->string_to_object (em_ior);
         }
 
-      this->em_ = ::CIAO::ExecutionManagerDaemon::_narrow (obj.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
+      this->em_ = ::CIAO::ExecutionManagerDaemon::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->em_.in ()))
         {
@@ -95,8 +87,7 @@ namespace CIAO
     Plan_Launcher_i::launch_plan (const char *deployment_plan_uri,
                                   const char *package_uri,
                                   bool use_package_name,
-                                  bool use_repoman
-                                  ACE_ENV_ARG_DECL)
+                                  bool use_repoman)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
       if (CIAO::debug_level () > 9)
@@ -126,10 +117,10 @@ namespace CIAO
     }
 
     const char *
-    Plan_Launcher_i::launch_plan (const ::Deployment::DeploymentPlan &plan ACE_ENV_ARG_DECL)
+    Plan_Launcher_i::launch_plan (const ::Deployment::DeploymentPlan &plan)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
-      ACE_TRY
+      try
         {
           if (CORBA::is_nil (this->em_.in ()))
             {
@@ -215,7 +206,7 @@ namespace CIAO
           map_.bind_dam_reference (plan.UUID.in (),
                                    Deployment::DomainApplicationManager::_duplicate (dam.in ()));
         }
-      ACE_CATCH (Deployment::ResourceNotAvailable, ex)
+      catch (const Deployment::ResourceNotAvailable& ex)
         {
           ACE_ERROR ((LM_ERROR,
                       "EXCEPTION: ResourceNotAvaiable exception caught: %s,\n"
@@ -228,53 +219,51 @@ namespace CIAO
                       ex.propertyName.in (),
                       ex.elementName.in (),
                       ex.resourceName.in ()));
-          ACE_THROW (Deployment_Failure (""));
+          throw Deployment_Failure ("");
         }
-      ACE_CATCH (Deployment::StartError, ex)
+      catch (const Deployment::StartError& ex)
         {
           ACE_ERROR ((LM_ERROR,
                       "EXCEPTION: StartError exception caught: %s, %s\n",
                       ex.name.in (),
                       ex.reason.in ()));
-          ACE_THROW (Deployment_Failure (""));
+          throw Deployment_Failure ("");
         }
-      ACE_CATCH (Deployment::InvalidProperty, ex)
+      catch (const Deployment::InvalidProperty& ex)
         {
           ACE_ERROR ((LM_ERROR,
                       "EXCEPTION: InvalidProperty exception caught: %s, %s\n",
                       ex.name.in (),
                       ex.reason.in ()));
-          ACE_THROW (Deployment_Failure (""));
+          throw Deployment_Failure ("");
         }
-      ACE_CATCH (Deployment::InvalidConnection, ex)
+      catch (const Deployment::InvalidConnection& ex)
         {
           ACE_ERROR ((LM_ERROR,
                       "EXCEPTION: InvalidConnection exception caught: %s, %s\n",
                       ex.name.in (),
                       ex.reason.in ()));
-          ACE_THROW (Deployment_Failure  (""));
+          throw Deployment_Failure  ("");
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           ACE_ERROR ((LM_ERROR,
                       "CORBA EXCEPTION: %s\n",
-                      ACE_ANY_EXCEPTION._info().fast_rep()));
-          ACE_THROW (Deployment_Failure  (""));
+                      ex._info().fast_rep()));
+          throw Deployment_Failure  ("");
         }
-      ACE_CATCHALL
+      catch (...)
         {
           ACE_ERROR ((LM_ERROR,
                       "EXCEPTION: non-CORBA exception\n"));
-          ACE_THROW (Deployment_Failure  (""));
+          throw Deployment_Failure  ("");
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
 
       return CORBA::string_dup (plan.UUID.in ());
     }
 
     ::Deployment::DomainApplicationManager_ptr
-    Plan_Launcher_i::get_dam (const char *uuid ACE_ENV_ARG_DECL)
+    Plan_Launcher_i::get_dam (const char *uuid)
     {
       if (!this->map_.is_plan_available (uuid))
         {
@@ -293,7 +282,7 @@ namespace CIAO
       // executable to tear down a plan, so we could NOT rely on the local
       // DAM_Map to fetch DAM obj reference. Instead, we make a remote call
       // on ExecutionManager to fetch it.
-      ACE_TRY
+      try
         {
           ::Deployment::DomainApplicationManager_var dapp_mgr =
               this->em_->getManager (uuid);
@@ -312,7 +301,7 @@ namespace CIAO
               this->destroy_dam_by_plan (uuid);
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // @todo the destroy_dam_by_plan could give a stoperror exception
           // we should handle
@@ -320,14 +309,12 @@ namespace CIAO
                       "for plan with uuid: %s\n", uuid));
           return false;
         }
-      ACE_ENDTRY;
 
       return true;
     }
 
     bool
-    Plan_Launcher_i::teardown_plan (::Deployment::DomainApplicationManager_ptr dam
-                                    ACE_ENV_ARG_DECL)
+    Plan_Launcher_i::teardown_plan (::Deployment::DomainApplicationManager_ptr dam)
     {
       if (CIAO::debug_level ())
         {
@@ -348,8 +335,7 @@ namespace CIAO
     }
 
     void
-    Plan_Launcher_i::destroy_dam (::Deployment::DomainApplicationManager_ptr dam
-                                  ACE_ENV_ARG_DECL)
+    Plan_Launcher_i::destroy_dam (::Deployment::DomainApplicationManager_ptr dam)
     {
       if (CIAO::debug_level ())
         {
@@ -366,8 +352,7 @@ namespace CIAO
     }
 
     void
-    Plan_Launcher_i::destroy_dam_by_plan (const char* plan_uuid
-                                          ACE_ENV_ARG_DECL)
+    Plan_Launcher_i::destroy_dam_by_plan (const char* plan_uuid)
     {
       if (CIAO::debug_level ())
         {
@@ -387,8 +372,7 @@ namespace CIAO
     Plan_Launcher_i::re_launch_plan (const char *deployment_plan_uri,
                                      const char *package_uri,
                                      bool use_package_name,
-                                     bool use_repoman
-                                     ACE_ENV_ARG_DECL)
+                                     bool use_repoman)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
       CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri);
@@ -408,7 +392,7 @@ namespace CIAO
     }
 
     const char *
-    Plan_Launcher_i::re_launch_plan (const ::Deployment::DeploymentPlan &plan ACE_ENV_ARG_DECL)
+    Plan_Launcher_i::re_launch_plan (const ::Deployment::DeploymentPlan &plan)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
     {
 
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
index 23ea6abc722..2212c00333f 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
@@ -43,8 +43,7 @@ namespace CIAO
                  CORBA::ORB_ptr orb,
                  bool use_repoman = false,
                  bool rm_use_naming = false,
-                 const char *rm_name = 0
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                 const char *rm_name = 0);
 
       /**
        * @brief Launch a plan, given a deployment plan URI
@@ -54,15 +53,13 @@ namespace CIAO
       const char * launch_plan (const char *deployment_plan_uri,
                                 const char *package_uri = 0,
                                 bool use_package_name = true,
-                                bool use_repoman = false
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                bool use_repoman = false)
         ACE_THROW_SPEC ((Deployment_Failure));
 
       const char * re_launch_plan (const char *deployment_plan_uri,
                                    const char *package_uri = 0,
                                    bool use_package_name = true,
-                                   bool use_repoman = false
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   bool use_repoman = false)
         ACE_THROW_SPEC ((Deployment_Failure));
 
       /**
@@ -70,29 +67,23 @@ namespace CIAO
        * @param plan A valid IDL deployment plan
        * @returns a string containing the UUID of the plan. Null indicates failure.
        */
-      const char * launch_plan (const ::Deployment::DeploymentPlan &plan
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const char * launch_plan (const ::Deployment::DeploymentPlan &plan)
         ACE_THROW_SPEC ((Deployment_Failure));
 
-      const char * re_launch_plan (const ::Deployment::DeploymentPlan &plan
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const char * re_launch_plan (const ::Deployment::DeploymentPlan &plan)
         ACE_THROW_SPEC ((Deployment_Failure));
 
       /// Returns the DAM associated with a given plan URI
-      ::Deployment::DomainApplicationManager_ptr get_dam (const char *uuid
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      ::Deployment::DomainApplicationManager_ptr get_dam (const char *uuid);
 
       /// Tears down a plan given the UUID
-      bool teardown_plan (const char *uuid ACE_ENV_ARG_DECL);
+      bool teardown_plan (const char *uuid);
 
-      bool teardown_plan (::Deployment::DomainApplicationManager_ptr dam
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      bool teardown_plan (::Deployment::DomainApplicationManager_ptr dam);
 
-      void destroy_dam (::Deployment::DomainApplicationManager_ptr dam
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      void destroy_dam (::Deployment::DomainApplicationManager_ptr dam);
 
-      void destroy_dam_by_plan (const char * plan_uuid
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      void destroy_dam_by_plan (const char * plan_uuid);
 
     private:
       ::CIAO::ExecutionManagerDaemon_var em_;
diff --git a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
index 61803ce1347..f61a9f2a71e 100644
--- a/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
@@ -39,13 +39,12 @@ static const char *RMname_service;
 /// main function that provides a sample interface for RM clients
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
-                      ""ACE_ENV_ARG_PARAMETER);
+                      "");
 
-      ACE_TRY_CHECK;
 
       Options* options = TheOptions::instance ();
       if (!options->parse_args (argc, argv))
@@ -55,8 +54,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       if (options->write_to_ior_)
       {
-        obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        obj = orb->string_to_object (ior);
       }
 
       else if (options->register_with_ns_)
@@ -66,13 +64,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         // Naming Service related operations
         CORBA::Object_var naming_context_object =
-          orb->resolve_initial_references ("NameService"
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
+          orb->resolve_initial_references ("NameService");
 
         CosNaming::NamingContext_var naming_context =
           CosNaming::NamingContext::_narrow (naming_context_object.in ());
-        ACE_TRY_CHECK;
 
         // Initialize the Naming Sequence
         CosNaming::Name name (1);
@@ -83,14 +78,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         // Resolve object from name
         obj = naming_context->resolve (name);
-        ACE_TRY_CHECK;
       }
 
 
     CIAO::RepositoryManagerDaemon_var rm =
-      CIAO::RepositoryManagerDaemon::_narrow (obj.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CIAO::RepositoryManagerDaemon::_narrow (obj.in ());
 
       if (CORBA::is_nil (rm.in ()))
         {
@@ -193,19 +185,18 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         Deployment::PackageConfiguration *pc = new Deployment::PackageConfiguration ();
 
         // Parse the PCD to make sure that there are no package errors.
-        ACE_TRY
+        try
         {
           CIAO::Config_Handlers::Packaging::PCD_Handler::package_config ("default.pcd", *pc);
         }
-        ACE_CATCHALL
+        catch (...)
         {
           ACE_ERROR ((
             LM_ERROR,
             "(%P|%t) [RM::retrieve_PC_from_descriptors] Error parsing the PCD\n"));
 
-          ACE_THROW (Deployment::PackageError ());
+          throw Deployment::PackageError ();
         }
-        ACE_ENDTRY;
 
         ACE_OS::chdir (cwd);
 
@@ -247,15 +238,12 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
 
       orb->shutdown (1);
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unknown exception \n");
+      ex._tao_print_exception ("Unknown exception \n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
index fe8c009efa6..10d67721cd0 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
@@ -73,13 +73,10 @@ private:
 
 bool
 write_ior_file (CORBA::ORB_ptr orb,
-                CIAO::RepositoryManagerDaemon_ptr obj
-                ACE_ENV_ARG_DECL)
+                CIAO::RepositoryManagerDaemon_ptr obj)
 {
   CORBA::String_var ior =
-    orb->object_to_string (obj
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    orb->object_to_string (obj);
 
   FILE* RMior_file =
     ACE_OS::fopen (CIAO::RepositoryManager::RMior, "w");
@@ -101,8 +98,7 @@ write_ior_file (CORBA::ORB_ptr orb,
 
 bool
 register_with_ns (CORBA::ORB_ptr orb,
-                  CIAO::RepositoryManagerDaemon_ptr obj
-                  ACE_ENV_ARG_DECL)
+                  CIAO::RepositoryManagerDaemon_ptr obj)
 {
   if (CIAO::RepositoryManager::repoman_name_ != "")
     CIAO::RepositoryManager::RMname_service =
@@ -110,9 +106,7 @@ register_with_ns (CORBA::ORB_ptr orb,
 
   // Naming Service related operations
   CORBA::Object_var naming_context_object =
-    orb->resolve_initial_references ("NameService"
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var naming_context =
     CosNaming::NamingContext::_narrow (naming_context_object.in ());
@@ -174,17 +168,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       retval =
         write_ior_file (orb.in (),
-        RepositoryManagerDaemon.in ()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RepositoryManagerDaemon.in ());
     }
     else if (CIAO::RepositoryManager::register_with_ns_)
     {
       retval =
         register_with_ns (orb.in (),
-        RepositoryManagerDaemon.in ()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RepositoryManagerDaemon.in ());
     }
 
     if (!retval)
@@ -276,16 +266,13 @@ Worker::Worker (CORBA::ORB_ptr orb)
 
 int Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index e031c81854f..91aa4e47460 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -220,7 +220,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
   if (this->names_.find (ACE_CString (installationName), entry) == 0)
     {
       if (!replace)
-        ACE_THROW (Deployment::NameExists ());
+        throw Deployment::NameExists ();
       else
         deletePackage (installationName);
     }
@@ -253,20 +253,19 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
       //TODO: how can I incorporate a Auto_Ptr is explicit release is needed
       ACE_Message_Block* mb = 0;
       ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
 
       //get the remote file
       if (!HTTP_Get (location, *mb))
         {
           mb->release ();
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       // Write file to designated location on disk
       if (!RM_Helper::write_to_disk (package_path.c_str (), *mb))
         {
           mb->release ();
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       mb->release ();
@@ -274,7 +273,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
   else
     {
       if (!RM_Helper::copy_from_disk_to_disk (location, package_path.c_str ()))
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
 
 
@@ -297,7 +296,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
     //remove the package
     remove (package_path.c_str ());
 
-    ACE_THROW (Deployment::PackageError ());
+    throw Deployment::PackageError ();
   }
 
   //TODO: move exception throwing out of this func. User boolean error handling!!!
@@ -314,7 +313,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
     //remove the package
     remove (package_path.c_str ());
 
-    ACE_THROW (Deployment::NameExists ());
+    throw Deployment::NameExists ();
   }
 
   //forming the server path info
@@ -329,7 +328,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
     //remove the package
     remove (package_path.c_str ());
 
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   PC_Updater updater (server_path, package_path);
@@ -342,7 +341,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
     remove_extracted_package (package_path.c_str (), path.c_str ());
     //remove the package
     remove (package_path.c_str ());
-    ACE_THROW (Deployment::PackageError ());
+    throw Deployment::PackageError ();
   }
 
 
@@ -366,7 +365,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
     remove (pc_path.c_str ());
 
     //throw exception
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   }
 
   //ALSO NEED THE UUID here
@@ -387,7 +386,7 @@ void CIAO_RepositoryManagerDaemon_i::installPackage (
      remove (pc_path.c_str ());
 
      //throw exception
-     ACE_THROW (CORBA::INTERNAL ());
+     throw CORBA::INTERNAL ();
   }
 
   //now add the type interface
@@ -426,19 +425,19 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
   if (this->names_.find (ACE_CString (installationName), entry) == 0)
     {
       if (!replace)
-        ACE_THROW (Deployment::NameExists ());
+        throw Deployment::NameExists ();
       else
         deletePackage (installationName);
     }
 
   // Find if there is a PackageConfiguration with the same uuid.
   if (this->uuids_.find (ACE_CString (pc.UUID), entry) == 0)
-    ACE_THROW (Deployment::NameExists ());
+    throw Deployment::NameExists ();
 
   // Find if the PackageConfiguration has a basePackage.
   // NOTE: ComponentPackageReferences are currently NOT supported.
   if (!(pc.basePackage.length () > 0))
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
+    throw CORBA::NO_IMPLEMENT ();
 
   // Form the path for the local file
   ACE_CString path (this->install_root_);
@@ -457,20 +456,19 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
     //TODO: how can I incorporate a Auto_Ptr is explicit release is needed
     ACE_Message_Block* mb;
     ACE_NEW_THROW_EX (mb, ACE_Message_Block (), CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
 
     //get the remote file
     if (!HTTP_Get (baseLocation, *mb))
     {
       mb->release ();
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
     // Write file to designated location on disk
     if (!RM_Helper::write_to_disk (package_path.c_str (), *mb))
     {
       mb->release ();
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
     mb->release ();
@@ -478,7 +476,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
   else
   {
     if (!RM_Helper::copy_from_disk_to_disk (baseLocation, package_path.c_str ()))
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
   }
 
 
@@ -501,7 +499,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
     remove_extracted_package (package_path.c_str (), path.c_str ());
     //remove the package
     remove (package_path.c_str ());
-    ACE_THROW (Deployment::PackageError ());
+    throw Deployment::PackageError ();
   }
 
   // Externalize the PackageConfiguration, so that we can access it later on
@@ -524,7 +522,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
     remove (pc_path.c_str ());
 
     //throw exception
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   }
 
   // Insert the UUID of the package.
@@ -545,7 +543,7 @@ void CIAO_RepositoryManagerDaemon_i::createPackage (
      remove (pc_path.c_str ());
 
      //throw exception
-     ACE_THROW (CORBA::INTERNAL ());
+     throw CORBA::INTERNAL ();
   }
 
   //now add the type interface
@@ -580,7 +578,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByName (const char * name)
   PCEntry *entry = 0;
 
   if (this->names_.find (ACE_CString (name), entry) != 0)
-    ACE_THROW (Deployment::NoSuchName ());
+    throw Deployment::NoSuchName ();
   //PackageConfiguration was not found
 
   ACE_CString pc_path (entry->int_id_.c_str ());
@@ -591,7 +589,6 @@ CIAO_RepositoryManagerDaemon_i::findPackageByName (const char * name)
                     Deployment::PackageConfiguration (),
                     CORBA::NO_MEMORY ());
 
-  ACE_CHECK_RETURN (0);
 
   if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -621,7 +618,7 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
   PCEntry *entry = 0;
 
   if (this->uuids_.find (ACE_CString (UUID), entry) != 0)
-    ACE_THROW (Deployment::NoSuchName ());
+    throw Deployment::NoSuchName ();
   //PackageConfiguration was not found
 
   ACE_CString pc_path (entry->int_id_.c_str ());
@@ -632,7 +629,6 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
                     Deployment::PackageConfiguration (),
                     CORBA::NO_MEMORY ());
 
-  ACE_CHECK_RETURN (0);
 
   if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -662,7 +658,6 @@ CIAO_RepositoryManagerDaemon_i::findPackageByUUID (const char * UUID)
     //return an empty sequence
     CORBA::StringSeq_var seq;
     ACE_NEW_THROW_EX (seq, CORBA::StringSeq (0), CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
 
     return seq._retn ();
   }
@@ -721,7 +716,6 @@ CIAO_RepositoryManagerDaemon_i::getAllNames ()
   CORBA::StringSeq_var seq;
   ACE_NEW_THROW_EX (seq, CORBA::StringSeq (num_entries), CORBA::NO_MEMORY ());
 
-  ACE_CHECK_RETURN (0);
 
   seq->length (num_entries);
 
@@ -769,7 +763,6 @@ CIAO_RepositoryManagerDaemon_i::getAllNames ()
                     CORBA::StringSeq (num_entries),
                     CORBA::NO_MEMORY ());
 
-  ACE_CHECK_RETURN (0);
 
   seq->length (num_entries);
 
@@ -807,7 +800,7 @@ void CIAO_RepositoryManagerDaemon_i::deletePackage (
   PCEntry *entry = 0;
 
   if (this->names_.find (ACE_CString (installationName), entry) != 0)
-    ACE_THROW (Deployment::NoSuchName ());
+    throw Deployment::NoSuchName ();
 
   //cache the package path
   ACE_CString path (entry->int_id_.c_str ());
@@ -834,7 +827,6 @@ void CIAO_RepositoryManagerDaemon_i::deletePackage (
                     Deployment::PackageConfiguration (),
                     CORBA::NO_MEMORY ());
 
-  ACE_CHECK_RETURN (0);
 
   if(!RM_Helper::reincarnate (pc, pc_path.c_str ()))
   {
@@ -867,7 +859,7 @@ void CIAO_RepositoryManagerDaemon_i::deletePackage (
   this->dump ();
 
   if (internal_err)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   else
     ACE_DEBUG ((LM_INFO, "Successfully deleted \'%s\'\n", installationName));
 
@@ -898,26 +890,25 @@ CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_package (char* package)
       ACE_OS::chdir (this->cwd_);
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) RepositoryManager: error extracting necessary files\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   Deployment::PackageConfiguration_var pc;
   //parse the PCD to make sure that there are no package errors
-  ACE_TRY
+  try
     {
       //CIAO::Config_Handlers::STD_PC_Intf intf (pcd_name.c_str ());
       //pc = intf.get_PC ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) RepositoryManager: Error parsing the PCD\n"));
 
       //change back the the old working dir
       ACE_OS::chdir (this->cwd_);
-      ACE_THROW (Deployment::PackageError ());
+      throw Deployment::PackageError ();
     }
-  ACE_ENDTRY;
   //able to parse the PC. So lets install the package in the repo
 
   //we no longer need the descriptors, so lets erase them!
@@ -981,20 +972,19 @@ CIAO_RepositoryManagerDaemon_i::retrieve_PC_from_descriptors (const char* pc_nam
 
   Deployment::PackageConfiguration_var pc = new Deployment::PackageConfiguration ();
   //parse the PCD to make sure that there are no package errors
-  ACE_TRY
+  try
     {
        CIAO::Config_Handlers::Packaging::PCD_Handler::package_config (pc_name, *pc);
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) [RM::retrieve_PC_from_descriptors] Error parsing the PCD\n"));
 
       //change back the the old working dir
       ACE_OS::chdir (this->cwd_);
-      ACE_THROW (Deployment::PackageError ());
+      throw Deployment::PackageError ();
     }
-  ACE_ENDTRY;
   //able to parse the PC. So lets install the package in the repo
 
   //change back the the old working dir
diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
index b2499812711..caa7e0a0f61 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
@@ -117,7 +117,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_OS::fprintf (fp,
                            "\t\tconst char*\n");
           ACE_OS::fprintf (fp,
-                           "\t\tACE_ENV_ARG_DECL_WITH_DEFAULTS);\n");
+                           "\t\t);\n");
         }
     }
 
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
index 4d3f01dde1f..da7f59a3b86 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
@@ -220,8 +220,8 @@ int CIAO::DomainDataManager::call_all_node_managers ()
           catch (CORBA::Exception& ex)
             {
               ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Join Domain==\n"));
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in "
-                                   "DomainDataManager::joinDomain");
+              ex._tao_print_exception (
+                "Exception caught in ""DomainDataManager::joinDomain");
             }
         }
     }
@@ -579,8 +579,8 @@ void CIAO::DomainDataManager::stop_monitors ()
           catch (CORBA::Exception& ex)
             {
               ACE_DEBUG ((LM_DEBUG , "TM::Error in calling Leave Domain\n"));
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in "
-                                   "DomainDataManager::leaveDomain");
+              ex._tao_print_exception (
+                "Exception caught in ""DomainDataManager::leaveDomain");
             }
         }
     }
@@ -644,7 +644,7 @@ find_in_initial_domain (const char* node_name,
     }
   }
 
-  // not found the node , retunr a node with an empty name
+  // not found the node , return a node with an empty name
   return false;
 }
 
@@ -664,7 +664,7 @@ find_in_provisioned_domain (const char* node_name,
     }
   }
 
-  // not found the node , retunr a node with an empty name
+  // not found the node , return a node with an empty name
   return false;
 }
 
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
index f947e1944d7..a39446e7273 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
@@ -56,8 +56,7 @@ namespace CIDL_TargetManager_i
   // Operations from ::Deployment::TargetManager
 
   ::Deployment::Domain *
-  TargetManager_exec_i::getAllResources (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManager_exec_i::getAllResources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CIAO::DomainDataManager::
@@ -65,8 +64,7 @@ namespace CIDL_TargetManager_i
   }
 
   ::Deployment::Domain *
-  TargetManager_exec_i::getAvailableResources (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManager_exec_i::getAvailableResources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CIAO::DomainDataManager::
@@ -75,8 +73,7 @@ namespace CIDL_TargetManager_i
 
   void
   TargetManager_exec_i::commitResources (
-  const ::Deployment::DeploymentPlan & plan
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const ::Deployment::DeploymentPlan & plan)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Deployment::ResourceNotAvailable,
@@ -88,8 +85,7 @@ namespace CIDL_TargetManager_i
 
   void
   TargetManager_exec_i::releaseResources (
-  const ::Deployment::DeploymentPlan &  plan
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const ::Deployment::DeploymentPlan &  plan)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CIAO::DomainDataManager::
@@ -100,8 +96,7 @@ namespace CIDL_TargetManager_i
   TargetManager_exec_i::updateDomain (
   const ::CORBA::StringSeq &  elements ,
   const ::Deployment::Domain &  domainSubset ,
-  ::Deployment::DomainUpdateKind  updateKind
-  ACE_ENV_ARG_DECL_NOT_USED)
+  ::Deployment::DomainUpdateKind  updateKind)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
@@ -176,8 +171,7 @@ namespace CIDL_TargetManager_i
 
   ::CORBA::Long
   TargetManagerExt_exec_i::get_pid (
-                                    const char * component_uuid
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    const char * component_uuid)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
@@ -187,8 +181,7 @@ namespace CIDL_TargetManager_i
   }
 
   ::CIAO::Host_Infos *
-  TargetManagerExt_exec_i::get_host_cpu (
-                                         ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManagerExt_exec_i::get_host_cpu ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
@@ -198,8 +191,7 @@ namespace CIDL_TargetManager_i
   }
 
   ::CIAO::Component_Infos *
-  TargetManagerExt_exec_i::get_component_cpu (
-                                              ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManagerExt_exec_i::get_component_cpu ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
@@ -212,7 +204,7 @@ namespace CIDL_TargetManager_i
 
   ::CIAO::Host_NodeManager_seq *
   TargetManagerExt_exec_i::get_all_node_managers
-  (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CIAO::DomainDataManager::
@@ -239,8 +231,7 @@ namespace CIDL_TargetManager_i
   // Port operations.
 
   ::Deployment::CCM_TargetManager_ptr
-  TargetManagerImpl_exec_i::get_targetMgr (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManagerImpl_exec_i::get_targetMgr ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
@@ -262,7 +253,6 @@ namespace CIDL_TargetManager_i
 
   ::CIAO::CCM_TargetManagerExt_ptr TargetManagerImpl_exec_i
   ::get_target_manager_ext (
-                            ACE_ENV_SINGLE_ARG_DECL_NOT_USED
                             ) ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (CORBA::is_nil (this->exec_ext_object_.in ()))
@@ -277,27 +267,23 @@ namespace CIDL_TargetManager_i
 
   void
   TargetManagerImpl_exec_i::set_session_context (
-  ::Components::SessionContext_ptr ctx
-  ACE_ENV_ARG_DECL)
+  ::Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
   {
     this->context_ =
     TargetManagerImpl_Context::_narrow (
-    ctx
-    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    ctx);
 
     if (this->context_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   }
 
   void
-  TargetManagerImpl_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManagerImpl_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -306,8 +292,7 @@ namespace CIDL_TargetManager_i
   }
 
   void
-  TargetManagerImpl_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManagerImpl_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -317,8 +302,7 @@ namespace CIDL_TargetManager_i
 
 
   void
-  TargetManagerImpl_exec_i::ccm_activate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManagerImpl_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -332,8 +316,7 @@ namespace CIDL_TargetManager_i
   }
 
   void
-  TargetManagerImpl_exec_i::ccm_passivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManagerImpl_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -342,8 +325,7 @@ namespace CIDL_TargetManager_i
   }
 
   void
-  TargetManagerImpl_exec_i::ccm_remove (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  TargetManagerImpl_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -381,8 +363,7 @@ namespace CIDL_TargetManager_i
   // Implicit operations.
 
   ::Components::EnterpriseComponent_ptr
-  TargetManagerHome_exec_i::create (
-  ACE_ENV_SINGLE_ARG_DECL)
+  TargetManagerHome_exec_i::create ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -394,7 +375,6 @@ namespace CIDL_TargetManager_i
     retval,
     TargetManagerImpl_exec_i,
     CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
     return retval;
   }
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
index 7c23c047992..fe419bdab8b 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_exec.h
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
@@ -43,13 +43,11 @@ namespace CIDL_TargetManager_i
     // Port operations.
 
     virtual ::Deployment::CCM_TargetManager_ptr
-    get_targetMgr (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_targetMgr ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::CIAO::CCM_TargetManagerExt_ptr
       get_target_manager_ext (
-                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
                               )
       ACE_THROW_SPEC ((::CORBA::SystemException));
 
@@ -57,43 +55,37 @@ namespace CIDL_TargetManager_i
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
    ::Components::CCMException));
 
     virtual void
-    ccm_activate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_remove (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
@@ -120,23 +112,19 @@ namespace CIDL_TargetManager_i
 
       virtual ::CORBA::Long
         get_pid (
-      const char * component_uuid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const char * component_uuid)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual ::CIAO::Host_Infos *
-        get_host_cpu (
-                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        get_host_cpu ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual ::CIAO::Component_Infos *
-        get_component_cpu (
-                           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        get_component_cpu ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual ::CIAO::Host_NodeManager_seq *
-        get_all_node_managers (
-                           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        get_all_node_managers ()
         ACE_THROW_SPEC ((CORBA::SystemException));
     };
 
@@ -154,19 +142,16 @@ namespace CIDL_TargetManager_i
     // Operations from ::Deployment::TargetManager
 
     virtual ::Deployment::Domain *
-    getAllResources (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    getAllResources ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Deployment::Domain *
-    getAvailableResources (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    getAvailableResources ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
     commitResources (
-    const ::Deployment::DeploymentPlan & plan
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    const ::Deployment::DeploymentPlan & plan)
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Deployment::ResourceNotAvailable,
@@ -174,16 +159,14 @@ namespace CIDL_TargetManager_i
 
     virtual void
     releaseResources (
-    const ::Deployment::DeploymentPlan & argname
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    const ::Deployment::DeploymentPlan & argname)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
     updateDomain (
     const ::CORBA::StringSeq & elements,
     const ::Deployment::Domain & domainSubset,
-    ::Deployment::DomainUpdateKind updateKind
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::Deployment::DomainUpdateKind updateKind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -220,8 +203,7 @@ namespace CIDL_TargetManager_i
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index a6038303961..d1ff9b8f67e 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
   std::vector<NodeAppTest::NodeAppTest_RoundTrip_var> comp_list;
   //std::vector<NodeAppTest::NodeAppTest_RoundTrip_var>::const_iterator iter;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -61,19 +61,15 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "CompNum: %d\n",comp_num));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CIAO::Client_init (orb.in ());
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Deployment::NodeApplication_var node_app =
-        Deployment::NodeApplication::_narrow (tmp.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Deployment::NodeApplication::_narrow (tmp.in ());
 
       if (CORBA::is_nil (node_app.in ()))
         {
@@ -191,15 +187,13 @@ main (int argc, char *argv[])
 
       // Install test component and its home on NodeApplication
       Deployment::ComponentInfos_var comp_info =
-        node_app->install (node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        node_app->install (node_info);
 
       // store the component refs
       for (i = 0; i < comp_num; ++i)
         {
           comp_list.push_back (NodeAppTest::NodeAppTest_RoundTrip::_narrow
                                (comp_info[i].component_ref.in ()));
-          ACE_TRY_CHECK;
 
           if (CORBA::is_nil (comp_list[i].in ()))
             {
@@ -214,7 +208,6 @@ main (int argc, char *argv[])
 
       // Before we can start we have to start.
       node_app->start ();
-      ACE_CHECK_RETURN (1);
 
       // Invoke Operation on the components
       ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n"));
@@ -225,8 +218,7 @@ main (int argc, char *argv[])
           CORBA::Long input = i;
 
           CORBA::Long output =
-            (comp_list[i])->cube_long (input ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            (comp_list[i])->cube_long (input);
 
           if (input*input*input == output)
             {
@@ -245,22 +237,18 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Try removing everything\n"));
       node_app->remove ();
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Homes and components removed successfully\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Test success!!\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
index 11a53732939..0969c9ec055 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
@@ -37,11 +37,10 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -49,13 +48,10 @@ main (int argc, char *argv[])
       CIAO::Client_init (orb.in ());
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Deployment::NodeApplication_var node_app =
-        Deployment::NodeApplication::_narrow(tmp.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Deployment::NodeApplication::_narrow(tmp.in ());
 
       if (CORBA::is_nil (node_app.in ()))
         {
@@ -96,8 +92,7 @@ main (int argc, char *argv[])
 
       // Install test component and its home on NodeApplication
       Deployment::ComponentInfos_var comp_info =
-        node_app->install (node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        node_app->install (node_info);
 
       assert (comp_info->length () == 1); //return 1 component objeref
 
@@ -105,9 +100,7 @@ main (int argc, char *argv[])
       Components::CCMObject_var objref = (comp_info[i]).component_ref;
 
       NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var =
-        NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ());
 
       if (CORBA::is_nil (roundtrip_var.in ()))
        {
@@ -120,7 +113,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n"));
       CORBA::Long input = 1L;
       CORBA::Long output =
-        roundtrip_var->cube_long (input ACE_ENV_ARG_PARAMETER);
+        roundtrip_var->cube_long (input);
 
       if (input == output)
         ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n"));
@@ -137,8 +130,7 @@ main (int argc, char *argv[])
       (node_info.impl_infos[0]).impl_infos[0].component_instance_name =
         CORBA::string_dup ("NodeAppTest_RoundTrip_2");
       Deployment::ComponentInfos_var comp_info_new =
-        node_app->install (node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        node_app->install (node_info);
 
       assert (comp_info_new->length () == 1); //return 1 component objeref
 
@@ -150,17 +142,14 @@ main (int argc, char *argv[])
       node_app->remove ();
       ACE_DEBUG ((LM_DEBUG, "=====Components and Homes removed successfully\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
       ACE_DEBUG ((LM_DEBUG, "=====Test success!!\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
index 31e8ee8eb6d..484e854113d 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
@@ -37,11 +37,10 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -49,13 +48,10 @@ main (int argc, char *argv[])
       CIAO::Client_init (orb.in ());
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Deployment::NodeApplication_var node_app =
-        Deployment::NodeApplication::_narrow(tmp.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Deployment::NodeApplication::_narrow(tmp.in ());
 
       if (CORBA::is_nil (node_app.in ()))
         {
@@ -96,8 +92,7 @@ main (int argc, char *argv[])
 
       // Install test component and its home on NodeApplication
       Deployment::ComponentInfos_var comp_info =
-        node_app->install (node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        node_app->install (node_info);
 
       assert (comp_info->length () == 1); //return 1 component objeref
 
@@ -105,9 +100,7 @@ main (int argc, char *argv[])
       Components::CCMObject_var objref = (comp_info[i]).component_ref;
 
       NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var =
-        NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ());
 
       if (CORBA::is_nil (roundtrip_var.in ()))
         {
@@ -118,12 +111,10 @@ main (int argc, char *argv[])
 
       // initialize the component
       roundtrip_var->ciao_postactivate ();
-      ACE_CHECK_RETURN (1);
 
       //get the provided facets info.
       Components::FacetDescriptions_var facets_info =
-        roundtrip_var->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER) ;
-      ACE_TRY_CHECK;
+        roundtrip_var->get_all_facets () ;
 
       if ( facets_info->length () != 2 )
         {
@@ -141,7 +132,6 @@ main (int argc, char *argv[])
             = NodeAppTest::LatencyTest::_narrow ( (facets_info[i]->facet_ref ()));
           ACE_DEBUG((LM_DEBUG, "Calling on facet %s\n", (facets_info[i]->name ())));
 
-          ACE_TRY_CHECK;
 
           if ( CORBA::is_nil (latency_var.in ()) )
             {
@@ -151,8 +141,7 @@ main (int argc, char *argv[])
 
           CORBA::Long input = 1L;
           CORBA::Long output =
-            latency_var->cube_long (input ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            latency_var->cube_long (input);
 
           if (input == output)
             ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n"));
@@ -167,17 +156,14 @@ main (int argc, char *argv[])
       node_app->remove ();
       ACE_DEBUG ((LM_DEBUG, "Component and Home removed successfully\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
       ACE_DEBUG ((LM_DEBUG, "Test success!!\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
index 7c6f2bd8792..d239a8db5c5 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
@@ -37,11 +37,10 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -49,13 +48,10 @@ main (int argc, char *argv[])
       CIAO::Client_init (orb.in ());
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Deployment::NodeApplication_var node_app =
-        Deployment::NodeApplication::_narrow(tmp.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Deployment::NodeApplication::_narrow(tmp.in ());
 
       if (CORBA::is_nil (node_app.in ()))
         {
@@ -96,8 +92,7 @@ main (int argc, char *argv[])
 
       // Install test component and its home on NodeApplication
       Deployment::ComponentInfos_var comp_info =
-        node_app->install (node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        node_app->install (node_info);
 
       assert (comp_info->length () == 1); //return 1 component objeref
 
@@ -105,9 +100,7 @@ main (int argc, char *argv[])
       Components::CCMObject_var objref = (comp_info[i]).component_ref;
 
       NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var =
-        NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ());
 
       if (CORBA::is_nil (roundtrip_var.in ()))
        {
@@ -120,8 +113,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n"));
       CORBA::Long input = 1L;
       CORBA::Long output =
-        roundtrip_var->cube_long (input ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_var->cube_long (input);
 
       if (input == output)
         ACE_DEBUG ((LM_DEBUG, "Retrun values matched!!\n"));
@@ -135,17 +127,14 @@ main (int argc, char *argv[])
       node_app->remove ();
       ACE_DEBUG ((LM_DEBUG, "Component and Home removed successfully\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
       ACE_DEBUG ((LM_DEBUG, "Test success!!\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp
index 3b9dfc2d84c..8cbd9270bd0 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.cpp
@@ -20,24 +20,21 @@ namespace CIDL_RoundTrip_Impl
   }
 
   NodeAppTest::CCM_LatencyTest_ptr
-  RoundTrip_exec_i::get_facet_1 (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  RoundTrip_exec_i::get_facet_1 ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new LatencyTest_Impl;
   }
 
   NodeAppTest::CCM_LatencyTest_ptr
-  RoundTrip_exec_i::get_facet_2 (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  RoundTrip_exec_i::get_facet_2 ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new LatencyTest_Impl;
   }
 
   CORBA::Long
-  RoundTrip_exec_i::cube_long (CORBA::Long data
-                               ACE_ENV_ARG_DECL_NOT_USED)
+  RoundTrip_exec_i::cube_long (CORBA::Long data)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return data * data * data;
@@ -45,8 +42,7 @@ namespace CIDL_RoundTrip_Impl
 
   // Operations from Components::SessionComponent
   void
-  RoundTrip_exec_i::set_session_context (Components::SessionContext_ptr
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+  RoundTrip_exec_i::set_session_context (Components::SessionContext_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -58,7 +54,7 @@ namespace CIDL_RoundTrip_Impl
   }
 
   void
-  RoundTrip_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  RoundTrip_exec_i::ccm_activate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -70,7 +66,7 @@ namespace CIDL_RoundTrip_Impl
   }
 
   void
-  RoundTrip_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  RoundTrip_exec_i::ccm_passivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -81,7 +77,7 @@ namespace CIDL_RoundTrip_Impl
   }
 
   void
-  RoundTrip_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  RoundTrip_exec_i::ccm_remove ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -92,7 +88,7 @@ namespace CIDL_RoundTrip_Impl
   }
 
   void
-  RoundTrip_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  RoundTrip_exec_i::ciao_preactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -104,7 +100,7 @@ namespace CIDL_RoundTrip_Impl
   }
 
   void
-  RoundTrip_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  RoundTrip_exec_i::ciao_postactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -123,7 +119,7 @@ namespace CIDL_RoundTrip_Impl
   }
 
   ::Components::EnterpriseComponent_ptr
-  RoundTripHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  RoundTripHome_exec_i::create ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -132,8 +128,7 @@ namespace CIDL_RoundTrip_Impl
 
   // Implementation for the probided inferface.
   CORBA::Long
-  LatencyTest_Impl::cube_long (CORBA::Long data
-		                           ACE_ENV_ARG_DECL_NOT_USED)
+  LatencyTest_Impl::cube_long (CORBA::Long data)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return data*data*data;
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
index 042840f4679..2df0ce868c8 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
@@ -38,40 +38,38 @@ namespace CIDL_RoundTrip_Impl
     RoundTrip_exec_i ();
 
     /// Operation to test the data
-    virtual CORBA::Long cube_long (CORBA::Long data
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long cube_long (CORBA::Long data)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /*
       virtual ::NodeAppTest::CCM_LatencyTest*
-      get_latency (ACE_ENV_SINGLE_ARG_DECL)
+      get_latency ()
       ACE_THROW_SPEC ((CORBA::SystemException));
     */
 
     NodeAppTest::CCM_LatencyTest_ptr
-    get_facet_1(ACE_ENV_SINGLE_ARG_DECL)
+    get_facet_1()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     NodeAppTest::CCM_LatencyTest_ptr
-    get_facet_2(ACE_ENV_SINGLE_ARG_DECL)
+    get_facet_2()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -79,11 +77,11 @@ namespace CIDL_RoundTrip_Impl
     void pulse (void);
 
     // CIAO defined methods
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -109,8 +107,7 @@ namespace CIDL_RoundTrip_Impl
     {
     }
 
-    virtual CORBA::Long cube_long (CORBA::Long data
-                                   ACE_ENV_ARG_DECL)
+    virtual CORBA::Long cube_long (CORBA::Long data)
       ACE_THROW_SPEC ((CORBA::SystemException));
   };
 
@@ -130,7 +127,7 @@ namespace CIDL_RoundTrip_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
diff --git a/CIAO/NEWS b/CIAO/NEWS
index 02dd86723c5..60bdd8b110f 100644
--- a/CIAO/NEWS
+++ b/CIAO/NEWS
@@ -61,6 +61,16 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 . Implement a planner to query the TargetManager and RepositoryManager
   and generate deployment plans on the fly.
 
+USER VISIBLE CHANGES BETWEEN CIAO-0.5.5 and CIAO-0.5.6
+======================================================
+
+. Removed all exception environment macros except ACE_THROW_RETURN
+  and ACE_THROW_SPEC
+
+. All CIAO libraries built on UNIX systems will now have the correct library
+  version numbers.  Previously they had the same version numbers as TAO
+  libraries.
+
 USER VISIBLE CHANGES BETWEEN CIAO-0.5.4 and CIAO-0.5.5
 ======================================================
 
diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM
index b58184e5d75..181e00f306d 100644
--- a/CIAO/PROBLEM-REPORT-FORM
+++ b/CIAO/PROBLEM-REPORT-FORM
@@ -43,9 +43,9 @@
 To: ciao-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 0.5.4
-    TAO VERSION : 1.5.4
-    ACE VERSION : 5.5.4
+    CIAO VERSION: 0.5.6
+    TAO VERSION : 1.5.6
+    ACE VERSION : 5.5.6
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/CIAO/RACE/Controller/Component/Controller_exec.cpp b/CIAO/RACE/Controller/Component/Controller_exec.cpp
index 1e3c61ea414..1606e03a867 100644
--- a/CIAO/RACE/Controller/Component/Controller_exec.cpp
+++ b/CIAO/RACE/Controller/Component/Controller_exec.cpp
@@ -18,20 +18,19 @@ namespace CIAO
 
       // Supported operations.
       void
-      Controller_exec_i::start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      Controller_exec_i::start ()
         ACE_THROW_SPEC ((::CORBA::SystemException))
       {}
 
       void
-      Controller_exec_i::stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      Controller_exec_i::stop ()
         ACE_THROW_SPEC ((::CORBA::SystemException))
       {}
 
       // Attribute operations.
 
       ::CORBA::Double
-      Controller_exec_i::sampling_period (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Controller_exec_i::sampling_period ()
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -44,27 +43,23 @@ namespace CIAO
 
       void
       Controller_exec_i::set_session_context (
-        ::Components::SessionContext_ptr ctx
-        ACE_ENV_ARG_DECL)
+        ::Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
       {
         this->context_ =
         Controller_Context::_narrow (
-          ctx
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          ctx);
 
         if (this->context_ == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       }
 
       void
-      Controller_exec_i::ciao_preactivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Controller_exec_i::ciao_preactivate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -73,8 +68,7 @@ namespace CIAO
       }
 
       void
-      Controller_exec_i::ciao_postactivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Controller_exec_i::ciao_postactivate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -83,8 +77,7 @@ namespace CIAO
       }
 
       void
-      Controller_exec_i::ccm_activate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Controller_exec_i::ccm_activate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -93,8 +86,7 @@ namespace CIAO
       }
 
       void
-      Controller_exec_i::ccm_passivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Controller_exec_i::ccm_passivate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -103,8 +95,7 @@ namespace CIAO
       }
 
       void
-      Controller_exec_i::ccm_remove (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Controller_exec_i::ccm_remove ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -135,8 +126,7 @@ namespace CIAO
       // Implicit operations.
 
       ::Components::EnterpriseComponent_ptr
-      Controller_Home_exec_i::create (
-        ACE_ENV_SINGLE_ARG_DECL)
+      Controller_Home_exec_i::create ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -148,7 +138,6 @@ namespace CIAO
           retval,
           Controller_exec_i,
           CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
         return retval;
       }
diff --git a/CIAO/RACE/Controller/Component/Controller_exec.h b/CIAO/RACE/Controller/Component/Controller_exec.h
index 8729cd99fc6..def356fef65 100644
--- a/CIAO/RACE/Controller/Component/Controller_exec.h
+++ b/CIAO/RACE/Controller/Component/Controller_exec.h
@@ -28,16 +28,15 @@ namespace CIAO
         virtual ~Controller_exec_i (void);
 
         // Supported operations.
-        virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        virtual void start ()
         ACE_THROW_SPEC ((::CORBA::SystemException));
 
-        virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        virtual void stop ()
         ACE_THROW_SPEC ((::CORBA::SystemException));
 
         // Attribute operations.
         virtual ::CORBA::Double
-        sampling_period (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        sampling_period ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Port operations.
@@ -46,43 +45,37 @@ namespace CIAO
 
         virtual void
         set_session_context (
-          ::Components::SessionContext_ptr ctx
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          ::Components::SessionContext_ptr ctx)
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ciao_preactivate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_preactivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ciao_postactivate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_postactivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ccm_activate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_activate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ccm_passivate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_passivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ccm_remove (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_remove ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
@@ -110,8 +103,7 @@ namespace CIAO
         // Implicit operations.
 
         virtual ::Components::EnterpriseComponent_ptr
-        create (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        create ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp
index 2d53a15e48c..9d1603361ab 100644
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp
+++ b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.cpp
@@ -49,27 +49,23 @@ namespace CIAO
 
       void
       Interactive_Input_Adapter_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx
-      ACE_ENV_ARG_DECL)
+      ::Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
       {
         this->context_ =
         Interactive_Input_Adapter_Context::_narrow (
-        ctx
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        ctx);
 
         if (this->context_ == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       }
 
       void
-      Interactive_Input_Adapter_exec_i::ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Interactive_Input_Adapter_exec_i::ciao_preactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -78,8 +74,7 @@ namespace CIAO
       }
 
       void
-      Interactive_Input_Adapter_exec_i::ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Interactive_Input_Adapter_exec_i::ciao_postactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -88,8 +83,7 @@ namespace CIAO
       }
 
       void
-      Interactive_Input_Adapter_exec_i::ccm_activate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Interactive_Input_Adapter_exec_i::ccm_activate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -98,8 +92,7 @@ namespace CIAO
       }
 
       void
-      Interactive_Input_Adapter_exec_i::ccm_passivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Interactive_Input_Adapter_exec_i::ccm_passivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -108,8 +101,7 @@ namespace CIAO
       }
 
       void
-      Interactive_Input_Adapter_exec_i::ccm_remove (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Interactive_Input_Adapter_exec_i::ccm_remove ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -140,8 +132,7 @@ namespace CIAO
       // Implicit operations.
 
       ::Components::EnterpriseComponent_ptr
-      Interactive_Input_Adapter_Home_exec_i::create (
-      ACE_ENV_SINGLE_ARG_DECL)
+      Interactive_Input_Adapter_Home_exec_i::create ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -153,7 +144,6 @@ namespace CIAO
         retval,
         Interactive_Input_Adapter_exec_i,
         CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
         return retval;
       }
diff --git a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h
index d272dbb5865..d16fbb76110 100644
--- a/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h
+++ b/CIAO/RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter_exec.h
@@ -56,43 +56,37 @@ namespace CIAO
 
         virtual void
         set_session_context (
-        ::Components::SessionContext_ptr ctx
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::Components::SessionContext_ptr ctx)
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_preactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_preactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_postactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_postactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_activate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_activate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_passivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_passivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_remove (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_remove ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
@@ -120,8 +114,7 @@ namespace CIAO
         // Implicit operations.
 
         virtual ::Components::EnterpriseComponent_ptr
-        create (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        create ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
index 57ba06e490d..4318902bc32 100644
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
+++ b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.cpp
@@ -42,8 +42,7 @@ namespace CIAO
 
       void
       LocationUpdater_exec_i::push_deployment (
-        ::CIAO::RACE::Deploy_Input * ev
-        ACE_ENV_ARG_DECL_NOT_USED)
+        ::CIAO::RACE::Deploy_Input * ev)
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         bool plan_exists = false;
@@ -103,7 +102,7 @@ namespace CIAO
              ACE_ERROR ((LM_ERROR,
                          "Unable to acquire RepositoryManagerDaemon's objref\n"));
 
-             ACE_THROW (CORBA::INTERNAL ());
+             throw CORBA::INTERNAL ();
            }
 
            //now obtian the corresponding PackageConfiguration from
@@ -126,7 +125,7 @@ namespace CIAO
              ACE_ERROR ((LM_ERROR,
                  "Error! Package not found! Location update failed!\n"));
 
-             ACE_THROW (CORBA::INTERNAL ());
+             throw CORBA::INTERNAL ();
 
            }
            catch (CORBA::Exception &)
@@ -134,7 +133,7 @@ namespace CIAO
              ACE_ERROR ((LM_ERROR,
                  "Error! General exception! Location update failed!\n"));
 
-             ACE_THROW (CORBA::INTERNAL ());
+             throw CORBA::INTERNAL ();
            }
 
           //now update the plan
@@ -196,27 +195,23 @@ namespace CIAO
 
       void
       LocationUpdater_exec_i::set_session_context (
-        ::Components::SessionContext_ptr ctx
-        ACE_ENV_ARG_DECL)
+        ::Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
       {
         this->context_ =
         LocationUpdater_Context::_narrow (
-          ctx
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          ctx);
 
         if (this->context_ == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       }
 
       void
-      LocationUpdater_exec_i::ciao_preactivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      LocationUpdater_exec_i::ciao_preactivate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -225,8 +220,7 @@ namespace CIAO
       }
 
       void
-      LocationUpdater_exec_i::ciao_postactivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      LocationUpdater_exec_i::ciao_postactivate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -235,8 +229,7 @@ namespace CIAO
       }
 
       void
-      LocationUpdater_exec_i::ccm_activate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      LocationUpdater_exec_i::ccm_activate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -245,8 +238,7 @@ namespace CIAO
       }
 
       void
-      LocationUpdater_exec_i::ccm_passivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      LocationUpdater_exec_i::ccm_passivate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -255,8 +247,7 @@ namespace CIAO
       }
 
       void
-      LocationUpdater_exec_i::ccm_remove (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      LocationUpdater_exec_i::ccm_remove ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -287,8 +278,7 @@ namespace CIAO
       // Implicit operations.
 
       ::Components::EnterpriseComponent_ptr
-      LocationUpdater_Home_exec_i::create (
-        ACE_ENV_SINGLE_ARG_DECL)
+      LocationUpdater_Home_exec_i::create ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -300,7 +290,6 @@ namespace CIAO
           retval,
           LocationUpdater_exec_i,
           CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
         return retval;
       }
diff --git a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h
index 14649ef550c..e3eb2f92fb2 100644
--- a/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h
+++ b/CIAO/RACE/Input_Adapters/LocationUpdater/LocationUpdater_exec.h
@@ -38,51 +38,44 @@ namespace CIAO
 
         virtual void
         push_deployment (
-          ::CIAO::RACE::Deploy_Input *ev
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          ::CIAO::RACE::Deploy_Input *ev)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Operations from Components::SessionComponent
 
         virtual void
         set_session_context (
-          ::Components::SessionContext_ptr ctx
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          ::Components::SessionContext_ptr ctx)
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ciao_preactivate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_preactivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ciao_postactivate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_postactivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ccm_activate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_activate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ccm_passivate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_passivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ccm_remove (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_remove ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
@@ -110,8 +103,7 @@ namespace CIAO
         // Implicit operations.
 
         virtual ::Components::EnterpriseComponent_ptr
-        create (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        create ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp
index 4b02edb3cc1..dd78aafb8b5 100644
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp
+++ b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.cpp
@@ -42,8 +42,7 @@ namespace CIAO
 
       void
       PlanGenerator_exec_i::push_deployment (
-        ::CIAO::RACE::Deploy_Input * ev
-        ACE_ENV_ARG_DECL_NOT_USED)
+        ::CIAO::RACE::Deploy_Input * ev)
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         try
@@ -72,7 +71,7 @@ namespace CIAO
             ACE_ERROR ((LM_ERROR,
                         "Unable to acquire RepositoryManagerDaemon's objref\n"));
 
-            ACE_THROW (CORBA::INTERNAL ());
+            throw CORBA::INTERNAL ();
           }
 
           //now obtian the corresponding PackageConfiguration from
@@ -95,7 +94,7 @@ namespace CIAO
             ACE_ERROR ((LM_ERROR,
                        "Error! Package not found! Location update failed!\n"));
 
-            ACE_THROW (CORBA::INTERNAL ());
+            throw CORBA::INTERNAL ();
 
           }
           catch (CORBA::Exception &)
@@ -103,7 +102,7 @@ namespace CIAO
             ACE_ERROR ((LM_ERROR,
                        "Error! General exception! Location update failed!\n"));
 
-            ACE_THROW (CORBA::INTERNAL ());
+            throw CORBA::INTERNAL ();
           }
 
           //now create the plan
@@ -149,27 +148,23 @@ namespace CIAO
 
       void
       PlanGenerator_exec_i::set_session_context (
-        ::Components::SessionContext_ptr ctx
-        ACE_ENV_ARG_DECL)
+        ::Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
       {
         this->context_ =
         PlanGenerator_Context::_narrow (
-          ctx
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          ctx);
 
         if (this->context_ == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       }
 
       void
-      PlanGenerator_exec_i::ciao_preactivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      PlanGenerator_exec_i::ciao_preactivate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -178,8 +173,7 @@ namespace CIAO
       }
 
       void
-      PlanGenerator_exec_i::ciao_postactivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      PlanGenerator_exec_i::ciao_postactivate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -188,8 +182,7 @@ namespace CIAO
       }
 
       void
-      PlanGenerator_exec_i::ccm_activate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      PlanGenerator_exec_i::ccm_activate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -198,8 +191,7 @@ namespace CIAO
       }
 
       void
-      PlanGenerator_exec_i::ccm_passivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      PlanGenerator_exec_i::ccm_passivate ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -208,8 +200,7 @@ namespace CIAO
       }
 
       void
-      PlanGenerator_exec_i::ccm_remove (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      PlanGenerator_exec_i::ccm_remove ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -240,8 +231,7 @@ namespace CIAO
       // Implicit operations.
 
       ::Components::EnterpriseComponent_ptr
-      PlanGenerator_Home_exec_i::create (
-        ACE_ENV_SINGLE_ARG_DECL)
+      PlanGenerator_Home_exec_i::create ()
       ACE_THROW_SPEC ((
                         ::CORBA::SystemException,
                         ::Components::CCMException))
@@ -253,7 +243,6 @@ namespace CIAO
           retval,
           PlanGenerator_exec_i,
           CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
         return retval;
       }
diff --git a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h
index e72e0329e5b..76fd200c58b 100644
--- a/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h
+++ b/CIAO/RACE/Input_Adapters/PlanGenerator/PlanGenerator_exec.h
@@ -38,51 +38,44 @@ namespace CIAO
 
         virtual void
         push_deployment (
-          ::CIAO::RACE::Deploy_Input *ev
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          ::CIAO::RACE::Deploy_Input *ev)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Operations from Components::SessionComponent
 
         virtual void
         set_session_context (
-          ::Components::SessionContext_ptr ctx
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          ::Components::SessionContext_ptr ctx)
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ciao_preactivate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_preactivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ciao_postactivate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_postactivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ccm_activate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_activate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ccm_passivate (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_passivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
         virtual void
-        ccm_remove (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_remove ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
@@ -110,8 +103,7 @@ namespace CIAO
         // Implicit operations.
 
         virtual ::Components::EnterpriseComponent_ptr
-        create (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        create ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp
index 8028afd2650..26288a3b96c 100644
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp
+++ b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.cpp
@@ -43,8 +43,7 @@ namespace CIAO
 
       ::CORBA::Boolean
       PlanEgress_exec_i::output_plan (
-      const ::Deployment::DeploymentPlan & /* plan */
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const ::Deployment::DeploymentPlan & /* plan */)
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -70,8 +69,7 @@ namespace CIAO
       // Port operations.
 
       ::CIAO::RACE::CCM_PlanEgress_ptr
-      XML_Output_Adapter_exec_i::get_plan_egress (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      XML_Output_Adapter_exec_i::get_plan_egress ()
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -82,27 +80,23 @@ namespace CIAO
 
       void
       XML_Output_Adapter_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx
-      ACE_ENV_ARG_DECL)
+      ::Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
       {
         this->context_ =
         XML_Output_Adapter_Context::_narrow (
-        ctx
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        ctx);
 
         if (this->context_ == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       }
 
       void
-      XML_Output_Adapter_exec_i::ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      XML_Output_Adapter_exec_i::ciao_preactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -111,8 +105,7 @@ namespace CIAO
       }
 
       void
-      XML_Output_Adapter_exec_i::ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      XML_Output_Adapter_exec_i::ciao_postactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -121,8 +114,7 @@ namespace CIAO
       }
 
       void
-      XML_Output_Adapter_exec_i::ccm_activate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      XML_Output_Adapter_exec_i::ccm_activate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -131,8 +123,7 @@ namespace CIAO
       }
 
       void
-      XML_Output_Adapter_exec_i::ccm_passivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      XML_Output_Adapter_exec_i::ccm_passivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -141,8 +132,7 @@ namespace CIAO
       }
 
       void
-      XML_Output_Adapter_exec_i::ccm_remove (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      XML_Output_Adapter_exec_i::ccm_remove ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -173,8 +163,7 @@ namespace CIAO
       // Implicit operations.
 
       ::Components::EnterpriseComponent_ptr
-      XML_Output_Adapter_Home_exec_i::create (
-      ACE_ENV_SINGLE_ARG_DECL)
+      XML_Output_Adapter_Home_exec_i::create ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -186,7 +175,6 @@ namespace CIAO
         retval,
         XML_Output_Adapter_exec_i,
         CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
         return retval;
       }
diff --git a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h
index 5f91f85fd0c..2dc45207a3e 100644
--- a/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h
+++ b/CIAO/RACE/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter_exec.h
@@ -50,8 +50,7 @@ namespace CIAO
 
         virtual ::CORBA::Boolean
         output_plan (
-        const ::Deployment::DeploymentPlan & plan
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const ::Deployment::DeploymentPlan & plan)
         ACE_THROW_SPEC ((CORBA::SystemException));
       };
 
@@ -70,51 +69,44 @@ namespace CIAO
         // Port operations.
 
         virtual ::CIAO::RACE::CCM_PlanEgress_ptr
-        get_plan_egress (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        get_plan_egress ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Operations from Components::SessionComponent
 
         virtual void
         set_session_context (
-        ::Components::SessionContext_ptr ctx
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::Components::SessionContext_ptr ctx)
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_preactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_preactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_postactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_postactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_activate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_activate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_passivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_passivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_remove (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_remove ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
@@ -142,8 +134,7 @@ namespace CIAO
         // Implicit operations.
 
         virtual ::Components::EnterpriseComponent_ptr
-        create (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        create ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp
index b4faa13659e..09e976afbbe 100644
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp
+++ b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.cpp
@@ -43,8 +43,7 @@ namespace CIAO
 
       void
       PlanIngress_exec_i::analyze_plan (
-      const ::Deployment::DeploymentPlan & /* plan */
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const ::Deployment::DeploymentPlan & /* plan */)
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -67,8 +66,7 @@ namespace CIAO
       // Attribute operations.
 
       ::CIAO::RACE::RACE_Classifications *
-      Plan_Analyzer_exec_i::classes (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Plan_Analyzer_exec_i::classes ()
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -78,8 +76,7 @@ namespace CIAO
       // Port operations.
 
       ::CIAO::RACE::CCM_PlanIngress_ptr
-      Plan_Analyzer_exec_i::get_plan_ingress (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Plan_Analyzer_exec_i::get_plan_ingress ()
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -90,27 +87,23 @@ namespace CIAO
 
       void
       Plan_Analyzer_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx
-      ACE_ENV_ARG_DECL)
+      ::Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
       {
         this->context_ =
         Plan_Analyzer_Context::_narrow (
-        ctx
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        ctx);
 
         if (this->context_ == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       }
 
       void
-      Plan_Analyzer_exec_i::ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Plan_Analyzer_exec_i::ciao_preactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -119,8 +112,7 @@ namespace CIAO
       }
 
       void
-      Plan_Analyzer_exec_i::ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Plan_Analyzer_exec_i::ciao_postactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -129,8 +121,7 @@ namespace CIAO
       }
 
       void
-      Plan_Analyzer_exec_i::ccm_activate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Plan_Analyzer_exec_i::ccm_activate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -139,8 +130,7 @@ namespace CIAO
       }
 
       void
-      Plan_Analyzer_exec_i::ccm_passivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Plan_Analyzer_exec_i::ccm_passivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -149,8 +139,7 @@ namespace CIAO
       }
 
       void
-      Plan_Analyzer_exec_i::ccm_remove (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Plan_Analyzer_exec_i::ccm_remove ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -181,8 +170,7 @@ namespace CIAO
       // Implicit operations.
 
       ::Components::EnterpriseComponent_ptr
-      Plan_Analyzer_Home_exec_i::create (
-      ACE_ENV_SINGLE_ARG_DECL)
+      Plan_Analyzer_Home_exec_i::create ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -194,7 +182,6 @@ namespace CIAO
         retval,
         Plan_Analyzer_exec_i,
         CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
         return retval;
       }
diff --git a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h
index 39a77efb1f7..93318713481 100644
--- a/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h
+++ b/CIAO/RACE/Plan_Analyzer/Component/Plan_Analyzer_exec.h
@@ -50,8 +50,7 @@ namespace CIAO
 
         virtual void
         analyze_plan (
-        const ::Deployment::DeploymentPlan & plan
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const ::Deployment::DeploymentPlan & plan)
         ACE_THROW_SPEC ((CORBA::SystemException));
       };
 
@@ -68,58 +67,50 @@ namespace CIAO
         // Attribute operations.
 
         virtual ::CIAO::RACE::RACE_Classifications *
-        classes (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        classes ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Port operations.
 
         virtual ::CIAO::RACE::CCM_PlanIngress_ptr
-        get_plan_ingress (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        get_plan_ingress ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Operations from Components::SessionComponent
 
         virtual void
         set_session_context (
-        ::Components::SessionContext_ptr ctx
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::Components::SessionContext_ptr ctx)
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_preactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_preactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_postactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_postactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_activate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_activate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_passivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_passivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_remove (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_remove ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
@@ -147,8 +138,7 @@ namespace CIAO
         // Implicit operations.
 
         virtual ::Components::EnterpriseComponent_ptr
-        create (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        create ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp
index 6594d1a6271..a149a785ce6 100644
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp
+++ b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.cpp
@@ -44,8 +44,7 @@ namespace CIAO
       void
       Planner_Manager_I_exec_i::execute_planners (
       const ::Deployment::DeploymentPlan & /* plan */,
-      const ::CIAO::RACE::PlannerFlow & /* flow */
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const ::CIAO::RACE::PlannerFlow & /* flow */)
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -68,8 +67,7 @@ namespace CIAO
       // Attribute operations.
 
       ::CIAO::RACE::RACE_Classifications *
-      Planner_Manager_exec_i::classes (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Planner_Manager_exec_i::classes ()
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -79,8 +77,7 @@ namespace CIAO
       // Port operations.
 
       ::CIAO::RACE::CCM_Planner_Manager_I_ptr
-      Planner_Manager_exec_i::get_planner_manager_i (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Planner_Manager_exec_i::get_planner_manager_i ()
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -91,27 +88,23 @@ namespace CIAO
 
       void
       Planner_Manager_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx
-      ACE_ENV_ARG_DECL)
+      ::Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
       {
         this->context_ =
         Planner_Manager_Context::_narrow (
-        ctx
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        ctx);
 
         if (this->context_ == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       }
 
       void
-      Planner_Manager_exec_i::ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Planner_Manager_exec_i::ciao_preactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -120,8 +113,7 @@ namespace CIAO
       }
 
       void
-      Planner_Manager_exec_i::ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Planner_Manager_exec_i::ciao_postactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -130,8 +122,7 @@ namespace CIAO
       }
 
       void
-      Planner_Manager_exec_i::ccm_activate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Planner_Manager_exec_i::ccm_activate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -140,8 +131,7 @@ namespace CIAO
       }
 
       void
-      Planner_Manager_exec_i::ccm_passivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Planner_Manager_exec_i::ccm_passivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -150,8 +140,7 @@ namespace CIAO
       }
 
       void
-      Planner_Manager_exec_i::ccm_remove (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      Planner_Manager_exec_i::ccm_remove ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -182,8 +171,7 @@ namespace CIAO
       // Implicit operations.
 
       ::Components::EnterpriseComponent_ptr
-      Planner_Manager_Home_exec_i::create (
-      ACE_ENV_SINGLE_ARG_DECL)
+      Planner_Manager_Home_exec_i::create ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -195,7 +183,6 @@ namespace CIAO
         retval,
         Planner_Manager_exec_i,
         CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
         return retval;
       }
diff --git a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h
index f3688075017..1ca6114e850 100644
--- a/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h
+++ b/CIAO/RACE/Planner_Manager/Component/Planner_Manager_exec.h
@@ -51,8 +51,7 @@ namespace CIAO
         virtual void
         execute_planners (
         const ::Deployment::DeploymentPlan & plan,
-        const ::CIAO::RACE::PlannerFlow & flow
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const ::CIAO::RACE::PlannerFlow & flow)
         ACE_THROW_SPEC ((CORBA::SystemException));
       };
 
@@ -69,58 +68,50 @@ namespace CIAO
         // Attribute operations.
 
         virtual ::CIAO::RACE::RACE_Classifications *
-        classes (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        classes ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Port operations.
 
         virtual ::CIAO::RACE::CCM_Planner_Manager_I_ptr
-        get_planner_manager_i (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        get_planner_manager_i ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Operations from Components::SessionComponent
 
         virtual void
         set_session_context (
-        ::Components::SessionContext_ptr ctx
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::Components::SessionContext_ptr ctx)
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_preactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_preactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_postactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_postactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_activate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_activate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_passivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_passivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_remove (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_remove ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
@@ -148,8 +139,7 @@ namespace CIAO
         // Implicit operations.
 
         virtual ::Components::EnterpriseComponent_ptr
-        create (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        create ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp
index 19b937706c1..ad3370c4366 100644
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp
+++ b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.cpp
@@ -43,8 +43,7 @@ namespace CIAO
 
       ::CORBA::Boolean
       Planner_I_exec_i::process_plan (
-      ::Deployment::DeploymentPlan & /* plan */
-      ACE_ENV_ARG_DECL_NOT_USED)
+      ::Deployment::DeploymentPlan & /* plan */)
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -68,8 +67,7 @@ namespace CIAO
       // Attribute operations.
 
       char *
-      SimpleBinPacker_exec_i::name (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      SimpleBinPacker_exec_i::name ()
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -78,16 +76,14 @@ namespace CIAO
 
       void
       SimpleBinPacker_exec_i::name (
-      const char * /* name */
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const char * /* name */)
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
       }
 
       char *
-      SimpleBinPacker_exec_i::type (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      SimpleBinPacker_exec_i::type ()
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -96,8 +92,7 @@ namespace CIAO
 
       void
       SimpleBinPacker_exec_i::type (
-      const char * /* type */
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const char * /* type */)
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -106,8 +101,7 @@ namespace CIAO
       // Port operations.
 
       ::CIAO::RACE::CCM_Planner_I_ptr
-      SimpleBinPacker_exec_i::get_planner_i (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      SimpleBinPacker_exec_i::get_planner_i ()
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Your code here.
@@ -118,27 +112,23 @@ namespace CIAO
 
       void
       SimpleBinPacker_exec_i::set_session_context (
-      ::Components::SessionContext_ptr ctx
-      ACE_ENV_ARG_DECL)
+      ::Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
       {
         this->context_ =
         SimpleBinPacker_Context::_narrow (
-        ctx
-        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        ctx);
 
         if (this->context_ == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       }
 
       void
-      SimpleBinPacker_exec_i::ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      SimpleBinPacker_exec_i::ciao_preactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -147,8 +137,7 @@ namespace CIAO
       }
 
       void
-      SimpleBinPacker_exec_i::ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      SimpleBinPacker_exec_i::ciao_postactivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -157,8 +146,7 @@ namespace CIAO
       }
 
       void
-      SimpleBinPacker_exec_i::ccm_activate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      SimpleBinPacker_exec_i::ccm_activate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -167,8 +155,7 @@ namespace CIAO
       }
 
       void
-      SimpleBinPacker_exec_i::ccm_passivate (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      SimpleBinPacker_exec_i::ccm_passivate ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -177,8 +164,7 @@ namespace CIAO
       }
 
       void
-      SimpleBinPacker_exec_i::ccm_remove (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      SimpleBinPacker_exec_i::ccm_remove ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -209,8 +195,7 @@ namespace CIAO
       // Implicit operations.
 
       ::Components::EnterpriseComponent_ptr
-      SimpleBinPacker_Home_exec_i::create (
-      ACE_ENV_SINGLE_ARG_DECL)
+      SimpleBinPacker_Home_exec_i::create ()
       ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::CCMException))
@@ -222,7 +207,6 @@ namespace CIAO
         retval,
         SimpleBinPacker_exec_i,
         CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
         return retval;
       }
diff --git a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h
index f71cac2a844..b0b70703c79 100644
--- a/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h
+++ b/CIAO/RACE/Planners/SimpleBinPacker/SimpleBinPacker_exec.h
@@ -50,8 +50,7 @@ namespace CIAO
 
         virtual ::CORBA::Boolean
         process_plan (
-        ::Deployment::DeploymentPlan & plan
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::Deployment::DeploymentPlan & plan)
         ACE_THROW_SPEC ((CORBA::SystemException));
       };
 
@@ -68,75 +67,64 @@ namespace CIAO
         // Attribute operations.
 
         virtual char *
-        name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        name ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         virtual void
         name (
-        const char *
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char *)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         virtual char *
-        type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        type ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         virtual void
         type (
-        const char *
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char *)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Port operations.
 
         virtual ::CIAO::RACE::CCM_Planner_I_ptr
-        get_planner_i (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        get_planner_i ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Operations from Components::SessionComponent
 
         virtual void
         set_session_context (
-        ::Components::SessionContext_ptr ctx
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::Components::SessionContext_ptr ctx)
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_preactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_preactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ciao_postactivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ciao_postactivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_activate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_activate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_passivate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_passivate ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
 
         virtual void
-        ccm_remove (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ccm_remove ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
@@ -164,8 +152,7 @@ namespace CIAO
         // Implicit operations.
 
         virtual ::Components::EnterpriseComponent_ptr
-        create (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        create ()
         ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::CCMException));
diff --git a/CIAO/VERSION b/CIAO/VERSION
index 96c4ca50560..c4fce05941d 100644
--- a/CIAO/VERSION
+++ b/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 0.5.4, released Mon Nov 20 08:16:34 2006.
+This is CIAO version 0.5.6, released Sun Jan 28 19:59:14 2007.
 
 If you have any problems with or questions about CIAO, please send
 e-mail to the CIAO mailing list (ciao-users@cs.wustl.edu), using the
diff --git a/CIAO/ciao/Container_Base.cpp b/CIAO/ciao/Container_Base.cpp
index 1d6fea6ed12..63507fede32 100644
--- a/CIAO/ciao/Container_Base.cpp
+++ b/CIAO/ciao/Container_Base.cpp
@@ -88,8 +88,7 @@ namespace CIAO
 
   int
   Session_Container::init (const char *name,
-                           const CORBA::PolicyList *more_policies
-                           ACE_ENV_ARG_DECL)
+                           const CORBA::PolicyList *more_policies)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::init");
@@ -106,9 +105,7 @@ namespace CIAO
       }
 
     CORBA::Object_var poa_object =
-      this->orb_->resolve_initial_references("RootPOA"
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      this->orb_->resolve_initial_references("RootPOA");
 
     if (CORBA::is_nil (poa_object.in ()))
       {
@@ -118,30 +115,22 @@ namespace CIAO
       }
 
     PortableServer::POA_var root_poa =
-      PortableServer::POA::_narrow (poa_object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      PortableServer::POA::_narrow (poa_object.in ());
 
     this->create_component_POA (name,
                                 more_policies,
-                                root_poa.in ()
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+                                root_poa.in ());
 
     ACE_CString port_poa_name (name);
     port_poa_name += ":Port_POA";
     this->create_facet_consumer_POA (port_poa_name.c_str (),
                                      more_policies,
-                                     root_poa.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+                                     root_poa.in ());
 
     PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      root_poa->the_POAManager ();
 
-    poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    poa_manager->activate ();
 
     return 0;
   }
@@ -149,8 +138,7 @@ namespace CIAO
   void
   Session_Container::create_component_POA (const char *name,
                                            const CORBA::PolicyList *p,
-                                           PortableServer::POA_ptr root
-                                           ACE_ENV_ARG_DECL)
+                                           PortableServer::POA_ptr root)
   {
     CIAO_TRACE ("Session_Container::create_component_POA");
 
@@ -167,29 +155,24 @@ namespace CIAO
       }
 
     PortableServer::POAManager_var poa_manager =
-      root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      root->the_POAManager ();
 
     this->component_poa_ =
       root->create_POA (name,
                         poa_manager.in (),
-                        policies
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                        policies);
   }
 
   void
   Session_Container::create_facet_consumer_POA (
                                                 const char *name,
                                                 const CORBA::PolicyList *p,
-                                                PortableServer::POA_ptr root
-                                                ACE_ENV_ARG_DECL)
+                                                PortableServer::POA_ptr root)
   {
     CIAO_TRACE ("Session_Container::create_facet_consumer_POA");
 
     PortableServer::POAManager_var poa_manager =
-      root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      root->the_POAManager ();
 
     CORBA::ULong p_length = 0;
     if (p != 0)
@@ -201,22 +184,16 @@ namespace CIAO
     policies.length (p_length + 3);
 
     policies[0] =
-      root->create_id_assignment_policy (PortableServer::USER_ID
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      root->create_id_assignment_policy (PortableServer::USER_ID);
 
     // Servant Manager Policy
     policies[1] =
       root->create_request_processing_policy
-      (PortableServer::USE_SERVANT_MANAGER
-       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      (PortableServer::USE_SERVANT_MANAGER);
 
     // Servant Retention Policy
     policies[2] =
-      root->create_servant_retention_policy (PortableServer::RETAIN
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      root->create_servant_retention_policy (PortableServer::RETAIN);
 
     for (CORBA::ULong i = 0; i < p_length; ++i)
       {
@@ -226,9 +203,7 @@ namespace CIAO
     this->facet_cons_poa_ =
       root->create_POA (name,
                         poa_manager.in (),
-                        policies
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                        policies);
 
     ACE_NEW_THROW_EX (this->sa_,
                       Servant_Activator (this->orb_.in ()),
@@ -236,15 +211,12 @@ namespace CIAO
 
     this->facet_cons_poa_->set_servant_manager (
                                                 this->sa_
-                                                ACE_ENV_ARG_PARAMETER
                                                 );
-    ACE_CHECK;
   }
 
   CORBA::Object_ptr
   Session_Container::install_servant (PortableServer::Servant p,
-                                      Container::OA_Type t
-                                      ACE_ENV_ARG_DECL)
+                                      Container::OA_Type t)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::install_servant");
@@ -261,34 +233,25 @@ namespace CIAO
       }
 
     PortableServer::ObjectId_var oid =
-      tmp->activate_object (p
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      tmp->activate_object (p);
 
     CORBA::Object_var objref =
-      tmp->id_to_reference (oid.in ()
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      tmp->id_to_reference (oid.in ());
 
     return objref._retn ();
   }
 
   CORBA::Object_ptr
   Session_Container::install_component (PortableServer::Servant p,
-                                        PortableServer::ObjectId_out oid
-                                        ACE_ENV_ARG_DECL)
+                                        PortableServer::ObjectId_out oid)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::install_component");
     PortableServer::ObjectId_var id =
-      this->component_poa_->activate_object (p
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->component_poa_->activate_object (p);
 
     CORBA::Object_var objref =
-      this->component_poa_->id_to_reference (id.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->component_poa_->id_to_reference (id.in ());
 
     oid = id._retn ();
 
@@ -306,8 +269,7 @@ namespace CIAO
                                         const char *exe_entrypt,
                                         const char *sv_dll_name,
                                         const char *sv_entrypt,
-                                        const char *ins_name
-                                        ACE_ENV_ARG_DECL)
+                                        const char *ins_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Deployment::UnknownImplId,
                      Deployment::ImplEntryPointNotFound,
@@ -488,9 +450,7 @@ namespace CIAO
 
     PortableServer::Servant home_servant = screator (home_executor.in (),
                                                      this,
-                                                     ins_name
-                                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::CCMHome::_nil ());
+                                                     ins_name);
 
     if (home_servant == 0)
       {
@@ -505,35 +465,27 @@ namespace CIAO
 
     CORBA::Object_var objref =
       this->install_servant (home_servant,
-                             Container::Component
-                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::CCMHome::_nil ());
+                             Container::Component);
 
     Components::CCMHome_var homeref =
-      Components::CCMHome::_narrow (objref.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      Components::CCMHome::_narrow (objref.in ());
 
     return homeref._retn ();
   }
 
   void
-  Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref
-                                          ACE_ENV_ARG_DECL)
+  Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::ciao_uninstall_home");
 
     this->uninstall (homeref,
-                     Container::Component
-                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                     Container::Component);
   }
 
   void
   Session_Container::uninstall (CORBA::Object_ptr objref,
-                                Container::OA_Type t
-                                ACE_ENV_ARG_DECL)
+                                Container::OA_Type t)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::uninstall");
@@ -550,19 +502,14 @@ namespace CIAO
       }
 
     PortableServer::ObjectId_var oid =
-      tmp->reference_to_id (objref
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      tmp->reference_to_id (objref);
 
-    tmp->deactivate_object (oid.in ()
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    tmp->deactivate_object (oid.in ());
   }
 
   void
   Session_Container::uninstall (PortableServer::Servant svt,
-                                Container::OA_Type t
-                                ACE_ENV_ARG_DECL)
+                                Container::OA_Type t)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::uninstall");
@@ -578,31 +525,22 @@ namespace CIAO
       }
 
     PortableServer::ObjectId_var oid
-      = tmp->servant_to_id (svt
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      = tmp->servant_to_id (svt);
 
-    tmp->deactivate_object (oid.in ()
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    tmp->deactivate_object (oid.in ());
   }
 
   void
   Session_Container::uninstall_component (Components::CCMObject_ptr objref,
-                                          PortableServer::ObjectId_out oid
-                                          ACE_ENV_ARG_DECL)
+                                          PortableServer::ObjectId_out oid)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::uninstall_component");
 
     PortableServer::ObjectId_var id =
-      this->component_poa_->reference_to_id (objref
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->component_poa_->reference_to_id (objref);
 
-    this->component_poa_->deactivate_object (id.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->component_poa_->deactivate_object (id.in ());
 
     oid = id._retn ();
   }
@@ -611,15 +549,13 @@ namespace CIAO
   Session_Container::add_servant_map (
                                       PortableServer::ObjectId &,
                                       Dynamic_Component_Servant_Base*
-                                      ACE_ENV_ARG_DECL_NOT_USED
                                       )
   {
     CIAO_TRACE ("Session_Container::add_servant_map");
   }
 
   void
-  Session_Container::deactivate_facet (const PortableServer::ObjectId &
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+  Session_Container::deactivate_facet (const PortableServer::ObjectId &)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::deactivate_facet");
@@ -628,15 +564,13 @@ namespace CIAO
   void
   Session_Container::delete_servant_map (
                                          PortableServer::ObjectId &
-                                         ACE_ENV_ARG_DECL_NOT_USED
                                          )
   {
     CIAO_TRACE ("Session_Container::delete_servant_map");
   }
 
   CORBA::Object_ptr
-  Session_Container::get_home_objref (PortableServer::Servant
-                                      ACE_ENV_ARG_DECL)
+  Session_Container::get_home_objref (PortableServer::Servant)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::get_home_objref");
@@ -646,8 +580,7 @@ namespace CIAO
   CORBA::Object_ptr
   Session_Container::generate_reference (const char *obj_id,
                                          const char *repo_id,
-                                         Container::OA_Type t
-                                         ACE_ENV_ARG_DECL)
+                                         Container::OA_Type t)
   {
     CIAO_TRACE ("Session_Container::generate_reference");
 
@@ -677,9 +610,7 @@ namespace CIAO
 
     CORBA::Object_var objref =
       tmp->create_reference_with_id (oid.in (),
-                                     repo_id
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                     repo_id);
 
     return objref._retn ();
   }
diff --git a/CIAO/ciao/Container_Base.h b/CIAO/ciao/Container_Base.h
index cbde8a4d6c0..551a1670d5b 100644
--- a/CIAO/ciao/Container_Base.h
+++ b/CIAO/ciao/Container_Base.h
@@ -75,8 +75,7 @@ namespace CIAO
 
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
-                      const CORBA::PolicyList *more_policies = 0
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                      const CORBA::PolicyList *more_policies = 0)
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
     /// Install a new home
@@ -86,7 +85,6 @@ namespace CIAO
         const char *sv_dll_name,
         const char *sv_entrypt,
         const char *ins_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::UnknownImplId,
@@ -94,27 +92,22 @@ namespace CIAO
                        Deployment::InstallationFailure)) = 0;
 
     // Uninstall a servant for component or home.
-    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref)
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
     // Uninstall a servant for component.
     virtual void uninstall_component (::Components::CCMObject_ptr objref,
-                                      PortableServer::ObjectId_out oid
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      PortableServer::ObjectId_out oid)
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
     // @@Jai, please see the Session Container class for comments.
     // @@ Jai, do you really need the environment variable?
     virtual void add_servant_map (PortableServer::ObjectId &oid,
-                                  Dynamic_Component_Servant_Base* servant
-                                  ACE_ENV_ARG_DECL) = 0;
+                                  Dynamic_Component_Servant_Base* servant) = 0;
 
-    virtual void delete_servant_map (PortableServer::ObjectId &oid
-                                     ACE_ENV_ARG_DECL) = 0;
+    virtual void delete_servant_map (PortableServer::ObjectId &oid) = 0;
 
-    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p)
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   protected:
@@ -185,8 +178,7 @@ namespace CIAO
 
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
-                      const CORBA::PolicyList *more_policies = 0
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                      const CORBA::PolicyList *more_policies = 0)
 
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -207,7 +199,6 @@ namespace CIAO
         const char *sv_dll_name,
         const char *sv_entrypt,
         const char *ins_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Deployment::UnknownImplId,
@@ -215,55 +206,46 @@ namespace CIAO
                        Deployment::InstallationFailure));
 
     /// Uninstall a servant for component or home.
-    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Uninstall a servant for component.
     virtual void uninstall_component (::Components::CCMObject_ptr objref,
-                                      PortableServer::ObjectId_out oid
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      PortableServer::ObjectId_out oid)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Install a servant for component or home.
     virtual CORBA::Object_ptr install_servant (PortableServer::Servant p,
-                                       Container::OA_Type t
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       Container::OA_Type t)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Install a component servant.
     CORBA::Object_ptr install_component (PortableServer::Servant p,
-                                         PortableServer::ObjectId_out oid
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         PortableServer::ObjectId_out oid)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Get an object reference to a component or home from the servant.
-    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Uninstall a servant for component or home.
     void uninstall (CORBA::Object_ptr objref,
-                    Container::OA_Type t
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                    Container::OA_Type t)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Uninstall a servant for component or home.
     void uninstall (PortableServer::Servant svt,
-                    Container::OA_Type t
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                    Container::OA_Type t)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // @@Jai, please consider naming this method as
     // "add_servant_to_map ()" to be more descriptive.
     virtual void add_servant_map (PortableServer::ObjectId &oid,
-                                  Dynamic_Component_Servant_Base* servant
-                                  ACE_ENV_ARG_DECL);
+                                  Dynamic_Component_Servant_Base* servant);
 
     // @@Jai, please consider naming this method as
     // "delete_servant_from_map ()" to be more descriptive.
-    virtual void delete_servant_map (PortableServer::ObjectId &oid
-                                     ACE_ENV_ARG_DECL);
+    virtual void delete_servant_map (PortableServer::ObjectId &oid);
 
     // @@Jai, could yo please add documentation?
     /*
@@ -274,20 +256,17 @@ namespace CIAO
      * deactivate_facet from the Swapping_Conatiner's interface. It
      * would make the base container interface much cleaner.
      */
-    virtual void deactivate_facet (const PortableServer::ObjectId &oid
-                                   ACE_ENV_ARG_DECL)
+    virtual void deactivate_facet (const PortableServer::ObjectId &oid)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Analog of the POA method that creates an object reference from
     /// an object id string.
     CORBA::Object_ptr generate_reference (const char *obj_id,
                                           const char *repo_id,
-                                          Container::OA_Type t
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          Container::OA_Type t);
 
     /// Return the servant activator factory that activates the
     /// servants for facets and consumers.
@@ -302,14 +281,12 @@ namespace CIAO
      */
     void create_component_POA (const char *name,
                                const CORBA::PolicyList *p,
-                               PortableServer::POA_ptr root
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                               PortableServer::POA_ptr root);
 
     /// Create POA for the facets and consumers alone.
     void create_facet_consumer_POA (const char *name,
                                     const CORBA::PolicyList *p,
-                                    PortableServer::POA_ptr root
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                    PortableServer::POA_ptr root);
 
     /// Not allowed to be
     Session_Container (void);
diff --git a/CIAO/ciao/Container_Base.inl b/CIAO/ciao/Container_Base.inl
index 0d6aeef9bcc..5d178c2024c 100644
--- a/CIAO/ciao/Container_Base.inl
+++ b/CIAO/ciao/Container_Base.inl
@@ -1,12 +1,10 @@
 // $Id$   -*- C++ -*-
 
 ACE_INLINE CORBA::Object_ptr
-CIAO::Session_Container::get_objref (PortableServer::Servant p
-                                     ACE_ENV_ARG_DECL)
+CIAO::Session_Container::get_objref (PortableServer::Servant p)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->the_POA ()->servant_to_reference (p
-                                                 ACE_ENV_ARG_PARAMETER);
+  return this->the_POA ()->servant_to_reference (p);
 }
 
 ACE_INLINE CIAO::Servant_Activator *
diff --git a/CIAO/ciao/Context_Impl_Base.cpp b/CIAO/ciao/Context_Impl_Base.cpp
index 6b31dedf392..9c377124e60 100644
--- a/CIAO/ciao/Context_Impl_Base.cpp
+++ b/CIAO/ciao/Context_Impl_Base.cpp
@@ -24,7 +24,6 @@ namespace CIAO
 
   Components::Principal_ptr
   Context_Impl_Base::get_caller_principal (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -34,7 +33,6 @@ namespace CIAO
 
   Components::CCMHome_ptr
   Context_Impl_Base::get_CCM_home (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -43,7 +41,6 @@ namespace CIAO
 
   CORBA::Boolean
   Context_Impl_Base::get_rollback_only (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::IllegalState))
@@ -53,7 +50,6 @@ namespace CIAO
 
   Components::Transaction::UserTransaction_ptr
   Context_Impl_Base::get_user_transaction (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::IllegalState))
@@ -65,7 +61,6 @@ namespace CIAO
   CORBA::Boolean
   Context_Impl_Base::is_caller_in_role (
       const char * /* role */
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -74,12 +69,11 @@ namespace CIAO
 
   void
   Context_Impl_Base::set_rollback_only (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::IllegalState))
   {
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
+    throw CORBA::NO_IMPLEMENT ();
   }
 
   // CIAO-specific.
diff --git a/CIAO/ciao/Context_Impl_Base.h b/CIAO/ciao/Context_Impl_Base.h
index dbed5dcafa3..189a9f3aba2 100644
--- a/CIAO/ciao/Context_Impl_Base.h
+++ b/CIAO/ciao/Context_Impl_Base.h
@@ -68,30 +68,29 @@ namespace CIAO
     // Operations from ::Components::CCMContext.
 
     virtual Components::Principal_ptr
-    get_caller_principal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_caller_principal ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual Components::CCMHome_ptr
-    get_CCM_home (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_CCM_home ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual CORBA::Boolean
-    get_rollback_only (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_rollback_only ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
 
     virtual Components::Transaction::UserTransaction_ptr
-    get_user_transaction (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_user_transaction ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
 
     virtual CORBA::Boolean
-    is_caller_in_role (const char *role
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    is_caller_in_role (const char *role)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
-    set_rollback_only (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    set_rollback_only ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
 
diff --git a/CIAO/ciao/Context_Impl_T.cpp b/CIAO/ciao/Context_Impl_T.cpp
index 0ef58a1b735..94bc0ac65eb 100644
--- a/CIAO/ciao/Context_Impl_T.cpp
+++ b/CIAO/ciao/Context_Impl_T.cpp
@@ -36,7 +36,6 @@ namespace CIAO
             typename COMP_VAR>
   CORBA::Object_ptr
   Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::get_CCM_object (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::IllegalState))
@@ -45,25 +44,19 @@ namespace CIAO
     {
       CORBA::Object_var obj;
 
-      ACE_TRY
+      try
         {
           obj =
-            this->container_->get_objref (this->servant_
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->container_->get_objref (this->servant_);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught Exception \n");
+          ex._tao_print_exception ("Caught Exception \n");
           return CORBA::Object::_nil ();
         }
-      ACE_ENDTRY;
 
 
-      this->component_ = COMP::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      this->component_ = COMP::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->component_.in ()))
       {
diff --git a/CIAO/ciao/Context_Impl_T.h b/CIAO/ciao/Context_Impl_T.h
index cc09becfd35..a9918af0d36 100644
--- a/CIAO/ciao/Context_Impl_T.h
+++ b/CIAO/ciao/Context_Impl_T.h
@@ -82,7 +82,7 @@ namespace CIAO
     // Operations from ::Components::SessionContext.
 
     virtual CORBA::Object_ptr
-    get_CCM_object (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_CCM_object ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
 
diff --git a/CIAO/ciao/Cookies.cpp b/CIAO/ciao/Cookies.cpp
index 4a319577be4..74d02a3cd18 100644
--- a/CIAO/ciao/Cookies.cpp
+++ b/CIAO/ciao/Cookies.cpp
@@ -57,7 +57,7 @@ namespace CIAO
 
   //========================================================
   CORBA::ValueBase *
-  Map_Key_Cookie_init::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
+  Map_Key_Cookie_init::create_for_unmarshal ()
   {
     CORBA::ValueBase *ret_val = 0;
 
@@ -65,8 +65,6 @@ namespace CIAO
                       CIAO::Map_Key_Cookie,
                       CORBA::NO_MEMORY ());
 
-    // @@ (OO) An "ACE_CHECK_RETURN (0) is missing here.
-
     return ret_val;
   }
 
diff --git a/CIAO/ciao/Cookies.h b/CIAO/ciao/Cookies.h
index 995629378d2..72cad6f5744 100644
--- a/CIAO/ciao/Cookies.h
+++ b/CIAO/ciao/Cookies.h
@@ -61,7 +61,7 @@ namespace CIAO
   public:
     virtual ~Map_Key_Cookie_init (void);
 
-    virtual CORBA::ValueBase *create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL);
+    virtual CORBA::ValueBase *create_for_unmarshal ();
   };
 }
 
diff --git a/CIAO/ciao/Dynamic_Component_Activator.cpp b/CIAO/ciao/Dynamic_Component_Activator.cpp
index 1400766070d..cdce36fb96f 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.cpp
+++ b/CIAO/ciao/Dynamic_Component_Activator.cpp
@@ -21,8 +21,7 @@ namespace CIAO
 
   PortableServer::Servant
   Dynamic_Component_Activator::incarnate (const PortableServer::ObjectId &oid,
-                                PortableServer::POA_ptr
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                PortableServer::POA_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest))
   {
@@ -43,8 +42,7 @@ namespace CIAO
     PortableServer::POA_ptr ,
     PortableServer::Servant ,
     CORBA::Boolean ,
-    CORBA::Boolean
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CORBA::Boolean)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h
index 504d8887ed9..aec2aaf79f5 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/CIAO/ciao/Dynamic_Component_Activator.h
@@ -65,8 +65,7 @@ namespace CIAO
      */
     PortableServer::Servant incarnate (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL)
+      PortableServer::POA_ptr poa)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::ForwardRequest));
 
@@ -74,8 +73,7 @@ namespace CIAO
                       PortableServer::POA_ptr adapter,
                       PortableServer::Servant servant,
                       CORBA::Boolean cleanup_in_progress,
-                      CORBA::Boolean remaining_activations
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Boolean remaining_activations)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void add_servant_map (PortableServer::ObjectId &oid,
diff --git a/CIAO/ciao/Dynamic_Component_Servant_Base.h b/CIAO/ciao/Dynamic_Component_Servant_Base.h
index 0e826cf40ab..ac849ad9e53 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_Base.h
+++ b/CIAO/ciao/Dynamic_Component_Servant_Base.h
@@ -37,8 +37,7 @@ namespace CIAO
     virtual ~Dynamic_Component_Servant_Base (void);
 
     virtual PortableServer::Servant
-      create (PortableServer::ObjectId &oid
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+      create (PortableServer::ObjectId &oid) = 0;
 
     virtual void destroy (PortableServer::ObjectId &oid) = 0;
 
diff --git a/CIAO/ciao/Dynamic_Component_Servant_T.cpp b/CIAO/ciao/Dynamic_Component_Servant_T.cpp
index c37f9763076..a69d568264a 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_T.cpp
+++ b/CIAO/ciao/Dynamic_Component_Servant_T.cpp
@@ -53,23 +53,17 @@ namespace CIAO
 
   template <typename COMP_SVNT>
   PortableServer::Servant Dynamic_Component_Servant<COMP_SVNT>::create (
-    PortableServer::ObjectId &oid
-    ACE_ENV_ARG_DECL)
+    PortableServer::ObjectId &oid)
   {
     CIAO::Swap_Exec_var swap_exec =
-      CIAO::Swap_Exec::_narrow (this->executor_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      CIAO::Swap_Exec::_narrow (this->executor_.in ());
 
     ::Components::EnterpriseComponent_var ciao_ec =
-      swap_exec->incarnate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      swap_exec->incarnate ();
 
     typedef typename COMP_SVNT::_exec_type exec_type;
     typename COMP_SVNT::_exec_type::_var_type ciao_comp =
-      exec_type::_narrow (ciao_ec.in ()
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      exec_type::_narrow (ciao_ec.in ());
 
     /// @@ Jai, should you be using ACE_NEW_THROW_EX here?
     COMP_SVNT *svt = new COMP_SVNT (ciao_comp.in (),
diff --git a/CIAO/ciao/Dynamic_Component_Servant_T.h b/CIAO/ciao/Dynamic_Component_Servant_T.h
index 5ca9fab815e..6d38bf85399 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_T.h
+++ b/CIAO/ciao/Dynamic_Component_Servant_T.h
@@ -45,8 +45,7 @@ namespace CIAO
     virtual ~Dynamic_Component_Servant (void);
 
     virtual PortableServer::Servant
-      create (PortableServer::ObjectId &oid
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      create (PortableServer::ObjectId &oid);
 
     virtual void destroy (PortableServer::ObjectId &oid);
 
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.cpp b/CIAO/ciao/Home_Servant_Impl_Base.cpp
index 81c62eb6110..f96c2ac684d 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_Base.cpp
@@ -17,7 +17,6 @@ namespace CIAO
 
   CORBA::IRObject_ptr
   Home_Servant_Impl_Base::get_component_def (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -27,7 +26,6 @@ namespace CIAO
 
   CORBA::IRObject_ptr
   Home_Servant_Impl_Base::get_home_def (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.h b/CIAO/ciao/Home_Servant_Impl_Base.h
index 848259f72d5..f7744ea6b48 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.h
+++ b/CIAO/ciao/Home_Servant_Impl_Base.h
@@ -50,11 +50,11 @@ namespace CIAO
     // Operations for CCMHome interface.
 
     virtual ::CORBA::IRObject_ptr
-    get_component_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_component_def ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::CORBA::IRObject_ptr
-    get_home_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_home_def ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
diff --git a/CIAO/ciao/Home_Servant_Impl_T.cpp b/CIAO/ciao/Home_Servant_Impl_T.cpp
index ec85dc8be6a..5dc7e68243b 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_T.cpp
@@ -53,7 +53,6 @@ namespace CIAO
                     EXEC,
                     COMP_SVNT>::remove_component (
       ::Components::CCMObject_ptr comp
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::RemoveFailure))
@@ -61,9 +60,7 @@ namespace CIAO
     CIAO_TRACE ("Home_Servant_Impl<>::remove_component");
 
     PortableServer::ObjectId_var oid =
-      this->container_->the_POA ()->reference_to_id (comp
-                                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->container_->the_POA ()->reference_to_id (comp);
 
     Components::CCMObject_var ccm_obj_var = Components::CCMObject::_nil ();
     if (objref_map_.find (oid.in (), ccm_obj_var) != 0)
@@ -74,17 +71,14 @@ namespace CIAO
 
     typedef typename COMP_SVNT::_stub_type stub_type;
     typename COMP_SVNT::_stub_var_type _ciao_comp =
-      stub_type::_narrow (ccm_obj_var.in ()
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      stub_type::_narrow (ccm_obj_var.in ());
 
     if (CORBA::is_nil (_ciao_comp.in ()))
       {
-        ACE_THROW (Components::RemoveFailure ());
+        throw Components::RemoveFailure ();
       }
 
-    _ciao_comp->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    _ciao_comp->remove ();
 
     if (CIAO::debug_level () > 3)
       {
@@ -122,14 +116,13 @@ namespace CIAO
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     COMP_SVNT>::create_component (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
   {
     CIAO_TRACE ("Home_Servant_Impl<>::create_component");
 
-    return this->create (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->create ();
   }
 
   // Operations for implicit home interface.
@@ -141,7 +134,6 @@ namespace CIAO
   Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     COMP_SVNT>::create (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
@@ -155,17 +147,13 @@ namespace CIAO
       }
 
     ::Components::EnterpriseComponent_var _ciao_ec =
-      this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+      this->executor_->create ();
 
 	typedef typename COMP_SVNT::_exec_type exec_type;
     typename COMP_SVNT::_exec_type::_var_type _ciao_comp =
-      exec_type::_narrow (_ciao_ec.in ()
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP::_nil ());
+      exec_type::_narrow (_ciao_ec.in ());
 
-    return this->_ciao_activate_component (_ciao_comp.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+    return this->_ciao_activate_component (_ciao_comp.in ());
   }
 
   // CIAO-specific operations.
@@ -178,21 +166,16 @@ namespace CIAO
                     EXEC,
                     COMP_SVNT>::_ciao_activate_component (
       typename COMP_SVNT::_exec_type::_ptr_type exe
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component");
 
     CORBA::Object_var hobj =
-      this->container_->get_objref (this
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+      this->container_->get_objref (this);
 
     Components::CCMHome_var home =
-      Components::CCMHome::_narrow (hobj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+      Components::CCMHome::_narrow (hobj.in ());
 
     typedef typename COMP_SVNT::_stub_type stub_type;
     COMP_SVNT *svt = 0;
@@ -209,20 +192,14 @@ namespace CIAO
 
     CORBA::Object_var objref =
       this->container_->install_component (svt,
-                                           oid.out ()
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+                                           oid.out ());
 
     typedef typename COMP_SVNT::_stub_type stub_type;
     typename COMP_SVNT::_stub_var_type ho =
-      stub_type::_narrow (objref.in ()
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+      stub_type::_narrow (objref.in ());
 
     Components::CCMObject_var ccmobjref =
-      Components::CCMObject::_narrow (objref.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+      Components::CCMObject::_narrow (objref.in ());
 
     this->objref_map_.bind (
       oid.in (),
@@ -239,7 +216,6 @@ namespace CIAO
                     EXEC,
                     COMP_SVNT>::_ciao_passivate_component (
       typename COMP_SVNT::_stub_ptr_type comp
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -247,9 +223,7 @@ namespace CIAO
 
     PortableServer::ObjectId_var oid;
     this->container_->uninstall_component (comp,
-                                           oid.out ()
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                           oid.out ());
   }
 }
 
diff --git a/CIAO/ciao/Home_Servant_Impl_T.h b/CIAO/ciao/Home_Servant_Impl_T.h
index 8d148dc193c..c29ba00615a 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.h
+++ b/CIAO/ciao/Home_Servant_Impl_T.h
@@ -57,22 +57,21 @@ namespace CIAO
     // Operations for CCMHome interface.
 
     virtual void
-    remove_component (Components::CCMObject_ptr comp
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    remove_component (Components::CCMObject_ptr comp)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::RemoveFailure));
 
     // Operations for keyless home interface.
 
     virtual ::Components::CCMObject_ptr
-    create_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create_component ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CreateFailure));
 
     // Operations for implicit home interface.
 
     virtual typename COMP_SVNT::_stub_ptr_type
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CreateFailure));
 
@@ -83,13 +82,11 @@ namespace CIAO
     // CIAO-specific operations.
 
     typename COMP_SVNT::_stub_ptr_type
-    _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void
-    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
diff --git a/CIAO/ciao/NodeApp_CB_Impl.cpp b/CIAO/ciao/NodeApp_CB_Impl.cpp
index 24578aa664c..c87e80f9333 100644
--- a/CIAO/ciao/NodeApp_CB_Impl.cpp
+++ b/CIAO/ciao/NodeApp_CB_Impl.cpp
@@ -11,8 +11,7 @@ NodeApplication_Callback_Impl  (CORBA::ORB_ptr o,
     poa_ (PortableServer::POA::_duplicate (p)),
     nam_ (Deployment::NodeApplicationManager::_duplicate (s))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     //@@ Note: this properties is useless unless
     //   we have some specific properties for the callback obj.
@@ -20,17 +19,13 @@ NodeApplication_Callback_Impl  (CORBA::ORB_ptr o,
     ACE_NEW_THROW_EX (tmp,
                     Deployment::Properties (properties),
                     CORBA::NO_MEMORY ());
-    ACE_TRY_CHECK;
     this->properties_ = tmp;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "NodeApp_CB_Impl::Constructor\t\n");
-    ACE_RE_THROW;
+    ex._tao_print_exception ("NodeApp_CB_Impl::Constructor\t\n");
+    throw;
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 CIAO::NodeApplication_Callback_Impl::~NodeApplication_Callback_Impl ()
@@ -46,8 +41,7 @@ CIAO::NodeApplication_Callback_Impl::_default_POA (void)
 Deployment::NodeApplicationManager_ptr
 CIAO::NodeApplication_Callback_Impl::register_node_application (
     Deployment::NodeApplication_ptr na,
-    Deployment::Properties_out properties
-    ACE_ENV_ARG_DECL_NOT_USED)
+    Deployment::Properties_out properties)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   properties = this->properties_._retn ();
diff --git a/CIAO/ciao/NodeApp_CB_Impl.h b/CIAO/ciao/NodeApp_CB_Impl.h
index 95cc3de30e5..bd5c5fd7711 100644
--- a/CIAO/ciao/NodeApp_CB_Impl.h
+++ b/CIAO/ciao/NodeApp_CB_Impl.h
@@ -53,8 +53,7 @@ namespace CIAO
     /// NodeApplicationManager
     Deployment::NodeApplicationManager_ptr
     register_node_application (Deployment::NodeApplication_ptr na,
-                               Deployment::Properties_out properties
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               Deployment::Properties_out properties)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     Deployment::NodeApplication_ptr get_nodeapp_ref (void);
diff --git a/CIAO/ciao/Port_Activator.h b/CIAO/ciao/Port_Activator.h
index db047575405..f3914d7d786 100644
--- a/CIAO/ciao/Port_Activator.h
+++ b/CIAO/ciao/Port_Activator.h
@@ -67,12 +67,10 @@ namespace CIAO
      * specifications.
      */
     virtual PortableServer::Servant activate (
-        const PortableServer::ObjectId &oid
-        ACE_ENV_ARG_DECL) = 0;
+        const PortableServer::ObjectId &oid) = 0;
 
     virtual void deactivate (
-        const PortableServer::Servant servant
-        ACE_ENV_ARG_DECL) = 0;
+        const PortableServer::Servant servant) = 0;
 
   protected:
     /// The object ID that is used to activate the servant within the
diff --git a/CIAO/ciao/Port_Activator_T.cpp b/CIAO/ciao/Port_Activator_T.cpp
index 6881ffc73e5..b6bc950a642 100644
--- a/CIAO/ciao/Port_Activator_T.cpp
+++ b/CIAO/ciao/Port_Activator_T.cpp
@@ -35,12 +35,10 @@ namespace CIAO
             typename COMP_SERV>
   void
   Port_Activator_T<SERV, EXEC, CONTEXT, COMP_SERV>::deactivate (
-      const PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
+      const PortableServer::Servant servant)
   {
     SERVANT *s = dynamic_cast<SERVANT *> (servant);
-    s->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    s->_remove_ref ();
   }
 
   template <typename SERV,
@@ -49,8 +47,7 @@ namespace CIAO
             typename COMP_SERV>
   PortableServer::Servant
   Port_Activator_T<SERV, EXEC, CONTEXT, COMP_SERV>::activate (
-      const PortableServer::ObjectId &oid
-      ACE_ENV_ARG_DECL)
+      const PortableServer::ObjectId &oid)
   {
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
diff --git a/CIAO/ciao/Port_Activator_T.h b/CIAO/ciao/Port_Activator_T.h
index 8afa788b655..bf159c89b4e 100644
--- a/CIAO/ciao/Port_Activator_T.h
+++ b/CIAO/ciao/Port_Activator_T.h
@@ -53,12 +53,10 @@ namespace CIAO
     /// Template method from the base class, please see the base class
     /// documentation for details.
     PortableServer::Servant activate (
-        const PortableServer::ObjectId &oid
-        ACE_ENV_ARG_DECL);
+        const PortableServer::ObjectId &oid);
 
     void deactivate (
-        const PortableServer::Servant servant
-        ACE_ENV_ARG_DECL);
+        const PortableServer::Servant servant);
 
   private:
     /// The executor
diff --git a/CIAO/ciao/Servant_Activator.cpp b/CIAO/ciao/Servant_Activator.cpp
index 2638133fa23..c0e1bc93d9d 100644
--- a/CIAO/ciao/Servant_Activator.cpp
+++ b/CIAO/ciao/Servant_Activator.cpp
@@ -38,8 +38,7 @@ namespace CIAO
 
   bool
   Servant_Activator::update_port_activator (
-    const PortableServer::ObjectId &oid
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var str =
@@ -66,8 +65,7 @@ namespace CIAO
 
   PortableServer::Servant
   Servant_Activator::incarnate (const PortableServer::ObjectId &oid,
-                                PortableServer::POA_ptr
-                                ACE_ENV_ARG_DECL)
+                                PortableServer::POA_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest))
   {
@@ -114,8 +112,7 @@ namespace CIAO
                 ACE_DEBUG ((LM_DEBUG, "Activating Port %s\n",
                             str.in ()));
 
-              return this->pa_[t]->activate (oid
-                                             ACE_ENV_ARG_PARAMETER);
+              return this->pa_[t]->activate (oid);
             }
         }
     }
@@ -128,8 +125,7 @@ namespace CIAO
                                   PortableServer::POA_ptr ,
                                   PortableServer::Servant servant,
                                   CORBA::Boolean ,
-                                  CORBA::Boolean
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Boolean)
       ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var str =
@@ -157,9 +153,7 @@ namespace CIAO
           {
             ACE_DEBUG ((LM_DEBUG, "Deactivating Port %s\n",
                         str.in ()));
-            this->pa_[t]->deactivate (servant
-                                      ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+            this->pa_[t]->deactivate (servant);
           }
       }
   }
diff --git a/CIAO/ciao/Servant_Activator.h b/CIAO/ciao/Servant_Activator.h
index 551388de004..9a3cfc58644 100644
--- a/CIAO/ciao/Servant_Activator.h
+++ b/CIAO/ciao/Servant_Activator.h
@@ -57,8 +57,7 @@ namespace CIAO
 
     virtual ~Servant_Activator (void);
 
-    bool update_port_activator (const PortableServer::ObjectId &oid
-      ACE_ENV_ARG_DECL)
+    bool update_port_activator (const PortableServer::ObjectId &oid)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Template methods overridden to get callbacks.
@@ -69,8 +68,7 @@ namespace CIAO
      */
     PortableServer::Servant incarnate (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL)
+      PortableServer::POA_ptr poa)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::ForwardRequest));
 
@@ -78,8 +76,7 @@ namespace CIAO
                       PortableServer::POA_ptr adapter,
                       PortableServer::Servant servant,
                       CORBA::Boolean cleanup_in_progress,
-                      CORBA::Boolean remaining_activations
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Boolean remaining_activations)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Local helper methods
diff --git a/CIAO/ciao/Servant_Impl_Base.cpp b/CIAO/ciao/Servant_Impl_Base.cpp
index daa48f70014..7ea606c2c7b 100644
--- a/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servant_Impl_Base.cpp
@@ -23,7 +23,6 @@ namespace CIAO
 
   ::Components::PrimaryKeyBase *
   Servant_Impl_Base::get_primary_key (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ::Components::NoKeyAvailable))
@@ -33,7 +32,6 @@ namespace CIAO
 
   CORBA::IRObject_ptr
   Servant_Impl_Base::get_component_def (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -43,7 +41,6 @@ namespace CIAO
 
   void
   Servant_Impl_Base::configuration_complete (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidConfiguration))
@@ -53,95 +50,78 @@ namespace CIAO
 
   void
   Servant_Impl_Base::remove (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::RemoveFailure))
   {
-    ACE_TRY
+    try
     {
       // Removing Facets
       Components::FacetDescriptions_var facets =
-        this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->get_all_facets ();
 
       CORBA::ULong const facet_len = facets->length ();
       for (CORBA::ULong i = 0; i < facet_len; ++i)
       {
         PortableServer::ObjectId_var facet_id =
           this->container_->the_facet_cons_POA ()->reference_to_id
-              (facets[i]->facet_ref () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+              (facets[i]->facet_ref ());
 
         CIAO::Servant_Activator *sa =
           this->container_->ports_servant_activator ();
 
-        sa->update_port_activator (facet_id.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        sa->update_port_activator (facet_id.in ());
 
         this->container_->the_facet_cons_POA ()->deactivate_object
-          (facet_id ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          (facet_id);
       }
 
       // Removed Facets
 
       // Removing Consumers
       Components::ConsumerDescriptions_var consumers =
-        this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->get_all_consumers ();
 
       CORBA::ULong const consumer_len = consumers->length ();
       for (CORBA::ULong j = 0; j < consumer_len; ++j)
       {
         PortableServer::ObjectId_var cons_id =
           this->container_->the_facet_cons_POA ()->reference_to_id
-              (consumers[j]->consumer () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+              (consumers[j]->consumer ());
 
         CIAO::Servant_Activator *sa =
           this->container_->ports_servant_activator ();
-        sa->update_port_activator (cons_id.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        sa->update_port_activator (cons_id.in ());
 
         this->container_->the_facet_cons_POA ()->deactivate_object
-          (cons_id ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          (cons_id);
       }
 
       Components::SessionComponent_var temp = this->get_executor ();
-      temp->ccm_remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      temp->ccm_remove ();
 
       CORBA::Object_var objref =
         this->container_->get_objref (this);
 
       Components::CCMObject_var ccmobjref =
-        Components::CCMObject::_narrow (objref.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Components::CCMObject::_narrow (objref.in ());
 
       PortableServer::ObjectId_var oid;
 
       this->container_->uninstall_component (ccmobjref.in (),
-                                             oid.out ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             oid.out ());
 
       this->home_servant_->update_component_map (oid);
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Port not active\n");
+      ex._tao_print_exception ("Port not active\n");
     }
-    ACE_ENDTRY;
   }
 
   ::Components::ConnectionDescriptions *
   Servant_Impl_Base::get_connections (
       const char * /* name */
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
@@ -151,7 +131,6 @@ namespace CIAO
 
   ::Components::ComponentPortDescription *
   Servant_Impl_Base::get_all_ports (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -162,24 +141,19 @@ namespace CIAO
     ::Components::ComponentPortDescription_var retv = cps;
 
     ::Components::FacetDescriptions_var facets_desc =
-      this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->get_all_facets ();
 
     ::Components::ReceptacleDescriptions_var receptacle_desc =
-      this->get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->get_all_receptacles ();
 
     ::Components::ConsumerDescriptions_var consumer_desc =
-      this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->get_all_consumers ();
 
     ::Components::EmitterDescriptions_var emitter_desc =
-      this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->get_all_emitters ();
 
     ::Components::PublisherDescriptions_var publisher_desc =
-      this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->get_all_publishers ();
 
     retv->facets (facets_desc.in ());
     retv->receptacles (receptacle_desc.in ());
@@ -193,7 +167,6 @@ namespace CIAO
   CORBA::Object_ptr
   Servant_Impl_Base::provide_facet (
       const char *name
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
@@ -218,7 +191,6 @@ namespace CIAO
   Components::FacetDescriptions *
   Servant_Impl_Base::get_named_facets (
       const ::Components::NameList & names
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
@@ -250,7 +222,6 @@ namespace CIAO
 
   ::Components::FacetDescriptions *
   Servant_Impl_Base::get_all_facets (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -278,7 +249,6 @@ namespace CIAO
 
   ::Components::ConsumerDescriptions *
   Servant_Impl_Base::get_all_consumers (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -287,7 +257,6 @@ namespace CIAO
                       ::Components::ConsumerDescriptions (
                       this->consumer_table_.size ()),
                       CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
 
     ::Components::ConsumerDescriptions_var retval = tmp;
 
@@ -309,7 +278,6 @@ namespace CIAO
   ::Components::EventConsumerBase_ptr
   Servant_Impl_Base::get_consumer (
       const char *sink_name
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
@@ -335,7 +303,6 @@ namespace CIAO
   ::Components::ConsumerDescriptions *
   Servant_Impl_Base::get_named_consumers (
       const ::Components::NameList & names
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
@@ -368,7 +335,6 @@ namespace CIAO
   ::Components::EmitterDescriptions *
   Servant_Impl_Base::get_named_emitters (
       const ::Components::NameList & /* names */
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
@@ -379,7 +345,6 @@ namespace CIAO
   ::Components::ReceptacleDescriptions *
 
   Servant_Impl_Base::get_all_receptacles (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -414,7 +379,6 @@ namespace CIAO
   ::Components::ReceptacleDescriptions *
   Servant_Impl_Base::get_named_receptacles (
       const ::Components::NameList & /* names */
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
@@ -425,7 +389,6 @@ namespace CIAO
   ::Components::PublisherDescriptions *
   Servant_Impl_Base::get_named_publishers (
       const ::Components::NameList & /* names */
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
@@ -436,13 +399,12 @@ namespace CIAO
   /// Protected operations.
   void
   Servant_Impl_Base::add_facet (const char *port_name,
-                                ::CORBA::Object_ptr port_ref
-                                ACE_ENV_ARG_DECL)
+                                ::CORBA::Object_ptr port_ref)
     ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     if (0 == port_name || ::CORBA::is_nil (port_ref))
       {
-        ACE_THROW ( ::CORBA::BAD_PARAM ());
+        throw ::CORBA::BAD_PARAM ();
         return;
       }
 
@@ -584,13 +546,12 @@ namespace CIAO
   Servant_Impl_Base::add_consumer (
       const char *port_name,
       ::Components::EventConsumerBase_ptr port_ref
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     if (0 == port_name || ::CORBA::is_nil (port_ref))
       {
-        ACE_THROW ( ::CORBA::BAD_PARAM ());
+        throw ::CORBA::BAD_PARAM ();
         return;
       }
 
@@ -671,7 +632,7 @@ namespace CIAO
   }
 
   ::Components::StandardConfigurator_ptr
-  Servant_Impl_Base::get_standard_configurator (ACE_ENV_SINGLE_ARG_DECL)
+  Servant_Impl_Base::get_standard_configurator ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Create the configurator servant.
@@ -683,15 +644,13 @@ namespace CIAO
 
 
     Components::StandardConfigurator_var configurator =
-      config_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (Components::StandardConfigurator::_nil ());
+      config_impl->_this ();
 
     return configurator._retn ();
   }
 
   PortableServer::POA_ptr
-  Servant_Impl_Base::_default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Servant_Impl_Base::_default_POA ()
   {
     return
       PortableServer::POA::_duplicate (container_->the_POA ());
diff --git a/CIAO/ciao/Servant_Impl_Base.h b/CIAO/ciao/Servant_Impl_Base.h
index c96add04588..89e5293264f 100644
--- a/CIAO/ciao/Servant_Impl_Base.h
+++ b/CIAO/ciao/Servant_Impl_Base.h
@@ -61,114 +61,103 @@ namespace CIAO
     /// Operations for CCMObject interface.
 
     virtual ::Components::PrimaryKeyBase *
-    get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_primary_key ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::NoKeyAvailable));
 
     virtual CORBA::IRObject_ptr
-    get_component_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_component_def ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual Components::SessionComponent_ptr
-    get_executor (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_executor ()
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
     virtual void
-    configuration_complete (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    configuration_complete ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidConfiguration));
 
     virtual void
-    remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::RemoveFailure));
 
     virtual ::Components::ConnectionDescriptions *
-    get_connections (const char *name
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_connections (const char *name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::ComponentPortDescription *
-    get_all_ports (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_ports ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual CORBA::Object_ptr
-    provide_facet (const char *name
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    provide_facet (const char *name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::FacetDescriptions *
-    get_named_facets (const ::Components::NameList & names
-                        ACE_ENV_ARG_DECL)
+    get_named_facets (const ::Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::FacetDescriptions *
-    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_facets ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     virtual ::Components::ConsumerDescriptions *
-    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_consumers ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     virtual ::Components::EventConsumerBase_ptr
-    get_consumer (const char *sink_name
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_consumer (const char *sink_name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::ConsumerDescriptions *
-    get_named_consumers (const ::Components::NameList & names
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_named_consumers (const ::Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::EmitterDescriptions *
-    get_named_emitters (const ::Components::NameList & names
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_named_emitters (const ::Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::ReceptacleDescriptions *
-    get_named_receptacles (const ::Components::NameList & names
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_named_receptacles (const ::Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::ReceptacleDescriptions *
-    get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_receptacles ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::PublisherDescriptions *
-    get_named_publishers (const ::Components::NameList & names
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_named_publishers (const ::Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     /// Operation to set attributes on the component.
-    virtual void set_attributes (const Components::ConfigValues &descr
-                                 ACE_ENV_ARG_DECL) = 0;
+    virtual void set_attributes (const Components::ConfigValues &descr) = 0;
 
     // Creates and returns the StandardConfigurator for the component.
     virtual ::Components::StandardConfigurator_ptr
-    get_standard_configurator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_standard_configurator ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Override that returns the (passed-in) default POA of our member
     /// component's container, to ensure that we get registered
     /// to that POA when _this() is called.
     virtual PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL
       );
 
   protected:
     void add_facet (const char *port_name,
-                    ::CORBA::Object_ptr port_ref
-                    ACE_ENV_ARG_DECL)
+                    ::CORBA::Object_ptr port_ref)
       ACE_THROW_SPEC (( ::CORBA::SystemException));
 
     CORBA::Object_ptr lookup_facet (const char *port_name);
@@ -182,8 +171,7 @@ namespace CIAO
                          ::Components::Cookie * cookie);
 
     void add_consumer (const char *port_name,
-                       ::Components::EventConsumerBase_ptr port_ref
-                       ACE_ENV_ARG_DECL)
+                       ::Components::EventConsumerBase_ptr port_ref)
       ACE_THROW_SPEC (( ::CORBA::SystemException));
 
     ::Components::EventConsumerBase_ptr lookup_consumer (
diff --git a/CIAO/ciao/Servant_Impl_T.cpp b/CIAO/ciao/Servant_Impl_T.cpp
index c1e7a6ce117..8925ce3b213 100644
--- a/CIAO/ciao/Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servant_Impl_T.cpp
@@ -32,25 +32,21 @@ namespace CIAO
   {
   // **********************************************************************
   /*
-            ACE_TRY_NEW_ENV
+            try
             {
               ::Components::SessionComponent_var scom =
                 ::Components::SessionComponent::_narrow (
                     this->executor_.in ()
-                    ACE_ENV_ARG_PARAMETER
                   );
-              ACE_TRY_CHECK;
 
               if (! ::CORBA::is_nil (scom.in ()))
                 {
-                  scom->ccm_remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  scom->ccm_remove ();
                 }
             }
-            ACE_CATCHANY
+            catch (const CORBA::Exception& ex)
             {
             }
-            ACE_ENDTRY;
    */
    // *********************************************************************
 
@@ -65,7 +61,6 @@ namespace CIAO
   CORBA::Boolean
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::same_component (
       CORBA::Object_ptr object_ref
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -75,15 +70,12 @@ namespace CIAO
       }
 
     ::CORBA::Object_var the_other =
-      object_ref->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      object_ref->_get_component ();
 
     ::CORBA::Object_var me =
-      this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->context_->get_CCM_object ();
 
-    return me->_is_equivalent (the_other.in ()
-                               ACE_ENV_ARG_PARAMETER);
+    return me->_is_equivalent (the_other.in ());
 
   }
 
@@ -92,11 +84,10 @@ namespace CIAO
             typename CONTEXT>
   ::Components::CCMHome_ptr
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_ccm_home (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return this->context_->get_CCM_home (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->context_->get_CCM_home ();
   }
 
   template <typename BASE_SKEL,
@@ -104,16 +95,13 @@ namespace CIAO
             typename CONTEXT>
   Components::SessionComponent_ptr
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_executor (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
           this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
         );
-    ACE_CHECK_RETURN (Components::SessionComponent::_nil ());
     return temp._retn ();
   }
 
@@ -122,32 +110,27 @@ namespace CIAO
             typename CONTEXT>
   CORBA::Object_ptr
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::_get_component (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionContext_var sc =
       ::Components::SessionContext::_narrow (
           this->context_
-          ACE_ENV_ARG_PARAMETER
         );
-    ACE_CHECK_RETURN (::CORBA::Object::_nil ());
 
     if (! ::CORBA::is_nil (sc.in ()))
       {
-        return sc->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+        return sc->get_CCM_object ();
       }
 
     ::Components::EntityContext_var ec =
       ::Components::EntityContext::_narrow (
           this->context_
-          ACE_ENV_ARG_PARAMETER
         );
-    ACE_CHECK_RETURN (::CORBA::Object::_nil ());
 
     if (! ::CORBA::is_nil (ec.in ()))
       {
-        return ec->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+        return ec->get_CCM_object ();
       }
 
     ACE_THROW_RETURN (CORBA::INTERNAL (),
@@ -161,20 +144,16 @@ namespace CIAO
             typename CONTEXT>
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::activate_component (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (this->is_activated () == 0)
       {
-        this->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->ciao_preactivate ();
 
-        this->ciao_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->ciao_activate ();
 
-        this->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->ciao_postactivate ();
       }
   }
 
@@ -183,24 +162,20 @@ namespace CIAO
             typename CONTEXT>
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
           this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
         );
-    ACE_CHECK;
 
     if (! ::CORBA::is_nil (temp.in ()))
       {
         if (this->pre_activated_ == 0)
           {
             this->pre_activated_ = 1;
-            temp->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+            temp->ciao_preactivate ();
           }
       }
   }
@@ -209,24 +184,20 @@ namespace CIAO
             typename EXEC,
             typename CONTEXT>
   void
-  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_activate (
-  ACE_ENV_SINGLE_ARG_DECL)
+  Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
           this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
         );
-    ACE_CHECK;
 
     if (! ::CORBA::is_nil (temp.in ()))
       {
         if (this->activated_ == 0)
           {
             this->activated_ = 1;
-            temp->ccm_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+            temp->ccm_activate ();
           }
       }
   }
@@ -236,24 +207,20 @@ namespace CIAO
             typename CONTEXT>
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
           this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
         );
-    ACE_CHECK;
 
     if (! ::CORBA::is_nil (temp.in ()))
       {
         if (this->post_activated_ == 0)
           {
             this->post_activated_ = 1;
-            temp->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+            temp->ciao_postactivate ();
           }
       }
   }
@@ -263,7 +230,6 @@ namespace CIAO
             typename CONTEXT>
   CORBA::Boolean
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::is_activated (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -275,7 +241,6 @@ namespace CIAO
             typename CONTEXT>
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_passivate (
-      ACE_ENV_SINGLE_ARG_DECL
     )
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -283,13 +248,10 @@ namespace CIAO
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
           this->executor_.in ()
-          ACE_ENV_ARG_PARAMETER
         );
-    ACE_CHECK;
 
     if (! ::CORBA::is_nil (temp.in ()))
-      temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      temp->ccm_passivate ();
 
     this->pre_activated_ = 0;
     this->activated_ = 0;
diff --git a/CIAO/ciao/Servant_Impl_T.h b/CIAO/ciao/Servant_Impl_T.h
index ac9ded8b267..5fb7f7c3cf3 100644
--- a/CIAO/ciao/Servant_Impl_T.h
+++ b/CIAO/ciao/Servant_Impl_T.h
@@ -55,47 +55,46 @@ namespace CIAO
     // Operations for CCMObject interface.
 
     virtual CORBA::Boolean
-    same_component (CORBA::Object_ptr object_ref
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    same_component (CORBA::Object_ptr object_ref)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::CCMHome_ptr
-    get_ccm_home (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_ccm_home ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual CORBA::Object_ptr
-    _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    _get_component ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual Components::SessionComponent_ptr
-    get_executor (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_executor ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
    // CIAO-specific operations.
 
     void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void
-    ciao_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// @@NOTE: The busted operation.
     void
-    ciao_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::Boolean
-    is_activated (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    is_activated ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void
-    activate_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    activate_component ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
diff --git a/CIAO/ciao/Server_init.cpp b/CIAO/ciao/Server_init.cpp
index 8e1428382d0..85cd54cf853 100644
--- a/CIAO/ciao/Server_init.cpp
+++ b/CIAO/ciao/Server_init.cpp
@@ -39,11 +39,9 @@ namespace CIAO
 
   namespace Utility
   {
-    int write_IOR (const char *pathname,
-                   const char *ior)
+    int write_IOR (const char *pathname, const char *ior)
     {
-      FILE* ior_output_file_ =
-        ACE_OS::fopen (pathname, "w");
+      FILE* ior_output_file_ = ACE_OS::fopen (pathname, "w");
 
       if (ior_output_file_)
         {
@@ -68,25 +66,23 @@ namespace CIAO
       CORBA::ULong lengthMissing = 0;
       CORBA::ULong OriginalLength = name.length();
       CosNaming::Name tmpName;
-
       CosNaming::NamingContext_var tmpCtxVar;
 
-      ACE_TRY
+      try
         {
           tmpCtxVar = nc->bind_new_context(name);
           ACE_DEBUG ((LM_DEBUG, "Bound Context.\n\n"));
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound&)
         {
           ACE_DEBUG ((LM_DEBUG, "Context Already Bound.\n\n"));
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, nf)
+      catch (const CosNaming::NamingContext::NotFound& nf)
         {
           ACE_DEBUG ((LM_DEBUG, "Context not found.\n\n"));
           isNotFound = true;
           lengthMissing = nf.rest_of_name.length();
         }
-      ACE_ENDTRY;
 
       if (lengthMissing == name.length())
         {
@@ -118,23 +114,22 @@ namespace CIAO
     //---------------------------------------------------------------------------------------------
     void NameUtility::BindObjectPath (const CosNaming::NamingContextExt_ptr nc,
                                       const CosNaming::Name& name,
-                                      const CORBA::Object_var obj)
+                                      const CORBA::Object_ptr obj)
     {
       CosNaming::Name tmpName;
-      CORBA::String_var  newSCName = nc->to_string(name);
+      CORBA::String_var newSCName = nc->to_string(name);
       ACE_DEBUG ((LM_DEBUG, "The name is: %s\n", newSCName.in ()));
 
-      ACE_TRY
+      try
         {
           nc->rebind(name, obj);
         }
 
-      ACE_CATCH (CosNaming::NamingContext::NotFound, ex )
+      catch (const CosNaming::NamingContext::NotFound&)
         {
           ACE_DEBUG ((LM_DEBUG, "Name not found, doing new bind.\n"));
           nc->bind(name, obj);
         }
-      ACE_ENDTRY;
     }
 
     //---------------------------------------------------------------------------------------------
@@ -149,7 +144,7 @@ namespace CIAO
       CORBA::Object_var objV;
       CosNaming::NamingContext_var tmpContextV;
 
-      if (name.length()==0)
+      if (name.length() == 0)
         {
           tmpContextV = CosNaming::NamingContext::_duplicate(nc);
         }
@@ -158,7 +153,7 @@ namespace CIAO
           objV = nc->resolve(name);
           tmpContextV = CosNaming::NamingContext::_narrow(objV.in ());
         }
-      if (CORBA::is_nil(tmpContextV.in ()))
+      if (CORBA::is_nil (tmpContextV.in ()))
         {
           ACE_ERROR ((LM_ERROR, "listBindings: Nil context.\n"));
           return 0;
@@ -166,7 +161,7 @@ namespace CIAO
 
       tmpContextV->list(max_list_size, basicListV.out(), bIterV.out());
 
-      CORBA::Long   max_remaining = max_list_size - basicListV->length();
+      CORBA::Long max_remaining = max_list_size - basicListV->length();
       CORBA::Boolean moreBindings = !CORBA::is_nil(bIterV.in ());
 
       if (moreBindings)
diff --git a/CIAO/ciao/Server_init.h b/CIAO/ciao/Server_init.h
index c5fe53ed77d..8e0ba15561b 100644
--- a/CIAO/ciao/Server_init.h
+++ b/CIAO/ciao/Server_init.h
@@ -70,7 +70,7 @@ namespace CIAO
       /// reference 'obj'.
       static  void BindObjectPath (const CosNaming::NamingContextExt_ptr,
                                    const CosNaming::Name&,
-                                   const CORBA::Object_var);
+                                   const CORBA::Object_ptr);
 
       /// Get a list of all bindings under the given context, up to
       /// max_list_size.
diff --git a/CIAO/ciao/StandardConfigurator_Impl.cpp b/CIAO/ciao/StandardConfigurator_Impl.cpp
index ae39266cf6b..b1ca2033d21 100644
--- a/CIAO/ciao/StandardConfigurator_Impl.cpp
+++ b/CIAO/ciao/StandardConfigurator_Impl.cpp
@@ -22,19 +22,15 @@ namespace CIAO
 
   void
   StandardConfigurator_Impl::set_configuration (
-      const Components::ConfigValues &descr
-      ACE_ENV_ARG_DECL)
+      const Components::ConfigValues &descr)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    this->component_->set_attributes (descr
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->component_->set_attributes (descr);
   }
 
   void
   StandardConfigurator_Impl::configure (
-    Components::CCMObject_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    Components::CCMObject_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::WrongComponentType))
   {
diff --git a/CIAO/ciao/StandardConfigurator_Impl.h b/CIAO/ciao/StandardConfigurator_Impl.h
index 558137b64d5..1c1f800d6c2 100644
--- a/CIAO/ciao/StandardConfigurator_Impl.h
+++ b/CIAO/ciao/StandardConfigurator_Impl.h
@@ -55,13 +55,11 @@ namespace CIAO
     /// being configured, i.e, the template method from
     /// StandardConfigurator interface.
     virtual void set_configuration (
-        const Components::ConfigValues & descr
-        ACE_ENV_ARG_DECL)
+        const Components::ConfigValues & descr)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     void configure (
-        Components::CCMObject_ptr comp
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        Components::CCMObject_ptr comp)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::WrongComponentType));
 
diff --git a/CIAO/ciao/Swapping_Container.cpp b/CIAO/ciao/Swapping_Container.cpp
index d7539ed21f2..aff7ab93113 100644
--- a/CIAO/ciao/Swapping_Container.cpp
+++ b/CIAO/ciao/Swapping_Container.cpp
@@ -34,28 +34,22 @@ namespace CIAO
   }
 
   CORBA::Object_ptr
-  Swapping_Container::get_home_objref (PortableServer::Servant p
-                                       ACE_ENV_ARG_DECL)
+  Swapping_Container::get_home_objref (PortableServer::Servant p)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    return this->the_home_servant_POA ()->servant_to_reference (p
-       ACE_ENV_ARG_PARAMETER);
+    return this->the_home_servant_POA ()->servant_to_reference (p);
   }
 
   void
-  Swapping_Container::deactivate_facet (const PortableServer::ObjectId &oid
-                                        ACE_ENV_ARG_DECL)
+  Swapping_Container::deactivate_facet (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    this->the_facet_cons_POA ()->deactivate_object (oid
-       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->the_facet_cons_POA ()->deactivate_object (oid);
   }
 
   int
   Swapping_Container::init (const char *name,
-                            const CORBA::PolicyList *more_policies
-                            ACE_ENV_ARG_DECL)
+                            const CORBA::PolicyList *more_policies)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     char buffer[MAXPATHLEN];
@@ -69,9 +63,7 @@ namespace CIAO
       }
 
     CORBA::Object_var poa_object =
-      this->orb_->resolve_initial_references("RootPOA"
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      this->orb_->resolve_initial_references("RootPOA");
 
     if (CORBA::is_nil (poa_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,35 +71,25 @@ namespace CIAO
                         -1);
 
     PortableServer::POA_var root_poa =
-      PortableServer::POA::_narrow (poa_object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      PortableServer::POA::_narrow (poa_object.in ());
 
 
     this->create_servant_POA (name,
                               more_policies,
-                              root_poa.in ()
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+                              root_poa.in ());
 
 
 
     this->create_home_servant_POA ("home servant POA",
                                    more_policies,
-                                   root_poa.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+                                   root_poa.in ());
 
-    this->create_connections_POA (root_poa.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    this->create_connections_POA (root_poa.in ());
 
     PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      root_poa->the_POAManager ();
 
-    poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    poa_manager->activate ();
 
     return 0;
   }
@@ -130,8 +112,7 @@ namespace CIAO
   void
   Swapping_Container::create_home_servant_POA (const char *name,
                                           const CORBA::PolicyList *p,
-                                          PortableServer::POA_ptr root
-                                          ACE_ENV_ARG_DECL)
+                                          PortableServer::POA_ptr root)
   {
     CORBA::PolicyList policies (0);
 
@@ -139,71 +120,55 @@ namespace CIAO
       policies = *p;
 
     PortableServer::POAManager_var poa_manager =
-      root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      root->the_POAManager ();
 
 
     this->home_servant_poa_ =
       root->create_POA (name,
                         poa_manager.in (),
-                        policies
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                        policies);
   }
 
   void
   Swapping_Container::create_connections_POA (
-      PortableServer::POA_ptr root
-      ACE_ENV_ARG_DECL)
+      PortableServer::POA_ptr root)
   {
     PortableServer::POAManager_var poa_manager =
-      root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      root->the_POAManager ();
 
     TAO::Utils::PolicyList_Destroyer policies (3);
     policies.length (3);
 
     policies[0] =
-      root->create_id_assignment_policy (PortableServer::USER_ID
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      root->create_id_assignment_policy (PortableServer::USER_ID);
 
     policies[1] =
       root->create_request_processing_policy
-        (PortableServer::USE_SERVANT_MANAGER
-         ACE_ENV_ARG_PARAMETER);
+        (PortableServer::USE_SERVANT_MANAGER);
 
-    ACE_CHECK;
 
     // Servant Retention Policy
     policies[2] =
-      root->create_servant_retention_policy (PortableServer::RETAIN
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      root->create_servant_retention_policy (PortableServer::RETAIN);
 
     this->facet_cons_poa_ =
       root->create_POA ("facet_consumer_poa",
                         poa_manager.in (),
-                        policies
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                        policies);
 
     ACE_NEW_THROW_EX (this->sa_,
                       Servant_Activator (this->orb_.in ()),
                       CORBA::NO_MEMORY ());
 
     this->facet_cons_poa_->set_servant_manager (
-        this->sa_
-        ACE_ENV_ARG_PARAMETER);
+        this->sa_);
 
-    ACE_CHECK;
   }
 
   void
   Swapping_Container::create_servant_POA (const char *name,
                                           const CORBA::PolicyList *p,
-                                          PortableServer::POA_ptr root
-                                          ACE_ENV_ARG_DECL)
+                                          PortableServer::POA_ptr root)
   {
     // @@ Jai, see how this method more or less does things (like
     // setting policies)  like create_connections_POA (). Could you
@@ -214,69 +179,52 @@ namespace CIAO
       policies = *p;
 
     PortableServer::POAManager_var poa_manager =
-      root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      root->the_POAManager ();
 
     CORBA::ULong policy_length = policies.length ();
     policies.length (policy_length + 1);
     policies[policy_length] =
-      root->create_id_assignment_policy (PortableServer::USER_ID
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      root->create_id_assignment_policy (PortableServer::USER_ID);
 
     policy_length = policies.length ();
     policies.length (policy_length + 1);
     policies[policy_length] =
      root->create_request_processing_policy (
-       PortableServer::USE_SERVANT_MANAGER
-       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+       PortableServer::USE_SERVANT_MANAGER);
 
     policy_length = policies.length ();
     policies.length (policy_length + 1);
     policies[policy_length] =
-      root->create_servant_retention_policy (PortableServer::RETAIN
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      root->create_servant_retention_policy (PortableServer::RETAIN);
 
     this->component_poa_ =
       root->create_POA (name,
                         poa_manager.in (),
-                        policies
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                        policies);
 
     ACE_NEW_THROW_EX (this->dsa_,
                       Dynamic_Component_Activator (this->orb_.in ()),
                       CORBA::NO_MEMORY ());
 
     this->component_poa_->set_servant_manager (
-        this->dsa_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        this->dsa_);
 
   }
 
   void
-  Swapping_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref
-                                          ACE_ENV_ARG_DECL)
+  Swapping_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::POA_ptr tmp = this->home_servant_poa_.in ();
     PortableServer::ObjectId_var oid =
-      tmp->reference_to_id (homeref
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      tmp->reference_to_id (homeref);
 
-    tmp->deactivate_object (oid.in ()
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    tmp->deactivate_object (oid.in ());
   }
 
   CORBA::Object_ptr
   Swapping_Container::install_servant (PortableServer::Servant p,
-                                      Container::OA_Type t
-                                      ACE_ENV_ARG_DECL)
+                                      Container::OA_Type t)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::POA_ptr tmp = 0;
@@ -289,14 +237,10 @@ namespace CIAO
       tmp = this->facet_cons_poa_.in ();
 
     PortableServer::ObjectId_var oid
-      = tmp->activate_object (p
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      = tmp->activate_object (p);
 
     CORBA::Object_var objref
-      = tmp->id_to_reference (oid.in ()
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      = tmp->id_to_reference (oid.in ());
 
     return objref._retn ();
   }
diff --git a/CIAO/ciao/Swapping_Container.h b/CIAO/ciao/Swapping_Container.h
index 99be4aa474f..98231eef33c 100644
--- a/CIAO/ciao/Swapping_Container.h
+++ b/CIAO/ciao/Swapping_Container.h
@@ -48,25 +48,20 @@ namespace CIAO
 
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
-                      const CORBA::PolicyList *more_policies = 0
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                      const CORBA::PolicyList *more_policies = 0)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual CORBA::Object_ptr install_servant (PortableServer::Servant p,
-                                               Container::OA_Type t
-                                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                               Container::OA_Type t)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void add_servant_map (PortableServer::ObjectId &oid,
@@ -74,8 +69,7 @@ namespace CIAO
 
     virtual void delete_servant_map (PortableServer::ObjectId &oid);
 
-    virtual void deactivate_facet (const PortableServer::ObjectId &oid
-                                  ACE_ENV_ARG_DECL)
+    virtual void deactivate_facet (const PortableServer::ObjectId &oid)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     PortableServer::POA_ptr the_home_servant_POA (void) const;
@@ -85,16 +79,13 @@ namespace CIAO
     /// Create POA  for the component.
     void create_servant_POA (const char *name,
                              const CORBA::PolicyList *p,
-                             PortableServer::POA_ptr root
-                             ACE_ENV_ARG_DECL);
+                             PortableServer::POA_ptr root);
 
     void create_home_servant_POA (const char *name,
                            const CORBA::PolicyList *p,
-                           PortableServer::POA_ptr root
-                           ACE_ENV_ARG_DECL);
+                           PortableServer::POA_ptr root);
 
-    void create_connections_POA (PortableServer::POA_ptr root
-                                 ACE_ENV_ARG_DECL);
+    void create_connections_POA (PortableServer::POA_ptr root);
   protected:
     unsigned long number_;
 
diff --git a/CIAO/ciao/Swapping_Container.inl b/CIAO/ciao/Swapping_Container.inl
index b2c00a33346..079569724d7 100644
--- a/CIAO/ciao/Swapping_Container.inl
+++ b/CIAO/ciao/Swapping_Container.inl
@@ -1,10 +1,8 @@
 // $Id$
 
 ACE_INLINE CORBA::Object_ptr
-CIAO::Swapping_Container::get_objref (PortableServer::Servant p
-                                     ACE_ENV_ARG_DECL)
+CIAO::Swapping_Container::get_objref (PortableServer::Servant p)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->the_POA ()->servant_to_reference (p
-                                                 ACE_ENV_ARG_PARAMETER);
+  return this->the_POA ()->servant_to_reference (p);
 }
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
index d222e722818..7b357c1a882 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
@@ -17,9 +17,7 @@ namespace CIAO
   // Operations for CCMHome interface.
 
   CORBA::IRObject_ptr
-  Swapping_Home_Servant_Impl_Base::get_component_def (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
+  Swapping_Home_Servant_Impl_Base::get_component_def (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
@@ -27,9 +25,7 @@ namespace CIAO
   }
 
   CORBA::IRObject_ptr
-  Swapping_Home_Servant_Impl_Base::get_home_def (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
+  Swapping_Home_Servant_Impl_Base::get_home_def (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
index 5e118476f18..d9e86e81e7d 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
@@ -46,12 +46,10 @@ namespace CIAO
     virtual ~Swapping_Home_Servant_Impl_Base (void);
 
     // Operations for CCMHome interface.
-    virtual ::CORBA::IRObject_ptr
-    get_component_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual ::CORBA::IRObject_ptr get_component_def (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual ::CORBA::IRObject_ptr
-    get_home_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual ::CORBA::IRObject_ptr get_home_def (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
index 12e8fc49527..a349718949e 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -40,17 +40,14 @@ namespace CIAO
     PortableServer::ObjectId_var oid =
       PortableServer::string_to_ObjectId (this->obj_id_);
 
-    ACE_TRY_NEW_ENV;
+    try
       {
-        this->container_->delete_servant_map (oid ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->container_->delete_servant_map (oid);
       }
-      ACE_CATCHANY;
+      catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "~Swapping_Home_Servant_Impl\t\n");
+        ex._tao_print_exception ("~Swapping_Home_Servant_Impl\t\n");
       }
-    ACE_ENDTRY;
 
     for (DYNAMIC_SERVANT_MAP_ITERATOR iter =
            this->dynamic_servant_map_.begin ();
@@ -70,7 +67,6 @@ namespace CIAO
                              EXEC,
                              COMP_SVNT>::remove_component (
       ::Components::CCMObject_ptr
-      ACE_ENV_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::RemoveFailure))
@@ -95,12 +91,11 @@ namespace CIAO
   Swapping_Home_Servant_Impl<BASE_SKEL,
                              EXEC,
                              COMP_SVNT>::create_component (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
   {
-    return this->create (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->create ();
   }
 
   // Operations for implicit home interface.
@@ -112,7 +107,6 @@ namespace CIAO
   Swapping_Home_Servant_Impl<BASE_SKEL,
                              EXEC,
                              COMP_SVNT>::create (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
@@ -125,11 +119,9 @@ namespace CIAO
 
 
     ::Components::EnterpriseComponent_var _ciao_ec =
-      this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+      this->executor_->create ();
 
-    return this->_ciao_activate_component (_ciao_ec.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+    return this->_ciao_activate_component (_ciao_ec.in ());
   }
 
   // CIAO-specific operations.
@@ -142,19 +134,14 @@ namespace CIAO
                              EXEC,
                              COMP_SVNT>::_ciao_activate_component (
       ::Components::EnterpriseComponent_ptr ec
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::Object_var hobj =
-      this->container_->get_home_objref (this
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+      this->container_->get_home_objref (this);
 
     Components::CCMHome_var home =
-      Components::CCMHome::_narrow (hobj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+      Components::CCMHome::_narrow (hobj.in ());
 
     PortableServer::ObjectId_var oid =
       PortableServer::string_to_ObjectId (this->obj_id_);
@@ -163,9 +150,7 @@ namespace CIAO
       this->container_->generate_reference (
         this->obj_id_,
         this->repo_id_,
-        Container::Component
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+        Container::Component);
 
     Dynamic_Component_Servant_Base *svt =
       new Dynamic_Component_Servant<COMP_SVNT> (ec,
@@ -174,16 +159,13 @@ namespace CIAO
                                                 this,
                                                 this->container_);
 
-    this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+    this->container_->add_servant_map (oid, svt);
 
     this->dynamic_servant_map_.bind (oid.in (), svt);
 
     typedef typename COMP_SVNT::_stub_type stub_type;
     typename COMP_SVNT::_stub_var_type ho =
-      stub_type::_narrow (objref.in ()
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (COMP_SVNT::_stub_type::_nil ());
+      stub_type::_narrow (objref.in ());
 
     return ho._retn ();
   }
@@ -216,16 +198,13 @@ namespace CIAO
                              EXEC,
                              COMP_SVNT>::_ciao_passivate_component (
       typename COMP_SVNT::_stub_ptr_type comp
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid;
 
     this->container_->uninstall_component (comp,
-                                           oid.out ()
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                           oid.out ());
 
     COMP_SVNT *servant = 0;
 
@@ -233,8 +212,7 @@ namespace CIAO
     {
       PortableServer::ServantBase_var safe (servant);
 
-      servant->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      servant->ciao_passivate ();
 
       this->component_map_.unbind (oid.in ());
     }
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
index b438c6fc133..db85bbce784 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
@@ -59,22 +59,21 @@ namespace CIAO
     // Operations for CCMHome interface.
 
     virtual void
-    remove_component (Components::CCMObject_ptr comp
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    remove_component (Components::CCMObject_ptr comp)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::RemoveFailure));
 
     // Operations for keyless home interface.
 
     virtual ::Components::CCMObject_ptr
-    create_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create_component ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CreateFailure));
 
     // Operations for implicit home interface.
 
     virtual typename COMP_SVNT::_stub_ptr_type
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CreateFailure));
 
@@ -85,13 +84,11 @@ namespace CIAO
     // CIAO-specific operations.
 
     typename COMP_SVNT::_stub_ptr_type
-    _ciao_activate_component (::Components::EnterpriseComponent_ptr ec
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    _ciao_activate_component (::Components::EnterpriseComponent_ptr ec)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void
-    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.cpp b/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
index da7843974c4..33c3621dd48 100644
--- a/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
+++ b/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
@@ -36,9 +36,7 @@ namespace CIAO
             typename COMP_VAR>
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::deactivate_facet (
-      const PortableServer::ObjectId &oid
-      ACE_ENV_ARG_DECL
-    )
+      const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /*
@@ -46,8 +44,7 @@ namespace CIAO
         PortableServer::string_to_ObjectId (obj_id);
     */
 
-    this->container_->deactivate_facet (oid ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->container_->deactivate_facet (oid);
   }
 
   template <typename BASE_CTX,
@@ -56,21 +53,15 @@ namespace CIAO
             typename COMP_VAR>
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
-     remove_facet (
-           CORBA::Object_ptr reference
-           ACE_ENV_ARG_DECL)
+     remove_facet (CORBA::Object_ptr reference)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid =
-      this->container_->the_facet_cons_POA ()->reference_to_id
-         (reference ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->container_->the_facet_cons_POA ()->reference_to_id (reference);
 
-    this->update_port_activator (oid.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->update_port_activator (oid.in ());
 
-    this->deactivate_facet (oid.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->deactivate_facet (oid.in ());
   }
 
   template <typename BASE_CTX,
@@ -79,9 +70,7 @@ namespace CIAO
             typename COMP_VAR>
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP, COMP_VAR>::
-     update_port_activator (
-           const PortableServer::ObjectId &oid
-           ACE_ENV_ARG_DECL)
+     update_port_activator (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /*
@@ -91,8 +80,7 @@ namespace CIAO
 
     CIAO::Servant_Activator *sa =
         this->container_->ports_servant_activator ();
-    sa->update_port_activator (oid ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    sa->update_port_activator (oid);
   }
 
 }
diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.h b/CIAO/ciao/Upgradeable_Context_Impl_T.h
index dc8d3269fcf..53e171b8eda 100644
--- a/CIAO/ciao/Upgradeable_Context_Impl_T.h
+++ b/CIAO/ciao/Upgradeable_Context_Impl_T.h
@@ -46,23 +46,19 @@ namespace CIAO
     virtual ~Upgradeable_Context_Impl (void);
 
     virtual void
-    deactivate_facet (const PortableServer::ObjectId &oid
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    deactivate_facet (const PortableServer::ObjectId &oid)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
-    update_port_activator (const PortableServer::ObjectId &oid
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    update_port_activator (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
-    remove_facet (CORBA::Object_ptr reference
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    remove_facet (CORBA::Object_ptr reference)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::ConsumerDescriptions *
-    get_registered_consumers (const char *publisher_name
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_registered_consumers (const char *publisher_name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::InvalidName,
                        ::Components::InvalidConnection)) = 0;
diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h
index a5583673907..0e6c663ed5d 100644
--- a/CIAO/ciao/Version.h
+++ b/CIAO/ciao/Version.h
@@ -4,6 +4,6 @@
 // This is file was automatically generated by $ACE_ROOT/bin/make_release.
 
 #define CIAO_MAJOR_VERSION 0
-#define CIAO_MINOR_VERSION 5
-#define CIAO_BETA_VERSION 4
-#define CIAO_VERSION "0.5.4"
+#define CIAO_MINOR_VERSION 5 
+#define CIAO_BETA_VERSION 6 
+#define CIAO_VERSION "0.5.6"
diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
index ad5aba294bf..9f6729ea0ef 100644
--- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
@@ -25,8 +25,7 @@ namespace CIAO
      EventServiceBase::ciao_push_event (
       ::Components::EventBase * evt,
       const char * source_id,
-      ::CORBA::TypeCode_ptr tc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ::CORBA::TypeCode_ptr tc)
     ACE_THROW_SPEC ((
       ::CORBA::SystemException,
       ::Components::BadEventType))
diff --git a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
index cec5777ae6e..be9e8f68e36 100644
--- a/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
+++ b/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
@@ -56,8 +56,7 @@ namespace CIAO
      * @c supplier_config.
      */
     virtual void connect_event_supplier (
-        Supplier_Config_ptr supplier_config
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        Supplier_Config_ptr supplier_config)
       ACE_THROW_SPEC ((
         CORBA::SystemException)) = 0;
 
@@ -68,8 +67,7 @@ namespace CIAO
      * @c consumer_config.
      */
     virtual void connect_event_consumer (
-        Consumer_Config_ptr consumer_config
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        Consumer_Config_ptr consumer_config)
       ACE_THROW_SPEC ((
         CORBA::SystemException)) = 0;
 
@@ -79,8 +77,7 @@ namespace CIAO
      * Disconnects the event supplier associated with this object.
      */
     virtual void disconnect_event_supplier (
-        const char * consumer_id
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        const char * consumer_id)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         Components::InvalidConnection)) = 0;
@@ -91,8 +88,7 @@ namespace CIAO
      * Disconnects the event consumer with UUID @c consumer_id.
      */
     virtual void disconnect_event_consumer (
-        const char * consumer_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char * consumer_id)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         Components::InvalidConnection)) = 0;
@@ -103,20 +99,18 @@ namespace CIAO
      * Pushes event @c ev to all consumers.
      */
     virtual void push_event (
-        Components::EventBase * ev
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        Components::EventBase * ev)
       ACE_THROW_SPEC ((
         CORBA::SystemException)) = 0;
 
     /**
-     * Pushes event @c ev to all consumers. The source id of the 
+     * Pushes event @c ev to all consumers. The source id of the
      * supplier is specified through @c source_id.
      */
     virtual void ciao_push_event (
         ::Components::EventBase * evt,
         const char * source_id,
-        ::CORBA::TypeCode_ptr tc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::CORBA::TypeCode_ptr tc)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::BadEventType));
@@ -127,23 +121,19 @@ namespace CIAO
   {
   public:
     virtual void start_conjunction_group (
-        ::CORBA::Long size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::CORBA::Long size)
       ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
 
     virtual void start_disjunction_group (
-        ::CORBA::Long size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::CORBA::Long size)
       ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
 
     virtual void insert_source (
-        const char * source_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char * source_id)
       ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
 
     virtual void insert_type (
-        ::CORBA::Long  event_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::CORBA::Long  event_type)
       ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
   };
 }
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
index fa597a12a87..1ef5b1ad889 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
@@ -48,8 +48,7 @@ namespace CIAO
                     RTEvent_Supplier_Config_impl (this->root_poa_.in ()),
                     Supplier_Config::_nil ());
     RTEvent_Supplier_Config_var return_rtec =
-      supplier_config->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      supplier_config->_this ();
     return return_rtec._retn ();
   }
 
@@ -63,8 +62,7 @@ namespace CIAO
                     RTEvent_Consumer_Config_impl (this->root_poa_.in ()),
                     Consumer_Config::_nil ());
     RTEvent_Consumer_Config_var return_rtec =
-      consumer_config->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      consumer_config->_this ();
     return return_rtec._retn ();
   }
 
@@ -73,8 +71,7 @@ namespace CIAO
   // to multiple event suppliers.
   void
   RTEventService::connect_event_supplier (
-      Supplier_Config_ptr supplier_config
-      ACE_ENV_ARG_DECL)
+      Supplier_Config_ptr supplier_config)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -84,19 +81,16 @@ namespace CIAO
       }
 
     RTEvent_Supplier_Config_ptr rt_config =
-      RTEvent_Supplier_Config::_narrow (supplier_config
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      RTEvent_Supplier_Config::_narrow (supplier_config);
 
     if (CORBA::is_nil (rt_config))
       {
-        ACE_THROW (CORBA::BAD_PARAM ());
+        throw CORBA::BAD_PARAM ();
       }
 
     // Get a proxy push consumer from the EventChannel.
     RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-      this->rt_event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->rt_event_channel_->for_suppliers ();
 
     RtecEventChannelAdmin::ProxyPushConsumer_var proxy_push_consumer =
       supplier_admin->obtain_push_consumer();
@@ -106,12 +100,10 @@ namespace CIAO
     ACE_NEW (supplier_servant,
              RTEventServiceSupplier_impl (root_poa_.in ()));
     RtecEventComm::PushSupplier_var push_supplier =
-      supplier_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      supplier_servant->_this ();
 
     RtecEventChannelAdmin::SupplierQOS_var qos =
-      rt_config->rt_event_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      rt_config->rt_event_qos ();
 
     ACE_SupplierQOS_Factory supplier_qos;
     supplier_qos.insert (ACE_ES_EVENT_SOURCE_ANY, ACE_ES_EVENT_ANY, 0, 1);
@@ -122,9 +114,7 @@ namespace CIAO
                        1);
 
     proxy_push_consumer->connect_push_supplier (push_supplier.in (),
-                                                supplier_qos.get_SupplierQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                                supplier_qos.get_SupplierQOS ());
 
 
     this->proxy_consumer_map_.bind (
@@ -134,8 +124,7 @@ namespace CIAO
 
   void
   RTEventService::connect_event_consumer (
-      Consumer_Config_ptr consumer_config
-      ACE_ENV_ARG_DECL)
+      Consumer_Config_ptr consumer_config)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -145,29 +134,24 @@ namespace CIAO
       }
 
     RTEvent_Consumer_Config_ptr rt_config =
-      RTEvent_Consumer_Config::_narrow (consumer_config
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      RTEvent_Consumer_Config::_narrow (consumer_config);
 
     if (CORBA::is_nil (rt_config))
       {
-        ACE_THROW (CORBA::BAD_PARAM ());
+        throw CORBA::BAD_PARAM ();
       }
 
     Components::EventConsumerBase_var consumer =
-      consumer_config->consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      consumer_config->consumer ();
 
     if (CORBA::is_nil (consumer.in ()))
       ACE_DEBUG ((LM_DEBUG, "nil event consumer\n"));
 
     RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-      this->rt_event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->rt_event_channel_->for_consumers ();
 
     RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier =
-      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      consumer_admin->obtain_push_supplier ();
 
     // Create and register consumer servant
     RTEventServiceConsumer_impl * consumer_servant = 0;
@@ -176,12 +160,10 @@ namespace CIAO
                root_poa_.in (),
                consumer.in ()));
     RtecEventComm::PushConsumer_var push_consumer =
-      consumer_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      consumer_servant->_this ();
 
     RtecEventChannelAdmin::ConsumerQOS_var qos =
-      rt_config->rt_event_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      rt_config->rt_event_qos ();
 
     ACE_DEBUG ((LM_DEBUG, "\n======== ConsumerQoS length is: %d\n\n",
                 qos->dependencies.length ()));
@@ -200,20 +182,17 @@ namespace CIAO
     proxy_supplier->connect_push_consumer (push_consumer.in (),
                                            qos.in ()
                                            //qos_factory.get_ConsumerQOS ()
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                           );
 
     ACE_CString consumer_id =
-      consumer_config->consumer_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      consumer_config->consumer_id ();
 
     this->proxy_supplier_map_.bind (consumer_id.c_str (), proxy_supplier._retn ());
   }
 
   void
   RTEventService::disconnect_event_supplier (
-      const char * connection_id
-      ACE_ENV_ARG_DECL)
+      const char * connection_id)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Components::InvalidConnection))
@@ -224,15 +203,12 @@ namespace CIAO
 
     this->proxy_consumer_map_.unbind (connection_id, proxy_consumer);
 
-    proxy_consumer->disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    proxy_consumer->disconnect_push_consumer ();
   }
 
   void
   RTEventService::disconnect_event_consumer (
-      const char * connection_id
-      ACE_ENV_ARG_DECL)
+      const char * connection_id)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Components::InvalidConnection))
@@ -241,15 +217,12 @@ namespace CIAO
 
     this->proxy_supplier_map_.unbind (connection_id, proxy_supplier);
 
-    proxy_supplier->disconnect_push_supplier (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    proxy_supplier->disconnect_push_supplier ();
   }
 
   void
   RTEventService::push_event (
-      Components::EventBase * ev
-      ACE_ENV_ARG_DECL)
+      Components::EventBase * ev)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -264,8 +237,7 @@ namespace CIAO
   RTEventService::ciao_push_event (
       Components::EventBase * ev,
       const char * source_id,
-      CORBA::TypeCode_ptr tc
-      ACE_ENV_ARG_DECL)
+      CORBA::TypeCode_ptr tc)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Components::BadEventType))
@@ -288,7 +260,7 @@ namespace CIAO
     // (if any) will get truncated when the Any is demarshaled. So the
     // signature of this method has been changed to pass in the derived
     // typecode, and TAO-specific methods are used to assign it as the
-    // Any's typecode and encode the value. This incurs an extra 
+    // Any's typecode and encode the value. This incurs an extra
     // encoding, which we may want to try to optimize someday.
     TAO_OutputCDR out;
     out << ev;
@@ -308,11 +280,10 @@ namespace CIAO
         ACE_DEBUG ((LM_DEBUG,
                     "CIAO (%P|%t) - RTEventService::ciao_push_event, "
                     "Error in finding the proxy consumer object.\n"));
-        ACE_THROW (Components::BadEventType ());
+        throw Components::BadEventType ();
       }
 
-    proxy_consumer->push (events ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    proxy_consumer->push (events);
   }
 
   void
@@ -331,10 +302,8 @@ namespace CIAO
                                                 this->root_poa_.in ());
     TAO_EC_Event_Channel * ec_servant = 0;
     ACE_NEW (ec_servant, TAO_EC_Event_Channel (attributes));
-    ec_servant->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-    this->rt_event_channel_ = ec_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    ec_servant->activate ();
+    this->rt_event_channel_ = ec_servant->_this ();
 
     if (false)
       {
@@ -353,8 +322,7 @@ namespace CIAO
   RTEventService::create_addr_serv (
         const char * name,
         ::CORBA::UShort port,
-        const char * address
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char * address)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException))
   {
@@ -388,22 +356,20 @@ namespace CIAO
       // Now we create and activate the servant
       SimpleAddressServer as_impl (addr);
       RtecUDPAdmin::AddrServer_var addr_srv =
-        as_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        as_impl._this ();
 */
 
     this->addr_serv_map_.bind (
       name,
       RtecUDPAdmin::AddrServer::_duplicate (addr_srv.in ()));
-      
+
 
     return true;
   }
 
   ::CORBA::Boolean
   RTEventService::create_sender (
-        const char * addr_serv_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char * addr_serv_id)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException))
   {
@@ -426,9 +392,7 @@ namespace CIAO
     TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create();
     sender->init (this->rt_event_channel_.in (),
                   addr_srv.in (),
-                  endpoint
-                  ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                  endpoint);
 
     // Setup the subscription and connect to the EC
     ACE_ConsumerQOS_Factory cons_qos_fact;
@@ -445,8 +409,7 @@ namespace CIAO
   RTEventService::create_receiver (
         const char * addr_serv_id,
         ::CORBA::Boolean is_multicast,
-        ::CORBA::UShort listen_port
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::CORBA::UShort listen_port)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException))
   {
@@ -526,7 +489,7 @@ namespace CIAO
 
 
   ::RtecEventChannelAdmin::EventChannel_ptr
-  RTEventService::tao_rt_event_channel (ACE_ENV_SINGLE_ARG_DECL)
+  RTEventService::tao_rt_event_channel ()
     ACE_THROW_SPEC ((::CORBA::SystemException))
   {
     return this->rt_event_channel_.in ();
@@ -583,7 +546,7 @@ namespace CIAO
         ACE_OS::printf("%s\n", out.str().c_str()); // printf is synchronized
 
         Components::EventBase * ev = 0;
-        ACE_TRY
+        try
         {
           TAO::Unknown_IDL_Type *unk =
               dynamic_cast<TAO::Unknown_IDL_Type *> (events[i].data.any_value.impl ());
@@ -592,9 +555,7 @@ namespace CIAO
           if (for_reading >> ev)
             {
               ev->_add_ref ();
-              this->event_consumer_->push_event (ev
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              this->event_consumer_->push_event (ev);
             }
           else
             {
@@ -602,14 +563,12 @@ namespace CIAO
                                     "failed to extract event\n"));
             }
         }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
         {
           ACE_ERROR ((LM_ERROR,
                       "CORBA EXCEPTION caught\n"));
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                              "RTEventServiceConsumer_impl::push()\n");
+          ex._tao_print_exception ("RTEventServiceConsumer_impl::push()\n");
         }
-        ACE_ENDTRY;
       }
 
   }
@@ -650,8 +609,7 @@ namespace CIAO
 
   void
   RTEvent_Supplier_Config_impl::supplier_id (
-      const char * supplier_id
-      ACE_ENV_ARG_DECL)
+      const char * supplier_id)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -683,8 +641,7 @@ namespace CIAO
   }
 
   CONNECTION_ID
-  RTEvent_Supplier_Config_impl::supplier_id (
-      ACE_ENV_SINGLE_ARG_DECL)
+  RTEvent_Supplier_Config_impl::supplier_id ()
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -692,8 +649,7 @@ namespace CIAO
   }
 
   EventServiceType
-  RTEvent_Supplier_Config_impl::service_type (
-      ACE_ENV_SINGLE_ARG_DECL)
+  RTEvent_Supplier_Config_impl::service_type ()
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -701,8 +657,7 @@ namespace CIAO
   }
 
   RtecEventChannelAdmin::SupplierQOS *
-  RTEvent_Supplier_Config_impl::rt_event_qos (
-      ACE_ENV_SINGLE_ARG_DECL)
+  RTEvent_Supplier_Config_impl::rt_event_qos ()
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -714,8 +669,7 @@ namespace CIAO
   }
 
   void
-  RTEvent_Supplier_Config_impl::destroy (
-      ACE_ENV_SINGLE_ARG_DECL)
+  RTEvent_Supplier_Config_impl::destroy ()
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -742,7 +696,7 @@ namespace CIAO
 
   void
   RTEvent_Consumer_Config_impl::start_conjunction_group (
-      CORBA::Long size ACE_ENV_ARG_DECL)
+      CORBA::Long size)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -754,8 +708,7 @@ namespace CIAO
 
   void
   RTEvent_Consumer_Config_impl::start_disjunction_group (
-      CORBA::Long size
-      ACE_ENV_ARG_DECL)
+      CORBA::Long size)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -768,8 +721,7 @@ namespace CIAO
 
   void
   RTEvent_Consumer_Config_impl::insert_source (
-      const char * source_id
-      ACE_ENV_ARG_DECL)
+      const char * source_id)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -784,8 +736,7 @@ namespace CIAO
 
   void
   RTEvent_Consumer_Config_impl::insert_type (
-        ::CORBA::Long event_type
-        ACE_ENV_ARG_DECL)
+        ::CORBA::Long event_type)
       ACE_THROW_SPEC ((::CORBA::SystemException))
   {
     if (event_type == 0L)
@@ -797,8 +748,7 @@ namespace CIAO
 
   void
   RTEvent_Consumer_Config_impl::consumer_id (
-      const char * consumer_id
-      ACE_ENV_ARG_DECL)
+      const char * consumer_id)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -815,8 +765,7 @@ namespace CIAO
 
   void
   RTEvent_Consumer_Config_impl::consumer (
-      Components::EventConsumerBase_ptr consumer
-      ACE_ENV_ARG_DECL)
+      Components::EventConsumerBase_ptr consumer)
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -824,8 +773,7 @@ namespace CIAO
   }
 
   CONNECTION_ID
-  RTEvent_Consumer_Config_impl::consumer_id (
-      ACE_ENV_SINGLE_ARG_DECL)
+  RTEvent_Consumer_Config_impl::consumer_id ()
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -834,8 +782,7 @@ namespace CIAO
 
 
   EventServiceType
-  RTEvent_Consumer_Config_impl::service_type (
-      ACE_ENV_SINGLE_ARG_DECL)
+  RTEvent_Consumer_Config_impl::service_type ()
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -843,8 +790,7 @@ namespace CIAO
   }
 
   Components::EventConsumerBase_ptr
-  RTEvent_Consumer_Config_impl::consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+  RTEvent_Consumer_Config_impl::consumer ()
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -857,8 +803,7 @@ namespace CIAO
   }
 
   RtecEventChannelAdmin::ConsumerQOS *
-  RTEvent_Consumer_Config_impl::rt_event_qos (
-      ACE_ENV_SINGLE_ARG_DECL)
+  RTEvent_Consumer_Config_impl::rt_event_qos ()
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
@@ -871,8 +816,7 @@ namespace CIAO
   }
 
   void
-  RTEvent_Consumer_Config_impl::destroy (
-      ACE_ENV_SINGLE_ARG_DECL)
+  RTEvent_Consumer_Config_impl::destroy ()
     ACE_THROW_SPEC ((
       CORBA::SystemException))
   {
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
index 5fa33f928bc..7737643b0a4 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
@@ -69,43 +69,37 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void connect_event_supplier (
-        CIAO::Supplier_Config_ptr supplier_config
-        ACE_ENV_ARG_DECL)
+        CIAO::Supplier_Config_ptr supplier_config)
       ACE_THROW_SPEC ((
         CORBA::SystemException));
 
     virtual void connect_event_consumer (
-        CIAO::Consumer_Config_ptr consumer_config
-        ACE_ENV_ARG_DECL)
+        CIAO::Consumer_Config_ptr consumer_config)
       ACE_THROW_SPEC ((
         CORBA::SystemException));
 
     virtual void
     disconnect_event_supplier (
-        const char * consumer_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char * consumer_id)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         Components::InvalidConnection));
 
     virtual void disconnect_event_consumer (
-        const char * connection_id
-        ACE_ENV_ARG_DECL)
+        const char * connection_id)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         Components::InvalidConnection));
 
     virtual void push_event (
-        Components::EventBase * ev
-        ACE_ENV_ARG_DECL)
+        Components::EventBase * ev)
       ACE_THROW_SPEC ((
         CORBA::SystemException));
 
     virtual void ciao_push_event (
         Components::EventBase * evt,
         const char * source_id,
-        CORBA::TypeCode_ptr tc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        CORBA::TypeCode_ptr tc)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
         ::Components::BadEventType));
@@ -113,27 +107,23 @@ namespace CIAO
     virtual ::CORBA::Boolean create_addr_serv (
         const char * name,
         ::CORBA::UShort port,
-        const char * address
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char * address)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException));
 
     virtual ::CORBA::Boolean create_sender (
-        const char * addr_serv_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const char * addr_serv_id)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException));
 
     virtual ::CORBA::Boolean create_receiver (
         const char * addr_serv_id,
         ::CORBA::Boolean is_multicast,
-        ::CORBA::UShort listen_port
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        ::CORBA::UShort listen_port)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException));
 
     virtual ::RtecEventChannelAdmin::EventChannel_ptr tao_rt_event_channel (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((::CORBA::SystemException));
 
@@ -208,8 +198,7 @@ namespace CIAO
     RTEventServiceSupplier_impl (
       PortableServer::POA_ptr poa);
 
-    virtual void disconnect_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL)
+    virtual void disconnect_push_supplier ()
       ACE_THROW_SPEC ((
         CORBA::SystemException));
 
@@ -237,8 +226,7 @@ namespace CIAO
     ACE_THROW_SPEC ((
       CORBA::SystemException));
 
-    virtual void disconnect_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL)
+    virtual void disconnect_push_consumer ()
       ACE_THROW_SPEC ((
         CORBA::SystemException));
 
@@ -267,47 +255,46 @@ namespace CIAO
 
     virtual ~RTEvent_Consumer_Config_impl (void);
 
-    virtual void start_conjunction_group (CORBA::Long size ACE_ENV_ARG_DECL)
+    virtual void start_conjunction_group (CORBA::Long size)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void start_disjunction_group (CORBA::Long size ACE_ENV_ARG_DECL)
+    virtual void start_disjunction_group (CORBA::Long size)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void insert_source (const char * source_id ACE_ENV_ARG_DECL)
+    virtual void insert_source (const char * source_id)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void insert_type (::CORBA::Long event_type
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void insert_type (::CORBA::Long event_type)
       ACE_THROW_SPEC ((::CORBA::SystemException));
 
-    virtual void consumer_id (const char * consumer_id ACE_ENV_ARG_DECL)
+    virtual void consumer_id (const char * consumer_id)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CONNECTION_ID consumer_id (ACE_ENV_SINGLE_ARG_DECL)
+    virtual CONNECTION_ID consumer_id ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    //virtual void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL)
+    //virtual void supplier_id (const char * supplier_id)
     //  ACE_THROW_SPEC ((CORBA::SystemException));
 
-    //virtual CONNECTION_ID supplier_id (ACE_ENV_SINGLE_ARG_DECL)
+    //virtual CONNECTION_ID supplier_id ()
     //  ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void consumer (Components::EventConsumerBase_ptr consumer ACE_ENV_ARG_DECL)
+    virtual void consumer (Components::EventConsumerBase_ptr consumer)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual Components::EventConsumerBase_ptr consumer (ACE_ENV_SINGLE_ARG_DECL)
+    virtual Components::EventConsumerBase_ptr consumer ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL)
+    virtual EventServiceType service_type ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     //@@ (GD) There should be a place where the deployment tool could
   //        set up the rt_event_qos properties for Consumer Config.
 
-    virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos (ACE_ENV_SINGLE_ARG_DECL)
+    virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void destroy ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -339,22 +326,22 @@ namespace CIAO
 
     virtual ~RTEvent_Supplier_Config_impl (void);
 
-    void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL)
+    void supplier_id (const char * supplier_id)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    CONNECTION_ID supplier_id (ACE_ENV_SINGLE_ARG_DECL)
+    CONNECTION_ID supplier_id ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL)
+    EventServiceType service_type ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     //@@ (GD) There should be a place where the deployment tool could
     //        set up the rt_event_qos properties for Supplier Config.
 
-    RtecEventChannelAdmin::SupplierQOS * rt_event_qos (ACE_ENV_SINGLE_ARG_DECL)
+    RtecEventChannelAdmin::SupplierQOS * rt_event_qos ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void destroy ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp
index d04a8528e9a..cdce7218291 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.cpp
@@ -23,8 +23,7 @@ SimpleAddressServer::get_addr (const RtecEventComm::EventHeader&,
 /*
 void
 SimpleAddressServer::get_ip_address (const RtecEventComm::EventHeader&,
-                                     RtecUDPAdmin::UDP_IP_Address_out address
-                                     ACE_ENV_ARG_DECL)
+                                     RtecUDPAdmin::UDP_IP_Address_out address)
     throw (CORBA::SystemException) {
   address = new RtecUDPAdmin::UDP_IP_Address;
 
diff --git a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h
index 9e149226d53..5a69d3171dc 100644
--- a/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h
+++ b/CIAO/ciaosvcs/Events/CIAO_RTEC/SimpleAddressServer.h
@@ -28,8 +28,7 @@ public:
 
 /*
   virtual void get_ip_address (const RtecEventComm::EventHeader& header,
-                               RtecUDPAdmin::UDP_IP_Address_out address
-                               ACE_ENV_ARG_DECL)
+                               RtecUDPAdmin::UDP_IP_Address_out address)
     throw (CORBA::SystemException);
 */
 private:
diff --git a/CIAO/docs/index.html b/CIAO/docs/index.html
index aa48ade7ee4..438bdf3416e 100644
--- a/CIAO/docs/index.html
+++ b/CIAO/docs/index.html
@@ -82,46 +82,37 @@ Visio file</a> (The same file in Visio V.5 format is <a
  <a href="imgs/DAnCE-Dynamic.sxd">DAnCE-Dynamic.sxd</a> <br>
 <br>
 <hr>
-<h2>CIAO's D&C Framework (DAnCE) part-by-part</h2>
+<h2>CIAO's D&C Framework (<a href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/dance/index.html">DAnCE</a>) part-by-part</h2>
 DAnCE's implementation is based on the OMG's Deployment and Configuration
 Specification version [ptc/2003-07-08]. Here is a list of the major
 actors of CIAO runtime that a user should be aware of.
 <ul>
-  <li><a
- href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/dance/dir_000011.html"><strong>NodeManager:</strong></a>
+  <li><strong>NodeManager:</strong>
 A daemon process responsible for managing NodeApplications that reside
 in the same physical node.</li>
   <p> </p>
-  <li><a
- href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/dance/dir_000007.html"><strong>NodeApplicationManager:</strong></a>
+  <li><strong>NodeApplicationManager:</strong>
 A infrastructure component responsible for deploying&nbsp;
 locality-constrained applications onto a node. A NodeApplicationManager
 is usually created by NodeManager.<br>
   </li>
   <p> </p>
-  <li><a
- href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/dance/dir_000013.html"><strong>NodeApplication:</strong></a>
+  <li><strong>NodeApplication:</strong>
 A component server instance spawned by NodeApplicationManager. <br>
   </li>
   <p> </p>
-  <li><a
- href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/dance/dir_000008.html"><strong>ExecutionManager:</strong></a>
+  <li><strong>ExecutionManager:</strong>
 Infrastructure component responsible for executing an component-based
 DRE application based on the information from DeploymentPlan.</li>
   <p> </p>
-  <li><strong><a
- href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/dance/dir_000010.html"><strong>DomainApplicationManager</strong></a></strong>:
+  <li><strong>DomainApplicationManager</strong>:
 Domain-oriented auxiliary component created and used by
 ExecutionManager to deploy the component-based DRE application at the
 domain level. <br>
     <br>
   </li>
-  <li><strong><a
- href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/tools/assembly_deployer/index.html"><strong></strong></a></strong><a
- href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/tools/assembly_deployer/index.html"><strong></strong></a><strong><a
- href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/tools/assembly_deployer/index.html"><strong></strong></a></strong><strong><a
- href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/dance/dir_000009.html"><strong>PlanLauncher</strong></a></strong><strong>:
-    </strong>Executor component responsible for parsing the XML-based
+  <li><strong>PlanLauncher</strong></strong>:
+Executor component responsible for parsing the XML-based
 deploymentplan and passing the plan to ExecutionManager for execution.<br>
     <br>
 To understand the runtime inter-relationships of various CIAO actors,
diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp b/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
index b692eb6a859..aedbcd3769b 100644
--- a/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
+++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp
@@ -33,20 +33,20 @@
 
 // get_component implementation.
 CORBA::Object_ptr
-[ciao module name]::[facet type]_Servant::_get_component (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[facet type]_Servant::_get_component ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::SessionContext_var sc =
       ::Components::SessionContext::_narrow (this->ctx_.in ());
 
   if (! CORBA::is_nil(sc.in ()))
-    return sc->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return sc->get_CCM_object ();
 
   ::Components::EntityContext_var ec =
       ::Components::EntityContext::_narrow (this->ctx_.in ());
 
   if (! CORBA::is_nil(ec.in ()))
-    return ec->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return ec->get_CCM_object ();
 
   ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 }
@@ -64,7 +64,7 @@ CORBA::Object_ptr
     // [receptacle name]Connections typedef'ed as a sequence of
     // struct [receptacle name]Connection.
 [receptacle name]Connections *
-[ciao module name]::[component name]_Context::get_connections_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Context::get_connections_[receptacle name] ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Strategized locking here.
@@ -93,15 +93,12 @@ CORBA::Object_ptr
 
 ##foreach [event name] with [eventtype] in (list of all event sources) generate:
 void
-[ciao module name]::[component name]_Context::push_[event name] ([eventtype] *ev
-                                                                 ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Context::push_[event name] ([eventtype] *ev)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 ##  if [event name] belongs to an 'emits' port
-  this->ciao_emits_[event name]_consumer_->push_[event name] (ev
-                                                              ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-  
+  this->ciao_emits_[event name]_consumer_->push_[event name] (ev);
+
 ##  else [event name] belongs to a 'publishes' port
   ACE_Active_Map_Manager<[eventtype]Consumer_var>::iterator
     end = this->ciao_publishes_[event name]_map_.end ();
@@ -113,9 +110,7 @@ void
       ACE_Active_Map_Manager<[eventtype]Consumer_var>::ENTRY &entry = *iter;
       [eventtype]Consumer_var c
         = [eventtype]Consumer::_narrow (entry.int_id_.in ());
-      c->push_[eventtype] (ev
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      c->push_[eventtype] (ev);
     }
 ##  endif [event name]
 }
@@ -126,8 +121,7 @@ void
 // Operations for publishes interfaces.
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
 ::Components::Cookie *
-[ciao module name]::[component name]_Context::subscribe_[publish name] ([eventtype]Consumer_ptr c
-                                                                        ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Context::subscribe_[publish name] ([eventtype]Consumer_ptr c)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::ExceededConnectionLimit))
 {
@@ -148,8 +142,7 @@ void
 }
 
 [eventtype]Consumer_ptr
-[ciao module name]::[component name]_Context::unsubscribe_[publish name] (::Components::Cookie *ck
-                            ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Context::unsubscribe_[publish name] (::Components::Cookie *ck)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::InvalidConnection))
 {
@@ -174,7 +167,7 @@ void
 ##  if [receptacle name] is a simplex receptacle ('uses')
 
 [uses type]_ptr
-[ciao module name]::[component name]_Context::get_connection_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+[ciao module name]::[component name]_Context::get_connection_[receptacle name] ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return [uses type]::_duplicate (this->ciao_uses_[receptacle name]_.in ());
@@ -182,29 +175,28 @@ void
 
 // Simplex [receptacle name] connection management operations
 void
-[ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c
-                                                                         ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::AlreadyConnected,
                    ::Components::InvalidConnection))
 {
   if (! CORBA::is_nil (this->ciao_uses_[receptacle name]_.in ()))
-    ACE_THROW (::Components::AlreadyConnected ());
+    throw ::Components::AlreadyConnected ();
 
   if (CORBA::is_nil (c))
-    ACE_THROW (::Components::InvalidConnection ());
+    throw ::Components::InvalidConnection ();
 
   // When do we throw InvalidConnection exception?
   this->ciao_uses_[receptacle name]_ = [uses type]::_duplicate (c);
 }
 
 [uses type]_ptr
-[ciao module name]::[component name]_Context::disconnect_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Context::disconnect_[receptacle name] ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::NoConnection))
 {
   if (CORBA::is_nil (this->ciao_uses_[receptacle name]_.in ()))
-    ACE_THROW (::Components::NoConnection ());
+    throw ::Components::NoConnection ();
 
   return this->ciao_uses_[receptacle name]_._retn ();
 }
@@ -212,8 +204,7 @@ void
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
 // Multiplex [receptacle name] connection management operations
 ::Components::Cookie *
-[ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c
-                                                                         ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Context::connect_[receptacle name] ([uses type]_ptr c)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::ExceedConnectionLimit,
                        ::Components::InvalidConnection))
@@ -235,8 +226,7 @@ void
 }
 
 [uses type]_ptr
-[ciao module name]::[component name]_Context::disconnect_[receptacle name] (::Components::Cookie *ck
-                                                                            ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Context::disconnect_[receptacle name] (::Components::Cookie *ck)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::InvalidConnection))
 {
@@ -259,7 +249,7 @@ void
 
 // Operations for ::Components::SessionContext interface
 CORBA::Object_ptr
-[ciao module name]::[component name]_Context::get_CCM_object (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Context::get_CCM_object ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::IllegalState))
 {
@@ -269,13 +259,9 @@ CORBA::Object_ptr
 
   if (CORBA::is_nil (this->component_.in ()))
     {
-      CORBA::Object_var obj =  this->container_->get_objref (this->servant_
-                                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CORBA::Object_var obj =  this->container_->get_objref (this->servant_);
 
-      this->component_ = [component name]::_narrow (obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->component_ = [component name]::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->component_.in ()))
         ACE_THROW_RETURN (CORBA::INTERNAL (), 0); // This should not happen...
@@ -295,45 +281,36 @@ CORBA::Object_ptr
 {
   this->context_ = new [ciao module name]::[component name]_Context (h, c, this);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       Components::SessionComponent_var scom =
-        Components::SessionComponent::_narrow (exe
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Components::SessionComponent::_narrow (exe);
 
       if (! CORBA::is_nil (scom.in ()))
-        scom->set_session_context (this->context_
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scom->set_session_context (this->context_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ Ignore any exceptions?  What happens if
       // set_session_context throws an CCMException?
     }
-  ACE_ENDTRY;
 }
 
 [ciao module name]::[component name]_Servant::~[component name]_Servant (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Components::SessionComponent_var scom =
-        Components::SessionComponent::_narrow (this->executor_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Components::SessionComponent::_narrow (this->executor_.in ());
 
       if (! CORBA::is_nil (scom.in ()))
-        scom->ccm_remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scom->ccm_remove ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // @@ Ignore any exceptions?  What happens if
       // set_session_context throws an CCMException?
     }
-  ACE_ENDTRY;
   this->context_->_remove_ref ();
 }
 
@@ -341,13 +318,12 @@ CORBA::Object_ptr
 ##foreach [facet name] with [facet type] in (list of all provided interfaces) generate:
 
 [facet type]_ptr
-[ciao module name]::[component name]_Servant::provide_[facet name] (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::provide_[facet name] ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->provide_[facet name]_.in ()))
     {
-      CCM_[facet type]_var fexe = this->executor_->get_[facet name] (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CCM_[facet type]_var fexe = this->executor_->get_[facet name] ();
 
       if (CORBA::is_nil (fexe.in ()))
         ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -357,13 +333,9 @@ CORBA::Object_ptr
                                                       this->context_);
       PortableServer::ServantBase_var safe_servant (svt);
 
-      CORBA::Object_var obj = this->container_->install_servant (svt
-                                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CORBA::Object_var obj = this->container_->install_servant (svt);
 
-      [facet type]_var fo = [facet type]::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      [facet type]_var fo = [facet type]::_narrow (obj.in ());
 
       this->provide_[facet name]_ = fo;
     }
@@ -379,27 +351,25 @@ CORBA::Object_ptr
 
 // Inherit from ::Compopnents::EventBConsumerBase
 void
-[ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_event (EventBase *ev
-                                                                                                       ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_event (EventBase *ev)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::BadEventType))
 {
   [eventtype]_var ev_type = [eventtype]::_downcast (ev);
   if (ev_type != 0)
     {
-      this->push_[eventtype] (ev_type.in ()
-                              ACE_ENV_ARG_PARAMETER);
+      this->push_[eventtype] (ev_type.in ());
       return;
     }
 
   // @@ This include the case when we receive a parent eventtype of [eventtype]
 
-  ACE_THROW (::Components::BadEventType ());
+  throw ::Components::BadEventType ();
 }
 
 // get_component implementation.
 [eventtype]Consumer_ptr
-[ciao module name]::[component name]_Servant::get_consumer_[consumer name] (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_consumer_[consumer name] ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumes_[consumer name]_.in ()))
@@ -409,13 +379,9 @@ void
                                                                                                        this->context_);
       PortableServer::ServantBase_var safe_servant (svt);
 
-      CORBA::Object_var obj = this->container_->install_servant (svt
-                                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CORBA::Object_var obj = this->container_->install_servant (svt);
 
-      [eventtype]Consumer_var eco = [eventtype]Consumer::_narrow (obj.in ()
-                                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      [eventtype]Consumer_var eco = [eventtype]Consumer::_narrow (obj.in ());
 
       this->consumes_[consumer name]_ = eco;
     }
@@ -427,8 +393,7 @@ void
 
 // Operations for Navigation interface
 CORBA::Object_ptr
-[ciao module name]::[component name]_Servant::provide_facet (const char * name
-                                                             ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::provide_facet (const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException ,
                    Components::InvalidName))
 {
@@ -442,14 +407,14 @@ CORBA::Object_ptr
 
 ##foreach [facet name] with [facet type] in (list of all provided interfaces) generate:
   if (ACE_OS_String::strcmp (name, "[facet name]") == 0)
-    return this->provide_[facet name] (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->provide_[facet name] ();
 ##end foreach [facet name] with [facet type]
 
   ACE_THROW_RETURN (::Components::InvalidName (), 0);
 }
 
 ::Components::FacetDescriptions *
-[ciao module name]::[component name]_Servant::get_all_facets (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_all_facets ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::FacetDescriptions_var collection
@@ -467,9 +432,8 @@ CORBA::Object_ptr
 
   x->Name ((const char *)"[facet name]");
   x->type_id ((const char *) "[facet type's repo id]"); //
-  x->facet_ref (this->provide_[facet name] (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK_RETURN (0);
-  
+  x->facet_ref (this->provide_[facet name] ());
+
   collection[i] = x._retn ();
   ++i;
 ##end foreach [facet name] with [facet type]
@@ -479,8 +443,7 @@ CORBA::Object_ptr
 }
 
 ::Components::FacetDescriptions *
-[ciao module name]::[component name]_Servant::get_named_facets (const Components::NameList & names
-                                                                ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_named_facets (const Components::NameList & names)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName))
 {
@@ -500,8 +463,7 @@ CORBA::Object_ptr
         {
           x->Name ((const char *)"[facet name]");
           x->type_id ((const char *) "[facet type's repo id]"); //
-          x->facet_ref (this->provide_[facet name] (ACE_ENV_SINGLE_ARG_PARAMETER));
-          ACE_CHECK_RETURN (0);
+          x->facet_ref (this->provide_[facet name] ());
         }
 ##end foreach [facet name] with [facet type]
       else
@@ -513,28 +475,23 @@ CORBA::Object_ptr
 }
 
 CORBA::Boolean
-[ciao module name]::[component name]_Servant::same_component (CORBA::Object_ptr object_ref
-                                                              ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::same_component (CORBA::Object_ptr object_ref)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (object_ref))
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
-  CORBA::Object_var the_other = object_ref->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Object_var the_other = object_ref->_get_component ();
 
-  CORBA::Object_var me = this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Object_var me = this->context_->get_CCM_object ();
 
-  return me->_is_equivalent (object_ref
-                             ACE_ENV_ARG_PARAMETER);
+  return me->_is_equivalent (object_ref);
 }
 
 // Operations for Receptacles interface
 ::Components::Cookie *
 [ciao module name]::[component name]_Servant::connect (const char * name,
-                                                       CORBA::Object_ptr connection
-                                                       ACE_ENV_ARG_DECL)
+                                                       CORBA::Object_ptr connection)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName,
                    Components::InvalidConnection,
@@ -549,20 +506,16 @@ CORBA::Boolean
   if (ACE_OS_String::strcmp (name, "[receptacle name]") == 0)
     {
       [uses type]_var _ciao_conn =
-        [uses type]::_narrow (connection
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        [uses type]::_narrow (connection);
 
       if (CORBA::is_nil (_ciao_conn.in ()))
         ACE_THROW_RETURN (::Components::InvalidConnection (), 0);
 
 ##  if [receptacle name] is a simplex receptacle ('uses')
-      this->connect_[receptacle name] (_caio_conn.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+      this->connect_[receptacle name] (_caio_conn.in ());
       return 0;
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
-      return this->connect_[receptacle name] (_ciao_conn.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+      return this->connect_[receptacle name] (_ciao_conn.in ());
 ##  endif [receptacle name]
     }
 ##end foreach [receptacle name] with [uses type]
@@ -580,8 +533,7 @@ CORBA::Boolean
 
 CORBA::Object_ptr
 [ciao module name]::[component name]_Servant::disconnect (const char * name,
-                                                          Components::Cookie *ck
-                                                          ACE_ENV_ARG_DECL)
+                                                          Components::Cookie *ck)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName,
                    Components::InvalidConnection,
@@ -595,10 +547,9 @@ CORBA::Object_ptr
 ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate:
   if (ACE_OS_String::strcmp (name, "[receptacle name]") == 0)
 ##  if [receptacle name] is a simplex receptacle ('uses')
-      return this->disconnect_[receptacle name] (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return this->disconnect_[receptacle name] ();
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
-      return this->connect_[receptacle name] (ck
-                                              ACE_ENV_ARG_PARAMETER);
+      return this->connect_[receptacle name] (ck);
 ##  endif [receptacle name]
 ##end foreach [receptacle name] with [uses type]
 
@@ -606,8 +557,7 @@ CORBA::Object_ptr
 }
 
 ::Components::ConnectionDescriptions *
-[ciao module name]::[component name]_Servant::get_connections (const char * name
-                                                               ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_connections (const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName))
 {
@@ -625,13 +575,12 @@ CORBA::Object_ptr
 
       retv[0] = new OBV_Components::ConnectionDescription;
       retv[0]->ck = 0;
-      retv[0]->objref = this->get_connection_[receptacle name] (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retv[0]->objref = this->get_connection_[receptacle name] ();
 
       return retv._retn ();
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
       // @@ Return type does not match here.  We can not return directly.
-      return this->get_connections_[receptacle name] (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return this->get_connections_[receptacle name] ();
 ##  endif [receptacle name]
     }
 ##end foreach [receptacle name] with [uses type]
@@ -640,7 +589,7 @@ CORBA::Object_ptr
 }
 
 ::Components::ReceptacleDescriptions *
-[ciao module name]::[component name]_Servant::get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_all_receptacles ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::ReceptacleDescriptions_var retv =
@@ -659,9 +608,7 @@ CORBA::Object_ptr
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
   retv[i]->is_multiple (1);
 ##  endif [receptacle name]
-  retv[i]->connections (*this->get_connections ("[receptacle name]"
-                                                ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK_RETURN (0);
+  retv[i]->connections (*this->get_connections ("[receptacle name]"));
   ++i;
 ##end foreach [receptacle name] with [uses type]
 
@@ -669,8 +616,7 @@ CORBA::Object_ptr
 }
 
 ::Components::ReceptacleDescriptions *
-[ciao module name]::[component name]_Servant::get_named_receptacles (const Components::NameList & names
-                                                                     ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_named_receptacles (const Components::NameList & names)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName))
 {
@@ -692,9 +638,7 @@ CORBA::Object_ptr
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
           retv[i]->is_multiple (1);
 ##  endif [receptacle name]
-          retv[i]->connections (*this->get_connections ("[receptacle name]"
-                                                       ACE_ENV_ARG_PARAMETER));
-          ACE_CHECK_RETURN (0);
+          retv[i]->connections (*this->get_connections ("[receptacle name]"));
         }
 ##end foreach [receptacle name] with [uses type]
       else
@@ -705,8 +649,7 @@ CORBA::Object_ptr
 
 // Operations for Events interface
 ::Components::EventConsumerBase_ptr
-[ciao module name]::[component name]_Servant::get_consumer (const char * sink_name
-                                                            ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_consumer (const char * sink_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName))
 {
@@ -716,15 +659,14 @@ CORBA::Object_ptr
 
 ##foreach [consumer name] with [eventtype] in (list of all consumers) generate:
   if (ACE_OS_String::strcmp (sink_name, "[consumer name]") == 0)
-    return this->get_consumer_[consumer name] (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->get_consumer_[consumer name] ();
 ##end foreach [consumer name] with [eventtype]
   ACE_THROW_RETURN (Components::InvalidName (), 0);
 }
 
 ::Components::Cookie *
 [ciao module name]::[component name]_Servant::subscribe (const char * publisher_name,
-                                                         Components::EventConsumerBase_ptr subscriber
-                                                         ACE_ENV_ARG_DECL)
+                                                         Components::EventConsumerBase_ptr subscriber)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName,
                    Components::InvalidConnection,
@@ -738,15 +680,12 @@ CORBA::Object_ptr
   if (ACE_OS_String::strcmp (publisher_name, "[publish name]") == 0)
     {
       [eventtype]Consumer_var _ciao_consumer =
-        [eventtype]Consumer::_narrow (subscriber
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        [eventtype]Consumer::_narrow (subscriber);
 
       if (CORBA::is_nil (_ciao_consumer.in ()))
         ACE_THROW_RETURN (Components::InvalidConnection (), 0);
 
-      return this->subscribe_[publish name] (_ciao_consumer.in ()
-                                             ACE_ENV_ARG_PARAMETER);
+      return this->subscribe_[publish name] (_ciao_consumer.in ());
     }
 ##end foreach [publish name] with [eventtype]
 
@@ -755,8 +694,7 @@ CORBA::Object_ptr
 
 ::Components::EventConsumerBase_ptr
 [ciao module name]::[component name]_Servant::unsubscribe (const char * publisher_name,
-                                                           Components::Cookie *ck
-                                                           ACE_ENV_ARG_DECL)
+                                                           Components::Cookie *ck)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName,
                    Components::InvalidConnection))
@@ -768,8 +706,7 @@ CORBA::Object_ptr
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
   if (ACE_OS_String::strcmp (publisher_name, "[publish name]") == 0)
     {
-      return this->unsubscribe_[publish name] (ck
-                                               ACE_ENV_ARG_PARAMETER);
+      return this->unsubscribe_[publish name] (ck);
     }
 ##end foreach [publish name] with [eventtype]
 
@@ -778,8 +715,7 @@ CORBA::Object_ptr
 
 void
 [ciao module name]::[component name]_Servant::connect_consumer (const char * emitter_name,
-                                                                Components::EventConsumerBase_ptr consumer
-                                                                ACE_ENV_ARG_DECL)
+                                                                Components::EventConsumerBase_ptr consumer)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName,
                    Components::AlreadyConnected,
@@ -787,31 +723,27 @@ void
 {
   // @@ We can omit this if clause if there's no emitter in this component.
   if (emitter_name == 0)
-    ACE_THROW (Components::InvalidName ());
+    throw Components::InvalidName ();
 
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
   if (ACE_OS_String::strcmp (emitter_name, "[emit name]") == 0)
     {
       [eventtype]Consumer_var _ciao_consumer =
-        [eventtype]Consumer::_narrow (consumer
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        [eventtype]Consumer::_narrow (consumer);
 
       if (CORBA::is_nil (_ciao_consumer.in ()))
-        ACE_THROW (Components::InvalidConnection);
+        throw Components::InvalidConnection;
 
-      this->connect_[emit name] (_ciao_consumer.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+      this->connect_[emit name] (_ciao_consumer.in ());
       return;
     }
 ##end foreach [emit name] with [eventtype]
 
-  ACE_THROW (Components::InvalidName ());
+  throw Components::InvalidName ();
 }
 
 ::Components::EventConsumerBase_ptr
-[ciao module name]::[component name]_Servant::disconnect_consumer (const char * source_name
-                                                                   ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::disconnect_consumer (const char * source_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName,
                    Components::NoConnection))
@@ -823,7 +755,7 @@ void
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
   if (ACE_OS_String::strcmp (source_name, "[emit name]") == 0)
     {
-      return this->disconnect_[emit name] (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return this->disconnect_[emit name] ();
     }
 ##end foreach [emit name] with [eventtype]
 
@@ -831,7 +763,7 @@ void
 }
 
 ::Components::ConsumerDescriptions *
-[ciao module name]::[component name]_Servant::get_all_consumers (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_all_consumers ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::ConsumerDescriptions_var retv =
@@ -845,8 +777,7 @@ void
   retv[i]->Name ("[consumer name]");
   retv[i]->type_id ("[eventtype]Consumer repo id");
   [eventtype]Consumer_var c
-    = this->get_consumer_[consumer name] (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    = this->get_consumer_[consumer name] ();
 
   retv[i]->consumer (c.in ());
 
@@ -857,8 +788,7 @@ void
 }
 
 ::Components::ConsumerDescriptions *
-[ciao module name]::[component name]_Servant::get_named_consumers (const Components::NameList & names
-                                                                   ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_named_consumers (const Components::NameList & names)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName))
 {
@@ -877,8 +807,7 @@ void
           retv[i]->Name ("[consumer name]");
           retv[i]->type_id ("[eventtype]Consumer repo id");
           [eventtype]Consumer_var c =
-            this->get_consumer_[consumer name] (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            this->get_consumer_[consumer name] ();
 
           retv[i]->consumer (c.in ());
         }
@@ -890,7 +819,7 @@ void
 }
 
 ::Components::EmitterDescriptions *
-[ciao module name]::[component name]_Servant::get_all_emitters (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_all_emitters ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::EmitterDescriptions_var retv =
@@ -912,8 +841,7 @@ void
 }
 
 ::Components::EmitterDescriptions *
-[ciao module name]::[component name]_Servant::get_named_emitters (const Components::NameList & names
-                                                                  ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_named_emitters (const Components::NameList & names)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName))
 {
@@ -941,7 +869,7 @@ void
 }
 
 ::Components::PublisherDescriptions *
-[ciao module name]::[component name]_Servant::get_all_publishers (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_all_publishers ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ to-do
@@ -952,8 +880,7 @@ void
 }
 
 ::Components::PublisherDescriptions *
-[ciao module name]::[component name]_Servant::get_named_publishers (const Components::NameList & names
-                                                                    ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_named_publishers (const Components::NameList & names)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidName))
 {
@@ -966,7 +893,7 @@ void
 
 // Operations for CCMObject interface
 ::CORBA::IRObject_ptr
-[ciao module name]::[component name]_Servant::get_component_def (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_component_def ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ to-do: Connect to an IfR?
@@ -974,14 +901,14 @@ void
 }
 
 ::Components::CCMHome_ptr
-[ciao module name]::[component name]_Servant::get_ccm_home (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_ccm_home ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->context_->get_CCM_home (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->context_->get_CCM_home ();
 }
 
 ::Components::PrimaryKeyBase *
-[ciao module name]::[component name]_Servant::get_primary_key (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_primary_key ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::NoKeyAvailable))
 {
@@ -990,7 +917,7 @@ void
 }
 
 void
-[ciao module name]::[component name]_Servant::configuration_complete (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+[ciao module name]::[component name]_Servant::configuration_complete ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::InvalidConfiguration))
 {
@@ -999,7 +926,7 @@ void
 }
 
 void
-[ciao module name]::[component name]_Servant::remove (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
@@ -1009,31 +936,26 @@ void
 }
 
 ::Components::ComponentPortDescription *
-[ciao module name]::[component name]_Servant::get_all_ports (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_all_ports ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::ComponentPortDescription_var retv =
     new OBV_Components::ComponentPortDescription;
 
   ::Components::FacetDescriptions_var facets_desc
-      = this->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+      = this->get_all_facets ();
+
   ::Components::ReceptacleDescriptions_var receptacle_desc
-      = get_all_receptacles (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+      = get_all_receptacles ();
 
   ::Components::ConsumerDescriptions_var consumer_desc
-      = this->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+      = this->get_all_consumers ();
 
   ::Components::EmitterDescriptions_var emitter_desc
-      = this->get_all_emitters (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+      = this->get_all_emitters ();
+
   ::Components::PublisherDescriptions_var publisher_desc
-      = this->get_all_publishers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+      = this->get_all_publishers ();
 
   retv->facets (facets_desc.in());
   retv->receptacles (receptacle_desc.in());
@@ -1046,14 +968,14 @@ void
 
 // get_component implementation.
 CORBA::Object_ptr
-[ciao module name]::[component name]_Servant::_get_component (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::_get_component ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::SessionContext_var sc =
       ::Components::SessionContext::_narrow (this->context_);
 
   if (! CORBA::is_nil(sc.in ()))
-    return sc->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return sc->get_CCM_object ();
 
   // @@ Do we need to try the following case here?  We are afterall implementing
   // a session component here.
@@ -1061,35 +983,31 @@ CORBA::Object_ptr
       ::Components::EntityContext::_narrow (this->context_);
 
   if (! CORBA::is_nil(ec.in ()))
-    return ec->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return ec->get_CCM_object ();
 
   ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 }
 
 void
-[ciao module name]::[component name]_Servant::_ciao_activate (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::_ciao_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (this->executor_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      ::Components::SessionComponent::_narrow (this->executor_.in ());
 
   if (! CORBA::is_nil (temp.in ()))
-    temp->ccm_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+    temp->ccm_activate ();
 }
 
 void
-[ciao module name]::[component name]_Servant::_ciao_passivate (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::_ciao_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::Components::SessionComponent_var temp =
-      ::Components::SessionComponent::_narrow (this->executor_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      ::Components::SessionComponent::_narrow (this->executor_.in ());
 
   if (! CORBA::is_nil (temp.in ()))
-    temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+    temp->ccm_passivate ();
 }
 
 //////////////////////////////////////////////////////////////////
@@ -1097,19 +1015,14 @@ void
 //////////////////////////////////////////////////////////////////
 
 [component name]_ptr
-[ciao module name]::[home name]_Servant::_ciao_activate_component (CCM_[component name]_ptr exe
-                                                                   ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[home name]_Servant::_ciao_activate_component (CCM_[component name]_ptr exe)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var hobj
-    = this->container_->get_objref (this
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    = this->container_->get_objref (this);
 
   ::Components::CCMHome_var home
-      = ::Components::CCMHome::_narrow (hobj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+      = ::Components::CCMHome::_narrow (hobj.in ());
 
   [ciao module name]::[component name]_Servant *svt =
     new [ciao module name]::[component name]_Servant (exe,
@@ -1120,17 +1033,12 @@ void
 
   CORBA::Object_var objref
     = this->container_->install_component (svt,
-                                           oid.out ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                           oid.out ());
 
-  svt->_ciao_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  svt->_ciao_activate ();
 
   [component name]_var ho
-    = [component name]::_narrow (objref.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    = [component name]::_narrow (objref.in ());
 
   if (this->component_map_.bind (oid.in (), svt) == 0)
     {
@@ -1141,23 +1049,19 @@ void
 }
 
 void
-[ciao module name]::[home name]_Servant::_ciao_passivate_component ([component name]_ptr comp
-                                                                    ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[home name]_Servant::_ciao_passivate_component ([component name]_ptr comp)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid;
 
   this->container_->uninstall_component (comp,
-                                         oid.out ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         oid.out ());
 
   [ciao module name]::[component name]_Servant *servant = 0;
   if (this->component_map_.unbind (oid.in (), servant) == 0)
     {
       PortableServer::ServantBase_var safe (servant);
-      servant->_ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      servant->_ciao_passivate ();
     }
   // What happen if unbind failed?
 
@@ -1165,7 +1069,7 @@ void
 
 // Operations for Implicit Home interface
 [component name]_ptr
-[ciao module name]::[home name]_Servant::create (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[home name]_Servant::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CreateFailure))
 {
@@ -1173,58 +1077,46 @@ void
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   Components::EnterpriseComponent_var _ciao_ec =
-    this->executor_->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->executor_->create ();
 
   CCM_[component name]_var _ciao_comp
-    = CCM_[component name]::_narrow (_ciao_ec.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    = CCM_[component name]::_narrow (_ciao_ec.in ());
 
-  return this->_ciao_activate_component (_ciao_comp.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+  return this->_ciao_activate_component (_ciao_comp.in ());
 }
 
 // Operations for CCMHome interface
 void
-[ciao module name]::[home name]_Servant::remove_component (Components::CCMObject_ptr comp
-                                                           ACE_ENV_ARG_DECL)
+[ciao module name]::[home name]_Servant::remove_component (Components::CCMObject_ptr comp)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::RemoveFailure))
 {
   [component name]_var _ciao_comp
-    = [component name]::_narrow (comp
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    = [component name]::_narrow (comp);
 
   if (CORBA::is_nil (_ciao_comp.in ()))
-    ACE_THROW (CORBA::INTERNAL ()); // What is the right exception to throw here?
+    throw CORBA::INTERNAL (); // What is the right exception to throw here?
 
   // @@ It seems to me that we need to make sure this is a component
   // generated by this home before calling remove on this component.
-  _ciao_comp->remove (ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  _ciao_comp->remove ();
 
 
   // Removing the object reference?  get the servant from the POA with
   // the objref, and call remove() on the component, deactivate the
   // component, and then remove-ref the servant?
-  this->_ciao_passivate_component (_ciao_comp.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  this->_ciao_passivate_component (_ciao_comp.in ());
 }
 
 extern "C" [SERVANT]_Export ::PortableServer::Servant
 create[home name]_Servant (::Components::HomeExecutorBase_ptr p,
-                           CIAO::Session_Container *c
-                           ACE_ENV_ARG_DECL);
+                           CIAO::Session_Container *c);
 {
   if (p == 0)
     return 0;
 
   CCM_[home name]_var x
-    = CCM_[home name]::_narrow (p
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    = CCM_[home name]::_narrow (p);
 
   if (CORBA::is_nil (x.in ()))
     return 0;
diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.h b/CIAO/docs/templates/CIAO_Glue_Session_Template.h
index 053933f776e..25c7813db53 100644
--- a/CIAO/docs/templates/CIAO_Glue_Session_Template.h
+++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.h
@@ -70,7 +70,7 @@ namespace CIAO_GLUE
 
     // get_component implementation.
     virtual CORBA::Object_ptr
-    _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    _get_component ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
@@ -108,55 +108,53 @@ namespace CIAO_GLUE
 ##foreach [receptacle name] with [uses type] in (list of all 'uses' interfaces) generate:
 ##  if [receptacle name] is a simplex receptacle ('uses')
     [uses type]_ptr
-    get_connection_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_connection_[receptacle name] ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
     // [receptacle name]Connections typedef'ed as a sequence of
     // struct [receptacle name]Connection.
     [receptacle name]Connections *
-    get_connections_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    get_connections_[receptacle name] ();
       ACE_THROW_SPEC ((CORBA::SystemException));
 ##  endif [receptacle name]
 ##end foreach [receptacle name] with [uses type]
 
 ##foreach [event name] with [eventtype] in (list of all event sources) generate:
-    void push_[event name] ([eventtype] *ev
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    void push_[event name] ([eventtype] *ev)
       ACE_THROW_SPEC ((CORBA::SystemException));
 ##end foreach [event name] with [eventtype]
 
     // Operations for ::Components::CCMContext
     virtual ::Components::Principal_ptr
-    get_caller_principal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_caller_principal ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::CCMHome_ptr
-    get_CCM_home (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_CCM_home ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual CORBA::Boolean
-    get_rollback_only (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_rollback_only ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
 
     virtual ::Components::Transaction::UserTransaction_ptr
-    get_user_transaction (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_user_transaction ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
 
     virtual CORBA::Boolean
-    is_caller_in_role (const char * role
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    is_caller_in_role (const char * role)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
-    set_rollback_only (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    set_rollback_only ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
 
     // Operations for ::Components::SessionContext interface
     virtual CORBA::Object_ptr
-    get_CCM_object (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_CCM_object ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::IllegalState));
   protected:
@@ -167,14 +165,13 @@ namespace CIAO_GLUE
 ##  if [receptacle name] is a simplex receptacle ('uses')
     // Simplex [receptacle name] connection management operations
     void
-    connect_[receptacle name] ([uses type]_ptr c
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    connect_[receptacle name] ([uses type]_ptr c)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::AlreadyConnected,
                        ::Components::InvalidConnection));
 
     [uses type]_ptr
-    disconnect_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    disconnect_[receptacle name] ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::NoConnection));
 
@@ -184,15 +181,13 @@ namespace CIAO_GLUE
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
     // Multiplex [receptacle name] connection management operations
     ::Components::Cookie *
-    connect_[receptacle name] ([uses type]_ptr c
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    connect_[receptacle name] ([uses type]_ptr c)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::ExceedConnectionLimit,
                        ::Components::InvalidConnection));
 
     [uses type]_ptr
-    disconnect_[receptacle name] (::Components::Cookie *ck
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    disconnect_[receptacle name] (::Components::Cookie *ck)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::InvalidConnection));
 
@@ -205,13 +200,12 @@ namespace CIAO_GLUE
     // Operations for emits interfaces.
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
     void
-    connect_[emit name] ([eventtype]Consumer_ptr c
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    connect_[emit name] ([eventtype]Consumer_ptr c)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::AlreadyConnected));
 
     [eventtype]Consumer_ptr
-    disconnect_[emit name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    disconnect_[emit name] ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::NoConnection));
 
@@ -221,14 +215,12 @@ namespace CIAO_GLUE
     // Operations for publishes interfaces.
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
       ::Components::Cookie *
-      subscribe_[publish name] ([eventtype]Consumer_ptr c
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      subscribe_[publish name] ([eventtype]Consumer_ptr c)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::ExceededConnectionLimit));
 
       [eventtype]Consumer_ptr
-      unsubscribe_[publish name] (::Components::Cookie *ck
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      unsubscribe_[publish name] (::Components::Cookie *ck)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::InvalidConnection));
 
@@ -273,7 +265,7 @@ namespace CIAO_GLUE
     // Operations for provides interfaces.
 ##foreach [facet name] with [facet type] in (list of all provided interfaces) generate:
     virtual [facet type]_ptr
-    provide_[facet name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    provide_[facet name] ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 ##end foreach [facet name] with [facet type]
 
@@ -283,37 +275,34 @@ namespace CIAO_GLUE
 ##  if [receptacle name] is a simplex receptacle ('uses')
     // Simplex [receptacle name] connection management operations
     virtual void
-    connect_[receptacle name] ([uses type]_ptr c
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    connect_[receptacle name] ([uses type]_ptr c)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::AlreadyConnected,
                        ::Components::InvalidConnection));
 
     virtual [uses type]_ptr
-    disconnect_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    disconnect_[receptacle name] ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::NoConnection));
 
     virtual [uses type]_ptr
-    get_connection_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_connection_[receptacle name] ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
     // Multiplex [receptacle name] connection management operations
     virtual ::Components::Cookie *
-    connect_[receptacle name] ([uses type]_ptr c
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    connect_[receptacle name] ([uses type]_ptr c)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::ExceedConnectionLimit,
                        ::Components::InvalidConnection));
 
     virtual [uses type]_ptr
-    disconnect_[receptacle name] (::Components::Cookie *ck
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    disconnect_[receptacle name] (::Components::Cookie *ck)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::InvalidConnection));
 
     virtual [receptacle name]Connections *
-    get_connections_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_connections_[receptacle name] ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 ##  endif [receptacle name]
 ##end foreach [receptacle name] with [uses type]
@@ -333,20 +322,18 @@ namespace CIAO_GLUE
       ~[event type]Consumer_[consumer name]_Servant ();
 
 ##  foreach [type] in ([eventtype] and all its parent eventtype, if any)
-      virtual void push_[type] ([type] *evt
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void push_[type] ([type] *evt)
         ACE_THROW_SPEC ((CORBA::SystemException));
 ##  end [type]
 
       // Inherit from ::Compopnents::EventConsumerBase
-      virtual void push_event (::Components::EventBase *ev
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void push_event (::Components::EventBase *ev)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          ::Components::BadEventType));
 
     // get_component implementation.
       virtual CORBA::Object_ptr
-      _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      _get_component ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     protected:
@@ -358,20 +345,19 @@ namespace CIAO_GLUE
     };
 
     virtual [eventtype]Consumer_ptr
-    get_consumer_[consumer name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_consumer_[consumer name] ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 ##end foreach [consumer name] with [eventtype]
 
     // Operations for emits interfaces.
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
     virtual void
-    connect_[emit name] ([eventtype]Consumer_ptr c
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    connect_[emit name] ([eventtype]Consumer_ptr c)
       ACE_THROW_SPEC ((CORBA::SystemException
                        ::Components::AlreadyConnected));
 
     virtual [eventtype]Consumer_ptr
-    disconnect_[emit name] (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    disconnect_[emit name] ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::NoConnection));
 ##end foreach [emit name] with [eventtype]
@@ -379,45 +365,39 @@ namespace CIAO_GLUE
     // Operations for publishes interfaces.
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
     virtual ::Components::Cookie *
-    subscribe_[publish name] ([eventtype]Consumer_ptr c
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    subscribe_[publish name] ([eventtype]Consumer_ptr c)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::ExceededConnectionLimit));
 
     virtual [eventtype]Consumer_ptr
-    unsubscribe_[publish name] (::Components::Cookie *ck
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    unsubscribe_[publish name] (::Components::Cookie *ck)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::InvalidConnection));
 ##end foreach [publish name] with [eventtype]
 
     // Operations for Navigation interface
     virtual CORBA::Object_ptr
-    provide_facet (const char * name
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    provide_facet (const char * name)
       ACE_THROW_SPEC ((CORBA::SystemException ,
                        Components::InvalidName)) ;
 
     virtual ::Components::FacetDescriptions *
-    get_all_facets (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_facets ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::FacetDescriptions *
-    get_named_facets (const Components::NameList & names
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_named_facets (const Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException ,
                        Components::InvalidName));
 
     virtual CORBA::Boolean
-    same_component (CORBA::Object_ptr object_ref
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    same_component (CORBA::Object_ptr object_ref)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations for Receptacles interface
     virtual ::Components::Cookie *
     connect (const char * name,
-             CORBA::Object_ptr connection
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+             CORBA::Object_ptr connection)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName,
                        Components::InvalidConnection,
@@ -426,8 +406,7 @@ namespace CIAO_GLUE
 
     virtual CORBA::Object_ptr
     disconnect (const char * name,
-                Components::Cookie *ck
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                Components::Cookie *ck)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName,
                        Components::InvalidConnection,
@@ -435,32 +414,28 @@ namespace CIAO_GLUE
                        Components::NoConnection));
 
     virtual ::Components::ConnectionDescriptions *
-    get_connections (const char * name
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_connections (const char * name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::ReceptacleDescriptions *
-    get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_receptacles ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::ReceptacleDescriptions *
-    get_named_receptacles (const Components::NameList & names
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_named_receptacles (const Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     // Operations for Events interface
     virtual ::Components::EventConsumerBase_ptr
-    get_consumer (const char * sink_name
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_consumer (const char * sink_name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::Cookie *
     subscribe (const char * publisher_name,
-               Components::EventConsumerBase_ptr subscriber
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+               Components::EventConsumerBase_ptr subscriber)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName,
                        Components::InvalidConnection,
@@ -468,100 +443,94 @@ namespace CIAO_GLUE
 
     virtual ::Components::EventConsumerBase_ptr
     unsubscribe (const char * publisher_name,
-                 Components::Cookie *ck
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                 Components::Cookie *ck)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName,
                        Components::InvalidConnection));
 
     virtual void
     connect_consumer (const char * emitter_name,
-                      Components::EventConsumerBase_ptr consumer
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                      Components::EventConsumerBase_ptr consumer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName,
                        Components::AlreadyConnected,
                        Components::InvalidConnection));
 
     virtual ::Components::EventConsumerBase_ptr
-    disconnect_consumer (const char * source_name
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    disconnect_consumer (const char * source_name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName,
                        Components::NoConnection));
 
     virtual ::Components::ConsumerDescriptions *
-    get_all_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_consumers ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::ConsumerDescriptions *
-    get_named_consumers (const Components::NameList & names
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_named_consumers (const Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::EmitterDescriptions *
-    get_all_emitters (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_emitters ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::EmitterDescriptions *
-    get_named_emitters (const Components::NameList & names
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_named_emitters (const Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::PublisherDescriptions *
-    get_all_publishers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_publishers ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::PublisherDescriptions *
-    get_named_publishers (const Components::NameList & names
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_named_publishers (const Components::NameList & names)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     // Operations for CCMObject interface
     virtual ::CORBA::IRObject_ptr
-    get_component_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_component_def ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::CCMHome_ptr
-    get_ccm_home (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_ccm_home ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::PrimaryKeyBase *
-    get_primary_key (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_primary_key ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::NoKeyAvailable));
 
     virtual void
-    configuration_complete (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    configuration_complete ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidConfiguration));
 
     virtual void
-    remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::RemoveFailure));
 
     virtual ::Components::ComponentPortDescription *
-    get_all_ports (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_all_ports ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // get_component implementation.
     virtual CORBA::Object_ptr
-    _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    _get_component ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // CIAO specific operations.
 
     // Activate the object in the container_
     void
-    _ciao_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    _ciao_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void
-    _ciao_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    _ciao_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
@@ -613,7 +582,7 @@ namespace CIAO_GLUE
     // for factory operations inherit from parent home(s), they should return
     // the corresponding component types their homes manage
     virtual [component name]_ptr
-    [factory name] (.... ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    [factory name] (....)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::CreateFailure,
                        ....));
@@ -624,7 +593,7 @@ namespace CIAO_GLUE
     // for finder operations inherit from parent home(s), they should return
     // the corresponding component types their homes manage
     virtual [component name]_ptr
-    [finder name] (.... ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    [finder name] (....)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::FinderFailure,
                        ....));
@@ -634,7 +603,7 @@ namespace CIAO_GLUE
 
     // Operations for KeylessHome interface
     virtual ::Components::CCMObject_ptr
-    create_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create_component ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CreateFailure));
 
@@ -642,65 +611,58 @@ namespace CIAO_GLUE
 
     // We do not support key'ed home at the moment but we might
     // as well generate the mapping.
-    virtual [component name]_ptr create ([key type] *key
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual [component name]_ptr create ([key type] *key)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::CreationFailure,
                        ::Components::DuplicateKeyValue,
                        ::Components::InvalidKey));
 
     virtual [component name]_ptr
-    find_by_primary_key ([key type] *key
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    find_by_primary_key ([key type] *key)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::FinderFailure,
                        ::Components::UnknownKeyValue,
                        ::Components::InvalidKey));
 
-    virtual void remove ([key type] *key
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void remove ([key type] *key)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        ::Components::RemoveFailure,
                        ::Components::UnknownKeyValue,
                        ::Components::InvalidKey));
 
     virtual [key type] *
-    get_primary_key ([component name]_ptr comp
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    get_primary_key ([component name]_ptr comp)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 ##  endif (keyed or keyless home)
 
     // Operations for Implicit Home interface
     virtual [component name]_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CreateFailure));
 
     // Operations for CCMHome interface
     virtual ::CORBA::IRObject_ptr
-    get_component_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_component_def ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::CORBA::IRObject_ptr
-    get_home_def (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_home_def ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void remove_component (Components::CCMObject_ptr comp
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void remove_component (Components::CCMObject_ptr comp)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::RemoveFailure));
 
   protected:
     // Helper method for factory operations.
      [component name]_ptr
-     _ciao_activate_component (CCM_[component name]_ptr exe
-                               ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+     _ciao_activate_component (CCM_[component name]_ptr exe)
        ACE_THROW_SPEC ((CORBA::SystemException));
 
     void
-    _ciao_passivate_component ([component name]_ptr comp
-                               ACE_ENV_SINGLE_ARG_DECL)
+    _ciao_passivate_component ([component name]_ptr comp)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // My Executor.
@@ -721,8 +683,7 @@ namespace CIAO_GLUE
 
 extern "C" [SERVANT]_Export ::PortableServer::Servant
 create[home name]_Servant (::Components::HomeExecutorBase_ptr p,
-                           CIAO::Session_Container *c
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                           CIAO::Session_Container *c);
 
 #if defined (__ACE_INLINE__)
 # include "[idl-name]_svnt.inl"
diff --git a/CIAO/docs/templates/CIAO_Glue_Session_Template.inl b/CIAO/docs/templates/CIAO_Glue_Session_Template.inl
index 8b02307bc85..1cb07a064ae 100644
--- a/CIAO/docs/templates/CIAO_Glue_Session_Template.inl
+++ b/CIAO/docs/templates/CIAO_Glue_Session_Template.inl
@@ -78,27 +78,26 @@ ACE_INLINE
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
 
 ACE_INLINE void
-[ciao module name]::[component name]_Context::connect_[emit name] ([eventtype]Consumer_ptr c
-                                                                   ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Context::connect_[emit name] ([eventtype]Consumer_ptr c)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::AlreadyConnected))
 {
   if (CORBA::is_nil (c))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   if (! CORBA::is_nil (this->ciao_emits_[emit name]_consumer_.in ()))
-    ACE_THROW (::Components::AlreadyConnected ());
+    throw ::Components::AlreadyConnected ();
 
   this->ciao_emits_[emit name]_consumer_ = c;
 }
 
 ACE_INLINE [eventtype]Consumer_ptr
-[ciao module name]::[component name]_Context::disconnect_[emit name] (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Context::disconnect_[emit name] ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::NoConnection))
 {
   if (CORBA::is_nil (this->ciao_emits_[emit name]_consumer_.in ()))
-    ACE_THROW (::Components::NoConnection ());
+    throw ::Components::NoConnection ();
 
   return this->ciao_emits_[emit name]_consumer_._retn ();
 }
@@ -107,7 +106,7 @@ ACE_INLINE [eventtype]Consumer_ptr
 
 // Operations for ::Components::CCMContext
 ACE_INLINE ::Components::Principal_ptr
-[ciao module name]::[component name]_Context::get_caller_principal (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Context::get_caller_principal ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ We don't support Security in CIAO yet.
@@ -115,14 +114,14 @@ ACE_INLINE ::Components::Principal_ptr
 }
 
 ACE_INLINE ::Components::CCMHome_ptr
-[ciao module name]::[component name]_Context::get_CCM_home (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+[ciao module name]::[component name]_Context::get_CCM_home ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Components::CCMHome::_duplicate (this->home_.in ());
 }
 
 ACE_INLINE CORBA::Boolean
-[ciao module name]::[component name]_Context::get_rollback_only (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Context::get_rollback_only ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::IllegalState))
 {
@@ -131,7 +130,7 @@ ACE_INLINE CORBA::Boolean
 }
 
 ACE_INLINE ::Components::Transaction::UserTransaction_ptr
-[ciao module name]::[component name]_Context::get_user_transaction (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Context::get_user_transaction ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::IllegalState))
 {
@@ -140,8 +139,7 @@ ACE_INLINE ::Components::Transaction::UserTransaction_ptr
 }
 
 ACE_INLINE CORBA::Boolean
-[ciao module name]::[component name]_Context::is_caller_in_role (const char * role
-                                                                 ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Context::is_caller_in_role (const char * role)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (role);
@@ -151,12 +149,12 @@ ACE_INLINE CORBA::Boolean
 }
 
 ACE_INLINE void
-[ciao module name]::[component name]_Context::set_rollback_only (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Context::set_rollback_only ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::IllegalState))
 {
   // @@ We don't support Transaction in CIAO yet.
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 //////////////////////////////////////////////////////////////////
@@ -181,59 +179,53 @@ ACE_INLINE [operation return_type]
 ##  if [receptacle name] is a simplex receptacle ('uses')
 // Simplex [receptacle name] connection management operations
 ACE_INLINE void
-[ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c
-                                                                         ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::AlreadyConnected,
                    ::Components::InvalidConnection))
 {
-  this->context_->connect_[receptacle name] (c
-                                             ACE_ENV_ARG_PARAMETER);
+  this->context_->connect_[receptacle name] (c);
 }
 
 ACE_INLINE [uses type]_ptr
-[ciao module name]::[component name]_Servant::disconnect_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::disconnect_[receptacle name] ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::NoConnection))
 {
-  return this->context_->disconnect_[receptacle name] (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->context_->disconnect_[receptacle name] ();
 }
 
 ACE_INLINE [uses type]_ptr
-[ciao module name]::[component name]_Servant::get_connection_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_connection_[receptacle name] ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->context_->get_connection_[receptacle name] (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->context_->get_connection_[receptacle name] ();
 }
 ##  else ([receptacle name] is a multiplex ('uses multiple') receptacle)
 
 // Multiplex [receptacle name] connection management operations
 ACE_INLINE ::Components::Cookie *
-[ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c
-                                                                         ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::connect_[receptacle name] ([uses type]_ptr c)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::ExceedConnectionLimit,
                    ::Components::InvalidConnection))
 {
-  return this->context_->connect_[receptacle name] (c
-                                                    ACE_ENV_ARG_PARAMETER);
+  return this->context_->connect_[receptacle name] (c);
 }
 
 ACE_INLINE [uses type]_ptr
-[ciao module name]::[component name]_Servant::disconnect_[receptacle name] (::Components::Cookie *ck
-                                                                            ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::disconnect_[receptacle name] (::Components::Cookie *ck)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::InvalidConnection))
 {
-  return this->context_->disconnect_[receptacle name] (ck
-                                                       ACE_ENV_ARG_PARAMETER);
+  return this->context_->disconnect_[receptacle name] (ck);
 }
 
 ACE_INLINE [receptacle name]Connections *
-[ciao module name]::[component name]_Servant::get_connections_[receptacle name] (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::get_connections_[receptacle name] ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->context_->get_connections_[receptacle name] (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->context_->get_connections_[receptacle name] ();
 }
 
 ##  endif [receptacle name]
@@ -267,33 +259,30 @@ ACE_INLINE
 }
 
 ACE_INLINE CORBA::Object_ptr
-[ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::_get_component (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::_get_component ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->ctx_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ctx_->get_CCM_object ();
 }
 
 ACE_INLINE void
 [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_[eventtype]
-  ([eventtype] *evt
-   ACE_ENV_ARG_DECL)
+  ([eventtype] *evt)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->executor_->push_[consumer name] (evt
-                                         ACE_ENV_ARG_PARAMETER);
+  this->executor_->push_[consumer name] (evt);
 }
 
 ##  foreach [type] in (all parents of eventtype, if any, not including EventConsumerBase)
 ACE_INLINE void
 [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant::push_[type]
-  ([type] *evt
-   ACE_ENV_ARG_DECL)
+  ([type] *evt)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Problem, there's no way to handle this case.
 
   //  this->executor_->push_[consumer name] (evt ACE_ENV_ARG);
-  ACE_THROW (::CORBA::BAD_PARAM ());
+  throw ::CORBA::BAD_PARAM ();
 }
 ##  end [type]
 
@@ -302,44 +291,38 @@ ACE_INLINE void
 // Operations for emits interfaces.
 ##foreach [emit name] with [eventtype] in (list of all emitters) generate:
 ACE_INLINE void
-[ciao module name]::[component name]_Servant::connect_[emit name] ([eventtype]Consumer_ptr c
-                                                                   ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::connect_[emit name] ([eventtype]Consumer_ptr c)
   ACE_THROW_SPEC ((CORBA::SystemException
                    ::Components::AlreadyConnected))
 {
-  this->context_->connect_[emit name] (c
-                                       ACE_ENV_ARG_PARAMETER);
+  this->context_->connect_[emit name] (c);
 }
 
 ACE_INLINE [eventtype]Consumer_ptr
-[ciao module name]::[component name]_Servant::disconnect_[emit name] (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[component name]_Servant::disconnect_[emit name] ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::NoConnection))
 {
-  return this->context_->disconnect_[emit name] (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->context_->disconnect_[emit name] ();
 }
 ##end foreach [emit name] with [eventtype]
 
 // Operations for publishes interfaces.
 ##foreach [publish name] with [eventtype] in (list of all publishers) generate:
 ACE_INLINE ::Components::Cookie *
-[ciao module name]::[component name]_Servant::subscribe_[publish name] ([eventtype]Consumer_ptr c
-                                                                        ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::subscribe_[publish name] ([eventtype]Consumer_ptr c)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::ExceededConnectionLimit))
 {
-  return this->context_->subscribe_[publish name] (c
-                                                   ACE_ENV_ARG_PARAMETER);
+  return this->context_->subscribe_[publish name] (c);
 }
 
 ACE_INLINE [eventtype]Consumer_ptr
-[ciao module name]::[component name]_Servant::unsubscribe_[publish name] (::Components::Cookie *ck
-                                                                          ACE_ENV_ARG_DECL)
+[ciao module name]::[component name]_Servant::unsubscribe_[publish name] (::Components::Cookie *ck)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::InvalidConnection))
 {
-  return this->context_->unsubscribe_[publish name] (ck
-                                                     ACE_ENV_ARG_PARAMETER);
+  return this->context_->unsubscribe_[publish name] (ck);
 }
 ##end foreach [publish name] with [eventtype]
 
@@ -370,22 +353,18 @@ ACE_INLINE
 // for factory operations inherit from parent home(s), they should return
 // the corresponding component types their homes manage
 ACE_INLINE [component name]_ptr
-[ciao module name]::[home name]_Servant::[factory name] (.... ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+[ciao module name]::[home name]_Servant::[factory name] (....)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ::Components::CreateFailure,
                    ....))
 {
   Components::EnterpriseComponent_var _ciao_ec =
-    this->executor_->[factory name] (.... ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->executor_->[factory name] (....);
 
   CCM_[component name]_var _ciao_comp
-    = CCM_[component name]::_narrow (_ciao_ec.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    = CCM_[component name]::_narrow (_ciao_ec.in ());
 
-  return this->_ciao_activate_component (_ciao_comp.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+  return this->_ciao_activate_component (_ciao_comp.in ());
 }
 ##end foreach [factory name]
 
@@ -393,19 +372,17 @@ ACE_INLINE [component name]_ptr
 // for finder operations inherit from parent home(s), they should return
 // the corresponding component types their homes manage
 ACE_INLINE [component name]_ptr
-[ciao module name]::[home name]_Servant::[finder name] (.... ACE_ENV_ARG_DECL)
+[ciao module name]::[home name]_Servant::[finder name] (....)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::FinderFailure,
                    ....))
 {
   Components::EnterpriseComponent_var com =
-    this->executor_->[finder name] (.... ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->executor_->[finder name] (....);
 
   // Do we create a new object reference referring to the same object,
   // or do we try to create a different objref referring to the same object?
-  return this->_ciao_create_helper (com
-                                    ACE_ENV_ARG_PARAMETER);
+  return this->_ciao_create_helper (com);
 }
 ##end foreach [finder name]
 
@@ -413,12 +390,12 @@ ACE_INLINE [component name]_ptr
 
 // Operations for KeylessHome interface
 ACE_INLINE ::Components::CCMObject_ptr
-[ciao module name]::[home name]_Servant::create_component (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[home name]_Servant::create_component ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CreateFailure))
 {
   // Simply forward to the create method.
-  return this->create (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->create ();
 }
 
 ##  else [home basename] is keyed home with [key type]
@@ -459,7 +436,7 @@ ACE_INLINE void
 {
   // @@ TO-DO when we suppor keyed home.
 
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ACE_INLINE [key type] *
@@ -476,7 +453,7 @@ ACE_INLINE [key type] *
 
 // Operations for CCMHome interface
 ACE_INLINE ::CORBA::IRObject_ptr
-[ciao module name]::[home name]_Servant::get_component_def (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[home name]_Servant::get_component_def ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ TO-DO.  Contact IfR?
@@ -485,7 +462,7 @@ ACE_INLINE ::CORBA::IRObject_ptr
 }
 
 ACE_INLINE CORBA::IRObject_ptr
-[ciao module name]::[home name]_Servant::get_home_def (ACE_ENV_SINGLE_ARG_DECL)
+[ciao module name]::[home name]_Servant::get_home_def ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ TO-DO.  Contact IfR?
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
index 330b4419477..fc059cc0d74 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
@@ -54,29 +54,23 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     // initialize the ORB
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, argv,""
-                       ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_init (argc, argv,"");
 
-    ACE_TRY_CHECK;
 
     if (parse_args (argc, argv) != 0)
       return -1;
 
     // create the factory object reference of StockBrokerHome
     CORBA::Object_var broker_obj =
-      orb->string_to_object (broker_ior
-                             ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (broker_ior);
 
     // downcast the object reference to the appropriate type
     Stock::StockBroker_var broker =
-    Stock::StockBroker::_narrow (broker_obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    Stock::StockBroker::_narrow (broker_obj.in ());
 
     if (CORBA::is_nil (broker.in ()))
     {
@@ -88,36 +82,29 @@ int main (int argc, char* argv[])
 
     if (subscribe_name != 0)
     {
-      broker->stock_subscribe (subscribe_name
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      broker->stock_subscribe (subscribe_name);
 
       ACE_DEBUG ((LM_DEBUG, "Subscribe successful!\n"));
     }
 
     if (unsubscribe_name != 0)
     {
-      broker->stock_unsubscribe (unsubscribe_name
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      broker->stock_unsubscribe (unsubscribe_name);
 
       ACE_DEBUG ((LM_DEBUG, "Unsubscribe successful!\n"));
     }
 
     // Finally destroy the ORB
-    orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+    orb->destroy ();
 
-    ACE_TRY_CHECK;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "Who is the culprit \n");
+    ex._tao_print_exception ("Who is the culprit \n");
     ACE_ERROR_RETURN ((LM_ERROR,
                         "Uncaught CORBA exception\n"),
                       1);
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp
index 994ba7795b5..4e85274ce8c 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp
@@ -28,8 +28,7 @@ namespace CIDL_StockBroker_Impl
 
   void
   StockBroker_exec_i::stock_subscribe (
-  const char * stock_name
-  ACE_ENV_ARG_DECL)
+  const char * stock_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Stock::Invalid_Stock))
   {
@@ -43,14 +42,13 @@ namespace CIDL_StockBroker_Impl
     }
     else
     {
-      ACE_THROW (Stock::Invalid_Stock ());
+      throw Stock::Invalid_Stock ();
     }
   }
 
   void
   StockBroker_exec_i::stock_unsubscribe (
-  const char * stock_name
-  ACE_ENV_ARG_DECL)
+  const char * stock_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Stock::Invalid_Stock))
   {
@@ -64,7 +62,7 @@ namespace CIDL_StockBroker_Impl
     }
     else
     {
-      ACE_THROW (Stock::Invalid_Stock ());
+      throw Stock::Invalid_Stock ();
     }
 
   }
@@ -72,8 +70,7 @@ namespace CIDL_StockBroker_Impl
 
   void
   StockBroker_exec_i::push_notify_in (
-  Stock::StockName *ev
-  ACE_ENV_ARG_DECL)
+  Stock::StockName *ev)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
 
@@ -85,16 +82,14 @@ namespace CIDL_StockBroker_Impl
     // Retrieve stock information if the stock name is in the subscribed_stock_list
     if (this->subscribed_stock_list_.find (stock_name.in ()) != this->subscribed_stock_list_.end ())
     {
-      Stock::StockQuoter_var quoter_obj = this->context_->get_connection_read_quoter (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      Stock::StockQuoter_var quoter_obj = this->context_->get_connection_read_quoter ();
 
       if (CORBA::is_nil (quoter_obj.in ()))
       {
-        ACE_THROW (CORBA::BAD_PARAM ());
+        throw CORBA::BAD_PARAM ();
       }
 
-      Stock::StockInfo_var info = quoter_obj->get_stock_info (stock_name.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      Stock::StockInfo_var info = quoter_obj->get_stock_info (stock_name.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Quoter - Current value of %s is %d\n",
                              stock_name.in (),
@@ -106,25 +101,21 @@ namespace CIDL_StockBroker_Impl
 
   void
   StockBroker_exec_i::set_session_context (
-  ::Components::SessionContext_ptr ctx
-  ACE_ENV_ARG_DECL)
+  ::Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
   {
-    this->context_ = StockBroker_Context::_narrow (ctx
-                                                   ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->context_ = StockBroker_Context::_narrow (ctx);
 
     if (0 == this->context_)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   }
 
   void
-  StockBroker_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockBroker_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -132,8 +123,7 @@ namespace CIDL_StockBroker_Impl
   }
 
   void
-  StockBroker_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockBroker_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -141,8 +131,7 @@ namespace CIDL_StockBroker_Impl
   }
 
   void
-  StockBroker_exec_i::ccm_activate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockBroker_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -150,8 +139,7 @@ namespace CIDL_StockBroker_Impl
   }
 
   void
-  StockBroker_exec_i::ccm_passivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockBroker_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -159,8 +147,7 @@ namespace CIDL_StockBroker_Impl
   }
 
   void
-  StockBroker_exec_i::ccm_remove (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockBroker_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -180,8 +167,7 @@ namespace CIDL_StockBroker_Impl
   }
 
   ::Components::EnterpriseComponent_ptr
-  StockBrokerHome_exec_i::create (
-  ACE_ENV_SINGLE_ARG_DECL)
+  StockBrokerHome_exec_i::create ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -193,7 +179,6 @@ namespace CIDL_StockBroker_Impl
     retval,
     StockBroker_exec_i,
     CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
     return retval;
   }
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h
index 7cbea3e82cc..020acf28a12 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker_exec.h
@@ -47,65 +47,56 @@ namespace CIDL_StockBroker_Impl
 
     virtual void
     stock_subscribe (
-    const char * stock_name
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    const char * stock_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Stock::Invalid_Stock));
 
     virtual void
     stock_unsubscribe (
-    const char * stock_name
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    const char * stock_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Stock::Invalid_Stock));
 
     virtual void
     push_notify_in (
-    ::Stock::StockName *ev
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::Stock::StockName *ev)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_activate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_remove (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
@@ -134,8 +125,7 @@ namespace CIDL_StockBroker_Impl
     virtual ~StockBrokerHome_exec_i (void);
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
index 431f5c617b4..d99fde85c7c 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
@@ -60,13 +60,11 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     // initialize the ORB
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, argv,""
-                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      CORBA::ORB_init (argc, argv,"");
 
     if (parse_args (argc, argv) != 0)
     {
@@ -75,15 +73,11 @@ int main (int argc, char* argv[])
 
     // create the factory object reference,
     CORBA::Object_var distributor_obj =
-      orb->string_to_object (distributor_ior
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (distributor_ior);
 
     // downcast the object reference to the appropriate type
     Stock::StockDistributor_var distributor =
-      Stock::StockDistributor::_narrow (distributor_obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      Stock::StockDistributor::_narrow (distributor_obj.in ());
 
     if (CORBA::is_nil (distributor.in ()))
     {
@@ -94,35 +88,28 @@ int main (int argc, char* argv[])
 
     if (turn_on)
     {
-      distributor->rate (rate
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      distributor->rate (rate);
 
       ACE_DEBUG ((LM_DEBUG, "Start up the Distribution service\n"));
 
-      distributor->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      distributor->start ();
     }
     else
     {
       ACE_DEBUG ((LM_DEBUG, "Stop the Distribution service\n"));
 
-      distributor->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      distributor->stop ();
     }
 
-    orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb->destroy ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "Who is the culprit \n");
+    ex._tao_print_exception ("Who is the culprit \n");
     ACE_ERROR_RETURN ((LM_ERROR,
                         "Uncaught CORBA exception\n"),
                       1);
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
index 236bcc345a1..1eaafa0027d 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
@@ -40,7 +40,7 @@ namespace CIDL_StockDistributor_Impl
   pulse_Generator::open_h ()
   {
     // convert the task into a active object that runs in separate thread
-    return this->activate (); 
+    return this->activate ();
   }
 
   int
@@ -49,7 +49,7 @@ namespace CIDL_StockDistributor_Impl
     this->reactor ()->end_reactor_event_loop ();
 
     // wait for all threads in the task to exit before it returns
-    return this->wait (); 
+    return this->wait ();
   }
 
   int
@@ -142,8 +142,7 @@ namespace CIDL_StockDistributor_Impl
   //==================================================================
 
   ::Stock::StockInfo *
-  StockQuoter_exec_i::get_stock_info (const char *stock_name
-  ACE_ENV_ARG_DECL)
+  StockQuoter_exec_i::get_stock_info (const char *stock_name)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Stock::Invalid_Stock))
@@ -188,26 +187,24 @@ namespace CIDL_StockDistributor_Impl
   // Supported or inherited operations.
 
   void
-  StockDistributor_exec_i::start (
-  ACE_ENV_SINGLE_ARG_DECL)
+  StockDistributor_exec_i::start ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (this->rate_ == 0 || this->pulser_.active())
     {
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw CORBA::BAD_PARAM ();
     }
 
     this->pulser_.start (this->rate_);
   }
 
   void
-  StockDistributor_exec_i::stop (
-  ACE_ENV_SINGLE_ARG_DECL)
+  StockDistributor_exec_i::stop ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (! this->pulser_.active ())
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
     }
 
     this->pulser_.stop ();
@@ -216,8 +213,7 @@ namespace CIDL_StockDistributor_Impl
   // Attribute operations.
 
   ::CORBA::Long
-  StockDistributor_exec_i::rate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockDistributor_exec_i::rate ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->rate_;
@@ -225,8 +221,7 @@ namespace CIDL_StockDistributor_Impl
 
   void
   StockDistributor_exec_i::rate (
-  ::CORBA::Long rate
-  ACE_ENV_ARG_DECL_NOT_USED)
+  ::CORBA::Long rate)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->rate_ = rate;
@@ -235,7 +230,7 @@ namespace CIDL_StockDistributor_Impl
   // Port operations.
 
   ::Stock::CCM_StockQuoter_ptr
-  StockDistributor_exec_i::get_push_quoter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockDistributor_exec_i::get_push_quoter ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new StockQuoter_exec_i (*this);
@@ -261,25 +256,21 @@ namespace CIDL_StockDistributor_Impl
 
   void
   StockDistributor_exec_i::set_session_context (
-  ::Components::SessionContext_ptr ctx
-  ACE_ENV_ARG_DECL)
+  ::Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
   {
-    this->context_ = StockDistributor_Context::_narrow (ctx
-                                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->context_ = StockDistributor_Context::_narrow (ctx);
 
     if (this->context_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   }
 
   void
-  StockDistributor_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockDistributor_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -287,8 +278,7 @@ namespace CIDL_StockDistributor_Impl
   }
 
   void
-  StockDistributor_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockDistributor_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -296,8 +286,7 @@ namespace CIDL_StockDistributor_Impl
   }
 
   void
-  StockDistributor_exec_i::ccm_activate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockDistributor_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -307,8 +296,7 @@ namespace CIDL_StockDistributor_Impl
   }
 
   void
-  StockDistributor_exec_i::ccm_passivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockDistributor_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -318,8 +306,7 @@ namespace CIDL_StockDistributor_Impl
   }
 
   void
-  StockDistributor_exec_i::ccm_remove (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  StockDistributor_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -339,8 +326,7 @@ namespace CIDL_StockDistributor_Impl
   }
 
   ::Components::EnterpriseComponent_ptr
-  StockDistributorHome_exec_i::create (
-  ACE_ENV_SINGLE_ARG_DECL)
+  StockDistributorHome_exec_i::create ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -352,7 +338,6 @@ namespace CIDL_StockDistributor_Impl
     retval,
     StockDistributor_exec_i,
     CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
     return retval;
   }
 
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h
index 605179ab613..b890eb0365f 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h
@@ -52,8 +52,7 @@ namespace CIDL_StockDistributor_Impl
 
     virtual ::Stock::StockInfo *
     get_stock_info (
-    const char * stock_name
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    const char * stock_name)
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Stock::Invalid_Stock));
@@ -135,76 +134,65 @@ namespace CIDL_StockDistributor_Impl
     // Supported or inherited operations.
 
     virtual void
-    start (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    start ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
-    stop (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    stop ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Attribute operations.
 
     virtual ::CORBA::Long
-    rate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    rate ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
     rate (
-    ::CORBA::Long
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::CORBA::Long)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Port operations.
 
     virtual ::Stock::CCM_StockQuoter_ptr
-    get_push_quoter (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_push_quoter ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_activate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_remove (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
@@ -254,8 +242,7 @@ namespace CIDL_StockDistributor_Impl
     virtual ~StockDistributorHome_exec_i (void);
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
index 12b3d28ea98..fb92bb2ea66 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
@@ -22,15 +22,14 @@ MyImpl::BMClosedED_exec_i::~BMClosedED_exec_i ()
 // Operations from HUDisplay::BMClosedED
 
 BasicSP::CCM_ReadData_ptr
-MyImpl::BMClosedED_exec_i::get_dataout (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::get_dataout ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return BasicSP::CCM_ReadData::_duplicate (this);
 }
 
 void
-MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
-                                          ACE_ENV_ARG_DECL)
+MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -45,20 +44,18 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
 
   // Refresh position
   BasicSP::ReadData_var dat
-    = this->context_->get_connection_datain (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    = this->context_->get_connection_datain ();
 
   if (CORBA::is_nil (dat.in ()))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "BMClosedED - got nil from get_connection \n"));
 
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
     }
 
   CORBA::String_var str =
-    dat->get_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    dat->get_data ();
 
   if (CIAO::debug_level () > 0)
     {
@@ -76,15 +73,13 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *
   BasicSP::DataAvailable_var event =
     new OBV_BasicSP::DataAvailable;
 
-  this->context_->push_out_avail (event
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->context_->push_out_avail (event);
 }
 
 // Operations from HUDisplay::position
 
 char *
-MyImpl::BMClosedED_exec_i::get_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::get_data ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->str_.inout ());
@@ -94,7 +89,6 @@ MyImpl::BMClosedED_exec_i::get_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 MyImpl::BMClosedED_exec_i::set_session_context (
     Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -106,27 +100,24 @@ MyImpl::BMClosedED_exec_i::set_session_context (
     }
 
   this->context_ =
-    BasicSP::CCM_BMClosedED_Context::_narrow (ctx
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    BasicSP::CCM_BMClosedED_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
-MyImpl::BMClosedED_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::BMClosedED_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -139,15 +130,14 @@ MyImpl::BMClosedED_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::BMClosedED_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::BMClosedED_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -157,7 +147,7 @@ MyImpl::BMClosedED_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::BMClosedED_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMClosedED_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -181,7 +171,7 @@ MyImpl::BMClosedEDHome_exec_i::~BMClosedEDHome_exec_i ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::BMClosedEDHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::BMClosedEDHome_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h
index 8b233be31e5..c6f9c0ff1fe 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.h
@@ -41,50 +41,48 @@ namespace MyImpl
     // Operations from HUDisplay::BMClosedED
 
     virtual BasicSP::CCM_ReadData_ptr
-    get_dataout (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_dataout ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
-    push_in_avail (BasicSP::DataAvailable *ev
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    push_in_avail (BasicSP::DataAvailable *ev)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from HUDisplay::position
     virtual char *
-    get_data (ACE_ENV_SINGLE_ARG_DECL)
+    get_data ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
 
     virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   protected:
@@ -115,7 +113,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
index 089ea646f76..5f401e2de5d 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp
@@ -18,15 +18,14 @@ MyImpl::BMDevice_exec_i::~BMDevice_exec_i ()
 }
 
 BasicSP::CCM_ReadData_ptr
-MyImpl::BMDevice_exec_i::get_data_read (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDevice_exec_i::get_data_read ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return BasicSP::CCM_ReadData::_duplicate (this);
 }
 
 void
-MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *
-                                       ACE_ENV_ARG_DECL)
+MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Nitify others
@@ -38,98 +37,94 @@ MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *
                   "BMDevice, received a timeout from EC \n"));
     }
 
-  this->context_->push_data_available (event
-                                       ACE_ENV_ARG_PARAMETER);
+  this->context_->push_data_available (event);
 }
 
 char *
-MyImpl::BMDevice_exec_i::data_read (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDevice_exec_i::data_read ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->str_);
 }
 
 char *
-MyImpl::BMDevice_exec_i::get_data (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::BMDevice_exec_i::get_data ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->data_read (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->data_read ();
 }
 
 // Operations from Components::SessionComponent
 void
 MyImpl::BMDevice_exec_i::set_session_context (
     Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDevice_exec_i::set_session_context\n"));
     }
 
   this->context_ =
-    BasicSP::CCM_BMDevice_Context::_narrow (ctx
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    BasicSP::CCM_BMDevice_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
-MyImpl::BMDevice_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDevice_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::BMDevice_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDevice_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDevice_exec_i::ccm_activate\n"));
     }
-    
+
 }
 
 void
-MyImpl::BMDevice_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDevice_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::BMDevice_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDevice_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDevice_exec_i::ccm_passivate\n"));
     }
 }
 
 void
-MyImpl::BMDevice_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDevice_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDevice_exec_i::ccm_remove\n"));
     }
 }
@@ -149,7 +144,7 @@ MyImpl::BMDeviceHome_exec_i::~BMDeviceHome_exec_i ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::BMDeviceHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::BMDeviceHome_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h
index a33f82e5006..6ad460faee4 100644
--- a/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h
+++ b/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.h
@@ -39,54 +39,52 @@ namespace MyImpl
     // Operations from BasicSP::BMDevice
 
     virtual BasicSP::CCM_ReadData_ptr
-    get_data_read (ACE_ENV_SINGLE_ARG_DECL)
+    get_data_read ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
-    push_timeout (BasicSP::TimeOut *ev
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    push_timeout (BasicSP::TimeOut *ev)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from BasicSP::position
 
     virtual char *
-    data_read (ACE_ENV_SINGLE_ARG_DECL)
+    data_read ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual char *
-    get_data (ACE_ENV_SINGLE_ARG_DECL)
+    get_data ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
     virtual void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
 
     virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   protected:
@@ -117,7 +115,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
index f0fc61007d7..227c26b41a4 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp
@@ -18,7 +18,6 @@ MyImpl::BMDisplay_exec_impl::~BMDisplay_exec_impl ()
 void
 MyImpl::BMDisplay_exec_impl::push_data_ready (
     BasicSP::DataAvailable *ev
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -35,15 +34,13 @@ MyImpl::BMDisplay_exec_impl::push_data_ready (
 
   // Refresh position
   BasicSP::ReadData_var dat
-    = this->context_->get_connection_comp_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    = this->context_->get_connection_comp_data ();
 
   if (CORBA::is_nil (dat.in ()))
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw CORBA::BAD_INV_ORDER ();
 
   CORBA::String_var str =
-    dat->get_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    dat->get_data ();
 
   ACE_DEBUG ((LM_DEBUG,
               "BMDisplay - Display data is [%s] \n",
@@ -55,30 +52,26 @@ MyImpl::BMDisplay_exec_impl::push_data_ready (
 void
 MyImpl::BMDisplay_exec_impl::set_session_context (
     Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDisplay_exec_impl::set_session_context\n"));
     }
 
   this->context_ =
-    BasicSP::CCM_BMDisplay_Context::_narrow (ctx
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    BasicSP::CCM_BMDisplay_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
 MyImpl::BMDisplay_exec_impl::ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -86,13 +79,13 @@ MyImpl::BMDisplay_exec_impl::ciao_preactivate (
 }
 
 void
-MyImpl::BMDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDisplay_exec_impl::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDisplay_exec_impl::ccm_activate\n"));
     }
 
@@ -100,7 +93,6 @@ MyImpl::BMDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 MyImpl::BMDisplay_exec_impl::ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -109,26 +101,25 @@ MyImpl::BMDisplay_exec_impl::ciao_postactivate (
 
 void
 MyImpl::BMDisplay_exec_impl::ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDisplay_exec_impl::ccm_passivate\n"));
     }
 }
 
 void
-MyImpl::BMDisplay_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDisplay_exec_impl::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
   if (CIAO::debug_level () > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "MyImpl::BMDisplay_exec_impl::ccm_remove\n"));
     }
 }
@@ -148,7 +139,7 @@ MyImpl::BMDisplayHome_exec_impl::~BMDisplayHome_exec_impl ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::BMDisplayHome_exec_impl::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::BMDisplayHome_exec_impl::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h
index 95d5361b36b..4d1f1e9e1a0 100644
--- a/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h
+++ b/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.h
@@ -38,40 +38,38 @@ namespace MyImpl
     // Operations from BasicSP::BMDisplay
 
     virtual void
-    push_data_ready (BasicSP::DataAvailable *ev
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    push_data_ready (BasicSP::DataAvailable *ev)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   protected:
@@ -100,7 +98,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/BasicSP/EC/EC_exec.cpp b/CIAO/examples/BasicSP/EC/EC_exec.cpp
index e7de45b3b46..89a3a57edfd 100644
--- a/CIAO/examples/BasicSP/EC/EC_exec.cpp
+++ b/CIAO/examples/BasicSP/EC/EC_exec.cpp
@@ -135,15 +135,14 @@ MyImpl::EC_exec_i::~EC_exec_i ()
 }
 
 CORBA::Long
-MyImpl::EC_exec_i::hertz (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::EC_exec_i::hertz ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->hertz_;
 }
 
 void
-MyImpl::EC_exec_i::hertz (CORBA::Long hertz
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+MyImpl::EC_exec_i::hertz (CORBA::Long hertz)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->hertz_ = hertz;
@@ -152,29 +151,29 @@ MyImpl::EC_exec_i::hertz (CORBA::Long hertz
 // Operations from supported interface(s)
 
 void
-MyImpl::EC_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::EC_exec_i::start ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->hertz_ == 0 || this->pulser_.active())
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw CORBA::BAD_INV_ORDER ();
 
   // @@ Start the rate generator
   this->pulser_.start (this->hertz_);
 }
 
 void
-MyImpl::EC_exec_i::stop (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::EC_exec_i::stop ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (! this->pulser_.active ())
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw CORBA::BAD_INV_ORDER ();
 
   // @@ stop the rate generator
   this->pulser_.stop ();
 }
 
 CORBA::Boolean
-MyImpl::EC_exec_i::active (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::EC_exec_i::active ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->pulser_.active ();
@@ -183,8 +182,7 @@ MyImpl::EC_exec_i::active (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Operations from Components::SessionComponent
 
 void
-MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx
-                                        ACE_ENV_ARG_DECL)
+MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -192,25 +190,23 @@ MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx
     ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::set_session_context\n"));
 
   this->context_ =
-    BasicSP::CCM_EC_Context::_narrow (ctx
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    BasicSP::CCM_EC_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   // Urm, we actually discard exceptions thown from this operation.
 
 }
 
 void
-MyImpl::EC_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::EC_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::EC_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::EC_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -221,14 +217,14 @@ MyImpl::EC_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::EC_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::EC_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::EC_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::EC_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -238,7 +234,7 @@ MyImpl::EC_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::EC_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::EC_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -249,7 +245,7 @@ MyImpl::EC_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 MyImpl::EC_exec_i::pulse (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (CIAO::debug_level () > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -257,15 +253,12 @@ MyImpl::EC_exec_i::pulse (void)
 
       BasicSP::TimeOut_var ev = new OBV_BasicSP::TimeOut ();
 
-      this->context_->push_timeout (ev.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->context_->push_timeout (ev.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ do nothing?
     }
-  ACE_ENDTRY;
 
 }
 
@@ -278,15 +271,14 @@ MyImpl::ECHome_exec_i::~ECHome_exec_i ()
 }
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::ECHome_exec_i::new_EC (CORBA::Long hertz
-                               ACE_ENV_ARG_DECL_NOT_USED)
+MyImpl::ECHome_exec_i::new_EC (CORBA::Long hertz)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return new MyImpl::EC_exec_i (hertz);
 }
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::ECHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::ECHome_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/examples/BasicSP/EC/EC_exec.h b/CIAO/examples/BasicSP/EC/EC_exec.h
index db95a5deaa4..dfc68f19dce 100644
--- a/CIAO/examples/BasicSP/EC/EC_exec.h
+++ b/CIAO/examples/BasicSP/EC/EC_exec.h
@@ -90,49 +90,47 @@ namespace MyImpl
 
     // Attribute operations.
 
-    virtual CORBA::Long hertz (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long hertz ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void hertz (CORBA::Long hertz
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void hertz (CORBA::Long hertz)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from supported interface(s)
 
-    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void start ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void stop ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CORBA::Boolean active (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Boolean active ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -170,14 +168,13 @@ namespace MyImpl
     // Explicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    new_EC (CORBA::Long hertz
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    new_EC (CORBA::Long hertz)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/BasicSP/EC/client.cpp b/CIAO/examples/BasicSP/EC/client.cpp
index 2c2f34118bc..62354cbe814 100644
--- a/CIAO/examples/BasicSP/EC/client.cpp
+++ b/CIAO/examples/BasicSP/EC/client.cpp
@@ -18,60 +18,45 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""
-		                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       // Resolve HomeFinder interface
 
       CORBA::Object_var obj
-        = orb->string_to_object ("file://ec.ior" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->string_to_object ("file://ec.ior");
 
       BasicSP::ECHome_var home
-        = BasicSP::ECHome::_narrow (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = BasicSP::ECHome::_narrow (obj.in ());
 
       if (CORBA::is_nil (home.in ()))
         ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire ECHome objref\n"), -1);
 
       BasicSP::EC_var pulser
-        = home->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = home->create ();
 
       // Place to plug in the rate
-      pulser->hertz (5
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      pulser->hertz (5);
 
-      pulser->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      pulser->start ();
 
       ACE_OS::sleep (45);
 
-      pulser->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      pulser->stop ();
 
-      home->remove_component (pulser.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      home->remove_component (pulser.in ());
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Who is the culprit \n");
+      ex._tao_print_exception ("Who is the culprit \n");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Uncaught CORBA exception\n"),
                         1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/examples/BasicSP/EC/controller.cpp b/CIAO/examples/BasicSP/EC/controller.cpp
index 24cfc8bac83..13a5fd6d81e 100644
--- a/CIAO/examples/BasicSP/EC/controller.cpp
+++ b/CIAO/examples/BasicSP/EC/controller.cpp
@@ -72,14 +72,12 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
+      CORBA::ORB_var orb = CORBA::ORB_init (argc,
 		                                        argv,
-					                                  ""
-					                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+					                                  "");
 
       if (parse_args (argc, argv) != 0)
         {
@@ -87,57 +85,44 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->string_to_object (rategen_ior_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (rategen_ior_);
 
       BasicSP::EC_var pulser
-        = BasicSP::EC::_narrow (obj.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = BasicSP::EC::_narrow (obj.in ());
 
       if (CORBA::is_nil (pulser.in ()))
         {
-          ACE_ERROR_RETURN ((LM_ERROR, 
+          ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to acquire 'EC' objref\n"),
                             -1);
         }
 
-      pulser->hertz (rate
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      pulser->hertz (rate);
 
       if (turn_on)
         {
-          pulser->hertz (rate
-                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          pulser->hertz (rate);
 
           ACE_DEBUG ((LM_DEBUG, "Start up the Event services\n"));
 
-          pulser->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          pulser->start ();
         }
       else
         {
-          pulser->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          pulser->stop ();
 
           ACE_DEBUG ((LM_DEBUG, "Stop the ES\n"));
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Who is the culprit \n");
+      ex._tao_print_exception ("Who is the culprit \n");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Uncaught CORBA exception\n"),
                         1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/examples/BasicSP/README.html b/CIAO/examples/BasicSP/README.html
index 00c785c7c2f..9bd740215e1 100644
--- a/CIAO/examples/BasicSP/README.html
+++ b/CIAO/examples/BasicSP/README.html
@@ -38,8 +38,8 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with
 
   <LI> Generate the project/make files for the <em> BasicSP </em> example directory:
     <UL>
-    <LI> <em> linux: </em> <code> [in $CIAO_ROOT/DAnCE/examples/BasicSP] mwc.pl </code> </LI>
-    <LI> <em> windows: </em> <code> [in %CIAO_ROOT%/DAnCE/examples/BasicSP] mwc.pl -type vc71</code> </LI>
+    <LI> <em> linux: </em> <code> [in $CIAO_ROOT/examples/BasicSP] mwc.pl -type gnuace</code> </LI>
+    <LI> <em> windows: </em> <code> [in %CIAO_ROOT%/examples/BasicSP] mwc.pl -type vc71</code> </LI>
     </UL>
   </LI>
 
@@ -51,7 +51,7 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with
 
 <UL>
 
-  <LI> Change into the $CIAO_ROOT/DAnCE/examples/BasicSP/descriptors directory Start NodeManagers (NodeDameon) by running <code> basicNodeDaemon.pl </code>
+  <LI> Change into the $CIAO_ROOT/examples/BasicSP/descriptors directory Start NodeManagers (NodeDameon) by running <code> basicNodeDaemon.pl </code>
   
   <LI> Start the execution manager:
   <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat </code>
@@ -60,7 +60,7 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with
   <LI> Start the executor:
   <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattern_deploymentplan.cdp -k file://EM.ior </code>
   
-  <LI> After this, components should be deployed successfully. You can run the $CIAO_ROOT/DAnCE/examples/BasicSP/EC/controller to start the application.
+  <LI> After this, components should be deployed successfully. You can run the $CIAO_ROOT/examples/BasicSP/EC/controller to start the application.
        Please make sure that the component IOR file for the EC component is present when you run this client.
 
   <BR/>
diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl
new file mode 100755
index 00000000000..898e8bca092
--- /dev/null
+++ b/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -0,0 +1,175 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{'ACE_ROOT'}/bin";
+use PerlACE::Run_Test;
+
+$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
+$TAO_ROOT = "$ENV{'TAO_ROOT'}";
+$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE";
+$daemons_running = 0;
+$em_running = 0;
+$ns_running = 0;
+$daemons = 5;
+@ports = ( 10000, 20000, 30000, 40000, 50000 );
+@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior", "NodeApp3.ior", "NodeApp4.ior", "NodeApp5.ior" );
+$status = 0;
+$dat_file = "NodeManagerMap.dat";
+$cdp_file = "flattern_deploymentplan.cdp";
+$controller_exec = "$CIAO_ROOT/examples/BasicSP/EC/controller";
+
+$nsior = PerlACE::LocalFile ("ns.ior");
+
+unlink $nsior;
+
+$E = 0;
+$EM = 0;
+
+# Delete if there are any .ior files.
+sub delete_ior_files {
+    for ($i = 0; $i < $daemons; ++$i) {
+        unlink $iorfiles[$i];
+    }
+    unlink PerlACE::LocalFile ("EM.ior");
+    unlink PerlACE::LocalFile ("Receiver.ior");
+    unlink PerlACE::LocalFile ("Sender.ior");
+    unlink PerlACE::LocalFile ("DAM.ior");
+    unlink PerlACE::LocalFile ("ns.ior");
+}
+
+sub kill_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i) {
+    $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+  }
+}
+
+sub kill_open_processes {
+  if ($daemons_running == 1) {
+    kill_node_daemons ();
+  }
+
+  if ($em_running == 1) {
+    $EM->Kill ();
+    $EM->TimedWait (1);
+  }
+
+  if ($ns_running == 1) {
+    $NS->Kill ();
+    $NS->TimedWait (1);
+  }
+
+}
+
+# Invoke naming service
+
+$NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior");
+
+$NS->Spawn ();
+
+print STDERR "Starting Naming Service\n";
+
+if (PerlACE::waitforfile_timed ($nsior, 10) == -1)
+{
+    print STDERR "ERROR: cannot find naming service IOR file\n";
+    $NS->Kill ();
+    exit 1;
+}
+
+$ns_running = 1;
+
+# Set up NamingService environment
+$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+
+
+sub run_node_daemons {
+  for ($i = 0; $i < $daemons; ++$i)
+  {
+      $iorfile = $iorfiles[$i];
+      $port = $ports[$i];
+
+      $iiop = "iiop://localhost:$port";
+      $node_app = "$DAnCE/NodeApplication/NodeApplication";
+
+      $d_cmd = "$DAnCE/NodeManager/NodeManager";
+      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30";
+
+      $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
+      $result = $Daemons[$i]->Spawn ();
+      push(@processes, $Daemons[$i]);
+
+      if (PerlACE::waitforfile_timed ($iorfile,
+                          $PerlACE::wait_interval_for_process_creation) == -1) {
+          print STDERR
+            "ERROR: The ior file of node daemon $i could not be found\n";
+          for (; $i >= 0; --$i) {
+            $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
+          }
+          return -1;
+      }
+  }
+  return 0;
+}
+
+delete_ior_files ();
+
+# Invoke node daemons.
+print "Invoking node daemons\n";
+$status = run_node_daemons ();
+
+if ($status != 0) {
+  print STDERR "ERROR: Unable to execute the node daemons\n";
+  kill_open_processes ();
+  exit 1;
+}
+
+$daemons_running = 1;
+
+# Invoke execution manager.
+print "Invoking execution manager\n";
+$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
+                            "-o EM.ior -i $dat_file");
+$EM->Spawn ();
+
+if (PerlACE::waitforfile_timed ("EM.ior",
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR
+      "ERROR: The ior file of execution manager could not be found\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$em_running = 1;
+
+sleep (10);
+
+# Invoke executor - start the application -.
+print "Invoking executor - start the application -\n";
+$E =
+  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+                        "-p flattened_deploymentplan.cdp -k file://EM.ior");
+
+$E->SpawnWaitKill (60);
+
+sleep (10);
+
+print "Invoking the controller\n";
+$controller = new PerlACE::Process ("$controller_exec", "");
+$result = $controller->SpawnWaitKill (3000);
+
+if ($result != 0) {
+    print STDERR "ERROR: The controller returned $result\n";
+    $status = 1;
+}
+
+# Invoke executor - stop the application -.
+print "Invoking executor - stop the application -\n";
+$E =
+  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
+                        "-p flattern_deploymentplan.cdp -k file://EM.ior");
+$E->SpawnWaitKill (3000);
+
+sleep (99999999999);
diff --git a/CIAO/examples/Display/GPS/GPS_exec.cpp b/CIAO/examples/Display/GPS/GPS_exec.cpp
index e19fb3aa7a6..f86e6226bad 100644
--- a/CIAO/examples/Display/GPS/GPS_exec.cpp
+++ b/CIAO/examples/Display/GPS/GPS_exec.cpp
@@ -9,14 +9,14 @@
 
 // Operations from HUDisplay::position
 CORBA::Long
-MyImpl::Position_Impl::posx (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::Position_Impl::posx ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return component_.posx();
 }
 
 CORBA::Long
-MyImpl::Position_Impl::posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::Position_Impl::posy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return component_.posy();
@@ -38,7 +38,7 @@ MyImpl::GPS_exec_i::~GPS_exec_i ()
 
 // Operations from HUDisplay::GPS
   HUDisplay::CCM_position_ptr
-  MyImpl::GPS_exec_i::get_MyLocation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  MyImpl::GPS_exec_i::get_MyLocation ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
 //     ACE_DEBUG ((LM_DEBUG,
@@ -47,8 +47,7 @@ MyImpl::GPS_exec_i::~GPS_exec_i ()
   }
 
 void
-MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *
-                                  ACE_ENV_ARG_DECL)
+MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 //   ACE_DEBUG ((LM_DEBUG,
@@ -61,19 +60,18 @@ MyImpl::GPS_exec_i::push_Refresh (HUDisplay::tick *
   // Nitify others
   HUDisplay::tick_var event = new OBV_HUDisplay::tick;
 
-  this->context_->push_Ready (event
-                              ACE_ENV_ARG_PARAMETER);
+  this->context_->push_Ready (event);
 }
 
 CORBA::Long
-MyImpl::GPS_exec_i::posx (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::posx ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positionx_;
 }
 
 CORBA::Long
-MyImpl::GPS_exec_i::posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::posy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positiony_;
@@ -82,8 +80,7 @@ MyImpl::GPS_exec_i::posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Operations from Components::SessionComponent
 void
-MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx
-                                         ACE_ENV_ARG_DECL)
+MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -91,24 +88,22 @@ MyImpl::GPS_exec_i::set_session_context (Components::SessionContext_ptr ctx
     ACE_DEBUG ((LM_DEBUG, "MyImpl::GPS_exec_i::set_session_context\n"));
 
   this->context_ =
-    HUDisplay::CCM_GPS_Context::_narrow (ctx
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    HUDisplay::CCM_GPS_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
-MyImpl::GPS_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::GPS_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -117,14 +112,14 @@ MyImpl::GPS_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::GPS_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::GPS_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -133,7 +128,7 @@ MyImpl::GPS_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::GPS_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -156,7 +151,7 @@ MyImpl::GPSHome_exec_i::~GPSHome_exec_i ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::GPSHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPSHome_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/examples/Display/GPS/GPS_exec.h b/CIAO/examples/Display/GPS/GPS_exec.h
index 079176b7ce9..d4b8a0b777e 100644
--- a/CIAO/examples/Display/GPS/GPS_exec.h
+++ b/CIAO/examples/Display/GPS/GPS_exec.h
@@ -34,47 +34,46 @@ namespace MyImpl
 
     /// Default destructor.
     ~GPS_exec_i ();
-    
+
     // Operations from HUDisplay::GPS
-    HUDisplay::CCM_position_ptr get_MyLocation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    HUDisplay::CCM_position_ptr get_MyLocation ()
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    void push_Refresh (HUDisplay::tick * ACE_ENV_ARG_DECL)
+
+    void push_Refresh (HUDisplay::tick *)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from HUDisplay::position
-    CORBA::Long posx (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    CORBA::Long posx ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    CORBA::Long posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    CORBA::Long posy ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-    void set_session_context (Components::SessionContext_ptr ctx
-			      ACE_ENV_ARG_DECL)
+    void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
 		       Components::CCMException));
 
-    void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
 		       Components::CCMException));
 
-    void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
 		       Components::CCMException));
 
-    void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
 		       Components::CCMException));
 
-    void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
 		       Components::CCMException));
 
-    void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
 		       Components::CCMException));
-	
+
    protected:
     // Component specific context
     HUDisplay::CCM_GPS_Context_var context_;
@@ -96,18 +95,18 @@ namespace MyImpl
   public:
     /// Default ctor.
     GPSHome_exec_i ();
-    
+
     /// Default dtor.
     ~GPSHome_exec_i ();
 
     // Explicit home operations
 /*     virtual ::Components::EnterpriseComponent_ptr */
-/*       new_GPS (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) */
+/*       new_GPS () */
 /*       ACE_THROW_SPEC ((CORBA::SystemException)); */
 
     // Implicit home operations
     virtual ::Components::EnterpriseComponent_ptr
-      create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
 		       Components::CCMException));
   };
@@ -123,10 +122,10 @@ namespace MyImpl
     }
 
     // Operations from HUDisplay::position
-    CORBA::Long posx (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    CORBA::Long posx ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    CORBA::Long posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    CORBA::Long posy ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp b/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp
index e9374a8fc54..98b52c9ac74 100644
--- a/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp
+++ b/CIAO/examples/Display/GPS/GPS_tracing_exec.cpp
@@ -24,15 +24,14 @@ MyImpl::GPS_tracing_exec_i::~GPS_tracing_exec_i ()
 // Operations from HUDisplay::GPS
 
 HUDisplay::CCM_position_ptr
-MyImpl::GPS_tracing_exec_i::get_MyLocation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_tracing_exec_i::get_MyLocation ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return HUDisplay::CCM_position::_duplicate (this);
 }
 
 void
-MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick *
-                                          ACE_ENV_ARG_DECL)
+MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Refresh position
@@ -47,21 +46,20 @@ MyImpl::GPS_tracing_exec_i::push_Refresh (HUDisplay::tick *
   // Nitify others
   HUDisplay::tick_var event = new OBV_HUDisplay::tick;
 
-  this->context_->push_Ready (event
-                              ACE_ENV_ARG_PARAMETER);
+  this->context_->push_Ready (event);
 }
 
 // Operations from HUDisplay::position
 
 CORBA::Long
-MyImpl::GPS_tracing_exec_i::posx (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_tracing_exec_i::posx ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positionx_;
 }
 
 CORBA::Long
-MyImpl::GPS_tracing_exec_i::posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_tracing_exec_i::posy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->positiony_;
@@ -70,8 +68,7 @@ MyImpl::GPS_tracing_exec_i::posy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Operations from Components::SessionComponent
 void
 MyImpl::GPS_tracing_exec_i::set_session_context (
-    Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL)
+    Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -80,24 +77,22 @@ MyImpl::GPS_tracing_exec_i::set_session_context (
                 "MyImpl::GPS_tracing_exec_i::set_session_context\n"));
 
   this->context_ =
-    HUDisplay::CCM_GPS_Context::_narrow (ctx
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    HUDisplay::CCM_GPS_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
-MyImpl::GPS_tracing_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_tracing_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::GPS_tracing_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_tracing_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -106,14 +101,14 @@ MyImpl::GPS_tracing_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::GPS_tracing_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_tracing_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::GPS_tracing_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_tracing_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -122,7 +117,7 @@ MyImpl::GPS_tracing_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::GPS_tracing_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPS_tracing_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -145,7 +140,7 @@ MyImpl::GPSHome_tracing_exec_i::~GPSHome_tracing_exec_i ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::GPSHome_tracing_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::GPSHome_tracing_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/examples/Display/GPS/GPS_tracing_exec.h b/CIAO/examples/Display/GPS/GPS_tracing_exec.h
index a9c71da3d2a..c6b67a34767 100644
--- a/CIAO/examples/Display/GPS/GPS_tracing_exec.h
+++ b/CIAO/examples/Display/GPS/GPS_tracing_exec.h
@@ -36,54 +36,52 @@ namespace MyImpl
     // Operations from HUDisplay::GPS
 
     virtual HUDisplay::CCM_position_ptr
-    get_MyLocation (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_MyLocation ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
-    push_Refresh (HUDisplay::tick *ev
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    push_Refresh (HUDisplay::tick *ev)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from HUDisplay::position
 
     virtual CORBA::Long
-    posx (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    posx ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual CORBA::Long
-    posy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    posy ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   protected:
@@ -120,7 +118,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
index e1fb5af0e48..06d1d8c213b 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.cpp
@@ -16,8 +16,7 @@ MyImpl::NavDisplay_exec_impl::~NavDisplay_exec_impl ()
 // Operations from HUDisplay::NavDisplay
 
 void
-MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev
-                                            ACE_ENV_ARG_DECL)
+MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ev);
@@ -27,19 +26,16 @@ MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev
 
   // Refresh position
   HUDisplay::position_var loc =
-    this->context_->get_connection_GPSLocation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->context_->get_connection_GPSLocation ();
 
   if (CORBA::is_nil (loc.in ()))
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
     }
 
-  CORBA::Long x = loc->posx (ACE_ENV_SINGLE_ARG_PARAMETER) % 500;
-  ACE_CHECK;
+  CORBA::Long x = loc->posx () % 500;
 
-  CORBA::Long y = loc->posy (ACE_ENV_SINGLE_ARG_PARAMETER) % 300;
-  ACE_CHECK;
+  CORBA::Long y = loc->posy () % 300;
 
   ACE_DEBUG ((LM_DEBUG, "NAVDISPLAY: Current Location is: (%d, %d)\n",
               x,
@@ -50,7 +46,6 @@ MyImpl::NavDisplay_exec_impl::push_Refresh (HUDisplay::tick *ev
 void
 MyImpl::NavDisplay_exec_impl::set_session_context (
     Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -62,20 +57,17 @@ MyImpl::NavDisplay_exec_impl::set_session_context (
     }
 
   this->context_ =
-    HUDisplay::CCM_NavDisplay_Context::_narrow (ctx
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    HUDisplay::CCM_NavDisplay_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
 MyImpl::NavDisplay_exec_impl::ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -83,7 +75,7 @@ MyImpl::NavDisplay_exec_impl::ciao_preactivate (
 }
 
 void
-MyImpl::NavDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplay_exec_impl::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -96,7 +88,6 @@ MyImpl::NavDisplay_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 MyImpl::NavDisplay_exec_impl::ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -104,7 +95,7 @@ MyImpl::NavDisplay_exec_impl::ciao_postactivate (
 }
 
 void
-MyImpl::NavDisplay_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplay_exec_impl::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -116,7 +107,7 @@ MyImpl::NavDisplay_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::NavDisplay_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplay_exec_impl::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -142,7 +133,7 @@ MyImpl::NavDisplayHome_exec_impl::~NavDisplayHome_exec_impl ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::NavDisplayHome_exec_impl::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplayHome_exec_impl::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h
index f85477fd126..3c5ca68d40d 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay_exec.h
@@ -37,39 +37,37 @@ namespace MyImpl
     // Operations from HUDisplay::NavDisplay
 
     virtual void
-    push_Refresh (HUDisplay::tick *ev
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    push_Refresh (HUDisplay::tick *ev)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
     virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   protected:
@@ -98,7 +96,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
index 224e0cac41b..32a4ebea140 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp
@@ -34,22 +34,18 @@ MyImpl::NavDisplayGUI_exec_impl::~NavDisplayGUI_exec_impl ()
 
 void
 MyImpl::NavDisplayGUI_exec_impl::push_Refresh (
-    HUDisplay::tick * /* ev */
-    ACE_ENV_ARG_DECL)
+    HUDisplay::tick * /* ev */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "ENTER: MyImpl::NavDisplayGUI_exec_impl::push_Refresh()\n"));
 
   // Refresh position
   HUDisplay::position_var loc =
-    this->context_->get_connection_GPSLocation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->context_->get_connection_GPSLocation ();
 
-  CORBA::Long lx = loc->posx (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Long lx = loc->posx ();
 
-  CORBA::Long ly = loc->posy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Long ly = loc->posy ();
 
   mutex_.acquire();
 
@@ -76,8 +72,7 @@ MyImpl::NavDisplayGUI_exec_impl::push_Refresh (
 
 // Operations from Components::SessionComponent
 void
-MyImpl::NavDisplayGUI_exec_impl::set_session_context (Components::SessionContext_ptr ctx
-                                            ACE_ENV_ARG_DECL)
+MyImpl::NavDisplayGUI_exec_impl::set_session_context (Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -85,24 +80,22 @@ MyImpl::NavDisplayGUI_exec_impl::set_session_context (Components::SessionContext
     ACE_DEBUG ((LM_DEBUG, "MyImpl::NavDisplayGUI_exec_impl::set_session_context\n"));
 
   this->context_ =
-    HUDisplay::CCM_NavDisplay_Context::_narrow (ctx
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    HUDisplay::CCM_NavDisplay_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
-MyImpl::NavDisplayGUI_exec_impl::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplayGUI_exec_impl::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::NavDisplayGUI_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::NavDisplayGUI_exec_impl::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -115,7 +108,7 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
   {
     ACE_DEBUG((LM_ERROR,
                "Cannot activate client threads\n"));
-    ACE_THROW(Components::CCMException());
+    throw Components::CCMException();
   }
 
   worker_->waitUntillInitialized();
@@ -131,14 +124,14 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-MyImpl::NavDisplayGUI_exec_impl::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplayGUI_exec_impl::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::NavDisplayGUI_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplayGUI_exec_impl::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -158,7 +151,7 @@ MyImpl::NavDisplayGUI_exec_impl::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 }
 
 void
-MyImpl::NavDisplayGUI_exec_impl::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplayGUI_exec_impl::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -187,7 +180,7 @@ MyImpl::NavDisplayGUIHome_exec_impl::~NavDisplayGUIHome_exec_impl ()
 // Implicit home operations.
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::NavDisplayGUIHome_exec_impl::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::NavDisplayGUIHome_exec_impl::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
index b2528ba62b7..e41de4c68d9 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h
@@ -42,40 +42,38 @@ namespace MyImpl
     // Operations from HUDisplay::NavDisplay
 
     virtual void
-    push_Refresh (HUDisplay::tick *ev
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    push_Refresh (HUDisplay::tick *ev)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
-    set_session_context (Components::SessionContext_ptr ctx
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual void
-    ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   protected:
@@ -108,7 +106,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.cpp b/CIAO/examples/Display/RateGen/RateGen_exec.cpp
index a5a27833490..a03c7bc3acc 100644
--- a/CIAO/examples/Display/RateGen/RateGen_exec.cpp
+++ b/CIAO/examples/Display/RateGen/RateGen_exec.cpp
@@ -146,15 +146,14 @@ MyImpl::RateGen_exec_i::~RateGen_exec_i ()
 }
 
 CORBA::Long
-MyImpl::RateGen_exec_i::hertz (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RateGen_exec_i::hertz ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->hertz_;
 }
 
 void
-MyImpl::RateGen_exec_i::hertz (CORBA::Long hertz
-                               ACE_ENV_ARG_DECL_NOT_USED)
+MyImpl::RateGen_exec_i::hertz (CORBA::Long hertz)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->hertz_ = hertz;
@@ -163,12 +162,12 @@ MyImpl::RateGen_exec_i::hertz (CORBA::Long hertz
 // Operations from supported interface(s)
 
 void
-MyImpl::RateGen_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::RateGen_exec_i::start ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->hertz_ == 0 || this->pulser_.active())
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
     }
 
   // @@ Start the rate generator
@@ -176,12 +175,12 @@ MyImpl::RateGen_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-MyImpl::RateGen_exec_i::stop (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::RateGen_exec_i::stop ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (! this->pulser_.active ())
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
     }
 
   // @@ stop the rate generator
@@ -189,7 +188,7 @@ MyImpl::RateGen_exec_i::stop (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-MyImpl::RateGen_exec_i::active (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RateGen_exec_i::active ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->pulser_.active ();
@@ -200,7 +199,6 @@ MyImpl::RateGen_exec_i::active (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 MyImpl::RateGen_exec_i::set_session_context (
     Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
@@ -212,27 +210,25 @@ MyImpl::RateGen_exec_i::set_session_context (
     }
 
   this->context_ =
-    HUDisplay::CCM_RateGen_Context::_narrow (ctx
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    HUDisplay::CCM_RateGen_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   // Urm, we actually discard exceptions thown from this operation.
 
 }
 
 void
-MyImpl::RateGen_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RateGen_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::RateGen_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RateGen_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -246,14 +242,14 @@ MyImpl::RateGen_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::RateGen_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RateGen_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::RateGen_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RateGen_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -267,7 +263,7 @@ MyImpl::RateGen_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::RateGen_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RateGen_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -281,7 +277,7 @@ MyImpl::RateGen_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 MyImpl::RateGen_exec_i::pulse (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 //       if (CIAO::debug_level () > 0)
 //         {
@@ -291,15 +287,12 @@ MyImpl::RateGen_exec_i::pulse (void)
 
       HUDisplay::tick_var ev = new OBV_HUDisplay::tick ();
 
-      this->context_->push_Pulse (ev.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->context_->push_Pulse (ev.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ do nothing?
     }
-  ACE_ENDTRY;
 
 }
 
@@ -312,21 +305,19 @@ MyImpl::RateGenHome_exec_i::~RateGenHome_exec_i ()
 }
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::RateGenHome_exec_i::new_RateGen (CORBA::Long /* hertz */
-                                         ACE_ENV_ARG_DECL)
+MyImpl::RateGenHome_exec_i::new_RateGen (CORBA::Long /* hertz */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Components::EnterpriseComponent_ptr tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     MyImpl::RateGen_exec_i,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tmp);
 
   return tmp;
 }
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::RateGenHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RateGenHome_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/examples/Display/RateGen/RateGen_exec.h b/CIAO/examples/Display/RateGen/RateGen_exec.h
index b6b8031c3bf..68c54c180c0 100644
--- a/CIAO/examples/Display/RateGen/RateGen_exec.h
+++ b/CIAO/examples/Display/RateGen/RateGen_exec.h
@@ -89,48 +89,46 @@ namespace MyImpl
 
     // Attribute operations.
 
-    virtual CORBA::Long hertz (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long hertz ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void hertz (CORBA::Long hertz
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void hertz (CORBA::Long hertz)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from supported interface(s)
 
-    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void start ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void stop ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual CORBA::Boolean active (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Boolean active ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -168,14 +166,13 @@ namespace MyImpl
     // Explicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    new_RateGen (CORBA::Long hertz
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    new_RateGen (CORBA::Long hertz)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/Display/RateGen/controller.cpp b/CIAO/examples/Display/RateGen/controller.cpp
index e9cbfe7dd22..fdb5838382d 100644
--- a/CIAO/examples/Display/RateGen/controller.cpp
+++ b/CIAO/examples/Display/RateGen/controller.cpp
@@ -69,15 +69,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       if (parse_args (argc, argv) != 0)
         {
@@ -85,14 +83,10 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->string_to_object (rategen_ior_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (rategen_ior_);
 
       HUDisplay::RateGen_var pulser =
-        HUDisplay::RateGen::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        HUDisplay::RateGen::_narrow (obj.in ());
 
       if (CORBA::is_nil (pulser.in ()))
         {
@@ -103,34 +97,27 @@ main (int argc, char *argv[])
 
       if (turn_on)
         {
-          pulser->hertz (rate
-                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          pulser->hertz (rate);
 
           ACE_DEBUG ((LM_DEBUG, "Start up the Rate Generator\n"));
 
-          pulser->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          pulser->start ();
         }
       else
         {
-          pulser->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          pulser->stop ();
 
           ACE_DEBUG ((LM_DEBUG, "Rate Generator stopped\n"));
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Who is the culprit \n");
+      ex._tao_print_exception ("Who is the culprit \n");
       cerr << "Uncaught CORBA exception" << endl;
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
index a956032fb67..f8e55decc14 100644
--- a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
+++ b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
@@ -19,26 +19,23 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::push_click_in (Hello::TimeOut * ev
-                                  ACE_ENV_ARG_DECL)
+  Receiver_exec_i::push_click_in (Hello::TimeOut * ev)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     //Get the message from the Sender first.
     ACE_DEBUG ((LM_DEBUG,
-                "Receiver - Informed by the Sender with message [%s]\n", 
+                "Receiver - Informed by the Sender with message [%s]\n",
                 ev->data ()));
 
     Hello::ReadMessage_var rev
-      = this->context_->get_connection_read_message 
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      = this->context_->get_connection_read_message
+        ();
 
     if (CORBA::is_nil (rev.in ()))
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
 
     CORBA::String_var str =
-      rev->get_message (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      rev->get_message ();
 
     ACE_DEBUG ((LM_DEBUG,
                 "Receiver - Got message from the server [%s] \n",
@@ -47,24 +44,21 @@ namespace CIDL_Receiver_Impl
 
   // Operations from Components::SessionComponen
   void
-  Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx
-                                        ACE_ENV_ARG_DECL)
+  Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_session_context\n"));
 
     this->context_ =
-      Receiver_Exec_Context::_narrow (ctx
-                                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      Receiver_Exec_Context::_narrow (ctx);
 
     if (CORBA::is_nil (this->context_.in ()))
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
   }
 
   void
-  Receiver_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ciao_preactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
@@ -73,7 +67,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_activate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
@@ -81,7 +75,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ciao_postactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
@@ -90,7 +84,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_passivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
@@ -98,7 +92,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_remove ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
@@ -115,7 +109,7 @@ namespace CIDL_Receiver_Impl
   }
 
   ::Components::EnterpriseComponent_ptr
-  ReceiverHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
+  ReceiverHome_exec_i::create ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.h b/CIAO/examples/Hello/Receiver/Receiver_exec.h
index b43c2350814..1322eb8d1a2 100644
--- a/CIAO/examples/Hello/Receiver/Receiver_exec.h
+++ b/CIAO/examples/Hello/Receiver/Receiver_exec.h
@@ -37,34 +37,32 @@ namespace CIDL_Receiver_Impl
 
     // Operation which will be called upon receiving the timeout event.
     virtual void
-    push_click_in (Hello::TimeOut *ev
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    push_click_in (Hello::TimeOut *ev)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -94,7 +92,7 @@ namespace CIDL_Receiver_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/Hello/Sender/Sender_exec.cpp b/CIAO/examples/Hello/Sender/Sender_exec.cpp
index 8dbe0feb377..ad4a4143b8d 100644
--- a/CIAO/examples/Hello/Sender/Sender_exec.cpp
+++ b/CIAO/examples/Hello/Sender/Sender_exec.cpp
@@ -5,7 +5,7 @@
 namespace CIDL_Sender_Impl
 {
   char*
-  Message_Impl::get_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Message_Impl::get_message ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender sending out message: [%s]\n", component_.message_.in ()));
@@ -17,23 +17,21 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::local_message (const char * local_message
-                                ACE_ENV_ARG_DECL_NOT_USED)
+  Sender_exec_i::local_message (const char * local_message)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     message_ = CORBA::string_dup (local_message);
   }
 
   char *
-  Sender_exec_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::local_message ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (message_.in ());
   }
 
   void
-  Sender_exec_i::hertz (CORBA::Long hertz
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  Sender_exec_i::hertz (CORBA::Long hertz)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->hertz_ = hertz;
@@ -41,15 +39,14 @@ namespace CIDL_Sender_Impl
   }
 
   CORBA::Long
-  Sender_exec_i::hertz (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::hertz ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->hertz_;
   }
 
   ::Hello::COLOR_SELECTION
-  Sender_exec_i::color (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::color ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
@@ -58,15 +55,14 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::color (
-  ::Hello::COLOR_SELECTION color
-  ACE_ENV_ARG_DECL_NOT_USED)
+  ::Hello::COLOR_SELECTION color)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->color_ = color;
   }
 
   Hello::CCM_ReadMessage_ptr
-  Sender_exec_i::get_push_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::get_push_message ()
         ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
@@ -75,14 +71,13 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
+  Sender_exec_i::start ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     event->data ("ACE/TAO/CIAO");
     ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n"));
-    this->context_->push_click_out (event.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->context_->push_click_out (event.in ());
 
     ACE_DEBUG ((LM_DEBUG, "My current color is:"));
 
@@ -111,26 +106,23 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL)
+  Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_session_context\n"));
 
     this->context_ =
-          Sender_Exec_Context::_narrow (ctx
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+          Sender_Exec_Context::_narrow (ctx);
 
     if (CORBA::is_nil (this->context_.in ()))
       {
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
   }
 
   void
-  Sender_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ciao_preactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -139,7 +131,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_activate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -148,7 +140,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ciao_postactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -157,7 +149,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_passivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -165,7 +157,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_remove ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -181,7 +173,7 @@ namespace CIDL_Sender_Impl
   }
 
   ::Components::EnterpriseComponent_ptr
-  SenderHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  SenderHome_exec_i::create ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
diff --git a/CIAO/examples/Hello/Sender/Sender_exec.h b/CIAO/examples/Hello/Sender/Sender_exec.h
index 043973c0826..23949e7c80d 100644
--- a/CIAO/examples/Hello/Sender/Sender_exec.h
+++ b/CIAO/examples/Hello/Sender/Sender_exec.h
@@ -46,21 +46,19 @@ namespace CIDL_Sender_Impl
     virtual ~Sender_exec_i ();
 
     /// Operation to set the value of the attribute "local_message"
-    virtual void local_message (const char * local_message
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void local_message (const char * local_message)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Operation to get the value of the attribute "local_message"
-    virtual char * local_message (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * local_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Operation to set the value of the attribute "hertz"
-    virtual void hertz (CORBA::Long hertz
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void hertz (CORBA::Long hertz)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Operation to get the value of the attribute "hertz"
-    virtual CORBA::Long hertz (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long hertz ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /* Operations for obtaining the interface reference. */
@@ -70,45 +68,43 @@ namespace CIDL_Sender_Impl
      */
     // Note: You can specify the return type as ::Hello::CCM_message *
     virtual Hello::CCM_ReadMessage_ptr
-    get_push_message (ACE_ENV_SINGLE_ARG_DECL)
+    get_push_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Hello::COLOR_SELECTION
-    color (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    color ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void
-    color (::Hello::COLOR_SELECTION
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    color (::Hello::COLOR_SELECTION)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operation inside of the trigger interface.
-    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void start ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -122,7 +118,7 @@ namespace CIDL_Sender_Impl
     CORBA::Long hertz_;
 
     ::Hello::COLOR_SELECTION color_;
-    
+
     friend class Message_Impl;
   };
 
@@ -140,7 +136,7 @@ namespace CIDL_Sender_Impl
     }
 
     virtual char *
-    get_message (ACE_ENV_SINGLE_ARG_DECL)
+    get_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -166,7 +162,7 @@ namespace CIDL_Sender_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp
index 0edc7faf471..6fa219abfba 100644
--- a/CIAO/examples/Hello/Sender/starter.cpp
+++ b/CIAO/examples/Hello/Sender/starter.cpp
@@ -48,13 +48,11 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       if (parse_args (argc, argv) != 0)
         {
@@ -62,13 +60,9 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
-      Hello::Sender_var sender = Hello::Sender::_narrow (obj.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Hello::Sender_var sender = Hello::Sender::_narrow (obj.in ());
 
       if (CORBA::is_nil (sender.in ()))
         {
@@ -82,19 +76,15 @@ main (int argc, char *argv[])
         sender->local_message (message);
       }
 
-      sender->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->start ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unknown exception \n");
+      ex._tao_print_exception ("Unknown exception \n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/examples/Null_Component/Null_Component_exec.cpp b/CIAO/examples/Null_Component/Null_Component_exec.cpp
index e52ce558dde..c48ebb2ea0b 100644
--- a/CIAO/examples/Null_Component/Null_Component_exec.cpp
+++ b/CIAO/examples/Null_Component/Null_Component_exec.cpp
@@ -38,8 +38,7 @@ namespace CIDL_Null_Component_Impl
   // Operations from ::Null_Interface
 
   void
-  Null_Interface_exec_i::null_operation (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Null_Interface_exec_i::null_operation ()
   ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     // Your code here.
@@ -64,8 +63,7 @@ namespace CIDL_Null_Component_Impl
   // Port operations.
 
   ::CCM_Null_Interface_ptr
-  Null_Component_exec_i::get_null_facet (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Null_Component_exec_i::get_null_facet ()
   ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     // Your code here.
@@ -76,26 +74,22 @@ namespace CIDL_Null_Component_Impl
 
   void
   Null_Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL)
+    ::Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC (( ::CORBA::SystemException,
                    ::Components::CCMException))
   {
     this->context_ =
       Null_Component_Context::_narrow (
-        ctx
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        ctx);
 
     if (this->context_ == 0)
     {
-      ACE_THROW ( ::CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
   }
 
   void
-  Null_Component_exec_i::ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Null_Component_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC (( ::CORBA::SystemException,
                    ::Components::CCMException))
   {
@@ -103,8 +97,7 @@ namespace CIDL_Null_Component_Impl
   }
 
   void
-  Null_Component_exec_i::ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Null_Component_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC (( ::CORBA::SystemException,
                    ::Components::CCMException))
   {
@@ -112,8 +105,7 @@ namespace CIDL_Null_Component_Impl
   }
 
   void
-  Null_Component_exec_i::ccm_activate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Null_Component_exec_i::ccm_activate ()
   ACE_THROW_SPEC (( ::CORBA::SystemException,
                    ::Components::CCMException))
   {
@@ -121,8 +113,7 @@ namespace CIDL_Null_Component_Impl
   }
 
   void
-  Null_Component_exec_i::ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Null_Component_exec_i::ccm_passivate ()
   ACE_THROW_SPEC (( ::CORBA::SystemException,
                    ::Components::CCMException))
   {
@@ -130,8 +121,7 @@ namespace CIDL_Null_Component_Impl
   }
 
   void
-  Null_Component_exec_i::ccm_remove (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Null_Component_exec_i::ccm_remove ()
   ACE_THROW_SPEC (( ::CORBA::SystemException,
                    ::Components::CCMException))
   {
@@ -161,8 +151,7 @@ namespace CIDL_Null_Component_Impl
   // Implicit operations.
 
   ::Components::EnterpriseComponent_ptr
-  Null_Component_Home_exec_i::create (
-    ACE_ENV_SINGLE_ARG_DECL)
+  Null_Component_Home_exec_i::create ()
   ACE_THROW_SPEC (( ::CORBA::SystemException,
                    ::Components::CCMException))
   {
@@ -173,7 +162,6 @@ namespace CIDL_Null_Component_Impl
       retval,
       Null_Component_exec_i,
       ::CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
     return retval;
   }
diff --git a/CIAO/examples/Null_Component/Null_Component_exec.h b/CIAO/examples/Null_Component/Null_Component_exec.h
index 4bfa913e20d..22026431a93 100644
--- a/CIAO/examples/Null_Component/Null_Component_exec.h
+++ b/CIAO/examples/Null_Component/Null_Component_exec.h
@@ -45,8 +45,7 @@ namespace CIDL_Null_Component_Impl
     // Operations from ::Null_Interface
 
     virtual void
-    null_operation (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    null_operation ()
     ACE_THROW_SPEC (( ::CORBA::SystemException));
   };
 
@@ -65,51 +64,44 @@ namespace CIDL_Null_Component_Impl
     // Port operations.
 
     virtual ::CCM_Null_Interface_ptr
-    get_null_facet (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    get_null_facet ()
     ACE_THROW_SPEC (( ::CORBA::SystemException));
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-      ::Components::SessionContext_ptr ctx
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ::Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ciao_preactivate (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ciao_postactivate (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ccm_activate (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ccm_passivate (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
 
     virtual void
-    ccm_remove (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
@@ -137,8 +129,7 @@ namespace CIDL_Null_Component_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
     ACE_THROW_SPEC ((
                       ::CORBA::SystemException,
                       ::Components::CCMException));
diff --git a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
index 985173e5720..4f50720ec1e 100644
--- a/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
+++ b/CIAO/examples/Null_Component/StaticDAnCEApp.cpp
@@ -22,22 +22,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       // Get reference to Root POA.
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       // Activate POA manager
       PortableServer::POAManager_var mgr
-        = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       int homes_table_size =
         sizeof (homes_table)/sizeof(HomeAttributes);
@@ -75,13 +69,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       static_node_manager_impl->init ();
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       if (CORBA::is_nil (adapter.in ()))
           ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
@@ -90,28 +81,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         static_node_manager_impl->_this ();
 
       CORBA::String_var str =
-        orb->object_to_string (manager.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (manager.in ());
 
       adapter->bind ("NodeManager",
-                     str.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     str.in ());
 
       // Run the main event loop for the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   catch (CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+      ex._tao_print_exception ("Caught CORBA Exception: ");
       return -1;
     }
 
diff --git a/CIAO/examples/Null_Component/plan.h b/CIAO/examples/Null_Component/plan.h
index 300e43b9f80..fce247dc321 100644
--- a/CIAO/examples/Null_Component/plan.h
+++ b/CIAO/examples/Null_Component/plan.h
@@ -4,8 +4,7 @@ extern "C" ::Components::HomeExecutorBase_ptr create_Null_Component_Home_Impl (v
 extern "C" ::PortableServer::Servant create_Null_Component_Home_Servant
 		(::Components::HomeExecutorBase_ptr p,
 		::CIAO::Session_Container *c,
-		const char*
-		ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+		const char*);
 
 struct HomeAttributes
 {
diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp b/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
index e4f4691c9b1..cf63cc2140c 100644
--- a/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
+++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.cpp
@@ -19,14 +19,14 @@ namespace CIDL_Receiver_Impl
   }
 
   ::Components::EnterpriseComponent_ptr
-  ReceiverSwap_exec_i::incarnate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ReceiverSwap_exec_i::incarnate ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new Receiver_exec_i;
   }
 
   ::Components::EnterpriseComponent_ptr
-  ReceiverSwap_exec_i::etherealize (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ReceiverSwap_exec_i::etherealize ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return new Receiver_exec_i;
@@ -41,8 +41,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::push_click_in (Hello::TimeOut *
-                                  ACE_ENV_ARG_DECL)
+  Receiver_exec_i::push_click_in (Hello::TimeOut *)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     //Get the message from the Sender first.
@@ -50,18 +49,16 @@ namespace CIDL_Receiver_Impl
                 "Receiver - Informed by the Sender \n"));
 
     Hello::ReadMessage_var rev
-      = this->context_->get_connection_read_message 
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      = this->context_->get_connection_read_message
+        ();
 
     if (CORBA::is_nil (rev.in ()))
       {
-        ACE_THROW (CORBA::BAD_INV_ORDER ());
+        throw CORBA::BAD_INV_ORDER ();
       }
 
     CORBA::String_var str =
-      rev->get_message (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      rev->get_message ();
 
     ACE_DEBUG ((LM_DEBUG,
                 "Receiver - Got message from the server [%s] \n",
@@ -70,26 +67,23 @@ namespace CIDL_Receiver_Impl
 
   // Operations from Components::SessionComponen
   void
-  Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx
-                                        ACE_ENV_ARG_DECL)
+  Receiver_exec_i::set_session_context (Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_session_context\n"));
 
     this->context_ =
-      Receiver_Exec_Context::_narrow (ctx
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      Receiver_Exec_Context::_narrow (ctx);
 
     if (CORBA::is_nil (this->context_.in ()))
       {
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
   }
 
   void
-  Receiver_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ciao_preactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -98,7 +92,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_activate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -106,7 +100,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ciao_postactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -115,27 +109,22 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_passivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_passivate\n"));
     /*
     CORBA::Object_var comp_object =
-      this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->context_->get_CCM_object ();
 
-    Hello::Receiver_var receiver = Hello::Receiver::_narrow (comp_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-                                                      ACE_CHECK;
+    Hello::Receiver_var receiver = Hello::Receiver::_narrow (comp_object.in ());
 
     ::Components::ConsumerDescriptions_var cons_desc =
-      receiver->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      receiver->get_all_consumers ();
 
     ::Components::FacetDescriptions_var facet_desc =
-      receiver->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      receiver->get_all_facets ();
 
     CORBA::ULong cons_len = cons_desc->length ();
     CORBA::ULong facet_len = facet_desc->length ();
@@ -151,7 +140,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_remove ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -168,22 +157,22 @@ namespace CIDL_Receiver_Impl
   }
 
   ::Components::EnterpriseComponent_ptr
-  ReceiverHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
+  ReceiverHome_exec_i::create ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
     Components::EnterpriseComponent_ptr tmp;
-      
+
     ACE_NEW_THROW_EX (tmp,
                       ReceiverSwap_exec_i,
                       CORBA::NO_MEMORY ());
-   
-    /* 
+
+    /*
     ACE_NEW_THROW_EX (tmp,
                       Receiver_exec_i,
                       CORBA::NO_MEMORY ());
     */
-   
+
     return tmp;
   }
 
diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/CIAO/examples/Swapping/Receiver/Receiver_exec.h
index df6a6eee581..d04a4092d0a 100644
--- a/CIAO/examples/Swapping/Receiver/Receiver_exec.h
+++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.h
@@ -34,11 +34,11 @@ namespace CIDL_Receiver_Impl
     ~ReceiverSwap_exec_i ();
 
     virtual ::Components::EnterpriseComponent_ptr
-    incarnate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    incarnate ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::EnterpriseComponent_ptr
-    etherealize (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    etherealize ()
       ACE_THROW_SPEC ((CORBA::SystemException));
   };
 
@@ -56,34 +56,32 @@ namespace CIDL_Receiver_Impl
 
     // Operation which will be called upon receiving the timeout event.
     virtual void
-    push_click_in (Hello::TimeOut *ev
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    push_click_in (Hello::TimeOut *ev)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -113,7 +111,7 @@ namespace CIDL_Receiver_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.cpp b/CIAO/examples/Swapping/Sender/Sender_exec.cpp
index 46160906631..1f0cba9a91d 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec.cpp
+++ b/CIAO/examples/Swapping/Sender/Sender_exec.cpp
@@ -10,7 +10,7 @@ const char* second_exe_entrypt = "createSenderExec_Impl";
 namespace CIDL_Sender_Impl
 {
   char*
-  Message_Impl::get_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Message_Impl::get_message ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender sending out message. \n"));
@@ -22,22 +22,21 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::local_message (const char * local_message
-                                ACE_ENV_ARG_DECL_NOT_USED)
+  Sender_exec_i::local_message (const char * local_message)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     message_ = CORBA::string_dup (local_message);
   }
 
   char *
-  Sender_exec_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::local_message ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup(message_. in());
   }
 
   Hello::CCM_ReadMessage_ptr
-  Sender_exec_i::get_push_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::get_push_message ()
         ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
@@ -46,36 +45,32 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
+  Sender_exec_i::start ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     ACE_DEBUG ((LM_DEBUG, "Sender initiates the process.\n"));
-    this->context_->push_click_out (event ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->context_->push_click_out (event);
   }
 
   void
-  Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL)
+  Sender_exec_i::set_session_context (Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_session_context\n"));
 
     this->context_ =
-          Sender_Exec_Context::_narrow (ctx
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+          Sender_Exec_Context::_narrow (ctx);
 
     if (CORBA::is_nil (this->context_.in ()))
       {
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
   }
 
   void
-  Sender_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ciao_preactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -84,7 +79,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_activate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -93,7 +88,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ciao_postactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -102,7 +97,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_passivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -110,7 +105,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_remove ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -136,7 +131,7 @@ namespace CIDL_Sender_Impl
   }
 
   ::Components::EnterpriseComponent_ptr
-  SenderSwap_exec_i::incarnate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  SenderSwap_exec_i::incarnate ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ExecFactory first_exec_creator = 0;
@@ -198,14 +193,14 @@ namespace CIDL_Sender_Impl
   }
 
   ::Components::EnterpriseComponent_ptr
-  SenderSwap_exec_i::etherealize (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  SenderSwap_exec_i::etherealize ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return 0;
   }
 
   ::Components::EnterpriseComponent_ptr
-  SenderHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  SenderHome_exec_i::create ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.h b/CIAO/examples/Swapping/Sender/Sender_exec.h
index 75530bd25fc..add761ed988 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec.h
+++ b/CIAO/examples/Swapping/Sender/Sender_exec.h
@@ -41,12 +41,11 @@ namespace CIDL_Sender_Impl
     virtual ~Sender_exec_i ();
 
     /// Operation to set the value of the attribute
-    virtual void local_message (const char * local_message
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void local_message (const char * local_message)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Operation to get the value of the attribute
-    virtual char * local_message (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * local_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /* Operations for obtaining the interface reference. */
@@ -56,37 +55,36 @@ namespace CIDL_Sender_Impl
      */
     // Note: You can specify the return type as ::Hello::CCM_message *
     virtual Hello::CCM_ReadMessage_ptr
-    get_push_message (ACE_ENV_SINGLE_ARG_DECL)
+    get_push_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     // Operation inside of the trigger interface.
-    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void start ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -114,7 +112,7 @@ namespace CIDL_Sender_Impl
     }
 
     virtual char *
-    get_message (ACE_ENV_SINGLE_ARG_DECL)
+    get_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -142,11 +140,11 @@ namespace CIDL_Sender_Impl
     ~SenderSwap_exec_i ();
 
     virtual ::Components::EnterpriseComponent_ptr
-    incarnate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    incarnate ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Components::EnterpriseComponent_ptr
-    etherealize (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    etherealize ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void  consumers (::Components::ConsumerDescriptions *p)
@@ -179,7 +177,7 @@ namespace CIDL_Sender_Impl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp b/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
index e2e976424a7..f98e5390df3 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.cpp
@@ -7,7 +7,7 @@
 namespace CIDL_Sender_Impl
 {
   char*
-  Message_Impl_1::get_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Message_Impl_1::get_message ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender 1 sending out message. \n"));
@@ -19,22 +19,21 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_1_i::local_message (const char * local_message
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+  Sender_exec_1_i::local_message (const char * local_message)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     message_ = CORBA::string_dup (local_message);
   }
 
   char *
-  Sender_exec_1_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_1_i::local_message ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup(message_.in ());
   }
 
   Hello::CCM_ReadMessage_ptr
-  Sender_exec_1_i::get_push_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_1_i::get_push_message ()
         ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
@@ -43,36 +42,32 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_1_i::start (ACE_ENV_SINGLE_ARG_DECL)
+  Sender_exec_1_i::start ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     ACE_DEBUG ((LM_DEBUG, "Sender 1 initiates the process.\n"));
-    this->context_->push_click_out (event ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->context_->push_click_out (event);
   }
 
   void
-  Sender_exec_1_i::set_session_context (Components::SessionContext_ptr ctx
-                                        ACE_ENV_ARG_DECL)
+  Sender_exec_1_i::set_session_context (Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_1_i::set_session_context\n"));
 
     this->context_ =
-          Sender_Exec_Context::_narrow (ctx
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+          Sender_Exec_Context::_narrow (ctx);
 
     if (CORBA::is_nil (this->context_.in ()))
       {
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
   }
 
   void
-  Sender_exec_1_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_1_i::ciao_preactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -81,7 +76,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_1_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
+  Sender_exec_1_i::ccm_activate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -89,12 +84,11 @@ namespace CIDL_Sender_Impl
                 "Sender_exec_1_i::ccm_activate\n"));
 
     CORBA::Object_var o =
-      this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->context_->get_CCM_object ();
   }
 
   void
-  Sender_exec_1_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_1_i::ciao_postactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
@@ -103,46 +97,36 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_1_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL)
+  Sender_exec_1_i::ccm_passivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_1_i::ccm_passivate\n"));
 
     Components::ConsumerDescriptions_var retval =
-      this->context_->get_registered_consumers ("click_out"
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->context_->get_registered_consumers ("click_out");
 
     this->base_exec_->consumers (retval._retn ());
 
     CORBA::Object_var o =
-      this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->context_->get_CCM_object ();
 
     Hello::Sender_var sender =
-      Hello::Sender::_narrow (o.in ()
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      Hello::Sender::_narrow (o.in ());
 
     Components::FacetDescriptions_var facets =
-        sender->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        sender->get_all_facets ();
 
     const CORBA::ULong facet_len = facets->length ();
       CORBA::ULong i = 0;
 
       for (i = 0; i < facet_len; ++i)
       {
-        this->context_->remove_facet (facets[i]->facet_ref ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        this->context_->remove_facet (facets[i]->facet_ref ());
         /*
-        this->context_->update_port_activator (oid ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        this->context_->update_port_activator (oid);
 
-        this->context_->deactivate_facet (oid ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        this->context_->deactivate_facet (oid);
         */
       }
 
@@ -153,7 +137,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_1_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_1_i::ccm_remove ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CCMException))
   {
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.h b/CIAO/examples/Swapping/Sender/Sender_exec_1.h
index 00b6db2e4b0..352ea6ec1b4 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_1.h
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.h
@@ -41,12 +41,11 @@ namespace CIDL_Sender_Impl
     virtual ~Sender_exec_1_i ();
 
     /// Operation to set the value of the attribute
-    virtual void local_message (const char * local_message
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void local_message (const char * local_message)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Operation to get the value of the attribute
-    virtual char * local_message (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * local_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /* Operations for obtaining the interface reference. */
@@ -56,37 +55,36 @@ namespace CIDL_Sender_Impl
      */
     // Note: You can specify the return type as ::Hello::CCM_message *
     virtual Hello::CCM_ReadMessage_ptr
-    get_push_message (ACE_ENV_SINGLE_ARG_DECL)
+    get_push_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     // Operation inside of the trigger interface.
-    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void start ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -118,7 +116,7 @@ namespace CIDL_Sender_Impl
     }
 
     virtual char *
-    get_message (ACE_ENV_SINGLE_ARG_DECL)
+    get_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp b/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
index a4c8fe46308..6b273012098 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.cpp
@@ -6,7 +6,7 @@
 namespace CIDL_Sender_Impl
 {
   char*
-  Message_Impl_2::get_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Message_Impl_2::get_message ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender 2 sending out message. \n"));
@@ -18,22 +18,21 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_2_i::local_message (const char * local_message
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+  Sender_exec_2_i::local_message (const char * local_message)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     message_ = CORBA::string_dup (local_message);
   }
 
   char *
-  Sender_exec_2_i::local_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_2_i::local_message ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup(message_.in ());
   }
 
   Hello::CCM_ReadMessage_ptr
-  Sender_exec_2_i::get_push_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_2_i::get_push_message ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
@@ -42,36 +41,32 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_2_i::start (ACE_ENV_SINGLE_ARG_DECL)
+  Sender_exec_2_i::start ()
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     ACE_DEBUG ((LM_DEBUG, "Sender 2 initiates the process.\n"));
-    this->context_->push_click_out (event ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->context_->push_click_out (event);
   }
 
   void
-  Sender_exec_2_i::set_session_context (Components::SessionContext_ptr ctx
-                                        ACE_ENV_ARG_DECL)
+  Sender_exec_2_i::set_session_context (Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
     ACE_DEBUG ((LM_DEBUG, "Sender_exec_2_i::set_session_context\n"));
 
     this->context_ =
-          Sender_Exec_Context::_narrow (ctx
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+          Sender_Exec_Context::_narrow (ctx);
 
     if (CORBA::is_nil (this->context_.in ()))
       {
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
   }
 
   void
-  Sender_exec_2_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_2_i::ciao_preactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
@@ -80,7 +75,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_2_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL)
+  Sender_exec_2_i::ccm_activate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
@@ -92,29 +87,24 @@ namespace CIDL_Sender_Impl
 
     if (CORBA::is_nil (this->context_.in ()))
       {
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
 
     CORBA::Object_var o =
-      this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->context_->get_CCM_object ();
 
     Hello::Sender_var sender =
-      Hello::Sender::_narrow (o.in ()
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      Hello::Sender::_narrow (o.in ());
 
     for (CORBA::ULong cnt = 0; cnt != c->length (); ++cnt)
       {
         sender->subscribe ("click_out",
-                           (*c)[cnt]->consumer ()
-                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                           (*c)[cnt]->consumer ());
       }
   }
 
   void
-  Sender_exec_2_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_2_i::ciao_postactivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
@@ -123,7 +113,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_2_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_2_i::ccm_passivate ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
@@ -131,7 +121,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_2_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_2_i::ccm_remove ()
     ACE_THROW_SPEC ((CORBA::SystemException,
                     Components::CCMException))
   {
diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.h b/CIAO/examples/Swapping/Sender/Sender_exec_2.h
index d12bd4594ee..9b548cf6626 100644
--- a/CIAO/examples/Swapping/Sender/Sender_exec_2.h
+++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.h
@@ -43,12 +43,11 @@ namespace CIDL_Sender_Impl
     virtual ~Sender_exec_2_i ();
 
     /// Operation to set the value of the attribute
-    virtual void local_message (const char * local_message
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void local_message (const char * local_message)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Operation to get the value of the attribute
-    virtual char * local_message (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * local_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /* Operations for obtaining the interface reference. */
@@ -58,37 +57,36 @@ namespace CIDL_Sender_Impl
      */
     // Note: You can specify the return type as ::Hello::CCM_message *
     virtual Hello::CCM_ReadMessage_ptr
-    get_push_message (ACE_ENV_SINGLE_ARG_DECL)
+    get_push_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     // Operation inside of the trigger interface.
-    virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void start ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -119,7 +117,7 @@ namespace CIDL_Sender_Impl
     }
 
     virtual char *
-    get_message (ACE_ENV_SINGLE_ARG_DECL)
+    get_message ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/CIAO/examples/Swapping/Sender/starter.cpp b/CIAO/examples/Swapping/Sender/starter.cpp
index c88771ea568..92718744cd5 100644
--- a/CIAO/examples/Swapping/Sender/starter.cpp
+++ b/CIAO/examples/Swapping/Sender/starter.cpp
@@ -13,7 +13,7 @@ parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "k:m");
   int c = 0;
-  
+
   while ((c = get_opts ()) != -1)
     {
       switch (c)
@@ -43,20 +43,18 @@ parse_args (int argc, char *argv[])
     {
       ior = "file://sender.ior";
     }
-    
+
   return 0;
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       if (parse_args (argc, argv) != 0)
         {
@@ -64,17 +62,13 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
-      Hello::Sender_var sender = Hello::Sender::_narrow (obj.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Hello::Sender_var sender = Hello::Sender::_narrow (obj.in ());
 
       if (CORBA::is_nil (sender.in ()))
         {
-          ACE_ERROR_RETURN ((LM_ERROR, 
+          ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to acquire Sender's objref\n"),
                             -1);
         }
@@ -84,25 +78,20 @@ main (int argc, char *argv[])
       return_message = sender->local_message ();
       ACE_DEBUG ((LM_DEBUG, "the message is %s\n", return_message));
 
-      sender->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->start ();
       sender->remove ();
 
       ACE_DEBUG ((LM_DEBUG, "creating one more servant here\n"));
-      sender->start (ACE_ENV_SINGLE_ARG_PARAMETER);
+      sender->start ();
       //sender->remove ();
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unknown exception \n");
+      ex._tao_print_exception ("Unknown exception \n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/performance-tests/Benchmark/LatencyTest.cpp b/CIAO/performance-tests/Benchmark/LatencyTest.cpp
index c6cc07e58e9..443506298bb 100644
--- a/CIAO/performance-tests/Benchmark/LatencyTest.cpp
+++ b/CIAO/performance-tests/Benchmark/LatencyTest.cpp
@@ -10,16 +10,15 @@ LatencyTest::LatencyTest (CORBA::ORB_ptr orb)
 
 
 CORBA::Long
-LatencyTest::makeCall (CORBA::Long send_time
-                       ACE_ENV_ARG_DECL_NOT_USED)
+LatencyTest::makeCall (CORBA::Long send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-LatencyTest::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+LatencyTest::shutdown ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/CIAO/performance-tests/Benchmark/LatencyTest.h b/CIAO/performance-tests/Benchmark/LatencyTest.h
index b4b73b1ae84..7bd3de194bf 100644
--- a/CIAO/performance-tests/Benchmark/LatencyTest.h
+++ b/CIAO/performance-tests/Benchmark/LatencyTest.h
@@ -17,11 +17,10 @@ class LatencyTest
   LatencyTest (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Long makeCall (CORBA::Long send_time
-                                ACE_ENV_ARG_DECL)
+  virtual CORBA::Long makeCall (CORBA::Long send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
index 7eba8595527..92bf6aecd2d 100644
--- a/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
+++ b/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
@@ -27,32 +27,26 @@ const char *ior4 = "file://comp4.ior";
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       // Resolve HomeFinder interface
       CORBA::Object_var obj1
-        = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->string_to_object (ior1);
 
       CORBA::Object_var obj2
-        = orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->string_to_object (ior2);
 
       CORBA::Object_var obj3
-        = orb->string_to_object (ior3 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->string_to_object (ior3);
 
       CORBA::Object_var obj4
-        = orb->string_to_object (ior4 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->string_to_object (ior4);
 
       if (CORBA::is_nil (obj1.in ()) ||
           CORBA::is_nil (obj2.in ()) ||
@@ -67,19 +61,15 @@ main (int argc, char *argv[])
       //Narrow to appropriate interfaces
       Benchmark::RoundTripClient_var client1=
         Benchmark::RoundTripClient::_narrow (obj1.in());
-      ACE_TRY_CHECK;
 
       Benchmark::RoundTripClient_var client2=
         Benchmark::RoundTripClient::_narrow (obj1.in());
-      ACE_TRY_CHECK;
 
       Benchmark::RoundTripClient_var client3=
         Benchmark::RoundTripClient::_narrow (obj1.in());
-      ACE_TRY_CHECK;
 
       Benchmark::RoundTripClient_var client4=
         Benchmark::RoundTripClient::_narrow (obj1.in());
-      ACE_TRY_CHECK;
 
       //Create Tasks
       Client_Task task1(client1.in());
@@ -94,11 +84,10 @@ main (int argc, char *argv[])
 
       task1.thr_mgr()->wait();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception Caught:");
+      ex._tao_print_exception ("Exception Caught:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
index 44a486b0154..07dd8d48095 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.cpp
@@ -46,7 +46,7 @@ MyImpl::RoundTrip_exec_i::~RoundTrip_exec_i ()
 }
 
 ::Benchmark::CCM_LatencyTest *
-MyImpl::RoundTrip_exec_i::get_latency (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTrip_exec_i::get_latency ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Benchmark::CCM_LatencyTest::_duplicate (this);
@@ -54,8 +54,7 @@ MyImpl::RoundTrip_exec_i::get_latency (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 /* Main method that invokes the octet_sequence */
 CORBA::Long
-MyImpl::RoundTrip_exec_i::makeCall (CORBA::Long data
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+MyImpl::RoundTrip_exec_i::makeCall (CORBA::Long data)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return data * data * data;
@@ -64,8 +63,7 @@ MyImpl::RoundTrip_exec_i::makeCall (CORBA::Long data
 // Operations from Components::SessionComponent
 void
 MyImpl::RoundTrip_exec_i::set_session_context (
-    Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL)
+    Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -74,24 +72,22 @@ MyImpl::RoundTrip_exec_i::set_session_context (
   //cout << "MyImpl::RoundTrip_exec_i::set_session_context\n" << endl;
 
   this->context_ =
-    Benchmark::CCM_RoundTrip_Context::_narrow (ctx
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    Benchmark::CCM_RoundTrip_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   // Urm, we actually discard exceptions thown from this operation.
 }
 
 void
-MyImpl::RoundTrip_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTrip_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::RoundTrip_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTrip_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -104,7 +100,7 @@ MyImpl::RoundTrip_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::RoundTrip_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTrip_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -112,7 +108,7 @@ MyImpl::RoundTrip_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::RoundTrip_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTrip_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -121,7 +117,7 @@ MyImpl::RoundTrip_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::RoundTrip_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTrip_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -139,7 +135,7 @@ MyImpl::RoundTripHome_exec_i::~RoundTripHome_exec_i ()
 }
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::RoundTripHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTripHome_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h
index c53971b4132..e2262581bd7 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip_exec.h
@@ -40,37 +40,35 @@ namespace MyImpl
     RoundTrip_exec_i ();
 
     /// Operation to test the data
-    virtual CORBA::Long makeCall (CORBA::Long data
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long makeCall (CORBA::Long data)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::Benchmark::CCM_LatencyTest*
-                        get_latency (ACE_ENV_SINGLE_ARG_DECL)
+                        get_latency ()
                 ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate  (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_postactivate  ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
@@ -104,7 +102,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 08bd7c111d9..9de1cb46a2d 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -85,7 +85,7 @@ set_priority ()
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       //set priority on the platform
       set_priority();
@@ -93,9 +93,7 @@ main (int argc, char *argv[])
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       if (parse_args(argc, argv) == -1)
         {
@@ -105,20 +103,16 @@ main (int argc, char *argv[])
 
       // Resolve HomeFinder interface
       CORBA::Object_var obj
-        = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->string_to_object (ior);
 
       Benchmark::RoundTripHome_var home
-        = Benchmark::RoundTripHome::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = Benchmark::RoundTripHome::_narrow (obj.in ());
 
       if (CORBA::is_nil (home.in ()))
         ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire TestHome objref\n"), -1);
 
       Benchmark::RoundTrip_var test
-        = home->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = home->create ();
 
       //Get the RoundTrip reference
       Benchmark::LatencyTest_var round_trip = test->provide_latency ();
@@ -127,8 +121,7 @@ main (int argc, char *argv[])
       long start = 0L;
       for (int j = 0; j < 100; ++j)
         {
-          round_trip->makeCall (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          round_trip->makeCall (start);
         }
 
       ///// Start Test ////////////////////////////////////////////
@@ -142,8 +135,7 @@ main (int argc, char *argv[])
           //Test value to be sent to the server
           long test = 0;
 
-          (void) round_trip->makeCall (test ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) round_trip->makeCall (test);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -171,13 +163,12 @@ main (int argc, char *argv[])
                                              stats.samples_count ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception Handled:");
+      ex._tao_print_exception ("Exception Handled:");
       return 1;
     }
 
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
index 59b75fec8a6..ab8ede89b50 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp
@@ -23,8 +23,7 @@ MyImpl::RoundTripClient_exec_i::~RoundTripClient_exec_i ()
 // Operations from Components::SessionComponent
 void
 MyImpl::RoundTripClient_exec_i::set_session_context (
-    Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL)
+    Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -36,26 +35,24 @@ MyImpl::RoundTripClient_exec_i::set_session_context (
   //scheduling strategy to real-time scheduling
 
   this->context_ =
-    Benchmark::CCM_RoundTripClient_Context::_narrow (ctx
-						     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    Benchmark::CCM_RoundTripClient_Context::_narrow (ctx);
 
   if (CORBA::is_nil (this->context_.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   // Urm, we actually discard exceptions thrown from this operation.
 }
 
 //Start the collocated test here
 void
-MyImpl::RoundTripClient_exec_i::ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTripClient_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::RoundTripClient_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTripClient_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -64,22 +61,21 @@ MyImpl::RoundTripClient_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-MyImpl::RoundTripClient_exec_i::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTripClient_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
 }
 
 void
-MyImpl::RoundTripClient_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
+MyImpl::RoundTripClient_exec_i::start ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ///////////// Start test /////////////////////////////////////////
 
   // Let's try to start tests from here...
   Benchmark::LatencyTest_var lt =
-    context_->get_connection_latency (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    context_->get_connection_latency ();
 
   if (CIAO::debug_level () > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -104,8 +100,7 @@ MyImpl::RoundTripClient_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
       //Test value to be sent to the server
       long test = 0;
 
-      (void) lt->makeCall (test ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) lt->makeCall (test);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -136,8 +131,7 @@ MyImpl::RoundTripClient_exec_i::start (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 ::Benchmark::CCM_Controller_ptr
-MyImpl::RoundTripClient_exec_i::get_controller (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTripClient_exec_i::get_controller ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Benchmark::CCM_Controller::_duplicate (this);
@@ -145,8 +139,7 @@ MyImpl::RoundTripClient_exec_i::get_controller (
 
 
 void
-MyImpl::RoundTripClient_exec_i::ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTripClient_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -155,7 +148,7 @@ MyImpl::RoundTripClient_exec_i::ccm_passivate (
 }
 
 void
-MyImpl::RoundTripClient_exec_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTripClient_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
@@ -173,7 +166,7 @@ MyImpl::RoundTripClientHome_exec_i::~RoundTripClientHome_exec_i ()
 }
 
 ::Components::EnterpriseComponent_ptr
-MyImpl::RoundTripClientHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyImpl::RoundTripClientHome_exec_i::create ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Components::CCMException))
 {
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h
index a5b22ff36e3..127684294f4 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h
@@ -40,36 +40,35 @@ namespace MyImpl
     ~RoundTripClient_exec_i ();
 
     // Operations from Components::SessionComponent
-    virtual void set_session_context (Components::SessionContext_ptr ctx
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void set_session_context (Components::SessionContext_ptr ctx)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_preactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_preactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_activate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ciao_postactivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_passivate ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
-    virtual void ccm_remove (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void ccm_remove ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
 
     virtual ::Benchmark::CCM_Controller_ptr
-                        get_controller (ACE_ENV_SINGLE_ARG_DECL)
+                        get_controller ()
                 ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void start (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void start ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -98,7 +97,7 @@ namespace MyImpl
     // Implicit home operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
   };
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
index 2df894b41c1..23b58d9cece 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
@@ -20,20 +20,17 @@ const char *ior = "file://test.ior";
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       // Resolve HomeFinder interface
       CORBA::Object_var obj
-        = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->string_to_object (ior);
       Benchmark::RoundTripClient_var test =
 	      Benchmark::RoundTripClient::_narrow(obj.in());
       //Get the RoundTrip reference
@@ -43,13 +40,12 @@ main (int argc, char *argv[])
       trigger->start();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception Handled:");
+      ex._tao_print_exception ("Exception Handled:");
       return 1;
     }
 
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
index 98858e62f5b..a1e3ed4f588 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.cpp
@@ -11,8 +11,7 @@ LatencyTest_Impl::LatencyTest_Impl (CORBA::ORB_ptr orb)
 
 
 CORBA::Long
-LatencyTest_Impl::makeCall (CORBA::Long send_time
-                            ACE_ENV_ARG_DECL_NOT_USED)
+LatencyTest_Impl::makeCall (CORBA::Long send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CIAO::debug_level () > 0)
@@ -22,8 +21,8 @@ LatencyTest_Impl::makeCall (CORBA::Long send_time
 }
 
 void
-LatencyTest_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+LatencyTest_Impl::shutdown ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h
index ec1878db753..9a13823eefe 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/LatencyTest.h
@@ -22,11 +22,10 @@ public:
   LatencyTest_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Long makeCall (CORBA::Long send_time
-			 ACE_ENV_ARG_DECL)
+  virtual CORBA::Long makeCall (CORBA::Long send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
index c6f2f81ae0c..7259a966207 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 #include "LatencyTest.h"
 #include "ace/Sched_Params.h"
@@ -33,15 +33,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -49,12 +47,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       LatencyTest_Impl *roundtrip_impl;
       ACE_NEW_RETURN (roundtrip_impl,
@@ -63,12 +59,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Benchmark::LatencyTest_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -82,26 +76,21 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "%s", ior.in ()));
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/performance-tests/Benchmark/server.cpp b/CIAO/performance-tests/Benchmark/server.cpp
index 345610c1eb2..c7f39d42809 100644
--- a/CIAO/performance-tests/Benchmark/server.cpp
+++ b/CIAO/performance-tests/Benchmark/server.cpp
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 #include "LatencyTest.h"
 
@@ -34,15 +34,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -50,12 +48,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       LatencyTest *roundtrip_impl;
       ACE_NEW_RETURN (roundtrip_impl,
@@ -65,36 +61,29 @@ main (int argc, char *argv[])
 
       //Get the RoundTrip reference
       Benchmark::LatencyTest_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       ACE_DEBUG ((LM_DEBUG, "%s", ior.in ()));
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
index 4e51b2b0e0d..005b183df40 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
@@ -94,7 +94,6 @@ CORBA::ULong
 Impl::TSEC_Session_impl::hash
 (
   CORBA::ULong Maximum
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   CORBA::ULong hash =
@@ -111,7 +110,6 @@ Impl::TSEC_Session_impl::hash
 CORBA::Long
 Impl::TSEC_Session_impl::getIdent
 (
-  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( ( CORBA::SystemException ) )
 {
   //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), -1 );
@@ -127,7 +125,6 @@ Impl::TSEC_Session_impl::getIdent
 CORBA::Boolean
 Impl::TSEC_Session_impl::isInUse
 (
-  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( ( CORBA::SystemException ) )
 {
   //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), FALSE );
@@ -186,10 +183,9 @@ CORBA::Object_ptr
 Impl::TSEC_CheckPoint_exec_i::getObjRef
 (
   PortableServer::Servant Servant
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( (CORBA::SystemException ) )
 {
-  return this->_p_sessionContainer->get_objref( Servant ACE_ENV_ARG_PARAMETER );
+  return this->_p_sessionContainer->get_objref( Servant );
 }
 
 
@@ -208,7 +204,7 @@ Impl::TSEC_CheckPoint_exec_i::init
 
   CORBA::ORB_var orb = CORBA::ORB_init( argc,
                                         const_cast<char **> (argv)
-                                        ACE_ENV_ARG_PARAMETER );
+ );
   _orb               = CORBA::ORB::_duplicate( orb.in () );
 
   return 0;
@@ -223,13 +219,12 @@ CORBA::Object_ptr
 Impl::TSEC_CheckPoint_exec_i::installServant
 (
   PortableServer::Servant Servant
-  ACE_ENV_ARG_DECL
 ) ACE_THROW_SPEC( ( CORBA::SystemException ) )
 {
   assert( this->_p_sessionContainer );
 
   return this->_p_sessionContainer->install_servant( Servant,
-                             CIAO::Container::Component ACE_ENV_ARG_PARAMETER );
+                             CIAO::Container::Component );
 }
 
 
@@ -241,7 +236,6 @@ void
 Impl::TSEC_CheckPoint_exec_i::uninstallServant
 (
   CORBA::Object_ptr ObjRef
-  ACE_ENV_ARG_DECL
 ) ACE_THROW_SPEC( ( CORBA::SystemException ) )
 {
   assert( this->_p_sessionContainer );
@@ -257,7 +251,6 @@ Impl::TSEC_CheckPoint_exec_i::uninstallServant
 ENW::TSession_ptr
 Impl::TSEC_CheckPoint_exec_i::createSession
 (
-  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( ( CORBA::SystemException ) )
 {
   static long cnt = 0L;
@@ -269,8 +262,8 @@ Impl::TSEC_CheckPoint_exec_i::createSession
   TSEC_Session_impl* p_sessionImpl = new TSEC_Session_impl( *this, ++cnt );
   PortableServer::ServantBase_var safe_servant( p_sessionImpl );
   CORBA::Object_var obj = this->installServant( p_sessionImpl
-                                                ACE_ENV_ARG_PARAMETER );
-  session = ENW::TSession::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER );
+ );
+  session = ENW::TSession::_narrow ( obj.in () );
 
   ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::createSession...[DONE]\n" ) );
 
@@ -286,7 +279,6 @@ Impl::TSEC_CheckPoint_exec_i::createSession
 Impl::TSEC_CheckPoint_exec_i::destroySession
 (
   ENW::TSession_ptr Session
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( ( CORBA::SystemException ) )
 {
   ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::destroySession...\n" ) );
@@ -311,7 +303,6 @@ ENW::TSession_ptr
 Impl::TSEC_CheckPoint_exec_i::acquireSession
 (
   CORBA::Long Ident
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( ( CORBA::SystemException,
                     ENW::EUnknownIdent ) )
 {
@@ -329,7 +320,7 @@ Impl::TSEC_CheckPoint_exec_i::acquireSession
   ENW::TSession_var  session = ENW::TSession::_nil();
   TSEC_Session_impl* p_sessionImpl = 0;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     {
       //ACE_GUARD_RETURN( TMutex, guard, _mutex, ENW::TSession::_nil() );
@@ -338,17 +329,16 @@ Impl::TSEC_CheckPoint_exec_i::acquireSession
 
     p_sessionImpl->isInUse( 1 );
     CORBA::Object_var obj = this->getObjRef( p_sessionImpl) ;
-    session = ENW::TSession::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER );
+    session = ENW::TSession::_narrow ( obj.in () );
     //session = sessionVector[Ident-1]._session;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION, "Reason\n" );
+    ex._tao_print_exception ("Reason\n");
     ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) );
 
     return session._retn();
   }
-  ACE_ENDTRY;
 
   ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[DONE]\n" ) );
 
@@ -365,7 +355,6 @@ Impl::TSEC_CheckPoint_exec_i::releaseSession
 (
   CORBA::Long Ident,
   ENW::TSession_ptr Session
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( ( CORBA::SystemException,
                     ENW::EUnknownSession ) )
 {
@@ -418,7 +407,6 @@ Impl::TSEC_CheckPoint_exec_i::releaseSession
 ENW::CCM_ISessionService_ptr
 Impl::TSEC_CheckPoint_exec_i::get_sessionService
 (
-  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( ( CORBA::SystemException ) )
 {
   return ENW::CCM_ISessionService::_duplicate( this );
@@ -433,7 +421,6 @@ void
 Impl::TSEC_CheckPoint_exec_i::set_session_context
 (
   Components::SessionContext_ptr Ctx
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( ( CORBA::SystemException,
                     Components::CCMException ) )
 {
@@ -442,12 +429,11 @@ Impl::TSEC_CheckPoint_exec_i::set_session_context
 
   this->_context =
     ENW::CCM_TSEC_CheckPoint_Context::_narrow( Ctx
-                                               ACE_ENV_ARG_PARAMETER );
-  ACE_CHECK;
+ );
 
   if( CORBA::is_nil( this->_context.in() ) )
   {
-    ACE_THROW( CORBA::INTERNAL() );
+    throw CORBA::INTERNAL();
   }
 
   CIDL_TSEC_CheckPoint_Impl::TSEC_CheckPoint_Context* p_checkPoint_Context =
@@ -455,14 +441,14 @@ Impl::TSEC_CheckPoint_exec_i::set_session_context
 
   if( !p_checkPoint_Context )
   {
-    ACE_THROW( CORBA::INTERNAL() );
+    throw CORBA::INTERNAL();
   }
 
   this->_p_sessionContainer = p_checkPoint_Context->_ciao_the_Container();
 
   if( !_p_sessionContainer )
   {
-    ACE_THROW( CORBA::INTERNAL() );
+    throw CORBA::INTERNAL();
   }
 }
 
@@ -475,7 +461,6 @@ void
 Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn
 (
   ENW::ET_LifeToken* /* Event */
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
 ) ACE_THROW_SPEC( ( CORBA::SystemException ) )
 {
   _awaitingLifeToken = false;
@@ -489,7 +474,6 @@ Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn
 void
 Impl::TSEC_CheckPoint_exec_i::ciao_preactivate
 (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 ) ACE_THROW_SPEC( ( CORBA::SystemException,
                     Components::CCMException ) )
 {
@@ -504,7 +488,6 @@ Impl::TSEC_CheckPoint_exec_i::ciao_preactivate
 void
 Impl::TSEC_CheckPoint_exec_i::ccm_activate
 (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 ) ACE_THROW_SPEC( ( CORBA::SystemException,
                     Components::CCMException ) )
 {
@@ -517,9 +500,9 @@ Impl::TSEC_CheckPoint_exec_i::ccm_activate
     p_sessionImpl = new TSEC_Session_impl( *this, i + 1 );
     PortableServer::ServantBase_var safe_servant( p_sessionImpl );
     CORBA::Object_var obj = this->installServant( p_sessionImpl
-                                                  ACE_ENV_ARG_PARAMETER );
+ );
     ENW::TSession_var session =
-                     ENW::TSession::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER );
+                     ENW::TSession::_narrow ( obj.in () );
     sessionVector[i] = TSEC_SessionEntry( p_sessionImpl, session.in () );
   }
 
@@ -534,7 +517,6 @@ Impl::TSEC_CheckPoint_exec_i::ccm_activate
 void
 Impl::TSEC_CheckPoint_exec_i::ciao_postactivate
 (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 ) ACE_THROW_SPEC( ( CORBA::SystemException,
                     Components::CCMException ) )
 {
@@ -549,7 +531,6 @@ Impl::TSEC_CheckPoint_exec_i::ciao_postactivate
 void
 Impl::TSEC_CheckPoint_exec_i::ccm_passivate
 (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 ) ACE_THROW_SPEC( ( CORBA::SystemException,
                     Components::CCMException ) )
 {
@@ -565,7 +546,6 @@ Impl::TSEC_CheckPoint_exec_i::ccm_passivate
 void
 Impl::TSEC_CheckPoint_exec_i::ccm_remove
 (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 ) ACE_THROW_SPEC( ( CORBA::SystemException,
                     Components::CCMException ) )
 {
@@ -600,7 +580,6 @@ Impl::TSEC_CheckPointHome_exec_i::~TSEC_CheckPointHome_exec_i()
 Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint
 (
   const char* Version
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
   ) ACE_THROW_SPEC( ( CORBA::SystemException ))
 {
   return new Impl::TSEC_CheckPoint_exec_i( Version );
@@ -614,7 +593,6 @@ Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint
 ::Components::EnterpriseComponent_ptr
 Impl::TSEC_CheckPointHome_exec_i::create
 (
-  ACE_ENV_SINGLE_ARG_DECL
 ) ACE_THROW_SPEC( ( CORBA::SystemException,
                     Components::CCMException ) )
 {
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
index 8aab825250b..5e5c3809813 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
@@ -82,7 +82,6 @@ namespace Impl
     CORBA::ULong hash
     (
       CORBA::ULong Maximum
-      ACE_ENV_ARG_DECL_NOT_USED
     );
 
     TSEC_CheckPoint_exec_i& getParent() { return _parent; }
@@ -122,25 +121,21 @@ namespace Impl
 
     virtual ENW::CCM_ISessionService_ptr get_sessionService
     (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
 
 
     virtual ENW::TSession_ptr createSession
     (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
 
     virtual CORBA::Boolean destroySession
     (
       ENW::TSession_ptr Session
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
 
     virtual ENW::TSession_ptr acquireSession
     (
       CORBA::Long Ident
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException,
                         ENW::EUnknownIdent ) );
 
@@ -148,7 +143,6 @@ namespace Impl
     (
       CORBA::Long       Ident,
       ENW::TSession_ptr Session
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException,
                         ENW::EUnknownSession ) );
 
@@ -159,7 +153,6 @@ namespace Impl
     virtual void push_lifeTokenIn
     (
       ENW::ET_LifeToken* Event
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
 
 
@@ -169,60 +162,51 @@ namespace Impl
     virtual void set_session_context
     (
       Components::SessionContext_ptr ctx
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException,
                         Components::CCMException ) );
 
     virtual void ciao_preactivate
     (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException,
                         Components::CCMException ) );
 
     virtual void ccm_activate
     (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException,
                         Components::CCMException ) );
 
     virtual void ciao_postactivate
     (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException,
                         Components::CCMException ) );
 
 
     virtual void ccm_passivate
     (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException,
                         Components::CCMException ) );
 
     virtual void ccm_remove
     (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException,
                         Components::CCMException ) );
 
     CORBA::Object_ptr getObjRef
     (
       PortableServer::Servant Servant
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
 
-    int init( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    int init(
     )ACE_THROW_SPEC( ( CORBA::SystemException ) );
 
     CORBA::Object_ptr installServant
     (
       PortableServer::Servant Servant
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
 
     void uninstallServant
     (
       CORBA::Object_ptr ObjRef
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
 
     TMutex& getMutex() { return _mutex; }
@@ -260,13 +244,11 @@ namespace Impl
     virtual ::Components::EnterpriseComponent_ptr new_TSEC_CheckPoint
     (
       const char* Version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) ACE_THROW_SPEC(( CORBA::SystemException));
 
     // Implicit home operations.
     virtual ::Components::EnterpriseComponent_ptr create
     (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC( ( CORBA::SystemException,
                         Components::CCMException ) );
   };
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
index 0480a326009..6e7d40bcea5 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
@@ -114,12 +114,11 @@ main
   char* argv[]
 )
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     // Initialize orb
     CORBA::ORB_var orb =
-                        CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+                        CORBA::ORB_init( argc, argv, "" );
 
     if( parse_args( argc, argv ) != 0 )
     {
@@ -127,12 +126,10 @@ main
     }
 
     CORBA::Object_var obj = orb->string_to_object( _sessionService_ior
-                                                   ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+ );
 
     ENW::ISessionService_var sessionService =
-               ENW::ISessionService::_narrow (obj.in () ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+               ENW::ISessionService::_narrow (obj.in () );
 
     if( CORBA::is_nil( sessionService.in() ) )
     {
@@ -185,18 +182,15 @@ main
       }
     }
 
-    orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    orb->destroy( );
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION,
-                         "Who is the culprit \n" );
+    ex._tao_print_exception ("Who is the culprit \n");
     cerr << "Uncaught CORBA exception" << endl;
 
     return 1;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/tests/IDL3/Events/Any/main.cpp b/CIAO/tests/IDL3/Events/Any/main.cpp
index d59f9fec0d4..77551725735 100644
--- a/CIAO/tests/IDL3/Events/Any/main.cpp
+++ b/CIAO/tests/IDL3/Events/Any/main.cpp
@@ -18,7 +18,7 @@ debug_msg (const char *msg)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
       StringMsg_init *StringMsg_factory = new StringMsg_init;
@@ -73,13 +73,11 @@ main (int argc, char *argv[])
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "caught exception:");
+      ex._tao_print_exception ("caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
index 78e7c3b54d8..3aca5735ae0 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
@@ -45,27 +45,23 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::set_session_context (
-  ::Components::SessionContext_ptr ctx
-  ACE_ENV_ARG_DECL)
+  ::Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
   {
     this->context_ =
     Receiver_Context::_narrow (
-    ctx
-    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    ctx);
 
     if (this->context_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   }
 
   void
-  Receiver_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -74,8 +70,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -84,8 +79,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_activate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -94,8 +88,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_passivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -104,8 +97,7 @@ namespace CIDL_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::ccm_remove (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Receiver_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -136,8 +128,7 @@ namespace CIDL_Receiver_Impl
   // Implicit operations.
 
   ::Components::EnterpriseComponent_ptr
-  ReceiverHome_exec_i::create (
-  ACE_ENV_SINGLE_ARG_DECL)
+  ReceiverHome_exec_i::create ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -149,7 +140,6 @@ namespace CIDL_Receiver_Impl
     retval,
     Receiver_exec_i,
     CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
     return retval;
   }
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
index fa366a6c10d..a90c6941de7 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.h
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
@@ -52,43 +52,37 @@ namespace CIDL_Receiver_Impl
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_activate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_remove (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
@@ -116,8 +110,7 @@ namespace CIDL_Receiver_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.cpp b/CIAO/tests/Minimum/Sender/Sender_exec.cpp
index a304cd83774..b8b1a1c516e 100644
--- a/CIAO/tests/Minimum/Sender/Sender_exec.cpp
+++ b/CIAO/tests/Minimum/Sender/Sender_exec.cpp
@@ -38,8 +38,7 @@ namespace CIDL_Sender_Impl
   // Supported or inherited operations.
 
   void
-  Sender_exec_i::bar (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::bar ()
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
@@ -53,27 +52,23 @@ namespace CIDL_Sender_Impl
 
   void
   Sender_exec_i::set_session_context (
-  ::Components::SessionContext_ptr ctx
-  ACE_ENV_ARG_DECL)
+  ::Components::SessionContext_ptr ctx)
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
   {
     this->context_ =
     Sender_Context::_narrow (
-    ctx
-    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    ctx);
 
     if (this->context_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   }
 
   void
-  Sender_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ciao_preactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -82,8 +77,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ciao_postactivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -92,8 +86,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_activate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_activate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -102,8 +95,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_passivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_passivate ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -112,8 +104,7 @@ namespace CIDL_Sender_Impl
   }
 
   void
-  Sender_exec_i::ccm_remove (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Sender_exec_i::ccm_remove ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -144,8 +135,7 @@ namespace CIDL_Sender_Impl
   // Implicit operations.
 
   ::Components::EnterpriseComponent_ptr
-  SenderHome_exec_i::create (
-  ACE_ENV_SINGLE_ARG_DECL)
+  SenderHome_exec_i::create ()
   ACE_THROW_SPEC ((
   ::CORBA::SystemException,
   ::Components::CCMException))
@@ -157,7 +147,6 @@ namespace CIDL_Sender_Impl
     retval,
     Sender_exec_i,
     CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
 
     return retval;
   }
diff --git a/CIAO/tests/Minimum/Sender/Sender_exec.h b/CIAO/tests/Minimum/Sender/Sender_exec.h
index 984586924f6..179bb6453a8 100644
--- a/CIAO/tests/Minimum/Sender/Sender_exec.h
+++ b/CIAO/tests/Minimum/Sender/Sender_exec.h
@@ -45,8 +45,7 @@ namespace CIDL_Sender_Impl
     // Supported or inherited operations.
 
     virtual void
-    bar (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    bar ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Attribute operations.
@@ -57,43 +56,37 @@ namespace CIDL_Sender_Impl
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ::Components::SessionContext_ptr ctx)
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_preactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_preactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ciao_postactivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ciao_postactivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_activate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_activate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_passivate (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_passivate ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
 
     virtual void
-    ccm_remove (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ccm_remove ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
@@ -121,8 +114,7 @@ namespace CIDL_Sender_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    create ()
     ACE_THROW_SPEC ((
     ::CORBA::SystemException,
     ::Components::CCMException));
diff --git a/CIAO/tools/Config_Handlers/DnC_Dump.cpp b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index 4b3476e15f6..be434b370a6 100644
--- a/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -759,7 +759,7 @@ namespace Deployment
             {
               ACE_DEBUG ((LM_DEBUG, "DnC_Dump::dump (CORBA::Any), expected short\
 encoded different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
                       temp));
@@ -781,7 +781,7 @@ encoded different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected long\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
                       temp));
@@ -795,7 +795,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected u short\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
                       temp));
@@ -809,7 +809,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected ulong\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %u \n", Dump_Obj::indent (),
                       temp));
@@ -823,7 +823,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected float\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
                       temp));
@@ -836,7 +836,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected double\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %f \n", Dump_Obj::indent (),
                       temp));
@@ -849,7 +849,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected bool\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
 
           if (temp)
@@ -866,7 +866,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected char\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
                       temp));
@@ -880,7 +880,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected octet\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
                       temp));
@@ -894,7 +894,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected string\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
                       temp));
@@ -907,7 +907,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longlong\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %l \n", Dump_Obj::indent (),
                       temp));
@@ -921,7 +921,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected longdouble\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %d \n", Dump_Obj::indent (),
                       temp));
@@ -935,7 +935,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wchar\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %c \n", Dump_Obj::indent (),
                       temp));
@@ -949,7 +949,7 @@ encoded with different type"));
             {
               ACE_DEBUG ((LM_DEBUG, "DnC::dump (CORBA::Any) expected wstring\
 encoded with different type"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
           ACE_DEBUG ((LM_DEBUG, "%sAny value: %s \n", Dump_Obj::indent (),
                       temp));
@@ -958,7 +958,7 @@ encoded with different type"));
 
       default:
         ACE_DEBUG ((LM_DEBUG, "Unknown type encoded in Any\n"));
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
   }
 }
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4b7a8a82b91..3e57816e8f3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,6360 +1,440 @@
-Mon Jan 15 09:44:10 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Tue Jan 30 12:37:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tao/ORB_Core.cpp:
-          Made debug statement dependent on debug level, it was now
-          printed alwasy
-
-Sat Jan 13 14:31:10 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/AlternateIIOP/run_test.pl:
-        * tests/Parallel_Connect_Strategy/run_test.pl:
-
-          Renumbered the port values passed to the server. I noticed the
-          PCS test on one nightly machine failed because the acceptor
-          couldn't open a new socket. Also corrected a cut & paste error
-          in the scripts.
-
-Fri Jan 12 21:40:13 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Oneway_Timeouts/client.cpp:
+        * tao/Compression/Compression_Manager.{h,cpp}:
+          Fixed layout and warnings in single threaded build
 
-          Replaced the final invocation used to signal a shutdown to the
-          server as this is a two-way call that was using the same
-          timeout-enabled reference as the test. This sometimes caused
-          spurious timeout errors that are then reported as failures even
-          though they are not.
+Tue Jan 30 12:03:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/run_test.pl:
+        * tao/Compression/Compressor_Factory.{h,cpp}:
+          Fixed layout and warnings in single threaded build
 
-          Increased the process start-up timeout as the old values were
-          short enough that the script assumed an error even though the
-          processes were actually running. On busy systems, a 2 or 5
-          second delay is really possible, particularly if shared
-          libraries have to be reloaded or the system is just busy.
+Tue Jan 30 11:14:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Jan 12 20:50:38 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/DynamicAny.mpc:
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
+          Fixed argument not used warning
 
-          Reordered the source files, which will likewise reorder the
-          linking of object files on builds using makefiles. Thanks
-          to Ossama Othman <Ossama.Othman@symantec.com> for this
-          suggestion to try and eliminate the Debian linking errors
-          in DynamicAny.
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+        * tao/AnyTypeCode/Fixed_TypeCode.cpp:
+        * tao/AnyTypeCode/Fixed_TypeCode.h:
+        * tao/AnyTypeCode/Marshal.h:
+        * tao/AnyTypeCode/Objref_TypeCode.cpp:
+        * tao/AnyTypeCode/Objref_TypeCode_Static.cpp:
+        * tao/AnyTypeCode/Value_TypeCode_Static.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
+        * tao/ORB.cpp:
+          Layout changes
 
-Fri Jan 12 17:23:07 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+Tue Jan 30 10:52:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+        * tests/COIOP/COIOP_Simple_Test.cpp:
+          New simplified COIOP test
 
-          Modified call to make_dyn_any_t() to be consistent with
-          changes in
+        * tests/COIOP/COIOP_Test.cpp:
+          Added advanced_resource.h include to force static
+          link
 
-          Thu Jan 11 18:42:33 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * tests/COIOP/COIOP_Tests.mpc:
+          Add custom project for the IDL files and added the
+          new simple test
 
-Fri Jan 12 09:06:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/COIOP/Server_Task.cpp:
+          Initialise pointer with 0
 
-        * tao/DynamicAny/DynAnyUtils_T.cpp:
-          Fixed compile problem
+        * tests/COIOP/run_test.pl:
+        * tests/Collocation_Tests/run_test.pl:
+          Fixed bug in these two perl script, last test case was not
+          unique
 
-Thu Jan 11 18:42:33 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+Tue Jan 30 09:33:14 2007  Martin Corino  <mcorino@remedy.nl>
 
-        * tao/DynamicAny/DynArray_i.cpp:
-        * tao/DynamicAny/DynCommon.cpp:
-        * tao/DynamicAny/DynAnyUtils_T.cpp:
-        * tao/DynamicAny/DynStruct_i.cpp:
-        * tao/DynamicAny/DynAny_i.cpp:
         * tao/DynamicAny/DynUnion_i.cpp:
-        * tao/DynamicAny/DynAnyUtils_T.h:
-        * tao/DynamicAny/DynAnyFactory.cpp:
-        * tao/DynamicAny/DynSequence_i.cpp:
-
-          Changed make_dyn_any_t() from a static method inside
-          a templatized struct to a template method inside a
-          namespace, and changed all usages accordingly. Thanks
-          to Ossama Othman <Ossama.Othman@symantec.com> for
-          the suggestion, which is an attempt to eliminate
-          Debian link errors in DynamicAny.
-
-Thu Jan 11 17:13:56 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Oneway_Timeouts/client.cpp:
-
-          Changed test failure criteria so that a missed deadline is no
-          longer considered a failure. The errors due to missed deadlines
-          are spurious on systems using preemptive multitasking because
-          there is no way to control the additional delay imposed by the
-          operating system. The test for exception delivery time is beside
-          the point for this test anyway; we want to test that an
-          exception occurs or does not occur, not when it happens to
-          occur.
-
-Wed Jan 10 21:47:39 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * docs/INS.html:
-          Updated documentation relative to corbaloc strings to include
-          IPv6 details. Also generally freshened the document by removing
-          references to obsoleted iioploc strings and added more
-          information on using the IOR Table. Localized the references
-          graphic images to avoid the need for an internet connection to
-          see the full document.
-
-        * docs/TAO-tutorials.html:
-        * docs/index.html:
-          Localized the references graphic images to avoid the need for an
-          internet connection to see the full document.
-
-        * docs/space.gif:
-        * docs/redball.gif:
-        * docs/interop-naming.png:
-        * docs/interop-naming.eps:
-
-          The image files, these used to be hosted only  at wustl,
-          requiring a network connection in order to see the graphics in
-          the documentation.
-
-Wed Jan 10 21:28:19 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * NEWS:
-
-          Updated with my changes since 1.5.4.
-
-Wed Jan 10 20:24:57 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/DynamicAny/DynAnyUtils_T.cpp:
-
-          Add missing include file.
-
-        * tao/DynamicAny/DynAnyUtils_T.h:
-
-          Fix a couple of Win-typos.
-
-Wed Jan 10 19:24:11 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Bug_1551_Regression/Client_Task.cpp:
-        * tests/Bug_1551_Regression/client.cpp:
-
-          Moved the setting of the policy override on the PolicyCurrent into
-          the thread specific code.  Since overrides set on the
-          PolicyCurrent only apply to the thread in which they are set, it
-          should have been done in each client thread.
-
-          Also, we ignore CORBA::TIMEOUT exceptions.  Since the server is
-          aborting itself, they are expected.
-
-        * tests/Bug_1551_Regression/run_test.pl:
-
-          Only sleep 30 seconds if starting the three clients succeeded.
-          And trap the return value of the WaitKill() called on the clients
-          in order to determine if the test needs to continue or not.
-
-Wed Jan 10 18:53:20 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/DynamicAny/DynAnyUtils_T.cpp:
-
-          New file, containing the implementation formerly in the
-          header file.
-
-        * tao/DynamicAny/DynAnyUtils_T.h:
-
-          Factored out the method bodies and put them in the new file
-          above.
-
-        * tao/DynamicAny.mpc:
-
-          Added the new file above explicitly in the Template_Files
-          block, also listed explicitly the rest of the .cpp files.
-
-Wed Jan 10 18:51:20 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * NEWS:
-
-          Updated with my changes since 1.5.4.
-
-Wed Jan 10 14:29:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Memory/Single_Threaded/Memory_Growth.mpc:
-          Removed not needed idlflags, these are inherited from the base
-
-Wed Jan 10 13:13:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
-        * orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl:
-        * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
-        * orbsvcs/tests/AVStreams/Latency/run_test.pl:
-          Check the result of th spawn of the first executable in
-          the test itself. With this change if we have a naming
-          service but no test executable we don't wait a long time
-          on a non existent process
-
-Wed Jan 10 12:30:00 UTC 2007  Simon Massey  <sma@prismtech.com>
-
-        * examples/mfc/server.cpp:
-        * utils/NamingViewer/NamingViewer.cpp:
-
-          From MFC 5.0, Enable3dControls and Enable3dControlsStatic are
-          obsolete because their functionality is incorporated into
-          Microsoft's 32-bit operating systems directly. Basically there
-          is no need to call with VC5.0 and above so I've commented
-          them out to stop the build issuing deprecated warnings.
-
-Wed Jan 10 09:57:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Compression/server.cpp:
-          Extended this test further
-
-Wed Jan 10 09:13:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/Bug_2350_Regression.idl:
-          Added missing id tag
-
-Wed Jan 10 02:02:00 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/tests/Notify/Basic/run_test.pl:
-        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
-
-          Modified these test files to only run the tests with the
-          "-UseSeparateDispatchingOrb 1" option with the notify.mt.conf
-          configuration.  Currently, only the MultiTypes test fails, but
-          the opportunity exists for others to fail.  The MultiTypes test
-          fails because in the reactive and the rt case, a separate ORB is
-          used to dispatch, but only one thread is running.  Therefore,
-          when the dispatch is made and the consumer invokes "disconnect*"
-          back on there, the non-dispatching (or "main") ORB isn't running
-          in order to handle the request.  When the same ORB is used for
-          administration and dispatching, the ORB can handle the
-          disconnect call b/c of nested upcalls.  Therefore, we simply
-          disallow using a separate dispatching ORB when not using using
-          separate dispatching threads.
-
-        * orbsvcs/tests/Notify/Basic:
-        * orbsvcs/tests/Notify/Blocking:
-        * orbsvcs/tests/Notify/Destroy:
-        * orbsvcs/tests/Notify/Discarding:
-        * orbsvcs/tests/Notify/Driver:
-        * orbsvcs/tests/Notify/MT_Dispatching:
-        * orbsvcs/tests/Notify/Ordering:
-        * orbsvcs/tests/Notify/Reconnecting:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter:
-        * orbsvcs/tests/Notify/Structured_Filter:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter:
-        * orbsvcs/tests/Notify/performance-tests/Filter:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen:
-        * orbsvcs/tests/Notify/performance-tests/Throughput:
-
-          Update the svn:ignore property on these directories.
-
-Tue Jan  9 19:56:41 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
-        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
-        * tao/Messaging/ExceptionHolder_i.h:
-        * tao/Messaging/ExceptionHolder_i.cpp:
-
-          Modified the tao_idl code to emit code to set the exception data
-          in the Messaging::ExceptionHolder in the AMI _excep operation.
-          This has the effect of allowing supporting code to raise the
-          correct user defined exception.  Previously, the user defined
-          exception would not be recognized and a CORBA::UNKNOWN would be
-          raised in it's place.  This fixes bug 2350.
-
-        * tests/IDL_Test/Bug_2350_Regression.idl:
-        * tests/IDL_Test/IDL_Test.mpc:
-
-          Added an idl file to ensure that the code to fix bug 2350 does
-          not incorrectly recognize user methods that end in _excep, that
-          take a single parameter ending in ExceptionHolder and raises a
-          user defined exception.
-
-Tue Jan  9 15:14:09 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-
-          Refactored #include "ace/OS_NS_string.h" for memcmp() out of the
-          two TAO_NO_COPY_OCTET_SEQUENCES branches and move it into the
-          common #include area.  This reverts changes yesterday by me and
-          this morning by Chad Elliott.
-
-Tue Jan  9 14:06:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicAny/diffs/DynamicAny.pidl.diff:
-          Removed from the repo, ancient and not needed anymore
-
-Tue Jan  9 12:34:12 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-
-          Added a missing #include "ace/OS_NS_string.h" to get
-          ACE_OS::memcmp().
-
-Tue Jan  9 07:25:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicInterface/DII_Invocation.cpp:
-          Reordered includes to fix compile problems with gcc4
-
-Tue Jan  9 06:15:00 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/TransportCurrent/Framework/Makefile.am:
-        * tests/TransportCurrent/IIOP/Makefile.am:
-
-          Regenerated.
-
-        * tests/TransportCurrent/IIOP/IIOP.mpc
-        * tests/TransportCurrent/Framework/Framework.mpc
-
-          For the automake builds includes are relative to both $(srcdir)
-          and the build dir.
-
-Tue Jan  9 03:50:30 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/IDL_Test/Makefile.am:
-
-          Regenerated.
-
-Tue Jan  9 03:48:33 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Compression/Makefile.am:
-
-          Regenerated.
-
-Tue Jan  9 03:43:45 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated for AnyTypeCode.mpc changes.
-
-Tue Jan  9 03:37:26 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/TransportCurrent/Framework/Makefile.am:
-        * tests/TransportCurrent/IIOP/Makefile.am:
-        * tests/TransportCurrent/lib/Makefile.am:
-
-          Regenerated.
-
-        * tests/TransportCurrent/IIOP/IIOP.mpc
-        * tests/TransportCurrent/Framework/Framework.mpc
-
-          For the automake builds includes are relative to $(srcdir),
-          libpaths are relative to the build dir.
-
-Mon Jan  8 19:56:54 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tao/Unbounded_Octet_Sequence_T.h:
-
-          Moved #include for OS_NS_string.h into the
-          (TAO_NO_COPY_OCTET_SEQUENCES == 0) clause...which is where it
-          should have been in the first place since that's where memcmp is
-          actually used.  This should fix the BCB build, and any other
-          TAO_NO_COPY_OCTET_SEQUENCES builds.
-
-Mon Jan  8 19:40:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/GIOP_Message_Locate_Header.h:
-          No need to export TAO_GIOP_Locate_Request_Header from the TAO library
-
-        * tao/RTCORBA/RTCORBAC.cpp:
-        * tao/RTCORBA/diffs/RTCORBA.diff
-          Use true/false
-
-Mon Jan  8 18:56:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode.mpc:
-          Cleanup and added regeneration of Dynamic.pidl
-
-        * tao/AnyTypeCode/Dynamic.pidl:
-          Removed TypeCode interface and include other pidl
-          file that has TypeCode. Fixes bugzilla bug 2766
-
-        * tao/AnyTypeCode/DynamicA.cpp:
-        * tao/AnyTypeCode/DynamicA.h:
-        * tao/AnyTypeCode/DynamicC.cpp:
-        * tao/AnyTypeCode/DynamicC.h:
-        * tao/AnyTypeCode/DynamicS.h:
-          Removed from the repo, they are now generated on the fly
-
-        * tao/PortableServer/ServantRetentionStrategyRetain.cpp (servant_to_system_id_i):
-          Added special check for CORBA/e so that the correct exception is thrown
-
-        * tests/IDL_Test/typecode.idl:
-          New idl file used to test how to regenerate Dynamic.pidl
-
-        * IDL_Test/IDL_Test.mpc:
-          Added typecode.idl
-
-Mon Jan  8 16:02:13 UTC 2007  Ciju John  <johnc@ociweb.com>
-
-        * docs/ORBEndpoint.html:
-          Update documentation for ORBEndpoint reuse_addr option.
-
-Mon Jan  8 13:55:00 UTC 2007  Simon Massey  <sma@prismtech.com>
-
-        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp:
-
-          Add some debug output to trace code flow for remote systems.
-
-Mon Jan  8 13:50:31 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/OBV/Truncatable/client.cpp:
-
-          Undefine VERIFY if it's defined to avoid warnings from vc71.
-
-Mon Jan  8 13:36:37 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/IIOP/Makefile.am:
-
-          Modified the MPC file to work with automake and updated the
-          Makefile.am accordingly.
-
-Mon Jan  8 10:52:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Invocation_Base.cpp (exception):
-          Set the forwarded_to_ member to nil again, it can be that
-          we had a forward request which was converted to a regular
-          exeption in a PI call and then we have to make sure we don't
-          keep the old data
-
-        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp (receive_other):
-          When an exception occurs make sure we implement the following
-          behaviour from the OMG spec section 21.3.6.5:
-          This interception point may raise a system exception. If it does, no other
-          Interceptors’ receive_other operations are called. The remaining
-          Interceptors in the Flow Stack are popped and have their receive_exception
-          interception point called.
-
-          This fixes the failing of bug 2287 regression on svn head. Thanks to
-          Simon McQueen for explaining the meaning of this test and reviewing
-          the changes above
-
-Mon Jan  8 00:18:21 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/run_test.pl:
-        * tests/TransportCurrent/IIOP/run_test.pl:
-
-Sun Jan  7 18:48:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Oneway_Timeouts/client.cpp:
-          Removed create_poa method, it is not used at all
-
-Sun Jan  7 12:06:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Acceptor_Filter_Factory.h:
-          Fixed problem with CORBA/e
-
-        * tao/PortableServer/Object_Adapter.cpp:
-        * tao/PortableServer/Root_POA.cpp:
-          Fixed compile problems when building CORBA/e compact with Borland C++
-
-Sat Jan  6 19:16:55 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * TAO_IDL:
-        * examples/AMI/FL_Callback:
-        * orbsvcs/Concurrency_Service:
-        * orbsvcs/CosEvent_Service:
-        * orbsvcs/Dump_Schedule:
-        * orbsvcs/Event_Service:
-        * orbsvcs/FTRT_Event_Service/Event_Service:
-        * orbsvcs/FTRT_Event_Service/Factory_Service:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service:
-        * orbsvcs/FT_ReplicationManager:
-        * orbsvcs/Fault_Detector:
-        * orbsvcs/Fault_Notifier:
-        * orbsvcs/IFR_Service:
-        * orbsvcs/ImplRepo_Service:
-        * orbsvcs/LifeCycle_Service:
-        * orbsvcs/LoadBalancer:
-        * orbsvcs/Logging_Service/Basic_Logging_Service:
-        * orbsvcs/Logging_Service/Event_Logging_Service:
-        * orbsvcs/Logging_Service/Notify_Logging_Service:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service:
-        * orbsvcs/Naming_Service:
-        * orbsvcs/Notify_Service:
-        * orbsvcs/Scheduling_Service:
-        * orbsvcs/TAO_Service:
-        * orbsvcs/Time_Service:
-        * orbsvcs/Trading_Service:
-        * orbsvcs/tests/AVStreams/Asynch_Three_Stage:
-        * orbsvcs/tests/AVStreams/Bidirectional_Flows:
-        * orbsvcs/tests/AVStreams/Component_Switching:
-        * orbsvcs/tests/AVStreams/Full_Profile:
-        * orbsvcs/tests/AVStreams/Latency:
-        * orbsvcs/tests/AVStreams/Modify_QoS:
-        * orbsvcs/tests/AVStreams/Multicast:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile:
-        * orbsvcs/tests/AVStreams/Multiple_Flows:
-        * orbsvcs/tests/AVStreams/Pluggable:
-        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol:
-        * orbsvcs/tests/AVStreams/Simple_Three_Stage:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS:
-        * orbsvcs/tests/BiDir_CORBALOC:
-        * orbsvcs/tests/Bug_1334_Regression:
-        * orbsvcs/tests/Bug_1393_Regression:
-        * orbsvcs/tests/Bug_1395_Regression:
-        * orbsvcs/tests/Bug_1630_Regression:
-        * orbsvcs/tests/Bug_2074_Regression:
-        * orbsvcs/tests/Bug_2137_Regression:
-        * orbsvcs/tests/Bug_2247_Regression:
-        * orbsvcs/tests/Bug_2248_Regression:
-        * orbsvcs/tests/Bug_2285_Regression:
-        * orbsvcs/tests/Bug_2287_Regression:
-        * orbsvcs/tests/Bug_2316_Regression:
-        * orbsvcs/tests/Bug_2377_Regression:
-        * orbsvcs/tests/Bug_2615_Regression:
-        * orbsvcs/tests/Bug_2709_Regression:
-        * orbsvcs/tests/Concurrency:
-        * orbsvcs/tests/CosEvent/Timeout:
-        * orbsvcs/tests/EC_Custom_Marshal:
-        * orbsvcs/tests/EC_MT_Mcast:
-        * orbsvcs/tests/EC_Mcast:
-        * orbsvcs/tests/EC_Multiple:
-        * orbsvcs/tests/EC_Throughput:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated:
-        * orbsvcs/tests/Event/ThreadFlags:
-        * orbsvcs/tests/Event/UDP:
-        * orbsvcs/tests/FT_App:
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation:
-        * orbsvcs/tests/FaultTolerance/IOGR:
-        * orbsvcs/tests/FaultTolerance/IOGRManipulation:
-        * orbsvcs/tests/FtRtEvent:
-        * orbsvcs/tests/HTIOP/AMI:
-        * orbsvcs/tests/HTIOP/BiDirectional:
-        * orbsvcs/tests/HTIOP/Hello:
-        * orbsvcs/tests/IOR_MCast:
-        * orbsvcs/tests/ImplRepo:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression:
-        * orbsvcs/tests/ImplRepo/NameService:
-        * orbsvcs/tests/ImplRepo/scale:
-        * orbsvcs/tests/InterfaceRepo/Application_Test:
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test:
-        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test:
-        * orbsvcs/tests/InterfaceRepo/IFR_Test:
-        * orbsvcs/tests/InterfaceRepo/Latency_Test:
-        * orbsvcs/tests/InterfaceRepo/Persistence_Test:
-        * orbsvcs/tests/Interoperable_Naming:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group:
-        * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU:
-        * orbsvcs/tests/Log/Basic_Log_Test:
-        * orbsvcs/tests/Miop/McastHello:
-        * orbsvcs/tests/Notify/PluggableTopology:
-        * orbsvcs/tests/Notify/XML_Persistence:
-        * orbsvcs/tests/Property:
-        * orbsvcs/tests/Redundant_Naming:
-        * orbsvcs/tests/Sched:
-        * orbsvcs/tests/Sched_Conf:
-        * orbsvcs/tests/Security/BiDirectional:
-        * orbsvcs/tests/Security/MT_IIOP_SSL:
-        * orbsvcs/tests/Security/Secure_Invocation:
-        * orbsvcs/tests/Security/ssliop_corbaloc:
-        * orbsvcs/tests/Simple_Naming:
-        * orbsvcs/tests/Time:
-        * orbsvcs/tests/ior_corbaname:
-        * orbsvcs/tests/tests_svc_loader:
-        * orbsvcs/tests/unit/Trading/Interpreter:
-        * tests/AMH_Exceptions:
-        * tests/AMH_Oneway:
-        * tests/AMI:
-        * tests/AMI_Buffering:
-        * tests/AMI_Timeouts:
-        * tests/Abstract_Interface:
-        * tests/Any/Recursive:
-        * tests/BiDirectional:
-        * tests/BiDirectional_DelayedUpcall:
-        * tests/BiDirectional_MultipleORB:
-        * tests/BiDirectional_NestedUpcall:
-        * tests/Big_AMI:
-        * tests/Big_Oneways:
-        * tests/Big_Reply:
-        * tests/Big_Request_Muxing:
-        * tests/Big_Twoways:
-        * tests/Blocking_Sync_None:
-        * tests/Bug_1020_Basic_Regression:
-        * tests/Bug_1020_Regression:
-        * tests/Bug_1254_Regression:
-        * tests/Bug_1269_Regression:
-        * tests/Bug_1270_Regression:
-        * tests/Bug_1330_Regression:
-        * tests/Bug_1361_Regression:
-        * tests/Bug_1476_Regression:
-        * tests/Bug_1476_Test:
-        * tests/Bug_1482_Regression:
-        * tests/Bug_1495_Regression:
-        * tests/Bug_1535_Regression:
-        * tests/Bug_1551_Regression:
-        * tests/Bug_1568_Regression:
-        * tests/Bug_1627_Regression:
-        * tests/Bug_1635_Regression:
-        * tests/Bug_1636_Regression:
-        * tests/Bug_1639_Regression:
-        * tests/Bug_1670_Regression:
-        * tests/Bug_1676_Regression:
-        * tests/Bug_1693_Test:
-        * tests/Bug_1812_Regression:
-        * tests/Bug_1813_Regression:
-        * tests/Bug_1869_Regression:
-        * tests/Bug_1904_Regression:
-        * tests/Bug_2084_Regression:
-        * tests/Bug_2122_Regression:
-        * tests/Bug_2124_Regression:
-        * tests/Bug_2126_Regression:
-        * tests/Bug_2134_Regression:
-        * tests/Bug_2144_Regression:
-        * tests/Bug_2174_Regression:
-        * tests/Bug_2183_Regression:
-        * tests/Bug_2186_Regression:
-        * tests/Bug_2188_Regression:
-        * tests/Bug_2201_Regression:
-        * tests/Bug_2222_Regression:
-        * tests/Bug_2234_Regression:
-        * tests/Bug_2289_Regression:
-        * tests/Bug_2319_Regression:
-        * tests/Bug_2328_Regression:
-        * tests/Bug_2345_Regression:
-        * tests/Bug_2349_Regression:
-        * tests/Bug_2375_Regression:
-        * tests/Bug_2399_Regression:
-        * tests/Bug_2417_Regression:
-        * tests/Bug_2419_Regression:
-        * tests/Bug_2424_Regression:
-        * tests/Bug_2429_Regression:
-        * tests/Bug_2494_Regression:
-        * tests/Bug_2503_Regression:
-        * tests/Bug_2542_Regression:
-        * tests/Bug_2543_Regression:
-        * tests/Bug_2549_Regression:
-        * tests/Bug_2560_Regression:
-        * tests/Bug_2593_Regression:
-        * tests/Bug_2595_Regression:
-        * tests/Bug_2654_Regression:
-        * tests/Bug_2669_Regression:
-        * tests/Bug_2683_Regression:
-        * tests/Bug_2702_Regression:
-        * tests/CDR:
-        * tests/COIOP:
-        * tests/CSD_Strategy_Tests/Broken:
-        * tests/CSD_Strategy_Tests/TP_Test_1:
-        * tests/CSD_Strategy_Tests/TP_Test_2:
-        * tests/CSD_Strategy_Tests/TP_Test_3:
-        * tests/CSD_Strategy_Tests/TP_Test_4:
-        * tests/CSD_Strategy_Tests/TP_Test_Dynamic:
-        * tests/CSD_Strategy_Tests/TP_Test_Static:
-        * tests/Cache_Growth_Test:
-        * tests/CallbackTest:
-        * tests/Client_Leaks:
-        * tests/CodeSets/simple:
-        * tests/Codec:
-        * tests/Collocation:
-        * tests/CollocationLockup:
-        * tests/Collocation_Exception_Test:
-        * tests/Collocation_Oneway_Tests:
-        * tests/Collocation_Opportunities:
-        * tests/Collocation_Tests:
-        * tests/Connect_Strategy_Test:
-        * tests/Connection_Failure:
-        * tests/Connection_Purging:
-        * tests/Connection_Timeout:
-        * tests/Crash_On_Write:
-        * tests/Crashed_Callback:
-        * tests/DII_Collocation_Tests/oneway:
-        * tests/DII_Collocation_Tests/twoway:
-        * tests/DLL_ORB:
-        * tests/DSI_Gateway:
-        * tests/DynAny_Test:
-        * tests/Explicit_Event_Loop:
-        * tests/Exposed_Policies:
-        * tests/FL_Cube:
-        * tests/Faults:
-        * tests/File_IO:
-        * tests/Forwarding:
-        * tests/GIOP_Fragments/PMB_With_Fragments:
-        * tests/Hang_Shutdown:
-        * tests/Hello:
-        * tests/ICMG_Any_Bug:
-        * tests/IDL_Test:
-        * tests/IORManipulation:
-        * tests/IOR_Endpoint_Hostnames:
-        * tests/IPV6:
-        * tests/InterOp-Naming:
-        * tests/Leader_Followers:
-        * tests/LongUpcalls:
-        * tests/MProfile:
-        * tests/MProfile_Connection_Timeout:
-        * tests/MProfile_Forwarding:
-        * tests/MT_BiDir:
-        * tests/MT_Client:
-        * tests/MT_Server:
-        * tests/MT_Timeout:
-        * tests/Multiple:
-        * tests/Multiple_Inheritance:
-        * tests/Muxed_GIOP_Versions:
-        * tests/Muxing:
-        * tests/Native_Exceptions:
-        * tests/NestedUpcall/MT_Client_Test:
-        * tests/NestedUpcall/Simple:
-        * tests/NestedUpcall/Triangle_Test:
-        * tests/Nested_Event_Loop:
-        * tests/Nested_Upcall_Crash:
-        * tests/No_Server_MT_Connect_Test:
-        * tests/OBV/Any:
-        * tests/OBV/Collocated/Forward:
-        * tests/OBV/Factory:
-        * tests/OBV/Forward:
-        * tests/OBV/Simple:
-        * tests/OBV/TC_Alignment:
-        * tests/OBV/Truncatable:
-        * tests/OBV/ValueBox:
-        * tests/ORB_Local_Config/Bug_1459:
-        * tests/ORB_Local_Config/Bug_2612:
-        * tests/ORB_Local_Config/Bunch:
-        * tests/ORB_Local_Config/Separation:
-        * tests/ORB_Local_Config/Service_Dependency:
-        * tests/ORB_Local_Config/Shared:
-        * tests/ORB_Local_Config/Simple:
-        * tests/ORB_Local_Config/Two_DLL_ORB:
-        * tests/ORB_destroy:
-        * tests/ORB_init:
-        * tests/ORB_init/Portspan:
-        * tests/ORB_shutdown:
-        * tests/ORT:
-        * tests/Object_Loader:
-        * tests/Objref_Sequence_Test:
-        * tests/OctetSeq:
-        * tests/Ondemand_Write:
-        * tests/Oneway_Buffering:
-        * tests/Oneway_Timeouts:
-        * tests/Oneways_Invoking_Twoways:
-        * tests/Optimized_Connection:
-        * tests/POA/Bug_2511_Regression:
-        * tests/POA/Current:
-        * tests/POA/Deactivate_Object:
-        * tests/POA/Default_Servant:
-        * tests/POA/EndpointPolicy:
-        * tests/POA/Etherealization:
-        * tests/POA/Excessive_Object_Deactivations:
-        * tests/POA/Identity:
-        * tests/POA/MT_Servant_Locator:
-        * tests/POA/Nested_Non_Servant_Upcalls:
-        * tests/POA/Non_Servant_Upcalls:
-        * tests/POA/Object_Reactivation:
-        * tests/POA/POAManagerFactory:
-        * tests/POA/POA_Destruction:
-        * tests/POA/Persistent_ID:
-        * tests/POA/Policies:
-        * tests/POA/Reference_Counting:
-        * tests/POA/Single_Threaded_POA:
-        * tests/POA/wait_for_completion:
-        * tests/Parallel_Connect_Strategy:
-        * tests/Param_Test:
-        * tests/Permanent_Forward:
-        * tests/Policies:
-        * tests/Portable_Interceptors/AMI:
-        * tests/Portable_Interceptors/AdvSlot:
-        * tests/Portable_Interceptors/AdvSlotDblCpy:
-        * tests/Portable_Interceptors/AdvSlotExt:
-        * tests/Portable_Interceptors/Benchmark:
-        * tests/Portable_Interceptors/Bug_1559:
-        * tests/Portable_Interceptors/Bug_2088:
-        * tests/Portable_Interceptors/Bug_2510_Regression:
-        * tests/Portable_Interceptors/Collocated/Dynamic:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation:
-        * tests/Portable_Interceptors/Dynamic:
-        * tests/Portable_Interceptors/ForwardRequest:
-        * tests/Portable_Interceptors/IORInterceptor:
-        * tests/Portable_Interceptors/ORB_Shutdown:
-        * tests/Portable_Interceptors/PICurrent:
-        * tests/Portable_Interceptors/PolicyFactory:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote:
-        * tests/Portable_Interceptors/Recursive_ORBInitializer:
-        * tests/Portable_Interceptors/Register_Initial_References:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow:
-        * tests/Portable_Interceptors/Service_Context_Manipulation:
-        * tests/Portable_Interceptors/Slot:
-        * tests/QtTests:
-        * tests/Queued_Message_Test:
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs:
-        * tests/RTCORBA/Banded_Connections:
-        * tests/RTCORBA/Client_Propagated:
-        * tests/RTCORBA/Client_Protocol:
-        * tests/RTCORBA/Collocation:
-        * tests/RTCORBA/Destroy_Thread_Pool:
-        * tests/RTCORBA/Diffserv:
-        * tests/RTCORBA/Dynamic_Thread_Pool:
-        * tests/RTCORBA/Explicit_Binding:
-        * tests/RTCORBA/Linear_Priority:
-        * tests/RTCORBA/MT_Client_Protocol_Priority:
-        * tests/RTCORBA/ORB_init:
-        * tests/RTCORBA/Persistent_IOR:
-        * tests/RTCORBA/Policies:
-        * tests/RTCORBA/Policy_Combinations:
-        * tests/RTCORBA/Priority_Inversion_With_Bands:
-        * tests/RTCORBA/Private_Connection:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection:
-        * tests/RTCORBA/RTMutex:
-        * tests/RTCORBA/Server_Declared:
-        * tests/RTCORBA/Server_Protocol:
-        * tests/RTCORBA/Thread_Pool:
-        * tests/RTScheduling/Current:
-        * tests/RTScheduling/DT_Spawn:
-        * tests/RTScheduling/Scheduling_Interceptor:
-        * tests/RTScheduling/Thread_Cancel:
-        * tests/RTScheduling/VoidData:
-        * tests/Reliable_Oneways:
-        * tests/Sequence_Unit_Tests:
-        * tests/Servant_To_Reference_Test:
-        * tests/Server_Connection_Purging:
-        * tests/Server_Leaks:
-        * tests/Server_Port_Zero:
-        * tests/Single_Read:
-        * tests/Smart_Proxies:
-        * tests/Smart_Proxies/Benchmark:
-        * tests/Smart_Proxies/Collocation:
-        * tests/Smart_Proxies/On_Demand:
-        * tests/Smart_Proxies/Policy:
-        * tests/Smart_Proxies/dtor:
-        * tests/Stack_Recursion:
-        * tests/Strategies:
-        * tests/Timed_Buffered_Oneways:
-        * tests/Timeout:
-        * tests/TransportCurrent/Framework:
-        * tests/TransportCurrent/IIOP:
-        * tests/Two_Objects:
-        * tests/Typedef_String_Array:
-        * tests/UNKNOWN_Exception:
-        * tests/Xt_Stopwatch:
-        * utils/catior:
-        * utils/nslist:
-
-          Added subversion svn:ignore properties on all these directories
-          comparable to the values previously in the vertigial .cvsignore
-          files, as well as updated them commensurate with the new svnignore
-          gnuace make target.
-
-        * TAO_IDL/.cvsignore:
-        * examples/AMI/FL_Callback/.cvsignore:
-        * orbsvcs/Concurrency_Service/.cvsignore:
-        * orbsvcs/CosEvent_Service/.cvsignore:
-        * orbsvcs/Dump_Schedule/.cvsignore:
-        * orbsvcs/Event_Service/.cvsignore:
-        * orbsvcs/FTRT_Event_Service/Event_Service/.cvsignore:
-        * orbsvcs/FTRT_Event_Service/Factory_Service/.cvsignore:
-        * orbsvcs/FTRT_Event_Service/Gateway_Service/.cvsignore:
-        * orbsvcs/FT_ReplicationManager/.cvsignore:
-        * orbsvcs/Fault_Detector/.cvsignore:
-        * orbsvcs/Fault_Notifier/.cvsignore:
-        * orbsvcs/IFR_Service/.cvsignore:
-        * orbsvcs/ImplRepo_Service/.cvsignore:
-        * orbsvcs/LifeCycle_Service/.cvsignore:
-        * orbsvcs/LoadBalancer/.cvsignore:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/.cvsignore:
-        * orbsvcs/Logging_Service/Event_Logging_Service/.cvsignore:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/.cvsignore:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/.cvsignore:
-        * orbsvcs/Naming_Service/.cvsignore:
-        * orbsvcs/Notify_Service/.cvsignore:
-        * orbsvcs/Scheduling_Service/.cvsignore:
-        * orbsvcs/TAO_Service/.cvsignore:
-        * orbsvcs/Time_Service/.cvsignore:
-        * orbsvcs/Trading_Service/.cvsignore:
-        * tests/AMH_Exceptions/.cvsignore:
-        * tests/AMH_Oneway/.cvsignore:
-        * tests/AMI/.cvsignore:
-        * tests/AMI_Buffering/.cvsignore:
-        * tests/AMI_Timeouts/.cvsignore:
-        * tests/Abstract_Interface/.cvsignore:
-        * tests/BiDirectional/.cvsignore:
-        * tests/BiDirectional_MultipleORB/.cvsignore:
-        * tests/BiDirectional_NestedUpcall/.cvsignore:
-        * tests/Big_Oneways/.cvsignore:
-        * tests/Big_Reply/.cvsignore:
-        * tests/Big_Request_Muxing/.cvsignore:
-        * tests/Big_Twoways/.cvsignore:
-        * tests/Blocking_Sync_None/.cvsignore:
-        * tests/Bug_1020_Basic_Regression/.cvsignore:
-        * tests/Bug_1020_Regression/.cvsignore:
-        * tests/Bug_1269_Regression/.cvsignore:
-        * tests/Bug_1270_Regression/.cvsignore:
-        * tests/Bug_1330_Regression/.cvsignore:
-        * tests/Bug_1361_Regression/.cvsignore:
-        * tests/Bug_1476_Regression/.cvsignore:
-        * tests/Bug_1482_Regression/.cvsignore:
-        * tests/Bug_1495_Regression/.cvsignore:
-        * tests/Bug_1535_Regression/.cvsignore:
-        * tests/Bug_1551_Regression/.cvsignore:
-        * tests/Bug_1568_Regression/.cvsignore:
-        * tests/Bug_1627_Regression/.cvsignore:
-        * tests/Bug_1635_Regression/.cvsignore:
-        * tests/Bug_1636_Regression/.cvsignore:
-        * tests/Bug_1639_Regression/.cvsignore:
-        * tests/Bug_1670_Regression/.cvsignore:
-        * tests/Bug_1693_Test/.cvsignore:
-        * tests/Bug_1904_Regression/.cvsignore:
-        * tests/CDR/.cvsignore:
-        * tests/Cache_Growth_Test/.cvsignore:
-        * tests/Client_Leaks/.cvsignore:
-        * tests/CodeSets/simple/.cvsignore:
-        * tests/Codec/.cvsignore:
-        * tests/Collocation/.cvsignore:
-        * tests/Collocation_Opportunities/.cvsignore:
-        * tests/Collocation_Tests/.cvsignore:
-        * tests/Connect_Strategy_Test/.cvsignore:
-        * tests/Connection_Failure/.cvsignore:
-        * tests/Connection_Purging/.cvsignore:
-        * tests/Connection_Timeout/.cvsignore:
-        * tests/Crash_On_Write/.cvsignore:
-        * tests/Crashed_Callback/.cvsignore:
-        * tests/DLL_ORB/.cvsignore:
-        * tests/DSI_Gateway/.cvsignore:
-        * tests/DynAny_Test/.cvsignore:
-        * tests/Explicit_Event_Loop/.cvsignore:
-        * tests/Exposed_Policies/.cvsignore:
-        * tests/FL_Cube/.cvsignore:
-        * tests/Faults/.cvsignore:
-        * tests/File_IO/.cvsignore:
-        * tests/Forwarding/.cvsignore:
-        * tests/GIOP_Fragments/PMB_With_Fragments/.cvsignore:
-        * tests/Hello/.cvsignore:
-        * tests/ICMG_Any_Bug/.cvsignore:
-        * tests/IDL_Test/.cvsignore:
-        * tests/IORManipulation/.cvsignore:
-        * tests/InterOp-Naming/.cvsignore:
-        * tests/Leader_Followers/.cvsignore:
-        * tests/LongUpcalls/.cvsignore:
-        * tests/MProfile/.cvsignore:
-        * tests/MProfile_Connection_Timeout/.cvsignore:
-        * tests/MProfile_Forwarding/.cvsignore:
-        * tests/MT_BiDir/.cvsignore:
-        * tests/MT_Client/.cvsignore:
-        * tests/MT_Server/.cvsignore:
-        * tests/MT_Timeout/.cvsignore:
-        * tests/Multiple/.cvsignore:
-        * tests/Multiple_Inheritance/.cvsignore:
-        * tests/Muxed_GIOP_Versions/.cvsignore:
-        * tests/Muxing/.cvsignore:
-        * tests/Native_Exceptions/.cvsignore:
-        * tests/NestedUpcall/MT_Client_Test/.cvsignore:
-        * tests/NestedUpcall/Simple/.cvsignore:
-        * tests/NestedUpcall/Triangle_Test/.cvsignore:
-        * tests/Nested_Event_Loop/.cvsignore:
-        * tests/Nested_Upcall_Crash/.cvsignore:
-        * tests/No_Server_MT_Connect_Test/.cvsignore:
-        * tests/OBV/Any/.cvsignore:
-        * tests/OBV/Collocated/Forward/.cvsignore:
-        * tests/OBV/Factory/.cvsignore:
-        * tests/OBV/Forward/.cvsignore:
-        * tests/OBV/TC_Alignment/.cvsignore:
-        * tests/ORB_destroy/.cvsignore:
-        * tests/ORB_init/.cvsignore:
-        * tests/ORB_init/Portspan/.cvsignore:
-        * tests/ORB_shutdown/.cvsignore:
-        * tests/ORT/.cvsignore:
-        * tests/Object_Loader/.cvsignore:
-        * tests/Objref_Sequence_Test/.cvsignore:
-        * tests/OctetSeq/.cvsignore:
-        * tests/Oneway_Buffering/.cvsignore:
-        * tests/Oneways_Invoking_Twoways/.cvsignore:
-        * tests/POA/Current/.cvsignore:
-        * tests/POA/Default_Servant/.cvsignore:
-        * tests/POA/Etherealization/.cvsignore:
-        * tests/POA/Excessive_Object_Deactivations/.cvsignore:
-        * tests/POA/Identity/.cvsignore:
-        * tests/POA/MT_Servant_Locator/.cvsignore:
-        * tests/POA/Nested_Non_Servant_Upcalls/.cvsignore:
-        * tests/POA/Non_Servant_Upcalls/.cvsignore:
-        * tests/POA/Object_Reactivation/.cvsignore:
-        * tests/POA/POA_Destruction/.cvsignore:
-        * tests/POA/Persistent_ID/.cvsignore:
-        * tests/POA/Policies/.cvsignore:
-        * tests/POA/Single_Threaded_POA/.cvsignore:
-        * tests/POA/wait_for_completion/.cvsignore:
-        * tests/Param_Test/.cvsignore:
-        * tests/Policies/.cvsignore:
-        * tests/Portable_Interceptors/AMI/.cvsignore:
-        * tests/Portable_Interceptors/Benchmark/.cvsignore:
-        * tests/Portable_Interceptors/Bug_1559/.cvsignore:
-        * tests/Portable_Interceptors/Collocated/Dynamic/.cvsignore:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.cvsignore:
-        * tests/Portable_Interceptors/Dynamic/.cvsignore:
-        * tests/Portable_Interceptors/ForwardRequest/.cvsignore:
-        * tests/Portable_Interceptors/IORInterceptor/.cvsignore:
-        * tests/Portable_Interceptors/ORB_Shutdown/.cvsignore:
-        * tests/Portable_Interceptors/PICurrent/.cvsignore:
-        * tests/Portable_Interceptors/PolicyFactory/.cvsignore:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/.cvsignore:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/.cvsignore:
-        * tests/QtTests/.cvsignore:
-        * tests/Queued_Message_Test/.cvsignore:
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs/.cvsignore:
-        * tests/RTCORBA/Banded_Connections/.cvsignore:
-        * tests/RTCORBA/Client_Propagated/.cvsignore:
-        * tests/RTCORBA/Client_Protocol/.cvsignore:
-        * tests/RTCORBA/Collocation/.cvsignore:
-        * tests/RTCORBA/Destroy_Thread_Pool/.cvsignore:
-        * tests/RTCORBA/Diffserv/.cvsignore:
-        * tests/RTCORBA/Explicit_Binding/.cvsignore:
-        * tests/RTCORBA/Linear_Priority/.cvsignore:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/.cvsignore:
-        * tests/RTCORBA/ORB_init/.cvsignore:
-        * tests/RTCORBA/Persistent_IOR/.cvsignore:
-        * tests/RTCORBA/Policies/.cvsignore:
-        * tests/RTCORBA/Policy_Combinations/.cvsignore:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/.cvsignore:
-        * tests/RTCORBA/Private_Connection/.cvsignore:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/.cvsignore:
-        * tests/RTCORBA/RTMutex/.cvsignore:
-        * tests/RTCORBA/Server_Declared/.cvsignore:
-        * tests/RTCORBA/Server_Protocol/.cvsignore:
-        * tests/RTCORBA/Thread_Pool/.cvsignore:
-        * tests/RTScheduling/Current/.cvsignore:
-        * tests/RTScheduling/DT_Spawn/.cvsignore:
-        * tests/RTScheduling/Scheduling_Interceptor/.cvsignore:
-        * tests/RTScheduling/Thread_Cancel/.cvsignore:
-        * tests/RTScheduling/VoidData/.cvsignore:
-        * tests/Reliable_Oneways/.cvsignore:
-        * tests/Servant_To_Reference_Test/.cvsignore:
-        * tests/Server_Connection_Purging/.cvsignore:
-        * tests/Server_Leaks/.cvsignore:
-        * tests/Server_Port_Zero/.cvsignore:
-        * tests/Single_Read/.cvsignore:
-        * tests/Smart_Proxies/.cvsignore:
-        * tests/Smart_Proxies/Benchmark/.cvsignore:
-        * tests/Smart_Proxies/Collocation/.cvsignore:
-        * tests/Smart_Proxies/On_Demand/.cvsignore:
-        * tests/Smart_Proxies/Policy/.cvsignore:
-        * tests/Smart_Proxies/dtor/.cvsignore:
-        * tests/Stack_Recursion/.cvsignore:
-        * tests/Strategies/.cvsignore:
-        * tests/Timed_Buffered_Oneways/.cvsignore:
-        * tests/Timeout/.cvsignore:
-        * tests/Two_Objects/.cvsignore:
-        * tests/Typedef_String_Array/.cvsignore:
-        * tests/UNKNOWN_Exception/.cvsignore:
-        * tests/Xt_Stopwatch/.cvsignore:
-        * utils/catior/.cvsignore:
-        * utils/nslist/.cvsignore:
-
-          Removed these files in favor of svn:ignore properties on the
-          parent directory.
-
-Sat Jan  6 07:07:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/fe/fe_lookup.cpp (lookup):
-          Make sure the signature is exactly the same as in the header
-          file, this should resolve the ld errors with HPUX IA64
-
-Sat Jan  6 00:06:52 UTC 2007  Steve Huston  <shuston@riverace.com>
-
-        * TAO_IDL/driver/drv_preproc.cpp: Removed the ACE_HAS_WINNT4 block -
-          everything runs on NT4 or up now, even when running TAO IDL for
-          building on Pharlap or CE.
-
-Fri Jan  5 22:51:37 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/ast_decl.h:
-
-          Small change to comment.
-
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/util/utl_global.cpp:
-
-          Changed logic of pushing/popping prefixes to/from
-          the IDL compiler's dedicated stack, to fix a
-          problem reported by Martin Corino <mcorino@remedy.nl>
-          related to #pragma prefix directives from included
-          IDL files and how they interact with the IDL
-          compiler's preprocessor.
-
-        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
-        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
-
-          Copied lines of code from the CCM preprocessing
-          visitor, which ensures that implied IDL nodes
-          will have the correct repository ids even if
-          the original node has its prefix modified later
-          in the IDL file. The same logic is now applied
-          to the AMI and AMH preprocessing visitors.
-
-Fri Jan  5 18:26:43 UTC 2007  Ciju John  <johnc@ociweb.com>
-
-        * docs/ORBEndpoint.html:
-          Update documentation for ORBEndpoint reuse_addr option.
-
-Fri Jan  5 17:09:35 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/Portable_Interceptors/Redirection/run_test.pl:
-
-          The sudden death of the first server is expected and is part of
-          the test. Changing the script to interpret the event
-          accordingly.
-
-Fri Jan  5 15:37:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/DynamicC.h:
-          Added typedef for _out_type to ParameterList, the IDL does
-          generate this but this file is handcrafted and not updated
-          when the IDL compiler was changed
-
-Fri Jan  5 15:07:46 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/IIOP/client.cpp:
-
-          Testing for minimum corba was wrong, causing invalid reference
-          to Object::_request member in minimum corba builds.
-
-Fri Jan  5 13:35:47 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * MPC/config/tc.mpb:
-
-          Added interceptors and pi as bases to ensure the derived
-          projects are not built prior, or without their prerequisites.
-
-        * tests/TransportCurrent/Framework/Framework.mpc:
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
-
-          Added tc (which derives from pi and interceptors) as base and
-          also simplified the base project lists. This ensures the tests
-          are skipped if TC is not built (for instance with
-          corba_e_compact).
-
-Fri Jan  5 13:07:32 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp (open_senders):
-
-          Switched from using a macro for the buffer length used in
-          gathering the ingore address as a string to using a literal
-          constant. This is consistent with common usage of addr_to_string
-          throughout the ACE/TAO codebase, and avoids adding potentially
-          system-specific includes at the application level.
-
-Fri Jan  5 13:04:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/ValueBox/client.cpp:
-          Renamed VERIFY to OBV_VERIFY to resolve redefinition warnings
-          in the MFC builds
-
-Fri Jan  5 11:00:00 UTC 2007  Simon Massey  <sma@prismtech.com>
-
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp:
-
-          Error if the typecode info is not available to display.
-
-Fri Jan  5 10:10:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/compression.mpb:
-          Removed pi as base, not needed. Thanks to JT for noticing this
-
-        * tao/Compression/Base_Compressor.h:
-          Make the members protected so that derived classes can access them
-
-        * tao/Compression/zlib/ZlibCompressor.cpp:
-          Fixed type of local variable
-
-Fri Jan  5 06:54:42 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefiles for new subdirectory.
-
-        * tests/Portable_Interceptors/Makefile.am:
-
-          Regenerate to descend into Redirection subdirectory.
-
-        * tests/Portable_Interceptors/Redirection/Makefile.am:
-
-          New Makefile.am.
-
-Fri Jan  5 06:51:11 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefiles for new subdirectory.
-
-        * tests/Makefile.am:
-
-          Regenerate to descend into Bug_2702_Regression subdirectory.
-
-        * tests/Bug_2702_Regression/Makefile.am:
-
-          New Makefile.am.
-
-Fri Jan  5 06:42:17 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/TransportCurrent/IIOP/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am
-
-          Regenerate.
-
-        * configure.ac:
-
-          Configure Makefiles for new subdirectory.
-
-        * tests/TransportCurrent/Makefile.am:
-
-          Regenerate to descend into lib subdirectory.
-
-        * tests/TransportCurrent/lib/Makefile.am:
-
-          New Makefile.am for library of common code for TransportCurrent
-          tests.
-
-        * tests/TransportCurrent/Framework/Framework.mpc:
-
-          Fix tpyo in after += specification.
-
-Fri Jan  5 04:09:08 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/lib/Client_ORBInitializer.h:
-        * tests/TransportCurrent/lib/Client_ORBInitializer.cpp:
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/lib/Current_Test_Impl.h:
-        * tests/TransportCurrent/lib/Server_ORBInitializer.h:
-        * tests/TransportCurrent/lib/Server_ORBInitializer.cpp:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
-
-          Thanks to Johnny Willemsen and Chris Cleeland for reminding
-          me. This change eliminates the use of the now deprecated ACE
-          exceptions macros.
-
-Fri Jan  5 03:35:00 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
-
-          Refactor the status message output in the open_senders() method
-          to make use of updated ACE_INET_Addr::addr_to_string() when
-          reporting IPv6 sender addresses.
-
-          Also, changed ECM_Federation::ECM_Federation() to force mapping
-          of supplier and consumer names to IPv4 format as the rest of the
-          code makes use of the now-obsolete assumption that an IP addr
-          fits into a long.
-
-Fri Jan  5 00:53:34 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Transport_Connector.cpp:
-        * tao/Strategies/UIOP_Connector.cpp:
-
-          Removed the warning generated if a trailing '/' was not present
-          if the default object key were desired. The '/' separator is
-          required only when an explicit object key is present. See
-          section 13.6.10.1 of CORBA 3.0.3 specification (formal/04-03-01)
-          to note that the slash is part of the object key portion of the
-          corbaloc string.
-
-Thu Jan  4 20:10:38 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          This is in addition to the change from "Thu Jan 4 04:11:02 UTC
-         2007". The aim is to resolve the linking problems on some
-         builds. Basically, I had a templatized ORB initializer (for
-         client and server side) which used to be pretty simple
-         anyway. This change eliminates the template and replaces it with
-         two simple classes.
-
-         The problem was that the Borland compiler was not seeing the
-         template instantiations. When I tried to fix that, the Windows VC
-         broke complaining about duplicate instantiations. In the end,
-         instead of mucking about with such a simple template I just
-         zapped it.
-
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/server.cpp:
-        * tests/TransportCurrent/IIOP/client.cpp:
-        * tests/TransportCurrent/IIOP/server.cpp:
-
-          Eliminated the trivial template usage for the ORB initializers,
-         where a simple class is sufficient.
-
-        * tests/TransportCurrent/lib/Client_ORBInitializer.h:
-        * tests/TransportCurrent/lib/Client_ORBInitializer.cpp:
-        * tests/TransportCurrent/lib/Server_ORBInitializer.cpp:
-        * tests/TransportCurrent/lib/Server_ORBInitializer.h:
-
-         Added as a replacement of the template.
-
-        * tests/TransportCurrent/Framework/run_test.pl:
-        * tests/TransportCurrent/IIOP/run_test.pl:
-
-          Modified so they now run on Windows, too. The problem was that
-         the ../lib was not part of the DLL search path on Windows and
-         there again, the path separator is ';'. The change ensures ../lib
-         is added to the PATH and introduces Config to pick the correct
-         separator.
-
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
-
-          Removed the partial template instantiation and replaced with two
-         simple classes. See above.
-
-        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
-
-          Updated to add pi to the list of base projects.
-
-        * tests/TransportCurrent/lib/ORBInitializer_T.h:
-        * tests/TransportCurrent/lib/ORBInitializer_T.cpp:
-
-          Removed these files.
-
-Thu Jan  4 19:55:35 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp (init):
-
-          Fixed conversion warnings in RTEMS build...the old .in() for a
-          _var problem.
-
-Thu Jan  4 16:32:38 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tests/Bug_2702_Regression/fakeserver2.pl:
-
-          Added "use" for Socket and IO::Socket packages.  The script
-          works just fine on many platforms without this for some reason,
-          but gave errors on the BCB build.
-
-Thu Jan  4 14:08:45 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
-
-          Regenerate.
-
-Thu Jan  4 14:00:16 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * tao/Makefile.am:
-        * tests/Compression/Makefile.am:
-
-          Tweak to use ACE_{ZLIB,ZZIP}_{CPPFLAGS,LDFLAGS,LIBS}
-          instead of -I${ZLIB_ROOT}/include, etc.  The former
-          are substituted by the configure script.
-
-        * configure.ac:
-
-          Use ACE_PATH_ZLIB and ACE_PATH_ZZIP autoconf macros.
-          zlib and zzip can now be enabled at configure time
-          with --with-zlib and --with-zzip.
-
-Thu Jan  4 13:55:18 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
-
-          Subtracted the -St option from idlflags in the custom_only idl
-          projects.  Prior to the split, the -St option was subtracted off
-          by the anytypecode base project.
-
-Thu Jan  4 11:33:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Compression/server.cpp:
-          Extended this test to test whether the correct exception
-          is thrown when we request an invalid compressor factory
-
-Thu Jan  4 04:11:02 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/Framework.mpc:
-        * tests/TransportCurrent/Framework/run_test.pl:
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
-        * tests/TransportCurrent/IIOP/client.cpp:
-        * tests/TransportCurrent/IIOP/run_test.pl:
-        * tests/TransportCurrent/IIOP/server.cpp:
-        * tests/TransportCurrent/lib:
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/lib/Current_Test.idl:
-        * tests/TransportCurrent/lib/Current_Test_Export.h:
-        * tests/TransportCurrent/lib/Current_Test_Impl.h:
-        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
-        * tests/TransportCurrent/lib/ORBInitializer_T.h:
-        * tests/TransportCurrent/lib/ORBInitializer_T.cpp:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
-
-          Split off the IDL and the common stuff fro the two tests into a
-          lib directory and adjusted the references. This will hopefully
-          deal with the build dependency issues we have been seeing
-          recently and will eliminate the cases of duplicate compilation
-          of the IDL. Thanks to Johnny Willemsen and J.T. Conklin for the
-          ideas.
-
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Current_Test.idl:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.h:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
-
-          Moved these files to lib directory.
-
-Wed Jan  3 22:23:57 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/Profile_Transport_Resolver.cpp:
-
-          Corrected the return value for find_transport. The comment in
-          the method wasn't very clear and so when the new safe transport
-          pointer code was added, the return value for success and failure
-          were inadvertently altered, which broke the optimized connection
-          strategy's endpoint selector
-
-        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
-
-          Fixed the name used in the ACE_RCSID tag.
-
-Wed Jan  3 19:53:43 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tao/tests/Bug_2702_Regression/server_on_localhost_1192.ior:
-
-          Added this file, which was somehow missed during the merge.
-          This should address test failures across all platforms.
-
-Wed Jan  3 19:50:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Compression/run_test.pl:
-          Added perl script to run this test automatically.
-
-Wed Jan  3 19:04:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
+          Fixed broken DynUnion support (see Bug #2785).
+
+Tue Jan 30 01:16:13 2007  James H. Hill     <hillj@isis.vanderbilt.edu>
+
+        * tao/Utils/Servant_Var.inl:
+
+          Fixed syntax error in catch (...) statements that was
+          prevent TAO from building in some cases.
+
+Mon Jan 29 19:27:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
+          Removed not needed return statements after ACE_THROW_RETURN, fixes
+          warnings with HP aCC on IA64
+
+Mon Jan 29 19:11:14 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Adapter_Registry.cpp:
+        * tao/AnyTypeCode/Any.cpp:
+        * tao/AnyTypeCode/Any_Array_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_Special_Impl_T.cpp:
+        * tao/AnyTypeCode/Any_SystemException.cpp:
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp:
+        * tao/AnyTypeCode/Empty_Param_TypeCode.cpp:
+        * tao/AnyTypeCode/ExceptionA.cpp:
+        * tao/AnyTypeCode/PolicyA.cpp:
+        * tao/AnyTypeCode/TypeCode.cpp:
+        * tao/AnyTypeCode/WrongTransactionA.cpp:
+        * tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * tao/Codeset/Codeset_Manager_Factory.cpp:
+        * tao/Codeset/Codeset_Translator_Factory.cpp:
+        * tao/Collocated_Invocation.cpp:
+        * tao/CORBANAME_Parser.cpp:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/CSD_Framework/CSD_Strategy_Base.inl
+        * tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
+        * tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Request.inl
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+        * tao/DynamicInterface/DII_Arguments.cpp:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * tao/DynamicInterface/Dynamic_Implementation.cpp:
+        * tao/EndpointPolicy/EndpointPolicy.cpp:
+        * tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp:
+        * tao/FILE_Parser.cpp:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/GIOP_Message_Base.h:
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/GIOP_Message_Lite.h:
+        * tao/HTTP_Parser.cpp:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+        * tao/IIOP_Acceptor.cpp:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/ImR_Client/ImR_Client.cpp:
         * tao/Invocation_Adapter.cpp:
-        * tao/Messaging/Asynch_Invocation.cpp:
-        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
-        * tao/Synch_Invocation.cpp:
-          Const improvements
-
-        * tao/Invocation_Base.cpp (handle_any_exception):
-          Check whether we had a location forward, if so, return
-          LOCATION_FORWARD. This fixes bugzilla bug 2763. Thanks to
-          Jaiganesh Balasubramanian for reporting this and testing
-          the patch.
-
-Wed Jan  3 18:47:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Redirection/test.idl:
-          Added missing Id tag.
-
-Wed Jan  3 16:05:58 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
-
-        * MPC/config/endpointpolicy.mpb:
-        * TAO_IDL/tao_idl.mpc:
-        * orbsvcs/Concurrency_Service/Concurrency_Service.mpc:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.mpc:
-        * orbsvcs/Dump_Schedule/Dump_Schedule.mpc:
-        * orbsvcs/Event_Service/Event_Service.mpc:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-        * orbsvcs/Fault_Detector/Fault_Detector.mpc:
-        * orbsvcs/Fault_Notifier/Fault_Notifier.mpc:
-        * orbsvcs/IFR_Service/IFR_Service.mpc:
-        * orbsvcs/LoadBalancer/LoadBalancer.mpc:
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
-        * orbsvcs/Naming_Service/Naming_Service.mpc:
-        * orbsvcs/Notify_Service/Notify_Service.mpc:
-        * orbsvcs/Scheduling_Service/Scheduling_Service.mpc:
-        * orbsvcs/TAO_Service/TAO_Service.mpc:
-        * orbsvcs/Time_Service/Time_Service.mpc:
-        * orbsvcs/Trading_Service/Trading_Service.mpc:
-        * orbsvcs/orbsvcs/AV.mpc:
-        * orbsvcs/orbsvcs/CosConcurrency.mpc:
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/CosLifeCycle.mpc:
-        * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
-        * orbsvcs/orbsvcs/CosNaming.mpc:
-        * orbsvcs/orbsvcs/CosNaming_Serv.mpc:
-        * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/CosProperty.mpc:
-        * orbsvcs/orbsvcs/CosTime.mpc:
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-        * orbsvcs/orbsvcs/ETCL.mpc:
-        * orbsvcs/orbsvcs/FTORB.mpc:
-        * orbsvcs/orbsvcs/FaultTolerance.mpc:
-        * orbsvcs/orbsvcs/FtRtEvent.mpc:
-        * orbsvcs/orbsvcs/HTIOP.mpc:
-        * orbsvcs/orbsvcs/IFRService.mpc:
-        * orbsvcs/orbsvcs/PortableGroup.mpc:
-        * orbsvcs/orbsvcs/RTCORBAEvent.mpc:
-        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
-        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
-        * orbsvcs/orbsvcs/RTKokyuEvent.mpc:
-        * orbsvcs/orbsvcs/RTSched.mpc:
-        * orbsvcs/orbsvcs/RTSchedEvent.mpc:
-        * orbsvcs/orbsvcs/RT_Notification.mpc:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-        * orbsvcs/orbsvcs/Security.mpc:
-        * orbsvcs/orbsvcs/Svc_Utils.mpc:
-        * tao/AnyTypeCode.mpc:
-        * tao/BiDir_GIOP.mpc:
-        * tao/CSD_Framework.mpc:
-        * tao/CSD_ThreadPool.mpc:
-        * tao/CodecFactory.mpc:
-        * tao/Codeset.mpc:
-        * tao/Compression.mpc:
-        * tao/Domain.mpc:
-        * tao/DynamicAny.mpc:
-        * tao/DynamicInterface.mpc:
-        * tao/EndpointPolicy.mpc:
-        * tao/FlResource.mpc:
-        * tao/IFR_Client.mpc:
-        * tao/IORInterceptor.mpc:
-        * tao/IORManipulation.mpc:
-        * tao/IORTable.mpc:
-        * tao/ImR_Client.mpc:
-        * tao/Messaging.mpc:
-        * tao/ObjRefTemplate.mpc:
-        * tao/PI.mpc:
-        * tao/PI_Server.mpc:
-        * tao/PortableServer.mpc:
-        * tao/QtResource.mpc:
-        * tao/RTCORBA.mpc:
-        * tao/RTPortableServer.mpc:
-        * tao/RTScheduler.mpc:
-        * tao/SmartProxies.mpc:
-        * tao/Strategies.mpc:
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
-        * tao/TkResource.mpc:
-        * tao/TypeCodeFactory.mpc:
-        * tao/Utils.mpc:
-        * tao/Valuetype.mpc:
-        * tao/XtResource.mpc:
-        * tao/ZlibCompressor.mpc:
-        * tao/tao.mpc:
-        * utils/catior/catior.mpc:
-        * utils/nslist/nslist.mpc:
-
-          Use the install base project instead of the deprecated core base
-          project.
-
-Wed Jan  3 15:18:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/Redirection/*:
-          New regression created by Jaiganesh Balasubramanian
-          <jai at dre dot vanderbilt dot edu> that reproduces a bug
-          in the handling of the PortableInterceptor::ForwardRequest
-          exception. Fix will follow later, see also bugzilla 2763
-
-Wed Jan  3 14:25:26 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * tao/Makefile.am:
-        * tests/Bug_2429_Regression/Makefile.am:
-
-          Fix tabs that were changed to eight spaces in some previous
-          checkin.
-
-Wed Jan  3 14:19:15 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/Collocation/Collocation.mpc:
-
-          Fixing build dependencies.
-
-Wed Jan  3 13:19:03 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-        * tests/Bug_2702_Regression/fakeserver2.pl: Added Id string to
-          fix fuzz build.
-
-Wed Jan  3 05:58:08 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
-
-          This entry documents the merge of several small bug fixes from
-          the OCI distribution.
-
-        * orbsvcs/Notify_Service/README:
-
-          Add documentation for the new "-UseSeparateDispatchingORB"
-          option.
-
-        * orbsvcs/Notify_Service/Notify_Service.h:
-        * orbsvcs/Notify_Service/Notify_Service.cpp:
-
-          Add new methods for creating the dispatching ORB and a flag for
-          indicating whether a separate dispatching ORB should be used.
-
-        * orbsvcs/orbsvcs/Notify/Properties.h:
-        * orbsvcs/orbsvcs/Notify/Properties.inl:
-        * orbsvcs/orbsvcs/Notify/Properties.cpp:
-
-          Added methods and data member related to managing the separate
-          dispatching ORB.
-
-        * orbsvcs/orbsvcs/Notify/Properties.h (instance):
-        * orbsvcs/orbsvcs/Notify/Properties.cpp (instance):
-        * orbsvcs/orbsvcs/Notify/RT_Properties.h (instance):
-        * orbsvcs/orbsvcs/Notify/RT_Properties.cpp (instance):
-
-          Merged in a change similar to "Thu May 19 00:29:35 2005  Ossama
-          Othman  <ossama@dre.vanderbilt.edu>" that avoids multiple
-          singleton instances of the Properties singleton.
-
-        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp (init):
-        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp (init):
-        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp (init):
-
-          Similar change in all three of these places substitutes
-          _unchecked_narrow() for _narrow() when using the "re-hosting"
-          technique for the a separate dispatching ORB.  For the reference
-          to the consumer itself, the _unchecked_narrow() is perfectly
-          fine because we had a reference to something of that type
-          already.  For the NotifyPublish narrowing, though, the
-          _unchecked_narrow() isn't completely sufficient.  However, we
-          want to avoid a normal _narrow() because the resulting _is_a()
-          invocation could end up deadlocking if the POA that's hosting
-          the object reference for the consumer has not yet been
-          activated.  Thus, we use pseudo-lazy evaluation for that,
-          described in the entry for Consumer.{h,cpp} below.
-
-        * orbsvcs/orbsvcs/Notify/Consumer.h:
-
-          Added a flag, have_not_yet_verified_publish_, that indicates
-          whether the type of this->publish_ has been verified to actually
-          be a reference to something implementing the NotifyPublish
-          interface.
-
-        * orbsvcs/orbsvcs/Notify/Consumer.cpp (CTOR, dispatch_updates_i):
-
-          Modified CTOR to initialize the aforementioned flag.  In
-          dispatch_updates_i, we assume that the reference is unverified
-          until we've checked it once.  I don't think we need to worry
-          about thread safety here...at least I hope not.
-
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.h (init_service2, init_i2):
-        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp (init_service2, init_i2):
-
-          Added code to parse the new option.
-
-        * orbsvcs/orbsvcs/Notify/POA_Helper.cpp (create_i, activate):
-
-          Corrected some minor memory leaks when getting the name of a
-          POA.
-
-        * orbsvcs/tests/Notify/Basic/run_test.pl:
-        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
-
-          Added an outer loop that runs the basic tests with and without a
-          separate dispatching ORB.
-
-        * tao/ObjectKey_Table.h:
+        * tao/Invocation_Base.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+        * tao/IORInterceptor_Adapter.h:
+        * tao/IORTable/IOR_Table_Impl.cpp:
+        * tao/IORTable/IOR_Table_Impl.h:
+        * tao/IORTable/Table_Adapter.cpp:
+        * tao/Leader_Follower_Flushing_Strategy.cpp:
+        * tao/LF_Connect_Strategy.cpp:
+        * tao/LF_Connect_Strategy.h:
+        * tao/LF_Event.cpp:
+        * tao/LF_Event.h:
+        * tao/LF_Event_Binder.h:
+        * tao/LF_Follower_Auto_Adder.h:
+        * tao/LF_Strategy_Complete.h:
+        * tao/LocateRequest_Invocation.cpp:
+        * tao/LocateRequest_Invocation_Adapter.cpp:
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp:
+        * tao/Messaging/Messaging_Loader.cpp:
+        * tao/Messaging/Messaging_ORBInitializer.cpp:
+        * tao/Messaging/Messaging_Policy_i.cpp:
+        * tao/MProfile.cpp:
+        * tao/Muxed_TMS.cpp:
+        * tao/Null_Fragmentation_Strategy.cpp:
+        * tao/Null_Fragmentation_Strategy.h:
+        * tao/NVList_Adapter.h:
+        * tao/Object.cpp:
+        * tao/Object.h:
+        * tao/Object_T.cpp:
         * tao/ObjectKey_Table.cpp:
-        * tao/Unbounded_Octet_Sequence_T.h:
-
-          Added an optimization to servant activation.  This change
-          removes the overhead of calling TAO::ObjectKey::operator[] and
-          TAO::unbounded_value_sequence<CORBA::Octet>::operator[].  The
-          main benefit of not calling these methods is that check_bounds()
-          is not called.  check_bounds () is not required since the
-          length of the two arrays are taken into account.  This change
-          provides about 30% decrease in servant activation time for a
-          debug build (tested on Windows VC71 and Linux gcc using OCITAO
-          1.4a).  The implementation uses ACE_OS::memcmp which could
-          possibly be optimized similar to ACE_HAS_SLOW_MEMSET.  This
-          change originated from OCITAO 1.4a as part of RT 8571.
-
-        * tao/GIOP_Message_State.cpp (parse_message_header_i):
-
-          Fixed a problem where TAO mistakenly considered ALL messages
-          with zero-length payload to be errors and was thus not
-          properly parsing and handling the GIOP CloseConnection
-          message.
-
-        * tao/GIOP_Utils.h:
-
-          Corrected comment incorrectly indicating that
-          CloseConnection could not be send by both sides of a
-          connection.
-
-        * tests/Bug_2702_Regression/CloseConnection.mpc:
-        * tests/Bug_2702_Regression/README:
-        * tests/Bug_2702_Regression/Test.idl:
-        * tests/Bug_2702_Regression/client.cpp:
-        * tests/Bug_2702_Regression/closeconnection.dat:
-        * tests/Bug_2702_Regression/fakeserver.pm:
-        * tests/Bug_2702_Regression/fakeserver2.pl:
-        * tests/Bug_2702_Regression/run_test.pl:
-
-          Added a test to simulate the receipt of a CloseConnection in a
-          client, similar to what the original reporter experienced.
-          See the accompanying README for details.
-
-        * orbsvcs/tests/Bug_1393_Regression/run_test.pl:
-        * orbsvcs/tests/Bug_1395_Regression/run_test.pl:
-        * orbsvcs/tests/Bug_1436_Regression/run_test.pl:
-        * orbsvcs/tests/Bug_1437_Regression/run_test.pl:
-        * orbsvcs/tests/Bug_2615_Regression/run_test.pl:
-        * orbsvcs/tests/Event/Performance/run_test.pl:
-        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
-        * orbsvcs/tests/ImplRepo/locked/run_test.pl:
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:
-        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl:
-        * orbsvcs/tests/RTCosScheduling/run_test.pl:
-        * orbsvcs/tests/Security/Big_Request/run_test.pl:
-        * orbsvcs/tests/Security/Callback/run_test.pl:
-        * orbsvcs/tests/Security/Secure_Invocation/run_test.pl:
-        * tests/COIOP/run_test.pl:
-        * tests/DLL_ORB/run_test.pl:
-        * tests/Portable_Interceptors/IORInterceptor/run_test.pl:
-        * tests/Portable_Interceptors/PICurrent/run_test.pl:
-        * tests/Portable_Interceptors/PolicyFactory/run_test.pl:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl:
-        * utils/nslist/run_test.pl:
-
-          Changed relative paths to $ACE_ROOT/bin in these scripts to
-          reference directly via the ACE_ROOT environment variable so
-          that the scripts would work properly when run in a workspace
-          that does not use the traditional everything-under-ACE_wrappers
-          directory hierarchy.
-
-Wed Jan  3 00:51:49 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/client.cpp:
-
-          Clarified the conditional compilation for TAO_HAS_MINIMUM_CORBA.
-
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
-
-          Qualified a constant with the Test:: workspace prefix.
-
-Tue Jan  2 16:32:36 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * tao/PI/PICurrent.h:
-        * tao/PI/PICurrent.cpp:
-          extern "C" linkage CANNOT be added to a class member.
-
-Tue Jan  2 14:07:36 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * tao/PI/PICurrent.h:
-          Add extern "C" linkage to the cleanup function.
-
-Tue Jan  2 14:07:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc:
-        * tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc:
-        * tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc:
-        * MPC/config/csd_tp_foo_a_lib.mpb:
-        * MPC/config/csd_tp_foo_b_lib.mpb:
-        * MPC/config/csd_tp_foo_c_lib.mpb:
-          Disabled with CORBA/e micro
-
-Tue Jan  2 12:45:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_operation/argument.cpp:
-          Fixed variable not used warning
-
-Tue Jan  2 11:50:57 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
-
-          Removing the trivial post_init() template implementation added
-          on Sun Dec 31 17:27:27 UTC 2006 because it confuses the Windows
-          builds.
-
-Tue Jan  2 09:13:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Removed support from the IDL compiler for -Ge 0 and -Ge 1. We
-        now always generate without enviroment macros. -Ge 2 is still there
-        but probably gets removed also soon
-
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_helper.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
-        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/argument.cpp:
-        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
-        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/arglist.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_helper.h:
-        * TAO_IDL/be_include/be_visitor_operation/operation.h:
-          Removed environment macro support
-
-        * docs/compiler.h:tml
-        * docs/tutorials/Quoter/AMI/Makefile.am:
-        * docs/tutorials/Quoter/Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/idl/Makefile.am:
-        * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
-        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
-        * docs/tutorials/Quoter/RTCORBA/Makefile.am:
-        * examples/Advanced/ch_3/Makefile.am:
-        * examples/AMH/Sink_Server/Makefile.am:
-        * examples/AMI/FL_Callback/Makefile.am:
-        * examples/Buffered_AMI/Makefile.am:
-        * examples/Buffered_Oneways/Makefile.am:
-        * examples/Callback_Quoter/Makefile.am:
-        * examples/Content_Server/AMI_Iterator/Makefile.am:
-        * examples/Content_Server/AMI_Observer/Makefile.am:
-        * examples/Content_Server/SMI_Iterator/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool4/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool/Makefile.am:
-        * examples/Event_Comm/Makefile.am:
-        * examples/ior_corbaloc/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
-        * examples/Load_Balancing/Makefile.am:
-        * examples/Load_Balancing_persistent/Makefile.am:
-        * examples/Logging/Makefile.am:
-        * examples/mfc/Makefile.am:
-        * examples/OBV/Typed_Events/Makefile.am:
-        * examples/Persistent_Grid/Makefile.am:
-        * examples/PluggableUDP/tests/Basic/Makefile.am:
-        * examples/PluggableUDP/tests/Performance/Makefile.am:
-        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
-        * examples/POA/Default_Servant/Makefile.am:
-        * examples/POA/DSI/Makefile.am:
-        * examples/POA/Forwarding/Makefile.am:
-        * examples/POA/Generic_Servant/Makefile.am:
-        * examples/POA/TIE/Makefile.am:
-        * examples/Quoter/Makefile.am:
-        * examples/RTCORBA/Activity/Makefile.am:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-        * examples/RTScheduling/Makefile.am:
-        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
-        * examples/Simple/bank/Makefile.am:
-        * examples/Simple/chat/Makefile.am:
-        * examples/Simple/echo/Makefile.am:
-        * examples/Simple/grid/Makefile.am:
-        * examples/Simple/time-date/Makefile.am:
-        * examples/Simple/time/Makefile.am:
-        * examples/Simulator/Event_Supplier/Makefile.am:
-        * examples/TypeCode_Creation/Makefile.am:
-        * interop-tests/wchar/Makefile.am:
-        * MPC/config/taoidldefaults.mpb:
-        * orbsvcs/examples/CosEC/Factory/Makefile.am:
-        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
-        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
-        * orbsvcs/examples/ImR/Advanced/Makefile.am:
-        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
-        * orbsvcs/examples/LoadBalancing/Makefile.am:
-        * orbsvcs/examples/ORT/Makefile.am:
-        * orbsvcs/examples/Security/Send_File/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * orbsvcs/orbsvcs/HTIOP.mpc:
-        * orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pid:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/orbsvcs/SSLIOP.mpc:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
-        * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
-        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2615_Regression/Makefile.am:
-        * orbsvcs/tests/Bug_2709_Regression/Makefile.am:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/Event/UDP/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
-        * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
-        * orbsvcs/tests/FT_App/Makefile.am:
-        * orbsvcs/tests/HTIOP/AMI/Makefile.am:
-        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
-        * orbsvcs/tests/HTIOP/Hello/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
-        * orbsvcs/tests/ImplRepo/scale/Makefile.am:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
-        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
-        * orbsvcs/tests/ior_corbaname/Makefile.am:
-        * orbsvcs/tests/IOR_MCast/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
-        * orbsvcs/tests/Miop/McastHello/Makefile.am:
-        * orbsvcs/tests/Notify/Blocking/Makefile.am:
-        * orbsvcs/tests/Notify/Discarding/Makefile.am:
-        * orbsvcs/tests/Notify/lib/Makefile.am:
-        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
-        * orbsvcs/tests/Notify/Ordering/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
-        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
-        * orbsvcs/tests/Redundant_Naming/Makefile.am:
-        * orbsvcs/tests/Security/BiDirectional/Makefile.am:
-        * orbsvcs/tests/Security/Big_Request/Makefile.am:
-        * orbsvcs/tests/Security/Callback/Makefile.am:
-        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
-        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
-        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
-        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
-        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
-        * orbsvcs/tests/Simple_Naming/Makefile.am:
-        * orbsvcs/tests/Trading/Makefile.am:
-        * performance-tests/Anyop/Makefile.am:
-        * performance-tests/Callback/Makefile.am:
-        * performance-tests/CSD_Strategy/TestInf/Makefile.am:
-        * performance-tests/CSD_Strategy/TestServant/Makefile.am:
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
-        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Latency/AMI/Makefile.am:
-        * performance-tests/Latency/Collocation/Makefile.am:
-        * performance-tests/Latency/Deferred/Makefile.am:
-        * performance-tests/Latency/DII/Makefile.am:
-        * performance-tests/Latency/DSI/Makefile.am:
-        * performance-tests/Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Memory/IORsize/Makefile.am:
-        * performance-tests/Memory/Single_Threaded/Makefile.am:
-        * performance-tests/Pluggable/Makefile.am:
-        * performance-tests/POA/Demux/Makefile.am:
-        * performance-tests/POA/Implicit_Activation/Makefile.am:
-        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
-        * performance-tests/Protocols/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
-        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
-        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/AMI/Makefile.am:
-        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
-        * performance-tests/Sequence_Latency/DII/Makefile.am:
-        * performance-tests/Sequence_Latency/DSI/Makefile.am:
-        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Throughput/Makefile.am:
-        * tao/AnyTypeCode.mpc:
-        * tao/AnyTypeCode/AnySeq.pid:
-        * tao/AnyTypeCode/Bounds.pid:
-        * tao/AnyTypeCode/Dynamic.pid:
-        * tao/AnyTypeCode/Dynamic_Parameter.pid:
-        * tao/AnyTypeCode/ValueModifier.pid:
-        * tao/AnyTypeCode/Visibility.pid:
-        * tao/BiDir_GIOP.mpc:
-        * tao/BiDir_GIOP/BiDirPolicy.pid:
-        * tao/BooleanSeq.pid:
-        * tao/CharSeq.pid:
-        * tao/CodecFactory.mpc:
-        * tao/CodecFactory/IOP_Codec.pid:
-        * tao/Compression.mpc:
-        * tao/Compression/TAO_Compression.pc.in
-        * tao/CONV_FRAME.pid:
-        * tao/CSD_Framework.mpc:
-        * tao/CSD_Framework/CSD_Framework.pid:
-        * tao/Current.pid:
-        * tao/Domain.pid:
-        * tao/DoubleSeq.pid:
-        * tao/DynamicAny.mpc:
-        * tao/EndpointPolicy.mpc:
-        * tao/EndpointPolicy/EndpointPolicyType.pid:
-        * tao/FloatSeq.pid:
-        * tao/GIOP.pid:
-        * tao/IFR_Client.mpc:
-        * tao/IFR_Client/IFR_Base.pid:
-        * tao/IFR_Client/IFR_Basic.pid:
-        * tao/IFR_Client/IFR_Components.pid:
-        * tao/IFR_Client/IFR_Extended.pid:
-        * tao/IIOP.pid:
-        * tao/IIOP_Endpoints.pid:
-        * tao/ImR_Client.mpc:
-        * tao/ImR_Client/ImplRepo.pid:
-        * tao/ImR_Client/ServerObject.pid:
-        * tao/InvalidName.pid:
-        * tao/IOP.pid:
-        * tao/IOP_IOR.pid:
-        * tao/IORInterceptor.mpc:
-        * tao/IORInterceptor/IORInfo.pid:
-        * tao/IORInterceptor/IORInterceptor.pid:
-        * tao/IORManipulation.mpc:
-        * tao/IORManipulation/IOR.pid:
-        * tao/IORTable.mpc:
-        * tao/IORTable/IORTable.pid:
-        * tao/LongDoubleSeq.pid:
-        * tao/LongLongSeq.pid:
-        * tao/LongSeq.pid:
-        * tao/Makefile.am:
-        * tao/Messaging.mpc:
-        * tao/Messaging/ExceptionHolder.pid:
-        * tao/Messaging/Messaging.pid:
-        * tao/Messaging/Messaging_No_Impl.pid:
-        * tao/Messaging/Messaging_RT_Policy.pid:
-        * tao/Messaging/Messaging_SyncScope_Policy.pid:
-        * tao/Messaging/Messaging_Types.pid:
-        * tao/Messaging/Pollable.pid:
-        * tao/Messaging/TAO_Ext.pid:
-        * tao/Messaging_PolicyValue.pid:
-        * tao/Object_Key.pid:
-        * tao/ObjectIdList.pid:
-        * tao/ObjRefTemplate.mpc:
-        * tao/ObjRefTemplate/Default_ORT.pid:
-        * tao/OctetSeq.pid:
-        * tao/orb_types.pid:
-        * tao/ParameterMode.pid:
-        * tao/PI.mpc:
-        * tao/PI/ClientRequestInfo.pid:
-        * tao/PI/ClientRequestInterceptor.pid:
-        * tao/PI/Interceptor.pid:
-        * tao/PI/InvalidSlot.pid:
-        * tao/PI/ORBInitializer.pid:
-        * tao/PI/ORBInitInfo.pid:
-        * tao/PI/PICurrent.pid:
-        * tao/PI/PIForwardRequest.pid:
-        * tao/PI/PolicyFactory.pid:
-        * tao/PI/ProcessingModePolicy.pid:
-        * tao/PI/RequestInfo.pid:
-        * tao/PI_Forward.pid:
-        * tao/PI_Server.mpc:
-        * tao/PI_Server/ServerRequestInfo.pid:
-        * tao/PI_Server/ServerRequestInterceptor.pid:
-        * tao/Policy.pid:
-        * tao/Policy_Forward.pid:
-        * tao/PortableInterceptor.pid:
-        * tao/PortableServer.mpc:
-        * tao/PortableServer/POA.pid:
-        * tao/PortableServer/POAManagerFactory.pid:
-        * tao/PortableServer/PortableServer.pid:
-        * tao/PortableServer/PS_Forward.pid:
-        * tao/PortableServer/RequestProcessingPolicy.pid:
-        * tao/PortableServer/ServantActivator.pid:
-        * tao/PortableServer/ServantLocator.pid:
-        * tao/PortableServer/ServantManager.pid:
-        * tao/PortableServer/ServantRetentionPolicy.pid:
-        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
-        * tao/PortableServer/ThreadPolicy.pid:
-        * tao/RTCORBA.mpc:
-        * tao/RTCORBA/diffs/RTCORBA.diff
-        * tao/RTCORBA/RTCORBA.pid:
-        * tao/RTCORBA/RTCORBAC.cpp:
-        * tao/RTPortableServer.mpc:
-        * tao/RTPortableServer/RTPortableServer.pid:
-        * tao/RTScheduler.mpc:
-        * tao/RTScheduling/RTScheduler.pid:
-        * tao/Services.pid:
-        * tao/ShortSeq.pid:
-        * tao/Strategies.mpc:
-        * tao/Strategies/COIOP_Endpoints.pid:
-        * tao/Strategies/sciop_endpoints.pid:
-        * tao/Strategies/uiop_endpoints.pid:
-        * tao/StringSeq.pid:
-        * tao/tao.mpc:
-        * tao/TAO.pid:
-        * tao/TimeBase.pid:
-        * tao/TypeCodeFactory.mpc:
-        * tao/TypeCodeFactory_Adapter.cpp:
-        * tao/TypeCodeFactory_Adapter.h:
-        * tao/ULongLongSeq.pid:
-        * tao/ULongSeq.pid:
-        * tao/UShortSeq.pid:
-        * tao/Valuetype.mpc:
-        * tao/Wait_Strategy.cpp:
-        * tao/WCharSeq.pid:
-        * tao/WrongTransaction.pid:
-        * tao/WStringSeq.pid:
-        * tests/Abstract_Interface/Makefile.am:
-        * tests/AMH_Exceptions/Makefile.am:
-        * tests/AMH_Oneway/Makefile.am:
-        * tests/AMI/Makefile.am:
-        * tests/AMI_Buffering/Makefile.am:
-        * tests/AMI_Timeouts/Makefile.am:
-        * tests/Any/Recursive/Makefile.am:
-        * tests/BiDirectional/Makefile.am:
-        * tests/BiDirectional_DelayedUpcall/Makefile.am:
-        * tests/BiDirectional_NestedUpcall/Makefile.am:
-        * tests/Big_AMI/Makefile.am:
-        * tests/Big_Oneways/Makefile.am:
-        * tests/Big_Reply/Makefile.am:
-        * tests/Big_Request_Muxing/Makefile.am:
-        * tests/Big_Twoways/Makefile.am:
-        * tests/Blocking_Sync_None/Makefile.am:
-        * tests/Bug_1020_Basic_Regression/Makefile.am:
-        * tests/Bug_1020_Regression/Makefile.am:
-        * tests/Bug_1254_Regression/Makefile.am:
-        * tests/Bug_1269_Regression/Makefile.am:
-        * tests/Bug_1270_Regression/Makefile.am:
-        * tests/Bug_1330_Regression/Makefile.am:
-        * tests/Bug_1361_Regression/Makefile.am:
-        * tests/Bug_1476_Regression/Makefile.am:
-        * tests/Bug_1476_Test/Makefile.am:
-        * tests/Bug_1482_Regression/Makefile.am:
-        * tests/Bug_1495_Regression/Makefile.am:
-        * tests/Bug_1535_Regression/bug_1535_regression.cpp:
-        * tests/Bug_1535_Regression/Bug_1535_Regression.mpc:
-        * tests/Bug_1535_Regression/Makefile.am:
-        * tests/Bug_1535_Regression/Test.cpp:
-        * tests/Bug_1535_Regression/Test.h:
-        * tests/Bug_1551_Regression/Makefile.am:
-        * tests/Bug_1568_Regression/Makefile.am:
-        * tests/Bug_1627_Regression/Makefile.am:
-        * tests/Bug_1636_Regression/Makefile.am:
-        * tests/Bug_1639_Regression/Makefile.am:
-        * tests/Bug_1670_Regression/Makefile.am:
-        * tests/Bug_1676_Regression/Makefile.am:
-        * tests/Bug_1693_Test/Makefile.am:
-        * tests/Bug_1812_Regression/Makefile.am:
-        * tests/Bug_1813_Regression/Makefile.am:
-        * tests/Bug_1869_Regression/Makefile.am:
-        * tests/Bug_1904_Regression/Makefile.am:
-        * tests/Bug_2084_Regression/Makefile.am:
-        * tests/Bug_2119_Regression/Makefile.am:
-        * tests/Bug_2122_Regression/Makefile.am:
-        * tests/Bug_2124_Regression/Makefile.am:
-        * tests/Bug_2126_Regression/Makefile.am:
-        * tests/Bug_2134_Regression/Makefile.am:
-        * tests/Bug_2144_Regression/Makefile.am:
-        * tests/Bug_2174_Regression/Makefile.am:
-        * tests/Bug_2183_Regression/Makefile.am:
-        * tests/Bug_2186_Regression/Makefile.am:
-        * tests/Bug_2188_Regression/Makefile.am:
-        * tests/Bug_2201_Regression/Makefile.am:
-        * tests/Bug_2222_Regression/Makefile.am:
-        * tests/Bug_2234_Regression/Makefile.am:
-        * tests/Bug_2289_Regression/Makefile.am:
-        * tests/Bug_2319_Regression/Makefile.am:
-        * tests/Bug_2328_Regression/Makefile.am:
-        * tests/Bug_2349_Regression/Makefile.am:
-        * tests/Bug_2375_Regression/Makefile.am:
-        * tests/Bug_2399_Regression/Makefile.am:
-        * tests/Bug_2417_Regression/Makefile.am:
-        * tests/Bug_2419_Regression/Makefile.am:
-        * tests/Bug_2424_Regression/Makefile.am:
-        * tests/Bug_2429_Regression/Bug_2429_Regression.mpc:
-        * tests/Bug_2429_Regression/Makefile.am:
-        * tests/Bug_2494_Regression/Makefile.am:
-        * tests/Bug_2503_Regression/Makefile.am:
-        * tests/Bug_2542_Regression/Makefile.am:
-        * tests/Bug_2543_Regression/bug_2543_regression.cpp:
-        * tests/Bug_2543_Regression/Makefile.am:
-        * tests/Bug_2549_Regression/Makefile.am:
-        * tests/Bug_2560_Regression/Makefile.am:
-        * tests/Bug_2593_Regression/Makefile.am:
-        * tests/Bug_2595_Regression/Makefile.am:
-        * tests/Bug_2654_Regression/Makefile.am:
-        * tests/Bug_2669_Regression/Makefile.am:
-        * tests/Bug_2683_Regression/Makefile.am:
-        * tests/Cache_Growth_Test/Makefile.am:
-        * tests/CallbackTest/Makefile.am:
-        * tests/Client_Leaks/Makefile.am:
-        * tests/Codec/Makefile.am:
-        * tests/CodeSets/simple/Makefile.am:
-        * tests/COIOP/Makefile.am:
-        * tests/Collocation/Makefile.am:
-        * tests/Collocation_Exception_Test/Makefile.am:
-        * tests/Collocation_Oneway_tests/Makefile.am:
-        * tests/Collocation_Opportunities/Makefile.am:
-        * tests/Collocation_tests/Makefile.am:
-        * tests/CollocationLockup/Makefile.am:
-        * tests/Connect_Strategy_Test/Makefile.am:
-        * tests/Connection_Failure/Makefile.am:
-        * tests/Connection_Purging/Makefile.am:
-        * tests/Connection_Timeout/Makefile.am:
-        * tests/Crash_On_Write/Makefile.am:
-        * tests/Crashed_Callback/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Common/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Foo_A/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Foo_B/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Foo_C/Makefile.am:
-        * tests/CSD_Strategy_tests/TP_Test_Dynamic/Makefile.am:
-        * tests/DII_Collocation_tests/oneway/Makefile.am:
-        * tests/DII_Collocation_tests/twoway/Makefile.am:
-        * tests/DLL_ORB/Makefile.am:
-        * tests/DSI_Gateway/Makefile.am:
-        * tests/DynAny_Test/Makefile.am:
-        * tests/Explicit_Event_Loop/Makefile.am:
-        * tests/Exposed_Policies/Makefile.am:
-        * tests/Faults/Makefile.am:
-        * tests/File_IO/Makefile.am:
-        * tests/FL_Cube/Makefile.am:
-        * tests/Forwarding/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Request/Makefile.am:
-        * tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am:
-        * tests/Hang_Shutdown/Makefile.am:
-        * tests/Hello/Makefile.am:
-        * tests/ICMG_Any_Bug/Makefile.am:
-        * tests/IDL_Test/Makefile.am:
-        * tests/InterOp-Naming/Makefile.am:
-        * tests/IOR_Endpoint_Hostnames/Makefile.am:
-        * tests/IPV6/Makefile.am:
-        * tests/Leader_Followers/Makefile.am:
-        * tests/LongUpcalls/Makefile.am:
-        * tests/MProfile/Makefile.am:
-        * tests/MProfile_Connection_Timeout/Makefile.am:
-        * tests/MProfile_Forwarding/Makefile.am:
-        * tests/MT_BiDir/Makefile.am:
-        * tests/MT_Client/Makefile.am:
-        * tests/MT_Server/Makefile.am:
-        * tests/MT_Timeout/Makefile.am:
-        * tests/Multiple/Makefile.am:
-        * tests/Multiple_Inheritance/Makefile.am:
-        * tests/Muxed_GIOP_Versions/Makefile.am:
-        * tests/Muxing/Makefile.am:
-        * tests/Native_Exceptions/Makefile.am:
-        * tests/Nested_Event_Loop/Makefile.am:
-        * tests/Nested_Upcall_Crash/Makefile.am:
-        * tests/NestedUpcall/MT_Client_Test/Makefile.am:
-        * tests/NestedUpcall/Simple/Makefile.am:
-        * tests/NestedUpcall/Triangle_Test/Makefile.am:
-        * tests/No_Server_MT_Connect_Test/Makefile.am:
-        * tests/Object_Loader/Makefile.am:
-        * tests/Objref_Sequence_Test/Makefile.am:
-        * tests/OBV/Any/Makefile.am:
-        * tests/OBV/Collocated/Forward/Makefile.am:
-        * tests/OBV/Factory/Makefile.am:
-        * tests/OBV/Forward/Makefile.am:
-        * tests/OBV/Simple/Makefile.am:
-        * tests/OBV/TC_Alignment/Makefile.am:
-        * tests/OBV/Truncatable/Makefile.am:
-        * tests/OBV/ValueBox/Makefile.am:
-        * tests/OctetSeq/Makefile.am:
-        * tests/Ondemand_Write/Makefile.am:
-        * tests/Oneway_Buffering/Makefile.am:
-        * tests/Oneway_Timeouts/Makefile.am:
-        * tests/Oneways_Invoking_Twoways/Makefile.am:
-        * tests/Optimized_Connection/Makefile.am:
-        * tests/ORB_init/Portspan/Makefile.am:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am:
-        * tests/ORB_shutdown/Makefile.am:
-        * tests/ORT/Makefile.am:
-        * tests/Parallel_Connect_Strategy/Makefile.am:
-        * tests/Param_Test/Makefile.am:
-        * tests/POA/Bug_2511_Regression/Makefile.am:
-        * tests/POA/Deactivate_Object/Makefile.am:
-        * tests/POA/Default_Servant/Makefile.am:
-        * tests/POA/EndpointPolicy/Makefile.am:
-        * tests/POA/Etherealization/Makefile.am:
-        * tests/POA/Excessive_Object_Deactivations/Makefile.am:
-        * tests/POA/Identity/Makefile.am:
-        * tests/POA/MT_Servant_Locator/Makefile.am:
-        * tests/POA/Nested_Non_Servant_Upcalls/Makefile.am:
-        * tests/POA/Non_Servant_Upcalls/Makefile.am:
-        * tests/POA/Object_Reactivation/Makefile.am:
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/POA/POA_Destruction/Makefile.am:
-        * tests/POA/Reference_Counting/Makefile.am:
-        * tests/POA/Single_Threaded_POA/Makefile.am:
-        * tests/POA/wait_for_completion/Makefile.am:
-        * tests/Policies/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlot/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlotExt/Makefile.am:
-        * tests/Portable_Interceptors/AMI/Makefile.am:
-        * tests/Portable_Interceptors/Benchmark/Makefile.am:
-        * tests/Portable_Interceptors/Bug_1559/Makefile.am:
-        * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am:
-        * tests/Portable_Interceptors/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/ForwardRequest/Makefile.am:
-        * tests/Portable_Interceptors/IORInterceptor/Makefile.am:
-        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
-        * tests/Portable_Interceptors/PICurrent/Makefile.am:
-        * tests/Portable_Interceptors/PolicyFactory/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
-        * tests/Portable_Interceptors/Register_Initial_References/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
-        * tests/QtTests/Makefile.am:
-        * tests/Reliable_Oneways/Makefile.am:
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am:
-        * tests/RTCORBA/Banded_Connections/Makefile.am:
-        * tests/RTCORBA/Client_Propagated/Makefile.am:
-        * tests/RTCORBA/Client_Protocol/Makefile.am:
-        * tests/RTCORBA/Collocation/Makefile.am:
-        * tests/RTCORBA/Diffserv/Makefile.am:
-        * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am:
-        * tests/RTCORBA/Explicit_Binding/Makefile.am:
-        * tests/RTCORBA/Linear_Priority/Makefile.am:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am:
-        * tests/RTCORBA/Persistent_IOR/Makefile.am:
-        * tests/RTCORBA/Policy_Combinations/Makefile.am:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am:
-        * tests/RTCORBA/Private_Connection/Makefile.am:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am:
-        * tests/RTCORBA/Server_Declared/Makefile.am:
-        * tests/RTCORBA/Server_Protocol/Makefile.am:
-        * tests/RTCORBA/Thread_Pool/Makefile.am:
-        * tests/RTScheduling/Scheduling_Interceptor/Makefile.am:
-        * tests/RTScheduling/VoidData/Makefile.am:
-        * tests/Servant_To_Reference_Test/Makefile.am:
-        * tests/Server_Connection_Purging/Makefile.am:
-        * tests/Server_Leaks/Makefile.am:
-        * tests/Server_Port_Zero/Makefile.am:
-        * tests/Single_Read/Makefile.am:
-        * tests/Smart_Proxies/Benchmark/Makefile.am:
-        * tests/Smart_Proxies/Collocation/Makefile.am:
-        * tests/Smart_Proxies/dtor/Makefile.am:
-        * tests/Smart_Proxies/Makefile.am:
-        * tests/Smart_Proxies/On_Demand/Makefile.am:
-        * tests/Smart_Proxies/Policy/Makefile.am:
-        * tests/Stack_Recursion/Makefile.am:
-        * tests/Strategies/Makefile.am:
-        * tests/Timed_Buffered_Oneways/Makefile.am:
-        * tests/Timeout/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am:
-        * tests/TransportCurrent/IIOP/Makefile.am:
-        * tests/Two_Objects/Makefile.am:
-        * tests/Typedef_String_Array/Makefile.am:
-        * tests/UNKNOWN_Exception/Makefile.am:
-        * tests/Xt_Stopwatch/Makefile.am:
-          Removed any occurence of -Ge 1
-
-Sun Dec 31 23:12:36 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-
-          It seems BUILD_ZZIP depends on BUILD_ZLIB, so add BUILD_ZLIB
-          conditionals, etc. everywhere we added BUILD_ZZIP support in:
-
-          Fri Dec 29 08:09:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-Sun Dec 31 18:15:00 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
-
-          Updating the @file to fix a fuzz error.
-
-Sun Dec 31 18:08:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
-
-          Disambiguating Transport::CurrentTest::ContextTag to
-          Test::Transport::CurrentTest::ContextTag to aid Borland's compiler.
-
-Sun Dec 31 17:27:27 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
-
-          Adding a trivial default implementation of post_init.
-
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/server.cpp:
-
-          Moved an #include from the header to the cpp file, where it
-          belongs.
-
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-
-              Added a "Template_Files" section to explicitely make
-          ORBInitializer.cpp available.
-
-Fri Dec 29 22:31:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TransportCurrent/Current_Loader.cpp:
-
-          Cleanup.
-
-        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
-
-          Replaced static_cast<>with a dynamic_cast<> in handler().
-
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Framework.mpc:
-
-          Whitespace cleanup.
-
-        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
-
-          Cleaned up template declarations and moved themplate code to a
-          cpp file.
-
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
-
-          Updated includes and removed unnecessary code.
-
-        * tests/TransportCurrent/Framework/client.cpp:
-
-          Added code to handle TAO_HAS_MINIMUM_CORBA by disabling DII.
-
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-
-          Whitespace cleanup.
-
-        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
-
-          Removing extra ';' from ACE_STATIC_SVC_REQUIRE.
-
-Sat Dec 30 03:55:42 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Makefile.am:
-
-          Fix stray trailing whitespace after \ continuation.
-
-Fri Dec 29 17:50:16 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff:
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
-        * orbsvcs/orbsvcs/Trader/constraint.l:
-
-          Added a rule to catch white space and ignore it.  Previously,
-          white space was not recognized and the lexer would print it out to
-          stdout.
-
-Fri Dec 29 14:49:24 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * MPC/config/trading_serv.mpb:
-
-          Added the utils base project.  It is used by the CosTrading_Serv
-          project and should have been in this base project.
-
-Fri Dec 29 08:09:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Request/Makefile.am:
-        * tests/GIOP_Fragments/Makefile.am:
-        * tests/Nested_Upcall_Crash/Makefile.am:
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am:
-        * tests/TransportCurrent/IIOP/Makefile.am:
-
-          Regenerate for misc *.mpc and *.mpb changes.
-
-        * tao/Makefile.am:
-
-          Regenerate for new Compression projects.
-
-        * configure.ac:
-
-          Configure Makefiles for new subdirectory.
-
-        * tests/Makefile.am:
-
-          Regenerate to descend into Compression subdirectory.
-
-        * tests/Compression/Makefile.am:
-
-          New Makefile.am for Compression unit tests.
-
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Hand-add automake conditionals for BUILD_ZZIP.  Unfortunately
-          MPC resolves options, files, etc. set by "features" at project
-          generation time, but we want them to be configure time options.
-
-Fri Dec 29 07:45:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added AM_CONDITIONALs for BUILD_ZLIB and BUILD_ZZIP, so we can
-          handle Makefile.am's with these options.  Default to false,
-          until we can write feature tests for these options.
-
-Fri Dec 29 07:37:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * docs/libraries.html:
-
-          Fix typos.
-
-Thu Dec 28 23:10:52 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
-
-          Apparently, interceptors and pi are still needed for the
-          build. Reverting my change from Thu Dec 28 19:29:58 UTC 2006.
-
-Thu Dec 28 20:30:14 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * docs/libraries.html:
-
-          Updated documentation for Transport::Current.
-
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
-
-          Reversing the removal of *_Export.h include to match the
-          convention.
-
-        * tests/TransportCurrent/Framework/run_test.pl:
-
-          Added code to support -static and -dynamic parameters, similar
-          to the IIOP test.
-
-Thu Dec 28 20:01:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
-        * tests/TransportCurrent/Framework/run_test.pl:
-
-Thu Dec 28 19:29:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
-
-          Removed interceptors and pi from the list of base projects. The
-          Transport::Current feature isnot itself dependent on these
-          features. The tests however are, and their *.mpc files have been
-          modifiedaccordingly to add interceptors explicitely.
-
-        * tao/TransportCurrent/Current_ORBInitializer.h:
-
-          Removed commented code.
-
-        * tao/TransportCurrent/Current_ORBInitializer.cpp:
-
-          Added "#pragma once".
-
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
-
-          Removed unnecessary *_Export.h include since TCC.h already
-          includes it.
-
-        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
-
-          Removed an extra ';' after ACE_STATIC_SVC_REQUIRE.
-
-        * tao/TransportCurrent/Transport_Current_Export.h:
-
-          Regenerated this file to fix DLL export problems in static
-          builds.
-
-        * tests/TransportCurrent/Framework/Framework.mpc:
-
-          Added interceptors to the base projects list to ensure this test
-          builds only when interceptors are supported.
-
-        * tests/TransportCurrent/Framework/Tester.cpp:
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/server.cpp:
-
-          Added code to handle single-threaded builds correctly.
-
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-
-          Changed the modulename from "TAO" to "Test" in order to fixing
-          an ambiguous reference to "TAO" namespace in builds with
-          versioned namespaces enabled.
-
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-
-          Added interceptors to the base projects list to ensure this test
-          builds only when interceptors are supported.
-
-Thu Dec 28 19:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Compression/Compression.cpp:
-          Fixed argument not used warning
-
-Thu Dec 28 12:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Simple/time-date/svc.conf.xml:
-          Updated this file to match the regular svc.conf file
-
-Thu Dec 28 12:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc:
-        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
-        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
-          Disable part of the projects when CORBA/e micro is enabled
-
-Thu Dec 28 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc:
-        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
-        * tests/NestedUpcall/Triangle_Test/TT.mpc:
-          Disable part of the projects when CORBA/e micro is enabled
-
-Thu Dec 28 12:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/libraries.html:
-          Documented the new compression libraries
-
-Thu Dec 28 11:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-          This is the first commit for a new part for TAO which hopefully
-          gets standardized next year. The final goal is to implement
-          Zipped GIOP (ZIOP). At the moment an ORB supports ZIOP the application
-          programmer can specify using policies that compression can be
-          applied on the application data send over the wire. This first
-          commit is the Compression module that delivers the infrastructure
-          classes with which data can be compressed. This can be used
-          by regular applications but then also by the ORB in the future.
-
-          This effort is supported by multiple parties, IONA did the
-          initial effort for Orbix and triggered this step, Remedy IT
-          will do the implementation for TAO, Andre Spiegel will do
-          the implementation for JacORB, IONA then for Orbix and PrismTech
-          will assist when needed and will keep an eye on the OMG process.
-
-          This commit adds first initial support, it is not 100% ready
-          but it is usable. This way we can share the code with the other
-          parties more easily and attract more people to this effort. Be
-          aware that the IDL can change, this is work in progress, not
-          a final spec.
-
-        * MPC/config/compression.mpb:
-          New base project for the compresion library
-
-        * MPC/config/zlibcompressor.mpb:
-          New base project for the zlib compressor
-
-        * docs/Libraries.html:
-          Corrected link to MPC readme
-
-        * docs/ORBEndpoint.html:
-          Small layout change
-
-        * tao/Compression/Base_Compressor.cpp:
-        * tao/Compression/Base_Compressor.h:
-        * tao/Compression/Compression.cpp:
-        * tao/Compression/Compression.h:
-        * tao/Compression/Compression.pidl:
-        * tao/Compression/compression_export.h:
-        * tao/Compression/Compression_Manager.cpp:
-        * tao/Compression/Compression_Manager.h:
-        * tao/Compression/Compressor_Factory.cpp:
-        * tao/Compression/Compressor_Factory.h:
-        * tao/Compression/TAO_Compression.pc.in:
-        * tao/Compression/TAO_Compression.rc:
-          New Compression library
-
-        * Compression/zlib/TAO_ZlibCompressor.pc.in:
-        * Compression/zlib/TAO_ZlibCompressor.rc:
-        * Compression/zlib/ZlibCompressor.cpp:
-        * Compression/zlib/ZlibCompressor.h:
-        * Compression/zlib/ZlibCompressor_export.h:
-        * Compression/zlib/ZlibCompressor_Factory.cpp:
-        * Compression/zlib/ZlibCompressor_Factory.h:
-          New Compressor that uses zlib to compress/uncompress data
-
-        * tao/File_Parser.cpp:
-          Use true for bool
-
-        * tao/objectid.h:
-          Added CompressionManager defines
-
+        * tao/ObjectKey_Table.h:
+        * tao/Objref_VarOut_T.h:
+        * tao/operation_details.cpp:
         * tao/ORB.cpp:
-          Added resolve_initial_references support for the CompressionManager
-
-        * tao/ORB_Core.{h,cpp,inl}:
-          Added support for CompressionManager
-
-        * tao/PI/Interceptor_List_T.cpp:
-          Const change
-
-        * tao/ZlibCompressor.mpc:
-        * tao/Compression.mpc:
-          New base projects
-
-        * tests/Compression/Compression_Test.mpc:
-        * tests/Compression/server.cpp:
-          First initial test of the Compression library
-
-Wed Dec 27 22:48:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Current_Test.idl:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.h:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/server.cpp:
-
-          Changed the modulename from "TAO" to "Test" in order to fixing
-          an ambiguous reference to "TAO" namespace in builds with
-          versioned namespaces enabled.
-
-Wed Dec 27 20:42:48 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
-
-          Fixing test failures because of incorrect counting.
-
-Wed Dec 27 11:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO-INSTALL.html:
-          Small improvements for cross compilation
-
-Wed Dec 27 10:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO-INSTALL.html:
-          Use more html keyword for layout and document how to use CORBA/e
-
-Wed Dec 27 05:35:06 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
-
-          Fixing an ambiguous reference to TAO namespace in builds with
-          versioned namespaces enabled.
-
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
-
-          Clarifying some debugging statements.
-
-Mon Dec 25 16:19:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * Merry Christmas everyone!!!
-
-Sun Dec 24 23:22:41 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc:
-
-          Adding "after" keyword to makesure IDL is built first in
-          parallel builds.
-
-Sun Dec 24 15:44:40 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
-
-          Getting the const-ness right.
-
-Sun Dec 24 15:39:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Parallel_Connect_Strategy/Makefile.am:
-        * tests/Reliable_Oneways/Makefile.am:
-
-          Regenerated.
-
-        * tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc:
-        * tests/Reliable_Oneways/Reliable_Oneways.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Sun Dec 24 15:38:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Smart_Proxies/Collocation/Makefile.am:
-
-          Regenerated.
-
-        * tests/Smart_Proxies/Collocation/SP_Collocation.mpc:
-
-          Changed IDL project to inherit from smart_proxies.
-
-          Changed *Test project to depend on *idl for build order.
-
-Sun Dec 24 00:04:19 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/CollocationLockup/Makefile.am:
-        * tests/DSI_Gateway/Makefile.am:
-        * tests/Nested_Upcall_Crash/Makefile.am:
-
-          Regenerated.
-
-        * tests/CollocationLockup/CollocationLockup.mpc:
-        * tests/DSI_Gateway/DSI_Gateway.mpc:
-        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Sat Dec 23 16:53:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Collocation/Makefile.am:
-        * tests/Smart_Proxies/Collocation/Makefile.am:
-
-          Regenerated.
-
-        * tests/Collocation/Collocation.mpc:
-        * tests/Smart_Proxies/Collocation/SP_Collocation.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Sat Dec 23 15:48:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/TransportCurrent/IIOP/Makefile.am:
-
-          Regenerated.
-
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-
-          Don't look for includes relative to $(srcdir), the ones we're
-          looking for are generated from *.idl and thus relative to the
-          build directory.
-
-Sat Dec 23 15:05:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Portable_Interceptors/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/Benchmark/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
-
-          Regenerated.
-
-        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc:
-        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc:
-
-          Don't suppress any/typecode generation.
-
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
-
-          Don't include server skeleton in client.
-
-Sat Dec 23 14:35:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/POA/Persistent_ID/Persistent_ID.mpc:
-
-          Fix case-mismatch problem introduced in last change.
-
-Sat Dec 23 04:48:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TransportCurrent/Current_Loader.cpp:
-
-          Fixing an pedantic complaint about an extra ';' at the end of
-          the line, after ACE_STATIC_SVC_REQUIRE.
-
-Sat Dec 23 03:53:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TransportCurrent/Current_ORBInitializer.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
-
-          Fixing compilation warnings.
-
-Sat Dec 23 02:01:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/POA/EndpointPolicy/Makefile.am:
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/Portable_Interceptors/AMI/Makefile.am:
-        * tests/Portable_Interceptors/Benchmark/Makefile.am:
-        * tests/Portable_Interceptors/Bug_1559/Makefile.am:
-        * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am:
-        * tests/Portable_Interceptors/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/ForwardRequest/Makefile.am:
-        * tests/Portable_Interceptors/IORInterceptor/Makefile.am:
-        * tests/Portable_Interceptors/PICurrent/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
-        * tests/RTCORBA/Banded_Connections/Makefile.am:
-        * tests/RTCORBA/Client_Protocol/Makefile.am:
-        * tests/RTCORBA/Diffserv/Makefile.am:
-        * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am:
-        * tests/RTCORBA/Explicit_Binding/Makefile.am:
-        * tests/RTCORBA/Linear_Priority/Makefile.am:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am:
-        * tests/RTCORBA/Persistent_IOR/Makefile.am:
-        * tests/RTCORBA/Policy_Combinations/Makefile.am:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am:
-        * tests/RTCORBA/Private_Connection/Makefile.am:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am:
-        * tests/RTCORBA/Server_Declared/Makefile.am:
-        * tests/RTCORBA/Server_Protocol/Makefile.am:
-        * tests/RTCORBA/Thread_Pool/Makefile.am:
-        * tests/RTScheduling/Scheduling_Interceptor/Makefile.am:
-
-          Regenerated.
-
-        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
-        * tests/POA/Persistent_ID/Persistent_ID.mpc:
-        * tests/Portable_Interceptors/AMI/PI_AMI.mpc:
-        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc:
-        * tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc:
-        * tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc:
-        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc:
-        * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc:
-        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc:
-        * tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc:
-        * tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc:
-        * tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc:
-        * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc:
-        * tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc:
-        * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc:
-        * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc:
-        * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc:
-        * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc:
-        * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc:
-        * tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc:
-        * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc:
-        * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc:
-        * tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Sat Dec 23 00:23:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/BiDirectional/Makefile.am:
-        * tests/BiDirectional_DelayedUpcall/Makefile.am:
-        * tests/BiDirectional_NestedUpcall/Makefile.am:
-        * tests/Bug_2417_Regression/Makefile.am:
-        * tests/Bug_2560_Regression/Makefile.am:
-        * tests/MT_BiDir/Makefile.am:
-        * tests/NestedUpcall/Triangle_Test/Makefile.am:
-
-          Regenerate to account for misc recent *.mpc changes.
-
-        * tests/TransportCurrent/IIOP/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am:
-
-          Regenerated.
-
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/Framework/Framework.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Fri Dec 22 20:54:44 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * MPC/config/tc.mpb:
-        * MPC/config/tc_iiop.mpb:
-
-          Split the tc.mpb in two projects (adding the tc_iiop). Updated
-          the dependencies in a bid to fix what seems to be a build order
-          issue on some scoreboard builds.
-
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-
-          Updated to inherit from the new tc_iiop.
-
-Fri Dec 22 18:55:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
-
-          Replaced obsolete ACE_reinterpret_cast macro.
-
-Thu Dec 21 21:29:47 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/simple.cpp:
-
-          Fixed FUZZ problems.
-
-Thu Dec 21 17:49:24 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
-
-          Updated the include files' path to resolve a compilation problem
-          in an autoconf (FC4_autoconf) build.
-
-Thu Dec 21 16:03:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
-
-          Added conditional compilation, based upon the presence of
-          TAO_HAS_IIOP.  The IIOP-specific current will compile and the
-          implementation shall throw CORBA::NO_IMPLEMENT at runtime.
-
-Thu Dec 21 15:32:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TransportCurrent/Current_Impl.h:
-        * tao/TransportCurrent/Current_Impl.cpp:
-        * tao/TransportCurrent/Current_Loader.h:
-        * tao/TransportCurrent/Current_ORBInitializer.h:
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
-        * tao/TransportCurrent/IIOP_Current_Impl.h:
-
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
-
-          Removed a ';' after the closing curly brace of a namespace
-          declaration which caused hiccups with gcc 4.0.2.
-
-Thu Dec 21 14:46:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/TransportCurrent/TC.idl:
-        * tao/TransportCurrent/TC_IIOP.idl:
-
-          Change #include files to be relative to ${TAO_ROOT} like the
-          other *.idl / *.pidl files.
-
-Thu Dec 21 14:00:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Wed Dec 20 21:14:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TransportCurrent/Current_Loader.h:
-
-          Fixing an error in builds that use versioned namespaces due to
-          incorect placement of TAO_END_VERSIONED_NAMESPACE_DECL.
-
-Wed Dec 20 20:59:39 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          These are fixes correcting scoreboard issues pertaining to the
-          checkin from Tue Dec 19 22:09:34 UTC 2006.
-
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
-
-          Updated the IDL compile options and include file path to reflect
-          the new position of these files (since Wed Dec 20 17:34:07)
-
-        * tao/TransportCurrent/Current_Loader.h:
-        * tao/TransportCurrent/Current_Loader.cpp:
-
-          Eliminated unnecessary code.
-
-        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
-
-          Removed unnecessary #include "ace/post.h"
-
-        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
-
-          Added an explicit cast to silence Windows builds complaining
-          about implicit conversion between HANDLE and CORBA::Long.
-
-Wed Dec 20 17:34:07 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefiles for new subdirectories.
-
-        * orbsvcs/tests/Makefile.am:
-
-          Regenerate to descend into TransportCurrent subdirectory.
-
-        * tests/TransportCurrent/Makefile.am:
-        * tests/TransportCurrent/IIOP/Makefile.am:
-        * tests/TransportCurrent/Framework/Makefile.am:
-
-          New Makefile.am's for TransportCurrent unit tests.
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-        * tao/TC.mpc:
-        * tao/TC_IIOP.mpc:
-
-          ...to here, to match convention established by other core TAO
-          library projects.  This also makes the generated Makefile.am
-          for the autoconf build a little more sane.
-
-        * tao/TransportCurrent/TC.mpc:
-        * tao/TransportCurrent/TC_IIOP.mpc:
-
-          Move TransportCurrent *.mpc projects from here...
-
-Wed Dec 20 16:22:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          These are fixes correcting scoreboard issues pertaining to the
-          checkin from Tue Dec 19 22:09:34 UTC 2006.
-
-        * MPC/config/tc.mpb:
-
-          Moved from $ACE_ROOT/bin/MakeProjectCreator/config according to
-          the new project configuration layout.
-
-        * tao/TransportCurrent/Current_Loader.h:
-        * tao/TransportCurrent/Current_Loader.cpp:
-        * tao/TransportCurrent/IIOP_Current_Loader.h:
-        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
-
-        * tao/Transport_Selection_Guard.cpp:
-
-          Removed errand semicolons after definitions which were breaking
-          some of the scoreboard builds.
-
-        * tests/TransportCurrent/Framework/Current_Test.idl:
-
-          Fixed a FUZZ warning about mismatched @file.
-
-        * tests/TransportCurrent/Framework/Framework.mpc:
-
-          Added the current directory to the include path.
-
-        * tests/TransportCurrent/Framework/Tester.cpp:
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/server.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/IIOP/client_static.conf:
-
-          Fixing a service initialization problem encountered in static
-          builds that prevented the tests from runnig. Also fixed include
-          file locations.
-
-Wed Dec 20 15:28:24 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * MPC/config/tc.mpb:
-
-        * tao/Transport_Selection_Guard.cpp:
-
-        * tests/TransportCurrent/Framework/Current_Test.idl:
-
-        * tests/TransportCurrent/Framework/Framework.mpc:
-
-        * tests/TransportCurrent/Framework/server.cpp:
-
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-
-
-Wed Dec 20 09:36:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/BiDirectional/BiDirectional.mpc:
-        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
-        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
-        * tests/Bug_2417_Regression/Bug_2417_Regression.mpc:
-        * tests/Bug_2560_Regression/Bug_2560_Regression.mpc:
-        * tests/MT_BiDir/MT_BiDir.mpc:
-        * tests/NestedUpcall/Triangle_Test/TT.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled. Also removed some after usage because
-          there is now a seperate idl project
-
-Wed Dec 20 09:31:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Callback_Quoter/Callback_Quoter.mpc:
-        * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc:
-        * orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
-        * orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
-        * performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
-
-Tue Dec 19 22:51:09 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * NEWS:
-
-          Updating the file with information about Transport::Current.
-
-Tue Dec 19 22:09:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-          Introducing the Transport::Current - an optional feature with an
-          IDL interface, which enables users to obtain information about
-          the Transports used to send or receive a message.
-
-          The implementation uses a TSS based stack of pointers to
-          Transport class instances, which an ORB selects on the critical
-          path.  The structure is used to update message and endpoint
-          related statistical information for the correct Transport. An
-          IDL interface available through ORB::resolve_initial_references,
-          provides access to the accumulated data inside servant up-calls
-          and interceptor invocations.
-
-        * docs/transport_current:
-
-          A new directory for the Transport Current documentation to
-          inhabit.
-
-        * docs/transport_current/index.html:
-        * docs/transport_current/transport_current.css:
-
-          Added reference and user-guide documentation for the Transport
-          Current.
-
-        * tao/orbconf.h:
-
-          Enabled the Transport::Current feature by default, by defining
-          TAO_HAS_TRANSPORT_CURRENT.  In recognition that this is very
-          likely an overkill for everybody but the few interested in the
-          feature, the plan is to reverse this default before the next
-          beta release.
-
+        * tao/ORB_Core.cpp:
         * tao/ORB_Core.h:
-        * tao/Profile_Transport_Resolver.h:
-        * tao/Profile_Transport_Resolver.inl:
-        * tao/Profile_Transport_Resolver.cpp:
-
-          Replaced the "naked" Transport pointer with a smart-pointer-like
-          TAO::Transport_Selection_Guard, which has ctor and dtor that
-          help keep a TSS-based stack of Transport instances when
-          TAO_HAS_TRANSPORT_CURRENT is defined as 1. If the latter is
-          disabled, the TSS access overhead goes away.
-
-        * tao/TAO_Server_Request.h:
-        * tao/TAO_Server_Request.inl:
+        * tao/ORB_Core.inl
+        * tao/ORBInitializer_Registry.cpp:
+        * tao/ORBInitializer_Registry.h:
+        * tao/ORBInitializer_Registry_Adapter.h:
+        * tao/Parser_Registry.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/PI.cpp:
+        * tao/PI/PI_ORBInitializer.cpp:
+        * tao/PI_Server/PI_Server_Loader.cpp:
+        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.h:
+        * tao/Pluggable_Messaging.h:
+        * tao/Pluggable_Messaging_Utils.inl
+        * tao/Policy_Current_Impl.cpp:
+        * tao/Policy_Current_Impl.h:
+        * tao/Policy_Current_Impl.inl
+        * tao/Policy_Manager.cpp:
+        * tao/Policy_Manager.h:
+        * tao/Policy_Manager.inl
+        * tao/Policy_Set.cpp:
+        * tao/Policy_Set.h:
+        * tao/Policy_Validator.cpp:
+        * tao/Policy_Validator.h:
+        * tao/PolicyFactory_Registry_Adapter.h:
+        * tao/PortableServer/Adapter_Activator.cpp:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
+        * tao/PortableServer/Local_Servant_Base.cpp:
+        * tao/PortableServer/Local_Servant_Base.h:
+        * tao/PortableServer/Non_Servant_Upcall.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+        * tao/Profile.cpp:
+        * tao/Reactive_Connect_Strategy.cpp:
+        * tao/Reactive_Flushing_Strategy.cpp:
+        * tao/Remote_Invocation.cpp:
+        * tao/Remote_Invocation.h:
+        * tao/RTCORBA/RT_Current.h:
+        * tao/RTCORBA/RT_Endpoint_Utils.cpp:
+        * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+        * tao/RTCORBA/RT_ORB.cpp:
+        * tao/RTCORBA/RT_ORB.h:
+        * tao/RTCORBA/RT_ORB_Loader.cpp:
+        * tao/RTCORBA/RT_ORB_Loader.h:
+        * tao/RTCORBA/RT_ORBInitializer.cpp:
+        * tao/RTCORBA/RT_ORBInitializer.h:
+        * tao/RTCORBA/RT_Policy_i.cpp:
+        * tao/RTCORBA/RT_Policy_i.h:
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+        * tao/RTCORBA/RT_Stub.h:
+        * tao/RTCORBA/RT_Stub_Factory.h:
+        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp:
+        * tao/RTCORBA/Thread_Pool.cpp:
+        * tao/RTCORBA/Thread_Pool.h:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+        * tao/RTScheduling/Current.cpp:
+        * tao/RTScheduling/Request_Interceptor.cpp:
+        * tao/RTScheduling/RTScheduler_Loader.cpp:
+        * tao/Service_Callbacks.cpp:
+        * tao/Service_Context.h:
+        * tao/Strategies/advanced_resource.h:
+        * tao/Strategies/COIOP_Transport.cpp:
+        * tao/Strategies/DIOP_Acceptor.cpp:
+        * tao/Strategies/DIOP_Connection_Handler.cpp:
+        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
+        * tao/Strategies/SCIOP_Connection_Handler.cpp:
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Factory.cpp:
+        * tao/Strategies/UIOP_Lite_Factory.cpp:
+        * tao/Stub.cpp:
+        * tao/Synch_Invocation.h:
         * tao/TAO_Server_Request.cpp:
-
-          Similar to the client-side code in Profile_Transport_Resolver,
-          this is where the server-side pieces of Transport Current
-          functionality plugs in. A Server_Request encapsulates knowledge
-          about the specific Transport on which an invocation
-          arrived. Adding a Transport_Selection_Guard instance member
-          (transport_selection_guard_) to keep track of the current
-          Transport, using TSS. This overhead is only present when
-          TAO_HAS_TRANSPORT_CURRENT is defined as 1.
-
-        * tao/TSS_Resources.h:
-        * tao/TSS_Resources.cpp:
-
-          Adding a Transport_Selection_Guard member pointer tsg_, which
-          when Transport Current feature is enabled, always points to the
-          most-recently selected (incoming or outgoing) Transport in the
-          current thread. This overhead is only present when
-          TAO_HAS_TRANSPORT_CURRENT is defined as 1.
-
-        * tao/Transport.h:
-        * tao/Transport.inl:
-        * tao/Transport.cpp (send_message_shared_i):
-
-          Introduced a new class TAO::Transport::Stats and added a member
-          pointer of that base type to the declaration of Transport. It
-          can only be non-null when Transport Current is enabled, whereby
-          it points to a TAO::Transport::Stats.  The send_message_shared_i
-          has been modified to update the statistics.  Also added the
-          requisite mutators and successor's.
-
-        * tao/Transport_Selection_Guard.h:
-        * tao/Transport_Selection_Guard.cpp:
-
-          The implementation of the TSS-pointed, stack-like chain of
-          Transport instances selected (potentially, in multiple nested up
-          calls). The TSS overhead is only present when
-          TAO_HAS_TRANSPORT_CURRENT is defined as 1, otherwise the methods
-          are trivial.
-
-        * tao/tao.mpc:
-
-          Updated to include the new source files.
-
-        * tao/TransportCurrent:
-
-          A new directory for the Transport Current implementation to
-          inhabit.  Currently, there are two implementations: a generic
-          one and an IIOP-specific one. The reason these two share this
-          location is that the generic Current is too generic to be useful
-          on its own, while providing almost all the required
-          infrastructure for the IIOP-specific one.
-
-        * tao/TransportCurrent/Current_Impl.h:
+        * tao/TAO_Server_Request.h:
+        * tao/Transport_Queueing_Strategies.cpp:
         * tao/TransportCurrent/Current_Impl.cpp:
-
-          The generic Current implementation.
-
-        * tao/TransportCurrent/Current_Loader.h:
         * tao/TransportCurrent/Current_Loader.cpp:
-
-          A loader, to handle registration with the Service repository.
-
-        * tao/TransportCurrent/Current_ORBInitializer.h:
         * tao/TransportCurrent/Current_ORBInitializer.cpp:
-        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
         * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
+        * tao/Utils/ORB_Manager.cpp:
+        * tao/Utils/Servant_Var.inl
+        * tao/Utils/Server_Main.cpp:
+        * tao/Valuetype/AbstractBase_T.cpp:
+        * tao/Wait_On_LF_No_Upcall.cpp:
+        * tao/Wait_Strategy.h:
+          Layout changes, const improvements and some cleanup of old code
+          that is not needed anymore now we removed emulated exceptions
 
-          An ORB initializer, to handle the registration of the name for
-          which resolve_initial_references() will return you a Current
-          pointer.
-
-        * tao/TransportCurrent/IIOP_Current_Impl.h:
-        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
-
-          The IIOP-specific Current implementation, complete with its own
-          derivative of TAO::Transport::Stats.
-
-        * tao/TransportCurrent/IIOP_Current_Loader.h:
-        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
-
-          A loader, to handle registration with the Service repository.
-
-        * tao/TransportCurrent/IIOP_Transport_Current.h:
-
-          A client-side interface for the IIOP-specific Transport Current.
+Sun Jan 28 19:59:14 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * tao/TransportCurrent/TC.idl:
+        * TAO version 1.5.6 released.
 
-          A client-side interface for the generic Transport Current.
+Fri Jan 26 18:56:23 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-        * tao/TransportCurrent/TC.mpc:
-
-          We need this to actually build the generic TC into a
-          self-contained service object library (DLL).
-
-        * tao/TransportCurrent/TC_IIOP.idl:
-
-          A client-side interface for the IIOP-specific Transport Current.
-
-        * tao/TransportCurrent/TC_IIOP.mpc:
-
-          We need this to actually build the IIOP-specific TC into a
-          self-contained service object library (DLL).
-
-        * tao/TransportCurrent/Transport_Current.h:
-
-          Basic declarations.
-
-        * tao/TransportCurrent/Transport_Current_Export.h:
-
-          Library export helpers.
-
-        * tests/TransportCurrent:
-
-          A new directory for the Transport Current tests to inhabit.
-
-        * tests/TransportCurrent/Framework:
-
-          A new directory for the test exercising the generic Transport Current.
-
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Current_Test.idl:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.h:
-        * tests/TransportCurrent/Framework/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/Framework/Framework.mpc:
-        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
-        * tests/TransportCurrent/Framework/README:
-        * tests/TransportCurrent/Framework/Server_Main.cpp:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
-        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
-        * tests/TransportCurrent/Framework/Tester.cpp:
-        * tests/TransportCurrent/Framework/client-static.conf:
-        * tests/TransportCurrent/Framework/client.conf:
-        * tests/TransportCurrent/Framework/client.cpp:
-        * tests/TransportCurrent/Framework/run_test.pl:
-        * tests/TransportCurrent/Framework/server-static.conf:
-        * tests/TransportCurrent/Framework/server.conf:
-        * tests/TransportCurrent/Framework/server.cpp:
-        * tests/TransportCurrent/Framework/simple.cpp:
-
-        * tests/TransportCurrent/IIOP:
-
-          A new directory for the test exercising the IIOP-specific Transport Current.
-
-        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
-        * tests/TransportCurrent/IIOP/IIOP.mpc:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
-        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
-        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
-        * tests/TransportCurrent/IIOP/README:
-        * tests/TransportCurrent/IIOP/client_dynamic.conf:
-        * tests/TransportCurrent/IIOP/client_static.conf:
-        * tests/TransportCurrent/IIOP/run_test.pl:
-        * tests/TransportCurrent/IIOP/server_dynamic.conf:
-        * tests/TransportCurrent/IIOP/server_static.conf:
-
-Tue Dec 19 18:44:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * */Makefile.am:
-
-          Baseline regeneration to match recent MPC changes.
-
-Tue Dec 19 15:29:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2345_Regression/Bug_2345_Regression.mpc:
-        * tests/Collocation_Opportunities/Collocation_Opportunities.mpc:
-        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc:
-        * tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc:
-        * tests/InterOp-Naming/InterOp-Naming.mpc:
-        * tests/MT_BiDir/MT_BiDir.mpc:
-        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
-        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
-        * tests/NestedUpcall/Triangle_Test/TT.mpc:
-        * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc:
-        * tests/POA/Identity/Identity.mpc:
-        * tests/POA/Object_Reactivation/Object_Reactivation.mpc:
-        * tests/POA/Persistent_ID/Persistent_ID.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
-
-Tue Dec 19 12:32:41 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
-
-          gcc gets confused when a static function is forward declared.  It
-          complains that the function is declared but never defined.  The
-          sed portion of the yacc regeneration rule just removes the forward
-          declaration (which was unnecessary anyway).
-
-Tue Dec 19 11:35:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/BiDirectional/BiDirectional.mpc:
-        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
-        * tests/BiDirectional_MultipleORB/destroy.mpc:
-        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
-
-Tue Dec 19 11:32:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc:
-        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
-        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
-        * performance-tests/Pluggable/Pluggable.mpc:
-        * performance-tests/POA/Create_Reference/Create_Reference.mpc:
-        * performance-tests/POA/Demux/Demux.mpc:
-        * performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
-
-Tue Dec 19 11:27:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/ImR/Advanced/Advanced.mpc:
-        * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc:
-        * orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc:
-        * orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc:
-        * orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
-        * orbsvcs/tests/ImplRepo/ImplRepo.mpc:
-        * orbsvcs/tests/ImplRepo/scale/scaletest.mpc:
-        * orbsvcs/tests/Property/Property.mpc:
-        * orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
-        * orbsvcs/Time_Service/Time_Service.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
-
-Tue Dec 19 11:19:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
-        * examples/Event_Comm/Event_Comm.mpc:
-        * examples/Logging/Logging.mpc:
-        * examples/Persistent_Grid/Persistent_Grid.mpc:
-        * examples/PluggableUDP/tests/Basic/Basic.mpc:
-        * examples/PluggableUDP/tests/Performance/Performance.mpc:
-        * examples/Quoter/Quoter.mpc:
-        * examples/Simple/bank/bank.mpc:
-        * examples/Simple/echo/echo.mpc:
-        * examples/Simple/grid/grid.mpc:
-        * examples/Simple/time/time.mpc:
-          Disabled some projects that can't compile when CORBA/e
-          micro has been enabled
+        * tao/PortableServer/Object_Adapter.cpp:
 
-Mon Dec 18 19:34:42 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+          Removed the global scope on the type used in a catch to help vc8
+          figure out what to do.
 
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+Fri Jan 26 18:45:53 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-          Added missing typecodes for supporting CORBA::ULongLong and
-          CORBA::LongLong.
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
 
-Mon Dec 18 12:50:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Removed the extra parenthesis around a throw argument.
 
-        * tao/Utils/ORB_Manager.{cpp,h}:
-          Removed one init_child_poa method, using a default argument
-          we don't need two seperate ones. Fixed compile errors with
-          CORBA/e micro
+Fri Jan 26 18:21:17 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-Mon Dec 18 10:30:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+        * *.cpp:
 
-        * tests/Portable_Interceptors/PICurrent/client.cpp:
-        * tests/Portable_Interceptors/PICurrent/server.cpp:
-        * tests/Portable_Interceptors/PICurrent/run_test.pl:
+          Removed unused variable warnings from 120 files.
 
-          Bugfix Bugzilla 2510 & 2547 - multi-threading issues for PICurrent.
-          Multi-Threaded servers take longer to shutdown. Increase the
-          length of kill time to wait for the server shutdown. Also
-          provide sleep(1) before orb->destroy() to allow comms to
-          proceed at shutdown (precausion only).
+Fri Jan 26 16:59:47 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-Fri Dec 15 18:17:36 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+        * TAO_IDL/ast/ast_structure_fwd.cpp:
+        * TAO_IDL/ast/ast_check.cpp:
 
-          Updating the test to make it behave appropriately for
-          multi-threaded and for single-threaded (thread unsafe?)
-          configurations.
+          Fixed incorrect error reporting of undefined struct when
+          it is forward declared multiple times.
 
-        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
-        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
-        * tests/ORB_Local_Config/ORB_Local_Config.mwc:
+        * TAO_IDL/ast/ast_enum.cpp:
+        * TAO_IDL/ast/ast_union_branch.cpp:
 
-Fri Dec 15 17:26:59 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+          Fixed incomplete initialization of AST_Expression class
+          that hold the value of a union case label when the
+          discriminator is an enum type, which was causing the
+          calculation of the union's default index to be
+          incorrect. Thanks to Martin Corino <mcorino@remedy.nl>
+          for reporting both the above IDL compiler bugs.
 
         * tests/IDL_Test/IDL_Test.mpc:
 
-          Fixed previous change to this file in
-
-          Wed Dec 13 18:16:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          that was excluding the *A.cpp file from the build.
-
-Fri Dec 15 16:32:35 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/ORT/Makefile.am:
-        * tests/Objref_Sequence_Test/Makefile.am:
-        * tests/Ondemand_Write/Makefile.am:
-        * tests/Oneway_Buffering/Makefile.am:
-        * tests/Oneways_Invoking_Twoways/Makefile.am:
-
-          Regenerated.
-
-        * tests/ORT/ORT.mpc:
-        * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc:
-        * tests/Ondemand_Write/Ondemand_Write.mpc:
-        * tests/Oneway_Buffering/Oneway_Buffering.mpc:
-        * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Thu Dec 14 16:58:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/MProfile/Makefile.am:
+          Uncommented the struct.idl file in the IDL_Files list,
+          so it can now be included in the test. The bug it
+          covers is the first one described above.
 
-          Regenerated.
+Fri Jan 26 13:46:23 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-        * tests/MProfile/MProfile.mpc:
+        * *.{h,inl,cpp}:
 
-          Changed IDL project to inherit from iormanip.
-          Changed Client project to not include testS.cpp.
+          Removed unused variable warnings from over 200 files.
 
-Thu Dec 14 16:18:00 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+Fri Jan 26 12:12:12 UTC 2007  Johnny Willemsen  <jwillmesen@remedy.nl>
 
-        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
-
-          Fix typo in IDL project name that broke build dependencies.
-
-Thu Dec 14 16:10:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
-
-          Regenerated.
-
-Thu Dec 14 13:52:00 UTC 2006  Simon Massey  <sma@prismtech.com>
-
-        * tao/PI/PICurrent.cpp:
-        * tao/PI/PICurrent.h:
-        * tests/Portable_Interceptors/PICurrent/run_test.pl:
-
-          Bugfix Bugzilla 2510 & 2547 - multi-threading issues for PICurrent.
-          Bugzilla 2552 - PICurrent_Impl, needs to be checked for
-          multi-threaded lazy copying. (Still work to do.)
-
-Thu Dec 14 13:21:46 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Modified the rule to output the end version block at the end.
-
-        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
-        * orbsvcs/orbsvcs/Trader/constraint.y:
-
-          Removed the end version block in the .y file and regenerated.
-
-Thu Dec 14 08:47:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
-        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h:
-
-          Align subtle differences (like using an explicit this-> (or not)
-          for invoking methods and accessing member variables.  This makes
-          diff betweens between the wrapper classes highlight the real and
-          substantial differences.  This too should make future maintenance
-          easier.
-
-          Removed #if 0'd out code that deactivated factory objects in the
-          shutdown() method.  This was originally #if'd out because the
-          factory objects aren't activated on the root POA (the factory
-          creates a POA with PERSISTENT lifespan policy for the factory
-          object activation, a POA that is not accessible from outside the
-          factory object).  While we could refactor things to gain access
-          to the factory POA, it really doesn't buy us much as the next
-          thing is done is the ORB is shutdown(), which will delete the
-          POAs, which will delete the objects, etc.
-
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
-
-          Overhaul the RTEvent_Logging_Service class to follow the idiom
-          used by the other three Logging Service implementations.  It had
-          lots of dead (commented out and/or #if 0'd) code for setting up
-          a scheduler; yet was missing support for supressing binding the
-          log factory to the naming service and spinning up a thread pool
-          for ORB threads.  Aligning this should make future maintenance
-          easier.
+        * tao/Wait_Strategy.cpp:
+          Fixed vc warning
 
-          Split out main() into new file RTEvent_Logging_Server.cpp.
+Fri Jan 26 12:05:12 UTC 2007  Johnny Willemsen  <jwillmesen@remedy.nl>
 
-Thu Dec 14 08:27:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * tao/Makefile.am:
+          Removed CSD_ORBInitializer.{h,cpp}, files where removed from the
+          distribution
 
-        * tests/OBV/Any/Makefile.am:
-        * tests/OBV/Factory/Makefile.am:
-        * tests/OBV/Forward/Makefile.am:
-        * tests/OBV/TC_Alignment/Makefile.am:
-        * tests/OBV/Truncatable/Makefile.am:
-        * tests/OBV/ValueBox/Makefile.am:
+Thu Jan 25 23:47:24 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-          Regenerated.
+        * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp(destroy):
 
-        * tests/OBV/Any/OBV_Any.mpc:
-        * tests/OBV/Factory/OBV_Factory.mpc:
-        * tests/OBV/Forward/OBV_Forward.mpc:
-        * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
-        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
-        * tests/OBV/ValueBox/valuebox.mpc:
+          Replaced a lost '*' in the parameter to indicate it is a pointer,
 
-          Changed IDL projects to inherit from valuetype, to
-          avoid suppressing typecodes and anys.
+Thu Jan 25 19:56:33 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-Thu Dec 14 07:01:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+        * *.cpp:
 
-        * tests/MProfile/Makefile.am:
-        * tests/MProfile_Connection_Timeout/Makefile.am:
-        * tests/No_Server_MT_Connect_Test/Makefile.am:
-        * tests/OBV/Any/Makefile.am:
-        * tests/OBV/Factory/Makefile.am:
-        * tests/OBV/Forward/Makefile.am:
-        * tests/OBV/TC_Alignment/Makefile.am:
-        * tests/OBV/Truncatable/Makefile.am:
-        * tests/OBV/ValueBox/Makefile.am:
+          Removed all of the ACE_PRINT_EXCEPTION macros.
 
-          Regenerated.
+Thu Jan 25 19:45:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * tests/MProfile/MProfile.mpc:
-        * tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc:
-        * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc:
-        * tests/OBV/Any/OBV_Any.mpc:
-        * tests/OBV/Factory/OBV_Factory.mpc:
-        * tests/OBV/Forward/OBV_Forward.mpc:
-        * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
-        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
-        * tests/OBV/ValueBox/valuebox.mpc:
+        * orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+        * orbsvcs/orbsvcs/Notify/Container_T.inl
+        * orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+        * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
+        * orbsvcs/orbsvcs/Notify/Event_Map_T.inl
+        * orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+        * orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+        * orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
+        * orbsvcs/tests/Notify/lib/Consumer_T.cpp
+        * orbsvcs/tests/Notify/lib/Peer_T.cpp
+        * orbsvcs/tests/Notify/lib/Supplier_T.cpp
+          Replaced ACE_TYPENAME with typename
 
-          Split out IDL compilation into separate MPC project.
+Thu Jan 25 17:39:59 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-        * tests/IDL_Test/Makefile.am:
+        * *.{h,cpp,inl}:
 
-          Regenerated.
+          Removed the ACE exception macros from all files.  There are a few
+          number of files that still use ACE_PRINT_EXCEPTION.  They will be
+          dealt with in my next commit.
 
-Wed Dec 13 18:16:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+Thu Jan 25 13:40:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/IDL_Test/IDL_Test.mpc:
+          Temporarily removed struct.idl, when the IDL compiler fix is in the repo
+          I will enable this file again
 
-          Added -GT to all IDL compiler command lines, since generation
-          of tie classes is no longer the default behavior, and we
-          want this test to cover it. Also added a block for
-          Template_Files, so the generated *S_T.cpp files will be
-          displayed in a separate folder in Visual Studio.
-
-Wed Dec 13 16:49:05 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/tie_sh.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-
-          Changed code generation for operation parameters in
-          tie class declarations to omit the parameter name. If
-          this name happened to be "T", some HP compilers would
-          have trouble disambiguating it from the tie class
-          template parameter typename. In the tie class operation
-          body, where the parameter name must be used, there is
-          already a code generation mechanism in place to avoid
-          the name clash. Thanks to Simon Massey <Simon.Massey@prismtech.com>
-          for reporting the problem.
-
-Wed Dec 13 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Bug_1630_Regression/test.mpc:
-          Don't build with CORBA/e
-
-Wed Dec 13 13:05:21 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
-
-          Added ACE_NOTREACHED around two returns that coult not possibly be
-          reached.
-
-Wed Dec 13 12:43:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Added search and replacement to both Constraint_l and Contraint_y
-          rules to avoid build warnings about conversion from long to int.
-
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
-        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
-
-          Regenerated.
-
-        * orbsvcs/orbsvcs/Trader/Interpreter.cpp:
-
-          Added a static_cast to avoid build warnings about conversion from
-          long to int.
-
-Wed Dec 13 07:19:26 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Server_Connection_Purging/Makefile.am:
-        * tests/Server_Leaks/Makefile.am:
-        * tests/Single_Read/Makefile.am:
-        * tests/Smart_Proxies/Benchmark/Makefile.am:
-        * tests/Smart_Proxies/Makefile.am:
-        * tests/Smart_Proxies/On_Demand/Makefile.am:
-        * tests/Smart_Proxies/Policy/Makefile.am:
-        * tests/Smart_Proxies/dtor/Makefile.am:
-        * tests/Stack_Recursion/Makefile.am:
-
-          Regenerated.
-
-        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
-        * tests/Server_Leaks/Server_Leaks.mpc:
-        * tests/Single_Read/Single_Read.mpc:
-        * tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc:
-        * tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc:
-        * tests/Smart_Proxies/Policy/SP_Policy.mpc:
-        * tests/Smart_Proxies/Smart_Proxies.mpc:
-        * tests/Smart_Proxies/dtor/dtor.mpc:
-        * tests/Stack_Recursion/Stack_Recursion.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Wed Dec 13 06:53:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
-        * docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc:
-          Don't build with CORBA/e micro
-
-Wed Dec 13 06:53:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IFR_Client_Adapter.h:
-          Fixed compile problem with CORBA/e
-
-Tue Dec 12 21:56:03 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/TAO_Internal.cpp (instance):
-
-          This change eliminates unnecessary caching of the
-          TAO_Ubergestalt_Ready_Condition, which used to cause problems
-          with accessing stale memory. My thanks goes to Johnny Willemsen
-          and Chad Elliott.
-
-Tue Dec 12 17:34:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Explicit_Event_Loop/Makefile.am:
-        * tests/Exposed_Policies/Makefile.am:
-        * tests/Faults/Makefile.am:
-        * tests/File_IO/Makefile.am:
-        * tests/Forwarding/Makefile.am:
-        * tests/Hello/Makefile.am:
-        * tests/IPV6/Makefile.am:
-        * tests/InterOp-Naming/Makefile.am:
-        * tests/Leader_Followers/Makefile.am:
-        * tests/LongUpcalls/Makefile.am:
-        * tests/MProfile_Forwarding/Makefile.am:
-        * tests/MT_BiDir/Makefile.am:
-        * tests/MT_Client/Makefile.am:
-        * tests/MT_Server/Makefile.am:
-        * tests/MT_Timeout/Makefile.am:
-        * tests/Multiple/Makefile.am:
-        * tests/Multiple_Inheritance/Makefile.am:
-        * tests/Muxed_GIOP_Versions/Makefile.am:
-        * tests/Muxing/Makefile.am:
-        * tests/Native_Exceptions/Makefile.am:
-        * tests/NestedUpcall/MT_Client_Test/Makefile.am:
-        * tests/NestedUpcall/Simple/Makefile.am:
-        * tests/NestedUpcall/Triangle_Test/Makefile.am:
-        * tests/Nested_Event_Loop/Makefile.am:
-
-          Regenerated.
-
-        * tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc:
-        * tests/Exposed_Policies/Exposed_Policies.mpc:
-        * tests/Faults/Faults.mpc:
-        * tests/File_IO/File_IO.mpc:
-        * tests/Forwarding/Forwarding.mpc:
-        * tests/Hello/Hello.mpc:
-        * tests/IPV6/IPV6_Hello.mpc:
-        * tests/InterOp-Naming/InterOp-Naming.mpc:
-        * tests/Leader_Followers/Leader_Followers.mpc:
-        * tests/LongUpcalls/LongUpcalls.mpc:
-        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
-        * tests/MT_BiDir/MT_BiDir.mpc:
-        * tests/MT_Client/MT_Client.mpc:
-        * tests/MT_Server/MT_Server.mpc:
-        * tests/MT_Timeout/MT_Timeout.mpc:
-        * tests/Multiple/Multiple.mpc:
-        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
-        * tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc:
-        * tests/Muxing/Muxing.mpc:
-        * tests/Native_Exceptions/Native_Exceptions.mpc:
-        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
-        * tests/NestedUpcall/Simple/Simple.mpc:
-        * tests/NestedUpcall/Triangle_Test/TT.mpc:
-        * tests/Nested_Event_Loop/Nested_Event_Loop.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Tue Dec 12 17:28:14 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefiles for new subdirectories.
-
-        * orbsvcs/tests/Makefile.am:
-
-          Regenerate to descend into unit test subdirectory.
-
-        * orbsvcs/tests/unit/Trading/Interpreter/Makefile.am:
-        * orbsvcs/tests/unit/Trading/Makefile.am:
-        * orbsvcs/tests/unit/Makefile.am:
-
-          New Makefile.am's for trading service unit tests.
-
-Tue Dec 12 17:24:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-        * orbsvcs/orbsvcs/CosConcurrency.mpc:
-
-          Don't include concurrency_export.h and concurrency_skel_export.h
-          in server library's MPC project.
-
-Tue Dec 12 16:13:34 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Use .in() to squelch conversion warning.
-
-Tue Dec 12 15:05:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * NEWS:
-
-          Provided an overview of the following changes.
-
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-
-          Added a verbatim section to automate the regeneration of the lex
-          file for the Trader Server library.  Which includes running the
-          lex output through sed and then patching at the end.
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
-
-          Switched from using CORBA::Long/CORBA::ULong to
-          CORBA::LongLong/CORBA::ULongLong to support 64-bit integers.  The
-          union contains various integral types and to support both Long and
-          LongLong would be redundant.
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
-
-          Added support dynamic sequences of CORBA::LongLong/
-          CORBA::ULongLong.
-
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff:
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
-        * orbsvcs/orbsvcs/Trader/constraint.l:
-
-          Updated the {float} regular expression to allow negative values
-          for floating point numbers.
-
-          Added support for CORBA::LongLong and CORBA::ULongLong.  Since all
-          integers are stored as 64-bit values instead of 32-bit values two
-          conversion functions (trader_stroll and trader_stroull) are used
-          to convert text into CORBA::LongLong and CORBA::ULongLong.  They
-          are good candidates for moving into ACE as emulation for platforms
-          that do not natively support strtoll and stroull.
-
-          Also, fixed an issue where negative integers were being stored and
-          compared as unsigned integers.
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
-        * orbsvcs/orbsvcs/Trader/Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Tokens.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
-        * orbsvcs/orbsvcs/Trader/constraint.y:
-
-          Switched the order of the TAO_SIGNED and TAO_UNSIGNED tokens which
-          are used by the TAO_Literal_Constraint to determine the widest
-          integral type.
-
-        * orbsvcs/tests/Trading/TT_Info.cpp:
-
-          Added a query to use a negative floating point number and a query
-          to use a number that would exceed the size of a CORBA::Long.
-
-        * orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp:
-        * orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc:
-        * orbsvcs/tests/unit/Trading/Interpreter/run_test.pl:
-
-          This unit test exercises the lexer for literal constraints as well
-          as the comparison of various mixed literal constraints.
-
-Tue Dec 12 14:21:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.h:
-          Fixed link problems with CORBA/e
-
-Tue Dec 12 12:31:45 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/TAO_Server_Request.inl:
-        * tao/TAO_Server_Request.cpp:
-
-          Corrected a very bad merge on my part.  Thanks to Chris Reed <cr
-          at progress dot com> for reporting this and providing a patch.
-
-Tue Dec 12 10:08:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/taoidl3toidl2defaults.mpb:
-          Moved to CIAO
-
-Mon Dec 11 21:38:29 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tests/Bug_2683_Regression/client.cpp:
-        * tests/Bug_2683_Regression/run_test.pl:
-
-          This test requires a host name to plug into the corbaloc string.
-          For VxWorks testing, only the server side runs on the target,
-          the client runs on the test-driver host. For this reason,
-          "localhost" is unacceptable for use as a hostname.
-
-Sun Dec 10 20:43:26 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Bug_2503_Regression/Makefile.am:
-        * tests/Bug_2560_Regression/Makefile.am:
-        * tests/Bug_2593_Regression/Makefile.am:
-        * tests/Bug_2595_Regression/Makefile.am:
-        * tests/Bug_2683_Regression/Makefile.am:
-        * tests/Cache_Growth_Test/Makefile.am:
-        * tests/CallbackTest/Makefile.am:
-        * tests/Client_Leaks/Makefile.am:
-        * tests/CodeSets/simple/Makefile.am:
-        * tests/Connect_Strategy_Test/Makefile.am:
-        * tests/Connection_Purging/Makefile.am:
-        * tests/Crash_On_Write/Makefile.am:
-        * tests/Crashed_Callback/Makefile.am:
-        * tests/Strategies/Makefile.am:
-        * tests/Timed_Buffered_Oneways/Makefile.am:
-        * tests/Two_Objects/Makefile.am:
-        * tests/Typedef_String_Array/Makefile.am:
-        * tests/UNKNOWN_Exception/Makefile.am:
-
-          Regenerated.
-
-        * tests/Bug_2503_Regression/Bug_2503_Regression.mpc:
-        * tests/Bug_2560_Regression/Bug_2560_Regression.mpc:
-        * tests/Bug_2593_Regression/Bug_2593_Regression.mpc:
-        * tests/Bug_2595_Regression/Bug_2595_Regression.mpc:
-        * tests/Bug_2683_Regression/IORTable.mpc:
-        * tests/Cache_Growth_Test/Cache_Growth_Test.mpc:
-        * tests/CallbackTest/CallbackTest.mpc:
-        * tests/Client_Leaks/Client_Leaks.mpc:
-        * tests/CodeSets/simple/CodeSets_simple.mpc:
-        * tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc:
-        * tests/Connection_Purging/Connection_Purging.mpc:
-        * tests/Crash_On_Write/Crash_On_Write.mpc:
-        * tests/Crashed_Callback/Crashed_Callback.mpc:
-        * tests/Strategies/Strategies.mpc:
-        * tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc:
-        * tests/Two_Objects/Two_Objects.mpc:
-        * tests/Typedef_String_Array/typedef_string_array.mpc:
-        * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-        * tests/Bug_2186_Regression/Makefile.am:
-
-          Regenerated.
-
-        * tests/Bug_2186_Regression/Bug_2186_Regression.mpc:
-
-          Add empty IDL_Files sections to Client and Server projects.
-
-Sun Dec 10 01:36:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Bug_2234_Regression/Makefile.am:
-
-          Regenerated.
-
-        * tests/Bug_2234_Regression/Bug_2234_Regression.mpc
-
-          Changed to inherit from anytypecode.
-
-Sun Dec 10 00:33:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Bug_1670/Regression/Makefile.am:
-
-          Regenerated.
-
-        * tests/Bug_1670/Regression/Bug_1670_Regression.mpc:
-
-          Add generated source files to MPC Source_Files section.
-
-Sat Dec  9 23:18:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Bug_1495_Regression/Makefile.am:
-        * tests/Bug_1551_Regression/Makefile.am:
-        * tests/Bug_1568_Regression/Makefile.am:
-        * tests/Bug_1627_Regression/Makefile.am:
-        * tests/Bug_1670_Regression/Makefile.am:
-        * tests/Bug_1676_Regression/Makefile.am:
-        * tests/Bug_1869_Regression/Makefile.am:
-        * tests/Bug_2174_Regression/Makefile.am:
-        * tests/Bug_2183_Regression/Makefile.am:
-        * tests/Bug_2186_Regression/Makefile.am:
-        * tests/Bug_2188_Regression/Makefile.am:
-        * tests/Bug_2234_Regression/Makefile.am:
-        * tests/Bug_2289_Regression/Makefile.am:
-        * tests/Bug_2328_Regression/Makefile.am:
-        * tests/Bug_2349_Regression/Makefile.am:
-        * tests/Bug_2429_Regression/Makefile.am:
-        * tests/Bug_2494_Regression/Makefile.am:
-
-          Regenerated.
-
-        * tests/Bug_1495_Regression/Bug_1495.mpc:
-        * tests/Bug_1551_Regression/Bug_1551_Regression.mpc:
-        * tests/Bug_1568_Regression/Bug_1568_Regression.mpc:
-        * tests/Bug_1627_Regression/Bug_1627_Regression.mpc:
-        * tests/Bug_1670_Regression/Bug_1670_Regression.mpc:
-        * tests/Bug_1676_Regression/Bug_1676_Regression.mpc:
-        * tests/Bug_1869_Regression/Bug_1869_Regression.mpc:
-        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc:
-        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc:
-        * tests/Bug_2186_Regression/Bug_2186_Regression.mpc:
-        * tests/Bug_2188_Regression/broken.mpc:
-        * tests/Bug_2234_Regression/Bug_2234_Regression.mpc:
-        * tests/Bug_2289_Regression/Bug_2289_Regression.mpc:
-        * tests/Bug_2328_Regression/Bug_2328_Regression.mpc:
-        * tests/Bug_2349_Regression/Bug_2349_Regression.mpc:
-        * tests/Bug_2429_Regression/Bug_2429_Regression.mpc:
-        * tests/Bug_2494_Regression/Bug_2494_Regression.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Fri Dec  8 22:30:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/IDL_Test/included.idl:
-        * tests/IDL_Test/valuetype.idl:
-
-          Added IDL to the test to cover the bug fixed in
-
-          Tue Dec  5 21:51:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Fri Dec  8 05:21:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Changed code to extract version number from tao/Version.h to be
-          more resilient to leading whitespace like was added by a bug in
-          the release script in the last beta.  Thanks to Ray Lischner
-          <rlischner at proteus-technologies dot com> for this patch.
-          Also thanks to Paul Riley <paul at riley dot net> for reporting
-          this problem.
-
-Fri Dec  8 04:45:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp:
-        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.h:
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-        * orbsvcs/orbsvcs/Log/Iterator_i.cpp:
-        * orbsvcs/orbsvcs/Log/Iterator_i.h:
+Wed Jan 24 18:46:01 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-          The Iterator's destroy() method was using _default_POA() to
-          obtain the POA to deactivate the object, but that didn't do
-          anything because it was activated on a the iterator POA.
-          Changed to pass the iterator POA so we can self-destruct
-          properly.
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Create the iterator POA with the POAManager obtained from the
-          log POA.  We were passing POAManager::_nil(), which created a
-          new POAManager.  This resulted in all operations on iterators to
-          fail, since the POAManager was never activated.
-
-Thu Dec  7 19:00:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * MPC/config/typecodefactory.mpb:
-
-          Added avoids_minimum_corba, avoids_corba_e_compact, and
-          avoids_corba_e_micro to the base project list. Thanks to
-          Johnny Willemsen <jwillemsen@remedy.nl> for his input
-          that helped reach the decision that this is the right
-          thing to do.
-
-        * orbsvcs/orbsvcs/IFRService.mpc:
-
-          - Removed base projects that are already pulled in by
-            others, including the 3 added to typecodefactory's
-            base project list, described above.
-
-          - Removed the 'IFRService' tag and tagcheck line, this
-            stuff was never used.
-
-          - Revised Source_Files and Template_Files blocks, and
-            added Header_Files block, so that template files will
-            get displayed in the right place and all header files
-            will get displayed, in Visual Studio projects.
-
-        * tests/Any/Recursive/RecursiveHello.mpc:
-        * examples/TypeCode_Creation/TypeCode_Creation.mpc:
-
-          Removed avoids_minimum_corba, avoids_corba_e_compact, and
-          avoids_corba_e_micro base projects, since they are now
-          pulled in by typecodefactory.
-
-Thu Dec  7 18:55:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.{h,cpp}:
-          Fixed minimum defines
-
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
-          Exclude certain functionality for CORBA/e
-
-Thu Dec  7 14:18:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
-        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
-        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
-        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
-          Build the clients after the idl project, not after server
-          to resolve build order problems in the CORBA/e builds
-
-Thu Dec  7 10:49:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB.{h,cpp}:
-          Disable more of the ORB when building for CORBA/e, thanks to
-          Jeff for pointing out that these methods wheren't disabled
-
-Thu Dec  7 09:56:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/rtscheduling.mpb:
-        * tao/RTScheduler.mpc:
-          Don't build with CORBA/e micro
-
-Thu Dec  7 09:54:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/avoids_corba_e_compact.mpb:
-        * MPC/config/avoids_corba_e_micro.mpb:
-        * MPC/config/avoids_minimum_corba.mpb:
-          Simplified these files, thanks to Jeff to pointing out that
-          they contained to much
-
-        * MPC/config/concurrency_serv.mpb:
-          Don't build with CORBA/e micro
-
-        * orbsvcs/orbsvcs/CosConcurrency.mpc:
-          Don't build serv with CORBA/e micro
-
-Thu Dec  7 08:02:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
-        * tao/PortableServer/ImplicitActivationStrategyImplicit.h:
-        * tao/PortableServer/RequestProcessingPolicy.cpp:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantManager.cpp:
-        * tao/PortableServer/ServantRetentionPolicy.cpp:
-        * tao/PortableServer/ThreadPolicy.cpp:
-        * tao/PortableServer/ThreadStrategySingle.cpp:
-        * tao/PortableServer/ThreadStrategySingle.h:
-        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
-        * tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
-          Disable more strategies with CORBA/e but also reordered some includes.
-          At the moment the strategy is fully disabled in a minimum build we
-          include orbconf.h outside the internal ifdef check and all includes
-          of classes are inside this ifdef. This way we don't pull in a static
-          initializers which seem to take 112 bytes of footprint per file
-          which is not needed.
-
-Thu Dec  7 07:38:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/PortableServer.cpp:
-          The wrong activation strategy was disabled when building for
-          CORBA/e
-
-Thu Dec  7 06:38:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ImR_Client/IMR_Client.cpp:
-        * tao/RTPortableServer/RT_POA.inl:
-          Some bool changes I missed in my previous commit
-
-Thu Dec  7 00:25:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Big_AMI/Makefile.am:
-
-          Regenerated.
-
-Wed Dec  6 22:27:21 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Big_AMI/Big_AMI.mpc:
-
-          Changed IDL project to inherit from ami.
-
-Wed Dec  6 21:11:47 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
-          Fixing a windows build warning about unused variable.
-
-wed Dec  6 19:58:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/POA/Policies/Policies.mpc:
-          Don't build when CORBA/e micro has been enabled
-
-Wed Dec  6 19:33:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
 
-        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
-        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
-        * examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc:
-        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
-          Don't build the server when CORBA/e micro has been enabled
+          Changed the last of the ACE_THROW's to real throw's.
 
-Wed Dec  6 19:24:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Jan 24 18:25:26 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
-        * tao/PortableServer/Active_Object_Map.cpp:
-        * tao/PortableServer/Active_Object_Map.h:
-        * tao/PortableServer/Active_Object_Map.inl:
-        * tao/PortableServer/Active_Object_Map_Entry.cpp:
-        * tao/PortableServer/IdUniquenessStrategy.h:
-        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
-        * tao/PortableServer/IdUniquenessStrategyMultiple.h:
-        * tao/PortableServer/IdUniquenessStrategyUnique.cpp:
-        * tao/PortableServer/IdUniquenessStrategyUnique.h:
-        * tao/PortableServer/RequestProcessingStrategy.h:
-        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
-        * tao/PortableServer/RequestProcessingStrategyAOMOnly.h:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
-        * tao/PortableServer/RequestProcessingStrategyDefaultServant.h:
-        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantActivator.h:
-        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
-        * tao/PortableServer/RequestProcessingStrategyServantLocator.h:
+        * tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp:
+        * tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * tao/EndpointPolicy/EndpointPolicy.cpp:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+        * tao/ImR_Client/ImR_Client.cpp:
+        * tao/Messaging/Asynch_Invocation.cpp:
+        * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+        * tao/Messaging/Messaging.cpp:
+        * tao/Messaging/Messaging_Loader.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/PI.cpp:
+        * tao/PI_Server/PI_Server_Loader.cpp:
+        * tao/PI_Server/Policy_Creator_T.h:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+        * tao/PortableServer/Non_Servant_Upcall.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
         * tao/PortableServer/Root_POA.cpp:
-        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/Servant_Base.cpp:
         * tao/PortableServer/Servant_Upcall.cpp:
-        * tao/PortableServer/Servant_Upcall.h:
-        * tao/PortableServer/ServantRetentionStrategy.h:
-        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
-        * tao/PortableServer/ServantRetentionStrategyNonRetain.h:
-        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
-        * tao/PortableServer/ServantRetentionStrategyRetain.h:
-          Use bool instead of int for several flags, also then use true/false
-          instead of 0/1
-
-Wed Dec  6 16:15:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
-        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
-
-          Fixing fuzz (missing $id$) and compile errors on
-          TAO_HAS_MINIMUM_CORBA builds, which define the POAManager
-          inteface without the deactivate() method.
-
-Wed Dec  6 16:10:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h:
-          Fixed doxygen warnings
-
-Wed Dec  6 15:55:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Abstract_Servant_Base.h:
-        * tao/AnyTypeCode/Fixed_TypeCode.h:
-        * tao/AnyTypeCode/TypeCode.h:
-        * tao/Codeset_Manager_Factory_Base.h:
-        * tao/Pluggable_Messaging.h:
-        * tao/Thread_Lane_Resources.h:
-          Fixed doxygen warnings
-
-Wed Dec  6 15:29:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Abstract_Interface/Makefile.am:
-        * tests/Any/Recursive/Makefile.am:
-        * tests/BiDirectional/Makefile.am:
-        * tests/BiDirectional_DelayedUpcall/Makefile.am:
-        * tests/BiDirectional_NestedUpcall/Makefile.am:
-        * tests/Big_AMI/Makefile.am:
-        * tests/Big_Oneways/Makefile.am:
-        * tests/Big_Reply/Makefile.am:
-        * tests/Big_Request_Muxing/Makefile.am:
-        * tests/Big_Twoways/Makefile.am:
-        * tests/Blocking_Sync_None/Makefile.am:
-        * tests/Bug_1020_Basic_Regression/Makefile.am:
-        * tests/Bug_1020_Regression/Makefile.am:
-        * tests/Bug_1254_Regression/Makefile.am:
-        * tests/Bug_1269_Regression/Makefile.am:
-        * tests/Bug_1270_Regression/Makefile.am:
-        * tests/Bug_1330_Regression/Makefile.am:
-        * tests/Bug_1361_Regression/Makefile.am:
-        * tests/Bug_1476_Regression/Makefile.am:
-        * tests/Bug_1482_Regression/Makefile.am:
-
-          Regenerated.
-
-        * tests/Abstract_Interface/Abstract_Interface.mpc:
-        * tests/Any/Recursive/RecursiveHello.mpc:
-        * tests/BiDirectional/BiDirectional.mpc:
-        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
-        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
-        * tests/Big_AMI/Big_AMI.mpc:
-        * tests/Big_Oneways/Big_Oneways.mpc:
-        * tests/Big_Reply/Big_Reply.mpc:
-        * tests/Big_Request_Muxing/Big_Request_Muxing.mpc:
-        * tests/Big_Twoways/Big_Twoways.mpc:
-        * tests/Blocking_Sync_None/Blocking_Sync_None.mpc:
-        * tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc:
-        * tests/Bug_1020_Regression/Bug_1020_Regression.mpc:
-        * tests/Bug_1254_Regression/Bug_1254_Regression.mpc:
-        * tests/Bug_1269_Regression/Bug_1269_Regression.mpc:
-        * tests/Bug_1270_Regression/Bug_1270_Regression.mpc:
-        * tests/Bug_1330_Regression/Bug_1330_Regression.mpc:
-        * tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
-        * tests/Bug_1476_Regression/Bug_1476_Regression.mpc:
-        * tests/Bug_1482_Regression/Bug_1482_Regression.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Wed Dec  6 14:36:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/PortableServer.cpp:
-          Reduced the number of process directives call for CORBA/e compact
-          and micro
-
-Wed Dec  6 14:28:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/ServantRetentionStrategyNonRetain.{h,cpp}:
-        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.{h,cpp}:
-          Added checks for CORBA/e compact and micro, no need to compile these
-          when these profiles are enabled.
-
-        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
-          Const improvement
-
-Wed Dec  6 14:15:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/rtportableserver.mpb:
-        * tao/RTPortableServer.mpc:
-          Don't build RTPortableServer when CORBA/e micro has been enabled
-
-Wed Dec  6 13:40:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-        * examples/Simple/time-date/Makefile.am:
-        * orbsvcs/examples/ORT/Makefile.am:
-        * orbsvcs/tests/Bug_2709_Regression/Makefile.am:
-        * tests/Bug_2654_Regression/Makefile.am:
-        * tests/OctetSeq/Makefile.am:
-        * tests/Oneway_Timeouts/Makefile.am:
-        * tests/Param_Test/Makefile.am:
-        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
-
-          Regenerate.
-
-        * configure.ac:
-        * orbsvcs/tests/Makefile.am:
-        * tests/Makefile.am:
-
-          Changes for move of Bug_2709_Regression unit test.
-
-Wed Dec  6 08:30:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * *.mpc:
-          Added to all mpc files that have avoids_corba_e_compact also
-          avoids_corba_e_micro because they also can't be build with
-          CORBA/e micro
-
-Tue Dec  5 21:51:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_argument/arglist.cpp (visit_sequence):
-
-          Added code to create the sequence node's name, if a check
-          determines that the node is from an included IDL file, and
-          is an anonymous sequence (not created with a typedef declaration).
-          This is the case in this particular visitor if a valuetype
-          inherits an anonymous sequence member from a valuetype
-          declared in another IDL file, and this visitor is generating
-          the argument list for the OBV_* constructor with member
-          values. The node's name has not yet been set, since it
-          cannot be done in the node constructor - if the sequence
-          is declared with a typedef, the typedef node is created
-          after the sequence node, and it also sets the sequence
-          node's 'anonymous' flag to false (set to true by default
-          in the sequence node constructor). Thanks to Ossama
-          Othman <ossama.othman@symantec.com> for reporting the
-          bug.
-
-Tue Dec  5 18:36:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/DSI_Gateway/DSI_Gateway.mpc:
-          Don't build with corba_e_compact
-
-        * orbsvcs/orbsvcs/Log/LogActivator.{h,cpp}:
-        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.{h,cpp}:
-          Changes to resolve compile errors with CORBA/e compact
-
-Tue Dec  5 15:29:59 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
-
-        * tests/Bug_2709_Regression/*:
-        * orbsvcs/tests/Bug_2709_Regression/*:
-          Regression test for bug#2709 was moved.
-
-Tue Dec  5 15:02:37 UTC 2006 Vadym Ridosh <vridosh@prismtech.com>
-        * tests/Bug_2709_Regression/Bug_2709_Regression.mpc:
-          Added dependency to avoid problem with build on some OSes.
-
-Tue Dec  5 11:35:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-          Added a check that -SSi is not a valid commandline argument, so
-          then we give an error, it is -SS, no third character at all.
-          This fixes bugzilla bug 2723.
-
-Tue Dec  5 11:31:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/valuetype.mpb:
-        * Valuetype.mpc:
-          Valuetype is not available with corba/e micro
-
-        * Valuetype/ValueBase.cpp:
-          Use ACE_ERROR for an error message
-
-Tue Dec  5 11:25:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
-        * orbsvcs/examples/ORT/ORT.mpc:
-          Don't build with corba/e compact
-
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
-          Don't build the server with corba/e compact
-
-        * orbsvcs/orbsvcs/PortableGroup.mpc:
-          Don't build with corba/e compact
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
-          Part can't be build with corba/e compact
-
-Tue Dec  5 11:19:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
-          Don't build the manager with corba/e compact
-
-Tue Dec  5 11:17:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
-          Don't build server with corba/e compact
-
-Tue Dec  5 08:28:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OctetSeq/OctetSeq.mpc:
-          Changed build order to resolve build order problems in the ace_for_tao
-          builds
-
-Tue Dec  5 04:21:50 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefile for new unit test subdirectory.
-
-        * tests/ORB_Local_Config/Makefile.am:
-
-          Regenerate to descend into CSD_Strategy subdirectory.
-
-        * tests/ORB_Local_Config/Bug_2612/Makefile.am:
-
-          New file.
-
-Tue Dec  5 04:10:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/AMH_Exceptions/Makefile.am:
-        * tests/AMH_Oneway/Makefile.am:
-        * tests/AMI/Makefile.am:
-        * tests/AMI_Buffering/Makefile.am:
-        * tests/AMI_Timeouts/Makefile.am:
-
-          Regenerated.
-
-        * tests/AMH_Exceptions/AMH_Exceptions.mpc:
-        * tests/AMH_Oneway/AMH_Oneway.mpc:
-        * tests/AMI/AMI.mpc:
-        * tests/AMI_Buffering/AMI_Buffering.mpc:
-        * tests/AMI_Timeouts/AMI_Timeouts.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Mon Dec  4 18:01:55 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tests/ORB_Local_Config/Bug_2612:
-        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
-        * tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h:
-        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
-        * tests/ORB_Local_Config/Bug_2612/run_test.pl:
-
-          Added new regression test for bug#2612. It should also cover the
-          issue described in bug#2677.
-
-        * tests/ORB_Local_Config/run_tests_all.pl:
-
-          Added the new test to the list of tests for manual execution.
-
-Mon Dec  4 17:30:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/Invocation_Adapter.cpp (invoke_i):
-        * tao/LocateRequest_Invocation_Adapter.cpp (invoke):
-
-          Added a service config guard to ensure the invocation is
-          processed, using the correct configuration repository.  The
-          change ensures that the ORB's repository is going to be
-          "current" for the duration of the invocation, which is needed if
-          timeouts and other policies are applied as expected.  Thanks to
-          Eider Oliveira <eider dot oliveira at gmail dot com> for
-          submitting the defect (bug# 2734)
-
-Mon Dec  4 16:17:07 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/util/utl_err.cpp (syntax_error):
-
-          Replaced increment of error count with immediate bailout
-          on any kind of syntax error. Keeping the state of the IDL
-          compiler consistent in the face of any syntax error would
-          require extensive hacking of bison-generated code, and we
-          still wouldn't get any code generation if there are any
-          errors going into the backend. This fix closes [BUGID:2688].
-
-Mon Dec  4 15:42:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/*:
-          The MPC base projects for TAO
-
-Mon Dec  4 13:23:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
-        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
-          Added static casts to get rid of warnings with vc
-
-Mon Dec  4 12:36:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Oneway_Timeouts/*:
-          Added missing id tags
-
-        * Release:
-          Added MPC
-
-Mon Dec  4 12:24:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC
-        * MPC/config
-          New directory for the base projects specifically for TAO
-
-Mon Dec  4 12:17:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2709_Regression/Client_Task.cpp:
-          Fixed conversion warning in vxworks builds
-
-Mon Dec  4 11:21:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
-        * tao/PI_Server/PortableServer_PolicyFactory.cpp:
-          Fixed compile errors with CORBA/e compact
-
-        * tao/Bounded_Value_Sequence_T.h:
-          Improved doxygen documentation
-
-Mon Dec  4 08:03:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Param_Test/Param_Test.mpc:
-          Build all projects after idl to get always the correct build
-          order
-
-Mon Dec  4 07:59:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicAny/DynCommon.{h,cpp}:
-          Removed not needed const qualifiers on the return type, fixes
-          icc warnings
-
-        * tao/Unbounded_Basic_String_Sequence_T.h:
-          Improved doxygen documentation
-
-        * tao/Policy_Set.cpp:
-          Const changes
-
-Sun Dec  3 14:25:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/ORB_Local_Config/Bug_1459/Makefile.am:
-        * tests/ORB_Local_Config/Bunch/Makefile.am:
-        * tests/ORB_Local_Config/Separation/Makefile.am:
-        * tests/ORB_Local_Config/Shared/Makefile.am:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am:
-        * tests/ORB_Local_Config/Simple/Makefile.am:
-        * tests/ORB_Local_Config/Service_Dependency/Makefile.am:
-
-          Add automake specific section so that includes is set relative
-          to $(srcdir).
-
-Sun Dec  3 07:39:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/BasicTypeTraits.cpp:
-          Fixed compile problems with Borland C++
-
-Sat Dec  2 23:11:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/Makefile.am:
-
-          Skip RTScheduling subdirectory for now.
-
-        * tests/Makefile.am:
-
-          Skip Bug_2399_Regression and CSD_Strategy_Tests
-          subdirectories for now.
-
-Sat Dec  2 23:02:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * Makefile.am:
-
-          Add tests subdirectory.
-
-        * tests/ICMG_Any_Bug/Makefile.am:
-        * tests/OBV/Simple/Makefile.am:
-
-          Regenerated.
-
-Fri Dec  1 20:18:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/fe_declarator.cpp (compose):
-
-          Removed a prefix match check that was overlooked in the
-          #pragma prefix changes in
-
-          Tue Nov 28 19:32:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          but was caught only on Solaris platforms, since on all
-          others, one of the compared strings always has an uninitialized
-          value of 0, which short-circuited the check.
-
-Fri Dec  1 15:39:03 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/OBV/Simple/OBV_Simple.mpc:
-
-          Removed -St from IDL compiler command line options, since
-          valuetypes now require typecode support.
-
-Fri Dec  1 15:19:34 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/ICMG_Any_Bug/Hello.mpc:
-
-          Removed -Sa and -St from the IDL compiler command line options
-          (pulled in from taoidldefaults.mpb), since the client code
-          uses DII.
-
-Fri Dec  1 14:59:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Event/UDP/Makefile.am:
-        * tests/Param_Test/Makefile.am:
-
-          Regenerated.
-
-Fri Dec  1 13:49:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Param_Test/Param_Test.mpc:
-          Added explicit build order and removed -Sa and -St from the
-          idlflags
-
-Fri Dec  1 13:37:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Security/Download.html:
-        * docs/tutorials/Quoter/index.html:
-          Updated download location of ACE/TAO/CIAO
-
-Fri Dec  1 13:35:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO-INSTALL.html:
-          Updated download location of ACE/TAO/CIAO
-
-Fri Dec  1 12:27:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Event/UDP/RtEC_UDP.mpc:
-          Fixed invalid filenames in this test
-
-Thu Nov 30 18:01:43 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/AnyTypeCode/BasicTypeTraits.cpp:
-        * tao/AnyTypeCode/BasicTypeTraits.h:
-
-          Added one-line convert() method to each specialization,
-          since returning the extraction type in
-          DynAnyBasicTypeUtils<>::get_value() is not correct for
-          chars, wchars, octets and booleans.
-
-        * tao/DynamicAny/DynAnyUtils_T.h:
-
-          Replaced an implicit temporary in
-          DynAnyBasicTypeUtils<>::get_value() with an explicit
-          constructor call, since the temporary was confused with a
-          cast by some compilers.
-
-        * tests/DynAny_Test/analyzer.cpp:
-
-          Replace a call to length() on an aliased array typecode
-          (which returned a BADKIND exception) to a call on the
-          unaliased typecode.
-
-Thu Nov 30 14:48:57 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
-        * tao/PortableServer/Var_Size_SArgument_T.cpp
-        * tao/Bounded_Sequence_CDR_T.h
-        * tao/Unbounded_Sequence_CDR_T.h
-
-          Fix for bugzilla 1676 (uninitialized "out" param for sequence<string>
-          can cause server to core). Old attempt to fix this was also removed.
-
-Thu Nov 30 14:17:22 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp (visit_union_pos):
-
-          Change to use the new DynAnyFactory method similar to the
-          change to Log_Constraint_Visitors.cpp in
-
-          Tue Nov 28 19:32:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Thu Nov 30 13:28:22 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/lex.yy.cpp.diff:
-
-          Recreated the diff file (and reprocessed idl.ll).  patch had
-          problems applying the diff that was in the repository (at least on
-          Linux).
-
-Thu Nov 30 13:06:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicAny/DynAny_i.cpp
-        * tao/DynamicAny/DynArray_i.cpp (init_common):
-        * tao/DynamicAny/DynEnum_i.cpp (init_common):
-        * tao/DynamicAny/DynSequence_i.cpp (init_common):
-        * tao/DynamicAny/DynStruct_i.cpp (init_common):
-        * tao/DynamicAny/DynUnion_i.cpp (init_common):
-          Use true/false for a bool
-
-Thu Nov 30 12:52:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/DynamicAny/DynCommon.cpp:
-          Fixed conversion warnings and const changes
-
-        * tao/DynamicAny/DynAnyUtils_T.h:
-          Made the code compiling with BCB6 and VC8 but with GCC there
-          are some more issues to be resolved
-
-Thu Nov 30 09:58:02 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
-
-        * tao/Stub.cpp
-        * tao/Stub.inl
-        * tao/Service_Callbacks.cpp
-        * tao/Service_Callbacks.h
-        * tao/ORB_Core.cpp
-        * tao/ORB_Core.inl
-        * tao/ORB_Core.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
-        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
-
-          Fix for bugzilla 2709.
-
-Thu Nov 30 05:52:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tests/Bug_2417_Regression/Makefile.am:
-        * tests/Bug_2654_Regression/Makefile.am:
-        * tests/Bug_2709_Regression/Makefile.am:
-        * tests/Hang_Shutdown/Makefile.am:
-        * tests/ICMG_Any_Bug/Makefile.am:
-        * tests/OctetSeq/Makefile.am:
-        * tests/Param_Test/Makefile.am:
-        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
-        * tests/RTCORBA/Client_Propagated/Makefile.am:
-        * tests/Timeout/Makefile.am:
-
-          Regenerated.
-
-        * tests/Bug_2417_Regression/Bug_2417_Regression.mpc:
-        * tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
-        * tests/Bug_2709_Regression/Bug_2709_Regression.mpc:
-        * tests/Hang_Shutdown/Hang.mpc:
-        * tests/ICMG_Any_Bug/Hello.mpc:
-        * tests/OctetSeq/OctetSeq.mpc:
-        * tests/Param_Test/Param_Test.mpc:
-        * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc:
-        * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc:
-        * tests/Timeout/Timeout.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Thu Nov 30 05:48:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added AM_CONDITIONAL for BUILD_JAVA, so we can handle
-          Makefile.am's with these options.  Default to false, until we
-          can write feature tests for this option.
-
-Thu Nov 30 05:44:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * examples/OBV/Typed_Events/Makefile.am:
-
-          Regenerated.
-
-Wed Nov 29 17:43:45 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/OBV/Typed_Events/Typed_Events.mpc:
-
-          Removed the IDL flag -St, which suppressed typecode generation,
-          so the _tao_type() method (which returns a typecode) can be
-          generated for the valuetypes in the IDL - necessary since
-          this method is pure virtual in ValueBase. This is a temporary
-          fix, some discussions are necessary to decide on an approach
-          to integrating _tao_type() with subsetted libraries, IDL
-          compiler command line options, and MPC settings.
-
-Wed Nov 29 17:13:33 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/DynamicAny/DynAnyUtils_T.h:
-
-          Put back some of the 'typename' qualifiers removed in
-
-          Wed Nov 29 000:11:49 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          since the lack is definitely causing problems with FC4
-          on the scoreboard. I had removed them because I thought
-          they were the cause of problems reported by Phil
-          Mesnier <mesnier_p@ociweb.com>, but perhaps those errors
-          stemmed from something else.
-
-Wed Nov 29 16:31:26 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/AnyTypeCode/BasicTypeTraits.cpp:
-        * tao/AnyTypeCode/BasicTypeTraits.h:
-
-          Added a guard around code for wchars similar to that in
-          tao/Unbounded_Sequence_CDR_T.h, as a workaround for LynxOS,
-          which has no native wchar type. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for the tip.
-
-Wed Nov 29 13:45:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefiles for new unit test subdirectories.
-
-        * tests/AMH_Exceptions/Makefile.am:
-        * tests/AMH_Oneway/Makefile.am:
-        * tests/AMI/Makefile.am:
-        * tests/AMI_Buffering/Makefile.am:
-        * tests/AMI_Timeouts/Makefile.am:
-        * tests/Abstract_Interface/Makefile.am:
-        * tests/Any/Makefile.am:
-        * tests/Any/Recursive/Makefile.am:
-        * tests/BiDirectional/Makefile.am:
-        * tests/BiDirectional_DelayedUpcall/Makefile.am:
-        * tests/BiDirectional_MultipleORB/Makefile.am:
-        * tests/BiDirectional_NestedUpcall/Makefile.am:
-        * tests/Big_AMI/Makefile.am:
-        * tests/Big_Oneways/Makefile.am:
-        * tests/Big_Reply/Makefile.am:
-        * tests/Big_Request_Muxing/Makefile.am:
-        * tests/Big_Twoways/Makefile.am:
-        * tests/Blocking_Sync_None/Makefile.am:
-        * tests/Bug_1020_Basic_Regression/Makefile.am:
-        * tests/Bug_1020_Regression/Makefile.am:
-        * tests/Bug_1254_Regression/Makefile.am:
-        * tests/Bug_1269_Regression/Makefile.am:
-        * tests/Bug_1270_Regression/Makefile.am:
-        * tests/Bug_1330_Regression/Makefile.am:
-        * tests/Bug_1361_Regression/Makefile.am:
-        * tests/Bug_1476_Regression/Makefile.am:
-        * tests/Bug_1476_Test/Makefile.am:
-        * tests/Bug_1482_Regression/Makefile.am:
-        * tests/Bug_1495_Regression/Makefile.am:
-        * tests/Bug_1535_Regression/Makefile.am:
-        * tests/Bug_1551_Regression/Makefile.am:
-        * tests/Bug_1568_Regression/Makefile.am:
-        * tests/Bug_1627_Regression/Makefile.am:
-        * tests/Bug_1635_Regression/Makefile.am:
-        * tests/Bug_1636_Regression/Makefile.am:
-        * tests/Bug_1639_Regression/Makefile.am:
-        * tests/Bug_1670_Regression/Makefile.am:
-        * tests/Bug_1676_Regression/Makefile.am:
-        * tests/Bug_1693_Test/Makefile.am:
-        * tests/Bug_1812_Regression/Makefile.am:
-        * tests/Bug_1813_Regression/Makefile.am:
-        * tests/Bug_1869_Regression/Makefile.am:
-        * tests/Bug_1904_Regression/Makefile.am:
-        * tests/Bug_2084_Regression/Makefile.am:
-        * tests/Bug_2119_Regression/Makefile.am:
-        * tests/Bug_2122_Regression/Makefile.am:
-        * tests/Bug_2124_Regression/Makefile.am:
-        * tests/Bug_2126_Regression/Makefile.am:
-        * tests/Bug_2134_Regression/Makefile.am:
-        * tests/Bug_2144_Regression/Makefile.am:
-        * tests/Bug_2174_Regression/Makefile.am:
-        * tests/Bug_2183_Regression/Makefile.am:
-        * tests/Bug_2186_Regression/Makefile.am:
-        * tests/Bug_2188_Regression/Makefile.am:
-        * tests/Bug_2201_Regression/Makefile.am:
-        * tests/Bug_2222_Regression/Makefile.am:
-        * tests/Bug_2234_Regression/Makefile.am:
-        * tests/Bug_2289_Regression/Makefile.am:
-        * tests/Bug_2319_Regression/Makefile.am:
-        * tests/Bug_2328_Regression/Makefile.am:
-        * tests/Bug_2345_Regression/Makefile.am:
-        * tests/Bug_2349_Regression/Makefile.am:
-        * tests/Bug_2375_Regression/Makefile.am:
-        * tests/Bug_2399_Regression/Makefile.am:
-        * tests/Bug_2417_Regression/Makefile.am:
-        * tests/Bug_2419_Regression/Makefile.am:
-        * tests/Bug_2424_Regression/Makefile.am:
-        * tests/Bug_2429_Regression/Makefile.am:
-        * tests/Bug_2494_Regression/Makefile.am:
-        * tests/Bug_2503_Regression/Makefile.am:
-        * tests/Bug_2542_Regression/Makefile.am:
-        * tests/Bug_2543_Regression/Makefile.am:
-        * tests/Bug_2549_Regression/Makefile.am:
-        * tests/Bug_2560_Regression/Makefile.am:
-        * tests/Bug_2593_Regression/Makefile.am:
-        * tests/Bug_2595_Regression/Makefile.am:
-        * tests/Bug_2654_Regression/Makefile.am:
-        * tests/Bug_2669_Regression/Makefile.am:
-        * tests/Bug_2683_Regression/Makefile.am:
-        * tests/Bug_2709_Regression/Makefile.am:
-        * tests/CDR/Makefile.am:
-        * tests/COIOP/Makefile.am:
-        * tests/CSD_Strategy_Tests/Broken/Makefile.am:
-        * tests/CSD_Strategy_Tests/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Common/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am:
-        * tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am:
-        * tests/Cache_Growth_Test/Makefile.am:
-        * tests/CallbackTest/Makefile.am:
-        * tests/Client_Leaks/Makefile.am:
-        * tests/CodeSets/Makefile.am:
-        * tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am:
-        * tests/CodeSets/libs/Makefile.am:
-        * tests/CodeSets/libs/UCS4_UTF16/Makefile.am:
-        * tests/CodeSets/simple/Makefile.am:
-        * tests/Codec/Makefile.am:
-        * tests/Collocation/Makefile.am:
-        * tests/CollocationLockup/Makefile.am:
-        * tests/Collocation_Exception_Test/Makefile.am:
-        * tests/Collocation_Oneway_Tests/Makefile.am:
-        * tests/Collocation_Opportunities/Makefile.am:
-        * tests/Collocation_Tests/Makefile.am:
-        * tests/Connect_Strategy_Test/Makefile.am:
-        * tests/Connection_Failure/Makefile.am:
-        * tests/Connection_Purging/Makefile.am:
-        * tests/Connection_Timeout/Makefile.am:
-        * tests/Crash_On_Write/Makefile.am:
-        * tests/Crashed_Callback/Makefile.am:
-        * tests/DII_Collocation_Tests/Makefile.am:
-        * tests/DII_Collocation_Tests/oneway/Makefile.am:
-        * tests/DII_Collocation_Tests/twoway/Makefile.am:
-        * tests/DLL_ORB/Makefile.am:
-        * tests/DSI_Gateway/Makefile.am:
-        * tests/DynAny_Test/Makefile.am:
-        * tests/Explicit_Event_Loop/Makefile.am:
-        * tests/Exposed_Policies/Makefile.am:
-        * tests/FL_Cube/Makefile.am:
-        * tests/Faults/Makefile.am:
-        * tests/File_IO/Makefile.am:
-        * tests/Forwarding/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am:
-        * tests/GIOP_Fragments/Java_Big_Request/Makefile.am:
-        * tests/GIOP_Fragments/Makefile.am:
-        * tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am:
-        * tests/Hang_Shutdown/Makefile.am:
-        * tests/Hello/Makefile.am:
-        * tests/ICMG_Any_Bug/Makefile.am:
-        * tests/IDL_Test/Makefile.am:
-        * tests/IORManipulation/Makefile.am:
-        * tests/IOR_Endpoint_Hostnames/Makefile.am:
-        * tests/IPV6/Makefile.am:
-        * tests/InterOp-Naming/Makefile.am:
-        * tests/Leader_Followers/Makefile.am:
-        * tests/LongUpcalls/Makefile.am:
-        * tests/MProfile/Makefile.am:
-        * tests/MProfile_Connection_Timeout/Makefile.am:
-        * tests/MProfile_Forwarding/Makefile.am:
-        * tests/MT_BiDir/Makefile.am:
-        * tests/MT_Client/Makefile.am:
-        * tests/MT_Server/Makefile.am:
-        * tests/MT_Timeout/Makefile.am:
-        * tests/Makefile.am:
-        * tests/Multiple/Makefile.am:
-        * tests/Multiple_Inheritance/Makefile.am:
-        * tests/Muxed_GIOP_Versions/Makefile.am:
-        * tests/Muxing/Makefile.am:
-        * tests/Native_Exceptions/Makefile.am:
-        * tests/NestedUpcall/MT_Client_Test/Makefile.am:
-        * tests/NestedUpcall/Makefile.am:
-        * tests/NestedUpcall/Simple/Makefile.am:
-        * tests/NestedUpcall/Triangle_Test/Makefile.am:
-        * tests/Nested_Event_Loop/Makefile.am:
-        * tests/Nested_Upcall_Crash/Makefile.am:
-        * tests/No_Server_MT_Connect_Test/Makefile.am:
-        * tests/OBV/Any/Makefile.am:
-        * tests/OBV/Collocated/Forward/Makefile.am:
-        * tests/OBV/Collocated/Makefile.am:
-        * tests/OBV/Factory/Makefile.am:
-        * tests/OBV/Forward/Makefile.am:
-        * tests/OBV/Makefile.am:
-        * tests/OBV/Simple/Makefile.am:
-        * tests/OBV/TC_Alignment/Makefile.am:
-        * tests/OBV/Truncatable/Makefile.am:
-        * tests/OBV/ValueBox/Makefile.am:
-        * tests/ORB_Local_Config/Bug_1459/Makefile.am:
-        * tests/ORB_Local_Config/Bunch/Makefile.am:
-        * tests/ORB_Local_Config/Makefile.am:
-        * tests/ORB_Local_Config/Separation/Makefile.am:
-        * tests/ORB_Local_Config/Service_Dependency/Makefile.am:
-        * tests/ORB_Local_Config/Shared/Makefile.am:
-        * tests/ORB_Local_Config/Simple/Makefile.am:
-        * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am:
-        * tests/ORB_destroy/Makefile.am:
-        * tests/ORB_init/Makefile.am:
-        * tests/ORB_init/Portspan/Makefile.am:
-        * tests/ORB_shutdown/Makefile.am:
-        * tests/ORT/Makefile.am:
-        * tests/Object_Loader/Makefile.am:
-        * tests/Objref_Sequence_Test/Makefile.am:
-        * tests/OctetSeq/Makefile.am:
-        * tests/Ondemand_Write/Makefile.am:
-        * tests/Oneway_Buffering/Makefile.am:
-        * tests/Oneway_Timeouts/Makefile.am:
-        * tests/Oneways_Invoking_Twoways/Makefile.am:
-        * tests/Optimized_Connection/Makefile.am:
-        * tests/POA/Bug_2511_Regression/Makefile.am:
-        * tests/POA/Current/Makefile.am:
-        * tests/POA/Deactivate_Object/Makefile.am:
-        * tests/POA/Default_Servant/Makefile.am:
-        * tests/POA/EndpointPolicy/Makefile.am:
-        * tests/POA/Etherealization/Makefile.am:
-        * tests/POA/Excessive_Object_Deactivations/Makefile.am:
-        * tests/POA/Identity/Makefile.am:
-        * tests/POA/MT_Servant_Locator/Makefile.am:
-        * tests/POA/Makefile.am:
-        * tests/POA/Nested_Non_Servant_Upcalls/Makefile.am:
-        * tests/POA/Non_Servant_Upcalls/Makefile.am:
-        * tests/POA/Object_Reactivation/Makefile.am:
-        * tests/POA/POAManagerFactory/Makefile.am:
-        * tests/POA/POA_Destruction/Makefile.am:
-        * tests/POA/Persistent_ID/Makefile.am:
-        * tests/POA/Policies/Makefile.am:
-        * tests/POA/Reference_Counting/Makefile.am:
-        * tests/POA/Single_Threaded_POA/Makefile.am:
-        * tests/POA/wait_for_completion/Makefile.am:
-        * tests/Parallel_Connect_Strategy/Makefile.am:
-        * tests/Param_Test/Makefile.am:
-        * tests/Permanent_Forward/Makefile.am:
-        * tests/Policies/Makefile.am:
-        * tests/Portable_Interceptors/AMI/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlot/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am:
-        * tests/Portable_Interceptors/AdvSlotExt/Makefile.am:
-        * tests/Portable_Interceptors/Benchmark/Makefile.am:
-        * tests/Portable_Interceptors/Bug_1559/Makefile.am:
-        * tests/Portable_Interceptors/Bug_2088/Makefile.am:
-        * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Makefile.am:
-        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am:
-        * tests/Portable_Interceptors/Dynamic/Makefile.am:
-        * tests/Portable_Interceptors/ForwardRequest/Makefile.am:
-        * tests/Portable_Interceptors/IORInterceptor/Makefile.am:
-        * tests/Portable_Interceptors/Makefile.am:
-        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
-        * tests/Portable_Interceptors/PICurrent/Makefile.am:
-        * tests/Portable_Interceptors/PolicyFactory/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am:
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
-        * tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am:
-        * tests/Portable_Interceptors/Register_Initial_References/Makefile.am:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
-        * tests/Portable_Interceptors/Slot/Makefile.am:
-        * tests/QtTests/Makefile.am:
-        * tests/Queued_Message_Test/Makefile.am:
-        * tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am:
-        * tests/RTCORBA/Banded_Connections/Makefile.am:
-        * tests/RTCORBA/Client_Propagated/Makefile.am:
-        * tests/RTCORBA/Client_Protocol/Makefile.am:
-        * tests/RTCORBA/Collocation/Makefile.am:
-        * tests/RTCORBA/Destroy_Thread_Pool/Makefile.am:
-        * tests/RTCORBA/Diffserv/Makefile.am:
-        * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am:
-        * tests/RTCORBA/Explicit_Binding/Makefile.am:
-        * tests/RTCORBA/Linear_Priority/Makefile.am:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am:
-        * tests/RTCORBA/Makefile.am:
-        * tests/RTCORBA/ORB_init/Makefile.am:
-        * tests/RTCORBA/Persistent_IOR/Makefile.am:
-        * tests/RTCORBA/Policies/Makefile.am:
-        * tests/RTCORBA/Policy_Combinations/Makefile.am:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am:
-        * tests/RTCORBA/Private_Connection/Makefile.am:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am:
-        * tests/RTCORBA/RTMutex/Makefile.am:
-        * tests/RTCORBA/Server_Declared/Makefile.am:
-        * tests/RTCORBA/Server_Protocol/Makefile.am:
-        * tests/RTCORBA/Thread_Pool/Makefile.am:
-        * tests/RTScheduling/Current/Makefile.am:
-        * tests/RTScheduling/DT_Spawn/Makefile.am:
-        * tests/RTScheduling/Makefile.am:
-        * tests/RTScheduling/Scheduling_Interceptor/Makefile.am:
-        * tests/RTScheduling/Thread_Cancel/Makefile.am:
-        * tests/RTScheduling/VoidData/Makefile.am:
-        * tests/Reliable_Oneways/Makefile.am:
-        * tests/Sequence_Unit_Tests/Makefile.am:
-        * tests/Servant_To_Reference_Test/Makefile.am:
-        * tests/Server_Connection_Purging/Makefile.am:
-        * tests/Server_Leaks/Makefile.am:
-        * tests/Server_Port_Zero/Makefile.am:
-        * tests/Single_Read/Makefile.am:
-        * tests/Smart_Proxies/Benchmark/Makefile.am:
-        * tests/Smart_Proxies/Collocation/Makefile.am:
-        * tests/Smart_Proxies/Makefile.am:
-        * tests/Smart_Proxies/On_Demand/Makefile.am:
-        * tests/Smart_Proxies/Policy/Makefile.am:
-        * tests/Smart_Proxies/dtor/Makefile.am:
-        * tests/Stack_Recursion/Makefile.am:
-        * tests/Strategies/Makefile.am:
-        * tests/Timed_Buffered_Oneways/Makefile.am:
-        * tests/Timeout/Makefile.am:
-        * tests/Two_Objects/Makefile.am:
-        * tests/Typedef_String_Array/Makefile.am:
-        * tests/UNKNOWN_Exception/Makefile.am:
-        * tests/Xt_Stopwatch/Makefile.am:
-
-          New files, baseline Makefile.am's for TAO's tests subdirectory.
-
-Wed Nov 29 13:25:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc:
-        * docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc:
-        * docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc:
-        * examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc:
-        * examples/OBV/Typed_Events/Typed_Events.mpc:
-        * examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
-        * examples/POA/Default_Servant/POA_Default_Servant.mpc:
-        * examples/POA/DSI/POA_DSI.mpc:
-        * examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
-        * examples/POA/FindPOA/POA_FindPOA.mpc:
-        * examples/POA/Forwarding/POA_Forwarding.mpc:
-        * examples/POA/Generic_Servant/POA_Generic_Servant.mpc:
-        * examples/POA/Loader/POA_Loader.mpc:
-        * examples/POA/NewPOA/POA_NewPOA.mpc:
-        * examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
-        * examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc:
-        * examples/POA/POA_BiDir/POA_BiDir.mpc:
-        * examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc:
-        * examples/POA/TIE/POA_TIE.mpc:
-        * examples/Quoter/Quoter.mpc:
-        * examples/TypeCode_Creation/TypeCode_Creation.mpc:
-        * orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc:
-        * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc:
-        * orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc:
-        * orbsvcs/examples/ORT/ORT.mpc:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
-        * orbsvcs/IFR_Service/IFR_Service.mpc:
-        * orbsvcs/orbsvcs/IFRService.mpc:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc:
-        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc:
-        * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc:
-        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc:
-        * orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc:
-        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
-        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
-        * orbsvcs/tests/FT_App/FT_App.mpc:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
-        * orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc:
-        * orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc:
-        * orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc:
-        * orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc:
-        * orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc:
-        * orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc:
-        * orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc:
-        * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
-        * performance-tests/Latency/Deferred/Deferred.mpc:
-        * performance-tests/Latency/DII/DII.mpc:
-        * performance-tests/Latency/DSI/DSI.mpc:
-        * performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc:
-        * performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc:
-        * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc:
-        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
-        * performance-tests/Sequence_Latency/DII/DII.mpc:
-        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
-        * tao/EndpointPolicy.mpc:
-        * tests/Bug_1535_Regression/Bug_1535_Regression.mpc:
-        * tests/Bug_1636_Regression/test.mpc:
-        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc:
-        * tests/Faults/Faults.mpc:
-        * tests/File_IO/File_IO.mpc:
-        * tests/ICMG_Any_Bug/Hello.mpc:
-        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
-        * tests/Param_Test/Param_Test.mpc:
-        * tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc:
-        * tests/POA/Default_Servant/Default_Servant.mpc:
-        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
-        * tests/POA/Etherealization/Etherealization.mpc:
-        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc:
-        * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc:
-        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
-        * tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc:
-        * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc:
-        * tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc:
-        * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc:
-        * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc:
-        * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc:
-        * tests/RTCORBA/Policies/Policies.mpc:
-        * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc:
-        * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc:
-        * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc:
-        * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc:
-        * tests/Servant_To_Reference_Test/Servant_to_Reference.mpc:
-          Added avoids_corba_e_compact as base project, these all
-          have also avoids_minimum_corba, so it was just a search/
-          replace.
-
-Wed Nov 29 12:07:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-          When generating the A.h file we don't need to generate an include
-          of another A.h file when we include a .idl file
-
-Wed Nov 29 02:51:19 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefiles for new unit test subdirectories.
-
-        * examples/Makefile.am:
-
-          Regenerate to descend into CSD_Strategy subdirectory.
-
-        * examples/CSD_Strategy/ThreadPool/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-
-          Regenerate.
-
-        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
-        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
-        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
-        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
-        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-        * tao/Makefile.am:
-
-          Regenerate.
-
-Wed Nov 29 000:11:49 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/DynamicAny/DynAnyUtils_T.h:
-
-          Removed some 'typename' qualifiers that Visual Studio seems
-          fine with either way, but which may be causing problems
-          with gcc.
-
-Tue Nov 28 22:44:08 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/DynamicAny/DynStruct_i.cpp:
-
-          Fixed typo (case error) in #include directive.
-
-        * tao/AnyTypeCode/BasicTypeTraits.h:
-
-          Replace forward declaration of enum TCKind with #include of
-          tao/Typecode_typesC.h to eliminate gcc complaints.
-
-Tue Nov 28 22:17:08 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/AnyTypeCode/BasicTypeTraits_T.h:
-
-          Added missing newline at the end of the file. Thanks to
-          Phil Mesnier <mesnier_p@ociweb.com> for reporting it.
-
-Tue Nov 28 21:00:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp.diff:
-
-          Applied patch sent by Chad Elliott <elliott_c@ociweb.com>.
-
-Tue Nov 28 20:03:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-          Improvement to the script for running on platforms with many
-          endpoints, such as those with IPv6. These improvements were
-          motivated by the discovery that the use of environment variables
-          by the ImplRepo Activator leads to trouble if the IMR IOR is
-          particularly long, which can happen if multiple profiles are
-          included in the IOR.
-
-Tue Nov 28 19:32:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/AnyTypeCode/BasicTypeTraits.cpp:
-        * tao/AnyTypeCode/BasicTypeTraits.h:
-        * tao/AnyTypeCode/BasicTypeTraits_T.h:
-
-          New files, defining and specializing template
-          utiities for using Anys and typecodes with
-          IDL basic types.
-
-        * tao/AnyTypeCode.mpc:
-
-          Added new files described above.
-
-        * tao/DynamicAny/DynAnyUtils_T.h:
-
-          New file containing templatized code factored
-          out from the insert_* and get_* methods, and
-          using the AnyTypeCode utilities described above.
-          Also contains code factored out from
-          DynAnyFactory methods.
-
-        * tao/DynamicAny/DynValue_i.cpp:
-        * tao/DynamicAny/DynAnyFactory.h:
-        * tao/DynamicAny/DynArray_i.cpp:
-        * tao/DynamicAny/DynCommon.cpp:
-        * tao/DynamicAny/DynStruct_i.cpp:
-        * tao/DynamicAny/DynCommon.h:
-        * tao/DynamicAny/DynValueBox_i.cpp:
-        * tao/DynamicAny/DynValueCommon_i.cpp:
-        * tao/DynamicAny/DynAny_i.cpp:
-        * tao/DynamicAny/DynUnion_i.cpp:
-        * tao/DynamicAny/DynUnion_i.h:
-        * tao/DynamicAny/DynAnyFactory.cpp:
-        * tao/DynamicAny/DynSequence_i.cpp:
-
-          - Added implementations of get_*_seq()
-            and insert_*_seq(), spec-defined
-            methods for each IDL basic type.
-
-          - Added implementation of insert_abstract()
-            and get_abstract().
-
-          - Factored out code from existing insert_*
-            and get_* methods to templatized
-            utility code described above.
-
-          - Factored out code from DynAnyFactory
-            methods similarly.
-
-          - Fixed bug in get_reference() and get_val()
-            that (incorrectly) took ownership of the
-            dynamic any's contents. Thanks to Phil
-            Mesnier <mesnier_p@ociweb.com> for
-            reporting the bug.
-
-        * tao/Valuetype/AbstractBase.h:
-        * tao/Valuetype/AbstractBase.cpp:
-
-          Added declaration and definition of typecode
-          for AbstractBase.
-
-        * tao/Valuetype/ValueBase.h:
-        * tao/Valuetype/ValueBase.cpp:
-
-          Added virtual _tao_type() method that returns
-          the associated typecode polymorphically. This
-          method is a TAO extension, and is for internal
-          use only (currently used in Any insertion
-          operators for valuetypes - see below). It
-          does not make a copy.
-
-        * docs/dynany/index.html:
-
-          Updated documentation to include the changes
-          described above.
-
-        * tests/DynAny_Test/test_dynstruct.cpp:
-        * tests/DynAny_Test/test_dynany.cpp:
-        * tests/DynAny_Test/test_dynunion.cpp:
-        * tests/DynAny_Test/data.cpp:
-        * tests/DynAny_Test/data.h:
-        * tests/DynAny_Test/test_dynenum.cpp:
-        * tests/DynAny_Test/test_dynsequence.cpp:
-        * tests/DynAny_Test/analyzer.cpp:
-        * tests/DynAny_Test/test_dynarray.cpp:
-        * tests/DynAny_Test/analyzer.h:
-        * tests/DynAny_Test/driver.cpp:
-        * tests/DynAny_Test/da_tests.idl:
-
-          Updated tests to cover some of the new Dynamic Any
-          methods described above.
-
-        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
-
-          Changed code that uses DynamicAnyFactory method,
-          a consequence of the refactoring in Dynamic Any
-          described above.
-
-        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/ast/ast_decl.cpp:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
-
-          - Fixed bugs in code generation for eventtypes. Thanks
-            to Ming Xiong <mxiong@dre.vanderbilt.edu> for
-            reporting a problem with anonymous sequence eventtype
-            members that led to the discovery of the other
-            inconsistencies.
-
-          - Added patches to the lex file and to the corresponding
-            generated C++ file that (1) corrects inconsistencies
-            between these two files and (2) fixes problems with
-            the SunCC preprocessor. Also patched the corresponding
-            lex.yy.cpp.diff file. Thanks to Chad Elliott
-            <elliott_c@ociweb.com> for supplying the patches.
-
-          - Added generation of virtual _tao_type() method for
-            valuetypes (and eventtypes), as well as use of this
-            method in the corresponding Any insertion operators.
-            These changes make Any insertion completely polymorphic
-            for valuetypes and eventtypes. These changes include
-            boxed valuetypes.
-
-          - Fixed a bug in the handling of #pragma prefix directives
-            when they occur before included IDL files. Thanks to
-            Viola Wang <vwang@eso.org> for reporting the problem.
-            This change closes [BUGID:2714].
-
-        * NEWS:
-
-          Added items listing the new Dynamic Any methods.
-
-Tue Nov 28 17:01:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * tao/TAO_Internal.cpp:
-          Fix to restore processing of the -ORBNegotiateCodesets 1
-          option.
-
-        * tests/Oneway_Timeouts/client.cpp:
-          Reimplement the timeout evaluation to avoid the use of
-          std::abs() as that function is not available on 64-bit windows
-          builds using the intel c++ compiler with VC 7.1 IDE.
-
-Tue Nov 28 16:54:36 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/utl_err.h (version_syntax_error):
-        * TAO_IDL/fe/lex.yy.cpp (idl_store_pragma):
-        * TAO_IDL/fe/idl.ll (idl_store_pragma):
-        * TAO_IDL/util/utl_err.cpp (version_syntax_error):
-
-          Qualified the char* parameter in the signature of the
-          recently-added version_syntax_error() with 'const'. Also
-          qualified the char* arg passed to it in idl_store_pragma()
-          similarly, since the rhs of this arg initialization is
-          a string literal, and thus causes a warning on some
-          compilers.
-
-Tue Nov 28 13:46:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Makefiles for new unit test subdirectories.
-
-        * orbsvcs/tests/Event/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
-
-          Regenerate to descend into new test subdirectories.
-
-        * orbsvcs/tests/Event/UDP/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am:
-
-          New files, Makefile.am's for newly supported unit tests.
-
-        * orbsvcs/tests/Event/UDP/RtEC_UDP.mpc:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
-
-          Split out IDL compilation into separate MPC project.
-
-Tue Nov 28 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Bounded_Basic_String_Sequence_T.h:
-          Fixed doxygen errors
-
-        * tao/Unbounded_Basic_String_Sequence_T.h:
-          Improved doxygen documentation
-
-Mon Nov 27 21:03:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
-
-          - Cosmetic changes to source code, mostly addition of
-            braces around single-line IF bodies.
-
-          - Cosmetic changes to generated code, to keep line
-            lengths less than 80 characters.
-
-        * TAO_IDLbe/be_visitor_typecode/typecode_defn.cpp:
-
-          Changed check to tell if interface or valuetype members
-          are defined, and thus if they need a forward declared
-          typecode generated. This need for this change is a
-          consequence of recent changes in the way forward
-          declared interfaces and valuetypes are handled.
-
-        * TAO_IDLast/ast_interface_fwd.cpp:
-
-          Removed an unnecessary line of source code.
-
-Mon Nov 27 17:34:21 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/utl_err.h:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/util/utl_err.cpp:
-
-          Added error check in #pragma version parsing, and a new
-          error message to output if an error is found with this
-          check. Since the only related error that was checked
-          for and reported before was an invalid version number,
-          an additional case was needed for a more general syntax
-          error. Thanks to Johnny Willemsen <jwillemsen@remedy.nl>
-          for supplying the example IDL that caused a crash due
-          to the lack of this error checking. This fix closes
-          [BUGID:2728].
-
-Mon Nov 27 14:46:18 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
-
-        * tests/Bug_2709_Regression/Bug_2709_Regression.mpc
-        * tests/Bug_2709_Regression/client.cpp
-        * tests/Bug_2709_Regression/Client_Task.cpp
-        * tests/Bug_2709_Regression/Client_Task.h
-        * tests/Bug_2709_Regression/README
-        * tests/Bug_2709_Regression/run_test.pl
-        * tests/Bug_2709_Regression/server.cpp
-        * tests/Bug_2709_Regression/Server_Task.cpp
-        * tests/Bug_2709_Regression/Server_Task.h
-        * tests/Bug_2709_Regression/Test.idl
-        * tests/Bug_2709_Regression/TestImpl.cpp
-        * tests/Bug_2709_Regression/TestImpl.h
-          Added a regression for bug 2709.
-
-Mon Nov 27 14:29:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/tao.mpc:
-        * tao/AnyTypeCode.mpc:
-
-          Move list generated typecode (*A.h) header files from tao.mpc
-          to AnyTypeCode.mpc.  Even though the files are generated from
-          rules in tao.mpc, they belong in AnyTypeCode.mpc (the sources
-          are compiled there, etc.).  This also helps with a latent MPC
-          bug that expressed itself in the borland builds, where the
-          directory separator was not changed from '/' to '\'.
-
-Mon Nov 27 12:50:48 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/Object.h:
-        * tao/Object.cpp:
-
-          Provide hooks to enable custom Object to IOR conversion or
-          allowing local objects (such as Smart Proxies) to be converted to
-          an IOR string.
-
-        * tao/ORB.cpp:
-
-          Utilize the new hooks when performing the Object to IOR string
-          conversion.
-
-        * tests/Smart_Proxies/Smart_Proxy_Impl.h:
-        * tests/Smart_Proxies/Smart_Proxy_Impl.cpp:
-        * tests/Smart_Proxies/client.cpp:
-        * tests/Smart_Proxies/run_test.pl:
-
-          This test has been modified to implement both aforementioned
-          hooks and perform comparisons to ensure that the right thing has
-          been done.
-
-Mon Nov 27 09:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/HTTP_Client.h:
-        * tao/HTTP_Handler.h:
-          Export these classes from the TAO lib. These can be reused then
-          by several parts in CIAO and that way we don't have code
-          duplication and smaller footprint
-
-Mon Nov 27 08:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * *.mpc:
-          Removed exceptions as base project because TAO already requires
-          exceptions and renamed minimum_corba to avoids_minimum_corba
-
-Mon Nov 27 08:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Document the changes I have done last weekend to resolve link
-        problems with vc8. With vc8 we now explicitly export the base
-        templates for the basic sequences. This also requires that
-        applications do import these base templates which in practice
-        means that when you use any of the sequences of basic types
-        you must include (in)directly the ones in the corba library.
-        If you don't do that you get compile/link errors related
-        to the basic sequences
-
-        * tao/tao.mpc:
-          Enabed -Gse for ULongLongSeq
-
-        * orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl:
-          Use the CORBA::ULongLongSeq predefined typedef
-
-        * orbsvcs/orbsvcs/CosTrading.idl:
-        * orbsvcs/orbsvcs/SecurityLevel3.idl:
-          Include a pidl file from core to get the import of the
-          base template
-
-        * tests/Portable_Interceptors/PICurrent/client.cpp:
-          Check also the length of the returned sequence
-
-Sun Nov 26 02:41:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/tests/Event/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
-
-          Hand tweak to avoid subdirectories that aren't yet supported.
-
-Sat Nov 25 13:56:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-        * orbsvcs/orbsvcs/ec_typed_events_idl.mpb:
-
-          Add -GT to idlflags.  We generate tie classes for the untyped
-          CosEvent interfaces, we should do the same for the typed ones
-          for symmetry.
-
-Fri Nov 24 14:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Sequence_Unit_Tests/Bounded_String.cpp:
-          Updated because of string sequence changes earlier today
-
-Fri Nov 24 13:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Portable_Interceptors/PICurrent/client.cpp:
-          Added a test for bugzilla 2656
-
-        * tao/Stub.cpp (get_policy_overrides):
-          When policies is zero, return an empty sequence instead of
-          a nill pointer. This fixes bugzilla 2656. Thanks to
-          Richard Ridgway <Richard_Ridgway at ml dot com> for
-          delevering the test extension and the patch for this file.
-
-Fri Nov 24 13:43:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure Bug_2615_Regression unit test.
-
-        * orbsvcs/tests/Makefile.am:
-
-          Regenerated to include Bug_2615_Regression subdirectory.
-
-        * orbsvcs/tests/Bug_2615_Regression/Makefile.am:
-
-          New file, Makefile.am for new-ish unit test.
-
-Fri Nov 24 13:39:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Configure RTCORBA Quoter tutorial.
-
-        * docs/tutorials/Quoter/Makefile.am
-
-          Regenerated to include RTCORBA subdirectory.
-
-        * docs/tutorials/Quoter/RTCORBA/Makefile.am
-
-          New file, Makefile.am for new-ish tutorial.
-
-Fri Nov 24 13:24:56 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-
-          Regenerated.
-
-Fri Nov 24 13:21:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * configure.ac:
-
-          Added AM_CONDITIONAL for BUILD_STL and BUILD_BOOST, so we can
-          generate Makefile.am's with these options.  Default to false,
-          until we can write feature tests for these options.
-
-Fri Nov 24 13:21:00 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-        * orbsvcs/orbsvcs/ec_typed_events_skel.mpb:
-
-          Removed *S_T.inl files from the Inline_Files section.
-
-Fri Nov 24 13:19:24 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-        * tao/Strategies.mpc:
-
-          Clear PIDL_Files section as the Strategies *.pidl files are
-          processed within the IDL_Files section, and this results in
-          duplicate entries.
-
-Fri Nov 24 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Bounded_Basic_String_Sequence_T.h:
-        * tao/Unbounded_Basic_String_Sequence_T.h:
-          Moved these templates from TAO::details to TAO namespace because
-          we are going to move these templates directly
-
-        * tao/Bounded_String_Sequence_T.h:
-        * tao/Bounded_Wstring_Sequence_T.h:
-        * tao/Unbounded_String_Sequence_T.h:
-        * tao/Unbounded_Wstring_Sequence_T.h:
-          Removed, not used anymore, the IDL compiler uses the basic string
-          sequence directly.
-
-        * TAO_IDL/be/be_visitor_template_export.cpp:
-          Removed special handling for (w)string sequences
-
-        * TAO_IDL/be/be_sequence.cpp:
-          Changed generation to use basic string sequence template directly
-
-        * tao/Sequence_T.h:
-        * tao/tao.mpc:
-          Removed the files that got removed
-
-        * tao/Unbounded_Sequence_CDR_T.h:
-        * tao/Bounded_Sequence_CDR_T.h:
-          Updated because of the move of the basic string sequence files
-          from TAO::details to TAO
-
-Fri Nov 24 06:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/tao.mpc:
-          Don't use -Gse for ULongLongSeq at this moment, vc8 seems to
-          have a problem with this file
-
-Thu Nov 23 14:51:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Makefile.am:
-
-          Regenerated.
-
-Thu Nov 23 14:20:33 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
-
-          (Hopefully) fix Borland warning.
-
-Thu Nov 23 14:15:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-
-          Removed *S_T.inl files from the Inline_Files section.
-
-Thu Nov 23 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/tao.mpc:
-          Readded -Gse again
-
-        * TAO_IDL/be/be_codegen.cpp:
-          Fixed wrong comment in A.h generation
-
-        * TAO_IDL/be/be_interface.cpp:
-          Const improvement
-
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-          Removed some unneeded c-style casts
-
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-          Small code change to define the local variable and assign
-          it on the same line.
-
-        * TAO_IDL/be/be_visitor_template_export.cpp:
-          Added special handling for octet/wstring and string sequences.
-          Removed generation of long comment why we explicitly
-          export the base templates, not usefull in generated code
-
-        * TAO_IDL/util/utl_global.cpp:
-          Removed spaces.
-
-        * tao/PolicyC.cpp:
-          Removed not needed Borland pragma option
-
-Thu Nov 23 12:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/tao.mpc:
-          Removed -Gse for the sequence files, causes some problems
-          on the scoreboard.
-
-Thu Nov 23 11:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * Release:
-          Changed TAO_ACE* to TAO_*mwc. That prevents that the TAO_ACE*.sln
-          files are added twice to the tar archive. This fixes bug 2680
-
-Thu Nov 23 10:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2669_Regression/Child.idl:
-        * tests/Bug_2669_Regression/client.cpp:
-          Added a regression for bug 2714 which hasn't been fixed yet.
-
-Thu Nov 23 07:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/tao.mpc:
-          Simplified the idlflags to put the common flags for all pidl files
-          at the top of this file. Added regeneration of OctetSeq.pidl
-          and UShortSeq.pidl, these can now be regenerated using the new
-          -Gse option which is enabled for all sequence files
-
-        * tao/OctetSeqC.{h,cpp}:
-        * tao/UShortSeqC.{h,cpp}:
-        * tao/OctetSeqS.h:
-        * tao/UShortSeqS.h:
-        * tao/AnyTypeCode/OctetSeqA.{h,cpp}:
-        * tao/AnyTypeCode/UShortSeqA.{h,cpp}:
-        * tao/diffs/OctetSeq.diff:
-        * tao/diffs/UShortSeq.diff:
-          Removed all these files, they are not regenerated as part of the
-          build.
-
-        * tao/OctetSeq.pidl:
-        * tao/UShortSeq.pidl:
-          Removed remark about applying a diff
-
-Thu Nov 23 06:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
-          Also don't build the server when ace_for_tao is enabled
-
-        * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
-          Don't build in ace_for_tao
-
-Thu Nov 23 03:20:04 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-        * orbsvcs/orbsvcs/CosTrading.mpc:
-        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/CosNotification.mpc:
-        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
-        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
-        * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
-        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
-        * orbsvcs/orbsvcs/CosProperty.mpc:
-
-          Removed *S_T.* files from the Header_Files, Inline_Files, and
-          Template_Files sections, cooresponding to the recent change to
-          orbsvcslib.mpb which removed -GT from the command line options
-          passed to tao_idl.
-
-Thu Nov 23 01:05:04 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
-          Fix typo in ACE_Get_Opt option specification which made it
-          impossible to specify the number of threads.
-
-Wed Nov 22 22:20:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/Makefile.am:
-
-          Regenerated.
-
-Wed Nov 22 20:29:03 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-
-          Regenerated.
-
-Wed Nov 22 20:18:50 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_template_export.cpp:
-        * TAO_IDL/be_include/be_visitor_template_export.h:
-
-          New files, defining a new visitor that optionally
-          generates an explicit export of the template base class
-          of the C++ class generated for an IDL sequence. This
-          visitor is triggered by the new command line option
-          described below, and is intended as a workaround for a
-          bug in Visual Studio. This fixes bugzilla 2703.
-
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be_include/be_global.h:
-
-          - Added new command line option -Gse that will trigger the
-            generation of an explicit export described above.
-
-          - Fixed call to lookup_by_name() when it is used to locate
-            CCMObject in the AST and store it for future access in
-            the backend global data class. An additional argument
-            was recently added to lookup_by_name() and should have
-            been used in this call but wasn't. Thanks to Johnny
-            Willemsen <jwillemsen@remedy.nl> for reporting the
-            resulting incorrect code generation in the copy
-            constructor for components. This fixes bugzilla 2724.
-
-        * TAO_IDL/be/be_interface.cpp:
-
-          Cosmetic changes.
-
-        * docs/releasenotes/index.html:
-        * docs/compiler.html:
-
-          Updated IDL compiler documentation with the new command line
-          option.
-
-Wed Nov 22 19:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/CosEvent.mpc:
-        * orbsvcs/orbsvcs/RTEvent.mpc:
-          Add -GT to the idlflags because we have some examples that use
-          the TIE files from these services
-
-Wed Nov 22 18:50:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-
-          Now the infinate recursion problem has been resolved, we invoke
-          TAO_LogMgr_i::create_log_reference() from TAO_Log_i::init() and
-          stash it away in a member variable.  This allows us to remove
-          the code that lazily obtained the object reference within the
-          active data path of the server.
-
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
-
-          Changed TAO_LogMgr_i::create_log_reference() to use
-          _unchecked_narrow() while narrowing the object reference.  This
-          avoids the infinite recursion which occured with _narrow() when
-          this was called by the servant activator's incarnate() method.
-
-
-Wed Nov 22 18:48:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
-
-          Remove extraneous ACE_DEBUG's in destructor.
-
-Wed Nov 22 18:42:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/examples/Log/Event/run_test.pl:
-        * orbsvcs/examples/Log/RTEvent/run_test.pl:
-        * orbsvcs/examples/Log/Notify/run_test.pl:
-
-          Increase timeout so that test passes on slower systems.
-
-Wed Nov 22 15:38:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * tao/Version.h:
-
-          Remove extraneous whitespace from TAO_VERSION macro definition.
-
-Wed Nov 22 15:14:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
-        * orbsvcs/tests/Event/Makefile.am:
-        * orbsvcs/tests/Simple_Naming/Makefile.am:
-        * orbsvcs/tests/ImplRepo/Makefile.am:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
-        * orbsvcs/tests/Trading/Makefile.am:
-        * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
-        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
-        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
-        * orbsvcs/tests/Redundant_Naming/Makefile.am:
-        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
-        * orbsvcs/tests/Notify/lib/Makefile.am:
-        * orbsvcs/tests/FT_App/Makefile.am:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
-        * orbsvcs/examples/CosEC/Factory/Makefile.am:
-        * orbsvcs/examples/LoadBalancing/Makefile.am:
-        * tao/Makefile.am:
-        * docs/tutorials/Quoter/idl/Makefile.am:
-        * performance-tests/Sequence_Latency/DSI/Makefile.am:
-        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/DII/Makefile.am:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Sequence_Latency/AMI/Makefile.am:
-        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am:
-        * performance-tests/Callback/Makefile.am:
-        * performance-tests/Latency/DSI/Makefile.am:
-        * performance-tests/Latency/Deferred/Makefile.am:
-        * performance-tests/Latency/Thread_Pool/Makefile.am:
-        * performance-tests/Latency/Single_Threaded/Makefile.am:
-        * performance-tests/Latency/DII/Makefile.am:
-        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
-        * performance-tests/Latency/AMI/Makefile.am:
-        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
-        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
-        * performance-tests/Throughput/Makefile.am:
-        * examples/POA/TIE/Makefile.am:
-        * examples/Kokyu_dsrt_schedulers/Makefile.am:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
-        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
-        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
-        * examples/RTCORBA/Activity/Makefile.am:
-        * examples/AMH/Sink_Server/Makefile.am:
-        * examples/mfc/Makefile.am:
-        * examples/AMI/FL_Callback/Makefile.am:
-        * examples/PluggableUDP/tests/Basic/Makefile.am:
-        * examples/PluggableUDP/tests/Performance/Makefile.am:
-        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
-
-          Regenerated.
-
-Wed Nov 22 12:34:29 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h:
-        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h:
-        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h:
-        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h:
-        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp:
-        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h:
-        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h:
-        * orbsvcs/tests/Bug_2137_Regression/README:
-        * orbsvcs/tests/Bug_2137_Regression/client.cpp:
-        * orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc:
-        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h:
-        * orbsvcs/tests/Bug_2248_Regression/test.idl:
-        * orbsvcs/tests/Bug_2248_Regression/server.cpp:
-        * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp:
-        * orbsvcs/tests/Bug_2248_Regression/README:
-        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
-        * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h:
-        * orbsvcs/tests/Bug_2248_Regression/client.h:
-        * orbsvcs/tests/Bug_2248_Regression/test_i.cpp:
-        * orbsvcs/tests/Bug_2248_Regression/tests.idl:
-        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
-        * orbsvcs/tests/Bug_2248_Regression/Client_i.h:
-        * orbsvcs/tests/Bug_2248_Regression/test_i.h:
-        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp:
-        * orbsvcs/tests/Bug_2247_Regression/Manager.h:
-        * orbsvcs/tests/Bug_2247_Regression/test.idl:
-        * orbsvcs/tests/Bug_2247_Regression/server.cpp:
-        * orbsvcs/tests/Bug_2247_Regression/test_i.cpp:
-        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
-        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
-        * orbsvcs/tests/Bug_2247_Regression/Client_i.h:
-        * orbsvcs/tests/Bug_2247_Regression/README:
-        * orbsvcs/tests/Bug_2247_Regression/test_i.h:
-        * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp:
-        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp:
-        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h:
-        * orbsvcs/Logging_Service/Event_Logging_Service/README:
-        * orbsvcs/Logging_Service/RTEvent_Logging_Service/README:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/README:
-        * tao/PortableServer/Servant_var.inl:
-        * tao/PortableServer/Servant_var.cpp:
-        * tao/PortableServer/Servant_var.h:
-        * tao/Incoming_Message_Stack.inl:
-        * tao/Incoming_Message_Stack.h:
-        * tests/Bug_2222_Regression/test.cpp:
-        * tests/Bug_2222_Regression/Bug_2222_Regression.mpc:
-        * tests/Bug_2222_Regression/TestCase.idl:
-        * tests/Bug_2222_Regression/TestType.idl:
-        * tests/Bug_2144_Regression/test.cpp:
-        * tests/Bug_2144_Regression/Bug_2144_Regression.mpc:
-        * tests/Bug_2144_Regression/test.idl:
-        * tests/Bug_2144_Regression/README:
-        * tests/QtTests/client.cpp:
-        * tests/QtTests/client.h:
-        * tests/QtTests/test.idl:
-        * tests/QtTests/server.cpp:
-        * tests/QtTests/test_i.cpp:
-        * tests/QtTests/test_i.h:
-        * tests/Bug_2375_Regression/test.cpp:
-        * tests/Bug_2375_Regression/test.idl:
-        * tests/Bug_2375_Regression/Bug_2375_Regression.mpc:
-        * tests/Bug_2375_Regression/README:
-        * tests/Bug_1812_Regression/test.cpp:
-        * tests/Bug_1812_Regression/Bug_1812_Regession.mpc:
-        * tests/Bug_1812_Regression/Test.idl:
-        * tests/MProfile_Forwarding/Servant_Locator.cpp:
-        * tests/MProfile_Forwarding/test.idl:
-        * tests/MProfile_Forwarding/server.cpp:
-        * tests/MProfile_Forwarding/test_i.inl:
-        * tests/MProfile_Forwarding/Servant_Locator.h:
-        * tests/Permanent_Forward/Permanent_Forward.mpc:
-        * tests/Permanent_Forward/README:
-        * tests/Permanent_Forward/StubTest.cpp:
-        * tests/ICMG_Any_Bug/client.cpp:
-        * tests/ICMG_Any_Bug/HelloWorld.h:
-        * tests/ICMG_Any_Bug/Hello.cpp:
-        * tests/ICMG_Any_Bug/server.cpp:
-        * tests/ICMG_Any_Bug/Hello.h:
-        * tests/Bug_2183_Regression/client.cpp:
-        * tests/Bug_2183_Regression/Hello.cpp:
-        * tests/Bug_2183_Regression/Test.idl:
-        * tests/Bug_2183_Regression/server.cpp:
-        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc:
-        * tests/Bug_2183_Regression/Hello.h:
-        * tests/Bug_2183_Regression/README:
-        * tests/IDL_Test/array_only.idl:
-        * tests/Bug_1813_Regression/test.cpp:
-        * tests/Bug_1813_Regression/Bug_1813_Regession.mpc:
-        * tests/Bug_1813_Regression/Test.idl:
-        * examples/RTCORBA/Activity/Job.idl:
-        * examples/RTCORBA/Activity/README:
-        * examples/Load_Balancing_persistent/Identity_i.cpp:
-        * examples/Load_Balancing_persistent/Load_Balancing_Service.h:
-        * examples/Load_Balancing_persistent/Identity_i.h:
-        * examples/Load_Balancing_persistent/README:
-        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
-        * examples/Load_Balancing_persistent/Identity.idl:
-        * examples/Load_Balancing_persistent/Identity_Server.cpp:
-        * examples/Load_Balancing_persistent/Load_Balancer_i.h:
-        * examples/Load_Balancing_persistent/Identity_Server.h:
-        * examples/Load_Balancing_persistent/Identity_Client.cpp:
-        * examples/Load_Balancing_persistent/Identity_Client.h:
-        * examples/Load_Balancing_persistent/Load_Balancer.idl:
-        * examples/Load_Balancing_persistent/Load_Balancing_Service.cpp:
-
-          Removed svn:executable property.
-
-Wed Nov 22 11:51:49 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/IFR_Service/IFR_Server.cpp:
-        * orbsvcs/IFR_Service/IFR_Service.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
-        * orbsvcs/orbsvcs/IFRService/Options.cpp:
-
-          Make IFR exit when it receives an invalid startup option and improve
-          usage message. Fixes bugzilla #2720.
-
-Wed Nov 22 11:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/FlResource/FlResource_Factory.cpp:
-        * tao/FlResource/FlResource_Factory.h:
-        * tao/QtResource/QtResource_Factory.cpp:
-        * tao/QtResource/QtResource_Factory.h:
-        * tao/TkResource/TkResource_Factory.cpp:
-        * tao/TkResource/TkResource_Factory.h:
-        * tao/XtResource/XtResource_Factory.cpp:
-        * tao/XtResource/XtResource_Factory.h:
-          Updated these files because the reactors they use are moved
-          to their own directories in ACE.
-
-Wed Nov 22 10:54:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Strategies.mpc:
-          Now build with ace_for_tao but derive from core_strategies
-
-        * tao/tao.mpc:
-          Added new HTTP files and moved all sequence.pidl files to one
-          group because soon they all will get a special tao_idl argument
-          to be used.
-
-        * tao/TAO_Internal.cpp:
-        * tao/default_resource.cpp:
-          Added HTTP
-
-        * tao/GUIResource_Factory.{h,cpp}:
-          Changed dynamically_allocated_reactor to bool
-
-        * tao/ORB_Core.{h,cpp,inl}:
-          Changed has_shutdown to a real bool
-
-        * tao/Valuetype/ValueBase.h:
-          Doxygen improvement
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+        * tao/PortableServer/poa_macros.h:
+        * tao/RTCORBA/RT_ORB_Loader.cpp:
+        * tao/RTCORBA/RT_Protocols_Hooks.cpp:
+        * tao/RTCORBA/Thread_Pool.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+        * tao/RTScheduling/Current.cpp:
+        * tao/RTScheduling/RTScheduler_Loader.cpp:
+        * tao/Stub.cpp:
+        * tao/Synch_Invocation.cpp:
+        * tao/Utils/Server_Main.cpp:
 
-Wed Nov 22 10:23:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+          The first run of my macro removal script picked up a few things to
+          remove.  I'll be running this script on the rest of the tree soon.
 
-        * performance-tests/Callback/Callback.mpc:
-        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
-        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
-        * performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc:
-        * performance-tests/Latency/Collocation/Collocation.mpc:
-        * performance-tests/Latency/Deferred/Deferred.mpc:
-        * performance-tests/Latency/DII/DII.mpc:
-        * performance-tests/Latency/DSI/DSI.mpc:
-        * performance-tests/Latency/Single_Threaded/Single_Threaded.mpc:
-        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc:
-        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
-        * performance-tests/Sequence_Latency/DII/DII.mpc:
-        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
-        * performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc:
-        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc:
-          Explicitly add avoids += ace_for_tao to these projects. At this
-          moment they are not build because the strategies library is not
-          available with ace_for_tao, but this is something I will change
-          but besides strategies these projects do use some ACE classes
-          which are not available in the ace_for_tao configuration
+Wed Jan 24 14:00:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
-          Const improvement
+        * tests/IDL_Test/struct.idl:
+        * tests/IDL_Test/IDL_Test.mpc:
+          Added new IDL test file, will fail to compile until Jeff commits a fix
+          for the IDL compiler.
 
-        * orbsvcs/tests/Event/UDP/Consumer.cpp:
-        * orbsvcs/tests/Event/UDP/receiver.cpp:
-        * orbsvcs/tests/Event/UDP/Supplier.cpp:
-        * orbsvcs/tests/Event/UDP/Supplier.h:
-        * orbsvcs/tests/Event/UDP/Test.idl:
-          Extended this test and reproduced the bug we had in CIAO. This
-          test now will fail until Jeff Parsons commits some related
-          valuetype changes.
+        * tests/Any/Recursive/*:
+          Added some new test cases, one has been fixed already last week, the other
+          one is new and stored in bugzill as 2776
 
-Wed Nov 22 10:17:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tao/*.{h,cpp,inl}:
+          Zapped all environment macros except ACE_THROW_SPEC and ACE_THROW_RETURN.
 
-        * Release:
-          Removed dsw files
+        * *.{h,cpp,inl}:
+          Zapped part of the environment macros from everything except the core TAO
+          libs, more follow later, first let us stabilize this commit. The goal is to
+          get rid of all environment macros
 
-        * docs/ORBEndpoint.html:
-          Added reuse_addr to the list of options, request has been made
-          to OCI to check and extend the documentation of this option
-          which has been available starting TAO 1.4.8
+Wed Jan 24 12:25:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_IDL/be/be_codegen.cpp:
-          Removed check for IFR_Client, we do have an empty A.h file for
-          the IFR_Client files now
-
-        * TAO_IDL/be/be_global.cpp:
-          Updated help of -GA
-
-        * tao/AnyTypeCode/NVList.cpp:
-          Use true/false
-
-        * tao/HTTP_Client.{h,cpp}:
-        * tao/HTTP_Handler.{h,cpp}:
-        * tao/HTTP_Parser.{h,cpp}:
-          New files to support http:/ as IOR format. Fixes bugzilla bugs
-          2670 and 372
+          Instead of Environment.h generate Basic_Types.h as include
 
-        * tao/IIOP_Acceptor.cpp:
-          Removed check for priority, that is gone already a long time and
-          this takes footprint.
-
-        * tao/Stub.cpp:
-          Const changes and removed TAO_Synchronous_Cancellation_Required which
-          doesn't seem used at all.
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+          Generate throw instead of ACE_THROW
 
-Mon Nov 20 08:16:34 2006  Simon McQueen  <sm@prismtech.com>
+Mon Jan 22 23:14:56 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
-        * TAO version 1.5.4 released.
+        * TAO version 1.5.5 released.
 
 Local Variables:
 mode: change-log
diff --git a/TAO/ChangeLogs/ChangeLog-07a b/TAO/ChangeLogs/ChangeLog-07a
new file mode 100644
index 00000000000..88a300d42e0
--- /dev/null
+++ b/TAO/ChangeLogs/ChangeLog-07a
@@ -0,0 +1,6555 @@
+Mon Jan 22 23:14:56 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * TAO version 1.5.5 released.
+
+Fri Jan 19 14:17:18 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/Union_TypeCode.cpp(tao_marshal):
+        * tao/AnyTypeCode/Union_TypeCode_Static.cpp(tao_marshal):
+
+          Changed the marshaling of union members in the typecode to
+          use the existing CDR stream, rather than creating a separate
+          one and merging it with write_octet_array_mb(), which was
+          causing as alignment problem. This fixes [BUGID:2773].
+
+Fri Jan 19 13:53:37 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * rules.tao.GNU:
+
+          Turn on the 'transport_current' feature by default.  Previously,
+          the TransporCurrent related libraries were not being compiled with
+          the GNUmakefiles.
+
+Thu Jan 18 12:05:47 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_Impl.cpp:
+          Fixig a "fuzz" error.
+
+Wed Jan 17 22:53:22 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * NEWS:
+        * docs/transport_current/index.html:
+
+          Updated the documentation on how to disable the
+          Transport::Current functionality.
+
+        * MPC/config/taodefaults.mpb:
+
+          Added a "feature(!transport_current)..." to help enable and
+          disable the Transport::Current features (and footprint impact).
+
+        * MPC/config/tc.mpb:
+
+          Projects inheriting from this will get "requires += transport_current"
+
+        * tao/TC.mpc:
+        * tao/TC_IIOP.mpc:
+
+          Added "requires += transport_current"
+
+        * tao/orbconf.h:
+
+          Fixing a macro re-definition when "transport_current=0" is
+          present in default.features.
+
+
+Wed Jan 17 18:16:18 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/Transport.h:
+        * tao/Transport.inl:
+        * tao/Transport.cpp:
+        * tao/TransportCurrent/Current_Impl.h:
+        * tao/TransportCurrent/Current_Impl.cpp:
+        * tao/TransportCurrent/Current_Loader.h:
+        * tao/TransportCurrent/Current_Loader.cpp:
+        * tao/TransportCurrent/IIOP_Current_Impl.h:
+        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+        * tao/TransportCurrent/IIOP_Current_Loader.h:
+        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
+        * tests/TransportCurrent/IIOP/client.cpp:
+        * tests/TransportCurrent/IIOP/server.cpp:
+
+          Updated to prevent any footprint impact when
+          Transport::Current functionality is disabled
+          (TAO_HAS_TRANSPORT_CURRENT is 0 or undefined)
+
+Wed Jan 17 16:05:42 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Properties.h:
+        * orbsvcs/orbsvcs/Notify/Properties.cpp:
+
+          Provide a method to set the properties instance.  If the
+          properties instance is not set by the user, a singleton instance
+          will be used.
+
+        * orbsvcs/Notify_Service/Notify_Server.cpp:
+
+          Set the properties instance before initializing the notify
+          service.  Using the static singleton can cause static destruction
+          issues between the properties instance and statically allocated
+          type code structures.  This change fixes Bug 1675.
+
+Wed Jan 17 12:36:48 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/examples/Notify/Filter/run_test.pl:
+        * orbsvcs/examples/Notify/Lanes/run_test.pl:
+        * orbsvcs/examples/Notify/Subscribe/run_test.pl:
+        * orbsvcs/examples/Notify/ThreadPool/run_test.pl:
+        * orbsvcs/tests/Notify/Basic/run_test.pl:
+        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
+        * orbsvcs/tests/Notify/Blocking/run_test.pl:
+        * orbsvcs/tests/Notify/Discarding/run_test.pl:
+        * orbsvcs/tests/Notify/Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/Lanes/run_test_notify.pl:
+        * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl:
+        * orbsvcs/tests/Notify/Ordering/run_test.pl:
+        * orbsvcs/tests/Notify/Reconnecting/run_test.pl:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Structured_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl:
+        * orbsvcs/tests/Notify/ThreadPool/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl:
+
+          The Notify_Service will fail to start up on HP-UX if the user does
+          not have the RTSCHED group privilege.  Each test that runs the
+          Notify_Service now calls a method in PerlACE::Run_Test that checks
+          for this group privilege.  If the user does not have the correct
+          access, a warning is printed and the test will exit.
+
+Tue Jan 16 18:39:17 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp:
+
+          Ensured request interceptors are heap allocated to avoid
+          problems trying to delete automatic instances when the ORB is
+          destroyed.
+
+Tue Jan 16 17:13:13 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/Transport.h:
+        * tao/Transport.cpp:
+
+          Added initialization for the stats_ member in case the TC
+          feature has been disabled, and providing a delete for it in the
+          destructor.
+
+        * tao/TransportCurrent/Current_Loader.h:
+        * tao/TransportCurrent/Current_Loader.cpp:
+
+          Removed unnecessary orbinitializer_registry method and
+          eliminated unnecesary whitespace.
+
+        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
+        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
+
+           Added TAO_Local_RefCounted_Object as an additional base class
+           to ensure proper cleanup of the ORB initializer instances. The
+           local CORBA objects are not reference counted (yet)!
+
+        * tests/TransportCurrent/Framework/Server_Main.cpp:
+        * tests/TransportCurrent/Framework/client.cpp:
+        * tests/TransportCurrent/Framework/server.cpp:
+        * tests/TransportCurrent/IIOP/client.cpp:
+        * tests/TransportCurrent/IIOP/server.cpp:
+
+          Ensured request interceptors are heap allocated to avoid
+          problems trying to delete automatic instances when the ORB is
+          destroyed.
+
+        * tests/TransportCurrent/lib/Client_ORBInitializer.h:
+        * tests/TransportCurrent/lib/Server_ORBInitializer.h:
+
+           Added TAO_Local_RefCounted_Object as an additional base class
+           to ensure proper cleanup of the ORB initializer instances. The
+           local CORBA objects are not reference counted (yet)!
+
+Tue Jan 16 11:15:10 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
+          Initialise pointer with 0
+
+        * orbsvcs/orbsvcs/Notify/Event_Map_T.h:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h:
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h:
+        * orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h:
+        * orbsvcs/tests/Notify/lib/Consumer_T.h:
+        * orbsvcs/tests/Notify/lib/Peer_T.h:
+        * orbsvcs/tests/Notify/lib/Supplier_T.h:
+          Use typename instead of ACE_TYPENAME
+
+Tue Jan 16 08:18:10 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CollocationLockup/CollocationLockup.cpp:
+          Removed not used global variable to fix gcc warning
+
+Mon Jan 15 09:44:10 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+          Made debug statement dependent on debug level, it was now
+          printed always
+
+Sat Jan 13 14:31:10 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/AlternateIIOP/run_test.pl:
+        * tests/Parallel_Connect_Strategy/run_test.pl:
+
+          Renumbered the port values passed to the server. I noticed the
+          PCS test on one nightly machine failed because the acceptor
+          couldn't open a new socket. Also corrected a cut & paste error
+          in the scripts.
+
+Fri Jan 12 21:40:13 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Oneway_Timeouts/client.cpp:
+
+          Replaced the final invocation used to signal a shutdown to the
+          server as this is a two-way call that was using the same
+          timeout-enabled reference as the test. This sometimes caused
+          spurious timeout errors that are then reported as failures even
+          though they are not.
+
+        * tests/run_test.pl:
+
+          Increased the process start-up timeout as the old values were
+          short enough that the script assumed an error even though the
+          processes were actually running. On busy systems, a 2 or 5
+          second delay is really possible, particularly if shared
+          libraries have to be reloaded or the system is just busy.
+
+Fri Jan 12 20:50:38 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/DynamicAny.mpc:
+
+          Reordered the source files, which will likewise reorder the
+          linking of object files on builds using makefiles. Thanks
+          to Ossama Othman <Ossama.Othman@symantec.com> for this
+          suggestion to try and eliminate the Debian linking errors
+          in DynamicAny.
+
+Fri Jan 12 17:23:07 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+
+          Modified call to make_dyn_any_t() to be consistent with
+          changes in
+
+          Thu Jan 11 18:42:33 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Fri Jan 12 09:06:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny/DynAnyUtils_T.cpp:
+          Fixed compile problem
+
+Thu Jan 11 18:42:33 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/DynamicAny/DynArray_i.cpp:
+        * tao/DynamicAny/DynCommon.cpp:
+        * tao/DynamicAny/DynAnyUtils_T.cpp:
+        * tao/DynamicAny/DynStruct_i.cpp:
+        * tao/DynamicAny/DynAny_i.cpp:
+        * tao/DynamicAny/DynUnion_i.cpp:
+        * tao/DynamicAny/DynAnyUtils_T.h:
+        * tao/DynamicAny/DynAnyFactory.cpp:
+        * tao/DynamicAny/DynSequence_i.cpp:
+
+          Changed make_dyn_any_t() from a static method inside
+          a templatized struct to a template method inside a
+          namespace, and changed all usages accordingly. Thanks
+          to Ossama Othman <Ossama.Othman@symantec.com> for
+          the suggestion, which is an attempt to eliminate
+          Debian link errors in DynamicAny.
+
+Thu Jan 11 17:13:56 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Oneway_Timeouts/client.cpp:
+
+          Changed test failure criteria so that a missed deadline is no
+          longer considered a failure. The errors due to missed deadlines
+          are spurious on systems using preemptive multitasking because
+          there is no way to control the additional delay imposed by the
+          operating system. The test for exception delivery time is beside
+          the point for this test anyway; we want to test that an
+          exception occurs or does not occur, not when it happens to
+          occur.
+
+Wed Jan 10 21:47:39 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * docs/INS.html:
+          Updated documentation relative to corbaloc strings to include
+          IPv6 details. Also generally freshened the document by removing
+          references to obsoleted iioploc strings and added more
+          information on using the IOR Table. Localized the references
+          graphic images to avoid the need for an internet connection to
+          see the full document.
+
+        * docs/TAO-tutorials.html:
+        * docs/index.html:
+          Localized the references graphic images to avoid the need for an
+          internet connection to see the full document.
+
+        * docs/space.gif:
+        * docs/redball.gif:
+        * docs/interop-naming.png:
+        * docs/interop-naming.eps:
+
+          The image files, these used to be hosted only  at wustl,
+          requiring a network connection in order to see the graphics in
+          the documentation.
+
+Wed Jan 10 21:28:19 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * NEWS:
+
+          Updated with my changes since 1.5.4.
+
+Wed Jan 10 20:24:57 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/DynamicAny/DynAnyUtils_T.cpp:
+
+          Add missing include file.
+
+        * tao/DynamicAny/DynAnyUtils_T.h:
+
+          Fix a couple of Win-typos.
+
+Wed Jan 10 19:24:11 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_1551_Regression/Client_Task.cpp:
+        * tests/Bug_1551_Regression/client.cpp:
+
+          Moved the setting of the policy override on the PolicyCurrent into
+          the thread specific code.  Since overrides set on the
+          PolicyCurrent only apply to the thread in which they are set, it
+          should have been done in each client thread.
+
+          Also, we ignore CORBA::TIMEOUT exceptions.  Since the server is
+          aborting itself, they are expected.
+
+        * tests/Bug_1551_Regression/run_test.pl:
+
+          Only sleep 30 seconds if starting the three clients succeeded.
+          And trap the return value of the WaitKill() called on the clients
+          in order to determine if the test needs to continue or not.
+
+Wed Jan 10 18:53:20 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/DynamicAny/DynAnyUtils_T.cpp:
+
+          New file, containing the implementation formerly in the
+          header file.
+
+        * tao/DynamicAny/DynAnyUtils_T.h:
+
+          Factored out the method bodies and put them in the new file
+          above.
+
+        * tao/DynamicAny.mpc:
+
+          Added the new file above explicitly in the Template_Files
+          block, also listed explicitly the rest of the .cpp files.
+
+Wed Jan 10 18:51:20 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * NEWS:
+
+          Updated with my changes since 1.5.4.
+
+Wed Jan 10 14:29:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Memory/Single_Threaded/Memory_Growth.mpc:
+          Removed not needed idlflags, these are inherited from the base
+
+Wed Jan 10 13:13:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl:
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl:
+        * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl:
+        * orbsvcs/tests/AVStreams/Latency/run_test.pl:
+          Check the result of th spawn of the first executable in
+          the test itself. With this change if we have a naming
+          service but no test executable we don't wait a long time
+          on a non existent process
+
+Wed Jan 10 12:30:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * examples/mfc/server.cpp:
+        * utils/NamingViewer/NamingViewer.cpp:
+
+          From MFC 5.0, Enable3dControls and Enable3dControlsStatic are
+          obsolete because their functionality is incorporated into
+          Microsoft's 32-bit operating systems directly. Basically there
+          is no need to call with VC5.0 and above so I've commented
+          them out to stop the build issuing deprecated warnings.
+
+Wed Jan 10 09:57:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Compression/server.cpp:
+          Extended this test further
+
+Wed Jan 10 09:13:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Bug_2350_Regression.idl:
+          Added missing id tag
+
+Wed Jan 10 02:02:00 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/tests/Notify/Basic/run_test.pl:
+        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
+
+          Modified these test files to only run the tests with the
+          "-UseSeparateDispatchingOrb 1" option with the notify.mt.conf
+          configuration.  Currently, only the MultiTypes test fails, but
+          the opportunity exists for others to fail.  The MultiTypes test
+          fails because in the reactive and the rt case, a separate ORB is
+          used to dispatch, but only one thread is running.  Therefore,
+          when the dispatch is made and the consumer invokes "disconnect*"
+          back on there, the non-dispatching (or "main") ORB isn't running
+          in order to handle the request.  When the same ORB is used for
+          administration and dispatching, the ORB can handle the
+          disconnect call b/c of nested upcalls.  Therefore, we simply
+          disallow using a separate dispatching ORB when not using using
+          separate dispatching threads.
+
+        * orbsvcs/tests/Notify/Basic:
+        * orbsvcs/tests/Notify/Blocking:
+        * orbsvcs/tests/Notify/Destroy:
+        * orbsvcs/tests/Notify/Discarding:
+        * orbsvcs/tests/Notify/Driver:
+        * orbsvcs/tests/Notify/MT_Dispatching:
+        * orbsvcs/tests/Notify/Ordering:
+        * orbsvcs/tests/Notify/Reconnecting:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter:
+        * orbsvcs/tests/Notify/Structured_Filter:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter:
+        * orbsvcs/tests/Notify/performance-tests/Filter:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen:
+        * orbsvcs/tests/Notify/performance-tests/Throughput:
+
+          Update the svn:ignore property on these directories.
+
+Tue Jan  9 19:56:41 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
+        * tao/Messaging/ExceptionHolder_i.h:
+        * tao/Messaging/ExceptionHolder_i.cpp:
+
+          Modified the tao_idl code to emit code to set the exception data
+          in the Messaging::ExceptionHolder in the AMI _excep operation.
+          This has the effect of allowing supporting code to raise the
+          correct user defined exception.  Previously, the user defined
+          exception would not be recognized and a CORBA::UNKNOWN would be
+          raised in it's place.  This fixes bug 2350.
+
+        * tests/IDL_Test/Bug_2350_Regression.idl:
+        * tests/IDL_Test/IDL_Test.mpc:
+
+          Added an idl file to ensure that the code to fix bug 2350 does
+          not incorrectly recognize user methods that end in _excep, that
+          take a single parameter ending in ExceptionHolder and raises a
+          user defined exception.
+
+Tue Jan  9 15:14:09 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * tao/Unbounded_Octet_Sequence_T.h:
+
+          Refactored #include "ace/OS_NS_string.h" for memcmp() out of the
+          two TAO_NO_COPY_OCTET_SEQUENCES branches and move it into the
+          common #include area.  This reverts changes yesterday by me and
+          this morning by Chad Elliott.
+
+Tue Jan  9 14:06:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny/diffs/DynamicAny.pidl.diff:
+          Removed from the repo, ancient and not needed anymore
+
+Tue Jan  9 12:34:12 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/Unbounded_Octet_Sequence_T.h:
+
+          Added a missing #include "ace/OS_NS_string.h" to get
+          ACE_OS::memcmp().
+
+Tue Jan  9 07:25:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicInterface/DII_Invocation.cpp:
+          Reordered includes to fix compile problems with gcc4
+
+Tue Jan  9 06:15:00 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/TransportCurrent/Framework/Makefile.am:
+        * tests/TransportCurrent/IIOP/Makefile.am:
+
+          Regenerated.
+
+        * tests/TransportCurrent/IIOP/IIOP.mpc
+        * tests/TransportCurrent/Framework/Framework.mpc
+
+          For the automake builds includes are relative to both $(srcdir)
+          and the build dir.
+
+Tue Jan  9 03:50:30 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/IDL_Test/Makefile.am:
+
+          Regenerated.
+
+Tue Jan  9 03:48:33 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Compression/Makefile.am:
+
+          Regenerated.
+
+Tue Jan  9 03:43:45 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated for AnyTypeCode.mpc changes.
+
+Tue Jan  9 03:37:26 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/TransportCurrent/Framework/Makefile.am:
+        * tests/TransportCurrent/IIOP/Makefile.am:
+        * tests/TransportCurrent/lib/Makefile.am:
+
+          Regenerated.
+
+        * tests/TransportCurrent/IIOP/IIOP.mpc
+        * tests/TransportCurrent/Framework/Framework.mpc
+
+          For the automake builds includes are relative to $(srcdir),
+          libpaths are relative to the build dir.
+
+Mon Jan  8 19:56:54 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * tao/Unbounded_Octet_Sequence_T.h:
+
+          Moved #include for OS_NS_string.h into the
+          (TAO_NO_COPY_OCTET_SEQUENCES == 0) clause...which is where it
+          should have been in the first place since that's where memcmp is
+          actually used.  This should fix the BCB build, and any other
+          TAO_NO_COPY_OCTET_SEQUENCES builds.
+
+Mon Jan  8 19:40:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/GIOP_Message_Locate_Header.h:
+          No need to export TAO_GIOP_Locate_Request_Header from the TAO library
+
+        * tao/RTCORBA/RTCORBAC.cpp:
+        * tao/RTCORBA/diffs/RTCORBA.diff
+          Use true/false
+
+Mon Jan  8 18:56:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode.mpc:
+          Cleanup and added regeneration of Dynamic.pidl
+
+        * tao/AnyTypeCode/Dynamic.pidl:
+          Removed TypeCode interface and include other pidl
+          file that has TypeCode. Fixes bugzilla bug 2766
+
+        * tao/AnyTypeCode/DynamicA.cpp:
+        * tao/AnyTypeCode/DynamicA.h:
+        * tao/AnyTypeCode/DynamicC.cpp:
+        * tao/AnyTypeCode/DynamicC.h:
+        * tao/AnyTypeCode/DynamicS.h:
+          Removed from the repo, they are now generated on the fly
+
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp (servant_to_system_id_i):
+          Added special check for CORBA/e so that the correct exception is thrown
+
+        * tests/IDL_Test/typecode.idl:
+          New idl file used to test how to regenerate Dynamic.pidl
+
+        * IDL_Test/IDL_Test.mpc:
+          Added typecode.idl
+
+Mon Jan  8 16:02:13 UTC 2007  Ciju John  <johnc@ociweb.com>
+
+        * docs/ORBEndpoint.html:
+          Update documentation for ORBEndpoint reuse_addr option.
+
+Mon Jan  8 13:55:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp:
+
+          Add some debug output to trace code flow for remote systems.
+
+Mon Jan  8 13:50:31 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/OBV/Truncatable/client.cpp:
+
+          Undefine VERIFY if it's defined to avoid warnings from vc71.
+
+Mon Jan  8 13:36:37 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+        * tests/TransportCurrent/IIOP/Makefile.am:
+
+          Modified the MPC file to work with automake and updated the
+          Makefile.am accordingly.
+
+Mon Jan  8 10:52:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Invocation_Base.cpp (exception):
+          Set the forwarded_to_ member to nil again, it can be that
+          we had a forward request which was converted to a regular
+          exception in a PI call and then we have to make sure we don't
+          keep the old data
+
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp (receive_other):
+          When an exception occurs make sure we implement the following
+          behaviour from the OMG spec section 21.3.6.5:
+          This interception point may raise a system exception. If it does, no other
+          Interceptors’ receive_other operations are called. The remaining
+          Interceptors in the Flow Stack are popped and have their receive_exception
+          interception point called.
+
+          This fixes the failing of bug 2287 regression on svn head. Thanks to
+          Simon McQueen for explaining the meaning of this test and reviewing
+          the changes above
+
+Mon Jan  8 00:18:21 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/run_test.pl:
+        * tests/TransportCurrent/IIOP/run_test.pl:
+
+Sun Jan  7 18:48:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Oneway_Timeouts/client.cpp:
+          Removed create_poa method, it is not used at all
+
+Sun Jan  7 12:06:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Acceptor_Filter_Factory.h:
+          Fixed problem with CORBA/e
+
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+          Fixed compile problems when building CORBA/e compact with Borland C++
+
+Sat Jan  6 19:16:55 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * TAO_IDL:
+        * examples/AMI/FL_Callback:
+        * orbsvcs/Concurrency_Service:
+        * orbsvcs/CosEvent_Service:
+        * orbsvcs/Dump_Schedule:
+        * orbsvcs/Event_Service:
+        * orbsvcs/FTRT_Event_Service/Event_Service:
+        * orbsvcs/FTRT_Event_Service/Factory_Service:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service:
+        * orbsvcs/FT_ReplicationManager:
+        * orbsvcs/Fault_Detector:
+        * orbsvcs/Fault_Notifier:
+        * orbsvcs/IFR_Service:
+        * orbsvcs/ImplRepo_Service:
+        * orbsvcs/LifeCycle_Service:
+        * orbsvcs/LoadBalancer:
+        * orbsvcs/Logging_Service/Basic_Logging_Service:
+        * orbsvcs/Logging_Service/Event_Logging_Service:
+        * orbsvcs/Logging_Service/Notify_Logging_Service:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service:
+        * orbsvcs/Naming_Service:
+        * orbsvcs/Notify_Service:
+        * orbsvcs/Scheduling_Service:
+        * orbsvcs/TAO_Service:
+        * orbsvcs/Time_Service:
+        * orbsvcs/Trading_Service:
+        * orbsvcs/tests/AVStreams/Asynch_Three_Stage:
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows:
+        * orbsvcs/tests/AVStreams/Component_Switching:
+        * orbsvcs/tests/AVStreams/Full_Profile:
+        * orbsvcs/tests/AVStreams/Latency:
+        * orbsvcs/tests/AVStreams/Modify_QoS:
+        * orbsvcs/tests/AVStreams/Multicast:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile:
+        * orbsvcs/tests/AVStreams/Multiple_Flows:
+        * orbsvcs/tests/AVStreams/Pluggable:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol:
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage:
+        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS:
+        * orbsvcs/tests/BiDir_CORBALOC:
+        * orbsvcs/tests/Bug_1334_Regression:
+        * orbsvcs/tests/Bug_1393_Regression:
+        * orbsvcs/tests/Bug_1395_Regression:
+        * orbsvcs/tests/Bug_1630_Regression:
+        * orbsvcs/tests/Bug_2074_Regression:
+        * orbsvcs/tests/Bug_2137_Regression:
+        * orbsvcs/tests/Bug_2247_Regression:
+        * orbsvcs/tests/Bug_2248_Regression:
+        * orbsvcs/tests/Bug_2285_Regression:
+        * orbsvcs/tests/Bug_2287_Regression:
+        * orbsvcs/tests/Bug_2316_Regression:
+        * orbsvcs/tests/Bug_2377_Regression:
+        * orbsvcs/tests/Bug_2615_Regression:
+        * orbsvcs/tests/Bug_2709_Regression:
+        * orbsvcs/tests/Concurrency:
+        * orbsvcs/tests/CosEvent/Timeout:
+        * orbsvcs/tests/EC_Custom_Marshal:
+        * orbsvcs/tests/EC_MT_Mcast:
+        * orbsvcs/tests/EC_Mcast:
+        * orbsvcs/tests/EC_Multiple:
+        * orbsvcs/tests/EC_Throughput:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated:
+        * orbsvcs/tests/Event/ThreadFlags:
+        * orbsvcs/tests/Event/UDP:
+        * orbsvcs/tests/FT_App:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation:
+        * orbsvcs/tests/FaultTolerance/IOGR:
+        * orbsvcs/tests/FaultTolerance/IOGRManipulation:
+        * orbsvcs/tests/FtRtEvent:
+        * orbsvcs/tests/HTIOP/AMI:
+        * orbsvcs/tests/HTIOP/BiDirectional:
+        * orbsvcs/tests/HTIOP/Hello:
+        * orbsvcs/tests/IOR_MCast:
+        * orbsvcs/tests/ImplRepo:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression:
+        * orbsvcs/tests/ImplRepo/NameService:
+        * orbsvcs/tests/ImplRepo/scale:
+        * orbsvcs/tests/InterfaceRepo/Application_Test:
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test:
+        * orbsvcs/tests/InterfaceRepo/Latency_Test:
+        * orbsvcs/tests/InterfaceRepo/Persistence_Test:
+        * orbsvcs/tests/Interoperable_Naming:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group:
+        * orbsvcs/tests/LoadBalancing/LoadMonitor/CPU:
+        * orbsvcs/tests/Log/Basic_Log_Test:
+        * orbsvcs/tests/Miop/McastHello:
+        * orbsvcs/tests/Notify/PluggableTopology:
+        * orbsvcs/tests/Notify/XML_Persistence:
+        * orbsvcs/tests/Property:
+        * orbsvcs/tests/Redundant_Naming:
+        * orbsvcs/tests/Sched:
+        * orbsvcs/tests/Sched_Conf:
+        * orbsvcs/tests/Security/BiDirectional:
+        * orbsvcs/tests/Security/MT_IIOP_SSL:
+        * orbsvcs/tests/Security/Secure_Invocation:
+        * orbsvcs/tests/Security/ssliop_corbaloc:
+        * orbsvcs/tests/Simple_Naming:
+        * orbsvcs/tests/Time:
+        * orbsvcs/tests/ior_corbaname:
+        * orbsvcs/tests/tests_svc_loader:
+        * orbsvcs/tests/unit/Trading/Interpreter:
+        * tests/AMH_Exceptions:
+        * tests/AMH_Oneway:
+        * tests/AMI:
+        * tests/AMI_Buffering:
+        * tests/AMI_Timeouts:
+        * tests/Abstract_Interface:
+        * tests/Any/Recursive:
+        * tests/BiDirectional:
+        * tests/BiDirectional_DelayedUpcall:
+        * tests/BiDirectional_MultipleORB:
+        * tests/BiDirectional_NestedUpcall:
+        * tests/Big_AMI:
+        * tests/Big_Oneways:
+        * tests/Big_Reply:
+        * tests/Big_Request_Muxing:
+        * tests/Big_Twoways:
+        * tests/Blocking_Sync_None:
+        * tests/Bug_1020_Basic_Regression:
+        * tests/Bug_1020_Regression:
+        * tests/Bug_1254_Regression:
+        * tests/Bug_1269_Regression:
+        * tests/Bug_1270_Regression:
+        * tests/Bug_1330_Regression:
+        * tests/Bug_1361_Regression:
+        * tests/Bug_1476_Regression:
+        * tests/Bug_1476_Test:
+        * tests/Bug_1482_Regression:
+        * tests/Bug_1495_Regression:
+        * tests/Bug_1535_Regression:
+        * tests/Bug_1551_Regression:
+        * tests/Bug_1568_Regression:
+        * tests/Bug_1627_Regression:
+        * tests/Bug_1635_Regression:
+        * tests/Bug_1636_Regression:
+        * tests/Bug_1639_Regression:
+        * tests/Bug_1670_Regression:
+        * tests/Bug_1676_Regression:
+        * tests/Bug_1693_Test:
+        * tests/Bug_1812_Regression:
+        * tests/Bug_1813_Regression:
+        * tests/Bug_1869_Regression:
+        * tests/Bug_1904_Regression:
+        * tests/Bug_2084_Regression:
+        * tests/Bug_2122_Regression:
+        * tests/Bug_2124_Regression:
+        * tests/Bug_2126_Regression:
+        * tests/Bug_2134_Regression:
+        * tests/Bug_2144_Regression:
+        * tests/Bug_2174_Regression:
+        * tests/Bug_2183_Regression:
+        * tests/Bug_2186_Regression:
+        * tests/Bug_2188_Regression:
+        * tests/Bug_2201_Regression:
+        * tests/Bug_2222_Regression:
+        * tests/Bug_2234_Regression:
+        * tests/Bug_2289_Regression:
+        * tests/Bug_2319_Regression:
+        * tests/Bug_2328_Regression:
+        * tests/Bug_2345_Regression:
+        * tests/Bug_2349_Regression:
+        * tests/Bug_2375_Regression:
+        * tests/Bug_2399_Regression:
+        * tests/Bug_2417_Regression:
+        * tests/Bug_2419_Regression:
+        * tests/Bug_2424_Regression:
+        * tests/Bug_2429_Regression:
+        * tests/Bug_2494_Regression:
+        * tests/Bug_2503_Regression:
+        * tests/Bug_2542_Regression:
+        * tests/Bug_2543_Regression:
+        * tests/Bug_2549_Regression:
+        * tests/Bug_2560_Regression:
+        * tests/Bug_2593_Regression:
+        * tests/Bug_2595_Regression:
+        * tests/Bug_2654_Regression:
+        * tests/Bug_2669_Regression:
+        * tests/Bug_2683_Regression:
+        * tests/Bug_2702_Regression:
+        * tests/CDR:
+        * tests/COIOP:
+        * tests/CSD_Strategy_Tests/Broken:
+        * tests/CSD_Strategy_Tests/TP_Test_1:
+        * tests/CSD_Strategy_Tests/TP_Test_2:
+        * tests/CSD_Strategy_Tests/TP_Test_3:
+        * tests/CSD_Strategy_Tests/TP_Test_4:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic:
+        * tests/CSD_Strategy_Tests/TP_Test_Static:
+        * tests/Cache_Growth_Test:
+        * tests/CallbackTest:
+        * tests/Client_Leaks:
+        * tests/CodeSets/simple:
+        * tests/Codec:
+        * tests/Collocation:
+        * tests/CollocationLockup:
+        * tests/Collocation_Exception_Test:
+        * tests/Collocation_Oneway_Tests:
+        * tests/Collocation_Opportunities:
+        * tests/Collocation_Tests:
+        * tests/Connect_Strategy_Test:
+        * tests/Connection_Failure:
+        * tests/Connection_Purging:
+        * tests/Connection_Timeout:
+        * tests/Crash_On_Write:
+        * tests/Crashed_Callback:
+        * tests/DII_Collocation_Tests/oneway:
+        * tests/DII_Collocation_Tests/twoway:
+        * tests/DLL_ORB:
+        * tests/DSI_Gateway:
+        * tests/DynAny_Test:
+        * tests/Explicit_Event_Loop:
+        * tests/Exposed_Policies:
+        * tests/FL_Cube:
+        * tests/Faults:
+        * tests/File_IO:
+        * tests/Forwarding:
+        * tests/GIOP_Fragments/PMB_With_Fragments:
+        * tests/Hang_Shutdown:
+        * tests/Hello:
+        * tests/ICMG_Any_Bug:
+        * tests/IDL_Test:
+        * tests/IORManipulation:
+        * tests/IOR_Endpoint_Hostnames:
+        * tests/IPV6:
+        * tests/InterOp-Naming:
+        * tests/Leader_Followers:
+        * tests/LongUpcalls:
+        * tests/MProfile:
+        * tests/MProfile_Connection_Timeout:
+        * tests/MProfile_Forwarding:
+        * tests/MT_BiDir:
+        * tests/MT_Client:
+        * tests/MT_Server:
+        * tests/MT_Timeout:
+        * tests/Multiple:
+        * tests/Multiple_Inheritance:
+        * tests/Muxed_GIOP_Versions:
+        * tests/Muxing:
+        * tests/Native_Exceptions:
+        * tests/NestedUpcall/MT_Client_Test:
+        * tests/NestedUpcall/Simple:
+        * tests/NestedUpcall/Triangle_Test:
+        * tests/Nested_Event_Loop:
+        * tests/Nested_Upcall_Crash:
+        * tests/No_Server_MT_Connect_Test:
+        * tests/OBV/Any:
+        * tests/OBV/Collocated/Forward:
+        * tests/OBV/Factory:
+        * tests/OBV/Forward:
+        * tests/OBV/Simple:
+        * tests/OBV/TC_Alignment:
+        * tests/OBV/Truncatable:
+        * tests/OBV/ValueBox:
+        * tests/ORB_Local_Config/Bug_1459:
+        * tests/ORB_Local_Config/Bug_2612:
+        * tests/ORB_Local_Config/Bunch:
+        * tests/ORB_Local_Config/Separation:
+        * tests/ORB_Local_Config/Service_Dependency:
+        * tests/ORB_Local_Config/Shared:
+        * tests/ORB_Local_Config/Simple:
+        * tests/ORB_Local_Config/Two_DLL_ORB:
+        * tests/ORB_destroy:
+        * tests/ORB_init:
+        * tests/ORB_init/Portspan:
+        * tests/ORB_shutdown:
+        * tests/ORT:
+        * tests/Object_Loader:
+        * tests/Objref_Sequence_Test:
+        * tests/OctetSeq:
+        * tests/Ondemand_Write:
+        * tests/Oneway_Buffering:
+        * tests/Oneway_Timeouts:
+        * tests/Oneways_Invoking_Twoways:
+        * tests/Optimized_Connection:
+        * tests/POA/Bug_2511_Regression:
+        * tests/POA/Current:
+        * tests/POA/Deactivate_Object:
+        * tests/POA/Default_Servant:
+        * tests/POA/EndpointPolicy:
+        * tests/POA/Etherealization:
+        * tests/POA/Excessive_Object_Deactivations:
+        * tests/POA/Identity:
+        * tests/POA/MT_Servant_Locator:
+        * tests/POA/Nested_Non_Servant_Upcalls:
+        * tests/POA/Non_Servant_Upcalls:
+        * tests/POA/Object_Reactivation:
+        * tests/POA/POAManagerFactory:
+        * tests/POA/POA_Destruction:
+        * tests/POA/Persistent_ID:
+        * tests/POA/Policies:
+        * tests/POA/Reference_Counting:
+        * tests/POA/Single_Threaded_POA:
+        * tests/POA/wait_for_completion:
+        * tests/Parallel_Connect_Strategy:
+        * tests/Param_Test:
+        * tests/Permanent_Forward:
+        * tests/Policies:
+        * tests/Portable_Interceptors/AMI:
+        * tests/Portable_Interceptors/AdvSlot:
+        * tests/Portable_Interceptors/AdvSlotDblCpy:
+        * tests/Portable_Interceptors/AdvSlotExt:
+        * tests/Portable_Interceptors/Benchmark:
+        * tests/Portable_Interceptors/Bug_1559:
+        * tests/Portable_Interceptors/Bug_2088:
+        * tests/Portable_Interceptors/Bug_2510_Regression:
+        * tests/Portable_Interceptors/Collocated/Dynamic:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation:
+        * tests/Portable_Interceptors/Dynamic:
+        * tests/Portable_Interceptors/ForwardRequest:
+        * tests/Portable_Interceptors/IORInterceptor:
+        * tests/Portable_Interceptors/ORB_Shutdown:
+        * tests/Portable_Interceptors/PICurrent:
+        * tests/Portable_Interceptors/PolicyFactory:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote:
+        * tests/Portable_Interceptors/Recursive_ORBInitializer:
+        * tests/Portable_Interceptors/Register_Initial_References:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow:
+        * tests/Portable_Interceptors/Service_Context_Manipulation:
+        * tests/Portable_Interceptors/Slot:
+        * tests/QtTests:
+        * tests/Queued_Message_Test:
+        * tests/RTCORBA/Activate_Object_Multiple_ORBs:
+        * tests/RTCORBA/Banded_Connections:
+        * tests/RTCORBA/Client_Propagated:
+        * tests/RTCORBA/Client_Protocol:
+        * tests/RTCORBA/Collocation:
+        * tests/RTCORBA/Destroy_Thread_Pool:
+        * tests/RTCORBA/Diffserv:
+        * tests/RTCORBA/Dynamic_Thread_Pool:
+        * tests/RTCORBA/Explicit_Binding:
+        * tests/RTCORBA/Linear_Priority:
+        * tests/RTCORBA/MT_Client_Protocol_Priority:
+        * tests/RTCORBA/ORB_init:
+        * tests/RTCORBA/Persistent_IOR:
+        * tests/RTCORBA/Policies:
+        * tests/RTCORBA/Policy_Combinations:
+        * tests/RTCORBA/Priority_Inversion_With_Bands:
+        * tests/RTCORBA/Private_Connection:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection:
+        * tests/RTCORBA/RTMutex:
+        * tests/RTCORBA/Server_Declared:
+        * tests/RTCORBA/Server_Protocol:
+        * tests/RTCORBA/Thread_Pool:
+        * tests/RTScheduling/Current:
+        * tests/RTScheduling/DT_Spawn:
+        * tests/RTScheduling/Scheduling_Interceptor:
+        * tests/RTScheduling/Thread_Cancel:
+        * tests/RTScheduling/VoidData:
+        * tests/Reliable_Oneways:
+        * tests/Sequence_Unit_Tests:
+        * tests/Servant_To_Reference_Test:
+        * tests/Server_Connection_Purging:
+        * tests/Server_Leaks:
+        * tests/Server_Port_Zero:
+        * tests/Single_Read:
+        * tests/Smart_Proxies:
+        * tests/Smart_Proxies/Benchmark:
+        * tests/Smart_Proxies/Collocation:
+        * tests/Smart_Proxies/On_Demand:
+        * tests/Smart_Proxies/Policy:
+        * tests/Smart_Proxies/dtor:
+        * tests/Stack_Recursion:
+        * tests/Strategies:
+        * tests/Timed_Buffered_Oneways:
+        * tests/Timeout:
+        * tests/TransportCurrent/Framework:
+        * tests/TransportCurrent/IIOP:
+        * tests/Two_Objects:
+        * tests/Typedef_String_Array:
+        * tests/UNKNOWN_Exception:
+        * tests/Xt_Stopwatch:
+        * utils/catior:
+        * utils/nslist:
+
+          Added subversion svn:ignore properties on all these directories
+          comparable to the values previously in the vestigial .cvsignore
+          files, as well as updated them commensurate with the new svnignore
+          gnuace make target.
+
+        * TAO_IDL/.cvsignore:
+        * examples/AMI/FL_Callback/.cvsignore:
+        * orbsvcs/Concurrency_Service/.cvsignore:
+        * orbsvcs/CosEvent_Service/.cvsignore:
+        * orbsvcs/Dump_Schedule/.cvsignore:
+        * orbsvcs/Event_Service/.cvsignore:
+        * orbsvcs/FTRT_Event_Service/Event_Service/.cvsignore:
+        * orbsvcs/FTRT_Event_Service/Factory_Service/.cvsignore:
+        * orbsvcs/FTRT_Event_Service/Gateway_Service/.cvsignore:
+        * orbsvcs/FT_ReplicationManager/.cvsignore:
+        * orbsvcs/Fault_Detector/.cvsignore:
+        * orbsvcs/Fault_Notifier/.cvsignore:
+        * orbsvcs/IFR_Service/.cvsignore:
+        * orbsvcs/ImplRepo_Service/.cvsignore:
+        * orbsvcs/LifeCycle_Service/.cvsignore:
+        * orbsvcs/LoadBalancer/.cvsignore:
+        * orbsvcs/Logging_Service/Basic_Logging_Service/.cvsignore:
+        * orbsvcs/Logging_Service/Event_Logging_Service/.cvsignore:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/.cvsignore:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/.cvsignore:
+        * orbsvcs/Naming_Service/.cvsignore:
+        * orbsvcs/Notify_Service/.cvsignore:
+        * orbsvcs/Scheduling_Service/.cvsignore:
+        * orbsvcs/TAO_Service/.cvsignore:
+        * orbsvcs/Time_Service/.cvsignore:
+        * orbsvcs/Trading_Service/.cvsignore:
+        * tests/AMH_Exceptions/.cvsignore:
+        * tests/AMH_Oneway/.cvsignore:
+        * tests/AMI/.cvsignore:
+        * tests/AMI_Buffering/.cvsignore:
+        * tests/AMI_Timeouts/.cvsignore:
+        * tests/Abstract_Interface/.cvsignore:
+        * tests/BiDirectional/.cvsignore:
+        * tests/BiDirectional_MultipleORB/.cvsignore:
+        * tests/BiDirectional_NestedUpcall/.cvsignore:
+        * tests/Big_Oneways/.cvsignore:
+        * tests/Big_Reply/.cvsignore:
+        * tests/Big_Request_Muxing/.cvsignore:
+        * tests/Big_Twoways/.cvsignore:
+        * tests/Blocking_Sync_None/.cvsignore:
+        * tests/Bug_1020_Basic_Regression/.cvsignore:
+        * tests/Bug_1020_Regression/.cvsignore:
+        * tests/Bug_1269_Regression/.cvsignore:
+        * tests/Bug_1270_Regression/.cvsignore:
+        * tests/Bug_1330_Regression/.cvsignore:
+        * tests/Bug_1361_Regression/.cvsignore:
+        * tests/Bug_1476_Regression/.cvsignore:
+        * tests/Bug_1482_Regression/.cvsignore:
+        * tests/Bug_1495_Regression/.cvsignore:
+        * tests/Bug_1535_Regression/.cvsignore:
+        * tests/Bug_1551_Regression/.cvsignore:
+        * tests/Bug_1568_Regression/.cvsignore:
+        * tests/Bug_1627_Regression/.cvsignore:
+        * tests/Bug_1635_Regression/.cvsignore:
+        * tests/Bug_1636_Regression/.cvsignore:
+        * tests/Bug_1639_Regression/.cvsignore:
+        * tests/Bug_1670_Regression/.cvsignore:
+        * tests/Bug_1693_Test/.cvsignore:
+        * tests/Bug_1904_Regression/.cvsignore:
+        * tests/CDR/.cvsignore:
+        * tests/Cache_Growth_Test/.cvsignore:
+        * tests/Client_Leaks/.cvsignore:
+        * tests/CodeSets/simple/.cvsignore:
+        * tests/Codec/.cvsignore:
+        * tests/Collocation/.cvsignore:
+        * tests/Collocation_Opportunities/.cvsignore:
+        * tests/Collocation_Tests/.cvsignore:
+        * tests/Connect_Strategy_Test/.cvsignore:
+        * tests/Connection_Failure/.cvsignore:
+        * tests/Connection_Purging/.cvsignore:
+        * tests/Connection_Timeout/.cvsignore:
+        * tests/Crash_On_Write/.cvsignore:
+        * tests/Crashed_Callback/.cvsignore:
+        * tests/DLL_ORB/.cvsignore:
+        * tests/DSI_Gateway/.cvsignore:
+        * tests/DynAny_Test/.cvsignore:
+        * tests/Explicit_Event_Loop/.cvsignore:
+        * tests/Exposed_Policies/.cvsignore:
+        * tests/FL_Cube/.cvsignore:
+        * tests/Faults/.cvsignore:
+        * tests/File_IO/.cvsignore:
+        * tests/Forwarding/.cvsignore:
+        * tests/GIOP_Fragments/PMB_With_Fragments/.cvsignore:
+        * tests/Hello/.cvsignore:
+        * tests/ICMG_Any_Bug/.cvsignore:
+        * tests/IDL_Test/.cvsignore:
+        * tests/IORManipulation/.cvsignore:
+        * tests/InterOp-Naming/.cvsignore:
+        * tests/Leader_Followers/.cvsignore:
+        * tests/LongUpcalls/.cvsignore:
+        * tests/MProfile/.cvsignore:
+        * tests/MProfile_Connection_Timeout/.cvsignore:
+        * tests/MProfile_Forwarding/.cvsignore:
+        * tests/MT_BiDir/.cvsignore:
+        * tests/MT_Client/.cvsignore:
+        * tests/MT_Server/.cvsignore:
+        * tests/MT_Timeout/.cvsignore:
+        * tests/Multiple/.cvsignore:
+        * tests/Multiple_Inheritance/.cvsignore:
+        * tests/Muxed_GIOP_Versions/.cvsignore:
+        * tests/Muxing/.cvsignore:
+        * tests/Native_Exceptions/.cvsignore:
+        * tests/NestedUpcall/MT_Client_Test/.cvsignore:
+        * tests/NestedUpcall/Simple/.cvsignore:
+        * tests/NestedUpcall/Triangle_Test/.cvsignore:
+        * tests/Nested_Event_Loop/.cvsignore:
+        * tests/Nested_Upcall_Crash/.cvsignore:
+        * tests/No_Server_MT_Connect_Test/.cvsignore:
+        * tests/OBV/Any/.cvsignore:
+        * tests/OBV/Collocated/Forward/.cvsignore:
+        * tests/OBV/Factory/.cvsignore:
+        * tests/OBV/Forward/.cvsignore:
+        * tests/OBV/TC_Alignment/.cvsignore:
+        * tests/ORB_destroy/.cvsignore:
+        * tests/ORB_init/.cvsignore:
+        * tests/ORB_init/Portspan/.cvsignore:
+        * tests/ORB_shutdown/.cvsignore:
+        * tests/ORT/.cvsignore:
+        * tests/Object_Loader/.cvsignore:
+        * tests/Objref_Sequence_Test/.cvsignore:
+        * tests/OctetSeq/.cvsignore:
+        * tests/Oneway_Buffering/.cvsignore:
+        * tests/Oneways_Invoking_Twoways/.cvsignore:
+        * tests/POA/Current/.cvsignore:
+        * tests/POA/Default_Servant/.cvsignore:
+        * tests/POA/Etherealization/.cvsignore:
+        * tests/POA/Excessive_Object_Deactivations/.cvsignore:
+        * tests/POA/Identity/.cvsignore:
+        * tests/POA/MT_Servant_Locator/.cvsignore:
+        * tests/POA/Nested_Non_Servant_Upcalls/.cvsignore:
+        * tests/POA/Non_Servant_Upcalls/.cvsignore:
+        * tests/POA/Object_Reactivation/.cvsignore:
+        * tests/POA/POA_Destruction/.cvsignore:
+        * tests/POA/Persistent_ID/.cvsignore:
+        * tests/POA/Policies/.cvsignore:
+        * tests/POA/Single_Threaded_POA/.cvsignore:
+        * tests/POA/wait_for_completion/.cvsignore:
+        * tests/Param_Test/.cvsignore:
+        * tests/Policies/.cvsignore:
+        * tests/Portable_Interceptors/AMI/.cvsignore:
+        * tests/Portable_Interceptors/Benchmark/.cvsignore:
+        * tests/Portable_Interceptors/Bug_1559/.cvsignore:
+        * tests/Portable_Interceptors/Collocated/Dynamic/.cvsignore:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/.cvsignore:
+        * tests/Portable_Interceptors/Dynamic/.cvsignore:
+        * tests/Portable_Interceptors/ForwardRequest/.cvsignore:
+        * tests/Portable_Interceptors/IORInterceptor/.cvsignore:
+        * tests/Portable_Interceptors/ORB_Shutdown/.cvsignore:
+        * tests/Portable_Interceptors/PICurrent/.cvsignore:
+        * tests/Portable_Interceptors/PolicyFactory/.cvsignore:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/.cvsignore:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/.cvsignore:
+        * tests/QtTests/.cvsignore:
+        * tests/Queued_Message_Test/.cvsignore:
+        * tests/RTCORBA/Activate_Object_Multiple_ORBs/.cvsignore:
+        * tests/RTCORBA/Banded_Connections/.cvsignore:
+        * tests/RTCORBA/Client_Propagated/.cvsignore:
+        * tests/RTCORBA/Client_Protocol/.cvsignore:
+        * tests/RTCORBA/Collocation/.cvsignore:
+        * tests/RTCORBA/Destroy_Thread_Pool/.cvsignore:
+        * tests/RTCORBA/Diffserv/.cvsignore:
+        * tests/RTCORBA/Explicit_Binding/.cvsignore:
+        * tests/RTCORBA/Linear_Priority/.cvsignore:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/.cvsignore:
+        * tests/RTCORBA/ORB_init/.cvsignore:
+        * tests/RTCORBA/Persistent_IOR/.cvsignore:
+        * tests/RTCORBA/Policies/.cvsignore:
+        * tests/RTCORBA/Policy_Combinations/.cvsignore:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/.cvsignore:
+        * tests/RTCORBA/Private_Connection/.cvsignore:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/.cvsignore:
+        * tests/RTCORBA/RTMutex/.cvsignore:
+        * tests/RTCORBA/Server_Declared/.cvsignore:
+        * tests/RTCORBA/Server_Protocol/.cvsignore:
+        * tests/RTCORBA/Thread_Pool/.cvsignore:
+        * tests/RTScheduling/Current/.cvsignore:
+        * tests/RTScheduling/DT_Spawn/.cvsignore:
+        * tests/RTScheduling/Scheduling_Interceptor/.cvsignore:
+        * tests/RTScheduling/Thread_Cancel/.cvsignore:
+        * tests/RTScheduling/VoidData/.cvsignore:
+        * tests/Reliable_Oneways/.cvsignore:
+        * tests/Servant_To_Reference_Test/.cvsignore:
+        * tests/Server_Connection_Purging/.cvsignore:
+        * tests/Server_Leaks/.cvsignore:
+        * tests/Server_Port_Zero/.cvsignore:
+        * tests/Single_Read/.cvsignore:
+        * tests/Smart_Proxies/.cvsignore:
+        * tests/Smart_Proxies/Benchmark/.cvsignore:
+        * tests/Smart_Proxies/Collocation/.cvsignore:
+        * tests/Smart_Proxies/On_Demand/.cvsignore:
+        * tests/Smart_Proxies/Policy/.cvsignore:
+        * tests/Smart_Proxies/dtor/.cvsignore:
+        * tests/Stack_Recursion/.cvsignore:
+        * tests/Strategies/.cvsignore:
+        * tests/Timed_Buffered_Oneways/.cvsignore:
+        * tests/Timeout/.cvsignore:
+        * tests/Two_Objects/.cvsignore:
+        * tests/Typedef_String_Array/.cvsignore:
+        * tests/UNKNOWN_Exception/.cvsignore:
+        * tests/Xt_Stopwatch/.cvsignore:
+        * utils/catior/.cvsignore:
+        * utils/nslist/.cvsignore:
+
+          Removed these files in favor of svn:ignore properties on the
+          parent directory.
+
+Sat Jan  6 07:07:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/fe/fe_lookup.cpp (lookup):
+          Make sure the signature is exactly the same as in the header
+          file, this should resolve the ld errors with HPUX IA64
+
+Sat Jan  6 00:06:52 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * TAO_IDL/driver/drv_preproc.cpp: Removed the ACE_HAS_WINNT4 block -
+          everything runs on NT4 or up now, even when running TAO IDL for
+          building on Pharlap or CE.
+
+Fri Jan  5 22:51:37 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/ast_decl.h:
+
+          Small change to comment.
+
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/util/utl_global.cpp:
+
+          Changed logic of pushing/popping prefixes to/from
+          the IDL compiler's dedicated stack, to fix a
+          problem reported by Martin Corino <mcorino@remedy.nl>
+          related to #pragma prefix directives from included
+          IDL files and how they interact with the IDL
+          compiler's preprocessor.
+
+        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+
+          Copied lines of code from the CCM preprocessing
+          visitor, which ensures that implied IDL nodes
+          will have the correct repository ids even if
+          the original node has its prefix modified later
+          in the IDL file. The same logic is now applied
+          to the AMI and AMH preprocessing visitors.
+
+Fri Jan  5 18:26:43 UTC 2007  Ciju John  <johnc@ociweb.com>
+
+        * docs/ORBEndpoint.html:
+          Update documentation for ORBEndpoint reuse_addr option.
+
+Fri Jan  5 17:09:35 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/Portable_Interceptors/Redirection/run_test.pl:
+
+          The sudden death of the first server is expected and is part of
+          the test. Changing the script to interpret the event
+          accordingly.
+
+Fri Jan  5 15:37:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/DynamicC.h:
+          Added typedef for _out_type to ParameterList, the IDL does
+          generate this but this file is handcrafted and not updated
+          when the IDL compiler was changed
+
+Fri Jan  5 15:07:46 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/IIOP/client.cpp:
+
+          Testing for minimum corba was wrong, causing invalid reference
+          to Object::_request member in minimum corba builds.
+
+Fri Jan  5 13:35:47 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * MPC/config/tc.mpb:
+
+          Added interceptors and pi as bases to ensure the derived
+          projects are not built prior, or without their prerequisites.
+
+        * tests/TransportCurrent/Framework/Framework.mpc:
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
+
+          Added tc (which derives from pi and interceptors) as base and
+          also simplified the base project lists. This ensures the tests
+          are skipped if TC is not built (for instance with
+          corba_e_compact).
+
+Fri Jan  5 13:07:32 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp (open_senders):
+
+          Switched from using a macro for the buffer length used in
+          gathering the ignore address as a string to using a literal
+          constant. This is consistent with common usage of addr_to_string
+          throughout the ACE/TAO codebase, and avoids adding potentially
+          system-specific includes at the application level.
+
+Fri Jan  5 13:04:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/ValueBox/client.cpp:
+          Renamed VERIFY to OBV_VERIFY to resolve redefinition warnings
+          in the MFC builds
+
+Fri Jan  5 11:00:00 UTC 2007  Simon Massey  <sma@prismtech.com>
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp:
+
+          Error if the typecode info is not available to display.
+
+Fri Jan  5 10:10:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/compression.mpb:
+          Removed pi as base, not needed. Thanks to JT for noticing this
+
+        * tao/Compression/Base_Compressor.h:
+          Make the members protected so that derived classes can access them
+
+        * tao/Compression/zlib/ZlibCompressor.cpp:
+          Fixed type of local variable
+
+Fri Jan  5 06:54:42 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefiles for new subdirectory.
+
+        * tests/Portable_Interceptors/Makefile.am:
+
+          Regenerate to descend into Redirection subdirectory.
+
+        * tests/Portable_Interceptors/Redirection/Makefile.am:
+
+          New Makefile.am.
+
+Fri Jan  5 06:51:11 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefiles for new subdirectory.
+
+        * tests/Makefile.am:
+
+          Regenerate to descend into Bug_2702_Regression subdirectory.
+
+        * tests/Bug_2702_Regression/Makefile.am:
+
+          New Makefile.am.
+
+Fri Jan  5 06:42:17 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/TransportCurrent/IIOP/Makefile.am:
+        * tests/TransportCurrent/Framework/Makefile.am
+
+          Regenerate.
+
+        * configure.ac:
+
+          Configure Makefiles for new subdirectory.
+
+        * tests/TransportCurrent/Makefile.am:
+
+          Regenerate to descend into lib subdirectory.
+
+        * tests/TransportCurrent/lib/Makefile.am:
+
+          New Makefile.am for library of common code for TransportCurrent
+          tests.
+
+        * tests/TransportCurrent/Framework/Framework.mpc:
+
+          Fix tpyo in after += specification.
+
+Fri Jan  5 04:09:08 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/lib/Client_ORBInitializer.h:
+        * tests/TransportCurrent/lib/Client_ORBInitializer.cpp:
+        * tests/TransportCurrent/lib/Client_Request_Interceptor.h:
+        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/lib/Current_Test_Impl.h:
+        * tests/TransportCurrent/lib/Server_ORBInitializer.h:
+        * tests/TransportCurrent/lib/Server_ORBInitializer.cpp:
+        * tests/TransportCurrent/lib/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
+
+          Thanks to Johnny Willemsen and Chris Cleeland for reminding
+          me. This change eliminates the use of the now deprecated ACE
+          exceptions macros.
+
+Fri Jan  5 03:35:00 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
+
+          Refactor the status message output in the open_senders() method
+          to make use of updated ACE_INET_Addr::addr_to_string() when
+          reporting IPv6 sender addresses.
+
+          Also, changed ECM_Federation::ECM_Federation() to force mapping
+          of supplier and consumer names to IPv4 format as the rest of the
+          code makes use of the now-obsolete assumption that an IP addr
+          fits into a long.
+
+Fri Jan  5 00:53:34 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Transport_Connector.cpp:
+        * tao/Strategies/UIOP_Connector.cpp:
+
+          Removed the warning generated if a trailing '/' was not present
+          if the default object key were desired. The '/' separator is
+          required only when an explicit object key is present. See
+          section 13.6.10.1 of CORBA 3.0.3 specification (formal/04-03-01)
+          to note that the slash is part of the object key portion of the
+          corbaloc string.
+
+Thu Jan  4 20:10:38 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          This is in addition to the change from "Thu Jan 4 04:11:02 UTC
+         2007". The aim is to resolve the linking problems on some
+         builds. Basically, I had a templatized ORB initializer (for
+         client and server side) which used to be pretty simple
+         anyway. This change eliminates the template and replaces it with
+         two simple classes.
+
+         The problem was that the Borland compiler was not seeing the
+         template instantiations. When I tried to fix that, the Windows VC
+         broke complaining about duplicate instantiations. In the end,
+         instead of mucking about with such a simple template I just
+         zapped it.
+
+        * tests/TransportCurrent/Framework/client.cpp:
+        * tests/TransportCurrent/Framework/server.cpp:
+        * tests/TransportCurrent/IIOP/client.cpp:
+        * tests/TransportCurrent/IIOP/server.cpp:
+
+          Eliminated the trivial template usage for the ORB initializers,
+         where a simple class is sufficient.
+
+        * tests/TransportCurrent/lib/Client_ORBInitializer.h:
+        * tests/TransportCurrent/lib/Client_ORBInitializer.cpp:
+        * tests/TransportCurrent/lib/Server_ORBInitializer.cpp:
+        * tests/TransportCurrent/lib/Server_ORBInitializer.h:
+
+         Added as a replacement of the template.
+
+        * tests/TransportCurrent/Framework/run_test.pl:
+        * tests/TransportCurrent/IIOP/run_test.pl:
+
+          Modified so they now run on Windows, too. The problem was that
+         the ../lib was not part of the DLL search path on Windows and
+         there again, the path separator is ';'. The change ensures ../lib
+         is added to the PATH and introduces Config to pick the correct
+         separator.
+
+        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
+
+          Removed the partial template instantiation and replaced with two
+         simple classes. See above.
+
+        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
+
+          Updated to add pi to the list of base projects.
+
+        * tests/TransportCurrent/lib/ORBInitializer_T.h:
+        * tests/TransportCurrent/lib/ORBInitializer_T.cpp:
+
+          Removed these files.
+
+Thu Jan  4 19:55:35 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp (init):
+
+          Fixed conversion warnings in RTEMS build...the old .in() for a
+          _var problem.
+
+Thu Jan  4 16:32:38 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * tests/Bug_2702_Regression/fakeserver2.pl:
+
+          Added "use" for Socket and IO::Socket packages.  The script
+          works just fine on many platforms without this for some reason,
+          but gave errors on the BCB build.
+
+Thu Jan  4 14:08:45 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
+
+          Regenerate.
+
+Thu Jan  4 14:00:16 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * tao/Makefile.am:
+        * tests/Compression/Makefile.am:
+
+          Tweak to use ACE_{ZLIB,ZZIP}_{CPPFLAGS,LDFLAGS,LIBS}
+          instead of -I${ZLIB_ROOT}/include, etc.  The former
+          are substituted by the configure script.
+
+        * configure.ac:
+
+          Use ACE_PATH_ZLIB and ACE_PATH_ZZIP autoconf macros.
+          zlib and zzip can now be enabled at configure time
+          with --with-zlib and --with-zzip.
+
+Thu Jan  4 13:55:18 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
+
+          Subtracted the -St option from idlflags in the custom_only idl
+          projects.  Prior to the split, the -St option was subtracted off
+          by the anytypecode base project.
+
+Thu Jan  4 11:33:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Compression/server.cpp:
+          Extended this test to test whether the correct exception
+          is thrown when we request an invalid compressor factory
+
+Thu Jan  4 04:11:02 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/Framework.mpc:
+        * tests/TransportCurrent/Framework/run_test.pl:
+        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+        * tests/TransportCurrent/IIOP/client.cpp:
+        * tests/TransportCurrent/IIOP/run_test.pl:
+        * tests/TransportCurrent/IIOP/server.cpp:
+        * tests/TransportCurrent/lib:
+        * tests/TransportCurrent/lib/Client_Request_Interceptor.h:
+        * tests/TransportCurrent/lib/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/lib/Current_Test.idl:
+        * tests/TransportCurrent/lib/Current_Test_Export.h:
+        * tests/TransportCurrent/lib/Current_Test_Impl.h:
+        * tests/TransportCurrent/lib/Current_Test_Lib.mpc:
+        * tests/TransportCurrent/lib/ORBInitializer_T.h:
+        * tests/TransportCurrent/lib/ORBInitializer_T.cpp:
+        * tests/TransportCurrent/lib/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/lib/Server_Request_Interceptor.cpp:
+
+          Split off the IDL and the common stuff fro the two tests into a
+          lib directory and adjusted the references. This will hopefully
+          deal with the build dependency issues we have been seeing
+          recently and will eliminate the cases of duplicate compilation
+          of the IDL. Thanks to Johnny Willemsen and J.T. Conklin for the
+          ideas.
+
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/Framework/Current_Test.idl:
+        * tests/TransportCurrent/Framework/Current_Test_Impl.h:
+        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
+        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
+
+          Moved these files to lib directory.
+
+Wed Jan  3 22:23:57 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Profile_Transport_Resolver.cpp:
+
+          Corrected the return value for find_transport. The comment in
+          the method wasn't very clear and so when the new safe transport
+          pointer code was added, the return value for success and failure
+          were inadvertently altered, which broke the optimized connection
+          strategy's endpoint selector
+
+        * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp:
+
+          Fixed the name used in the ACE_RCSID tag.
+
+Wed Jan  3 19:53:43 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * tao/tests/Bug_2702_Regression/server_on_localhost_1192.ior:
+
+          Added this file, which was somehow missed during the merge.
+          This should address test failures across all platforms.
+
+Wed Jan  3 19:50:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Compression/run_test.pl:
+          Added perl script to run this test automatically.
+
+Wed Jan  3 19:04:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Invocation_Adapter.cpp:
+        * tao/Messaging/Asynch_Invocation.cpp:
+        * tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+        * tao/Synch_Invocation.cpp:
+          Const improvements
+
+        * tao/Invocation_Base.cpp (handle_any_exception):
+          Check whether we had a location forward, if so, return
+          LOCATION_FORWARD. This fixes bugzilla bug 2763. Thanks to
+          Jaiganesh Balasubramanian for reporting this and testing
+          the patch.
+
+Wed Jan  3 18:47:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Redirection/test.idl:
+          Added missing Id tag.
+
+Wed Jan  3 16:05:58 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * MPC/config/endpointpolicy.mpb:
+        * TAO_IDL/tao_idl.mpc:
+        * orbsvcs/Concurrency_Service/Concurrency_Service.mpc:
+        * orbsvcs/CosEvent_Service/CosEvent_Service.mpc:
+        * orbsvcs/Dump_Schedule/Dump_Schedule.mpc:
+        * orbsvcs/Event_Service/Event_Service.mpc:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
+        * orbsvcs/Fault_Detector/Fault_Detector.mpc:
+        * orbsvcs/Fault_Notifier/Fault_Notifier.mpc:
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+        * orbsvcs/LoadBalancer/LoadBalancer.mpc:
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.mpc:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.mpc:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.mpc:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.mpc:
+        * orbsvcs/Naming_Service/Naming_Service.mpc:
+        * orbsvcs/Notify_Service/Notify_Service.mpc:
+        * orbsvcs/Scheduling_Service/Scheduling_Service.mpc:
+        * orbsvcs/TAO_Service/TAO_Service.mpc:
+        * orbsvcs/Time_Service/Time_Service.mpc:
+        * orbsvcs/Trading_Service/Trading_Service.mpc:
+        * orbsvcs/orbsvcs/AV.mpc:
+        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+        * orbsvcs/orbsvcs/CosEvent.mpc:
+        * orbsvcs/orbsvcs/CosLifeCycle.mpc:
+        * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
+        * orbsvcs/orbsvcs/CosNaming.mpc:
+        * orbsvcs/orbsvcs/CosNaming_Serv.mpc:
+        * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+        * orbsvcs/orbsvcs/CosProperty.mpc:
+        * orbsvcs/orbsvcs/CosTime.mpc:
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+        * orbsvcs/orbsvcs/ETCL.mpc:
+        * orbsvcs/orbsvcs/FTORB.mpc:
+        * orbsvcs/orbsvcs/FaultTolerance.mpc:
+        * orbsvcs/orbsvcs/FtRtEvent.mpc:
+        * orbsvcs/orbsvcs/HTIOP.mpc:
+        * orbsvcs/orbsvcs/IFRService.mpc:
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+        * orbsvcs/orbsvcs/RTCORBAEvent.mpc:
+        * orbsvcs/orbsvcs/RTCosScheduling.mpc:
+        * orbsvcs/orbsvcs/RTEvent.mpc:
+        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/RTEvent_Serv.mpc:
+        * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
+        * orbsvcs/orbsvcs/RTKokyuEvent.mpc:
+        * orbsvcs/orbsvcs/RTSched.mpc:
+        * orbsvcs/orbsvcs/RTSchedEvent.mpc:
+        * orbsvcs/orbsvcs/RT_Notification.mpc:
+        * orbsvcs/orbsvcs/SSLIOP.mpc:
+        * orbsvcs/orbsvcs/Security.mpc:
+        * orbsvcs/orbsvcs/Svc_Utils.mpc:
+        * tao/AnyTypeCode.mpc:
+        * tao/BiDir_GIOP.mpc:
+        * tao/CSD_Framework.mpc:
+        * tao/CSD_ThreadPool.mpc:
+        * tao/CodecFactory.mpc:
+        * tao/Codeset.mpc:
+        * tao/Compression.mpc:
+        * tao/Domain.mpc:
+        * tao/DynamicAny.mpc:
+        * tao/DynamicInterface.mpc:
+        * tao/EndpointPolicy.mpc:
+        * tao/FlResource.mpc:
+        * tao/IFR_Client.mpc:
+        * tao/IORInterceptor.mpc:
+        * tao/IORManipulation.mpc:
+        * tao/IORTable.mpc:
+        * tao/ImR_Client.mpc:
+        * tao/Messaging.mpc:
+        * tao/ObjRefTemplate.mpc:
+        * tao/PI.mpc:
+        * tao/PI_Server.mpc:
+        * tao/PortableServer.mpc:
+        * tao/QtResource.mpc:
+        * tao/RTCORBA.mpc:
+        * tao/RTPortableServer.mpc:
+        * tao/RTScheduler.mpc:
+        * tao/SmartProxies.mpc:
+        * tao/Strategies.mpc:
+        * tao/TC.mpc:
+        * tao/TC_IIOP.mpc:
+        * tao/TkResource.mpc:
+        * tao/TypeCodeFactory.mpc:
+        * tao/Utils.mpc:
+        * tao/Valuetype.mpc:
+        * tao/XtResource.mpc:
+        * tao/ZlibCompressor.mpc:
+        * tao/tao.mpc:
+        * utils/catior/catior.mpc:
+        * utils/nslist/nslist.mpc:
+
+          Use the install base project instead of the deprecated core base
+          project.
+
+Wed Jan  3 15:18:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/Redirection/*:
+          New regression created by Jaiganesh Balasubramanian
+          <jai at dre dot vanderbilt dot edu> that reproduces a bug
+          in the handling of the PortableInterceptor::ForwardRequest
+          exception. Fix will follow later, see also bugzilla 2763
+
+Wed Jan  3 14:25:26 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+        * tao/Makefile.am:
+        * tests/Bug_2429_Regression/Makefile.am:
+
+          Fix tabs that were changed to eight spaces in some previous
+          checkin.
+
+Wed Jan  3 14:19:15 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/Collocation/Collocation.mpc:
+
+          Fixing build dependencies.
+
+Wed Jan  3 13:19:03 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+        * tests/Bug_2702_Regression/fakeserver2.pl: Added Id string to
+          fix fuzz build.
+
+Wed Jan  3 05:58:08 UTC 2007  Chris Cleeland  <cleeland_c@ociweb.com>
+
+          This entry documents the merge of several small bug fixes from
+          the OCI distribution.
+
+        * orbsvcs/Notify_Service/README:
+
+          Add documentation for the new "-UseSeparateDispatchingORB"
+          option.
+
+        * orbsvcs/Notify_Service/Notify_Service.h:
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+
+          Add new methods for creating the dispatching ORB and a flag for
+          indicating whether a separate dispatching ORB should be used.
+
+        * orbsvcs/orbsvcs/Notify/Properties.h:
+        * orbsvcs/orbsvcs/Notify/Properties.inl:
+        * orbsvcs/orbsvcs/Notify/Properties.cpp:
+
+          Added methods and data member related to managing the separate
+          dispatching ORB.
+
+        * orbsvcs/orbsvcs/Notify/Properties.h (instance):
+        * orbsvcs/orbsvcs/Notify/Properties.cpp (instance):
+        * orbsvcs/orbsvcs/Notify/RT_Properties.h (instance):
+        * orbsvcs/orbsvcs/Notify/RT_Properties.cpp (instance):
+
+          Merged in a change similar to "Thu May 19 00:29:35 2005  Ossama
+          Othman  <ossama@dre.vanderbilt.edu>" that avoids multiple
+          singleton instances of the Properties singleton.
+
+        * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp (init):
+        * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp (init):
+        * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp (init):
+
+          Similar change in all three of these places substitutes
+          _unchecked_narrow() for _narrow() when using the "re-hosting"
+          technique for the a separate dispatching ORB.  For the reference
+          to the consumer itself, the _unchecked_narrow() is perfectly
+          fine because we had a reference to something of that type
+          already.  For the NotifyPublish narrowing, though, the
+          _unchecked_narrow() isn't completely sufficient.  However, we
+          want to avoid a normal _narrow() because the resulting _is_a()
+          invocation could end up deadlocking if the POA that's hosting
+          the object reference for the consumer has not yet been
+          activated.  Thus, we use pseudo-lazy evaluation for that,
+          described in the entry for Consumer.{h,cpp} below.
+
+        * orbsvcs/orbsvcs/Notify/Consumer.h:
+
+          Added a flag, have_not_yet_verified_publish_, that indicates
+          whether the type of this->publish_ has been verified to actually
+          be a reference to something implementing the NotifyPublish
+          interface.
+
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp (CTOR, dispatch_updates_i):
+
+          Modified CTOR to initialize the aforementioned flag.  In
+          dispatch_updates_i, we assume that the reference is unverified
+          until we've checked it once.  I don't think we need to worry
+          about thread safety here...at least I hope not.
+
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.h (init_service2, init_i2):
+        * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp (init_service2, init_i2):
+
+          Added code to parse the new option.
+
+        * orbsvcs/orbsvcs/Notify/POA_Helper.cpp (create_i, activate):
+
+          Corrected some minor memory leaks when getting the name of a
+          POA.
+
+        * orbsvcs/tests/Notify/Basic/run_test.pl:
+        * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl:
+
+          Added an outer loop that runs the basic tests with and without a
+          separate dispatching ORB.
+
+        * tao/ObjectKey_Table.h:
+        * tao/ObjectKey_Table.cpp:
+        * tao/Unbounded_Octet_Sequence_T.h:
+
+          Added an optimization to servant activation.  This change
+          removes the overhead of calling TAO::ObjectKey::operator[] and
+          TAO::unbounded_value_sequence<CORBA::Octet>::operator[].  The
+          main benefit of not calling these methods is that check_bounds()
+          is not called.  check_bounds () is not required since the
+          length of the two arrays are taken into account.  This change
+          provides about 30% decrease in servant activation time for a
+          debug build (tested on Windows VC71 and Linux gcc using OCITAO
+          1.4a).  The implementation uses ACE_OS::memcmp which could
+          possibly be optimized similar to ACE_HAS_SLOW_MEMSET.  This
+          change originated from OCITAO 1.4a as part of RT 8571.
+
+        * tao/GIOP_Message_State.cpp (parse_message_header_i):
+
+          Fixed a problem where TAO mistakenly considered ALL messages
+          with zero-length payload to be errors and was thus not
+          properly parsing and handling the GIOP CloseConnection
+          message.
+
+        * tao/GIOP_Utils.h:
+
+          Corrected comment incorrectly indicating that
+          CloseConnection could not be send by both sides of a
+          connection.
+
+        * tests/Bug_2702_Regression/CloseConnection.mpc:
+        * tests/Bug_2702_Regression/README:
+        * tests/Bug_2702_Regression/Test.idl:
+        * tests/Bug_2702_Regression/client.cpp:
+        * tests/Bug_2702_Regression/closeconnection.dat:
+        * tests/Bug_2702_Regression/fakeserver.pm:
+        * tests/Bug_2702_Regression/fakeserver2.pl:
+        * tests/Bug_2702_Regression/run_test.pl:
+
+          Added a test to simulate the receipt of a CloseConnection in a
+          client, similar to what the original reporter experienced.
+          See the accompanying README for details.
+
+        * orbsvcs/tests/Bug_1393_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_1395_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_1436_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_1437_Regression/run_test.pl:
+        * orbsvcs/tests/Bug_2615_Regression/run_test.pl:
+        * orbsvcs/tests/Event/Performance/run_test.pl:
+        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
+        * orbsvcs/tests/ImplRepo/locked/run_test.pl:
+        * orbsvcs/tests/ImplRepo/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl:
+        * orbsvcs/tests/RTCosScheduling/run_test.pl:
+        * orbsvcs/tests/Security/Big_Request/run_test.pl:
+        * orbsvcs/tests/Security/Callback/run_test.pl:
+        * orbsvcs/tests/Security/Secure_Invocation/run_test.pl:
+        * tests/COIOP/run_test.pl:
+        * tests/DLL_ORB/run_test.pl:
+        * tests/Portable_Interceptors/IORInterceptor/run_test.pl:
+        * tests/Portable_Interceptors/PICurrent/run_test.pl:
+        * tests/Portable_Interceptors/PolicyFactory/run_test.pl:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/run_test.pl:
+        * utils/nslist/run_test.pl:
+
+          Changed relative paths to $ACE_ROOT/bin in these scripts to
+          reference directly via the ACE_ROOT environment variable so
+          that the scripts would work properly when run in a workspace
+          that does not use the traditional everything-under-ACE_wrappers
+          directory hierarchy.
+
+Wed Jan  3 00:51:49 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/client.cpp:
+
+          Clarified the conditional compilation for TAO_HAS_MINIMUM_CORBA.
+
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+
+          Qualified a constant with the Test:: workspace prefix.
+
+Tue Jan  2 16:32:36 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tao/PI/PICurrent.h:
+        * tao/PI/PICurrent.cpp:
+          extern "C" linkage CANNOT be added to a class member.
+
+Tue Jan  2 14:07:36 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tao/PI/PICurrent.h:
+          Add extern "C" linkage to the cleanup function.
+
+Tue Jan  2 14:07:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc:
+        * MPC/config/csd_tp_foo_a_lib.mpb:
+        * MPC/config/csd_tp_foo_b_lib.mpb:
+        * MPC/config/csd_tp_foo_c_lib.mpb:
+          Disabled with CORBA/e micro
+
+Tue Jan  2 12:45:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/argument.cpp:
+          Fixed variable not used warning
+
+Tue Jan  2 11:50:57 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
+
+          Removing the trivial post_init() template implementation added
+          on Sun Dec 31 17:27:27 UTC 2006 because it confuses the Windows
+          builds.
+
+Tue Jan  2 09:13:36 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Removed support from the IDL compiler for -Ge 0 and -Ge 1. We
+        now always generate without environment macros. -Ge 2 is still there
+        but probably gets removed also soon
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
+        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
+        * TAO_IDL/be/be_visitor_operation/argument.cpp:
+        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
+        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/arglist.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_helper.h:
+        * TAO_IDL/be_include/be_visitor_operation/operation.h:
+          Removed environment macro support
+
+        * docs/compiler.h:tml
+        * docs/tutorials/Quoter/AMI/Makefile.am:
+        * docs/tutorials/Quoter/Event_Service/Makefile.am:
+        * docs/tutorials/Quoter/idl/Makefile.am:
+        * docs/tutorials/Quoter/On_Demand_Activation/Makefile.am:
+        * docs/tutorials/Quoter/RT_Event_Service/Makefile.am:
+        * docs/tutorials/Quoter/RTCORBA/Makefile.am:
+        * examples/Advanced/ch_3/Makefile.am:
+        * examples/AMH/Sink_Server/Makefile.am:
+        * examples/AMI/FL_Callback/Makefile.am:
+        * examples/Buffered_AMI/Makefile.am:
+        * examples/Buffered_Oneways/Makefile.am:
+        * examples/Callback_Quoter/Makefile.am:
+        * examples/Content_Server/AMI_Iterator/Makefile.am:
+        * examples/Content_Server/AMI_Observer/Makefile.am:
+        * examples/Content_Server/SMI_Iterator/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool4/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool/Makefile.am:
+        * examples/Event_Comm/Makefile.am:
+        * examples/ior_corbaloc/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am:
+        * examples/Load_Balancing/Makefile.am:
+        * examples/Load_Balancing_persistent/Makefile.am:
+        * examples/Logging/Makefile.am:
+        * examples/mfc/Makefile.am:
+        * examples/OBV/Typed_Events/Makefile.am:
+        * examples/Persistent_Grid/Makefile.am:
+        * examples/PluggableUDP/tests/Basic/Makefile.am:
+        * examples/PluggableUDP/tests/Performance/Makefile.am:
+        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
+        * examples/POA/Default_Servant/Makefile.am:
+        * examples/POA/DSI/Makefile.am:
+        * examples/POA/Forwarding/Makefile.am:
+        * examples/POA/Generic_Servant/Makefile.am:
+        * examples/POA/TIE/Makefile.am:
+        * examples/Quoter/Makefile.am:
+        * examples/RTCORBA/Activity/Makefile.am:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
+        * examples/RTScheduling/Makefile.am:
+        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
+        * examples/Simple/bank/Makefile.am:
+        * examples/Simple/chat/Makefile.am:
+        * examples/Simple/echo/Makefile.am:
+        * examples/Simple/grid/Makefile.am:
+        * examples/Simple/time-date/Makefile.am:
+        * examples/Simple/time/Makefile.am:
+        * examples/Simulator/Event_Supplier/Makefile.am:
+        * examples/TypeCode_Creation/Makefile.am:
+        * interop-tests/wchar/Makefile.am:
+        * MPC/config/taoidldefaults.mpb:
+        * orbsvcs/examples/CosEC/Factory/Makefile.am:
+        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
+        * orbsvcs/examples/ImR/Advanced/Makefile.am:
+        * orbsvcs/examples/ImR/Combined_Service/Makefile.am:
+        * orbsvcs/examples/LoadBalancing/Makefile.am:
+        * orbsvcs/examples/ORT/Makefile.am:
+        * orbsvcs/examples/Security/Send_File/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/orbsvcs/HTIOP.mpc:
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pid:
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/SSLIOP.mpc:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
+        * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
+        * orbsvcs/tests/Bug_1395_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2247_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2248_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2285_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2287_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2316_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2615_Regression/Makefile.am:
+        * orbsvcs/tests/Bug_2709_Regression/Makefile.am:
+        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
+        * orbsvcs/tests/Event/UDP/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
+        * orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
+        * orbsvcs/tests/FT_App/Makefile.am:
+        * orbsvcs/tests/HTIOP/AMI/Makefile.am:
+        * orbsvcs/tests/HTIOP/BiDirectional/Makefile.am:
+        * orbsvcs/tests/HTIOP/Hello/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Makefile.am:
+        * orbsvcs/tests/ImplRepo/scale/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am:
+        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
+        * orbsvcs/tests/ior_corbaname/Makefile.am:
+        * orbsvcs/tests/IOR_MCast/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
+        * orbsvcs/tests/Miop/McastHello/Makefile.am:
+        * orbsvcs/tests/Notify/Blocking/Makefile.am:
+        * orbsvcs/tests/Notify/Discarding/Makefile.am:
+        * orbsvcs/tests/Notify/lib/Makefile.am:
+        * orbsvcs/tests/Notify/MT_Dispatching/Makefile.am:
+        * orbsvcs/tests/Notify/Ordering/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Filter/Makefile.am:
+        * orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am:
+        * orbsvcs/tests/Redundant_Naming/Makefile.am:
+        * orbsvcs/tests/Security/BiDirectional/Makefile.am:
+        * orbsvcs/tests/Security/Big_Request/Makefile.am:
+        * orbsvcs/tests/Security/Callback/Makefile.am:
+        * orbsvcs/tests/Security/Crash_Test/Makefile.am:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am:
+        * orbsvcs/tests/Security/MT_SSLIOP/Makefile.am:
+        * orbsvcs/tests/Security/Secure_Invocation/Makefile.am:
+        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
+        * orbsvcs/tests/Simple_Naming/Makefile.am:
+        * orbsvcs/tests/Trading/Makefile.am:
+        * performance-tests/Anyop/Makefile.am:
+        * performance-tests/Callback/Makefile.am:
+        * performance-tests/CSD_Strategy/TestInf/Makefile.am:
+        * performance-tests/CSD_Strategy/TestServant/Makefile.am:
+        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
+        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Latency/AMI/Makefile.am:
+        * performance-tests/Latency/Collocation/Makefile.am:
+        * performance-tests/Latency/Deferred/Makefile.am:
+        * performance-tests/Latency/DII/Makefile.am:
+        * performance-tests/Latency/DSI/Makefile.am:
+        * performance-tests/Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Memory/IORsize/Makefile.am:
+        * performance-tests/Memory/Single_Threaded/Makefile.am:
+        * performance-tests/Pluggable/Makefile.am:
+        * performance-tests/POA/Demux/Makefile.am:
+        * performance-tests/POA/Implicit_Activation/Makefile.am:
+        * performance-tests/POA/Object_Creation_And_Registration/Makefile.am:
+        * performance-tests/Protocols/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/Makefile.am:
+        * performance-tests/RTCorba/Oneways/Reliable/Makefile.am:
+        * performance-tests/RTCorba/Thread_Pool/Makefile.am:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/AMI/Makefile.am:
+        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
+        * performance-tests/Sequence_Latency/DII/Makefile.am:
+        * performance-tests/Sequence_Latency/DSI/Makefile.am:
+        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Throughput/Makefile.am:
+        * tao/AnyTypeCode.mpc:
+        * tao/AnyTypeCode/AnySeq.pid:
+        * tao/AnyTypeCode/Bounds.pid:
+        * tao/AnyTypeCode/Dynamic.pid:
+        * tao/AnyTypeCode/Dynamic_Parameter.pid:
+        * tao/AnyTypeCode/ValueModifier.pid:
+        * tao/AnyTypeCode/Visibility.pid:
+        * tao/BiDir_GIOP.mpc:
+        * tao/BiDir_GIOP/BiDirPolicy.pid:
+        * tao/BooleanSeq.pid:
+        * tao/CharSeq.pid:
+        * tao/CodecFactory.mpc:
+        * tao/CodecFactory/IOP_Codec.pid:
+        * tao/Compression.mpc:
+        * tao/Compression/TAO_Compression.pc.in
+        * tao/CONV_FRAME.pid:
+        * tao/CSD_Framework.mpc:
+        * tao/CSD_Framework/CSD_Framework.pid:
+        * tao/Current.pid:
+        * tao/Domain.pid:
+        * tao/DoubleSeq.pid:
+        * tao/DynamicAny.mpc:
+        * tao/EndpointPolicy.mpc:
+        * tao/EndpointPolicy/EndpointPolicyType.pid:
+        * tao/FloatSeq.pid:
+        * tao/GIOP.pid:
+        * tao/IFR_Client.mpc:
+        * tao/IFR_Client/IFR_Base.pid:
+        * tao/IFR_Client/IFR_Basic.pid:
+        * tao/IFR_Client/IFR_Components.pid:
+        * tao/IFR_Client/IFR_Extended.pid:
+        * tao/IIOP.pid:
+        * tao/IIOP_Endpoints.pid:
+        * tao/ImR_Client.mpc:
+        * tao/ImR_Client/ImplRepo.pid:
+        * tao/ImR_Client/ServerObject.pid:
+        * tao/InvalidName.pid:
+        * tao/IOP.pid:
+        * tao/IOP_IOR.pid:
+        * tao/IORInterceptor.mpc:
+        * tao/IORInterceptor/IORInfo.pid:
+        * tao/IORInterceptor/IORInterceptor.pid:
+        * tao/IORManipulation.mpc:
+        * tao/IORManipulation/IOR.pid:
+        * tao/IORTable.mpc:
+        * tao/IORTable/IORTable.pid:
+        * tao/LongDoubleSeq.pid:
+        * tao/LongLongSeq.pid:
+        * tao/LongSeq.pid:
+        * tao/Makefile.am:
+        * tao/Messaging.mpc:
+        * tao/Messaging/ExceptionHolder.pid:
+        * tao/Messaging/Messaging.pid:
+        * tao/Messaging/Messaging_No_Impl.pid:
+        * tao/Messaging/Messaging_RT_Policy.pid:
+        * tao/Messaging/Messaging_SyncScope_Policy.pid:
+        * tao/Messaging/Messaging_Types.pid:
+        * tao/Messaging/Pollable.pid:
+        * tao/Messaging/TAO_Ext.pid:
+        * tao/Messaging_PolicyValue.pid:
+        * tao/Object_Key.pid:
+        * tao/ObjectIdList.pid:
+        * tao/ObjRefTemplate.mpc:
+        * tao/ObjRefTemplate/Default_ORT.pid:
+        * tao/OctetSeq.pid:
+        * tao/orb_types.pid:
+        * tao/ParameterMode.pid:
+        * tao/PI.mpc:
+        * tao/PI/ClientRequestInfo.pid:
+        * tao/PI/ClientRequestInterceptor.pid:
+        * tao/PI/Interceptor.pid:
+        * tao/PI/InvalidSlot.pid:
+        * tao/PI/ORBInitializer.pid:
+        * tao/PI/ORBInitInfo.pid:
+        * tao/PI/PICurrent.pid:
+        * tao/PI/PIForwardRequest.pid:
+        * tao/PI/PolicyFactory.pid:
+        * tao/PI/ProcessingModePolicy.pid:
+        * tao/PI/RequestInfo.pid:
+        * tao/PI_Forward.pid:
+        * tao/PI_Server.mpc:
+        * tao/PI_Server/ServerRequestInfo.pid:
+        * tao/PI_Server/ServerRequestInterceptor.pid:
+        * tao/Policy.pid:
+        * tao/Policy_Forward.pid:
+        * tao/PortableInterceptor.pid:
+        * tao/PortableServer.mpc:
+        * tao/PortableServer/POA.pid:
+        * tao/PortableServer/POAManagerFactory.pid:
+        * tao/PortableServer/PortableServer.pid:
+        * tao/PortableServer/PS_Forward.pid:
+        * tao/PortableServer/RequestProcessingPolicy.pid:
+        * tao/PortableServer/ServantActivator.pid:
+        * tao/PortableServer/ServantLocator.pid:
+        * tao/PortableServer/ServantManager.pid:
+        * tao/PortableServer/ServantRetentionPolicy.pid:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/ThreadPolicy.pid:
+        * tao/RTCORBA.mpc:
+        * tao/RTCORBA/diffs/RTCORBA.diff
+        * tao/RTCORBA/RTCORBA.pid:
+        * tao/RTCORBA/RTCORBAC.cpp:
+        * tao/RTPortableServer.mpc:
+        * tao/RTPortableServer/RTPortableServer.pid:
+        * tao/RTScheduler.mpc:
+        * tao/RTScheduling/RTScheduler.pid:
+        * tao/Services.pid:
+        * tao/ShortSeq.pid:
+        * tao/Strategies.mpc:
+        * tao/Strategies/COIOP_Endpoints.pid:
+        * tao/Strategies/sciop_endpoints.pid:
+        * tao/Strategies/uiop_endpoints.pid:
+        * tao/StringSeq.pid:
+        * tao/tao.mpc:
+        * tao/TAO.pid:
+        * tao/TimeBase.pid:
+        * tao/TypeCodeFactory.mpc:
+        * tao/TypeCodeFactory_Adapter.cpp:
+        * tao/TypeCodeFactory_Adapter.h:
+        * tao/ULongLongSeq.pid:
+        * tao/ULongSeq.pid:
+        * tao/UShortSeq.pid:
+        * tao/Valuetype.mpc:
+        * tao/Wait_Strategy.cpp:
+        * tao/WCharSeq.pid:
+        * tao/WrongTransaction.pid:
+        * tao/WStringSeq.pid:
+        * tests/Abstract_Interface/Makefile.am:
+        * tests/AMH_Exceptions/Makefile.am:
+        * tests/AMH_Oneway/Makefile.am:
+        * tests/AMI/Makefile.am:
+        * tests/AMI_Buffering/Makefile.am:
+        * tests/AMI_Timeouts/Makefile.am:
+        * tests/Any/Recursive/Makefile.am:
+        * tests/BiDirectional/Makefile.am:
+        * tests/BiDirectional_DelayedUpcall/Makefile.am:
+        * tests/BiDirectional_NestedUpcall/Makefile.am:
+        * tests/Big_AMI/Makefile.am:
+        * tests/Big_Oneways/Makefile.am:
+        * tests/Big_Reply/Makefile.am:
+        * tests/Big_Request_Muxing/Makefile.am:
+        * tests/Big_Twoways/Makefile.am:
+        * tests/Blocking_Sync_None/Makefile.am:
+        * tests/Bug_1020_Basic_Regression/Makefile.am:
+        * tests/Bug_1020_Regression/Makefile.am:
+        * tests/Bug_1254_Regression/Makefile.am:
+        * tests/Bug_1269_Regression/Makefile.am:
+        * tests/Bug_1270_Regression/Makefile.am:
+        * tests/Bug_1330_Regression/Makefile.am:
+        * tests/Bug_1361_Regression/Makefile.am:
+        * tests/Bug_1476_Regression/Makefile.am:
+        * tests/Bug_1476_Test/Makefile.am:
+        * tests/Bug_1482_Regression/Makefile.am:
+        * tests/Bug_1495_Regression/Makefile.am:
+        * tests/Bug_1535_Regression/bug_1535_regression.cpp:
+        * tests/Bug_1535_Regression/Bug_1535_Regression.mpc:
+        * tests/Bug_1535_Regression/Makefile.am:
+        * tests/Bug_1535_Regression/Test.cpp:
+        * tests/Bug_1535_Regression/Test.h:
+        * tests/Bug_1551_Regression/Makefile.am:
+        * tests/Bug_1568_Regression/Makefile.am:
+        * tests/Bug_1627_Regression/Makefile.am:
+        * tests/Bug_1636_Regression/Makefile.am:
+        * tests/Bug_1639_Regression/Makefile.am:
+        * tests/Bug_1670_Regression/Makefile.am:
+        * tests/Bug_1676_Regression/Makefile.am:
+        * tests/Bug_1693_Test/Makefile.am:
+        * tests/Bug_1812_Regression/Makefile.am:
+        * tests/Bug_1813_Regression/Makefile.am:
+        * tests/Bug_1869_Regression/Makefile.am:
+        * tests/Bug_1904_Regression/Makefile.am:
+        * tests/Bug_2084_Regression/Makefile.am:
+        * tests/Bug_2119_Regression/Makefile.am:
+        * tests/Bug_2122_Regression/Makefile.am:
+        * tests/Bug_2124_Regression/Makefile.am:
+        * tests/Bug_2126_Regression/Makefile.am:
+        * tests/Bug_2134_Regression/Makefile.am:
+        * tests/Bug_2144_Regression/Makefile.am:
+        * tests/Bug_2174_Regression/Makefile.am:
+        * tests/Bug_2183_Regression/Makefile.am:
+        * tests/Bug_2186_Regression/Makefile.am:
+        * tests/Bug_2188_Regression/Makefile.am:
+        * tests/Bug_2201_Regression/Makefile.am:
+        * tests/Bug_2222_Regression/Makefile.am:
+        * tests/Bug_2234_Regression/Makefile.am:
+        * tests/Bug_2289_Regression/Makefile.am:
+        * tests/Bug_2319_Regression/Makefile.am:
+        * tests/Bug_2328_Regression/Makefile.am:
+        * tests/Bug_2349_Regression/Makefile.am:
+        * tests/Bug_2375_Regression/Makefile.am:
+        * tests/Bug_2399_Regression/Makefile.am:
+        * tests/Bug_2417_Regression/Makefile.am:
+        * tests/Bug_2419_Regression/Makefile.am:
+        * tests/Bug_2424_Regression/Makefile.am:
+        * tests/Bug_2429_Regression/Bug_2429_Regression.mpc:
+        * tests/Bug_2429_Regression/Makefile.am:
+        * tests/Bug_2494_Regression/Makefile.am:
+        * tests/Bug_2503_Regression/Makefile.am:
+        * tests/Bug_2542_Regression/Makefile.am:
+        * tests/Bug_2543_Regression/bug_2543_regression.cpp:
+        * tests/Bug_2543_Regression/Makefile.am:
+        * tests/Bug_2549_Regression/Makefile.am:
+        * tests/Bug_2560_Regression/Makefile.am:
+        * tests/Bug_2593_Regression/Makefile.am:
+        * tests/Bug_2595_Regression/Makefile.am:
+        * tests/Bug_2654_Regression/Makefile.am:
+        * tests/Bug_2669_Regression/Makefile.am:
+        * tests/Bug_2683_Regression/Makefile.am:
+        * tests/Cache_Growth_Test/Makefile.am:
+        * tests/CallbackTest/Makefile.am:
+        * tests/Client_Leaks/Makefile.am:
+        * tests/Codec/Makefile.am:
+        * tests/CodeSets/simple/Makefile.am:
+        * tests/COIOP/Makefile.am:
+        * tests/Collocation/Makefile.am:
+        * tests/Collocation_Exception_Test/Makefile.am:
+        * tests/Collocation_Oneway_tests/Makefile.am:
+        * tests/Collocation_Opportunities/Makefile.am:
+        * tests/Collocation_tests/Makefile.am:
+        * tests/CollocationLockup/Makefile.am:
+        * tests/Connect_Strategy_Test/Makefile.am:
+        * tests/Connection_Failure/Makefile.am:
+        * tests/Connection_Purging/Makefile.am:
+        * tests/Connection_Timeout/Makefile.am:
+        * tests/Crash_On_Write/Makefile.am:
+        * tests/Crashed_Callback/Makefile.am:
+        * tests/CSD_Strategy_tests/TP_Common/Makefile.am:
+        * tests/CSD_Strategy_tests/TP_Foo_A/Makefile.am:
+        * tests/CSD_Strategy_tests/TP_Foo_B/Makefile.am:
+        * tests/CSD_Strategy_tests/TP_Foo_C/Makefile.am:
+        * tests/CSD_Strategy_tests/TP_Test_Dynamic/Makefile.am:
+        * tests/DII_Collocation_tests/oneway/Makefile.am:
+        * tests/DII_Collocation_tests/twoway/Makefile.am:
+        * tests/DLL_ORB/Makefile.am:
+        * tests/DSI_Gateway/Makefile.am:
+        * tests/DynAny_Test/Makefile.am:
+        * tests/Explicit_Event_Loop/Makefile.am:
+        * tests/Exposed_Policies/Makefile.am:
+        * tests/Faults/Makefile.am:
+        * tests/File_IO/Makefile.am:
+        * tests/FL_Cube/Makefile.am:
+        * tests/Forwarding/Makefile.am:
+        * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am:
+        * tests/GIOP_Fragments/Java_Big_Request/Makefile.am:
+        * tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am:
+        * tests/Hang_Shutdown/Makefile.am:
+        * tests/Hello/Makefile.am:
+        * tests/ICMG_Any_Bug/Makefile.am:
+        * tests/IDL_Test/Makefile.am:
+        * tests/InterOp-Naming/Makefile.am:
+        * tests/IOR_Endpoint_Hostnames/Makefile.am:
+        * tests/IPV6/Makefile.am:
+        * tests/Leader_Followers/Makefile.am:
+        * tests/LongUpcalls/Makefile.am:
+        * tests/MProfile/Makefile.am:
+        * tests/MProfile_Connection_Timeout/Makefile.am:
+        * tests/MProfile_Forwarding/Makefile.am:
+        * tests/MT_BiDir/Makefile.am:
+        * tests/MT_Client/Makefile.am:
+        * tests/MT_Server/Makefile.am:
+        * tests/MT_Timeout/Makefile.am:
+        * tests/Multiple/Makefile.am:
+        * tests/Multiple_Inheritance/Makefile.am:
+        * tests/Muxed_GIOP_Versions/Makefile.am:
+        * tests/Muxing/Makefile.am:
+        * tests/Native_Exceptions/Makefile.am:
+        * tests/Nested_Event_Loop/Makefile.am:
+        * tests/Nested_Upcall_Crash/Makefile.am:
+        * tests/NestedUpcall/MT_Client_Test/Makefile.am:
+        * tests/NestedUpcall/Simple/Makefile.am:
+        * tests/NestedUpcall/Triangle_Test/Makefile.am:
+        * tests/No_Server_MT_Connect_Test/Makefile.am:
+        * tests/Object_Loader/Makefile.am:
+        * tests/Objref_Sequence_Test/Makefile.am:
+        * tests/OBV/Any/Makefile.am:
+        * tests/OBV/Collocated/Forward/Makefile.am:
+        * tests/OBV/Factory/Makefile.am:
+        * tests/OBV/Forward/Makefile.am:
+        * tests/OBV/Simple/Makefile.am:
+        * tests/OBV/TC_Alignment/Makefile.am:
+        * tests/OBV/Truncatable/Makefile.am:
+        * tests/OBV/ValueBox/Makefile.am:
+        * tests/OctetSeq/Makefile.am:
+        * tests/Ondemand_Write/Makefile.am:
+        * tests/Oneway_Buffering/Makefile.am:
+        * tests/Oneway_Timeouts/Makefile.am:
+        * tests/Oneways_Invoking_Twoways/Makefile.am:
+        * tests/Optimized_Connection/Makefile.am:
+        * tests/ORB_init/Portspan/Makefile.am:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am:
+        * tests/ORB_shutdown/Makefile.am:
+        * tests/ORT/Makefile.am:
+        * tests/Parallel_Connect_Strategy/Makefile.am:
+        * tests/Param_Test/Makefile.am:
+        * tests/POA/Bug_2511_Regression/Makefile.am:
+        * tests/POA/Deactivate_Object/Makefile.am:
+        * tests/POA/Default_Servant/Makefile.am:
+        * tests/POA/EndpointPolicy/Makefile.am:
+        * tests/POA/Etherealization/Makefile.am:
+        * tests/POA/Excessive_Object_Deactivations/Makefile.am:
+        * tests/POA/Identity/Makefile.am:
+        * tests/POA/MT_Servant_Locator/Makefile.am:
+        * tests/POA/Nested_Non_Servant_Upcalls/Makefile.am:
+        * tests/POA/Non_Servant_Upcalls/Makefile.am:
+        * tests/POA/Object_Reactivation/Makefile.am:
+        * tests/POA/Persistent_ID/Makefile.am:
+        * tests/POA/POA_Destruction/Makefile.am:
+        * tests/POA/Reference_Counting/Makefile.am:
+        * tests/POA/Single_Threaded_POA/Makefile.am:
+        * tests/POA/wait_for_completion/Makefile.am:
+        * tests/Policies/Makefile.am:
+        * tests/Portable_Interceptors/AdvSlot/Makefile.am:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am:
+        * tests/Portable_Interceptors/AdvSlotExt/Makefile.am:
+        * tests/Portable_Interceptors/AMI/Makefile.am:
+        * tests/Portable_Interceptors/Benchmark/Makefile.am:
+        * tests/Portable_Interceptors/Bug_1559/Makefile.am:
+        * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am:
+        * tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am:
+        * tests/Portable_Interceptors/Dynamic/Makefile.am:
+        * tests/Portable_Interceptors/ForwardRequest/Makefile.am:
+        * tests/Portable_Interceptors/IORInterceptor/Makefile.am:
+        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
+        * tests/Portable_Interceptors/PICurrent/Makefile.am:
+        * tests/Portable_Interceptors/PolicyFactory/Makefile.am:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
+        * tests/Portable_Interceptors/Register_Initial_References/Makefile.am:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
+        * tests/QtTests/Makefile.am:
+        * tests/Reliable_Oneways/Makefile.am:
+        * tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am:
+        * tests/RTCORBA/Banded_Connections/Makefile.am:
+        * tests/RTCORBA/Client_Propagated/Makefile.am:
+        * tests/RTCORBA/Client_Protocol/Makefile.am:
+        * tests/RTCORBA/Collocation/Makefile.am:
+        * tests/RTCORBA/Diffserv/Makefile.am:
+        * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am:
+        * tests/RTCORBA/Explicit_Binding/Makefile.am:
+        * tests/RTCORBA/Linear_Priority/Makefile.am:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am:
+        * tests/RTCORBA/Persistent_IOR/Makefile.am:
+        * tests/RTCORBA/Policy_Combinations/Makefile.am:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am:
+        * tests/RTCORBA/Private_Connection/Makefile.am:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am:
+        * tests/RTCORBA/Server_Declared/Makefile.am:
+        * tests/RTCORBA/Server_Protocol/Makefile.am:
+        * tests/RTCORBA/Thread_Pool/Makefile.am:
+        * tests/RTScheduling/Scheduling_Interceptor/Makefile.am:
+        * tests/RTScheduling/VoidData/Makefile.am:
+        * tests/Servant_To_Reference_Test/Makefile.am:
+        * tests/Server_Connection_Purging/Makefile.am:
+        * tests/Server_Leaks/Makefile.am:
+        * tests/Server_Port_Zero/Makefile.am:
+        * tests/Single_Read/Makefile.am:
+        * tests/Smart_Proxies/Benchmark/Makefile.am:
+        * tests/Smart_Proxies/Collocation/Makefile.am:
+        * tests/Smart_Proxies/dtor/Makefile.am:
+        * tests/Smart_Proxies/Makefile.am:
+        * tests/Smart_Proxies/On_Demand/Makefile.am:
+        * tests/Smart_Proxies/Policy/Makefile.am:
+        * tests/Stack_Recursion/Makefile.am:
+        * tests/Strategies/Makefile.am:
+        * tests/Timed_Buffered_Oneways/Makefile.am:
+        * tests/Timeout/Makefile.am:
+        * tests/TransportCurrent/Framework/Makefile.am:
+        * tests/TransportCurrent/IIOP/Makefile.am:
+        * tests/Two_Objects/Makefile.am:
+        * tests/Typedef_String_Array/Makefile.am:
+        * tests/UNKNOWN_Exception/Makefile.am:
+        * tests/Xt_Stopwatch/Makefile.am:
+          Removed any occurrence of -Ge 1
+
+Sun Dec 31 23:12:36 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+
+          It seems BUILD_ZZIP depends on BUILD_ZLIB, so add BUILD_ZLIB
+          conditionals, etc. everywhere we added BUILD_ZZIP support in:
+
+          Fri Dec 29 08:09:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+Sun Dec 31 18:15:00 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
+
+          Updating the @file to fix a fuzz error.
+
+Sun Dec 31 18:08:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+
+          Disambiguating Transport::CurrentTest::ContextTag to
+          Test::Transport::CurrentTest::ContextTag to aid Borland's compiler.
+
+Sun Dec 31 17:27:27 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
+
+          Adding a trivial default implementation of post_init.
+
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/server.cpp:
+
+          Moved an #include from the header to the cpp file, where it
+          belongs.
+
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+
+              Added a "Template_Files" section to explicitly make
+          ORBInitializer.cpp available.
+
+Fri Dec 29 22:31:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_Loader.cpp:
+
+          Cleanup.
+
+        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+
+          Replaced static_cast<>with a dynamic_cast<> in handler().
+
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/Framework/Framework.mpc:
+
+          Whitespace cleanup.
+
+        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
+        * tests/TransportCurrent/Framework/ORBInitializer_T.cpp:
+
+          Cleaned up template declarations and moved template code to a
+          cpp file.
+
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
+
+          Updated includes and removed unnecessary code.
+
+        * tests/TransportCurrent/Framework/client.cpp:
+
+          Added code to handle TAO_HAS_MINIMUM_CORBA by disabling DII.
+
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+
+          Whitespace cleanup.
+
+        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
+
+          Removing extra ';' from ACE_STATIC_SVC_REQUIRE.
+
+Sat Dec 30 03:55:42 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Makefile.am:
+
+          Fix stray trailing whitespace after \ continuation.
+
+Fri Dec 29 17:50:16 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff:
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * orbsvcs/orbsvcs/Trader/constraint.l:
+
+          Added a rule to catch white space and ignore it.  Previously,
+          white space was not recognized and the lexer would print it out to
+          stdout.
+
+Fri Dec 29 14:49:24 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * MPC/config/trading_serv.mpb:
+
+          Added the utils base project.  It is used by the CosTrading_Serv
+          project and should have been in this base project.
+
+Fri Dec 29 08:09:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+        * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am:
+        * tests/GIOP_Fragments/Java_Big_Request/Makefile.am:
+        * tests/GIOP_Fragments/Makefile.am:
+        * tests/Nested_Upcall_Crash/Makefile.am:
+        * tests/POA/Persistent_ID/Makefile.am:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
+        * tests/TransportCurrent/Framework/Makefile.am:
+        * tests/TransportCurrent/IIOP/Makefile.am:
+
+          Regenerate for misc *.mpc and *.mpb changes.
+
+        * tao/Makefile.am:
+
+          Regenerate for new Compression projects.
+
+        * configure.ac:
+
+          Configure Makefiles for new subdirectory.
+
+        * tests/Makefile.am:
+
+          Regenerate to descend into Compression subdirectory.
+
+        * tests/Compression/Makefile.am:
+
+          New Makefile.am for Compression unit tests.
+
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Hand-add automake conditionals for BUILD_ZZIP.  Unfortunately
+          MPC resolves options, files, etc. set by "features" at project
+          generation time, but we want them to be configure time options.
+
+Fri Dec 29 07:45:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Added AM_CONDITIONALs for BUILD_ZLIB and BUILD_ZZIP, so we can
+          handle Makefile.am's with these options.  Default to false,
+          until we can write feature tests for these options.
+
+Fri Dec 29 07:37:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * docs/libraries.html:
+
+          Fix typos.
+
+Thu Dec 28 23:10:52 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TC.mpc:
+        * tao/TC_IIOP.mpc:
+
+          Apparently, interceptors and pi are still needed for the
+          build. Reverting my change from Thu Dec 28 19:29:58 UTC 2006.
+
+Thu Dec 28 20:30:14 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * docs/libraries.html:
+
+          Updated documentation for Transport::Current.
+
+        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
+
+          Reversing the removal of *_Export.h include to match the
+          convention.
+
+        * tests/TransportCurrent/Framework/run_test.pl:
+
+          Added code to support -static and -dynamic parameters, similar
+          to the IIOP test.
+
+Thu Dec 28 20:01:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
+        * tests/TransportCurrent/Framework/run_test.pl:
+
+Thu Dec 28 19:29:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TC.mpc:
+        * tao/TC_IIOP.mpc:
+
+          Removed interceptors and pi from the list of base projects. The
+          Transport::Current feature is not itself dependent on these
+          features. The tests however are, and their *.mpc files have been
+          modified accordingly to add interceptors explicitely.
+
+        * tao/TransportCurrent/Current_ORBInitializer.h:
+
+          Removed commented code.
+
+        * tao/TransportCurrent/Current_ORBInitializer.cpp:
+
+          Added "#pragma once".
+
+        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
+
+          Removed unnecessary *_Export.h include since TCC.h already
+          includes it.
+
+        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
+
+          Removed an extra ';' after ACE_STATIC_SVC_REQUIRE.
+
+        * tao/TransportCurrent/Transport_Current_Export.h:
+
+          Regenerated this file to fix DLL export problems in static
+          builds.
+
+        * tests/TransportCurrent/Framework/Framework.mpc:
+
+          Added interceptors to the base projects list to ensure this test
+          builds only when interceptors are supported.
+
+        * tests/TransportCurrent/Framework/Tester.cpp:
+        * tests/TransportCurrent/Framework/client.cpp:
+        * tests/TransportCurrent/Framework/server.cpp:
+
+          Added code to handle single-threaded builds correctly.
+
+        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+
+          Changed the modulename from "TAO" to "Test" in order to fixing
+          an ambiguous reference to "TAO" namespace in builds with
+          versioned namespaces enabled.
+
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+
+          Added interceptors to the base projects list to ensure this test
+          builds only when interceptors are supported.
+
+Thu Dec 28 19:14:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Compression/Compression.cpp:
+          Fixed argument not used warning
+
+Thu Dec 28 12:52:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Simple/time-date/svc.conf.xml:
+          Updated this file to match the regular svc.conf file
+
+Thu Dec 28 12:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc:
+        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
+        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
+          Disable part of the projects when CORBA/e micro is enabled
+
+Thu Dec 28 12:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc:
+        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
+        * tests/NestedUpcall/Triangle_Test/TT.mpc:
+          Disable part of the projects when CORBA/e micro is enabled
+
+Thu Dec 28 12:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/libraries.html:
+          Documented the new compression libraries
+
+Thu Dec 28 11:33:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          This is the first commit for a new part for TAO which hopefully
+          gets standardized next year. The final goal is to implement
+          Zipped GIOP (ZIOP). At the moment an ORB supports ZIOP the application
+          programmer can specify using policies that compression can be
+          applied on the application data send over the wire. This first
+          commit is the Compression module that delivers the infrastructure
+          classes with which data can be compressed. This can be used
+          by regular applications but then also by the ORB in the future.
+
+          This effort is supported by multiple parties, IONA did the
+          initial effort for Orbix and triggered this step, Remedy IT
+          will do the implementation for TAO, Andre Spiegel will do
+          the implementation for JacORB, IONA then for Orbix and PrismTech
+          will assist when needed and will keep an eye on the OMG process.
+
+          This commit adds first initial support, it is not 100% ready
+          but it is usable. This way we can share the code with the other
+          parties more easily and attract more people to this effort. Be
+          aware that the IDL can change, this is work in progress, not
+          a final spec.
+
+        * MPC/config/compression.mpb:
+          New base project for the compression library
+
+        * MPC/config/zlibcompressor.mpb:
+          New base project for the zlib compressor
+
+        * docs/Libraries.html:
+          Corrected link to MPC readme
+
+        * docs/ORBEndpoint.html:
+          Small layout change
+
+        * tao/Compression/Base_Compressor.cpp:
+        * tao/Compression/Base_Compressor.h:
+        * tao/Compression/Compression.cpp:
+        * tao/Compression/Compression.h:
+        * tao/Compression/Compression.pidl:
+        * tao/Compression/compression_export.h:
+        * tao/Compression/Compression_Manager.cpp:
+        * tao/Compression/Compression_Manager.h:
+        * tao/Compression/Compressor_Factory.cpp:
+        * tao/Compression/Compressor_Factory.h:
+        * tao/Compression/TAO_Compression.pc.in:
+        * tao/Compression/TAO_Compression.rc:
+          New Compression library
+
+        * Compression/zlib/TAO_ZlibCompressor.pc.in:
+        * Compression/zlib/TAO_ZlibCompressor.rc:
+        * Compression/zlib/ZlibCompressor.cpp:
+        * Compression/zlib/ZlibCompressor.h:
+        * Compression/zlib/ZlibCompressor_export.h:
+        * Compression/zlib/ZlibCompressor_Factory.cpp:
+        * Compression/zlib/ZlibCompressor_Factory.h:
+          New Compressor that uses zlib to compress/uncompress data
+
+        * tao/File_Parser.cpp:
+          Use true for bool
+
+        * tao/objectid.h:
+          Added CompressionManager defines
+
+        * tao/ORB.cpp:
+          Added resolve_initial_references support for the CompressionManager
+
+        * tao/ORB_Core.{h,cpp,inl}:
+          Added support for CompressionManager
+
+        * tao/PI/Interceptor_List_T.cpp:
+          Const change
+
+        * tao/ZlibCompressor.mpc:
+        * tao/Compression.mpc:
+          New base projects
+
+        * tests/Compression/Compression_Test.mpc:
+        * tests/Compression/server.cpp:
+          First initial test of the Compression library
+
+Wed Dec 27 22:48:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/Framework/Current_Test.idl:
+        * tests/TransportCurrent/Framework/Current_Test_Impl.h:
+        * tests/TransportCurrent/Framework/Current_Test_Impl.cpp:
+        * tests/TransportCurrent/Framework/client.cpp:
+        * tests/TransportCurrent/Framework/server.cpp:
+
+          Changed the modulename from "TAO" to "Test" in order to fixing
+          an ambiguous reference to "TAO" namespace in builds with
+          versioned namespaces enabled.
+
+Wed Dec 27 20:42:48 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+
+          Fixing test failures because of incorrect counting.
+
+Wed Dec 27 11:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Small improvements for cross compilation
+
+Wed Dec 27 10:51:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Use more html keyword for layout and document how to use CORBA/e
+
+Wed Dec 27 05:35:06 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
+
+          Fixing an ambiguous reference to TAO namespace in builds with
+          versioned namespaces enabled.
+
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+
+          Clarifying some debugging statements.
+
+Mon Dec 25 16:19:42 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * Merry Christmas everyone!!!
+
+Sun Dec 24 23:22:41 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc:
+
+          Adding "after" keyword to make sure IDL is built first in
+          parallel builds.
+
+Sun Dec 24 15:44:40 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+
+          Getting the const-ness right.
+
+Sun Dec 24 15:39:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Parallel_Connect_Strategy/Makefile.am:
+        * tests/Reliable_Oneways/Makefile.am:
+
+          Regenerated.
+
+        * tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc:
+        * tests/Reliable_Oneways/Reliable_Oneways.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Sun Dec 24 15:38:15 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Smart_Proxies/Collocation/Makefile.am:
+
+          Regenerated.
+
+        * tests/Smart_Proxies/Collocation/SP_Collocation.mpc:
+
+          Changed IDL project to inherit from smart_proxies.
+
+          Changed *Test project to depend on *idl for build order.
+
+Sun Dec 24 00:04:19 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/CollocationLockup/Makefile.am:
+        * tests/DSI_Gateway/Makefile.am:
+        * tests/Nested_Upcall_Crash/Makefile.am:
+
+          Regenerated.
+
+        * tests/CollocationLockup/CollocationLockup.mpc:
+        * tests/DSI_Gateway/DSI_Gateway.mpc:
+        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Sat Dec 23 16:53:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Collocation/Makefile.am:
+        * tests/Smart_Proxies/Collocation/Makefile.am:
+
+          Regenerated.
+
+        * tests/Collocation/Collocation.mpc:
+        * tests/Smart_Proxies/Collocation/SP_Collocation.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Sat Dec 23 15:48:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/TransportCurrent/IIOP/Makefile.am:
+
+          Regenerated.
+
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+
+          Don't look for includes relative to $(srcdir), the ones we're
+          looking for are generated from *.idl and thus relative to the
+          build directory.
+
+Sat Dec 23 15:05:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Portable_Interceptors/Dynamic/Makefile.am:
+        * tests/Portable_Interceptors/Benchmark/Makefile.am:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
+
+          Regenerated.
+
+        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc:
+        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc:
+
+          Don't suppress any/typecode generation.
+
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
+
+          Don't include server skeleton in client.
+
+Sat Dec 23 14:35:09 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/POA/Persistent_ID/Makefile.am:
+        * tests/POA/Persistent_ID/Persistent_ID.mpc:
+
+          Fix case-mismatch problem introduced in last change.
+
+Sat Dec 23 04:48:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_Loader.cpp:
+
+          Fixing an pedantic complaint about an extra ';' at the end of
+          the line, after ACE_STATIC_SVC_REQUIRE.
+
+Sat Dec 23 03:53:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_ORBInitializer.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+
+          Fixing compilation warnings.
+
+Sat Dec 23 02:01:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/POA/EndpointPolicy/Makefile.am:
+        * tests/POA/Persistent_ID/Makefile.am:
+        * tests/Portable_Interceptors/AMI/Makefile.am:
+        * tests/Portable_Interceptors/Benchmark/Makefile.am:
+        * tests/Portable_Interceptors/Bug_1559/Makefile.am:
+        * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am:
+        * tests/Portable_Interceptors/Dynamic/Makefile.am:
+        * tests/Portable_Interceptors/ForwardRequest/Makefile.am:
+        * tests/Portable_Interceptors/IORInterceptor/Makefile.am:
+        * tests/Portable_Interceptors/PICurrent/Makefile.am:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
+        * tests/RTCORBA/Banded_Connections/Makefile.am:
+        * tests/RTCORBA/Client_Protocol/Makefile.am:
+        * tests/RTCORBA/Diffserv/Makefile.am:
+        * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am:
+        * tests/RTCORBA/Explicit_Binding/Makefile.am:
+        * tests/RTCORBA/Linear_Priority/Makefile.am:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am:
+        * tests/RTCORBA/Persistent_IOR/Makefile.am:
+        * tests/RTCORBA/Policy_Combinations/Makefile.am:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am:
+        * tests/RTCORBA/Private_Connection/Makefile.am:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am:
+        * tests/RTCORBA/Server_Declared/Makefile.am:
+        * tests/RTCORBA/Server_Protocol/Makefile.am:
+        * tests/RTCORBA/Thread_Pool/Makefile.am:
+        * tests/RTScheduling/Scheduling_Interceptor/Makefile.am:
+
+          Regenerated.
+
+        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
+        * tests/POA/Persistent_ID/Persistent_ID.mpc:
+        * tests/Portable_Interceptors/AMI/PI_AMI.mpc:
+        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc:
+        * tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc:
+        * tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc:
+        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc:
+        * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc:
+        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc:
+        * tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc:
+        * tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc:
+        * tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc:
+        * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc:
+        * tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc:
+        * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc:
+        * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc:
+        * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc:
+        * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc:
+        * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc:
+        * tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc:
+        * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc:
+        * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc:
+        * tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Sat Dec 23 00:23:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/BiDirectional/Makefile.am:
+        * tests/BiDirectional_DelayedUpcall/Makefile.am:
+        * tests/BiDirectional_NestedUpcall/Makefile.am:
+        * tests/Bug_2417_Regression/Makefile.am:
+        * tests/Bug_2560_Regression/Makefile.am:
+        * tests/MT_BiDir/Makefile.am:
+        * tests/NestedUpcall/Triangle_Test/Makefile.am:
+
+          Regenerate to account for misc recent *.mpc changes.
+
+        * tests/TransportCurrent/IIOP/Makefile.am:
+        * tests/TransportCurrent/Framework/Makefile.am:
+
+          Regenerated.
+
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+        * tests/TransportCurrent/Framework/Framework.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Fri Dec 22 20:54:44 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * MPC/config/tc.mpb:
+        * MPC/config/tc_iiop.mpb:
+
+          Split the tc.mpb in two projects (adding the tc_iiop). Updated
+          the dependencies in a bid to fix what seems to be a build order
+          issue on some scoreboard builds.
+
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+
+          Updated to inherit from the new tc_iiop.
+
+Fri Dec 22 18:55:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+
+          Replaced obsolete ACE_reinterpret_cast macro.
+
+Thu Dec 21 21:29:47 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/simple.cpp:
+
+          Fixed FUZZ problems.
+
+Thu Dec 21 17:49:24 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+
+          Updated the include files' path to resolve a compilation problem
+          in an autoconf (FC4_autoconf) build.
+
+Thu Dec 21 16:03:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+
+          Added conditional compilation, based upon the presence of
+          TAO_HAS_IIOP.  The IIOP-specific current will compile and the
+          implementation shall throw CORBA::NO_IMPLEMENT at runtime.
+
+Thu Dec 21 15:32:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_Impl.h:
+        * tao/TransportCurrent/Current_Impl.cpp:
+        * tao/TransportCurrent/Current_Loader.h:
+        * tao/TransportCurrent/Current_ORBInitializer.h:
+        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
+        * tao/TransportCurrent/IIOP_Current_Impl.h:
+
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+
+          Removed a ';' after the closing curly brace of a namespace
+          declaration which caused hiccups with gcc 4.0.2.
+
+Thu Dec 21 14:46:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/TransportCurrent/TC.idl:
+        * tao/TransportCurrent/TC_IIOP.idl:
+
+          Change #include files to be relative to ${TAO_ROOT} like the
+          other *.idl / *.pidl files.
+
+Thu Dec 21 14:00:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated.
+
+Wed Dec 20 21:14:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_Loader.h:
+
+          Fixing an error in builds that use versioned namespaces due to
+          incorrect placement of TAO_END_VERSIONED_NAMESPACE_DECL.
+
+Wed Dec 20 20:59:39 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          These are fixes correcting scoreboard issues pertaining to the
+          checkin from Tue Dec 19 22:09:34 UTC 2006.
+
+        * tao/TC.mpc:
+        * tao/TC_IIOP.mpc:
+
+          Updated the IDL compile options and include file path to reflect
+          the new position of these files (since Wed Dec 20 17:34:07)
+
+        * tao/TransportCurrent/Current_Loader.h:
+        * tao/TransportCurrent/Current_Loader.cpp:
+
+          Eliminated unnecessary code.
+
+        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
+
+          Removed unnecessary #include "ace/post.h"
+
+        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+
+          Added an explicit cast to silence Windows builds complaining
+          about implicit conversion between HANDLE and CORBA::Long.
+
+Wed Dec 20 17:34:07 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefiles for new subdirectories.
+
+        * orbsvcs/tests/Makefile.am:
+
+          Regenerate to descend into TransportCurrent subdirectory.
+
+        * tests/TransportCurrent/Makefile.am:
+        * tests/TransportCurrent/IIOP/Makefile.am:
+        * tests/TransportCurrent/Framework/Makefile.am:
+
+          New Makefile.am's for TransportCurrent unit tests.
+
+        * tao/Makefile.am:
+
+          Regenerated.
+
+        * tao/TC.mpc:
+        * tao/TC_IIOP.mpc:
+
+          ...to here, to match convention established by other core TAO
+          library projects.  This also makes the generated Makefile.am
+          for the autoconf build a little more sane.
+
+        * tao/TransportCurrent/TC.mpc:
+        * tao/TransportCurrent/TC_IIOP.mpc:
+
+          Move TransportCurrent *.mpc projects from here...
+
+Wed Dec 20 16:22:29 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          These are fixes correcting scoreboard issues pertaining to the
+          checkin from Tue Dec 19 22:09:34 UTC 2006.
+
+        * MPC/config/tc.mpb:
+
+          Moved from $ACE_ROOT/bin/MakeProjectCreator/config according to
+          the new project configuration layout.
+
+        * tao/TransportCurrent/Current_Loader.h:
+        * tao/TransportCurrent/Current_Loader.cpp:
+        * tao/TransportCurrent/IIOP_Current_Loader.h:
+        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
+
+        * tao/Transport_Selection_Guard.cpp:
+
+          Removed errand semicolons after definitions which were breaking
+          some of the scoreboard builds.
+
+        * tests/TransportCurrent/Framework/Current_Test.idl:
+
+          Fixed a FUZZ warning about mismatched @file.
+
+        * tests/TransportCurrent/Framework/Framework.mpc:
+
+          Added the current directory to the include path.
+
+        * tests/TransportCurrent/Framework/Tester.cpp:
+        * tests/TransportCurrent/Framework/client.cpp:
+        * tests/TransportCurrent/Framework/server.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
+        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+        * tests/TransportCurrent/IIOP/client_static.conf:
+
+          Fixing a service initialization problem encountered in static
+          builds that prevented the tests from runnig. Also fixed include
+          file locations.
+
+Wed Dec 20 15:28:24 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * MPC/config/tc.mpb:
+
+        * tao/Transport_Selection_Guard.cpp:
+
+        * tests/TransportCurrent/Framework/Current_Test.idl:
+
+        * tests/TransportCurrent/Framework/Framework.mpc:
+
+        * tests/TransportCurrent/Framework/server.cpp:
+
+        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+
+
+Wed Dec 20 09:36:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/BiDirectional/BiDirectional.mpc:
+        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
+        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
+        * tests/Bug_2417_Regression/Bug_2417_Regression.mpc:
+        * tests/Bug_2560_Regression/Bug_2560_Regression.mpc:
+        * tests/MT_BiDir/MT_BiDir.mpc:
+        * tests/NestedUpcall/Triangle_Test/TT.mpc:
+          Disabled some projects that can't compile when CORBA/e
+          micro has been enabled. Also removed some after usage because
+          there is now a separate idl project
+
+Wed Dec 20 09:31:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Callback_Quoter/Callback_Quoter.mpc:
+        * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc:
+        * orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
+        * orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
+        * performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc:
+          Disabled some projects that can't compile when CORBA/e
+          micro has been enabled
+
+Tue Dec 19 22:51:09 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * NEWS:
+
+          Updating the file with information about Transport::Current.
+
+Tue Dec 19 22:09:34 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          Introducing the Transport::Current - an optional feature with an
+          IDL interface, which enables users to obtain information about
+          the Transports used to send or receive a message.
+
+          The implementation uses a TSS based stack of pointers to
+          Transport class instances, which an ORB selects on the critical
+          path.  The structure is used to update message and endpoint
+          related statistical information for the correct Transport. An
+          IDL interface available through ORB::resolve_initial_references,
+          provides access to the accumulated data inside servant up-calls
+          and interceptor invocations.
+
+        * docs/transport_current:
+
+          A new directory for the Transport Current documentation to
+          inhabit.
+
+        * docs/transport_current/index.html:
+        * docs/transport_current/transport_current.css:
+
+          Added reference and user-guide documentation for the Transport
+          Current.
+
+        * tao/orbconf.h:
+
+          Enabled the Transport::Current feature by default, by defining
+          TAO_HAS_TRANSPORT_CURRENT.  In recognition that this is very
+          likely an overkill for everybody but the few interested in the
+          feature, the plan is to reverse this default before the next
+          beta release.
+
+        * tao/ORB_Core.h:
+        * tao/Profile_Transport_Resolver.h:
+        * tao/Profile_Transport_Resolver.inl:
+        * tao/Profile_Transport_Resolver.cpp:
+
+          Replaced the "naked" Transport pointer with a smart-pointer-like
+          TAO::Transport_Selection_Guard, which has ctor and dtor that
+          help keep a TSS-based stack of Transport instances when
+          TAO_HAS_TRANSPORT_CURRENT is defined as 1. If the latter is
+          disabled, the TSS access overhead goes away.
+
+        * tao/TAO_Server_Request.h:
+        * tao/TAO_Server_Request.inl:
+        * tao/TAO_Server_Request.cpp:
+
+          Similar to the client-side code in Profile_Transport_Resolver,
+          this is where the server-side pieces of Transport Current
+          functionality plugs in. A Server_Request encapsulates knowledge
+          about the specific Transport on which an invocation
+          arrived. Adding a Transport_Selection_Guard instance member
+          (transport_selection_guard_) to keep track of the current
+          Transport, using TSS. This overhead is only present when
+          TAO_HAS_TRANSPORT_CURRENT is defined as 1.
+
+        * tao/TSS_Resources.h:
+        * tao/TSS_Resources.cpp:
+
+          Adding a Transport_Selection_Guard member pointer tsg_, which
+          when Transport Current feature is enabled, always points to the
+          most-recently selected (incoming or outgoing) Transport in the
+          current thread. This overhead is only present when
+          TAO_HAS_TRANSPORT_CURRENT is defined as 1.
+
+        * tao/Transport.h:
+        * tao/Transport.inl:
+        * tao/Transport.cpp (send_message_shared_i):
+
+          Introduced a new class TAO::Transport::Stats and added a member
+          pointer of that base type to the declaration of Transport. It
+          can only be non-null when Transport Current is enabled, whereby
+          it points to a TAO::Transport::Stats.  The send_message_shared_i
+          has been modified to update the statistics.  Also added the
+          requisite mutators and successor's.
+
+        * tao/Transport_Selection_Guard.h:
+        * tao/Transport_Selection_Guard.cpp:
+
+          The implementation of the TSS-pointed, stack-like chain of
+          Transport instances selected (potentially, in multiple nested up
+          calls). The TSS overhead is only present when
+          TAO_HAS_TRANSPORT_CURRENT is defined as 1, otherwise the methods
+          are trivial.
+
+        * tao/tao.mpc:
+
+          Updated to include the new source files.
+
+        * tao/TransportCurrent:
+
+          A new directory for the Transport Current implementation to
+          inhabit.  Currently, there are two implementations: a generic
+          one and an IIOP-specific one. The reason these two share this
+          location is that the generic Current is too generic to be useful
+          on its own, while providing almost all the required
+          infrastructure for the IIOP-specific one.
+
+        * tao/TransportCurrent/Current_Impl.h:
+        * tao/TransportCurrent/Current_Impl.cpp:
+
+          The generic Current implementation.
+
+        * tao/TransportCurrent/Current_Loader.h:
+        * tao/TransportCurrent/Current_Loader.cpp:
+
+          A loader, to handle registration with the Service repository.
+
+        * tao/TransportCurrent/Current_ORBInitializer.h:
+        * tao/TransportCurrent/Current_ORBInitializer.cpp:
+        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
+        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
+
+          An ORB initializer, to handle the registration of the name for
+          which resolve_initial_references() will return you a Current
+          pointer.
+
+        * tao/TransportCurrent/IIOP_Current_Impl.h:
+        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+
+          The IIOP-specific Current implementation, complete with its own
+          derivative of TAO::Transport::Stats.
+
+        * tao/TransportCurrent/IIOP_Current_Loader.h:
+        * tao/TransportCurrent/IIOP_Current_Loader.cpp:
+
+          A loader, to handle registration with the Service repository.
+
+        * tao/TransportCurrent/IIOP_Transport_Current.h:
+
+          A client-side interface for the IIOP-specific Transport Current.
+
+        * tao/TransportCurrent/TC.idl:
+
+          A client-side interface for the generic Transport Current.
+
+        * tao/TransportCurrent/TC.mpc:
+
+          We need this to actually build the generic TC into a
+          self-contained service object library (DLL).
+
+        * tao/TransportCurrent/TC_IIOP.idl:
+
+          A client-side interface for the IIOP-specific Transport Current.
+
+        * tao/TransportCurrent/TC_IIOP.mpc:
+
+          We need this to actually build the IIOP-specific TC into a
+          self-contained service object library (DLL).
+
+        * tao/TransportCurrent/Transport_Current.h:
+
+          Basic declarations.
+
+        * tao/TransportCurrent/Transport_Current_Export.h:
+
+          Library export helpers.
+
+        * tests/TransportCurrent:
+
+          A new directory for the Transport Current tests to inhabit.
+
+        * tests/TransportCurrent/Framework:
+
+          A new directory for the test exercising the generic Transport Current.
+
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/Framework/Current_Test.idl:
+        * tests/TransportCurrent/Framework/Current_Test_Impl.h:
+        * tests/TransportCurrent/Framework/Current_Test_Impl.cpp:
+        * tests/TransportCurrent/Framework/Framework.mpc:
+        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
+        * tests/TransportCurrent/Framework/README:
+        * tests/TransportCurrent/Framework/Server_Main.cpp:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.cpp:
+        * tests/TransportCurrent/Framework/Tester.cpp:
+        * tests/TransportCurrent/Framework/client-static.conf:
+        * tests/TransportCurrent/Framework/client.conf:
+        * tests/TransportCurrent/Framework/client.cpp:
+        * tests/TransportCurrent/Framework/run_test.pl:
+        * tests/TransportCurrent/Framework/server-static.conf:
+        * tests/TransportCurrent/Framework/server.conf:
+        * tests/TransportCurrent/Framework/server.cpp:
+        * tests/TransportCurrent/Framework/simple.cpp:
+
+        * tests/TransportCurrent/IIOP:
+
+          A new directory for the test exercising the IIOP-specific Transport Current.
+
+        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+        * tests/TransportCurrent/IIOP/IIOP.mpc:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Tester.cpp:
+        * tests/TransportCurrent/IIOP/README:
+        * tests/TransportCurrent/IIOP/client_dynamic.conf:
+        * tests/TransportCurrent/IIOP/client_static.conf:
+        * tests/TransportCurrent/IIOP/run_test.pl:
+        * tests/TransportCurrent/IIOP/server_dynamic.conf:
+        * tests/TransportCurrent/IIOP/server_static.conf:
+
+Tue Dec 19 18:44:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * */Makefile.am:
+
+          Baseline regeneration to match recent MPC changes.
+
+Tue Dec 19 15:29:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2345_Regression/Bug_2345_Regression.mpc:
+        * tests/Collocation_Opportunities/Collocation_Opportunities.mpc:
+        * tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc:
+        * tests/GIOP_Fragments/PMB_With_Fragments/PMB_With_Fragments.mpc:
+        * tests/InterOp-Naming/InterOp-Naming.mpc:
+        * tests/MT_BiDir/MT_BiDir.mpc:
+        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
+        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
+        * tests/NestedUpcall/Triangle_Test/TT.mpc:
+        * tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc:
+        * tests/POA/Identity/Identity.mpc:
+        * tests/POA/Object_Reactivation/Object_Reactivation.mpc:
+        * tests/POA/Persistent_ID/Persistent_ID.mpc:
+          Disabled some projects that can't compile when CORBA/e
+          micro has been enabled
+
+Tue Dec 19 12:32:41 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+
+          gcc gets confused when a static function is forward declared.  It
+          complains that the function is declared but never defined.  The
+          sed portion of the yacc regeneration rule just removes the forward
+          declaration (which was unnecessary anyway).
+
+Tue Dec 19 11:35:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/BiDirectional/BiDirectional.mpc:
+        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
+        * tests/BiDirectional_MultipleORB/destroy.mpc:
+        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
+          Disabled some projects that can't compile when CORBA/e
+          micro has been enabled
+
+Tue Dec 19 11:32:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc:
+        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
+        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
+        * performance-tests/Pluggable/Pluggable.mpc:
+        * performance-tests/POA/Create_Reference/Create_Reference.mpc:
+        * performance-tests/POA/Demux/Demux.mpc:
+        * performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc:
+          Disabled some projects that can't compile when CORBA/e
+          micro has been enabled
+
+Tue Dec 19 11:27:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/ImR/Advanced/Advanced.mpc:
+        * orbsvcs/examples/ImR/Combined_Service/ImR_Combined_Service.mpc:
+        * orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc:
+        * orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.mpc:
+        * orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
+        * orbsvcs/tests/ImplRepo/ImplRepo.mpc:
+        * orbsvcs/tests/ImplRepo/scale/scaletest.mpc:
+        * orbsvcs/tests/Property/Property.mpc:
+        * orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
+        * orbsvcs/Time_Service/Time_Service.mpc:
+          Disabled some projects that can't compile when CORBA/e
+          micro has been enabled
+
+Tue Dec 19 11:19:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
+        * examples/Event_Comm/Event_Comm.mpc:
+        * examples/Logging/Logging.mpc:
+        * examples/Persistent_Grid/Persistent_Grid.mpc:
+        * examples/PluggableUDP/tests/Basic/Basic.mpc:
+        * examples/PluggableUDP/tests/Performance/Performance.mpc:
+        * examples/Quoter/Quoter.mpc:
+        * examples/Simple/bank/bank.mpc:
+        * examples/Simple/echo/echo.mpc:
+        * examples/Simple/grid/grid.mpc:
+        * examples/Simple/time/time.mpc:
+          Disabled some projects that can't compile when CORBA/e
+          micro has been enabled
+
+Mon Dec 18 19:34:42 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+
+          Added missing typecodes for supporting CORBA::ULongLong and
+          CORBA::LongLong.
+
+Mon Dec 18 12:50:00 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Utils/ORB_Manager.{cpp,h}:
+          Removed one init_child_poa method, using a default argument
+          we don't need two seperate ones. Fixed compile errors with
+          CORBA/e micro
+
+Mon Dec 18 10:30:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tests/Portable_Interceptors/PICurrent/client.cpp:
+        * tests/Portable_Interceptors/PICurrent/server.cpp:
+        * tests/Portable_Interceptors/PICurrent/run_test.pl:
+
+          Bugfix Bugzilla 2510 & 2547 - multi-threading issues for PICurrent.
+          Multi-Threaded servers take longer to shutdown. Increase the
+          length of kill time to wait for the server shutdown. Also
+          provide sleep(1) before orb->destroy() to allow comms to
+          proceed at shutdown (precausion only).
+
+Fri Dec 15 18:17:36 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          Updating the test to make it behave appropriately for
+          multi-threaded and for single-threaded (thread unsafe?)
+          configurations.
+
+        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
+        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
+        * tests/ORB_Local_Config/ORB_Local_Config.mwc:
+
+Fri Dec 15 17:26:59 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+
+          Fixed previous change to this file in
+
+          Wed Dec 13 18:16:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          that was excluding the *A.cpp file from the build.
+
+Fri Dec 15 16:32:35 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/ORT/Makefile.am:
+        * tests/Objref_Sequence_Test/Makefile.am:
+        * tests/Ondemand_Write/Makefile.am:
+        * tests/Oneway_Buffering/Makefile.am:
+        * tests/Oneways_Invoking_Twoways/Makefile.am:
+
+          Regenerated.
+
+        * tests/ORT/ORT.mpc:
+        * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc:
+        * tests/Ondemand_Write/Ondemand_Write.mpc:
+        * tests/Oneway_Buffering/Oneway_Buffering.mpc:
+        * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Thu Dec 14 16:58:18 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/MProfile/Makefile.am:
+
+          Regenerated.
+
+        * tests/MProfile/MProfile.mpc:
+
+          Changed IDL project to inherit from iormanip.
+          Changed Client project to not include testS.cpp.
+
+Thu Dec 14 16:18:00 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
+
+          Fix typo in IDL project name that broke build dependencies.
+
+Thu Dec 14 16:10:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+
+          Regenerated.
+
+Thu Dec 14 13:52:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * tao/PI/PICurrent.cpp:
+        * tao/PI/PICurrent.h:
+        * tests/Portable_Interceptors/PICurrent/run_test.pl:
+
+          Bugfix Bugzilla 2510 & 2547 - multi-threading issues for PICurrent.
+          Bugzilla 2552 - PICurrent_Impl, needs to be checked for
+          multi-threaded lazy copying. (Still work to do.)
+
+Thu Dec 14 13:21:46 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+
+          Modified the rule to output the end version block at the end.
+
+        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+        * orbsvcs/orbsvcs/Trader/constraint.y:
+
+          Removed the end version block in the .y file and regenerated.
+
+Thu Dec 14 08:47:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+        * orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h:
+
+          Align subtle differences (like using an explicit this-> (or not)
+          for invoking methods and accessing member variables.  This makes
+          diffs between between the wrapper classes highlight the real and
+          substantial differences.  This too should make future maintenance
+          easier.
+
+          Removed #if 0'd out code that deactivated factory objects in the
+          shutdown() method.  This was originally #if'd out because the
+          factory objects aren't activated on the root POA (the factory
+          creates a POA with PERSISTENT lifespan policy for the factory
+          object activation, a POA that is not accessible from outside the
+          factory object).  While we could refactor things to gain access
+          to the factory POA, it really doesn't buy us much as the next
+          thing is done is the ORB is shutdown(), which will delete the
+          POAs, which will delete the objects, etc.
+
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp:
+
+          Overhaul the RTEvent_Logging_Service class to follow the idiom
+          used by the other three Logging Service implementations.  It had
+          lots of dead (commented out and/or #if 0'd) code for setting up
+          a scheduler; yet was missing support for suppressing binding the
+          log factory to the naming service and spinning up a thread pool
+          for ORB threads.  Aligning this should make future maintenance
+          easier.
+
+          Split out main() into new file RTEvent_Logging_Server.cpp.
+
+Thu Dec 14 08:27:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/OBV/Any/Makefile.am:
+        * tests/OBV/Factory/Makefile.am:
+        * tests/OBV/Forward/Makefile.am:
+        * tests/OBV/TC_Alignment/Makefile.am:
+        * tests/OBV/Truncatable/Makefile.am:
+        * tests/OBV/ValueBox/Makefile.am:
+
+          Regenerated.
+
+        * tests/OBV/Any/OBV_Any.mpc:
+        * tests/OBV/Factory/OBV_Factory.mpc:
+        * tests/OBV/Forward/OBV_Forward.mpc:
+        * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
+        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
+        * tests/OBV/ValueBox/valuebox.mpc:
+
+          Changed IDL projects to inherit from valuetype, to
+          avoid suppressing typecodes and anys.
+
+Thu Dec 14 07:01:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/MProfile/Makefile.am:
+        * tests/MProfile_Connection_Timeout/Makefile.am:
+        * tests/No_Server_MT_Connect_Test/Makefile.am:
+        * tests/OBV/Any/Makefile.am:
+        * tests/OBV/Factory/Makefile.am:
+        * tests/OBV/Forward/Makefile.am:
+        * tests/OBV/TC_Alignment/Makefile.am:
+        * tests/OBV/Truncatable/Makefile.am:
+        * tests/OBV/ValueBox/Makefile.am:
+
+          Regenerated.
+
+        * tests/MProfile/MProfile.mpc:
+        * tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc:
+        * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc:
+        * tests/OBV/Any/OBV_Any.mpc:
+        * tests/OBV/Factory/OBV_Factory.mpc:
+        * tests/OBV/Forward/OBV_Forward.mpc:
+        * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
+        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
+        * tests/OBV/ValueBox/valuebox.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+        * tests/IDL_Test/Makefile.am:
+
+          Regenerated.
+
+Wed Dec 13 18:16:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/IDL_Test.mpc:
+
+          Added -GT to all IDL compiler command lines, since generation
+          of tie classes is no longer the default behavior, and we
+          want this test to cover it. Also added a block for
+          Template_Files, so the generated *S_T.cpp files will be
+          displayed in a separate folder in Visual Studio.
+
+Wed Dec 13 16:49:05 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
+        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
+        * TAO_IDL/be/be_visitor_operation/tie_sh.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+
+          Changed code generation for operation parameters in
+          tie class declarations to omit the parameter name. If
+          this name happened to be "T", some HP compilers would
+          have trouble disambiguating it from the tie class
+          template parameter typename. In the tie class operation
+          body, where the parameter name must be used, there is
+          already a code generation mechanism in place to avoid
+          the name clash. Thanks to Simon Massey <Simon.Massey@prismtech.com>
+          for reporting the problem.
+
+Wed Dec 13 14:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_1630_Regression/test.mpc:
+          Don't build with CORBA/e
+
+Wed Dec 13 13:05:21 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
+
+          Added ACE_NOTREACHED around two returns that could not possibly be
+          reached.
+
+Wed Dec 13 12:43:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+
+          Added search and replacement to both Constraint_l and Contraint_y
+          rules to avoid build warnings about conversion from long to int.
+
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/Trader/Interpreter.cpp:
+
+          Added a static_cast to avoid build warnings about conversion from
+          long to int.
+
+Wed Dec 13 07:19:26 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Server_Connection_Purging/Makefile.am:
+        * tests/Server_Leaks/Makefile.am:
+        * tests/Single_Read/Makefile.am:
+        * tests/Smart_Proxies/Benchmark/Makefile.am:
+        * tests/Smart_Proxies/Makefile.am:
+        * tests/Smart_Proxies/On_Demand/Makefile.am:
+        * tests/Smart_Proxies/Policy/Makefile.am:
+        * tests/Smart_Proxies/dtor/Makefile.am:
+        * tests/Stack_Recursion/Makefile.am:
+
+          Regenerated.
+
+        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
+        * tests/Server_Leaks/Server_Leaks.mpc:
+        * tests/Single_Read/Single_Read.mpc:
+        * tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc:
+        * tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc:
+        * tests/Smart_Proxies/Policy/SP_Policy.mpc:
+        * tests/Smart_Proxies/Smart_Proxies.mpc:
+        * tests/Smart_Proxies/dtor/dtor.mpc:
+        * tests/Stack_Recursion/Stack_Recursion.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Wed Dec 13 06:53:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
+        * docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc:
+          Don't build with CORBA/e micro
+
+Wed Dec 13 06:53:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IFR_Client_Adapter.h:
+          Fixed compile problem with CORBA/e
+
+Tue Dec 12 21:56:03 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TAO_Internal.cpp (instance):
+
+          This change eliminates unnecessary caching of the
+          TAO_Ubergestalt_Ready_Condition, which used to cause problems
+          with accessing stale memory. My thanks goes to Johnny Willemsen
+          and Chad Elliott.
+
+Tue Dec 12 17:34:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Explicit_Event_Loop/Makefile.am:
+        * tests/Exposed_Policies/Makefile.am:
+        * tests/Faults/Makefile.am:
+        * tests/File_IO/Makefile.am:
+        * tests/Forwarding/Makefile.am:
+        * tests/Hello/Makefile.am:
+        * tests/IPV6/Makefile.am:
+        * tests/InterOp-Naming/Makefile.am:
+        * tests/Leader_Followers/Makefile.am:
+        * tests/LongUpcalls/Makefile.am:
+        * tests/MProfile_Forwarding/Makefile.am:
+        * tests/MT_BiDir/Makefile.am:
+        * tests/MT_Client/Makefile.am:
+        * tests/MT_Server/Makefile.am:
+        * tests/MT_Timeout/Makefile.am:
+        * tests/Multiple/Makefile.am:
+        * tests/Multiple_Inheritance/Makefile.am:
+        * tests/Muxed_GIOP_Versions/Makefile.am:
+        * tests/Muxing/Makefile.am:
+        * tests/Native_Exceptions/Makefile.am:
+        * tests/NestedUpcall/MT_Client_Test/Makefile.am:
+        * tests/NestedUpcall/Simple/Makefile.am:
+        * tests/NestedUpcall/Triangle_Test/Makefile.am:
+        * tests/Nested_Event_Loop/Makefile.am:
+
+          Regenerated.
+
+        * tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc:
+        * tests/Exposed_Policies/Exposed_Policies.mpc:
+        * tests/Faults/Faults.mpc:
+        * tests/File_IO/File_IO.mpc:
+        * tests/Forwarding/Forwarding.mpc:
+        * tests/Hello/Hello.mpc:
+        * tests/IPV6/IPV6_Hello.mpc:
+        * tests/InterOp-Naming/InterOp-Naming.mpc:
+        * tests/Leader_Followers/Leader_Followers.mpc:
+        * tests/LongUpcalls/LongUpcalls.mpc:
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
+        * tests/MT_BiDir/MT_BiDir.mpc:
+        * tests/MT_Client/MT_Client.mpc:
+        * tests/MT_Server/MT_Server.mpc:
+        * tests/MT_Timeout/MT_Timeout.mpc:
+        * tests/Multiple/Multiple.mpc:
+        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
+        * tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc:
+        * tests/Muxing/Muxing.mpc:
+        * tests/Native_Exceptions/Native_Exceptions.mpc:
+        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
+        * tests/NestedUpcall/Simple/Simple.mpc:
+        * tests/NestedUpcall/Triangle_Test/TT.mpc:
+        * tests/Nested_Event_Loop/Nested_Event_Loop.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Tue Dec 12 17:28:14 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefiles for new subdirectories.
+
+        * orbsvcs/tests/Makefile.am:
+
+          Regenerate to descend into unit test subdirectory.
+
+        * orbsvcs/tests/unit/Trading/Interpreter/Makefile.am:
+        * orbsvcs/tests/unit/Trading/Makefile.am:
+        * orbsvcs/tests/unit/Makefile.am:
+
+          New Makefile.am's for trading service unit tests.
+
+Tue Dec 12 17:24:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+
+          Don't include concurrency_export.h and concurrency_skel_export.h
+          in server library's MPC project.
+
+Tue Dec 12 16:13:34 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+
+          Use .in() to squelch conversion warning.
+
+Tue Dec 12 15:05:04 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * NEWS:
+
+          Provided an overview of the following changes.
+
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+
+          Added a verbatim section to automate the regeneration of the lex
+          file for the Trader Server library.  Which includes running the
+          lex output through sed and then patching at the end.
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
+
+          Switched from using CORBA::Long/CORBA::ULong to
+          CORBA::LongLong/CORBA::ULongLong to support 64-bit integers.  The
+          union contains various integral types and to support both Long and
+          LongLong would be redundant.
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+
+          Added support dynamic sequences of CORBA::LongLong/
+          CORBA::ULongLong.
+
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff:
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * orbsvcs/orbsvcs/Trader/constraint.l:
+
+          Updated the {float} regular expression to allow negative values
+          for floating point numbers.
+
+          Added support for CORBA::LongLong and CORBA::ULongLong.  Since all
+          integers are stored as 64-bit values instead of 32-bit values two
+          conversion functions (trader_stroll and trader_stroull) are used
+          to convert text into CORBA::LongLong and CORBA::ULongLong.  They
+          are good candidates for moving into ACE as emulation for platforms
+          that do not natively support strtoll and stroull.
+
+          Also, fixed an issue where negative integers were being stored and
+          compared as unsigned integers.
+
+        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
+        * orbsvcs/orbsvcs/Trader/Interpreter.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_Tokens.h:
+        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+        * orbsvcs/orbsvcs/Trader/constraint.y:
+
+          Switched the order of the TAO_SIGNED and TAO_UNSIGNED tokens which
+          are used by the TAO_Literal_Constraint to determine the widest
+          integral type.
+
+        * orbsvcs/tests/Trading/TT_Info.cpp:
+
+          Added a query to use a negative floating point number and a query
+          to use a number that would exceed the size of a CORBA::Long.
+
+        * orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp:
+        * orbsvcs/tests/unit/Trading/Interpreter/Interpreter.mpc:
+        * orbsvcs/tests/unit/Trading/Interpreter/run_test.pl:
+
+          This unit test exercises the lexer for literal constraints as well
+          as the comparison of various mixed literal constraints.
+
+Tue Dec 12 14:21:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.h:
+          Fixed link problems with CORBA/e
+
+Tue Dec 12 12:31:45 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/TAO_Server_Request.inl:
+        * tao/TAO_Server_Request.cpp:
+
+          Corrected a very bad merge on my part.  Thanks to Chris Reed <cr
+          at progress dot com> for reporting this and providing a patch.
+
+Tue Dec 12 10:08:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/taoidl3toidl2defaults.mpb:
+          Moved to CIAO
+
+Mon Dec 11 21:38:29 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/Bug_2683_Regression/client.cpp:
+        * tests/Bug_2683_Regression/run_test.pl:
+
+          This test requires a host name to plug into the corbaloc string.
+          For VxWorks testing, only the server side runs on the target,
+          the client runs on the test-driver host. For this reason,
+          "localhost" is unacceptable for use as a hostname.
+
+Sun Dec 10 20:43:26 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Bug_2503_Regression/Makefile.am:
+        * tests/Bug_2560_Regression/Makefile.am:
+        * tests/Bug_2593_Regression/Makefile.am:
+        * tests/Bug_2595_Regression/Makefile.am:
+        * tests/Bug_2683_Regression/Makefile.am:
+        * tests/Cache_Growth_Test/Makefile.am:
+        * tests/CallbackTest/Makefile.am:
+        * tests/Client_Leaks/Makefile.am:
+        * tests/CodeSets/simple/Makefile.am:
+        * tests/Connect_Strategy_Test/Makefile.am:
+        * tests/Connection_Purging/Makefile.am:
+        * tests/Crash_On_Write/Makefile.am:
+        * tests/Crashed_Callback/Makefile.am:
+        * tests/Strategies/Makefile.am:
+        * tests/Timed_Buffered_Oneways/Makefile.am:
+        * tests/Two_Objects/Makefile.am:
+        * tests/Typedef_String_Array/Makefile.am:
+        * tests/UNKNOWN_Exception/Makefile.am:
+
+          Regenerated.
+
+        * tests/Bug_2503_Regression/Bug_2503_Regression.mpc:
+        * tests/Bug_2560_Regression/Bug_2560_Regression.mpc:
+        * tests/Bug_2593_Regression/Bug_2593_Regression.mpc:
+        * tests/Bug_2595_Regression/Bug_2595_Regression.mpc:
+        * tests/Bug_2683_Regression/IORTable.mpc:
+        * tests/Cache_Growth_Test/Cache_Growth_Test.mpc:
+        * tests/CallbackTest/CallbackTest.mpc:
+        * tests/Client_Leaks/Client_Leaks.mpc:
+        * tests/CodeSets/simple/CodeSets_simple.mpc:
+        * tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc:
+        * tests/Connection_Purging/Connection_Purging.mpc:
+        * tests/Crash_On_Write/Crash_On_Write.mpc:
+        * tests/Crashed_Callback/Crashed_Callback.mpc:
+        * tests/Strategies/Strategies.mpc:
+        * tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc:
+        * tests/Two_Objects/Two_Objects.mpc:
+        * tests/Typedef_String_Array/typedef_string_array.mpc:
+        * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+        * tests/Bug_2186_Regression/Makefile.am:
+
+          Regenerated.
+
+        * tests/Bug_2186_Regression/Bug_2186_Regression.mpc:
+
+          Add empty IDL_Files sections to Client and Server projects.
+
+Sun Dec 10 01:36:17 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Bug_2234_Regression/Makefile.am:
+
+          Regenerated.
+
+        * tests/Bug_2234_Regression/Bug_2234_Regression.mpc
+
+          Changed to inherit from anytypecode.
+
+Sun Dec 10 00:33:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Bug_1670/Regression/Makefile.am:
+
+          Regenerated.
+
+        * tests/Bug_1670/Regression/Bug_1670_Regression.mpc:
+
+          Add generated source files to MPC Source_Files section.
+
+Sat Dec  9 23:18:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Bug_1495_Regression/Makefile.am:
+        * tests/Bug_1551_Regression/Makefile.am:
+        * tests/Bug_1568_Regression/Makefile.am:
+        * tests/Bug_1627_Regression/Makefile.am:
+        * tests/Bug_1670_Regression/Makefile.am:
+        * tests/Bug_1676_Regression/Makefile.am:
+        * tests/Bug_1869_Regression/Makefile.am:
+        * tests/Bug_2174_Regression/Makefile.am:
+        * tests/Bug_2183_Regression/Makefile.am:
+        * tests/Bug_2186_Regression/Makefile.am:
+        * tests/Bug_2188_Regression/Makefile.am:
+        * tests/Bug_2234_Regression/Makefile.am:
+        * tests/Bug_2289_Regression/Makefile.am:
+        * tests/Bug_2328_Regression/Makefile.am:
+        * tests/Bug_2349_Regression/Makefile.am:
+        * tests/Bug_2429_Regression/Makefile.am:
+        * tests/Bug_2494_Regression/Makefile.am:
+
+          Regenerated.
+
+        * tests/Bug_1495_Regression/Bug_1495.mpc:
+        * tests/Bug_1551_Regression/Bug_1551_Regression.mpc:
+        * tests/Bug_1568_Regression/Bug_1568_Regression.mpc:
+        * tests/Bug_1627_Regression/Bug_1627_Regression.mpc:
+        * tests/Bug_1670_Regression/Bug_1670_Regression.mpc:
+        * tests/Bug_1676_Regression/Bug_1676_Regression.mpc:
+        * tests/Bug_1869_Regression/Bug_1869_Regression.mpc:
+        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc:
+        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc:
+        * tests/Bug_2186_Regression/Bug_2186_Regression.mpc:
+        * tests/Bug_2188_Regression/broken.mpc:
+        * tests/Bug_2234_Regression/Bug_2234_Regression.mpc:
+        * tests/Bug_2289_Regression/Bug_2289_Regression.mpc:
+        * tests/Bug_2328_Regression/Bug_2328_Regression.mpc:
+        * tests/Bug_2349_Regression/Bug_2349_Regression.mpc:
+        * tests/Bug_2429_Regression/Bug_2429_Regression.mpc:
+        * tests/Bug_2494_Regression/Bug_2494_Regression.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Fri Dec  8 22:30:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/included.idl:
+        * tests/IDL_Test/valuetype.idl:
+
+          Added IDL to the test to cover the bug fixed in
+
+          Tue Dec  5 21:51:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Fri Dec  8 05:21:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Changed code to extract version number from tao/Version.h to be
+          more resilient to leading whitespace like was added by a bug in
+          the release script in the last beta.  Thanks to Ray Lischner
+          <rlischner at proteus-technologies dot com> for this patch.
+          Also thanks to Paul Riley <paul at riley dot net> for reporting
+          this problem.
+
+Fri Dec  8 04:45:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp:
+        * orbsvcs/orbsvcs/Log/Hash_Iterator_i.h:
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+        * orbsvcs/orbsvcs/Log/Iterator_i.cpp:
+        * orbsvcs/orbsvcs/Log/Iterator_i.h:
+
+          The Iterator's destroy() method was using _default_POA() to
+          obtain the POA to deactivate the object, but that didn't do
+          anything because it was activated on a the iterator POA.
+          Changed to pass the iterator POA so we can self-destruct
+          properly.
+
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+
+          Create the iterator POA with the POAManager obtained from the
+          log POA.  We were passing POAManager::_nil(), which created a
+          new POAManager.  This resulted in all operations on iterators to
+          fail, since the POAManager was never activated.
+
+Thu Dec  7 19:00:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * MPC/config/typecodefactory.mpb:
+
+          Added avoids_minimum_corba, avoids_corba_e_compact, and
+          avoids_corba_e_micro to the base project list. Thanks to
+          Johnny Willemsen <jwillemsen@remedy.nl> for his input
+          that helped reach the decision that this is the right
+          thing to do.
+
+        * orbsvcs/orbsvcs/IFRService.mpc:
+
+          - Removed base projects that are already pulled in by
+            others, including the 3 added to typecodefactory's
+            base project list, described above.
+
+          - Removed the 'IFRService' tag and tagcheck line, this
+            stuff was never used.
+
+          - Revised Source_Files and Template_Files blocks, and
+            added Header_Files block, so that template files will
+            get displayed in the right place and all header files
+            will get displayed, in Visual Studio projects.
+
+        * tests/Any/Recursive/RecursiveHello.mpc:
+        * examples/TypeCode_Creation/TypeCode_Creation.mpc:
+
+          Removed avoids_minimum_corba, avoids_corba_e_compact, and
+          avoids_corba_e_micro base projects, since they are now
+          pulled in by typecodefactory.
+
+Thu Dec  7 18:55:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.{h,cpp}:
+          Fixed minimum defines
+
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+          Exclude certain functionality for CORBA/e
+
+Thu Dec  7 14:18:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
+        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
+          Build the clients after the idl project, not after server
+          to resolve build order problems in the CORBA/e builds
+
+Thu Dec  7 10:49:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.{h,cpp}:
+          Disable more of the ORB when building for CORBA/e, thanks to
+          Jeff for pointing out that these methods weren't disabled
+
+Thu Dec  7 09:56:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/rtscheduling.mpb:
+        * tao/RTScheduler.mpc:
+          Don't build with CORBA/e micro
+
+Thu Dec  7 09:54:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/avoids_corba_e_compact.mpb:
+        * MPC/config/avoids_corba_e_micro.mpb:
+        * MPC/config/avoids_minimum_corba.mpb:
+          Simplified these files, thanks to Jeff to pointing out that
+          they contained to much
+
+        * MPC/config/concurrency_serv.mpb:
+          Don't build with CORBA/e micro
+
+        * orbsvcs/orbsvcs/CosConcurrency.mpc:
+          Don't build serv with CORBA/e micro
+
+Thu Dec  7 08:02:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ImplicitActivationStrategyImplicit.cpp:
+        * tao/PortableServer/ImplicitActivationStrategyImplicit.h:
+        * tao/PortableServer/RequestProcessingPolicy.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantManager.cpp:
+        * tao/PortableServer/ServantRetentionPolicy.cpp:
+        * tao/PortableServer/ThreadPolicy.cpp:
+        * tao/PortableServer/ThreadStrategySingle.cpp:
+        * tao/PortableServer/ThreadStrategySingle.h:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp:
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.h:
+          Disable more strategies with CORBA/e but also reordered some includes.
+          At the moment the strategy is fully disabled in a minimum build we
+          include orbconf.h outside the internal ifdef check and all includes
+          of classes are inside this ifdef. This way we don't pull in a static
+          initializers which seem to take 112 bytes of footprint per file
+          which is not needed.
+
+Thu Dec  7 07:38:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServer.cpp:
+          The wrong activation strategy was disabled when building for
+          CORBA/e
+
+Thu Dec  7 06:38:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ImR_Client/IMR_Client.cpp:
+        * tao/RTPortableServer/RT_POA.inl:
+          Some bool changes I missed in my previous commit
+
+Thu Dec  7 00:25:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Big_AMI/Makefile.am:
+
+          Regenerated.
+
+Wed Dec  6 22:27:21 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Big_AMI/Big_AMI.mpc:
+
+          Changed IDL project to inherit from ami.
+
+Wed Dec  6 21:11:47 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
+          Fixing a windows build warning about unused variable.
+
+wed Dec  6 19:58:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/Policies/Policies.mpc:
+          Don't build when CORBA/e micro has been enabled
+
+Wed Dec  6 19:33:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+        * examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc:
+        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
+          Don't build the server when CORBA/e micro has been enabled
+
+Wed Dec  6 19:24:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Object_Map.cpp:
+        * tao/PortableServer/Active_Object_Map.h:
+        * tao/PortableServer/Active_Object_Map.inl:
+        * tao/PortableServer/Active_Object_Map_Entry.cpp:
+        * tao/PortableServer/IdUniquenessStrategy.h:
+        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
+        * tao/PortableServer/IdUniquenessStrategyMultiple.h:
+        * tao/PortableServer/IdUniquenessStrategyUnique.cpp:
+        * tao/PortableServer/IdUniquenessStrategyUnique.h:
+        * tao/PortableServer/RequestProcessingStrategy.h:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.h:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.h:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.h:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.h:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/PortableServer/Servant_Upcall.h:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.h:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.h:
+          Use bool instead of int for several flags, also then use true/false
+          instead of 0/1
+
+Wed Dec  6 16:15:58 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
+        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
+
+          Fixing fuzz (missing $id$) and compile errors on
+          TAO_HAS_MINIMUM_CORBA builds, which define the POAManager
+          interface without the deactivate() method.
+
+Wed Dec  6 16:10:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h:
+          Fixed doxygen warnings
+
+Wed Dec  6 15:55:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Abstract_Servant_Base.h:
+        * tao/AnyTypeCode/Fixed_TypeCode.h:
+        * tao/AnyTypeCode/TypeCode.h:
+        * tao/Codeset_Manager_Factory_Base.h:
+        * tao/Pluggable_Messaging.h:
+        * tao/Thread_Lane_Resources.h:
+          Fixed doxygen warnings
+
+Wed Dec  6 15:29:25 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Abstract_Interface/Makefile.am:
+        * tests/Any/Recursive/Makefile.am:
+        * tests/BiDirectional/Makefile.am:
+        * tests/BiDirectional_DelayedUpcall/Makefile.am:
+        * tests/BiDirectional_NestedUpcall/Makefile.am:
+        * tests/Big_AMI/Makefile.am:
+        * tests/Big_Oneways/Makefile.am:
+        * tests/Big_Reply/Makefile.am:
+        * tests/Big_Request_Muxing/Makefile.am:
+        * tests/Big_Twoways/Makefile.am:
+        * tests/Blocking_Sync_None/Makefile.am:
+        * tests/Bug_1020_Basic_Regression/Makefile.am:
+        * tests/Bug_1020_Regression/Makefile.am:
+        * tests/Bug_1254_Regression/Makefile.am:
+        * tests/Bug_1269_Regression/Makefile.am:
+        * tests/Bug_1270_Regression/Makefile.am:
+        * tests/Bug_1330_Regression/Makefile.am:
+        * tests/Bug_1361_Regression/Makefile.am:
+        * tests/Bug_1476_Regression/Makefile.am:
+        * tests/Bug_1482_Regression/Makefile.am:
+
+          Regenerated.
+
+        * tests/Abstract_Interface/Abstract_Interface.mpc:
+        * tests/Any/Recursive/RecursiveHello.mpc:
+        * tests/BiDirectional/BiDirectional.mpc:
+        * tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc:
+        * tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc:
+        * tests/Big_AMI/Big_AMI.mpc:
+        * tests/Big_Oneways/Big_Oneways.mpc:
+        * tests/Big_Reply/Big_Reply.mpc:
+        * tests/Big_Request_Muxing/Big_Request_Muxing.mpc:
+        * tests/Big_Twoways/Big_Twoways.mpc:
+        * tests/Blocking_Sync_None/Blocking_Sync_None.mpc:
+        * tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc:
+        * tests/Bug_1020_Regression/Bug_1020_Regression.mpc:
+        * tests/Bug_1254_Regression/Bug_1254_Regression.mpc:
+        * tests/Bug_1269_Regression/Bug_1269_Regression.mpc:
+        * tests/Bug_1270_Regression/Bug_1270_Regression.mpc:
+        * tests/Bug_1330_Regression/Bug_1330_Regression.mpc:
+        * tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
+        * tests/Bug_1476_Regression/Bug_1476_Regression.mpc:
+        * tests/Bug_1482_Regression/Bug_1482_Regression.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Wed Dec  6 14:36:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServer.cpp:
+          Reduced the number of process directives call for CORBA/e compact
+          and micro
+
+Wed Dec  6 14:28:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.{h,cpp}:
+          Added checks for CORBA/e compact and micro, no need to compile these
+          when these profiles are enabled.
+
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+          Const improvement
+
+Wed Dec  6 14:15:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/rtportableserver.mpb:
+        * tao/RTPortableServer.mpc:
+          Don't build RTPortableServer when CORBA/e micro has been enabled
+
+Wed Dec  6 13:40:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+        * examples/Simple/time-date/Makefile.am:
+        * orbsvcs/examples/ORT/Makefile.am:
+        * orbsvcs/tests/Bug_2709_Regression/Makefile.am:
+        * tests/Bug_2654_Regression/Makefile.am:
+        * tests/OctetSeq/Makefile.am:
+        * tests/Oneway_Timeouts/Makefile.am:
+        * tests/Param_Test/Makefile.am:
+        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
+
+          Regenerate.
+
+        * configure.ac:
+        * orbsvcs/tests/Makefile.am:
+        * tests/Makefile.am:
+
+          Changes for move of Bug_2709_Regression unit test.
+
+Wed Dec  6 08:30:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * *.mpc:
+          Added to all mpc files that have avoids_corba_e_compact also
+          avoids_corba_e_micro because they also can't be build with
+          CORBA/e micro
+
+Tue Dec  5 21:51:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_argument/arglist.cpp (visit_sequence):
+
+          Added code to create the sequence node's name, if a check
+          determines that the node is from an included IDL file, and
+          is an anonymous sequence (not created with a typedef declaration).
+          This is the case in this particular visitor if a valuetype
+          inherits an anonymous sequence member from a valuetype
+          declared in another IDL file, and this visitor is generating
+          the argument list for the OBV_* constructor with member
+          values. The node's name has not yet been set, since it
+          cannot be done in the node constructor - if the sequence
+          is declared with a typedef, the typedef node is created
+          after the sequence node, and it also sets the sequence
+          node's 'anonymous' flag to false (set to true by default
+          in the sequence node constructor). Thanks to Ossama
+          Othman <ossama.othman@symantec.com> for reporting the
+          bug.
+
+Tue Dec  5 18:36:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DSI_Gateway/DSI_Gateway.mpc:
+          Don't build with corba_e_compact
+
+        * orbsvcs/orbsvcs/Log/LogActivator.{h,cpp}:
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.{h,cpp}:
+          Changes to resolve compile errors with CORBA/e compact
+
+Tue Dec  5 15:29:59 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
+
+        * tests/Bug_2709_Regression/*:
+        * orbsvcs/tests/Bug_2709_Regression/*:
+          Regression test for bug#2709 was moved.
+
+Tue Dec  5 15:02:37 UTC 2006 Vadym Ridosh <vridosh@prismtech.com>
+        * tests/Bug_2709_Regression/Bug_2709_Regression.mpc:
+          Added dependency to avoid problem with build on some OSes.
+
+Tue Dec  5 11:35:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Added a check that -SSi is not a valid commandline argument, so
+          then we give an error, it is -SS, no third character at all.
+          This fixes bugzilla bug 2723.
+
+Tue Dec  5 11:31:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/valuetype.mpb:
+        * Valuetype.mpc:
+          Valuetype is not available with corba/e micro
+
+        * Valuetype/ValueBase.cpp:
+          Use ACE_ERROR for an error message
+
+Tue Dec  5 11:25:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
+        * orbsvcs/examples/ORT/ORT.mpc:
+          Don't build with corba/e compact
+
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
+          Don't build the server with corba/e compact
+
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+          Don't build with corba/e compact
+
+        * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
+          Part can't be build with corba/e compact
+
+Tue Dec  5 11:19:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
+          Don't build the manager with corba/e compact
+
+Tue Dec  5 11:17:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+          Don't build server with corba/e compact
+
+Tue Dec  5 08:28:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OctetSeq/OctetSeq.mpc:
+          Changed build order to resolve build order problems in the ace_for_tao
+          builds
+
+Tue Dec  5 04:21:50 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefile for new unit test subdirectory.
+
+        * tests/ORB_Local_Config/Makefile.am:
+
+          Regenerate to descend into CSD_Strategy subdirectory.
+
+        * tests/ORB_Local_Config/Bug_2612/Makefile.am:
+
+          New file.
+
+Tue Dec  5 04:10:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/AMH_Exceptions/Makefile.am:
+        * tests/AMH_Oneway/Makefile.am:
+        * tests/AMI/Makefile.am:
+        * tests/AMI_Buffering/Makefile.am:
+        * tests/AMI_Timeouts/Makefile.am:
+
+          Regenerated.
+
+        * tests/AMH_Exceptions/AMH_Exceptions.mpc:
+        * tests/AMH_Oneway/AMH_Oneway.mpc:
+        * tests/AMI/AMI.mpc:
+        * tests/AMI_Buffering/AMI_Buffering.mpc:
+        * tests/AMI_Timeouts/AMI_Timeouts.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Mon Dec  4 18:01:55 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Bug_2612:
+        * tests/ORB_Local_Config/Bug_2612/Bug_2612.mpc:
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.h:
+        * tests/ORB_Local_Config/Bug_2612/DllOrb.cpp:
+        * tests/ORB_Local_Config/Bug_2612/DllOrb_Export.h:
+        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
+        * tests/ORB_Local_Config/Bug_2612/run_test.pl:
+
+          Added new regression test for bug#2612. It should also cover the
+          issue described in bug#2677.
+
+        * tests/ORB_Local_Config/run_tests_all.pl:
+
+          Added the new test to the list of tests for manual execution.
+
+Mon Dec  4 17:30:30 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/Invocation_Adapter.cpp (invoke_i):
+        * tao/LocateRequest_Invocation_Adapter.cpp (invoke):
+
+          Added a service config guard to ensure the invocation is
+          processed, using the correct configuration repository.  The
+          change ensures that the ORB's repository is going to be
+          "current" for the duration of the invocation, which is needed if
+          timeouts and other policies are applied as expected.  Thanks to
+          Eider Oliveira <eider dot oliveira at gmail dot com> for
+          submitting the defect (bug# 2734)
+
+Mon Dec  4 16:17:07 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/util/utl_err.cpp (syntax_error):
+
+          Replaced increment of error count with immediate bailout
+          on any kind of syntax error. Keeping the state of the IDL
+          compiler consistent in the face of any syntax error would
+          require extensive hacking of bison-generated code, and we
+          still wouldn't get any code generation if there are any
+          errors going into the backend. This fix closes [BUGID:2688].
+
+Mon Dec  4 15:42:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/*:
+          The MPC base projects for TAO
+
+Mon Dec  4 13:23:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp:
+        * examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp:
+          Added static casts to get rid of warnings with vc
+
+Mon Dec  4 12:36:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Oneway_Timeouts/*:
+          Added missing id tags
+
+        * Release:
+          Added MPC
+
+Mon Dec  4 12:24:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC
+        * MPC/config
+          New directory for the base projects specifically for TAO
+
+Mon Dec  4 12:17:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2709_Regression/Client_Task.cpp:
+          Fixed conversion warning in vxworks builds
+
+Mon Dec  4 11:21:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI_Server/PortableServer_ORBInitializer.cpp:
+        * tao/PI_Server/PortableServer_PolicyFactory.cpp:
+          Fixed compile errors with CORBA/e compact
+
+        * tao/Bounded_Value_Sequence_T.h:
+          Improved doxygen documentation
+
+Mon Dec  4 08:03:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Param_Test/Param_Test.mpc:
+          Build all projects after idl to get always the correct build
+          order
+
+Mon Dec  4 07:59:57 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny/DynCommon.{h,cpp}:
+          Removed not needed const qualifiers on the return type, fixes
+          icc warnings
+
+        * tao/Unbounded_Basic_String_Sequence_T.h:
+          Improved doxygen documentation
+
+        * tao/Policy_Set.cpp:
+          Const changes
+
+Sun Dec  3 14:25:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/ORB_Local_Config/Bug_1459/Makefile.am:
+        * tests/ORB_Local_Config/Bunch/Makefile.am:
+        * tests/ORB_Local_Config/Separation/Makefile.am:
+        * tests/ORB_Local_Config/Shared/Makefile.am:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am:
+        * tests/ORB_Local_Config/Simple/Makefile.am:
+        * tests/ORB_Local_Config/Service_Dependency/Makefile.am:
+
+          Add automake specific section so that includes is set relative
+          to $(srcdir).
+
+Sun Dec  3 07:39:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/BasicTypeTraits.cpp:
+          Fixed compile problems with Borland C++
+
+Sat Dec  2 23:11:45 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/Makefile.am:
+
+          Skip RTScheduling subdirectory for now.
+
+        * tests/Makefile.am:
+
+          Skip Bug_2399_Regression and CSD_Strategy_Tests
+          subdirectories for now.
+
+Sat Dec  2 23:02:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+
+          Add tests subdirectory.
+
+        * tests/ICMG_Any_Bug/Makefile.am:
+        * tests/OBV/Simple/Makefile.am:
+
+          Regenerated.
+
+Fri Dec  1 20:18:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/fe_declarator.cpp (compose):
+
+          Removed a prefix match check that was overlooked in the
+          #pragma prefix changes in
+
+          Tue Nov 28 19:32:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          but was caught only on Solaris platforms, since on all
+          others, one of the compared strings always has an uninitialized
+          value of 0, which short-circuited the check.
+
+Fri Dec  1 15:39:03 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/OBV/Simple/OBV_Simple.mpc:
+
+          Removed -St from IDL compiler command line options, since
+          valuetypes now require typecode support.
+
+Fri Dec  1 15:19:34 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/ICMG_Any_Bug/Hello.mpc:
+
+          Removed -Sa and -St from the IDL compiler command line options
+          (pulled in from taoidldefaults.mpb), since the client code
+          uses DII.
+
+Fri Dec  1 14:59:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/Event/UDP/Makefile.am:
+        * tests/Param_Test/Makefile.am:
+
+          Regenerated.
+
+Fri Dec  1 13:49:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Param_Test/Param_Test.mpc:
+          Added explicit build order and removed -Sa and -St from the
+          idlflags
+
+Fri Dec  1 13:37:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/Security/Download.html:
+        * docs/tutorials/Quoter/index.html:
+          Updated download location of ACE/TAO/CIAO
+
+Fri Dec  1 13:35:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Updated download location of ACE/TAO/CIAO
+
+Fri Dec  1 12:27:43 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Event/UDP/RtEC_UDP.mpc:
+          Fixed invalid filenames in this test
+
+Thu Nov 30 18:01:43 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/BasicTypeTraits.cpp:
+        * tao/AnyTypeCode/BasicTypeTraits.h:
+
+          Added one-line convert() method to each specialization,
+          since returning the extraction type in
+          DynAnyBasicTypeUtils<>::get_value() is not correct for
+          chars, wchars, octets and booleans.
+
+        * tao/DynamicAny/DynAnyUtils_T.h:
+
+          Replaced an implicit temporary in
+          DynAnyBasicTypeUtils<>::get_value() with an explicit
+          constructor call, since the temporary was confused with a
+          cast by some compilers.
+
+        * tests/DynAny_Test/analyzer.cpp:
+
+          Replace a call to length() on an aliased array typecode
+          (which returned a BADKIND exception) to a call on the
+          unaliased typecode.
+
+Thu Nov 30 14:48:57 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
+        * tao/PortableServer/Var_Size_SArgument_T.cpp
+        * tao/Bounded_Sequence_CDR_T.h
+        * tao/Unbounded_Sequence_CDR_T.h
+
+          Fix for bugzilla 1676 (uninitialized "out" param for sequence<string>
+          can cause server to core). Old attempt to fix this was also removed.
+
+Thu Nov 30 14:17:22 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp (visit_union_pos):
+
+          Change to use the new DynAnyFactory method similar to the
+          change to Log_Constraint_Visitors.cpp in
+
+          Tue Nov 28 19:32:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Thu Nov 30 13:28:22 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/lex.yy.cpp.diff:
+
+          Recreated the diff file (and reprocessed idl.ll).  patch had
+          problems applying the diff that was in the repository (at least on
+          Linux).
+
+Thu Nov 30 13:06:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny/DynAny_i.cpp
+        * tao/DynamicAny/DynArray_i.cpp (init_common):
+        * tao/DynamicAny/DynEnum_i.cpp (init_common):
+        * tao/DynamicAny/DynSequence_i.cpp (init_common):
+        * tao/DynamicAny/DynStruct_i.cpp (init_common):
+        * tao/DynamicAny/DynUnion_i.cpp (init_common):
+          Use true/false for a bool
+
+Thu Nov 30 12:52:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny/DynCommon.cpp:
+          Fixed conversion warnings and const changes
+
+        * tao/DynamicAny/DynAnyUtils_T.h:
+          Made the code compiling with BCB6 and VC8 but with GCC there
+          are some more issues to be resolved
+
+Thu Nov 30 09:58:02 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
+
+        * tao/Stub.cpp
+        * tao/Stub.inl
+        * tao/Service_Callbacks.cpp
+        * tao/Service_Callbacks.h
+        * tao/ORB_Core.cpp
+        * tao/ORB_Core.inl
+        * tao/ORB_Core.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+        * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+
+          Fix for bugzilla 2709.
+
+Thu Nov 30 05:52:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Bug_2417_Regression/Makefile.am:
+        * tests/Bug_2654_Regression/Makefile.am:
+        * tests/Bug_2709_Regression/Makefile.am:
+        * tests/Hang_Shutdown/Makefile.am:
+        * tests/ICMG_Any_Bug/Makefile.am:
+        * tests/OctetSeq/Makefile.am:
+        * tests/Param_Test/Makefile.am:
+        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
+        * tests/RTCORBA/Client_Propagated/Makefile.am:
+        * tests/Timeout/Makefile.am:
+
+          Regenerated.
+
+        * tests/Bug_2417_Regression/Bug_2417_Regression.mpc:
+        * tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
+        * tests/Bug_2709_Regression/Bug_2709_Regression.mpc:
+        * tests/Hang_Shutdown/Hang.mpc:
+        * tests/ICMG_Any_Bug/Hello.mpc:
+        * tests/OctetSeq/OctetSeq.mpc:
+        * tests/Param_Test/Param_Test.mpc:
+        * tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc:
+        * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc:
+        * tests/Timeout/Timeout.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Thu Nov 30 05:48:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Added AM_CONDITIONAL for BUILD_JAVA, so we can handle
+          Makefile.am's with these options.  Default to false, until we
+          can write feature tests for this option.
+
+Thu Nov 30 05:44:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * examples/OBV/Typed_Events/Makefile.am:
+
+          Regenerated.
+
+Wed Nov 29 17:43:45 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * examples/OBV/Typed_Events/Typed_Events.mpc:
+
+          Removed the IDL flag -St, which suppressed typecode generation,
+          so the _tao_type() method (which returns a typecode) can be
+          generated for the valuetypes in the IDL - necessary since
+          this method is pure virtual in ValueBase. This is a temporary
+          fix, some discussions are necessary to decide on an approach
+          to integrating _tao_type() with subsetted libraries, IDL
+          compiler command line options, and MPC settings.
+
+Wed Nov 29 17:13:33 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/DynamicAny/DynAnyUtils_T.h:
+
+          Put back some of the 'typename' qualifiers removed in
+
+          Wed Nov 29 000:11:49 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          since the lack is definitely causing problems with FC4
+          on the scoreboard. I had removed them because I thought
+          they were the cause of problems reported by Phil
+          Mesnier <mesnier_p@ociweb.com>, but perhaps those errors
+          stemmed from something else.
+
+Wed Nov 29 16:31:26 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/BasicTypeTraits.cpp:
+        * tao/AnyTypeCode/BasicTypeTraits.h:
+
+          Added a guard around code for wchars similar to that in
+          tao/Unbounded_Sequence_CDR_T.h, as a workaround for LynxOS,
+          which has no native wchar type. Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for the tip.
+
+Wed Nov 29 13:45:23 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefiles for new unit test subdirectories.
+
+        * tests/AMH_Exceptions/Makefile.am:
+        * tests/AMH_Oneway/Makefile.am:
+        * tests/AMI/Makefile.am:
+        * tests/AMI_Buffering/Makefile.am:
+        * tests/AMI_Timeouts/Makefile.am:
+        * tests/Abstract_Interface/Makefile.am:
+        * tests/Any/Makefile.am:
+        * tests/Any/Recursive/Makefile.am:
+        * tests/BiDirectional/Makefile.am:
+        * tests/BiDirectional_DelayedUpcall/Makefile.am:
+        * tests/BiDirectional_MultipleORB/Makefile.am:
+        * tests/BiDirectional_NestedUpcall/Makefile.am:
+        * tests/Big_AMI/Makefile.am:
+        * tests/Big_Oneways/Makefile.am:
+        * tests/Big_Reply/Makefile.am:
+        * tests/Big_Request_Muxing/Makefile.am:
+        * tests/Big_Twoways/Makefile.am:
+        * tests/Blocking_Sync_None/Makefile.am:
+        * tests/Bug_1020_Basic_Regression/Makefile.am:
+        * tests/Bug_1020_Regression/Makefile.am:
+        * tests/Bug_1254_Regression/Makefile.am:
+        * tests/Bug_1269_Regression/Makefile.am:
+        * tests/Bug_1270_Regression/Makefile.am:
+        * tests/Bug_1330_Regression/Makefile.am:
+        * tests/Bug_1361_Regression/Makefile.am:
+        * tests/Bug_1476_Regression/Makefile.am:
+        * tests/Bug_1476_Test/Makefile.am:
+        * tests/Bug_1482_Regression/Makefile.am:
+        * tests/Bug_1495_Regression/Makefile.am:
+        * tests/Bug_1535_Regression/Makefile.am:
+        * tests/Bug_1551_Regression/Makefile.am:
+        * tests/Bug_1568_Regression/Makefile.am:
+        * tests/Bug_1627_Regression/Makefile.am:
+        * tests/Bug_1635_Regression/Makefile.am:
+        * tests/Bug_1636_Regression/Makefile.am:
+        * tests/Bug_1639_Regression/Makefile.am:
+        * tests/Bug_1670_Regression/Makefile.am:
+        * tests/Bug_1676_Regression/Makefile.am:
+        * tests/Bug_1693_Test/Makefile.am:
+        * tests/Bug_1812_Regression/Makefile.am:
+        * tests/Bug_1813_Regression/Makefile.am:
+        * tests/Bug_1869_Regression/Makefile.am:
+        * tests/Bug_1904_Regression/Makefile.am:
+        * tests/Bug_2084_Regression/Makefile.am:
+        * tests/Bug_2119_Regression/Makefile.am:
+        * tests/Bug_2122_Regression/Makefile.am:
+        * tests/Bug_2124_Regression/Makefile.am:
+        * tests/Bug_2126_Regression/Makefile.am:
+        * tests/Bug_2134_Regression/Makefile.am:
+        * tests/Bug_2144_Regression/Makefile.am:
+        * tests/Bug_2174_Regression/Makefile.am:
+        * tests/Bug_2183_Regression/Makefile.am:
+        * tests/Bug_2186_Regression/Makefile.am:
+        * tests/Bug_2188_Regression/Makefile.am:
+        * tests/Bug_2201_Regression/Makefile.am:
+        * tests/Bug_2222_Regression/Makefile.am:
+        * tests/Bug_2234_Regression/Makefile.am:
+        * tests/Bug_2289_Regression/Makefile.am:
+        * tests/Bug_2319_Regression/Makefile.am:
+        * tests/Bug_2328_Regression/Makefile.am:
+        * tests/Bug_2345_Regression/Makefile.am:
+        * tests/Bug_2349_Regression/Makefile.am:
+        * tests/Bug_2375_Regression/Makefile.am:
+        * tests/Bug_2399_Regression/Makefile.am:
+        * tests/Bug_2417_Regression/Makefile.am:
+        * tests/Bug_2419_Regression/Makefile.am:
+        * tests/Bug_2424_Regression/Makefile.am:
+        * tests/Bug_2429_Regression/Makefile.am:
+        * tests/Bug_2494_Regression/Makefile.am:
+        * tests/Bug_2503_Regression/Makefile.am:
+        * tests/Bug_2542_Regression/Makefile.am:
+        * tests/Bug_2543_Regression/Makefile.am:
+        * tests/Bug_2549_Regression/Makefile.am:
+        * tests/Bug_2560_Regression/Makefile.am:
+        * tests/Bug_2593_Regression/Makefile.am:
+        * tests/Bug_2595_Regression/Makefile.am:
+        * tests/Bug_2654_Regression/Makefile.am:
+        * tests/Bug_2669_Regression/Makefile.am:
+        * tests/Bug_2683_Regression/Makefile.am:
+        * tests/Bug_2709_Regression/Makefile.am:
+        * tests/CDR/Makefile.am:
+        * tests/COIOP/Makefile.am:
+        * tests/CSD_Strategy_Tests/Broken/Makefile.am:
+        * tests/CSD_Strategy_Tests/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Common/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am:
+        * tests/Cache_Growth_Test/Makefile.am:
+        * tests/CallbackTest/Makefile.am:
+        * tests/Client_Leaks/Makefile.am:
+        * tests/CodeSets/Makefile.am:
+        * tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am:
+        * tests/CodeSets/libs/Makefile.am:
+        * tests/CodeSets/libs/UCS4_UTF16/Makefile.am:
+        * tests/CodeSets/simple/Makefile.am:
+        * tests/Codec/Makefile.am:
+        * tests/Collocation/Makefile.am:
+        * tests/CollocationLockup/Makefile.am:
+        * tests/Collocation_Exception_Test/Makefile.am:
+        * tests/Collocation_Oneway_Tests/Makefile.am:
+        * tests/Collocation_Opportunities/Makefile.am:
+        * tests/Collocation_Tests/Makefile.am:
+        * tests/Connect_Strategy_Test/Makefile.am:
+        * tests/Connection_Failure/Makefile.am:
+        * tests/Connection_Purging/Makefile.am:
+        * tests/Connection_Timeout/Makefile.am:
+        * tests/Crash_On_Write/Makefile.am:
+        * tests/Crashed_Callback/Makefile.am:
+        * tests/DII_Collocation_Tests/Makefile.am:
+        * tests/DII_Collocation_Tests/oneway/Makefile.am:
+        * tests/DII_Collocation_Tests/twoway/Makefile.am:
+        * tests/DLL_ORB/Makefile.am:
+        * tests/DSI_Gateway/Makefile.am:
+        * tests/DynAny_Test/Makefile.am:
+        * tests/Explicit_Event_Loop/Makefile.am:
+        * tests/Exposed_Policies/Makefile.am:
+        * tests/FL_Cube/Makefile.am:
+        * tests/Faults/Makefile.am:
+        * tests/File_IO/Makefile.am:
+        * tests/Forwarding/Makefile.am:
+        * tests/GIOP_Fragments/Java_Big_Reply/Makefile.am:
+        * tests/GIOP_Fragments/Java_Big_Request/Makefile.am:
+        * tests/GIOP_Fragments/Makefile.am:
+        * tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am:
+        * tests/Hang_Shutdown/Makefile.am:
+        * tests/Hello/Makefile.am:
+        * tests/ICMG_Any_Bug/Makefile.am:
+        * tests/IDL_Test/Makefile.am:
+        * tests/IORManipulation/Makefile.am:
+        * tests/IOR_Endpoint_Hostnames/Makefile.am:
+        * tests/IPV6/Makefile.am:
+        * tests/InterOp-Naming/Makefile.am:
+        * tests/Leader_Followers/Makefile.am:
+        * tests/LongUpcalls/Makefile.am:
+        * tests/MProfile/Makefile.am:
+        * tests/MProfile_Connection_Timeout/Makefile.am:
+        * tests/MProfile_Forwarding/Makefile.am:
+        * tests/MT_BiDir/Makefile.am:
+        * tests/MT_Client/Makefile.am:
+        * tests/MT_Server/Makefile.am:
+        * tests/MT_Timeout/Makefile.am:
+        * tests/Makefile.am:
+        * tests/Multiple/Makefile.am:
+        * tests/Multiple_Inheritance/Makefile.am:
+        * tests/Muxed_GIOP_Versions/Makefile.am:
+        * tests/Muxing/Makefile.am:
+        * tests/Native_Exceptions/Makefile.am:
+        * tests/NestedUpcall/MT_Client_Test/Makefile.am:
+        * tests/NestedUpcall/Makefile.am:
+        * tests/NestedUpcall/Simple/Makefile.am:
+        * tests/NestedUpcall/Triangle_Test/Makefile.am:
+        * tests/Nested_Event_Loop/Makefile.am:
+        * tests/Nested_Upcall_Crash/Makefile.am:
+        * tests/No_Server_MT_Connect_Test/Makefile.am:
+        * tests/OBV/Any/Makefile.am:
+        * tests/OBV/Collocated/Forward/Makefile.am:
+        * tests/OBV/Collocated/Makefile.am:
+        * tests/OBV/Factory/Makefile.am:
+        * tests/OBV/Forward/Makefile.am:
+        * tests/OBV/Makefile.am:
+        * tests/OBV/Simple/Makefile.am:
+        * tests/OBV/TC_Alignment/Makefile.am:
+        * tests/OBV/Truncatable/Makefile.am:
+        * tests/OBV/ValueBox/Makefile.am:
+        * tests/ORB_Local_Config/Bug_1459/Makefile.am:
+        * tests/ORB_Local_Config/Bunch/Makefile.am:
+        * tests/ORB_Local_Config/Makefile.am:
+        * tests/ORB_Local_Config/Separation/Makefile.am:
+        * tests/ORB_Local_Config/Service_Dependency/Makefile.am:
+        * tests/ORB_Local_Config/Shared/Makefile.am:
+        * tests/ORB_Local_Config/Simple/Makefile.am:
+        * tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am:
+        * tests/ORB_destroy/Makefile.am:
+        * tests/ORB_init/Makefile.am:
+        * tests/ORB_init/Portspan/Makefile.am:
+        * tests/ORB_shutdown/Makefile.am:
+        * tests/ORT/Makefile.am:
+        * tests/Object_Loader/Makefile.am:
+        * tests/Objref_Sequence_Test/Makefile.am:
+        * tests/OctetSeq/Makefile.am:
+        * tests/Ondemand_Write/Makefile.am:
+        * tests/Oneway_Buffering/Makefile.am:
+        * tests/Oneway_Timeouts/Makefile.am:
+        * tests/Oneways_Invoking_Twoways/Makefile.am:
+        * tests/Optimized_Connection/Makefile.am:
+        * tests/POA/Bug_2511_Regression/Makefile.am:
+        * tests/POA/Current/Makefile.am:
+        * tests/POA/Deactivate_Object/Makefile.am:
+        * tests/POA/Default_Servant/Makefile.am:
+        * tests/POA/EndpointPolicy/Makefile.am:
+        * tests/POA/Etherealization/Makefile.am:
+        * tests/POA/Excessive_Object_Deactivations/Makefile.am:
+        * tests/POA/Identity/Makefile.am:
+        * tests/POA/MT_Servant_Locator/Makefile.am:
+        * tests/POA/Makefile.am:
+        * tests/POA/Nested_Non_Servant_Upcalls/Makefile.am:
+        * tests/POA/Non_Servant_Upcalls/Makefile.am:
+        * tests/POA/Object_Reactivation/Makefile.am:
+        * tests/POA/POAManagerFactory/Makefile.am:
+        * tests/POA/POA_Destruction/Makefile.am:
+        * tests/POA/Persistent_ID/Makefile.am:
+        * tests/POA/Policies/Makefile.am:
+        * tests/POA/Reference_Counting/Makefile.am:
+        * tests/POA/Single_Threaded_POA/Makefile.am:
+        * tests/POA/wait_for_completion/Makefile.am:
+        * tests/Parallel_Connect_Strategy/Makefile.am:
+        * tests/Param_Test/Makefile.am:
+        * tests/Permanent_Forward/Makefile.am:
+        * tests/Policies/Makefile.am:
+        * tests/Portable_Interceptors/AMI/Makefile.am:
+        * tests/Portable_Interceptors/AdvSlot/Makefile.am:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am:
+        * tests/Portable_Interceptors/AdvSlotExt/Makefile.am:
+        * tests/Portable_Interceptors/Benchmark/Makefile.am:
+        * tests/Portable_Interceptors/Bug_1559/Makefile.am:
+        * tests/Portable_Interceptors/Bug_2088/Makefile.am:
+        * tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am:
+        * tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am:
+        * tests/Portable_Interceptors/Collocated/Makefile.am:
+        * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am:
+        * tests/Portable_Interceptors/Dynamic/Makefile.am:
+        * tests/Portable_Interceptors/ForwardRequest/Makefile.am:
+        * tests/Portable_Interceptors/IORInterceptor/Makefile.am:
+        * tests/Portable_Interceptors/Makefile.am:
+        * tests/Portable_Interceptors/ORB_Shutdown/Makefile.am:
+        * tests/Portable_Interceptors/PICurrent/Makefile.am:
+        * tests/Portable_Interceptors/PolicyFactory/Makefile.am:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am:
+        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am:
+        * tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am:
+        * tests/Portable_Interceptors/Register_Initial_References/Makefile.am:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am:
+        * tests/Portable_Interceptors/Slot/Makefile.am:
+        * tests/QtTests/Makefile.am:
+        * tests/Queued_Message_Test/Makefile.am:
+        * tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am:
+        * tests/RTCORBA/Banded_Connections/Makefile.am:
+        * tests/RTCORBA/Client_Propagated/Makefile.am:
+        * tests/RTCORBA/Client_Protocol/Makefile.am:
+        * tests/RTCORBA/Collocation/Makefile.am:
+        * tests/RTCORBA/Destroy_Thread_Pool/Makefile.am:
+        * tests/RTCORBA/Diffserv/Makefile.am:
+        * tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am:
+        * tests/RTCORBA/Explicit_Binding/Makefile.am:
+        * tests/RTCORBA/Linear_Priority/Makefile.am:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am:
+        * tests/RTCORBA/Makefile.am:
+        * tests/RTCORBA/ORB_init/Makefile.am:
+        * tests/RTCORBA/Persistent_IOR/Makefile.am:
+        * tests/RTCORBA/Policies/Makefile.am:
+        * tests/RTCORBA/Policy_Combinations/Makefile.am:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am:
+        * tests/RTCORBA/Private_Connection/Makefile.am:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am:
+        * tests/RTCORBA/RTMutex/Makefile.am:
+        * tests/RTCORBA/Server_Declared/Makefile.am:
+        * tests/RTCORBA/Server_Protocol/Makefile.am:
+        * tests/RTCORBA/Thread_Pool/Makefile.am:
+        * tests/RTScheduling/Current/Makefile.am:
+        * tests/RTScheduling/DT_Spawn/Makefile.am:
+        * tests/RTScheduling/Makefile.am:
+        * tests/RTScheduling/Scheduling_Interceptor/Makefile.am:
+        * tests/RTScheduling/Thread_Cancel/Makefile.am:
+        * tests/RTScheduling/VoidData/Makefile.am:
+        * tests/Reliable_Oneways/Makefile.am:
+        * tests/Sequence_Unit_Tests/Makefile.am:
+        * tests/Servant_To_Reference_Test/Makefile.am:
+        * tests/Server_Connection_Purging/Makefile.am:
+        * tests/Server_Leaks/Makefile.am:
+        * tests/Server_Port_Zero/Makefile.am:
+        * tests/Single_Read/Makefile.am:
+        * tests/Smart_Proxies/Benchmark/Makefile.am:
+        * tests/Smart_Proxies/Collocation/Makefile.am:
+        * tests/Smart_Proxies/Makefile.am:
+        * tests/Smart_Proxies/On_Demand/Makefile.am:
+        * tests/Smart_Proxies/Policy/Makefile.am:
+        * tests/Smart_Proxies/dtor/Makefile.am:
+        * tests/Stack_Recursion/Makefile.am:
+        * tests/Strategies/Makefile.am:
+        * tests/Timed_Buffered_Oneways/Makefile.am:
+        * tests/Timeout/Makefile.am:
+        * tests/Two_Objects/Makefile.am:
+        * tests/Typedef_String_Array/Makefile.am:
+        * tests/UNKNOWN_Exception/Makefile.am:
+        * tests/Xt_Stopwatch/Makefile.am:
+
+          New files, baseline Makefile.am's for TAO's tests subdirectory.
+
+Wed Nov 29 13:25:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc:
+        * docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc:
+        * examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc:
+        * examples/OBV/Typed_Events/Typed_Events.mpc:
+        * examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc:
+        * examples/POA/Default_Servant/POA_Default_Servant.mpc:
+        * examples/POA/DSI/POA_DSI.mpc:
+        * examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc:
+        * examples/POA/FindPOA/POA_FindPOA.mpc:
+        * examples/POA/Forwarding/POA_Forwarding.mpc:
+        * examples/POA/Generic_Servant/POA_Generic_Servant.mpc:
+        * examples/POA/Loader/POA_Loader.mpc:
+        * examples/POA/NewPOA/POA_NewPOA.mpc:
+        * examples/POA/On_Demand_Activation/POA_On_Demand_Activation.mpc:
+        * examples/POA/On_Demand_Loading/POA_On_Demand_Loading.mpc:
+        * examples/POA/POA_BiDir/POA_BiDir.mpc:
+        * examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc:
+        * examples/POA/TIE/POA_TIE.mpc:
+        * examples/Quoter/Quoter.mpc:
+        * examples/TypeCode_Creation/TypeCode_Creation.mpc:
+        * orbsvcs/examples/Notify/Lanes/Notify_Lanes.mpc:
+        * orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc:
+        * orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc:
+        * orbsvcs/examples/ORT/ORT.mpc:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+        * orbsvcs/orbsvcs/IFRService.mpc:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc:
+        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc:
+        * orbsvcs/performance-tests/RTEvent/lib/RTEC_Perf.mpc:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc:
+        * orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc:
+        * orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc:
+        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
+        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
+        * orbsvcs/tests/FT_App/FT_App.mpc:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
+        * orbsvcs/tests/ImplRepo/NameService/ImplRepo_NameService.mpc:
+        * orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc:
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/IFR_IDL3_Test.mpc:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/IFR_IFR_Test.mpc:
+        * orbsvcs/tests/InterfaceRepo/Persistence_Test/IFR_Persistence_Test.mpc:
+        * orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc:
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.mpc:
+        * orbsvcs/tests/Notify/RT_lib/RT_Notify_lib.mpc:
+        * orbsvcs/tests/tests_svc_loader/tests_svc_loader.mpc:
+        * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
+        * performance-tests/Latency/Deferred/Deferred.mpc:
+        * performance-tests/Latency/DII/DII.mpc:
+        * performance-tests/Latency/DSI/DSI.mpc:
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/Common.mpc:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/ORB_Per_Priority.mpc:
+        * performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc:
+        * performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc:
+        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+        * performance-tests/Sequence_Latency/DII/DII.mpc:
+        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
+        * tao/EndpointPolicy.mpc:
+        * tests/Bug_1535_Regression/Bug_1535_Regression.mpc:
+        * tests/Bug_1636_Regression/test.mpc:
+        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc:
+        * tests/Faults/Faults.mpc:
+        * tests/File_IO/File_IO.mpc:
+        * tests/ICMG_Any_Bug/Hello.mpc:
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
+        * tests/Param_Test/Param_Test.mpc:
+        * tests/POA/Bug_2511_Regression/Bug_2511_Regression.mpc:
+        * tests/POA/Default_Servant/Default_Servant.mpc:
+        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
+        * tests/POA/Etherealization/Etherealization.mpc:
+        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc:
+        * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc:
+        * tests/POA/POAManagerFactory/POAManagerFactory.mpc:
+        * tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc:
+        * tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc:
+        * tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc:
+        * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc:
+        * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc:
+        * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc:
+        * tests/RTCORBA/Policies/Policies.mpc:
+        * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc:
+        * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc:
+        * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc:
+        * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc:
+        * tests/Servant_To_Reference_Test/Servant_to_Reference.mpc:
+          Added avoids_corba_e_compact as base project, these all
+          have also avoids_minimum_corba, so it was just a search/
+          replace.
+
+Wed Nov 29 12:07:46 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          When generating the A.h file we don't need to generate an include
+          of another A.h file when we include a .idl file
+
+Wed Nov 29 02:51:19 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefiles for new unit test subdirectories.
+
+        * examples/Makefile.am:
+
+          Regenerate to descend into CSD_Strategy subdirectory.
+
+        * examples/CSD_Strategy/ThreadPool/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool2/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool3/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool5/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+
+          Regenerate.
+
+        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
+        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
+        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+        * tao/Makefile.am:
+
+          Regenerate.
+
+Wed Nov 29 000:11:49 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/DynamicAny/DynAnyUtils_T.h:
+
+          Removed some 'typename' qualifiers that Visual Studio seems
+          fine with either way, but which may be causing problems
+          with gcc.
+
+Tue Nov 28 22:44:08 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/DynamicAny/DynStruct_i.cpp:
+
+          Fixed typo (case error) in #include directive.
+
+        * tao/AnyTypeCode/BasicTypeTraits.h:
+
+          Replace forward declaration of enum TCKind with #include of
+          tao/Typecode_typesC.h to eliminate gcc complaints.
+
+Tue Nov 28 22:17:08 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/BasicTypeTraits_T.h:
+
+          Added missing newline at the end of the file. Thanks to
+          Phil Mesnier <mesnier_p@ociweb.com> for reporting it.
+
+Tue Nov 28 21:00:28 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/fe/lex.yy.cpp.diff:
+
+          Applied patch sent by Chad Elliott <elliott_c@ociweb.com>.
+
+Tue Nov 28 20:03:21 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/tests/ImplRepo/run_test.pl:
+          Improvement to the script for running on platforms with many
+          endpoints, such as those with IPv6. These improvements were
+          motivated by the discovery that the use of environment variables
+          by the ImplRepo Activator leads to trouble if the IMR IOR is
+          particularly long, which can happen if multiple profiles are
+          included in the IOR.
+
+Tue Nov 28 19:32:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/BasicTypeTraits.cpp:
+        * tao/AnyTypeCode/BasicTypeTraits.h:
+        * tao/AnyTypeCode/BasicTypeTraits_T.h:
+
+          New files, defining and specializing template
+          utilities for using Anys and typecodes with
+          IDL basic types.
+
+        * tao/AnyTypeCode.mpc:
+
+          Added new files described above.
+
+        * tao/DynamicAny/DynAnyUtils_T.h:
+
+          New file containing templatized code factored
+          out from the insert_* and get_* methods, and
+          using the AnyTypeCode utilities described above.
+          Also contains code factored out from
+          DynAnyFactory methods.
+
+        * tao/DynamicAny/DynValue_i.cpp:
+        * tao/DynamicAny/DynAnyFactory.h:
+        * tao/DynamicAny/DynArray_i.cpp:
+        * tao/DynamicAny/DynCommon.cpp:
+        * tao/DynamicAny/DynStruct_i.cpp:
+        * tao/DynamicAny/DynCommon.h:
+        * tao/DynamicAny/DynValueBox_i.cpp:
+        * tao/DynamicAny/DynValueCommon_i.cpp:
+        * tao/DynamicAny/DynAny_i.cpp:
+        * tao/DynamicAny/DynUnion_i.cpp:
+        * tao/DynamicAny/DynUnion_i.h:
+        * tao/DynamicAny/DynAnyFactory.cpp:
+        * tao/DynamicAny/DynSequence_i.cpp:
+
+          - Added implementations of get_*_seq()
+            and insert_*_seq(), spec-defined
+            methods for each IDL basic type.
+
+          - Added implementation of insert_abstract()
+            and get_abstract().
+
+          - Factored out code from existing insert_*
+            and get_* methods to templatized
+            utility code described above.
+
+          - Factored out code from DynAnyFactory
+            methods similarly.
+
+          - Fixed bug in get_reference() and get_val()
+            that (incorrectly) took ownership of the
+            dynamic any's contents. Thanks to Phil
+            Mesnier <mesnier_p@ociweb.com> for
+            reporting the bug.
+
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/AbstractBase.cpp:
+
+          Added declaration and definition of typecode
+          for AbstractBase.
+
+        * tao/Valuetype/ValueBase.h:
+        * tao/Valuetype/ValueBase.cpp:
+
+          Added virtual _tao_type() method that returns
+          the associated typecode polymorphically. This
+          method is a TAO extension, and is for internal
+          use only (currently used in Any insertion
+          operators for valuetypes - see below). It
+          does not make a copy.
+
+        * docs/dynany/index.html:
+
+          Updated documentation to include the changes
+          described above.
+
+        * tests/DynAny_Test/test_dynstruct.cpp:
+        * tests/DynAny_Test/test_dynany.cpp:
+        * tests/DynAny_Test/test_dynunion.cpp:
+        * tests/DynAny_Test/data.cpp:
+        * tests/DynAny_Test/data.h:
+        * tests/DynAny_Test/test_dynenum.cpp:
+        * tests/DynAny_Test/test_dynsequence.cpp:
+        * tests/DynAny_Test/analyzer.cpp:
+        * tests/DynAny_Test/test_dynarray.cpp:
+        * tests/DynAny_Test/analyzer.h:
+        * tests/DynAny_Test/driver.cpp:
+        * tests/DynAny_Test/da_tests.idl:
+
+          Updated tests to cover some of the new Dynamic Any
+          methods described above.
+
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+
+          Changed code that uses DynamicAnyFactory method,
+          a consequence of the refactoring in Dynamic Any
+          described above.
+
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/ast/ast_interface_fwd.cpp:
+        * TAO_IDL/ast/ast_decl.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/idl.ll:
+
+          - Fixed bugs in code generation for eventtypes. Thanks
+            to Ming Xiong <mxiong@dre.vanderbilt.edu> for
+            reporting a problem with anonymous sequence eventtype
+            members that led to the discovery of the other
+            inconsistencies.
+
+          - Added patches to the lex file and to the corresponding
+            generated C++ file that (1) corrects inconsistencies
+            between these two files and (2) fixes problems with
+            the SunCC preprocessor. Also patched the corresponding
+            lex.yy.cpp.diff file. Thanks to Chad Elliott
+            <elliott_c@ociweb.com> for supplying the patches.
+
+          - Added generation of virtual _tao_type() method for
+            valuetypes (and eventtypes), as well as use of this
+            method in the corresponding Any insertion operators.
+            These changes make Any insertion completely polymorphic
+            for valuetypes and eventtypes. These changes include
+            boxed valuetypes.
+
+          - Fixed a bug in the handling of #pragma prefix directives
+            when they occur before included IDL files. Thanks to
+            Viola Wang <vwang@eso.org> for reporting the problem.
+            This change closes [BUGID:2714].
+
+        * NEWS:
+
+          Added items listing the new Dynamic Any methods.
+
+Tue Nov 28 17:01:44 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/TAO_Internal.cpp:
+          Fix to restore processing of the -ORBNegotiateCodesets 1
+          option.
+
+        * tests/Oneway_Timeouts/client.cpp:
+          Reimplement the timeout evaluation to avoid the use of
+          std::abs() as that function is not available on 64-bit windows
+          builds using the intel c++ compiler with VC 7.1 IDE.
+
+Tue Nov 28 16:54:36 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/utl_err.h (version_syntax_error):
+        * TAO_IDL/fe/lex.yy.cpp (idl_store_pragma):
+        * TAO_IDL/fe/idl.ll (idl_store_pragma):
+        * TAO_IDL/util/utl_err.cpp (version_syntax_error):
+
+          Qualified the char* parameter in the signature of the
+          recently-added version_syntax_error() with 'const'. Also
+          qualified the char* arg passed to it in idl_store_pragma()
+          similarly, since the rhs of this arg initialization is
+          a string literal, and thus causes a warning on some
+          compilers.
+
+Tue Nov 28 13:46:55 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefiles for new unit test subdirectories.
+
+        * orbsvcs/tests/Event/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Makefile.am:
+
+          Regenerate to descend into new test subdirectories.
+
+        * orbsvcs/tests/Event/UDP/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Makefile.am:
+
+          New files, Makefile.am's for newly supported unit tests.
+
+        * orbsvcs/tests/Event/UDP/RtEC_UDP.mpc:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/Bug_2604.mpc:
+
+          Split out IDL compilation into separate MPC project.
+
+Tue Nov 28 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Bounded_Basic_String_Sequence_T.h:
+          Fixed doxygen errors
+
+        * tao/Unbounded_Basic_String_Sequence_T.h:
+          Improved doxygen documentation
+
+Mon Nov 27 21:03:53 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+
+          - Cosmetic changes to source code, mostly addition of
+            braces around single-line IF bodies.
+
+          - Cosmetic changes to generated code, to keep line
+            lengths less than 80 characters.
+
+        * TAO_IDLbe/be_visitor_typecode/typecode_defn.cpp:
+
+          Changed check to tell if interface or valuetype members
+          are defined, and thus if they need a forward declared
+          typecode generated. This need for this change is a
+          consequence of recent changes in the way forward
+          declared interfaces and valuetypes are handled.
+
+        * TAO_IDLast/ast_interface_fwd.cpp:
+
+          Removed an unnecessary line of source code.
+
+Mon Nov 27 17:34:21 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/utl_err.h:
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/util/utl_err.cpp:
+
+          Added error check in #pragma version parsing, and a new
+          error message to output if an error is found with this
+          check. Since the only related error that was checked
+          for and reported before was an invalid version number,
+          an additional case was needed for a more general syntax
+          error. Thanks to Johnny Willemsen <jwillemsen@remedy.nl>
+          for supplying the example IDL that caused a crash due
+          to the lack of this error checking. This fix closes
+          [BUGID:2728].
+
+Mon Nov 27 14:46:18 UTC 2006  Vadym Ridosh <vridosh@prismtech.com>
+
+        * tests/Bug_2709_Regression/Bug_2709_Regression.mpc
+        * tests/Bug_2709_Regression/client.cpp
+        * tests/Bug_2709_Regression/Client_Task.cpp
+        * tests/Bug_2709_Regression/Client_Task.h
+        * tests/Bug_2709_Regression/README
+        * tests/Bug_2709_Regression/run_test.pl
+        * tests/Bug_2709_Regression/server.cpp
+        * tests/Bug_2709_Regression/Server_Task.cpp
+        * tests/Bug_2709_Regression/Server_Task.h
+        * tests/Bug_2709_Regression/Test.idl
+        * tests/Bug_2709_Regression/TestImpl.cpp
+        * tests/Bug_2709_Regression/TestImpl.h
+          Added a regression for bug 2709.
+
+Mon Nov 27 14:29:38 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/tao.mpc:
+        * tao/AnyTypeCode.mpc:
+
+          Move list generated typecode (*A.h) header files from tao.mpc
+          to AnyTypeCode.mpc.  Even though the files are generated from
+          rules in tao.mpc, they belong in AnyTypeCode.mpc (the sources
+          are compiled there, etc.).  This also helps with a latent MPC
+          bug that expressed itself in the borland builds, where the
+          directory separator was not changed from '/' to '\'.
+
+Mon Nov 27 12:50:48 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tao/Object.h:
+        * tao/Object.cpp:
+
+          Provide hooks to enable custom Object to IOR conversion or
+          allowing local objects (such as Smart Proxies) to be converted to
+          an IOR string.
+
+        * tao/ORB.cpp:
+
+          Utilize the new hooks when performing the Object to IOR string
+          conversion.
+
+        * tests/Smart_Proxies/Smart_Proxy_Impl.h:
+        * tests/Smart_Proxies/Smart_Proxy_Impl.cpp:
+        * tests/Smart_Proxies/client.cpp:
+        * tests/Smart_Proxies/run_test.pl:
+
+          This test has been modified to implement both aforementioned
+          hooks and perform comparisons to ensure that the right thing has
+          been done.
+
+Mon Nov 27 09:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/HTTP_Client.h:
+        * tao/HTTP_Handler.h:
+          Export these classes from the TAO lib. These can be reused then
+          by several parts in CIAO and that way we don't have code
+          duplication and smaller footprint
+
+Mon Nov 27 08:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * *.mpc:
+          Removed exceptions as base project because TAO already requires
+          exceptions and renamed minimum_corba to avoids_minimum_corba
+
+Mon Nov 27 08:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Document the changes I have done last weekend to resolve link
+        problems with vc8. With vc8 we now explicitly export the base
+        templates for the basic sequences. This also requires that
+        applications do import these base templates which in practice
+        means that when you use any of the sequences of basic types
+        you must include (in)directly the ones in the corba library.
+        If you don't do that you get compile/link errors related
+        to the basic sequences
+
+        * tao/tao.mpc:
+          Enabled -Gse for ULongLongSeq
+
+        * orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl:
+          Use the CORBA::ULongLongSeq predefined typedef
+
+        * orbsvcs/orbsvcs/CosTrading.idl:
+        * orbsvcs/orbsvcs/SecurityLevel3.idl:
+          Include a pidl file from core to get the import of the
+          base template
+
+        * tests/Portable_Interceptors/PICurrent/client.cpp:
+          Check also the length of the returned sequence
+
+Sun Nov 26 02:41:57 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/tests/Event/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Makefile.am:
+
+          Hand tweak to avoid subdirectories that aren't yet supported.
+
+Sat Nov 25 13:56:43 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/ec_typed_events_idl.mpb:
+
+          Add -GT to idlflags.  We generate tie classes for the untyped
+          CosEvent interfaces, we should do the same for the typed ones
+          for symmetry.
+
+Fri Nov 24 14:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/Bounded_String.cpp:
+          Updated because of string sequence changes earlier today
+
+Fri Nov 24 13:45:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Portable_Interceptors/PICurrent/client.cpp:
+          Added a test for bugzilla 2656
+
+        * tao/Stub.cpp (get_policy_overrides):
+          When policies is zero, return an empty sequence instead of
+          a nill pointer. This fixes bugzilla 2656. Thanks to
+          Richard Ridgway <Richard_Ridgway at ml dot com> for
+          delivering the test extension and the patch for this file.
+
+Fri Nov 24 13:43:44 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Bug_2615_Regression unit test.
+
+        * orbsvcs/tests/Makefile.am:
+
+          Regenerated to include Bug_2615_Regression subdirectory.
+
+        * orbsvcs/tests/Bug_2615_Regression/Makefile.am:
+
+          New file, Makefile.am for new-ish unit test.
+
+Fri Nov 24 13:39:13 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure RTCORBA Quoter tutorial.
+
+        * docs/tutorials/Quoter/Makefile.am
+
+          Regenerated to include RTCORBA subdirectory.
+
+        * docs/tutorials/Quoter/RTCORBA/Makefile.am
+
+          New file, Makefile.am for new-ish tutorial.
+
+Fri Nov 24 13:24:56 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+
+          Regenerated.
+
+Fri Nov 24 13:21:52 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Added AM_CONDITIONAL for BUILD_STL and BUILD_BOOST, so we can
+          generate Makefile.am's with these options.  Default to false,
+          until we can write feature tests for these options.
+
+Fri Nov 24 13:21:00 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/ec_typed_events_skel.mpb:
+
+          Removed *S_T.inl files from the Inline_Files section.
+
+Fri Nov 24 13:19:24 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated.
+
+        * tao/Strategies.mpc:
+
+          Clear PIDL_Files section as the Strategies *.pidl files are
+          processed within the IDL_Files section, and this results in
+          duplicate entries.
+
+Fri Nov 24 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Bounded_Basic_String_Sequence_T.h:
+        * tao/Unbounded_Basic_String_Sequence_T.h:
+          Moved these templates from TAO::details to TAO namespace because
+          we are going to move these templates directly
+
+        * tao/Bounded_String_Sequence_T.h:
+        * tao/Bounded_Wstring_Sequence_T.h:
+        * tao/Unbounded_String_Sequence_T.h:
+        * tao/Unbounded_Wstring_Sequence_T.h:
+          Removed, not used anymore, the IDL compiler uses the basic string
+          sequence directly.
+
+        * TAO_IDL/be/be_visitor_template_export.cpp:
+          Removed special handling for (w)string sequences
+
+        * TAO_IDL/be/be_sequence.cpp:
+          Changed generation to use basic string sequence template directly
+
+        * tao/Sequence_T.h:
+        * tao/tao.mpc:
+          Removed the files that got removed
+
+        * tao/Unbounded_Sequence_CDR_T.h:
+        * tao/Bounded_Sequence_CDR_T.h:
+          Updated because of the move of the basic string sequence files
+          from TAO::details to TAO
+
+Fri Nov 24 06:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Don't use -Gse for ULongLongSeq at this moment, vc8 seems to
+          have a problem with this file
+
+Thu Nov 23 14:51:05 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated.
+
+Thu Nov 23 14:20:33 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
+
+          (Hopefully) fix Borland warning.
+
+Thu Nov 23 14:15:47 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/CosEvent.mpc:
+
+          Removed *S_T.inl files from the Inline_Files section.
+
+Thu Nov 23 13:08:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Readded -Gse again
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Fixed wrong comment in A.h generation
+
+        * TAO_IDL/be/be_interface.cpp:
+          Const improvement
+
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+          Removed some unneeded c-style casts
+
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+          Small code change to define the local variable and assign
+          it on the same line.
+
+        * TAO_IDL/be/be_visitor_template_export.cpp:
+          Added special handling for octet/wstring and string sequences.
+          Removed generation of long comment why we explicitly
+          export the base templates, not usefull in generated code
+
+        * TAO_IDL/util/utl_global.cpp:
+          Removed spaces.
+
+        * tao/PolicyC.cpp:
+          Removed not needed Borland pragma option
+
+Thu Nov 23 12:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Removed -Gse for the sequence files, causes some problems
+          on the scoreboard.
+
+Thu Nov 23 11:11:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Release:
+          Changed TAO_ACE* to TAO_*mwc. That prevents that the TAO_ACE*.sln
+          files are added twice to the tar archive. This fixes bug 2680
+
+Thu Nov 23 10:57:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2669_Regression/Child.idl:
+        * tests/Bug_2669_Regression/client.cpp:
+          Added a regression for bug 2714 which hasn't been fixed yet.
+
+Thu Nov 23 07:41:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Simplified the idlflags to put the common flags for all pidl files
+          at the top of this file. Added regeneration of OctetSeq.pidl
+          and UShortSeq.pidl, these can now be regenerated using the new
+          -Gse option which is enabled for all sequence files
+
+        * tao/OctetSeqC.{h,cpp}:
+        * tao/UShortSeqC.{h,cpp}:
+        * tao/OctetSeqS.h:
+        * tao/UShortSeqS.h:
+        * tao/AnyTypeCode/OctetSeqA.{h,cpp}:
+        * tao/AnyTypeCode/UShortSeqA.{h,cpp}:
+        * tao/diffs/OctetSeq.diff:
+        * tao/diffs/UShortSeq.diff:
+          Removed all these files, they are not regenerated as part of the
+          build.
+
+        * tao/OctetSeq.pidl:
+        * tao/UShortSeq.pidl:
+          Removed remark about applying a diff
+
+Thu Nov 23 06:47:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
+          Also don't build the server when ace_for_tao is enabled
+
+        * performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
+          Don't build in ace_for_tao
+
+Thu Nov 23 03:20:04 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/CosNotification.mpc:
+        * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+        * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+        * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
+        * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+        * orbsvcs/orbsvcs/CosProperty.mpc:
+
+          Removed *S_T.* files from the Header_Files, Inline_Files, and
+          Template_Files sections, corresponding to the recent change to
+          orbsvcslib.mpb which removed -GT from the command line options
+          passed to tao_idl.
+
+Thu Nov 23 01:05:04 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp:
+          Fix typo in ACE_Get_Opt option specification which made it
+          impossible to specify the number of threads.
+
+Wed Nov 22 22:20:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/Makefile.am:
+
+          Regenerated.
+
+Wed Nov 22 20:29:03 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+
+          Regenerated.
+
+Wed Nov 22 20:18:50 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_template_export.cpp:
+        * TAO_IDL/be_include/be_visitor_template_export.h:
+
+          New files, defining a new visitor that optionally
+          generates an explicit export of the template base class
+          of the C++ class generated for an IDL sequence. This
+          visitor is triggered by the new command line option
+          described below, and is intended as a workaround for a
+          bug in Visual Studio. This fixes bugzilla 2703.
+
+        * TAO_IDL/be/be_visitor_root.cpp:
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+
+          - Added new command line option -Gse that will trigger the
+            generation of an explicit export described above.
+
+          - Fixed call to lookup_by_name() when it is used to locate
+            CCMObject in the AST and store it for future access in
+            the backend global data class. An additional argument
+            was recently added to lookup_by_name() and should have
+            been used in this call but wasn't. Thanks to Johnny
+            Willemsen <jwillemsen@remedy.nl> for reporting the
+            resulting incorrect code generation in the copy
+            constructor for components. This fixes bugzilla 2724.
+
+        * TAO_IDL/be/be_interface.cpp:
+
+          Cosmetic changes.
+
+        * docs/releasenotes/index.html:
+        * docs/compiler.html:
+
+          Updated IDL compiler documentation with the new command line
+          option.
+
+Wed Nov 22 19:17:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/CosEvent.mpc:
+        * orbsvcs/orbsvcs/RTEvent.mpc:
+          Add -GT to the idlflags because we have some examples that use
+          the TIE files from these services
+
+Wed Nov 22 18:50:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Log_i.cpp:
+
+          Now the infinite recursion problem has been resolved, we invoke
+          TAO_LogMgr_i::create_log_reference() from TAO_Log_i::init() and
+          stash it away in a member variable.  This allows us to remove
+          the code that lazily obtained the object reference within the
+          active data path of the server.
+
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+
+          Changed TAO_LogMgr_i::create_log_reference() to use
+          _unchecked_narrow() while narrowing the object reference.  This
+          avoids the infinite recursion which occurred with _narrow() when
+          this was called by the servant activator's incarnate() method.
+
+
+Wed Nov 22 18:48:02 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp:
+
+          Remove extraneous ACE_DEBUG's in destructor.
+
+Wed Nov 22 18:42:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/examples/Log/Event/run_test.pl:
+        * orbsvcs/examples/Log/RTEvent/run_test.pl:
+        * orbsvcs/examples/Log/Notify/run_test.pl:
+
+          Increase timeout so that test passes on slower systems.
+
+Wed Nov 22 15:38:40 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Version.h:
+
+          Remove extraneous whitespace from TAO_VERSION macro definition.
+
+Wed Nov 22 15:14:51 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
+        * orbsvcs/tests/Event/Makefile.am:
+        * orbsvcs/tests/Simple_Naming/Makefile.am:
+        * orbsvcs/tests/ImplRepo/Makefile.am:
+        * orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
+        * orbsvcs/tests/Trading/Makefile.am:
+        * orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
+        * orbsvcs/tests/Bug_2377_Regression/Makefile.am:
+        * orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am:
+        * orbsvcs/tests/Redundant_Naming/Makefile.am:
+        * orbsvcs/tests/Interoperable_Naming/Makefile.am:
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am:
+        * orbsvcs/tests/Notify/lib/Makefile.am:
+        * orbsvcs/tests/FT_App/Makefile.am:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile.am:
+        * orbsvcs/ImplRepo_Service/Makefile.am:
+        * orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
+        * orbsvcs/examples/CosEC/Factory/Makefile.am:
+        * orbsvcs/examples/LoadBalancing/Makefile.am:
+        * tao/Makefile.am:
+        * docs/tutorials/Quoter/idl/Makefile.am:
+        * performance-tests/Sequence_Latency/DSI/Makefile.am:
+        * performance-tests/Sequence_Latency/Deferred/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Sequence_Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/DII/Makefile.am:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Sequence_Latency/AMI/Makefile.am:
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile.am:
+        * performance-tests/Callback/Makefile.am:
+        * performance-tests/Latency/DSI/Makefile.am:
+        * performance-tests/Latency/Deferred/Makefile.am:
+        * performance-tests/Latency/Thread_Pool/Makefile.am:
+        * performance-tests/Latency/Single_Threaded/Makefile.am:
+        * performance-tests/Latency/DII/Makefile.am:
+        * performance-tests/Latency/AMH_Single_Threaded/Makefile.am:
+        * performance-tests/Latency/AMI/Makefile.am:
+        * performance-tests/Latency/Thread_Per_Connection/Makefile.am:
+        * performance-tests/Cubit/TAO/MT_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/DII_Cubit/Makefile.am:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am:
+        * performance-tests/Throughput/Makefile.am:
+        * examples/POA/TIE/Makefile.am:
+        * examples/Kokyu_dsrt_schedulers/Makefile.am:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile.am:
+        * examples/RTScheduling/MIF_Scheduler/Makefile.am:
+        * examples/CSD_Strategy/ThreadPool6/Makefile.am:
+        * examples/RTCORBA/Activity/Makefile.am:
+        * examples/AMH/Sink_Server/Makefile.am:
+        * examples/mfc/Makefile.am:
+        * examples/AMI/FL_Callback/Makefile.am:
+        * examples/PluggableUDP/tests/Basic/Makefile.am:
+        * examples/PluggableUDP/tests/Performance/Makefile.am:
+        * examples/PluggableUDP/tests/SimplePerformance/Makefile.am:
+
+          Regenerated.
+
+Wed Nov 22 12:34:29 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h:
+        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h:
+        * orbsvcs/tests/Bug_2137_Regression/README:
+        * orbsvcs/tests/Bug_2137_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2137_Regression/Bug_2137_Regression.mpc:
+        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h:
+        * orbsvcs/tests/Bug_2248_Regression/test.idl:
+        * orbsvcs/tests/Bug_2248_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/README:
+        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h:
+        * orbsvcs/tests/Bug_2248_Regression/client.h:
+        * orbsvcs/tests/Bug_2248_Regression/test_i.cpp:
+        * orbsvcs/tests/Bug_2248_Regression/tests.idl:
+        * orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc:
+        * orbsvcs/tests/Bug_2248_Regression/Client_i.h:
+        * orbsvcs/tests/Bug_2248_Regression/test_i.h:
+        * orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/Manager.h:
+        * orbsvcs/tests/Bug_2247_Regression/test.idl:
+        * orbsvcs/tests/Bug_2247_Regression/server.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/test_i.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
+        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
+        * orbsvcs/tests/Bug_2247_Regression/Client_i.h:
+        * orbsvcs/tests/Bug_2247_Regression/README:
+        * orbsvcs/tests/Bug_2247_Regression/test_i.h:
+        * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp:
+        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp:
+        * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h:
+        * orbsvcs/Logging_Service/Event_Logging_Service/README:
+        * orbsvcs/Logging_Service/RTEvent_Logging_Service/README:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/README:
+        * tao/PortableServer/Servant_var.inl:
+        * tao/PortableServer/Servant_var.cpp:
+        * tao/PortableServer/Servant_var.h:
+        * tao/Incoming_Message_Stack.inl:
+        * tao/Incoming_Message_Stack.h:
+        * tests/Bug_2222_Regression/test.cpp:
+        * tests/Bug_2222_Regression/Bug_2222_Regression.mpc:
+        * tests/Bug_2222_Regression/TestCase.idl:
+        * tests/Bug_2222_Regression/TestType.idl:
+        * tests/Bug_2144_Regression/test.cpp:
+        * tests/Bug_2144_Regression/Bug_2144_Regression.mpc:
+        * tests/Bug_2144_Regression/test.idl:
+        * tests/Bug_2144_Regression/README:
+        * tests/QtTests/client.cpp:
+        * tests/QtTests/client.h:
+        * tests/QtTests/test.idl:
+        * tests/QtTests/server.cpp:
+        * tests/QtTests/test_i.cpp:
+        * tests/QtTests/test_i.h:
+        * tests/Bug_2375_Regression/test.cpp:
+        * tests/Bug_2375_Regression/test.idl:
+        * tests/Bug_2375_Regression/Bug_2375_Regression.mpc:
+        * tests/Bug_2375_Regression/README:
+        * tests/Bug_1812_Regression/test.cpp:
+        * tests/Bug_1812_Regression/Bug_1812_Regession.mpc:
+        * tests/Bug_1812_Regression/Test.idl:
+        * tests/MProfile_Forwarding/Servant_Locator.cpp:
+        * tests/MProfile_Forwarding/test.idl:
+        * tests/MProfile_Forwarding/server.cpp:
+        * tests/MProfile_Forwarding/test_i.inl:
+        * tests/MProfile_Forwarding/Servant_Locator.h:
+        * tests/Permanent_Forward/Permanent_Forward.mpc:
+        * tests/Permanent_Forward/README:
+        * tests/Permanent_Forward/StubTest.cpp:
+        * tests/ICMG_Any_Bug/client.cpp:
+        * tests/ICMG_Any_Bug/HelloWorld.h:
+        * tests/ICMG_Any_Bug/Hello.cpp:
+        * tests/ICMG_Any_Bug/server.cpp:
+        * tests/ICMG_Any_Bug/Hello.h:
+        * tests/Bug_2183_Regression/client.cpp:
+        * tests/Bug_2183_Regression/Hello.cpp:
+        * tests/Bug_2183_Regression/Test.idl:
+        * tests/Bug_2183_Regression/server.cpp:
+        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc:
+        * tests/Bug_2183_Regression/Hello.h:
+        * tests/Bug_2183_Regression/README:
+        * tests/IDL_Test/array_only.idl:
+        * tests/Bug_1813_Regression/test.cpp:
+        * tests/Bug_1813_Regression/Bug_1813_Regession.mpc:
+        * tests/Bug_1813_Regression/Test.idl:
+        * examples/RTCORBA/Activity/Job.idl:
+        * examples/RTCORBA/Activity/README:
+        * examples/Load_Balancing_persistent/Identity_i.cpp:
+        * examples/Load_Balancing_persistent/Load_Balancing_Service.h:
+        * examples/Load_Balancing_persistent/Identity_i.h:
+        * examples/Load_Balancing_persistent/README:
+        * examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
+        * examples/Load_Balancing_persistent/Identity.idl:
+        * examples/Load_Balancing_persistent/Identity_Server.cpp:
+        * examples/Load_Balancing_persistent/Load_Balancer_i.h:
+        * examples/Load_Balancing_persistent/Identity_Server.h:
+        * examples/Load_Balancing_persistent/Identity_Client.cpp:
+        * examples/Load_Balancing_persistent/Identity_Client.h:
+        * examples/Load_Balancing_persistent/Load_Balancer.idl:
+        * examples/Load_Balancing_persistent/Load_Balancing_Service.cpp:
+
+          Removed svn:executable property.
+
+Wed Nov 22 11:51:49 UTC 2006  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/IFR_Service/IFR_Server.cpp:
+        * orbsvcs/IFR_Service/IFR_Service.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp:
+        * orbsvcs/orbsvcs/IFRService/Options.cpp:
+
+          Make IFR exit when it receives an invalid startup option and improve
+          usage message. Fixes bugzilla #2720.
+
+Wed Nov 22 11:39:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/FlResource/FlResource_Factory.cpp:
+        * tao/FlResource/FlResource_Factory.h:
+        * tao/QtResource/QtResource_Factory.cpp:
+        * tao/QtResource/QtResource_Factory.h:
+        * tao/TkResource/TkResource_Factory.cpp:
+        * tao/TkResource/TkResource_Factory.h:
+        * tao/XtResource/XtResource_Factory.cpp:
+        * tao/XtResource/XtResource_Factory.h:
+          Updated these files because the reactors they use are moved
+          to their own directories in ACE.
+
+Wed Nov 22 10:54:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies.mpc:
+          Now build with ace_for_tao but derive from core_strategies
+
+        * tao/tao.mpc:
+          Added new HTTP files and moved all sequence.pidl files to one
+          group because soon they all will get a special tao_idl argument
+          to be used.
+
+        * tao/TAO_Internal.cpp:
+        * tao/default_resource.cpp:
+          Added HTTP
+
+        * tao/GUIResource_Factory.{h,cpp}:
+          Changed dynamically_allocated_reactor to bool
+
+        * tao/ORB_Core.{h,cpp,inl}:
+          Changed has_shutdown to a real bool
+
+        * tao/Valuetype/ValueBase.h:
+          Doxygen improvement
+
+Wed Nov 22 10:23:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Callback/Callback.mpc:
+        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:
+        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
+        * performance-tests/Latency/AMH_Single_Threaded/Single_Threaded.mpc:
+        * performance-tests/Latency/Collocation/Collocation.mpc:
+        * performance-tests/Latency/Deferred/Deferred.mpc:
+        * performance-tests/Latency/DII/DII.mpc:
+        * performance-tests/Latency/DSI/DSI.mpc:
+        * performance-tests/Latency/Single_Threaded/Single_Threaded.mpc:
+        * performance-tests/Sequence_Latency/AMH_Single_Threaded/Single_Threaded.mpc:
+        * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+        * performance-tests/Sequence_Latency/DII/DII.mpc:
+        * performance-tests/Sequence_Latency/DSI/DSI.mpc:
+        * performance-tests/Sequence_Latency/Single_Threaded/Single_Threaded.mpc:
+        * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/LoadBalancing.mpc:
+          Explicitly add avoids += ace_for_tao to these projects. At this
+          moment they are not build because the strategies library is not
+          available with ace_for_tao, but this is something I will change
+          but besides strategies these projects do use some ACE classes
+          which are not available in the ace_for_tao configuration
+
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
+          Const improvement
+
+        * orbsvcs/tests/Event/UDP/Consumer.cpp:
+        * orbsvcs/tests/Event/UDP/receiver.cpp:
+        * orbsvcs/tests/Event/UDP/Supplier.cpp:
+        * orbsvcs/tests/Event/UDP/Supplier.h:
+        * orbsvcs/tests/Event/UDP/Test.idl:
+          Extended this test and reproduced the bug we had in CIAO. This
+          test now will fail until Jeff Parsons commits some related
+          valuetype changes.
+
+Wed Nov 22 10:17:12 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * Release:
+          Removed dsw files
+
+        * docs/ORBEndpoint.html:
+          Added reuse_addr to the list of options, request has been made
+          to OCI to check and extend the documentation of this option
+          which has been available starting TAO 1.4.8
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Removed check for IFR_Client, we do have an empty A.h file for
+          the IFR_Client files now
+
+        * TAO_IDL/be/be_global.cpp:
+          Updated help of -GA
+
+        * tao/AnyTypeCode/NVList.cpp:
+          Use true/false
+
+        * tao/HTTP_Client.{h,cpp}:
+        * tao/HTTP_Handler.{h,cpp}:
+        * tao/HTTP_Parser.{h,cpp}:
+          New files to support http:/ as IOR format. Fixes bugzilla bugs
+          2670 and 372
+
+        * tao/IIOP_Acceptor.cpp:
+          Removed check for priority, that is gone already a long time and
+          this takes footprint.
+
+        * tao/Stub.cpp:
+          Const changes and removed TAO_Synchronous_Cancellation_Required which
+          doesn't seem used at all.
+
+Mon Nov 20 08:16:34 2006  Simon McQueen  <sm@prismtech.com>
+
+        * TAO version 1.5.4 released.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/TAO/MPC/config/taodefaults.mpb b/TAO/MPC/config/taodefaults.mpb
index 0343a1e0814..481150f68c2 100644
--- a/TAO/MPC/config/taodefaults.mpb
+++ b/TAO/MPC/config/taodefaults.mpb
@@ -18,3 +18,9 @@ project : exceptions {
 feature(!corba_messaging) {
   macros += TAO_HAS_CORBA_MESSAGING=0
 }
+
+// If the transport current feature is disabled, then we need
+// to add the TAO_HAS_CORBA_MESSAGING=0 macro onto the command line.
+feature(!transport_current) {
+  macros += TAO_HAS_TRANSPORT_CURRENT=0
+}
diff --git a/TAO/MPC/config/tc.mpb b/TAO/MPC/config/tc.mpb
index 4a11f6882e0..c518c2152b3 100644
--- a/TAO/MPC/config/tc.mpb
+++ b/TAO/MPC/config/tc.mpb
@@ -2,6 +2,7 @@
 // $Id$
 
 project: taolib_with_idl, interceptors, pi {
-  after   += TC
-  libs    += TAO_TC
+  requires += transport_current
+  after    += TC
+  libs     += TAO_TC
 }
diff --git a/TAO/NEWS b/TAO/NEWS
index 3909a1eb26f..7a3a4d84d9e 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -6,13 +6,20 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 
 . (JTC) autoconf support for tests and examples subdirectories.
 
-PLANNED CHANGES FOR "TAO-5.5.6"
+PLANNED CHANGES FOR "TAO-5.5.7"
 ===============================
 
 . (OO) Coverity error fixes for TAO.
 . (OO) Remove exception specifications from ORB mediated operations (C++
        mapping requirement).
 . (OO) Various other fixes that have been piling up.
+. (Remedy) Add ZIOP support
+
+USER VISIBLE CHANGES BETWEEN TAO-1.5.5 and TAO-1.5.6
+====================================================
+
+. Removed all exception environment macros except ACE_THROW_RETURN
+  and ACE_THROW_SPEC
 
 USER VISIBLE CHANGES BETWEEN TAO-1.5.4 and TAO-1.5.5
 ====================================================
@@ -83,8 +90,8 @@ USER VISIBLE CHANGES BETWEEN TAO-1.5.4 and TAO-1.5.5
   implementation can utilize a separate ORB for dispatching events to
   consumers.
 
-. Contributed the Transport::Current support - an optional
-  feature with IDL interfaces, which enables users to obtain
+. Contributed the Transport::Current support - a TAO-specific
+  feature providing IDL interfaces which enables users to obtain
   information about the Transports used to send or receive a
   message.  The basic intent is to provide (typically) a
   read-only interface to obtaining data like the number of bytes
@@ -94,11 +101,11 @@ USER VISIBLE CHANGES BETWEEN TAO-1.5.4 and TAO-1.5.5
   Transport::Current is insufficient.  This implementation also
   provides support for specific Transport implementations. See
   the TC_IIOP implementation, which is an IIOP-specific
-  Transport::Current, which extends the generic interface with
+  Transport::Current. It extends the generic interface with
   operations providing information about IIOP endpoints, like
-  host and port.  To build TAO with support for this feature, a
-  macro named TAO_HAS_TRANSPORT_CURRENT must be defined and have
-  a value != 0. For more details of how the feature is intended
+  host and port.  By default, TAO builds with support for this feature.
+  Define "transport_current=0" in your default.features file to disable
+  it. For more details of how the feature is intended
   to be used, see docs/transport_current/index.html
 
 USER VISIBLE CHANGES BETWEEN TAO-1.5.3 and TAO-1.5.4
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index f99940e1c23..9a16027b1f5 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -43,8 +43,8 @@
 To: tao-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 1.5.4
-    ACE VERSION: 5.5.4
+    TAO VERSION: 1.5.6
+    ACE VERSION: 5.5.6
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/TAO_IDL/ast/ast_check.cpp b/TAO/TAO_IDL/ast/ast_check.cpp
index a4c1afcc73d..7bb53bae46e 100644
--- a/TAO/TAO_IDL/ast/ast_check.cpp
+++ b/TAO/TAO_IDL/ast/ast_check.cpp
@@ -70,17 +70,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "global_extern.h"
 #include "utl_err.h"
 
-ACE_RCSID (ast, 
-           ast_check, 
+ACE_RCSID (ast,
+           ast_check,
            "$Id$")
 
 // Static storage for remembering nodes.
-static AST_Type	**ast_fwds = 0;
-static long	ast_n_fwds_used = 0;
-static long	ast_n_fwds_alloc = 0;
+static AST_Type  **ast_fwds = 0;
+static long  ast_n_fwds_used = 0;
+static long  ast_n_fwds_alloc = 0;
 
-#undef	INCREMENT
-#define	INCREMENT	64
+#undef  INCREMENT
+#define  INCREMENT  64
 
 // Store a node representing a forward declared struct or union.
 void
@@ -132,13 +132,26 @@ AST_check_fwd_decls (void)
 
       if (!d->is_defined ())
         {
-          idl_global->err ()->fwd_decl_not_defined (d);
+          // The member pd_full_definition is no longer set for
+          // every fwd decl, if there is more than one. So if
+          // is_defined() fails, we try to look up the fwd decl
+          // that has the full def, and emit an error only if
+          // this lookup fails.
+          AST_Decl *f =
+            d->defined_in ()->lookup_by_name_local (d->local_name (),
+                                                    0,
+                                                    true);
+
+          if (f == 0)
+            {
+              idl_global->err ()->fwd_decl_not_defined (d);
+            }
         }
     }
-    
+
   // This method is called once per file in the command line,
   // in between which the elements of ast_fwds are destroyed,
-  // so we have to clean up.  
+  // so we have to clean up.
   delete [] ast_fwds;
   ast_fwds = 0;
   ast_n_fwds_alloc = 0;
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
index 37837f7e5a0..b1b290cd6d5 100644
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum.cpp
@@ -156,11 +156,28 @@ AST_Enum::lookup_by_value (const AST_Expression *v)
     {
       d = i.item ();
       item = AST_EnumVal::narrow_from_decl (d);
+      AST_Expression *cv = item->constant_value ();
 
-      if (item->constant_value () == v)
+      if (cv == v)
         {
           return item;
         }
+
+      // Enum union label expressions don't get evaluated upon
+      // creation, to evaluate them later, we have only the
+      // string name to look up the enum value with.
+      UTL_ScopedName *v_n = const_cast<AST_Expression *> (v)->n ();
+
+      if (v_n != 0)
+        {
+          Identifier *cv_i = item->local_name ();
+          Identifier *v_i = v_n->last_component ();
+
+          if (cv_i->compare (v_i))
+            {
+              return item;
+            }
+        }
     }
 
   return 0;
@@ -246,7 +263,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
 
       t1 = idl_global->gen ()->create_enum_val (ev->u.ulval,
                                                 t->name ());
-                                                
+
       delete ev;
       ev = 0;
 
diff --git a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
index f6b87046559..d057a3e6ec7 100644
--- a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
@@ -69,6 +69,9 @@ AST_StructureFwd::set_full_definition (AST_Structure *nfd)
   delete this->pd_full_definition;
   this->pd_full_definition = 0;
   this->pd_full_definition = nfd;
+
+  // In case it's not already set.
+  this->is_defined_ = true;
 }
 
 bool
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
index 8fff20afb86..332cff62a18 100644
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp
@@ -72,6 +72,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_union_branch.h"
 #include "ast_union_label.h"
 #include "ast_union.h"
+#include "ast_enum.h"
+#include "ast_enum_val.h"
 #include "ast_visitor.h"
 #include "utl_labellist.h"
 
@@ -80,21 +82,21 @@ ACE_RCSID(ast, ast_union_branch, "$Id$")
 AST_UnionBranch::AST_UnionBranch (void)
   : COMMON_Base (),
     AST_Decl (),
-	  AST_Field (),
-	  pd_ll (0)
+    AST_Field (),
+    pd_ll (0)
 {
 }
 
 AST_UnionBranch::AST_UnionBranch (UTL_LabelList *ll,
                                   AST_Type *ft,
-				                          UTL_ScopedName *n)
+                                  UTL_ScopedName *n)
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_union_branch,
               n),
-	  AST_Field (AST_Decl::NT_union_branch,
+    AST_Field (AST_Decl::NT_union_branch,
                ft,
                n),
-	  pd_ll (ll)
+    pd_ll (ll)
 {
 }
 
@@ -133,7 +135,7 @@ AST_UnionBranch::destroy (void)
   this->pd_ll->destroy ();
   delete this->pd_ll;
   this->pd_ll = 0;
-  
+
   this->AST_Field::destroy ();
 }
 
@@ -144,8 +146,8 @@ AST_UnionBranch::label (unsigned long index)
 {
   unsigned long i = 0;
 
-  for (UTL_LabellistActiveIterator iter (this->pd_ll); 
-       !iter.is_done (); 
+  for (UTL_LabellistActiveIterator iter (this->pd_ll);
+       !iter.is_done ();
        iter.next ())
     {
       if (i == index)
@@ -178,19 +180,37 @@ AST_UnionBranch::add_labels (AST_Union *u)
   AST_UnionLabel *ul = 0;
   AST_Expression *ex = 0;
 
+  bool enum_labels = (u->udisc_type () == AST_Expression::EV_enum);
+
   for (UTL_LabellistActiveIterator i (this->pd_ll);
        !i.is_done ();
        i.next ())
     {
       ul = i.item ();
-      
+
       if (ul->label_kind () == AST_UnionLabel::UL_default)
         {
           return;
         }
-        
+
       ex = ul->label_val ();
-      u->add_to_name_referenced (ex->n ()->first_component ());
+      UTL_ScopedName *n = ex->n ();
+
+      if (n != 0)
+        {
+          u->add_to_name_referenced (ex->n ()->first_component ());
+        }
+
+      // If we have enum val labels, we need to set the type and
+      // evaluate here, so the value will be available when the
+      // default index in calculated.
+      if (enum_labels)
+        {
+          ex->ev ()->et = AST_Expression::EV_enum;
+          AST_Enum *disc = AST_Enum::narrow_from_decl (u->disc_type ());
+          AST_EnumVal *dval = disc->lookup_by_value (ex);
+          ex->ev ()->u.eval = dval->constant_value ()->ev ()->u.ulval;
+        }
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index ae563cf3e4c..d18af7c1b1b 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1625,7 +1625,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
     );
 
   this->gen_standard_include (this->client_header_,
-                              "tao/Environment.h");
+                              "tao/Basic_Types.h");
 
   // Conditionally included.
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 589825b354d..8060bc61a8d 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -235,7 +235,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   *os << "void " << node->name () << "::_raise (void) const" << be_nl
       << "{" << be_idt_nl
-      << "TAO_RAISE (*this);" << be_uidt_nl
+      << "throw *this;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << "void " << node->name ()
@@ -250,14 +250,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "return;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
       *os << "}" << be_nl << be_nl;
     }
@@ -266,14 +259,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "TAO_OutputCDR &) const" << be_nl
           << "{" << be_idt_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
       *os << "}" << be_nl << be_nl;
     }
@@ -290,14 +276,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << "return;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
       *os << "}" << be_nl << be_nl;
     }
@@ -306,14 +285,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl;
 
       *os << "}" << be_nl << be_nl;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 114a9d2e691..be81c7d5fc1 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -521,9 +521,9 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << ");" << be_uidt_nl << be_uidt_nl;
   *os << "if (_tao_adapter == 0)" << be_idt_nl
       << "{" << be_idt_nl
-      << "ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,"
+      << "throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1,"
       << be_nl
-      << "                                  ::CORBA::COMPLETED_NO));"
+      << "                                  ::CORBA::COMPLETED_NO);"
       << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
 
@@ -547,7 +547,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   *os << "if (_tao_result == false)" << be_idt_nl
       << "{" << be_idt_nl
-      << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl
+      << "throw ::CORBA::MARSHAL ();" << be_uidt_nl
       << "}" << be_uidt;
 
   this->generate_send_reply (os);
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index ba881c6039a..6f01e55accd 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -384,7 +384,7 @@ be_visitor_amh_operation_ss::generate_shared_section (be_decl *node,
       << be_idt_nl
       << "buffer_allocator.allocate();"
       << be_uidt_nl << be_nl
-      << "if (!_tao_rh_ptr) " << be_idt_nl << "ACE_THROW ( ::CORBA::NO_MEMORY ());"
+      << "if (!_tao_rh_ptr) " << be_idt_nl << "throw ::CORBA::NO_MEMORY ();"
       << be_uidt_nl;
 
   // Initialize amh rh
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 4061f48b16b..cab35ba9eff 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -397,14 +397,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_marshal_and_invoke
       *os << be_uidt << be_uidt_nl
           << " ))" << be_nl;
 
-      if (be_global->use_raw_throw ())
-        {
-          *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl << be_nl;
-        }
-      else
-        {
-          *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
-        }
+      *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl << be_nl;
     }
 
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index ea3f10ab578..746ea884bdc 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -438,7 +438,7 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node)
 
   // We need to throw an exceptions that was assigned in a
   // different place (by the app-developer). ACE_THROW does
-  // not fit the bill since the ACE_THROW macro contructs the
+  // not fit the bill since the ACE_THROW macro constructs the
   // exception passed to it.  Also exception->_raise() is
   // ruled out since in platforms without native exception
   // support, the _raise() function does not do anything. Below we
diff --git a/TAO/VERSION b/TAO/VERSION
index 4dfedb1b686..55dc2de4368 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.5.4, released Mon Nov 20 08:16:34 2006.
+This is TAO version 1.5.6, released Sun Jan 28 19:59:14 2007.
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-users@cs.wustl.edu), using the
diff --git a/TAO/docs/transport_current/index.html b/TAO/docs/transport_current/index.html
index 40067cbdc35..16e11cf453a 100644
--- a/TAO/docs/transport_current/index.html
+++ b/TAO/docs/transport_current/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 
-<!-- $Id:$ -->
+<!-- $Id$ -->
 
 <HTML>
 <HEAD>
@@ -469,14 +469,11 @@ functionality is being used.
 <P>
 It is possible at build time, to
 disable the functionality, so that applications only incur the penalty
-if they require it. The ORB, by default will not support the Transport Current functionality. 
-Use the following #define (in your config.h file) to enable it:
+if they require the features. The ORB, by default enables the Transport::Current 
+functionality. Adding "transport_current=0" to your default.features file will 
+disable it.
 </P>
 
-<PRE>
-#define TAO_HAS_TRANSPORT_CURRENT 1
-</PRE>
-
 <H3>
 Example Code
 </H3>
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
index 819c4ed0cb5..eb20cf8a400 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
@@ -14,8 +14,8 @@ public:
 
   void connect (CosEventChanneAdmin::ConsumerAdmin_ptr consumer_admin);
 
-  void push (const CORBA::Any& data ACE_ENV_ARG_DECL_NOT_USED);
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void push (const CORBA::Any& data);
+  void disconnect_push_consumer (void);
 
 private:
 };
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
index 2e156b24642..ce6ce1ede7d 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
@@ -31,8 +31,7 @@ Stock_Consumer::disconnect ()
 }
 
 void
-Stock_Consumer::push (const CORBA::Any& data
-                      ACE_ENV_ARG_DECL_NOT_USED)
+Stock_Consumer::push (const CORBA::Any& data)
   throw (CORBA::SystemException)
 {
   Quoter::Event *event;
@@ -46,7 +45,7 @@ Stock_Consumer::push (const CORBA::Any& data
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stock_Consumer::disconnect_push_consumer (void)
     throw (CORBA::SystemException)
 {
   this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
index d5de84958cd..66c131b0c04 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
@@ -18,9 +18,9 @@ public:
   void disconnect ();
   // Disconnect from the event channel.
 
-  void push (const CORBA::Any& data ACE_ENV_ARG_DECL_NOT_USED)
+  void push (const CORBA::Any& data)
     throw (CORBA::SystemException);
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_consumer (void)
     throw (CORBA::SystemException);
 
 private:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
index 37126ff41f2..a12cd27270c 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
@@ -46,7 +46,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 }
 
 void
-Quoter_Stock_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Quoter_Stock_i::disconnect_push_supplier (void)
   throw (CORBA::SystemException)
 {
   // Forget about the consumer it is not there anymore
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
index b4c619e1a6a..e7a74ac119f 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
@@ -22,7 +22,7 @@ public:
   CORBA::Double price () throw (CORBA::SystemException);
   void set_price (CORBA::Double new_price) throw (CORBA::SystemException);
 
-  void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_supplier (void)
     throw (CORBA::SystemException);
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
index ab075fcfcf7..9baa7fcd721 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
@@ -13,8 +13,7 @@ PortableServer::Servant
 Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid,
                                            PortableServer::POA_ptr,
                                            const char *,
-                                           void * & cookie
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           void * & cookie)
   throw (CORBA::SystemException, PortableServer::ForwardRequest)
 {
 
@@ -48,8 +47,7 @@ Quoter_Stock_Factory_Locator_i::postinvoke (const PortableServer::ObjectId &,
                                             PortableServer::POA_ptr,
                                             const char *,
                                             void * cookie,
-                                            PortableServer::Servant servant
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+                                            PortableServer::Servant servant)
   throw (CORBA::SystemException)
 {
 
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
index 4f3a9666ba2..fb3c89199d0 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
@@ -18,8 +18,7 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa,
                                              const char * operation,
-                                             void * & cookie
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             void * & cookie)
     throw (CORBA::SystemException, PortableServer::ForwardRequest);
 
   // Postinvoke function
@@ -27,8 +26,7 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator
                            PortableServer::POA_ptr poa,
                            const char * operation,
                            void * cookie,
-                           PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           PortableServer::Servant servant)
     throw (CORBA::SystemException);
 
  private:
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
index 1eb23c4111a..991719cbddf 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Admin.cpp
@@ -34,7 +34,7 @@ static bool use_naming = false;
 
 // Parse the command-line arguments and set the global options.
 
-static int 
+static int
 parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "o:r:bsc");
@@ -60,7 +60,7 @@ parse_args (int argc, char *argv[])
         case 'c':
           use_naming = get_opts.opt_arg ();
           break;
-          
+
         case '?':
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -100,7 +100,7 @@ get_distributor_reference (CORBA::ORB_ptr orb)
     return orb->string_to_object (ior.c_str ());
 }
 
-int 
+int
 main (int argc, char *argv[])
 {
   try
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
       // This call MUST come after ORB_init(), which may need to
       // extract -ORB options first.
       if (parse_args (argc, argv) != 0)
-        return 1;  
+        return 1;
 
       CORBA::Object_var obj = get_distributor_reference (orb);
 
@@ -150,8 +150,7 @@ main (int argc, char *argv[])
     }
   catch (CORBA::Exception &ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
index 298d35bb5cf..020a0f332d1 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
@@ -23,7 +23,7 @@ static std::string ior = "file://StockDistributor.ior";
 static std::string distributor_name = "StockDistributor";
 
 // Default priority level for running the broker.
-static Priority_Mapping::Priority priority_level 
+static Priority_Mapping::Priority priority_level
     = Priority_Mapping::MEDIUM;
 
 // Default stock name.
@@ -32,7 +32,7 @@ static std::string stock_name = "IBM";
 // A flag that indicates use of the Naming Service.
 bool use_naming = false;
 
-static int 
+static int
 parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "o:p:n:c");
@@ -51,28 +51,28 @@ parse_args (int argc, char *argv[])
             case 0:
               priority_level = Priority_Mapping::VERY_LOW;
               break;
-              
+
             case 1:
               priority_level = Priority_Mapping::LOW;
               break;
-              
+
             case 2:
               priority_level = Priority_Mapping::MEDIUM;
               break;
-              
+
             case 3:
               priority_level = Priority_Mapping::HIGH;
               break;
-              
+
             case 4:
               priority_level = Priority_Mapping::VERY_HIGH;
               break;
-              
+
             default:
               std::cerr << "Warning: Invalid priority detected, defaulting to very low.\n";
               priority_level = Priority_Mapping::VERY_LOW;
               break;
-              
+
             }
           break;
 
@@ -82,7 +82,7 @@ parse_args (int argc, char *argv[])
         case 'c':
           use_naming = true;
           break;
-          
+
         case '?':
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -122,7 +122,7 @@ get_distributor_reference (CORBA::ORB_ptr orb)
     return orb->string_to_object (ior.c_str ());
 }
 
-int 
+int
 main (int argc, char *argv[])
 {
   try
@@ -160,7 +160,7 @@ main (int argc, char *argv[])
 
       // Create the factory object. Create a <Stock::StockBroker>.
       Stock_StockBrokerHome_i stock_broker_home (orb);
-      Stock::StockBroker_var stock_broker = 
+      Stock::StockBroker_var stock_broker =
         stock_broker_home.create (stock_distributor.in (),
                                   stock_name.c_str ());
 
@@ -169,15 +169,15 @@ main (int argc, char *argv[])
                            "Nil StockBroker object reference <%s>\n",
                            ior.c_str ()),
                           1);
-      
+
       // Create a new consumer and initialize it.
       Stock::StockNameConsumer_var consumer =
         stock_broker->get_consumer_notifier ();
 
       // Subscribe the consumer with the distributor.
-      ::Stock::Cookie_var cookie = 
+      ::Stock::Cookie_var cookie =
           stock_distributor->subscribe_notifier (consumer, priority_level);
-      
+
       consumer->cookie (cookie.in ());
 
       // Get the object reference to a StockQuoter that's been
@@ -194,19 +194,18 @@ main (int argc, char *argv[])
       stock_broker->connect_quoter_info (stock_quoter);
 
       // Run the event loop.
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "running the event loop:\n"
                   "*** message: ready to receieve stock information...\n\n"));
       orb->run ();
-      
+
       // Cleanup the POA and ORB.
       poa->destroy (1, 1);
       orb->destroy ();
     }
   catch (CORBA::Exception &ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
   catch (...)
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
index e35081f3ddf..bdd02120b12 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.cpp
@@ -26,7 +26,7 @@ u_int update_freq = 1;
 // A flag that indicates use of the Naming Service.
 bool use_naming = false;
 
-static int 
+static int
 parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "o:r:u:c");
@@ -65,7 +65,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-static int 
+static int
 set_distributor_reference (CORBA::ORB_ptr orb,
                            CORBA::Object_ptr obj)
 {
@@ -116,7 +116,7 @@ set_distributor_reference (CORBA::ORB_ptr orb,
   return 0;
 }
 
-int 
+int
 main (int argc, char *argv[])
 {
   try
@@ -128,7 +128,7 @@ main (int argc, char *argv[])
       // extract -ORB options first.
       if (parse_args (argc, argv) != 0)
         return 1;
-      
+
       // Get the RootPOA.
       CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ());
@@ -140,7 +140,7 @@ main (int argc, char *argv[])
       // Create the factory object. Create a <Stock::StockDistributor>.
       StockDistributorHome_i stock_distributor_home (orb.in ());
 
-      Stock::StockDistributor_var stock_distributor = stock_distributor_home.create (); 
+      Stock::StockDistributor_var stock_distributor = stock_distributor_home.create ();
 
       if (CORBA::is_nil (stock_distributor.in ()))
         ACE_ERROR_RETURN ((LM_DEBUG,
@@ -161,7 +161,7 @@ main (int argc, char *argv[])
       STOCK_DATABASE->update_rate (update_freq);
 
       // Enter into the event looping.
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "*** message: ready for transmission...\n"));
       orb->run ();
 
@@ -171,7 +171,7 @@ main (int argc, char *argv[])
     }
   catch (CORBA::Exception &ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Admin: ");
+      ex._tao_print_exception ("Admin: ");
 
       return 1;
     }
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
index 47fe0510610..a9b28de02b7 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
@@ -34,7 +34,7 @@ StockDistributor_i::~StockDistributor_i (void)
   this->active_ = false;
 }
 
-::Stock::Cookie * 
+::Stock::Cookie *
 StockDistributor_i::subscribe_notifier (::Stock::StockNameConsumer_ptr c,
                                               ::RTCORBA::Priority priority)
   throw (::CORBA::SystemException)
@@ -52,15 +52,15 @@ StockDistributor_i::subscribe_notifier (::Stock::StockNameConsumer_ptr c,
 
   // Insert the cookie into the <subscribers_list_>.
   this->subscribers_list_[cookie->cookie_id ()] =
-    std::make_pair (Stock::StockNameConsumer::_duplicate (c), 
+    std::make_pair (Stock::StockNameConsumer::_duplicate (c),
                     priority);
-  
+
   ACE_DEBUG ((LM_DEBUG, "Subscribing  %s\n", cookie->cookie_id ()));
 
   return cookie._retn();
 }
 
-::Stock::StockNameConsumer_ptr 
+::Stock::StockNameConsumer_ptr
 StockDistributor_i::unsubscribe_notifier (::Stock::Cookie *ck)
   throw (::CORBA::SystemException,
          ::Stock::Invalid_Subscription)
@@ -70,7 +70,7 @@ StockDistributor_i::unsubscribe_notifier (::Stock::Cookie *ck)
       ACE_DEBUG ((LM_DEBUG, "ERROR: Cookie given to unsubscribe_notifier was null\n"));
       return 0;
     }
-  
+
   // Get mutual exclusion of the <subscribers_list_>.
   ACE_WRITE_GUARD_RETURN (ACE_RW_Thread_Mutex, guard, lock_, 0);
 
@@ -86,19 +86,19 @@ StockDistributor_i::unsubscribe_notifier (::Stock::Cookie *ck)
   // Erase the mapping from the <subscribers_list_>.
   Stock::StockNameConsumer_var consumer (iter->second.first._retn ());
   this->subscribers_list_.erase (iter);
-  
+
   // Return the StockNameConsumer to the client.
   return consumer._retn ();
 }
 
-::Stock::StockQuoter_ptr 
+::Stock::StockQuoter_ptr
 StockDistributor_i::provide_quoter_info (::Stock::Cookie *ck)
   throw (::CORBA::SystemException,
          ::Stock::Invalid_Subscription)
 {
   ACE_READ_GUARD_RETURN (ACE_RW_Thread_Mutex, guard, lock_, 0);
-  
-  try 
+
+  try
     {
       CookieMap::const_iterator iter = this->subscribers_list_.find (ck->cookie_id ());
 
@@ -106,11 +106,11 @@ StockDistributor_i::provide_quoter_info (::Stock::Cookie *ck)
 
       if (iter == this->subscribers_list_.end ())
         throw ::Stock::Invalid_Subscription ();
-  
-  
+
+
       StockQuoter_i *quoter = new StockQuoter_i;
       PortableServer::ServantBase_var owner_transfer (quoter);
-      PortableServer::ObjectId *oid = 
+      PortableServer::ObjectId *oid =
         this->rt_poa_->activate_object_with_priority (quoter,
                                                       iter->second.second);
 
@@ -126,12 +126,12 @@ StockDistributor_i::provide_quoter_info (::Stock::Cookie *ck)
     }
   catch (CORBA::Exception &ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "StockDistributor_i::provide_quoter_info");
+      ex._tao_print_exception ("StockDistributor_i::provide_quoter_info");
       return ::Stock::StockQuoter::_nil ();
     }
 }
 
-::CORBA::Long 
+::CORBA::Long
 StockDistributor_i::notification_rate ()
   throw (::CORBA::SystemException)
 {
@@ -146,33 +146,33 @@ StockDistributor_i::notification_rate (::CORBA::Long notification_rate)
   STOCK_DATABASE->update_rate (this->rate_);
 }
 
-void 
+void
 StockDistributor_i::start ()
   throw (::CORBA::SystemException)
 {
   STOCK_DATABASE->start ();
 }
 
-void 
+void
 StockDistributor_i::stop ()
   throw (::CORBA::SystemException)
 {
   STOCK_DATABASE->stop ();
 }
 
-void 
+void
 StockDistributor_i::shutdown ()
   throw (::CORBA::SystemException)
 {
   ACE_DEBUG ((LM_DEBUG, "Stopping publisher\n"));
   // Stop publishing events
   this->stop ();
-  
+
   ACE_DEBUG ((LM_DEBUG, "Deactivating the Distributor object\n"));
   // Deactivate this obj
   ::Stock::StockDistributor_var dist = this->_this ();
   PortableServer::ObjectId_var oid = this->rt_poa_->reference_to_id (dist.in ());
-  
+
   this->rt_poa_->deactivate_object (oid.in ());
 }
 
@@ -182,15 +182,15 @@ struct StrSeq_Converter
 {
   StrSeq_Converter (CORBA::StringSeq &seq)
     : seq_ (seq),
-      pos_ (0) 
+      pos_ (0)
   {
   }
-  
+
   void operator () (const std::string &str)
   {
     this->seq_[pos_++] = str.c_str ();
   }
-  
+
   CORBA::StringSeq &seq_;
   CORBA::ULong pos_;
 };
@@ -202,49 +202,49 @@ struct Stock_Publisher
   {
     CORBA::Object_var obj = orb->resolve_initial_references ("RTCurrent");
     rt_current_ = RTCORBA::Current::_narrow (obj.in ());
-    
+
     // Create the message
     sn_ = new OBV_Stock::StockNames ();
     sn_->names (stocks);
   }
-  
+
   void operator () (const StockDistributor_i::CookieMap::value_type &item)
   {
     try
       {
         // Set priority of the request
         this->rt_current_->the_priority (item.second.second);
-        
+
         // publish!
         item.second.first->push_StockName (this->sn_.in ());
       }
     catch (CORBA::Exception &ex)
       {
-        ACE_PRINT_EXCEPTION (ex, "Distributor: Stock_Publisher");
+        ex._tao_print_exception ("Distributor: Stock_Publisher");
       }
   }
-  
+
   RTCORBA::Current_var rt_current_;
   Stock::StockNames_var sn_;
 };
 
-    
-void 
+
+void
 StockDistributor_i::operator () (std::vector <std::string> &stocks)
 {
   ACE_DEBUG ((LM_DEBUG,
               "*** message: transmitting data to the StockNameConsumer, got %i stocks\n",
               stocks.size ()));
-  
+
   // Convert the stocks into a stringseq
   CORBA::StringSeq_var corba_stocks = new CORBA::StringSeq ();
   corba_stocks->length (stocks.size ());
-  
+
   std::for_each (stocks.begin (),
                  stocks.end (),
                  StrSeq_Converter (corba_stocks));
-  
-  
+
+
   ACE_READ_GUARD (ACE_RW_Thread_Mutex, g, lock_);
   std::for_each (this->subscribers_list_.begin (),
                  this->subscribers_list_.end (),
@@ -268,20 +268,20 @@ StockQuoter_i::get_stock_info (const char * stock_name)
 {
   // Obtain the stock information from the database.
   ACE_DEBUG ((LM_DEBUG, "*** message: requesting stock_info from the database\n"));
-  
+
   try
     {
       Stock_Database<StockDistributor_i>::StockInfo si
         (STOCK_DATABASE->get_stock_info (stock_name));
-      
+
       Stock::StockInfo_var stock_info = new Stock::StockInfo;
       stock_info->name = si.name_.c_str ();
       stock_info->high = si.high_;
       stock_info->low = si.low_;
       stock_info->last = si.last_;
-      
+
       return stock_info._retn ();
-      
+
     }
   catch (Stock_Database<StockDistributor_i>::Invalid_Stock &ex)
     {
@@ -295,10 +295,10 @@ StockDistributorHome_i::StockDistributorHome_i (CORBA::ORB_ptr orb)
   :     orb_ (CORBA::ORB::_duplicate (orb)),
         rt_poa_ (RTPortableServer::POA::_nil ()),
         dist_id_ (0)
-{ 
+{
   // Register this class as a signal handler to catch keyboard interrupts.
   if (orb_->orb_core ()->reactor ()->register_handler (SIGINT, this) == -1)
-    ACE_DEBUG ((LM_DEBUG, "ERROR: Failed to register as a signal handler: %p\n", 
+    ACE_DEBUG ((LM_DEBUG, "ERROR: Failed to register as a signal handler: %p\n",
                 "register_handler\n"));
 
   // Register the necessary factories and mappings with the specified
@@ -311,54 +311,54 @@ StockDistributorHome_i::StockDistributorHome_i (CORBA::ORB_ptr orb)
   Stock::Cookie_init *cookie_factory = new Stock::Cookie_init;
   this->orb_->register_value_factory (cookie_factory->tao_repository_id (),
                                cookie_factory);
-  
+
   Stock::Priority_Mapping::register_mapping (orb_.in ());
-  
+
   // Get a reference to the <RTORB>.
   CORBA::Object_var obj = orb_->resolve_initial_references ("RTORB");
   RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (obj.in ());
-  
+
   TAO::Utils::PolicyList_Destroyer policies (2);
   policies.length (2);
-  
+
   // Create a <SERVER_DECLARED> priority model policy.
   policies[0] =
     rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                           Stock::Priority_Mapping::VERY_LOW);
-  
+
   // Create a threadpool with lanes for the distributor. Since the brokers
   // will have various priorities, create a lane for each priority.
   RTCORBA::ThreadpoolLanes lanes (5); lanes.length (5);
-  
-  for (CORBA::ULong i = 0; i < lanes.length (); ++i) 
+
+  for (CORBA::ULong i = 0; i < lanes.length (); ++i)
     {
       lanes[i].lane_priority = static_cast<RTCORBA::Priority> (i);
       lanes[i].static_threads = 5;
       lanes[i].dynamic_threads = 0;
     }
-  
-  RTCORBA::ThreadpoolId threadpool_id = 
+
+  RTCORBA::ThreadpoolId threadpool_id =
     rt_orb->create_threadpool_with_lanes (1024*1024,
                                           lanes,
                                           false, false, 0, 0);
-  
+
   policies[1] = rt_orb->create_threadpool_policy (threadpool_id);
 
   PortableServer::POA_var poa = this->_default_POA ();
   PortableServer::POAManager_var poa_mgr = poa->the_POAManager ();
-  
+
   // Create a child POA with <SERVER_DECLARED> policies. The name of
   // the POA will be <StockDistributor_POA>. Any instances of the
   // StockDistributor_i created via the create() method will be
   // activated under this POA.
   PortableServer::POA_var child_poa =
-    poa->create_POA ("StockDistributor_POA", 
+    poa->create_POA ("StockDistributor_POA",
                      poa_mgr.in (),
                      policies);
-  
+
   // Narrow the POA to a RT POA, and cache the reference
   this->rt_poa_ = RTPortableServer::POA::_narrow (child_poa.in ());
-  
+
   // Create the initial distributor reference
   this->create_distributor ();
 }
@@ -368,12 +368,12 @@ StockDistributorHome_i::~StockDistributorHome_i (void)
 {
 }
 
-::Stock::StockDistributor_ptr 
+::Stock::StockDistributor_ptr
 StockDistributorHome_i::create ()
   throw (::CORBA::SystemException)
 {
   CORBA::Object_var obj;
-  
+
   try
     {
       obj = this->rt_poa_->id_to_reference (this->dist_id_.in ());
@@ -382,16 +382,16 @@ StockDistributorHome_i::create ()
     {
       ACE_DEBUG ((LM_DEBUG, "Caught an exception creating a reference to "
                   "distributor, creating a new one\n"));
-      
+
       this->create_distributor ();
       obj = this->rt_poa_->id_to_reference (this->dist_id_.in ());
     }
 
-  return Stock::StockDistributor::_narrow (obj.in ());      
+  return Stock::StockDistributor::_narrow (obj.in ());
 }
 
 
-int 
+int
 StockDistributorHome_i::handle_signal (int,
                                        siginfo_t *,
                                        ucontext_t *)
@@ -401,23 +401,23 @@ StockDistributorHome_i::handle_signal (int,
   try
     {
       ACE_DEBUG ((LM_DEBUG, "Commanding the distributor to shut down\n"));
-      CORBA::Object_var obj 
+      CORBA::Object_var obj
         (this->rt_poa_->id_to_reference (this->dist_id_.in ()));
 
-      Stock::StockDistributor_var dist 
+      Stock::StockDistributor_var dist
         (Stock::StockDistributor::_narrow (obj.in ()));
-      
+
       // kill the active distributor
       dist->shutdown ();
     }
-  catch (...) 
+  catch (...)
     {
       // Swallow any exceptions, distributor may already be dead
     }
-  
+
   ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n"));
   this->orb_->shutdown (true);
-  
+
   return 0;
 }
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
index 8fe636bcd96..a7f3f642c2c 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
@@ -49,11 +49,11 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna
             }
           catch (Stock::Invalid_Stock &e)
             {
-              ACE_PRINT_EXCEPTION (e, "Stock exception: invalid stock name: ");
+              e._tao_print_exception ("Stock exception: invalid stock name: ");
             }
           catch (CORBA::Exception &ex)
             {
-      ACE_PRINT_EXCEPTION (ex, "Stock_StockNameConsumer_i::push_StockName: ");
+      ex._tao_print_exception ("Stock_StockNameConsumer_i::push_StockName: ");
             }
         }
     }
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
index 395e31bf6b0..df62e93fd86 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
@@ -33,8 +33,7 @@ Stock_Consumer::disconnect ()
 }
 
 void
-Stock_Consumer::push (const RtecEventComm::EventSet &data
-                      ACE_ENV_ARG_DECL_NOT_USED)
+Stock_Consumer::push (const RtecEventComm::EventSet &data)
   throw (CORBA::SystemException)
 {
   for (CORBA::ULong i = 0; i != data.length (); ++i) {
@@ -52,7 +51,7 @@ Stock_Consumer::push (const RtecEventComm::EventSet &data
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stock_Consumer::disconnect_push_consumer (void)
     throw (CORBA::SystemException)
 {
   this->supplier_proxy_ =
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
index a82044836bc..17c8f5e4c0c 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
@@ -20,9 +20,9 @@ public:
   void disconnect ();
   // Disconnect from the event channel.
 
-  void push (const RtecEventComm::EventSet& data ACE_ENV_ARG_DECL_NOT_USED)
+  void push (const RtecEventComm::EventSet& data)
     throw (CORBA::SystemException);
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_consumer (void)
     throw (CORBA::SystemException);
 
 private:
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
index a042bbcb1ac..33ecce06d7c 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
@@ -16,12 +16,12 @@ protected:
       ref_count_(0) {}
 
 public:
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void _add_ref (void)
   {
     ++this->ref_count_;
   }
 
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void _remove_ref (void)
   {
     CORBA::ULong new_count = --this->ref_count_;
 
@@ -93,7 +93,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 }
 
 void
-Quoter_Stock_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Quoter_Stock_i::disconnect_push_supplier (void)
   throw (CORBA::SystemException)
 {
   // Forget about the consumer it is not there anymore
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
index 91b781df2ee..b107a1d177d 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
@@ -23,7 +23,7 @@ public:
   CORBA::Double price () throw (CORBA::SystemException);
   void set_price (CORBA::Double new_price) throw (CORBA::SystemException);
 
-  void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_supplier (void)
     throw (CORBA::SystemException);
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index 1bb6f2cbc19..978df100a3e 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -75,11 +75,10 @@ AMH_Servant::parse_args (int &argc, char **argv)
 
 void
 AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                          Test::Timestamp send_time
-                          ACE_ENV_ARG_DECL)
+                          Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       // @@ Mayur, the below Timer_Handler instance will leak if your
       //    schedule_timer() call below fails (which you do not check
@@ -96,7 +95,6 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
       long l = this->reactor_->schedule_timer (handler,
                                                (void *) 0,
                                                ACE_Time_Value (0, this->sleep_time_));
-      ACE_TRY_CHECK;
 
       if (l == -1) //schedule timer failed
         {
@@ -110,11 +108,10 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
           return;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Exception in start_test \n");
+      ex._tao_print_exception ("Exception in start_test \n");
     }
-  ACE_ENDTRY;
 
   // Footnote: This method is thread-safe:
   // - We have no common state (and don't alter any).
@@ -123,37 +120,31 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 }
 
 void
-AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-                         ACE_ENV_ARG_DECL)
+AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       _tao_rh->start_test ();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Exception in start_test \n");
+      ex._tao_print_exception ("Exception in start_test \n");
     }
-  ACE_ENDTRY;
 }
 
 void
-AMH_Servant::end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-                         ACE_ENV_ARG_DECL)
+AMH_Servant::end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       _tao_rh->end_test ();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Exception in end_test \n");
+      ex._tao_print_exception ("Exception in end_test \n");
     }
-  ACE_ENDTRY;
 }
 
 
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.h b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
index b71c32fe9df..26db1af6dba 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.h
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
@@ -33,17 +33,14 @@ public:
   virtual int parse_args (int& argc, char **argv);
 
   // = The skeleton methods
-  virtual void start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
+                            Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index b1a722b18d8..e4dc7055790 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -22,20 +22,17 @@ Base_Server::Base_Server (int& argc, char **argv)
 
 Base_Server::~Base_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_->destroy (1, 1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying Base_Server \n");
+      ex._tao_print_exception (
+        "Exception caught while destroying Base_Server \n");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -108,42 +105,33 @@ Base_Server::try_RT_scheduling (void)
 int
 Base_Server::start_orb_and_poa (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised initialising ORB or POA");
+      ex._tao_print_exception ("Exception raised initialising ORB or POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   // If we have got to this point, everything has gone well.  return
   // normally
@@ -153,33 +141,27 @@ Base_Server::start_orb_and_poa (void)
 void
 Base_Server::register_servant (AMH_Servant *servant)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Test::Roundtrip_var roundtrip =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (roundtrip.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (roundtrip.in ());
 
       (void) this->write_ior_to_file (ior.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while registering servant");
+      ex._tao_print_exception ("Exception raised while registering servant");
     }
-  ACE_ENDTRY;
 }
 
 
 void
 Base_Server::run_event_loop (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Time_Value period (0, 11000);
       while (1)
@@ -193,16 +175,14 @@ Base_Server::run_event_loop (void)
           // are never handled. This results in the server not sending
           // (some) replies to the client and the client just ends up
           // waiting (forever) for them.
-          this->orb_->perform_work (period ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->perform_work (period);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exceptionin Base_Server::run_event_loop");
+      ex._tao_print_exception (
+        "Caught exceptionin Base_Server::run_event_loop");
     }
-  ACE_ENDTRY;
 }
 
 int
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index 9b31627ae37..0780491cf91 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -84,19 +84,16 @@ Client_Task::try_RT_scheduling (void)
 int
 Client_Task::narrow_servant (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (this->argc_, this->argv_, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (this->argc_, this->argv_, "");
 
       CORBA::Object_var object =
-        orb->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (this->ior_);
 
       this->roundtrip_ =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (this->roundtrip_.in ()))
         {
@@ -106,13 +103,11 @@ Client_Task::narrow_servant (void)
                             0);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught trying to narrow servant\n");
+      ex._tao_print_exception ("Exception caught trying to narrow servant\n");
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
@@ -122,27 +117,23 @@ Client_Task::run_test (void)
   ACE_hrtime_t test_start = 0;
   ACE_hrtime_t test_end = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       test_start = ACE_OS::gethrtime ();
 
-      this->roundtrip_->start_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->roundtrip_->start_test ();
 
       this->svc ();
 
-      this->roundtrip_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->roundtrip_->end_test ();
 
       test_end = ACE_OS::gethrtime ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
 
 
   // High resolution timer calibration
@@ -164,25 +155,22 @@ Client_Task::run_test (void)
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       for (int i = 0; i != this->iterations_; ++i)
         {
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->roundtrip_->test_method (start);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           this->latency_.sample (now - start);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
diff --git a/TAO/examples/AMH/Sink_Server/Timer_Handler.cpp b/TAO/examples/AMH/Sink_Server/Timer_Handler.cpp
index a7f04ba0fb5..2eabb3b9e82 100644
--- a/TAO/examples/AMH/Sink_Server/Timer_Handler.cpp
+++ b/TAO/examples/AMH/Sink_Server/Timer_Handler.cpp
@@ -26,17 +26,16 @@ int
 Timer_Handler::handle_timeout (const ACE_Time_Value &,
                                const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->rh_->test_method (this->send_time_);
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in Timer_Handler::handle_timeout \n");
+      ex._tao_print_exception (
+        "Exception in Timer_Handler::handle_timeout \n");
       return -1;
     }
-  ACE_ENDTRY;
 
   // Returning -1 calls handle_close which will clean up and
   // deregister this handle from the reactor. DO not return anything
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index f4e81a5b099..48699b49cdd 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -11,34 +11,32 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
 }
 
 void
-Peer_Handler_i::request (CORBA::Long retval
-                         ACE_ENV_ARG_DECL)
+Peer_Handler_i::request (CORBA::Long retval)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static int i = 0;
   i++;
   if (i % 100 == 0)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d replies received\n", i));
-  this->peer_->reply (retval ACE_ENV_ARG_PARAMETER);
+  this->peer_->reply (retval);
 }
 
 
 void
 Peer_Handler_i::request_excep (
-    ::Messaging::ExceptionHolder *
-    ACE_ENV_ARG_DECL_NOT_USED)
+    ::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Peer_Handler_i::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Handler_i::start (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Peer_Handler_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Handler_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
@@ -56,33 +54,28 @@ Peer_i::~Peer_i (void)
 void
 Peer_i::init (CORBA::ORB_ptr orb,
               Progress_ptr progress,
-              const ACE_Time_Value &delay
-              ACE_ENV_ARG_DECL)
+              const ACE_Time_Value &delay)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
   this->progress_ = Progress::_duplicate (progress);
   this->delay_ = delay;
 
-  Peer_var peer = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Peer_var peer = this->_this ();
 
   ACE_DEBUG ((LM_DEBUG, "Peer (%P|%t) - binding\n"));
-  this->id_ = this->progress_->bind (peer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->id_ = this->progress_->bind (peer.in ());
 }
 
 void
-Peer_i::reply (CORBA::Long result
-               ACE_ENV_ARG_DECL)
+Peer_i::reply (CORBA::Long result)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->progress_->recv_reply (result ACE_ENV_ARG_PARAMETER);
+  this->progress_->recv_reply (result);
 }
 
 CORBA::Long
-Peer_i::request (CORBA::Long id
-                 ACE_ENV_ARG_DECL_NOT_USED)
+Peer_i::request (CORBA::Long id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv  = this->delay_;
@@ -93,13 +86,11 @@ Peer_i::request (CORBA::Long id
 
 void
 Peer_i::start (const PeerSet &the_peers,
-               CORBA::Long iterations
-               ACE_ENV_ARG_DECL)
+               CORBA::Long iterations)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   AMI_PeerHandler_var handler =
-    this->reply_handler_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->reply_handler_._this ();
 
   // @@ Report errors as exceptions...
   Peer_Task *task;
@@ -112,10 +103,10 @@ Peer_i::start (const PeerSet &the_peers,
 }
 
 void
-Peer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Peer_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 // ****************************************************************
@@ -141,22 +132,17 @@ Peer_Task::svc (void)
       CORBA::ULong l = this->the_peers_.length ();
       for (CORBA::ULong j = 0; j != l; ++j)
         {
-          ACE_TRY_NEW_ENV
+          try
             {
               this->the_peers_[j]->sendc_request (this->handler_.in (),
-                                                  this->id_
-                                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                  this->id_);
 
-              this->progress_->sent_request (this->id_
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->progress_->sent_request (this->id_);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               // Ignore exceptions;
             }
-          ACE_ENDTRY;
         }
       if (i % 100 == 0)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d requests sent\n", i));
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index 251ca6e57c6..99e5436445e 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -27,18 +27,16 @@ public:
   Peer_Handler_i (Peer_i *peer);
   // The peer
 
-  virtual void request (CORBA::Long retval
-                         ACE_ENV_ARG_DECL)
+  virtual void request (CORBA::Long retval)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void request_excep (::Messaging::ExceptionHolder * excep_holder
-                              ACE_ENV_ARG_DECL)
+  virtual void request_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void start (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -57,27 +55,23 @@ public:
 
   void init (CORBA::ORB_ptr orb,
              Progress_ptr progress,
-             const ACE_Time_Value &delay
-             ACE_ENV_ARG_DECL)
+             const ACE_Time_Value &delay)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void reply (CORBA::Long result
-              ACE_ENV_ARG_DECL)
+  void reply (CORBA::Long result)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used by the Reply_Handler to indicate that a reply has been
   // received.
 
    // = See test.idl for an explanation of these methods.
-  CORBA::Long request (CORBA::Long id
-                       ACE_ENV_ARG_DECL)
+  CORBA::Long request (CORBA::Long id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void start (const PeerSet& the_peers,
-              CORBA::Long iterations
-              ACE_ENV_ARG_DECL)
+              CORBA::Long iterations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index 91e6c571118..4bf0e7e1054 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -15,8 +15,7 @@ Progress_i::Progress_i (Progress_Window *window)
 }
 
 void
-Progress_i::sent_request (CORBA::Long id
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Progress_i::sent_request (CORBA::Long id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id));
@@ -24,20 +23,18 @@ Progress_i::sent_request (CORBA::Long id
 }
 
 void
-Progress_i::recv_reply (CORBA::Long id
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Progress_i::recv_reply (CORBA::Long id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->window_->recv_reply (id);
 }
 
 CORBA::Long
-Progress_i::bind (Peer_ptr a_peer
-                  ACE_ENV_ARG_DECL)
+Progress_i::bind (Peer_ptr a_peer)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Progress (%t) - peer bound\n"));
-  return this->window_->bind (a_peer ACE_ENV_ARG_PARAMETER);
+  return this->window_->bind (a_peer);
 }
 
 // ****************************************************************
@@ -127,8 +124,7 @@ Progress_Window::recv_reply (CORBA::Long id)
 }
 
 CORBA::Long
-Progress_Window::bind (Peer_ptr a_peer
-                       ACE_ENV_ARG_DECL_NOT_USED)
+Progress_Window::bind (Peer_ptr a_peer)
 {
   CORBA::ULong l = this->peers_.length ();
   this->peers_.length (l + 1);
@@ -151,20 +147,16 @@ Progress_Window::start ()
   if (this->peers_.length () < CORBA::ULong (this->n_peers_))
     return;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   for (CORBA::ULong i = 0; i != this->peers_.length (); ++i)
     {
-      ACE_TRY
+      try
         {
           this->peers_[i]->start (this->peers_,
-                                  this->n_iterations_
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                  this->n_iterations_);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions
         }
-      ACE_ENDTRY;
     }
 }
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index efb915e3b52..3761dd58206 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -34,8 +34,7 @@ public:
   void recv_reply (CORBA::Long id);
   // Keep track of the progress on each peer
 
-  CORBA::Long bind (Peer_ptr a_peer
-                    ACE_ENV_ARG_DECL);
+  CORBA::Long bind (Peer_ptr a_peer);
   // One of the peers has bound to the server
 
   void start (void);
@@ -74,14 +73,11 @@ public:
   // ctor
 
   // = The Progress methods.
-  void sent_request (CORBA::Long id
-                     ACE_ENV_ARG_DECL)
+  void sent_request (CORBA::Long id)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void recv_reply (CORBA::Long id
-                   ACE_ENV_ARG_DECL)
+  void recv_reply (CORBA::Long id)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  CORBA::Long bind (Peer_ptr a_peer
-                    ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long bind (Peer_ptr a_peer)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 529143d03f2..14fbfa282a2 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -6,8 +6,8 @@
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (FL_Callback, 
-           peer, 
+ACE_RCSID (FL_Callback,
+           peer,
            "$Id$")
 
 const char *ior = "file://progress.ior";
@@ -99,15 +99,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -115,35 +113,28 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var progress_object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Progress_var progress =
-        Progress::_narrow (progress_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Progress::_narrow (progress_object.in ());
 
       ACE_Time_Value delay (0, interval);
 
       Peer_i peer;
       peer.init (orb.in (),
                  progress.in (),
-                 delay
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                 delay);
 
       Worker worker (orb.in ());
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -156,13 +147,11 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index d5d9556a839..34c26812fda 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -56,12 +56,10 @@ int
 main (int argc, char *argv[])
 {
   TAO::FlResource_Loader fl_loader;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -85,8 +83,7 @@ main (int argc, char *argv[])
       sw.show ();
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -94,25 +91,20 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Progress_i server_impl (&sw);
 
       Progress_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -133,12 +125,10 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Fl::run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp
index 4b745c72953..2a7e57e6607 100644
--- a/TAO/examples/Advanced/ch_12/server.cpp
+++ b/TAO/examples/Advanced/ch_12/server.cpp
@@ -565,8 +565,7 @@ DeviceLocator_impl::
 preinvoke (const PortableServer::ObjectId & oid,
            PortableServer::POA_ptr          /*poa*/,
            const char *                     operation,
-           void * &                         /*cookie*/
-           ACE_ENV_ARG_DECL)
+           void * &                         /*cookie*/)
   throw (CORBA::SystemException, PortableServer::ForwardRequest)
 {
   // Convert object id into asset number.
@@ -704,8 +703,8 @@ main (int argc, char * argv[])
     }
   catch  (const CORBA::Exception & e)
     {
-      std::cerr << "Uncaught CORBA exception: " 
-                //<< e 
+      std::cerr << "Uncaught CORBA exception: "
+                //<< e
                 << std::endl;
       return 1;
     }
diff --git a/TAO/examples/Advanced/ch_12/server.h b/TAO/examples/Advanced/ch_12/server.h
index a68cfacd9ec..ce0413811a4 100644
--- a/TAO/examples/Advanced/ch_12/server.h
+++ b/TAO/examples/Advanced/ch_12/server.h
@@ -192,8 +192,7 @@ public:
   preinvoke (const PortableServer::ObjectId & oid,
              PortableServer::POA_ptr          poa,
              const char *                     operation,
-             void * &                         cookie
-             ACE_ENV_ARG_DECL)
+             void * &                         cookie)
     throw (CORBA::SystemException,
            PortableServer::ForwardRequest);
   virtual void
@@ -201,8 +200,7 @@ public:
               PortableServer::POA_ptr          /*poa*/,
               const char *                     /*operation*/,
               void *                           /*cookie*/,
-              PortableServer::Servant          /*servant*/
-              ACE_ENV_ARG_DECL)
+              PortableServer::Servant          /*servant*/)
     throw (CORBA::SystemException) {}
 private:
   Controller_impl *                   m_ctrl;
diff --git a/TAO/examples/Advanced/ch_3/client.cpp b/TAO/examples/Advanced/ch_3/client.cpp
index b8e0b3db2e5..49b11d92cea 100644
--- a/TAO/examples/Advanced/ch_3/client.cpp
+++ b/TAO/examples/Advanced/ch_3/client.cpp
@@ -29,10 +29,10 @@
 int
 main (int argc, char *argv[])
 {
-  try 
+  try
     {
       // Check arguments
-      if  (argc != 2) 
+      if  (argc != 2)
         {
           cerr << "Usage: client IOR_string" << endl;
           throw 0;
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
 
       // Destringify argv[1]
       CORBA::Object_var obj = orb->string_to_object (argv[1]);
-      if  (CORBA::is_nil (obj.in ())) 
+      if  (CORBA::is_nil (obj.in ()))
         {
           cerr << "Nil Time reference" << endl;
           throw 0;
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
       // Narrow
       Time_var tm = Time::_narrow (obj.in ());
 
-      if  (CORBA::is_nil (tm.in ())) 
+      if  (CORBA::is_nil (tm.in ()))
         {
           cerr << "Argument is not a Time reference" << endl;
           throw 0;
@@ -71,14 +71,13 @@ main (int argc, char *argv[])
            << setw (2) << setfill ('0') << tod.minute << ":"
            << setw (2) << setfill ('0') << tod.second << endl;
     }
-  catch  (const CORBA::Exception &x) 
+  catch  (const CORBA::Exception &x)
     {
-      ACE_PRINT_EXCEPTION (x,
-                           "Who is the culprit \n");
+      x._tao_print_exception ("Who is the culprit \n");
       cerr << "Uncaught CORBA exception" << endl;
       return 1;
     }
-  catch  (...) 
+  catch  (...)
     {
       return 1;
     }
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index f74694e7d6e..acc617edb2d 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -52,8 +52,7 @@ static int received_all_replies = 0;
 class Reply_Handler : public POA_AMI_testHandler
 {
 public:
-  void method (CORBA::ULong reply_number
-               ACE_ENV_ARG_DECL_NOT_USED)
+  void method (CORBA::ULong reply_number)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -65,41 +64,35 @@ public:
         received_all_replies = 1;
     }
 
-  void method_excep (::Messaging::ExceptionHolder *holder
-                     ACE_ENV_ARG_DECL)
+  void method_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_TRY
+    try
       {
-        holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        holder->raise_exception ();
       }
-    ACE_CATCH(CORBA::SystemException, ex)
+    catch (const CORBA::SystemException& ex)
       {
-        ACE_PRINT_EXCEPTION (ex, "Reply_Handler::method_excep: ");
+        ex._tao_print_exception ("Reply_Handler::method_excep: ");
       }
-    ACE_ENDTRY;
   }
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
-  void shutdown_excep (::Messaging::ExceptionHolder *holder
-                       ACE_ENV_ARG_DECL)
+  void shutdown_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_TRY
+    try
       {
-        holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        holder->raise_exception ();
       }
-    ACE_CATCH(CORBA::SystemException, ex)
+    catch (const CORBA::SystemException& ex)
       {
-        ACE_PRINT_EXCEPTION (ex, "Reply_Handler::shutdown_excep: ");
+        ex._tao_print_exception ("Reply_Handler::shutdown_excep: ");
       }
-    ACE_ENDTRY;
   }
 };
 
@@ -181,19 +174,14 @@ parse_args (int argc, char **argv)
 }
 
 void
-setup_buffering_constraints (CORBA::ORB_ptr orb
-                             ACE_ENV_ARG_DECL)
+setup_buffering_constraints (CORBA::ORB_ptr orb)
 {
   // Obtain PolicyCurrent.
-  CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent"
-                                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent");
 
   // Narrow down to correct type.
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::PolicyCurrent::_narrow (object.in ());
 
   // Start off with no constraints.
   TAO::BufferingConstraint buffering_constraint;
@@ -213,19 +201,14 @@ setup_buffering_constraints (CORBA::ORB_ptr orb
   // Setup the buffering constraint policy.
   buffering_constraint_policy_list[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_constraint_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        buffering_constraint_any);
 
   // Setup the constraints (at the ORB level).
   policy_current->set_policy_overrides (buffering_constraint_policy_list,
-                                        CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        CORBA::ADD_OVERRIDE);
 
   // We are done with the policy.
-  buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  buffering_constraint_policy_list[0]->destroy ();
 
   // Setup the none sync scope policy, i.e., the ORB will buffer AMI
   // calls.
@@ -242,35 +225,27 @@ setup_buffering_constraints (CORBA::ORB_ptr orb
   // Setup the none sync scope policy.
   sync_none_policy_list[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        sync_none_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        sync_none_any);
 
   // Setup the none sync scope (at the ORB level).
   policy_current->set_policy_overrides (sync_none_policy_list,
-                                        CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        CORBA::ADD_OVERRIDE);
 
   // We are now done with these policies.
-  sync_none_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  sync_none_policy_list[0]->destroy ();
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -278,41 +253,28 @@ main (int argc, char **argv)
         return parse_args_result;
 
       CORBA::Object_var base =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (base.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (base.in ());
 
       // Get an object reference from the argument string.
-      base = orb->string_to_object (IOR
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      base = orb->string_to_object (IOR);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Try to narrow the object reference to a <test> reference.
-      test_var test_object = test::_narrow (base.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test_object = test::_narrow (base.in ());
 
       Reply_Handler reply_handler_servant;
-      AMI_testHandler_var reply_handler_object = reply_handler_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      AMI_testHandler_var reply_handler_object = reply_handler_servant._this ();
 
       if (setup_buffering)
         {
-          setup_buffering_constraints (orb.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          setup_buffering_constraints (orb.in ());
         }
 
       for (CORBA::ULong i = 1; i <= iterations; ++i)
@@ -325,9 +287,7 @@ main (int argc, char **argv)
             {
               // Invoke the AMI method.
               test_object->sendc_method (reply_handler_object.in (),
-                                         i
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                         i);
             }
           else
             {
@@ -335,9 +295,7 @@ main (int argc, char **argv)
 
               // Invoke the regular method.
               test_object->method (i,
-                                   reply_number
-                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                   reply_number);
 
               ACE_DEBUG ((LM_DEBUG,
                           "client: Regular Reply %d @ %T\n",
@@ -348,8 +306,7 @@ main (int argc, char **argv)
           ACE_Time_Value sleep_interval (0,
                                          interval * 1000);
 
-          orb->run (sleep_interval ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (sleep_interval);
         }
 
       // Loop until all replies have been received.
@@ -361,14 +318,11 @@ main (int argc, char **argv)
       // Shutdown server.
       if (shutdown_server)
         {
-          test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_object->shutdown ();
         }
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
       // Destroy the ORB.  On some platforms, e.g., Win32, the socket
       // library is closed at the end of main().  This means that any
@@ -376,18 +330,14 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index 4049f81222e..7c49893a30a 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -39,28 +39,21 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -68,13 +61,10 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -87,26 +77,20 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp
index 0b3d8ffd45e..683b7cb6ed7 100644
--- a/TAO/examples/Buffered_AMI/test_i.cpp
+++ b/TAO/examples/Buffered_AMI/test_i.cpp
@@ -11,8 +11,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::method (CORBA::ULong request_number,
-                CORBA::ULong_out reply_number
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CORBA::ULong_out reply_number)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -23,9 +22,8 @@ test_i::method (CORBA::ULong request_number,
 }
 
 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);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h
index e42bb2e1bcd..e1263790a91 100644
--- a/TAO/examples/Buffered_AMI/test_i.h
+++ b/TAO/examples/Buffered_AMI/test_i.h
@@ -29,11 +29,10 @@ public:
 
   // = The test interface methods.
   void method (CORBA::ULong request_number,
-               CORBA::ULong_out reply_number
-               ACE_ENV_ARG_DECL_NOT_USED)
+               CORBA::ULong_out reply_number)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index 8f1469da973..15375e78566 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -116,17 +116,14 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -135,25 +132,17 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var base =
-        orb->string_to_object (IOR
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a <test> reference.
-      test_var test_object = test::_narrow (base.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test_object = test::_narrow (base.in ());
 
       // Obtain PolicyCurrent.
-      base = orb->resolve_initial_references ("PolicyCurrent"
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      base = orb->resolve_initial_references ("PolicyCurrent");
 
       // Narrow down to correct type.
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (base.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (base.in ());
 
       // Setup the none sync scope policy, i.e., the ORB will buffer
       // oneways.
@@ -170,19 +159,14 @@ main (int argc, char **argv)
       // Setup the none sync scope policy.
       sync_none_policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_none_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            sync_none_any);
 
       // Setup the none sync scope.
       policy_current->set_policy_overrides (sync_none_policy_list,
-                                            CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::ADD_OVERRIDE);
 
       // We are now done with this policy.
-      sync_none_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sync_none_policy_list[0]->destroy ();
 
       // Start off with no constraints.
       TAO::BufferingConstraint buffering_constraint;
@@ -226,11 +210,9 @@ main (int argc, char **argv)
       // Setup the buffering constraint policy.
       buffering_constraint_policy_list[0] =
         orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                            buffering_constraint_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            buffering_constraint_any);
 
-      if (buffering_constraint.mode == TAO::BUFFER_FLUSH) 
+      if (buffering_constraint.mode == TAO::BUFFER_FLUSH)
         {
           ACE_ERROR((LM_ERROR, "Error : Must specify a timeout, message"
             " count, or message bytes constraint.\n"));
@@ -239,9 +221,7 @@ main (int argc, char **argv)
 
       // Setup the constraints.
       policy_current->set_policy_overrides (buffering_constraint_policy_list,
-                                            CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::ADD_OVERRIDE);
 
       //
       // We use this policy again later. Therefore, we don't destroy
@@ -266,9 +246,7 @@ main (int argc, char **argv)
       // Setup the buffering flush policy.
       buffering_flush_policy_list[0] =
         orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                            buffering_flush_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            buffering_flush_any);
 
       //
       // Explicit flushing policy will be used later.
@@ -282,24 +260,18 @@ main (int argc, char **argv)
             {
               // Setup explicit flushing.
               policy_current->set_policy_overrides (buffering_flush_policy_list,
-                                                    CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                    CORBA::ADD_OVERRIDE);
 
               ACE_DEBUG ((LM_DEBUG,
                           "client: Iteration %d @ %T\n",
                           i));
 
               // Invoke the oneway method.
-              test_object->method (i
-                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              test_object->method (i);
 
               // Reset buffering policy.
               policy_current->set_policy_overrides (buffering_constraint_policy_list,
-                                                    CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                    CORBA::ADD_OVERRIDE);
             }
           else
             {
@@ -308,33 +280,27 @@ main (int argc, char **argv)
                           i));
 
               // Invoke the oneway method.
-              test_object->method (i
-                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              test_object->method (i);
             }
 
           // Interval between successive calls.
           ACE_Time_Value sleep_interval (0,
                                          interval * 1000);
 
-          orb->run (sleep_interval ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (sleep_interval);
         }
 
       // Shutdown server.
       if (shutdown_server)
         {
-          test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_object->shutdown ();
         }
 
       // We are done with the policy.
-      buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      buffering_constraint_policy_list[0]->destroy ();
 
       // We are done with the policy.
-      buffering_flush_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      buffering_flush_policy_list[0]->destroy ();
 
       // Destroy the ORB.  On some platforms, e.g., Win32, the socket
       // library is closed at the end of main().  This means that any
@@ -342,18 +308,14 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 3b900d8f8a3..f30643ea98a 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -37,28 +37,21 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -66,13 +59,10 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -85,26 +75,20 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp
index 95972fe8939..ab9ad6c7c48 100644
--- a/TAO/examples/Buffered_Oneways/test_i.cpp
+++ b/TAO/examples/Buffered_Oneways/test_i.cpp
@@ -10,8 +10,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::method (CORBA::ULong request_number
-                ACE_ENV_ARG_DECL_NOT_USED)
+test_i::method (CORBA::ULong request_number)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -20,9 +19,8 @@ test_i::method (CORBA::ULong request_number
 }
 
 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);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h
index c8a79e05bb3..674e65be4f9 100644
--- a/TAO/examples/Buffered_Oneways/test_i.h
+++ b/TAO/examples/Buffered_Oneways/test_i.h
@@ -28,11 +28,10 @@ public:
   // ctor.
 
   // = The test interface methods.
-  void method (CORBA::ULong request_number
-               ACE_ENV_ARG_DECL_NOT_USED)
+  void method (CORBA::ULong request_number)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
index a81a617566c..d3e1d5cb42b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
@@ -16,11 +16,10 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb
+    = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -32,9 +31,8 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->string_to_object(this->ior_.c_str());
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -43,8 +41,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Foo_var foo = Foo::_narrow(obj.in());
 
   if (CORBA::is_nil(foo.in()))
     {
@@ -55,12 +52,9 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   for (CORBA::Long i = 1; i <= 100; i++)
     {
-      foo->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      foo->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      CORBA::Long value = foo->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      foo->op1();
+      foo->op2(i);
+      CORBA::Long value = foo->op3();
 
       ACE_DEBUG((LM_DEBUG,
                  "(%P|%t) ===> Value retrieved from op3() == %d\n",
@@ -68,29 +62,25 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
       for (CORBA::Long j = 1; j <= 5; j++)
         {
-          foo->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          foo->op4(495 + (i * 5) + j);
         }
 
-      ACE_TRY_NEW_ENV
+      try
       {
-        foo->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        foo->op5();
       }
-      ACE_CATCH (FooException, ex)
+      catch (const FooException& )
       {
         ACE_DEBUG((LM_DEBUG,
                   "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
+
       }
-      ACE_ENDTRY;
     }
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ===> Tell server that we are done().\n"));
 
-  foo->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  foo->done();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ===> Back from done().\n"));
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
index 1c706005563..d4bd28ef6a5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
@@ -13,7 +13,7 @@ class ClientApp
     ClientApp();
     ~ClientApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
index 66e424d8781..f5659723d0e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
@@ -24,7 +24,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
@@ -34,7 +34,7 @@ Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
@@ -43,7 +43,7 @@ Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op3(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
@@ -52,7 +52,7 @@ Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
@@ -71,7 +71,7 @@ Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_op5_;
@@ -80,7 +80,7 @@ Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   unsigned num_left = --this->num_clients_;
@@ -102,7 +102,7 @@ Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)
                  this->count_op3_,
                  this->count_op4_,
                  this->count_op5_));
-      
+
       if (TheOrbShutdownTask::instance()->open(0) != 0)
         {
           ACE_ERROR((LM_ERROR, "(%P|%t)Foo_i::done: failed to create orb "\
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
index c1da2d5811b..2829a446f59 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
@@ -14,22 +14,22 @@ class Foo_i : public virtual POA_Foo
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op2(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op4(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException, FooException));
 
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp
index f9d551e8aee..ebcd029165c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp
@@ -25,7 +25,7 @@ OrbShutdownTask::~OrbShutdownTask()
 }
 
 
-void 
+void
 OrbShutdownTask::orb(CORBA::ORB_ptr orb)
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -53,18 +53,16 @@ OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->shutdown(0);
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::shutdown() call "
       "in OrbShutdownTask::svc().\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
index 8a107eff964..3f3330912ac 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
@@ -22,16 +22,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
+  int result = this->parse_args(argc, argv);
   if (result != 0)
     {
       return result;
@@ -39,9 +38,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   TheOrbShutdownTask::instance()->orb (orb.in ());
 
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -50,9 +48,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POA_var root_poa
+    = PortableServer::POA::_narrow(obj.in());
 
   if (CORBA::is_nil(root_poa.in()))
     {
@@ -61,20 +58,17 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA.
   CORBA::PolicyList policies(0);
   policies.length(0);
 
-  PortableServer::POA_var child_poa 
+  PortableServer::POA_var child_poa
     = root_poa->create_POA("ChildPoa",
                            poa_manager.in(),
-                           policies 
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                           policies);
 
   if (CORBA::is_nil(child_poa.in()))
     {
@@ -89,30 +83,26 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
                                                  new TAO::CSD::TP_Strategy();
 
   // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
+  if (csd_tp_strategy->apply_to(child_poa.in()) == false)
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
       ACE_THROW_RETURN (TestException(), -1);
     }
-  ACE_CHECK_RETURN (-1);
 
   // Create the servant object.
   Foo_i* servant = new Foo_i(this->num_clients_);
-    
+
   // local smart pointer variable to deal with releasing the reference
   // to the servant object when the smart pointer object falls out of scope.
   PortableServer::ServantBase_var owner_transfer(servant);
 
   // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = child_poa->activate_object(servant  
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::ObjectId_var oid
+    = child_poa->activate_object(servant);
 
   // Obtain the object reference.
-  obj = child_poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  obj = child_poa->servant_to_reference(servant);
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -122,9 +112,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
     }
 
   // Stringify the object reference
-  CORBA::String_var ior 
-    = orb->object_to_string(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var ior
+    = orb->object_to_string(obj.in());
 
   // Write the stringified object reference to the ior file.
   FILE* ior_file = ACE_OS::fopen(this->ior_filename_.c_str(), "w");
@@ -141,15 +130,13 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   ACE_OS::fclose(ior_file);
 
   // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
 
   // Run the ORB event loop.
-  orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->run();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp ORB has stopped running. "
@@ -167,14 +154,12 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   ACE_OS::sleep (2);
 
   // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy(1, 1);
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is destroying the ORB.\n"));
 
-  orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->destroy();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp has completed running successfully.\n"));
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
index ad89b43c972..efd5a586475 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
@@ -14,7 +14,7 @@ class ServerApp
     ServerApp();
     ~ServerApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
index 1f9c337ae54..2c768647052 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
@@ -22,24 +22,21 @@ main(int argc, char* argv[])
 
   ClientApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ClientApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
index 8c3c4b192a0..699e7a00dbe 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
@@ -20,24 +20,21 @@ main(int argc, char* argv[])
 
   ServerApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception in main() for ServerApp"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception in main() for ServerApp");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ServerApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
index 14e52e52804..b5ce48c7133 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
@@ -16,11 +16,10 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb
+    = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -32,9 +31,8 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->string_to_object(this->ior_.c_str());
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -43,8 +41,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Foo_var foo = Foo::_narrow(obj.in());
 
   if (CORBA::is_nil(foo.in()))
     {
@@ -55,12 +52,9 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   for (CORBA::Long i = 1; i <= 100; i++)
     {
-      foo->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      foo->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      CORBA::Long value = foo->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      foo->op1();
+      foo->op2(i);
+      CORBA::Long value = foo->op3();
 
       ACE_DEBUG((LM_DEBUG,
                  "(%P|%t) ===> Value retrieved from op3() == %d\n",
@@ -68,29 +62,25 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
       for (CORBA::Long j = 1; j <= 5; j++)
         {
-          foo->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          foo->op4(495 + (i * 5) + j);
         }
 
-      ACE_TRY_NEW_ENV
+      try
       {
-        foo->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        foo->op5();
       }
-      ACE_CATCH (FooException, ex)
+      catch (const FooException& )
       {
         ACE_DEBUG((LM_DEBUG,
                   "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
+
       }
-      ACE_ENDTRY;
     }
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ===> Tell server that we are done().\n"));
 
-  foo->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  foo->done();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ===> Back from done().\n"));
@@ -104,7 +94,7 @@ int
 ClientApp::parse_args(int argc, char* argv[])
 {
   this->exe_name_ = argv[0];
-  
+
   ACE_Get_Opt get_opts(argc, argv, "i:");
 
   int c;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
index 7dc57bb78dc..f4648822d1e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
@@ -14,7 +14,7 @@ class ClientApp
     ClientApp();
     ~ClientApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
index 1c1fc13eaf6..d47ceaf17ee 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
@@ -25,8 +25,7 @@ FooServantList::~FooServantList()
 
 
 void
-FooServantList::create_and_activate(PortableServer::POA_ptr poa
-                                    ACE_ENV_ARG_DECL)
+FooServantList::create_and_activate(PortableServer::POA_ptr poa)
 {
   for (unsigned i = 0; i < this->num_servants_; i++)
     {
@@ -39,27 +38,21 @@ FooServantList::create_and_activate(PortableServer::POA_ptr poa
       PortableServer::ObjectId_var id =
                     PortableServer::string_to_ObjectId(servant_name.c_str());
 
-      poa->activate_object_with_id(id.in(), 
-                                   this->servants_[i].in() 
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa->activate_object_with_id(id.in(),
+                                   this->servants_[i].in());
 
-      CORBA::Object_var obj = poa->id_to_reference(id.in()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Object_var obj = poa->id_to_reference(id.in());
 
       if (CORBA::is_nil(obj.in()))
         {
           ACE_ERROR((LM_ERROR,
                      "(%P|%t) Failed to activate servant (%s).\n",
                      servant_name.c_str()));
-          ACE_THROW (TestException());
+          throw TestException();
         }
 
-      CORBA::String_var ior 
-        = this->orb_->object_to_string(obj.in() 
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::String_var ior
+        = this->orb_->object_to_string(obj.in());
 
       ACE_CString filename = servant_name + ".ior";
       FILE* ior_file = ACE_OS::fopen(filename.c_str(), "w");
@@ -69,7 +62,7 @@ FooServantList::create_and_activate(PortableServer::POA_ptr poa
           ACE_ERROR((LM_ERROR,
                      "(%P|%t) Cannot open output file (%s) for writing IOR.",
                      filename.c_str()));
-          ACE_THROW (TestException());
+          throw TestException();
         }
 
       ACE_OS::fprintf(ior_file, "%s", ior.in());
@@ -79,7 +72,7 @@ FooServantList::create_and_activate(PortableServer::POA_ptr poa
 
 
 void
-FooServantList::client_done(ACE_ENV_SINGLE_ARG_DECL)
+FooServantList::client_done(void)
 {
   unsigned num_left;
 
@@ -94,6 +87,6 @@ FooServantList::client_done(ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_ERROR((LM_ERROR, "(%P|%t)FooServantList::client_done: "
             "failed to create orb shutdown thread.\n"));
-        }        
+        }
     }
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index d6e35ff894a..c07350e07b4 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -18,10 +18,9 @@ class FooServantList
                    CORBA::ORB_ptr orb);
     ~FooServantList();
 
-    void create_and_activate(PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL);
+    void create_and_activate(PortableServer::POA_ptr poa);
 
-    void client_done(ACE_ENV_SINGLE_ARG_DECL);
+    void client_done(void);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index 5923bb5b022..a6773b691ee 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -22,7 +22,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
@@ -32,7 +32,7 @@ Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
@@ -41,7 +41,7 @@ Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op3(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
@@ -50,7 +50,7 @@ Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
@@ -69,7 +69,7 @@ Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_op5_;
@@ -78,9 +78,8 @@ Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
-  this->mgr_->client_done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->mgr_->client_done();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
index d68b2bc84c1..e81153d9dc6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
@@ -16,22 +16,22 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op2(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op4(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException, FooException));
 
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp
index f9d551e8aee..ebcd029165c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp
@@ -25,7 +25,7 @@ OrbShutdownTask::~OrbShutdownTask()
 }
 
 
-void 
+void
 OrbShutdownTask::orb(CORBA::ORB_ptr orb)
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -53,18 +53,16 @@ OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->shutdown(0);
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::shutdown() call "
       "in OrbShutdownTask::svc().\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
index 30670fa4ee3..0ea97ea6429 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
@@ -25,10 +25,9 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -42,9 +41,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   TheOrbShutdownTask::instance()->orb (orb.in ());
 
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -53,9 +51,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POA_var root_poa
+    = PortableServer::POA::_narrow(obj.in());
 
   if (CORBA::is_nil(root_poa.in()))
     {
@@ -64,24 +61,19 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA.
   CORBA::PolicyList policies(1);
   policies.length(1);
 
-  policies[0] = root_poa->create_id_assignment_policy(PortableServer::USER_ID 
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0] = root_poa->create_id_assignment_policy(PortableServer::USER_ID);
 
-  PortableServer::POA_var child_poa 
+  PortableServer::POA_var child_poa
     = root_poa->create_POA("ChildPoa",
                            poa_manager.in(),
-                           policies
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                           policies);
 
   if (CORBA::is_nil(child_poa.in()))
     {
@@ -90,8 +82,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]->destroy ();
 
   // Create the thread pool servant dispatching strategy object, and
   // hold it in a (local) smart pointer variable.
@@ -101,32 +92,28 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   csd_tp_strategy->set_num_threads(this->num_servants_);
 
   // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
+  if (csd_tp_strategy->apply_to(child_poa.in()) == false)
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
       ACE_THROW_RETURN (TestException(), -1);
     }
-  ACE_CHECK_RETURN (-1);
 
   FooServantList servants(this->ior_filename_.c_str(),
                           this->num_servants_,
                           this->num_clients_,
                           orb.in());
 
-  servants.create_and_activate(child_poa.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  servants.create_and_activate(child_poa.in());
 
   // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
 
   // Run the ORB event loop.
-  orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->run();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp ORB has stopped running. "
@@ -144,14 +131,12 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
              "(%P|%t) ServerApp is destroying the Root POA.\n"));
 
   // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy(1, 1);
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is destroying the ORB.\n"));
 
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->destroy();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp has completed running successfully.\n"));
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
index 7556826f1e2..a6f69ecb395 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
@@ -13,7 +13,7 @@ class ServerApp
     ServerApp();
     ~ServerApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
index 545d6b52a9a..41d9b635f30 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
@@ -21,24 +21,21 @@ main(int argc, char* argv[])
 
   ClientApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ClientApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
index bb14220d3c7..1fa02daa71b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
@@ -21,24 +21,21 @@ main(int argc, char* argv[])
 
   ServerApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ServerApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
index b55bdff6842..f5301dfc2d2 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
@@ -16,11 +16,10 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb
+    = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -32,9 +31,8 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->string_to_object(this->ior_.c_str());
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -43,8 +41,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Foo_var foo = Foo::_narrow(obj.in());
 
   if (CORBA::is_nil(foo.in()))
     {
@@ -55,12 +52,9 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   for (CORBA::Long i = 1; i <= 100; i++)
     {
-      foo->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      foo->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      CORBA::Long value = foo->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      foo->op1();
+      foo->op2(i);
+      CORBA::Long value = foo->op3();
 
       ACE_DEBUG((LM_DEBUG,
                  "(%P|%t) ===> Value retrieved from op3() == %d\n",
@@ -68,29 +62,25 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
       for (CORBA::Long j = 1; j <= 5; j++)
         {
-          foo->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          foo->op4(495 + (i * 5) + j);
         }
 
-      ACE_TRY_NEW_ENV
+      try
       {
-        foo->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        foo->op5();
       }
-      ACE_CATCH (FooException, ex)
+      catch (const FooException& )
       {
         ACE_DEBUG((LM_DEBUG,
                   "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
+
       }
-      ACE_ENDTRY;
     }
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ===> Tell server that we are done().\n"));
 
-  foo->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  foo->done();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ===> Back from done().\n"));
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
index 7dc57bb78dc..f4648822d1e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
@@ -14,7 +14,7 @@ class ClientApp
     ClientApp();
     ~ClientApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
index 39a83de2507..bbc9b5fa385 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
@@ -16,14 +16,14 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
 
 void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->value_ = value;
@@ -31,7 +31,7 @@ Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op3(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   return this->value_;
@@ -40,7 +40,7 @@ Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->value_ = value;
@@ -48,15 +48,15 @@ Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
-  ACE_THROW (FooException());
+  throw FooException();
 }
 
 
 void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   unsigned num_left = --this->num_clients_;
@@ -67,6 +67,6 @@ Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_ERROR((LM_ERROR, "(%P|%t)Foo_i::done: "
             "failed to create orb shutdown thread.\n"));
-        }        
+        }
     }
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
index 3e000a7954a..7bd860e3640 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
@@ -12,22 +12,22 @@ class Foo_i : public virtual POA_Foo
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op2(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op4(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException, FooException));
 
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp
index f9d551e8aee..ebcd029165c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp
@@ -25,7 +25,7 @@ OrbShutdownTask::~OrbShutdownTask()
 }
 
 
-void 
+void
 OrbShutdownTask::orb(CORBA::ORB_ptr orb)
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -53,18 +53,16 @@ OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->shutdown(0);
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::shutdown() call "
       "in OrbShutdownTask::svc().\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp
index 390bbe8a317..a4955817b4b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp
@@ -74,18 +74,16 @@ OrbTask::open(void*)
 int
 OrbTask::svc()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->run();
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
                "(%P|%t) Exception raised by ORB::run() method. "
                "OrbTask is stopping.\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
index 0c7aecbc33d..62a7bb49b6b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
@@ -25,16 +25,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
+  int result = this->parse_args(argc, argv);
   if (result != 0)
     {
       return result;
@@ -42,9 +41,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   TheOrbShutdownTask::instance()->orb (orb.in ());
 
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -53,9 +51,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POA_var root_poa
+    = PortableServer::POA::_narrow(obj.in());
 
   if (CORBA::is_nil(root_poa.in()))
     {
@@ -64,20 +61,17 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA.
   CORBA::PolicyList policies(0);
   policies.length(0);
 
-  PortableServer::POA_var child_poa 
+  PortableServer::POA_var child_poa
     = root_poa->create_POA("ChildPoa",
                            poa_manager.in(),
-                           policies 
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                           policies);
 
   if (CORBA::is_nil(child_poa.in()))
     {
@@ -92,13 +86,12 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
                                                  new TAO::CSD::TP_Strategy();
 
   // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
+  if (csd_tp_strategy->apply_to(child_poa.in()) == false)
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
       ACE_THROW_RETURN (TestException(), -1);
     }
-  ACE_CHECK_RETURN (-1);
 
   // Create the servant object.
   Foo_i* servant = new Foo_i(this->num_clients_);
@@ -108,13 +101,11 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   PortableServer::ServantBase_var owner_transfer(servant);
 
   // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = child_poa->activate_object(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::ObjectId_var oid
+    = child_poa->activate_object(servant);
 
   // Obtain the object reference.
-  obj = child_poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  obj = child_poa->servant_to_reference(servant);
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -124,9 +115,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
     }
 
   // Stringify the object reference
-  CORBA::String_var ior 
-    = orb->object_to_string(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var ior
+    = orb->object_to_string(obj.in());
 
   // Write the stringified object reference to the ior file.
   FILE* ior_file = ACE_OS::fopen(this->ior_filename_.c_str(), "w");
@@ -143,8 +133,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   ACE_OS::fclose(ior_file);
 
   // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is ready.\n"));
@@ -155,8 +144,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
     {
       // Since the num_orb_threads_ is exactly one, we just use the current
       // (mainline) thread to run the ORB event loop.
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      orb->run();
     }
   else
     {
@@ -175,8 +163,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
         }
 
       // This will use the current (mainline) thread to run the ORB event loop.
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      orb->run();
 
       // Now that the current thread has unblocked from running the orb,
       // make sure to wait for all of the worker threads to complete.
@@ -192,10 +179,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   ACE_OS::sleep (2);
 
   // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy(1, 1);
+  orb->destroy();
 
   return 0;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
index 9ffd10f0507..f5f61c84eb4 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
@@ -14,7 +14,7 @@ class ServerApp
     ServerApp();
     ~ServerApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
index f1b0c4cb08a..34c9ba2b3d7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
@@ -21,24 +21,21 @@ main(int argc, char* argv[])
 
   ClientApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ClientApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
index cad2b8e119d..6aa553483aa 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
@@ -19,24 +19,21 @@ main(int argc, char* argv[])
 
   ServerApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ServerApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
index c243461dcaa..61712fb4fae 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
@@ -12,9 +12,8 @@ Callback_i::~Callback_i ()
 }
 
 
-void 
+void
 Callback_i::test_method (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
index dae67d71eb0..d9e41b60de4 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
@@ -14,7 +14,6 @@ class Callback_i : public virtual POA_Callback
     virtual ~Callback_i();
 
     virtual void test_method (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
index 755407ac48b..637f5b9b587 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
@@ -51,18 +51,15 @@ ClientTask::svc()
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ClientTask::svc start\n"));
 
-  ACE_TRY_NEW_ENV
+  try
   {
     for (CORBA::Long i = 1; i <= 100; i++)
     {
       // Simple Two-way calls.
-      this->foo_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->op1();
 
-      this->foo_->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Long value = this->foo_->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->op2(i);
+      CORBA::Long value = this->foo_->op3();
 
       ACE_DEBUG((LM_DEBUG,
                  "(%P|%t) ===> Value retrieved from op3() == %d\n",
@@ -70,30 +67,26 @@ ClientTask::svc()
 
       for (CORBA::Long j = 1; j <= 5; j++)
         {
-          this->foo_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->foo_->op4(495 + (i * 5) + j);
         }
 
-      ACE_TRY_EX (op5)
+      try
       {
         ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Invoke op5()\n"));
-        this->foo_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (op5);
+        this->foo_->op5();
         ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> No exception raised from op5().  :-(\n"));
       }
-      ACE_CATCH (FooException, ex)
+      catch (const FooException& )
       {
         ACE_DEBUG((LM_DEBUG,
                    "(%P|%t) ===> Caught FooException - as expected.\n"));
 
       }
-      ACE_ENDTRY;
 
       // Two-Way calls with inout parameters.
       CORBA::String_var message = CORBA::string_dup( "Hello! " );
       CORBA::Boolean result
-        = this->foo_->op6( "TAO User", message.inout() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = this->foo_->op6( "TAO User", message.inout());
 
       if (result)
         {
@@ -108,20 +101,16 @@ ClientTask::svc()
         }
 
       // Callback test.
-      this->foo_->callback_object (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->callback_object (this->callback_.in ());
 
-      this->foo_->test_callback (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_callback ();
 
       // One-Way calls with various arguments.
       CORBA::String_var ub_string = CORBA::string_dup( "UNBOUNDED STRING" );
-      this->foo_->test_unbounded_string_arg (ub_string.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_unbounded_string_arg (ub_string.in ());
 
       CORBA::String_var bd_string = CORBA::string_dup( "BOUNDED STRING" );
-      this->foo_->test_bounded_string_arg (bd_string.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_bounded_string_arg (bd_string.in ());
 
       Fixed_Array fixed_array;
 
@@ -130,23 +119,19 @@ ClientTask::svc()
           fixed_array[m] = i + m;
         }
 
-      this->foo_->test_fixed_array_arg (fixed_array ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_fixed_array_arg (fixed_array);
 
       Var_Array var_array;
       var_array[0] = CORBA::string_dup( "STRING 1" );
       var_array[1] = CORBA::string_dup( "STRING 2" );
       var_array[2] = CORBA::string_dup( "STRING 3" );
-      this->foo_->test_var_array_arg (var_array ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_var_array_arg (var_array);
 
       Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
       char * buffer1 = CORBA::string_dup ("BOUNDED VAR SIZE CHAR");
       bd_var_size_string->replace (ACE_OS::strlen (buffer1) + 1,
                                    buffer1, true);
-      this->foo_->test_bounded_var_size_arg (bd_var_size_string.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_bounded_var_size_arg (bd_var_size_string.in ());
 
       char * buffer2 = CORBA::string_dup ("UNBOUNDED VAR SIZE CHAR");
       Unbounded_Var_Size_var ub_var_size_string = new Unbounded_Var_Size(100);
@@ -154,47 +139,38 @@ ClientTask::svc()
                                    ACE_OS::strlen (buffer2) + 1,
                                    buffer2,
                                    true);
-      this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ());
 
       TimeOfDay t;
       t.hour = 12;
       t.minute = 30;
       t.second = 10;
-      this->foo_->test_fixed_size_arg (t ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_fixed_size_arg (t);
 
-      this->foo_->test_fixed_size_arg_two_way (t ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_fixed_size_arg_two_way (t);
 
       CORBA::Boolean special_value = 1;
-      this->foo_->test_special_basic_arg (special_value ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_special_basic_arg (special_value);
 
-      this->foo_->test_objref_arg (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_objref_arg (this->callback_.in ());
     }
 
     ACE_DEBUG((LM_DEBUG,
               "(%P|%t) ClientTask::svc - Invoke foo->done()\n"));
 
-    this->foo_->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->foo_->done ();
     ACE_DEBUG((LM_DEBUG,
               "(%P|%t) ClientTask::svc - Back from foo->done()\n"));
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in ClientTask::svc():");
+     ex._tao_print_exception ("Caught exception in ClientTask::svc():");
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
                "(%P|%t) Unknown (...) exception caught in ClientTask::svc()\n"));
   }
-  ACE_ENDTRY;
 
 
   ACE_DEBUG((LM_DEBUG,
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index ad128eb15d6..9ae1781b873 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -21,7 +21,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
@@ -31,7 +31,7 @@ Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
@@ -40,7 +40,7 @@ Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op3(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
@@ -49,7 +49,7 @@ Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
@@ -68,7 +68,7 @@ Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - ENTER\n"));
@@ -80,11 +80,10 @@ Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)
 }
 
 
-CORBA::Boolean 
+CORBA::Boolean
 Foo_i::op6 (
   const char * user_name,
   char *& message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -98,40 +97,37 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::test_unbounded_string_arg (
   const char * message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
 CORBA::SystemException
 ))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ")
-                       ACE_TEXT("got unbounded string %s\n"), 
+                       ACE_TEXT("got unbounded string %s\n"),
                        message));
 }
 
 
-void 
+void
 Foo_i::test_bounded_string_arg (
   const char * message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
 CORBA::SystemException
 ))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ")
-                       ACE_TEXT("got bounded string %s\n"), 
+                       ACE_TEXT("got bounded string %s\n"),
                        message));
 }
 
 
-void 
+void
 Foo_i::test_fixed_array_arg (
   const ::Fixed_Array message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -140,31 +136,29 @@ ACE_THROW_SPEC ((
   for (CORBA::ULong i = 0; i < 20; i++)
     {
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_array_arg ")
-                           ACE_TEXT("got fixed_array[i] = %d\n"), 
+                           ACE_TEXT("got fixed_array[i] = %d\n"),
                            i, message[i]));
     }
 }
 
 
-void 
+void
 Foo_i::test_bounded_var_size_arg (
   const ::Bounded_Var_Size & message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
 ))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ")
-                       ACE_TEXT("got var array chars %s\n"), 
+                       ACE_TEXT("got var array chars %s\n"),
                        message.get_buffer ()));
 }
 
 
-void 
+void
 Foo_i::test_unbounded_var_size_arg (
   const ::Unbounded_Var_Size & message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -176,10 +170,9 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::test_fixed_size_arg (
   const ::TimeOfDay & t
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -190,10 +183,9 @@ ACE_THROW_SPEC ((
                        t.hour, t.minute, t.second));
 }
 
-void 
+void
 Foo_i::test_fixed_size_arg_two_way (
   const ::TimeOfDay & t
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -204,10 +196,9 @@ ACE_THROW_SPEC ((
                        t.hour, t.minute, t.second));
 }
 
-void 
+void
 Foo_i::test_var_array_arg (
   const ::Var_Array messages
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -222,10 +213,9 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::test_special_basic_arg (
   ::CORBA::Boolean value
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -236,10 +226,9 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::test_objref_arg (
   ::Callback_ptr cb
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -251,10 +240,9 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::callback_object (
   ::Callback_ptr cb
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -263,9 +251,8 @@ ACE_THROW_SPEC ((
   this->callback_ = Callback::_duplicate (cb);
 }
 
-void 
+void
 Foo_i::test_callback (
-  ACE_ENV_SINGLE_ARG_DECL
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException, FooException
@@ -273,18 +260,17 @@ ACE_THROW_SPEC ((
 {
   if (CORBA::is_nil (this->callback_.in ()))
     {
-      ACE_THROW (FooException ());
+      throw FooException ();
     }
   else
     {
-      this->callback_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->callback_->test_method ();
     }
 }
 
 
 void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned> num_clients = 2;
@@ -297,6 +283,6 @@ Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_ERROR((LM_ERROR, "(%P|%t)Foo_i::done: "
             "failed to create orb shutdown thread.\n"));
-        }  
+        }
     }
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
index e5b465d24c6..bb209487d87 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
@@ -17,25 +17,24 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name);
     virtual ~Foo_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op2(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op4(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException, FooException));
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
         char *& message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -43,31 +42,27 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_unbounded_string_arg (
         const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
     virtual void test_bounded_string_arg (
         const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
     virtual void test_fixed_array_arg (
         const ::Fixed_Array message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
     virtual void test_var_array_arg (
         const ::Var_Array messages
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -75,15 +70,13 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_bounded_var_size_arg (
         const ::Bounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void test_unbounded_var_size_arg (
         const ::Unbounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -91,7 +84,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_fixed_size_arg (
         const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -99,7 +91,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_fixed_size_arg_two_way (
         const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -107,7 +98,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_special_basic_arg (
         ::CORBA::Boolean value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -115,7 +105,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_objref_arg (
         ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -123,20 +112,18 @@ class Foo_i : public virtual POA_Foo
 
     virtual void callback_object (
         ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void test_callback (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException, FooException
       ));
-  
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp
index f9d551e8aee..ebcd029165c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp
@@ -25,7 +25,7 @@ OrbShutdownTask::~OrbShutdownTask()
 }
 
 
-void 
+void
 OrbShutdownTask::orb(CORBA::ORB_ptr orb)
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -53,18 +53,16 @@ OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->shutdown(0);
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::shutdown() call "
       "in OrbShutdownTask::svc().\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
index f5e5a1006d8..09a9a31049a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
@@ -26,16 +26,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
+  int result = this->parse_args(argc, argv);
   if (result != 0)
     {
       return result;
@@ -46,14 +45,10 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   if (synch_with_server_)
   {
     CORBA::Object_var manager_object =
-      orb_->resolve_initial_references("ORBPolicyManager" 
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      orb_->resolve_initial_references("ORBPolicyManager");
 
-    CORBA::PolicyManager_var policy_manager 
-      = CORBA::PolicyManager::_narrow(manager_object.in() 
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    CORBA::PolicyManager_var policy_manager
+      = CORBA::PolicyManager::_narrow(manager_object.in());
 
     if (CORBA::is_nil (policy_manager.in ()))
     {
@@ -64,27 +59,21 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
     CORBA::Any policy_value;
     policy_value <<= Messaging::SYNC_WITH_SERVER;
-    CORBA::PolicyList policies(1); 
+    CORBA::PolicyList policies(1);
     policies.length(1);
 
     policies[0] =
       orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                          policy_value
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+                          policy_value);
 
     policy_manager->set_policy_overrides (policies,
-                                          CORBA::ADD_OVERRIDE
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+                                          CORBA::ADD_OVERRIDE);
 
-    policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    policies[0]->destroy ();
   }
 
-  CORBA::Object_var obj 
-    = orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -93,9 +82,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POA_var root_poa
+    = PortableServer::POA::_narrow(obj.in());
 
   if (CORBA::is_nil(root_poa.in()))
     {
@@ -104,23 +92,18 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA.
   CORBA::PolicyList policies(1);
   policies.length(1);
 
-  policies[0] = root_poa->create_id_assignment_policy(PortableServer::USER_ID 
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0] = root_poa->create_id_assignment_policy(PortableServer::USER_ID);
 
   PortableServer::POA_var child_poa_1 = root_poa->create_POA("ChildPoa_1",
                                                            poa_manager.in(),
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                           policies);
 
   if (CORBA::is_nil(child_poa_1.in()))
     {
@@ -131,9 +114,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   PortableServer::POA_var child_poa_2 = root_poa->create_POA("ChildPoa_2",
                                                            poa_manager.in(),
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                           policies);
 
   if (CORBA::is_nil(child_poa_2.in()))
     {
@@ -142,8 +123,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]->destroy ();
 
   // Create the thread pool servant dispatching strategy object, and
   // hold it in a (local) smart pointer variable.
@@ -155,39 +135,29 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   csd_tp_strategy->set_num_threads(2);
 
   // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa_1.in() ACE_ENV_ARG_PARAMETER) == false)
+  if (csd_tp_strategy->apply_to(child_poa_1.in()) == false)
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa 1.\n"));
       ACE_THROW_RETURN (TestException(), -1);
     }
-  ACE_CHECK_RETURN (-1);
-
-  Foo_var foo1 = this->create_foo(child_poa_1.in(), 
-                                  "foo_applied_strategy"
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  Foo_var foo2 = this->create_foo(child_poa_2.in(), 
-                                  "foo_not_applied_strategy"
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  Callback_var callback1 
-    = this->create_callback(child_poa_1.in(), 
-                            "callback_applied_strategy"
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  Callback_var callback2 
-    = this->create_callback(child_poa_2.in(), 
-                            "callback_not_applied_strategy"
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  Foo_var foo1 = this->create_foo(child_poa_1.in(),
+                                  "foo_applied_strategy");
+
+  Foo_var foo2 = this->create_foo(child_poa_2.in(),
+                                  "foo_not_applied_strategy");
+
+  Callback_var callback1
+    = this->create_callback(child_poa_1.in(),
+                            "callback_applied_strategy");
+
+  Callback_var callback2
+    = this->create_callback(child_poa_2.in(),
+                            "callback_not_applied_strategy");
 
   // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
@@ -195,7 +165,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   // Wait for the custom stretegy launch the dispatching threads.
   ACE_OS::sleep (2);
 
-  ClientTask client1 (foo1.in (), callback1.in ()); 
+  ClientTask client1 (foo1.in (), callback1.in ());
   if (client1.open() != 0)
     {
       ACE_ERROR((LM_ERROR,
@@ -212,8 +182,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
     }
 
   // Run the ORB event loop.
-  orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb_->run();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp ORB has stopped running.\n"));
@@ -236,14 +205,12 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
              "(%P|%t) ServerApp is destroying the Root POA.\n"));
 
   // Tear-down the root poa and orb_.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy(1, 1);
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is destroying the ORB.\n"));
 
-  orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb_->destroy();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp has completed running successfully.\n"));
@@ -281,25 +248,22 @@ ServerApp::parse_args(int argc, char* argv[])
 
   return 0;
 }
-  
+
 
 Foo_ptr
 ServerApp::create_foo (
-  PortableServer::POA_ptr poa, 
-  const char* servant_name
-  ACE_ENV_ARG_DECL)
+  PortableServer::POA_ptr poa,
+  const char* servant_name)
 {
-  PortableServer::ServantBase_var servant 
+  PortableServer::ServantBase_var servant
     = new Foo_i(servant_name);
 
   PortableServer::ObjectId_var id =
                 PortableServer::string_to_ObjectId(servant_name);
 
-  poa->activate_object_with_id(id.in(), servant.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Foo::_nil ());
+  poa->activate_object_with_id(id.in(), servant.in());
 
-  CORBA::Object_var obj = poa->id_to_reference(id.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Foo::_nil ());
+  CORBA::Object_var obj = poa->id_to_reference(id.in());
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -309,8 +273,7 @@ ServerApp::create_foo (
       ACE_THROW_RETURN (TestException(), Foo::_nil ());
     }
 
-  Foo_var foo = Foo::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Foo::_nil ());
+  Foo_var foo = Foo::_narrow (obj.in ());
 
   return foo._retn ();
 }
@@ -318,20 +281,17 @@ ServerApp::create_foo (
 Callback_ptr
 ServerApp::create_callback(
   PortableServer::POA_ptr poa,
-  const char* servant_name
-  ACE_ENV_ARG_DECL)
+  const char* servant_name)
 {
-  PortableServer::ServantBase_var servant 
+  PortableServer::ServantBase_var servant
     = new Callback_i();
 
   PortableServer::ObjectId_var id =
     PortableServer::string_to_ObjectId("callback");
 
-  poa->activate_object_with_id(id.in(), servant.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Callback::_nil ());
+  poa->activate_object_with_id(id.in(), servant.in());
 
-  CORBA::Object_var obj = poa->id_to_reference(id.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Callback::_nil ());
+  CORBA::Object_var obj = poa->id_to_reference(id.in());
 
   if (CORBA::is_nil(obj.in()))
   {
@@ -341,8 +301,7 @@ ServerApp::create_callback(
     ACE_THROW_RETURN (TestException(), Callback::_nil ());
   }
 
-  Callback_var callback = Callback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Callback::_nil ());
+  Callback_var callback = Callback::_narrow (obj.in ());
 
   return callback._retn ();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
index 0c10f8341d0..b79e2fd3e67 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
@@ -13,9 +13,9 @@ class ServerApp
     ServerApp();
     ~ServerApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
+
 
-   
   private:
 
     int parse_args(int argc, char* argv[]);
@@ -23,15 +23,13 @@ class ServerApp
 
     Foo_ptr
     create_foo(
-      PortableServer::POA_ptr poa, 
-      const char* servant_name
-      ACE_ENV_ARG_DECL);
+      PortableServer::POA_ptr poa,
+      const char* servant_name);
 
     Callback_ptr
     create_callback(
       PortableServer::POA_ptr poa,
-      const char* servant_name
-      ACE_ENV_ARG_DECL);
+      const char* servant_name);
 
 
     ACE_CString exe_name_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
index d0884b4aeb4..ae4b26425fb 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
@@ -20,24 +20,21 @@ main(int argc, char* argv[])
 
   ServerApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ServerApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
index c243461dcaa..61712fb4fae 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
@@ -12,9 +12,8 @@ Callback_i::~Callback_i ()
 }
 
 
-void 
+void
 Callback_i::test_method (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
index fe35e4d2e74..016ff3fb464 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
@@ -14,7 +14,6 @@ class Callback_i : public virtual POA_Callback
     virtual ~Callback_i();
 
     virtual void test_method (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
index 36adb94e0d8..ae572aae83e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
@@ -22,11 +22,10 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb
+    = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -38,9 +37,8 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->string_to_object(this->ior_.c_str());
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -49,8 +47,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Foo_var foo = Foo::_narrow(obj.in());
 
   if (CORBA::is_nil(foo.in()))
     {
@@ -61,8 +58,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   // Create the callback object using the child poa with the custom
   // strategy.
-  obj = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  obj = orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -71,9 +67,8 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POA_var root_poa
+    = PortableServer::POA::_narrow(obj.in());
 
   if (CORBA::is_nil(root_poa.in()))
     {
@@ -82,20 +77,17 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA.
   CORBA::PolicyList policies(0);
   policies.length(0);
 
-  PortableServer::POA_var child_poa 
+  PortableServer::POA_var child_poa
     = root_poa->create_POA("ChildPoa",
                            poa_manager.in(),
-                           policies 
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                           policies);
 
   if (CORBA::is_nil(child_poa.in()))
     {
@@ -112,13 +104,12 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   csd_tp_strategy->set_num_threads(1);
 
   // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
+  if (csd_tp_strategy->apply_to(child_poa.in()) == false)
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
       ACE_THROW_RETURN (TestException(), -1);
     }
-  ACE_CHECK_RETURN (-1);
 
   // Create the servant object.
   Callback_i* servant = new Callback_i ();
@@ -128,14 +119,11 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   PortableServer::ServantBase_var owner_transfer(servant);
 
   // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = child_poa->activate_object(servant 
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::ObjectId_var oid
+    = child_poa->activate_object(servant);
 
   // Obtain the object reference.
-  obj = child_poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  obj = child_poa->servant_to_reference(servant);
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -144,8 +132,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  Callback_var callback = Callback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Callback_var callback = Callback::_narrow (obj.in ());
 
   ClientTask client_task(orb.in (), foo.in (), callback.in ());
 
@@ -155,14 +142,12 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
     }
 
     // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ClientApp is ready.\n"));
 
-  orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->run();
 
   client_task.wait ();
 
@@ -170,14 +155,12 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
              "(%P|%t) ClientApp is destroying the Root POA.\n"));
 
   // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy(1, 1);
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ClientApp is destroying the ORB.\n"));
 
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->destroy();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ClientApp has completed running successfully.\n"));
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
index 4bb06ef0cac..10e811c60bf 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
@@ -8,14 +8,14 @@
 
 class ClientTask;
 
-class ClientApp 
+class ClientApp
 {
   public:
 
     ClientApp();
     ~ClientApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
index d7e2231fc2f..e168976bd08 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
@@ -55,7 +55,7 @@ ClientTask::svc()
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ClientTask::svc start\n"));
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Make sure the connection is established before making
     // remote invocations.
@@ -69,14 +69,11 @@ ClientTask::svc()
     for (CORBA::Long i = 1; i <= 100; i++)
     {
       // Simple Two-way calls.
-      this->foo_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->op1();
 
-      this->foo_->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->op2(i);
 
-      CORBA::Long value = this->foo_->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Long value = this->foo_->op3();
 
       ACE_DEBUG((LM_DEBUG,
                  "(%P|%t) ===> Value retrieved from op3() == %d\n",
@@ -84,30 +81,26 @@ ClientTask::svc()
 
       for (CORBA::ULong j = 1; j <= 5; j++)
         {
-          this->foo_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->foo_->op4(495 + (i * 5) + j);
         }
 
-      ACE_TRY_EX (op5)
+      try
       {
         ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Invoke op5()\n"));
-        this->foo_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (op5);
+        this->foo_->op5();
         ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> No exception raised from op5().  :-(\n"));
       }
-      ACE_CATCH (FooException, ex)
+      catch (const FooException& )
       {
         ACE_DEBUG((LM_DEBUG,
                    "(%P|%t) ===> Caught FooException - as expected.\n"));
 
       }
-      ACE_ENDTRY;
 
       // Two-Way calls with inout parameters.
       CORBA::String_var message = CORBA::string_dup( "Hello! " );
       CORBA::Boolean result
-        = this->foo_->op6( "TAO User", message.inout() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = this->foo_->op6( "TAO User", message.inout());
 
       if (result)
         {
@@ -122,21 +115,16 @@ ClientTask::svc()
         }
 
       // Callback test.
-      this->foo_->callback_object (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->callback_object (this->callback_.in ());
 
-      this->foo_->test_callback (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_callback ();
 
       // One-Way calls with various arguments.
       CORBA::String_var ub_string = CORBA::string_dup( "UNBOUNDED STRING" );
-      this->foo_->test_unbounded_string_arg (ub_string.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_unbounded_string_arg (ub_string.in ());
 
       CORBA::String_var bd_string = CORBA::string_dup( "BOUNDED STRING" );
-      this->foo_->test_bounded_string_arg (bd_string.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_bounded_string_arg (bd_string.in ());
 
       Fixed_Array fixed_array;
 
@@ -145,24 +133,20 @@ ClientTask::svc()
           fixed_array[m] = i + m;
         }
 
-      this->foo_->test_fixed_array_arg (fixed_array ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_fixed_array_arg (fixed_array);
 
       Var_Array var_array;
       var_array[0] = CORBA::string_dup( "STRING 1" );
       var_array[1] = CORBA::string_dup( "STRING 2" );
       var_array[2] = CORBA::string_dup( "STRING 3" );
-      this->foo_->test_var_array_arg (var_array ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_var_array_arg (var_array);
 
       Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
       char*  buffer1 = CORBA::string_dup ("BOUNDED VAR SIZE CHAR");
       bd_var_size_string->replace (ACE_OS::strlen (buffer1) + 1,
                                    buffer1,
                                    true);
-      this->foo_->test_bounded_var_size_arg (bd_var_size_string.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_bounded_var_size_arg (bd_var_size_string.in ());
 
       char* buffer2 = CORBA::string_dup ("UNBOUNDED VAR SIZE CHAR");
       Unbounded_Var_Size_var ub_var_size_string = new Unbounded_Var_Size(100);
@@ -170,48 +154,39 @@ ClientTask::svc()
                                    ACE_OS::strlen (buffer2) + 1,
                                    buffer2,
                                    true);
-      this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ());
 
       TimeOfDay t;
       t.hour = 12;
       t.minute = 30;
       t.second = 10;
-      this->foo_->test_fixed_size_arg (t ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_fixed_size_arg (t);
 
-      this->foo_->test_fixed_size_arg_two_way (t ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_fixed_size_arg_two_way (t);
 
       CORBA::Boolean special_value = 1;
-      this->foo_->test_special_basic_arg (special_value ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_special_basic_arg (special_value);
 
-      this->foo_->test_objref_arg (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->foo_->test_objref_arg (this->callback_.in ());
     }
 
     ACE_DEBUG((LM_DEBUG,
                "(%P|%t) ClientTask::svc - Invoke foo->done()\n"));
 
-    this->foo_->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->foo_->done ();
 
     ACE_DEBUG((LM_DEBUG,
                "(%P|%t) ClientTask::svc - Back from foo->done()\n"));
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in ClientTask::svc:");
+     ex._tao_print_exception ("Caught exception in ClientTask::svc:");
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
                "(%P|%t) Unknown (...) exception caught in ClientTask::svc()\n"));
   }
-  ACE_ENDTRY;
 
   if (! collocated_)
     {
@@ -240,24 +215,19 @@ ClientTask::validate_connection ()
 {
   for (CORBA::ULong j = 0; j != 1000; ++j)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
           CORBA::PolicyList_var unused;
-          this->foo_->_validate_connection (unused
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->foo_->_validate_connection (unused);
 #else
-          this->foo_->_is_a ("Not_An_IDL_Type"
-                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->foo_->_is_a ("Not_An_IDL_Type");
 #endif /* TAO_HAS_MESSAGING == 1 */
           return true;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
         }
-      ACE_ENDTRY;
     }
 
   return false;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
index 4f2bddc3ab8..6ec34ef4561 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
@@ -37,8 +37,7 @@ FooServantList::~FooServantList()
 
 void
 FooServantList::create_and_activate(CORBA::ORB_ptr orb,
-                                    PortableServer::POA_ptr poa
-                                    ACE_ENV_ARG_DECL)
+                                    PortableServer::POA_ptr poa)
 {
   poa_ = PortableServer::POA::_duplicate (poa);
 
@@ -54,28 +53,23 @@ FooServantList::create_and_activate(CORBA::ORB_ptr orb,
       PortableServer::ObjectId_var id =
                     PortableServer::string_to_ObjectId(servant_name.c_str());
 
-      poa->activate_object_with_id(id.in(), 
-                                   this->safe_servants_[i].in()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa->activate_object_with_id(id.in(),
+                                   this->safe_servants_[i].in());
 
-      CORBA::Object_var obj = poa->id_to_reference(id.in()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Object_var obj = poa->id_to_reference(id.in());
 
       if (CORBA::is_nil(obj.in()))
         {
           ACE_ERROR((LM_ERROR,
                      "(%P|%t) Failed to activate servant (%s).\n",
                      servant_name.c_str()));
-          ACE_THROW (TestException());
+          throw TestException();
         }
 
       // create the collocated object reference.
       if (this->collocated_test_ && i == 0)
         {
-          Foo_var collocated = Foo::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          Foo_var collocated = Foo::_narrow (obj.in ());
 
           // Create the servant object.
           Callback_i* servant = new Callback_i ();
@@ -89,35 +83,31 @@ FooServantList::create_and_activate(CORBA::ORB_ptr orb,
 
           poa->activate_object_with_id(id.in(), safe_servant.in());
 
-          CORBA::Object_var obj = poa->id_to_reference(id.in() 
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          CORBA::Object_var obj = poa->id_to_reference(id.in());
 
           if (CORBA::is_nil(obj.in()))
             {
               ACE_ERROR((LM_ERROR,
                         "(%P|%t) Failed to activate servant (%s).\n",
                         servant_name.c_str()));
-              ACE_THROW (TestException());
+              throw TestException();
             }
 
-          Callback_var callback 
-            = Callback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          Callback_var callback
+            = Callback::_narrow (obj.in ());
 
-          collocated_client_ 
+          collocated_client_
             = new ClientTask(orb, collocated.in (), callback.in (), true);
           if (collocated_client_->open() != 0)
             {
               ACE_ERROR((LM_ERROR,
                 "(%P|%t) Failed to open the collocated client.\n"));
-              ACE_THROW (TestException());
+              throw TestException();
             }
         }
 
-      CORBA::String_var ior 
-        = this->orb_->object_to_string(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::String_var ior
+        = this->orb_->object_to_string(obj.in());
 
       ACE_CString filename = servant_name + ".ior";
       FILE* ior_file = ACE_OS::fopen(filename.c_str(), "w");
@@ -127,9 +117,9 @@ FooServantList::create_and_activate(CORBA::ORB_ptr orb,
           ACE_ERROR((LM_ERROR,
                      "(%P|%t) Cannot open output file (%s) for writing IOR.",
                      filename.c_str()));
-          ACE_THROW (TestException());
+          throw TestException();
         }
-      else 
+      else
         {
           ACE_DEBUG((LM_DEBUG,
                      "(%P|%t) writing IOR to file %s\n",
@@ -142,7 +132,7 @@ FooServantList::create_and_activate(CORBA::ORB_ptr orb,
 
 
 void
-FooServantList::client_done(ACE_ENV_SINGLE_ARG_DECL)
+FooServantList::client_done(void)
 {
   unsigned num_left;
 
@@ -157,12 +147,12 @@ FooServantList::client_done(ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_ERROR((LM_ERROR, "(%P|%t)FooServantList::client_done: "
             "failed to create orb shutdown thread.\n"));
-        }        
+        }
     }
 }
 
 
-ClientTask* 
+ClientTask*
 FooServantList::collocated_client () const
 {
   return collocated_client_;
@@ -170,7 +160,7 @@ FooServantList::collocated_client () const
 
 
 void
-FooServantList::deactivate_servant (ACE_ENV_SINGLE_ARG_DECL)
+FooServantList::deactivate_servant (void)
 {
   for (unsigned i = 0; i < this->num_servants_; i++)
     {
@@ -188,19 +178,16 @@ FooServantList::deactivate_servant (ACE_ENV_SINGLE_ARG_DECL)
                 "deactivate %dth servant \n", i+1));
 
               PortableServer::ObjectId_var id =
-                poa_->servant_to_id (safe_servants_[i].in () 
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                poa_->servant_to_id (safe_servants_[i].in ());
 
-              poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              poa_->deactivate_object (id.in ());
 
               if (this->num_servants_ == 1)
                 {
                   // If there is only one servant and we deactivate it then
                   // all clients will catch exception and we need a way to
                   // shutdown the orb.
-                  // Wait for 5 seconds so we can see the requests queued 
+                  // Wait for 5 seconds so we can see the requests queued
                   // will be cancelled by deactivate servant.
                   ACE_OS::sleep (5);
                   ACE_DEBUG((LM_DEBUG, "(%P|%t)shutdown ORB\n"));
@@ -208,14 +195,14 @@ FooServantList::deactivate_servant (ACE_ENV_SINGLE_ARG_DECL)
                     {
                       ACE_ERROR((LM_ERROR, "(%P|%t)FooServantList::deactivate_servant: "
                         "failed to create orb shutdown thread.\n"));
-                    }        
+                    }
                 }
               else
                 {
                   GuardType guard(this->num_clients_lock_);
                   // The clients that requests this deactivated servant
-                  // will catch exception due to the deactivated servant. 
-                  // We need descrease the num_clients so the alived 
+                  // will catch exception due to the deactivated servant.
+                  // We need descrease the num_clients so the alived
                   // servant can be called to shutdown the orb.
                   this->num_clients_ -= this->init_num_clients_/num_servants_;
                 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
index fb40809e62e..8a3f6dd3c3f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
@@ -22,15 +22,14 @@ class FooServantList
                    CORBA::ORB_ptr orb);
     ~FooServantList();
 
-    void create_and_activate(CORBA::ORB_ptr orb, 
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL);
+    void create_and_activate(CORBA::ORB_ptr orb,
+                             PortableServer::POA_ptr poa);
 
-    void client_done(ACE_ENV_SINGLE_ARG_DECL);
+    void client_done(void);
 
     ClientTask* collocated_client () const;
 
-    void deactivate_servant (ACE_ENV_SINGLE_ARG_DECL);
+    void deactivate_servant (void);
 
   private:
 
@@ -41,7 +40,7 @@ class FooServantList
     PortableServer::ServantBase_var* safe_servants_;
     ACE_CString prefix_;
     unsigned num_servants_;
-    
+
     LockType num_clients_lock_;
     unsigned num_clients_;
     unsigned init_num_clients_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
index dd4f1c9821a..de8c5c5b9e8 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
@@ -23,7 +23,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
@@ -33,7 +33,7 @@ Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
@@ -42,15 +42,14 @@ Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::op3(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
 
   if (this->count_op3_ == 30)
     {
-      this->mgr_->deactivate_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->mgr_->deactivate_servant ();
     }
 
   return this->value_.value ();
@@ -58,7 +57,7 @@ Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
@@ -77,19 +76,18 @@ Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_op5_;
-  ACE_THROW (FooException());
+  throw FooException();
 }
 
 
-CORBA::Boolean 
+CORBA::Boolean
 Foo_i::op6 (
   const char * user_name,
   char *& message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -103,40 +101,37 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::test_unbounded_string_arg (
   const char * message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
 CORBA::SystemException
 ))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ")
-                       ACE_TEXT("got unbounded string %s\n"), 
+                       ACE_TEXT("got unbounded string %s\n"),
                        message));
 }
 
 
-void 
+void
 Foo_i::test_bounded_string_arg (
   const char * message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
 CORBA::SystemException
 ))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ")
-                       ACE_TEXT("got bounded string %s\n"), 
+                       ACE_TEXT("got bounded string %s\n"),
                        message));
 }
 
 
-void 
+void
 Foo_i::test_fixed_array_arg (
   const ::Fixed_Array message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -145,31 +140,29 @@ ACE_THROW_SPEC ((
   for (CORBA::ULong i = 0; i < 20; i++)
     {
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_array_arg ")
-                           ACE_TEXT("got fixed_array[i] = %d\n"), 
+                           ACE_TEXT("got fixed_array[i] = %d\n"),
                            i, message[i]));
     }
 }
 
 
-void 
+void
 Foo_i::test_bounded_var_size_arg (
   const ::Bounded_Var_Size & message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
 ))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ")
-                       ACE_TEXT("got var array chars %s\n"), 
+                       ACE_TEXT("got var array chars %s\n"),
                        message.get_buffer ()));
 }
 
 
-void 
+void
 Foo_i::test_unbounded_var_size_arg (
   const ::Unbounded_Var_Size & message
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -181,10 +174,9 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::test_fixed_size_arg (
   const ::TimeOfDay & t
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -195,10 +187,9 @@ ACE_THROW_SPEC ((
                        t.hour, t.minute, t.second));
 }
 
-void 
+void
 Foo_i::test_fixed_size_arg_two_way (
   const ::TimeOfDay & t
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -209,10 +200,9 @@ ACE_THROW_SPEC ((
                        t.hour, t.minute, t.second));
 }
 
-void 
+void
 Foo_i::test_var_array_arg (
   const ::Var_Array messages
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -227,10 +217,9 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::test_special_basic_arg (
   ::CORBA::Boolean value
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -241,10 +230,9 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::test_objref_arg (
   ::Callback_ptr cb
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -256,10 +244,9 @@ ACE_THROW_SPEC ((
 }
 
 
-void 
+void
 Foo_i::callback_object (
   ::Callback_ptr cb
-  ACE_ENV_ARG_DECL_NOT_USED
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -268,9 +255,8 @@ ACE_THROW_SPEC ((
   this->callback_ = Callback::_duplicate (cb);
 }
 
-void 
+void
 Foo_i::test_callback (
-  ACE_ENV_SINGLE_ARG_DECL
 )
 ACE_THROW_SPEC ((
   CORBA::SystemException, FooException
@@ -278,33 +264,31 @@ ACE_THROW_SPEC ((
 {
   if (CORBA::is_nil (this->callback_.in ()))
     {
-      ACE_THROW (FooException ());
+      throw FooException ();
     }
   else
     {
-      this->callback_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->callback_->test_method ();
     }
 }
 
 
 void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
-  this->mgr_->client_done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->mgr_->client_done();
 }
 
 
-void 
+void
 Foo_i::active (bool flag)
 {
   active_ = flag;
 }
 
 
-bool 
+bool
 Foo_i::active ()
 {
   return active_.value ();
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index 48f99ee7e23..9b0db58c201 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -16,25 +16,24 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op2(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op4(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException, FooException));
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
         char *& message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -42,31 +41,27 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_unbounded_string_arg (
         const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
     virtual void test_bounded_string_arg (
         const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
     virtual void test_fixed_array_arg (
         const ::Fixed_Array message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
     virtual void test_var_array_arg (
         const ::Var_Array messages
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -74,15 +69,13 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_bounded_var_size_arg (
         const ::Bounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void test_unbounded_var_size_arg (
         const ::Unbounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -90,7 +83,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_fixed_size_arg (
         const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -98,7 +90,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_fixed_size_arg_two_way (
         const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -106,7 +97,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_special_basic_arg (
         ::CORBA::Boolean value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -114,7 +104,6 @@ class Foo_i : public virtual POA_Foo
 
     virtual void test_objref_arg (
         ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -122,20 +111,18 @@ class Foo_i : public virtual POA_Foo
 
     virtual void callback_object (
         ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void test_callback (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException, FooException
       ));
-  
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
     void active (bool flag);
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp
index f9d551e8aee..ebcd029165c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp
@@ -25,7 +25,7 @@ OrbShutdownTask::~OrbShutdownTask()
 }
 
 
-void 
+void
 OrbShutdownTask::orb(CORBA::ORB_ptr orb)
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -53,18 +53,16 @@ OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->shutdown(0);
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::shutdown() call "
       "in OrbShutdownTask::svc().\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp
index fcfb7c919ac..c474c574113 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp
@@ -74,18 +74,16 @@ OrbTask::open(void*)
 int
 OrbTask::svc()
 {
-  ACE_TRY_NEW_ENV 
-  { 
-    this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK; 
-  } 
-  ACE_CATCHALL 
-  { 
+  try
+  {
+    this->orb_->run();
+  }
+  catch (...)
+  {
     ACE_ERROR((LM_ERROR,
                "(%P|%t) Exception raised by ORB::run() method. "
                "OrbTask is stopping.\n"));
   }
-  ACE_ENDTRY; 
 
   return 0;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
index b8cd5ed04a1..82162205ef5 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
@@ -30,16 +30,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
+  int result = this->parse_args(argc, argv);
   if (result != 0)
     {
       return result;
@@ -47,10 +46,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   TheOrbShutdownTask::instance()->orb (orb.in ());
 
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA"  
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -59,9 +56,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POA_var root_poa
+    = PortableServer::POA::_narrow(obj.in());
 
   if (CORBA::is_nil(root_poa.in()))
     {
@@ -70,25 +66,20 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA.
   CORBA::PolicyList policies(1);
   policies.length(1);
 
-  policies[0] 
-    = root_poa->create_id_assignment_policy(PortableServer::USER_ID 
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]
+    = root_poa->create_id_assignment_policy(PortableServer::USER_ID);
 
-  PortableServer::POA_var child_poa 
+  PortableServer::POA_var child_poa
     = root_poa->create_POA("ChildPoa",
                            poa_manager.in(),
-                           policies
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                           policies);
 
   if (CORBA::is_nil(child_poa.in()))
     {
@@ -97,8 +88,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]->destroy ();
 
   // Create the thread pool servant dispatching strategy object, and
   // hold it in a (local) smart pointer variable.
@@ -108,13 +98,12 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   csd_tp_strategy->set_num_threads(this->num_csd_threads_);
 
   // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
+  if (csd_tp_strategy->apply_to(child_poa.in()) == false)
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
       ACE_THROW_RETURN (TestException(), -1);
     }
-  ACE_CHECK_RETURN (-1);
 
   FooServantList servants(this->ior_filename_.c_str(),
                           this->num_servants_,
@@ -123,16 +112,13 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
                           this->servant_to_deactivate_,
                           orb.in());
 
-  // Activate the POA Manager before start the ClientTask thread so that 
-  // we do not need coordinate the ClientTask and main thread for the 
+  // Activate the POA Manager before start the ClientTask thread so that
+  // we do not need coordinate the ClientTask and main thread for the
   // collocated test.
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate();
 
-  servants.create_and_activate(orb.in (), 
-                               child_poa.in() 
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  servants.create_and_activate(orb.in (),
+                               child_poa.in());
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is ready.\n"));
@@ -143,8 +129,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
     {
       // Since the num_orb_threads_ is exactly one, we just use the current
       // (mainline) thread to run the ORB event loop.
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      orb->run();
     }
   else
     {
@@ -163,8 +148,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
         }
 
       // This will use the current (mainline) thread to run the ORB event loop.
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      orb->run();
 
       // Now that the current thread has unblocked from running the orb,
       // make sure to wait for all of the worker threads to complete.
@@ -188,14 +172,12 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
              "(%P|%t) ServerApp is destroying the Root POA.\n"));
 
   // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy(1, 1);
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is destroying the ORB.\n"));
 
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->destroy();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp has completed running successfully.\n"));
@@ -318,7 +300,7 @@ ServerApp::parse_args(int argc, char* argv[])
         }
     }
 
-  // The deadlock will happen with the collocated callback test  
+  // The deadlock will happen with the collocated callback test
   // when we have one working thread, so create at least one more
   // working thread would resolve the deadlock.
   if (this->collocated_test_ == 1 && this->num_csd_threads_ == 1)
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
index 8b461a3e299..f45f9cfe44a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
@@ -13,7 +13,7 @@ class ServerApp
     ServerApp();
     ~ServerApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
index 1f9c337ae54..2c768647052 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
@@ -22,24 +22,21 @@ main(int argc, char* argv[])
 
   ClientApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ClientApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
index ba16e928f63..48b765f3ebe 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
@@ -22,24 +22,21 @@ main(int argc, char* argv[])
 
   ServerApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ServerApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
index 74e97209295..13d30e1711f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
@@ -16,11 +16,10 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb
+    = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -32,9 +31,8 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->string_to_object(this->ior_.c_str());
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -43,8 +41,7 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);
     }
 
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Foo_var foo = Foo::_narrow(obj.in());
 
   if (CORBA::is_nil(foo.in()))
     {
@@ -56,12 +53,9 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   for (CORBA::Long i = 1; i <= 100; i++)
     {
-      foo->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      foo->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      CORBA::Long value = foo->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      foo->op1();
+      foo->op2(i);
+      CORBA::Long value = foo->op3();
 
       ACE_DEBUG((LM_DEBUG,
                  "(%P|%t) ===> Value retrieved from op3() == %d\n",
@@ -69,29 +63,25 @@ ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
       for (CORBA::Long j = 1; j <= 5; j++)
         {
-          foo->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          foo->op4(495 + (i * 5) + j);
         }
 
-      ACE_TRY_NEW_ENV
+      try
       {
-        foo->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        foo->op5();
       }
-      ACE_CATCH (FooException, ex)
+      catch (const FooException& )
       {
         ACE_DEBUG((LM_DEBUG,
                   "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
+
       }
-      ACE_ENDTRY;
     }
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ===> Tell server that we are done().\n"));
 
-  foo->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  foo->done();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ===> Back from done().\n"));
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
index 7dc57bb78dc..f4648822d1e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
@@ -14,7 +14,7 @@ class ClientApp
     ClientApp();
     ~ClientApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
index 8201c889f88..f2044eb4e8b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
@@ -25,7 +25,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
@@ -35,7 +35,7 @@ Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
@@ -44,7 +44,7 @@ Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_i::op3(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
@@ -53,7 +53,7 @@ Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
@@ -72,16 +72,16 @@ Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_op5_;
-  ACE_THROW (FooException());
+  throw FooException();
 }
 
 
 void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   unsigned num_left = --this->num_clients_;
@@ -108,6 +108,6 @@ Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_ERROR((LM_ERROR, "(%P|%t)Foo_i::done: "
             "failed to create orb shutdown thread.\n"));
-        }        
+        }
     }
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
index ab50cc5589a..2858ec966ad 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
@@ -5,29 +5,29 @@
 #include "FooS.h"
 
 
-class Foo_i 
+class Foo_i
 {
   public:
 
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op2(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
+    virtual void op4(CORBA::Long value)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException, FooException));
 
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
index f9d551e8aee..ebcd029165c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
@@ -25,7 +25,7 @@ OrbShutdownTask::~OrbShutdownTask()
 }
 
 
-void 
+void
 OrbShutdownTask::orb(CORBA::ORB_ptr orb)
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -53,18 +53,16 @@ OrbShutdownTask::svc()
 {
   ACE_OS::sleep (2);
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->shutdown(0);
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::shutdown() call "
       "in OrbShutdownTask::svc().\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
index 62de607a4fb..3fe87380250 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
@@ -23,16 +23,15 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
+  int result = this->parse_args(argc, argv);
   if (result != 0)
     {
       return result;
@@ -40,9 +39,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   TheOrbShutdownTask::instance()->orb (orb.in ());
 
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var obj
+    = orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -51,9 +49,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);;
     }
 
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POA_var root_poa
+    = PortableServer::POA::_narrow(obj.in());
 
   if (CORBA::is_nil(root_poa.in()))
     {
@@ -62,25 +59,20 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);;
     }
 
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA.
   CORBA::PolicyList policies(1);
   policies.length(1);
 
   policies[0] =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
-  PortableServer::POA_var child_poa 
+  PortableServer::POA_var child_poa
     = root_poa->create_POA("ChildPoa",
                            poa_manager.in(),
-                           policies 
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                           policies);
 
   if (CORBA::is_nil(child_poa.in()))
     {
@@ -89,8 +81,7 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
       ACE_THROW_RETURN (TestException(), -1);;
     }
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]->destroy ();
 
   // Create the thread pool servant dispatching strategy object, and
   // hold it in a (local) smart pointer variable.
@@ -98,23 +89,21 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
                                                  new TAO::CSD::TP_Strategy();
 
   // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
+  if (csd_tp_strategy->apply_to(child_poa.in()) == false)
     {
       ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
                  "Failed to apply custom dispatching strategy to child poa.\n"));
       ACE_THROW_RETURN (TestException(), -1);;
     }
-  ACE_CHECK_RETURN (-1);
 
   // Create the Foo_i object.
   Foo_i foo_i (this->num_clients_);
 
   // Create tie object with the Foo_i object.
-  POA_Foo_tie<Foo_i> foo_tie_i (foo_i, child_poa.in ()); 
+  POA_Foo_tie<Foo_i> foo_tie_i (foo_i, child_poa.in ());
 
   // Get Object Reference for the foo_tie_i object.
-  Foo_var foo = foo_tie_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Foo_var foo = foo_tie_i._this ();
 
   if (CORBA::is_nil(foo.in()))
     {
@@ -124,9 +113,8 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
     }
 
   // Stringify the object reference
-  CORBA::String_var ior 
-    = orb->object_to_string(foo.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var ior
+    = orb->object_to_string(foo.in());
 
   // Write the stringified object reference to the ior file.
   FILE* ior_file = ACE_OS::fopen(this->ior_filename_.c_str(), "w");
@@ -143,15 +131,13 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   ACE_OS::fclose(ior_file);
 
   // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
 
   // Run the ORB event loop.
-  orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->run();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp ORB has stopped running. "
@@ -169,14 +155,12 @@ ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
   ACE_OS::sleep (2);
 
   // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy(1, 1);
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is destroying the ORB.\n"));
 
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->destroy();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp has completed running successfully.\n"));
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
index ad89b43c972..efd5a586475 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
@@ -14,7 +14,7 @@ class ServerApp
     ServerApp();
     ~ServerApp();
 
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
index 1f9c337ae54..2c768647052 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
@@ -22,24 +22,21 @@ main(int argc, char* argv[])
 
   ClientApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ClientApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
index ba16e928f63..48b765f3ebe 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
@@ -22,24 +22,21 @@ main(int argc, char* argv[])
 
   ServerApp app;
 
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
+  try
+  {
+    int ret = app.run(argc,argv);
+    return ret == 1 ? 0 : ret;
+  }
+  catch (const CORBA::Exception& ex)
+  {
+     ex._tao_print_exception ("Caught exception:");
+  }
+  catch (...)
+  {
+    ACE_ERROR((LM_ERROR,
+               "(%P|%t) Unknown (...) exception caught in main() "
+               "for ServerApp\n"));
+  }
 
   return 1;
 }
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index 4aeab0b4941..891a3a59f64 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -161,8 +161,7 @@ Consumer_Handler::parse_args (void)
 int
 Consumer_Handler::via_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialization of the naming service.
       if (naming_services_client_.init (orb_.in ()) != 0)
@@ -176,26 +175,21 @@ Consumer_Handler::via_naming_service (void)
       notifier_ref_name[0].id = CORBA::string_dup ("Notifier");
 
       CORBA::Object_var notifier_obj =
-        this->naming_services_client_->resolve (notifier_ref_name
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_services_client_->resolve (notifier_ref_name);
 
       // The CORBA::Object_var object is downcast to Notifier_var using
       // the <_narrow> method.
       this->server_ =
-        Notifier::_narrow (notifier_obj.in ()
-                           ACE_ENV_ARG_PARAMETER);
+        Notifier::_narrow (notifier_obj.in ());
 
-      ACE_TRY_CHECK;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer_Handler::via_naming_service\n");
+      ex._tao_print_exception (
+        "Consumer_Handler::via_naming_service\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -211,15 +205,12 @@ Consumer_Handler::init (int argc, char **argv)
   // Register our <Input_Handler> to handle STDIN events, which will
   // trigger the <handle_input> method to process these events.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
 
       // Parse command line and verify parameters.
@@ -280,9 +271,7 @@ Consumer_Handler::init (int argc, char **argv)
                               -1);
 
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->string_to_object (this->ior_);
 
           if (CORBA::is_nil (server_object.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -291,19 +280,15 @@ Consumer_Handler::init (int argc, char **argv)
                               -1);
           // The downcasting from CORBA::Object_var to Notifier_var is
           // done using the <_narrow> method.
-          this->server_ = Notifier::_narrow (server_object.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_ = Notifier::_narrow (server_object.in ());
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "Consumer_Handler::init");
+      ex._tao_print_exception ("Consumer_Handler::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -312,24 +297,19 @@ int
 Consumer_Handler::run (void)
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Obtain and activate the RootPOA.
      CORBA::Object_var obj =
-            this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+            this->orb_->resolve_initial_references ("RootPOA");
 
      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
      PortableServer::POAManager_var poa_manager=
-       root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       root_poa->the_POAManager ();
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      ACE_NEW_RETURN (this->consumer_servant_,
                      Consumer_i (),
@@ -339,8 +319,7 @@ Consumer_Handler::run (void)
 
      // Get the consumer stub (i.e consumer object) pointer.
      this->consumer_var_ =
-       this->consumer_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+       this->consumer_servant_->_this ();
 
       if (this->interactive_ == 0)
         {
@@ -348,9 +327,7 @@ Consumer_Handler::run (void)
           // Register with the server.
           this->server_->register_callback (this->stock_name_,
                                             this->threshold_value_,
-                                            this->consumer_var_.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                            this->consumer_var_.in ());
 
           // Note the registration.
           this->registered_ = 1;
@@ -361,16 +338,14 @@ Consumer_Handler::run (void)
         }
 
       // Run the ORB.
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer_Handler::init");
+      ex._tao_print_exception ("Consumer_Handler::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
index a27c762615e..65d25959c76 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
@@ -103,17 +103,14 @@ Consumer_Input_Handler::register_consumer ()
   this->consumer_handler_->threshold_value_ =
     ACE_OS::atoi (needed_stock_value);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
 
       // Register with the server.
       this->consumer_handler_->server_->register_callback (this->consumer_handler_->stock_name_,
                                                            this->consumer_handler_->threshold_value_,
-                                                           this->consumer_handler_->consumer_var_.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                           this->consumer_handler_->consumer_var_.in ());
 
       // Note the registration.
       consumer_handler_->registered_ = 1;
@@ -124,13 +121,12 @@ Consumer_Input_Handler::register_consumer ()
       ACE_DEBUG ((LM_DEBUG,
                   "registeration done!\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Consumer_Input_Handler::register_consumer()\n");
+      ex._tao_print_exception (
+        "Consumer_Input_Handler::register_consumer()\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
 return 0;
 }
@@ -166,50 +162,40 @@ Consumer_Input_Handler::quit_consumer_process ()
   // Only if the consumer is registered and wants to shut
   // down, its necessary to unregister and then shutdown.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (consumer_handler_->unregistered_ != 1 && consumer_handler_->registered_ == 1)
         {
           // If the notifier has exited and the consumer tries to call
           // the unregister_callback method tehn an execption will be
-          // raised. Hence check for this case using ACE_ENV_SINGLE_ARG_PARAMETER.
-          this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in ()
-                                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          // raised. Hence check for this case using.
+          this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in ());
 
           ACE_DEBUG ((LM_DEBUG,
                       " Consumer Unregistered \n "));
           consumer_handler_->unregistered_ = 0;
           consumer_handler_->registered_ = 0;
         }
-      this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->consumer_handler_->consumer_servant_->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // There would be an exception only if there is a communication
       // failure between the notifier and consumer. On catching the
       // exception proclaim the problem and do a graceful exit.
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Communication failed!\n");
+      ex._tao_print_exception ("Communication failed!\n");
 
-      ACE_TRY_EX (block1)
+      try
         {
-          this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (block1);
+          this->consumer_handler_->consumer_servant_->shutdown ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
 
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
index 5fe25a265f6..82e2d6e3570 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
@@ -60,9 +60,8 @@ Consumer_Signal_Handler::quit_on_signal (void)
   // Only if the consumer is registered and wants to shut down, its
   // necessary to unregister and then shutdown.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (consumer_handler_->unregistered_ != 1
           && consumer_handler_->registered_ == 1)
@@ -72,16 +71,14 @@ Consumer_Signal_Handler::quit_on_signal (void)
           ACE_DEBUG ((LM_DEBUG,
                       "Consumer Unregistered\n"));
         }
-      this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->consumer_handler_->consumer_servant_->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Consumer_Input_Handler::quit_consumer_process()");
+      ex._tao_print_exception (
+        "Consumer_Input_Handler::quit_consumer_process()");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.cpp b/TAO/examples/Callback_Quoter/Consumer_i.cpp
index b892a31372c..131e606e112 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_i.cpp
@@ -28,8 +28,7 @@ Consumer_i::~Consumer_i (void)
 }
 
 void
-Consumer_i::push (const Callback_Quoter::Info &data
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Consumer_i::push (const Callback_Quoter::Info &data)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // On getting the needed information you now proceed to the next
@@ -42,7 +41,7 @@ Consumer_i::push (const Callback_Quoter::Info &data
 }
 
 void
-Consumer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h
index 839f2768c6a..efdaa0c8801 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.h
+++ b/TAO/examples/Callback_Quoter/Consumer_i.h
@@ -39,12 +39,11 @@ public:
   ~Consumer_i (void);
   // Destructor.
 
-  void push (const Callback_Quoter::Info & data
-             ACE_ENV_ARG_DECL)
+  void push (const Callback_Quoter::Info & data)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gets the stock information from the Notifier.
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used to get the consumer to shut down.
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index 7874c0ef56b..bcf34e90c32 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -54,43 +54,37 @@ Notifier_Input_Handler::~Notifier_Input_Handler (void)
 // the object name is bound to the naming server.
 
 int
-Notifier_Input_Handler::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Notifier_Input_Handler::init_naming_service (void)
 {
 
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
-  if (this->naming_server_.init (orb.in ()) == -1) 
+  if (this->naming_server_.init (orb.in ()) == -1)
     return -1;
-             
+
   // create the name for the naming service
   CosNaming::Name notifier_obj_name (1);
   notifier_obj_name.length (1);
   notifier_obj_name[0].id = CORBA::string_dup ("Notifier");
 
   // (re)Bind the object.
-  ACE_TRY
+  try
     {
-      Notifier_var notifier_obj = notifier_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Notifier_var notifier_obj = notifier_i_._this ();
 
-      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_manager_.activate_poa_manager ();
 
       naming_server_->rebind (notifier_obj_name,
-                              notifier_obj.in()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              notifier_obj.in());
 
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Unable to bind %s \n",
                          "Notifier"),
                         -1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -142,8 +136,7 @@ Notifier_Input_Handler::parse_args (void)
 
 int
 Notifier_Input_Handler::init (int argc,
-                              char *argv[]
-                              ACE_ENV_ARG_DECL)
+                              char *argv[])
 {
 
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
@@ -154,13 +147,11 @@ Notifier_Input_Handler::init (int argc,
 
   if (this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
-  ACE_CHECK_RETURN (-1);
 
   int retval = this->parse_args ();
 
@@ -187,9 +178,7 @@ Notifier_Input_Handler::init (int argc,
   // Activate the servant in the POA.
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("Notifier",
-                                                 &this->notifier_i_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                 &this->notifier_i_);
 
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
@@ -205,14 +194,13 @@ Notifier_Input_Handler::init (int argc,
 
   if (this->using_naming_service_)
     {
-      this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->init_naming_service ();
     }
   return 0;
 }
 
 int
-Notifier_Input_Handler::run (ACE_ENV_SINGLE_ARG_DECL)
+Notifier_Input_Handler::run (void)
 {
   // Run the main event loop for the ORB.
 
@@ -220,8 +208,7 @@ Notifier_Input_Handler::run (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               " Type \"q\" to quit \n "));
 
-  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->orb_manager_.run ();
 
   if (result == -1)
     {
@@ -238,9 +225,8 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // The string could read contains \n\0 hence using ACE_OS::read
       // which returns the no of bytes read and hence i can manipulate
@@ -260,17 +246,14 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE)
         {
           // @@ Please remove this call if it's not used.
           // (this->notifier_i_.consumer_map_).close();
-          this->notifier_i_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->notifier_i_.shutdown ();
         }
     }
-   ACE_CATCHANY
+   catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Input_Handler::init");
+      ex._tao_print_exception ("Input_Handler::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index 109db1f6bc0..7ee23aea677 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -45,11 +45,10 @@ public:
   // Destructor.
 
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the Notifier who plays the role of the server here.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the ORB.
 
    virtual int handle_input (ACE_HANDLE);
@@ -63,7 +62,7 @@ private:
   int parse_args (void);
   // Parses the command line arguments.
 
-  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (void);
   // Initialises the name server and registers the Notifier object
   // name with the name server.
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index 995338205c4..5448a187d08 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -37,8 +37,7 @@ Notifier_i::~Notifier_i (void)
 void
 Notifier_i::register_callback (const char *stock_name,
                                CORBA::Long threshold_value,
-                               Callback_Quoter::Consumer_ptr consumer_handler
-                               ACE_ENV_ARG_DECL)
+                               Callback_Quoter::Consumer_ptr consumer_handler)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Stock))
 {
@@ -64,7 +63,8 @@ Notifier_i::register_callback (const char *stock_name,
   if (this->consumer_map_.find (stock_name, consumers) == 0)
     {
      if ( consumers->insert (consumer_data) == -1)
-       ACE_THROW ( Callback_Quoter::Invalid_Stock ("Insertion failed! Invalid Stock!\n"));
+       throw Callback_Quoter::Invalid_Stock (
+         "Insertion failed! Invalid Stock!\n");
      else
       ACE_DEBUG ((LM_DEBUG,
                   "Inserted map entry: stockname %s threshold %d",
@@ -75,12 +75,12 @@ Notifier_i::register_callback (const char *stock_name,
     {
       // the unbounded set entry is created.
       ACE_NEW_THROW_EX (consumers, CONSUMERS, CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       // When a new entry is tried to be inserted into the unbounded set and it
       // fails an exception is raised.
       if (consumers->insert (consumer_data) == -1)
-        ACE_THROW ( Callback_Quoter::Invalid_Stock ("Insertion failed! Invalid Stock!\n"));
+        throw Callback_Quoter::Invalid_Stock (
+          "Insertion failed! Invalid Stock!\n");
 
       // The bond between the stockname <hash_key> and the consumers <hash_value>
       // is fused.
@@ -106,8 +106,7 @@ Notifier_i::orb (CORBA::ORB_ptr orb)
 // Remove the client handler.
 
 void
-Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer
-                                 ACE_ENV_ARG_DECL)
+Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Handle))
 {
@@ -141,7 +140,8 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer
        // removed an exception is raised.
 
        if ((*iter).int_id_->remove (consumer_to_remove) == -1)
-         ACE_THROW (Callback_Quoter::Invalid_Handle ( "Unregistration failed! Invalid Consumer Handle!\n"));
+         throw Callback_Quoter::Invalid_Handle (
+           "Unregistration failed! Invalid Consumer Handle!\n");
        else
         ACE_DEBUG ((LM_DEBUG,
                     "unregister_callback:consumer removed\n"));
@@ -153,8 +153,7 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer
 
 void
 Notifier_i::market_status (const char *stock_name,
-                           CORBA::Long stock_value
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           CORBA::Long stock_value)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -202,7 +201,7 @@ Notifier_i::market_status (const char *stock_name,
 }
 
 void
-Notifier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Notifier_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->consumer_map_.close () > 0)
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index d40647a2274..db15a8de06f 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -51,29 +51,26 @@ public:
 
   virtual void register_callback (const char *stock_name,
                                   CORBA::Long threshold_value,
-                                  Callback_Quoter::Consumer_ptr consumer_handler
-                                  ACE_ENV_ARG_DECL)
+                                  Callback_Quoter::Consumer_ptr consumer_handler)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Stock));
   // Register a distributed callback handler that is invoked when the
   // given stock reaches the desired threshold value.
 
-  virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler
-                                    ACE_ENV_ARG_DECL)
+  virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Handle));
   // Remove the consumer object.
 
   virtual void market_status (const char *stock_name,
-                              CORBA::Long stock_value
-                              ACE_ENV_ARG_DECL)
+                              CORBA::Long stock_value)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the market status.
 
   void orb (CORBA::ORB_ptr orb);
   // Get the orb pointer.
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the Notifier.
 
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index 35bcc26633a..ed4683d995f 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -156,28 +156,26 @@ int
 Supplier::send_market_status (const char *stock_name,
                               long value)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
 
       // Make the RMI.
       this->notifier_->market_status (stock_name,
-                                      value
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      value);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception : Supplier::send_market_status");
+      sysex._tao_print_exception (
+        "System Exception : Supplier::send_market_status");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception : Supplier::send_market_status");
+      userex._tao_print_exception (
+        "User Exception : Supplier::send_market_status");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -214,9 +212,8 @@ Supplier::run (void)
 int
 Supplier::via_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialization of the naming service.
       if (naming_services_client_.init (orb_.in ()) != 0)
@@ -229,28 +226,25 @@ Supplier::via_naming_service (void)
       notifier_ref_name[0].id = CORBA::string_dup ("Notifier");
 
       CORBA::Object_var notifier_obj =
-        this->naming_services_client_->resolve (notifier_ref_name
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_services_client_->resolve (notifier_ref_name);
 
       // The CORBA::Object_var object is downcast to Notifier_var
       // using the <_narrow> method.
       this->notifier_ =
-        Notifier::_narrow (notifier_obj.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Notifier::_narrow (notifier_obj.in ());
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception : Supplier::via_naming_service\n");
+      sysex._tao_print_exception (
+        "System Exception : Supplier::via_naming_service\n");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception : Supplier::via_naming_service\n");
+      userex._tao_print_exception (
+        "User Exception : Supplier::via_naming_service\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -263,16 +257,13 @@ Supplier::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -294,9 +285,7 @@ Supplier::init (int argc, char **argv)
                            this->argv_[0]),
                           -1);
       CORBA::Object_var notifier_object =
-        this->orb_->string_to_object (this->ior_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (this->ior_);
 
       if (CORBA::is_nil (notifier_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -305,21 +294,18 @@ Supplier::init (int argc, char **argv)
                           -1);
       // The downcasting from CORBA::Object_var to Notifier_var is
       // done using the <_narrow> method.
-      this->notifier_ = Notifier::_narrow (notifier_object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->notifier_ = Notifier::_narrow (notifier_object.in ());
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception : Supplier::init");
+      sysex._tao_print_exception ("System Exception : Supplier::init");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception : Supplier::init");
+      userex._tao_print_exception ("User Exception : Supplier::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp
index 44f07d70cd1..e018f1bb4de 100644
--- a/TAO/examples/Callback_Quoter/notifier.cpp
+++ b/TAO/examples/Callback_Quoter/notifier.cpp
@@ -14,31 +14,27 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tNotifier\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int rc = notifier.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int rc = notifier.init (argc, argv);
 
       if (rc == -1)
         return 1;
       else
         {
-          notifier.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          notifier.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index 95aa978da82..55754368e9a 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -26,8 +26,7 @@ Content_Iterator_i::~Content_Iterator_i (void)
 
 CORBA::Boolean
 Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
-                                Web_Server::Chunk_Type_out chunk
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                Web_Server::Chunk_Type_out chunk)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize/allocate the Chunk_Type sequence
@@ -106,28 +105,24 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
 }
 
 void
-Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Content_Iterator_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Content_Iterator object.
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 
   // Decrease the reference count on our selves.
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 int
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
index 4bf25d1a660..8fba05df706 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
@@ -52,13 +52,12 @@ public:
   // Destructor
 
   virtual CORBA::Boolean next_chunk (CORBA::ULongLong offset,
-                                     Web_Server::Chunk_Type_out chunk
-                                     ACE_ENV_ARG_DECL)
+                                     Web_Server::Chunk_Type_out chunk)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the iterator.
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index 214b818cfd3..934865fbd92 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -18,8 +18,7 @@ ACE_RCSID (AMI_Iterator,
 void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
-                                  Web_Server::Metadata_Type_out metadata
-                                  ACE_ENV_ARG_DECL)
+                                  Web_Server::Metadata_Type_out metadata)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -29,48 +28,45 @@ Iterator_Factory_i::get_iterator (const char *pathname,
   ACE_stat file_status;
   if (ACE_OS::stat (pathname, &file_status) == -1)
     // HTTP 1.1 "Internal Server Error".
-    ACE_THROW (Web_Server::Error_Result (500));
+    throw Web_Server::Error_Result (500);
 
   Content_Iterator_i *iterator_servant = 0;
   ACE_NEW_THROW_EX (iterator_servant,
                     Content_Iterator_i (pathname,
                                         file_status.st_size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   if (iterator_servant->init () != 0)
     {
       if (errno == EACCES)
         // HTTP 1.1 "Forbidden".
-        ACE_THROW (Web_Server::Error_Result (403));
+        throw Web_Server::Error_Result (403);
       else
         // HTTP 1.1 "Internal Server Error".
-        ACE_THROW (Web_Server::Error_Result (500));
+        throw Web_Server::Error_Result (500);
     }
 
 
   // Activate the Content_Iterator object.
   Web_Server::Content_Iterator_var iterator =
-    iterator_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    iterator_servant->_this ();
 
   Web_Server::Metadata_Type *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     Web_Server::Metadata_Type,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   metadata = tmp;
 
   if (this->modification_date (&file_status,
                                metadata) != 0)
     // HTTP 1.1 "Internal Server Error.
-    ACE_THROW (Web_Server::Error_Result (500));
+    throw Web_Server::Error_Result (500);
 
   if (this->content_type (pathname,
                           metadata) != 0)
     // HTTP 1.1 "Internal Server Error.
-    ACE_THROW (Web_Server::Error_Result (500));
+    throw Web_Server::Error_Result (500);
 
   contents = iterator._retn (); // Make a copy
 }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
index 9d8feb6e748..26cb3a8380d 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
@@ -45,8 +45,7 @@ public:
 
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
-                             Web_Server::Metadata_Type_out metadata
-                             ACE_ENV_ARG_DECL)
+                             Web_Server::Metadata_Type_out metadata)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // This factory method returns a <Content_Iterator> that can be used
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index 85f0cdd68fb..4237416f0af 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -35,8 +35,7 @@ Iterator_Handler::~Iterator_Handler (void)
 
 void
 Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
-                              const Web_Server::Chunk_Type &chunk_data
-                              ACE_ENV_ARG_DECL)
+                              const Web_Server::Chunk_Type &chunk_data)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (pending_data)
@@ -58,9 +57,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
         this->offset_ += chunk->length ();
 
       this->contents_->sendc_next_chunk (this->ami_handler_.in (),
-                                         this->offset_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                         this->offset_);
 
     }
   else
@@ -72,9 +69,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
       (*this->request_count_)--;  // No more data.
 
       // Done with the iterator, so destroy it.
-      this->contents_->sendc_destroy (this->ami_handler_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->contents_->sendc_destroy (this->ami_handler_.in ());
 
       // File retrieval has completed, so spawn an external viewer to
       // display its contents.
@@ -83,20 +78,18 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
     }
 }
 void
-Iterator_Handler::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Iterator_Handler::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate this reply handler.
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 }
 
 
 void
 Iterator_Handler::run (int *request_count,
                        const char *pathname,
-                       Web_Server::Iterator_Factory_ptr factory
-                       ACE_ENV_ARG_DECL)
+                       Web_Server::Iterator_Factory_ptr factory)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -104,38 +97,30 @@ Iterator_Handler::run (int *request_count,
       this->request_count_ = request_count;
   else
     // @@ Application code shouldn't throw system exceptions.
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
   // Initialize the Content Iterator
   this->initialize_content_iterator (pathname,
-                                     factory
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                     factory);
 
   // Activate this Reply Handler.
-  this->ami_handler_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ami_handler_ = this->_this ();
 
   // Begin the asynchronous invocation.
   this->contents_->sendc_next_chunk (this->ami_handler_.in (),
-                                     this->offset_
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                     this->offset_);
 }
 
 void
 Iterator_Handler::initialize_content_iterator
   (const char *pathname,
-   Web_Server::Iterator_Factory_ptr factory
-   ACE_ENV_ARG_DECL)
+   Web_Server::Iterator_Factory_ptr factory)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
   // Obtain a Content Iterator for the desired file.
   factory->get_iterator (pathname,
                          this->contents_,
-                         this->metadata_
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         this->metadata_);
 
   // Create a temporary file to store the retrieved data.
   ACE_FILE_Connector connector;
@@ -155,22 +140,19 @@ Iterator_Handler::initialize_content_iterator
 }
 
 void
-Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+Iterator_Handler::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 }
 
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
index 2f65d26faab..9427fef211b 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
@@ -53,27 +53,23 @@ public:
   // name of the file being retrieved from the web server.
 
   virtual void next_chunk (CORBA::Boolean pending_data,
-                   const Web_Server::Chunk_Type & chunk
-                   ACE_ENV_ARG_DECL)
+                   const Web_Server::Chunk_Type & chunk)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void next_chunk_excep (
-      ::Messaging::ExceptionHolder *
-      ACE_ENV_ARG_DECL_NOT_USED)
+      ::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy_excep (
-      ::Messaging::ExceptionHolder *
-      ACE_ENV_ARG_DECL_NOT_USED)
+      ::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
   void run (int *request_count,
             const char *pathname,
-            Web_Server::Iterator_Factory_ptr factory
-            ACE_ENV_ARG_DECL)
+            Web_Server::Iterator_Factory_ptr factory)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Activate and run this Reply Handler.  The contents (not the
@@ -87,13 +83,12 @@ private:
   // on the heap).
 
   void initialize_content_iterator (const char *pathname,
-                                    Web_Server::Iterator_Factory_ptr factory
-                                    ACE_ENV_ARG_DECL)
+                                    Web_Server::Iterator_Factory_ptr factory)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Initialize the Content Iterator used to retrieve the file.
 
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+  void deactivate (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate this reply handler.
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index 4f4368cca67..93b5fd0d1a0 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -15,21 +15,18 @@ ACE_RCSID (AMI_Iterator,
 
 // Obtain reference to Iterator_Factory
 Web_Server::Iterator_Factory_ptr
-get_iterator (CORBA::ORB_ptr orb
-              ACE_ENV_ARG_DECL);
+get_iterator (CORBA::ORB_ptr orb);
 
 // Perform file requests
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
-                      Web_Server::Iterator_Factory_ptr f
-                      ACE_ENV_ARG_DECL);
+                      Web_Server::Iterator_Factory_ptr f);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (argc < 2)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,30 +36,22 @@ main (int argc, char *argv[])
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Mighty ORB");
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Get an Iterator_Factory reference.
       Web_Server::Iterator_Factory_var factory =
-        ::get_iterator (orb.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ::get_iterator (orb.in ());
 
       if (CORBA::is_nil (factory.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,34 +71,28 @@ main (int argc, char *argv[])
       ::invoke_requests (argc,
                          argv,
                          &request_count,
-                         factory.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         factory.in ());
 
       // Run the ORB event loop.
       while (request_count > 0)
         {
           CORBA::Boolean more_work;
 
-          more_work = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          more_work = orb->work_pending ();
 
           if (more_work)
             {
-              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work ();
             }
           else
             ACE_OS::sleep (tv);
         }
 
-      orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (0);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCH (Web_Server::Error_Result, exc)
+  catch (const Web_Server::Error_Result& exc)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Caught Web Server exception with ")
@@ -117,14 +100,12 @@ main (int argc, char *argv[])
                          exc.status),
                         -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught unexpected exception:"));
+      ex._tao_print_exception (ACE_TEXT ("Caught unexpected exception:"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   // Wait for all children to exit.
   ACE_Process_Manager::instance ()->wait ();
@@ -133,21 +114,17 @@ main (int argc, char *argv[])
 }
 
 Web_Server::Iterator_Factory_ptr
-get_iterator (CORBA::ORB_ptr o
-              ACE_ENV_ARG_DECL)
+get_iterator (CORBA::ORB_ptr o)
 {
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (o);
 
   // Get a reference to the Name Service.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
+    orb->resolve_initial_references ("NameService");
 
   // Narrow to a Naming Context
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
+    CosNaming::NamingContext::_narrow (obj.in ());
 
   if (CORBA::is_nil (obj.in ()))
     {
@@ -162,8 +139,7 @@ get_iterator (CORBA::ORB_ptr o
   name[0].id = CORBA::string_dup ("Iterator_Factory");
   name[0].kind = CORBA::string_dup ("");
 
-  obj = nc->resolve (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
+  obj = nc->resolve (name);
 
   Web_Server::Iterator_Factory_ptr factory =
     Web_Server::Iterator_Factory::_narrow (obj.in ());
@@ -174,8 +150,7 @@ get_iterator (CORBA::ORB_ptr o
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
-                      Web_Server::Iterator_Factory_ptr f
-                      ACE_ENV_ARG_DECL)
+                      Web_Server::Iterator_Factory_ptr f)
 {
   Web_Server::Iterator_Factory_var factory =
     Web_Server::Iterator_Factory::_duplicate (f);
@@ -189,7 +164,6 @@ void invoke_requests (int argc,
       ACE_NEW_THROW_EX (handler,
                         Iterator_Handler,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       // Transfer ownership to the POA.
       PortableServer::ServantBase_var tmp (handler);
@@ -197,8 +171,6 @@ void invoke_requests (int argc,
       // This ends up being an AMI call, so it won't block.
       handler->run (request_count,
                     argv[i + 1],
-                    factory.in ()
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                    factory.in ());
     }
 }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index a1c2d6de7e5..d33f37fbf5d 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -8,54 +8,43 @@
 
 #include "Iterator_Factory_i.h"
 
-ACE_RCSID (AMI_Iterator, 
-           server, 
+ACE_RCSID (AMI_Iterator,
+           server,
            "$Id$")
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Mighty ORB");
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Create the Iterator_Factory servant and object.
       // It activates and deactivates the Content_Iterator object.
       Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory_servant._this ();
 
       // Get a reference to the Name Service.
-      obj = orb->resolve_initial_references ("NameService"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references ("NameService");
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (obj.in ());
 
       // Create a name.
       CosNaming::Name name;
@@ -63,13 +52,10 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      nc->bind (name, factory.in ());
 
       // Some debugging output.
-      CORBA::String_var IOR = orb->object_to_string (factory.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var IOR = orb->object_to_string (factory.in ());
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
                   name[0].id.in (),
@@ -79,17 +65,14 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught unexpected exception:"));
+      ex._tao_print_exception (ACE_TEXT ("Caught unexpected exception:"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index 832e96b6732..1fd4ed054b7 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -28,13 +28,12 @@ Callback_Handler::~Callback_Handler (void)
 }
 
 void
-Callback_Handler::next_chunk (ACE_ENV_SINGLE_ARG_DECL)
+Callback_Handler::next_chunk (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->last_chunk_ == 1)
     {
-      this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->deactivate ();
 
       return;
     }
@@ -44,7 +43,7 @@ Callback_Handler::next_chunk (ACE_ENV_SINGLE_ARG_DECL)
     Web_Server::Chunk_Type::allocbuf (BUFSIZ);
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    throw CORBA::NO_MEMORY ();
 
   ssize_t bytes_read = this->file_io_.recv (buf,
                                             BUFSIZ);
@@ -52,7 +51,7 @@ Callback_Handler::next_chunk (ACE_ENV_SINGLE_ARG_DECL)
     {
       Web_Server::Chunk_Type::freebuf (buf);
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   else if (bytes_read == 0)
     {
@@ -79,59 +78,49 @@ Callback_Handler::next_chunk (ACE_ENV_SINGLE_ARG_DECL)
 
   this->callback_->sendc_next_chunk (this->ami_handler_.in (),
                                      this->chunk_.in (),
-                                     this->last_chunk_
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                     this->last_chunk_);
 }
 
 void
 Callback_Handler::next_chunk_excep
-  (::Messaging::ExceptionHolder *excep_holder
-   ACE_ENV_ARG_DECL_NOT_USED)
+  (::Messaging::ExceptionHolder *excep_holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->last_chunk_ = 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->deactivate ();
 
-      excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      excep_holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Exception occured during ")
-                           ACE_TEXT ("sendc_next_chunk() call:"));
+      ex._tao_print_exception (
+        ACE_TEXT ("Exception occured during ")
+        ACE_TEXT ("sendc_next_chunk() call:"));
     }
-  ACE_ENDTRY;
 }
 
 void
-Callback_Handler::run (ACE_ENV_SINGLE_ARG_DECL)
+Callback_Handler::run (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
   // Open the file to be downloaded
-  this->open_file (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->open_file ();
 
   // Activate this Reply Handler.
-  this->ami_handler_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ami_handler_ = this->_this ();
 
   // Begin the asynchronous invocation.  Note that the AMI
   // "sendc_next_chunk()" call is done within the following call,
   // since data must first be read into the Chunk.
-  this->next_chunk (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->next_chunk ();
 }
 
 void
-Callback_Handler::open_file (ACE_ENV_SINGLE_ARG_DECL)
+Callback_Handler::open_file (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -145,27 +134,23 @@ Callback_Handler::open_file (ACE_ENV_SINGLE_ARG_DECL)
                          0,
                          O_RDONLY) == -1)
     // HTTP 1.1 "Not Found"
-    ACE_THROW (Web_Server::Error_Result (404));
+    throw Web_Server::Error_Result (404);
 }
 
 void
-Callback_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+Callback_Handler::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Close the file that was sent to the client.
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
   // Now deactivate the AMI_CallbackHandler object.
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
index db3f8bb2656..79f7a7dba99 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
@@ -77,15 +77,14 @@ public:
   // Constructor that creates a content iterator corresponding to the
   // name of the file being retrieved from the web server.
 
-  virtual void next_chunk (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void next_chunk (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback for this reply handler.
 
-  virtual void next_chunk_excep (::Messaging::ExceptionHolder *
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void next_chunk_excep (::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void run (ACE_ENV_SINGLE_ARG_DECL)
+  void run (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Activate and run this Reply Handler.  The contents (not the
@@ -98,12 +97,12 @@ private:
   // Destructor (private to ensure that Callback_Handler is allocated
   // on the heap).
 
-  void open_file (ACE_ENV_SINGLE_ARG_DECL)
+  void open_file (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result));
   // Open the file to be uploaded to the client callback.
 
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+  void deactivate (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate this reply handler.
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index 15755e55328..c2c60adbecf 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -51,8 +51,7 @@ Callback_i::~Callback_i (void)
 
 void
 Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
-                        CORBA::Boolean last_chunk
-                        ACE_ENV_ARG_DECL)
+                        CORBA::Boolean last_chunk)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!last_chunk)
@@ -98,8 +97,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
       if (this->metadata_received ())
         {
           (void) this->file_io_.close ();
-          this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->deactivate ();
 
           (void) this->spawn_viewer ();
         }
@@ -109,8 +107,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
 void
 Callback_i::metadata (const Web_Server::Metadata_Type &metadata)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       {
         ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -131,19 +128,17 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata)
       // an external viewer to display it.
       if (this->content_received ())
         {
-          this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->deactivate ();
 
           (void) this->spawn_viewer ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught unexpected exception ")
-                           ACE_TEXT ("in Callback_i::metdata(...):"));
+      ex._tao_print_exception (
+        ACE_TEXT ("Caught unexpected exception ")
+        ACE_TEXT ("in Callback_i::metdata(...):"));
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -278,19 +273,15 @@ Callback_i::spawn_viewer (void)
 }
 
 void
-Callback_i::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+Callback_i::deactivate (void)
 {
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
index 38ca7d43272..18690abce63 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
@@ -61,8 +61,7 @@ public:
   // Constructor
 
   virtual void next_chunk (const Web_Server::Chunk_Type &chunk,
-                           CORBA::Boolean last_chunk
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Boolean last_chunk)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
@@ -92,7 +91,7 @@ private:
 
 private:
 
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (void);
   // Deactivate this Callback servant.
 
 private:
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
index 4b6f0db6c37..b4bfb2755ec 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
@@ -18,8 +18,7 @@ ACE_RCSID (AMI_Observer,
 Web_Server::Metadata_Type *
 Push_Iterator_Factory_i::register_callback
   (const char *pathname,
-   Web_Server::Callback_ptr client_callback
-   ACE_ENV_ARG_DECL)
+   Web_Server::Callback_ptr client_callback)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   if (CORBA::is_nil (client_callback))  // @@ Will it ever be nil?
@@ -44,14 +43,12 @@ Push_Iterator_Factory_i::register_callback
                     Callback_Handler (pathname,
                                       client_callback),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   // Transfer ownership to the POA.
   PortableServer::ServantBase_var tmp (handler);
 
   // Start sending data to the client callback object.
-  handler->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  handler->run ();
 
   ACE_stat file_status;
   if (ACE_OS::stat (pathname,
@@ -64,7 +61,6 @@ Push_Iterator_Factory_i::register_callback
   ACE_NEW_THROW_EX (meta_tmp,
                     Web_Server::Metadata_Type,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   Web_Server::Metadata_Type_var metadata = meta_tmp;
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
index 684d13f8011..7bf0c2dacc2 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
@@ -53,8 +53,7 @@ class Push_Iterator_Factory_i :
 public:
   Web_Server::Metadata_Type *register_callback
     (const char *pathname,
-     Web_Server::Callback_ptr client_callback
-     ACE_ENV_ARG_DECL)
+     Web_Server::Callback_ptr client_callback)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // This registration method passes a <Callback> that the Web server
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index 96a7b7c0b88..46c920b873d 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -25,66 +25,54 @@ Push_Iterator_Handler::~Push_Iterator_Handler (void)
 
 void
 Push_Iterator_Handler::register_callback
-  (const Web_Server::Metadata_Type &metadata
-   ACE_ENV_ARG_DECL)
+  (const Web_Server::Metadata_Type &metadata)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_servant_->metadata (metadata);
 
   // This handler is no longer needed, so deactivate it.
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 }
 
 void
 Push_Iterator_Handler::run (int *request_count,
                             const char *pathname,
-                            Web_Server::Iterator_Factory_ptr factory
-                            ACE_ENV_ARG_DECL)
+                            Web_Server::Iterator_Factory_ptr factory)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
   ACE_NEW_THROW_EX (this->callback_servant_,
                     Callback_i (request_count),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   // Pass ownership of the Callback servant to the POA.
   PortableServer::ServantBase_var tmp (this->callback_servant_);
 
   // Activate the Callback.
   this->callback_ =
-    this->callback_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->callback_servant_->_this ();
 
   // Activate this Reply Handler.
   this->ami_handler_ =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Register the client callback with the server asynchronously.
   factory->sendc_register_callback (this->ami_handler_.in (),
                                     pathname,
-                                    this->callback_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    this->callback_.in ());
 }
 
 void
-Push_Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+Push_Iterator_Handler::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
   // Now deactivate the AMI_CallbackHandler object.
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
index 8b8254550da..a884c218600 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
@@ -62,8 +62,7 @@ public:
 
   void run (int *request_count,
             const char *pathname,
-            Web_Server::Iterator_Factory_ptr factory
-            ACE_ENV_ARG_DECL)
+            Web_Server::Iterator_Factory_ptr factory)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Activate and run this Reply Handler.  The contents (not the
@@ -78,18 +77,16 @@ private:
   // on the heap).
 
   virtual void register_callback
-  (const Web_Server::Metadata_Type &metadata
-   ACE_ENV_ARG_DECL)
+  (const Web_Server::Metadata_Type &metadata)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // AMI callback that is invoked when a response from the
   // corresponding server method is received.
 
   virtual void register_callback_excep
-  (::Messaging::ExceptionHolder *
-   ACE_ENV_ARG_DECL_NOT_USED)
+  (::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+  void deactivate (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate this handler.
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index 986c828875a..2a5f8204d05 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -15,21 +15,18 @@ ACE_RCSID (AMI_Observer,
 
 // Obtain reference to Iterator_Factory
 Web_Server::Iterator_Factory_ptr
-get_iterator (CORBA::ORB_ptr orb
-              ACE_ENV_ARG_DECL);
+get_iterator (CORBA::ORB_ptr orb);
 
 // Perform file requests
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
-                      Web_Server::Iterator_Factory_ptr f
-                      ACE_ENV_ARG_DECL);
+                      Web_Server::Iterator_Factory_ptr f);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (argc < 2)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -40,30 +37,22 @@ main (int argc, char *argv[])
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Mighty ORB");
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Get an Iterator_Factory reference.
       Web_Server::Iterator_Factory_var factory =
-        ::get_iterator (orb.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ::get_iterator (orb.in ());
 
       if (CORBA::is_nil (factory.in ()))
         {
@@ -83,9 +72,7 @@ main (int argc, char *argv[])
       ::invoke_requests (argc,
                          argv,
                          &request_count,
-                         factory.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         factory.in ());
 
       // 1 millisecond delay to reduce "busy waiting" in ORB event
       // loop.
@@ -96,25 +83,21 @@ main (int argc, char *argv[])
         {
           CORBA::Boolean more_work;
 
-          more_work = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          more_work = orb->work_pending ();
 
           if (more_work)
             {
-              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work ();
             }
           else
             ACE_OS::sleep (tv);
         }
 
-      orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (0);
 
-      //orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      //ACE_TRY_CHECK;
+      //orb->destroy ();
     }
-  ACE_CATCH (Web_Server::Error_Result, exc)
+  catch (const Web_Server::Error_Result& exc)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Caught Web Server exception ")
@@ -122,14 +105,12 @@ main (int argc, char *argv[])
                          exc.status),
                         -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught unexpected exception:"));
+      ex._tao_print_exception (ACE_TEXT ("Caught unexpected exception:"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   // Wait for all spawned viewers to exit.
   ACE_Process_Manager::instance ()->wait ();
@@ -138,21 +119,17 @@ main (int argc, char *argv[])
 }
 
 Web_Server::Iterator_Factory_ptr
-get_iterator (CORBA::ORB_ptr o
-              ACE_ENV_ARG_DECL)
+get_iterator (CORBA::ORB_ptr o)
 {
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (o);
 
   // Get a reference to the Name Service.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
+    orb->resolve_initial_references ("NameService");
 
   // Narrow to a Naming Context
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
+    CosNaming::NamingContext::_narrow (obj.in ());
 
   if (CORBA::is_nil (obj.in ()))
     {
@@ -167,8 +144,7 @@ get_iterator (CORBA::ORB_ptr o
   name[0].id = CORBA::string_dup ("Push_Iterator_Factory");
   name[0].kind = CORBA::string_dup ("");
 
-  obj = nc->resolve (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
+  obj = nc->resolve (name);
 
   Web_Server::Iterator_Factory_ptr factory =
     Web_Server::Iterator_Factory::_narrow (obj.in ());
@@ -179,8 +155,7 @@ get_iterator (CORBA::ORB_ptr o
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
-                      Web_Server::Iterator_Factory_ptr f
-                      ACE_ENV_ARG_DECL)
+                      Web_Server::Iterator_Factory_ptr f)
 {
   Web_Server::Iterator_Factory_var factory =
     Web_Server::Iterator_Factory::_duplicate (f);
@@ -194,7 +169,6 @@ void invoke_requests (int argc,
       ACE_NEW_THROW_EX (handler,
                         Push_Iterator_Handler,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       // Transfer ownership to the POA.
       PortableServer::ServantBase_var tmp (handler);
@@ -202,8 +176,6 @@ void invoke_requests (int argc,
       // This ends up being an AMI call, so it won't block.
       handler->run (request_count,
                     argv[i + 1],
-                    factory.in ()
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                    factory.in ());
     }
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp
index 83388bc3fb9..e3cc88d906e 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp
@@ -7,53 +7,42 @@
 #include "Push_Web_ServerS.h"
 #include "Push_Iterator_Factory_i.h"
 
-ACE_RCSID (AMI_Observer, 
-           server, 
+ACE_RCSID (AMI_Observer,
+           server,
            "$Id$")
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Mighty ORB");
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Create the Iterator_Factory servant and object.
       Push_Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory_servant._this ();
 
       // Get a reference to the Name Service.
-      obj = orb->resolve_initial_references ("NameService"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references ("NameService");
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (obj.in ());
 
       // Create a name.
       CosNaming::Name name;
@@ -61,13 +50,10 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Push_Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      nc->bind (name, factory.in ());
 
       // Some debugging output.
-      CORBA::String_var IOR = orb->object_to_string (factory.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var IOR = orb->object_to_string (factory.in ());
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
                   name[0].id.in (),
@@ -77,17 +63,14 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught unexpected exception:"));
+      ex._tao_print_exception (ACE_TEXT ("Caught unexpected exception:"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 4ca7e00bedb..3aef112e8d5 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -27,8 +27,7 @@ Content_Iterator_i::~Content_Iterator_i (void)
 
 CORBA::Boolean
 Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
-                                Web_Server::Chunk_Type_out chunk
-                                ACE_ENV_ARG_DECL)
+                                Web_Server::Chunk_Type_out chunk)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize/allocate the Chunk_Type sequence
@@ -36,7 +35,6 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
   ACE_NEW_THROW_EX (tmp,
                     Web_Server::Chunk_Type,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (false);
 
   chunk = tmp;
 
@@ -118,28 +116,23 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset,
 }
 
 void
-Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Content_Iterator_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Content_Iterator object.
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
   // Get the object ID associated with this servant.
-  PortableServer::ObjectId_var oid = poa->servant_to_id (this
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::ObjectId_var oid = poa->servant_to_id (this);
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 
   // Decrease the reference count on our selves.
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 int
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
index 8af8f5f900f..7d61b296a03 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
@@ -52,13 +52,12 @@ public:
   // Destructor
 
   virtual CORBA::Boolean next_chunk (CORBA::ULongLong offset,
-                                     Web_Server::Chunk_Type_out chunk
-                                     ACE_ENV_ARG_DECL)
+                                     Web_Server::Chunk_Type_out chunk)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the iterator.
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
index fce34dc3dcd..d43c37035ed 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
@@ -14,8 +14,7 @@ ACE_RCSID (SMI_Iterator, Iterator_Factory_i, "$Id$")
 void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
-                                  Web_Server::Metadata_Type_out metadata
-                                  ACE_ENV_ARG_DECL)
+                                  Web_Server::Metadata_Type_out metadata)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -25,7 +24,7 @@ Iterator_Factory_i::get_iterator (const char *pathname,
   ACE_stat file_status;
   if (ACE_OS::stat (pathname, &file_status) == -1)
     {
-      ACE_THROW (Web_Server::Error_Result (500));
+      throw Web_Server::Error_Result (500);
       // HTTP 1.1 "Internal Server Error"
     }
 
@@ -34,18 +33,17 @@ Iterator_Factory_i::get_iterator (const char *pathname,
                     Content_Iterator_i (pathname,
                                         file_status.st_size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   if (iterator_servant->init () != 0)
     {
       if (errno == EACCES)
         {
-          ACE_THROW (Web_Server::Error_Result (403));
+          throw Web_Server::Error_Result (403);
           // HTTP 1.1 "Forbidden"
         }
       else
         {
-          ACE_THROW (Web_Server::Error_Result (500));
+          throw Web_Server::Error_Result (500);
           // HTTP 1.1 "Internal Server Error"
         }
     }
@@ -53,28 +51,26 @@ Iterator_Factory_i::get_iterator (const char *pathname,
 
   // Activate the Content_Iterator object.
   Web_Server::Content_Iterator_var iterator =
-    iterator_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    iterator_servant->_this ();
 
   Web_Server::Metadata_Type *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     Web_Server::Metadata_Type,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   metadata = tmp;
 
   if (this->modification_date (&file_status,
                                metadata) != 0)
     {
-      ACE_THROW (Web_Server::Error_Result (500));
+      throw Web_Server::Error_Result (500);
       // HTTP 1.1 "Internal Server Error
     }
 
   if (this->content_type (pathname,
                           metadata) != 0)
     {
-      ACE_THROW (Web_Server::Error_Result (500));
+      throw Web_Server::Error_Result (500);
       // HTTP 1.1 "Internal Server Error
     }
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
index 3e049f08fe3..e68a29079c7 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
@@ -47,8 +47,7 @@ public:
 
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
-                             Web_Server::Metadata_Type_out metadata
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             Web_Server::Metadata_Type_out metadata)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // This factory method returns a <Content_Iterator> that can be used
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index dcec6b9a578..e81ac7370ff 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -18,8 +18,7 @@ ACE_RCSID (SMI_Iterator,
 
 // Retrieve the data from the server
 int retrieve_data (const char *content_type,
-                   Web_Server::Content_Iterator_ptr contents
-                   ACE_ENV_ARG_DECL);
+                   Web_Server::Content_Iterator_ptr contents);
 
 
 // Map content type to viewer.
@@ -34,8 +33,7 @@ int spawn_viewer (const char *content_type,
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (argc < 2)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -45,20 +43,15 @@ main (int argc, char *argv[])
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Mighty ORB");
 
       // Get a reference to the Name Service.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (obj.in ());
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -74,8 +67,7 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      obj = nc->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = nc->resolve (name);
 
       // Now narrow to an Iterator_Factory reference.
       Web_Server::Iterator_Factory_var factory =
@@ -97,9 +89,7 @@ main (int argc, char *argv[])
       Web_Server::Metadata_Type_var metadata;
       factory->get_iterator (pathname,
                              contents,
-                             metadata
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             metadata);
 
       ACE_DEBUG ((LM_INFO,
                   ACE_TEXT ("File <%s> has the following ")
@@ -111,24 +101,19 @@ main (int argc, char *argv[])
                   metadata->content_type.in ()));
 
       int result = ::retrieve_data (metadata->content_type.in (),
-                                    contents.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    contents.in ());
 
       if (result != 0)
         return -1;
 
       // Done with the Content_Iterator, so destroy it.
-      contents->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      contents->destroy ();
 
-      orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (0);
 
-      // orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      // ACE_TRY_CHECK;
+      // orb->destroy ();
     }
-  ACE_CATCH (Web_Server::Error_Result, exc)
+  catch (const Web_Server::Error_Result& exc)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Caught Web Server exception ")
@@ -136,14 +121,12 @@ main (int argc, char *argv[])
                          exc.status),
                         -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught unexpected exception:"));
+      ex._tao_print_exception (ACE_TEXT ("Caught unexpected exception:"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   // Wait for all children to exit.
   ACE_Process_Manager::instance ()->wait ();
@@ -153,8 +136,7 @@ main (int argc, char *argv[])
 
 
 int retrieve_data (const char *content_type,
-                   Web_Server::Content_Iterator_ptr iterator
-                   ACE_ENV_ARG_DECL)
+                   Web_Server::Content_Iterator_ptr iterator)
 {
   Web_Server::Content_Iterator_var contents =
     Web_Server::Content_Iterator::_duplicate (iterator);
@@ -184,8 +166,7 @@ int retrieve_data (const char *content_type,
 
   for (;;)
     {
-      rc = contents->next_chunk (offset, chunk ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      rc = contents->next_chunk (offset, chunk);
 
       if (!rc)
         break;
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
index 701dccbeac0..14ea359f5af 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
@@ -8,54 +8,43 @@
 
 #include "Iterator_Factory_i.h"
 
-ACE_RCSID (SMI_Iterator, 
-           server, 
+ACE_RCSID (SMI_Iterator,
+           server,
            "$Id$")
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Mighty ORB");
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Create the Iterator_Factory servant and object.
       // It activates and deactivates the Content_Iterator object.
       Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory_servant._this ();
 
       // Get a reference to the Name Service.
-      obj = orb->resolve_initial_references ("NameService"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references ("NameService");
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc;
-      nc = CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      nc = CosNaming::NamingContext::_narrow (obj.in ());
 
       // Create a name.
       CosNaming::Name name;
@@ -63,13 +52,10 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      nc->bind (name, factory.in ());
 
       // Some debugging output.
-      CORBA::String_var IOR = orb->object_to_string (factory.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var IOR = orb->object_to_string (factory.in ());
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
                   name[0].id.in (),
@@ -79,17 +65,14 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught unexpected exception:"));
+      ex._tao_print_exception (ACE_TEXT ("Caught unexpected exception:"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index b71951cf34b..b471eba752f 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -33,31 +33,23 @@ Consumer_Handler::init (int argc,
    // necessary.
   filtering_criteria = argc > 1 ? argv[1] : "";
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Save the Shutdown callback.
       this->shutdowncallback = _shutdowncallback;
@@ -67,9 +59,8 @@ Consumer_Handler::init (int argc,
 
       // Start the servant.
       this->receiver_ =
-        this->receiver_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->receiver_i_._this ();
 
-      ACE_TRY_CHECK;
 
       if (this->get_notifier () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,16 +70,13 @@ Consumer_Handler::init (int argc,
 
       // Subscribe ourselves with the notifier's broker.
       this->notifier_->subscribe (this->receiver_.in (),
-                                  filtering_criteria
-                                  ACE_ENV_ARG_PARAMETER);
+                                  filtering_criteria);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Consumer_Handler::init\n");
+     ex._tao_print_exception ("Consumer_Handler::init\n");
      return -1;
    }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -96,7 +84,7 @@ Consumer_Handler::init (int argc,
 int
 Consumer_Handler::get_notifier (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialization of the naming service.
       if (naming_services_client_.init (orb_.in ()) != 0)
@@ -110,24 +98,18 @@ Consumer_Handler::get_notifier (void)
       notifier_ref_name[0].id = CORBA::string_dup (NOTIFIER_BIND_NAME);
 
       CORBA::Object_var notifier_obj =
-        this->naming_services_client_->resolve (notifier_ref_name
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_services_client_->resolve (notifier_ref_name);
 
       // The CORBA::Object_var object is downcast to Notifier_var
       // using the <_narrow> method.
       this->notifier_ =
-        Event_Comm::Notifier::_narrow (notifier_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Event_Comm::Notifier::_narrow (notifier_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Consumer_Handler::get_notifier\n");
+      ex._tao_print_exception ("Consumer_Handler::get_notifier\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -153,16 +135,13 @@ Consumer_Handler::run (void)
               "Running the Consumer...\n"));
 
   // Run the ORB.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
index 697408dfa36..f6ce490ee8c 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -47,23 +47,19 @@ Consumer_Input_Handler::close (void)
       // Only try to unsubscribe if the Consumer initiated the
       // shutdown.  Otherwise, the Notifier initiated it and it has
       // probably gone away by now!
-      ACE_TRY_NEW_ENV
+      try
         {
           // Gracefully shutdown the Receiver by removing it from the
           // Notifier's internal map.
 
           if (notifier != 0)
             notifier->unsubscribe (receiver,
-                                   ""
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                   "");
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Consumer_Input_Handler::handle_close\n");
+          ex._tao_print_exception ("Consumer_Input_Handler::handle_close\n");
         }
-      ACE_ENDTRY;
     }
 
   // Make sure to cleanup the STDIN handler.
@@ -132,20 +128,18 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE h)
     }
   else
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           Event_Comm::Event event;
 
           event.tag_ = ACE_OS::strdup (buf);
 
-          notifier->push (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          notifier->push (event);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception\n");
+          ex._tao_print_exception ("Unexpected exception\n");
         }
-      ACE_ENDTRY;
     }
 
   /* NOTREACHED */
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index 9a2ce82b193..50068489754 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -160,8 +160,7 @@ The filtering criteria will not work.\n"));
 
 void
 Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
-                       const char *filtering_criteria
-                       ACE_ENV_ARG_DECL)
+                       const char *filtering_criteria)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    Event_Comm::Notifier::CannotSubscribe
@@ -198,7 +197,8 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
           // Inform the caller that the <Event_Comm::Consumer> * is
           // already being used.
 
-          ACE_THROW (Event_Comm::Notifier::CannotSubscribe ("Duplicate consumer and filtering criteria found.\n"));
+          throw Event_Comm::Notifier::CannotSubscribe (
+            "Duplicate consumer and filtering criteria found.\n");
         }
     }
 
@@ -214,7 +214,8 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
     {
       // Prevent memory leaks.
       delete nr_entry;
-      ACE_THROW (Event_Comm::Notifier::CannotSubscribe ("Failed to add Consumer to internal map\n"));
+      throw Event_Comm::Notifier::CannotSubscribe (
+        "Failed to add Consumer to internal map\n");
     }
 }
 
@@ -222,8 +223,7 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
 
 void
 Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
-                         const char *filtering_criteria
-                         ACE_ENV_ARG_DECL)
+                         const char *filtering_criteria)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    Event_Comm::Notifier::CannotUnsubscribe
@@ -265,21 +265,22 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
           // @@ This is a hack, we need a better approach!
           if (this->map_.unbind (me->ext_id_,
                                  nr_entry) == -1)
-            ACE_THROW (Event_Comm::Notifier::CannotUnsubscribe ("Internal map unbind failed."));
+            throw Event_Comm::Notifier::CannotUnsubscribe (
+              "Internal map unbind failed.");
           else
             delete nr_entry;
         }
     }
 
   if (found == 0)
-    ACE_THROW (Event_Comm::Notifier::CannotUnsubscribe ("The Consumer and filtering criteria were not found."));
+    throw Event_Comm::Notifier::CannotUnsubscribe (
+      "The Consumer and filtering criteria were not found.");
 }
 
 // Disconnect all the consumers, giving them the <reason>.
 
 void
-Notifier_i::disconnect (const char *reason
-                        ACE_ENV_ARG_DECL)
+Notifier_i::disconnect (const char *reason)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -303,17 +304,14 @@ Notifier_i::disconnect (const char *reason
       ACE_DEBUG ((LM_DEBUG,
                   "disconnecting client %x\n",
                   consumer_ref));
-      ACE_TRY
+      try
         {
-          consumer_ref->disconnect (reason
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer_ref->disconnect (reason);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception\n");
+          ex._tao_print_exception ("Unexpected exception\n");
         }
-      ACE_ENDTRY;
 
       delete me->int_id_;
       count++;
@@ -333,8 +331,7 @@ Notifier_i::disconnect (const char *reason
 // Notify all consumers whose filtering criteria match the event.
 
 void
-Notifier_i::push (const Event_Comm::Event &event
-                  ACE_ENV_ARG_DECL)
+Notifier_i::push (const Event_Comm::Event &event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -369,19 +366,15 @@ Notifier_i::push (const Event_Comm::Event &event
                       (const char *) event.tag_,
                       me->int_id_->criteria (),
                       consumer_ref));
-          ACE_TRY
+          try
             {
-              consumer_ref->push (event
-                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              consumer_ref->push (event);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "Unexpected exception\n");
+              ex._tao_print_exception ("Unexpected exception\n");
               continue;
             }
-          ACE_ENDTRY;
           count++;
         }
     }
@@ -416,8 +409,7 @@ Consumer_i::~Consumer_i (void)
 // occurred.
 
 void
-Consumer_i::push (const Event_Comm::Event &event
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Consumer_i::push (const Event_Comm::Event &event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *tmpstr = event.tag_;
@@ -431,8 +423,7 @@ Consumer_i::push (const Event_Comm::Event &event
 // <Event_Comm::Notifier>.
 
 void
-Consumer_i::disconnect (const char *reason
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Consumer_i::disconnect (const char *reason)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h
index 34d19972733..61529ad22e6 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.h
+++ b/TAO/examples/Event_Comm/Event_Comm_i.h
@@ -61,13 +61,11 @@ public:
   void set_reactor (ACE_Reactor *reactor);
   // set the <ACE_Reactor> to use when quitting.
 
-  virtual void push (const Event_Comm::Event & event
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const Event_Comm::Event & event)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Pass the <event> to the <Consumer>.
 
-  virtual void disconnect (const char * reason
-                           ACE_ENV_ARG_DECL)
+  virtual void disconnect (const char * reason)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Disconnect the <Consumer> from the <Notifier>, giving it the
@@ -98,20 +96,17 @@ public:
   Notifier_i (size_t size_hint = Notifier_i::DEFAULT_SIZE);
   // Initialize a Notifier_i object with the specified size hint.
 
-  virtual void disconnect (const char *reason
-                           ACE_ENV_ARG_DECL)
+  virtual void disconnect (const char *reason)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnect all the receivers, giving them the <reason>.
 
-  virtual void push (const Event_Comm::Event &event
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const Event_Comm::Event &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send the <event> to all the consumers who have subscribed and who
   // match the filtering criteria.
 
    virtual void subscribe (Event_Comm::Consumer_ptr Consumer,
-                           const char * filtering_criteria
-                           ACE_ENV_ARG_DECL)
+                           const char * filtering_criteria)
      ACE_THROW_SPEC ((
                       CORBA::SystemException,
                       Event_Comm::Notifier::CannotSubscribe
@@ -120,8 +115,7 @@ public:
   // <filtering_criteria> applied by the <Notifier>.
 
  void unsubscribe (Event_Comm::Consumer *consumer,
-                    const char *filtering_criteria
-                    ACE_ENV_ARG_DECL)
+                    const char *filtering_criteria)
    ACE_THROW_SPEC ((
                     CORBA::SystemException,
                     Event_Comm::Notifier::CannotUnsubscribe
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index b2cb6b53f94..4df1cb9b4ac 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -85,31 +85,23 @@ Notifier_Handler::init (int argc,
   // set the callback
  shutdowncallback = _shutdowncallback;
 
- ACE_TRY_NEW_ENV
+ try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Initialization of the naming service.
       if (this->naming_client_.init (orb_.in ()) != 0)
@@ -124,25 +116,19 @@ Notifier_Handler::init (int argc,
       CORBA::string_dup (NOTIFIER_BIND_NAME);
 
       CORBA::Object_var notifier_obj =
-       this->naming_client_->resolve (notifier_ref_name
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+       this->naming_client_->resolve (notifier_ref_name);
 
 
       // The CORBA::Object_var object is downcast to Notifier_var
       // using the <_narrow> method.
       this->notifier_ =
-         Event_Comm::Notifier::_narrow (notifier_obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         Event_Comm::Notifier::_narrow (notifier_obj.in ());
   }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Notifier_Handler::init\n");
+     ex._tao_print_exception ("Notifier_Handler::init\n");
      return -1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp
index 991dd77d1f6..e1f2d8f0967 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Server.cpp
@@ -24,12 +24,10 @@ Notifier_Server::~Notifier_Server (void)
 int
 Notifier_Server::close (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // disconnect all the consumers.
-      this->servant_.disconnect ("notifier shutdown."
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->servant_.disconnect ("notifier shutdown.");
 
       // Name the object.
       CosNaming::Name notifier_obj_name (1);
@@ -37,18 +35,15 @@ Notifier_Server::close (void)
       notifier_obj_name[0].id =
         CORBA::string_dup (NOTIFIER_BIND_NAME);
 
-      this->naming_server_->unbind (notifier_obj_name
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->naming_server_->unbind (notifier_obj_name);
 
       // Instruct the ORB to shutdown.
       this->orb_manager_.orb ()->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
     return 0;
 }
@@ -57,9 +52,9 @@ Notifier_Server::close (void)
 // the object name is bound to the naming server.
 
 int
-Notifier_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Notifier_Server::init_naming_service (void)
 {
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = this->orb_manager_.orb ();
 
@@ -72,29 +67,23 @@ Notifier_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 
       // Register the object implementation with the POA.
       Event_Comm::Notifier_var notifier_obj =
-        this->servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->servant_._this ();
 
       // Name the object.
       CosNaming::Name notifier_obj_name (1);
       notifier_obj_name.length (1);
       notifier_obj_name[0].id =
         CORBA::string_dup (NOTIFIER_BIND_NAME);
-      ACE_TRY_CHECK;
 
       // Now, attach the object name to the context.
       this->naming_server_->bind (notifier_obj_name,
-                                  notifier_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  notifier_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Notifier_Server::init_naming_service\n");
+      ex._tao_print_exception ("Notifier_Server::init_naming_service\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -103,44 +92,38 @@ Notifier_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 // Initialize the server.
 int
 Notifier_Server::init (int argc,
-                       char *argv[]
-                       ACE_ENV_ARG_DECL)
+                       char *argv[])
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create the child poa under the root POA.
 
  if (this->orb_manager_.init_child_poa (argc,
                                         argv,
-                                        "child_poa"
-                                        ACE_ENV_ARG_PARAMETER) == -1)
+                                        "child_poa") == -1)
 
    ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                       "init_child_poa"),
                       -1);
- ACE_CHECK_RETURN (-1);
 
- this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
+ this->orb_manager_.activate_poa_manager ();
 
  // Activate the servant in the POA.
  CORBA::String_var str =
    this->orb_manager_.activate_under_child_poa (NOTIFIER_BIND_NAME,
-                                                 &this->servant_
-                                                ACE_ENV_ARG_PARAMETER);
+                                                 &this->servant_);
 
- return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->init_naming_service ();
 }
 
 int
-Notifier_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Notifier_Server::run (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running the notifier server...\n"));
 
   // Run the main event loop for the ORB.
-  this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_manager_.run ();
 
   return 0;
 }
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index 9fbab0ee982..b84f3f059f8 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -35,10 +35,10 @@ public:
   ~Notifier_Server (void);
   // Destructor.
 
- int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+ int init (int argc, char *argv[]);
   // Initialize the Server state.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
   int close (void);
@@ -48,7 +48,7 @@ public:
   // Reactor accessor.
 
 private:
-  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (void);
   // Initialises the name server and registers the Notifier server
   // object name with the name server.
 
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
index 73847bd2ce9..87907a02e38 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -98,7 +98,7 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE)
       ACE_ASSERT (notifier != 0);
 
       // Use the notifier to notify Consumers.
-      ACE_TRY_NEW_ENV
+      try
         {
           Event_Comm::Event event;
 
@@ -109,14 +109,12 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE)
           // reference...  event.value_ = ...
 
           // Forward <Event> to all <Consumers>.
-          notifier->push (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          notifier->push (event);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected Error\n");
+          ex._tao_print_exception ("Unexpected Error\n");
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index 8e348b1df5b..774eea4db30 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -20,31 +20,26 @@ Notifier::handle_signal (int signum, siginfo_t *, ucontext_t *)
 void
 Notifier::run (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      ns_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ns_.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return;
     }
-  ACE_ENDTRY;
 }
 
 Notifier::Notifier (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      ns_.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ns_.init (argc, argv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Notifier_Server.init failed\n ");
+      ex._tao_print_exception ("Notifier_Server.init failed\n ");
     }
-  ACE_ENDTRY;
 
   // Register with the ORB's Reactor to receive a signal to shut us
   // down.
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index eeb9a9846c4..30b2df14acd 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -15,14 +15,14 @@
 using namespace std;
 
 EDF_Scheduling::SchedulingParameter
-EDF_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EDF_Sched_Param_Policy::value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
-EDF_Sched_Param_Policy::value (const EDF_Scheduling::SchedulingParameter& value ACE_ENV_ARG_DECL_NOT_USED)
+EDF_Sched_Param_Policy::value (const EDF_Scheduling::SchedulingParameter& value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_ = value;
@@ -37,7 +37,6 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb,
     ace_sched_policy_ (ace_sched_policy),
     ace_sched_scope_ (ace_sched_scope)
 {
-  ACE_DECLARE_NEW_ENV;
 
   Kokyu::DSRT_ConfigInfo config;
 
@@ -53,19 +52,14 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb,
   kokyu_dispatcher_ = tmp;
 
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RTScheduler_Current"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("RTScheduler_Current");
 
   this->current_ =
-    RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTScheduling::Current::_narrow (object.in ());
 
   IOP::CodecFactory_var codec_factory;
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("CodecFactory"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("CodecFactory");
 
   if (CORBA::is_nil(obj.in ()))
     {
@@ -97,7 +91,7 @@ EDF_Scheduler::shutdown (void)
 }
 
 EDF_Scheduling::SchedulingParameterPolicy_ptr
-EDF_Scheduler::create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value ACE_ENV_ARG_DECL)
+EDF_Scheduler::create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /* MEASURE: Time to create scheduling parameter */
@@ -122,8 +116,7 @@ void
 EDF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
-                                             CORBA::Policy_ptr
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+                                             CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -164,8 +157,7 @@ void
 EDF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                                 const char *name,
                                                 CORBA::Policy_ptr sched_param,
-                                                CORBA::Policy_ptr implicit_sched_param
-                                                ACE_ENV_ARG_DECL)
+                                                CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -177,17 +169,14 @@ EDF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT
   this->begin_new_scheduling_segment (guid,
                                       name,
                                       sched_param,
-                                      implicit_sched_param
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      implicit_sched_param);
 }
 
 void
 EDF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& guid,
                                           const char* name,
                                           CORBA::Policy_ptr sched_policy,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -218,8 +207,7 @@ EDF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
 
 void
 EDF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
-                                       const char *
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       const char *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -238,8 +226,7 @@ EDF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid
 void
 EDF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char *,
-                                              CORBA::Policy_ptr
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+                                              CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int int_guid;
@@ -251,8 +238,7 @@ EDF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdTyp
 
 
 void
-EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL)
+EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -264,8 +250,7 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
   DSUI_EVENT_LOG (EDF_SCHED_FAM, ENTER_CLIENT_SCHED_TIME, int_guid, 0, NULL);
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -279,8 +264,7 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
   sc.context_id = Client_Interceptor::SchedulingInfo;
 
   CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->scheduling_parameter();
 
   CORBA::Long importance;
   TimeBase::TimeT deadline;
@@ -334,8 +318,7 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 #endif
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ri->add_request_service_context (sc, 0);
 
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -364,8 +347,7 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
                                 RTScheduling::Current::IdType_out guid_out,
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out sched_param_out,
-                                CORBA::Policy_out /*implicit_sched_param_out*/
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Policy_out /*implicit_sched_param_out*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -383,8 +365,7 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
 #endif
 
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -400,9 +381,7 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
     return;
 
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (Server_Interceptor::SchedulingInfo);
 
   CORBA::Long importance;
   TimeBase::TimeT deadline;
@@ -497,8 +476,7 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
 }
 
 void
-EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
-			  ACE_ENV_ARG_DECL_NOT_USED)
+EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
@@ -510,8 +488,7 @@ EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
 }
 
 void
-EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int int_guid;
@@ -522,8 +499,7 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -540,8 +516,7 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   TimeBase::TimeT deadline;
 
   CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->scheduling_parameter();
 
   if (CORBA::is_nil (sched_policy))
     {
@@ -583,8 +558,7 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
                                              *codec_->encode (sc_qos_as_any));
 
       // Add this context to the service context list.
-      ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_reply_service_context (sc, 1);
 
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):reply sc added\n"));
@@ -601,8 +575,7 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 }
 
 void
-EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -612,13 +585,11 @@ EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
                   this->current_->id ()->length ());
   DSUI_EVENT_LOG (EDF_SCHED_FAM, SEND_EXCEPTION, int_guid, 0, NULL);
 
-  send_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  send_reply (ri);
 }
 
 void
-EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -628,13 +599,11 @@ EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
                   this->current_->id ()->length ());
   DSUI_EVENT_LOG (EDF_SCHED_FAM, SEND_OTHER, int_guid, 0, NULL);
 
-  send_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  send_reply (ri);
 }
 
 void
-EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL)
+EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int int_guid;
@@ -643,11 +612,9 @@ EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 
   RTScheduling::Current::IdType guid;
 
-  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 ();
 
   ACE_CString opname = operation.in ();
 #ifdef KOKYU_DSRT_LOGGING
@@ -661,9 +628,7 @@ EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
   // expected.
 
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo);
 
   CORBA::Long importance;
   TimeBase::TimeT deadline;
@@ -713,20 +678,17 @@ EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 void
-EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL)
+EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_EXCEPTION, 0, 0, NULL);
 
-  receive_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  receive_reply (ri);
 }
 
 void
-EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL)
+EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -734,43 +696,40 @@ EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
   DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_OTHER, 0, 0, NULL);
 
 //Otherwise Segmentation fault when oneway call happens.
-/*  receive_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+/*  receive_reply (ri);
 */
 }
 
 void
-EDF_Scheduler::cancel (const RTScheduling::Current::IdType &
-                       ACE_ENV_ARG_DECL)
+EDF_Scheduler::cancel (const RTScheduling::Current::IdType &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
-EDF_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL)
+EDF_Scheduler::scheduling_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 void
-EDF_Scheduler::scheduling_policies (const CORBA::PolicyList &
-                                    ACE_ENV_ARG_DECL)
+EDF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
-EDF_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL)
+EDF_Scheduler::poa_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 char *
-EDF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
+EDF_Scheduler::scheduling_discipline_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -778,8 +737,7 @@ EDF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
 
 RTScheduling::ResourceManager_ptr
 EDF_Scheduler::create_resource_manager (const char *,
-                                        CORBA::Policy_ptr
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -788,10 +746,9 @@ EDF_Scheduler::create_resource_manager (const char *,
 void
 EDF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
-                                         CORBA::Policy_ptr
-                                         ACE_ENV_ARG_DECL)
+                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
index ca3f4263c43..e1a7a27c903 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h
@@ -51,11 +51,10 @@ public EDF_Scheduling::SchedulingParameterPolicy,
 {
  public:
 
-    EDF_Scheduling::SchedulingParameter value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    EDF_Scheduling::SchedulingParameter value (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void value (const EDF_Scheduling::SchedulingParameter & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    void value (const EDF_Scheduling::SchedulingParameter & value)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
@@ -78,7 +77,6 @@ public TAO_Local_RefCounted_Object
 
   virtual EDF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                  )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -87,45 +85,38 @@ public TAO_Local_RefCounted_Object
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
                                              CORBA::Policy_ptr sched_param,
-                                             CORBA::Policy_ptr implicit_sched_param
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                                 const char * name,
                                                 CORBA::Policy_ptr sched_param,
-                                                CORBA::Policy_ptr implicit_sched_param
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                           const char * name,
                                           CORBA::Policy_ptr sched_param,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              CORBA::Policy_ptr outer_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-			  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
@@ -133,65 +124,54 @@ public TAO_Local_RefCounted_Object
                                 RTScheduling::Current::IdType_out guid,
                                 CORBA::String_out name,
                                 CORBA::Policy_out sched_param,
-                                CORBA::Policy_out implicit_sched_param
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                CORBA::Policy_out implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void cancel (const RTScheduling::Current::IdType & guid)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * scheduling_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter
-                                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                     CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Kokyu::DSRT_Dispatcher_Factory<EDF_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index 911fc6abf7d..fed6b3777bc 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -25,7 +25,6 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy (
 
 FP_Scheduling::SegmentSchedulingParameter
 FP_Segment_Sched_Param_Policy::value (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -37,7 +36,6 @@ FP_Segment_Sched_Param_Policy::value (
 void
 FP_Segment_Sched_Param_Policy::value (
         const FP_Scheduling::SegmentSchedulingParameter & value
-        ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -47,20 +45,19 @@ FP_Segment_Sched_Param_Policy::value (
 }
 
 CORBA::Policy_ptr
-FP_Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+FP_Segment_Sched_Param_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FP_Segment_Sched_Param_Policy* tmp;
   ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-FP_Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FP_Segment_Sched_Param_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -75,7 +72,6 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
     ace_sched_policy_ (ace_sched_policy),
     ace_sched_scope_ (ace_sched_scope)
 {
-  ACE_DECLARE_NEW_ENV;
 
   Kokyu::DSRT_ConfigInfo config;
 
@@ -89,19 +85,14 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
   kokyu_dispatcher_ = tmp;
 
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RTScheduler_Current"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("RTScheduler_Current");
 
   this->current_ =
-    RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTScheduling::Current::_narrow (object.in ());
 
   IOP::CodecFactory_var codec_factory;
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("CodecFactory"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("CodecFactory");
 
   if (CORBA::is_nil(obj.in ()))
     {
@@ -135,7 +126,6 @@ Fixed_Priority_Scheduler::shutdown (void)
 FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
 Fixed_Priority_Scheduler::create_segment_scheduling_parameter (
         const FP_Scheduling::SegmentSchedulingParameter & value
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -161,8 +151,7 @@ void
 Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType& guid,
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
-                                             CORBA::Policy_ptr
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+                                             CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -198,25 +187,21 @@ void
 Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
-                                                           CORBA::Policy_ptr implicit_sched_param
-                                                           ACE_ENV_ARG_DECL)
+                                                           CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
                                       sched_param,
-                                      implicit_sched_param
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      implicit_sched_param);
 }
 
 void
 Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                           const char* name,
                                           CORBA::Policy_ptr sched_policy,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -247,8 +232,7 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current
 
 void
 Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
-                                       const char *
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       const char *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #ifdef KOKYU_DSRT_LOGGING
@@ -265,8 +249,7 @@ Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::I
 void
 Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                                          const char *,
-                                                         CORBA::Policy_ptr
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -274,15 +257,13 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur
 
 
 void
-Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                                        ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -295,7 +276,7 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
   sc.context_id = Client_Interceptor::SchedulingInfo;
 
   CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->current_->scheduling_parameter();
   /*
   int guid;
   ACE_OS::memcpy (&guid,
@@ -343,8 +324,7 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
 #endif
 
       // Add this context to the service context list.
-      ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_request_service_context (sc, 0);
     }
 
 
@@ -369,8 +349,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
                                 RTScheduling::Current::IdType_out guid_out,
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out sched_param_out,
-                                CORBA::Policy_out /*implicit_sched_param_out*/
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Policy_out /*implicit_sched_param_out*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -382,8 +361,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
 
   RTScheduling::Current::IdType guid;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -399,9 +377,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
     return;
 
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (Server_Interceptor::SchedulingInfo);
 
   RTCORBA::Priority desired_priority;
 
@@ -457,23 +433,20 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
 }
 
 void
-Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
-			  ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::Priority desired_priority = 0;
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -487,8 +460,7 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
 
   ACE_DEBUG ((LM_DEBUG, "in send_reply: before accessing current_->sched_param\n"));
   CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->scheduling_parameter();
 
   if (CORBA::is_nil (sched_policy))
   {
@@ -517,8 +489,7 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
       sc.context_data = reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
 
       // Add this context to the service context list.
-      ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_reply_service_context (sc, 1);
 
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):reply sc added\n"));
@@ -534,36 +505,31 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
 }
 
 void
-Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  send_reply (ri ACE_ENV_ARG_PARAMETER);
+  send_reply (ri);
 }
 
 void
-Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  send_reply (ri ACE_ENV_ARG_PARAMETER);
+  send_reply (ri);
 }
 
 void
-Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::Current::IdType guid;
   RTCORBA::Priority desired_priority=0;
 
-  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 ();
 
   ACE_CString opname = operation.in ();
 #ifdef KOKYU_DSRT_LOGGING
@@ -576,9 +542,7 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo);
 
   if (sc.ptr () == 0)
     {
@@ -615,57 +579,51 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
 }
 
 void
-Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  receive_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  receive_reply (ri);
 }
 
 void
-Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  receive_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  receive_reply (ri);
 }
 
 void
-Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &
-                       ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL)
+Fixed_Priority_Scheduler::scheduling_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 void
-Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &
-                                    ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL)
+Fixed_Priority_Scheduler::poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 char *
-Fixed_Priority_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
+Fixed_Priority_Scheduler::scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -673,8 +631,7 @@ Fixed_Priority_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
 
 RTScheduling::ResourceManager_ptr
 Fixed_Priority_Scheduler::create_resource_manager (const char *,
-                                        CORBA::Policy_ptr
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -683,10 +640,9 @@ Fixed_Priority_Scheduler::create_resource_manager (const char *,
 void
 Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
-                                         CORBA::Policy_ptr
-                                         ACE_ENV_ARG_DECL)
+                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
index b7c80325dde..5d9a3d001c8 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h
@@ -46,7 +46,6 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
      FP_Segment_Sched_Param_Policy (const FP_Segment_Sched_Param_Policy &rhs);
 
      FP_Scheduling::SegmentSchedulingParameter value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -54,18 +53,15 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
 
      void value (
         const FP_Scheduling::SegmentSchedulingParameter & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-     virtual CORBA::Policy_ptr copy (
-       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+     virtual CORBA::Policy_ptr copy ()
      ACE_THROW_SPEC ((CORBA::SystemException));
 
-     virtual void destroy (
-       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+     virtual void destroy ()
      ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
@@ -90,7 +86,6 @@ public TAO_Local_RefCounted_Object
   virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
     create_segment_scheduling_parameter (
         const FP_Scheduling::SegmentSchedulingParameter & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -99,40 +94,34 @@ public TAO_Local_RefCounted_Object
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
                                              CORBA::Policy_ptr sched_param,
-                                             CORBA::Policy_ptr implicit_sched_param
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                                 const char * name,
                                                 CORBA::Policy_ptr sched_param,
-                                                CORBA::Policy_ptr implicit_sched_param
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                           const char * name,
                                           CORBA::Policy_ptr sched_param,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              CORBA::Policy_ptr outer_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
@@ -140,70 +129,58 @@ public TAO_Local_RefCounted_Object
                                 RTScheduling::Current::IdType_out guid,
                                 CORBA::String_out name,
                                 CORBA::Policy_out sched_param,
-                                CORBA::Policy_out implicit_sched_param
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                CORBA::Policy_out implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-			  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void cancel (const RTScheduling::Current::IdType & guid)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * scheduling_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter
-                                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                     CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index 43dac21d14a..73a767d6413 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -24,21 +24,21 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy (
 }
 
 MIF_Scheduling::SchedulingParameter
-MIF_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MIF_Sched_Param_Policy::value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
-MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_ = value;
 }
 
 CORBA::Policy_ptr
-MIF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+MIF_Sched_Param_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MIF_Sched_Param_Policy* tmp = 0;
@@ -46,13 +46,12 @@ MIF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
 		    MIF_Sched_Param_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-MIF_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MIF_Sched_Param_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -66,7 +65,6 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
     ace_sched_policy_ (ace_sched_policy),
     ace_sched_scope_ (ace_sched_scope)
 {
-  ACE_DECLARE_NEW_ENV;
 
   Kokyu::DSRT_ConfigInfo config;
 
@@ -80,17 +78,13 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
   kokyu_dispatcher_ = tmp;
 
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RTScheduler_Current"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("RTScheduler_Current");
 
   this->current_ =
-    RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTScheduling::Current::_narrow (object.in ());
 
   IOP::CodecFactory_var codec_factory;
-  CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory"
-                                                           ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory");
 
   if (CORBA::is_nil(obj.in ()))
     {
@@ -122,7 +116,7 @@ MIF_Scheduler::shutdown (void)
 }
 
 MIF_Scheduling::SchedulingParameterPolicy_ptr
-MIF_Scheduler::create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value ACE_ENV_ARG_DECL)
+MIF_Scheduler::create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MIF_Scheduling::SchedulingParameterPolicy_ptr sched_param_policy;
@@ -144,8 +138,7 @@ void
 MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType& guid,
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
-                                             CORBA::Policy_ptr
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+                                             CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -181,25 +174,21 @@ void
 MIF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
-                                                           CORBA::Policy_ptr implicit_sched_param
-                                                           ACE_ENV_ARG_DECL)
+                                                           CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
                                       sched_param,
-                                      implicit_sched_param
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      implicit_sched_param);
 }
 
 void
 MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& guid,
                                           const char* name,
                                           CORBA::Policy_ptr sched_policy,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -229,8 +218,7 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
 void
 MIF_Scheduler::end_scheduling_segment (
                     const RTScheduling::Current::IdType &guid,
-                    const char *
-                    ACE_ENV_ARG_DECL_NOT_USED)
+                    const char *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #ifdef KOKYU_DSRT_LOGGING
@@ -248,8 +236,7 @@ void
 MIF_Scheduler::end_nested_scheduling_segment (
                    const RTScheduling::Current::IdType &,
                    const char *,
-                   CORBA::Policy_ptr
-                   ACE_ENV_ARG_DECL_NOT_USED)
+                   CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -257,15 +244,13 @@ MIF_Scheduler::end_nested_scheduling_segment (
 
 
 void
-MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -279,8 +264,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
   sc.context_id = Client_Interceptor::SchedulingInfo;
 
   CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->scheduling_parameter();
   /*
   int guid;
   ACE_OS::memcpy (&guid,
@@ -326,8 +310,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 #endif
 
       // Add this context to the service context list.
-      ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_request_service_context (sc, 0);
     }
 
 
@@ -352,8 +335,7 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
                                 RTScheduling::Current::IdType_out guid_out,
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out sched_param_out,
-                                CORBA::Policy_out /*implicit_sched_param_out*/
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Policy_out /*implicit_sched_param_out*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -365,8 +347,7 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
 
   RTScheduling::Current::IdType guid;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -382,9 +363,7 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
     return;
 
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (Server_Interceptor::SchedulingInfo);
 
   CORBA::Short importance;
 
@@ -439,15 +418,13 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
 }
 
 void
-MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Short importance = 0;
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -460,8 +437,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   sc.context_id = Server_Interceptor::SchedulingInfo;
 
   CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->scheduling_parameter();
 
   if (CORBA::is_nil (sched_policy))
   {
@@ -496,8 +472,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
       sc.context_data = reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
 
       // Add this context to the service context list.
-      ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_reply_service_context (sc, 1);
 
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):reply sc added\n"));
@@ -513,46 +488,38 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 }
 
 void
-MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  send_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  send_reply (ri);
 }
 
 void
-MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
-			  ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  send_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  send_reply (ri);
 }
 
 void
-MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL)
+MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::Current::IdType guid;
   CORBA::Short importance=0;
 
-  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 ();
 
   ACE_CString opname = operation.in ();
 #ifdef KOKYU_DSRT_LOGGING
@@ -565,9 +532,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo);
 
   if (sc.ptr () == 0)
     {
@@ -603,56 +568,50 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 void
-MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL)
+MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  receive_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  receive_reply (ri);
 }
 
 void
-MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL)
+MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  receive_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  receive_reply (ri);
 }
 
 void
-MIF_Scheduler::cancel (const RTScheduling::Current::IdType &
-                       ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Scheduler::cancel (const RTScheduling::Current::IdType &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL)
+MIF_Scheduler::scheduling_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 void
-MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &
-                                    ACE_ENV_ARG_DECL)
+MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL)
+MIF_Scheduler::poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 char *
-MIF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
+MIF_Scheduler::scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -660,8 +619,7 @@ MIF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
 
 RTScheduling::ResourceManager_ptr
 MIF_Scheduler::create_resource_manager (const char *,
-                                        CORBA::Policy_ptr
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -670,10 +628,9 @@ MIF_Scheduler::create_resource_manager (const char *,
 void
 MIF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
-                                         CORBA::Policy_ptr
-                                         ACE_ENV_ARG_DECL)
+                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
index 5ab0bfe09e8..7803ce173f3 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h
@@ -45,19 +45,16 @@ public MIF_Scheduling::SchedulingParameterPolicy,
      MIF_Sched_Param_Policy ();
      MIF_Sched_Param_Policy (const MIF_Sched_Param_Policy &rhs);
 
-    MIF_Scheduling::SchedulingParameter value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    MIF_Scheduling::SchedulingParameter value (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void value (const MIF_Scheduling::SchedulingParameter & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    void value (const MIF_Scheduling::SchedulingParameter & value)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-     virtual CORBA::Policy_ptr copy (
-       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+     virtual CORBA::Policy_ptr copy ()
      ACE_THROW_SPEC ((CORBA::SystemException));
 
-     virtual void destroy (
-       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+     virtual void destroy ()
      ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
@@ -80,7 +77,6 @@ public TAO_Local_RefCounted_Object
 
   virtual MIF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                  )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -89,40 +85,34 @@ public TAO_Local_RefCounted_Object
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
                                              CORBA::Policy_ptr sched_param,
-                                             CORBA::Policy_ptr implicit_sched_param
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                                 const char * name,
                                                 CORBA::Policy_ptr sched_param,
-                                                CORBA::Policy_ptr implicit_sched_param
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                           const char * name,
                                           CORBA::Policy_ptr sched_param,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              CORBA::Policy_ptr outer_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
@@ -130,70 +120,58 @@ public TAO_Local_RefCounted_Object
                                 RTScheduling::Current::IdType_out guid,
                                 CORBA::String_out name,
                                 CORBA::Policy_out sched_param,
-                                CORBA::Policy_out implicit_sched_param
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                CORBA::Policy_out implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-			  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void cancel (const RTScheduling::Current::IdType & guid)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * scheduling_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter
-                                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                     CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index dec4a6e5211..fdcde8a9872 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -24,21 +24,21 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy (
 }
 
 MUF_Scheduling::SchedulingParameter
-MUF_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MUF_Sched_Param_Policy::value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
-MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value ACE_ENV_ARG_DECL_NOT_USED)
+MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_ = value;
 }
 
 CORBA::Policy_ptr
-MUF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+MUF_Sched_Param_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MUF_Sched_Param_Policy* tmp;
@@ -46,13 +46,12 @@ MUF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
 		    MUF_Sched_Param_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-MUF_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MUF_Sched_Param_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -66,7 +65,6 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb,
     ace_sched_policy_ (ace_sched_policy),
     ace_sched_scope_ (ace_sched_scope)
 {
-  ACE_DECLARE_NEW_ENV;
 
   Kokyu::DSRT_ConfigInfo config;
 
@@ -80,19 +78,14 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb,
   kokyu_dispatcher_ = tmp;
 
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RTScheduler_Current"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("RTScheduler_Current");
 
   this->current_ =
-    RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTScheduling::Current::_narrow (object.in ());
 
   IOP::CodecFactory_var codec_factory;
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("CodecFactory"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("CodecFactory");
 
   if (CORBA::is_nil(obj.in ()))
     {
@@ -123,7 +116,7 @@ MUF_Scheduler::shutdown (void)
 }
 
 MUF_Scheduling::SchedulingParameterPolicy_ptr
-MUF_Scheduler::create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value ACE_ENV_ARG_DECL)
+MUF_Scheduler::create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MUF_Scheduling::SchedulingParameterPolicy_ptr sched_param_policy;
@@ -145,8 +138,7 @@ void
 MUF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
-                                             CORBA::Policy_ptr
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+                                             CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -186,25 +178,21 @@ void
 MUF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
-                                                           CORBA::Policy_ptr implicit_sched_param
-                                                           ACE_ENV_ARG_DECL)
+                                                           CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
                                       sched_param,
-                                      implicit_sched_param
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      implicit_sched_param);
 }
 
 void
 MUF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& guid,
                                           const char* name,
                                           CORBA::Policy_ptr sched_policy,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -234,8 +222,7 @@ MUF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g
 
 void
 MUF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
-                                       const char *
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       const char *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #ifdef KOKYU_DSRT_LOGGING
@@ -252,23 +239,20 @@ MUF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid
 void
 MUF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                                          const char *,
-                                                         CORBA::Policy_ptr
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 
 void
-MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL)
+MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -282,8 +266,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
   sc.context_id = Client_Interceptor::SchedulingInfo;
 
   CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->scheduling_parameter();
 
   /*
   int guid;
@@ -341,8 +324,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 #endif
 
       // Add this context to the service context list.
-      ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_request_service_context (sc, 0);
     }
 
 
@@ -367,8 +349,7 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
                                 RTScheduling::Current::IdType_out guid_out,
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out sched_param_out,
-                                CORBA::Policy_out /*implicit_sched_param_out*/
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Policy_out /*implicit_sched_param_out*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -380,8 +361,7 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
 
   RTScheduling::Current::IdType guid;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -397,9 +377,7 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
     return;
 
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (Server_Interceptor::SchedulingInfo);
 
   CORBA::Long criticality;
   TimeBase::TimeT deadline,exec_time;
@@ -467,23 +445,20 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
 }
 
 void
-MUF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
-			  ACE_ENV_ARG_DECL_NOT_USED)
+MUF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   Kokyu::Svc_Ctxt_DSRT_QoS sc_qos;
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #ifdef KOKYU_DSRT_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -500,8 +475,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   TimeBase::TimeT deadline,exec_time;
 
   CORBA::Policy_ptr sched_policy =
-    this->current_->scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->scheduling_parameter();
 
   if (CORBA::is_nil (sched_policy))
   {
@@ -543,8 +517,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
       sc.context_data = reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
 
       // Add this context to the service context list.
-      ri->add_reply_service_context (sc, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_reply_service_context (sc, 1);
 
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):reply sc added\n"));
@@ -560,37 +533,30 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 }
 
 void
-MUF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+MUF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  send_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  send_reply (ri);
 }
 
 void
-MUF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+MUF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  send_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  send_reply (ri);
 }
 
 void
-MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL)
+MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::Current::IdType guid;
 
-  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 ();
 
   ACE_CString opname = operation.in ();
 #ifdef KOKYU_DSRT_LOGGING
@@ -603,9 +569,7 @@ MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo);
 
   CORBA::Long criticality;
   TimeBase::TimeT deadline,exec_time;
@@ -653,57 +617,51 @@ MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 void
-MUF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL)
+MUF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  receive_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  receive_reply (ri);
 }
 
 void
-MUF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL)
+MUF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  receive_reply (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  receive_reply (ri);
 }
 
 void
-MUF_Scheduler::cancel (const RTScheduling::Current::IdType &
-                       ACE_ENV_ARG_DECL)
+MUF_Scheduler::cancel (const RTScheduling::Current::IdType &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
-MUF_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL)
+MUF_Scheduler::scheduling_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 void
-MUF_Scheduler::scheduling_policies (const CORBA::PolicyList &
-                                    ACE_ENV_ARG_DECL)
+MUF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::PolicyList*
-MUF_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL)
+MUF_Scheduler::poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 char *
-MUF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
+MUF_Scheduler::scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -711,8 +669,7 @@ MUF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL)
 
 RTScheduling::ResourceManager_ptr
 MUF_Scheduler::create_resource_manager (const char *,
-                                        CORBA::Policy_ptr
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
@@ -721,10 +678,9 @@ MUF_Scheduler::create_resource_manager (const char *,
 void
 MUF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
-                                         CORBA::Policy_ptr
-                                         ACE_ENV_ARG_DECL)
+                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
index ad24bc4067f..11b15ee9e91 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h
@@ -61,19 +61,16 @@ public MUF_Scheduling::SchedulingParameterPolicy,
     MUF_Sched_Param_Policy ();
     MUF_Sched_Param_Policy (const MUF_Sched_Param_Policy &rhs);
 
-    MUF_Scheduling::SchedulingParameter value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    MUF_Scheduling::SchedulingParameter value (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void value (const MUF_Scheduling::SchedulingParameter & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    void value (const MUF_Scheduling::SchedulingParameter & value)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-     virtual CORBA::Policy_ptr copy (
-       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+     virtual CORBA::Policy_ptr copy ()
      ACE_THROW_SPEC ((CORBA::SystemException));
 
-     virtual void destroy (
-       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+     virtual void destroy ()
      ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
@@ -96,7 +93,6 @@ public TAO_Local_RefCounted_Object
 
   virtual MUF_Scheduling::SchedulingParameterPolicy_ptr
     create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                  )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -105,45 +101,38 @@ public TAO_Local_RefCounted_Object
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
                                              CORBA::Policy_ptr sched_param,
-                                             CORBA::Policy_ptr implicit_sched_param
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                                 const char * name,
                                                 CORBA::Policy_ptr sched_param,
-                                                CORBA::Policy_ptr implicit_sched_param
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                           const char * name,
                                           CORBA::Policy_ptr sched_param,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              CORBA::Policy_ptr outer_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-			  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
@@ -151,65 +140,54 @@ public TAO_Local_RefCounted_Object
                                 RTScheduling::Current::IdType_out guid,
                                 CORBA::String_out name,
                                 CORBA::Policy_out sched_param,
-                                CORBA::Policy_out implicit_sched_param
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                CORBA::Policy_out implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void cancel (const RTScheduling::Current::IdType & guid)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * scheduling_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter
-                                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                     CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 6d3ab90a29b..96589c1d2eb 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -138,22 +138,19 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "(%t): main thread prio is %d\n", prio));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -167,14 +164,10 @@ main (int argc, char *argv[])
         {
           ACE_DEBUG ((LM_DEBUG, "Dyn Sched enabled\n"));
           CORBA::Object_ptr manager_obj =
-            orb->resolve_initial_references ("RTSchedulerManager"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_RTScheduler_Manager::_narrow (manager_obj);
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
@@ -195,20 +188,16 @@ main (int argc, char *argv[])
           manager->rtscheduler (scheduler);
 
           CORBA::Object_var object =
-            orb->resolve_initial_references ("RTScheduler_Current"
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTScheduler_Current");
 
           current  =
-            RTScheduling::Current::_narrow (object.in () 
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTScheduling::Current::_narrow (object.in ());
 
         }
 
-      Worker worker1 (orb.in (), 
-                      server.in (), 
-                      current.in (), 
+      Worker worker1 (orb.in (),
+                      server.in (),
+                      current.in (),
                       scheduler, 10, 15);
 
       if (worker1.activate (flags, 1, 0, max_prio) != 0)
@@ -219,9 +208,9 @@ main (int argc, char *argv[])
 
       ACE_OS::sleep(2);
 
-      Worker worker2 (orb.in (), 
-                      server.in (), 
-                      current.in (), 
+      Worker worker2 (orb.in (),
+                      server.in (),
+                      current.in (),
                       scheduler, 12, 5);
 
       if (worker2.activate (flags, 1, 0, max_prio) != 0)
@@ -233,7 +222,7 @@ main (int argc, char *argv[])
       worker1.wait ();
       worker2.wait ();
 
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "(%t): wait for worker threads done in main thread\n"));
 
       if (do_shutdown)
@@ -247,36 +236,29 @@ main (int argc, char *argv[])
               CORBA::Policy_ptr implicit_sched_param = 0;
               current->begin_scheduling_segment (0,
                                                  sched_param_policy.in (),
-                                                 implicit_sched_param
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                 implicit_sched_param);
             }
 
             ACE_DEBUG ((LM_DEBUG, "(%t): about to call server shutdown\n"));
-            server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            server->shutdown ();
 
             ACE_DEBUG ((LM_DEBUG, "after shutdown call in main thread\n"));
 
 
             if (enable_dynamic_scheduling)
             {
-              current->end_scheduling_segment (0 
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              current->end_scheduling_segment (0);
             }
         }
 
       scheduler->shutdown ();
       ACE_DEBUG ((LM_DEBUG, "scheduler shutdown done\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -303,7 +285,6 @@ Worker::Worker (CORBA::ORB_ptr orb,
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   const char * name = 0;
   /*
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):about to sleep for %d sec\n", sleep_time_));
@@ -343,23 +324,19 @@ Worker::svc (void)
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):before begin_sched_segment\n"));
       scheduler_current_->begin_scheduling_segment (name,
                                                     sched_param_policy.in (),
-                                                    implicit_sched_param
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                                    implicit_sched_param);
 
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):after begin_sched_segment\n"));
     }
 
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):about to make two way call\n"));
-  server_->test_method (server_load_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  server_->test_method (server_load_);
 
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):two way call done\n"));
 
   if (enable_dynamic_scheduling)
     {
       scheduler_current_->end_scheduling_segment (name);
-      ACE_CHECK_RETURN (-1);
     }
 
   ACE_DEBUG ((LM_DEBUG, "client worker thread (%t) done\n"));
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index 839dcd2c9cf..8700bc9964c 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -90,20 +90,18 @@ main (int argc, char *argv[])
 
   if (sched_policy == ACE_SCHED_RR)
     flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_RR;
-  else 
+  else
     flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_FIFO;
 
   task_stats.init (100000);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -111,12 +109,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -124,14 +120,10 @@ main (int argc, char *argv[])
       if (enable_dynamic_scheduling)
         {
           CORBA::Object_ptr manager_obj =
-            orb->resolve_initial_references ("RTSchedulerManager"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_RTScheduler_Manager::_narrow (manager_obj);
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
@@ -142,9 +134,9 @@ main (int argc, char *argv[])
             {
               disp_impl_type = Kokyu::DSRT_OS_BASED;
             }
-          
+
           ACE_NEW_RETURN (scheduler,
-                          Fixed_Priority_Scheduler (orb.in (), 
+                          Fixed_Priority_Scheduler (orb.in (),
                                          disp_impl_type,
                                          sched_policy,
                                          sched_scope), -1);
@@ -152,27 +144,22 @@ main (int argc, char *argv[])
           manager->rtscheduler (scheduler);
 
           CORBA::Object_var object =
-            orb->resolve_initial_references ("RTScheduler_Current"
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTScheduler_Current");
 
           current  =
-            RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTScheduling::Current::_narrow (object.in ());
         }
 
-      Simple_Server_i server_impl (orb.in (), 
-                                   current.in (), 
-                                   task_stats, 
+      Simple_Server_i server_impl (orb.in (),
+                                   current.in (),
+                                   task_stats,
                                    enable_yield);
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -189,17 +176,16 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Worker worker (orb.in ());
       if (worker.activate (flags,
-                           nthreads, 
+                           nthreads,
                            0,
-                           ACE_Sched_Params::priority_max(sched_policy, 
+                           ACE_Sched_Params::priority_max(sched_policy,
                                                           sched_scope)) != 0)
         {
-          ACE_ERROR ((LM_ERROR, 
+          ACE_ERROR ((LM_ERROR,
                       "Cannot activate threads in RT class.",
                       "Trying to activate in non-RT class\n"));
 
@@ -219,16 +205,14 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "shutting down scheduler\n"));
       scheduler->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Exiting main...\n"));
-  task_stats.dump_samples ("timeline.txt", 
+  task_stats.dump_samples ("timeline.txt",
                             "Time\t\tGUID",
                             ACE_High_Res_Timer::global_scale_factor ());
   return 0;
@@ -244,18 +228,15 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_Time_Value tv(120);
 
-  ACE_TRY
+  try
     {
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%t|%T): Worker thread exiting...\n"));
   return 0;
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
index 6112c2b8e36..a7bb67610a1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp
@@ -14,7 +14,7 @@
 ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
+Simple_Server_i::test_method (CORBA::Long exec_duration)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hthread_t thr_handle;
@@ -24,8 +24,8 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 
   ACE_OS::
     memcpy (&guid,
-            this->current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
-            sizeof (this->current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length ()));
+            this->current_->id ()->get_buffer (),
+            sizeof (this->current_->id ()->length ()));
 
   ACE_High_Res_Timer timer;
   ACE_Time_Value elapsed_time;
@@ -95,15 +95,14 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
             {
               CORBA::Policy_var sched_param_policy =
                 CORBA::Policy::_duplicate (current_->
-                                           scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER));
+                                           scheduling_parameter());
 
               const char * name = 0;
 
               CORBA::Policy_ptr implicit_sched_param = 0;
               current_->update_scheduling_segment (name,
                                                    sched_param_policy.in (),
-                                                   implicit_sched_param
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   implicit_sched_param);
               yield_count_down_time = yield_interval;
               yield_count_down.start ();
             }
@@ -122,9 +121,9 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
index 040fa13acbc..45c7c4449fc 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h
@@ -29,17 +29,17 @@ class Simple_Server_i : public POA_Simple_Server
   //   Implements the Simple_Server interface in test.idl
   //
 public:
-  Simple_Server_i (CORBA::ORB_ptr orb, 
+  Simple_Server_i (CORBA::ORB_ptr orb,
                    RTScheduling::Current_ptr current,
                    Task_Stats&,
                    int);
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index 122e2b06881..f47fe54a5cf 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -138,22 +138,19 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "(%t): main thread prio is %d\n", prio));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -167,14 +164,10 @@ main (int argc, char *argv[])
         {
           ACE_DEBUG ((LM_DEBUG, "Dyn Sched enabled\n"));
           CORBA::Object_ptr manager_obj =
-            orb->resolve_initial_references ("RTSchedulerManager"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_RTScheduler_Manager::_narrow (manager_obj);
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
@@ -195,13 +188,10 @@ main (int argc, char *argv[])
           manager->rtscheduler (scheduler);
 
           CORBA::Object_var object =
-            orb->resolve_initial_references ("RTScheduler_Current"
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTScheduler_Current");
 
           current  =
-            RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTScheduling::Current::_narrow (object.in ());
 
         }
 
@@ -226,7 +216,7 @@ main (int argc, char *argv[])
       worker1.wait ();
       worker2.wait ();
 
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "(%t): wait for worker threads done in main thread\n"));
 
       if (do_shutdown)
@@ -240,35 +230,29 @@ main (int argc, char *argv[])
               CORBA::Policy_ptr implicit_sched_param = 0;
               current->begin_scheduling_segment (0,
                                                  sched_param_policy.in (),
-                                                 implicit_sched_param
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                 implicit_sched_param);
             }
 
             ACE_DEBUG ((LM_DEBUG, "(%t): about to call server shutdown\n"));
-            server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            server->shutdown ();
 
             ACE_DEBUG ((LM_DEBUG, "after shutdown call in main thread\n"));
 
 
             if (enable_dynamic_scheduling)
             {
-              current->end_scheduling_segment (0 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              current->end_scheduling_segment (0);
             }
         }
 
       scheduler->shutdown ();
       ACE_DEBUG ((LM_DEBUG, "scheduler shutdown done\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -295,7 +279,6 @@ Worker::Worker (CORBA::ORB_ptr orb,
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   const char * name = 0;
   /*
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):about to sleep for %d sec\n", sleep_time_));
@@ -334,21 +317,17 @@ Worker::svc (void)
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):before begin_sched_segment\n"));
       scheduler_current_->begin_scheduling_segment (name,
                                                     sched_param_policy.in (),
-                                                    implicit_sched_param
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                                    implicit_sched_param);
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):after begin_sched_segment\n"));
     }
 
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):about to make two way call\n"));
-  server_->test_method (server_load_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  server_->test_method (server_load_);
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):two way call done\n"));
 
   if (enable_dynamic_scheduling)
     {
       scheduler_current_->end_scheduling_segment (name);
-      ACE_CHECK_RETURN (-1);
     }
 
   ACE_DEBUG ((LM_DEBUG, "client worker thread (%t) done\n"));
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index a137b5d45f8..5f6739fbf9f 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -90,20 +90,18 @@ main (int argc, char *argv[])
 
   if (sched_policy == ACE_SCHED_RR)
     flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_RR;
-  else 
+  else
     flags = THR_NEW_LWP | THR_BOUND | THR_JOINABLE | THR_SCHED_FIFO;
 
   task_stats.init (100000);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -111,12 +109,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -124,14 +120,10 @@ main (int argc, char *argv[])
       if (enable_dynamic_scheduling)
         {
           CORBA::Object_ptr manager_obj =
-            orb->resolve_initial_references ("RTSchedulerManager"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_RTScheduler_Manager::_narrow (manager_obj);
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
@@ -142,9 +134,9 @@ main (int argc, char *argv[])
             {
               disp_impl_type = Kokyu::DSRT_OS_BASED;
             }
-          
+
           ACE_NEW_RETURN (scheduler,
-                          MIF_Scheduler (orb.in (), 
+                          MIF_Scheduler (orb.in (),
                                          disp_impl_type,
                                          sched_policy,
                                          sched_scope), -1);
@@ -152,27 +144,22 @@ main (int argc, char *argv[])
           manager->rtscheduler (scheduler);
 
           CORBA::Object_var object =
-            orb->resolve_initial_references ("RTScheduler_Current"
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTScheduler_Current");
 
           current  =
-            RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTScheduling::Current::_narrow (object.in ());
         }
 
-      Simple_Server_i server_impl (orb.in (), 
-                                   current.in (), 
-                                   task_stats, 
+      Simple_Server_i server_impl (orb.in (),
+                                   current.in (),
+                                   task_stats,
                                    enable_yield);
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -189,17 +176,16 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Worker worker (orb.in ());
       if (worker.activate (flags,
-                           nthreads, 
+                           nthreads,
                            0,
-                           ACE_Sched_Params::priority_max(sched_policy, 
+                           ACE_Sched_Params::priority_max(sched_policy,
                                                           sched_scope)) != 0)
         {
-          ACE_ERROR ((LM_ERROR, 
+          ACE_ERROR ((LM_ERROR,
                       "Cannot activate threads in RT class.",
                       "Trying to activate in non-RT class\n"));
 
@@ -219,16 +205,14 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "shutting down scheduler\n"));
       scheduler->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Exiting main...\n"));
-  task_stats.dump_samples ("timeline.txt", 
+  task_stats.dump_samples ("timeline.txt",
                             "Time\t\tGUID",
                             ACE_High_Res_Timer::global_scale_factor ());
   return 0;
@@ -244,18 +228,15 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_Time_Value tv(120);
 
-  ACE_TRY
+  try
     {
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%t|%T): Worker thread exiting...\n"));
   return 0;
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
index 0f781409900..6ac6bf963e1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp
@@ -14,7 +14,7 @@
 ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
+Simple_Server_i::test_method (CORBA::Long exec_duration)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hthread_t thr_handle;
@@ -24,8 +24,8 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 
   ACE_OS::
     memcpy (&guid,
-            this->current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
-            sizeof (this->current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length ()));
+            this->current_->id ()->get_buffer (),
+            sizeof (this->current_->id ()->length ()));
 
   ACE_High_Res_Timer timer;
   ACE_Time_Value elapsed_time;
@@ -95,15 +95,14 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
             {
               CORBA::Policy_var sched_param_policy =
                 CORBA::Policy::_duplicate (current_->
-                                           scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER));
+                                           scheduling_parameter());
 
               const char * name = 0;
 
               CORBA::Policy_ptr implicit_sched_param = 0;
               current_->update_scheduling_segment (name,
                                                    sched_param_policy.in (),
-                                                   implicit_sched_param
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   implicit_sched_param);
               yield_count_down_time = yield_interval;
               yield_count_down.start ();
             }
@@ -122,9 +121,9 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
index 040fa13acbc..45c7c4449fc 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h
@@ -29,17 +29,17 @@ class Simple_Server_i : public POA_Simple_Server
   //   Implements the Simple_Server interface in test.idl
   //
 public:
-  Simple_Server_i (CORBA::ORB_ptr orb, 
+  Simple_Server_i (CORBA::ORB_ptr orb,
                    RTScheduling::Current_ptr current,
                    Task_Stats&,
                    int);
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 81e8d8b0d83..e6d676b39a0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -143,22 +143,19 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "(%t): main thread prio is %d\n", prio));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -172,14 +169,10 @@ main (int argc, char *argv[])
         {
           ACE_DEBUG ((LM_DEBUG, "Dyn Sched enabled\n"));
           CORBA::Object_ptr manager_obj =
-            orb->resolve_initial_references ("RTSchedulerManager"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_RTScheduler_Manager::_narrow (manager_obj);
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
@@ -200,32 +193,29 @@ main (int argc, char *argv[])
           manager->rtscheduler (scheduler);
 
           CORBA::Object_var object =
-            orb->resolve_initial_references ("RTScheduler_Current"
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTScheduler_Current");
 
           current  =
-            RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTScheduling::Current::_narrow (object.in ());
 
         }
 
       TimeBase::TimeT deadline;
-      TimeBase::TimeT exec_time; 
+      TimeBase::TimeT exec_time;
       int criticality=0;
 
       ORBSVCS_Time::Time_Value_to_TimeT (deadline,
-                                         ACE_OS::gettimeofday () + 
+                                         ACE_OS::gettimeofday () +
                                          ACE_Time_Value (50,0) );
 
       ORBSVCS_Time::Time_Value_to_TimeT (exec_time,
-                                         ACE_OS::gettimeofday () + 
+                                         ACE_OS::gettimeofday () +
                                          ACE_Time_Value (10,0) );
 
-      Worker worker1 (orb.in (), 
-                      server.in (), 
-                      current.in (), 
-                      scheduler, 
+      Worker worker1 (orb.in (),
+                      server.in (),
+                      current.in (),
+                      scheduler,
                       deadline,
                       exec_time,
                       criticality,
@@ -240,18 +230,18 @@ main (int argc, char *argv[])
       ACE_OS::sleep(2);
 
       ORBSVCS_Time::Time_Value_to_TimeT (deadline,
-                                         ACE_OS::gettimeofday () + 
+                                         ACE_OS::gettimeofday () +
                                          ACE_Time_Value (30,0) );
 
       ORBSVCS_Time::Time_Value_to_TimeT (exec_time,
-                                         ACE_OS::gettimeofday () + 
+                                         ACE_OS::gettimeofday () +
                                          ACE_Time_Value (10,0) );
 
       criticality = 0;
-      Worker worker2 (orb.in (), 
-                      server.in (), 
-                      current.in (), 
-                      scheduler, 
+      Worker worker2 (orb.in (),
+                      server.in (),
+                      current.in (),
+                      scheduler,
                       deadline,
                       exec_time,
                       criticality,
@@ -264,18 +254,18 @@ main (int argc, char *argv[])
         }
 
       ORBSVCS_Time::Time_Value_to_TimeT (deadline,
-                                         ACE_OS::gettimeofday () + 
+                                         ACE_OS::gettimeofday () +
                                          ACE_Time_Value (100,0) );
 
       ORBSVCS_Time::Time_Value_to_TimeT (exec_time,
-                                         ACE_OS::gettimeofday () + 
+                                         ACE_OS::gettimeofday () +
                                          ACE_Time_Value (10,0) );
       criticality = 1;
 
-      Worker worker3 (orb.in (), 
-                      server.in (), 
-                      current.in (), 
-                      scheduler, 
+      Worker worker3 (orb.in (),
+                      server.in (),
+                      current.in (),
+                      scheduler,
                       deadline,
                       exec_time,
                       criticality,
@@ -290,7 +280,7 @@ main (int argc, char *argv[])
       worker2.wait ();
       worker3.wait ();
 
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "(%t): wait for worker threads done in main thread\n"));
 
       if (do_shutdown)
@@ -306,35 +296,29 @@ main (int argc, char *argv[])
               CORBA::Policy_ptr implicit_sched_param = 0;
               current->begin_scheduling_segment (0,
                                                  sched_param_policy.in (),
-                                                 implicit_sched_param
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                 implicit_sched_param);
             }
 
             ACE_DEBUG ((LM_DEBUG, "(%t): about to call server shutdown\n"));
-            server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            server->shutdown ();
 
             ACE_DEBUG ((LM_DEBUG, "after shutdown call in main thread\n"));
 
 
             if (enable_dynamic_scheduling)
             {
-              current->end_scheduling_segment (0 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              current->end_scheduling_segment (0);
             }
         }
 
       scheduler->shutdown ();
       ACE_DEBUG ((LM_DEBUG, "scheduler shutdown done\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -365,7 +349,6 @@ Worker::Worker (CORBA::ORB_ptr orb,
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   const char * name = 0;
   /*
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):about to sleep for %d sec\n", sleep_time_));
@@ -406,21 +389,17 @@ Worker::svc (void)
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):before begin_sched_segment\n"));
       scheduler_current_->begin_scheduling_segment (name,
                                                     sched_param_policy.in (),
-                                                    implicit_sched_param
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                                    implicit_sched_param);
       ACE_DEBUG ((LM_DEBUG, "(%t|%T):after begin_sched_segment\n"));
     }
 
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):about to make two way call\n"));
-  server_->test_method (server_load_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  server_->test_method (server_load_);
   ACE_DEBUG ((LM_DEBUG, "(%t|%T):two way call done\n"));
 
   if (enable_dynamic_scheduling)
     {
       scheduler_current_->end_scheduling_segment (name);
-      ACE_CHECK_RETURN (-1);
     }
 
   ACE_DEBUG ((LM_DEBUG, "client worker thread (%t) done\n"));
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index f22355074e1..76e68cb70f6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -95,15 +95,13 @@ main (int argc, char *argv[])
 
   task_stats.init (100000);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -111,12 +109,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -124,14 +120,10 @@ main (int argc, char *argv[])
       if (enable_dynamic_scheduling)
         {
           CORBA::Object_ptr manager_obj =
-            orb->resolve_initial_references ("RTSchedulerManager"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTSchedulerManager");
 
           TAO_RTScheduler_Manager_var manager =
-            TAO_RTScheduler_Manager::_narrow (manager_obj
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_RTScheduler_Manager::_narrow (manager_obj);
 
           Kokyu::DSRT_Dispatcher_Impl_t disp_impl_type;
           if (enable_yield)
@@ -152,13 +144,10 @@ main (int argc, char *argv[])
           manager->rtscheduler (scheduler);
 
           CORBA::Object_var object =
-            orb->resolve_initial_references ("RTScheduler_Current"
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RTScheduler_Current");
 
           current  =
-            RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTScheduling::Current::_narrow (object.in ());
         }
 
       Simple_Server_i server_impl (orb.in (),
@@ -167,12 +156,10 @@ main (int argc, char *argv[])
                                    enable_yield);
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -189,8 +176,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Worker worker (orb.in ());
       if (worker.activate (flags,
@@ -219,13 +205,11 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "shutting down scheduler\n"));
       scheduler->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Exiting main...\n"));
   task_stats.dump_samples ("timeline.txt",
@@ -244,18 +228,15 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_Time_Value tv(120);
 
-  ACE_TRY
+  try
     {
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%t|%T): Worker thread exiting...\n"));
   return 0;
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
index 0f781409900..6ac6bf963e1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp
@@ -14,7 +14,7 @@
 ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
+Simple_Server_i::test_method (CORBA::Long exec_duration)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hthread_t thr_handle;
@@ -24,8 +24,8 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 
   ACE_OS::
     memcpy (&guid,
-            this->current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
-            sizeof (this->current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length ()));
+            this->current_->id ()->get_buffer (),
+            sizeof (this->current_->id ()->length ()));
 
   ACE_High_Res_Timer timer;
   ACE_Time_Value elapsed_time;
@@ -95,15 +95,14 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
             {
               CORBA::Policy_var sched_param_policy =
                 CORBA::Policy::_duplicate (current_->
-                                           scheduling_parameter(ACE_ENV_SINGLE_ARG_PARAMETER));
+                                           scheduling_parameter());
 
               const char * name = 0;
 
               CORBA::Policy_ptr implicit_sched_param = 0;
               current_->update_scheduling_segment (name,
                                                    sched_param_policy.in (),
-                                                   implicit_sched_param
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   implicit_sched_param);
               yield_count_down_time = yield_interval;
               yield_count_down.start ();
             }
@@ -122,9 +121,9 @@ Simple_Server_i::test_method (CORBA::Long exec_duration ACE_ENV_ARG_DECL)
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
index 040fa13acbc..45c7c4449fc 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h
@@ -29,17 +29,17 @@ class Simple_Server_i : public POA_Simple_Server
   //   Implements the Simple_Server interface in test.idl
   //
 public:
-  Simple_Server_i (CORBA::ORB_ptr orb, 
+  Simple_Server_i (CORBA::ORB_ptr orb,
                    RTScheduling::Current_ptr current,
                    Task_Stats&,
                    int);
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index 7948ab73785..4408b158fc6 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -74,13 +74,10 @@ Identity_Client::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       result = this->orb_manager_.init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
       if (result == -1)
         return result;
 
@@ -89,32 +86,26 @@ Identity_Client::init (int argc,
       if (result < 0)
         return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Identity_Client::init");
+      ex._tao_print_exception ("Identity_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+Identity_Client::run (void)
 {
   ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized \n"));
 
   // Contact the <Object_Group_Factory> to obtain an <Object_Group>.
   CORBA::ORB_var orb = orb_manager_.orb ();
   CORBA::Object_var obj =
-    orb->string_to_object (this->group_factory_ior_
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->string_to_object (this->group_factory_ior_);
   Load_Balancer::Object_Group_Factory_var factory =
-    Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Load_Balancer::Object_Group_Factory::_narrow (obj.in ());
 
   if (CORBA::is_nil (factory.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -131,13 +122,10 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
               "Identity_Client: Requesting Object Group "
               "with id <%s>\n", group_name));
   Load_Balancer::Object_Group_var object_group =
-    factory->resolve (group_name
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    factory->resolve (group_name);
 
   // List <Object_Group>'s id.
-  CORBA::String_var id = object_group->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var id = object_group->id ();
 
   if (ACE_OS::strcmp (id.in (), group_name) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -151,8 +139,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
               group_name));
 
   Load_Balancer::Member_ID_List_var id_list =
-    object_group->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    object_group->members ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Identity_Client: The Group contains %d members:\n",
@@ -178,20 +165,15 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 
   for (size_t ind = 0; ind < this->number_of_invocations_; ++ind)
     {
-      obj = object_group->resolve (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      obj = object_group->resolve ();
 
-      identity_object = Identity::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      identity_object = Identity::_narrow (obj.in ());
       if (CORBA::is_nil (identity_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Identity_Client: cannot narrow an object received from"
                            "<Object_Group::resolve> to <Identity>\n"),
                           -1);
-      identity_object->get_name (identity.out ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      identity_object->get_name (identity.out ());
     }
 
   ACE_DEBUG ((LM_DEBUG,
@@ -213,19 +195,15 @@ main (int argc, char *argv[])
   if (client.init (argc, argv) == -1)
     return 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = client.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Identity_Client");
+      ex._tao_print_exception ("Identity_Client");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   if (result == -1)
     return 1;
diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h
index 0275dd47847..18d89ff2efd 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.h
+++ b/TAO/examples/Load_Balancing/Identity_Client.h
@@ -54,7 +54,7 @@ public:
   int init (int argc, char *argv[]);
   // Initializes <orb_manager_>, and parses commandline arguments.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // See TITLE.
 
 private:
diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp
index 638dd1e245b..1605a12551c 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Server.cpp
@@ -70,13 +70,10 @@ Identity_Server::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       result = this->orb_manager_.init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
       if (result == -1)
         return result;
 
@@ -89,13 +86,9 @@ Identity_Server::init (int argc,
       // <Object_Group>s, one random and one rr.
       CORBA::ORB_var orb = orb_manager_.orb ();
       CORBA::Object_var obj =
-        orb->string_to_object (this->group_factory_ior_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (this->group_factory_ior_);
       Load_Balancer::Object_Group_Factory_var factory =
-        Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Load_Balancer::Object_Group_Factory::_narrow (obj.in ());
 
       if (CORBA::is_nil (factory.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -108,18 +101,14 @@ Identity_Server::init (int argc,
                   "Group with id <Identity, Random>\n"));
 
       Load_Balancer::Object_Group_var random_group =
-        factory->make_random ("Identity, Random"
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory->make_random ("Identity, Random");
 
       ACE_DEBUG ((LM_DEBUG,
                   "Identity_Server: Requesting new Round Robin "
                   "Object Group with id <Identity, Round Robin>\n"));
 
       Load_Balancer::Object_Group_var rr_group =
-        factory->make_round_robin ("Identity, Round Robin"
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory->make_round_robin ("Identity, Round Robin");
 
       // Create the requested number of <Identity> objects, and
       // register them with the random and round robin
@@ -130,34 +119,27 @@ Identity_Server::init (int argc,
                   "with <Identity, Random> Object Group\n",
                     random_objects_));
       create_objects (random_objects_,
-                      random_group.in ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      random_group.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Identity_Server: Registering %d object(s) "
                   "with <Identity, Round Robin> Object Group\n",
                     random_objects_));
       create_objects (rr_objects_,
-                      rr_group.in ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      rr_group.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Identity_Server::init");
+      ex._tao_print_exception ("Identity_Server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 void
 Identity_Server::create_objects (size_t number_of_objects,
-                                 Load_Balancer::Object_Group_ptr group
-                                 ACE_ENV_ARG_DECL)
+                                 Load_Balancer::Object_Group_ptr group)
 {
   // Create the specified number of servants, and register each one
   // with the provided <Object_Group>.
@@ -174,33 +156,27 @@ Identity_Server::create_objects (size_t number_of_objects,
       ACE_NEW_THROW_EX (identity_servant,
                         Identity_i (id),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
       PortableServer::ServantBase_var s = identity_servant;
-      orb_manager_.activate (identity_servant
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      orb_manager_.activate (identity_servant);
 
       Load_Balancer::Member member;
       member.id = CORBA::string_dup (id);
-      member.obj = identity_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      member.obj = identity_servant->_this ();
 
       // Bind the servant in the <Object_Group>.
-      group->bind (member ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      group->bind (member);
     }
 }
 
 int
-Identity_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Identity_Server::run (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Identity_Server: Initialized \n"));
 
   int result;
 
-  result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->orb_manager_.run ();
 
   return result;
 }
@@ -218,19 +194,15 @@ main (int argc, char *argv[])
   if (server.init (argc, argv) == -1)
     return 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      result = server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = server.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Identity_Server");
+      ex._tao_print_exception ("Identity_Server");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   if (result == -1)
     return 1;
diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h
index 1f4c411a44e..cec659f3917 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.h
+++ b/TAO/examples/Load_Balancing/Identity_Server.h
@@ -49,7 +49,7 @@ public:
   // Performs all the initializations necessary before going into the
   // ORB event loop.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the server.
 
 private:
@@ -57,8 +57,7 @@ private:
   // Parses the commandline arguments.
 
   void create_objects (size_t number_of_objects,
-                       Load_Balancer::Object_Group_ptr group
-                       ACE_ENV_ARG_DECL);
+                       Load_Balancer::Object_Group_ptr group);
   // Creates the specified number of identity objects, and registers
   // each one with the provided <Object_Group>.  Identity servants are
   // given names
diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp
index 69a168f2e63..9cb33e89fe2 100644
--- a/TAO/examples/Load_Balancing/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing/Identity_i.cpp
@@ -25,7 +25,7 @@ Identity_i::~Identity_i (void)
 
 void
 Identity_i::get_name (CORBA::String_out name
-                      ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   name = this->name_.in ();
diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h
index 7e421f390a3..7a6abd8c61c 100644
--- a/TAO/examples/Load_Balancing/Identity_i.h
+++ b/TAO/examples/Load_Balancing/Identity_i.h
@@ -30,8 +30,7 @@ public:
   ~Identity_i (void);
   // Destructor.
 
-  virtual void get_name (CORBA::String_out name
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void get_name (CORBA::String_out name)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the name of this object.
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
index f438dba3874..7206c16db88 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
@@ -33,31 +33,26 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id,
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_round_robin (const char * id
-                                          ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::make_round_robin (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
   return make_group (0,
-                     id
-                     ACE_ENV_ARG_PARAMETER);
+                     id);
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_random (const char * id
-                                     ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::make_random (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
   return make_group (1,
-                     id
-                     ACE_ENV_ARG_PARAMETER);
+                     id);
 }
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
-                                    const char * id
-                                    ACE_ENV_ARG_DECL)
+                                    const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -84,17 +79,14 @@ Object_Group_Factory_i::make_group (int random,
         ACE_NEW_THROW_EX (group_servant,
                           RR_Object_Group (id, this),
                           CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (group._retn ());
 
       // Temporarily put the servant into the auto_ptr.
       ACE_Auto_Basic_Ptr<Object_Group_i> temp (group_servant);
 
       // Register with the poa, begin using ref. counting.
-      group = group_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (group._retn ());
+      group = group_servant->_this ();
 
-      group_servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
+      group_servant->_remove_ref ();
       temp.release ();
 
       // Make an entry in appropriate map of groups.
@@ -123,8 +115,7 @@ Object_Group_Factory_i::make_group (int random,
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::resolve (const char * id
-                                 ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::resolve (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -140,8 +131,7 @@ Object_Group_Factory_i::resolve (const char * id
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::list_groups (int random
-                                     ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::list_groups (int random)
 {
   Load_Balancer::Group_List * list;
 
@@ -156,7 +146,6 @@ Object_Group_Factory_i::list_groups (int random
   ACE_NEW_THROW_EX (list,
                     Load_Balancer::Group_List (len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (list);
   list->length (len);
 
   // Create an iterator for group structure to populate the list.
@@ -182,17 +171,17 @@ Object_Group_Factory_i::list_groups (int random
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::round_robin_groups (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (0 ACE_ENV_ARG_PARAMETER);
+  return list_groups (0);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::random_groups (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (1 ACE_ENV_ARG_PARAMETER);
+  return list_groups (1);
 }
 
 Object_Group_i::Object_Group_i (const char * id,
@@ -215,15 +204,14 @@ Object_Group_i::~Object_Group_i (void)
 }
 
 char *
-Object_Group_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Group_i::id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (id_.c_str ());
 }
 
 void
-Object_Group_i::bind (const Load_Balancer::Member & member
-                      ACE_ENV_ARG_DECL)
+Object_Group_i::bind (const Load_Balancer::Member & member)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::duplicate_member))
 {
@@ -233,18 +221,17 @@ Object_Group_i::bind (const Load_Balancer::Member & member
   // Insert new member into <members_> and check for duplicates/failures.
   int result = members_.trybind (member_id, obj);
   if (result == 1)
-    ACE_THROW (Load_Balancer::duplicate_member ());
+    throw Load_Balancer::duplicate_member ();
   else if (result == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   // Insert new member's id into <member_id_list_>.
   ACE_CString *new_id;
   ACE_NEW_THROW_EX (new_id,
                     ACE_CString (member.id),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
   if (member_id_list_.insert_tail (new_id) == 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    throw CORBA::NO_MEMORY ();
 
   // Theoretically, we should deal with memory failures more
   // thoroughly.  But, practically, the whole system is going to be
@@ -257,8 +244,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member
 }
 
 void
-Object_Group_i::unbind (const char * id
-                        ACE_ENV_ARG_DECL)
+Object_Group_i::unbind (const char * id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -270,7 +256,7 @@ Object_Group_i::unbind (const char * id
 
   // Check to make sure we have it.
   if (members_.find (member_id) == -1)
-    ACE_THROW (Load_Balancer::no_such_member ());
+    throw Load_Balancer::no_such_member ();
 
   // Remove all entries for this member.
   members_.unbind (member_id);
@@ -287,8 +273,7 @@ Object_Group_i::unbind (const char * id
 }
 
 CORBA::Object_ptr
-Object_Group_i::resolve_with_id (const char * id
-                                 ACE_ENV_ARG_DECL)
+Object_Group_i::resolve_with_id (const char * id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -303,7 +288,7 @@ Object_Group_i::resolve_with_id (const char * id
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_i::members (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Load_Balancer::Member_ID_List * list;
@@ -315,7 +300,6 @@ Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (list,
                     Load_Balancer::Member_ID_List (len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (list);
   list->length (len);
 
   // Create an iterator for <member_id_list_> to populate the list.
@@ -332,22 +316,17 @@ Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "Load_Balancer: Destroyed object group"
@@ -367,18 +346,18 @@ Random_Object_Group::~Random_Object_Group (void)
 }
 
 void
-Random_Object_Group::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Random_Object_Group::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
   my_factory_->remove_group (id_, 1);
 
-  Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  Object_Group_i::destroy ();
 }
 
 CORBA::Object_ptr
-Random_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
+Random_Object_Group::resolve (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -417,18 +396,18 @@ RR_Object_Group::~RR_Object_Group (void)
 }
 
 void
-RR_Object_Group::destroy (ACE_ENV_SINGLE_ARG_DECL)
+RR_Object_Group::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
   my_factory_->remove_group (id_, 0);
 
-  Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  Object_Group_i::destroy ();
 }
 
 CORBA::Object_ptr
-RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
+RR_Object_Group::resolve (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -459,8 +438,7 @@ RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-RR_Object_Group::unbind (const char *id
-                         ACE_ENV_ARG_DECL)
+RR_Object_Group::unbind (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -468,7 +446,7 @@ RR_Object_Group::unbind (const char *id
 
   // Check to make sure we have it.
   if (members_.find (member_id) == -1)
-    ACE_THROW (Load_Balancer::no_such_member ());
+    throw Load_Balancer::no_such_member ();
 
   // Remove all entries for this member.
   members_.unbind (member_id);
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h
index 2699cc88f99..923216e992e 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h
@@ -53,8 +53,7 @@ public:
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
-  Load_Balancer::Object_Group_ptr make_round_robin (const char * id
-                                                    ACE_ENV_ARG_DECL)
+  Load_Balancer::Object_Group_ptr make_round_robin (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -63,8 +62,7 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  Load_Balancer::Object_Group_ptr make_random (const char * id
-                                               ACE_ENV_ARG_DECL)
+  Load_Balancer::Object_Group_ptr make_random (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -73,22 +71,21 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  Load_Balancer::Object_Group_ptr resolve (const char * id
-                                           ACE_ENV_ARG_DECL)
+  Load_Balancer::Object_Group_ptr resolve (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
   // Locates and returns an <Object_Group> by its <Group_ID>.   If
   // no <Object_Group> has <Group_ID> of <id>, throw a
   // <no_such_group> exception.
 
-  Load_Balancer::Group_List * round_robin_groups (ACE_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Group_List * round_robin_groups (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the round robin <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing round robin
   // <Object_Group>s created by this factory.
 
-  Load_Balancer::Group_List * random_groups (ACE_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Group_List * random_groups (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the random <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
@@ -110,16 +107,14 @@ private:
   // = Helper methods.
 
   Load_Balancer::Object_Group_ptr make_group (int random,
-                                              const char * id
-                                              ACE_ENV_ARG_DECL)
+                                              const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // This function factors out common code in <make_round_robin> and
   // <make_random>.  Creates a random <Object_Group> if <random> parameter is
   // set to 1 and round robin <Object_Group> if it is 0.
 
-  Load_Balancer::Group_List * list_groups (int random
-                                           ACE_ENV_ARG_DECL);
+  Load_Balancer::Group_List * list_groups (int random);
   // This function factors out common code in <random_groups> and
   // <round_robin_groups>.  Returns a sequence of its random
   // groups if <random> parameter is set to 1 and a sequence of its
@@ -164,12 +159,11 @@ public:
 
   // = Load_Balancer::Object_Group idl methods.
 
-  char * id (ACE_ENV_SINGLE_ARG_DECL)
+  char * id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get group's id.
 
-  void bind (const Load_Balancer::Member & member
-             ACE_ENV_ARG_DECL)
+  void bind (const Load_Balancer::Member & member)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_member));
   // Adds a new <member> to the <Object_Group>.  Note that each
@@ -177,15 +171,14 @@ public:
   // group already contains a member with the same <Member_ID>, a
   // <duplicate_member> exceptions is thrown.
 
-  void unbind (const char * id
-               ACE_ENV_ARG_DECL)
+  void unbind (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Removes a member with the specified <Member_ID> from the
   // <Object_Group>.  If none of the group's members have a
   // Member_ID of <id>, <no_such_member> exception is thrown.
 
-  CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Object_ptr resolve (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member)) = 0;
   // Returns a member object from this <Object_Group> in accordance with
@@ -193,19 +186,18 @@ public:
   // ``round robin.''  If the group contains no members, <no_such_member>
   // exception is thrown.
 
-  CORBA::Object_ptr resolve_with_id (const char * id
-                                     ACE_ENV_ARG_DECL)
+  CORBA::Object_ptr resolve_with_id (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns an object with the specified <Member_ID>.  If this
   // <Object_Group> contains no members with the specified
   // <Member_ID>, <no_such_member> exception is thrown.
 
-  Load_Balancer::Member_ID_List * members (ACE_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Member_ID_List * members (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a sequence of <Member_ID>s of all of its members.
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
@@ -259,13 +251,13 @@ public:
   ~Random_Object_Group (void);
   // Destructor.
 
-  CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Object_ptr resolve (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
   // the "random" load balancing policy.
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
@@ -288,21 +280,20 @@ public:
   ~RR_Object_Group (void);
   // Destructor.
 
-  void unbind (const char * id
-               ACE_ENV_ARG_DECL)
+  void unbind (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // We need to override the implementation of <unbind> from
   // Object_Group_i to make sure <resolve>
   // works correctly.
 
-  CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Object_ptr resolve (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
   // the "round robin" load balancing policy.
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
index b2369ebe8b4..91581c92f95 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
@@ -66,13 +66,10 @@ Load_Balancing_Service::init (int argc,
   int result;
   CORBA::String_var ior;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       result = this->orb_manager_.init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
       if (result == -1)
         return result;
 
@@ -87,9 +84,7 @@ Load_Balancing_Service::init (int argc,
                       Object_Group_Factory_i (),
                       -1);
       PortableServer::ServantBase_var s = factory_servant;
-      ior = orb_manager_.activate (factory_servant
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ior = orb_manager_.activate (factory_servant);
 
       if (ior.in () == 0)
         return -1;
@@ -98,13 +93,11 @@ Load_Balancing_Service::init (int argc,
                     "Load_Balancer: Object Group Factory ior is %s\n",
                     ior.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Load_Balancing_Service::init");
+      ex._tao_print_exception ("Load_Balancing_Service::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (this->ior_output_file_ != 0)
     {
@@ -119,15 +112,14 @@ Load_Balancing_Service::init (int argc,
 
 
 int
-Load_Balancing_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Load_Balancing_Service::run (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Load_Balancer: Initialized \n"));
 
   int result;
 
-  result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->orb_manager_.run ();
 
   return result;
 }
@@ -145,19 +137,15 @@ main (int argc, char *argv[])
   if (factory.init (argc, argv) == -1)
     return 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      result = factory.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = factory.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Load_Balancing_Service");
+      ex._tao_print_exception ("Load_Balancing_Service");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   if (result == -1)
     return 1;
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
index 229e17d760c..a8ddde7fd79 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
@@ -44,7 +44,7 @@ public:
   // Initialize the <Load_Balancing_Service>: initializes the ORB, parses
   // arguments, creates a servant ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the server.
 
 private:
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 0ffc8625639..9ead6d3e69a 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -77,13 +77,10 @@ Identity_Client::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       result = this->orb_manager_.init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
       if (result == -1)
         return result;
 
@@ -92,26 +89,22 @@ Identity_Client::init (int argc,
       if (result < 0)
         return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Identity_Client::init");
+      ex._tao_print_exception ("Identity_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+Identity_Client::run (void)
 {
   // Contact the <Object_Group_Factory> to obtain an <Object_Group>.
   CORBA::ORB_var orb = orb_manager_.orb ();
   CORBA::Object_var obj =
-    orb->string_to_object (this->group_factory_ior_
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->string_to_object (this->group_factory_ior_);
 
   if (obj.in () == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -120,9 +113,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
                       -1);
 
   Load_Balancer::Object_Group_Factory_var factory =
-    Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Load_Balancer::Object_Group_Factory::_narrow (obj.in ());
 
   if (CORBA::is_nil (factory.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -156,9 +147,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 #endif /*TAO_MEASURE_STATS*/
       // Remote call
       object_group =
-        factory->resolve (group_name
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        factory->resolve (group_name);
 
       CORBA::String_var iorstring =
         orb->object_to_string (object_group.in ());
@@ -187,14 +176,12 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   // List <Object_Group>'s id.
-  CORBA::String_var id = object_group->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var id = object_group->id ();
   ACE_DEBUG ((LM_DEBUG, "Object Group's id is: %s\n\n", id.in ()));
 
   // List all <Object_Group>s members.
   Load_Balancer::Member_ID_List_var id_list =
-    object_group->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    object_group->members ();
   ACE_DEBUG ((LM_DEBUG,
               "The group contains %d members:\n",
               id_list->length ()));
@@ -211,16 +198,11 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 
   for (size_t ind = 0; ind < this->number_of_invocations_; ++ind)
     {
-      objref = object_group->resolve (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      objref = object_group->resolve ();
 
-      obj = orb->string_to_object (objref.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      obj = orb->string_to_object (objref.in ());
 
-      identity_object = Identity::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      identity_object = Identity::_narrow (obj.in ());
 
       if (CORBA::is_nil (identity_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -228,12 +210,10 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
                            "<Object_Group::resolve> to <Identity>\n"),
                           -1);
       identity_object->get_name (identity.out ());
-      ACE_CHECK_RETURN (-1);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Invocation  %s\n",
                   identity.in ()));
-      ACE_CHECK_RETURN (-1);
 
     }
 
@@ -253,19 +233,15 @@ main (int argc, char *argv[])
   if (client.init (argc, argv) == -1)
     return 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = client.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Identity_Client");
+      ex._tao_print_exception ("Identity_Client");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   if (result == -1)
     return 1;
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
index 94565ef6278..91f5fe9eaf0 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
@@ -54,7 +54,7 @@ public:
   int init (int argc, char *argv[]);
   // Initializes <orb_manager_>, and parses commandline arguments.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // See TITLE.
 
 private:
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index 772a2092ada..d3b78ac3686 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -58,13 +58,10 @@ Identity_Server::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       result = this->orb_manager_.init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
       if (result == -1)
         return result;
 
@@ -73,21 +70,15 @@ Identity_Server::init (int argc,
 
       // Lifespan policy
       policies[0] =
-        this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT
-                                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT);
 
       policies[1] =
-        this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
       this->persistent_POA_  =
         this->orb_manager_.root_poa()->create_POA ("persistent_server",
                                                    this->orb_manager_.poa_manager (),
-                                                   policies
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   policies);
 
 
       // Destroy policy objects
@@ -95,25 +86,22 @@ Identity_Server::init (int argc,
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Identity_Server::init");
+      ex._tao_print_exception ("Identity_Server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL)
+Identity_Server::register_groups (void)
 {
 
 
@@ -122,14 +110,10 @@ Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL)
   // <Object_Group>s, one random and one rr.
   CORBA::ORB_var orb = orb_manager_.orb ();
   CORBA::Object_var obj =
-    orb->string_to_object (this->group_factory_ior_
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->string_to_object (this->group_factory_ior_);
 
   Load_Balancer::Object_Group_Factory_var factory =
-    Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Load_Balancer::Object_Group_Factory::_narrow (obj.in ());
 
   if (CORBA::is_nil (factory.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -139,67 +123,52 @@ Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL)
 
 
   // Unbind the previously registered random group.
-  ACE_TRY_EX (UNBIND_RANDOM)
+  try
     {
-      factory->unbind_random ("Random group"
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (UNBIND_RANDOM);
+      factory->unbind_random ("Random group");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%N | %l) <Unbind> harmless here \n"));
     }
-  ACE_ENDTRY;
 
   // Unbind the previously registered round robin group
-  ACE_TRY_EX (UNBIND_ROUND)
+  try
     {
-      factory->unbind_round_robin ("Round Robin group"
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (UNBIND_ROUND);
+      factory->unbind_round_robin ("Round Robin group");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%N | %l) <Unbind> harmless here \n"));
     }
-  ACE_ENDTRY;
 
 
   // We want to make two groups Random & Round Robin.
   Load_Balancer::Object_Group_var random_group =
-    factory->make_random ("Random group"
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    factory->make_random ("Random group");
 
   Load_Balancer::Object_Group_var rr_group =
-    factory->make_round_robin ("Round Robin group"
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    factory->make_round_robin ("Round Robin group");
 
 
   // Create the requested number of <Identity> objects, and
   // register them with the random and round robin
   // <Object_Group>s.
   this->create_objects (random_objects_,
-                        random_group.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        random_group.in ());
 
 
   this->create_objects (rr_objects_,
-                        rr_group.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        rr_group.in ());
 
   return 0;
 }
 
 void
 Identity_Server::create_objects (size_t number_of_objects,
-                                 Load_Balancer::Object_Group_ptr group
-                                 ACE_ENV_ARG_DECL)
+                                 Load_Balancer::Object_Group_ptr group)
 {
   // Create the specified number of servants, and register each one
   // with the provided <Object_Group>.
@@ -216,49 +185,40 @@ Identity_Server::create_objects (size_t number_of_objects,
       ACE_NEW_THROW_EX (identity_servant,
                         Identity_i (id, this->persistent_POA_.in ()),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       PortableServer::ServantBase_var s = identity_servant;
-      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_manager_.activate_poa_manager ();
 
-      CORBA::Object_var obj = identity_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Object_var obj = identity_servant->_this ();
 
       Load_Balancer::Member member;
       member.id = CORBA::string_dup (id);
       member.obj =
-        this->orb_manager_.orb ()->object_to_string (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->orb_manager_.orb ()->object_to_string (obj.in ());
 
       // Do an unbind and then bind
-      ACE_TRY_EX (UNBIND)
+      try
         {
-          group->unbind (id ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (UNBIND);
+          group->unbind (id);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%N | %l) Harmless here \n"));
         }
-      ACE_ENDTRY;
 
       // Bind the servant in the random <Object_Group>.
-      group->bind (member ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      group->bind (member);
 
     }
 }
 
 int
- Identity_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+ Identity_Server::run (void)
 {
   int result;
 
-  result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->orb_manager_.run ();
 
   return result;
 }
@@ -280,22 +240,17 @@ main (int argc, char *argv[])
   if (server.parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      result = server.register_groups (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = server.register_groups ();
 
-      result = server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = server.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Identity_Server");
+      ex._tao_print_exception ("Identity_Server");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   if (result == -1)
     return 1;
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
index 36cdc386f62..a8f745224cb 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
@@ -52,18 +52,17 @@ public:
   // Performs all the initializations necessary before going into the
   // ORB event loop.
 
-  int register_groups (ACE_ENV_SINGLE_ARG_DECL);
+  int register_groups (void);
 
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the server.
 
 private:
 
 
   void create_objects (size_t number_of_objects,
-                       Load_Balancer::Object_Group_ptr group
-                       ACE_ENV_ARG_DECL);
+                       Load_Balancer::Object_Group_ptr group);
   // Creates the specified number of identity objects, and registers
   // each one with the provided <Object_Group>.  Identity servants are
   // given names
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
index 5c8d6b0b57d..efa5f20eedf 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
@@ -26,15 +26,14 @@ Identity_i::~Identity_i (void)
 }
 
 void
-Identity_i::get_name (CORBA::String_out name
-                      ACE_ENV_ARG_DECL_NOT_USED)
+Identity_i::get_name (CORBA::String_out name)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   name = this->name_.in ();
 }
 
 PortableServer::POA_ptr
-Identity_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Identity_i::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h
index 3712d79c9f1..b06b626b78a 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h
@@ -31,12 +31,11 @@ public:
   ~Identity_i (void);
   // Destructor.
 
-  virtual void get_name (CORBA::String_out name
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void get_name (CORBA::String_out name)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the name of this object.
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL)
+  PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Method for the POA that will return the persistent POA_ptr stored
   // in here..
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index f5d171a3b4f..cf89d7d37c3 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -39,7 +39,7 @@ Object_Group_Factory_i::~Object_Group_Factory_i (void)
 }
 
 PortableServer::POA_ptr
-Object_Group_Factory_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Group_Factory_i::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
@@ -47,8 +47,7 @@ Object_Group_Factory_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_round_robin (const char * id
-                                          ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::make_round_robin (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -60,7 +59,6 @@ Object_Group_Factory_i::make_round_robin (const char * id
       ACE_NEW_THROW_EX (this->rr_groups_,
                         (hash_map) HASH_MAP (this->mem_pool_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
       // Bind it in the mem pool with a name
       if (this->mem_pool_->bind (rr_name_bind,
@@ -73,13 +71,11 @@ Object_Group_Factory_i::make_round_robin (const char * id
     }
 
   return this->make_group (0,
-                           id
-                           ACE_ENV_ARG_PARAMETER);
+                           id);
 }
 
 void
-Object_Group_Factory_i::unbind_round_robin (const char * id
-                                            ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::unbind_round_robin (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -87,7 +83,7 @@ Object_Group_Factory_i::unbind_round_robin (const char * id
     {
       if (this->mem_pool_->find (rr_name_bind,
                                  (void *&)this->rr_groups_) == -1)
-        ACE_THROW (Load_Balancer::no_such_group ());
+        throw Load_Balancer::no_such_group ();
     }
 
   char *int_id = 0;
@@ -95,7 +91,7 @@ Object_Group_Factory_i::unbind_round_robin (const char * id
   // Throw an exception if not found in the HASH MAP
   if (this->rr_groups_->find (const_cast<char *> (id),
                               this->mem_pool_) < 0)
-    ACE_THROW (Load_Balancer::no_such_group ());
+    throw Load_Balancer::no_such_group ();
 
   // Unbind the entry
   this->rr_groups_->unbind (const_cast<char *> (id),
@@ -119,8 +115,7 @@ Object_Group_Factory_i::unbind_round_robin (const char * id
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_random (const char * id
-                                     ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::make_random (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -132,7 +127,6 @@ Object_Group_Factory_i::make_random (const char * id
       ACE_NEW_THROW_EX (this->random_groups_,
                         (hash_map) HASH_MAP (this->mem_pool_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
       // Bind it in the mem pool with a name
       if (this->mem_pool_->bind (random_name_bind,
@@ -145,14 +139,12 @@ Object_Group_Factory_i::make_random (const char * id
     }
 
   return this->make_group (1,
-                           id
-                           ACE_ENV_ARG_PARAMETER);
+                           id);
 }
 
 
 void
-Object_Group_Factory_i::unbind_random (const char * id
-                                       ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::unbind_random (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -160,7 +152,7 @@ Object_Group_Factory_i::unbind_random (const char * id
     {
       if (this->mem_pool_->find (random_name_bind,
                                  (void *&)this->random_groups_) == -1)
-        ACE_THROW (Load_Balancer::no_such_group ());
+        throw Load_Balancer::no_such_group ();
     }
 
   char *int_id = 0;
@@ -168,7 +160,7 @@ Object_Group_Factory_i::unbind_random (const char * id
   // Throw an exception if not found in the HASH MAP
   if (this->random_groups_->find (const_cast<char *> (id),
                                   this->mem_pool_) < 0)
-    ACE_THROW (Load_Balancer::no_such_group ());
+    throw Load_Balancer::no_such_group ();
 
   // Unbind the entry
   this->random_groups_->unbind (const_cast<char *> (id),
@@ -192,8 +184,7 @@ Object_Group_Factory_i::unbind_random (const char * id
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
-                                    const char * id
-                                    ACE_ENV_ARG_DECL)
+                                    const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -234,19 +225,14 @@ Object_Group_Factory_i::make_group (int random,
                       RR_Object_Group (id,
                                        this->poa_.in ()),
                       CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (group._retn ());
 
   // Register with the poa, begin using ref. counting.
-  group = group_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (group._retn ());
+  group = group_servant->_this ();
 
-  group_servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
+  group_servant->_remove_ref ();
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (group.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
+    this->orb_->object_to_string (group.in ());
 
 
   // Calculate and allocate the memory we need to store this name to
@@ -286,9 +272,7 @@ Object_Group_Factory_i::make_group (int random,
 
 
   // Update the value of flags_
-  this->update_flags (random
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
+  this->update_flags (random);
 
   if (result == -1)
     {
@@ -308,8 +292,7 @@ Object_Group_Factory_i::make_group (int random,
 
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::resolve (const char * id
-                                 ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::resolve (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -358,8 +341,7 @@ Object_Group_Factory_i::resolve (const char * id
     {
       this->mem_pool_->find (flags_name_bind,
                              (void *&)this->flags_);
-      this->update_objects (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
+      this->update_objects ();
     }
 
   char *ior = 0;
@@ -374,15 +356,11 @@ Object_Group_Factory_i::resolve (const char * id
                       0);
 
   CORBA::Object_var objref =
-    this->orb_->string_to_object (ior
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
+    this->orb_->string_to_object (ior);
 
   Load_Balancer::Object_Group_ptr
-    object_group = Load_Balancer::Object_Group::_narrow (objref.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
+    object_group = Load_Balancer::Object_Group::_narrow (objref.in ());
 
-  ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
 
 #if defined (DOORS_MEASURE_STATS)
@@ -402,8 +380,7 @@ Object_Group_Factory_i::resolve (const char * id
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::list_groups (int random
-                                     ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::list_groups (int random)
 {
   Load_Balancer::Group_List * list;
 
@@ -418,7 +395,6 @@ Object_Group_Factory_i::list_groups (int random
   ACE_NEW_THROW_EX (list,
                     Load_Balancer::Group_List (len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (list);
   list->length (len);
 
   // Create an iterator for group structure to populate the list.
@@ -444,23 +420,22 @@ Object_Group_Factory_i::list_groups (int random
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::round_robin_groups (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (0 ACE_ENV_ARG_PARAMETER);
+  return list_groups (0);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::random_groups (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (1 ACE_ENV_ARG_PARAMETER);
+  return list_groups (1);
 }
 
 
 void
-Object_Group_Factory_i::update_flags (int random
-                                      ACE_ENV_ARG_DECL)
+Object_Group_Factory_i::update_flags (int random)
 {
   //First check whether we have memory for flags_
   if (!this->flags_)
@@ -473,7 +448,6 @@ Object_Group_Factory_i::update_flags (int random
           ACE_NEW_THROW_EX (this->flags_,
                             (value) CORBA::Short (0),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
 
           // Initialize the variable
           this->mem_pool_->bind (flags_name_bind,
@@ -503,7 +477,7 @@ Object_Group_Factory_i::update_flags (int random
 }
 
 void
-Object_Group_Factory_i::update_objects (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::update_objects (void)
 {
   // Create an appropriate servant.
   Object_Group_i * group_servant = 0;
@@ -583,7 +557,7 @@ Object_Group_i::~Object_Group_i (void)
 
 
 PortableServer::POA_ptr
-Object_Group_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Group_i::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
@@ -591,23 +565,21 @@ Object_Group_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 char *
-Object_Group_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Group_i::id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (id_.c_str ());
 }
 
 void
-Object_Group_i::bind (const Load_Balancer::Member & member
-                      ACE_ENV_ARG_DECL)
+Object_Group_i::bind (const Load_Balancer::Member & member)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::duplicate_member))
 {
 
   if (this->members_ == 0)
     {
-      ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      ACE_CString id = this->id ();
 
       id += server_id_name_bind;
 
@@ -617,7 +589,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member
           ACE_NEW_THROW_EX (this->members_,
                             (hash_map) HASH_MAP (this->allocator_),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
 
           // Bind it in the mem pool with a name
           if (this->allocator_->bind (id.c_str (),
@@ -633,7 +604,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member
   // Check whether the element already exists..
   if (this->members_->find (const_cast<char *> ((const char *) member.id),
                             this->allocator_) == 0)
-    ACE_THROW (Load_Balancer::duplicate_member ());
+    throw Load_Balancer::duplicate_member ();
 
   size_t id_len = ACE_OS::strlen (member.id) + 1;
   size_t ref_len = ACE_OS::strlen (member.obj) + 1;
@@ -641,7 +612,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member
   char *mem_alloc = (char *)this->allocator_->malloc (id_len + ref_len);
 
   if (mem_alloc == 0)
-     ACE_THROW (CORBA::NO_MEMORY ());
+     throw CORBA::NO_MEMORY ();
 
   char **id_ptr = (char **)this->allocator_->malloc (sizeof (char *));
   *id_ptr = mem_alloc;
@@ -656,16 +627,15 @@ Object_Group_i::bind (const Load_Balancer::Member & member
                                         ior_ptr);
 
   if (result == 1)
-    ACE_THROW (Load_Balancer::duplicate_member ());
+    throw Load_Balancer::duplicate_member ();
   else if (result == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   // Search the list first from the mem mapp pool and then Insert new
   // member's id into <member_id_list_>.
 
   ACE_CString id = dll_name_bind;
-  id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  id += this->id ();
 
 
   if (this->allocator_->find (id.c_str (),
@@ -676,7 +646,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member
       ACE_NEW_THROW_EX (this->member_id_list_,
                         (dll_list) LIST (this->allocator_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       // Bind it in the mem pool with a name
       if (this->allocator_->bind (id.c_str (),
@@ -689,7 +658,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member
     }
 
   if (member_id_list_->insert_tail (id_ptr) == 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    throw CORBA::NO_MEMORY ();
 
   // Theoretically, we should deal with memory failures more
   // thoroughly.  But, practically, the whole system is going to be
@@ -697,29 +666,27 @@ Object_Group_i::bind (const Load_Balancer::Member & member
 }
 
 void
-Object_Group_i::unbind (const char * id
-                        ACE_ENV_ARG_DECL)
+Object_Group_i::unbind (const char * id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
   // Check whether the this->member_ is NULL
   if (this->members_ == 0)
     {
-      ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      ACE_CString id = this->id ();
 
       id += server_id_name_bind;
 
       if (this->allocator_->find (id.c_str (),
                                   (void *&)this->members_) == -1)
         {
-          ACE_THROW (Load_Balancer::no_such_member ());
+          throw Load_Balancer::no_such_member ();
         }
     }
   // Check to make sure we have it.
   if (this->members_->find (const_cast<char *> (id),
                             this->allocator_) == -1)
-    ACE_THROW (Load_Balancer::no_such_member ());
+    throw Load_Balancer::no_such_member ();
 
   // Remove all entries for this member.
   this->members_->unbind (const_cast<char *> (id),
@@ -728,13 +695,12 @@ Object_Group_i::unbind (const char * id
   if (this->member_id_list_ == 0)
     {
       ACE_CString id = dll_name_bind;
-      id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      id += this->id ();
 
       if (this->allocator_->find (id.c_str (),
                                   (void *&)this->member_id_list_)
           == -1)
-        ACE_THROW (Load_Balancer::no_such_member ());
+        throw Load_Balancer::no_such_member ();
 
     }
 
@@ -751,8 +717,7 @@ Object_Group_i::unbind (const char * id
 }
 
 char *
-Object_Group_i::resolve_with_id (const char * id
-                                 ACE_ENV_ARG_DECL)
+Object_Group_i::resolve_with_id (const char * id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -771,13 +736,12 @@ Object_Group_i::resolve_with_id (const char * id
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_i::members (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Load_Balancer::Member_ID_List * list = 0;
 
-  this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->read_from_memory ();
 
   // Figure out the length of the list.
   CORBA::ULong len = this->members_->current_size ();
@@ -786,7 +750,6 @@ Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (list,
                     Load_Balancer::Member_ID_List (len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (list);
   list->length (len);
 
   // Create an iterator for <member_id_list_> to populate the list.
@@ -805,30 +768,24 @@ Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 void
-Object_Group_i::read_from_memory (ACE_ENV_SINGLE_ARG_DECL)
+Object_Group_i::read_from_memory (void)
 {
     // Sanity check needs to be done in all the places
-  ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CString id = this->id ();
 
   if (!this->members_)
     {
@@ -846,8 +803,7 @@ Object_Group_i::read_from_memory (ACE_ENV_SINGLE_ARG_DECL)
   if (!this->member_id_list_)
     {
       id = dll_name_bind;
-      id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      id += this->id ();
 
       if (this->allocator_->find (id.c_str (),
                                   (void *&)this->member_id_list_) == -1)
@@ -869,13 +825,12 @@ Random_Object_Group::Random_Object_Group (const char *id,
 }
 
 char *
-Random_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
+Random_Object_Group::resolve (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
 
-  this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->read_from_memory ();
 
   size_t group_size = this->members_->current_size ();
   if (group_size == 0)
@@ -909,14 +864,13 @@ RR_Object_Group::RR_Object_Group (const char *id,
 }
 
 char *
-RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
+RR_Object_Group::resolve (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
   char *objref = 0;
 
-  this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->read_from_memory ();
 
   size_t group_size = this->members_->current_size ();
   if (group_size == 0)
@@ -946,30 +900,28 @@ RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-RR_Object_Group::unbind (const char *id
-                         ACE_ENV_ARG_DECL)
+RR_Object_Group::unbind (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
 
   if (this->members_ == 0)
     {
-      ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      ACE_CString id = this->id ();
 
       id += server_id_name_bind;
 
       if (this->allocator_->find (id.c_str (),
                                   (void *&)this->members_) == -1)
         {
-          ACE_THROW (Load_Balancer::no_such_member ());
+          throw Load_Balancer::no_such_member ();
         }
     }
 
   // Check to make sure we have it.
   if (this->members_->find (const_cast<char *> (id),
                             this->allocator_) == -1)
-    ACE_THROW (Load_Balancer::no_such_member ());
+    throw Load_Balancer::no_such_member ();
 
   // Remove all entries for this member.
   this->members_->unbind (const_cast<char *> (id),
@@ -980,13 +932,12 @@ RR_Object_Group::unbind (const char *id
   if (this->member_id_list_ == 0)
     {
       ACE_CString id = dll_name_bind;
-      id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      id += this->id ();
 
       if (this->allocator_->find (id.c_str (),
                                   (void *&)this->member_id_list_)
           == -1)
-        ACE_THROW (Load_Balancer::no_such_member ());
+        throw Load_Balancer::no_such_member ();
 
     }
 
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 119c2ccb0e0..fd0ab4097dd 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -61,15 +61,14 @@ public:
   // Destructor.
 
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL)
+  PortableServer::POA_ptr _default_POA (void)
      ACE_THROW_SPEC ((CORBA::SystemException));
   // Method for the POA that will return the persistent POA_ptr stored
   // in here..
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
-  Load_Balancer::Object_Group_ptr make_round_robin (const char * id
-                                                    ACE_ENV_ARG_DECL)
+  Load_Balancer::Object_Group_ptr make_round_robin (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -78,14 +77,12 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_round_robin (const char *id
-                           ACE_ENV_ARG_DECL)
+  void unbind_round_robin (const char *id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
 
 
-  Load_Balancer::Object_Group_ptr make_random (const char * id
-                                               ACE_ENV_ARG_DECL)
+  Load_Balancer::Object_Group_ptr make_random (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -94,27 +91,25 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_random (const char *id
-                      ACE_ENV_ARG_DECL)
+  void unbind_random (const char *id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
 
-  Load_Balancer::Object_Group_ptr resolve (const char * id
-                                           ACE_ENV_ARG_DECL)
+  Load_Balancer::Object_Group_ptr resolve (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
   // Locates and returns an <Object_Group IOR> by its <Group_ID>.   If
   // no <Object_Group> has <Group_ID> of <id>, throw a
   // <no_such_group> exception.
 
-  Load_Balancer::Group_List * round_robin_groups (ACE_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Group_List * round_robin_groups (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the round robin <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing round robin
   // <Object_Group>s created by this factory.
 
-  Load_Balancer::Group_List * random_groups (ACE_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Group_List * random_groups (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the random <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
@@ -132,26 +127,23 @@ private:
   // = Helper methods.
 
   Load_Balancer::Object_Group_ptr make_group (int random,
-                                              const char * id
-                                              ACE_ENV_ARG_DECL)
+                                              const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // This function factors out common code in <make_round_robin> and
   // <make_random>.  Creates a random <Object_Group> if <random> parameter is
   // set to 1 and round robin <Object_Group> if it is 0.
 
-  Load_Balancer::Group_List * list_groups (int random
-                                           ACE_ENV_ARG_DECL);
+  Load_Balancer::Group_List * list_groups (int random);
   // This function factors out common code in <random_groups> and
   // <round_robin_groups>.  Returns a sequence of its random
   // groups if <random> parameter is set to 1 and a sequence of its
   // round robin groups if it is 0.
 
-  void update_flags (int random
-                     ACE_ENV_ARG_DECL);
+  void update_flags (int random);
   // The helper that updates the vlaue of the variable flags_
 
-  void update_objects (ACE_ENV_SINGLE_ARG_DECL);
+  void update_objects (void);
   // This rolls back the status of the objects in the POA if the
   // service had failed..
 
@@ -206,17 +198,16 @@ public:
 
   // Persistent POA
   // Method for the POA
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL)
+  PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Load_Balancer::Object_Group idl methods.
 
-  char * id (ACE_ENV_SINGLE_ARG_DECL)
+  char * id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get group's id.
 
-  void bind (const Load_Balancer::Member & member
-             ACE_ENV_ARG_DECL)
+  void bind (const Load_Balancer::Member & member)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_member));
   // Adds a new <member> to the <Object_Group>.  Note that each
@@ -224,15 +215,14 @@ public:
   // group already contains a member with the same <Member_ID>, a
   // <duplicate_member> exceptions is thrown.
 
-  void unbind (const char * id
-               ACE_ENV_ARG_DECL)
+  void unbind (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Removes a member with the specified <Member_ID> from the
   // <Object_Group>.  If none of the group's members have a
   // Member_ID of <id>, <no_such_member> exception is thrown.
 
-  char * resolve (ACE_ENV_SINGLE_ARG_DECL)
+  char * resolve (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member)) = 0;
   // Returns a member object from this <Object_Group> in accordance with
@@ -240,19 +230,18 @@ public:
   // ``round robin.''  If the group contains no members, <no_such_member>
   // exception is thrown.
 
-  char * resolve_with_id (const char * id
-                          ACE_ENV_ARG_DECL)
+  char * resolve_with_id (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns an object with the specified <Member_ID>.  If this
   // <Object_Group> contains no members with the specified
   // <Member_ID>, <no_such_member> exception is thrown.
 
-  Load_Balancer::Member_ID_List * members (ACE_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Member_ID_List * members (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a sequence of <Member_ID>s of all of its members.
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
@@ -261,7 +250,7 @@ public:
 
 protected:
 
-  void read_from_memory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void read_from_memory (void);
   // This will replenish all the pointers that could have been lost
   // because of failure
 
@@ -304,7 +293,7 @@ public:
                        PortableServer::POA_ptr poa);
   // Constructor.
 
-  char * resolve (ACE_ENV_SINGLE_ARG_DECL)
+  char * resolve (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
@@ -324,15 +313,14 @@ public:
                    PortableServer::POA_ptr poa);
   // Constructor.
 
-  void unbind (const char * id
-               ACE_ENV_ARG_DECL)
+  void unbind (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // We need to override the implementation of <unbind> from
   // Object_Group_i to make sure <resolve>
   // works correctly.
 
-  char * resolve (ACE_ENV_SINGLE_ARG_DECL)
+  char * resolve (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index ec94198bcc1..754cee0f1ae 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
@@ -66,13 +66,10 @@ Load_Balancing_Service::init (int argc,
   int result;
   CORBA::String_var ior;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       result = this->orb_manager_.init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
       if (result == -1)
         return result;
 
@@ -87,21 +84,15 @@ Load_Balancing_Service::init (int argc,
 
       // Lifespan policy
       policies[0] =
-        this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT
-                                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT);
 
       policies[1] =
-        this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
       PortableServer::POA_var persistent_POA =
         this->orb_manager_.root_poa()->create_POA ("persistent",
                                                    this->orb_manager_.poa_manager (),
-                                                   policies
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   policies);
 
 
       // Destroy policy objects
@@ -109,8 +100,7 @@ Load_Balancing_Service::init (int argc,
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
       // Create, ref. count, and activate the servant.
@@ -122,14 +112,11 @@ Load_Balancing_Service::init (int argc,
 
       // Activate the POA manager
       //PortableServer::ServantBase_var s = factory_servant;
-      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_manager_.activate_poa_manager ();
 
       CORBA::Object_var objref = factory_servant->_this ();
 
-      ior = this->orb_manager_.orb ()->object_to_string (objref.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ior = this->orb_manager_.orb ()->object_to_string (objref.in ());
 
       if (ior.in () == 0)
         return -1;
@@ -138,13 +125,11 @@ Load_Balancing_Service::init (int argc,
                     "Object Group Factory ior: %s\n",
                     ior.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Load_Balancing_Service::init");
+      ex._tao_print_exception ("Load_Balancing_Service::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (this->ior_output_file_ != 0)
     {
@@ -159,12 +144,11 @@ Load_Balancing_Service::init (int argc,
 
 
 int
-Load_Balancing_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Load_Balancing_Service::run (void)
 {
   int result;
 
-  result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->orb_manager_.run ();
 
   return result;
 }
@@ -182,19 +166,15 @@ main (int argc, char *argv[])
   if (factory.init (argc, argv) == -1)
     return 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      result = factory.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = factory.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Load_Balancing_Service");
+      ex._tao_print_exception ("Load_Balancing_Service");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   if (result == -1)
     return 1;
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
index 0ea8c460e6d..24dc905d346 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
@@ -44,7 +44,7 @@ public:
   // Initialize the <Load_Balancing_Service>: initializes the ORB, parses
   // arguments, creates a servant ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the server.
 
 private:
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 1e425fbd119..8f9b28bd67a 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -19,8 +19,7 @@ Logger_Factory_i::~Logger_Factory_i (void)
 }
 
 Logger_ptr
-Logger_Factory_i::make_logger (const char *name
-                               ACE_ENV_ARG_DECL)
+Logger_Factory_i::make_logger (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Logger_i *result;
@@ -38,7 +37,6 @@ Logger_Factory_i::make_logger (const char *name
       ACE_NEW_THROW_EX (result,
                         Logger_i (name),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (Logger::_nil ());
     }
 
   // Enter the new logger into the hash map.  Check if the <bind>
@@ -63,7 +61,7 @@ Logger_Factory_i::make_logger (const char *name
   // registration attempt.
   // @@ Matt, this code doesn't seem right.  Can you please check with
   // Irfan and Carlos about whether this is the right thing to do?
-  return result->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return result->_this ();
 }
 
 Logger_i::Logger_i (const char *name)
@@ -111,34 +109,30 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level)
 }
 
 void
-Logger_i::log (const Logger::Log_Record &log_rec
-               ACE_ENV_ARG_DECL)
+Logger_i::log (const Logger::Log_Record &log_rec)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER);
+  this->logv (log_rec, verbosity_level_);
 }
 
 void
-Logger_i::log_twoway (const Logger::Log_Record &log_rec
-                      ACE_ENV_ARG_DECL)
+Logger_i::log_twoway (const Logger::Log_Record &log_rec)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER);
+  this->logv (log_rec, verbosity_level_);
 }
 
 void
 Logger_i::logv_twoway (const Logger::Log_Record &log_rec,
-                       Logger::Verbosity_Level verbosity
-                       ACE_ENV_ARG_DECL)
+                       Logger::Verbosity_Level verbosity)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity ACE_ENV_ARG_PARAMETER);
+  this->logv (log_rec, verbosity);
 }
 
 void
 Logger_i::logv (const Logger::Log_Record &log_rec,
-               Logger::Verbosity_Level verbosity
-               ACE_ENV_ARG_DECL_NOT_USED)
+               Logger::Verbosity_Level verbosity)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create an <ACE_Log_Record> to leverage existing logging
@@ -186,8 +180,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
 }
 
 void
-Logger_i::verbosity (Logger::Verbosity_Level level
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Logger_i::verbosity (Logger::Verbosity_Level level)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->verbosity_level_ = level;
diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h
index 8d4ef584f81..cfc4ed15cac 100644
--- a/TAO/examples/Logging/Logger_i.h
+++ b/TAO/examples/Logging/Logger_i.h
@@ -36,32 +36,27 @@ public:
   virtual ~Logger_i (void);
   // destructor
 
-  virtual void log (const Logger::Log_Record &log_rec
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void log (const Logger::Log_Record &log_rec)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
 
   virtual void logv (const Logger::Log_Record &log_rec,
-                     Logger::Verbosity_Level verbosity
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     Logger::Verbosity_Level verbosity)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
-  virtual void log_twoway (const Logger::Log_Record &log_rec
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void log_twoway (const Logger::Log_Record &log_rec)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
 
   virtual void logv_twoway (const Logger::Log_Record &log_rec,
-                            Logger::Verbosity_Level verbosity
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                            Logger::Verbosity_Level verbosity)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
-   void verbosity (Logger::Verbosity_Level level
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+   void verbosity (Logger::Verbosity_Level level)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE
   //  and SILENT}. Defaults to VERBOSE
@@ -95,8 +90,7 @@ public:
   ~Logger_Factory_i (void);
   // Destructor.
 
-  virtual Logger_ptr make_logger (const char *name
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual Logger_ptr make_logger (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function returns a logger with name <name>. If <name> is
   // unique, a new logger is created; else, a previously created
diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp
index 51f5062e56e..9b696ae503d 100644
--- a/TAO/examples/Logging/Logging_Service.cpp
+++ b/TAO/examples/Logging/Logging_Service.cpp
@@ -14,31 +14,26 @@ main (int argc, char *argv[])
 
   Logger_Server log_server;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int ret = log_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int ret = log_server.init (argc, argv);
       if (ret == -1)
         return 1;
       else
         {
-          log_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          log_server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp
index 3b65ab4da94..2ed175d878d 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/examples/Logging/Logging_Service_i.cpp
@@ -43,8 +43,7 @@ Logger_Server::parse_args (void)
 
 int
 Logger_Server::init (int argc,
-                     char *argv[]
-                     ACE_ENV_ARG_DECL)
+                     char *argv[])
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -53,17 +52,14 @@ Logger_Server::init (int argc,
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
 
-  ACE_CHECK_RETURN (-1);
 
-  this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_manager_.activate_poa_manager ();
 
   // Parse the command line arguments.
   if (this->parse_args () != 0)
@@ -75,16 +71,14 @@ Logger_Server::init (int argc,
   // Activate the logger_factory.
   CORBA::String_var str =
     this->orb_manager_.activate_under_child_poa ("logger_factory",
-                                                 &this->factory_impl_
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 &this->factory_impl_);
     if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "The IOR is: <%s>\n",
                 str.in ()));
 
     // Initialize the naming service
-    int ret = this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    int ret = this->init_naming_service ();
     if (ret != 0)
       ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
@@ -99,7 +93,7 @@ Logger_Server::init (int argc,
 // and logger_factory object.
 
 int
-Logger_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
+Logger_Server::init_naming_service ()
 {
   // Get pointers to the ORB and child POA
   CORBA::ORB_var orb = this->orb_manager_.orb ();
@@ -109,26 +103,22 @@ Logger_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SIN
     return -1;
 
   // Create an instance of the Logger_Factory
-  Logger_Factory_var factory = this->factory_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Logger_Factory_var factory = this->factory_impl_._this ();
 
   //Register the logger_factory
   CosNaming::Name factory_name (1);
   factory_name.length (1);
   factory_name[0].id = CORBA::string_dup ("Logger_Factory");
   this->my_name_server_->bind (factory_name,
-                               factory.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                               factory.in ());
 
   return 0;
 }
 
 int
-Logger_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Logger_Server::run (void)
 {
-  int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int ret = this->orb_manager_.run ();
   if (ret == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Logger_Server::run"),
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index 6cf6f8546ac..206038d986d 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -57,15 +57,13 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize the Logger_Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the ORB.
 
-  Logger_ptr make_logger (const char *name
-                          ACE_ENV_ARG_DECL);
+  Logger_ptr make_logger (const char *name);
   // This function creates and returns a logger with the given <name>.
   // Currently, <name> is unused.
 
@@ -73,7 +71,7 @@ private:
   int parse_args (void);
   // Parses the commandline arguments.
 
-  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (void);
   // Initialises the name server and registers logger_factory with the
   // name server.
 
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index f82bba200c4..b4cd884edf0 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -11,8 +11,8 @@
 #include "ace/OS_NS_arpa_inet.h"
 #include "ace/OS_NS_sys_time.h"
 
-ACE_RCSID (Logger, 
-           Logging_Test_i, 
+ACE_RCSID (Logger,
+           Logging_Test_i,
            "$Id$")
 
   // Constructor
@@ -33,8 +33,7 @@ Logger_Client::init (int argc, char *argv[])
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -42,10 +41,8 @@ Logger_Client::init (int argc, char *argv[])
       // Initialize the ORB
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              "internet"
-                              ACE_ENV_ARG_PARAMETER);
+                              "internet");
 
-      ACE_TRY_CHECK;
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "\nOrb initialized successfully\n"));
@@ -55,36 +52,32 @@ Logger_Client::init (int argc, char *argv[])
         return -1;
 
       // Initialize the naming service
-      int ret = this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int ret = this->init_naming_service ();
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize naming"
                            "services.\n"),
                           -1);
       // Create the logger instances
-      ret = this->init_loggers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ret = this->init_loggers ();
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize logger"
                            "instances.\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      ex._tao_print_exception ("init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 
 }
 
 int
-Logger_Client::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Logger_Client::init_naming_service (void)
 {
   // Initialize the naming services
   if (my_name_client_.init (orb_.in ()) != 0)
@@ -99,8 +92,7 @@ Logger_Client::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
   factory_name[0].id = CORBA::string_dup ("Logger_Factory");
 
   CORBA::Object_var factory_ref =
-    my_name_client_->resolve (factory_name
-                              ACE_ENV_ARG_PARAMETER);
+    my_name_client_->resolve (factory_name);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "\nFactory_ref resolved\n"));
@@ -115,8 +107,7 @@ Logger_Client::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 
   // Narrow the factory and check the success
   factory_ =
-    Logger_Factory::_narrow (factory_ref.in ()
-                             ACE_ENV_ARG_PARAMETER);
+    Logger_Factory::_narrow (factory_ref.in ());
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -131,8 +122,7 @@ Logger_Client::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 
   // If debugging, get the factory's IOR
   CORBA::String_var str =
-    orb_->object_to_string (factory_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+    orb_->object_to_string (factory_.in ());
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "The factory IOR is <%s>\n",
@@ -141,19 +131,15 @@ Logger_Client::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Logger_Client::init_loggers (ACE_ENV_SINGLE_ARG_DECL)
+Logger_Client::init_loggers (void)
 {
   // Retrieve the Logger obj ref corresponding to key1 and
   // key2.
-  ACE_TRY
+  try
     {
-      this->logger_1_ = factory_->make_logger ("key1"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->logger_1_ = factory_->make_logger ("key1");
 
-      this->logger_2_ = factory_->make_logger ("key2"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->logger_2_ = factory_->make_logger ("key2");
 
       if (CORBA::is_nil (this->logger_1_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -173,9 +159,7 @@ Logger_Client::init_loggers (ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "\nTrying to resolve already created logger..."));
-          Logger_var logger_3 = factory_->make_logger ("key1"
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          Logger_var logger_3 = factory_->make_logger ("key1");
 
           if (CORBA::is_nil (logger_3.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -185,12 +169,11 @@ Logger_Client::init_loggers (ACE_ENV_SINGLE_ARG_DECL)
                         "\nResolution succeeded."));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init_loggers");
+      ex._tao_print_exception ("init_loggers");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -200,8 +183,7 @@ Logger_Client::init_loggers (ACE_ENV_SINGLE_ARG_DECL)
 int
 Logger_Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create 3 Log_Records for the test
       Logger::Log_Record rec1;
@@ -250,45 +232,36 @@ Logger_Client::run (void)
         }
 
       // Change the verbosity.
-      this->logger_1_->verbosity (Logger::VERBOSE_LITE ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->logger_1_->verbosity (Logger::VERBOSE_LITE);
 
       // Log the first Log_Record (VERBOSE_LITE)
-      this->logger_1_->log (rec1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->logger_1_->log (rec1);
 
       // Change the verbosity again.
-      this->logger_2_->verbosity (Logger::VERBOSE ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->logger_2_->verbosity (Logger::VERBOSE);
 
       // Log the second Log_Record (VERBOSE)
-      this->logger_2_->log (rec2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->logger_2_->log (rec2);
 
       // Change the verbosity again
-      this->logger_2_->verbosity (Logger::SILENT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->logger_2_->verbosity (Logger::SILENT);
 
       // Log the third log record using logv() (this shows if the
       // verbosity level overrides the logger's verbosity level)
-      this->logger_2_->logv (rec3, Logger::VERBOSE ACE_ENV_ARG_PARAMETER);
+      this->logger_2_->logv (rec3, Logger::VERBOSE);
 
       // Change the verbosity again (so that regular log msgs can be
       // seen again)
-      this->logger_2_->verbosity (Logger::VERBOSE ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->logger_2_->verbosity (Logger::VERBOSE);
 
       // Log the fourth record using log_twoway()
-      this->logger_2_->log_twoway (rec4 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->logger_2_->log_twoway (rec4);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "run");
+      ex._tao_print_exception ("run");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h
index 781c55a7b4f..326b1a6cabf 100644
--- a/TAO/examples/Logging/Logging_Test_i.h
+++ b/TAO/examples/Logging/Logging_Test_i.h
@@ -68,10 +68,10 @@ private:
                     const char *msg);
   // Prepares the <Log_Record> for logging.
 
-  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (void);
   // Initialises the name server and resolves the logger_factory
 
-  int init_loggers (ACE_ENV_SINGLE_ARG_DECL);
+  int init_loggers (void);
   // Instantiates the 2 logger member variables
 
   void show_record (Logger::Log_Record &newrec);
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 979bc54cc79..b4048168fa0 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -69,21 +69,18 @@ Server<Servant>::parse_args (void)
 template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
-                       char *argv[]
-                       ACE_ENV_ARG_DECL)
+                       char *argv[])
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
 
-  ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
   this->argv_ = argv;
@@ -102,13 +99,11 @@ Server<Servant>::init (const char *servant_name,
 
   // Make sure that you check for failures here via the ACE_TRY
   // macros?!
-  ACE_TRY
+  try
     {
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
-                                                     &this->servant_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                     &this->servant_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
@@ -123,22 +118,20 @@ Server<Servant>::init (const char *servant_name,
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in activation of POA");
+      ex._tao_print_exception ("Exception in activation of POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 template <class Servant>int
-Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
+Server<Servant>::run (void)
 {
     // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
@@ -241,16 +234,13 @@ Client<InterfaceObj, Var>::init (const char *name,
   this->argv_ = argv;
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    name
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    name);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -261,8 +251,7 @@ Client<InterfaceObj, Var>::init (const char *name,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->string_to_object (this->ior_);
 
 
           if (CORBA::is_nil (server_object.in ()))
@@ -270,9 +259,7 @@ Client<InterfaceObj, Var>::init (const char *name,
                                "invalid ior <%s>\n",
                                this->ior_),
                               -1);
-          this->server_ = InterfaceObj::_narrow (server_object.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_ = InterfaceObj::_narrow (server_object.in ());
         }
       else
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -281,12 +268,11 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init");
+      ex._tao_print_exception ("Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -294,7 +280,7 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client<InterfaceObj, Var>::obtain_initial_references (void)
 {
 
   return 0;
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 380dc749dc6..abe49613309 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -51,8 +51,7 @@ public:
 
   int init (const char *servant_name,
             int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -60,7 +59,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
 protected:
@@ -121,7 +120,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL);
+  int obtain_initial_references (void);
   // Initialize naming service
 
 protected:
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index bbadaefee44..9fc29a3f555 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -21,9 +21,8 @@ Checkpoint_Client_i::run (const char *name,
   ACE_Time_Value now (ACE_OS::gettimeofday ());
   ACE_OS::srand ((unsigned int) now.sec () );
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Make factories to unmarshal OBV, when getting back a list
       // of events which raised an alarm condition.
@@ -43,15 +42,13 @@ Checkpoint_Client_i::run (const char *name,
       Temperature_var t_e (static_cast<Temperature*> (new Temperature_impl (temperature)));
       t_e->origin_id_ (KITCHEN);
       t_e->do_print ();
-      checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      checkpoint->put_event (t_e);
 
       temperature = random_number (25,30);
       t_e = new Temperature_impl (temperature);
       t_e->origin_id_ (BATHROOM);
       t_e->do_print ();
-      checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      checkpoint->put_event (t_e);
 
       Point point = { random_number (0,4),
                       random_number (0,4),
@@ -59,8 +56,7 @@ Checkpoint_Client_i::run (const char *name,
       Position_var p_e (static_cast<Position*> (new Position_impl (point)));
       p_e->origin_id_ (JONAS);
       p_e->do_print ();
-      checkpoint->put_event (p_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      checkpoint->put_event (p_e);
 
 
       int urgent = (random_number (0,2) > 1) ? 1 : 0;
@@ -69,14 +65,12 @@ Checkpoint_Client_i::run (const char *name,
       Log_Msg_var l_e (static_cast<Log_Msg*> (new Log_Msg_impl (urgent, a_text)));
       l_e->origin_id_ (JONAS);
       l_e->do_print ();
-      checkpoint->put_event (l_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      checkpoint->put_event (l_e);
 
 
       ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n"));
 
-      Event_List_var list (checkpoint->get_critical_events (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+      Event_List_var list (checkpoint->get_critical_events ());
 
       for (Event_List_Iterator i (list); i.next (); i.advance ())
         {
@@ -84,17 +78,14 @@ Checkpoint_Client_i::run (const char *name,
         }
 
       if (checkpoint.shutdown () == 1)
-        checkpoint->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+        checkpoint->shutdown ();
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI");
+      ex._tao_print_exception ("\n Exception in RMI");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index f6c06328d45..a1169f57cca 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -19,7 +19,7 @@ Event_impl::~Event_impl ()
 }
 
 void
-Event_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_impl::do_print (void)
 {
   ACE_DEBUG((LM_DEBUG, "(time %d origin %d)  ",
              (CORBA::ULong) this->time_(),
@@ -33,7 +33,7 @@ Event_factory::~Event_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event)
-Event_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_factory::create_for_unmarshal (void)
 {
   return new Event_impl;
 }
@@ -55,10 +55,10 @@ Temperature_impl::~Temperature_impl ()
 }
 
 void
-Temperature_impl::do_print (ACE_ENV_SINGLE_ARG_DECL)
+Temperature_impl::do_print (void)
 {
   // The timestamp
-  Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER);
+  Event_impl::do_print ();
 
   ACE_DEBUG((LM_DEBUG, "Temperature is %f\n", this->temperature_() ));
 }
@@ -68,7 +68,7 @@ Temperature_factory::~Temperature_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Temperature)
-Temperature_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Temperature_factory::create_for_unmarshal (void)
 {
   return new Temperature_impl;
 }
@@ -91,47 +91,47 @@ Position_impl::~Position_impl ()
 }
 
 void
-Position_impl::do_print (ACE_ENV_SINGLE_ARG_DECL)
+Position_impl::do_print (void)
 {
   // The timestamp
-  Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER);
+  Event_impl::do_print ();
 
   CORBA::Float x =
-    this->x(ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->x();
   CORBA::Float y =
-    this->y(ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->y();
   CORBA::Float z =
-    this->z(ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->z();
   ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n",
              x, y, z));
 }
 
-CORBA::Float Position_impl::x (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Float Position_impl::x (void)
 {
   return this->xyz()[0];
 }
 
-void Position_impl::x (CORBA::Float x ACE_ENV_ARG_DECL_NOT_USED)
+void Position_impl::x (CORBA::Float x)
 {
   this->xyz()[0] = x;
 }
 
-CORBA::Float Position_impl::y (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Float Position_impl::y (void)
 {
   return this->xyz()[1];
 }
 
-void Position_impl::y (CORBA::Float y ACE_ENV_ARG_DECL_NOT_USED)
+void Position_impl::y (CORBA::Float y)
 {
   this->xyz()[1] = y;
 }
 
-CORBA::Float Position_impl::z (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Float Position_impl::z (void)
 {
   return this->xyz()[2];
 }
 
-void Position_impl::z (CORBA::Float z ACE_ENV_ARG_DECL_NOT_USED)
+void Position_impl::z (CORBA::Float z)
 {
   this->xyz()[2] = z;
 }
@@ -142,7 +142,7 @@ Position_factory::~Position_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Position)
-Position_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Position_factory::create_for_unmarshal (void)
 {
   return new Position_impl;
 }
@@ -165,11 +165,10 @@ Log_Msg_impl::~Log_Msg_impl ()
 }
 
 void
-Log_Msg_impl::do_print (ACE_ENV_SINGLE_ARG_DECL)
+Log_Msg_impl::do_print (void)
 {
   // The timestamp
-  Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Event_impl::do_print ();
 
   if (this->urgency () > 0)
     {
@@ -186,7 +185,7 @@ Log_Msg_factory::~Log_Msg_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)
-Log_Msg_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_Msg_factory::create_for_unmarshal (void)
 {
   return new Log_Msg_impl;
 }
@@ -217,20 +216,19 @@ Event_List_Link_impl::~Event_List_Link_impl ()
 }
 
 Event*
-Event_List_Link_impl::get_event (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_List_Link_impl::get_event (void)
 {
   return this->my_event ();
 }
 
 Event_List_Link*
-Event_List_Link_impl::get_next_link (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_List_Link_impl::get_next_link (void)
 {
   return this->next ();
 }
 
 void
-Event_List_Link_impl::attach_next_link (Event_List_Link *n
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+Event_List_Link_impl::attach_next_link (Event_List_Link *n)
 {
   this->next (n);
 }
@@ -240,7 +238,7 @@ Event_List_Link_factory::~Event_List_Link_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)
-Event_List_Link_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_List_Link_factory::create_for_unmarshal (void)
 {
   return new Event_List_Link_impl;
 }
@@ -260,7 +258,7 @@ Event_List_impl::~Event_List_impl (void)
 }
 
 void
-Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED)
+Event_List_impl::store_event (Event* e)
 {
   // This operation should perform atomically and should
   // guard against the access to the list from another thread.
@@ -307,7 +305,7 @@ Event_List_factory::~Event_List_factory (void)
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event_List)
-Event_List_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_List_factory::create_for_unmarshal (void)
 {
   return new Event_List_impl;
 }
@@ -402,8 +400,7 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl ()
 
 
 CORBA::Boolean
-Temperature_Criterion_impl::is_critical (Event* e
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+Temperature_Criterion_impl::is_critical (Event* e)
 {
   // Downcast to a temperature.
   Temperature* t = Temperature::_downcast (e);
@@ -420,7 +417,7 @@ Temperature_Criterion_impl::is_critical (Event* e
 
 
 void
-Temperature_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Temperature_Criterion_impl::do_print (void)
 {
   ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n",
              this->origin_id_ () ));
@@ -433,7 +430,7 @@ Temperature_Criterion_factory::~Temperature_Criterion_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion)
-Temperature_Criterion_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Temperature_Criterion_factory::create_for_unmarshal (void)
 {
   return new Temperature_Criterion_impl;
 }
@@ -459,7 +456,7 @@ Position_Criterion_impl::~Position_Criterion_impl ()
 
 
 CORBA::Boolean
-Position_Criterion_impl::is_critical (Event* e ACE_ENV_ARG_DECL_NOT_USED)
+Position_Criterion_impl::is_critical (Event* e)
 {
   Position* p = Position::_downcast (e);
   // Is Event really a Position ?
@@ -480,13 +477,13 @@ Position_Criterion_impl::is_critical (Event* e ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Position_Criterion_impl::do_print ( ACE_ENV_SINGLE_ARG_DECL )
+Position_Criterion_impl::do_print ( )
 {
   ACE_DEBUG((LM_DEBUG,
              "Alarm boundary for events with origin id %d is the box\n",
              this->origin_id_ () ));
-  this->leftbottom ()->do_print(ACE_ENV_SINGLE_ARG_PARAMETER);
-  this->topright ()->do_print(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->leftbottom ()->do_print();
+  this->topright ()->do_print();
 }
 
 Position_Criterion_factory::~Position_Criterion_factory ()
@@ -494,7 +491,7 @@ Position_Criterion_factory::~Position_Criterion_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)
-Position_Criterion_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Position_Criterion_factory::create_for_unmarshal (void)
 {
   return new Position_Criterion_impl;
 }
@@ -512,8 +509,7 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl ()
 
 
 CORBA::Boolean
-Log_Msg_Criterion_impl::is_critical (Event* e
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+Log_Msg_Criterion_impl::is_critical (Event* e)
 {
   Log_Msg* lm = Log_Msg::_downcast (e);
 
@@ -527,7 +523,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e
 
 
 void
-Log_Msg_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_Msg_Criterion_impl::do_print (void)
 {
   ACE_DEBUG((LM_DEBUG,
              "All log messages with urgency greater zero are registered.\n" ));
@@ -538,7 +534,7 @@ Log_Msg_Criterion_factory::~Log_Msg_Criterion_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)
-Log_Msg_Criterion_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_Msg_Criterion_factory::create_for_unmarshal (void)
 {
   return new Log_Msg_Criterion_impl;
 }
@@ -561,8 +557,7 @@ Criterion_List_impl::~Criterion_List_impl ()
 }
 
 void
-Criterion_List_impl::store_criterion (Criterion *c
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+Criterion_List_impl::store_criterion (Criterion *c)
 {
   if (!my_list ())
     {
@@ -575,7 +570,7 @@ Criterion_List_impl::store_criterion (Criterion *c
 }
 
 CORBA::Boolean
-Criterion_List_impl::is_critical (Event *e ACE_ENV_ARG_DECL_NOT_USED)
+Criterion_List_impl::is_critical (Event *e)
 {
   // Try all criterions. Walking the list is efficient enough for
   // demonstration.
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index 1884808680e..12893631c4e 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -51,7 +51,7 @@ class Event_impl : public virtual OBV_Event,
   Event_impl ();
   virtual ~Event_impl ();
 
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (void);
   // Implementation of the do_print () operation the valuetype should have.
   // All operations in valuetypes are virtual.
 
@@ -89,7 +89,7 @@ protected:
 
 private:
 
-  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void);
 };
 #endif /* is not defined */
 
@@ -127,7 +127,7 @@ public:
 
   virtual ~Temperature_impl ();
 
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (void);
   // Overrides Event_impl::do_print (). Note that a new declaration
   // in IDL in a derived class is not allowed.
 };
@@ -145,7 +145,7 @@ protected:
 
 private:
 
-  TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Temperature) create_for_unmarshal (void);
 };
 
 
@@ -159,15 +159,15 @@ public:
   Position_impl (Point &p);
   virtual ~Position_impl ();
 
-  virtual CORBA::Float x (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void x (CORBA::Float ACE_ENV_ARG_DECL);
-  virtual CORBA::Float y (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void y (CORBA::Float ACE_ENV_ARG_DECL);
-  virtual CORBA::Float z (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void z (CORBA::Float ACE_ENV_ARG_DECL);
+  virtual CORBA::Float x (void);
+  virtual void x (CORBA::Float);
+  virtual CORBA::Float y (void);
+  virtual void y (CORBA::Float);
+  virtual CORBA::Float z (void);
+  virtual void z (CORBA::Float);
   //These are the attributes
 
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (void);
 };
 
 class Position_factory : public CORBA::ValueFactoryBase
@@ -182,7 +182,7 @@ protected:
 
 private:
 
-  TAO_OBV_CREATE_RETURN_TYPE (Position)  create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Position)  create_for_unmarshal (void);
 };
 
 
@@ -196,7 +196,7 @@ public:
   Log_Msg_impl (CORBA::Short urgency_p, const char *message_p);
   virtual ~Log_Msg_impl ();
 
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (void);
 };
 
 class Log_Msg_factory : public CORBA::ValueFactoryBase
@@ -211,7 +211,7 @@ protected:
 
 private:
 
-  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)  create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)  create_for_unmarshal (void);
 };
 
 
@@ -232,12 +232,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link,
   Event_List_Link_impl (Event *e);
   virtual ~Event_List_Link_impl ();
 
-  Event *get_event (ACE_ENV_SINGLE_ARG_DECL);
+  Event *get_event (void);
 
  private:
-  Event_List_Link *get_next_link (ACE_ENV_SINGLE_ARG_DECL);
+  Event_List_Link *get_next_link (void);
 
-  void attach_next_link (Event_List_Link * chain ACE_ENV_ARG_DECL);
+  void attach_next_link (Event_List_Link * chain);
   // Attach a chain at the end.
 };
 
@@ -252,7 +252,7 @@ protected:
 
 private:
 
-  TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)  create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)  create_for_unmarshal (void);
 };
 
 
@@ -266,9 +266,9 @@ class Event_List_impl : public virtual OBV_Event_List,
   Event_List_impl ();
   virtual ~Event_List_impl ();
 
-  void store_event (Event* e ACE_ENV_ARG_DECL);
+  void store_event (Event* e);
 
-  Event_List_Link *get_first_link(ACE_ENV_SINGLE_ARG_DECL);
+  Event_List_Link *get_first_link(void);
   // The iterator needs it.
 
  private:
@@ -294,7 +294,7 @@ protected:
 
 private:
 
-  TAO_OBV_CREATE_RETURN_TYPE (Event_List)  create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Event_List)  create_for_unmarshal (void);
 
 };
 
@@ -349,9 +349,9 @@ public:
 
   virtual ~Temperature_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL);
+  CORBA::Boolean is_critical (Event* e);
 
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (void);
 };
 
 class Temperature_Criterion_factory : public CORBA::ValueFactoryBase
@@ -359,7 +359,7 @@ class Temperature_Criterion_factory : public CORBA::ValueFactoryBase
   friend class Temperature;
 private:
   virtual ~Temperature_Criterion_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal (void);
 };
 
 
@@ -376,9 +376,9 @@ public:
                            Position *tr);
   virtual ~Position_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL);
+  CORBA::Boolean is_critical (Event* e);
 
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (void);
 };
 
 class Position_Criterion_factory : public CORBA::ValueFactoryBase
@@ -390,7 +390,7 @@ protected:
 
 private:
 
-  TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)  create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)  create_for_unmarshal (void);
 };
 
 
@@ -403,9 +403,9 @@ public:
   Log_Msg_Criterion_impl ();
   virtual ~Log_Msg_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL);
+  CORBA::Boolean is_critical (Event* e);
 
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (void);
 };
 
 class Log_Msg_Criterion_factory : public CORBA::ValueFactoryBase
@@ -416,7 +416,7 @@ protected:
   virtual ~Log_Msg_Criterion_factory ();
 
 private:
-  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)  create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)  create_for_unmarshal (void);
 };
 
 
@@ -427,8 +427,8 @@ class Criterion_List_impl : public virtual OBV_Criterion_List,
   Criterion_List_impl ();
   virtual ~Criterion_List_impl ();
 
-  void store_criterion (Criterion *c ACE_ENV_ARG_DECL);
-  CORBA::Boolean is_critical (Event *e ACE_ENV_ARG_DECL);
+  void store_criterion (Criterion *c);
+  CORBA::Boolean is_critical (Event *e);
 };
 
 
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 0893047771e..9ed260294f0 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -103,8 +103,7 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
 
 
 void
-Checkpoint_i::put_event (Event *event
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Checkpoint_i::put_event (Event *event)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In general this function would be a dispatcher which looks at the
@@ -134,7 +133,7 @@ Checkpoint_i::put_event (Event *event
 
 
 Event_List *
-Checkpoint_i::get_critical_events (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Checkpoint_i::get_critical_events (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The skeleton should not steal our list by decrementing
@@ -151,7 +150,7 @@ Checkpoint_i::get_critical_events (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Shutdown the server application.
 
 void
-Checkpoint_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Checkpoint_i::shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h
index 785093c5d14..bd1259e9c5f 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.h
+++ b/TAO/examples/OBV/Typed_Events/Server_i.h
@@ -37,16 +37,14 @@ public:
 
   virtual void put_event (
         Event * e
-        ACE_ENV_ARG_DECL
   )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Event_List * get_critical_events (
-        ACE_ENV_SINGLE_ARG_DECL
   )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index 2a8bb4802ba..02ed9d0ec12 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -12,32 +12,28 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tCheckpoint Event_Types server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (server.init ("Event_Types_Checkpoint",
                        argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 550f5082ff8..8ef9b338672 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -60,8 +60,7 @@ public:
                      CORBA::ORB_ptr orb);
 
   CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                  const char *name
-                                  ACE_ENV_ARG_DECL)
+                                  const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::PolicyList first_poa_policies_;
@@ -82,43 +81,34 @@ Adapter_Activator::Adapter_Activator (PortableServer::POAManager_ptr poa_manager
 
 CORBA::Boolean
 Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                    const char *name
-                                    ACE_ENV_ARG_DECL)
+                                    const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (name, "firstPOA") == 0)
     {
       PortableServer::POA_var child = parent->create_POA (name,
                                                           this->poa_manager_.in (),
-                                                          this->first_poa_policies_
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                          this->first_poa_policies_);
 
       // Creation of firstPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < this->first_poa_policies_.length ();
            ++i)
         {
-          this->first_poa_policies_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->first_poa_policies_[i]->destroy ();
         }
 
-      child->the_activator (this
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      child->the_activator (this);
 
       reference_counted_test_i *servant =
         new reference_counted_test_i (this->orb_.in (),
                                       child.in ());
 
-      child->set_servant (servant
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      child->set_servant (servant);
 
       // This means that the ownership of <servant> now belongs to the
       // POA.
-      servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      servant->_remove_ref ();
 
       // Finally everything is fine
       return 1;
@@ -127,17 +117,14 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
     {
       PortableServer::POA_var child = parent->create_POA (name,
                                                           this->poa_manager_.in (),
-                                                          this->second_poa_policies_
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                          this->second_poa_policies_);
 
       // Creation of secondPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < this->second_poa_policies_.length ();
            ++i)
         {
-          this->second_poa_policies_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->second_poa_policies_[i]->destroy ();
         }
 
       reference_counted_test_i *servant =
@@ -148,14 +135,11 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
         PortableServer::string_to_ObjectId ("third test");
 
       child->activate_object_with_id (oid.in (),
-                                      servant
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                      servant);
 
       // This means that the ownership of <servant> now belongs to the
       // POA.
-      servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      servant->_remove_ref ();
 
       // Finally everything is fine
       return 1;
@@ -264,16 +248,13 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -281,20 +262,15 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Adapter_Activator *adapter_activator =
         new Adapter_Activator (poa_manager.in (),
@@ -303,9 +279,7 @@ main (int argc, char **argv)
       PortableServer::AdapterActivator_var adapter_activator_var =
         adapter_activator;
 
-      root_poa->the_activator (adapter_activator_var.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->the_activator (adapter_activator_var.in ());
 
       PortableServer::POA_var first_poa;
       PortableServer::POA_var second_poa;
@@ -317,34 +291,24 @@ main (int argc, char **argv)
 
         // Id Assignment Policy
         policies[0] =
-          root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID);
 
         // Lifespan policy
         policies[1] =
-          root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
         // Request Processing policy
         policies[2] =
-          root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
-                                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT);
 
         // Id Uniqueness
         policies[3] =
-          root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
         // Create the firstPOA under the RootPOA.
         first_poa = root_poa->create_POA ("firstPOA",
                                           poa_manager.in (),
-                                          policies
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                          policies);
       }
 
       {
@@ -354,22 +318,16 @@ main (int argc, char **argv)
 
         // Id Assignment Policy
         policies[0] =
-          root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
         // Lifespan policy
         policies[1] =
-          root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
         // Create the secondPOA under the firstPOA.
         second_poa = first_poa->create_POA ("secondPOA",
                                             poa_manager.in (),
-                                            policies
-                                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                            policies);
       }
 
       // Create a servant.
@@ -377,42 +335,30 @@ main (int argc, char **argv)
                                               root_poa.in ());
 
       PortableServer::ObjectId_var first_oid =
-        root_poa->activate_object (&first_servant
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&first_servant);
 
       // Get Object Reference for the first_servant object.
-      test_var first_test = first_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var first_test = first_servant._this ();
 
       CORBA::Object_var second_test =
-        first_poa->create_reference ("IDL:test:1.0"
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->create_reference ("IDL:test:1.0");
 
       PortableServer::ObjectId_var third_oid =
         PortableServer::string_to_ObjectId ("third test");
 
       CORBA::Object_var third_test =
         second_poa->create_reference_with_id (third_oid.in (),
-                                              "IDL:test:1.0"
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              "IDL:test:1.0");
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var first_ior =
-        orb->object_to_string (first_test.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (first_test.in ());
 
       CORBA::String_var second_ior =
-        orb->object_to_string (second_test.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (second_test.in ());
 
       CORBA::String_var third_ior =
-        orb->object_to_string (third_test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (third_test.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n%s\n%s\n",
@@ -427,24 +373,18 @@ main (int argc, char **argv)
         return write_result;
 
       first_poa->destroy (1,
-                          1
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          1);
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index d4af66acb11..3395bbc3385 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -23,22 +23,17 @@ DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc (void)
 }
 
 DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb,
-                            PortableServer::POA_ptr poa
-                            ACE_ENV_ARG_DECL)
+                            PortableServer::POA_ptr poa)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa))
 {
   // Get the POA Current object reference
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("POACurrent"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("POACurrent");
 
   // Narrow the object reference to a POA Current reference
   this->poa_current_ =
-    PortableServer::Current::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::Current::_narrow (obj.in ());
 }
 
 DatabaseImpl::Entry::~Entry (void)
@@ -46,14 +41,12 @@ DatabaseImpl::Entry::~Entry (void)
 }
 
 void
-DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request
-                             ACE_ENV_ARG_DECL)
+DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request)
 {
   // The servant determines the key associated with the database
   // entry represented by self.
   PortableServer::ObjectId_var oid =
-    this->poa_current_->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_current_->get_object_id ();
 
   // Now convert the id into a string
   CORBA::String_var key =
@@ -66,16 +59,14 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request
   if (ACE_OS::strcmp (operation,
                       "_is_a") == 0)
     {
-      this->is_a (request ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->is_a (request);
     }
   else
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
+    throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request
-                           ACE_ENV_ARG_DECL)
+DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request)
 {
   CORBA::NVList_ptr list;
   this->orb_->create_list (0, list);
@@ -85,25 +76,18 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request
 
   list->add_value ("value",
                    any_1,
-                   CORBA::ARG_IN
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   CORBA::ARG_IN);
 
-  request->arguments (list
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  request->arguments (list);
 
-  CORBA::NamedValue_ptr nv = list->item (0
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::NamedValue_ptr nv = list->item (0);
 
   CORBA::Any_ptr ap = nv->value ();
   const char *value;
   *ap >>= value;
 
   const char *object_id =
-    CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::_tc_Object->id ();
 
   CORBA::Boolean result;
   if (ACE_OS::strcmp (value, "IDL:Database/Employee:1.0") == 0
@@ -117,38 +101,31 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request
   CORBA::Any::from_boolean from_boolean (result);
   result_any <<= from_boolean;
 
-  request->set_result (result_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  request->set_result (result_any);
 }
 
 CORBA::RepositoryId
 DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/,
-                                         PortableServer::POA_ptr
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         PortableServer::POA_ptr)
 {
   return 0;
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Entry::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+DatabaseImpl::Entry::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb,
-                            PortableServer::POA_ptr poa
-                            ACE_ENV_ARG_DECL)
+                            PortableServer::POA_ptr poa)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa)),
     common_servant_ (orb,
-                     poa
-                     ACE_ENV_ARG_PARAMETER)
+                     poa)
 {
-  ACE_CHECK;
 
-  this->poa_->set_servant (&this->common_servant_
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->set_servant (&this->common_servant_);
 }
 
 DatabaseImpl::Agent::~Agent (void)
@@ -158,8 +135,7 @@ DatabaseImpl::Agent::~Agent (void)
 Database::Entry_ptr
 DatabaseImpl::Agent::create_entry (const char *key,
                                    const char *entry_type,
-                                   const Database::NVPairSequence &initial_attributes
-                                   ACE_ENV_ARG_DECL)
+                                   const Database::NVPairSequence &initial_attributes)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
                    Database::Duplicate_Key))
@@ -192,7 +168,6 @@ DatabaseImpl::Agent::create_entry (const char *key,
   ACE_NEW_THROW_EX (new_employee,
                     Employee (name, id),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Database::Entry::_nil ());
 
   // @@ Should check the return value here and throw an exception if
   // it fails.
@@ -214,21 +189,16 @@ DatabaseImpl::Agent::create_entry (const char *key,
 
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (obj_id.in (),
-                                          repository_id.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Database::Entry::_nil ());
+                                          repository_id.in ());
 
-  Database::Entry_var entry = Database::Entry::_narrow (obj.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Database::Entry::_nil ());
+  Database::Entry_var entry = Database::Entry::_narrow (obj.in ());
 
   return entry._retn ();
 }
 
 Database::Entry_ptr
 DatabaseImpl::Agent::find_entry (const char *key,
-                                 const char *entry_type
-                                 ACE_ENV_ARG_DECL)
+                                 const char *entry_type)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
                    Database::Not_Found))
@@ -259,13 +229,9 @@ DatabaseImpl::Agent::find_entry (const char *key,
         DatabaseImpl::entry_type_to_repository_id ("Entry");
       CORBA::Object_var obj =
         this->poa_->create_reference_with_id (obj_id.in (),
-                                              repository_id.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (Database::Entry::_nil ());
+                                              repository_id.in ());
 
-      entry = Database::Entry::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (Database::Entry::_nil ());
+      entry = Database::Entry::_narrow (obj.in ());
     }
   else
     {
@@ -282,14 +248,13 @@ DatabaseImpl::Agent::find_entry (const char *key,
 
 void
 DatabaseImpl::Agent::destroy_entry (const char *key,
-                                    const char *entry_type
-                                    ACE_ENV_ARG_DECL)
+                                    const char *entry_type)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
                    Database::Unknown_Key))
 {
   if (ACE_OS::strcmp (entry_type, "Employee") != 0)
-    ACE_THROW (Database::Unknown_Type ());
+    throw Database::Unknown_Type ();
 
   void *temp;
   if (DATABASE::instance ()->unbind (key, temp) == 0)
@@ -311,19 +276,19 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
                   "Employee with key = %s not found\n",
                   key));
 
-      ACE_THROW (Database::Unknown_Key ());
+      throw Database::Unknown_Key ();
     }
 }
 
 void
-DatabaseImpl::Agent::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+DatabaseImpl::Agent::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Agent::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+DatabaseImpl::Agent::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index 4ef67eb752d..e29d77dc6ec 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -35,28 +35,24 @@ public:
   {
   public:
     Entry (CORBA::ORB_ptr orb,
-           PortableServer::POA_ptr poa
-           ACE_ENV_ARG_DECL_NOT_USED);
+           PortableServer::POA_ptr poa);
     ~Entry (void);
 
-    virtual void invoke (CORBA::ServerRequest_ptr request
-                         ACE_ENV_ARG_DECL);
+    virtual void invoke (CORBA::ServerRequest_ptr request);
     // The invoke() method receives requests issued to any CORBA
     // object incarnated by the DSI servant and performs the
     // processing necessary to execute the request.
 
     virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
-                                                    PortableServer::POA_ptr poa
-                                                    ACE_ENV_ARG_DECL);
+                                                    PortableServer::POA_ptr poa);
     // The _primary_interface() method receives an ObjectId value and
     // a POA_ptr as input parameters and returns a valid RepositoryId
     // representing the most-derived interface for that oid.
 
-    virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+    virtual PortableServer::POA_ptr _default_POA (void);
     // Returns the default POA for this servant.
 
-    virtual void is_a (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL);
+    virtual void is_a (CORBA::ServerRequest_ptr request);
     // Handles the _is_a call
 
   protected:
@@ -74,36 +70,32 @@ public:
   {
   public:
     Agent (CORBA::ORB_ptr orb,
-           PortableServer::POA_ptr poa
-           ACE_ENV_ARG_DECL_NOT_USED);
+           PortableServer::POA_ptr poa);
     ~Agent (void);
 
     virtual Database::Entry_ptr create_entry (const char *key,
                                               const char *entry_type,
-                                              const Database::NVPairSequence &initial_attributes
-                                              ACE_ENV_ARG_DECL)
+                                              const Database::NVPairSequence &initial_attributes)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Duplicate_Key));
 
     virtual Database::Entry_ptr find_entry (const char *key,
-                                            const char *entry_type
-                                            ACE_ENV_ARG_DECL)
+                                            const char *entry_type)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Not_Found));
 
     virtual void destroy_entry (const char *key,
-                                const char *entry_type
-                                ACE_ENV_ARG_DECL)
+                                const char *entry_type)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Unknown_Key));
 
-    virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+    virtual PortableServer::POA_ptr _default_POA (void);
     // Returns the default POA for this servant.
 
   protected:
diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp
index f3361796b0b..97d1b630e32 100644
--- a/TAO/examples/POA/DSI/client.cpp
+++ b/TAO/examples/POA/DSI/client.cpp
@@ -102,19 +102,17 @@ read_IOR_from_file (void)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   char str [255];
   // Initialize the ORB
-  ACE_TRY
+  try
     {
       ACE_OS::strcpy (str,
                       "CORBA::ORB_init");
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
 
-                                            0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Parse the command-line arguments to get the location of the
       // IOR
@@ -135,18 +133,14 @@ main (int argc, char **argv)
                       "CORBA::ORB::string_to_object");
 
       // Get the object reference with the IOR
-      CORBA::Object_var object = orb->string_to_object (IOR
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = orb->string_to_object (IOR);
 
       ACE_OS::strcpy (str,
                       "Database::Agent::_narrow");
 
       // Narrow the object reference to a Database::Agent
       Database::Agent_var database_agent =
-        Database::Agent::_narrow (object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Database::Agent::_narrow (object.in ());
 
       Database::NVPairSequence employee_attributes (2);
       employee_attributes.length (2);
@@ -171,16 +165,12 @@ main (int argc, char **argv)
       Database::Entry_var entry =
         database_agent->create_entry ("irfan",
                                       "Employee",
-                                      employee_attributes
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      employee_attributes);
 
       ACE_OS::strcpy (str, "Database::Employee::_narrow");
 
       Database::Employee_var employee =
-        Database::Employee::_narrow (entry.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Database::Employee::_narrow (entry.in ());
 
       /*
        *
@@ -192,42 +182,34 @@ main (int argc, char **argv)
 #if 0
       // Reset the id
       ACE_OS::strcpy (str, "Database::Employee::id");
-      employee->id (666 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      employee->id (666);
 #endif /* 0 */
 
       ACE_OS::strcpy (str, "Database::Entry::find");
       // Find the employee
       entry = database_agent->find_entry ("irfan",
-                                          "Employee"
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          "Employee");
 
       ACE_OS::strcpy (str, "Database::Entry::destroy");
       // Destroy the employee
       database_agent->destroy_entry ("irfan",
-                                     "Employee"
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     "Employee");
 
       ACE_OS::strcpy (str, "Shutdown server");
 
       if (shutdown_server)
         {
-          database_agent->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          database_agent->shutdown ();
         }
 
       ACE_OS::free (IOR);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      ex._tao_print_exception (str);
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 2e7bc06fe6e..31cbc500b94 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -80,13 +80,11 @@ write_iors_to_file (const char *first_ior)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -94,88 +92,67 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow the object reference to a POA reference
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ()
-                                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::PolicyList policies (5);
       policies.length (5);
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT);
 
       // Servant Retention Policy
       policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN);
 
       // Id Uniqueness Policy
       policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER);
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
-      ACE_TRY_CHECK;
 
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
                                                                 poa_manager.in (),
-                                                                policies
-                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                                policies);
 
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       // Create a Database Agent Implementation object in first_poa
       DatabaseImpl::Agent database_agent_impl (orb.in (),
-                                               first_poa.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               first_poa.in ());
 
       PortableServer::ObjectId_var database_agent_oid =
         PortableServer::string_to_ObjectId ("DatabaseAgent");
 
       first_poa->activate_object_with_id (database_agent_oid.in (),
-                                          &database_agent_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          &database_agent_impl);
 
       CORBA::Object_var database_agent =
-        first_poa->id_to_reference (database_agent_oid.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->id_to_reference (database_agent_oid.in ());
 
       // Get the IOR for the "DatabaseAgent" object
       CORBA::String_var database_agent_ior =
-        orb->object_to_string (database_agent.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (database_agent.in ());
 
       ACE_DEBUG ((LM_DEBUG,"%s\n",
                   database_agent_ior.in ()));
@@ -185,20 +162,16 @@ main (int argc, char **argv)
         return write_result;
 
       // set the state of the poa_manager to active i.e ready to process requests
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Run the ORB
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index d471e1b9ee7..0728e000e67 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -28,10 +28,8 @@ FileImpl::System::System (PortableServer::POA_ptr poa)
     // Create the Default Descriptor Servant
     fd_servant_ (poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   // set the default servant of the POA
-  poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->set_servant (&this->fd_servant_);
 }
 
 FileImpl::System::~System (void)
@@ -39,15 +37,14 @@ FileImpl::System::~System (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FileImpl::System::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
-                        CORBA::Long flags
-                        ACE_ENV_ARG_DECL)
+                        CORBA::Long flags)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
@@ -76,15 +73,12 @@ FileImpl::System::open (const char *file_name,
   // from ACE_HANDLE string
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (oid.in (),
-                                          "IDL:File/Descriptor:1.0"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (File::Descriptor::_nil ());
+                                          "IDL:File/Descriptor:1.0");
 
   // Narrow the object reference to a File Descriptor
   File::Descriptor_var fd =
-    File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    File::Descriptor::_narrow (obj.in ());
 
-  ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
   return fd._retn ();
 }
@@ -100,59 +94,50 @@ FileImpl::Descriptor::~Descriptor (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FileImpl::Descriptor::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL)
+FileImpl::Descriptor::fd (void)
 {
   //
   // One way of getting our id.
   //
 
   // Get a reference to myself
-  File::Descriptor_var me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+  File::Descriptor_var me = this->_this ();
 
   // Get the ObjectId from the reference
   PortableServer::ObjectId_var oid1 =
-    this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    this->poa_->reference_to_id (me.in ());
 
   //
   // Another way of getting our id.
   //
 
   PortableServer::ObjectId_var oid2 =
-    this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    this->poa_->servant_to_id (this);
 
   //
   // Yet another way of getting our id.
   //
 
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0);
 
   // Get the POA Current object reference
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("POACurrent"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    orb->resolve_initial_references ("POACurrent");
 
   // Narrow the object reference to a POA Current reference
   PortableServer::Current_var poa_current =
-    PortableServer::Current::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    PortableServer::Current::_narrow (obj.in ());
 
   PortableServer::ObjectId_var oid3 =
-    poa_current->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    poa_current->get_object_id ();
 
   ACE_ASSERT (oid1.in () == oid2.in ());
   ACE_ASSERT (oid2.in () == oid3.in ());
@@ -166,13 +151,11 @@ FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Long
-FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
-                             ACE_ENV_ARG_DECL)
+FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_HANDLE file_descriptor = this->fd ();
 
   const CORBA::Octet *data = &buffer[0];
 
@@ -186,13 +169,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
 }
 
 File::Descriptor::DataBuffer *
-FileImpl::Descriptor::read (CORBA::Long num_bytes
-                            ACE_ENV_ARG_DECL)
+FileImpl::Descriptor::read (CORBA::Long num_bytes)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_HANDLE file_descriptor = this->fd ();
 
   CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
   int length = ACE_OS::read (file_descriptor, buffer, num_bytes);
@@ -209,13 +190,11 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes
 
 CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
-                             CORBA::Long whence
-                             ACE_ENV_ARG_DECL)
+                             CORBA::Long whence)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_HANDLE file_descriptor = this->fd ();
 
   CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor,
                                                     offset,
@@ -227,12 +206,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
+FileImpl::Descriptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ACE_HANDLE for this object reference
-  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_HANDLE file_descriptor = this->fd ();
 
   // Close the file corresponding to this object reference.
   ACE_OS::close (file_descriptor);
diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h
index ebe06fce403..1a6ba088622 100644
--- a/TAO/examples/POA/Default_Servant/File_i.h
+++ b/TAO/examples/POA/Default_Servant/File_i.h
@@ -34,35 +34,32 @@ public:
     ~Descriptor (void);
     // Destructor
 
-    PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+    PortableServer::POA_ptr _default_POA (void);
     // Returns the default POA of this object
 
-    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer
-                               ACE_ENV_ARG_DECL)
+    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // write buffer to File corresponding to this Descriptor
 
-    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes
-                                                ACE_ENV_ARG_DECL)
+    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes)
       ACE_THROW_SPEC ((CORBA::SystemException,
     // Reads num_bytes from the file and returns it
                        File::IOError));
 
     virtual CORBA::ULong lseek (CORBA::ULong offset,
-                                CORBA::Long whence
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Long whence)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // seek to the offset in file from whence
 
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
     // closes the file corresponding to the requested ObjectID
 
   private:
 
-    ACE_HANDLE fd (ACE_ENV_SINGLE_ARG_DECL);
+    ACE_HANDLE fd (void);
     // Extracts the ACE_HANDLE from the objectID
 
     PortableServer::POA_var poa_;
@@ -80,12 +77,11 @@ public:
     ~System (void);
     //Destructor
 
-    PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+    PortableServer::POA_ptr _default_POA (void);
     //Returns the default POA of this object
 
     File::Descriptor_ptr open (const char *file_name,
-                               CORBA::Long flags
-                               ACE_ENV_ARG_DECL)
+                               CORBA::Long flags)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // Opens a file ,creates a Descriptor reference with the
diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp
index a1a99766578..abf27200e44 100644
--- a/TAO/examples/POA/Default_Servant/client.cpp
+++ b/TAO/examples/POA/Default_Servant/client.cpp
@@ -73,13 +73,11 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       // Parse the command-line arguments to get the IOR
       parse_args (argc, argv);
@@ -106,20 +104,14 @@ main (int argc, char **argv)
       ior_buffer.alloc ()-> free (data);
       ACE_OS::close (input_file);
 
-      CORBA::Object_var object = orb->string_to_object (ior.c_str ()
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = orb->string_to_object (ior.c_str ());
 
       // Narrow the object reference to a File::System
-      File::System_var file_system = File::System::_narrow (object.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      File::System_var file_system = File::System::_narrow (object.in ());
 
       // Creat the file filename i.e "test"
       File::Descriptor_var fd = file_system->open (filename,
-                                                   O_CREAT | O_RDWR
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   O_CREAT | O_RDWR);
 
       int message_length = ACE_OS::strlen (message) + 1;
       CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (message_length);
@@ -127,17 +119,13 @@ main (int argc, char **argv)
       File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, 1);
 
       // write the message to the file
-      fd->write (data_sent ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fd->write (data_sent);
 
       //seek to the beginning of the file
-      fd->lseek (0, SEEK_SET ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fd->lseek (0, SEEK_SET);
 
       // Read back the written message
-      File::Descriptor::DataBuffer_var data_received = fd->read (message_length
-                                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      File::Descriptor::DataBuffer_var data_received = fd->read (message_length);
 
       char *result = (char *) &data_received[0];
 
@@ -146,16 +134,13 @@ main (int argc, char **argv)
                  result));
 
       // close the file
-      fd->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fd->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main");
+      ex._tao_print_exception ("Exception caught in main");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index be45c3a1297..9bfef6166d5 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -60,13 +60,11 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -74,59 +72,47 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow the object reference to a POA reference
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ());
 
-      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
 
       CORBA::PolicyList policies (5);
       policies.length (5);
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT);
 
       // Servant Retention Policy
       policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN);
 
       // Id Uniqueness Policy
       policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
                                                                 poa_manager.in (),
-                                                                policies
-                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                                policies);
 
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       // Create a File System Implementation object in first_poa
@@ -136,18 +122,14 @@ main (int argc, char **argv)
         PortableServer::string_to_ObjectId ("FileSystem");
 
       first_poa->activate_object_with_id (file_system_oid.in (),
-                                          &file_system_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          &file_system_impl);
 
       CORBA::Object_var file_system =
-        first_poa->id_to_reference (file_system_oid.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->id_to_reference (file_system_oid.in ());
 
       // Get the IOR for the "FileSystem" object
       CORBA::String_var file_system_ior =
-        orb->object_to_string (file_system.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (file_system.in ());
 
       ACE_DEBUG ((LM_DEBUG,"%s\n",
                   file_system_ior.in ()));
@@ -162,21 +144,17 @@ main (int argc, char **argv)
       ACE_OS::fclose (output_file);
 
       // set the state of the poa_manager to active i.e ready to process requests
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Run the ORB
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EXCEPTION CAUGHT");
+      ex._tao_print_exception ("EXCEPTION CAUGHT");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp
index 924ce3bd0f1..f21c2d5b1c6 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -120,17 +120,14 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -138,20 +135,15 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the firstPOA to be created.
       CORBA::PolicyList policies (3);
@@ -159,56 +151,42 @@ main (int argc, char **argv)
 
       // Id Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       // Threading policy
       policies[2] =
-        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL);
 
       // Create the firstPOA under the RootPOA.
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa =
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
-      policies[2]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[2]->destroy ();
 
       // Threading policy
       policies[2] =
-        root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL);
 
       // Create the secondPOA under the firstPOA.
       name = "secondPOA";
       PortableServer::POA_var second_poa =
         first_poa->create_POA (name.c_str (),
                                poa_manager.in (),
-                               policies
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               policies);
 
       // 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_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
       // Create two Objects of Class test_i (defined in
@@ -224,14 +202,11 @@ main (int argc, char **argv)
       //  ObjectId activate_object(in Servant p_servant)
       //    raises (ServantAlreadyActive, WrongPolicy);
       PortableServer::ObjectId_var first_oid =
-        root_poa->activate_object (&first_servant
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&first_servant);
 
       // Get Object Reference for the first_servant object.
       test_var first_test =
-        first_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_servant._this ();
 
       // Get ObjectId for object secondtest and use that ObjectId to
       // activate the second_servant object.
@@ -242,14 +217,11 @@ main (int argc, char **argv)
         PortableServer::string_to_ObjectId ("second test");
 
       first_poa->activate_object_with_id (second_oid.in (),
-                                          &second_servant
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          &second_servant);
 
       // Get Object reference for second_servant object.
       test_var second_test =
-        second_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        second_servant._this ();
 
       // Get ObjectId for the string thirdPOA Create the object reference
       // for thirdPOA using that ObjectId.  Operation Used :
@@ -269,22 +241,17 @@ main (int argc, char **argv)
 
       CORBA::Object_var third_test =
         second_poa->create_reference_with_id (third_oid.in (),
-                                              "IDL:test:1.0"
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              "IDL:test:1.0");
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var first_ior =
-        orb->object_to_string (first_test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (first_test.in ());
 
       CORBA::String_var second_ior =
-        orb->object_to_string (second_test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (second_test.in ());
 
       CORBA::String_var third_ior =
-        orb->object_to_string (third_test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (third_test.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n%s\n%s\n",
@@ -303,23 +270,17 @@ main (int argc, char **argv)
       test_i third_servant (orb.in (),
                             second_poa.in ());
       second_poa->activate_object_with_id (third_oid.in (),
-                                           &third_servant
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           &third_servant);
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index 3d811df3b1b..b999a0ef89c 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -35,20 +35,17 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
   bool expected_exception_raised = false;
 
   // New environment.
-  ACE_TRY_NEW_ENV
+  try
     {
       // Try to find child poa.
       PortableServer::POA_var child_poa =
         parent->find_POA (child_poa_name,
-                          activate
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          activate);
     }
-  ACE_CATCH (PortableServer::POA::AdapterNonExistent, foo)
+  catch (const PortableServer::POA::AdapterNonExistent& )
     {
       expected_exception_raised = true;
     }
-  ACE_ENDTRY;
 
   if (!expected_exception_raised)
     ACE_ERROR ((LM_ERROR, "ERROR: Caught incorrect exception\n"));
@@ -59,32 +56,25 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Initialize the ORB
-  ACE_TRY
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow Object reference to RootPOA to a POA reference.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Try to find a non-existant POA.  Since the Adapter Activator
       // has not been installed yet, this call should fail.
@@ -98,24 +88,18 @@ main (int argc, char **argv)
 
       // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
-      root_poa->the_activator (activator.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->the_activator (activator.in ());
 
       // Try to find a childPOA of RootPOA named firstPOA
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa =
         root_poa->find_POA (name.c_str (),
-                            1
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            1);
 
       name = "secondPOA";
       PortableServer::POA_var second_poa =
         first_poa->find_POA (name.c_str (),
-                             1
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             1);
 
       // Try to find a non-existant POA.  Even though the Adapter
       // Activator has been installed, this call should fail because
@@ -126,16 +110,13 @@ main (int argc, char **argv)
 
       // Get the names of all the POAs
       CORBA::String_var root_poa_name =
-        root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_name ();
 
       CORBA::String_var first_poa_name =
-        first_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->the_name ();
 
       CORBA::String_var second_poa_name =
-        second_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        second_poa->the_name ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n%s\n%s\n",
@@ -143,13 +124,11 @@ main (int argc, char **argv)
                   first_poa_name.in (),
                   second_poa_name.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.cpp b/TAO/examples/POA/Forwarding/Servant_Activator.cpp
index d7d2452dadf..eedc9664cb6 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.cpp
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.cpp
@@ -14,14 +14,11 @@ ACE_RCSID(Forwarding, Servant_Activator, "$Id$")
 
 PortableServer::Servant
 ServantActivator::incarnate (const PortableServer::ObjectId &,
-                             PortableServer::POA_ptr
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->orb_->shutdown (0);
 
   // Throw forward exception
   ACE_THROW_RETURN (
@@ -35,16 +32,15 @@ ServantActivator::etherealize (const PortableServer::ObjectId &,
                                PortableServer::POA_ptr,
                                PortableServer::Servant servant,
                                CORBA::Boolean,
-                               CORBA::Boolean
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               CORBA::Boolean)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   delete servant;
 }
 
 void
-ServantActivator::forward_requests (ACE_ENV_SINGLE_ARG_DECL)
+ServantActivator::forward_requests (void)
 {
   if (CORBA::is_nil (this->forward_to_.in ()))
-    ACE_THROW (test::Cannot_Forward ());
+    throw test::Cannot_Forward ();
 }
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h
index 7b559180569..eda11fdaefc 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.h
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.h
@@ -39,8 +39,7 @@ public:
                     CORBA::Object_ptr forward_to);
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId & oid,
-                                             PortableServer::POA_ptr adapter
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             PortableServer::POA_ptr adapter)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -48,11 +47,10 @@ public:
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant serv,
                             CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                            CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void forward_requests (ACE_ENV_SINGLE_ARG_DECL);
+  void forward_requests (void);
   // Object should be forwarded from now on.
 
 private:
diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp
index a47f480a36d..b5b6309b044 100644
--- a/TAO/examples/POA/Forwarding/client.cpp
+++ b/TAO/examples/POA/Forwarding/client.cpp
@@ -66,16 +66,14 @@ parse_args (int argc, char **argv)
 }
 
 void
-do_calls (test_ptr test
-          ACE_ENV_ARG_DECL)
+do_calls (test_ptr test)
 {
   for (int j = 1; j <= servers; j++)
     {
       for (int i = 1; i <= iterations; i++)
         {
           // Invoke the doit() method of the test reference.
-          CORBA::Long result = test->doit (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          CORBA::Long result = test->doit ();
 
           // Print the result of doit () method of the test reference.
           ACE_DEBUG ((LM_DEBUG,
@@ -88,8 +86,7 @@ do_calls (test_ptr test
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Asking server to forward next time\n"));
-          test->forward (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          test->forward ();
         }
     }
 }
@@ -98,13 +95,11 @@ do_calls (test_ptr test
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result =
@@ -114,28 +109,21 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a test reference.
       test_var test =
-        test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
-      do_calls (test.in ()
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      do_calls (test.in ());
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in client");
+      ex._tao_print_exception ("Exception caught in client");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp
index b4a4e26b918..8f2a32df312 100644
--- a/TAO/examples/POA/Forwarding/server.cpp
+++ b/TAO/examples/POA/Forwarding/server.cpp
@@ -64,8 +64,7 @@ parse_args (int argc, char **argv)
 }
 
 PortableServer::POA_ptr
-setup_poa (PortableServer::POA_ptr root_poa
-           ACE_ENV_ARG_DECL)
+setup_poa (PortableServer::POA_ptr root_poa)
 {
   // Policies for the childPOA to be created.
   CORBA::PolicyList policies (2);
@@ -73,36 +72,28 @@ setup_poa (PortableServer::POA_ptr root_poa
 
   // Tell the POA to use a servant manager.
   policies[0] =
-    root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
   // Allow implicit activation.
   policies[1] =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->the_POAManager ();
 
   // Create POA as child of RootPOA with the above policies.  This POA
   // will use a SERVANT_ACTIVATOR because of RETAIN policy.
   PortableServer::POA_var child_poa =
     root_poa->create_POA ("childPOA",
                           poa_manager.in (),
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                          policies);
 
   // Creation of childPOAs 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 (PortableServer::POA::_nil ());
+      policies[i]->destroy ();
     }
 
   return child_poa._retn ();
@@ -110,16 +101,13 @@ setup_poa (PortableServer::POA_ptr root_poa
 
 ServantActivator *
 create_servant_manager (CORBA::ORB_ptr orb,
-                        PortableServer::POA_ptr child_poa
-                        ACE_ENV_ARG_DECL)
+                        PortableServer::POA_ptr child_poa)
 {
   CORBA::Object_var forward_to;
   if (forward_to_ior)
     {
       forward_to =
-        orb->string_to_object (forward_to_ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        orb->string_to_object (forward_to_ior);
     }
 
   ServantActivator *activator = 0;
@@ -129,8 +117,7 @@ create_servant_manager (CORBA::ORB_ptr orb,
                   0);
 
   // Set ServantActivator to be the servant activator.
-  child_poa->set_servant_manager (activator
-                                  ACE_ENV_ARG_PARAMETER);
+  child_poa->set_servant_manager (activator);
   // For the code above, we're using the CORBA 3.0 servant manager
   // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
   // use the following code in place of the previous line:
@@ -139,8 +126,7 @@ create_servant_manager (CORBA::ORB_ptr orb,
   //   activator->_this ();
   //
   // child_poa->set_servant_manager (servant_activator.in (),
-  //                                 ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  //);
 
   test_i *servant = 0;
   ACE_NEW_RETURN (servant,
@@ -153,13 +139,10 @@ create_servant_manager (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var servant_var (servant);
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    servant->_this ();
 
   CORBA::String_var ior =
-    orb->object_to_string (test.in ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    orb->object_to_string (test.in ());
 
   FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
   if (output_file == 0)
@@ -178,16 +161,13 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result =
         parse_args (argc, argv);
@@ -197,47 +177,33 @@ main (int argc,
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       PortableServer::POA_var child_poa =
-        setup_poa (root_poa.in ()
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        setup_poa (root_poa.in ());
 
       PortableServer::ServantManager_var manager =
         create_servant_manager (orb.in (),
-                                child_poa.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                child_poa.in ());
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in server");
+      ex._tao_print_exception ("Exception caught in server");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Forwarding/test_i.cpp b/TAO/examples/POA/Forwarding/test_i.cpp
index 254c4377ace..e5b253f86ab 100644
--- a/TAO/examples/POA/Forwarding/test_i.cpp
+++ b/TAO/examples/POA/Forwarding/test_i.cpp
@@ -18,42 +18,35 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Long
-test_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::doit (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_++;
 }
 
 void
-test_i::forward (ACE_ENV_SINGLE_ARG_DECL)
+test_i::forward (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    test::Cannot_Forward))
 {
-  this->activator_.forward_requests (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->activator_.forward_requests ();
 
   PortableServer::ObjectId_var id =
-    this->poa_->servant_to_id (this
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->servant_to_id (this);
 
-  this->poa_->deactivate_object (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->deactivate_object (id.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;
+  this->orb_->shutdown (0);
 }
 
 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/examples/POA/Forwarding/test_i.h b/TAO/examples/POA/Forwarding/test_i.h
index 4a78980de85..b72e64413e6 100644
--- a/TAO/examples/POA/Forwarding/test_i.h
+++ b/TAO/examples/POA/Forwarding/test_i.h
@@ -25,18 +25,18 @@ public:
                 ServantActivator &activator,
                 CORBA::Long value);
 
-  virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long doit (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Setup forwarding
-  virtual void forward (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void forward (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      test::Cannot_Forward));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
   // Returns the default POA for this servant.
 
 protected:
diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp
index 901c06ce028..e76561b13c7 100644
--- a/TAO/examples/POA/Generic_Servant/client.cpp
+++ b/TAO/examples/POA/Generic_Servant/client.cpp
@@ -106,17 +106,14 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result =
@@ -126,19 +123,13 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a test reference.
-      test_var test = test::_narrow (object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test = test::_narrow (object.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nConnecting to: %s\n\n",
@@ -156,25 +147,19 @@ main (int argc, char **argv)
         {
           if (oneway && timed_method)
             {
-              test->timed_oneway_method (timeout
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              test->timed_oneway_method (timeout);
             }
           else if (oneway)
             {
-              test->oneway_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              test->oneway_method ();
             }
           else if (!oneway && timed_method)
             {
-              test->timed_method (timeout
-                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              test->timed_method (timeout);
             }
           else
             {
-              test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              test->method ();
             }
         }
 
@@ -187,17 +172,14 @@ main (int argc, char **argv)
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error!");
+      ex._tao_print_exception ("Error!");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Generic_Servant/test_i.cpp b/TAO/examples/POA/Generic_Servant/test_i.cpp
index 3e9df19ff8c..d43196aea2a 100644
--- a/TAO/examples/POA/Generic_Servant/test_i.cpp
+++ b/TAO/examples/POA/Generic_Servant/test_i.cpp
@@ -15,19 +15,19 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 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::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-test_i::oneway_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::oneway_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -49,8 +49,7 @@ test_i::sleep (CORBA::ULong timeout,
 }
 
 void
-test_i::timed_method (CORBA::ULong timeout
-                      ACE_ENV_ARG_DECL_NOT_USED)
+test_i::timed_method (CORBA::ULong timeout)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->sleep (timeout,
@@ -58,8 +57,7 @@ test_i::timed_method (CORBA::ULong timeout
 }
 
 void
-test_i::timed_oneway_method (CORBA::ULong timeout
-                             ACE_ENV_ARG_DECL_NOT_USED)
+test_i::timed_oneway_method (CORBA::ULong timeout)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->sleep (timeout,
@@ -67,12 +65,10 @@ test_i::timed_oneway_method (CORBA::ULong timeout
 }
 
 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;
+  this->orb_->shutdown (0);
 }
 
 
diff --git a/TAO/examples/POA/Generic_Servant/test_i.h b/TAO/examples/POA/Generic_Servant/test_i.h
index 3a6a4c96889..6c0ff86e610 100644
--- a/TAO/examples/POA/Generic_Servant/test_i.h
+++ b/TAO/examples/POA/Generic_Servant/test_i.h
@@ -22,28 +22,26 @@ public:
           PortableServer::POA_ptr poa);
   // Constructor - takes a POA and a value parameter
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
   // Returns the Default POA of this servant
 
-  void method (ACE_ENV_SINGLE_ARG_DECL)
+  void method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // A twoway operation.
 
-  void oneway_method (ACE_ENV_SINGLE_ARG_DECL)
+  void oneway_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // A oneway operation.
 
-  void timed_method (CORBA::ULong timeout
-                     ACE_ENV_ARG_DECL)
+  void timed_method (CORBA::ULong timeout)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // A timed twoway operation.
 
-  void timed_oneway_method (CORBA::ULong timeout
-                            ACE_ENV_ARG_DECL)
+  void timed_oneway_method (CORBA::ULong timeout)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // A timed twoway operation.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the ORB
 
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index 2628f42f52a..c3f24418416 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -20,8 +20,8 @@
 #include "Servant_Activator.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Loader, 
-           Servant_Activator, 
+ACE_RCSID (Loader,
+           Servant_Activator,
            "$Id$")
 
 // Initialization.The dllname is used by the Loactor to load it into
@@ -64,8 +64,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
 
 PortableServer::Servant
 ServantActivator::incarnate (const PortableServer::ObjectId &oid,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr poa)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -89,8 +88,7 @@ ServantActivator::etherealize (const PortableServer::ObjectId &oid,
                                PortableServer::POA_ptr poa,
                                PortableServer::Servant servant,
                                CORBA::Boolean,
-                               CORBA::Boolean remaining_activations
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               CORBA::Boolean remaining_activations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If there are no remaining activations i.e ObjectIds associated
diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h
index 8fb6642488f..a0a3ec2e174 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.h
+++ b/TAO/examples/POA/Loader/Servant_Activator.h
@@ -64,8 +64,7 @@ public:
   // Initialization.
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                             PortableServer::POA_ptr poa
-                                             ACE_ENV_ARG_DECL)
+                                             PortableServer::POA_ptr poa)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
@@ -82,8 +81,7 @@ public:
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations
-                            ACE_ENV_ARG_DECL)
+                            CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a test object is
   // deactivated. This occurs when the POA is destroyed or the Object
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index 014b276b6ed..5a0442e04b7 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -20,8 +20,8 @@
 #include "Servant_Locator.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Loader, 
-           Servant_Locator, 
+ACE_RCSID (Loader,
+           Servant_Locator,
            "$Id$")
 
 // Initialization.The dllname is used by the Loactor to load it into
@@ -69,8 +69,7 @@ PortableServer::Servant
 ServantLocator::preinvoke (const PortableServer::ObjectId &oid,
                            PortableServer::POA_ptr poa,
                            const char * /* operation */,
-                           PortableServer::ServantLocator::Cookie &cookie
-                           ACE_ENV_ARG_DECL)
+                           PortableServer::ServantLocator::Cookie &cookie)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -100,8 +99,7 @@ ServantLocator::postinvoke (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr poa ,
                             const char * /* operation */,
                             PortableServer::ServantLocator::Cookie cookie,
-                            PortableServer::Servant servant
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the passed servant with the cookie.
diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h
index 3105fc45e82..eeedf1fb6c1 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.h
+++ b/TAO/examples/POA/Loader/Servant_Locator.h
@@ -69,8 +69,7 @@ public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
-                                             PortableServer::ServantLocator::Cookie &the_cookie
-                                             ACE_ENV_ARG_DECL)
+                                             PortableServer::ServantLocator::Cookie &the_cookie)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA whenever it receives a request
@@ -87,8 +86,7 @@ public:
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
-                           PortableServer::Servant the_servant
-                           ACE_ENV_ARG_DECL)
+                           PortableServer::Servant the_servant)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a test servant completes a
   // request. As the Servant Loactor interface is used when the POA
diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index 287be59afe8..b08c8712b39 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -109,15 +109,12 @@ Server_i::write_iors_to_file (const char *first_ior,
 int
 Server_i::init (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -125,26 +122,20 @@ Server_i::init (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA"
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("RootPOA");
 
       // Narrow the Object reference to a POA reference
-      root_poa_ = PortableServer::POA::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa_ = PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of RootPOA
-      poa_manager_ = root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager_ = root_poa_->the_POAManager ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:init_poa ()");
+      ex._tao_print_exception ("Server_i:init_poa ()");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -159,50 +150,39 @@ Server_i::create_poa (const char *name,
 {
   PortableServer::POA_ptr my_poa = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       policies_.length (4);
 
       // ID Assignment Policy.
       policies_[0] =
         root_poa_->create_id_assignment_policy
-        (PortableServer::USER_ID
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        (PortableServer::USER_ID);
 
       // Lifespan Policy.
       policies_[1] =
         root_poa_->create_lifespan_policy
-        (PortableServer::PERSISTENT
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        (PortableServer::PERSISTENT);
 
       // Request Processing Policy.
       policies_[2] =
         root_poa_->create_request_processing_policy
-        (PortableServer::USE_SERVANT_MANAGER
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        (PortableServer::USE_SERVANT_MANAGER);
 
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
         {
           policies_[3] =
             root_poa_->create_servant_retention_policy
-            (PortableServer::RETAIN
-             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            (PortableServer::RETAIN);
         }
 
       if (servant_retention_policy == 0)
         {
           policies_[3] =
             root_poa_->create_servant_retention_policy
-            (PortableServer::NON_RETAIN
-             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            (PortableServer::NON_RETAIN);
         }
 
       // Create myPOA as the child of RootPOA with the above
@@ -211,9 +191,7 @@ Server_i::create_poa (const char *name,
       // being RETAIN or NONRETAIN respectively.
       my_poa = root_poa_->create_POA (name,
                                       poa_manager_.in (),
-                                      policies_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      policies_);
 
       // Destroy the policy objects as they have been passed to
       // create_POA and no longer needed.
@@ -222,17 +200,14 @@ Server_i::create_poa (const char *name,
            ++i)
         {
           CORBA::Policy_ptr policy = policies_[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_poa ()");
+      ex._tao_print_exception ("Server_i:create_poa ()");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return my_poa;
 }
@@ -242,9 +217,8 @@ Server_i::create_poa (const char *name,
 int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // An Servant Activator object is created which will activate
       // the servant on demand.
@@ -259,8 +233,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       // Set ServantActivator object as the servant_manager of
       // firstPOA.
       this->servant_activator_ = temp_servant_activator;
-      first_poa->set_servant_manager (this->servant_activator_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+      first_poa->set_servant_manager (this->servant_activator_.in ());
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous lines:
@@ -268,8 +241,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       // this->servant_activator_ = temp_servant_activator->_this ();
       //
       // first_poa->set_servant_manager (this->servant_activator_.in ()
-      //                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      //);
 
       // Create a reference with user created ID in firstPOA which
       // uses the ServantActivator.
@@ -277,16 +249,13 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
         PortableServer::string_to_ObjectId ("first test");
 
       first_test_ = first_poa->create_reference_with_id (first_test_oid.in (),
-                                                        "IDL:test:1.0"
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                        "IDL:test:1.0");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_activator ()");
+      ex._tao_print_exception ("Server_i:create_activator ()");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -296,9 +265,8 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // An Servant Locator object is created which will activate
       // the servant on demand.
@@ -312,8 +280,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       // Set ServantLocator object as the servant Manager of
       // secondPOA.
       this->servant_locator_ = temp_servant_locator;
-      second_poa->set_servant_manager (this->servant_locator_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+      second_poa->set_servant_manager (this->servant_locator_.in ());
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous lines:
@@ -323,8 +290,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       // Set ServantLocator object as the servant Manager of
       // secondPOA.
       // second_poa->set_servant_manager (this->servant_locator_.in ()
-      //                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      //);
 
       // Try to create a reference with user created ID in second_poa
       // which uses ServantLocator.
@@ -333,16 +299,13 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 
       second_test_ =
         second_poa->create_reference_with_id (second_test_oid.in (),
-                                              "IDL:test:1.0"
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              "IDL:test:1.0");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_locator ()");
+      ex._tao_print_exception ("Server_i:create_locator ()");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -352,22 +315,17 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 int
 Server_i::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Invoke object_to_string on the references created in firstPOA
       // and secondPOA.
 
       CORBA::String_var first_test_ior =
-        orb_->object_to_string (first_test_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (first_test_.in ());
 
       CORBA::String_var second_test_ior =
-        orb_->object_to_string (second_test_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (second_test_.in ());
 
       // Print the ior's of first_test and second_test.
 
@@ -383,20 +341,17 @@ Server_i::run (void)
 
       // Set the poa_manager state to active, ready to process
       // requests.
-      poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager_->activate ();
 
-      ACE_TRY_CHECK;
 
       // Run the ORB.
-      orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:run ()");
+      ex._tao_print_exception ("Server_i:run ()");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index be4283821ee..bf85132f79c 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -33,16 +33,13 @@ ACE_RCSID (NewPOA,
            "$Id$")
 
 void
-print_poa (PortableServer::POA_ptr poa
-           ACE_ENV_ARG_DECL)
+print_poa (PortableServer::POA_ptr poa)
 {
   CORBA::String_var poa_name =
-    poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->the_name ();
 
   CORBA::OctetSeq_var poa_id =
-    poa->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "POA name = %s\n",
@@ -64,43 +61,34 @@ print_poa (PortableServer::POA_ptr poa
               "\n"));
 
   PortableServer::POAList_var children =
-    poa->the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->the_children ();
 
   for (CORBA::ULong index = 0;
        index != children->length ();
        ++index)
     {
-      print_poa (children[index]
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      print_poa (children[index]);
     }
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // The first step Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // _narrow() the Object to get the POA object, i.e., the root_poa.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Policies for the new POAs
       CORBA::PolicyList policies (2);
@@ -108,31 +96,25 @@ main (int argc, char **argv)
 
       // Threading policy
       policies[0] =
-        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL);
 
       // Lifespan policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::TRANSIENT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::TRANSIENT);
 
       // Creation of the firstPOA
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa =
         root_poa->create_POA (name.c_str (),
                               PortableServer::POAManager::_nil (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POA, i.e. firstPOA/secondPOA
       name = "secondPOA";
       PortableServer::POA_var second_poa =
         first_poa->create_POA (name.c_str (),
                                PortableServer::POAManager::_nil (),
-                               policies
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               policies);
 
       // Creating thirdPOA.
       name = "thirdPOA";
@@ -140,9 +122,7 @@ main (int argc, char **argv)
       PortableServer::POA_var third_poa =
         root_poa->create_POA (name.c_str (),
                               PortableServer::POAManager::_nil (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POAs over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0;
@@ -150,27 +130,22 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       // Get the names of all the POAs and print them out.
 
       CORBA::String_var root_poa_name =
-        root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_name ();
 
       CORBA::String_var first_poa_name =
-        first_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->the_name ();
 
       CORBA::String_var second_poa_name =
-        second_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        second_poa->the_name ();
 
       CORBA::String_var third_poa_name =
-        third_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        third_poa->the_name ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n%s\n%s\n%s\n",
@@ -179,18 +154,14 @@ main (int argc, char **argv)
                   second_poa_name.in (),
                   third_poa_name.in ()));
 
-      print_poa (root_poa.in ()
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      print_poa (root_poa.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main ");
+      ex._tao_print_exception ("Exception caught in main ");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
index 4180f009135..2f445782f5b 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
@@ -21,8 +21,8 @@
 #include "test_i.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (On_Demand_Activation, 
-           Servant_Activator, 
+ACE_RCSID (On_Demand_Activation,
+           Servant_Activator,
            "$Id$")
 
 ServantActivator::ServantActivator (CORBA::ORB_ptr orb)
@@ -32,8 +32,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb)
 
 PortableServer::Servant
 ServantActivator::incarnate (const PortableServer::ObjectId &oid,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr poa)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -58,8 +57,7 @@ ServantActivator::etherealize (const PortableServer::ObjectId &,
                                PortableServer::POA_ptr ,
                                PortableServer::Servant servant,
                                CORBA::Boolean ,
-                               CORBA::Boolean remaining_activations
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               CORBA::Boolean remaining_activations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If there are no remaining activations i.e ObjectIds associated
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
index c03a101a5f2..860e67077a5 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
@@ -31,8 +31,7 @@ public:
   ServantActivator (CORBA::ORB_ptr orb);
 
   PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                     PortableServer::POA_ptr poa
-                                     ACE_ENV_ARG_DECL)
+                                     PortableServer::POA_ptr poa)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
@@ -43,8 +42,7 @@ public:
                     PortableServer::POA_ptr adapter,
                     PortableServer::Servant servant,
                     CORBA::Boolean cleanup_in_progress,
-                    CORBA::Boolean remaining_activations
-                    ACE_ENV_ARG_DECL)
+                    CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a test object is deactivated.
 
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
index 28f4ad8be63..93b1b8c6e3b 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -21,8 +21,8 @@
 #include "test_i.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (On_Demand_Activation, 
-           Servant_Locator, 
+ACE_RCSID (On_Demand_Activation,
+           Servant_Locator,
            "$Id$")
 
 ServantLocator::ServantLocator (CORBA::ORB_ptr orb)
@@ -36,8 +36,7 @@ PortableServer::Servant
 ServantLocator::preinvoke (const PortableServer::ObjectId &oid,
                            PortableServer::POA_ptr poa,
                            const char * /* operation */,
-                           PortableServer::ServantLocator::Cookie &cookie
-                           ACE_ENV_ARG_DECL)
+                           PortableServer::ServantLocator::Cookie &cookie)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -69,8 +68,7 @@ ServantLocator::postinvoke (const PortableServer::ObjectId & /* oid */,
                             PortableServer::POA_ptr /* poa */,
                             const char * /* operation */,
                             PortableServer::ServantLocator::Cookie cookie,
-                            PortableServer::Servant servant
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the passed servant with the cookie.
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
index d3fb447468c..cd0556ec60c 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
@@ -39,8 +39,7 @@ public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
-                                             PortableServer::ServantLocator::Cookie &the_cookie
-                                             ACE_ENV_ARG_DECL)
+                                             PortableServer::ServantLocator::Cookie &the_cookie)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA whenever it receives a request
@@ -50,8 +49,7 @@ public:
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
-                           PortableServer::Servant the_servant
-                           ACE_ENV_ARG_DECL)
+                           PortableServer::Servant the_servant)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a test servant completes a
   // request.
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index c5aa44a172f..dc264f997e3 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -102,13 +102,11 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -116,46 +114,38 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow the Object reference to a POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of RootPOA
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager ();
 
-      ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (4);
       policies.length (4);
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
       PortableServer::POA_var first_poa;
       {
         // Servant Retention Policy
         policies[3] =
-          root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_servant_retention_policy (PortableServer::RETAIN);
 
         ACE_CString name = "firstPOA";
 
@@ -163,9 +153,7 @@ main (int argc, char **argv)
         // firstPOA will use SERVANT_ACTIVATOR because of RETAIN policy.
         first_poa = root_poa->create_POA (name.c_str (),
                                           poa_manager.in (),
-                                          policies
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                          policies);
 
       }
 
@@ -173,8 +161,7 @@ main (int argc, char **argv)
       {
         // Servant Retention Policy
         policies[3] =
-          root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN);
 
         ACE_CString name = "secondPOA";
 
@@ -183,9 +170,7 @@ main (int argc, char **argv)
         // policy.
         second_poa = root_poa->create_POA (name.c_str (),
                                            poa_manager.in (),
-                                           policies
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                           policies);
 
       }
 
@@ -196,8 +181,7 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       // Allocate the servant activator.
@@ -208,8 +192,7 @@ main (int argc, char **argv)
 
       // Set ServantActivator object as the servant_manager of
       // firstPOA.
-      first_poa->set_servant_manager (activator
-                                      ACE_ENV_ARG_PARAMETER);
+      first_poa->set_servant_manager (activator);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
@@ -218,8 +201,7 @@ main (int argc, char **argv)
       //   activator->_this ();
       //
       // first_poa->set_servant_manager (servant_activator.in (),
-      //                                 ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      //);
 
       // Create a reference with user created ID in firstPOA which uses
       // the ServantActivator.
@@ -228,8 +210,7 @@ main (int argc, char **argv)
         PortableServer::string_to_ObjectId ("first test");
 
       CORBA::Object_var first_test =
-        first_poa->create_reference_with_id (first_test_oid.in (), "IDL:test:1.0" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->create_reference_with_id (first_test_oid.in (), "IDL:test:1.0");
 
       // Allocate the servant activator.
       ServantLocator *locator;
@@ -239,8 +220,7 @@ main (int argc, char **argv)
 
       // Set ServantLocator object as the servant Manager of
       // secondPOA.
-      second_poa->set_servant_manager (locator
-                                       ACE_ENV_ARG_PARAMETER);
+      second_poa->set_servant_manager (locator);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
@@ -249,8 +229,7 @@ main (int argc, char **argv)
       //   locator->_this ();
       //
       // second_poa->set_servant_manager (servant_locator.in (),
-      //                                  ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      //);
 
       // Try to create a reference with user created ID in second_poa
       // which uses ServantLocator.
@@ -260,20 +239,17 @@ main (int argc, char **argv)
 
       CORBA::Object_var second_test =
         second_poa->create_reference_with_id (second_test_oid.in (),
-                                              "IDL:test:1.0" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              "IDL:test:1.0");
 
       // Invoke object_to_string on the references created in firstPOA and
       // secondPOA.
 
       CORBA::String_var first_test_ior =
-        orb->object_to_string (first_test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (first_test.in ());
 
 
       CORBA::String_var second_test_ior =
-        orb->object_to_string (second_test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (second_test.in ());
 
       // Print the ior's of first_test and second_test.
 
@@ -287,20 +263,16 @@ main (int argc, char **argv)
         return write_result;
 
       // Set the poa_manager state to active, ready to process requests.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Run the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main");
+      ex._tao_print_exception ("Exception caught in main");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
index 9fc6f5ad62f..5a30dec4d78 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
@@ -19,8 +19,8 @@
 
 #include "Servant_Activator.h"
 
-ACE_RCSID (On_Demand_Loading, 
-           Servant_Activator, 
+ACE_RCSID (On_Demand_Loading,
+           Servant_Activator,
            "$Id$")
 
 // Initialization.
@@ -34,8 +34,7 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb)
 
 PortableServer::Servant
 ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
-                               PortableServer::POA_ptr poa
-                               ACE_ENV_ARG_DECL)
+                               PortableServer::POA_ptr poa)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -62,8 +61,7 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid,
                                  PortableServer::POA_ptr,
                                  PortableServer::Servant servant,
                                  CORBA::Boolean,
-                                 CORBA::Boolean remaining_activations
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 CORBA::Boolean remaining_activations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If there are no remaining activations i.e ObjectIds associated
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
index 24e9744bcc0..dfb116a8157 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
@@ -42,8 +42,7 @@ public:
   // Initialization.
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                             PortableServer::POA_ptr poa
-                                             ACE_ENV_ARG_DECL)
+                                             PortableServer::POA_ptr poa)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
@@ -60,8 +59,7 @@ public:
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations
-                            ACE_ENV_ARG_DECL)
+                            CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a test servant is
   // deactivated. This occurs when the POA is destroyed or the Object
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
index 9e83dfa84b3..6e9f9f60340 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -19,8 +19,8 @@
 
 #include "Servant_Locator.h"
 
-ACE_RCSID (On_Demand_Activation, 
-           Servant_Locator, 
+ACE_RCSID (On_Demand_Activation,
+           Servant_Locator,
            "$Id$")
 
 // Initialization.
@@ -36,8 +36,7 @@ PortableServer::Servant
 ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr poa,
                              const char * /* operation */,
-                             PortableServer::ServantLocator::Cookie &cookie
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::ServantLocator::Cookie &cookie)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -74,8 +73,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid,
                               PortableServer::POA_ptr /* poa */,
                               const char * /* operation */,
                               PortableServer::ServantLocator::Cookie cookie,
-                              PortableServer::Servant servant
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the passed servant with the cookie.
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
index 7bc64dab6dc..e28daa6b5b1 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
@@ -47,8 +47,7 @@ public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
-                                             PortableServer::ServantLocator::Cookie &the_cookie
-                                             ACE_ENV_ARG_DECL)
+                                             PortableServer::ServantLocator::Cookie &the_cookie)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA whenever it receives a request
@@ -65,8 +64,7 @@ public:
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
-                           PortableServer::Servant the_servant
-                           ACE_ENV_ARG_DECL)
+                           PortableServer::Servant the_servant)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a test servant completes a
   // request. As the Servant Loactor interface is used when the POA
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index c1d6f600d34..5e7b040d916 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -113,16 +113,13 @@ Server_i::write_iors_to_file (const char *first_ior,
 int
 Server_i::init (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -130,26 +127,20 @@ Server_i::init (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA"
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("RootPOA");
 
       // Narrow the Object reference to a POA reference
-      root_poa_ = PortableServer::POA::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa_ = PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of RootPOA
-      poa_manager_ = root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager_ = root_poa_->the_POAManager ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:init_poa ()");
+      ex._tao_print_exception ("Server_i:init_poa ()");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -164,46 +155,35 @@ Server_i::create_poa (const char *name,
 {
   PortableServer::POA_ptr my_poa = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       policies_.length (4);
 
       // ID Assignment Policy.
       policies_[0] =
         root_poa_->create_id_assignment_policy
-        (PortableServer::USER_ID
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        (PortableServer::USER_ID);
 
       // Lifespan Policy.
       policies_[1] =
         root_poa_->create_lifespan_policy
-        (PortableServer::PERSISTENT
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        (PortableServer::PERSISTENT);
 
       // Request Processing Policy.
       policies_[2] =
         root_poa_->create_request_processing_policy
-        (PortableServer::USE_SERVANT_MANAGER
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        (PortableServer::USE_SERVANT_MANAGER);
 
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
         policies_[3] =
           root_poa_->create_servant_retention_policy
-          (PortableServer::RETAIN
-           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          (PortableServer::RETAIN);
 
       if (servant_retention_policy == 0)
         policies_[3] =
           root_poa_->create_servant_retention_policy
-          (PortableServer::NON_RETAIN
-           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          (PortableServer::NON_RETAIN);
 
       // Create myPOA as the child of RootPOA with the above
       // policies_. myPOA will use SERVANT_ACTIVATOR or
@@ -211,9 +191,7 @@ Server_i::create_poa (const char *name,
       // being RETAIN or NONRETAIN respectively.
       my_poa = root_poa_->create_POA (name,
                                       poa_manager_.in (),
-                                      policies_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      policies_);
 
       // Destroy the policy objects as they have been passed to
       // create_POA and no longer needed.
@@ -222,17 +200,14 @@ Server_i::create_poa (const char *name,
            ++i)
         {
           CORBA::Policy_ptr policy = policies_[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:create_poa ()");
+      ex._tao_print_exception ("Server_i:create_poa ()");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return my_poa;
 }
@@ -242,8 +217,7 @@ Server_i::create_poa (const char *name,
 int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // An Servant Activator object is created which will activate
       // the servant on-demand.
@@ -253,8 +227,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 
       // Set ServantActivator_i object as the servant_manager of
       // firstPOA.
-      first_poa->set_servant_manager (servant_activator_impl_
-                                      ACE_ENV_ARG_PARAMETER);
+      first_poa->set_servant_manager (servant_activator_impl_);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
@@ -263,8 +236,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       //   servant_activator_impl_->_this ();
       //
       // first_poa->set_servant_manager (servant_activator.in (),
-      //                                 ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      //);
 
       // Create a reference with user created ID in firstPOA which
       // uses the ServantActivator. The servant dll name as well as
@@ -276,16 +248,13 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
                                                        "create_test_i");
 
       first_test_ = first_poa->create_reference_with_id (first_test_oid.in (),
-                                                        "IDL:test:1.0"
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                        "IDL:test:1.0");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:create_activator ()");
+      ex._tao_print_exception ("Server_i:create_activator ()");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -295,8 +264,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // An Servant Locator object is created which will activate
       // the servant on-demand.
@@ -306,8 +274,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 
       // Set ServantLocator_i object as the servant Manager of
       // secondPOA.
-      second_poa->set_servant_manager (servant_locator_impl_
-                                       ACE_ENV_ARG_PARAMETER);
+      second_poa->set_servant_manager (servant_locator_impl_);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
@@ -315,8 +282,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       //   servant_loator_impl_->_this ();
       //
       // second_poa->set_servant_manager (servant_locator_impl_,
-      //                                  ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      //);
 
       // Try to create a reference with user created ID in second_poa
       // which uses ServantLocator. The servant dll name as well as
@@ -328,16 +294,13 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
          "create_test_i");
       second_test_ = second_poa->create_reference_with_id
         (second_test_oid.in (),
-         "IDL:test:1.0"
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         "IDL:test:1.0");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:create_locator ()");
+      ex._tao_print_exception ("Server_i:create_locator ()");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -347,21 +310,16 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 int
 Server_i::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Invoke object_to_string on the references created in firstPOA
       // and secondPOA.
 
       CORBA::String_var first_test_ior =
-        orb_->object_to_string (first_test_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (first_test_.in ());
 
       CORBA::String_var second_test_ior =
-        orb_->object_to_string (second_test_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (second_test_.in ());
 
       // Print the ior's of first_test and second_test.
 
@@ -377,23 +335,18 @@ Server_i::run (void)
 
       // Set the poa_manager state to active, ready to process
       // requests.
-      poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager_->activate ();
 
-      ACE_TRY_CHECK;
 
       // Run the ORB.
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:run ()");
+      ex._tao_print_exception ("Server_i:run ()");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
index df22f01b0a9..d8d039f4f8c 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
@@ -31,16 +31,13 @@ ACE_RCSID (POA_BiDir,
            "$Id$")
 
 void
-print_poa (PortableServer::POA_ptr poa
-           ACE_ENV_ARG_DECL)
+print_poa (PortableServer::POA_ptr poa)
 {
   CORBA::String_var poa_name =
-    poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->the_name ();
 
   CORBA::OctetSeq_var poa_id =
-    poa->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "POA name = %s\n",
@@ -62,43 +59,34 @@ print_poa (PortableServer::POA_ptr poa
               "\n"));
 
   PortableServer::POAList_var children =
-    poa->the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->the_children ();
 
   for (CORBA::ULong index = 0;
        index != children->length ();
        ++index)
     {
-      print_poa (children[index]
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      print_poa (children[index]);
     }
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // The first step Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // _narrow() the Object to get the POA object, i.e., the root_poa.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Policies for the new POAs
       CORBA::PolicyList policies (2);
@@ -106,31 +94,25 @@ main (int argc, char **argv)
 
       // Threading policy
       policies[0] =
-        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL);
 
       // Lifespan policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::TRANSIENT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::TRANSIENT);
 
       // Creation of the firstPOA
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa =
         root_poa->create_POA (name.c_str (),
                               PortableServer::POAManager::_nil (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POA, i.e. firstPOA/secondPOA
       name = "secondPOA";
       PortableServer::POA_var second_poa =
         first_poa->create_POA (name.c_str (),
                                PortableServer::POAManager::_nil (),
-                               policies
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               policies);
 
       // Creation of the new POAs over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0;
@@ -138,8 +120,7 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       CORBA::Any pol;
@@ -149,9 +130,7 @@ main (int argc, char **argv)
 
       bidir_policy[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
 
       // Creating thirdPOA.
@@ -160,36 +139,29 @@ main (int argc, char **argv)
       PortableServer::POA_var third_poa =
         root_poa->create_POA (name.c_str (),
                               PortableServer::POAManager::_nil (),
-                              bidir_policy
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              bidir_policy);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong k = 0;
            k < bidir_policy.length ();
            ++k)
         {
-          bidir_policy[k]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          bidir_policy[k]->destroy ();
         }
 
       // Get the names of all the POAs and print them out.
 
       CORBA::String_var root_poa_name =
-        root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_name ();
 
       CORBA::String_var first_poa_name =
-        first_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->the_name ();
 
       CORBA::String_var second_poa_name =
-        second_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        second_poa->the_name ();
 
       CORBA::String_var third_poa_name =
-        third_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        third_poa->the_name ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n%s\n%s\n%s\n",
@@ -198,18 +170,14 @@ main (int argc, char **argv)
                   second_poa_name.in (),
                   third_poa_name.in ()));
 
-      print_poa (root_poa.in ()
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      print_poa (root_poa.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main ");
+      ex._tao_print_exception ("Exception caught in main ");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
index 5c3bcb3b2b0..10b7e85057f 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
@@ -107,16 +107,13 @@ write_iors_to_file (const char *ior)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -124,20 +121,15 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Create a servant.
       reference_counted_test_i *servant = 0;
@@ -147,17 +139,14 @@ main (int argc, char **argv)
                       -1);
 
       // Get Object Reference for the servant object.
-      test_var test = servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test = servant->_this ();
 
       // This means that the ownership of <servant> now belongs to
       // the POA.
-      servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      servant->_remove_ref ();
 
       // Stringyfy all the object references and print them out.
-      CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var ior = orb->object_to_string (test.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n",
@@ -167,19 +156,15 @@ main (int argc, char **argv)
       if (write_result != 0)
         return write_result;
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index 687f400c6bb..d80786263f2 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -24,50 +24,41 @@
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (RootPOA, 
-           RootPOA, 
+ACE_RCSID (RootPOA,
+           RootPOA,
            "$Id$")
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initilize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       // Resolve the initial references for the name RootPOA thus getting
       // an object of type CORBA::Object.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // apply _narrow on the object of type CORBA::Object, to make it
       // a POA class Object.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the name of the root POA.
       CORBA::String_var poa_name =
-        root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_name ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "The RootPOA is : %s\n",
                   poa_name.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised");
-      ACE_CHECK_RETURN (-1);
+      ex._tao_print_exception ("Exception raised");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp
index 9f29271ff6d..4c42701fc9d 100644
--- a/TAO/examples/POA/TIE/client.cpp
+++ b/TAO/examples/POA/TIE/client.cpp
@@ -110,28 +110,25 @@ class Test
 {
 public:
   static void run (CORBA::ORB_ptr orb,
-                   char *IOR
-                   ACE_ENV_ARG_DECL)
+                   char *IOR)
   {
     if (IOR != 0)
       {
         // Get an object reference from the argument string.
-        CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        CORBA::Object_var object = orb->string_to_object (IOR);
 
-        /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
+        /*if (.exception () != 0)
           {
-            ACE_ENV_ARG_PARAMETER.print_exception ("CORBA::ORB::string_to_object");
+.print_exception ("CORBA::ORB::string_to_object");
             return;
           }
         */
         // Try to narrow the object reference to a reference.
-        T_var test = T::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        T_var test = T::_narrow (object.in ());
 
-        /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
+        /*if (.exception () != 0)
           {
-            ACE_ENV_ARG_PARAMETER.print_exception ("_narrow");
+.print_exception ("_narrow");
             return;
           }
         */
@@ -146,8 +143,7 @@ public:
         for (i = 0; i < iterations ; i++)
           {
             // Invoke the doit() method on the reference.
-            result = test->doit (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+            result = test->doit ();
           }
 
         // stop the timer.
@@ -157,9 +153,9 @@ public:
         // compute average time.
         print_stats (elapsed_time, i);
 
-        /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
+        /*if (.exception () != 0)
           {
-            ACE_ENV_ARG_PARAMETER.print_exception ("doit");
+.print_exception ("doit");
             return;
           }
         */
@@ -174,12 +170,10 @@ public:
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
         // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -189,42 +183,28 @@ main (int argc, char **argv)
       int i = 1;
 
       Test<A, A_var>::run (orb.in (),
-                           IOR[i++]
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           IOR[i++]);
 
       Test<Outer::B, Outer::B_var>::run (orb.in (),
-                                         IOR[i++]
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         IOR[i++]);
 
       Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (),
-                                                       IOR[i++]
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                       IOR[i++]);
 
       Test<A, A_var>::run (orb.in (),
-                           IOR[i++]
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           IOR[i++]);
 
       Test<Outer::B, Outer::B_var>::run (orb.in (),
-                                         IOR[i++]
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         IOR[i++]);
 
       Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (),
-                                                       IOR[i++]
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                       IOR[i++]);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception Caught in main");
+      ex._tao_print_exception ("Exception Caught in main");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index 1c53b7ebb97..81064c725e1 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -24,36 +24,30 @@ ACE_RCSID(TIE, server, "$Id$")
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   char str[256];
 
-  ACE_TRY
+  try
     {
       ACE_OS::strcpy (str, "CORBA::ORB_init");
 
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       ACE_OS::strcpy (str, "PortableServer::POA::the_POAManager");
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
 
       // Policies for the firstPOA to be created.
@@ -63,14 +57,12 @@ main (int argc, char **argv)
       ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy");
       // Lifespan policy
       policies[0] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       ACE_OS::strcpy (str, "PortableServer::POA::create_implicit_activation_policy");
       // Implicit activation policy
       policies[1] =
-        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
       ACE_OS::strcpy (str, "PortableServer::POA::create_POA");
       // Create the firstPOA under the RootPOA.
@@ -78,9 +70,7 @@ main (int argc, char **argv)
       PortableServer::POA_var first_poa =
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
 
       ACE_OS::strcpy (str,"PortableServer::POA::create_POA");
@@ -91,8 +81,7 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       // Create A_i
@@ -121,59 +110,49 @@ main (int argc, char **argv)
 
       ACE_OS::strcpy (str, "POA_A::_this");
       // Get Object Reference for the a_impl object.
-      A_var a = a_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      A_var a = a_impl._this ();
 
 
       ACE_OS::strcpy (str, "POA_Outer::B::_this");
       // Get Object Reference for the b_impl object.
-      Outer::B_var b = b_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Outer::B_var b = b_impl._this ();
 
       ACE_OS::strcpy (str, "POA_Outer::Inner::C::_this");
       // Get Object Reference for the c_impl object.
-      Outer::Inner::C_var c = c_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Outer::Inner::C_var c = c_impl._this ();
 
 #if defined (ACE_HAS_USING_KEYWORD)
       ACE_OS::strcpy (str, "POA_A::_this");
       // Get Object Reference for the a_tie_impl object.
-      A_var a_tie = a_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      A_var a_tie = a_tie_impl._this ();
 
       ACE_OS::strcpy (str, "POA_Outer::B::_this");
       // Get Object Reference for the a_tie_impl object.
-      Outer::B_var b_tie = b_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Outer::B_var b_tie = b_tie_impl._this ();
 
       ACE_OS::strcpy (str, "POA_Outer::C::_this");
       // Get Object Reference for the c_tie_impl object.
-      Outer::Inner::C_var c_tie = c_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Outer::Inner::C_var c_tie = c_tie_impl._this ();
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
       ACE_OS::strcpy (str, "CORBA::ORB::object_to_string");
       // Stringyfy all the object references and print them out.
       CORBA::String_var first_ior =
-        orb->object_to_string (a.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (a.in ());
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var second_ior =
-        orb->object_to_string (b.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (b.in ());
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var third_ior =
-        orb->object_to_string (c.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (c.in ());
 
 #if defined (ACE_HAS_USING_KEYWORD)
       // Stringyfy all the object references and print them out.
       CORBA::String_var forth_ior =
-        orb->object_to_string (a_tie.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (a_tie.in ());
 
       FILE *output_file_1 = ACE_OS::fopen ("ior_1", "w");
       FILE *output_file_2 = ACE_OS::fopen ("ior_2", "w");
@@ -205,14 +184,12 @@ main (int argc, char **argv)
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var fifth_ior =
-        orb->object_to_string (b_tie.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (b_tie.in ());
 
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var sixth_ior =
-        orb->object_to_string (c_tie.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (c_tie.in ());
 
       FILE *output_file_5 = ACE_OS::fopen ("ior_5", "w");
       FILE *output_file_6 = ACE_OS::fopen ("ior_6", "w");
@@ -231,19 +208,15 @@ main (int argc, char **argv)
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      ex._tao_print_exception (str);
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/TIE/test_i.cpp b/TAO/examples/POA/TIE/test_i.cpp
index 1fd4ecbb3ef..bc557892f28 100644
--- a/TAO/examples/POA/TIE/test_i.cpp
+++ b/TAO/examples/POA/TIE/test_i.cpp
@@ -31,7 +31,7 @@ Tie_i::~Tie_i (void)
 
 // Return this->value
 CORBA::Long
-Tie_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Tie_i::doit (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
@@ -47,7 +47,7 @@ A_i::A_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-A_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+A_i::doit (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
@@ -55,7 +55,7 @@ A_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-A_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+A_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -70,7 +70,7 @@ Outer_i::B_i::B_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-Outer_i::B_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Outer_i::B_i::doit (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
@@ -78,7 +78,7 @@ Outer_i::B_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-Outer_i::B_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Outer_i::B_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -93,7 +93,7 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-Outer_i::Inner_i::C_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Outer_i::Inner_i::C_i::doit (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
@@ -101,7 +101,7 @@ Outer_i::Inner_i::C_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-Outer_i::Inner_i::C_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Outer_i::Inner_i::C_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/POA/TIE/test_i.h b/TAO/examples/POA/TIE/test_i.h
index 0f211e53d6a..b2a456bc0bf 100644
--- a/TAO/examples/POA/TIE/test_i.h
+++ b/TAO/examples/POA/TIE/test_i.h
@@ -27,7 +27,7 @@ public:
   virtual ~Tie_i (void);
 
   // Simple doit method
-  virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long doit (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -43,11 +43,11 @@ public:
        PortableServer::POA_ptr poa);
 
   // Simple doit method
-  virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long doit (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 protected:
 
@@ -69,11 +69,11 @@ public:
          PortableServer::POA_ptr poa);
 
     // Simple doit method
-    virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
+    virtual CORBA::Long doit (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Returns the Default POA of this Servant object
-    virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+    virtual PortableServer::POA_ptr _default_POA (void);
 
   protected:
 
@@ -95,11 +95,11 @@ public:
            PortableServer::POA_ptr poa);
 
       // Simple doit method
-      virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Long doit (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       // Returns the Default POA of this Servant object
-      virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+      virtual PortableServer::POA_ptr _default_POA (void);
 
     protected:
 
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index ab94a8760c1..2c46ec286e2 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -67,16 +67,13 @@ Grid_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Make the Grid.
 
       Grid_ptr grid = client->make_grid (width_,
-                                         height_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         height_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Made the grid succesfully\n"));
@@ -90,9 +87,7 @@ Grid_Client_i::run (const char *name,
               // Set a value on the grid
               grid->set (index_,
                          ctr,
-                         (value_ + ctr)
-                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                         (value_ + ctr));
 
             }
         }
@@ -100,28 +95,22 @@ Grid_Client_i::run (const char *name,
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Setting a value for the grid\n"));
 
-      ACE_TRY_CHECK;
 
       if (client.shutdown () == 1) {
-        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        client->shutdown ();
       }
 
     }
-  ACE_CATCH (CORBA::UserException, range_ex)
+  catch (const CORBA::UserException& range_ex)
     {
-      ACE_PRINT_EXCEPTION (range_ex,
-                           "\tFrom get and set grid");
+      range_ex._tao_print_exception ("\tFrom get and set grid");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, memex)
+  catch (const CORBA::SystemException& memex)
     {
-      ACE_PRINT_EXCEPTION (memex,
-                           "Cannot make grid as Memory exhausted");
+      memex._tao_print_exception ("Cannot make grid as Memory exhausted");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index fcec899cc6e..05197509721 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -60,8 +60,7 @@ Grid_i::~Grid_i (void)
 void
 Grid_i::set (CORBA::Short x,
              CORBA::Short y,
-             CORBA::Long value
-             ACE_ENV_ARG_DECL)
+             CORBA::Long value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -69,7 +68,7 @@ Grid_i::set (CORBA::Short x,
       || y < 0
       || x >= width_
       || y >= height_)
-    ACE_THROW (Grid::RANGE_ERROR ());
+    throw Grid::RANGE_ERROR ();
   else
     array_[x][y] = value;
 }
@@ -78,8 +77,7 @@ Grid_i::set (CORBA::Short x,
 
 CORBA::Long
 Grid_i::get (CORBA::Short x,
-             CORBA::Short y
-             ACE_ENV_ARG_DECL)
+             CORBA::Short y)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -95,30 +93,28 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::width (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::height (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
 }
 
 void
-Grid_i::width (CORBA::Short x
-               ACE_ENV_ARG_DECL_NOT_USED)
+Grid_i::width (CORBA::Short x)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
 }
 
 void
-Grid_i::height (CORBA::Short y
-                ACE_ENV_ARG_DECL_NOT_USED)
+Grid_i::height (CORBA::Short y)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
@@ -126,7 +122,7 @@ Grid_i::height (CORBA::Short y
 
 // Destroy the grid
 void
-Grid_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+Grid_i::destroy ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
@@ -168,8 +164,7 @@ Grid_Factory_i::~Grid_Factory_i (void)
 
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
-                           CORBA::Short height
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Short height)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -204,7 +199,7 @@ Grid_Factory_i::make_grid (CORBA::Short width,
   grid_ptr->set_pool (pool_t_);
 
   // Register the Grid pointer.
-  return grid_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return grid_ptr->_this ();
 }
 
 // Set the ORB pointer.
@@ -217,7 +212,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 // Shutdown.
 void
-Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_Factory_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -229,7 +224,7 @@ Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Grid_Factory_i::cleanup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_Factory_i::cleanup (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *name = "Array";
diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h
index 9545672721b..c6d665d01a6 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_i.h
@@ -42,16 +42,15 @@ public:
   // Destructor.
 
   virtual Grid_ptr make_grid (CORBA::Short,
-                              CORBA::Short
-                              ACE_ENV_ARG_DECL)
+                              CORBA::Short)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
-  virtual void cleanup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+  virtual void cleanup ( )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Do a clean up of the memory map
 
@@ -98,40 +97,36 @@ public:
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short width (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the width of the grid
 
-  virtual CORBA::Short height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short height (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the height of the grid
 
-  virtual void width (CORBA::Short
-                      ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void width (CORBA::Short)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the width of the grid.
 
-  virtual void height (CORBA::Short
-                       ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void height (CORBA::Short)
      ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the height of the grid.
 
   virtual void set (CORBA::Short,
                     CORBA::Short,
-                    CORBA::Long
-                    ACE_ENV_ARG_DECL_NOT_USED)
+                    CORBA::Long)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Sets the grid value.
 
   virtual CORBA::Long get (CORBA::Short,
-                           CORBA::Short
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           CORBA::Short)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Gets the grid value.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the grid.
 
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
index b3b5b0dfd7e..f9b45d2e01a 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
@@ -58,15 +58,12 @@ Persistent_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Make the Grid.
       Grid_ptr grid = client->make_grid (width_,
-                                         height_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         height_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Made the grid succesfully\n"));
@@ -77,9 +74,7 @@ Persistent_Client_i::run (const char *name,
           for (CORBA::Short ctr = 0; ctr < width_; ctr++)
             {
               CORBA::Long ret_val = grid->get (index_,
-                                               ctr
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                               ctr);
 
               ACE_DEBUG ((LM_DEBUG,
                           "Grid value [%d][%d] =  %d \n",index_, ctr,ret_val));
@@ -87,29 +82,23 @@ Persistent_Client_i::run (const char *name,
         }
 
       if (client.shutdown () == 1) {
-        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        client->shutdown ();
       }
 
       if (this->remove_ == 1) {
-        client->cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        client->cleanup ();
       }
     }
-  ACE_CATCH (CORBA::UserException, range_ex)
+  catch (const CORBA::UserException& range_ex)
     {
-      ACE_PRINT_EXCEPTION (range_ex,
-                           "\tFrom get and set grid");
+      range_ex._tao_print_exception ("\tFrom get and set grid");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, memex)
+  catch (const CORBA::SystemException& memex)
     {
-      ACE_PRINT_EXCEPTION (memex,
-                           "Cannot make grid as Memory exhausted");
+      memex._tao_print_exception ("Cannot make grid as Memory exhausted");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index b69f2e4f6f8..fa72a968eb8 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -72,21 +72,18 @@ Server<Servant>::parse_args (void)
 template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
-                       char *argv[]
-                       ACE_ENV_ARG_DECL)
+                       char *argv[])
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
 
-  ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
   this->argv_ = argv;
@@ -108,13 +105,11 @@ Server<Servant>::init (const char *servant_name,
 
   // Make sure that you check for failures here via the ACE_TRY
   // macros?!
-  ACE_TRY
+  try
     {
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
-                                                     &this->servant_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                     &this->servant_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
@@ -129,24 +124,20 @@ Server<Servant>::init (const char *servant_name,
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "\tException in activation of POA");
+      ex._tao_print_exception ("\tException in activation of POA");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 template <class Servant> int
-Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
+Server<Servant>::run (void)
 {
     // Run the main event loop for the ORB.
-  int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int ret = this->orb_manager_.run ();
 
   if (ret == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -249,16 +240,13 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -267,8 +255,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->string_to_object (this->ior_);
 
 
           if (CORBA::is_nil (server_object.in ()))
@@ -276,9 +263,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
                                "invalid ior <%s>\n",
                                this->ior_),
                               -1);
-          this->server_ = InterfaceObj::_narrow (server_object.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_ = InterfaceObj::_narrow (server_object.in ());
         }
       else
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -287,12 +272,11 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init");
+      ex._tao_print_exception ("Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index c5bcc8fa47a..6b2cdf92d33 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -46,8 +46,7 @@ public:
 
   int init (const char *servant_name,
             int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -55,7 +54,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
  protected:
@@ -120,7 +119,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int obtain_initial_references (void);
   // Initialize naming service
 
 protected:
diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp
index 99f007eae7f..e0ce288d564 100644
--- a/TAO/examples/Persistent_Grid/server.cpp
+++ b/TAO/examples/Persistent_Grid/server.cpp
@@ -13,32 +13,28 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tGrid server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (server.init ("Grid",
                        argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
index 882b5078c5d..854e25be0dd 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
@@ -39,9 +39,8 @@ UDP_Client_i::svc (void)
   client_name += "_";
   client_name += pid;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::String_var corba_client_name =
         CORBA::string_dup (client_name.c_str ());
@@ -52,9 +51,7 @@ UDP_Client_i::svc (void)
         {
           udp_->invoke (corba_client_name.in (),
                         udpHandler_.inout (),
-                        i
-                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                        i);
 
           ACE_DEBUG ((LM_DEBUG,
                       "invoked %s %d, going to wait %d ms\n",
@@ -66,8 +63,7 @@ UDP_Client_i::svc (void)
         }
 
       // shut down remote ORB
-      udp_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      udp_->shutdown ();
 
       ACE_Time_Value tv (0, 500); // 50ms
       ACE_OS::sleep (tv);  // let the previous request go through
@@ -77,12 +73,11 @@ UDP_Client_i::svc (void)
       orb_->shutdown ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\tException");
+      ex._tao_print_exception ("\tException");
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
index f1a611b447d..034a06c97d5 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
@@ -29,11 +29,10 @@ UDP_i::orb (CORBA::ORB_ptr o)
 void
 UDP_i::invoke (const char * client_name,
                UDP_ptr udpHandler,
-               CORBA::Long request_id
-               ACE_ENV_ARG_DECL)
+               CORBA::Long request_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "UDP_i::invoke: name = %s request id = %d\n",
@@ -61,24 +60,21 @@ UDP_i::invoke (const char * client_name,
         {
           udpHandler->invoke (client_name,
                               UDP::_nil (),
-                              request_id
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                              request_id);
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
        ACE_DEBUG ((LM_DEBUG,
                    "UDP_i::svc: Received exception\n"));
     }
-  ACE_ENDTRY;
 }
 
 // Shutdown.
 
 void
-UDP_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+UDP_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
index a58b21721cc..a2c81560b23 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
@@ -46,11 +46,10 @@ public:
 
   virtual void invoke (const char *client_name,
                        UDP_ptr udpHandler,
-                       CORBA::Long request_id
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                       CORBA::Long request_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown the server.
diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
index f7db9081cbd..e4cca3fefb7 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
@@ -76,22 +76,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       UDP_var udp_var =
-        UDP::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        UDP::_narrow (object.in ());
 
       if (CORBA::is_nil (udp_var.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -102,8 +99,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -111,15 +107,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Instantiate reply handler
       UDP_i udp_i;
@@ -128,8 +121,7 @@ main (int argc, char *argv[])
       udp_i.orb (orb.in ());
 
       UDP_var udpHandler_var =
-        udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        udp_i._this ();
 
       // Instantiate client
       UDP_Client_i *client = new UDP_Client_i (orb.in (),
@@ -143,18 +135,15 @@ main (int argc, char *argv[])
 
       // ORB loop, will be shut down by our client thread
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       client->wait ();
       // it is save to delete the client, because the client was actually
@@ -162,13 +151,11 @@ main (int argc, char *argv[])
       // event loop.
       delete client;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
index ba54736c4d4..6cb03a3d652 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
@@ -62,15 +62,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,39 +76,29 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Install a persistent POA in order to achieve a persistent IOR
       // for our object.
       CORBA::PolicyList policies;
       policies.length (2);
       policies[0] =
-        root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy(PortableServer::PERSISTENT);
       policies[1] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
-                             policies
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             policies);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
-      policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[1]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -123,27 +111,21 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("UDP_Object");
 
       persistent_poa->activate_object_with_id (id.in (),
-                                               &udp_i
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               &udp_i);
 
       CORBA::Object_var obj =
-        persistent_poa->id_to_reference (id.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        persistent_poa->id_to_reference (id.in ());
 
 
-      UDP_var udp_var = UDP::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+      UDP_var udp_var = UDP::_narrow (obj.in ());
 
-      // UDP_var udp_var = udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // UDP_var udp_var = udp_i._this ();
       if (CORBA::is_nil (udp_var.in ()))
         ACE_DEBUG ((LM_DEBUG,
                     "Failed to narrow correct object reference.\n"));
 
       CORBA::String_var ior =
-        orb->object_to_string (udp_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (udp_var.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -160,8 +142,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       /*
       // Instantiate reply handler
@@ -170,8 +151,7 @@ main (int argc, char *argv[])
       udpHandler_i.orb (orb.in ());
 
       UDP_var udpHandler_var =
-        udpHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        udpHandler_i._this ();
 
       // Instantiate client
       UDP_Client_i* client = new UDP_Client_i (orb,
@@ -181,28 +161,23 @@ main (int argc, char *argv[])
       client->activate ();
       */
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       //delete client;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
index 77db4ccca0e..061863b7548 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
@@ -45,17 +45,14 @@ UDP_PerformanceClient::svc ()
   ACE_UINT32 micro_seconds = 0;
   ACE_UINT32 delta_micro_seconds = 1;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::String_var corba_client_name =
         CORBA::string_dup (client_name.c_str ());
 
-      UDP_var udpHandler_var = udpHandler_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      UDP_var udpHandler_var = udpHandler_->_this ();
 
-      udp_->setResponseHandler (udpHandler_var.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      udp_->setResponseHandler (udpHandler_var.in ());
 
       ACE_High_Res_Timer timer;
       while (1)
@@ -72,10 +69,8 @@ UDP_PerformanceClient::svc ()
                j++)
             {
               udp_->invoke (corba_client_name.in (),
-                            j
-                            ACE_ENV_ARG_PARAMETER);
+                            j);
 
-              ACE_TRY_CHECK;
 
               if (micro_seconds)
                 {
@@ -94,9 +89,7 @@ UDP_PerformanceClient::svc ()
             udpHandler_->getMessagesCount ();
 
           // Reset expected request ID
-          udp_->reset (corba_client_name.in ()
-                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          udp_->reset (corba_client_name.in ());
 
           // Give the reset a chance to propagate back to us
           ACE_OS::sleep (tv);
@@ -157,23 +150,20 @@ UDP_PerformanceClient::svc ()
         }
 
       // shut down remote ORB
-      udp_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      udp_->shutdown ();
 
       ACE_Time_Value tv (0, 50); // 50ms
       ACE_OS::sleep (tv);  // let the previous request go through
 
       // Shut down local ORB, trigger the end of the ORB event loop
             // in the main thread.
-      orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\tException");
+      ex._tao_print_exception ("\tException");
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
index e7e0180fbd1..6061703700d 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
@@ -29,8 +29,7 @@ UDP_i::orb (CORBA::ORB_ptr orb)
 
 
 void
-UDP_i::setResponseHandler (UDP_ptr udpHandler
-                           ACE_ENV_ARG_DECL_NOT_USED)
+UDP_i::setResponseHandler (UDP_ptr udpHandler)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (udpHandler))
@@ -42,11 +41,10 @@ UDP_i::setResponseHandler (UDP_ptr udpHandler
 
 void
 UDP_i::invoke (const char * client_name,
-               CORBA::Long request_id
-               ACE_ENV_ARG_DECL)
+               CORBA::Long request_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "UDP_i::invoke: name = %s request id = %d\n",
@@ -79,27 +77,23 @@ UDP_i::invoke (const char * client_name,
       if (!CORBA::is_nil (responseHandler_.in ()))
         {
           responseHandler_->invoke (client_name,
-                                    request_id
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                    request_id);
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
        ACE_DEBUG ((LM_DEBUG,
                    "UDP_i::invoke: Received exception\n"));
     }
-  ACE_ENDTRY;
 }
 
 
 void
-UDP_i::reset (const char * client_name
-              ACE_ENV_ARG_DECL)
+UDP_i::reset (const char * client_name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       // ACE_DEBUG ((LM_DEBUG,
       //            "UDP_i::reset: invoked\n"));
@@ -108,41 +102,35 @@ UDP_i::reset (const char * client_name
                                 0);
       if (!CORBA::is_nil (responseHandler_.in ()))
         {
-          responseHandler_->reset (client_name
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          responseHandler_->reset (client_name);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
        ACE_DEBUG ((LM_DEBUG,
                    "UDP_i::reset: Received exception\n"));
     }
-  ACE_ENDTRY;
 }
 
 // Shutdown.
 
 void
-UDP_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+UDP_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
               "UDP_i is shutting down"));
 
-  ACE_TRY
+  try
     {
       // Instruct the ORB to shutdown.
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception: orb->run");
+      ex._tao_print_exception ("Caught exception: orb->run");
     }
-  ACE_ENDTRY;
 }
 
 
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
index 92110a910b9..a1c42bfc64d 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
@@ -39,21 +39,18 @@ public:
   ~UDP_i (void);
   // Destructor
 
-  virtual void setResponseHandler (UDP_ptr udpHandler
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void setResponseHandler (UDP_ptr udpHandler)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void invoke (const char *client_name,
-                       CORBA::Long request_id
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                       CORBA::Long request_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void reset (const char * client_name
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void reset (const char * client_name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown the server.
diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
index 07bb98914ee..28133bb7679 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
@@ -75,22 +75,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "PerformanceClient" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "PerformanceClient");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       UDP_var udp_var =
-        UDP::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        UDP::_narrow (object.in ());
 
       if (CORBA::is_nil (udp_var.in ()))
         {
@@ -103,8 +100,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -112,15 +108,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Instantiate reply handler
       UDP_i udp_i;
@@ -129,8 +122,7 @@ main (int argc, char *argv[])
       udp_i.orb (orb.in ());
 
       UDP_var udpHandler_var =
-        udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        udp_i._this ();
 
       // Instantiate client
       ACE_Task_Base* client = new UDP_PerformanceClient (orb.in (),
@@ -143,18 +135,15 @@ main (int argc, char *argv[])
       client->activate ();
 
       // ORB loop, will be shut down by our client thread
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);  // Fetch responses
-      ACE_TRY_CHECK;
+      orb->run ();  // Fetch responses
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
 
       root_poa->destroy (1, // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
-            orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+            orb->destroy ();
 
       // it is save to delete the client, because the client was actually
       // the one calling orb->shutdown () triggering the end of the ORB
@@ -162,13 +151,11 @@ main (int argc, char *argv[])
       delete client;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
index 0a003a08589..7c1740a3837 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
@@ -64,32 +64,27 @@ static ACE_THR_FUNC_RETURN svc (void *arg)
 {
   CORBA::ORB_ptr orb = (CORBA::ORB_ptr)arg;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception: orb->run");
+      ex._tao_print_exception ("Caught exception: orb->run");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "PerformanceServer" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "PerformanceServer");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -97,12 +92,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Install a persistent POA in order to achieve a persistent IOR
       // for our object.
@@ -110,27 +103,19 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;
       policies.length (2);
       policies[0] =
-        root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy(PortableServer::PERSISTENT);
 
       policies[1] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
-                             policies
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             policies);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
-      policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[1]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -143,26 +128,20 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("UDP_Object");
 
       persistent_poa->activate_object_with_id (id.in (),
-                                               &udp_i
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               &udp_i);
 
       CORBA::Object_var obj =
-        persistent_poa->id_to_reference (id.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        persistent_poa->id_to_reference (id.in ());
 
 
-      UDP_var udp_var = UDP::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      UDP_var udp_var = UDP::_narrow (obj.in ());
 
       if (CORBA::is_nil (udp_var.in ()))
         ACE_DEBUG ((LM_DEBUG,
                     "Failed to narrow correct object reference.\n"));
 
       CORBA::String_var ior =
-        orb->object_to_string (udp_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (udp_var.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -179,36 +158,30 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (orb_threads > 1)
         ACE_Thread_Manager::instance ()->spawn_n (orb_threads-1,
                                                   svc,
                                                   orb.in ());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
 
       root_poa->destroy (1, // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
-            orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+            orb->destroy ();
 
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index 8c5b4c7bd21..2e2aa70b5c8 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -63,22 +63,18 @@ private:
 //int testClient (char* orbName, char* iorFile)
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
           CORBA::ORB_init (argc,
                            argv,
-                           "ORB_Test_Client"
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           "ORB_Test_Client");
 
       CORBA::Object_var object =
-        orb->string_to_object (iorFile ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (iorFile);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -89,9 +85,7 @@ int main (int argc, char *argv[])
         }
 
       CORBA::String_var string =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Client: orb->object_to_string:\n%s\n",
@@ -103,16 +97,13 @@ int main (int argc, char *argv[])
 
       //ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -131,7 +122,7 @@ Client::Client (Simple_Server_ptr server,
 int
 Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Octet_Seq octetSeq(SIZE_BLOCK);
       Char_Seq charSeq(SIZE_BLOCK);
@@ -143,8 +134,7 @@ Client::svc (void)
 
       // This sets up the connector, so that we do not incur
       // the overhead on the first call in the loop.
-      server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_->sendCharSeq (charSeq);
 
       timer.start ();
 
@@ -153,10 +143,9 @@ Client::svc (void)
         {
           client_count++;
 
-          server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server_->sendCharSeq (charSeq);
 
-          //server_->sendOctetSeq (octetSeq ACE_ENV_ARG_PARAMETER);
+          //server_->sendOctetSeq (octetSeq);
 
           //ACE_DEBUG ((LM_DEBUG, "."));
         }
@@ -182,16 +171,13 @@ Client::svc (void)
                     1000000 / (dur / this->niterations_)));
       }
 
-      server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_->shutdown ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
+      ex._tao_print_exception ("MT_Client: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
index acc84689614..cfb201d74ca 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
@@ -35,17 +35,15 @@ const char *ior_output_file = "test.ior";
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "ORB_Test_Server" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "ORB_Test_Server");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,27 +51,21 @@ int main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Simple_Server_i server_impl (orb.in ());
 
-      PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl);
 
-      CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in ());
 
-      Simple_Server_var server = Simple_Server::_narrow (objOne.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Simple_Server_var server = Simple_Server::_narrow (objOne.in ());
 
       CORBA::String_var ior =
-              orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+              orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -90,27 +82,21 @@ int main (int argc, char *argv[])
                 ACE_OS::fclose (output_file);
               }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
index e9ad3018cc1..85160bbc5e5 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
@@ -10,7 +10,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Server_i::sendCharSeq (const Char_Seq & ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::sendCharSeq (const Char_Seq &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple_Server_count++;
@@ -18,7 +18,7 @@ Simple_Server_i::sendCharSeq (const Char_Seq & ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::sendOctetSeq (const Octet_Seq & ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::sendOctetSeq (const Octet_Seq &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple_Server_count++;
@@ -26,8 +26,7 @@ Simple_Server_i::sendOctetSeq (const Octet_Seq & ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 CORBA::Long
-Simple_Server_i::get_number (CORBA::Long
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::get_number (CORBA::Long)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long tmp = Simple_Server_count;
@@ -36,20 +35,17 @@ Simple_Server_i::get_number (CORBA::Long
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Simple_Server_i::shutdown\n"));
-  ACE_TRY
+  try
     {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
index 27dccfeb62d..6eced0ebb9b 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
@@ -31,16 +31,16 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void sendCharSeq (const Char_Seq & charSeq ACE_ENV_ARG_DECL_NOT_USED)
+  void sendCharSeq (const Char_Seq & charSeq)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void sendOctetSeq (const Octet_Seq & octetSeq ACE_ENV_ARG_DECL_NOT_USED)
+  void sendOctetSeq (const Octet_Seq & octetSeq)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long get_number (CORBA::Long num ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long get_number (CORBA::Long num)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index f8b7c4a070e..0b22ea6e067 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -28,7 +28,7 @@ Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server (void)
 
 Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Unbind the Quoter Factory Finder.
       CosNaming::Name factory_Finder_Name (2);
@@ -36,31 +36,26 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
       factory_Finder_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_Finder_Name[1].id = CORBA::string_dup ("Quoter_Factory_Finder");
       if (!CORBA::is_nil (this->quoterNamingContext_var_.in ()))
-        this->quoterNamingContext_var_->unbind (factory_Finder_Name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->quoterNamingContext_var_->unbind (factory_Finder_Name);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "Could not unbind the Factor Finder from the Name Service\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "~Quoter_Factor_Finder_Server");
+      ex._tao_print_exception ("~Quoter_Factor_Finder_Server");
     }
-  ACE_ENDTRY;
 }
 
 int
 Quoter_Factory_Finder_Server::init (int argc,
-                                    char *argv[]
-                                    ACE_ENV_ARG_DECL)
+                                    char *argv[])
 {
   const char *exception_message = "Null Message";
 
-  ACE_TRY
+  try
     {
       exception_message = "While ORB_Manager::init";
       int initvalue = this->orb_manager_.init (argc,
-                                               argv
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               argv);
 
       if (initvalue == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -70,8 +65,7 @@ Quoter_Factory_Finder_Server::init (int argc,
 
       // Activate the POA manager
       exception_message = "While activating the POA manager";
-      int result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int result = this->orb_manager_.activate_poa_manager ();
 
       if (result == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "activate_poa_manager"), -1);
@@ -90,9 +84,7 @@ Quoter_Factory_Finder_Server::init (int argc,
       // Activate the object.
       exception_message = "Failure while activating the Quoter Factory Finder Impl";
       CORBA::String_var str  =
-        this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_);
 
       // Print the IOR.
       if (this->debug_level_ >= 2)
@@ -105,8 +97,7 @@ Quoter_Factory_Finder_Server::init (int argc,
       // Get the Naming Service object reference.
       exception_message = "While resolving the Name Service";
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_manager_.orb()->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (namingObj_var.in ()))
         ACE_ERROR ((LM_ERROR,
@@ -115,9 +106,7 @@ Quoter_Factory_Finder_Server::init (int argc,
       // Narrow the object reference to a Naming Context.
       exception_message = "While narrowing the Naming Context";
       CosNaming::NamingContext_var namingContext_var =
-        CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (namingObj_var.in ());
 
       // Get the IDL_Quoter naming context.
       CosNaming::Name quoterContextName (1);  // max = 1
@@ -126,14 +115,11 @@ Quoter_Factory_Finder_Server::init (int argc,
 
       exception_message = "While resolving the Quoter Naming Context";
       CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        namingContext_var->resolve (quoterContextName);
 
       exception_message = "While narrowing the Quoter Naming Context";
       quoterNamingContext_var_ =
-        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ());
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
@@ -146,39 +132,34 @@ Quoter_Factory_Finder_Server::init (int argc,
       quoter_Factory_Finder_Name_[0].id = CORBA::string_dup ("Quoter_Factory_Finder");
 
       exception_message = "Factory_Factory::_this";
-      CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this();
 
       exception_message = "While binding the Factory Finder";
       quoterNamingContext_var_->bind (quoter_Factory_Finder_Name_,
-                                      ff_obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      ff_obj.in ());
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
                     "Factory_Finder: Bound the Quoter Factory Finder to the Quoter Naming Context.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Factor_Finder_Server::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 int
-Quoter_Factory_Finder_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Quoter_Factory_Finder_Server::run (void)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Factory_Finder_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb_manager_.orb()->run ();
 
   return 0;
 }
@@ -224,29 +205,26 @@ main (int argc, char *argv [])
 {
   Quoter_Factory_Finder_Server quoter_Factory_Finder_Server;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      int result = quoter_Factory_Finder_Server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int result = quoter_Factory_Finder_Server.init (argc, argv);
 
       if (result == -1)
         return 1;
       else
         {
-          quoter_Factory_Finder_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          quoter_Factory_Finder_Server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index 2bed421dc17..10a8af781c0 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -37,10 +37,10 @@ public:
   ~Quoter_Factory_Finder_Server (void);
   // Destructor
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb
 
   u_int parse_args (void);
diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index db7d0eec12f..760a754b968 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -40,8 +40,7 @@ Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void)
 
 
 CosLifeCycle::Factories *
-Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
-                                         ACE_ENV_ARG_DECL)
+Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory))
 {
@@ -49,7 +48,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
 
   CosLifeCycle::Factories *factories_ptr = 0;
 
-  ACE_TRY
+  try
   {
     // Get a reference to the ORB.
     CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance ()->orb ();
@@ -57,8 +56,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
     // Get the Naming Service object reference.
     exception_message = "While resolving the Name Service";
     CORBA::Object_var namingObj_var =
-      orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb_ptr->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil (namingObj_var.in ()))
       ACE_ERROR ((LM_ERROR,
@@ -67,9 +65,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
     // Narrow the object reference to a Naming Context.
     exception_message = "While narrowing the Naming Context";
     CosNaming::NamingContext_var namingContext_var =
-      CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      CosNaming::NamingContext::_narrow (namingObj_var.in ());
 
     // Take the key supplied to search for a Quoter Factory
     CosNaming::Name factoryName = (CosNaming::Name) factory_key;
@@ -77,8 +73,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
     // Try to get a reference to a Quoter Factory
     exception_message = "While resolving the Factory Object";
     CORBA::Object_var quoterFactoryObject_var =
-      namingContext_var->resolve (factoryName ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      namingContext_var->resolve (factoryName);
 
     // Check if it is a valid Quoter Factory reference
     if (CORBA::is_nil (quoterFactoryObject_var.in()))
@@ -101,12 +96,11 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
       ACE_DEBUG ((LM_DEBUG,
                   "Factory Finder: Have reference to a Quoter Factory.\n"));
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Factory_Finder::find_factories - %s\n", exception_message));
       ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
     }
-  ACE_ENDTRY;
 
   return factories_ptr;
 }
diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h
index 97695c7c9b2..0a3945c5d55 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.h
+++ b/TAO/examples/Quoter/Factory_Finder_i.h
@@ -28,8 +28,7 @@ public:
   Quoter_Factory_Finder_i (int debug_level = 1);
   ~Quoter_Factory_Finder_i (void);
 
-  virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key
-                                                    ACE_ENV_ARG_DECL)
+  virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory));
   // Returns a sequence of Factories if factories matching the
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index eb1bfe506ab..4e9b26a0269 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -29,7 +29,7 @@ Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server (void)
 
 Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Unbind the Quoter Factory Finder.
       CosNaming::Name generic_Factory_Name (2);
@@ -37,42 +37,37 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
       generic_Factory_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       generic_Factory_Name[1].id = CORBA::string_dup ("Quoter_Generic_Factory");
       if (!CORBA::is_nil (this->quoterNamingContext_var_.in ()))
-        this->quoterNamingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->quoterNamingContext_var_->unbind (generic_Factory_Name);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
     }
-  ACE_ENDTRY;
 }
 
 int
 Quoter_Generic_Factory_Server::init (int argc,
-                                     char *argv[]
-                                     ACE_ENV_ARG_DECL)
+                                     char *argv[])
 {
   const char *exception_message = "Null Message";
 
-  ACE_TRY
+  try
     {
       int result = 0;
       // Initialize the ORB Manager
       exception_message = "While initing the orb_manager";
-      result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->orb_manager_.init (argc, argv);
 
       if (result == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), -1);
 
       // Activate the POA manager
       exception_message = "While activating the POA manager";
-      result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->orb_manager_.activate_poa_manager ();
 
       if (result == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "activate_poa_manager"), -1);
@@ -89,9 +84,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       // Activate the object.
       exception_message = "While activating the Generic Factory";
       CORBA::String_var str  =
-        this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_);
 
       // Print the IOR.
       if (this->debug_level_ >= 2)
@@ -105,8 +98,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       // Get the Naming Service object reference.
       exception_message = "While getting the Naming Service Reference";
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_manager_.orb()->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (namingObj_var.in ()))
         ACE_ERROR ((LM_ERROR,
@@ -115,9 +107,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       // Narrow the object reference to a Naming Context.
       exception_message = "While narrowing the Naming Context";
       CosNaming::NamingContext_var namingContext_var =
-        CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (namingObj_var.in ());
 
       if (CORBA::is_nil (namingContext_var.in ()))
         ACE_ERROR ((LM_ERROR,
@@ -135,15 +125,11 @@ Quoter_Generic_Factory_Server::init (int argc,
 
       exception_message = "While resolving the Quoter";
       CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        namingContext_var->resolve (quoterContextName);
 
       exception_message = "While narrowing the Quoter";
       quoterNamingContext_var_ =
-        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ());
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
@@ -156,14 +142,11 @@ Quoter_Generic_Factory_Server::init (int argc,
       quoter_Generic_Factory_Name[0].id = CORBA::string_dup ("Quoter_Generic_Factory");
 
       exception_message = "Generic_Factory::_this";
-      CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this();
 
       exception_message = "While binding the Generic Factory";
       quoterNamingContext_var_->bind (quoter_Generic_Factory_Name,
-                                      gf_obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      gf_obj.in ());
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
@@ -182,30 +165,23 @@ Quoter_Generic_Factory_Server::init (int argc,
 
         exception_message = "While resolving the Life Cycle Service";
         CORBA::Object_var life_Cycle_Service_Obj_var =
-          namingContext_var->resolve (life_Cycle_Service_Name
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          namingContext_var->resolve (life_Cycle_Service_Name);
 
         exception_message = "While narrowing the Life Cycle Service";
         LifeCycleService::Life_Cycle_Service_var  life_Cycle_Service_var =
-          LifeCycleService::Life_Cycle_Service::_narrow (life_Cycle_Service_Obj_var.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          LifeCycleService::Life_Cycle_Service::_narrow (life_Cycle_Service_Obj_var.in ());
 
         if (this->debug_level_ >= 2)
           ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Have a proper reference to Life Cycle Service.\n"));
 
         exception_message = "While _this on Generic Factory";
-        CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this();
 
         exception_message = "While registering the generic factory";
         life_Cycle_Service_var->register_factory ("Quoter_Generic_Factory",  // name
                                                   "Bryan 503",               // location
                                                   "Generic Factory",         // description
-                                                  object_var.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                                  object_var.in ());
 
         if (this->debug_level_ >= 2)
           ACE_DEBUG ((LM_DEBUG,
@@ -213,27 +189,26 @@ Quoter_Generic_Factory_Server::init (int argc,
       }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Generic_Factory_Server::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Quoter_Generic_Factory_Server::init");
+      ex._tao_print_exception (
+        "Quoter_Generic_Factory_Server::init");
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
 }
 
 int
-Quoter_Generic_Factory_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Quoter_Generic_Factory_Server::run (void)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Generic_Factory_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb_manager_.orb()->run ();
 
   return 0;
 }
@@ -282,28 +257,25 @@ main (int argc, char *argv [])
 {
   Quoter_Generic_Factory_Server quoter_Generic_Factory_Server;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (quoter_Generic_Factory_Server.init (argc,
-                                              argv
-                                              ACE_ENV_ARG_PARAMETER) == -1)
+                                              argv) == -1)
         return 1;
       else
         {
-          quoter_Generic_Factory_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          quoter_Generic_Factory_Server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index 8e20a97cba0..3ffc00d50f8 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -38,11 +38,10 @@ public:
   // Destructor
 
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
   u_int parse_args (void);
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index 15c9a4034c5..b8b31a9f546 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -20,8 +20,8 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Quoter, 
-           Generic_Factory_i, 
+ACE_RCSID (Quoter,
+           Generic_Factory_i,
            "$Id$")
 
 // Constructor
@@ -36,8 +36,7 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void)
 }
 
 CORBA::Boolean
-Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -46,11 +45,10 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &
 
 
 CosNaming::NamingContext_ptr
-Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key
-                                              ACE_ENV_ARG_DECL)
+Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key)
 {
   CosNaming::NamingContext_var quoterNamingContext_var;
-  ACE_TRY
+  try
     {
       // @@ FIXME Get a reference to the ORB.
       CORBA::ORB_ptr orb_ptr =
@@ -58,8 +56,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
       // Get the Naming Service object reference.
       CORBA::Object_var namingObj_var =
-        orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_ptr->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (namingObj_var.in ()))
         ACE_ERROR ((LM_ERROR,
@@ -67,9 +64,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
       // Narrow the object reference to a Naming Context.
       CosNaming::NamingContext_var namingContext_var =
-        CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (namingObj_var.in ());
 
       CosNaming::Name quoterContextName (1);  // max = 1
       quoterContextName.length (1);
@@ -77,20 +72,16 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
       // Get the IDL_Quoter naming context.
       CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        namingContext_var->resolve (quoterContextName);
 
       quoterNamingContext_var =
-        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key),
                         CosNaming::NamingContext::_nil ());
     }
-  ACE_ENDTRY;
   return quoterNamingContext_var._retn ();
 }
 
@@ -98,20 +89,17 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
 CORBA::Object_ptr
 Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
-                                         const CosLifeCycle::Criteria &
-                                         ACE_ENV_ARG_DECL)
+                                         const CosLifeCycle::Criteria &)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
                        CosLifeCycle::CannotMeetCriteria))
 {
   Stock::Quoter_var quoter_var;
-  ACE_TRY
+  try
     {
       CosNaming::NamingContext_var quoterNamingContext_var =
-        this->get_naming_context (factory_key
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->get_naming_context (factory_key);
 
       // ** now a proper reference to the quoter naming context is
       // available
@@ -122,20 +110,17 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
 
       // Try to get a reference to a Quoter Factory
       CORBA::Object_var quoterFactoryObject_var =
-        quoterNamingContext_var->resolve (factory_Name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        quoterNamingContext_var->resolve (factory_Name);
 
       // We were able to get a reference to Quoter Factory.
       // Check if it is a valid Quoter Factory reference
       if (CORBA::is_nil (quoterFactoryObject_var.in()))
         { // throw a NoFactory exception
-          ACE_TRY_THROW (CosLifeCycle::NoFactory (factory_key));
+          throw CosLifeCycle::NoFactory (factory_key);
         }
 
       Stock::Quoter_Factory_var factory_var =
-        Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in ());
 
       if (CORBA::is_nil (factory_var.in ()))
         {
@@ -149,9 +134,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
 
       // Now retrieve the Quoter obj ref corresponding to the key.
       quoter_var =
-        factory_var->create_quoter ("test"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory_var->create_quoter ("test");
 
       if (this->debug_level_ > 1)
         ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Quoter Created\n"));
@@ -167,11 +150,10 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
         ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Return an object reference to a new object.\n"));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key),
                         CORBA::Object::_nil ());
     }
-  ACE_ENDTRY;
   return quoter_var._retn ();
 }
diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h
index b03ee673647..8245312a87c 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.h
+++ b/TAO/examples/Quoter/Generic_Factory_i.h
@@ -29,15 +29,13 @@ public:
   Quoter_Generic_Factory_i (int debug_level = 1);
   ~Quoter_Generic_Factory_i (void);
 
-  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key
-                           ACE_ENV_ARG_DECL)
+  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
-                                   const CosLifeCycle::Criteria &the_criteria
-                                   ACE_ENV_ARG_DECL)
+                                   const CosLifeCycle::Criteria &the_criteria)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -47,8 +45,7 @@ public:
   // request to a more concrete Factory.
 
 private:
-  CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key
-                                                   ACE_ENV_ARG_DECL_NOT_USED);
+  CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key);
   // a helper to get the proper naming context.
 
   int debug_level_;
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 17caadc1bc1..98c7dbcbc5c 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -46,7 +46,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void)
 
 // Initialize everything in the factory
 
-int Quoter_Factory_i::init (ACE_ENV_SINGLE_ARG_DECL)
+int Quoter_Factory_i::init (void)
 {
   ACE_NEW_RETURN (this->my_quoters_,
                   Quoter_i *[this->quoter_num_],
@@ -61,28 +61,23 @@ int Quoter_Factory_i::init (ACE_ENV_SINGLE_ARG_DECL)
                       -1);
 
       const char *location_string = "POA::activate";
-      ACE_TRY
+      try
         {
-          this->poa_ptr_->activate_object (this->my_quoters_[i] ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->poa_ptr_->activate_object (this->my_quoters_[i]);
 
           location_string = "_this";
-          Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this();
 
           location_string = "CORBA::ORB::object_to_string";
           // Stringify the object reference and print it out.
           CORBA::String_var quoter_ior =
-            TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in ());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, location_string);
+          ex._tao_print_exception (location_string);
           return -1;
         }
-      ACE_ENDTRY;
     }
 
   // Everything is ok
@@ -93,8 +88,7 @@ int Quoter_Factory_i::init (ACE_ENV_SINGLE_ARG_DECL)
 // Return the quoter by the id <name>.
 
 Stock::Quoter_ptr
-Quoter_Factory_i::create_quoter (const char *
-                                 ACE_ENV_ARG_DECL)
+Quoter_Factory_i::create_quoter (const char *)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Quoter))
 {
@@ -103,7 +97,7 @@ Quoter_Factory_i::create_quoter (const char *
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Quoter %d Created\n", this->next_quoter_));
 
-  return my_quoters_[this->next_quoter_]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return my_quoters_[this->next_quoter_]->_this ();
 }
 
 
@@ -131,8 +125,7 @@ Quoter_i::~Quoter_i (void)
 // For now, just return 42.  It was a good day on Wall Street.
 
 CORBA::Long
-Quoter_i::get_quote (char const *
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Quoter_i::get_quote (char const *)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Stock,
                        Stock::Invalid_Quoter))
@@ -146,7 +139,7 @@ Quoter_i::get_quote (char const *
 CosLifeCycle::LifeCycleObject_ptr
 Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
                 const CosLifeCycle::Criteria &/*the_criteria*/
-                ACE_ENV_ARG_DECL)
+                )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotCopyable,
@@ -156,7 +149,7 @@ Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
   const char *exception_message = "Null message";
   CosLifeCycle::LifeCycleObject_ptr lifeCycleObject_ptr =
 CosLifeCycle::LifeCycleObject::_nil ();
-  ACE_TRY
+  try
     {
       // The name of the Generic Factory
       CosLifeCycle::Key factoryKey (2);  // max = 2
@@ -178,8 +171,7 @@ CosLifeCycle::LifeCycleObject::_nil ();
       // Find an appropriate factory over there.
       exception_message = "While trying to find a factory.\n";
       CosLifeCycle::Factories *factories_ptr =
-        there->find_factories (factoryKey ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        there->find_factories (factoryKey);
 
       // Now it is known that there is at least one factory.
       Stock::Quoter_var quoter_var;
@@ -192,9 +184,7 @@ CosLifeCycle::LifeCycleObject::_nil ();
         // Narrow it to a Quoter Factory.
         exception_message = "While narrowing.\n";
         CosLifeCycle::GenericFactory_var generic_Factory_var =
-          CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr);
 
         if (CORBA::is_nil (generic_Factory_var.in ()))
           {
@@ -215,13 +205,10 @@ CosLifeCycle::LifeCycleObject::_nil ();
           exception_message = "While creating an object";
           CORBA::Object_var quoterObject_var =
             generic_Factory_var->create_object (genericFactoryName,
-                                                criteria
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                criteria);
 
           exception_message = "While narrowing object";
-          quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          quoter_var = Stock::Quoter::_narrow (quoterObject_var.in());
 
           if (CORBA::is_nil (quoter_var.in ()))
             {
@@ -252,17 +239,15 @@ CosLifeCycle::LifeCycleObject::_nil ();
       lifeCycleObject_ptr =
         CosLifeCycle::LifeCycleObject::_duplicate ((CosLifeCycle::LifeCycleObject_ptr) quoter_var.in());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "Quoter_i::copy - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ex._tao_print_exception ("Exception");
 
       // Report a NoFactory exception back to the caller
-      ACE_TRY_THROW (CosLifeCycle::NoFactory ());
+      throw CosLifeCycle::NoFactory ();
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (CosLifeCycle::LifeCycleObject::_nil());
 
   return lifeCycleObject_ptr;
 }
@@ -273,7 +258,7 @@ CosLifeCycle::LifeCycleObject::_nil ();
 void
 Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
                 const CosLifeCycle::Criteria & /* the_criteria */
-                ACE_ENV_ARG_DECL)
+                )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotMovable,
@@ -283,14 +268,14 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
   ACE_ERROR ((LM_ERROR,
               "Quoter_i::move: The Quoter object is not movable!"));
 
-  ACE_THROW (CosLifeCycle::NotMovable());
+  throw CosLifeCycle::NotMovable();
 }
 
 
 // Removes the object.  Once we shut down the ORB we can call it a day.
 
 void
-Quoter_i::remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Quoter_i::remove (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NotRemovable))
 {
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index b7e1e2b7e5f..b0bdc032f20 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -43,8 +43,7 @@ public:
   ~Quoter_i (void);
   // Destructor
 
-  virtual CORBA::Long get_quote (const char *stock_name
-                                 ACE_ENV_ARG_DECL)
+  virtual CORBA::Long get_quote (const char *stock_name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Stock,
                        Stock::Invalid_Quoter));
@@ -53,8 +52,7 @@ public:
   // = Lifecycle methods
 
   virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there,
-                                                  const CosLifeCycle::Criteria &the_criteria
-                                                  ACE_ENV_ARG_DECL)
+                                                  const CosLifeCycle::Criteria &the_criteria)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotCopyable,
@@ -63,8 +61,7 @@ public:
   // Make a copy of this object
 
   virtual void move (CosLifeCycle::FactoryFinder_ptr there,
-                     const CosLifeCycle::Criteria &the_criteria
-                     ACE_ENV_ARG_DECL)
+                     const CosLifeCycle::Criteria &the_criteria)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotMovable,
@@ -72,7 +69,7 @@ public:
                        CosLifeCycle::CannotMeetCriteria));
   // Move this object using <there>
 
-  virtual void remove (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void remove (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NotRemovable));
   // Removes the object.
@@ -105,11 +102,10 @@ public:
   ~Quoter_Factory_i (void);
   // Destructor.
 
-  int init (ACE_ENV_SINGLE_ARG_DECL);
+  int init (void);
   // Initialize everything in the factory
 
-  virtual Stock::Quoter_ptr create_quoter (const char *name
-                                           ACE_ENV_ARG_DECL)
+  virtual Stock::Quoter_ptr create_quoter (const char *name)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Quoter));
   // Return the quoter by the id <name>.
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 7dec1d90a22..c5cf32579d3 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -6,8 +6,8 @@
 
 #include "client.h"
 
-ACE_RCSID (Quoter, 
-           client, 
+ACE_RCSID (Quoter,
+           client,
            "$Id$")
 
 Quoter_Task::Quoter_Task (int argc, char **argv)
@@ -90,11 +90,10 @@ Quoter_Client::run (void)
                 "\nQuoter Example: Quoter_Client is running\n"));
 
   const char *exception_message = "Null Message";
-  ACE_TRY_NEW_ENV
+  try
     {
       exception_message = "While using get_quote ()";
-      CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware");
 
       if (this->debug_level_ >= 1)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: ACE Hardware = %i\n", q));
@@ -105,9 +104,7 @@ Quoter_Client::run (void)
       exception_message = "While copying the quoter";
       CORBA::Object_var quoterObj_var =
         this->quoter_var_->copy (factory_Finder_var_.in (),
-                                 criteria
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 criteria);
 
       if (CORBA::is_nil (quoterObj_var.in()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -117,9 +114,7 @@ Quoter_Client::run (void)
       // Narrow it to the actual Quoter interface
       exception_message = "While narrowing the quoter";
       Stock::Quoter_var copied_quoter_var =
-        Stock::Quoter::_narrow (quoterObj_var.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Stock::Quoter::_narrow (quoterObj_var.in ());
 
       if (CORBA::is_nil (copied_quoter_var.in()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -130,20 +125,18 @@ Quoter_Client::run (void)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object.\n"));
 
       exception_message = "While using get_quote () on copied object";
-      q = copied_quoter_var->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      q = copied_quoter_var->get_quote ("ACE Hardware");
 
       if (this->debug_level_ >= 1)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object: ACE Hardware = %i\n", q));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Client::run - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Quoter_Client::run");
+      ex._tao_print_exception ("Quoter_Client::run");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -163,12 +156,11 @@ Quoter_Client::init_naming_service (void)
 {
   const char *exception_message = "Null Message";
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Resolve the Naming Service
       CORBA::Object_var naming_obj =
-        orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -177,8 +169,7 @@ Quoter_Client::init_naming_service (void)
 
       exception_message = "While narrowing the naming context";
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: Have a proper reference to the Naming Service.\n"));
@@ -193,18 +184,14 @@ Quoter_Client::init_naming_service (void)
 
       exception_message = "While resolving the factory finder";
       CORBA::Object_var factory_obj =
-        naming_context->resolve (quoterFactoryFinderName
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (quoterFactoryFinderName);
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: Resolved the Quoter Factory Finder!\n"));
 
       exception_message = "While narrowing the factory finder";
       factory_Finder_var_ =
-        Stock::Quoter_Factory_Finder::_narrow (factory_obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Stock::Quoter_Factory_Finder::_narrow (factory_obj.in ());
 
       if (CORBA::is_nil (factory_Finder_var_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -237,8 +224,7 @@ Quoter_Client::init_naming_service (void)
       // Find an appropriate factory over there.
       exception_message = "While finding factories";
       CosLifeCycle::Factories *factories_ptr =
-          factory_Finder_var_->find_factories (factoryName ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          factory_Finder_var_->find_factories (factoryName);
 
       if (factories_ptr == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -266,9 +252,7 @@ Quoter_Client::init_naming_service (void)
       // Narrow it to a Quoter Generic Factory
       exception_message = "While narrowing the factory";
       generic_Factory_var_ =
-        CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in ());
 
       if (CORBA::is_nil (this->generic_Factory_var_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -278,18 +262,18 @@ Quoter_Client::init_naming_service (void)
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: Have a proper reference to the Quoter Factory.\n"));
     }
-  ACE_CATCH (CosLifeCycle::NoFactory, excpt)
+  catch (const CosLifeCycle::NoFactory& excpt)
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Client::run - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (excpt, "Quoter::init_naming_service: No Factory available!");
+      excpt._tao_print_exception (
+        "Quoter::init_naming_service: No Factory available!");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "Quoter_Client::init_naming_service - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Quoter::init_naming_service");
+      ex._tao_print_exception ("Quoter::init_naming_service");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -306,14 +290,12 @@ Quoter_Client::init (int argc, char **argv)
   for (i = 0; i < argc; i++)
     this->argv_[i] = argv[i];
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "internet");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -341,12 +323,9 @@ Quoter_Client::init (int argc, char **argv)
 
       CORBA::Object_var quoterObject_var =
         this->generic_Factory_var_->create_object (genericFactoryName,
-                                                   criteria
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   criteria);
 
-      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in());
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: Quoter Created\n"));
@@ -358,12 +337,11 @@ Quoter_Client::init (int argc, char **argv)
                             -1);
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Quoter::init");
+      ex._tao_print_exception ("Quoter::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index 973111c3e7e..c9c1e4944a9 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -61,15 +61,13 @@ Quoter_Server::parse_args (void)
 
 int
 Quoter_Server::init (int argc,
-                    char* argv[]
-                    ACE_ENV_ARG_DECL)
+                    char* argv[])
 {
   const char *exception_message = "Null Message";
-  ACE_TRY
+  try
     {
       exception_message = "While ORB Manager init";
-      int result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int result = this->orb_manager_.init (argc, argv);
 
       if (result == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -91,20 +89,17 @@ Quoter_Server::init (int argc,
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        this->orb_manager_.orb()->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.orb()->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       exception_message = "While narrowing the root pos";
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       exception_message = "While getting the POA Manager";
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       ACE_NEW_RETURN (quoter_Factory_i_ptr_,
                       Quoter_Factory_i(this->num_of_objs_,
@@ -112,46 +107,39 @@ Quoter_Server::init (int argc,
                       0);
 
       exception_message = "While initing the quoter factory";
-      quoter_Factory_i_ptr_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      quoter_Factory_i_ptr_->init ();
 
       PortableServer::ObjectId_var quoter_Factory_oid =
         PortableServer::string_to_ObjectId ("Quoter_Factory");
 
       exception_message = "While activating quoter factory";
       root_poa->activate_object_with_id (quoter_Factory_oid.in (),
-                                         quoter_Factory_i_ptr_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         quoter_Factory_i_ptr_);
 
       // Get Object reference for first_foo_impl object.
       exception_message = "While quoter_Factor::_this";
-      Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this ();
 
       // Stringify the object reference and print it out.
       exception_message = "While object_to_string";
       CORBA::String_var quoter_Factory_ior =
-        this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in ());
 
       exception_message = "While activating the POA Manager";
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Print the IOR.
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Quoter Server: IOR is: <%s>\n", quoter_Factory_ior.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "Quote_Server::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Exception");
+      throw;
     }
-  ACE_ENDTRY;
 
-  return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->init_naming_service ();
 }
 
 
@@ -159,16 +147,15 @@ Quoter_Server::init (int argc,
 // and Quoter_factory object.
 
 int
-Quoter_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Quoter_Server::init_naming_service (void)
 {
   const char *exception_message = "Null Message";
-  ACE_TRY
+  try
     {
       CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb();
 
       CORBA::Object_var naming_obj =
-        orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_ptr->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -177,8 +164,7 @@ Quoter_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 
       exception_message = "While narrowing naming context";
       namingContext_var_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name quoterContextName (1);
       quoterContextName.length (1);
@@ -186,8 +172,7 @@ Quoter_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 
       exception_message = "While binding a new context";
       CosNaming::NamingContext_var quoterNameContext =
-        namingContext_var_->bind_new_context (quoterContextName ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        namingContext_var_->bind_new_context (quoterContextName);
 
       //Register the quoter_factory name with the IDL_quoter Naming
       //Context...
@@ -196,42 +181,37 @@ Quoter_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
       quoterFactoryContextName[0].id = CORBA::string_dup ("Quoter_Factory");
 
       exception_message = "While using factory _this";
-      Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this ();
 
       exception_message = "While binding factory";
       quoterNameContext->bind (quoterFactoryContextName,
-                               quoter_factory_var.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               quoter_factory_var.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "Quote_Server::init_naming_service - %s", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ex._tao_print_exception ("Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 int
-Quoter_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Quoter_Server::run (void)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb_manager_.orb()->run ();
 
   return 0;
 }
 
 Quoter_Server::~Quoter_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Unbind quoter factory context and name.
       CosNaming::Name factory_name (2);
@@ -239,21 +219,18 @@ Quoter_Server::~Quoter_Server (void)
       factory_name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_name[1].id = CORBA::string_dup ("Quoter_Factory");
       if (!CORBA::is_nil (this->namingContext_var_.in ()))
-        this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->namingContext_var_->unbind (factory_name);
 
       factory_name.length (1);
       if (!CORBA::is_nil (this->namingContext_var_.in ()))
-        this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->namingContext_var_->unbind (factory_name);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                   "Could not unbind Quoter Server from the Name Service\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "~Quoter_Server");
+      ex._tao_print_exception ("~Quoter_Server");
     }
-  ACE_ENDTRY;
 
   delete [] this->argv_;
 }
@@ -263,27 +240,24 @@ main (int argc, char *argv[])
 {
   Quoter_Server quoter_server;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      int result = quoter_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int result = quoter_server.init (argc, argv);
 
       if (result == -1)
         return 1;
 
-      quoter_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      quoter_server.run ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index 26a0540be88..ad2949cf7a1 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -52,17 +52,17 @@ public:
   ~Quoter_Server (void);
   // Destructor
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the server.
 
 private:
   int parse_args (void);
   // Parses the commandline arguments.
 
-  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (void);
   // Initializes the name server and registers cubit factory with the
   // name server.
 
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 4207926db61..45f3787ef29 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -61,62 +61,41 @@ Activity::current (void)
 }
 
 int
-Activity::init (int& argc, char *argv []
-                ACE_ENV_ARG_DECL)
+Activity::init (int& argc, char *argv [])
 {
   // Copy command line parameter.
   ACE_Argv_Type_Converter command_line(argc, argv);
 
   this->orb_ = CORBA::ORB_init (command_line.get_argc(),
                                 command_line.get_ASCII_argv(),
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                "");
 
   CORBA::Object_var object =
-    orb_->resolve_initial_references ("RootPOA"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb_->resolve_initial_references ("RootPOA");
 
   root_poa_ =
-    PortableServer::POA::_narrow (object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_->the_POAManager ();
 
   object =
-    orb_->resolve_initial_references ("RTORB"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb_->resolve_initial_references ("RTORB");
 
   this->rt_orb_ =
-    RTCORBA::RTORB::_narrow (object.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTCORBA::RTORB::_narrow (object.in ());
 
   object =
-    orb_->resolve_initial_references ("RTCurrent"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb_->resolve_initial_references ("RTCurrent");
 
   current_ =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTCORBA::Current::_narrow (object.in ());
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
-  object = this->orb_->resolve_initial_references ("PriorityMappingManager"
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  object = this->orb_->resolve_initial_references ("PriorityMappingManager");
   RTCORBA::PriorityMappingManager_var mapping_manager =
-    RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
   this->priority_mapping_ = mapping_manager->mapping ();
 
@@ -124,12 +103,10 @@ Activity::init (int& argc, char *argv []
 }
 
 int
-Activity::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Activity::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
@@ -138,9 +115,7 @@ Activity::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
                       -1);
 
   this->naming_ =
-    CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CosNaming::NamingContextExt::_narrow (naming_obj.in ());
 
   //@@tmp hack, otherwise crashes on exit!..??
   CosNaming::NamingContextExt::_duplicate (this->naming_.in());
@@ -148,21 +123,19 @@ Activity::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Activity::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL)
+Activity::activate_poa_list (void)
 {
   POA_LIST list;
   int count = builder_->poa_list (list);
 
   for (int i = 0; i < count; ++i)
     {
-      list[i]->activate (this->rt_orb_.in(), this->root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list[i]->activate (this->rt_orb_.in(), this->root_poa_.in ());
     }
 }
 
 void
-Activity::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
+Activity::activate_job_list (void)
 {
   JOB_LIST list;
   int count = builder_->job_list (list);
@@ -177,40 +150,28 @@ Activity::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
 
       // find your poa
       PortableServer::POA_var host_poa =
-        root_poa_->find_POA (job->poa ().c_str (), 0
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        root_poa_->find_POA (job->poa ().c_str (), 0);
 
       PortableServer::ServantBase_var servant_var (job);
 
       // Register with poa.
       PortableServer::ObjectId_var id;
 
-      id = host_poa->activate_object (job
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      id = host_poa->activate_object (job);
 
       CORBA::Object_var server =
-        host_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        host_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb_->object_to_string (server.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        orb_->object_to_string (server.in ());
 
       const ACE_CString &job_name = job->name ();
 
       CosNaming::Name_var name =
-        this->naming_->to_name (job_name.c_str ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_->to_name (job_name.c_str ());
 
       this->naming_->rebind (name.in (),
-                             server.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Registered %s with the naming service\n",
@@ -222,7 +183,7 @@ Activity::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Activity::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
+Activity::activate_schedule (void)
 {
   TASK_LIST list;
   int count = builder_->task_list (list);
@@ -245,25 +206,19 @@ Activity::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
       name[0].id = CORBA::string_dup (task->job ());
 
       CORBA::Object_var obj =
-        this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_->resolve (name);
 
-      Job_var job = Job::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      Job_var job = Job::_narrow (obj.in ());
 
       if (TAO_debug_level > 0)
         {
           // Check that the object is configured with some
           // PriorityModelPolicy.
           CORBA::Policy_var policy =
-            job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+            job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
           RTCORBA::PriorityModelPolicy_var priority_policy =
-            RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+            RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
           if (CORBA::is_nil (priority_policy.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -271,8 +226,7 @@ Activity::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
           else
             {
               RTCORBA::PriorityModel priority_model =
-                priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+                priority_policy->priority_model ();
 
               if (priority_model == RTCORBA::CLIENT_PROPAGATED)
                 ACE_DEBUG ((LM_DEBUG,
@@ -345,54 +299,43 @@ Activity::check_ifexit (void)
 }
 
 CORBA::Short
-Activity::get_server_priority (CORBA::Object_ptr server
-                               ACE_ENV_ARG_DECL)
+Activity::get_server_priority (CORBA::Object_ptr server)
 {
   // Get the Priority Model Policy from the stub.
   CORBA::Policy_var policy =
-    server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
   // Narrow down to correct type.
   RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
   // 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)
     return -1;
 
   // Return the server priority.
-  return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return priority_policy->server_priority ();
 }
 
 void
-Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL)
+Activity::run (int argc, char *argv[])
 {
-  this->init (argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init (argc, argv);
 
-  if (this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->resolve_naming_service () == -1)
     return;
-  ACE_CHECK;
 
-  this->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->activate_poa_list ();
 
-  this->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->activate_job_list ();
 
-  this->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->activate_schedule ();
 
   this->create_started_flag_file (argc, argv);
 
-  orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_->run ();
 
   orb_->destroy ();
 
@@ -440,18 +383,15 @@ main (int argc, char *argv[])
   ACE_Timer_Heap timer_queue;
   ACE_Reactor::instance ()->timer_queue (&timer_queue);
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ACTIVITY::instance()->run (argc, argv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index 346b2c6a414..ed3d66a2f32 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -49,14 +49,14 @@ private:
 
 public:
   /// initialize the ORB et. al.
-  int init (int& argc, char *argv [] ACE_ENV_ARG_DECL);
+  int init (int& argc, char *argv []);
 
 
   /// Activate the tasks, jobs, poas.
-  void run (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  void run (int argc, char *argv[]);
 
   /// Resolve the naming service.
-  int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int resolve_naming_service (void);
 
   /// = Accessors
   CORBA::ORB_ptr orb (void);
@@ -64,8 +64,7 @@ public:
   void builder (Builder* builder);
 
   /// Returns priority if server declared model else -1
-  CORBA::Short get_server_priority (CORBA::Object_ptr server
-                                    ACE_ENV_ARG_DECL);
+  CORBA::Short get_server_priority (CORBA::Object_ptr server);
   /// = Callbacks
   /// Task ended notification
   void task_ended (Periodic_Task* ended_task);
@@ -76,13 +75,13 @@ public:
   protected:
   /// = Activation methods.
   /// Activate the POA's
-  void activate_poa_list (ACE_ENV_SINGLE_ARG_DECL);
+  void activate_poa_list (void);
 
   /// Activate the task list.
-  void activate_schedule (ACE_ENV_SINGLE_ARG_DECL);
+  void activate_schedule (void);
 
   /// Activate the Job's
-  void activate_job_list (ACE_ENV_SINGLE_ARG_DECL);
+  void activate_job_list (void);
 
   /// Check if we should process exit
   void check_ifexit (void);
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index 637ea2cd7f6..a0182cea653 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -34,7 +34,7 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-Job_i::work (CORBA::ULong work ACE_ENV_ARG_DECL_NOT_USED)
+Job_i::work (CORBA::ULong work)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static CORBA::ULong prime_number = 9619;
@@ -51,7 +51,7 @@ Job_i::work (CORBA::ULong work ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Job_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Job_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACTIVITY::instance()->job_ended (this);
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index d1b4ceaa3e2..194b9bd2b1e 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -38,12 +38,12 @@ class activity_Export Job_i : public POA_Job
   const ACE_CString& poa (void);
 
   /// = inteface Job method implementation.
-  virtual void work (CORBA::ULong work ACE_ENV_ARG_DECL)
+  virtual void work (CORBA::ULong work)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index 16eb3cd1e4d..7da6b98be48 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -106,7 +106,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa)
 {
 
   /*
@@ -132,9 +132,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
   // Create a priority model policy.
   priority_model_policy =
     rt_orb->create_priority_model_policy (priority_model_,
-                                          server_priority_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          server_priority_);
 
   if (lanes_.length () != 0)
     {
@@ -154,16 +152,12 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              max_request_buffer_size);
 
 
       // Create a thread-pool policy.
       lanes_policy =
-        rt_orb->create_threadpool_policy (threadpool_id
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id);
 
     }
 
@@ -171,9 +165,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
     {
       // Create a bands policy.
       bands_policy =
-        rt_orb->create_priority_banded_connection_policy (this->bands_
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rt_orb->create_priority_banded_connection_policy (this->bands_);
     }
 
   CORBA::PolicyList poa_policy_list;
@@ -208,12 +200,9 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
 
   // Get the POA Manager.
   PortableServer::POAManager_var poa_manager =
-    parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    parent_poa->the_POAManager ();
 
   parent_poa->create_POA (POA_name_.c_str (),
                           poa_manager.in (),
-                          poa_policy_list
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          poa_policy_list);
 }
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index cce1b948364..4f5328ed71f 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -35,8 +35,7 @@ class activity_Export POA_Holder
   int init (ACE_Arg_Shifter& arg_shifter);
 
   /// Activate the new POA using the parameters initialized before.
-  void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa
-                 ACE_ENV_ARG_DECL);
+  void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa);
 
  protected:
   /// = POA create options.
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
index 08c9450f44e..fe30b56c19b 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
@@ -59,12 +59,10 @@ Thread_Task::svc (void)
   // if debugging, dump the priority that we're actually at.
   if (TAO_debug_level > 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
       // Get the priority of the current thread.
       RTCORBA::Priority prio =
-        ACTIVITY::instance()->current ()->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        ACTIVITY::instance()->current ()->the_priority ();
 
       if (prio == this->task_priority_)
         ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index a0ae68a61ce..44e08a0c106 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -172,22 +172,20 @@ DT_Creator::init (int argc, char *argv [])
 }
 
 void
-DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::register_synch_obj (void)
 {
   CosNaming::Name name (1);
   name.length (1);
 
   CosNaming::NamingContext_var synch_context;
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup ("Synch");
 
-      synch_context = this->naming_->bind_new_context (name
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      synch_context = this->naming_->bind_new_context (name);
 
       //
       // We reach here if there was no exception raised in
@@ -195,7 +193,7 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
       //
 
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& )
     {
       //
       // The synch context already exists, probably created by the
@@ -207,15 +205,11 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
         CORBA::string_dup ("Synch");
 
       CORBA::Object_var object =
-        this->naming_->resolve (name
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_->resolve (name);
 
       synch_context = CosNaming::NamingContext::_narrow (object.in ());
 
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_CString synch_name ("Synch");
   ACE_Time_Value timestamp = ACE_OS::gettimeofday ();
@@ -233,43 +227,34 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW (synch_,
      Synch_i);
 
-  Synch_var synch = synch_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Synch_var synch = synch_->_this ();
 
   // Register the synch object with the Synch context.
   synch_context->rebind (name,
-       synch.in ()
-       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+       synch.in ());
 
 }
 
 
 int
-DT_Creator::activate_root_poa (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::activate_root_poa (void)
 {
   CORBA::Object_var object =
-    orb_->resolve_initial_references ("RootPOA"
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb_->resolve_initial_references ("RootPOA");
 
   root_poa_ =
-    PortableServer::POA::_narrow (object.in ()
-          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   return 0;
 }
 
 void
-DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::activate_poa_list (void)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -278,26 +263,20 @@ DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL)
   if (poa_count_ > 0)
     {
       CORBA::Object_var object =
-  orb_->resolve_initial_references ("RTORB"
-            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+  orb_->resolve_initial_references ("RTORB");
 
       this->rt_orb_ =
-  RTCORBA::RTORB::_narrow (object.in ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+  RTCORBA::RTORB::_narrow (object.in ());
     }
 
   for (int i = 0; i < poa_count_; ++i)
     {
-      poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in ()
-            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in ());
     }
 }
 
 void
-DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::activate_job_list (void)
 {
 
   if (TAO_debug_level > 0)
@@ -315,40 +294,28 @@ DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
 
       // find your poa
       PortableServer::POA_var host_poa =
-        root_poa_->find_POA (job->poa ().c_str (), 0
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        root_poa_->find_POA (job->poa ().c_str (), 0);
 
       PortableServer::ServantBase_var servant_var (job);
 
       // Register with poa.
       PortableServer::ObjectId_var id;
 
-      id = host_poa->activate_object (job
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      id = host_poa->activate_object (job);
 
       CORBA::Object_var server =
-        host_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        host_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb_->object_to_string (server.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        orb_->object_to_string (server.in ());
 
       const ACE_CString &job_name = job->name ();
 
       CosNaming::Name_var name =
-        this->naming_->to_name (job_name.c_str ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_->to_name (job_name.c_str ());
 
       this->naming_->rebind (name.in (),
-                             server.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             server.in ());
 
 
     } /* while */
@@ -358,7 +325,7 @@ DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::activate_schedule (void)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -379,25 +346,19 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
     name[0].id = CORBA::string_dup (task->job ());
 
     CORBA::Object_var obj =
-      this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->naming_->resolve (name);
 
-    Job_var job = Job::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Job_var job = Job::_narrow (obj.in ());
 
     //    if (TAO_debug_level > 0)
     // {
         // Check that the object is configured with some
         // PriorityModelPolicy.
         CORBA::Policy_var policy =
-    job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+    job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
         RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                   ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
         if (CORBA::is_nil (priority_policy.in ()))
     ACE_DEBUG ((LM_DEBUG,
@@ -406,8 +367,7 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
     {
                   /*
       RTCORBA::PriorityModel priority_model =
-        priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        priority_policy->priority_model ();
 
       if (priority_model == RTCORBA::CLIENT_PROPAGATED)
         ACE_DEBUG ((LM_DEBUG,
@@ -430,12 +390,10 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-DT_Creator::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+DT_Creator::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
@@ -444,9 +402,7 @@ DT_Creator::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
                       -1);
 
   this->naming_ =
-    CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CosNaming::NamingContextExt::_narrow (naming_obj.in ());
 
   //@@tmp hack, otherwise crashes on exit!..??
   CosNaming::NamingContextExt::_duplicate (this->naming_.in());
@@ -454,8 +410,7 @@ DT_Creator::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
-            ACE_ENV_ARG_DECL)
+DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current)
 {
   current_ = RTScheduling::Current::_duplicate (current);
 
@@ -470,8 +425,7 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
 
   while (!this->synch ()->synched ())
     {
-      this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->perform_work ();
     }
 
   CORBA::Policy_var sched_param;
@@ -479,9 +433,7 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
   const char * name = 0;
   current_->begin_scheduling_segment (name,
               sched_param.in (),
-              sched_param.in ()
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+              sched_param.in ());
 
   ACE_NEW (base_time_,
      ACE_Time_Value (*(this->synch ()->base_time ())));
@@ -517,17 +469,13 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current
       dt_list_ [i]->activate_task (current,
            sched_param.in (),
            flags,
-           base_time_
-           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+           base_time_);
 
     }
 
   this->wait ();
 
-  current_->end_scheduling_segment (name
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  current_->end_scheduling_segment (name);
 
   this->check_ifexit ();
 }
diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h
index 106f4221307..0c6b5af90ac 100644
--- a/TAO/examples/RTScheduling/DT_Creator.h
+++ b/TAO/examples/RTScheduling/DT_Creator.h
@@ -33,12 +33,11 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
 
   int dt_task_init (ACE_Arg_Shifter& arg_shifter);
 
-  virtual void create_distributable_threads (RTScheduling::Current_ptr  current
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual void create_distributable_threads (RTScheduling::Current_ptr  current);
 
-  void activate_poa_list (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void activate_job_list (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void activate_schedule (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void activate_poa_list (void);
+  void activate_job_list (void);
+  void activate_schedule (void);
 
   virtual void yield (int suspend_time,
           Thread_Task* task) = 0;
@@ -56,7 +55,7 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
   //  virtual Task* task (void) = 0;
 
   /// Resolve the naming service.
-  int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int resolve_naming_service (void);
 
   int dt_count (void);
 
@@ -81,9 +80,9 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object
 
   Synch_i* synch (void);
 
-  void register_synch_obj (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void register_synch_obj (void);
 
-  int activate_root_poa (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int activate_root_poa (void);
 
  protected:
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index 5019ee6ae5d..b8ee3b265c1 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -8,61 +8,53 @@
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
 
 RTCORBA::Priority
-Segment_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Segment_Sched_Param_Policy::value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
-Segment_Sched_Param_Policy::value (RTCORBA::Priority value
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Segment_Sched_Param_Policy::value (RTCORBA::Priority value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_ = value;
 }
 
 CORBA::Policy_ptr
-Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+Segment_Sched_Param_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Segment_Sched_Param_Policy *copy = 0;
   ACE_NEW_THROW_EX (copy,
                     Segment_Sched_Param_Policy,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
-  copy->value (this->value_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  copy->value (this->value_);
 
   return copy;
 }
 
 void
-Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Segment_Sched_Param_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTScheduler_Current"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTScheduler_Current");
 
       this->current_ =
-        RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTScheduling::Current::_narrow (object.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
 }
 
 Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void)
@@ -70,8 +62,7 @@ Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void)
 }
 
 FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
-Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority segment_priority
-                                                               ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority segment_priority)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FP_Scheduling::SegmentSchedulingParameterPolicy_ptr segment_policy;
@@ -94,8 +85,7 @@ void
 Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &,
                                                         const char *,
                                                         CORBA::Policy_ptr /*sched_policy*/,
-                                                        CORBA::Policy_ptr
-                                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                                        CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -105,41 +95,34 @@ void
 Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
-                                                           CORBA::Policy_ptr implicit_sched_param
-                                                           ACE_ENV_ARG_DECL)
+                                                           CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
                                       sched_param,
-                                      implicit_sched_param
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      implicit_sched_param);
 }
 
 void
 Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                                      const char *name,
                                                      CORBA::Policy_ptr sched_param,
-                                                     CORBA::Policy_ptr implicit_sched_param
-                                                     ACE_ENV_ARG_DECL)
+                                                     CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
                                       sched_param,
-                                      implicit_sched_param
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      implicit_sched_param);
 
 }
 
 void
 Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &,
-                                                  const char *
-                                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                                  const char *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -147,8 +130,7 @@ Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::I
 void
 Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                                          const char *,
-                                                         CORBA::Policy_ptr
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -156,8 +138,7 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur
 
 
 void
-Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info
-                                        ACE_ENV_ARG_DECL)
+Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -178,13 +159,10 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
   srv_con->context_id = Client_Interceptor::SchedulingInfo;
   srv_con->context_data.length (sizeof (size_t));
   ACE_OS::memcpy (srv_con->context_data.get_buffer (),
-                  current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
+                  current_->id ()->get_buffer (),
                   sizeof (size_t));
-  ACE_CHECK;
   request_info->add_request_service_context (*srv_con,
-                                             0
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                             0);
 
 }
 
@@ -193,15 +171,12 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
                                            RTScheduling::Current::IdType_out guid_out,
                                            CORBA::String_out /*name*/,
                                            CORBA::Policy_out /*sched_param*/,
-                                           CORBA::Policy_out /*implicit_sched_param*/
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::Policy_out /*implicit_sched_param*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   IOP::ServiceContext* serv_cxt =
-    request_info->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    request_info->get_request_service_context (Server_Interceptor::SchedulingInfo);
 
   if (serv_cxt != 0)
     {
@@ -241,89 +216,80 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
 }
 
 void
-Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::scheduling_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 void
-Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
-Fixed_Priority_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::poa_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 char *
-Fixed_Priority_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Fixed_Priority_Scheduler::scheduling_discipline_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -331,8 +297,7 @@ Fixed_Priority_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NO
 
 RTScheduling::ResourceManager_ptr
 Fixed_Priority_Scheduler::create_resource_manager (const char *,
-                                                   CORBA::Policy_ptr
-                                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                                   CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -341,8 +306,7 @@ Fixed_Priority_Scheduler::create_resource_manager (const char *,
 void
 Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                                     const char *,
-                                                    CORBA::Policy_ptr
-                                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                                    CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
index 3c689613388..1312733b110 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h
@@ -12,17 +12,16 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy,
        public TAO_Local_RefCounted_Object
 {
  public:
-  virtual RTCORBA::Priority value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual RTCORBA::Priority value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void value (RTCORBA::Priority value
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void value (RTCORBA::Priority value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
@@ -40,47 +39,40 @@ public TAO_Local_RefCounted_Object
   ~Fixed_Priority_Scheduler (void);
 
   virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
-    create_segment_scheduling_parameter (RTCORBA::Priority segment_priority
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    create_segment_scheduling_parameter (RTCORBA::Priority segment_priority)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
 					     const char * name,
 					     CORBA::Policy_ptr sched_param,
-					     CORBA::Policy_ptr implicit_sched_param
-					     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+					     CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
 						const char * name,
 						CORBA::Policy_ptr sched_param,
-						CORBA::Policy_ptr implicit_sched_param
-						ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+						CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid,
 					  const char * name,
 					  CORBA::Policy_ptr sched_param,
-					  CORBA::Policy_ptr implicit_sched_param
-					  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+					  CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-				       const char * name
-				       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+				       const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
 					      const char * name,
-					      CORBA::Policy_ptr outer_sched_param
-					      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+					      CORBA::Policy_ptr outer_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-			     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
@@ -88,70 +80,58 @@ public TAO_Local_RefCounted_Object
 				RTScheduling::Current::IdType_out guid,
 				CORBA::String_out name,
 				CORBA::Policy_out sched_param,
-				CORBA::Policy_out implicit_sched_param
-				ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+				CORBA::Policy_out implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-			   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-			       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-			   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-			   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-			      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-				  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-			      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     PortableInterceptor::ForwardRequest));
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid
-		       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void cancel (const RTScheduling::Current::IdType & guid)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * scheduling_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies
-				    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-								     CORBA::Policy_ptr scheduling_parameter
-								     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+								     CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
 					 const char * name,
-					 CORBA::Policy_ptr scheduling_parameter
-					 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+					 CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
index 6f78d4353bd..ebd1b42d228 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp
@@ -29,8 +29,7 @@ int
 FP_Task::activate_task (RTScheduling::Current_ptr current,
 			CORBA::Policy_ptr sched_param,
 			long flags,
-			ACE_Time_Value* base_time
-			ACE_ENV_ARG_DECL)
+			ACE_Time_Value* base_time)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -43,9 +42,7 @@ FP_Task::activate_task (RTScheduling::Current_ptr current,
 
   base_time_ = base_time;
 
-  current_ = RTScheduling::Current::_narrow (current
-					     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  current_ = RTScheduling::Current::_narrow (current);
 
   sched_param_ = CORBA::Policy::_duplicate (sched_param);
 
@@ -68,16 +65,12 @@ FP_Task::activate_task (RTScheduling::Current_ptr current,
 void
 FP_Task::pre_activate (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::Object_var object = DT_TEST::instance ()->orb ()->resolve_initial_references ("PriorityMappingManager"
-											   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = DT_TEST::instance ()->orb ()->resolve_initial_references ("PriorityMappingManager");
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-	RTCORBA::PriorityMappingManager::_narrow (object.in ()
-						  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+	RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
       RTCORBA::PriorityMapping *pm =
 	mapping_manager->mapping ();
@@ -98,12 +91,10 @@ FP_Task::pre_activate (void)
 
       this->importance_ = native_priority;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
 }
 
 int
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
index 1a231b1eb9a..f170c911c01 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h
@@ -18,9 +18,8 @@ public:
   virtual int activate_task (RTScheduling::Current_ptr current,
 			     CORBA::Policy_ptr sched_param,
 			     long flags,
-			     ACE_Time_Value* base_time
-			     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  
+			     ACE_Time_Value* base_time);
+
   virtual int perform_task (void);
 
   virtual void pre_activate (void);
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
index 2d328877266..c629a336669 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
@@ -64,14 +64,11 @@ DT_Test::check_supported_priorities (void)
 }
 
 int
-DT_Test::init (int argc, char *argv []
-	       ACE_ENV_ARG_DECL)
+DT_Test::init (int argc, char *argv [])
 {
   orb_ = CORBA::ORB_init (argc,
 			  argv,
-			  ""
-			  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+			  "");
 
   this->check_supported_priorities ();
 
@@ -79,13 +76,9 @@ DT_Test::init (int argc, char *argv []
 
   TASK_STATS::instance ()->init (dt_creator_->total_load ());
 
-  CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager"
-								   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager");
 
-  TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
-									  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj);
 
 
   ACE_NEW_RETURN (scheduler_,
@@ -95,13 +88,10 @@ DT_Test::init (int argc, char *argv []
   manager->rtscheduler (scheduler_);
 
   CORBA::Object_var object =
-    orb_->resolve_initial_references ("RTScheduler_Current"
-				      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb_->resolve_initial_references ("RTScheduler_Current");
 
   current_  =
-    RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTScheduling::Current::_narrow (object.in ());
 
 
   if (sched_policy_ != ACE_SCHED_OTHER)
@@ -128,42 +118,31 @@ DT_Test::init (int argc, char *argv []
 }
 
 void
-DT_Test::run (int argc, char* argv []
-	      ACE_ENV_ARG_DECL)
+DT_Test::run (int argc, char* argv [])
 {
-  init (argc,argv
-	ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  init (argc,argv);
 
-  if (this->dt_creator_->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->dt_creator_->resolve_naming_service () == -1)
     return;
-  ACE_CHECK;
 
 
   //TASK_STATS::instance ()->init (this->dt_creator_->dt_count () * 100);
 
 
-  this->dt_creator_->activate_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->dt_creator_->activate_root_poa ();
 
-  this->dt_creator_->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->dt_creator_->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->dt_creator_->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->dt_creator_->activate_poa_list ();
+  this->dt_creator_->activate_job_list ();
+  this->dt_creator_->activate_schedule ();
 
   DT_Creator* dt_creator = this->dt_creator_;
-  dt_creator->register_synch_obj (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  dt_creator->register_synch_obj ();
 
   ACE_DEBUG ((LM_DEBUG,
 	      "Registered Synch Object\n"));
 
   /*
-  dt_creator_->create_distributable_threads (current_.in ()
-					     ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  dt_creator_->create_distributable_threads (current_.in ());
   */
 
   this->activate_task ();
@@ -173,8 +152,7 @@ DT_Test::run (int argc, char* argv []
   dt_creator_->log_msg (msg);
 
   //ACE_Thread_Manager::instance ()->wait ();
-  orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_->run ();
 
 
 }
@@ -229,24 +207,20 @@ DT_Test::activate_task (void)
 int
 DT_Test::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
 		  "In test::svc\n"));
 
-      dt_creator_->create_distributable_threads (current_.in ()
-						 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dt_creator_->create_distributable_threads (current_.in ());
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -261,22 +235,18 @@ DT_Test::orb (void)
 int
 main (int argc, char* argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_FP_DT_Creator);
 
-      DT_TEST::instance ()->run (argc, argv
-				 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      DT_TEST::instance ()->run (argc, argv);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
index 70e043e4f21..c28f67fd35c 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h
@@ -16,16 +16,14 @@ class Task_Stats;
 class DT_Test :public ACE_Task <ACE_SYNCH>
 {
  public:
-  
+
   DT_Test (void);
-  
+
   void check_supported_priorities (void);
-  
-  int init (int argc, char *argv []
-	    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void run (int argc, char *argv [] 
-	  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (int argc, char *argv []);
+
+  void run (int argc, char *argv []);
 
   void dt_creator (FP_DT_Creator* dt_creator);
   FP_DT_Creator* dt_creator (void);
@@ -37,15 +35,15 @@ class DT_Test :public ACE_Task <ACE_SYNCH>
   CORBA::ORB_ptr orb (void);
 
   ACE_hrtime_t base_t;
-  
-  void register_synch_obj (ACE_ENV_SINGLE_ARG_DECL);
+
+  void register_synch_obj (void);
 
   protected:
   /// task svc
   virtual int svc (void);
 
 
-  
+
  private:
   /// = Policies
   long thr_sched_policy_;
@@ -54,13 +52,13 @@ class DT_Test :public ACE_Task <ACE_SYNCH>
   CORBA::ORB_var orb_;
   int max_priority_;
   int min_priority_;
-  RTScheduling::Current_var current_; 
+  RTScheduling::Current_var current_;
   FP_DT_Creator* dt_creator_;
   Fixed_Priority_Scheduler* scheduler_;
   RTCORBA::RTORB_var rt_orb_;
   /// Reference to the root poa.
   PortableServer::POA_var root_poa_;
-  
+
 };
 
 typedef ACE_Singleton <DT_Test, TAO_SYNCH_MUTEX> DT_TEST;
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index 00a5c022d0e..6aee5a32c81 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -52,8 +52,7 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter)
 
 void
 Job_i::work (CORBA::ULong work,
-       CORBA::Short importance
-       ACE_ENV_ARG_DECL)
+       CORBA::Short importance)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static CORBA::ULong prime_number = 9619;
@@ -65,8 +64,8 @@ Job_i::work (CORBA::ULong work,
 
   if (guid_ == 0)
     ACE_OS::memcpy (&guid_,
-        dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
-        sizeof (dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length ()));
+        dt_creator_->current ()->id ()->get_buffer (),
+        sizeof (dt_creator_->current ()->id ()->length ()));
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -108,9 +107,7 @@ Job_i::work (CORBA::ULong work,
       const char * name = 0;
       dt_creator_->current ()->update_scheduling_segment (name,
                 sched_param.in (),
-                sched_param.in ()
-                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                sched_param.in ());
     }
 }
 
@@ -127,7 +124,7 @@ Job_i::guid (void)
 }
 
 void
-Job_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Job_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   dt_creator_->job_ended ();
diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h
index 219c5908f33..6a79a8f9c3d 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -45,8 +45,7 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job
 
   /// = inteface Job method implementation.
   virtual void work (CORBA::ULong work,
-         CORBA::Short importance
-         ACE_ENV_ARG_DECL)
+         CORBA::Short importance)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -56,7 +55,7 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job
 
   void dump_stats (void);
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
index 6c02c305435..9025497a5bb 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
@@ -40,7 +40,7 @@ void
 MIF_DT_Creator::yield (int suspend_time,
 		       Thread_Task*)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Time_Value const sus_time_value (suspend_time);
       ACE_Time_Value now (ACE_OS::gettimeofday ());
@@ -53,20 +53,16 @@ MIF_DT_Creator::yield (int suspend_time,
           const char * name = 0;
           current_->update_scheduling_segment (name,
                                                sched_param.in (),
-                                               sched_param.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               sched_param.in ());
           now = ACE_OS::gettimeofday ();
           if (suspend_time == 1)
             break;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
 }
 
 int
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index f692891e326..c97affc9fbc 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -31,38 +31,35 @@ DT::resume (void)
 }
 
 CORBA::Short
-Segment_Sched_Param_Policy::importance (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Segment_Sched_Param_Policy::importance (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->importance_;
 }
 
 void
-Segment_Sched_Param_Policy::importance (CORBA::Short importance
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+Segment_Sched_Param_Policy::importance (CORBA::Short importance)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->importance_ = importance;
 }
 
 CORBA::Policy_ptr
-Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+Segment_Sched_Param_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Segment_Sched_Param_Policy *copy = 0;
   ACE_NEW_THROW_EX (copy,
                     Segment_Sched_Param_Policy,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
-  copy->importance (this->importance_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  copy->importance (this->importance_);
 
   return copy;
 }
 
 void
-Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Segment_Sched_Param_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -71,25 +68,20 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb)
   : wait_cond_ (lock_),
     wait_ (0)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTScheduler_Current"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTScheduler_Current");
 
       this->current_ =
-        RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTScheduling::Current::_narrow (object.in ());
 
       wait_ = 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
 }
 
 MIF_Scheduler::~MIF_Scheduler (void)
@@ -126,8 +118,7 @@ MIF_Scheduler::resume_main (void)
 }
 
 MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
-MIF_Scheduler::create_segment_scheduling_parameter (CORBA::Short importance
-                                                    ACE_ENV_ARG_DECL)
+MIF_Scheduler::create_segment_scheduling_parameter (CORBA::Short importance)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr segment_policy;
@@ -149,8 +140,7 @@ void
 MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &/*guid*/,
                                              const char *,
                                              CORBA::Policy_ptr sched_policy,
-                                             CORBA::Policy_ptr
-                                             ACE_ENV_ARG_DECL)
+                                             CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -163,8 +153,7 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
   MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param =
     MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (sched_policy);
 
-  CORBA::Short desired_priority = sched_param->importance (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Short desired_priority = sched_param->importance ();
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -193,25 +182,21 @@ void
 MIF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
                                                            const char *name,
                                                            CORBA::Policy_ptr sched_param,
-                                                           CORBA::Policy_ptr implicit_sched_param
-                                                           ACE_ENV_ARG_DECL)
+                                                           CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
                                       name,
                                       sched_param,
-                                      implicit_sched_param
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      implicit_sched_param);
 }
 
 void
 MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/*guid*/,
                                           const char* /*name*/,
                                           CORBA::Policy_ptr sched_policy,
-                                          CORBA::Policy_ptr /*implicit_sched_param*/
-                                          ACE_ENV_ARG_DECL)
+                                          CORBA::Policy_ptr /*implicit_sched_param*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -223,7 +208,7 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/
   MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param =
     MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (sched_policy);
 
-  CORBA::Short desired_priority = sched_param->importance (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Short desired_priority = sched_param->importance ();
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -262,8 +247,7 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/
 
 void
 MIF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid,
-                                       const char *
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       const char *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   size_t count = 0;
@@ -290,29 +274,25 @@ MIF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid
 void
 MIF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                                          const char *,
-                                                         CORBA::Policy_ptr
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info
-                             ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var =
-    MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+    MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ());
 
   IOP::ServiceContext* srv_con = new IOP::ServiceContext;
   srv_con->context_id = Client_Interceptor::SchedulingInfo;
 
-  int guid_length = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length ();
-  ACE_CHECK;
+  int guid_length = current_->id ()->length ();
 
-  RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  RTScheduling::Current::IdType* guid = current_->id ();
 
   CORBA::Octet *seq_buf = CORBA::OctetSeq::allocbuf (guid_length);
   ACE_OS::memcpy (seq_buf,
@@ -341,9 +321,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
     }
 
   request_info->add_request_service_context (*srv_con,
-                                             0
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                             0);
 
   lock_.acquire ();
   if (ready_que_.message_count () > 0)
@@ -359,9 +337,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
                   priority,
                   ACE_DEFAULT_THREAD_PRIORITY));
 
-      current_->the_priority (priority + 1
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      current_->the_priority (priority + 1);
 
       ACE_Thread::self (current);
       if (ACE_Thread::getprio (current, priority) == -1)
@@ -387,8 +363,7 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
                                 RTScheduling::Current::IdType_out guid_out,
                                 CORBA::String_out,
                                 CORBA::Policy_out sched_param_out,
-                                CORBA::Policy_out /*implicit_sched_param*/
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                CORBA::Policy_out /*implicit_sched_param*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -459,13 +434,11 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
 }
 
 void
-MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  RTScheduling::Current::IdType* guid = current_->id ();
 
   size_t count;
   ACE_OS::memcpy (&count,
@@ -489,8 +462,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
 }
 
 void
-MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -507,15 +479,13 @@ MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr
 }
 
 void
-MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL)
+MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     {
-      RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      RTScheduling::Current::IdType* guid = current_->id ();
 
       size_t count;
       ACE_OS::memcpy (&count,
@@ -541,22 +511,19 @@ MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
 }
 
 void
-MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
-                          ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL)
+MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var =
-    MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+    MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ());
 
   int importance = sched_param_var->importance ();
   CORBA::Octet *int_buf = CORBA::OctetSeq::allocbuf (sizeof (importance));
@@ -564,7 +531,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
                   &importance,
                   sizeof (importance));
 
-  RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  RTScheduling::Current::IdType* guid = current_->id ();
 
   size_t gu_id;
   ACE_OS::memcpy (&gu_id,
@@ -593,22 +560,18 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
 
-  current_->the_priority (priority - 1
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  current_->the_priority (priority - 1);
   new_dt->suspend ();
   lock_.release ();
 }
 
 void
-MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
-                                  ACE_ENV_ARG_DECL)
+MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var =
-    MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+    MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ());
 
   int importance = sched_param_var->importance ();
   CORBA::Octet *int_buf = CORBA::OctetSeq::allocbuf (sizeof (importance));
@@ -616,7 +579,7 @@ MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
                   &importance,
                   sizeof (importance));
 
-  RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  RTScheduling::Current::IdType* guid = current_->id ();
 
   size_t gu_id;
   ACE_OS::memcpy (&gu_id,
@@ -639,22 +602,18 @@ MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
 
-  current_->the_priority (priority - 1
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  current_->the_priority (priority - 1);
   new_dt->suspend ();
   lock_.release ();
 }
 
 void
-MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL)
+MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
  MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var =
-    MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+    MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ());
 
   int importance = sched_param_var->importance ();
   CORBA::Octet *int_buf = CORBA::OctetSeq::allocbuf (sizeof (importance));
@@ -662,7 +621,7 @@ MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
                   &importance,
                   sizeof (importance));
 
-  RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  RTScheduling::Current::IdType* guid = current_->id ();
 
   size_t gu_id;
   ACE_OS::memcpy (&gu_id,
@@ -685,43 +644,39 @@ MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
 
-  current_->the_priority (priority - 1
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  current_->the_priority (priority - 1);
   new_dt->suspend ();
   lock_.release ();
 }
 
 void
-MIF_Scheduler::cancel (const RTScheduling::Current::IdType &
-                       ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Scheduler::cancel (const RTScheduling::Current::IdType &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MIF_Scheduler::scheduling_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 void
-MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
-MIF_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MIF_Scheduler::poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
         return 0;
 }
 
 char *
-MIF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MIF_Scheduler::scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
         return 0;
@@ -729,8 +684,7 @@ MIF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 RTScheduling::ResourceManager_ptr
 MIF_Scheduler::create_resource_manager (const char *,
-                                        CORBA::Policy_ptr
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
         return 0;
@@ -739,8 +693,7 @@ MIF_Scheduler::create_resource_manager (const char *,
 void
 MIF_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
-                                         CORBA::Policy_ptr
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
index c388b0f58d6..ee1f5371f55 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h
@@ -34,17 +34,16 @@ public MIF_Scheduling::SegmentSchedulingParameterPolicy,
        public TAO_Local_RefCounted_Object
 {
  public:
-  virtual CORBA::Short importance (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short importance (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void importance (CORBA::Short importance
-                           ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void importance (CORBA::Short importance)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
@@ -65,8 +64,7 @@ public TAO_Local_RefCounted_Object
 
 
   virtual MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr
-    create_segment_scheduling_parameter (CORBA::Short segment_priority
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    create_segment_scheduling_parameter (CORBA::Short segment_priority)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void wait (void);
@@ -78,40 +76,34 @@ public TAO_Local_RefCounted_Object
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                const char * name,
                CORBA::Policy_ptr sched_param,
-               CORBA::Policy_ptr implicit_sched_param
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+               CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
          RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
             const char * name,
             CORBA::Policy_ptr sched_param,
-            CORBA::Policy_ptr implicit_sched_param
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+            CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
          RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid,
             const char * name,
             CORBA::Policy_ptr sched_param,
-            CORBA::Policy_ptr implicit_sched_param
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+            CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
          RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-               const char * name
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+               const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                 const char * name,
-                CORBA::Policy_ptr outer_sched_param
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                CORBA::Policy_ptr outer_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
          PortableInterceptor::ForwardRequest));
 
@@ -119,70 +111,58 @@ public TAO_Local_RefCounted_Object
         RTScheduling::Current::IdType_out guid,
         CORBA::String_out name,
         CORBA::Policy_out sched_param,
-        CORBA::Policy_out implicit_sched_param
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        CORBA::Policy_out implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
          PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
          PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
          PortableInterceptor::ForwardRequest));
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
          PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
          PortableInterceptor::ForwardRequest));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
          PortableInterceptor::ForwardRequest));
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void cancel (const RTScheduling::Current::IdType & guid)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * scheduling_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                     CORBA::Policy_ptr scheduling_parameter
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
            const char * name,
-           CORBA::Policy_ptr scheduling_parameter
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+           CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
index d504fd941f5..acbbb2b6caf 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
@@ -49,8 +49,7 @@ int
 MIF_Task::activate_task (RTScheduling::Current_ptr current,
        CORBA::Policy_ptr sched_param,
        long flags,
-       ACE_Time_Value* base_time
-       ACE_ENV_ARG_DECL)
+       ACE_Time_Value* base_time)
 {
 
   if (TAO_debug_level > 0)
@@ -64,9 +63,7 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current,
 
   base_time_ = base_time;
 
-  current_ = RTScheduling::Current::_narrow (current
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  current_ = RTScheduling::Current::_narrow (current);
 
   sched_param_ = CORBA::Policy::_duplicate (sched_param);
 
@@ -88,7 +85,7 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current,
 int
 MIF_Task::perform_task (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       char msg [BUFSIZ];
@@ -123,9 +120,7 @@ MIF_Task::perform_task (void)
 
           current_->update_scheduling_segment (name,
                                                sched_param.in (),
-                                               sched_param.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               sched_param.in ());
         }
 
       if (this->dist_)
@@ -152,22 +147,18 @@ MIF_Task::perform_task (void)
 
               current_->update_scheduling_segment (name,
                                                    sched_param.in (),
-                                                   sched_param.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                   sched_param.in ());
 
             }
 
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
index a4cfcf11993..d999a0b2637 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.h
@@ -20,11 +20,10 @@ class MIF_Task : public Thread_Task
   virtual int activate_task (RTScheduling::Current_ptr current,
 			     CORBA::Policy_ptr sched_param,
 			     long flags,
-			     ACE_Time_Value* base_time
-			     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+			     ACE_Time_Value* base_time);
 
   virtual int perform_task (void);
-  
+
  private:
   void pre_activate (void);
   void post_activate (void);
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index f290a52e718..481540e1c45 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -15,24 +15,17 @@ DT_Test::DT_Test (void)
 }
 
 int
-DT_Test::init (int argc, char *argv []
-         ACE_ENV_ARG_DECL)
+DT_Test::init (int argc, char *argv [])
 {
   orb_ = CORBA::ORB_init (argc,
         argv,
-        ""
-        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+        "");
 
   dt_creator_->orb (orb_.in ());
 
-  CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager"
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager");
 
-  TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj);
 
 
   ACE_NEW_RETURN (scheduler_,
@@ -41,50 +34,36 @@ DT_Test::init (int argc, char *argv []
   manager->rtscheduler (scheduler_);
 
   CORBA::Object_var object =
-    orb_->resolve_initial_references ("RTScheduler_Current"
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb_->resolve_initial_references ("RTScheduler_Current");
 
   current_  =
-    RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTScheduling::Current::_narrow (object.in ());
 
   return 0;
 }
 
 void
-DT_Test::run (int argc, char* argv []
-        ACE_ENV_ARG_DECL)
+DT_Test::run (int argc, char* argv [])
 {
-  init (argc,argv
-  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  init (argc,argv);
 
   TASK_STATS::instance ()->init (this->dt_creator_->total_load ());
-  if (this->dt_creator_->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->dt_creator_->resolve_naming_service () == -1)
     return;
-  ACE_CHECK;
 
-  this->dt_creator_->activate_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->dt_creator_->activate_root_poa ();
 
-  this->dt_creator_->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->dt_creator_->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->dt_creator_->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->dt_creator_->activate_poa_list ();
+  this->dt_creator_->activate_job_list ();
+  this->dt_creator_->activate_schedule ();
 
   DT_Creator* dt_creator = this->dt_creator_;
-  dt_creator->register_synch_obj (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  dt_creator->register_synch_obj ();
 
   ACE_DEBUG ((LM_DEBUG,
         "Registered Synch Object\n"));
 
-  dt_creator_->create_distributable_threads (current_.in ()
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  dt_creator_->create_distributable_threads (current_.in ());
 
   orb_->destroy ();
 
@@ -130,20 +109,16 @@ long flags;
 int
 DT_Test::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      dt_creator_->create_distributable_threads (current_.in ()
-             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dt_creator_->create_distributable_threads (current_.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -158,24 +133,20 @@ DT_Test::current (void)
 int
 main (int argc, char* argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_MIF_DT_Creator);
 
     ACE_DEBUG ((LM_DEBUG,
          "%t\n"));
-      DT_TEST::instance ()->run (argc, argv
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      DT_TEST::instance ()->run (argc, argv);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
index 273b9df8813..93d7b928d6d 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h
@@ -18,11 +18,9 @@ class DT_Test //:public ACE_Task <ACE_SYNCH>
 
   DT_Test (void);
 
-  int init (int argc, char *argv []
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (int argc, char *argv []);
 
-  void run (int argc, char *argv []
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void run (int argc, char *argv []);
 
   void dt_creator (MIF_DT_Creator* dt_creator);
 
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index 605979bb28f..e0572d8f57c 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -145,7 +145,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa)
 {
   CORBA::Policy_var priority_model_policy;
   CORBA::Policy_var lanes_policy;
@@ -155,9 +155,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
   // Create a priority model policy.
   priority_model_policy =
     rt_orb->create_priority_model_policy (priority_model_,
-                                          server_priority_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          server_priority_);
 
   if (lanes_.length () != 0)
     {
@@ -175,15 +173,11 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              max_request_buffer_size);
 
       // Create a thread-pool policy.
       lanes_policy =
-        rt_orb->create_threadpool_policy (threadpool_id
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id);
 
       ACE_DEBUG ((LM_DEBUG,
       "Activated Lanes\n"));
@@ -204,14 +198,10 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
                                    tp_priority_,
                                    allow_request_buffering,
                                    max_buffered_requests,
-                                   max_request_buffer_size
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   max_request_buffer_size);
 
 
-      thread_pool_policy = rt_orb->create_threadpool_policy (threadpool_id_1
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      thread_pool_policy = rt_orb->create_threadpool_policy (threadpool_id_1);
 
       ACE_DEBUG ((LM_DEBUG,
       "Activated thread pool\n"));
@@ -223,9 +213,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
     {
       // Create a bands policy.
       bands_policy =
-        rt_orb->create_priority_banded_connection_policy (this->bands_
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rt_orb->create_priority_banded_connection_policy (this->bands_);
       ACE_DEBUG ((LM_DEBUG,
       "Activated Bands\n"));
 
@@ -306,12 +294,9 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
 
   // Get the POA Manager.
   PortableServer::POAManager_var poa_manager =
-    parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    parent_poa->the_POAManager ();
 
   parent_poa->create_POA (POA_name_.c_str (),
                           poa_manager.in (),
-                          poa_policy_list
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          poa_policy_list);
 }
diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h
index a42d3335894..77a20d2bab6 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -40,8 +40,7 @@ public:
   int init (ACE_Arg_Shifter& arg_shifter);
 
   /// Activate the new POA using the parameters initialized before.
-  void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa
-                 ACE_ENV_ARG_DECL);
+  void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa);
 
  protected:
   /// = POA create options.
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 8cd648b1cf3..88296f3b815 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -14,10 +14,9 @@ Starter::Starter (CORBA::ORB_ptr orb)
 }
 
 void
-Starter::init (ACE_ENV_SINGLE_ARG_DECL)
+Starter::init (void)
 {
-  this->resolve_synch_objs (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->resolve_synch_objs ();
 
   this->fire ();
 }
@@ -35,7 +34,7 @@ Starter::fire (void)
 }
 
 void
-Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL)
+Starter::resolve_synch_objs (void)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -45,9 +44,7 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL)
     CORBA::string_dup ("Synch");
 
   CORBA::Object_var object =
-    this->naming_client_->resolve (name
-           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_client_->resolve (name);
 
   this->synch_context_ =
     CosNaming::NamingContext::_narrow (object.in ());
@@ -60,14 +57,10 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL)
   // Get the list of synchs registered for this sender.
   this->synch_context_->list (chunk,
             binding_list,
-            iterator
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+            iterator);
 
   // Add the receivers found in the bindinglist to the <receivers>.
-  this->add_to_synchs (binding_list
-           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->add_to_synchs (binding_list);
 
   if (!CORBA::is_nil (iterator.in ()))
     {
@@ -77,13 +70,9 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL)
       while (more)
         {
           more = iterator->next_n (chunk,
-                                   binding_list
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                   binding_list);
 
-          this->add_to_synchs (binding_list
-             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->add_to_synchs (binding_list);
         }
     }
 
@@ -91,8 +80,7 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Starter::add_to_synchs (CosNaming::BindingList &binding_list
-      ACE_ENV_ARG_DECL)
+Starter::add_to_synchs (CosNaming::BindingList &binding_list)
 {
   ACE_Time_Value base_time = ACE_OS::gettimeofday ();
   for (CORBA::ULong i = 0;
@@ -115,8 +103,7 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list
       // Resolve the reference of the receiver from the receiver
       // context.
       CORBA::Object_var obj =
-        this->synch_context_->resolve (name
-               ACE_ENV_ARG_PARAMETER);
+        this->synch_context_->resolve (name);
 
       Synch_var synch_obj =
         Synch::_narrow (obj.in ());
@@ -134,27 +121,22 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
               argv,
-              ""
-              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+              "");
 
       Starter starter (orb.in ());
 
-      starter.init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      starter.init ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 return 0;
 }
 
diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h
index 13c7a0d0c80..757af4cae0a 100644
--- a/TAO/examples/RTScheduling/Starter.h
+++ b/TAO/examples/RTScheduling/Starter.h
@@ -16,7 +16,7 @@ class Starter
 
   Starter (CORBA::ORB_ptr orb);
 
-  void init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void init (void);
 
   void fire (void);
 
@@ -25,10 +25,9 @@ class Starter
                                 ACE_Null_Mutex> Synchs;
 
  private:
-  void resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void resolve_synch_objs (void);
 
-  void add_to_synchs (CosNaming::BindingList &binding_list
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void add_to_synchs (CosNaming::BindingList &binding_list);
 
   /// A naming context.
   CosNaming::NamingContext_var synch_context_;
diff --git a/TAO/examples/RTScheduling/Synch_i.cpp b/TAO/examples/RTScheduling/Synch_i.cpp
index 339c225e7bb..43f48446ccf 100644
--- a/TAO/examples/RTScheduling/Synch_i.cpp
+++ b/TAO/examples/RTScheduling/Synch_i.cpp
@@ -8,8 +8,7 @@ Synch_i::Synch_i (void)
 }
 
 void
-Synch_i::go (CORBA::Long base_time
-             ACE_ENV_ARG_DECL_NOT_USED)
+Synch_i::go (CORBA::Long base_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/RTScheduling/Synch_i.h b/TAO/examples/RTScheduling/Synch_i.h
index e0307668200..9758f3bd8c4 100644
--- a/TAO/examples/RTScheduling/Synch_i.h
+++ b/TAO/examples/RTScheduling/Synch_i.h
@@ -10,8 +10,7 @@ class SYNCH_Export Synch_i : public POA_Synch
  public:
 
   Synch_i (void);
-  virtual void go (CORBA::Long base_time
-                   ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void go (CORBA::Long base_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   int synched (void);
diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp
index ded158b93b0..22abb129d88 100644
--- a/TAO/examples/RTScheduling/Thread_Task.cpp
+++ b/TAO/examples/RTScheduling/Thread_Task.cpp
@@ -26,7 +26,7 @@ Thread_Task::Thread_Task (void)
 int
 Thread_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (TAO_debug_level > 0)
         {
@@ -39,9 +39,7 @@ Thread_Task::svc (void)
       CORBA::Policy_var implicit_sched_param = CORBA::Policy::_duplicate (sched_param_.in ());;
       this->current_->begin_scheduling_segment (name,
                                                 sched_param_.in (),
-                                                implicit_sched_param.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                implicit_sched_param.in ());
 
       ACE_OS::memcpy (&count_,
                       this->current_->id ()->get_buffer (),
@@ -59,18 +57,14 @@ Thread_Task::svc (void)
 
       this->perform_task ();
 
-      this->current_->end_scheduling_segment (name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_->end_scheduling_segment (name);
 
       dt_creator_->dt_ended () ;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h
index 0af6dda5a1a..ace9e6a8880 100644
--- a/TAO/examples/RTScheduling/Thread_Task.h
+++ b/TAO/examples/RTScheduling/Thread_Task.h
@@ -25,8 +25,7 @@ class RTSCHEDTESTLIB_Export Thread_Task : public ACE_Task <ACE_SYNCH>
   virtual int activate_task (RTScheduling::Current_ptr current,
                              CORBA::Policy_ptr sched_param,
                              long flags,
-                             ACE_Time_Value* base_time
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                             ACE_Time_Value* base_time) = 0;
 
   virtual int perform_task (void);
 
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 6a1e517f271..f8055d55ad2 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -90,31 +90,24 @@ Server<Servant>::test_for_ins (CORBA::String_var ior)
                 this->ins_,
                 ior.in ()));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
         }
 
-      adapter->bind (this->ins_, ior.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      adapter->bind (this->ins_, ior.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -123,21 +116,18 @@ Server<Servant>::test_for_ins (CORBA::String_var ior)
 template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
-                       char *argv[]
-                       ACE_ENV_ARG_DECL)
+                       char *argv[])
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
 
-  ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
   this->argv_ = argv;
@@ -170,13 +160,11 @@ Server<Servant>::init (const char *servant_name,
 
   // Make sure that you check for failures here via the ACE_TRY
   // macros?!
-  ACE_TRY
+  try
     {
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
-                                                     &this->servant_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                     &this->servant_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
@@ -197,21 +185,21 @@ Server<Servant>::init (const char *servant_name,
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\tException in activation of POA");
+      ex._tao_print_exception (
+        "\tException in activation of POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 template <class Servant>int
-Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
+Server<Servant>::run (void)
 {
     // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
@@ -232,21 +220,16 @@ Server<Servant>::register_name (void)
   bindName.length (1);
   bindName[0].id = CORBA::string_dup (name);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // (re)Bind the object.
-  ACE_TRY
+  try
     {
-      CORBA::Object_var object = servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = servant_._this ();
 
-      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_manager_.activate_poa_manager ();
 
       naming_client_->rebind (bindName,
-                              object.in()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              object.in());
 
       // Test for INS.
       if (this->ins_)
@@ -259,15 +242,13 @@ Server<Servant>::register_name (void)
                               -1);
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Unable to bind %s \n",
                          name),
                         -1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -377,16 +358,13 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
   this->argv_ = argv;
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -395,8 +373,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->string_to_object (this->ior_);
 
 
           if (CORBA::is_nil (server_object.in ()))
@@ -404,9 +381,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
                                "invalid ior <%s>\n",
                                this->ior_),
                               -1);
-          this->server_ = INTERFACE_OBJECT::_narrow (server_object.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_ = INTERFACE_OBJECT::_narrow (server_object.in ());
         }
       else if (this->naming_ == 1)
         {
@@ -414,8 +389,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
           ACE_DEBUG((LM_DEBUG,
                      "Using the Naming Service \n"));
           this->name_ = const_cast<char *> (name);
-          int retv = this->obtain_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int retv = this->obtain_initial_references ();
           if (retv ==-1)
             return -1;
         }
@@ -426,12 +400,11 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init");
+      ex._tao_print_exception ("Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -439,10 +412,10 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
 
 
 template <class INTERFACE_OBJECT, class Var> int
-Client<INTERFACE_OBJECT, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL)
+Client<INTERFACE_OBJECT, Var>::obtain_initial_references (void)
 {
 
-  ACE_TRY
+  try
     {
       // Initialize the naming services.
       if (naming_client_.init (orb_.in ()) != 0)
@@ -457,20 +430,16 @@ Client<INTERFACE_OBJECT, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DEC
       server_name[0].id =
       CORBA::string_dup (this->name_);
       CORBA::Object_var obj =
-        naming_client_->resolve (server_name
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_client_->resolve (server_name);
 
-      this->server_ = INTERFACE_OBJECT::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->server_ = INTERFACE_OBJECT::_narrow (obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::obtain_initial_references");
+       ex._tao_print_exception (
+         "Client::obtain_initial_references");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 453335f52f3..6c43056c84d 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -47,8 +47,7 @@ public:
 
   int init (const char *servant_name,
             int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -56,7 +55,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
   int test_for_ins (CORBA::String_var ior);
@@ -127,7 +126,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL);
+  int obtain_initial_references (void);
   // Initialize naming service
 
   CORBA::ORB_ptr orb (void) {return this->orb_.in ();}
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index c6404e5ac28..c8f2efdecb5 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -45,8 +45,7 @@ AccountManager_i::set_orb_manager (TAO_ORB_Manager *orb_manager)
 
 Bank::Account_ptr
 AccountManager_i::open (const char *name,
-                        CORBA::Float initial_balance
-                        ACE_ENV_ARG_DECL)
+                        CORBA::Float initial_balance)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Account_i *result = 0;
@@ -65,7 +64,6 @@ AccountManager_i::open (const char *name,
                         Account_i (name,
                                    initial_balance),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (Bank::Account::_nil ());
 
       // Enter the new Account in the hash map. If the <bind> fails
       // throw an UNKNOWN exception. <result> may be valid but since
@@ -93,16 +91,14 @@ AccountManager_i::open (const char *name,
 // Shutdown.
 
 void
-AccountManager_i::close (Bank::Account_ptr account
-                         ACE_ENV_ARG_DECL)
+AccountManager_i::close (Bank::Account_ptr account)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::String_var name =
-        CORBA::string_dup (account->name (ACE_ENV_SINGLE_ARG_PARAMETER));
+        CORBA::string_dup (account->name ());
 
-      ACE_TRY_CHECK;
 
       if (hash_map_.unbind (name.in ()) == -1)
         {
@@ -115,17 +111,14 @@ AccountManager_i::close (Bank::Account_ptr account
                    "[SERVER] Process/Thread Id : (%P/%t) Closing Account for %s\n",
                    (char *) name));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unable to close Account\n");
+      ex._tao_print_exception ("Unable to close Account\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-AccountManager_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AccountManager_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index ebae834858d..441152eafa6 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -56,18 +56,16 @@ public:
   // Destructor.
 
   virtual Bank::Account_ptr open (const char *name,
-                                  CORBA::Float initial_balance
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Float initial_balance)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the Account interface with the given name from the server.
   // Put the initial balance specified in the new account.
 
-  virtual void close (Bank::Account_ptr
-                      ACE_ENV_ARG_DECL)
+  virtual void close (Bank::Account_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Close the given account.
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp
index 2f150afc54a..6243c29e421 100644
--- a/TAO/examples/Simple/bank/Account_i.cpp
+++ b/TAO/examples/Simple/bank/Account_i.cpp
@@ -37,42 +37,39 @@ Account_i::orb (CORBA::ORB_ptr o)
 // Return the current balance on the server.
 
 CORBA::Float
-Account_i::balance (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Account_i::balance (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return balance_;
 }
 
 void
-Account_i::deposit (CORBA::Float deposit
-                    ACE_ENV_ARG_DECL_NOT_USED)
+Account_i::deposit (CORBA::Float deposit)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   balance_ += deposit;
 }
 
 void
-Account_i::withdraw (CORBA::Float withdrawl
-                     ACE_ENV_ARG_DECL)
+Account_i::withdraw (CORBA::Float withdrawl)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Bank::Account::Overdraft))
 {
   if (balance_ >= withdrawl)
     balance_ -= withdrawl;
   else
-    ACE_THROW (Bank::Account::Overdraft ("Exception::Overdraft\n"));
+    throw Bank::Account::Overdraft ("Exception::Overdraft\n");
 }
 
 char *
-Account_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Account_i::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
-Account_i::name (const char *name
-                 ACE_ENV_ARG_DECL_NOT_USED)
+Account_i::name (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->name_ = CORBA::string_dup (name);
diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h
index 1190a811220..657a53f1156 100644
--- a/TAO/examples/Simple/bank/Account_i.h
+++ b/TAO/examples/Simple/bank/Account_i.h
@@ -42,27 +42,24 @@ public:
   ~Account_i (void);
   // Destructor.
 
-  virtual CORBA::Float balance (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Float balance (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Get the current balance in the account.
 
-  virtual char *name (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char *name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the name of the <Account> holder.
 
-  virtual void name (const char *name
-                     ACE_ENV_ARG_DECL)
+  virtual void name (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the name of the <Account> holder.
 
-  virtual void deposit (CORBA::Float
-                        ACE_ENV_ARG_DECL)
+  virtual void deposit (CORBA::Float)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deposit money in the account.
 
-  virtual void withdraw (CORBA::Float
-                         ACE_ENV_ARG_DECL)
+  virtual void withdraw (CORBA::Float)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Bank::Account::Overdraft));
   // Withdraw money in the account.
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp
index a201d196a02..cb329902373 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.cpp
+++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp
@@ -29,19 +29,17 @@ Bank_Client_i::run (const char *name,
   if (client.init (name,argc, argv) == -1)
     return -1;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       this->check_accounts ();
       if (client.shutdown () == 1)
-        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "\nException caught in run\n"));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -49,29 +47,25 @@ Bank_Client_i::run (const char *name,
 int
 Bank_Client_i::check_accounts (void )
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "\nTests for account with same name\n"));
-      this->test_for_same_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_for_same_name ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nTests for account with different names\n"));
-      this->test_for_different_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_for_different_name ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nTests for overdrafts\n"));
-      this->test_for_overdraft (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_for_overdraft ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "From Bank_Client_i::check_accounts()"));
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -79,33 +73,29 @@ Bank_Client_i::check_accounts (void )
 // a same name can be opened
 
 void
-Bank_Client_i::test_for_same_name (ACE_ENV_SINGLE_ARG_DECL)
+Bank_Client_i::test_for_same_name (void)
 {
 
   const char *name = "Name";
   CORBA::Float initial_bal = 0.00;
 
   Bank::Account_var acct_id1 = client->open (name,
-                                             initial_bal
-                                             ACE_ENV_ARG_PARAMETER);
+                                             initial_bal);
 
   Bank::Account_var acct_id2 = client->open (name,
-                                             initial_bal
-                                             ACE_ENV_ARG_PARAMETER);
+                                             initial_bal);
 
   ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *) acct_id2.in ()) != 0);
 
-  client->close (acct_id1.in ()
-                 ACE_ENV_ARG_PARAMETER);
+  client->close (acct_id1.in ());
 
-  client->close (acct_id2.in ()
-                 ACE_ENV_ARG_PARAMETER);
+  client->close (acct_id2.in ());
 }
 
 // This method tests whether an account with different names can be opened
 
 void
-Bank_Client_i::test_for_different_name (ACE_ENV_SINGLE_ARG_DECL)
+Bank_Client_i::test_for_different_name (void)
 {
   const char *name1 = "Name1";
   const char *name2 = "Name2";
@@ -113,40 +103,32 @@ Bank_Client_i::test_for_different_name (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Float initial_bal = 0.0;
 
   Bank::Account_var acct_id1 = client->open (name1,
-                                             initial_bal
-                                             ACE_ENV_ARG_PARAMETER);
+                                             initial_bal);
 
   Bank::Account_var acct_id2 = client->open (name2,
-                                             initial_bal
-                                             ACE_ENV_ARG_PARAMETER);
+                                             initial_bal);
   ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *)acct_id2.in ()) == 0);
 
-  client->close (acct_id1.in ()
-                 ACE_ENV_ARG_PARAMETER);
+  client->close (acct_id1.in ());
 
-  client->close (acct_id2.in ()
-                 ACE_ENV_ARG_PARAMETER);
+  client->close (acct_id2.in ());
 }
 
 // This method tests the Overdraft exception.
 
 void
-Bank_Client_i::test_for_overdraft (ACE_ENV_SINGLE_ARG_DECL)
+Bank_Client_i::test_for_overdraft (void)
 {
 
   CORBA::Float initial_bal = 100.0;
   const char *name = "Name";
-  Bank::Account_var acct_id = client->open (name, initial_bal ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  acct_id->deposit (100.00 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Bank::Account_var acct_id = client->open (name, initial_bal);
+  acct_id->deposit (100.00);
 
-  CORBA::Float bal = acct_id->balance (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Float bal = acct_id->balance ();
 
   acct_id->withdraw (bal + 20);
 
-  client->close (acct_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  client->close (acct_id.in ());
 }
 
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h
index 7f1a4084c8c..44fa6e2d4d4 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.h
+++ b/TAO/examples/Simple/bank/Bank_Client_i.h
@@ -50,15 +50,15 @@ private:
   int check_accounts (void);
   // Method that calls all the test functions
 
-  void test_for_different_name (ACE_ENV_SINGLE_ARG_DECL);
+  void test_for_different_name (void);
   // Tests if accounts opened with different names return a different account
   // reference.
 
-  void test_for_same_name (ACE_ENV_SINGLE_ARG_DECL);
+  void test_for_same_name (void);
   // Tests if accounts opened with the same name return the same
   // object reference.
 
-  void test_for_overdraft (ACE_ENV_SINGLE_ARG_DECL);
+  void test_for_overdraft (void);
   // Tests for the Overdraft Exception when the client tries to
   // withdraw more money than the current balance.
 };
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index 57ded2b1063..2b6f62e3624 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -12,31 +12,28 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tBank server\n\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (server.init ("Bank",
                        argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,"User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,"System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
 
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp
index 6aee1874901..24ad01cda93 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.cpp
+++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp
@@ -43,8 +43,7 @@ Broadcaster_i::~Broadcaster_i (void)
 
 void
 Broadcaster_i::add (Receiver_ptr receiver,
-                    const char *nickname
-                    ACE_ENV_ARG_DECL)
+                    const char *nickname)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotAdd
@@ -58,7 +57,7 @@ Broadcaster_i::add (Receiver_ptr receiver,
 
   // Insert the Receiver reference to the set
   if (receiver_set_.insert (receiver_data) == -1)
-    ACE_THROW (Broadcaster::CannotAdd ("failed to add to the receiver set\n"));
+    throw Broadcaster::CannotAdd ("failed to add to the receiver set\n");
 
   // Tell everyone which person just joined the chat.
   ACE_CString broadcast_string =
@@ -66,24 +65,18 @@ Broadcaster_i::add (Receiver_ptr receiver,
     + ACE_CString (nickname)
     + ACE_CString (" has joined the chat ****\n");
 
-  ACE_TRY
+  try
     {
-      this->broadcast (broadcast_string.fast_rep ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->broadcast (broadcast_string.fast_rep ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Broadcaster_i::broadcast failed.\t\n");
+      ex._tao_print_exception ("Broadcaster_i::broadcast failed.\t\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Broadcaster_i::remove (Receiver_ptr receiver
-                       ACE_ENV_ARG_DECL)
+Broadcaster_i::remove (Receiver_ptr receiver)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotRemove
@@ -110,7 +103,7 @@ Broadcaster_i::remove (Receiver_ptr receiver
 
   // Remove the reference from our list.
   if (this->receiver_set_.remove (receiver_data_to_remove) == -1)
-    ACE_THROW(Broadcaster::CannotRemove ("failed to remove from receiver set\n"));
+    throw Broadcaster::CannotRemove ("failed to remove from receiver set\n");
 
   // Tell everyone, which person left the chat.
   ACE_CString broadcast_string = "**** "
@@ -118,20 +111,17 @@ Broadcaster_i::remove (Receiver_ptr receiver
     + " left the chat"
     + " ****\n";
 
-  this->broadcast (broadcast_string.fast_rep ()
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->broadcast (broadcast_string.fast_rep ());
 }
 
 void
 Broadcaster_i::say (Receiver_ptr receiver,
-                    const char *text
-                    ACE_ENV_ARG_DECL)
+                    const char *text)
  ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  ACE_TRY
+  try
     {
       ACE_CString sender_nickname ("Sender Unknown");
 
@@ -152,22 +142,16 @@ Broadcaster_i::say (Receiver_ptr receiver,
       // Broadcast the message to all registered clients
       ACE_CString broadcast_string ("[" + sender_nickname + "] " + text);
 
-      this->broadcast (broadcast_string.fast_rep ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->broadcast (broadcast_string.fast_rep ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Broadcaster_i::say\t\n");
+      ex._tao_print_exception ("Broadcaster_i::say\t\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Broadcaster_i::broadcast (const char *text
-                          ACE_ENV_ARG_DECL)
+Broadcaster_i::broadcast (const char *text)
 {
   // Broadcast the message to all registered clients.
 
@@ -175,18 +159,15 @@ Broadcaster_i::broadcast (const char *text
        iter != this->receiver_set_.end ();
        iter++)
     {
-      ACE_TRY
+      try
         {
-          (*iter).receiver_->message (text
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (*iter).receiver_->message (text);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Failed to send a message\n");
+          ex._tao_print_exception (
+            "Failed to send a message\n");
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index 666f8ab66c7..dbe9857c821 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -45,16 +45,14 @@ public:
   // Destructor.
 
   virtual void add (Receiver_ptr receiver,
-                    const char *nickname
-                    ACE_ENV_ARG_DECL)
+                    const char *nickname)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotAdd
     ));
   // Saves receiver references in a list.
 
-  virtual void remove (Receiver_ptr receiver
-                       ACE_ENV_ARG_DECL)
+  virtual void remove (Receiver_ptr receiver)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotRemove
@@ -62,8 +60,7 @@ public:
   // Removes receiver references from the list.
 
   virtual void say (Receiver_ptr receiver,
-                    const char *text
-                    ACE_ENV_ARG_DECL)
+                    const char *text)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -73,8 +70,7 @@ public:
   TAO_ORB_Manager orb_manager_;
   // The ORB manager.
 
-  void broadcast (const char* text
-                  ACE_ENV_ARG_DECL);
+  void broadcast (const char* text);
   // Broadcasts the text to all registered clients.
 
   class Receiver_Data
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index 268da16eaeb..d84fe2d98c0 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -84,14 +84,12 @@ Client_i::init (int argc, char *argv[])
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Retrieve the ORB.
       this->orb_manager_.init (argc,
                                argv,
-                               0
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               0);
 
       CORBA::ORB_var orb = this->orb_manager_.orb ();
 
@@ -106,9 +104,7 @@ Client_i::init (int argc, char *argv[])
                           -1);
 
       CORBA::Object_var server_object =
-        orb->string_to_object (this->ior_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (this->ior_);
 
       if (CORBA::is_nil (server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -116,17 +112,13 @@ Client_i::init (int argc, char *argv[])
                            this->ior_),
                           -1);
 
-      this->server_ = Broadcaster::_narrow (server_object.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->server_ = Broadcaster::_narrow (server_object.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "client_i::init\n");
+      ex._tao_print_exception ("client_i::init\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   // Register our <Input_Handler> to handle STDIN events, which will
   // trigger the <handle_input> method to process these events.
@@ -149,34 +141,27 @@ Client_i::run (void)
               "\n============= Simple Chat =================\n"
               "========== type 'quit' to exit  ===========\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableServer::POAManager_var poa_manager =
         this->orb_manager_.poa_manager ();
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       this->receiver_var_ =
-        this->receiver_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->receiver_i_._this ();
 
       // Register ourselves with the server.
       server_->add (this->receiver_var_.in (),
-                    this->nickname_
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    this->nickname_);
 
       // Run the ORB.
-      this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_manager_.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_i::run ()");
+      ex._tao_print_exception ("Client_i::run ()");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -189,7 +174,7 @@ Client_i::handle_input (ACE_HANDLE)
   if (ACE_OS::fgets (buf, BUFSIZ, stdin) == 0)
     return 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Check if the user wants to quit.
       if (ACE_OS::strncmp (buf,
@@ -198,26 +183,21 @@ Client_i::handle_input (ACE_HANDLE)
         {
           // Remove ourselves from the server.
           this->server_->remove (this->receiver_var_.in ());
-          this->receiver_i_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->receiver_i_.shutdown ();
 
-          ACE_TRY_CHECK;
           return 0;
         }
 
       // Call the server function <say> to pass the string typed by
       // the server.
       this->server_->say (this->receiver_var_.in (),
-                          buf
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          buf);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Input_Handler::init");
+      ex._tao_print_exception ("Input_Handler::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp
index ac2ba71f635..76f87bb8ec5 100644
--- a/TAO/examples/Simple/chat/Receiver_i.cpp
+++ b/TAO/examples/Simple/chat/Receiver_i.cpp
@@ -28,8 +28,7 @@ Receiver_i::~Receiver_i (void)
 }
 
 void
-Receiver_i::message (const char *msg
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Receiver_i::message (const char *msg)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -40,7 +39,7 @@ Receiver_i::message (const char *msg
 }
 
 void
-Receiver_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Receiver_i::shutdown (void)
  ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h
index 7c3a0767517..8db9998cc4a 100644
--- a/TAO/examples/Simple/chat/Receiver_i.h
+++ b/TAO/examples/Simple/chat/Receiver_i.h
@@ -37,14 +37,13 @@ public:
   ~Receiver_i (void);
   // Destructor.
 
-  virtual void message (const char *msg
-                        ACE_ENV_ARG_DECL)
+  virtual void message (const char *msg)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
   // Receives a message string.
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp
index 208a440ad86..651990e7ebb 100644
--- a/TAO/examples/Simple/chat/Server_i.cpp
+++ b/TAO/examples/Simple/chat/Server_i.cpp
@@ -60,29 +60,24 @@ Server_i::parse_args (int argc, char *argv[])
 
 int
 Server_i::init (int argc,
-                char *argv[]
-                ACE_ENV_ARG_DECL)
+                char *argv[])
 {
   // Parse the command line options.
   if (this-> parse_args(argc, argv) == -1)
     return -1;
 
   if (this->orb_manager_.init (argc,
-                               argv
-                               ACE_ENV_ARG_PARAMETER) == -1)
+                               argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "orb manager init failed\n"),
                       -1);
-  ACE_CHECK_RETURN (-1);
 
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
   // Activate the servant.
   CORBA::String_var str =
-    this->orb_manager_.activate (&this->broadcaster_i_
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_manager_.activate (&this->broadcaster_i_);
 
   // Write the IOR to a file.
   this->write_IOR (str.in ());
@@ -90,14 +85,13 @@ Server_i::init (int argc,
 }
 
 int
-Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Server_i::run (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running chat server...\n"));
 
   // Run the main event loop for the ORB.
-  int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int ret = this->orb_manager_.run ();
   if (ret == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index 03fdd200b37..3a651d95639 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -39,11 +39,10 @@ public:
  // Destructor.
 
  int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
  // Initialize the server.
 
- int run (ACE_ENV_SINGLE_ARG_DECL);
+ int run (void);
  // Run the ORB.
 
 private:
diff --git a/TAO/examples/Simple/chat/client.cpp b/TAO/examples/Simple/chat/client.cpp
index 7caf6e595a0..9cf87f0b0f7 100644
--- a/TAO/examples/Simple/chat/client.cpp
+++ b/TAO/examples/Simple/chat/client.cpp
@@ -21,7 +21,7 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Client_i client_i;
 
@@ -29,15 +29,12 @@ main (int argc, char *argv[])
 	  || client_i.run () == -1)
 	return -1;
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "client::main\t\n");
+      ex._tao_print_exception ("client::main\t\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp
index 66937b85a2e..f459c40a8df 100644
--- a/TAO/examples/Simple/chat/server.cpp
+++ b/TAO/examples/Simple/chat/server.cpp
@@ -23,30 +23,26 @@ int
 main (int argc, char *argv[])
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_i server_i;
 
-      int ret = server_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int ret = server_i.init (argc, argv);
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "\n error in init.\n"),
                           1);
-      ret = server_i.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ret = server_i.run ();
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "\n error in run.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "server::main\t\n");
+      ex._tao_print_exception ("server::main\t\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp
index 67088738cf4..a91569cd1e6 100644
--- a/TAO/examples/Simple/echo/Echo_Client_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp
@@ -28,9 +28,8 @@ Echo_Client_i::run (const char *name,
   if (client.init (name,argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       while (1)
         {
@@ -43,9 +42,7 @@ Echo_Client_i::run (const char *name,
           if (ACE_OS::fgets (buf,sizeof buf, stdin) == 0)
             break;
 
-          CORBA::String_var s = client->echo_string (buf
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::String_var s = client->echo_string (buf);
 
           ACE_DEBUG ((LM_DEBUG,
                       "\nString echoed by client \n%s\n",
@@ -53,18 +50,15 @@ Echo_Client_i::run (const char *name,
         }
 
       if (client.shutdown () == 1)
-        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+        client->shutdown ();
 
-      ACE_TRY_CHECK;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI");
+      ex._tao_print_exception ("\n Exception in RMI");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index aeef101e78d..64bdb6e52f3 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -27,8 +27,7 @@ Echo_i::orb (CORBA::ORB_ptr o)
 // Return a list of object references.
 
 Echo::List *
-Echo_i::echo_list (const char *
-                   ACE_ENV_ARG_DECL)
+Echo_i::echo_list (const char *)
  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Echo::List_var list;
@@ -47,19 +46,13 @@ Echo_i::echo_list (const char *
 
   // Just do something to get a list of object references.
   list[CORBA::ULong(0)] =
-    orb_->resolve_initial_references ("NameService"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    orb_->resolve_initial_references ("NameService");
 
   list[CORBA::ULong(1)] =
-    orb_->resolve_initial_references ("NameService"
-                                      ACE_ENV_ARG_PARAMETER);;
-  ACE_CHECK_RETURN (0);
+    orb_->resolve_initial_references ("NameService");;
 
   list[CORBA::ULong(2)] =
-    orb_->resolve_initial_references ("NameService"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    orb_->resolve_initial_references ("NameService");
 
   return list._retn ();
 }
@@ -67,8 +60,7 @@ Echo_i::echo_list (const char *
 // Return the mesg string from the server
 
 char *
-Echo_i::echo_string (const char *mesg
-                     ACE_ENV_ARG_DECL)
+Echo_i::echo_string (const char *mesg)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The pointer mesg was NULL, return.
@@ -94,7 +86,7 @@ Echo_i::echo_string (const char *mesg
 // Shutdown the server application.
 
 void
-Echo_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index 1b782cce796..1b5628a6a0e 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -40,17 +40,15 @@ public:
   ~Echo_i (void);
   // Destructor.
 
-  virtual Echo::List *echo_list (const char *mesg
-                                 ACE_ENV_ARG_DECL)
+  virtual Echo::List *echo_list (const char *mesg)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the mesg string back from the server.
 
-  virtual char *echo_string (const char *mesg
-                             ACE_ENV_ARG_DECL)
+  virtual char *echo_string (const char *mesg)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the mesg string back from the server.
 
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
    ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index b74d5bc7af6..9755513ceab 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -12,33 +12,29 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tEcho server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (server.init ("Echo",
                        argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,"User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
 
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index d333682c8dd..1091f06a98e 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -78,16 +78,13 @@ Grid_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Make the Grid.
 
       Grid_var grid = client->make_grid (width_,
-                                         height_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         height_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Made the grid succesfully\n"));
@@ -95,42 +92,33 @@ Grid_Client_i::run (const char *name,
       // Set a value on the grid
       grid->set (setx_,
                  sety_,
-                 value_
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                 value_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Setting a value for the grid\n"));
 
       CORBA::Long ret_val = grid->get (setx_,
-                                       sety_
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       sety_);
 
       ACE_ASSERT (ret_val == value_);
 
       if (client.shutdown () == 1) {
-        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        client->shutdown ();
       }
 
       client.orb ()->destroy ();
       ACE_UNUSED_ARG (ret_val);
     }
-  ACE_CATCH (CORBA::UserException, range_ex)
+  catch (const CORBA::UserException& range_ex)
     {
-      ACE_PRINT_EXCEPTION (range_ex,
-                           "\tFrom get and set grid");
+      range_ex._tao_print_exception ("\tFrom get and set grid");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, memex)
+  catch (const CORBA::SystemException& memex)
     {
-      ACE_PRINT_EXCEPTION (memex,
-                           "Cannot make grid as Memory exhausted");
+      memex._tao_print_exception ("Cannot make grid as Memory exhausted");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 8a320540b28..47998c5d449 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -16,15 +16,13 @@ Grid_i::Grid_i (void)
 //  Constructor.
 
 Grid_i::Grid_i (CORBA::Short x,
-                CORBA::Short y
-                ACE_ENV_ARG_DECL)
+                CORBA::Short y)
   : width_ (x),
     height_ (y)
 {
   ACE_NEW_THROW_EX (array_,
                     CORBA::Long *[y],
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   // Allocate memory for the matrix.
 
@@ -33,7 +31,6 @@ Grid_i::Grid_i (CORBA::Short x,
       ACE_NEW_THROW_EX (array_[ctr],
                         CORBA::Long[x],
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
 
 }
@@ -50,8 +47,7 @@ Grid_i::~Grid_i (void)
 void
 Grid_i::set (CORBA::Short x,
              CORBA::Short y,
-             CORBA::Long value
-             ACE_ENV_ARG_DECL)
+             CORBA::Long value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -59,7 +55,7 @@ Grid_i::set (CORBA::Short x,
       || y < 0
       || x >= width_
       || y >= height_)
-    ACE_THROW (Grid::RANGE_ERROR ());
+    throw Grid::RANGE_ERROR ();
   else
     array_[x][y] = value;
 }
@@ -68,8 +64,7 @@ Grid_i::set (CORBA::Short x,
 
 CORBA::Long
 Grid_i::get (CORBA::Short x,
-             CORBA::Short y
-             ACE_ENV_ARG_DECL)
+             CORBA::Short y)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -85,30 +80,28 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::width (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::height (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
 }
 
 void
-Grid_i::width (CORBA::Short x
-               ACE_ENV_ARG_DECL_NOT_USED)
+Grid_i::width (CORBA::Short x)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
 }
 
 void
-Grid_i::height (CORBA::Short y
-                ACE_ENV_ARG_DECL_NOT_USED)
+Grid_i::height (CORBA::Short y)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
@@ -117,7 +110,7 @@ Grid_i::height (CORBA::Short y
 // Destroy the grid
 
 void
-Grid_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
@@ -143,7 +136,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 // Shutdown.
 
 void
-Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_Factory_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -172,8 +165,7 @@ Grid_Factory_i::~Grid_Factory_i (void)
 
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
-                           CORBA::Short height
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Short height)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Grid_i *grid_ptr = 0;
@@ -192,12 +184,10 @@ Grid_Factory_i::make_grid (CORBA::Short width,
   // This attempts to create a new Grid_i and throws an exception and
   // returns a null value if it fails
   ACE_NEW_THROW_EX (grid_ptr,
-                    Grid_i (width, height ACE_ENV_ARG_PARAMETER),
+                    Grid_i (width, height),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Grid::_nil ());
 
   // Register the Grid pointer.
-  Grid_ptr gptr = grid_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  Grid_ptr gptr = grid_ptr->_this ();
   return gptr;
 }
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index 77f08452574..2911b466cca 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -35,47 +35,42 @@ public:
   // Constructor
 
   Grid_i (CORBA::Short,
-          CORBA::Short
-          ACE_ENV_ARG_DECL_NOT_USED);
+          CORBA::Short);
   // Constructor.
 
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short width (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the width of the grid
 
-  virtual CORBA::Short height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short height (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the height of the grid
 
-  virtual void width (CORBA::Short
-                      ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void width (CORBA::Short)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the width of the grid.
 
-  virtual void height (CORBA::Short
-                       ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void height (CORBA::Short)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the height of the grid.
 
   virtual void set (CORBA::Short,
                     CORBA::Short,
-                    CORBA::Long
-                    ACE_ENV_ARG_DECL_NOT_USED)
+                    CORBA::Long)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Sets the grid value.
 
   virtual CORBA::Long get (CORBA::Short,
-                           CORBA::Short
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           CORBA::Short)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Gets the grid value.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Destroy the grid.
@@ -104,12 +99,11 @@ public:
   // Destructor.
 
   virtual Grid_ptr make_grid (CORBA::Short,
-                              CORBA::Short
-                              ACE_ENV_ARG_DECL)
+                              CORBA::Short)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index 6e95c17f2b5..4f290727fcb 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -12,35 +12,30 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tGrid server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (server.init ("Grid",
                        argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
       //ACE_UNUSED_ARG (userex);
-      ACE_PRINT_EXCEPTION (userex, "User Exception in main");
+      userex._tao_print_exception ("User Exception in main");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       //ACE_UNUSED_ARG (sysex);
-      ACE_PRINT_EXCEPTION (sysex, "System Exception in main ");
+      sysex._tao_print_exception ("System Exception in main ");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index 78bd1de184d..e2a7aab8d18 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -38,23 +38,21 @@ DLL_ORB::svc (void)
   ACE_DEBUG ((LM_DEBUG,
               "\n\trunning ORB event loop (%t)\n\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Run the ORB event loop in its own thread.
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -73,7 +71,7 @@ DLL_ORB::init (int argc, char *argv[])
 //                         -1);
      }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "\n\tInitialize ORB (%t)\n\n"));
@@ -82,17 +80,13 @@ DLL_ORB::init (int argc, char *argv[])
       // Initialize the ORB.
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    "An ORB"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "An ORB");
 
       if (CORBA::is_nil (this->orb_.in ()))
         return -1;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -100,16 +94,12 @@ DLL_ORB::init (int argc, char *argv[])
                           1);
 
       this->poa_ =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       this->poa_manager_ =
-        this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->the_POAManager ();
 
-      this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_->activate ();
 
 #if defined (ACE_HAS_THREADS)
       // Become an Active Object so that the ORB
@@ -119,11 +109,10 @@ DLL_ORB::init (int argc, char *argv[])
       return 0;
 #endif /* ACE_HAS_THREADS */
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "DLL_ORB::init");
+      ex._tao_print_exception ("DLL_ORB::init");
     }
-  ACE_ENDTRY;
 
   return -1;
 }
@@ -178,7 +167,7 @@ Time_Date_Servant::parse_args (int argc, char *argv[])
 int
 Time_Date_Servant::init (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "\n\tTime_Date servant\n\n"));
@@ -198,13 +187,10 @@ Time_Date_Servant::init (int argc, char *argv[])
       PortableServer::ServantBase_var safe_servant = servant;
 
       CORBA::Object_var obj =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       CORBA::String_var str =
-        orb->orb_->object_to_string (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->orb_->object_to_string (obj.in ());
 
       if (this->ior_output_file_)
         {
@@ -215,12 +201,11 @@ Time_Date_Servant::init (int argc, char *argv[])
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "DLL_ORB::init");
+      ex._tao_print_exception ("DLL_ORB::init");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
index 4d751fcf9fa..5b68548274d 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
@@ -37,16 +37,13 @@ Time_Date_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::Long l;
 
       // Get the time & date in binary format.
-      client_->bin_date (l
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client_->bin_date (l);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Binary time_date = %d\n",
@@ -54,9 +51,7 @@ Time_Date_Client_i::run (const char *name,
 
       // Get the time & date in string format.
       CORBA::String_var str_var;
-      client_->str_date (str_var.out()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client_->str_date (str_var.out());
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) String time_date = %s\n",
@@ -64,20 +59,16 @@ Time_Date_Client_i::run (const char *name,
 
       client_.shutdown ();
     }
-  ACE_CATCH (CORBA::UserException, range_ex)
+  catch (const CORBA::UserException& range_ex)
     {
-      ACE_PRINT_EXCEPTION (range_ex,
-                           "\tFrom get and set time_date");
+      range_ex._tao_print_exception ("\tFrom get and set time_date");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, memex)
+  catch (const CORBA::SystemException& memex)
     {
-      ACE_PRINT_EXCEPTION (memex,
-                           "Cannot make time_date");
+      memex._tao_print_exception ("Cannot make time_date");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index daf4a6ee737..0f7479f7882 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -7,8 +7,7 @@
 // Obtain the time and date in binary format.
 
 void
-Time_Date_i::bin_date (CORBA::Long_out time_date
-                       ACE_ENV_ARG_DECL_NOT_USED)
+Time_Date_i::bin_date (CORBA::Long_out time_date)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   time_date = ACE_OS::time (0);
@@ -17,8 +16,7 @@ Time_Date_i::bin_date (CORBA::Long_out time_date
 // Obtain the time and date in string format.
 
 void
-Time_Date_i::str_date (CORBA::String_out time_date
-                       ACE_ENV_ARG_DECL_NOT_USED)
+Time_Date_i::str_date (CORBA::String_out time_date)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const time_t time = ACE_OS::time (0);
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h
index 2957a71a68d..b4dcac8018c 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.h
+++ b/TAO/examples/Simple/time-date/Time_Date_i.h
@@ -34,14 +34,12 @@ class Time_Date_i
 public:
   // = Initialization and termination methods.
 
-  virtual void bin_date (CORBA::Long_out time_date
-                         ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void bin_date (CORBA::Long_out time_date)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Obtain the time and date in binary format.
 
-  virtual void str_date (CORBA::String_out time_date
-                         ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void str_date (CORBA::String_out time_date)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Obtain the time and date in string format.
 
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index ace24d63d6e..83ebb85e2e2 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -26,9 +26,8 @@ Time_Client_i::run (const char *name,
   if (client.init (name, argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // 64-bit OS's require pointers to be aligned on an
       // 8 byte boundary.  64-bit HP-UX requires a double to do this
@@ -43,8 +42,7 @@ Time_Client_i::run (const char *name,
       ACE_UNUSED_ARG (padding);
 
       //Make the RMI.
-      timedate = client->current_time (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      timedate = client->current_time ();
 
       // Print out value
       // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly
@@ -58,15 +56,13 @@ Time_Client_i::run (const char *name,
                   ascii_timedate));
 
       if (client.shutdown () == 1)
-        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\tException");
+      ex._tao_print_exception ("\tException");
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp
index c9905bef9b7..d7db9b30c7b 100644
--- a/TAO/examples/Simple/time/Time_i.cpp
+++ b/TAO/examples/Simple/time/Time_i.cpp
@@ -29,7 +29,7 @@ Time_i::orb (CORBA::ORB_ptr o)
 // Return the current date/time on the server.
 
 CORBA::Long
-Time_i::current_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Time_i::current_time (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Long (ACE_OS::time (0));
@@ -38,7 +38,7 @@ Time_i::current_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Shutdown.
 
 void
-Time_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+Time_i::shutdown ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h
index ae0ec382ff5..621c8519fe8 100644
--- a/TAO/examples/Simple/time/Time_i.h
+++ b/TAO/examples/Simple/time/Time_i.h
@@ -39,11 +39,11 @@ public:
   ~Time_i (void);
   // Destructor
 
-  virtual CORBA::Long current_time (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long current_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the current time/date on the server
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown the server.
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index 8c3792e16b5..0f5a862156a 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -12,32 +12,28 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tTime and Date server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (server.init ("Time",
                        argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,"User Exception in main");
+      userex._tao_print_exception ("User Exception in main");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,"System Exception in main");
+      sysex._tao_print_exception ("System Exception in main");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index 2f16dd37bb5..654cee6b006 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -17,8 +17,8 @@
 #include "DOVE_Supplier.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (Event_Supplier, 
-           DOVE_Supplier, 
+ACE_RCSID (Event_Supplier,
+           DOVE_Supplier,
            "$Id$")
 
 // Static pointer member initialization for Singleton.
@@ -69,13 +69,11 @@ DOVE_Supplier::~DOVE_Supplier ()
 int
 DOVE_Supplier::init (void)
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     // Connect to the RootPOA.
     CORBA::Object_var poaObject_var =
-      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA"
-                                                                 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA");
 
     if (CORBA::is_nil (poaObject_var.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -83,19 +81,15 @@ DOVE_Supplier::init (void)
                         -1);
 
     this->root_POA_var_ =
-      PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      PortableServer::POA::_narrow (poaObject_var.in ());
 
     this->poa_manager_ =
-       root_POA_var_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+       root_POA_var_->the_POAManager ();
 
     // Get the Naming Service object reference.
     CORBA::Object_var namingObj_var =
       TAO_ORB_Core_instance()->orb()->resolve_initial_references (
-          "NameService"
-          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+          "NameService");
 
     if (CORBA::is_nil (namingObj_var.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -103,17 +97,13 @@ DOVE_Supplier::init (void)
                         -1);
 
     this->namingContext_var_ =
-      CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      CosNaming::NamingContext::_narrow (namingObj_var.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "DOVE_Supplier::init");
+    ex._tao_print_exception ("DOVE_Supplier::init");
     return -1;
   }
-  ACE_ENDTRY;
 
   initialized_ = 1;
   return 0;
@@ -257,7 +247,7 @@ DOVE_Supplier::notify (CORBA::Any &message)
       this->connected ();
     }
 
-  ACE_TRY_NEW_ENV
+  try
   {
     RtecEventComm::Event event;
     event.header.source = SOURCE_ID;
@@ -274,17 +264,14 @@ DOVE_Supplier::notify (CORBA::Any &message)
     events[0] = event;
 
     // Now we invoke a RPC
-    this->current_connection_params_->proxyPushConsumer_var_->push (events
-                                                                    ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->current_connection_params_->proxyPushConsumer_var_->push (events);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     ACE_ERROR ((LM_ERROR,
                 "DOVE_Supplier::notify: "
                 "unexpected exception.\n"));
   }
-  ACE_ENDTRY;
 }
 
 
@@ -336,7 +323,7 @@ DOVE_Supplier::Internal_DOVE_Supplier::Internal_DOVE_Supplier (DOVE_Supplier *im
 int
 DOVE_Supplier::get_Scheduler ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
@@ -344,16 +331,12 @@ DOVE_Supplier::get_Scheduler ()
         CORBA::string_dup (this->current_connection_params_->ss_name_);
 
       CORBA::Object_var objref =
-          namingContext_var_->resolve (schedule_name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          namingContext_var_->resolve (schedule_name);
 
       this->current_connection_params_->scheduler_var_ =
-        RtecScheduler::Scheduler::_narrow(objref.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecScheduler::Scheduler::_narrow(objref.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       current_connection_params_->scheduler_var_ = 0;
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -362,7 +345,6 @@ DOVE_Supplier::get_Scheduler ()
                          this->current_connection_params_->ss_name_),
                         -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -371,7 +353,7 @@ DOVE_Supplier::get_Scheduler ()
 int
 DOVE_Supplier::get_EventChannel ()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get a reference to the Event Service
     CosNaming::Name channel_name (1);
@@ -380,26 +362,21 @@ DOVE_Supplier::get_EventChannel ()
       CORBA::string_dup (this->current_connection_params_->es_name_);
 
     CORBA::Object_var eventServiceObj_var =
-      this->namingContext_var_->resolve (channel_name ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->namingContext_var_->resolve (channel_name);
 
     this->current_connection_params_->eventChannel_var_ =
-       RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in()
-                                                   ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+       RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in());
 
     if (CORBA::is_nil (this->current_connection_params_->eventChannel_var_.in()))
       ACE_ERROR_RETURN ((LM_ERROR,
                          "The reference to the event channel is nil!"),
                          1);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "DOVE_Supplier::get_EventChannel");
+    ex._tao_print_exception ("DOVE_Supplier::get_EventChannel");
     return -1;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -408,16 +385,14 @@ DOVE_Supplier::get_EventChannel ()
 int
 DOVE_Supplier::connect_Supplier ()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     // Generate the Real-time information descriptor.
     this->current_connection_params_->rt_info_ =
       this->current_connection_params_->
         scheduler_var_->
-          create (this->current_connection_params_->pod_rt_info_.entry_point
-                  ACE_ENV_ARG_PARAMETER);
+          create (this->current_connection_params_->pod_rt_info_.entry_point);
 
-    ACE_TRY_CHECK;
 
     this->current_connection_params_->scheduler_var_->
       set (this->current_connection_params_->rt_info_,
@@ -429,10 +404,8 @@ DOVE_Supplier::connect_Supplier ()
            static_cast<RtecScheduler::Importance_t> (this->current_connection_params_->pod_rt_info_.importance),
            this->current_connection_params_->pod_rt_info_.quantum,
            this->current_connection_params_->pod_rt_info_.threads,
-           static_cast<RtecScheduler::Info_Type_t> (this->current_connection_params_->pod_rt_info_.info_type)
-           ACE_ENV_ARG_PARAMETER);
+           static_cast<RtecScheduler::Info_Type_t> (this->current_connection_params_->pod_rt_info_.info_type));
 
-    ACE_TRY_CHECK;
 
 
     // Set the publications to report them to the event channel.
@@ -447,41 +420,33 @@ DOVE_Supplier::connect_Supplier ()
     qos.publications[0].event.header.ec_recv_time = ORBSVCS_Time::zero ();
     qos.publications[0].event.header.ec_send_time = ORBSVCS_Time::zero ();
     qos.publications[0].event.data.any_value <<= x;
-    ACE_TRY_CHECK;
     qos.publications[0].dependency_info.number_of_calls = 1;
     qos.publications[0].dependency_info.rt_info =
       this->current_connection_params_->rt_info_;
 
     // = Connect as a supplier.
     this->current_connection_params_->supplierAdmin_var_ =
-      this->current_connection_params_->eventChannel_var_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->current_connection_params_->eventChannel_var_->for_suppliers ();
 
     this->current_connection_params_->proxyPushConsumer_var_ =
-      this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer ();
 
     // In calling _this we get back an object reference and register
     // the servant with the POA.
     RtecEventComm::PushSupplier_var pushSupplier_var =
-      this->internal_DOVE_Supplier_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->internal_DOVE_Supplier_ptr_->_this ();
 
     // Connect the supplier to the proxy consumer.
     ACE_SupplierQOS_Factory::debug (qos);
     this->current_connection_params_->
       proxyPushConsumer_var_->connect_push_supplier (pushSupplier_var.in (),
-                                                     qos
-                                                     ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                                                     qos);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "DOVE_Supplier::connect_supplier");
+    ex._tao_print_exception ("DOVE_Supplier::connect_supplier");
     return -1;
   }
-  ACE_ENDTRY;
 
   return 0;
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
index 1324df29fa3..9a0daa7cd8a 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
@@ -76,7 +76,7 @@ private:
 
   public:
 
-    virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index 66548bcc92c..bdedb6c27ff 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -81,34 +81,28 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv)
   nav_roll_ (0),
   nav_pitch_ (0)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->sched_hi_name_.length (1);
       this->sched_hi_name_[0].id = CORBA::string_dup ("DUAL_SCHED_HI");
-      ACE_TRY_CHECK;
 
       this->sched_lo_name_.length (1);
       this->sched_lo_name_[0].id = CORBA::string_dup ("DUAL_SCHED_LO");
-      ACE_TRY_CHECK;
 
       this->channel_hi_name_.length (1);
       this->channel_hi_name_[0].id = CORBA::string_dup ("DUAL_EC_HI");
-      ACE_TRY_CHECK;
 
       this->channel_lo_name_.length (1);
       this->channel_lo_name_[0].id = CORBA::string_dup ("DUAL_EC_LO");
-      ACE_TRY_CHECK;
 
-      this->terminator_ = terminator_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->terminator_ = terminator_impl_._this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DualEC_Supplier::DualEC_Supplier : could "
-                           "not resolve reference to terminator");
+      ex._tao_print_exception (
+        "DualEC_Supplier::DualEC_Supplier : could "
+        "not resolve reference to terminator");
   }
-  ACE_ENDTRY;
 
   // Initialize the high priority RT_Info data
   rt_info_nav_hi_.entry_point = "DUALEC_NAV_HI";
@@ -145,29 +139,23 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv)
 
 DualEC_Supplier::~DualEC_Supplier ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->navigation_Supplier_.disconnect ();
       this->weapons_Supplier_.disconnect ();
 
       // Unbind the schedulers from the NS.
-      this->naming_context_->unbind (this->sched_hi_name_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->naming_context_->unbind (this->sched_lo_name_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->naming_context_->unbind (this->sched_hi_name_);
+      this->naming_context_->unbind (this->sched_lo_name_);
 
       // Unbind the ECs from the NS.
-      this->naming_context_->unbind (this->channel_hi_name_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->naming_context_->unbind (this->channel_lo_name_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->naming_context_->unbind (this->channel_hi_name_);
+      this->naming_context_->unbind (this->channel_lo_name_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DualEC_Supplier::~DualEC_Supplier");
+      ex._tao_print_exception ("DualEC_Supplier::~DualEC_Supplier");
     }
-  ACE_ENDTRY;
 
   // @@TBD - destroy the ECs
   // @@TBD - destroy the schedulers
@@ -178,12 +166,11 @@ DualEC_Supplier::init ()
 {
   this->get_options (argc_, argv_);
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Connect to the RootPOA.
     CORBA::Object_var poaObject_var =
-      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA");
 
     if (CORBA::is_nil (poaObject_var.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -191,22 +178,17 @@ DualEC_Supplier::init ()
                         1);
 
     this->root_POA_var_ =
-      PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      PortableServer::POA::_narrow (poaObject_var.in ());
 
     this->poa_manager_ =
-       root_POA_var_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+       root_POA_var_->the_POAManager ();
 
-    poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    poa_manager_->activate ();
 
     // Get the Naming Service object reference.
     CORBA::Object_var namingObj_var =
       TAO_ORB_Core_instance()->orb()->resolve_initial_references (
-          "NameService"
-          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+          "NameService");
 
     if (CORBA::is_nil (namingObj_var.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -214,18 +196,14 @@ DualEC_Supplier::init ()
                         -1);
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      CosNaming::NamingContext::_narrow (namingObj_var.in ());
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "DualEC_Supplier::init");
+    ex._tao_print_exception ("DualEC_Supplier::init");
     return -1;
   }
-  ACE_ENDTRY;
 
   // Create two scheduling service instances.
   if (this->create_schedulers () == -1)
@@ -299,7 +277,7 @@ DualEC_Supplier::init ()
 // Private class that implements a termination servant.
 
 void
-DualEC_Supplier::Terminator::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+DualEC_Supplier::Terminator::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
@@ -324,7 +302,7 @@ DualEC_Supplier::run_nav_thread (void *arg)
   DualEC_Supplier * sup =
     static_cast<DualEC_Supplier *> (arg);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Unbounded_Queue_Iterator<Navigation *>
         nav_iter (sup->navigation_data_);
@@ -364,7 +342,6 @@ DualEC_Supplier::run_nav_thread (void *arg)
               }
 
             sup->navigation_Supplier_.notify (any);
-            ACE_TRY_CHECK;
           }
         else
           {
@@ -389,10 +366,9 @@ DualEC_Supplier::run_nav_thread (void *arg)
       while (++total_sent < sup->total_messages_);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -406,7 +382,7 @@ DualEC_Supplier::run_weap_thread (void *arg)
   DualEC_Supplier * sup =
     static_cast<DualEC_Supplier *> (arg);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Unbounded_Queue_Iterator<Weapons *>
         weap_iter (sup->weapons_data_);
@@ -435,7 +411,6 @@ DualEC_Supplier::run_weap_thread (void *arg)
             ACE_OS::sleep (sup->weap_pause_);
 
             sup->weapons_Supplier_.notify (any);
-            ACE_TRY_CHECK;
           }
         else
           {
@@ -460,10 +435,9 @@ DualEC_Supplier::run_weap_thread (void *arg)
       while (++total_sent < sup->total_messages_);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -480,7 +454,7 @@ DualEC_Supplier::create_schedulers (void)
   // create either a runtime or a config scheduler for
   // each instance
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (use_runtime_schedulers_)
         {
@@ -497,35 +471,29 @@ DualEC_Supplier::create_schedulers (void)
                           ACE_Config_Scheduler,
                           -1);
 
-          this->sched_hi_ = sched_hi_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->sched_hi_ = sched_hi_impl_->_this ();
 
           ACE_NEW_RETURN (this->sched_lo_impl_,
                           ACE_Config_Scheduler,
                           -1);
 
-          this->sched_lo_ = sched_lo_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->sched_lo_ = sched_lo_impl_->_this ();
 
           // Register Scheduling Service Implementations with Naming Service
 
           this->naming_context_->bind (this ->sched_hi_name_,
-                                       this->sched_hi_.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       this->sched_hi_.in ());
 
           naming_context_->bind (this->sched_lo_name_,
-                                 this->sched_lo_.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                 this->sched_lo_.in ());
 
           // Register high and low priority rt_infos with the
           // schedulers to force priority differentiation.
 
           this->sched_hi_rt_info_hi_ =
             this->sched_hi_->
-              create (this->rt_info_dummy_hi_.entry_point
-                      ACE_ENV_ARG_PARAMETER);
+              create (this->rt_info_dummy_hi_.entry_point);
 
-          ACE_TRY_CHECK;
 
           this->sched_hi_->
             set (this->sched_hi_rt_info_hi_,
@@ -537,17 +505,13 @@ DualEC_Supplier::create_schedulers (void)
                  static_cast<RtecScheduler::Importance_t> (this->rt_info_dummy_hi_.importance),
                  this->rt_info_dummy_hi_.quantum,
                  this->rt_info_dummy_hi_.threads,
-                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_hi_.info_type)
-                 ACE_ENV_ARG_PARAMETER);
+                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_hi_.info_type));
 
-          ACE_TRY_CHECK;
 
           this->sched_hi_rt_info_lo_ =
             this->sched_hi_->
-              create (this->rt_info_dummy_lo_.entry_point
-                      ACE_ENV_ARG_PARAMETER);
+              create (this->rt_info_dummy_lo_.entry_point);
 
-          ACE_TRY_CHECK;
 
           this->sched_hi_->
             set (this->sched_hi_rt_info_lo_,
@@ -559,17 +523,13 @@ DualEC_Supplier::create_schedulers (void)
                  static_cast<RtecScheduler::Importance_t> (this->rt_info_dummy_lo_.importance),
                  this->rt_info_dummy_lo_.quantum,
                  this->rt_info_dummy_lo_.threads,
-                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_lo_.info_type)
-                 ACE_ENV_ARG_PARAMETER);
+                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_lo_.info_type));
 
-          ACE_TRY_CHECK;
 
           this->sched_hi_rt_info_hi_ =
             this->sched_lo_->
-              create (this->rt_info_dummy_hi_.entry_point
-                      ACE_ENV_ARG_PARAMETER);
+              create (this->rt_info_dummy_hi_.entry_point);
 
-          ACE_TRY_CHECK;
 
           this->sched_lo_->
             set (this->sched_hi_rt_info_hi_,
@@ -581,17 +541,13 @@ DualEC_Supplier::create_schedulers (void)
                  static_cast<RtecScheduler::Importance_t> (this->rt_info_dummy_hi_.importance),
                  this->rt_info_dummy_hi_.quantum,
                  this->rt_info_dummy_hi_.threads,
-                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_hi_.info_type)
-                 ACE_ENV_ARG_PARAMETER);
+                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_hi_.info_type));
 
-          ACE_TRY_CHECK;
 
           this->sched_hi_rt_info_lo_ =
             this->sched_lo_->
-              create (this->rt_info_dummy_lo_.entry_point
-                      ACE_ENV_ARG_PARAMETER);
+              create (this->rt_info_dummy_lo_.entry_point);
 
-          ACE_TRY_CHECK;
 
           this->sched_lo_->
             set (this->sched_hi_rt_info_lo_,
@@ -603,20 +559,16 @@ DualEC_Supplier::create_schedulers (void)
                  static_cast<RtecScheduler::Importance_t> (this->rt_info_dummy_lo_.importance),
                  this->rt_info_dummy_lo_.quantum,
                  this->rt_info_dummy_lo_.threads,
-                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_lo_.info_type)
-                 ACE_ENV_ARG_PARAMETER);
+                 static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_lo_.info_type));
 
-          ACE_TRY_CHECK;
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DualEC_Supplier::create_schedulers");
+      ex._tao_print_exception ("DualEC_Supplier::create_schedulers");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -628,7 +580,7 @@ DualEC_Supplier::create_schedulers (void)
 int
 DualEC_Supplier::create_event_channels (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create Event Service Implementations, passing in the respective
       // Scheduling Service Implementations (which must already be created).
@@ -641,8 +593,7 @@ DualEC_Supplier::create_event_channels (void)
                       TAO_EC_Event_Channel (attr_high),
                       -1);
 
-      this->ec_hi_ = ec_hi_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->ec_hi_ = ec_hi_impl_->_this ();
 
       TAO_EC_Event_Channel_Attributes attr_low (root_POA_var_.in (),
                                                 root_POA_var_.in ());
@@ -653,27 +604,22 @@ DualEC_Supplier::create_event_channels (void)
                       TAO_EC_Event_Channel (attr_low),
                       -1);
 
-      this->ec_lo_ = ec_lo_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->ec_lo_ = ec_lo_impl_->_this ();
 
       // Register Event Service Implementations with Naming Service
 
       naming_context_->bind (this->channel_hi_name_,
-                             this->ec_hi_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             this->ec_hi_.in ());
 
       naming_context_->bind (this->channel_lo_name_,
-                                     this->ec_lo_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     this->ec_lo_.in ());
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "DualEC_Supplier::create_event_channels");
+    ex._tao_print_exception ("DualEC_Supplier::create_event_channels");
     return -1;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -681,7 +627,7 @@ DualEC_Supplier::create_event_channels (void)
 void
 DualEC_Supplier::compute_schedules (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       sched_hi_->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
@@ -691,8 +637,7 @@ DualEC_Supplier::compute_schedules (void)
          this->infos_hi_.out (),
          this->deps_hi_.out (),
          this->configs_hi_.out (),
-         this->anomalies_hi_.out () ACE_ENV_ARG_PARAMETER);
-       ACE_TRY_CHECK;
+         this->anomalies_hi_.out ());
 
       sched_lo_->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
@@ -702,8 +647,7 @@ DualEC_Supplier::compute_schedules (void)
          this->infos_lo_.out (),
          this->deps_hi_.out (),
          this->configs_lo_.out (),
-         this->anomalies_lo_.out () ACE_ENV_ARG_PARAMETER);
-       ACE_TRY_CHECK;
+         this->anomalies_lo_.out ());
 
       if (dump_schedule_headers_ && (this->hi_schedule_file_name_ != 0))
         {
@@ -712,7 +656,6 @@ DualEC_Supplier::compute_schedules (void)
                                                 configs_hi_.in (),
                                                 anomalies_hi_.in (),
                                                 this->hi_schedule_file_name_);
-          ACE_TRY_CHECK;
         }
 
       if (dump_schedule_headers_ && (this->lo_schedule_file_name_ != 0))
@@ -722,20 +665,18 @@ DualEC_Supplier::compute_schedules (void)
                                                 configs_lo_.in (),
                                                 anomalies_lo_.in (),
                                                 this->lo_schedule_file_name_);
-          ACE_TRY_CHECK;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+    ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 }
 
 void
 DualEC_Supplier::start_generating_events (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Spawn a thread that runs the orb event loop
       ACE_Thread_Manager orb_thread_manager;
@@ -770,7 +711,6 @@ DualEC_Supplier::start_generating_events (void)
 
       // Shut down the ORB via the termination servant
       this->terminator_->shutdown ();
-      ACE_TRY_CHECK;
 
       // Wait for the thread that runs the orb event loop.
       orb_thread_manager.wait ();
@@ -795,11 +735,10 @@ DualEC_Supplier::start_generating_events (void)
         if (weap_iter.next (weap_temp) && weap_temp)
           delete (*weap_temp);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
 }
 
@@ -1106,15 +1045,13 @@ main (int argc, char *argv [])
 
 
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       TAO_ORB_Manager orb_Manager;
 
       orb_Manager.init (argc,
-                        argv
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        argv);
 
 
       // Create the demo supplier.
@@ -1133,13 +1070,11 @@ main (int argc, char *argv [])
 
       // when done, we clean up
       delete event_Supplier_ptr;
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
index 9f265fe91e3..1b9695b9cc0 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
@@ -81,7 +81,7 @@ private:
     // = DESCRIPTION
     // Private class that implements a termination servant.
   {
-    void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    void shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   };
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index e14e834f16c..0ae7315b44f 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -61,8 +61,7 @@ int
 Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                               const char *my_name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Get a Scheduler.
 
@@ -70,8 +69,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
         ACE_Scheduler_Factory::server ();
 
       // Define Real-time information.
-      rt_info_ = server->create (my_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rt_info_ = server->create (my_name);
 
       server->set (rt_info_,
                    RtecScheduler::VERY_LOW_CRITICALITY,
@@ -82,9 +80,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                    RtecScheduler::VERY_LOW_IMPORTANCE,
                    ORBSVCS_Time::zero (),
                    1,
-                   RtecScheduler::OPERATION
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   RtecScheduler::OPERATION);
 
 
       // Create the event that we're registering for.
@@ -102,48 +98,41 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
       // = Connect as a consumer.
 
       this->consumer_admin_ =
-        channel_admin_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        channel_admin_->for_consumers ();
 
       // Obtain a pointer to a push supplier.  "suppliers" is
       // inherited from a base class.
 
       this->suppliers_ =
-        consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin_->obtain_push_supplier ();
 
       // The _this function returns an object pointer. This is needed
       // because a consumer inherits from a Servant class that is no
       // CORBA::Object.
 
       RtecEventComm::PushConsumer_var objref =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       this->suppliers_->connect_push_consumer (objref.in (),
-                                               dependencies.get_ConsumerQOS ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               dependencies.get_ConsumerQOS ());
     }
-  ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
+  catch (const RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR& )
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Demo_Consumer::open: subscribe failed.\n"),
                         -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Demo_Consumer::open: unexpected exception.\n"),
                         -1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 0;
 }
 
 void
-Demo_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demo_Consumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -151,8 +140,7 @@ Demo_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Demo_Consumer::push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+Demo_Consumer::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -176,24 +164,19 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events
         {
           ACE_DEBUG ((LM_DEBUG, "Demo Consumer: received ACE_ES_EVENT_NOTIFICATION event.\n"));
 
-          ACE_TRY
+          try
             {
               // Use a temporary int to avoid overload ambiguities with
               // the enum.
-              int kind = events[i].data.any_value.type()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              ACE_DEBUG ((LM_DEBUG, "ID: %s\n", events[i].data.any_value.type()->id(ACE_ENV_SINGLE_ARG_PARAMETER)));
-              ACE_TRY_CHECK;
-              ACE_DEBUG ((LM_DEBUG, "Name: %s\n", events[i].data.any_value.type()->name(ACE_ENV_SINGLE_ARG_PARAMETER)));
-              ACE_TRY_CHECK;
-              ACE_DEBUG ((LM_DEBUG, "member_count: %u\n", events[i].data.any_value.type()->member_count(ACE_ENV_SINGLE_ARG_PARAMETER)));
-              ACE_TRY_CHECK;
+              int kind = events[i].data.any_value.type()->kind ();
+
+              ACE_DEBUG ((LM_DEBUG, "ID: %s\n", events[i].data.any_value.type()->id()));
+              ACE_DEBUG ((LM_DEBUG, "Name: %s\n", events[i].data.any_value.type()->name()));
+              ACE_DEBUG ((LM_DEBUG, "member_count: %u\n", events[i].data.any_value.type()->member_count()));
               ACE_DEBUG ((LM_DEBUG, "TCKind: %d\n", kind));
 
               CORBA::Boolean ret =
-                _tc_Navigation->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                _tc_Navigation->equal (events[i].data.any_value.type());
 
               if (ret)
                 {
@@ -203,8 +186,7 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events
                 }
               else
                 {
-                  ret = _tc_Weapons->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  ret = _tc_Weapons->equal (events[i].data.any_value.type());
 
                   if (ret)
                     {
@@ -214,12 +196,10 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events
                     }
                 }
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the Navigation and Weapons data.\n"));
             }
-          ACE_ENDTRY;
-          ACE_CHECK;
         }
     }
 }
@@ -227,25 +207,21 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events
 void
 Demo_Consumer::shutdown (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Disconnect from the push supplier.
 
-      this->suppliers_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->suppliers_->disconnect_push_supplier ();
 
       ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n"));
-      ACE_TRY_CHECK;
 
       TAO_ORB_Core_instance ()->orb ()->shutdown ();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR,
                  "(%t) Demo_Consumer::shutdown: unexpected exception.\n"));
     }
-  ACE_ENDTRY;
 }
 
 // function get_options
@@ -291,18 +267,15 @@ get_options (int argc, char *argv [])
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -310,17 +283,13 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -328,9 +297,7 @@ main (int argc, char *argv [])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
 
@@ -344,13 +311,10 @@ main (int argc, char *argv [])
       channel_name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (channel_name
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (channel_name);
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in());
 
       if (CORBA::is_nil (ec.in()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -370,27 +334,22 @@ main (int argc, char *argv [])
                            "Someone was feeling introverted.\n"),
                           -1);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Run the ORB
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       delete demo_consumer;
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
index 0e0d931a3d9..b18544679c8 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
@@ -46,13 +46,12 @@ public:
   // supplier.  Stores <my_name> for printing out messages.  Returns 0
   // on success, -1 on failure.
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The channel is disconnecting.
 
   // = (not protected to allow short-circuiting) protected:
-  virtual void push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // If the <events>[0] is a notification, prints out the data from
   // the supplier.  If its a shutdown message, the consumer
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 748cc06b360..6da0105f123 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -246,7 +246,7 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
 {
   static u_long last_completion = 0;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     Schedule_Viewer_Data **sched_data;
 
@@ -341,7 +341,6 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
                     (*sched_data)->operation_name));
       }
 
-      ACE_TRY_CHECK;
 
 
             if (last_completion > (*sched_data)->completion_time)
@@ -366,12 +365,11 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
     if (schedule_iter.done ())
       schedule_iter.first ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     ACE_ERROR ((LM_ERROR,
                 "(%t)Error in Event_Supplier::insert_event_data.\n"));
   }
-  ACE_ENDTRY;
 }
 
 
@@ -445,15 +443,13 @@ Event_Supplier::get_options (int argc, char *argv [])
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       TAO_ORB_Manager orb_Manager;
 
       orb_Manager.init (argc,
-                        argv
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        argv);
 
 
       // Create the demo supplier.
@@ -472,14 +468,12 @@ main (int argc, char *argv [])
 
       // when done, we clean up
       delete event_Supplier_ptr;
-      ACE_TRY_CHECK;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 829ec59a9f0..d5f252e0406 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -46,7 +46,7 @@ ACE_RCSID (Event_Supplier,
 #if defined (ACE_OPENVMS)
 // need this to circumvent link error on OpenVMS
 // has to do with interference in template instantiations
-// for the server build by previous compilation of 
+// for the server build by previous compilation of
 // components which are reused here without recompilation
 ACE_Time_Value dum = ACE_Time_Value::zero;
 #endif
@@ -267,7 +267,7 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
   const TimeBase::TimeT TEN_HZ_PERIOD = ONE_HZ_PERIOD / 10;
   const TimeBase::TimeT TWENTY_HZ_PERIOD = ONE_HZ_PERIOD / 20;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     Schedule_Viewer_Data **sched_data;
 
@@ -378,7 +378,6 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
                     (*sched_data)->operation_name));
       }
 
-      ACE_TRY_CHECK;
 
 
             if (last_completion > (*sched_data)->completion_time)
@@ -403,12 +402,11 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
     if (schedule_iter.done ())
       schedule_iter.first ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     ACE_ERROR ((LM_ERROR,
                 "(%t)Error in Logging_Supplier::insert_event_data.\n"));
   }
-  ACE_ENDTRY;
 }
 
 
@@ -499,15 +497,13 @@ Logging_Supplier::get_options (int argc, char *argv [])
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       TAO_ORB_Manager orb_Manager;
 
       orb_Manager.init (argc,
-                        argv
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        argv);
 
 
       // Create the demo supplier.
@@ -526,14 +522,12 @@ main (int argc, char *argv [])
 
       // when done, we clean up
       delete event_Supplier_ptr;
-      ACE_TRY_CHECK;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index b811e0b9aca..bf1953fdf8b 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -8,19 +8,15 @@ ACE_RCSID(TypeCode_Creation, main, "$Id$")
 
 int main(int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       CORBA::TypeCode_var iface_tc =
         orb->create_interface_tc (CORBA::string_dup ("IDL:iface:1.0"),
-                                  CORBA::string_dup ("iface")
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  CORBA::string_dup ("iface"));
 
       CORBA::ULong length = 5;
 
@@ -72,9 +68,7 @@ int main(int argc, char *argv[])
       CORBA::TypeCode_ptr foo_tc = orb->create_union_tc ("IDL:foo:1.0",
                                                           "foo",
                                                           CORBA::_tc_short,
-                                                          foo_members
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                          foo_members);
 
       length = 2;
 
@@ -94,14 +88,10 @@ int main(int argc, char *argv[])
 
       CORBA::TypeCode_var bar_tc = orb->create_struct_tc ("IDL:bar:1.0",
                                                           "bar",
-                                                          bar_members
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                          bar_members);
 
       // Check for equality with the typecode created by the IDL compiler.
-      CORBA::Boolean eq = bar_tc->equal (_tc_bar
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean eq = bar_tc->equal (_tc_bar);
 
       if (!eq)
         {
@@ -111,13 +101,11 @@ int main(int argc, char *argv[])
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "exception:");
+      ex._tao_print_exception ("exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/ior_corbaloc/client.cpp b/TAO/examples/ior_corbaloc/client.cpp
index 1cbae2ff35e..dd8ca517b0b 100644
--- a/TAO/examples/ior_corbaloc/client.cpp
+++ b/TAO/examples/ior_corbaloc/client.cpp
@@ -21,34 +21,29 @@
 
 int main (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
 
       IOR_corbaloc_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+      init_result = client.init (argc, argv);
 
         if (init_result == 0)
           {
-            client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            client.run ();
           }
         return 0;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException&)
     {
       //
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp
index 80c352cb9fa..071964c8d02 100644
--- a/TAO/examples/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp
@@ -17,16 +17,15 @@
 
 int main (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       if(argc < 2 )
         {
@@ -38,14 +37,11 @@ int main (int argc, char *argv [])
 
       // Get an object reference using a corbaname: style URL
       CORBA::Object_var obj =
-        orb->string_to_object (argv[1]
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (argv[1]);
 
       // Narrow
       corbaloc::Status_var factory =
-        corbaloc::Status::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corbaloc::Status::_narrow (obj.in ());
 
       if (CORBA::is_nil (factory.in ()))
         {
@@ -57,8 +53,7 @@ int main (int argc, char *argv [])
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        factory->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory->print_status ();
 
       if (ret_value != 0)
         {
@@ -69,16 +64,14 @@ int main (int argc, char *argv [])
 
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException&)
     {
       //
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
index 5c3403bbffe..e2d5ce56831 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp
@@ -32,10 +32,10 @@ IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void)
 }
 
 int
-IOR_corbaloc_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
+IOR_corbaloc_Client_i::run (void)
 {
 
-  ACE_TRY
+  try
     {
       CosNaming::Name name (1);
 
@@ -44,14 +44,11 @@ IOR_corbaloc_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 
       // Resolve the name
       CORBA::Object_var factory_object =
-        this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (name);
 
       // Narrow
       corbaloc::Status_var factory =
-        corbaloc::Status::_narrow (factory_object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corbaloc::Status::_narrow (factory_object.in ());
 
       if (CORBA::is_nil (factory.in ()))
         {
@@ -63,8 +60,7 @@ IOR_corbaloc_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        factory->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory->print_status ();
 
       if (ret_value != 0)
         {
@@ -73,31 +69,28 @@ IOR_corbaloc_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
                     0));
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "CosNaming::NamingContext::NotFound");
+      ex._tao_print_exception ("CosNaming::NamingContext::NotFound");
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "A system exception on client side");
+      ex._tao_print_exception ("A system exception on client side");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
 IOR_corbaloc_Client_i::init (int& argc,
-                             char *argv[]
-                             ACE_ENV_ARG_DECL)
+                             char *argv[])
 {
 
-  ACE_TRY
+  try
     {
 
       // First initialize the ORB, that will remove some arguments...
@@ -105,7 +98,7 @@ IOR_corbaloc_Client_i::init (int& argc,
         CORBA::ORB_init (argc,
                          argv,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       if(argc < 2){
               ACE_DEBUG((LM_DEBUG, "\nUsage:\n  %s [corbaloc URL for NameService]\n", argv[0]));
@@ -116,9 +109,7 @@ IOR_corbaloc_Client_i::init (int& argc,
 
       // Get a reference to the Naming Service
       CORBA::Object_var naming_context_object =
-        orb->string_to_object (corbaloc_url_.c_str()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (corbaloc_url_.c_str());
 
       if (CORBA::is_nil (naming_context_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -127,26 +118,22 @@ IOR_corbaloc_Client_i::init (int& argc,
 
       // Narrow to get the correct reference
       this->naming_context_ =
-        CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContextExt::_narrow (naming_context_object.in ());
 
       if (CORBA::is_nil (this->naming_context_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot narrow Naming Service\n :client"),
                           -1);
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "client");
+      ex._tao_print_exception ("client");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
index 5595ed23148..a3f32cc65da 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h
@@ -40,10 +40,10 @@ class IOR_corbaloc_Client_i
   IOR_corbaloc_Client_i (void);
   ~IOR_corbaloc_Client_i (void);
 
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (void);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (int& argc, char *argv[]);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp
index b5351d69be2..af4cf921000 100644
--- a/TAO/examples/ior_corbaloc/server.cpp
+++ b/TAO/examples/ior_corbaloc/server.cpp
@@ -7,15 +7,13 @@
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
       if (argc < 2)
         {
@@ -24,22 +22,18 @@ int main (int argc, char* argv[])
         }
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
       // Activate the POA Manager
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Create the servant
       corbaloc_Status_i status_i;
@@ -47,18 +41,14 @@ int main (int argc, char* argv[])
       // Activate it to obtain the reference
       corbaloc::Status_var status =
         status_i._this ();
-      ACE_TRY_CHECK;
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       // Narrow down the reference
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_context_object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_context_object.in ());
 
       // Bind Iterator_Factory to the Naming Context
       CosNaming::Name name (1);
@@ -66,26 +56,20 @@ int main (int argc, char* argv[])
       name[0].id = CORBA::string_dup (argv[1]);
 
       naming_context->rebind (name, status.in ());
-      ACE_TRY_CHECK;
 
       // Run the orb
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Destroy the POA, waiting until the destruction terminates
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
+      orb->destroy ();
     }
-  ACE_CATCH (CORBA::SystemException, ex) {
-    ACE_PRINT_EXCEPTION (ex, "CORBA exception raised! ");
+  catch (const CORBA::SystemException& ex){
+    ex._tao_print_exception ("CORBA exception raised! ");
   }
-  ACE_CATCHANY {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in server");
+  catch (const CORBA::Exception& ex){
+    ex._tao_print_exception ("Exception caught in server");
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/ior_corbaloc/status_i.cpp b/TAO/examples/ior_corbaloc/status_i.cpp
index e519ac04eb9..fc47f429511 100644
--- a/TAO/examples/ior_corbaloc/status_i.cpp
+++ b/TAO/examples/ior_corbaloc/status_i.cpp
@@ -9,7 +9,7 @@ corbaloc_Status_i::corbaloc_Status_i ()
 }
 
 CORBA::Boolean
-corbaloc_Status_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+corbaloc_Status_i::print_status (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the server received the request from the client, return true
diff --git a/TAO/examples/ior_corbaloc/status_i.h b/TAO/examples/ior_corbaloc/status_i.h
index 6b8052b12e5..3b3495833db 100644
--- a/TAO/examples/ior_corbaloc/status_i.h
+++ b/TAO/examples/ior_corbaloc/status_i.h
@@ -11,7 +11,7 @@ class corbaloc_Status_i : public POA_corbaloc::Status
 public:
   corbaloc_Status_i ();
 
-  CORBA::Boolean print_status (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean print_status (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void set_name (const char *name) { server_name_ = name; }
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index bc4b918404d..5d7fdacb675 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -7,7 +7,7 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *orb_name = "";
 
@@ -15,21 +15,16 @@ main (int argc, char *argv[])
                   "Initializing the ORB!\n"));
       CORBA::ORB_var the_orb = CORBA::ORB_init (argc,
                                                 argv,
-                                                orb_name
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                orb_name);
 
       CORBA::Object_var orb_obj =
-        the_orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        the_orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var the_root_poa =
-        PortableServer::POA::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (orb_obj.in ());
 
       PortableServer::POAManager_var the_poa_manager =
-        the_root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        the_root_poa->the_POAManager ();
 
       // Retrieving the servants IOR from a file
 	  ACE_DEBUG ((LM_DEBUG,
@@ -39,15 +34,13 @@ main (int argc, char *argv[])
         "file://ior.txt";
 
       orb_obj =
-        the_orb->string_to_object (filename ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        the_orb->string_to_object (filename);
 
 	  ACE_DEBUG ((LM_DEBUG,
                   "Narrowing the IOR!\n"));
 
       W32_Test_Interface_var mycall =
-        W32_Test_Interface::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        W32_Test_Interface::_narrow (orb_obj.in ());
 
 	  ACE_DEBUG ((LM_DEBUG,
                   "Sending the Request!\n"));
@@ -58,13 +51,11 @@ main (int argc, char *argv[])
       // Free up the string.
       CORBA::string_free (response);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index f610bc8df5c..e5ae0008f05 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -43,7 +43,7 @@ END_MESSAGE_MAP()
 static unsigned long
 spawn_my_orb_thread (void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialization arguments for the ORB
       const char *orb_name = "";
@@ -51,34 +51,26 @@ spawn_my_orb_thread (void *)
       CORBA::ORB_var the_orb =
         CORBA::ORB_init (__argc,
                          __argv,
-                         orb_name
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         orb_name);
 
       CORBA::Object_var orb_obj =
-        the_orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        the_orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var the_root_poa =
-        PortableServer::POA::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (orb_obj.in ());
 
       PortableServer::POAManager_var the_poa_manager =
-        the_root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        the_root_poa->the_POAManager ();
 
-      the_poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      the_poa_manager->activate ();
 
       // Initializing the NamingService
       W32_Test_Impl myservant;
       W32_Test_Interface_var orb_servant =
         myservant._this (ACE_TRY_CHECK);
-      ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        the_orb->object_to_string (orb_servant.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        the_orb->object_to_string (orb_servant.in ());
 
       FILE *output_file = ACE_OS::fopen ("ior.txt",
                                         "w");
@@ -87,17 +79,13 @@ spawn_my_orb_thread (void *)
                        ior.in ());
       ACE_OS::fclose (output_file);
 
-      the_orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      the_orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return 0;
 }
@@ -114,7 +102,7 @@ CServerApp::CServerApp()
 
 CServerApp::~CServerApp()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var the_shutdown_orb;
 
@@ -126,23 +114,16 @@ CServerApp::~CServerApp()
       the_shutdown_orb =
         CORBA::ORB_init (argc,
                          argv,
-                         orb_name
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         orb_name);
 
-      the_shutdown_orb->shutdown (0 // wait_for_completion
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      the_shutdown_orb->shutdown (0);
 
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
 
   ACE::fini ();
diff --git a/TAO/interop-tests/wchar/client.cpp b/TAO/interop-tests/wchar/client.cpp
index c7ebabb7368..04b5ca47d56 100644
--- a/TAO/interop-tests/wchar/client.cpp
+++ b/TAO/interop-tests/wchar/client.cpp
@@ -101,72 +101,59 @@ assign_wstruct (short key, interop::wstruct & ws)
 
 CORBA::Boolean
 run_one_test (interop::WChar_Passer_ptr server,
-              int test_num ACE_ENV_ARG_DECL)
+              int test_num)
 {
   switch (test_num)
     {
     case WCHAR_TO_SERVER:
       return server->wchar_to_server (ref.get_wchar(data_set),
-                                      data_set
-                                      ACE_ENV_ARG_PARAMETER);
+                                      data_set);
     case WSTRING_TO_SERVER:
       return server->wstring_to_server (ref.get_wstring(data_set),
-                                        data_set
-                                        ACE_ENV_ARG_PARAMETER);
+                                        data_set);
     case WARRAY_TO_SERVER:
       return server->warray_to_server (ref.get_warray(data_set),
-                                       data_set
-                                       ACE_ENV_ARG_PARAMETER);
+                                       data_set);
     case ANY_WCHAR_TO_SERVER:
       {
         CORBA::Any a;
         a <<= CORBA::Any::from_wchar(ref.get_wchar(data_set));
-        return server->any_to_server (a,data_set ACE_ENV_ARG_PARAMETER);
+        return server->any_to_server (a,data_set);
       }
     case WSTRING_EXCEPTION:
       {
-        ACE_TRY_NEW_ENV
+        try
           {
-            server->exception_test(data_set ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            server->exception_test(data_set);
           }
-        ACE_CATCH (interop::WChar_Passer::WStringException, e)
+        catch (const interop::WChar_Passer::WStringException& e)
           {
             return ref.match_except (data_set,e.why.in());
           }
-        ACE_ENDTRY;
         break;
       }
     case WCHAR_FROM_SERVER:
       {
-        CORBA::WChar wc = server->wchar_from_server (data_set
-                                                     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+        CORBA::WChar wc = server->wchar_from_server (data_set);
         return ref.match_wchar (data_set,wc);
       }
     case WSTRING_FROM_SERVER:
       {
         CORBA::WString_var ws =
-          server->wstring_from_server (data_set
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+          server->wstring_from_server (data_set);
         return ref.match_wstring (data_set,ws.in());
       }
     case WARRAY_FROM_SERVER:
       {
         interop::warray_var wa =
-          server->warray_from_server (data_set
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+          server->warray_from_server (data_set);
         return ref.match_warray (data_set,wa.in());
       }
     case ANY_WCHAR_FROM_SERVER:
       {
         CORBA::WChar wc;
         CORBA::Any_var test = server->any_from_server (data_set,
-                                                       interop::is_wchar
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+                                                       interop::is_wchar);
         if (test >>= CORBA::Any::to_wchar(wc))
           {
             return ref.match_wchar (data_set,wc);
@@ -177,16 +164,13 @@ run_one_test (interop::WChar_Passer_ptr server,
       {
         CORBA::Any a;
         a <<= ref.get_wstring(data_set);
-        return server->any_to_server (a,data_set
-                                      ACE_ENV_ARG_PARAMETER);
+        return server->any_to_server (a,data_set);
       }
     case ANY_WSTRING_FROM_SERVER:
       {
         const CORBA::WChar *ws;
         CORBA::Any_var test = server->any_from_server (data_set,
-                                                       interop::is_wstring
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+                                                       interop::is_wstring);
         if (test >>= ws)
           {
             return ref.match_wstring (data_set,ws);
@@ -198,8 +182,7 @@ run_one_test (interop::WChar_Passer_ptr server,
         CORBA::Any a;
         a <<= ref.get_wstring(data_set);
         const CORBA::WChar *ws;
-        CORBA::Any_var test = server->any_echo (a ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+        CORBA::Any_var test = server->any_echo (a);
         if (test >>= ws)
           {
             return ref.match_wstring (data_set,ws);
@@ -209,8 +192,7 @@ run_one_test (interop::WChar_Passer_ptr server,
     case WSTRUCTSEQ_FROM_SERVER:
       {
         interop::wstructseq_var wsList =
-          server->wstructseq_from_server(data_set ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+          server->wstructseq_from_server(data_set);
         int result = 1;
 
         for (CORBA::ULong i = 0; i < wsList->length(); i++)
@@ -227,13 +209,11 @@ run_one_test (interop::WChar_Passer_ptr server,
         {
           assign_wstruct(data_set, (*wsList)[i]);
         }
-        return server->wstructseq_to_server(wsList.in(), data_set
-                                            ACE_ENV_ARG_PARAMETER);
+        return server->wstructseq_to_server(wsList.in(), data_set);
       }
     case NUL_WSTRING_TO_SERVER:
       return server->wstring_to_server (L"",
-                                        -1
-                                        ACE_ENV_ARG_PARAMETER);
+                                        -1);
     default:
       break;
     }
@@ -241,7 +221,7 @@ run_one_test (interop::WChar_Passer_ptr server,
 }
 
 short
-run_tests (interop::WChar_Passer_ptr server ACE_ENV_ARG_DECL)
+run_tests (interop::WChar_Passer_ptr server)
 {
   short successes = 0;
   short numtests = 0;
@@ -250,8 +230,7 @@ run_tests (interop::WChar_Passer_ptr server ACE_ENV_ARG_DECL)
   for (int i = 0; i < LAST_TEST; i++, t <<= 1)
     if ((tests_to_run & t) == t)
       {
-        CORBA::Boolean result = run_one_test (server,t ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+        CORBA::Boolean result = run_one_test (server,t);
         ++numtests;
         if (result) ++successes;
         if (verbose)
@@ -324,7 +303,7 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
   ACE_UNUSED_ARG (argv);
   ACE_ERROR_RETURN ((LM_ERROR,ACE_TEXT ("This test requires wchar support\n")),0);
 #else
-  ACE_TRY_NEW_ENV
+  try
   {
     ACE_Argv_Type_Converter command_line(argc, argv);
     // Initialize orb
@@ -333,8 +312,7 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
       return 0;
 
     // Destringify ior
-    CORBA::Object_var obj = orb->string_to_object( ACE_TEXT_ALWAYS_CHAR(ior) ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::Object_var obj = orb->string_to_object( ACE_TEXT_ALWAYS_CHAR(ior));
     if( CORBA::is_nil( obj.in() ) )
       ACE_ERROR_RETURN ((LM_ERROR,
                          "arg is not a valid ior sting"),
@@ -342,35 +320,30 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
 
     // Narrow
     interop::WChar_Passer_var server =
-      interop::WChar_Passer::_narrow( obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      interop::WChar_Passer::_narrow( obj.in());
 
     if( CORBA::is_nil( server.in() ))
       ACE_ERROR_RETURN ((LM_ERROR,
                          "arg is not a interop::WChar_Passer reference\n"),
                         -1);
 
-    short result = run_tests (server.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    short result = run_tests (server.in());
     CORBA::String_var server_orb =
-      server->orb_name(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      server->orb_name();
     ACE_ERROR ((LM_ERROR,
                 "wchar_interop test (TAO client, %s server) %s \n",
                 server_orb.in(),
                 (result ? "passed" : "failed")));
     if (kill_server)
     {
-      server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown();
     }
   }
-  ACE_CATCH(CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ex, "Uncaught CORBA exception: ");
+    ex._tao_print_exception ("Uncaught CORBA exception: ");
     return 1;
   }
-  ACE_ENDTRY;
   return 0;
 #endif
 }
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index 88aa05387ca..df242339900 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.cpp
+++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp
@@ -38,7 +38,7 @@ interop_WChar_Passer_i::~interop_WChar_Passer_i (void)
 }
 
 char *
-interop_WChar_Passer_i::orb_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+interop_WChar_Passer_i::orb_name (void)
     ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return CORBA::string_dup ("TAO");
@@ -46,16 +46,14 @@ interop_WChar_Passer_i::orb_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Boolean
 interop_WChar_Passer_i::wchar_to_server (CORBA::WChar test,
-                                         CORBA::Short key
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_wchar (key,test);
 }
 
 CORBA::WChar
-interop_WChar_Passer_i::wchar_from_server (CORBA::Short key
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+interop_WChar_Passer_i::wchar_from_server (CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.get_wchar (key);
@@ -63,16 +61,14 @@ interop_WChar_Passer_i::wchar_from_server (CORBA::Short key
 
 CORBA::Boolean
 interop_WChar_Passer_i::wstring_to_server (const CORBA::WChar * test,
-                                           CORBA::Short key
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_wstring(key,test);
 }
 
 CORBA::WChar *
-interop_WChar_Passer_i::wstring_from_server (CORBA::Short key
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+interop_WChar_Passer_i::wstring_from_server (CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return CORBA::wstring_dup (ref_.get_wstring(key));
@@ -80,16 +76,14 @@ interop_WChar_Passer_i::wstring_from_server (CORBA::Short key
 
 CORBA::Boolean
 interop_WChar_Passer_i::warray_to_server (const interop::warray test,
-                                          CORBA::Short key
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return ref_.match_warray(key,test);
 }
 
 interop::warray_slice *
-interop_WChar_Passer_i::warray_from_server (CORBA::Short key
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+interop_WChar_Passer_i::warray_from_server (CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return interop::warray_dup (ref_.get_warray(key));
@@ -97,27 +91,23 @@ interop_WChar_Passer_i::warray_from_server (CORBA::Short key
 
 CORBA::Boolean
 interop_WChar_Passer_i::wstruct_to_server (const interop::wstruct & test,
-                                           CORBA::Short key
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return
     ref_.match_wchar (key,test.st_char) &&
     ref_.match_wstring (key,test.st_string) &&
     ref_.match_warray (key,test.st_array) &&
-    this->any_to_server (test.st_any,key ACE_ENV_ARG_PARAMETER);
+    this->any_to_server (test.st_any,key);
 }
 
 interop::wstruct *
-interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key
-                                             ACE_ENV_ARG_DECL)
+interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wstruct_var ws = new interop::wstruct ();
-  ws->st_char = this->wchar_from_server(key ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  ws->st_string = this->wstring_from_server(key ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ws->st_char = this->wchar_from_server(key);
+  ws->st_string = this->wstring_from_server(key);
   ref_.assign_warray (key, ws->st_array);
   ws->st_any <<= ref_.get_wstring(key);
   return ws._retn ();
@@ -125,22 +115,19 @@ interop_WChar_Passer_i::wstruct_from_server (CORBA::Short key
 
 CORBA::Boolean
 interop_WChar_Passer_i::wstructseq_to_server (const interop::wstructseq & test,
-                                              CORBA::Short key
-                                              ACE_ENV_ARG_DECL)
+                                              CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::Boolean result = 1;
   for (CORBA::ULong i = 0; result && i < test.length(); i++)
     {
-      result = this->wstruct_to_server(test[i], key ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      result = this->wstruct_to_server(test[i], key);
     }
   return result;
 }
 
 interop::wstructseq *
-interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key
-                                                ACE_ENV_ARG_DECL)
+interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wstructseq_var wsListI = new interop::wstructseq();
@@ -148,10 +135,8 @@ interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key
 
   for (CORBA::ULong i = 0; i < wsListI->length(); i++)
     {
-      wsListI[i].st_char = this->wchar_from_server(key ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-      wsListI[i].st_string = this->wstring_from_server(key ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      wsListI[i].st_char = this->wchar_from_server(key);
+      wsListI[i].st_string = this->wstring_from_server(key);
       ref_.assign_warray (key, wsListI[i].st_array);
       // this is to keep Cxx on TRUE64 happy
       // it won't cast a wide character literal (i.e. L"")
@@ -165,17 +150,16 @@ interop_WChar_Passer_i::wstructseq_from_server (CORBA::Short key
 
 CORBA::Boolean
 interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test,
-                                          CORBA::Short key
-                                          ACE_ENV_ARG_DECL)
+                                          CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   switch (test._d()) {
   case interop::is_wchar :
-    return this->wchar_to_server (test.u_char(),key  ACE_ENV_ARG_PARAMETER);
+    return this->wchar_to_server (test.u_char(),key);
   case interop::is_wstring :
-    return this->wstring_to_server (test.u_string(),key  ACE_ENV_ARG_PARAMETER);
+    return this->wstring_to_server (test.u_string(),key);
   case interop::is_warray :
-    return this->warray_to_server (test.u_array(),key ACE_ENV_ARG_PARAMETER);
+    return this->warray_to_server (test.u_array(),key);
   default:
     /*return 0*/;
   }
@@ -184,8 +168,7 @@ interop_WChar_Passer_i::wunion_to_server (const interop::wunion & test,
 
 interop::wunion *
 interop_WChar_Passer_i::wunion_from_server (CORBA::Short key,
-                                            interop::wchar_types type
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+                                            interop::wchar_types type)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   interop::wunion *wu = new interop::wunion ();
@@ -206,8 +189,7 @@ interop_WChar_Passer_i::wunion_from_server (CORBA::Short key,
 
 CORBA::Boolean
 interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
-                                       CORBA::Short key
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::WChar wc;
@@ -217,23 +199,22 @@ interop_WChar_Passer_i::any_to_server (const CORBA::Any &test,
 
   if (test >>= CORBA::Any::to_wchar(wc))
     {
-      return this->wchar_to_server(wc,key ACE_ENV_ARG_PARAMETER);
+      return this->wchar_to_server(wc,key);
     }
   else if (test >>= ws)
     {
-      return this->wstring_to_server (ws,key ACE_ENV_ARG_PARAMETER);
+      return this->wstring_to_server (ws,key);
     }
   else if (test >>= forany)
     {
-      return this->warray_to_server (forany.in(),key ACE_ENV_ARG_PARAMETER);
+      return this->warray_to_server (forany.in(),key);
     }
   return 0;
 }
 
 CORBA::Any*
 interop_WChar_Passer_i::any_from_server (CORBA::Short key,
-                                         interop::wchar_types type
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         interop::wchar_types type)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   CORBA::Any *any = new CORBA::Any;
@@ -255,26 +236,24 @@ interop_WChar_Passer_i::any_from_server (CORBA::Short key,
 }
 
 CORBA::Any *
-interop_WChar_Passer_i::any_echo (const CORBA::Any &test
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+interop_WChar_Passer_i::any_echo (const CORBA::Any &test)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   return new CORBA::Any (test);
 }
 
 void
-interop_WChar_Passer_i::exception_test ( CORBA::Short key
-                                         ACE_ENV_ARG_DECL)
+interop_WChar_Passer_i::exception_test ( CORBA::Short key)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    interop::WChar_Passer::WStringException))
 {
-  ACE_THROW (interop::WChar_Passer::WStringException(ref_.get_except(key),
-                                             this->wchar_from_server(key ACE_ENV_ARG_PARAMETER)));
+  throw interop::WChar_Passer::WStringException(ref_.get_except(key),
+                                                this->wchar_from_server(key));
 }
 
 void
-interop_WChar_Passer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+interop_WChar_Passer_i::shutdown (void)
   ACE_THROW_SPEC (( CORBA::SystemException ))
 {
-  this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown(0);
 }
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h
index 395d1a89607..bec5f5c7e3c 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.h
+++ b/TAO/interop-tests/wchar/interop_wchar_i.h
@@ -42,84 +42,68 @@ public:
   //Destructor
   virtual ~interop_WChar_Passer_i (void);
 
-  virtual char * orb_name (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * orb_name (void)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wchar_to_server (CORBA::WChar test,
-                                          CORBA::Short key
-                                          ACE_ENV_ARG_DECL)
+                                          CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual CORBA::WChar wchar_from_server (CORBA::Short key
-                                          ACE_ENV_ARG_DECL)
+  virtual CORBA::WChar wchar_from_server (CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wstring_to_server (const CORBA::WChar * test,
-                                            CORBA::Short key
-                                            ACE_ENV_ARG_DECL)
+                                            CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual CORBA::WChar * wstring_from_server (CORBA::Short key
-                                              ACE_ENV_ARG_DECL)
+  virtual CORBA::WChar * wstring_from_server (CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean warray_to_server (const interop::warray test,
-                                           CORBA::Short key
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual interop::warray_slice * warray_from_server (CORBA::Short key
-                                                      ACE_ENV_ARG_DECL)
+  virtual interop::warray_slice * warray_from_server (CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wstruct_to_server (const interop::wstruct & test,
-                                            CORBA::Short key
-                                            ACE_ENV_ARG_DECL)
+                                            CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual interop::wstruct * wstruct_from_server (CORBA::Short key
-                                                  ACE_ENV_ARG_DECL)
+  virtual interop::wstruct * wstruct_from_server (CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean wstructseq_to_server (const interop::wstructseq & test,
-                                            CORBA::Short key
-                                            ACE_ENV_ARG_DECL)
+                                            CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual interop::wstructseq * wstructseq_from_server (CORBA::Short key
-                                             ACE_ENV_ARG_DECL)
+  virtual interop::wstructseq * wstructseq_from_server (CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
  virtual CORBA::Boolean wunion_to_server (const interop::wunion & test,
-                                           CORBA::Short key
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::Short key)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual interop::wunion * wunion_from_server (CORBA::Short key,
-                                                interop::wchar_types type
-                                                ACE_ENV_ARG_DECL)
+                                                interop::wchar_types type)
     ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Boolean any_to_server (const CORBA::Any &test,
-                                        CORBA::Short key
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
   virtual CORBA::Any* any_from_server (CORBA::Short key,
-                                       interop::wchar_types type
-                                       ACE_ENV_ARG_DECL)
+                                       interop::wchar_types type)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
-  virtual CORBA::Any* any_echo (const CORBA::Any &test
-                                ACE_ENV_ARG_DECL)
+  virtual CORBA::Any* any_echo (const CORBA::Any &test)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
-virtual void exception_test (CORBA::Short key
-                             ACE_ENV_ARG_DECL)
+virtual void exception_test (CORBA::Short key)
   ACE_THROW_SPEC (( CORBA::SystemException,
                     interop::WChar_Passer::WStringException ));
 
-virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+virtual void shutdown (void)
   ACE_THROW_SPEC (( CORBA::SystemException ));
 
 private:
diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp
index 8b464c4cbd5..0ba8e111404 100644
--- a/TAO/interop-tests/wchar/server.cpp
+++ b/TAO/interop-tests/wchar/server.cpp
@@ -80,8 +80,7 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
   ACE_OS::fclose (output_file);
   ACE_ERROR_RETURN ((LM_ERROR,"This test requires wchar support\n"),0);
 #else
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
         // Initialize orb
         CORBA::ORB_var orb = CORBA::ORB_init( command_line.get_argc(), command_line.get_ASCII_argv() );
@@ -89,21 +88,17 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
         //Get reference to Root POA
         CORBA::Object_var obj =
         orb->resolve_initial_references( "RootPOA"
-                                         ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+ );
 
         PortableServer::POA_var poa =
           PortableServer::POA::_narrow( obj.in()
-                                        ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+ );
 
         PortableServer::POAManager_var mgr =
-          poa->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+          poa->the_POAManager( );
 
         // Activate POA Manager
-        mgr->activate( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+        mgr->activate( );
 
         // Create an object
         interop_WChar_Passer_i servant(orb.in(), verbose);
@@ -111,13 +106,11 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
         // Register the servant with the RootPOA, obtain its object
         // reference, stringify it, and write it to a file.
         obj = poa->servant_to_reference( &servant
-                                         ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+ );
 
         CORBA::String_var str =
           orb->object_to_string( obj.in()
-                                 ACE_ENV_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+ );
 
         FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
         if (output_file == 0)
@@ -130,17 +123,14 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
         ACE_OS::fclose (output_file);
 
         // Accept requests
-        orb->run( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
-        orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+        orb->run( );
+        orb->destroy( );
       }
-    ACE_CATCH(CORBA::Exception, ex)
+    catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION(ex, "uncaught exception");
+        ex._tao_print_exception ("uncaught exception");
         return 1;
       }
-    ACE_ENDTRY;
 
     return 0;
 #endif /* ACE_HAS_WCHAR */
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index a3245dae921..71f2362ab05 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -1,20 +1,17 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/Concurrecy_Service/Concurrency_Service
-//
-// = FILENAME
-//    Concurrency_Service.cpp
-//
-// = DESCRIPTION
-//      This class implements a Concurrency_Service object.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Concurrency_Service.cpp
+ *
+ *  $Id$
+ *
+ *    This class implements a Concurrency_Service object.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #include "Concurrency_Service.h"
 
@@ -42,12 +39,11 @@ Concurrency_Service::Concurrency_Service (void)
 // Constructor taking command-line arguments.
 
 Concurrency_Service::Concurrency_Service (int argc,
-                                          ACE_TCHAR** argv
-                                          ACE_ENV_ARG_DECL)
+                                          ACE_TCHAR** argv)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("Concurrency_Service::Concurrency_Service (...)\n")));
-  this->init (argc, argv ACE_ENV_ARG_PARAMETER);
+  this->init (argc, argv);
 }
 
 int
@@ -91,8 +87,7 @@ Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv)
 
 int
 Concurrency_Service::init (int argc,
-                           ACE_TCHAR **argv
-                           ACE_ENV_ARG_DECL)
+                           ACE_TCHAR **argv)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::init\n"));
@@ -102,21 +97,18 @@ Concurrency_Service::init (int argc,
 
   if (this->orb_manager_.init_child_poa (command_line.get_argc(),
                                          command_line.get_ASCII_argv(),
-                                         "child_poa"
-                                          ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("%p\n"),
                        ACE_TEXT("init_child_poa")),
                       -1);
-  ACE_CHECK_RETURN (-1);
 
   if (this->parse_args (command_line.get_argc(), command_line.get_TCHAR_argv())!=0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT("Could not parse command line\n")),
                      -1);
   CORBA::String_var str =
-    this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory ()
-                                ACE_ENV_ARG_PARAMETER);
+    this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory ());
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               ACE_TEXT_CHAR_TO_TCHAR(str.in ())));
@@ -149,13 +141,13 @@ Concurrency_Service::init (int argc,
     }
 
   if (this->use_naming_service_)
-    return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->init_naming_service ();
 
   return 0;
 }
 
 int
-Concurrency_Service::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Concurrency_Service::init_naming_service (void)
 {
   ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n"));
   CORBA::ORB_var orb;
@@ -168,38 +160,32 @@ Concurrency_Service::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
   if (result == -1)
     return result;
   lockset_factory_ =
-    this->my_concurrency_server_.GetLockSetFactory ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->my_concurrency_server_.GetLockSetFactory ()->_this ();
 
   CosNaming::Name concurrency_context_name (1);
   concurrency_context_name.length (1);
   concurrency_context_name[0].id = CORBA::string_dup ("CosConcurrency");
 
   this->concurrency_context_ =
-    this->naming_client_->bind_new_context (concurrency_context_name
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->naming_client_->bind_new_context (concurrency_context_name);
 
   CosNaming::Name lockset_name (1);
   lockset_name.length (1);
   lockset_name[0].id = CORBA::string_dup ("LockSetFactory");
   this->concurrency_context_->bind (lockset_name,
-                                   lockset_factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                   lockset_factory_.in ());
   return 0;
 }
 
 // Run the ORB event loop.
 
 int
-Concurrency_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Concurrency_Service::run (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::run (...)\n"));
 
-  int retval = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int retval = this->orb_manager_.run ();
   if (retval == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                       "Concurrency_Service::run"),
@@ -223,30 +209,26 @@ ACE_TMAIN (int argc, ACE_TCHAR ** argv)
   ACE_DEBUG ((LM_DEBUG,
               "\n \t Concurrency Service:SERVER \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int r = concurrency_service.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int r = concurrency_service.init (argc, argv);
 
       if (r == -1)
         return 1;
 
-      concurrency_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      concurrency_service.run ();
     }
 
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
 
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index ccd0fe73930..e5f0c5e133b 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -1,21 +1,18 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/Concurrency_Service/Concurency_Service
-//
-// = FILENAME
-//    Concurrency_Service.h
-//
-// = DESCRIPTION
-//      This class implements a subset of the functionality of the
-//      CORBA Concurrency Service.
-//
-// = AUTHORS
-//    Torben Worm <tworm@cs.wustl.edu>
-//
-// ============================================================================
+
+//=============================================================================
+/**
+ *  @file    Concurrency_Service.h
+ *
+ *  $Id$
+ *
+ *    This class implements a subset of the functionality of the
+ *    CORBA Concurrency Service.
+ *
+ *
+ *  @author Torben Worm <tworm@cs.wustl.edu>
+ */
+//=============================================================================
+
 
 #ifndef _CONCURRENCY_SERVICE_H
 #define _CONCURRENCY_SERVICE_H
@@ -31,73 +28,76 @@
 #include "orbsvcs/Concurrency/Concurrency_Utils.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
+/**
+ * @class Concurrency_Service
+ *
+ * @brief Defines a class that encapsulates the implementation of the
+ * concurrency service.
+ *
+ * This class uses the TAO_ORB_Manager, the TAO_Naming_Client, and
+ * the TAO_Concurrency_Server classes to implement a server for
+ * the concurrency service.
+ */
 class Concurrency_Service : public TAO_ORB_Manager
 {
-  // = TITLE
-  //   Defines a class that encapsulates the implementation of the
-  //   concurrency service.
-  // = DESCRIPTION
-  //   This class uses the TAO_ORB_Manager, the TAO_Naming_Client, and
-  //   the TAO_Concurrency_Server classes to implement a server for
-  //   the concurrency service.
 public:
   // = Initialization and termination methods.
+  /// Default Constructor.
   Concurrency_Service (void);
-  // Default Constructor.
 
+  /// Constructor taking the command-line arguments.
   Concurrency_Service (int argc,
-                       ACE_TCHAR **argv
-                       ACE_ENV_ARG_DECL);
-  // Constructor taking the command-line arguments.
+                       ACE_TCHAR **argv);
 
+  /// Destructor.
   ~Concurrency_Service (void);
-  // Destructor.
 
+  /// Initialize the Concurrency Service with the arguments.
   int init (int argc,
-            ACE_TCHAR **argv
-            ACE_ENV_ARG_DECL);
-  // Initialize the Concurrency Service with the arguments.
+            ACE_TCHAR **argv);
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
-  // Run the Concurrency_Service.
+  /// Run the Concurrency_Service.
+  int run (void);
 
 private:
+  /// Parses the commandline arguments.
   int parse_args (int argc, ACE_TCHAR** argv);
-  // Parses the commandline arguments.
 
-  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
-  // Initialize the name server and register the concurency server
-  // factory with it. Maybe later it will be convinient to register
-  // the individual lock sets with the naming service. At present the
-  // clients must keep track of the reference and pass 'by hand'
+  /**
+   * Initialize the name server and register the concurency server
+   * factory with it. Maybe later it will be convinient to register
+   * the individual lock sets with the naming service. At present the
+   * clients must keep track of the reference and pass 'by hand'
+   */
+  int init_naming_service (void);
 
+  /// Flag to tell wheter the naming service will be used.
   int use_naming_service_;
-  // Flag to tell wheter the naming service will be used.
 
+  /// The name of the file where we output the IOR.
   const char *ior_file_name_;
-  // The name of the file where we output the IOR.
 
+  /// The name of a file where the process stores its pid.
   const char *pid_file_name_;
-  // The name of a file where the process stores its pid.
 
+  /// The ORB manager
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager
 
+  /// An instance of the name client used for registering the factory
+  /// objects.
   TAO_Naming_Client naming_client_;
-  // An instance of the name client used for registering the factory
-  // objects.
 
+  /// An instance of the concurrency server.
   TAO_Concurrency_Server my_concurrency_server_;
-  // An instance of the concurrency server.
 
+  /// Factory var to register with the naming service.
   CosConcurrencyControl::LockSetFactory_var lockset_factory_;
-  // Factory var to register with the naming service.
 
+  /// Naming context for the concurrency service.
   CosNaming::NamingContext_var concurrency_context_;
-  // Naming context for the concurrency service.
 
+  /// Naming context for the naming service.
   CosNaming::NamingContext_var naming_context_;
-  // Naming context for the naming service.
 };
 
 #endif /* _CONCURRENCY_SERVICE_H */
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 2bb2e9205ac..71f9d9740c5 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -8,8 +8,8 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_main.h"
 
-ACE_RCSID (CosEvent_Service, 
-           CosEvent_Service, 
+ACE_RCSID (CosEvent_Service,
+           CosEvent_Service,
            "$Id$")
 
 int
@@ -17,16 +17,14 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Intialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
 
       // Call TAO_CEC_Event_Loader::init (argc, argv) from here.
       TAO_CEC_Event_Loader event_service;
@@ -49,27 +47,24 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       //    Don't worry about this change yet... Let's get all the changes
       //    in and then we can fix the EC shutdown problem...
       //
-      //    As inidicated above, The Typed EC implementation can now be 
-      //    destroyed by passing -d at the command line and 
+      //    As inidicated above, The Typed EC implementation can now be
+      //    destroyed by passing -d at the command line and
       //    calling destroy on the typed EC interface.
       //    Calling fini() completes the destruction, although most of
       //    this is done in TAO_CEC_TypedEventChannel::shutdown().
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
       event_service.fini();
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
       // Destroy the ORB
-      orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, argv[0]);
+      ex._tao_print_exception (argv[0]);
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index ec523388f64..e40e3a66417 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -18,19 +18,17 @@ ACE_RCSID (Dump_Schedule,
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), "internet");
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil(naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -38,8 +36,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       const char *name = "ScheduleService";
       if (command_line.get_argc() > 1)
@@ -58,9 +55,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), deps.out (), configs.out (), anomalies.out ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         infos.out (), deps.out (), configs.out (), anomalies.out ());
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                             deps.in (),
@@ -68,11 +63,10 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
                                             anomalies.in (),
                                             "Scheduler_Runtime.cpp");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Dump_Schedule");
+      ex._tao_print_exception ("Dump_Schedule");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index f0510a4fef0..dc0082c11ef 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -51,38 +51,32 @@ Event_Service::~Event_Service (void)
 int
 Event_Service::run (int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Make a copy of command line parameter.
       ACE_Argv_Type_Converter command(argc, argv);
 
       // Initialize ORB.
       this->orb_ =
-        CORBA::ORB_init (command.get_argc(), command.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (command.get_argc(), command.get_ASCII_argv(), "");
 
       if (this->parse_args (command.get_argc(), command.get_TCHAR_argv()) == -1)
         return 1;
 
       CORBA::Object_var root_poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (root_poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the root POA.\n"),
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (root_poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (root_poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // When we have a service name or a non local scheduler we must use the
       // naming service.
@@ -97,8 +91,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
       if (use_name_service)
         {
           naming_obj=
-            this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->resolve_initial_references ("NameService");
 
           if (CORBA::is_nil (naming_obj.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -106,8 +99,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
                               1);
 
           naming_context =
-            CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CosNaming::NamingContext::_narrow (naming_obj.in ());
         }
 
       // This is the name we (potentially) register the Scheduling
@@ -125,27 +117,21 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
                           ACE_Config_Scheduler,
                           1);
 
-          scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          scheduler = this->sched_impl_->_this ();
 
           // Register the servant with the Naming Context....
           if (!CORBA::is_nil (naming_context.in ()))
             {
-              naming_context->rebind (schedule_name, scheduler.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              naming_context->rebind (schedule_name, scheduler.in ());
             }
         }
       else if (this->scheduler_type_ == ES_SCHED_GLOBAL)
         {
           // Get reference to a scheduler from naming service
           CORBA::Object_var tmp =
-            naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            naming_context->resolve (schedule_name);
 
-          scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ());
 
           if (CORBA::is_nil (scheduler.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -167,13 +153,12 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
                       1);
       this->ec_impl_ = ec_impl;
 
-      ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl->activate ();
 
       RtecEventChannelAdmin::EventChannel_var ec;
 
       // If the object_id_ is empty and we don't use BiDIR GIOP, activate the
-      // servant under the default POA, else create a new child POA with 
+      // servant under the default POA, else create a new child POA with
       // the needed policies
       int persistent = ACE_OS::strcmp(this->object_id_.c_str(), "");
       if ((persistent == 0) && (this->use_bidir_giop_ == false))
@@ -181,8 +166,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
           // Notice that we activate *this* object with the POA, but we
           // forward all the requests to the underlying EC
           // implementation.
-          ec = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ec = this->_this ();
         }
       else
         {
@@ -194,14 +178,10 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
           if (persistent != 0)
             {
               policies[index++] =
-                root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
               policies[index++] =
-                root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
             }
 
           if (this->use_bidir_giop_ == true)
@@ -210,9 +190,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
               pol <<= BiDirPolicy::BOTH;
               policies[index++] =
                 this->orb_->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                                           pol
-                                            ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                           pol);
             }
 
           policies.length (index);
@@ -221,17 +199,14 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
           PortableServer::POA_var child_poa =
             root_poa->create_POA (child_poa_name.c_str (),
                                   poa_manager.in (),
-                                  policies
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                  policies);
 
           // Creation of persistentPOA is over. Destroy the Policy objects.
           for (CORBA::ULong i = 0;
                i < policies.length ();
                ++i)
             {
-              policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              policies[i]->destroy ();
             }
 
           if (CORBA::is_nil (child_poa.in ()))
@@ -243,24 +218,17 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
             PortableServer::string_to_ObjectId(object_id_.c_str());
 
           child_poa->activate_object_with_id(ec_object_id.in(),
-                                             this
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                             this);
 
           CORBA::Object_var ec_obj =
-            child_poa->id_to_reference(ec_object_id.in()
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            child_poa->id_to_reference(ec_object_id.in());
 
           ec =
-            RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in()
-                                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in());
         }
 
       CORBA::String_var str =
-         this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         this->orb_->object_to_string (ec.in ());
 
       if (ACE_OS::strcmp(this->ior_file_name_.c_str(), "") != 0)
         {
@@ -299,39 +267,34 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
           CosNaming::Name channel_name (1);
           channel_name.length (1);
           channel_name[0].id = CORBA::string_dup (this->service_name_.c_str());
-          naming_context->rebind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          naming_context->rebind (channel_name, ec.in ());
         }
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("%s; running event service\n"),
                   ACE_TEXT_CHAR_TO_TCHAR(__FILE__)));
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
       if (bind_to_naming_service_ && !CORBA::is_nil (naming_context.in ()))
         {
           CosNaming::Name channel_name (1);
           channel_name.length (1);
           channel_name[0].id = CORBA::string_dup (this->service_name_.c_str());
-          naming_context->unbind (channel_name ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          naming_context->unbind (channel_name);
         }
 
       if (!CORBA::is_nil (scheduler.in ()) &&
           !CORBA::is_nil (naming_context.in ()))
         {
-          naming_context->unbind (schedule_name ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          naming_context->unbind (schedule_name);
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC");
+      ex._tao_print_exception ("EC");
     }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -423,47 +386,44 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv [])
 
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-Event_Service::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+Event_Service::for_consumers (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->ec_impl_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ec_impl_->for_consumers ();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-Event_Service::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+Event_Service::for_suppliers (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->ec_impl_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ec_impl_->for_suppliers ();
 }
 
 void
-Event_Service::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Event_Service::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_impl_->destroy ();
   this->orb_->shutdown ();
 }
 
 RtecEventChannelAdmin::Observer_Handle
-Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                                ACE_ENV_ARG_DECL)
+Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER);
+  return this->ec_impl_->append_observer (observer);
 }
 
 void
-Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
-                                ACE_ENV_ARG_DECL)
+Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
+  this->ec_impl_->remove_observer (handle);
 }
 
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index efd15738d4c..84c3f46542f 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -41,22 +41,20 @@ public:
 
   // = The RtecEventChannelAdmin::Event_Channel methods
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    for_consumers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    for_suppliers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                     ACE_ENV_ARG_DECL)
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle
-                                ACE_ENV_ARG_DECL)
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index add3c0f5153..6648a74bba9 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -40,7 +40,7 @@ FT_EventService::~FT_EventService()
 int
 FT_EventService::run(int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     // Make a copy of command line parameter.
     ACE_Argv_Type_Converter command(argc, argv);
@@ -48,72 +48,58 @@ FT_EventService::run(int argc, ACE_TCHAR* argv[])
     // Initialize ORB.
     orb_ = CORBA::ORB_init (command.get_argc(),
                             command.get_ASCII_argv(),
-                            "" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                            "");
 
     if (this->parse_args (command.get_argc(), command.get_TCHAR_argv()) == -1)
       return 1;
 
     CORBA::Object_var root_poa_object =
-      orb_->resolve_initial_references("RootPOA"
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb_->resolve_initial_references("RootPOA");
     if (CORBA::is_nil (root_poa_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
       " (%P|%t) Unable to initialize the root POA.\n"),
       1);
 
     PortableServer::POA_var root_poa =
-      PortableServer::POA::_narrow (root_poa_object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      PortableServer::POA::_narrow (root_poa_object.in ());
 
     PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      root_poa->the_POAManager ();
 
-    poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    poa_manager->activate ();
 
     CORBA::Object_var naming_obj =
-      orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb_->resolve_initial_references ("NameService");
     if (CORBA::is_nil (naming_obj.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
       " (%P|%t) Unable to initialize the Naming Service.\n"),
       1);
 
     CosNaming::NamingContext_var naming_context =
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
 
-    setup_scheduler(naming_context.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(-1);
+    setup_scheduler(naming_context.in());
 
 
-    poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    poa_manager->activate();
 
     // Activate the Event channel implementation
 
     TAO_FTEC_Event_Channel ec(orb_, root_poa);
 
     FtRtecEventChannelAdmin::EventChannel_var ec_ior =
-      ec.activate(membership_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      ec.activate(membership_);
 
     if (report_factory(orb_.in(), ec_ior.in() )==-1)
       return -1;
 
-    orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb_->run();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+    ex._tao_print_exception ("A CORBA Exception occurred.");
     return -1;
   }
-  ACE_ENDTRY;
 
 
   ACE_Thread_Manager::instance()->wait();
@@ -205,8 +191,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv [])
 }
 
 void
-FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
-                                 ACE_ENV_ARG_DECL)
+FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context)
 {
     RtecScheduler::Scheduler_var scheduler;
     if (CORBA::is_nil(naming_context)) {
@@ -214,8 +199,7 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
             ACE_Config_Scheduler,
             CORBA::NO_MEMORY());
 
-        scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        scheduler = this->sched_impl_->_this ();
 
         if (ACE_Scheduler_Factory::server(scheduler.in()) == -1)
             ACE_ERROR((LM_ERROR,"Unable to install scheduler\n"));
@@ -238,23 +222,17 @@ FT_EventService::setup_scheduler(CosNaming::NamingContext_ptr naming_context
                     ACE_Config_Scheduler,
                     CORBA::NO_MEMORY());
 
-                scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK;
+                scheduler = this->sched_impl_->_this ();
 
                 // Register the servant with the Naming Context....
-                naming_context->rebind (schedule_name, scheduler.in ()
-                    ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
+                naming_context->rebind (schedule_name, scheduler.in ());
             }
             else
             {
                 CORBA::Object_var tmp =
-                    naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
+                    naming_context->resolve (schedule_name);
 
-                scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
-                    ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
+                scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ());
             }
         }
     }
@@ -264,7 +242,7 @@ int
 FT_EventService::report_factory(CORBA::ORB_ptr orb,
                    FtRtecEventChannelAdmin::EventChannel_ptr ec)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     char* addr = ACE_OS::getenv("EventChannelFactoryAddr");
 
     if (addr != NULL) {
@@ -278,10 +256,8 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb,
         ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Invalid Factory Address\n"), -1);
 
       ACE_DEBUG((LM_DEBUG,"Factory connected\n"));
-      CORBA::String_var my_ior_string = orb->object_to_string(ec
-        ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var my_ior_string = orb->object_to_string(ec);
 
-      ACE_TRY_CHECK;
       int len = strlen(my_ior_string.in()) ;
 
       if (stream.send_n(my_ior_string.in(), len) != len)
@@ -290,10 +266,9 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb,
       stream.close();
     }
   }
-  ACE_CATCHALL {
+  catch (...){
     return -1;
   }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
index 9238edf51b0..c8c181e55cc 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
@@ -35,8 +35,7 @@ public:
 
 private:
   int parse_args (int argc, ACE_TCHAR* argv []);
-  void setup_scheduler(CosNaming::NamingContext_ptr naming_context
-                                        ACE_ENV_ARG_DECL);
+  void setup_scheduler(CosNaming::NamingContext_ptr naming_context);
   int report_factory(CORBA::ORB_ptr orb,
                    FtRtecEventChannelAdmin::EventChannel_ptr ec);
   virtual void become_primary();
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index b4febf2f835..45cfae40bcf 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -24,7 +24,6 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
   const char * type_id,
   const PortableGroup::Criteria & the_criteria,
   PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -40,11 +39,11 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
   FILE* file = 0;
   char *id_str=0, *prog=0;
 
-  ACE_TRY {
+  try{
 
     file = fopen(conf_file, "r");
     if (file == 0)
-      ACE_TRY_THROW (PortableGroup::NoFactory());
+      throw PortableGroup::NoFactory();
 
     ACE_Read_Buffer read_buf(file);
 
@@ -56,21 +55,18 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
       }
     }
   }
-  ACE_CATCHALL {
+  catch (...){
     if (file) fclose(file);
     if (id_str) ACE_Allocator::instance()->free(id_str);
     if (prog) ACE_Allocator::instance()->free(prog);
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
 
     ACE_THROW_RETURN(PortableGroup::ObjectNotCreated(), CORBA::Object::_nil());
 }
 
 void EventChannelFactory_i::delete_object (
   const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
@@ -83,7 +79,7 @@ void EventChannelFactory_i::delete_object (
   CORBA::Object_var obj;
   if (objects.find(object_id, obj) == 0) {
     objects.unbind(object_id);
-    //obj->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
+    //obj->shutdown();
   }
 }
 
@@ -185,18 +181,15 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   if (strlen(ior)  ==0)
     return result;
 
-  ACE_TRY_NEW_ENV {
-    CORBA::Object_var result  = orb->string_to_object(ior
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    CORBA::Object_var result  = orb->string_to_object(ior);
 
     if (objects.bind(id, result) ==0){
       return result._retn();
     }
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
index 656df7363bf..c4f2da131fe 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.h
@@ -29,7 +29,6 @@ public:
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -42,7 +41,6 @@ public:
 
   virtual void delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index e2189bb34db..f9e0cb37295 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -55,49 +55,35 @@ int parse_args(int argc, char* argv[])
 int main(int argc, ACE_TCHAR* argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
     if (parse_args(argc, argv) == -1)
       return -1;
 
     CORBA::Object_var obj =
-      orb->resolve_initial_references("RootPOA"
-      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+      orb->resolve_initial_references("RootPOA");
 
     PortableServer::POA_var poa =
-      PortableServer::POA::_narrow(obj.in()
-                                   ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      PortableServer::POA::_narrow(obj.in());
 
-    PortableServer::POAManager_var mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    PortableServer::POAManager_var mgr = poa->the_POAManager();
 
-    mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    mgr->activate();
 
     EventChannelFactory_i servant("factory.cfg", orb.in());
 
     FT::GenericFactory_var event_channel_factory =
-      servant._this(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      servant._this();
 
     // register to the Event Service
 
     if (id.length()) {
       CORBA::Object_var namng_contex_object =
-        orb->resolve_initial_references("NameService"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("NameService");
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow(namng_contex_object.in()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow(namng_contex_object.in());
 
       // register to naming service
       CosNaming::Name name(1);
@@ -106,9 +92,7 @@ int main(int argc, ACE_TCHAR* argv[])
       if (kind.length())
         name[0].kind = CORBA::string_dup(kind.c_str());
 
-      naming_context->bind(name, event_channel_factory.in()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_context->bind(name, event_channel_factory.in());
 
       ACE_DEBUG((LM_DEBUG, "Register to naming service with %s", id.c_str()));
       if (kind.length())
@@ -118,9 +102,7 @@ int main(int argc, ACE_TCHAR* argv[])
 
     if (output.length()) {
       // get the IOR of factory
-      CORBA::String_var str = orb->object_to_string(event_channel_factory.in()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var str = orb->object_to_string(event_channel_factory.in());
 
       if (ACE_OS::strcmp(output.c_str(), "") != 0)
       {
@@ -137,19 +119,16 @@ int main(int argc, ACE_TCHAR* argv[])
       }
     }
 
-    ACE_TRY_CHECK;
 
-    orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+    orb->run();
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+    ex._tao_print_exception ("A CORBA Exception occurred.");
   }
-  ACE_ENDTRY;
 
 
-  ACE_CHECK_RETURN(1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index e431da580ae..946ed18646a 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -23,7 +23,7 @@ namespace {
 
 int parse_args(int argc, ACE_TCHAR** argv)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:n:o:"));
     int opt;
     CosNaming::Name name(1);
@@ -36,12 +36,8 @@ int parse_args(int argc, ACE_TCHAR** argv)
       {
       case 'i':
         {
-          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
-                                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ftec = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-                                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ());
+          ftec = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
         }
         break;
       case 'n':
@@ -57,62 +53,48 @@ int parse_args(int argc, ACE_TCHAR** argv)
       /// we should get the ftec from Naming Service
 
       CosNaming::NamingContext_var naming_context =
-        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService");
 
       ftec = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
-        name
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        name);
 
       if (CORBA::is_nil(ftec.in()))
         ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1);
     }
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception&){
     ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1);
   }
-  ACE_ENDTRY;
   return 0;
 }
 
 int main(int argc,  ACE_TCHAR** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    orb = CORBA::ORB_init (argc, argv, ""
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb = CORBA::ORB_init (argc, argv, "");
 
     if (parse_args(argc, argv)==-1)
       return 1;
 
     PortableServer::POA_var
-      root_poa =  resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      root_poa =  resolve_init<PortableServer::POA>(orb.in(), "RootPOA");
 
     // create POAManager
     PortableServer::POAManager_var
-      mgr = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      mgr = root_poa->the_POAManager();
 
 
-    mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    mgr->activate();
 
     TAO_FTRTEC::FTEC_Gateway gateway_servant(orb.in(), ftec.in());
 
     RtecEventChannelAdmin::EventChannel_var gateway =
-      gateway_servant.activate(root_poa.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      gateway_servant.activate(root_poa.in());
 
     if (ior_file_name.length())
     {
-      CORBA::String_var str = orb->object_to_string(gateway.in()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var str = orb->object_to_string(gateway.in());
 
       FILE *output_file=
         ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name.c_str()),
@@ -126,11 +108,10 @@ int main(int argc,  ACE_TCHAR** argv)
       ACE_OS::fclose (output_file);
     }
 
-    orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+    orb->run();
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception&){
     return 1;
   }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 5a08f15d6d9..c824b411c5e 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -58,8 +58,7 @@ TAO::FT_FaultConsumer::~FT_FaultConsumer ()
 int TAO::FT_FaultConsumer::init (
   PortableServer::POA_ptr poa,
   FT::FaultNotifier_ptr fault_notifier,
-  TAO::FT_FaultAnalyzer * fault_analyzer
-  ACE_ENV_ARG_DECL)
+  TAO::FT_FaultAnalyzer * fault_analyzer)
 {
 
   if (TAO_debug_level > 1)
@@ -91,22 +90,18 @@ int TAO::FT_FaultConsumer::init (
   //@@ For now, let's try just activating it in the POA.
 
   // Activate this consumer in the POA.
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->object_id_ = this->poa_->activate_object (this);
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (this->object_id_.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->id_to_reference (this->object_id_.in());
 
   // Narrow it to CosNotifyComm::StructuredPushConsumer.
   this->consumer_ref_ = CosNotifyComm::StructuredPushConsumer::_narrow (
-    obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    obj.in());
 
   // Subscribe to the FaultNotifier.
   CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil ();
   this->consumer_id_ = fault_notifier_->connect_structured_fault_consumer (
-    this->consumer_ref_.in(), filter.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->consumer_ref_.in(), filter.in ());
 
   if (TAO_debug_level > 1)
   {
@@ -125,7 +120,7 @@ int TAO::FT_FaultConsumer::init (
 * - Disconnect from FT::FaultNotifier.
 * - Deactivate from the POA.
 */
-int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::FT_FaultConsumer::fini (void)
 {
 
   if (TAO_debug_level > 1)
@@ -137,7 +132,7 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
 
   // Disconnect from the FaultNotifier.
   // Swallow any exception.
-  ACE_TRY_NEW_ENV
+  try
   {
     if (!CORBA::is_nil (this->fault_notifier_.in()))
     {
@@ -152,8 +147,7 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
       }
 
       this->fault_notifier_->disconnect_consumer (
-        this->consumer_id_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->consumer_id_);
 
       if (TAO_debug_level > 1)
       {
@@ -166,20 +160,15 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
 
       // Deactivate ourself from the POA.
       this->poa_->deactivate_object (
-        this->object_id_.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->object_id_.in());
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO::FT_FaultConsumer::fini: "
-        "Error disconnecting from notifier (ignored).\n")
-    );
+        "TAO::FT_FaultConsumer::fini: ""Error disconnecting from notifier (ignored).\n"));
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN(1);
 
   if (TAO_debug_level > 1)
   {
@@ -225,7 +214,6 @@ size_t TAO::FT_FaultConsumer::notifications () const
 // we simply log the error and drop the event.
 void TAO::FT_FaultConsumer::push_structured_event (
   const CosNotification::StructuredEvent &event
-  ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
@@ -277,7 +265,6 @@ void TAO::FT_FaultConsumer::push_structured_event (
 void TAO::FT_FaultConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
@@ -289,7 +276,6 @@ void TAO::FT_FaultConsumer::offer_change (
 }
 
 void TAO::FT_FaultConsumer::disconnect_structured_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 4ba96cdee31..04f8c3303e1 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -71,15 +71,14 @@ namespace TAO
     int init (
       PortableServer::POA_ptr poa,
       FT::FaultNotifier_ptr fault_notifier,
-      TAO::FT_FaultAnalyzer * fault_analyzer
-      ACE_ENV_ARG_DECL);
+      TAO::FT_FaultAnalyzer * fault_analyzer);
 
     /**
     * Clean house for process shut down.
     * - Disconnect from FT::FaultNotifier.
     * - Deactivate from the POA.
     */
-    int fini (ACE_ENV_SINGLE_ARG_DECL);
+    int fini (void);
 
     /**
     * Accessor for a duplicate of this consumer's object reference.
@@ -106,19 +105,16 @@ namespace TAO
     // CORBA methods
     virtual void push_structured_event (
       const CosNotification::StructuredEvent &notification
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType));
 
    virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 0268c527fbb..33d947d344e 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -45,8 +45,7 @@ TAO::FT_Property_Validator::~FT_Property_Validator (void)
 
 void
 TAO::FT_Property_Validator::validate_property (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -67,8 +66,7 @@ TAO::FT_Property_Validator::validate_property (
                   && value != FT::ACTIVE
                   && value != FT::ACTIVE_WITH_VOTING
                   && value != FT::SEMI_ACTIVE))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->membership_style_)
         {
@@ -76,8 +74,7 @@ TAO::FT_Property_Validator::validate_property (
           if (!(property.val >>= value)
               || (value != PortableGroup::MEMB_APP_CTRL
                   && value != PortableGroup::MEMB_INF_CTRL))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->consistency_style_)
         {
@@ -85,8 +82,7 @@ TAO::FT_Property_Validator::validate_property (
           if (!(property.val >>= value)
               || (value != FT::CONS_APP_CTRL
                   && value != FT::CONS_INF_CTRL))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->fault_monitoring_style_)
         {
@@ -95,8 +91,7 @@ TAO::FT_Property_Validator::validate_property (
               || (value != FT::PULL
                   && value != FT::PUSH
                   && value != FT::NOT_MONITORED))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->fault_monitoring_granularity_)
         {
@@ -105,22 +100,21 @@ TAO::FT_Property_Validator::validate_property (
               || (value != FT::MEMB
                   && value != FT::LOC
                   && value != FT::LOC_AND_TYPE))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->factories_)
         {
           const PortableGroup::FactoriesValue * factories;
           if (!(property.val >>= factories))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
           else
             {
               const CORBA::ULong flen = factories->length ();
 
               if (flen == 0)
-                ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                           property.val));
+                throw PortableGroup::InvalidProperty (
+                  property.nam,
+                  property.val);
 
               for (CORBA::ULong j = 0; j < flen; ++j)
                 {
@@ -129,8 +123,9 @@ TAO::FT_Property_Validator::validate_property (
 
                   if (CORBA::is_nil (factory_info.the_factory.in ())
                       || factory_info.the_location.length () == 0)
-                    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                               property.val));
+                    throw PortableGroup::InvalidProperty (
+                      property.nam,
+                      property.val);
                 }
             }
         }
@@ -139,8 +134,7 @@ TAO::FT_Property_Validator::validate_property (
 
 void
 TAO::FT_Property_Validator::validate_criteria (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidCriteria,
                    PortableGroup::CannotMeetCriteria))
@@ -239,7 +233,7 @@ TAO::FT_Property_Validator::validate_criteria (
       // deallocations should occur.
       invalid_criteria.length (p);
 
-      ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
+      throw PortableGroup::InvalidCriteria (invalid_criteria);
     }
 }
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index 954d7f29ded..77d0d76b6a0 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -48,8 +48,7 @@ namespace TAO
     /// first invalid property is encountered.  The remaining properties
     /// will not be validated.
     virtual
-    void validate_property (const PortableGroup::Properties & props
-                            ACE_ENV_ARG_DECL)
+    void validate_property (const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -58,8 +57,7 @@ namespace TAO
     /// will be validated regardless of whether or not an invalid
     /// property was encountered.
     virtual
-    void validate_criteria (const PortableGroup::Properties & criteria
-                            ACE_ENV_ARG_DECL)
+    void validate_criteria (const PortableGroup::Properties & criteria)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidCriteria,
                       PortableGroup::CannotMeetCriteria));
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index bfc77eb5a46..2d5d6c1084f 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -139,7 +139,7 @@ const char * TAO::FT_ReplicationManager::identity () const
 }
 
 //public
-int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
 
@@ -156,16 +156,13 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Get the RootPOA.
   CORBA::Object_var poa_obj = this->orb_->resolve_initial_references (
-    TAO_OBJID_ROOTPOA ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    TAO_OBJID_ROOTPOA);
   this->poa_ = PortableServer::POA::_narrow (
-    poa_obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa_obj.in ());
 
 
   // initialize the FactoryRegistry
-  this->factory_registry_.init (this->orb_.in (), this->poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->factory_registry_.init (this->orb_.in (), this->poa_.in ());
 
   PortableGroup::FactoryRegistry_var factory_registry = this->factory_registry_.reference ();
 
@@ -173,21 +170,16 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   this->group_factory_.init (
     this->orb_.in (),
     this->poa_.in (),
-    factory_registry.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    factory_registry.in ());
 
   // Activate ourself in the POA.
   PortableServer::ObjectId_var oid = this->poa_->activate_object (
-    this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this);
 
   CORBA::Object_var this_obj = this->poa_->id_to_reference (
-    oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    oid.in ());
   this->replication_manager_ref_ = FT::ReplicationManager::_narrow (
-    this_obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this_obj.in ());
 
   // If we were given an initial IOR string for a Fault Notifier on the
   // command line, convert it to an IOR, then register the fault
@@ -195,15 +187,12 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   if (this->fault_notifier_ior_string_ != 0)
   {
     CORBA::Object_var notifier_obj = this->orb_->string_to_object (
-      this->fault_notifier_ior_string_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      this->fault_notifier_ior_string_);
     FT::FaultNotifier_var notifier = FT::FaultNotifier::_narrow (
-      notifier_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      notifier_obj.in ());
     if (! CORBA::is_nil (notifier.in ()))
     {
-      this->register_fault_notifier_i (notifier.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->register_fault_notifier_i (notifier.in ());
     }
     else
     {
@@ -217,21 +206,17 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Activate the RootPOA.
   PortableServer::POAManager_var poa_mgr =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  poa_mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
+  poa_mgr->activate ();
 
   // Register our IOR in the IORTable with the key-string
   // "ReplicationManager".
   CORBA::Object_var ior_table_obj =
     this->orb_->resolve_initial_references (
-      TAO_OBJID_IORTABLE ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+      TAO_OBJID_IORTABLE);
 
   IORTable::Table_var ior_table =
-    IORTable::Table::_narrow (ior_table_obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    IORTable::Table::_narrow (ior_table_obj.in ());
   if (CORBA::is_nil (ior_table.in ()))
   {
     ACE_ERROR_RETURN ( (LM_ERROR,
@@ -241,11 +226,8 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   else
   {
     CORBA::String_var rm_ior_str = this->orb_->object_to_string (
-      this->replication_manager_ref_.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-    ior_table->bind ("ReplicationManager", rm_ior_str.in ()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      this->replication_manager_ref_.in ());
+    ior_table->bind ("ReplicationManager", rm_ior_str.in ());
   }
 
   // Publish our IOR, either to a file or the Naming Service.
@@ -262,13 +244,11 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     this->identity_ += this->ns_name_;
 
     CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (
-        TAO_OBJID_NAMESERVICE ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+        TAO_OBJID_NAMESERVICE);
 
     this->naming_context_ =
       CosNaming::NamingContext::_narrow (
-        naming_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+        naming_obj.in ());
 
     if (CORBA::is_nil (this->naming_context_.in ()))
     {
@@ -282,9 +262,7 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
     this->naming_context_->rebind (
       this->this_name_,
-      this->replication_manager_ref_.in ()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      this->replication_manager_ref_.in ());
   }
 
   if (TAO_debug_level > 1)
@@ -309,38 +287,30 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   // Initialize default properties
   PortableGroup::Value value;
   value <<= TAO_PG_MEMBERSHIP_STYLE;
-  this->properties_support_.set_default_property (PortableGroup::PG_MEMBERSHIP_STYLE, value ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->properties_support_.set_default_property (PortableGroup::PG_MEMBERSHIP_STYLE, value);
 
   value <<= TAO_PG_INITIAL_NUMBER_MEMBERS;
-  this->properties_support_.set_default_property (PortableGroup::PG_INITIAL_NUMBER_MEMBERS, value ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->properties_support_.set_default_property (PortableGroup::PG_INITIAL_NUMBER_MEMBERS, value);
 
   value <<= TAO_PG_MINIMUM_NUMBER_MEMBERS;
-  this->properties_support_.set_default_property (PortableGroup::PG_MINIMUM_NUMBER_MEMBERS, value ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->properties_support_.set_default_property (PortableGroup::PG_MINIMUM_NUMBER_MEMBERS, value);
 
   value <<= FT::SEMI_ACTIVE;
-  this->properties_support_.set_default_property (FT::FT_REPLICATION_STYLE, value ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->properties_support_.set_default_property (FT::FT_REPLICATION_STYLE, value);
 
   value <<= FT::CONS_APP_CTRL;
-  this->properties_support_.set_default_property (  FT::FT_CONSISTENCY_STYLE, value ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->properties_support_.set_default_property (  FT::FT_CONSISTENCY_STYLE, value);
 
   value <<= FT::PULL;
-  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_STYLE, value ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_STYLE, value);
 
   value <<= FT::MEMB;
-  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_GRANULARITY, value ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_GRANULARITY, value);
 
 #if 0
   FaultMonitoringIntervalAndTimeoutValue times;
   value <<= times;
-  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_INTERVAL_AND_TIMEOUT, value ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->properties_support_.set_default_property (FT::FT_FAULT_MONITORING_INTERVAL_AND_TIMEOUT, value);
 #endif
 
 #if 0
@@ -353,7 +323,7 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 //public
-int TAO::FT_ReplicationManager::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::FT_ReplicationManager::idle (int & result)
 {
   ACE_UNUSED_ARG (result);
   return this->quit_;
@@ -361,12 +331,11 @@ int TAO::FT_ReplicationManager::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
 
 
 //public
-int TAO::FT_ReplicationManager::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::FT_ReplicationManager::fini (void)
 {
   int result = 0;
 
-  result = this->fault_consumer_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->fault_consumer_.fini ();
 
   if (this->ior_output_file_ != 0)
   {
@@ -375,8 +344,7 @@ int TAO::FT_ReplicationManager::fini (ACE_ENV_SINGLE_ARG_DECL)
   }
   if (this->ns_name_ != 0)
   {
-    this->naming_context_->unbind (this->this_name_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    this->naming_context_->unbind (this->this_name_);
     this->ns_name_ = 0;
   }
 
@@ -386,18 +354,16 @@ int TAO::FT_ReplicationManager::fini (ACE_ENV_SINGLE_ARG_DECL)
 //CORBA
 void
 TAO::FT_ReplicationManager::register_fault_notifier (
-  FT::FaultNotifier_ptr fault_notifier
-  ACE_ENV_ARG_DECL)
+  FT::FaultNotifier_ptr fault_notifier)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
-  this->register_fault_notifier_i (fault_notifier ACE_ENV_ARG_PARAMETER);
+  this->register_fault_notifier_i (fault_notifier);
 }
 
 //private
 void
 TAO::FT_ReplicationManager::register_fault_notifier_i (
-  FT::FaultNotifier_ptr fault_notifier
-  ACE_ENV_ARG_DECL)
+  FT::FaultNotifier_ptr fault_notifier)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   if (CORBA::is_nil (fault_notifier))
@@ -407,11 +373,11 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
         "%T %n (%P|%t) - "
         "Bad Fault Notifier object reference provided.\n")
     ));
-    ACE_THROW (CORBA::BAD_PARAM (
+    throw CORBA::BAD_PARAM (
       CORBA::SystemException::_tao_minor_code (
         TAO::VMCID,
         EINVAL),
-      CORBA::COMPLETED_NO));
+      CORBA::COMPLETED_NO);
   }
 
   // Cache new Fault Notifier object reference.
@@ -420,12 +386,11 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
   // Re-initialize our consumer.
   // Swallow any exception.
   int result = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     //@@ should we check to see if a notifier is already registered, rather than
     // simply "unregistering"?
-    result = this->fault_consumer_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    result = this->fault_consumer_.fini ();
 
     // Note if the fini failed, we ignore it.  It may not have been registered in the first place.
 
@@ -449,21 +414,16 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
       result = this->fault_consumer_.init (
         this->poa_.in (),
         this->fault_notifier_.in (),
-        analyzer
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        analyzer);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO::FT_ReplicationManager::register_fault_notifier_i: "
-        "Error reinitializing FT_FaultConsumer.\n")
-    );
+        "TAO::FT_ReplicationManager::register_fault_notifier_i: ""Error reinitializing FT_FaultConsumer.\n"));
     result = -1;
   }
-  ACE_ENDTRY;
 
   if (result != 0)
   {
@@ -473,11 +433,11 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
         "Could not re-initialize FT_FaultConsumer.\n")
     ));
 
-    ACE_THROW (CORBA::INTERNAL (
+    throw CORBA::INTERNAL (
       CORBA::SystemException::_tao_minor_code (
         TAO::VMCID,
         EINVAL),
-      CORBA::COMPLETED_NO));
+      CORBA::COMPLETED_NO);
   }
 }
 
@@ -485,8 +445,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
 // Returns the reference of the Fault Notifier.
 //CORBA
 FT::FaultNotifier_ptr
-TAO::FT_ReplicationManager::get_fault_notifier (
-  ACE_ENV_SINGLE_ARG_DECL)
+TAO::FT_ReplicationManager::get_fault_notifier ()
   ACE_THROW_SPEC ( (CORBA::SystemException, FT::InterfaceNotFound))
 {
   if (CORBA::is_nil (this->fault_notifier_.in ()))
@@ -501,8 +460,7 @@ TAO::FT_ReplicationManager::get_fault_notifier (
 //CORBA
 ::PortableGroup::FactoryRegistry_ptr
 TAO::FT_ReplicationManager::get_factory_registry (
-  const PortableGroup::Criteria & selection_criteria
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const PortableGroup::Criteria & selection_criteria)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   ACE_UNUSED_ARG (selection_criteria);
@@ -511,8 +469,7 @@ TAO::FT_ReplicationManager::get_factory_registry (
 
 // TAO-specific shutdown operation.
 //public
-void TAO::FT_ReplicationManager::shutdown (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void TAO::FT_ReplicationManager::shutdown ()
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   this->quit_ = 1;
@@ -521,8 +478,7 @@ void TAO::FT_ReplicationManager::shutdown (
 // Get the type_id associated with an object group.
 //CORBA
 char * TAO::FT_ReplicationManager::type_id (
-  PortableGroup::ObjectGroup_ptr object_group
-  ACE_ENV_ARG_DECL)
+  PortableGroup::ObjectGroup_ptr object_group)
 {
   char * result = 0;
   TAO::PG_Object_Group * group = 0;
@@ -543,89 +499,77 @@ char * TAO::FT_ReplicationManager::type_id (
 //CORBA
 void
 TAO::FT_ReplicationManager::set_default_properties (
-  const PortableGroup::Properties & props
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
 
-  this->properties_support_.set_default_properties (props ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.set_default_properties (props);
   //@@ validate properties?
 }
 
 //CORBA
 PortableGroup::Properties *
-TAO::FT_ReplicationManager::get_default_properties (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::FT_ReplicationManager::get_default_properties ()
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
-  return this->properties_support_.get_default_properties (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->properties_support_.get_default_properties ();
 }
 
 //CORBA
 void
 TAO::FT_ReplicationManager::remove_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
-  this->properties_support_.remove_default_properties (props
-    ACE_ENV_ARG_PARAMETER);
+  this->properties_support_.remove_default_properties (props);
 }
 
 //CORBA
 void
 TAO::FT_ReplicationManager::set_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.set_type_properties (
     type_id,
-    overrides
-    ACE_ENV_ARG_PARAMETER);
+    overrides);
 }
 
 //CORBA
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_type_properties (
-    const char *type_id
-    ACE_ENV_ARG_DECL)
+    const char *type_id)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
-  return this->properties_support_.get_type_properties (type_id
-     ACE_ENV_ARG_PARAMETER);
+  return this->properties_support_.get_type_properties (type_id);
 }
 
 //CORBA
 void
 TAO::FT_ReplicationManager::remove_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.remove_type_properties (
     type_id,
-    props
-    ACE_ENV_ARG_PARAMETER);
+    props);
 }
 
 //CORBA
 void
 TAO::FT_ReplicationManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::InvalidProperty,
@@ -635,20 +579,18 @@ TAO::FT_ReplicationManager::set_properties_dynamically (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    group->set_properties_dynamically (overrides ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    group->set_properties_dynamically (overrides);
   }
   else
   {
-    ACE_THROW (PortableGroup::ObjectGroupNotFound ());
+    throw PortableGroup::ObjectGroupNotFound ();
   }
 }
 
 //CORBA
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_properties (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -676,8 +618,7 @@ TAO::FT_ReplicationManager::get_properties (
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::set_primary_member (
   PortableGroup::ObjectGroup_ptr object_group,
-  const PortableGroup::Location & the_location
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (
     CORBA::SystemException
     , PortableGroup::ObjectGroupNotFound
@@ -695,8 +636,7 @@ TAO::FT_ReplicationManager::set_primary_member (
     PortableGroup::TagGroupTaggedComponent tag_component;
     TAO_FT_IOGR_Property prop (tag_component);
 
-    int sts = group->set_primary_member (&prop, the_location ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+    int sts = group->set_primary_member (&prop, the_location);
     if (sts)
     {
       result = group->reference ();
@@ -719,8 +659,7 @@ TAO::FT_ReplicationManager::create_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     const char * type_id,
-    const PortableGroup::Criteria & the_criteria
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Criteria & the_criteria)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -733,8 +672,7 @@ TAO::FT_ReplicationManager::create_member (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    group->create_member (the_location, type_id, the_criteria ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+    group->create_member (the_location, type_id, the_criteria);
     result = group->reference ();
   }
   else
@@ -756,8 +694,7 @@ PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
-    CORBA::Object_ptr member
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr member)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -772,9 +709,7 @@ TAO::FT_ReplicationManager::add_member (
   {
     group->add_member (
       the_location,
-      member
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      member);
 
     result = group->reference ();
 
@@ -796,8 +731,7 @@ TAO::FT_ReplicationManager::add_member (
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -808,11 +742,9 @@ TAO::FT_ReplicationManager::remove_member (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    group->remove_member (the_location ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (result._retn ());
+    group->remove_member (the_location);
 
-    group->minimum_populate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (result._retn ());
+    group->minimum_populate ();
       //@@ how about the case where the member was removed successfully,
       // but for one reason or another we were unable to bring the group
       // back up to minimum_number_of_replicas?
@@ -829,8 +761,7 @@ TAO::FT_ReplicationManager::remove_member (
 //CORBA
 PortableGroup::Locations *
 TAO::FT_ReplicationManager::locations_of_members (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -840,9 +771,7 @@ TAO::FT_ReplicationManager::locations_of_members (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    result = group->locations_of_members (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = group->locations_of_members ();
   }
   else
   {
@@ -860,18 +789,16 @@ TAO::FT_ReplicationManager::locations_of_members (
 //CORBA
 PortableGroup::ObjectGroups *
 TAO::FT_ReplicationManager::groups_at_location (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
-  return this->group_factory_.groups_at_location (the_location ACE_ENV_ARG_PARAMETER);
+  return this->group_factory_.groups_at_location (the_location);
 }
 
 //CORBA
 PortableGroup::ObjectGroupId
 TAO::FT_ReplicationManager::get_object_group_id (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -880,7 +807,6 @@ TAO::FT_ReplicationManager::get_object_group_id (
   if (this->group_factory_.find_group (object_group, group))
   {
     group->get_object_group_id ();
-    ACE_CHECK_RETURN (result);
     result = group->get_object_group_id ();
   }
   else
@@ -899,8 +825,7 @@ TAO::FT_ReplicationManager::get_object_group_id (
 //CORBA
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::get_object_group_ref (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -928,8 +853,7 @@ TAO::FT_ReplicationManager::get_object_group_ref (
 //CORBA, TAO specific
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::get_object_group_ref_from_id (
-    PortableGroup::ObjectGroupId group_id
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroupId group_id)
   ACE_THROW_SPEC ( (
     CORBA::SystemException
     , PortableGroup::ObjectGroupNotFound
@@ -960,8 +884,7 @@ TAO::FT_ReplicationManager::get_object_group_ref_from_id (
 CORBA::Object_ptr
 TAO::FT_ReplicationManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -972,8 +895,7 @@ TAO::FT_ReplicationManager::get_member_ref (
   TAO::PG_Object_Group * group = 0;
   if (this->group_factory_.find_group (object_group, group))
   {
-    result = group->get_member_reference (the_location ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::Object::_nil());
+    result = group->get_member_reference (the_location);
   }
   else
   {
@@ -997,8 +919,7 @@ CORBA::Object_ptr
 TAO::FT_ReplicationManager::create_object (
   const char * type_id,
   const PortableGroup::Criteria & the_criteria,
-  PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-  ACE_ENV_ARG_DECL)
+  PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -1013,20 +934,15 @@ TAO::FT_ReplicationManager::create_object (
   // type of object group
   TAO::PG_Property_Set * typeid_properties
     = this->properties_support_.find_typeid_properties (
-      type_id
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      type_id);
 
   TAO::PG_Object_Group * group
     = this->group_factory_.create_group (
       type_id,
       the_criteria,
-      typeid_properties
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      typeid_properties);
 
-  group->initial_populate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  group->initial_populate ();
     //@@ on error we should remove the group from the Group_Factory
     // doing this "right" will require a var-type pointer to the object group
     // that knows about the factory, too.
@@ -1040,7 +956,6 @@ TAO::FT_ReplicationManager::create_object (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
   PortableGroup::GenericFactory::FactoryCreationId_var factory_id = factory_id_ptr;
   PortableGroup::ObjectGroupId group_id = group->get_object_group_id ();
   factory_id <<= group_id;
@@ -1052,8 +967,7 @@ TAO::FT_ReplicationManager::create_object (
 //CORBA
 void
 TAO::FT_ReplicationManager::delete_object (
-  const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
@@ -1062,13 +976,11 @@ TAO::FT_ReplicationManager::delete_object (
   if (factory_creation_id >>= group_id)
   {
     this->group_factory_.delete_group (
-      group_id
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      group_id);
   }
   else
   {
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
   }
 }
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index a38ed1ec911..753b8f9340c 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -111,13 +111,13 @@ namespace TAO
      * @param orb Our CORBA::ORB -- we keep var to it.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /**
      * Prepare to exit.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (ACE_ENV_SINGLE_ARG_DECL);
+    int fini (void);
 
     /**
      * Idle-time activity.
@@ -125,7 +125,7 @@ namespace TAO
      * @param result is set to process return code if return value is non-zero.
      * @return zero to continue; nonzero to exit
      */
-    int idle (int & result ACE_ENV_ARG_DECL);
+    int idle (int & result);
 
 
     /**
@@ -139,8 +139,7 @@ namespace TAO
      * @param object_group The ObjectGroup.
      * @return String identifying the type id associated with the ObjectGroup.
      */
-    char * type_id (PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL);
+    char * type_id (PortableGroup::ObjectGroup_ptr object_group);
 
 
   //////////////////////
@@ -158,7 +157,6 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     virtual void register_fault_notifier (
         FT::FaultNotifier_ptr fault_notifier
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -166,7 +164,6 @@ namespace TAO
 
     /// Returns the reference of the Fault Notifier.
     virtual FT::FaultNotifier_ptr get_fault_notifier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -176,7 +173,6 @@ namespace TAO
     /// TAO-specific find factory registry
     virtual ::PortableGroup::FactoryRegistry_ptr get_factory_registry (
         const PortableGroup::Criteria & selection_criteria
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -184,7 +180,6 @@ namespace TAO
 
     /// TAO-specific shutdown operation.
     virtual void shutdown (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -201,21 +196,18 @@ namespace TAO
 
     /// Set the default properties to be used by all object groups.
     virtual void set_default_properties (
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
 
     /// Get the default properties used by all object groups.
-    virtual PortableGroup::Properties * get_default_properties (
-        ACE_ENV_SINGLE_ARG_DECL)
+    virtual PortableGroup::Properties * get_default_properties ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Remove default properties.
     virtual void remove_default_properties (
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -226,8 +218,7 @@ namespace TAO
      */
     virtual void set_type_properties (
         const char * type_id,
-        const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & overrides)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -238,15 +229,13 @@ namespace TAO
      * addition to the default properties that were not overridden.
      */
     virtual PortableGroup::Properties * get_type_properties (
-        const char * type_id
-        ACE_ENV_ARG_DECL)
+        const char * type_id)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Remove the given properties associated with the Replica type ID.
     virtual void remove_type_properties (
         const char * type_id,
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::InvalidProperty,
                       PortableGroup::UnsupportedProperty));
@@ -259,8 +248,7 @@ namespace TAO
      */
     virtual void set_properties_dynamically (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & overrides)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::InvalidProperty,
@@ -274,8 +262,7 @@ namespace TAO
      * that weren't overridden.
      */
     virtual PortableGroup::Properties * get_properties (
-        PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+        PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
@@ -294,8 +281,7 @@ namespace TAO
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location,
         const char * type_id,
-        const PortableGroup::Criteria & the_criteria
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Criteria & the_criteria)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberAlreadyPresent,
@@ -308,8 +294,7 @@ namespace TAO
     virtual PortableGroup::ObjectGroup_ptr add_member (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location,
-        CORBA::Object_ptr member
-        ACE_ENV_ARG_DECL)
+        CORBA::Object_ptr member)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberAlreadyPresent,
@@ -328,29 +313,25 @@ namespace TAO
      */
     virtual PortableGroup::ObjectGroup_ptr remove_member (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberNotFound));
 
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::Locations * locations_of_members (
-        PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+        PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::ObjectGroups * groups_at_location (
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the ObjectGroupId for the given ObjectGroup.
     virtual PortableGroup::ObjectGroupId get_object_group_id (
-        PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+        PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
@@ -360,8 +341,7 @@ namespace TAO
      * parameter.
      */
     virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-        PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+        PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound));
 
@@ -371,7 +351,6 @@ namespace TAO
      */
      virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
           PortableGroup::ObjectGroupId group_id
-          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -384,8 +363,7 @@ namespace TAO
      */
     virtual CORBA::Object_ptr get_member_ref (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Location & loc
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & loc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectGroupNotFound,
                       PortableGroup::MemberNotFound));
@@ -394,7 +372,6 @@ namespace TAO
     virtual PortableGroup::ObjectGroup_ptr set_primary_member (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -427,8 +404,7 @@ namespace TAO
         const char * type_id,
         const PortableGroup::Criteria & the_criteria,
         PortableGroup::GenericFactory::FactoryCreationId_out
-          factory_creation_id
-        ACE_ENV_ARG_DECL)
+          factory_creation_id)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::NoFactory,
                       PortableGroup::ObjectNotCreated,
@@ -444,8 +420,7 @@ namespace TAO
      */
     virtual void delete_object (
         const PortableGroup::GenericFactory::FactoryCreationId &
-          factory_creation_id
-        ACE_ENV_ARG_DECL)
+          factory_creation_id)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableGroup::ObjectNotFound));
 
@@ -462,7 +437,6 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     void register_fault_notifier_i (
         FT::FaultNotifier_ptr fault_notifier
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index 4606008727c..e84359052b1 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -391,7 +391,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
   int result = 0;
   object_is_primary = 0;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Create an "empty" TAO_FT_IOGR_Property and use it to get the
     // tagged component.
@@ -399,8 +399,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
     FT::TagFTGroupTaggedComponent ft_group_tagged_component;
     CORBA::Boolean got_tagged_component =
       temp_ft_prop.get_tagged_component (
-          iogr, ft_group_tagged_component ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+          iogr, ft_group_tagged_component);
     if (got_tagged_component)
     {
       // Create a new TAO_FT_IOGR_Property with the tagged
@@ -409,14 +408,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
 
       // Check to see if a primary is set.
       CORBA::Boolean primary_is_set = ft_prop.is_primary_set (
-        iogr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        iogr);
       if (primary_is_set)
       {
         // Get the primary object.
         CORBA::Object_var primary_obj = ft_prop.get_primary (
-          iogr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          iogr);
         if (CORBA::is_nil (primary_obj.in()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -429,8 +426,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
         // Get the object reference of the failed member.
         CORBA::Object_var failed_obj =
           this->replication_manager_->get_member_ref (
-            iogr, location ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+            iogr, location);
         if (CORBA::is_nil (failed_obj.in()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -442,8 +438,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
 
         // Are the two object refs (primary and failed) equivalent?
         CORBA::Boolean equiv = primary_obj->_is_equivalent (
-          failed_obj.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          failed_obj.in());
         if (equiv)
         {
           object_is_primary = 1;
@@ -470,16 +465,13 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
       result = -1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ")
-    );
+        "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: "));
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -492,14 +484,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
   PortableGroup::ObjectGroup_var the_object_group = PortableGroup::ObjectGroup::_nil();
   PortableGroup::Properties_var properties;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get the object group reference based on the ObjectGroupId.
     the_object_group =
       this->replication_manager_->get_object_group_ref_from_id (
-        fault_event_desc.object_group_id
-        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+        fault_event_desc.object_group_id);
 
     // This should not happen, but let us be safe.
     if (CORBA::is_nil (the_object_group.in()))
@@ -510,25 +500,20 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
           "Could not get ObjectGroup reference from ObjectGroupId: <%Q>.\n"),
           fault_event_desc.object_group_id
       ));
-      ACE_TRY_THROW (PortableGroup::ObjectGroupNotFound ());
+      throw PortableGroup::ObjectGroupNotFound ();
     }
 
     // Get the properties associated with this ObjectGroup.
     properties = this->replication_manager_->get_properties (
-      the_object_group.in()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      the_object_group.in());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
-    );
+        "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "));
     result = -1;
   }
-  ACE_ENDTRY;
 
   if (result == 0)
   {
@@ -786,25 +771,21 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::remove_failed_member (
   int result = 0;
   new_iogr = PortableGroup::ObjectGroup::_nil ();
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Remove the old primary member from the object group.
     PortableGroup::ObjectGroup_var temp_iogr =
       this->replication_manager_->remove_member (
         iogr,
-        fault_event_desc.location.in()
-        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+        fault_event_desc.location.in());
     new_iogr = temp_iogr._retn ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::remove_failed_member: ");
     result = -1;
   }
-  ACE_ENDTRY;
   return result;
 }
 
@@ -820,23 +801,19 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary (
   int result = 0;
   new_iogr = PortableGroup::ObjectGroup::_nil ();
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get the locations of the remaining members of the object group.
     PortableGroup::Locations_var locations =
       this->replication_manager_->locations_of_members (
-        iogr
-        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+        iogr);
 
     // Choose the first location as our new primary location.
     if (locations->length() >= 1)
     {
       new_iogr = this->replication_manager_->set_primary_member (
         iogr,
-        (*locations)[0]
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        (*locations)[0]);
     }
     else
     {
@@ -848,14 +825,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary (
         -1);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary: ");
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -873,15 +848,13 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
   int result = 0;
   new_iogr = PortableGroup::ObjectGroup::_nil ();
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get current number of members in object group
     // (same as number of locations).
     PortableGroup::Locations_var locations =
       this->replication_manager_->locations_of_members (
-        iogr
-        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+        iogr);
     CORBA::ULong num_members = locations->length();
 
     // If it is less than the MinimumNumberMembers property, add
@@ -895,8 +868,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
       PortableGroup::Criteria fake_criteria;
       PortableGroup::FactoryRegistry_var factory_registry =
         this->replication_manager_->get_factory_registry (
-          fake_criteria ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          fake_criteria);
 
 
       // @@ DLW SAYS: we need to find out the role played by this object
@@ -905,8 +877,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
       CORBA::String_var type_id;
       PortableGroup::FactoryInfos_var factories_by_type =
           factory_registry->list_factories_by_role (
-          fault_event_desc.type_id.in(), type_id ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          fault_event_desc.type_id.in(), type_id);
 
       //
       // Build a set of locations of factories for this type that we
@@ -944,9 +915,7 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
           iogr,
           good_location.in(),
           fault_event_desc.type_id.in(),
-          fake_criteria
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          fake_criteria);
 
         // Stop adding members when we reach the value of the
         // MinimumNumberMembers property.
@@ -956,14 +925,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::add_members (
 
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::add_members: ");
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -983,26 +950,23 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::location_failure (
   //   location.
   // - Handle each one of them as a single replica failure.
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get the factory registry from the Replication Manager.
     PortableGroup::Criteria fake_criteria;
     PortableGroup::FactoryRegistry_var factory_registry =
       this->replication_manager_->get_factory_registry (
-        fake_criteria ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+        fake_criteria);
 
     // Unregister all factories at the failed location.
     factory_registry->unregister_factory_by_location (
-      fault_event_desc.location.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      fault_event_desc.location.in());
 
     // Determine all the object groups that had members at that
     // location.
     PortableGroup::ObjectGroups_var object_groups_at_location =
       this->replication_manager_->groups_at_location (
-      fault_event_desc.location.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      fault_event_desc.location.in());
 
     // Handle each one of them as a single replica failure.
     for (CORBA::ULong i=0;
@@ -1012,27 +976,23 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::location_failure (
       // Get the object group id.
       fault_event_desc.object_group_id =
         this->replication_manager_->get_object_group_id (
-          object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          object_groups_at_location[i]);
 
       // Get type id of this object group.
       fault_event_desc.type_id =
         this->replication_manager_->type_id (
-          object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          object_groups_at_location[i]);
 
       // Handle it as a single replica failure.
       result = this->single_replica_failure (fault_event_desc);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::location_failure: ");
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -1052,30 +1012,26 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
   //   location of that type.
   // - Handle each one of them as a single replica failure.
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Get the factory registry from the Replication Manager.
     PortableGroup::Criteria fake_criteria;
     PortableGroup::FactoryRegistry_var factory_registry =
       this->replication_manager_->get_factory_registry (
-        fake_criteria ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+        fake_criteria);
 
     // Unregister the factory at the failed location associated with
     // the role.
     //@@ Using type_id as the role for now.
     factory_registry->unregister_factory (
       fault_event_desc.type_id.in(),
-      fault_event_desc.location.in()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      fault_event_desc.location.in());
 
     // Get all the object groups that had members at that
     // location.
     PortableGroup::ObjectGroups_var object_groups_at_location =
       this->replication_manager_->groups_at_location (
-      fault_event_desc.location.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      fault_event_desc.location.in());
 
     // For each one, if it was of the same type as the failed type,
     // handle it as a single replica failure.
@@ -1086,14 +1042,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
       // Get the object group id.
       fault_event_desc.object_group_id =
         this->replication_manager_->get_object_group_id (
-          object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          object_groups_at_location[i]);
 
       // Get type id of this object group.
       PortableGroup::TypeId_var type_id =
         this->replication_manager_->type_id (
-          object_groups_at_location[i] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          object_groups_at_location[i]);
 
       // If the type id is the same as the failed type id...
       if (ACE_OS::strcmp (type_id.in(), fault_event_desc.type_id.in()) == 0)
@@ -1103,14 +1057,12 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
       }
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       "TAO::FT_ReplicationManagerFaultAnalyzer::type_failure: ");
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index 0efefef03cd..df556a7c958 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -83,8 +83,7 @@ TAO::FT_FaultDetectorFactory_i::~FT_FaultDetectorFactory_i ()
     // before this object disappears
     shutdown_i ();
   }
-  ACE_DECLARE_NEW_ENV;
-  fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+  fini ();
   this->threadManager_.close ();
 }
 
@@ -187,7 +186,7 @@ const char * TAO::FT_FaultDetectorFactory_i::identity () const
   return this->identity_.c_str();
 }
 
-int TAO::FT_FaultDetectorFactory_i::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::FT_FaultDetectorFactory_i::idle (int & result)
 {
   ACE_UNUSED_ARG (result);
   int quit = this->quit_requested_;
@@ -207,16 +206,14 @@ int TAO::FT_FaultDetectorFactory_i::idle (int & result ACE_ENV_ARG_DECL_NOT_USED
 }
 
 
-int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -225,10 +222,8 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
-  ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil(this->poa_.in ()))
   {
@@ -238,27 +233,20 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   }
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   // Register with the POA.
 
-  this->objectId_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->objectId_ = this->poa_->activate_object (this);
 
   // find my IOR
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (objectId_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->id_to_reference (objectId_.in ());
 
-  this->ior_ = this->orb_->object_to_string (this_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->ior_ = this->orb_->object_to_string (this_obj.in ());
 
   this->identity_ = "FaultDetectorFactory";
 
@@ -266,22 +254,18 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   // Register with ReplicationManager
   if (this->rm_register_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
-      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager");
+      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in());
       if (!CORBA::is_nil (replication_manager_.in ()))
       {
         // capture the default notifier
-        this->notifier_ =  this->replication_manager_->get_fault_notifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->notifier_ =  this->replication_manager_->get_fault_notifier ();
 
         // register with ReplicationManager::RegistrationFactory
         PortableGroup::Criteria criteria(0);
-        this->factory_registry_ = this->replication_manager_->get_factory_registry (criteria ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->factory_registry_ = this->replication_manager_->get_factory_registry (criteria);
 
         if (! CORBA::is_nil(factory_registry_.in ()))
         {
@@ -299,9 +283,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
           this->factory_registry_->register_factory(
             FT::FAULT_DETECTOR_ROLE_NAME,
             FT::FAULT_DETECTOR_ROLE_NAME,
-            info
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            info);
 
           ACE_DEBUG ((LM_DEBUG,
             "FaultDetector Registration complete.\n"
@@ -318,12 +300,11 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         ACE_ERROR ((LM_ERROR,"FaultNotifier: Can't resolve ReplicationManager, It will not be registered.\n" ));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "ReplicaFactory: Exception resolving ReplicationManager.  Factory will not be registered.\n" );
+      ex._tao_print_exception (
+        "ReplicaFactory: Exception resolving ReplicationManager.  Factory will not be registered.\n");
     }
-    ACE_ENDTRY;
   }
   else
   {
@@ -345,8 +326,7 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     this->identity_ += this->ns_name_;
 
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ())){
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -355,21 +335,19 @@ int TAO::FT_FaultDetectorFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
     this->naming_context_ =
-      ::CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      ::CosNaming::NamingContext::_narrow (naming_obj.in ());
 
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
 
     this->naming_context_->rebind (this->this_name_, this_obj.in()  //CORBA::Object::_duplicate(this_obj)
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+                            );
   }
 
   return result;
 }
 
-int TAO::FT_FaultDetectorFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::FT_FaultDetectorFactory_i::fini (void)
 {
   if (this->ior_output_file_ != 0)
   {
@@ -378,8 +356,7 @@ int TAO::FT_FaultDetectorFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
   }
   if (this->ns_name_ != 0)
   {
-    this->naming_context_->unbind (this_name_
-                            ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->unbind (this_name_);
     this->ns_name_ = 0;
   }
 
@@ -387,9 +364,7 @@ int TAO::FT_FaultDetectorFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
   {
     this->factory_registry_->unregister_factory(
       FT::FAULT_DETECTOR_ROLE_NAME,
-      this->location_
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      this->location_);
     this->registered_ = 0;
   }
   return 0;
@@ -457,7 +432,6 @@ void TAO::FT_FaultDetectorFactory_i::remove_detector(CORBA::ULong id, TAO::Fault
 
 void TAO::FT_FaultDetectorFactory_i::change_properties (
     const PortableGroup::Properties & property_set
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -491,12 +465,12 @@ void TAO::FT_FaultDetectorFactory_i::change_properties (
     ::PortableGroup::InvalidProperty ex;
     ex.nam.length(1);
     ex.nam[0].id = CORBA::string_dup(FT::FT_FAULT_MONITORING_INTERVAL);
-    ACE_THROW (::PortableGroup::InvalidProperty (ex));
+    throw ::PortableGroup::InvalidProperty (ex);
   }
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::change_properties);
 }
 
-void TAO::FT_FaultDetectorFactory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void TAO::FT_FaultDetectorFactory_i::shutdown (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -512,7 +486,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -673,7 +646,6 @@ CORBA::Object_ptr TAO::FT_FaultDetectorFactory_i::create_object (
 
 void TAO::FT_FaultDetectorFactory_i::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -694,17 +666,17 @@ void TAO::FT_FaultDetectorFactory_i::delete_object (
     }
     else
     {
-      ACE_THROW(::PortableGroup::ObjectNotFound());
+      throw ::PortableGroup::ObjectNotFound();
     }
   }
   else
   {
-    ACE_THROW(::PortableGroup::ObjectNotFound());
+    throw ::PortableGroup::ObjectNotFound();
   }
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::delete_object);
 }
 
-CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_RETURN(TAO::FT_FaultDetectorFactory_i::is_alive)
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index a28eebffe56..f6e9fa59a07 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -117,13 +117,13 @@ namespace TAO
      * @param orb our ORB -- we keep var to it.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /**
      * Prepare to exit.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (ACE_ENV_SINGLE_ARG_DECL);
+    int fini (void);
 
     /**
      * Idle-time activity.
@@ -131,7 +131,7 @@ namespace TAO
      * @param result is set to process return code if return value is non-zero.
      * @return zero to continue; nonzero to exit
      */
-    int idle(int & result ACE_ENV_ARG_DECL);
+    int idle(int & result);
 
 
     /**
@@ -156,14 +156,13 @@ namespace TAO
     // CORBA interface FaultDetectorFactory methods
     virtual void change_properties (
         const PortableGroup::Properties & property_set
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableGroup::InvalidProperty
       ));
 
-    virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void shutdown (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -174,7 +173,6 @@ namespace TAO
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -187,7 +185,6 @@ namespace TAO
 
     virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -197,7 +194,7 @@ namespace TAO
     //////////////////////////////////////////
     // CORBA interface PullMonitorable methods
 
-    virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+    virtual CORBA::Boolean is_alive (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /////////////////////////
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
index 60d749ef0dd..6d8174af809 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
@@ -87,11 +87,10 @@ void TAO::Fault_Detector_i::run()
 {
   while ( ! this->quit_requested_ )
   {
-    ACE_TRY_NEW_ENV
+    try
     {
-      if (this->monitorable_->is_alive(ACE_ENV_SINGLE_ARG_PARAMETER))
+      if (this->monitorable_->is_alive())
       {
-        ACE_TRY_CHECK;
         // use this rather than ACE_OS::sleep
         // to allow the nap to be interruped see request_quit
         this->sleep_.wait (&sleep_time_, 0);
@@ -106,7 +105,7 @@ void TAO::Fault_Detector_i::run()
         this->quit_requested_ = 1;
       }
     }
-    ACE_CATCHANY  // todo refine this
+    catch (const CORBA::Exception&)// todo refine this
     {
       ACE_ERROR ((LM_ERROR,
         "FaultDetector FAULT: exception.\n"
@@ -114,7 +113,6 @@ void TAO::Fault_Detector_i::run()
       notify();
       this->quit_requested_ = 1;
     }
-    ACE_ENDTRY;
   }
   // warning:  The following call will delete
   // this object.  Be careful not to reference
@@ -157,7 +155,7 @@ void TAO::Fault_Detector_i::notify()
         vEvent->filterable_data[3].value <<= this->group_id_;
       }
     }
-    ACE_TRY_NEW_ENV
+    try
     {
       if (TAO_debug_level > 5)
       {
@@ -165,9 +163,7 @@ void TAO::Fault_Detector_i::notify()
         "call Fault Detector push Structured Event.\n"
         ));
       }
-      this->notifier_->push_structured_fault(vEvent.in()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->notifier_->push_structured_fault(vEvent.in());
       if (TAO_debug_level > 5)
       {
 
@@ -176,12 +172,10 @@ void TAO::Fault_Detector_i::notify()
         ));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Fault Detector cannot send notification.");
+      ex._tao_print_exception ("Fault Detector cannot send notification.");
     }
-    ACE_ENDTRY;
   }
   else
   {
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index e120b9a2cc7..2af2e7a10ef 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -82,19 +82,17 @@ TAO::FT_FaultNotifier_i::FT_FaultNotifier_i ()
 // Implementation skeleton destructor
 TAO::FT_FaultNotifier_i::~FT_FaultNotifier_i ()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    fini ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
-int TAO::FT_FaultNotifier_i::idle(int &result ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::FT_FaultNotifier_i::idle(int &result)
 {
   static unsigned long linger = 0;
   ACE_UNUSED_ARG(result);
@@ -196,16 +194,15 @@ const char * TAO::FT_FaultNotifier_i::identity () const
   return this->identity_.c_str();
 }
 
-PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+PortableServer::POA_ptr TAO::FT_FaultNotifier_i::_default_POA (void)
 {
   return this->poa_.in();
 }
 
 
-void TAO::FT_FaultNotifier_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL)
+void TAO::FT_FaultNotifier_i::_remove_ref (void)
 {
-  notify_channel_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  notify_channel_->destroy();
 
   ACE_ERROR ((LM_ERROR,
     "FaultNotifier (%P|%t) _remove_ref setting gone\n"
@@ -213,7 +210,7 @@ void TAO::FT_FaultNotifier_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL)
   this->gone_ = 1;
 }
 
-int TAO::FT_FaultNotifier_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::FT_FaultNotifier_i::fini (void)
 {
   if (this->ior_output_file_ != 0)
   {
@@ -222,22 +219,20 @@ int TAO::FT_FaultNotifier_i::fini (ACE_ENV_SINGLE_ARG_DECL)
   }
   if (this->ns_name_ != 0 && this->naming_context_.in() != 0)
   {
-    this->naming_context_->unbind (this_name_
-                            ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->unbind (this_name_);
     this->ns_name_ = 0;
   }
 
   if (this->registered_)
   {
-    ACE_TRY
+    try
     {
       this->replication_manager_->register_fault_notifier(::FT::FaultNotifier::_nil ());
-      ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
         "FaultNotifier unregistered from ReplicationManager.\n"
         ));
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
         "FaultNotifier Can't unregister from ReplicationManager.\n"
@@ -245,23 +240,20 @@ int TAO::FT_FaultNotifier_i::fini (ACE_ENV_SINGLE_ARG_DECL)
       // complain, but otherwise ignore this error
       // RM may be down.
     }
-    ACE_ENDTRY;
 
     this->registered_ = 0;
   }
   return 0;
 }
 
-int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
+int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb )
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -270,10 +262,8 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
-  ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil(this->poa_.in ()))
   {
@@ -283,52 +273,39 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
   }
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  poa_manager->activate ();
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my IOR
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    this->poa_->id_to_reference (object_id_.in ());
 
-  this->ior_ = this->orb_->object_to_string (this_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->ior_ = this->orb_->object_to_string (this_obj.in ());
 
 
   ////////////////////////////////////////////////
   // Register with coresident Notification Channel
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory =
-    TAO_Notify_EventChannelFactory_i::create (poa_.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    TAO_Notify_EventChannelFactory_i::create (poa_.in ());
   CosNotification::QoSProperties initial_qos;
   CosNotification::AdminProperties initial_admin;
   this->notify_channel_ =
     notify_factory->create_channel (initial_qos,
     initial_admin,
-    channel_id_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    channel_id_);
 
-  this->filter_factory_ = this->notify_channel_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->filter_factory_ = this->notify_channel_->default_filter_factory ();
 
   ///////////////////////////
   // Producer registration
 
-  this->supplier_admin_ = this->notify_channel_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->supplier_admin_ = this->notify_channel_->default_supplier_admin ();
 
   ::CosNotifyChannelAdmin::ProxyID proxyId = 0;
 
@@ -337,14 +314,10 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
   ::CosNotifyChannelAdmin::ProxyConsumer_var consumer
     = this->supplier_admin_->obtain_notification_push_consumer (
       ::CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxyId
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+      proxyId);
 
   structured_proxy_push_consumer_
-    = ::CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(consumer.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    = ::CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(consumer.in ());
   if (CORBA::is_nil (this->structured_proxy_push_consumer_.in ()))
   {
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -356,23 +329,17 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
   CosNotifyComm::StructuredPushSupplier_var stubPushSupplier =
     CosNotifyComm::StructuredPushSupplier::_nil();
 
-  this->structured_proxy_push_consumer_->connect_structured_push_supplier (stubPushSupplier.in()
-     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->structured_proxy_push_consumer_->connect_structured_push_supplier (stubPushSupplier.in());
 
   ////////////////////
   // Sequence producer
   consumer
     = this->supplier_admin_->obtain_notification_push_consumer (
       ::CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      proxyId
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+      proxyId);
 
   this->sequence_proxy_push_consumer_
-    = ::CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(consumer.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    = ::CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(consumer.in ());
   if (CORBA::is_nil (this->sequence_proxy_push_consumer_.in ()))
   {
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -384,15 +351,12 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
   CosNotifyComm::SequencePushSupplier_var stubSeqPushSupplier =
     CosNotifyComm::SequencePushSupplier::_nil();
 
-  this->sequence_proxy_push_consumer_->connect_sequence_push_supplier (stubSeqPushSupplier.in()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->sequence_proxy_push_consumer_->connect_sequence_push_supplier (stubSeqPushSupplier.in());
   ///////////////////////////
   // Consumer registration
 
   // find the channel administrator for consumers
-  this->consumer_admin_ = this->notify_channel_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->consumer_admin_ = this->notify_channel_->default_consumer_admin ();
   if (CORBA::is_nil (this->consumer_admin_.in ()))
   {
     ACE_ERROR ((LM_ERROR,
@@ -406,12 +370,10 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
   // Register with ReplicationManager
   if (this->rm_register_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
-      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager");
+      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in());
       if (!CORBA::is_nil (replication_manager_.in ()))
       {
         // @@: should we check to see if there's already one registered?
@@ -436,12 +398,11 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
         ACE_ERROR ((LM_ERROR,"FaultNotifier: Can't resolve ReplicationManager, It will not be registered.\n" ));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "FaultNotifier: Exception resolving ReplicationManager.  Notifier will not be registered.\n" );
+      ex._tao_print_exception (
+        "FaultNotifier: Exception resolving ReplicationManager.  Notifier will not be registered.\n");
     }
-    ACE_ENDTRY;
   }
   else
   {
@@ -471,8 +432,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
       this->identity_ += this->ns_name_;
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->orb_->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil(naming_obj.in ())){
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -481,8 +441,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
       }
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
       if (CORBA::is_nil(this->naming_context_.in ()))
       {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -493,8 +452,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
       this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
 
       this->naming_context_->rebind (this->this_name_, this_obj.in()  //CORBA::Object::_duplicate(this_obj)
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                              );
     }
   }
 
@@ -506,35 +464,30 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL )
 
 void TAO::FT_FaultNotifier_i::push_structured_fault (
     const CosNotification::StructuredEvent & event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::push_structured_fault);
 
-  this->structured_proxy_push_consumer_->push_structured_event (event
-    ACE_ENV_ARG_PARAMETER);
+  this->structured_proxy_push_consumer_->push_structured_event (event);
 
   METHOD_RETURN(TAO::FT_FaultNotifier_i::push_structured_fault);
 }
 
 void TAO::FT_FaultNotifier_i::push_sequence_fault (
     const CosNotification::EventBatch & events
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_ENTRY(TAO::FT_FaultNotifier_i::push_sequence_fault);
 
-  this->sequence_proxy_push_consumer_->push_structured_events (events
-    ACE_ENV_ARG_PARAMETER);
+  this->sequence_proxy_push_consumer_->push_structured_events (events);
 
   METHOD_RETURN(TAO::FT_FaultNotifier_i::push_sequence_fault);
 }
 
 ::CosNotifyFilter::Filter_ptr TAO::FT_FaultNotifier_i::create_subscription_filter (
     const char * constraint_grammar
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar))
 {
@@ -549,7 +502,6 @@ void TAO::FT_FaultNotifier_i::push_sequence_fault (
 FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -583,14 +535,12 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_
   info.proxyVar_
       = this->consumer_admin_->obtain_notification_push_supplier (
       ::CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      info.proxyId_
-      ACE_ENV_ARG_PARAMETER);
+      info.proxyId_);
 
   this->consumer_connects_ += 1;
 
   ::CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxySupplier
-    = ::CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(info.proxyVar_.in ()
-        ACE_ENV_ARG_PARAMETER);
+    = ::CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(info.proxyVar_.in ());
 
   if ( CORBA::is_nil (proxySupplier.in ()))
   {
@@ -602,8 +552,7 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_
   }
   else
   {
-    proxySupplier->connect_structured_push_consumer ( push_consumer
-      ACE_ENV_ARG_PARAMETER);
+    proxySupplier->connect_structured_push_consumer ( push_consumer);
 
     if (! CORBA::is_nil (filter))
     {
@@ -617,7 +566,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_structured_fault_
 FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -650,14 +598,12 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co
   info.proxyVar_
     = this->consumer_admin_->obtain_notification_push_supplier (
       ::CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      info.proxyId_
-      ACE_ENV_ARG_PARAMETER);
+      info.proxyId_);
 
   this->consumer_connects_ += 1;
 
   ::CosNotifyChannelAdmin::SequenceProxyPushSupplier_var proxySupplier
-    = ::CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(info.proxyVar_.in ()
-      ACE_ENV_ARG_PARAMETER);
+    = ::CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(info.proxyVar_.in ());
   if ( CORBA::is_nil (proxySupplier.in ()))
   {
     // this is a shoould-not-occur situation.  The consumer admin returned
@@ -668,8 +614,7 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co
   }
   else
   {
-    proxySupplier->connect_sequence_push_consumer ( push_consumer
-      ACE_ENV_ARG_PARAMETER);
+    proxySupplier->connect_sequence_push_consumer ( push_consumer);
 
     if (! CORBA::is_nil (filter))
     {
@@ -681,7 +626,6 @@ FT::FaultNotifier::ConsumerId TAO::FT_FaultNotifier_i::connect_sequence_fault_co
 
 void TAO::FT_FaultNotifier_i::disconnect_consumer (
     FT::FaultNotifier::ConsumerId connection
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
@@ -693,13 +637,12 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
     ProxyInfo & info = this->proxy_infos_[index];
     if (CORBA::is_nil(info.proxyVar_.in ()) )
     {
-      ACE_THROW(CosEventComm::Disconnected());
+      throw CosEventComm::Disconnected();
     }
     else
     {
       ::CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxySupplier
-        = ::CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(info.proxyVar_.in ()
-            ACE_ENV_ARG_PARAMETER);
+        = ::CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(info.proxyVar_.in ());
       if (! CORBA::is_nil (proxySupplier.in ()))
       {
         proxySupplier->disconnect_structured_push_supplier ();
@@ -708,8 +651,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
       else
       {
         ::CosNotifyChannelAdmin::SequenceProxyPushSupplier_var proxySupplier
-          = ::CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(info.proxyVar_.in ()
-              ACE_ENV_ARG_PARAMETER);
+          = ::CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(info.proxyVar_.in ());
         if (! CORBA::is_nil (proxySupplier.in ()))
         {
           proxySupplier->disconnect_sequence_push_supplier ();
@@ -720,14 +662,14 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
           ACE_ERROR((LM_ERROR,
             "%T %n (%P|%t) Unexpected proxy supplier type\n"
             ));
-          ACE_THROW(CosEventComm::Disconnected());
+          throw CosEventComm::Disconnected();
         }
       }
     }
   }
   else
   {
-    ACE_THROW(CosEventComm::Disconnected());
+    throw CosEventComm::Disconnected();
   }
 
   this->consumer_disconnects_ += 1;
@@ -741,8 +683,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
         static_cast<unsigned int> (this->consumer_connects_),
         static_cast<unsigned int> (this->consumer_disconnects_)
         ));
-      this->poa_->deactivate_object (this->object_id_.in ()
-                   ACE_ENV_ARG_PARAMETER);
+      this->poa_->deactivate_object (this->object_id_.in ());
       this->quitting_ = 1;
     }
   }
@@ -750,7 +691,7 @@ void TAO::FT_FaultNotifier_i::disconnect_consumer (
   METHOD_RETURN(TAO::FT_FaultNotifier_i::disconnect_consumer);
 }
 
-CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean TAO::FT_FaultNotifier_i::is_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_RETURN(TAO::FT_FaultNotifier_i::is_alive) 1;
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index 1f5e672eaed..f182cb50000 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -67,13 +67,13 @@ namespace TAO
      * @param orbManager our ORB -- we keep var to it.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /**
      * Prepare to exit
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (ACE_ENV_SINGLE_ARG_DECL);
+    int fini (void);
 
     /**
      * Identify this fault notifier.
@@ -86,7 +86,7 @@ namespace TAO
      * @param result [out] status code to return from process
      * @returns 0 to continue; nonzero to quit
      */
-    int idle(int &result ACE_ENV_ARG_DECL);
+    int idle(int &result);
 
     //////////////////
     // CORBA interface
@@ -94,53 +94,47 @@ namespace TAO
 
     virtual void push_structured_fault (
         const CosNotification::StructuredEvent & event
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void push_sequence_fault (
       const CosNotification::EventBatch & events
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter (
       const char * constraint_grammar
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar));
 
     virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer (
       CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
       CosNotifyFilter::Filter_ptr filter
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer (
       CosNotifyComm::SequencePushConsumer_ptr push_consumer,
       CosNotifyFilter::Filter_ptr filter
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void disconnect_consumer (
       FT::FaultNotifier::ConsumerId connection
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
 
     //////////////////////////////////////////
     // CORBA interface PullMonitorable methods
-    virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+    virtual CORBA::Boolean is_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     /////////////////////////////////////////
     // Override CORBA servant virtual methods
-    virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+    virtual PortableServer::POA_ptr _default_POA (void);
 
-    virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+    virtual void _remove_ref (void);
 
     /////////////////////////
     // Implementation methods
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index d6947d62727..905212046e3 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -13,11 +13,9 @@ main (int argc, char *argv[])
 {
   IFR_Service server;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int status = server.init (argc, argv);
 
       if (status != 0)
         {
@@ -25,11 +23,9 @@ main (int argc, char *argv[])
         }
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
 
-          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          status = server.fini ();
 
           if (status == -1)
             {
@@ -37,16 +33,15 @@ main (int argc, char *argv[])
             }
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unknown Exception");
+      ex._tao_print_exception ("Unknown Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index cf0d1c13b3c..95fdd4a1291 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -25,17 +25,14 @@ IFR_Service::~IFR_Service (void)
 
 int
 IFR_Service::init (int argc,
-                   char *argv[]
-                   ACE_ENV_ARG_DECL)
+                   char *argv[])
 {
   int result;
-  ACE_TRY
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       result = this->my_ifr_server_.init_with_orb (argc,
                                                    argv,
@@ -46,43 +43,35 @@ IFR_Service::init (int argc,
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "IFR_Service::init");
+      ex._tao_print_exception ("IFR_Service::init");
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
-IFR_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+IFR_Service::run (void)
 {
-  this->orb_->run (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run (0);
 
   return 0;
 }
 
 int
-IFR_Service::fini (ACE_ENV_SINGLE_ARG_DECL)
+IFR_Service::fini (void)
 {
-  ACE_TRY
+  try
     {
       this->my_ifr_server_.fini ();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "IFR_Service::fini");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("IFR_Service::fini");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index ac7970f348b..034d00696d8 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -42,14 +42,13 @@ public:
 
   /// Initialize the IFR service.
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+            char *argv[]);
 
   /// Shut down the IFR Service.
-  int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int fini (void);
 
   /// Run the IFR service.
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (void);
 
 protected:
 
diff --git a/TAO/orbsvcs/IFR_Service/be_init.cpp b/TAO/orbsvcs/IFR_Service/be_init.cpp
index 8327a82601f..6a57d0af586 100644
--- a/TAO/orbsvcs/IFR_Service/be_init.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_init.cpp
@@ -69,23 +69,18 @@ BE_save_orb_args (int &argc, char *argv[])
 int
 BE_ifr_orb_init (int &ac, char *av[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       be_global->orb (CORBA::ORB_init (ac,
                                        av,
-                                       0
-                                       ACE_ENV_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+                                       0));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("BE_ifr_orb_init"));
+      ex._tao_print_exception (ACE_TEXT ("BE_ifr_orb_init"));
 
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 043d02b66dc..d9a779052d3 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -99,15 +99,13 @@ BE_abort (void)
 }
 
 void
-BE_create_holding_scope (ACE_ENV_SINGLE_ARG_DECL)
+BE_create_holding_scope (void)
 {
   CORBA::ModuleDef_ptr scope = CORBA::ModuleDef::_nil ();
 
   // If we are multi-threaded, it may already be created.
   CORBA::Contained_var result =
-    be_global->repository ()->lookup_id (be_global->holding_scope_name ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    be_global->repository ()->lookup_id (be_global->holding_scope_name ());
 
   // Will live until the repository goes away for good.
   if (CORBA::is_nil (result.in ()))
@@ -117,27 +115,21 @@ BE_create_holding_scope (ACE_ENV_SINGLE_ARG_DECL)
                                       be_global->holding_scope_name (),
                                       be_global->holding_scope_name (),
                                       "1.0"
-                                      ACE_ENV_ARG_PARAMETER
                                     );
-      ACE_CHECK;
     }
   else
     {
-      scope = CORBA::ModuleDef::_narrow (result.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      scope = CORBA::ModuleDef::_narrow (result.in ());
     }
 
   be_global->holding_scope (scope);
 }
 
 int
-BE_ifr_repo_init (ACE_ENV_SINGLE_ARG_DECL)
+BE_ifr_repo_init (void)
 {
   CORBA::Object_var object =
-    be_global->orb ()->resolve_initial_references ("InterfaceRepository"
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    be_global->orb ()->resolve_initial_references ("InterfaceRepository");
 
   if (CORBA::is_nil (object.in ()))
     {
@@ -150,9 +142,7 @@ BE_ifr_repo_init (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Repository_var repo =
-    CORBA::Repository::_narrow (object.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::Repository::_narrow (object.in ());
 
   if (CORBA::is_nil (repo.in ()))
     {
@@ -173,19 +163,16 @@ BE_ifr_repo_init (ACE_ENV_SINGLE_ARG_DECL)
 TAO_IFR_BE_Export void
 BE_produce (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = BE_ifr_repo_init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int status = BE_ifr_repo_init ();
 
       if (status != 0)
         {
           return;
         }
 
-      BE_create_holding_scope (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      BE_create_holding_scope ();
 
       // Get the root node.
       AST_Decl *d = idl_global->root ();
@@ -237,13 +224,11 @@ BE_produce (void)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("BE_produce"));
+      ex._tao_print_exception (ACE_TEXT ("BE_produce"));
 
     }
-  ACE_ENDTRY;
 
   // Clean up.
   BE_cleanup ();
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 31f082877d2..30f289b4a0f 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -116,23 +116,19 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->ir_current_ =
       be_global->repository ()->get_primitive (
                                     this->predefined_type_to_pkind (node)
-                                    ACE_ENV_ARG_PARAMETER
                                   );
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_predefined_type"));
+      ex._tao_print_exception (ACE_TEXT ("visit_predefined_type"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -147,15 +143,12 @@ ifr_adding_visitor::visit_module (AST_Module *node)
 
   CORBA::Container_var new_def;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If this module been opened before, it will already be in
       // the repository.
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -169,9 +162,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
                                        node->repoID (),
                                        node->local_name ()->get_string (),
                                        node->version ()
-                                       ACE_ENV_ARG_PARAMETER
                                      );
-              ACE_TRY_CHECK;
             }
           else
             {
@@ -187,8 +178,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
       else
         {
           CORBA::DefinitionKind kind =
-            prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            prev_def->def_kind ();
 
           if (kind == CORBA::dk_Module)
             {
@@ -201,9 +191,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               this->in_reopened_ = 1;
 
               new_def =
-                CORBA::ComponentIR::Container::_narrow (prev_def.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::ComponentIR::Container::_narrow (prev_def.in ());
             }
         }
 
@@ -244,14 +232,12 @@ ifr_adding_visitor::visit_module (AST_Module *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_module"));
+      ex._tao_print_exception (ACE_TEXT ("visit_module"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -264,21 +250,16 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_interface_def (node
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int status = this->create_interface_def (node);
 
           return status;
         }
@@ -314,38 +295,29 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               if (node->ifr_fwd_added () == 0)
                 {
                   CORBA::DefinitionKind kind =
-                    prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    prev_def->def_kind ();
 
                   if (kind == CORBA::dk_Interface)
                     {
                       CORBA::InterfaceDef_var iface =
-                        CORBA::InterfaceDef::_narrow (prev_def.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                        CORBA::InterfaceDef::_narrow (prev_def.in ());
 
                       CORBA::ContainedSeq_var contents =
                         iface->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
                       for (CORBA::ULong i = 0; i < length; ++i)
                         {
-                          contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                          contents[i]->destroy ();
                         }
                     }
                   else
                     {
-                      prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                      prev_def->destroy ();
 
-                      int status = this->create_interface_def (node
-                                                               ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                      int status = this->create_interface_def (node);
 
                       return status;
                     }
@@ -363,9 +335,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               for (CORBA::ULong i = 0; i < n_parents; ++i)
                 {
                   result =
-                    be_global->repository ()->lookup_id (parents[i]->repoID ()
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    be_global->repository ()->lookup_id (parents[i]->repoID ());
 
                   // If one of our interface's parents is not in the repository,
                   // that means that it has not yet been seen (even as a
@@ -375,17 +345,13 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                   if (CORBA::is_nil (result.in ()))
                     {
                       this->ir_current_ =
-                        CORBA::IDLType::_narrow (prev_def.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK
+                        CORBA::IDLType::_narrow (prev_def.in ());
 
                       return 0;
                     }
 
                   bases[i] =
-                    CORBA::InterfaceDef::_narrow (result.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    CORBA::InterfaceDef::_narrow (result.in ());
 
                   if (CORBA::is_nil (bases[i]))
                     {
@@ -401,13 +367,9 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                 }
 
               CORBA::InterfaceDef_var extant_def =
-                CORBA::InterfaceDef::_narrow (prev_def. in ()
-                                              ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::InterfaceDef::_narrow (prev_def. in ());
 
-              extant_def->base_interfaces (bases
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK
+              extant_def->base_interfaces (bases);
 
               node->ifr_added (1);
 
@@ -470,20 +432,16 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_interface"));
+      ex._tao_print_exception (ACE_TEXT ("visit_interface"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -498,14 +456,11 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 
   AST_Interface *i = node->full_definition ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (i->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (i->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -530,7 +485,6 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->local_name ()->get_string (),
                                        i->version (),
                                        bases
-                                       ACE_ENV_ARG_PARAMETER
                                      );
                 }
               else
@@ -541,11 +495,9 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->local_name ()->get_string (),
                                        i->version (),
                                        bases
-                                       ACE_ENV_ARG_PARAMETER
                                      );
                 }
 
-              ACE_TRY_CHECK;
             }
           else
             {
@@ -564,14 +516,12 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
         }
 
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_interface_fwd"));
+      ex._tao_print_exception (ACE_TEXT ("visit_interface_fwd"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -584,12 +534,9 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->element_type (node->boxed_type ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->element_type (node->boxed_type ());
 
       CORBA::Container_ptr current_scope =
         CORBA::Container::_nil ();
@@ -602,9 +549,7 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
                 node->local_name ()->get_string (),
                 node->version (),
                 this->ir_current_.in ()
-                ACE_ENV_ARG_PARAMETER
               );
-          ACE_TRY_CHECK;
         }
       else
         {
@@ -619,14 +564,12 @@ ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
 
       node->ifr_added (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_valuebox"));
+      ex._tao_print_exception (ACE_TEXT ("visit_valuebox"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -639,21 +582,16 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_value_def (node
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int status = this->create_value_def (node);
 
           return status;
         }
@@ -689,39 +627,30 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
               if (node->ifr_fwd_added () == 0)
                 {
                   CORBA::DefinitionKind kind =
-                    prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    prev_def->def_kind ();
 
                   if (kind == CORBA::dk_Value)
                     {
                       CORBA::ValueDef_var value =
-                        CORBA::ValueDef::_narrow (prev_def.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                        CORBA::ValueDef::_narrow (prev_def.in ());
 
                       CORBA::ContainedSeq_var contents =
                         value->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
                       for (CORBA::ULong i = 0; i < length; ++i)
                         {
-                          contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                          contents[i]->destroy ();
                         }
                     }
                   else
                     {
-                      prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                      prev_def->destroy ();
 
                       int status =
-                        this->create_value_def (node
-                                                ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                        this->create_value_def (node);
 
                       return status;
                     }
@@ -730,71 +659,47 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
               // Our previous definition is a valuetype, so narrow it here,
               // then populate it.
               CORBA::ExtValueDef_var extant_def =
-                CORBA::ExtValueDef::_narrow (prev_def. in ()
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::ExtValueDef::_narrow (prev_def. in ());
 
               // Concrete base value.
 
               CORBA::ValueDef_var base_vt;
               this->fill_base_value (base_vt.out (),
-                                     node
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                     node);
 
-              extant_def->base_value (base_vt.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->base_value (base_vt.in ());
 
               // Abstract base values.
 
               CORBA::ValueDefSeq abstract_base_values;
               this->fill_abstract_base_values (abstract_base_values,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                               node);
 
-              extant_def->abstract_base_values (abstract_base_values
-                                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->abstract_base_values (abstract_base_values);
 
               // Supported interfaces.
 
               CORBA::InterfaceDefSeq supported;
               this->fill_supported_interfaces (supported,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                               node);
 
-              extant_def->supported_interfaces (supported
-                                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->supported_interfaces (supported);
 
               // Intializers.
 
               CORBA::ExtInitializerSeq initializers;
               this->fill_initializers (initializers,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       node);
 
-              extant_def->ext_initializers (initializers
-                                            ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->ext_initializers (initializers);
 
               // Truncatable, abstract, custom.
 
-              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ())
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ()));
 
-              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ())
-                                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ()));
 
-              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ())
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ()));
 
               node->ifr_added (1);
 
@@ -858,20 +763,16 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_valuetype"));
+      ex._tao_print_exception (ACE_TEXT ("visit_valuetype"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -886,14 +787,11 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
 
   AST_Interface *v = node->full_definition ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (v->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (v->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -929,9 +827,7 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
                                    abstract_bases,
                                    supported,
                                    initializers
-                                   ACE_ENV_ARG_PARAMETER
                                  );
-              ACE_TRY_CHECK;
             }
           else
             {
@@ -949,14 +845,12 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node)
           v->ifr_fwd_added (1);
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_valuetype_fwd"));
+      ex._tao_print_exception (ACE_TEXT ("visit_valuetype_fwd"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -969,21 +863,16 @@ ifr_adding_visitor::visit_component (AST_Component *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_component_def (node
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int status = this->create_component_def (node);
 
           return status;
         }
@@ -1019,41 +908,32 @@ ifr_adding_visitor::visit_component (AST_Component *node)
               if (node->ifr_fwd_added () == 0)
                 {
                   CORBA::DefinitionKind kind =
-                    prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    prev_def->def_kind ();
 
                   if (kind == CORBA::dk_Component)
                     {
                       CORBA::ComponentIR::ComponentDef_var value =
                         CORBA::ComponentIR::ComponentDef::_narrow (
                             prev_def.in ()
-                            ACE_ENV_ARG_PARAMETER
                           );
-                      ACE_TRY_CHECK;
 
                       CORBA::ContainedSeq_var contents =
                         value->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
                       for (CORBA::ULong i = 0; i < length; ++i)
                         {
-                          contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                          contents[i]->destroy ();
                         }
                     }
                   else
                     {
-                      prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                      prev_def->destroy ();
 
                       int status =
-                        this->create_component_def (node
-                                                    ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                        this->create_component_def (node);
 
                       return status;
                     }
@@ -1064,54 +944,34 @@ ifr_adding_visitor::visit_component (AST_Component *node)
               CORBA::ComponentIR::ComponentDef_var extant_def =
                 CORBA::ComponentIR::ComponentDef::_narrow (
                                                       prev_def.in ()
-                                                      ACE_ENV_ARG_PARAMETER
                                                     );
-              ACE_TRY_CHECK;
 
               CORBA::InterfaceDefSeq supported_interfaces;
               this->fill_supported_interfaces (supported_interfaces,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                               node);
 
-              extant_def->supported_interfaces (supported_interfaces
-                                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->supported_interfaces (supported_interfaces);
 
               CORBA::ComponentIR::ComponentDef_var base_component;
               this->fill_base_component (base_component.out (),
-                                         node
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                         node);
 
-              extant_def->base_component (base_component.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->base_component (base_component.in ());
 
               this->visit_all_provides (node,
-                                        extant_def.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                        extant_def.in ());
 
               this->visit_all_uses (node,
-                                    extant_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                    extant_def.in ());
 
               this->visit_all_emits (node,
-                                     extant_def.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                     extant_def.in ());
 
               this->visit_all_publishes (node,
-                                         extant_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                         extant_def.in ());
 
               this->visit_all_consumes (node,
-                                        extant_def.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                        extant_def.in ());
 
               node->ifr_added (1);
 
@@ -1175,20 +1035,16 @@ ifr_adding_visitor::visit_component (AST_Component *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_component"));
+      ex._tao_print_exception (ACE_TEXT ("visit_component"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1204,14 +1060,11 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
   AST_Component *c =
     AST_Component::narrow_from_decl (node->full_definition ());
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (c->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (c->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -1223,9 +1076,7 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
               CORBA::ComponentIR::Container_var ccm_scope =
                 CORBA::ComponentIR::Container::_narrow (
                                                    current_scope
-                                                   ACE_ENV_ARG_PARAMETER
                                                  );
-              ACE_TRY_CHECK;
 
               // If our full definition is found in this IDL file, we go
               // ahead and create the full entry now.
@@ -1240,14 +1091,10 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
               if (node->is_defined ())
                 {
                   this->fill_supported_interfaces (supported_interfaces,
-                                                   c
-                                                   ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                                   c);
 
                   this->fill_base_component (base_component.out (),
-                                             c
-                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                             c);
                 }
 
               this->ir_current_ =
@@ -1257,9 +1104,7 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
                                c->version (),
                                base_component.in (),
                                supported_interfaces
-                               ACE_ENV_ARG_PARAMETER
                              );
-              ACE_TRY_CHECK;
 
               // Might as well go ahead and complete the repository
               // entry now, if we can - we're halfway there already.
@@ -1268,34 +1113,22 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
                   CORBA::ComponentIR::ComponentDef_var new_def =
                     CORBA::ComponentIR::ComponentDef::_narrow (
                         this->ir_current_.in ()
-                        ACE_ENV_ARG_PARAMETER
                       );
-                  ACE_TRY_CHECK;
 
                   this->visit_all_provides (c,
-                                            new_def.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                            new_def.in ());
 
                   this->visit_all_uses (c,
-                                        new_def.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                        new_def.in ());
 
                   this->visit_all_emits (c,
-                                         new_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                         new_def.in ());
 
                   this->visit_all_publishes (c,
-                                             new_def.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                             new_def.in ());
 
                   this->visit_all_consumes (c,
-                                            new_def.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                            new_def.in ());
                 }
             }
           else
@@ -1314,14 +1147,12 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node)
           c->ifr_fwd_added (1);
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_component_fwd"));
+      ex._tao_print_exception (ACE_TEXT ("visit_component_fwd"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1334,21 +1165,16 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_event_def (node
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int status = this->create_event_def (node);
 
           return status;
         }
@@ -1384,41 +1210,32 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
               if (node->ifr_fwd_added () == 0)
                 {
                   CORBA::DefinitionKind kind =
-                    prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    prev_def->def_kind ();
 
                   if (kind == CORBA::dk_Value)
                     {
                       CORBA::ComponentIR::EventDef_var event =
                         CORBA::ComponentIR::EventDef::_narrow (
                             prev_def.in ()
-                            ACE_ENV_ARG_PARAMETER
                           );
-                      ACE_TRY_CHECK;
 
                       CORBA::ContainedSeq_var contents =
                         event->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
                       for (CORBA::ULong i = 0; i < length; ++i)
                         {
-                          contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                          contents[i]->destroy ();
                         }
                     }
                   else
                     {
-                      prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                      prev_def->destroy ();
 
                       int status =
-                        this->create_event_def (node
-                                                ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                        this->create_event_def (node);
 
                       return status;
                     }
@@ -1427,71 +1244,47 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
               // Our previous definition is a valuetype, so narrow it here,
               // then populate it.
               CORBA::ComponentIR::EventDef_var extant_def =
-                CORBA::ComponentIR::EventDef::_narrow (prev_def. in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::ComponentIR::EventDef::_narrow (prev_def. in ());
 
               // Concrete base value.
 
               CORBA::ValueDef_var base_vt;
               this->fill_base_value (base_vt.out (),
-                                     node
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                     node);
 
-              extant_def->base_value (base_vt.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->base_value (base_vt.in ());
 
               // Abstract base values.
 
               CORBA::ValueDefSeq abstract_base_values;
               this->fill_abstract_base_values (abstract_base_values,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                               node);
 
-              extant_def->abstract_base_values (abstract_base_values
-                                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->abstract_base_values (abstract_base_values);
 
               // Supported interfaces.
 
               CORBA::InterfaceDefSeq supported;
               this->fill_supported_interfaces (supported,
-                                               node
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                               node);
 
-              extant_def->supported_interfaces (supported
-                                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->supported_interfaces (supported);
 
               // Intializers.
 
               CORBA::ExtInitializerSeq initializers;
               this->fill_initializers (initializers,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       node);
 
-              extant_def->ext_initializers (initializers
-                                            ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->ext_initializers (initializers);
 
               // Truncatable, abstract, custom.
 
-              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ())
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->is_abstract (static_cast<CORBA::Boolean> (node->is_abstract ()));
 
-              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ())
-                                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->is_truncatable (static_cast<CORBA::Boolean> (node->truncatable ()));
 
-              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ())
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              extant_def->is_custom (static_cast<CORBA::Boolean> (node->custom ()));
 
               node->ifr_added (1);
 
@@ -1555,20 +1348,16 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_eventtype"));
+      ex._tao_print_exception (ACE_TEXT ("visit_eventtype"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1583,14 +1372,11 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
 
   AST_Interface *v = node->full_definition ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (v->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (v->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -1614,9 +1400,7 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
               CORBA::ComponentIR::Container_var ccm_scope =
                 CORBA::ComponentIR::Container::_narrow (
                                                    current_scope
-                                                   ACE_ENV_ARG_PARAMETER
                                                  );
-              ACE_TRY_CHECK;
 
               CORBA::Boolean abstract =
                 static_cast<CORBA::Boolean> (v->is_abstract ());
@@ -1633,9 +1417,7 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
                                abstract_bases,
                                supported,
                                initializers
-                               ACE_ENV_ARG_PARAMETER
                              );
-              ACE_TRY_CHECK;
             }
           else
             {
@@ -1653,14 +1435,12 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node)
           v->ifr_fwd_added (1);
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_eventtype_fwd"));
+      ex._tao_print_exception (ACE_TEXT ("visit_eventtype_fwd"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1673,21 +1453,16 @@ ifr_adding_visitor::visit_home (AST_Home *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_home_def (node
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int status = this->create_home_def (node);
 
           return status;
         }
@@ -1723,41 +1498,32 @@ ifr_adding_visitor::visit_home (AST_Home *node)
               if (node->ifr_fwd_added () == 0)
                 {
                   CORBA::DefinitionKind kind =
-                    prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    prev_def->def_kind ();
 
                   if (kind == CORBA::dk_Component)
                     {
                       CORBA::ComponentIR::HomeDef_var value =
                         CORBA::ComponentIR::HomeDef::_narrow (
                             prev_def.in ()
-                            ACE_ENV_ARG_PARAMETER
                           );
-                      ACE_TRY_CHECK;
 
                       CORBA::ContainedSeq_var contents =
                         value->contents (CORBA::dk_all,
-                                         1
-                                         ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                                         1);
 
                       CORBA::ULong length = contents->length ();
 
                       for (CORBA::ULong i = 0; i < length; ++i)
                         {
-                          contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                          contents[i]->destroy ();
                         }
                     }
                   else
                     {
-                      prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                      prev_def->destroy ();
 
                       int status =
-                        this->create_home_def (node
-                                               ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                        this->create_home_def (node);
 
                       return status;
                     }
@@ -1775,20 +1541,16 @@ ifr_adding_visitor::visit_home (AST_Home *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ =
-                CORBA::IDLType::_narrow (prev_def.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::IDLType::_narrow (prev_def.in ());
             }
         }
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_home"));
+      ex._tao_print_exception (ACE_TEXT ("visit_home"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1807,13 +1569,10 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -1839,26 +1598,23 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
           // second time and we want to just update ir_current_.
           if (node->ifr_added () == 0 && this->in_reopened_ == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               return this->visit_structure (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("ifr_adding_visitor::visit_structure"));
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor::visit_structure"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1888,14 +1644,11 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this enum already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -1930,9 +1683,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
                     node->local_name ()->get_string (),
                     node->version (),
                     members
-                    ACE_ENV_ARG_PARAMETER
                   );
-              ACE_TRY_CHECK;
             }
           else
             {
@@ -1958,8 +1709,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
           // second time and we want to just update ir_current_.
           if (node->ifr_added () == 0 && this->in_reopened_ == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               return this->visit_enum (node);
             }
@@ -1967,19 +1717,15 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
           // There is already an entry in the repository, so just update
           // the current IR object holder.
           this->ir_current_ =
-            CORBA::EnumDef::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::EnumDef::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("ifr_adding_visitor::visit_enum"));
+      ex._tao_print_exception (ACE_TEXT ("ifr_adding_visitor::visit_enum"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2035,30 +1781,23 @@ ifr_adding_visitor::visit_field (AST_Field *node)
 int
 ifr_adding_visitor::visit_attribute (AST_Attribute *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       AST_Type *type = node->field_type ();
 
       // Updates ir_current_.
-      this->get_referenced_type (type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->get_referenced_type (type);
 
       CORBA::AttributeMode mode =
         node->readonly () ? CORBA::ATTR_READONLY : CORBA::ATTR_NORMAL;
 
       CORBA::ExceptionDefSeq get_exceptions;
       this->fill_get_exceptions (get_exceptions,
-                                 node
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 node);
 
       CORBA::ExceptionDefSeq set_exceptions;
       this->fill_set_exceptions (set_exceptions,
-                                 node
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 node);
 
       CORBA::Container_ptr current_scope =
         CORBA::Container::_nil ();
@@ -2066,15 +1805,12 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
       if (be_global->ifr_scopes ().top (current_scope) == 0)
         {
           CORBA::DefinitionKind kind =
-            current_scope->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            current_scope->def_kind ();
 
           if (kind == CORBA::dk_Value || kind == CORBA::dk_Event)
             {
               CORBA::ExtValueDef_var value =
-                CORBA::ExtValueDef::_narrow (current_scope
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::ExtValueDef::_narrow (current_scope);
 
               CORBA::ExtAttributeDef_var new_def =
                 value->create_ext_attribute (
@@ -2085,18 +1821,14 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
                     mode,
                     get_exceptions,
                     set_exceptions
-                    ACE_ENV_ARG_PARAMETER
                   );
-              ACE_TRY_CHECK;
             }
           else
             {
               // We are an interface, a local interface, an abstract
               // interface or a component. This narrow covers them all.
               CORBA::InterfaceAttrExtension_var iface =
-                CORBA::InterfaceAttrExtension::_narrow (current_scope
-                                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::InterfaceAttrExtension::_narrow (current_scope);
 
               CORBA::ExtAttributeDef_var new_def =
                 iface->create_ext_attribute (
@@ -2107,9 +1839,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
                     mode,
                     get_exceptions,
                     set_exceptions
-                    ACE_ENV_ARG_PARAMETER
                   );
-              ACE_TRY_CHECK;
             }
         }
       else
@@ -2123,14 +1853,12 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_attribute"));
+      ex._tao_print_exception (ACE_TEXT ("visit_attribute"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2143,13 +1871,10 @@ ifr_adding_visitor::visit_union (AST_Union *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -2177,26 +1902,21 @@ ifr_adding_visitor::visit_union (AST_Union *node)
           // second time and we want to just update ir_current_.
           if (node->ifr_added () == 0 && this->in_reopened_ == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               return this->visit_union (node);
             }
 
           this->ir_current_ =
-            CORBA::UnionDef::_narrow (prev_def.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::UnionDef::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("ifr_adding_visitor::visit_union"));
+      ex._tao_print_exception (ACE_TEXT ("ifr_adding_visitor::visit_union"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2211,13 +1931,10 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 
   const char *id = node->repoID ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (id
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (id);
 
       // Nothing prevents this constant's repo id from already being
       // in the repository as another type, if it came from another
@@ -2235,8 +1952,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
           // second time and we want to just update ir_current_.
           if (node->ifr_added () == 0 && this->in_reopened_ == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
             }
           else
             {
@@ -2254,21 +1970,15 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
           // This constant's type is a typedef - look up the typedef to
           // pass to create_constant().
           CORBA::Contained_var contained =
-            be_global->repository ()->lookup_id (td->repoID ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            be_global->repository ()->lookup_id (td->repoID ());
 
-          this->ir_current_ = CORBA::IDLType::_narrow (contained.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->ir_current_ = CORBA::IDLType::_narrow (contained.in ());
         }
       else
         {
           CORBA::PrimitiveKind pkind = this->expr_type_to_pkind (ev->et);
           this->ir_current_ =
-            be_global->repository ()->get_primitive (pkind
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            be_global->repository ()->get_primitive (pkind);
         }
 
       CORBA::Any any;
@@ -2287,9 +1997,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
                 node->version (),
                 this->ir_current_.in (),
                 any
-                ACE_ENV_ARG_PARAMETER
               );
-          ACE_TRY_CHECK;
         }
       else
         {
@@ -2302,14 +2010,12 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_constant"));
+      ex._tao_print_exception (ACE_TEXT ("visit_constant"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2317,12 +2023,9 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 int
 ifr_adding_visitor::visit_array (AST_Array *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->element_type (node->base_type ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->element_type (node->base_type ());
 
       AST_Expression **dims = node->dims ();
 
@@ -2332,19 +2035,15 @@ ifr_adding_visitor::visit_array (AST_Array *node)
             be_global->repository ()->create_array (
                 dims[i - 1]->ev ()->u.ulval,
                 this->ir_current_.in ()
-                ACE_ENV_ARG_PARAMETER
               );
-          ACE_TRY_CHECK;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_array"));
+      ex._tao_print_exception (ACE_TEXT ("visit_array"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2352,29 +2051,22 @@ ifr_adding_visitor::visit_array (AST_Array *node)
 int
 ifr_adding_visitor::visit_sequence (AST_Sequence *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->element_type (node->base_type ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->element_type (node->base_type ());
 
       this->ir_current_ =
         be_global->repository ()->create_sequence (
                                       node->max_size ()->ev ()->u.ulval,
                                       this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER
                                     );
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_sequence"));
+      ex._tao_print_exception (ACE_TEXT ("visit_sequence"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2388,32 +2080,26 @@ ifr_adding_visitor::visit_string (AST_String *node)
 
   CORBA::ULong bound = static_cast<CORBA::ULong> (ev->u.ulval);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (node->node_type () == AST_Decl::NT_string)
         {
           this->ir_current_ =
-            be_global->repository ()->create_string (bound
-                                                     ACE_ENV_ARG_PARAMETER);
+            be_global->repository ()->create_string (bound);
         }
       else
         {
           this->ir_current_ =
-            be_global->repository ()->create_wstring (bound
-                                                      ACE_ENV_ARG_PARAMETER);
+            be_global->repository ()->create_wstring (bound);
         }
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_string"));
+      ex._tao_print_exception (ACE_TEXT ("visit_string"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2426,12 +2112,9 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->element_type (node->base_type ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->element_type (node->base_type ());
 
       CORBA::Container_ptr current_scope =
         CORBA::Container::_nil ();
@@ -2444,9 +2127,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
                 node->local_name ()->get_string (),
                 node->version (),
                 this->ir_current_.in ()
-                ACE_ENV_ARG_PARAMETER
               );
-          ACE_TRY_CHECK;
         }
       else
         {
@@ -2461,14 +2142,12 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
 
       node->ifr_added (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_typedef"));
+      ex._tao_print_exception (ACE_TEXT ("visit_typedef"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2523,13 +2202,10 @@ ifr_adding_visitor::visit_native (AST_Native *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -2543,9 +2219,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
                     node->repoID (),
                     node->local_name ()->get_string (),
                     node->version ()
-                    ACE_ENV_ARG_PARAMETER
                   );
-              ACE_TRY_CHECK;
             }
           else
             {
@@ -2571,27 +2245,22 @@ ifr_adding_visitor::visit_native (AST_Native *node)
           // second time and we want to just update ir_current_.
           if (node->ifr_added () == 0 && this->in_reopened_ == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_native (node);
             }
 
           this->ir_current_ =
-            CORBA::NativeDef::_narrow (prev_def.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::NativeDef::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_native"));
+      ex._tao_print_exception (ACE_TEXT ("visit_native"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -2772,8 +2441,7 @@ ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev,
 }
 
 void
-ifr_adding_visitor::element_type (AST_Type *base_type
-                                  ACE_ENV_ARG_DECL)
+ifr_adding_visitor::element_type (AST_Type *base_type)
 {
   if (base_type->anonymous ())
     {
@@ -2789,9 +2457,7 @@ ifr_adding_visitor::element_type (AST_Type *base_type
   else
     {
       CORBA::Contained_var contained =
-        be_global->repository ()->lookup_id (base_type->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        be_global->repository ()->lookup_id (base_type->repoID ());
 
       if (CORBA::is_nil (contained.in ()))
         {
@@ -2802,15 +2468,12 @@ ifr_adding_visitor::element_type (AST_Type *base_type
             ));
         }
 
-      this->ir_current_ = CORBA::IDLType::_narrow (contained.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->ir_current_ = CORBA::IDLType::_narrow (contained.in ());
     }
 }
 
 int
-ifr_adding_visitor::create_interface_def (AST_Interface *node
-                                          ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_interface_def (AST_Interface *node)
 {
   CORBA::ULong n_parents = static_cast<CORBA::ULong> (node->n_inherits ());
   AST_Interface **parents = node->inherits ();
@@ -2826,16 +2489,13 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
       for (CORBA::ULong i = 0; i < n_parents; ++i)
         {
           result =
-            be_global->repository ()->lookup_id (parents[i]->repoID ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            be_global->repository ()->lookup_id (parents[i]->repoID ());
 
           // If we got to visit_interface() from a forward declared interface,
           // this node may not yet be in the repository.
           if (CORBA::is_nil (result.in ()))
             {
-              int status = this->create_interface_def (parents[i]
-                                                       ACE_ENV_ARG_PARAMETER);
+              int status = this->create_interface_def (parents[i]);
 
               if (status != 0)
                 {
@@ -2850,16 +2510,12 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                 }
 
               bases[i] =
-                CORBA::AbstractInterfaceDef::_narrow (this->ir_current_.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (-1);
+                CORBA::AbstractInterfaceDef::_narrow (this->ir_current_.in ());
             }
           else
             {
               abs_bases[i] =
-                CORBA::AbstractInterfaceDef::_narrow (result.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (-1);
+                CORBA::AbstractInterfaceDef::_narrow (result.in ());
             }
 
           if (CORBA::is_nil (abs_bases[i]))
@@ -2883,16 +2539,13 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
       for (CORBA::ULong i = 0; i < n_parents; ++i)
         {
           result =
-            be_global->repository ()->lookup_id (parents[i]->repoID ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            be_global->repository ()->lookup_id (parents[i]->repoID ());
 
           // If we got to visit_interface() from a forward declared interface,
           // this node may not yet be in the repository.
           if (CORBA::is_nil (result.in ()))
             {
-              int status = this->create_interface_def (parents[i]
-                                                       ACE_ENV_ARG_PARAMETER);
+              int status = this->create_interface_def (parents[i]);
 
               if (status != 0)
                 {
@@ -2906,15 +2559,11 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                   );
                 }
 
-              bases[i] = CORBA::InterfaceDef::_narrow (this->ir_current_.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (-1);
+              bases[i] = CORBA::InterfaceDef::_narrow (this->ir_current_.in ());
             }
           else
             {
-              bases[i] = CORBA::InterfaceDef::_narrow (result.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (-1);
+              bases[i] = CORBA::InterfaceDef::_narrow (result.in ());
             }
 
           if (CORBA::is_nil (bases[i]))
@@ -2946,7 +2595,6 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                                node->local_name ()->get_string (),
                                node->version (),
                                bases
-                               ACE_ENV_ARG_PARAMETER
                              );
         }
       else if (node->is_abstract ())
@@ -2957,7 +2605,6 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                                node->local_name ()->get_string (),
                                node->version (),
                                abs_bases
-                               ACE_ENV_ARG_PARAMETER
                              );
         }
       else
@@ -2968,19 +2615,15 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                                node->local_name ()->get_string (),
                                node->version (),
                                bases
-                               ACE_ENV_ARG_PARAMETER
                              );
         }
 
-      ACE_CHECK_RETURN (-1);
 
       node->ifr_added (1);
 
       // Push the new IR object onto the scope stack.
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (new_def.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CORBA::Container::_narrow (new_def.in ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -3047,8 +2690,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
 }
 
 int
-ifr_adding_visitor::create_value_def (AST_ValueType *node
-                                      ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_value_def (AST_ValueType *node)
 {
   CORBA::Container_ptr current_scope =
     CORBA::Container::_nil ();
@@ -3057,27 +2699,19 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
     {
       CORBA::ValueDef_var base_value;
       this->fill_base_value (base_value.out (),
-                             node
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                             node);
 
       CORBA::ValueDefSeq abstract_base_values;
       this->fill_abstract_base_values (abstract_base_values,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                       node);
 
       CORBA::InterfaceDefSeq supported_interfaces;
       this->fill_supported_interfaces (supported_interfaces,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                       node);
 
       CORBA::ExtInitializerSeq initializers;
       this->fill_initializers (initializers,
-                               node
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                               node);
 
       CORBA::ExtValueDef_var new_def =
         current_scope->create_ext_value (
@@ -3091,17 +2725,13 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
                            abstract_base_values,
                            supported_interfaces,
                            initializers
-                           ACE_ENV_ARG_PARAMETER
                          );
-      ACE_CHECK_RETURN (-1);
 
       node->ifr_added (1);
 
       // Push the new IR object onto the scope stack.
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (new_def.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CORBA::Container::_narrow (new_def.in ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -3168,8 +2798,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node
 }
 
 int
-ifr_adding_visitor::create_component_def (AST_Component *node
-                                          ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_component_def (AST_Component *node)
 {
   CORBA::Container_ptr current_scope =
     CORBA::Container::_nil ();
@@ -3178,29 +2807,21 @@ ifr_adding_visitor::create_component_def (AST_Component *node
     {
       CORBA::ComponentIR::ComponentDef_var base_component;
       this->fill_base_component (base_component.out (),
-                                 node
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                 node);
 
       CORBA::InterfaceDefSeq supported_interfaces;
       this->fill_supported_interfaces (supported_interfaces,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                       node);
 
       CORBA::ComponentIR::Container_var ccm_scope =
-        CORBA::ComponentIR::Container::_narrow (current_scope
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CORBA::ComponentIR::Container::_narrow (current_scope);
 
       CORBA::ComponentIR::ComponentDef_var new_def =
         ccm_scope->create_component (node->repoID (),
                                      node->local_name ()->get_string (),
                                      node->version (),
                                      base_component.in (),
-                                     supported_interfaces
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                     supported_interfaces);
 
       node->ifr_added (1);
 
@@ -3230,29 +2851,19 @@ ifr_adding_visitor::create_component_def (AST_Component *node
         }
 
       this->visit_all_provides (node,
-                                new_def.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                new_def.in ());
 
       this->visit_all_uses (node,
-                            new_def.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                            new_def.in ());
 
       this->visit_all_emits (node,
-                             new_def.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                             new_def.in ());
 
       this->visit_all_publishes (node,
-                                 new_def.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                 new_def.in ());
 
       this->visit_all_consumes (node,
-                                new_def.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                new_def.in ());
 
       // This spot in the AST doesn't necessarily have to be the
       // interface definition - it could be any reference to it.
@@ -3294,8 +2905,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node
 }
 
 int
-ifr_adding_visitor::create_home_def (AST_Home *node
-                                     ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_home_def (AST_Home *node)
 {
   CORBA::Container_ptr current_scope =
     CORBA::Container::_nil ();
@@ -3304,32 +2914,22 @@ ifr_adding_visitor::create_home_def (AST_Home *node
     {
       CORBA::ComponentIR::HomeDef_var base_home;
       this->fill_base_home (base_home.out (),
-                            node
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                            node);
 
       CORBA::ComponentIR::ComponentDef_var managed_component;
       this->fill_managed_component (managed_component.out (),
-                                    node
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                    node);
 
       CORBA::InterfaceDefSeq supported_interfaces;
       this->fill_supported_interfaces (supported_interfaces,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                       node);
 
       CORBA::ValueDef_var primary_key;
       this->fill_primary_key (primary_key.out (),
-                              node
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                              node);
 
       CORBA::ComponentIR::Container_var ccm_scope =
-        CORBA::ComponentIR::Container::_narrow (current_scope
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CORBA::ComponentIR::Container::_narrow (current_scope);
 
       CORBA::ComponentIR::HomeDef_var new_def =
         ccm_scope->create_home (node->repoID (),
@@ -3338,17 +2938,13 @@ ifr_adding_visitor::create_home_def (AST_Home *node
                                 base_home.in (),
                                 managed_component.in (),
                                 supported_interfaces,
-                                primary_key.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                primary_key.in ());
 
       node->ifr_added (1);
 
       // Push the new IR object onto the scope stack.
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (new_def.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CORBA::Container::_narrow (new_def.in ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -3378,14 +2974,10 @@ ifr_adding_visitor::create_home_def (AST_Home *node
       // Get the contents of these lists into the repository.
 
       this->visit_all_factories (node,
-                                 new_def.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                 new_def.in ());
 
       this->visit_all_finders (node,
-                               new_def.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                               new_def.in ());
 
       // This spot in the AST doesn't necessarily have to be the
       // interface definition - it could be any reference to it.
@@ -3427,8 +3019,7 @@ ifr_adding_visitor::create_home_def (AST_Home *node
 }
 
 int
-ifr_adding_visitor::create_event_def (AST_EventType *node
-                                      ACE_ENV_ARG_DECL)
+ifr_adding_visitor::create_event_def (AST_EventType *node)
 {
   CORBA::Container_ptr current_scope =
     CORBA::Container::_nil ();
@@ -3437,32 +3028,22 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
     {
       CORBA::ValueDef_var base_value;
       this->fill_base_value (base_value.out (),
-                             node
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                             node);
 
       CORBA::ValueDefSeq abstract_base_values;
       this->fill_abstract_base_values (abstract_base_values,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                       node);
 
       CORBA::InterfaceDefSeq supported_interfaces;
       this->fill_supported_interfaces (supported_interfaces,
-                                       node
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                       node);
 
       CORBA::ExtInitializerSeq initializers;
       this->fill_initializers (initializers,
-                               node
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                               node);
 
       CORBA::ComponentIR::Container_var ccm_scope =
-        CORBA::ComponentIR::Container::_narrow (current_scope
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CORBA::ComponentIR::Container::_narrow (current_scope);
 
       CORBA::ExtValueDef_var new_def =
         ccm_scope->create_event (
@@ -3476,17 +3057,13 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
                        abstract_base_values,
                        supported_interfaces,
                        initializers
-                       ACE_ENV_ARG_PARAMETER
                      );
-      ACE_CHECK_RETURN (-1);
 
       node->ifr_added (1);
 
       // Push the new IR object onto the scope stack.
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (new_def.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CORBA::Container::_narrow (new_def.in ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -3555,7 +3132,7 @@ ifr_adding_visitor::create_event_def (AST_EventType *node
 int
 ifr_adding_visitor::create_value_member (AST_Field *node)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       AST_Type *bt = node->field_type ();
       AST_Decl::NodeType nt = bt->node_type ();
@@ -3585,14 +3162,10 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
         {
           // If the IDL is legal, this will succeed.
           CORBA::Contained_var holder =
-                be_global->repository ()->lookup_id (bt->repoID ()
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                be_global->repository ()->lookup_id (bt->repoID ());
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (holder.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            CORBA::IDLType::_narrow (holder.in ());
         }
 
       CORBA::Visibility vis = CORBA::PUBLIC_MEMBER;
@@ -3627,37 +3200,29 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
             -1
           );
         }
-      ACE_TRY_CHECK;
 
       CORBA::ValueDef_var vt =
-        CORBA::ValueDef::_narrow (current_scope
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ValueDef::_narrow (current_scope);
 
       CORBA::ValueMemberDef_var vm =
         vt->create_value_member (node->repoID (),
                                  node->local_name ()->get_string (),
                                  node->version (),
                                  this->ir_current_.in (),
-                                 vis
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 vis);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("create_value_member"));
+      ex._tao_print_exception (ACE_TEXT ("create_value_member"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-ifr_adding_visitor::get_referenced_type (AST_Type *node
-                                         ACE_ENV_ARG_DECL)
+ifr_adding_visitor::get_referenced_type (AST_Type *node)
 {
   switch (node->node_type ())
   {
@@ -3685,14 +3250,10 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node
     default:
       {
         CORBA::Contained_var prev_def =
-          be_global->repository ()->lookup_id (node->repoID ()
-                                               ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          be_global->repository ()->lookup_id (node->repoID ());
 
         this->ir_current_ =
-          CORBA::IDLType::_narrow (prev_def.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          CORBA::IDLType::_narrow (prev_def.in ());
         break;
       }
   }
@@ -3700,8 +3261,7 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node
 
 void
 ifr_adding_visitor::fill_base_value (CORBA::ValueDef_ptr &result,
-                                     AST_ValueType *node
-                                     ACE_ENV_ARG_DECL)
+                                     AST_ValueType *node)
 {
   result = CORBA::ValueDef::_nil ();
   AST_ValueType *base_value = node->inherits_concrete ();
@@ -3714,15 +3274,12 @@ ifr_adding_visitor::fill_base_value (CORBA::ValueDef_ptr &result,
   CORBA::Contained_var holder =
     be_global->repository ()->lookup_id (
                                   base_value->repoID ()
-                                  ACE_ENV_ARG_PARAMETER
                                 );
-  ACE_CHECK;
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ValueDef::_narrow (holder.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::ValueDef::_narrow (holder.in ());
     }
 }
 
@@ -3730,7 +3287,6 @@ void
 ifr_adding_visitor::fill_base_component (
     CORBA::ComponentIR::ComponentDef_ptr &result,
     AST_Component *node
-    ACE_ENV_ARG_DECL
   )
 {
   result = CORBA::ComponentIR::ComponentDef::_nil ();
@@ -3744,22 +3300,18 @@ ifr_adding_visitor::fill_base_component (
   CORBA::Contained_var holder =
     be_global->repository ()->lookup_id (
                                   base_component->repoID ()
-                                  ACE_ENV_ARG_PARAMETER
                                 );
-  ACE_CHECK;
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ComponentIR::ComponentDef::_narrow (holder.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::ComponentDef::_narrow (holder.in ());
     }
 }
 
 void
 ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result,
-                                    AST_Home *node
-                                    ACE_ENV_ARG_DECL)
+                                    AST_Home *node)
 {
   result = CORBA::ComponentIR::HomeDef::_nil ();
   AST_Home *base_home = node->base_home ();
@@ -3772,15 +3324,12 @@ ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result,
   CORBA::Contained_var holder =
     be_global->repository ()->lookup_id (
                                   base_home->repoID ()
-                                  ACE_ENV_ARG_PARAMETER
                                 );
-  ACE_CHECK;
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ComponentIR::HomeDef::_narrow (holder.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::HomeDef::_narrow (holder.in ());
     }
   else
     {
@@ -3788,8 +3337,7 @@ ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result,
       /// the repository and go again.
       (void) base_home->ast_accept (this);
       this->fill_base_home (result,
-                            node
-                            ACE_ENV_ARG_PARAMETER);
+                            node);
     }
 }
 
@@ -3797,7 +3345,6 @@ void
 ifr_adding_visitor::fill_managed_component (
     CORBA::ComponentIR::ComponentDef_ptr &result,
     AST_Home *node
-    ACE_ENV_ARG_DECL
   )
 {
   result = CORBA::ComponentIR::ComponentDef::_nil ();
@@ -3809,15 +3356,12 @@ ifr_adding_visitor::fill_managed_component (
     }
 
   CORBA::Contained_var holder =
-    be_global->repository ()->lookup_id (managed_component->repoID ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    be_global->repository ()->lookup_id (managed_component->repoID ());
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ComponentIR::ComponentDef::_narrow (holder.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+        CORBA::ComponentIR::ComponentDef::_narrow (holder.in ());
     }
   else
     {
@@ -3825,15 +3369,13 @@ ifr_adding_visitor::fill_managed_component (
       /// the repository and go again.
       (void) managed_component->ast_accept (this);
       this->fill_managed_component (result,
-                                    node
-                                    ACE_ENV_ARG_PARAMETER);
+                                    node);
     }
 }
 
 void
 ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result,
-                                      AST_Home *node
-                                      ACE_ENV_ARG_DECL)
+                                      AST_Home *node)
 {
   result = CORBA::ValueDef::_nil ();
   AST_ValueType *primary_key = node->primary_key ();
@@ -3844,15 +3386,12 @@ ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result,
     }
 
   CORBA::Contained_var holder =
-    be_global->repository ()->lookup_id (primary_key->repoID ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    be_global->repository ()->lookup_id (primary_key->repoID ());
 
   if (!CORBA::is_nil (holder.in ()))
     {
       result =
-        CORBA::ValueDef::_narrow (holder.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+        CORBA::ValueDef::_narrow (holder.in ());
     }
   else
     {
@@ -3860,15 +3399,13 @@ ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result,
       /// the repository and go again.
       (void) primary_key->ast_accept (this);
       this->fill_primary_key (result,
-                              node
-                              ACE_ENV_ARG_PARAMETER);
+                              node);
     }
 }
 
 void
 ifr_adding_visitor::fill_abstract_base_values (CORBA::ValueDefSeq &result,
-                                               AST_ValueType *node
-                                               ACE_ENV_ARG_DECL)
+                                               AST_ValueType *node)
 {
   CORBA::Long s_length = node->n_inherits ();
   result.length (0);
@@ -3894,29 +3431,24 @@ ifr_adding_visitor::fill_abstract_base_values (CORBA::ValueDefSeq &result,
           (void) list[i]->ast_accept (this);
 
           result[first_abs ? i : i - 1] =
-            CORBA::ValueDef::_narrow (this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+            CORBA::ValueDef::_narrow (this->ir_current_.in ());
         }
     }
 }
 
 void
 ifr_adding_visitor::fill_inherited_interfaces (CORBA::InterfaceDefSeq &result,
-                                               AST_Interface *node
-                                               ACE_ENV_ARG_DECL)
+                                               AST_Interface *node)
 {
   result.length (0);
   this->fill_interfaces (result,
                          node->inherits (),
-                         node->n_inherits ()
-                         ACE_ENV_ARG_PARAMETER);
+                         node->n_inherits ());
 }
 
 void
 ifr_adding_visitor::fill_supported_interfaces (CORBA::InterfaceDefSeq &result,
-                                               AST_Interface *node
-                                               ACE_ENV_ARG_DECL)
+                                               AST_Interface *node)
 {
   result.length (0);
   CORBA::Long s_length = 0;
@@ -3952,15 +3484,13 @@ ifr_adding_visitor::fill_supported_interfaces (CORBA::InterfaceDefSeq &result,
 
   this->fill_interfaces (result,
                          list,
-                         s_length
-                         ACE_ENV_ARG_PARAMETER);
+                         s_length);
 }
 
 void
 ifr_adding_visitor::fill_interfaces (CORBA::InterfaceDefSeq &result,
                                      AST_Interface **list,
-                                     CORBA::Long length
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Long length)
 {
   // Not sure if this could be negative in some default case or
   // not. If it's 0, we should make the call anyway to clear
@@ -3976,17 +3506,14 @@ ifr_adding_visitor::fill_interfaces (CORBA::InterfaceDefSeq &result,
           (void) list[i]->ast_accept (this);
 
           result[i] =
-            CORBA::InterfaceDef::_narrow (this->ir_current_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+            CORBA::InterfaceDef::_narrow (this->ir_current_.in ());
         }
     }
 }
 
 void
 ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
-                                       AST_ValueType *node
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       AST_ValueType *node)
 {
   result.length (0);
   AST_Decl *item = 0;
@@ -4078,28 +3605,23 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result,
 
 void
 ifr_adding_visitor::fill_get_exceptions (CORBA::ExceptionDefSeq &result,
-                                         AST_Attribute *node
-                                         ACE_ENV_ARG_DECL)
+                                         AST_Attribute *node)
 {
   this->fill_exceptions (result,
-                         node->get_get_exceptions ()
-                         ACE_ENV_ARG_PARAMETER);
+                         node->get_get_exceptions ());
 }
 
 void
 ifr_adding_visitor::fill_set_exceptions (CORBA::ExceptionDefSeq &result,
-                                         AST_Attribute *node
-                                         ACE_ENV_ARG_DECL)
+                                         AST_Attribute *node)
 {
   this->fill_exceptions (result,
-                         node->get_set_exceptions ()
-                         ACE_ENV_ARG_PARAMETER);
+                         node->get_set_exceptions ());
 }
 
 void
 ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
-                                     AST_Decl *node
-                                     ACE_ENV_ARG_DECL)
+                                     AST_Decl *node)
 {
   switch (node->node_type ())
     {
@@ -4107,16 +3629,14 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
         {
           AST_Operation *op = AST_Operation::narrow_from_decl (node);
           this->fill_exceptions (result,
-                                 op->exceptions ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 op->exceptions ());
           return;
         }
       case AST_Decl::NT_factory:
         {
           AST_Factory *f = AST_Factory::narrow_from_decl (node);
           this->fill_exceptions (result,
-                                 f->exceptions ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                 f->exceptions ());
           return;
         }
       default:
@@ -4127,8 +3647,7 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
 
 void
 ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
-                                     UTL_ExceptList *list
-                                     ACE_ENV_ARG_DECL)
+                                     UTL_ExceptList *list)
 {
   if (list == 0)
     {
@@ -4152,21 +3671,16 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
       // inherit from IDLType.
       (void) d->ast_accept (this);
 
-      holder = be_global->repository ()->lookup_id (d->repoID ()
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      holder = be_global->repository ()->lookup_id (d->repoID ());
 
       result[index] =
-        CORBA::ExceptionDef::_narrow (holder.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        CORBA::ExceptionDef::_narrow (holder.in ());
     }
 }
 
 void
 ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
-                                 AST_Operation *node
-                                 ACE_ENV_ARG_DECL)
+                                 AST_Operation *node)
 {
   AST_Argument *arg = 0;
   CORBA::ULong n_args = static_cast<CORBA::ULong> (node->argument_count ());
@@ -4189,7 +3703,6 @@ ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
 
       result[index].type_def =
         CORBA::IDLType::_duplicate (this->ir_current_.in ());
-      ACE_CHECK;
 
       result[index].mode = CORBA::PARAM_IN;
     }
@@ -4197,8 +3710,7 @@ ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
 
 void
 ifr_adding_visitor::visit_all_provides (AST_Component *node,
-                                        CORBA::ComponentIR::ComponentDef_ptr c
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4213,13 +3725,9 @@ ifr_adding_visitor::visit_all_provides (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
-      interface_type = CORBA::InterfaceDef::_narrow (contained.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      interface_type = CORBA::InterfaceDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4227,16 +3735,13 @@ ifr_adding_visitor::visit_all_provides (AST_Component *node,
       new_def = c->create_provides (str.fast_rep (),
                                     local_name,
                                     tmp->impl->version (),
-                                    interface_type.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    interface_type.in ());
     }
 }
 
 void
 ifr_adding_visitor::visit_all_uses (AST_Component *node,
-                                    CORBA::ComponentIR::ComponentDef_ptr c
-                                    ACE_ENV_ARG_DECL)
+                                    CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4251,13 +3756,9 @@ ifr_adding_visitor::visit_all_uses (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
-      interface_type = CORBA::InterfaceDef::_narrow (contained.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      interface_type = CORBA::InterfaceDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4266,16 +3767,13 @@ ifr_adding_visitor::visit_all_uses (AST_Component *node,
                                 local_name,
                                 tmp->impl->version (),
                                 interface_type.in (),
-                                static_cast<CORBA::Boolean> (tmp->is_multiple)
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                static_cast<CORBA::Boolean> (tmp->is_multiple));
     }
 }
 
 void
 ifr_adding_visitor::visit_all_emits (AST_Component *node,
-                                     CORBA::ComponentIR::ComponentDef_ptr c
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4290,14 +3788,10 @@ ifr_adding_visitor::visit_all_emits (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
       event_type =
-        CORBA::ComponentIR::EventDef::_narrow (contained.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        CORBA::ComponentIR::EventDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4305,16 +3799,13 @@ ifr_adding_visitor::visit_all_emits (AST_Component *node,
       new_def = c->create_emits (str.fast_rep (),
                                  local_name,
                                  tmp->impl->version (),
-                                 event_type.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 event_type.in ());
     }
 }
 
 void
 ifr_adding_visitor::visit_all_publishes (AST_Component *node,
-                                         CORBA::ComponentIR::ComponentDef_ptr c
-                                         ACE_ENV_ARG_DECL)
+                                         CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4329,14 +3820,10 @@ ifr_adding_visitor::visit_all_publishes (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
       event_type =
-        CORBA::ComponentIR::EventDef::_narrow (contained.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        CORBA::ComponentIR::EventDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4344,16 +3831,13 @@ ifr_adding_visitor::visit_all_publishes (AST_Component *node,
       new_def = c->create_publishes (str.fast_rep (),
                                      local_name,
                                      tmp->impl->version (),
-                                     event_type.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     event_type.in ());
     }
 }
 
 void
 ifr_adding_visitor::visit_all_consumes (AST_Component *node,
-                                        CORBA::ComponentIR::ComponentDef_ptr c
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::ComponentIR::ComponentDef_ptr c)
 {
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
@@ -4368,14 +3852,10 @@ ifr_adding_visitor::visit_all_consumes (AST_Component *node,
        i.advance ())
     {
       i.next (tmp);
-      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      contained = be_global->repository ()->lookup_id (tmp->impl->repoID ());
 
       event_type =
-        CORBA::ComponentIR::EventDef::_narrow (contained.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        CORBA::ComponentIR::EventDef::_narrow (contained.in ());
 
       ACE_CString str (node->repoID ());
       local_name = tmp->id->get_string ();
@@ -4383,16 +3863,13 @@ ifr_adding_visitor::visit_all_consumes (AST_Component *node,
       new_def = c->create_consumes (str.fast_rep (),
                                     local_name,
                                     tmp->impl->version (),
-                                    event_type.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    event_type.in ());
     }
 }
 
 void
 ifr_adding_visitor::visit_all_factories (AST_Home *node,
-                                         CORBA::ComponentIR::HomeDef_ptr h
-                                         ACE_ENV_ARG_DECL)
+                                         CORBA::ComponentIR::HomeDef_ptr h)
 {
   AST_Operation **tmp = 0;
   CORBA::Contained_var contained;
@@ -4405,30 +3882,23 @@ ifr_adding_visitor::visit_all_factories (AST_Home *node,
       i.next (tmp);
       CORBA::ParDescriptionSeq params;
       this->fill_params (params,
-                         *tmp
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                         *tmp);
 
       CORBA::ExceptionDefSeq exceptions;
       this->fill_exceptions (exceptions,
-                             *tmp
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             *tmp);
 
       new_def = h->create_factory ((*tmp)->repoID (),
                                    (*tmp)->local_name ()->get_string (),
                                    (*tmp)->version (),
                                    params,
-                                   exceptions
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   exceptions);
     }
 }
 
 void
 ifr_adding_visitor::visit_all_finders (AST_Home *node,
-                                       CORBA::ComponentIR::HomeDef_ptr h
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ComponentIR::HomeDef_ptr h)
 {
   AST_Operation **tmp = 0;
   CORBA::Contained_var contained;
@@ -4441,23 +3911,17 @@ ifr_adding_visitor::visit_all_finders (AST_Home *node,
       i.next (tmp);
       CORBA::ParDescriptionSeq params;
       this->fill_params (params,
-                         *tmp
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                         *tmp);
 
       CORBA::ExceptionDefSeq exceptions;
       this->fill_exceptions (exceptions,
-                             *tmp
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             *tmp);
 
       new_def = h->create_finder ((*tmp)->repoID (),
                                   (*tmp)->local_name ()->get_string (),
                                   (*tmp)->version (),
                                   params,
-                                  exceptions
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                  exceptions);
     }
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
index 839373308e1..73c7257ced6 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -140,127 +140,98 @@ protected:
                  CORBA::Any &any);
   // Determine the primitive type and insert into the Any.
 
-  void element_type (AST_Type *base_type
-                     ACE_ENV_ARG_DECL);
+  void element_type (AST_Type *base_type);
   // Creates or looks up the element type of an array or sequence,
   // and stores the result in ir_current_.
 
-  int create_interface_def (AST_Interface *node
-                            ACE_ENV_ARG_DECL);
+  int create_interface_def (AST_Interface *node);
   // Code encapsulated out of visit_interface().
 
-  int create_value_def (AST_ValueType *node
-                        ACE_ENV_ARG_DECL);
+  int create_value_def (AST_ValueType *node);
   // Code encapsulated out of visit_valuetype().
 
-  int create_component_def (AST_Component *node
-                            ACE_ENV_ARG_DECL);
+  int create_component_def (AST_Component *node);
   // Code encapsulated out of visit_component().
 
-  int create_home_def (AST_Home *node
-                       ACE_ENV_ARG_DECL);
+  int create_home_def (AST_Home *node);
   // Code encapsulated out of visit_home().
 
-  int create_event_def (AST_EventType *node
-                        ACE_ENV_ARG_DECL);
+  int create_event_def (AST_EventType *node);
   // Code encapsulated out of visit_eventtype().
 
   int create_value_member (AST_Field *node);
   // Conditional call from visit_field().
 
-  void get_referenced_type (AST_Type *node
-                            ACE_ENV_ARG_DECL);
+  void get_referenced_type (AST_Type *node);
   // Utility method to update ir_current_ for struct members, union
   // members, operation parameters and operation return types.
 
   void fill_base_value (CORBA::ValueDef_ptr &result,
-                        AST_ValueType *node
-                        ACE_ENV_ARG_DECL);
+                        AST_ValueType *node);
 
   void fill_base_component (CORBA::ComponentIR::ComponentDef_ptr &result,
-                            AST_Component *node
-                            ACE_ENV_ARG_DECL);
+                            AST_Component *node);
 
   void fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result,
-                       AST_Home *node
-                       ACE_ENV_ARG_DECL);
+                       AST_Home *node);
 
   void fill_managed_component (CORBA::ComponentIR::ComponentDef_ptr &result,
-                               AST_Home *node
-                               ACE_ENV_ARG_DECL);
+                               AST_Home *node);
 
   void fill_primary_key (CORBA::ValueDef_ptr &result,
-                         AST_Home *node
-                         ACE_ENV_ARG_DECL);
+                         AST_Home *node);
 
   void fill_abstract_base_values (CORBA::ValueDefSeq &result,
-                                  AST_ValueType *node
-                                  ACE_ENV_ARG_DECL);
+                                  AST_ValueType *node);
 
   void fill_inherited_interfaces (CORBA::InterfaceDefSeq &result,
-                                  AST_Interface *node
-                                  ACE_ENV_ARG_DECL);
+                                  AST_Interface *node);
 
   void fill_supported_interfaces (CORBA::InterfaceDefSeq &result,
-                                  AST_Interface *node
-                                  ACE_ENV_ARG_DECL);
+                                  AST_Interface *node);
 
   void fill_interfaces (CORBA::InterfaceDefSeq &result,
                         AST_Interface **list,
-                        CORBA::Long length
-                        ACE_ENV_ARG_DECL);
+                        CORBA::Long length);
 
   void fill_initializers (CORBA::ExtInitializerSeq &result,
-                          AST_ValueType *node
-                          ACE_ENV_ARG_DECL);
+                          AST_ValueType *node);
 
   void fill_get_exceptions (CORBA::ExceptionDefSeq &result,
-                            AST_Attribute *node
-                            ACE_ENV_ARG_DECL);
+                            AST_Attribute *node);
 
   void fill_set_exceptions (CORBA::ExceptionDefSeq &result,
-                            AST_Attribute *node
-                            ACE_ENV_ARG_DECL);
+                            AST_Attribute *node);
 
   void fill_exceptions (CORBA::ExceptionDefSeq &result,
-                        AST_Decl *node
-                        ACE_ENV_ARG_DECL);
+                        AST_Decl *node);
 
   void fill_exceptions (CORBA::ExceptionDefSeq &result,
-                        UTL_ExceptList *list
-                        ACE_ENV_ARG_DECL);
+                        UTL_ExceptList *list);
 
   void fill_params (CORBA::ParDescriptionSeq &result,
-                    AST_Operation *node
-                    ACE_ENV_ARG_DECL);
+                    AST_Operation *node);
 
   void visit_all_provides (AST_Component *node,
-                           CORBA::ComponentIR::ComponentDef_ptr c
-                           ACE_ENV_ARG_DECL);
+                           CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_uses (AST_Component *node,
-                       CORBA::ComponentIR::ComponentDef_ptr c
-                       ACE_ENV_ARG_DECL);
+                       CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_emits (AST_Component *node,
-                        CORBA::ComponentIR::ComponentDef_ptr c
-                        ACE_ENV_ARG_DECL);
+                        CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_publishes (AST_Component *node,
-                            CORBA::ComponentIR::ComponentDef_ptr c
-                            ACE_ENV_ARG_DECL);
+                            CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_consumes (AST_Component *node,
-                           CORBA::ComponentIR::ComponentDef_ptr c
-                           ACE_ENV_ARG_DECL);
+                           CORBA::ComponentIR::ComponentDef_ptr c);
 
   void visit_all_factories (AST_Home *node,
-                            CORBA::ComponentIR::HomeDef_ptr h
-                            ACE_ENV_ARG_DECL);
+                            CORBA::ComponentIR::HomeDef_ptr h);
 
   void visit_all_finders (AST_Home *node,
-                          CORBA::ComponentIR::HomeDef_ptr h
-                          ACE_ENV_ARG_DECL);
+                          CORBA::ComponentIR::HomeDef_ptr h);
 
   void expand_id (ACE_CString &str,
                   const char *local_name);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index d22c22c825b..2e3ae1ea413 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -48,8 +48,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 
   AST_Field **f = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Visit each field.
       for (CORBA::ULong i = 0; i < nfields; ++i)
@@ -89,8 +88,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->get_referenced_type (ft);
             }
 
           this->members_[i].name =
@@ -105,16 +103,14 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
             CORBA::IDLType::_duplicate (this->ir_current_.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_scope")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_scope"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -122,14 +118,11 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this union already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -146,9 +139,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
                 CORBA::IDLType::_duplicate (visitor.ir_current ());
 
               CORBA::Contained_ptr tmp =
-                CORBA::Contained::_narrow (visitor.ir_current ()
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::Contained::_narrow (visitor.ir_current ());
 
               // Since the enclosing ExceptionDef hasn't been created
               // yet, we don't have a scope, so this nested StructDef
@@ -167,29 +158,24 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_structure (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_exception::visit_structure")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_exception::visit_structure"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -197,13 +183,10 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (!CORBA::is_nil (prev_def.in ()))
         {
@@ -222,8 +205,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will create a new ExceptionDef entry.
               return this->visit_exception (node);
@@ -266,10 +248,8 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
         current_scope->create_exception (node->repoID (),
                                          node->local_name ()->get_string (),
                                          node->version (),
-                                         this->members_
-                                         ACE_ENV_ARG_PARAMETER);
+                                         this->members_);
 
-      ACE_TRY_CHECK;
 
       size_t size = this->move_queue_.size ();
 
@@ -278,42 +258,34 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           CORBA::Contained_var traveller;
 
           CORBA::Container_var new_container =
-            CORBA::Container::_narrow (new_def.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::Container::_narrow (new_def.in ());
 
           for (size_t i = 0; i < size; ++i)
             {
               this->move_queue_.dequeue_head (traveller);
 
               CORBA::String_var name =
-                traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                traveller->name ();
 
               CORBA::String_var version =
-                traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                traveller->version ();
 
               traveller->move (new_container.in (),
                                name.in (),
-                               version.in ()
-                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                               version.in ());
             }
         }
 
       node->ifr_added (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_exception::visit_exception")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_exception::visit_exception"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -321,14 +293,11 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 int
 ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this enum already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -357,14 +326,10 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
                                           node->local_name ()->get_string (),
                                           node->version (),
                                           members
-                                          ACE_ENV_ARG_PARAMETER
                                         );
-          ACE_TRY_CHECK;
 
           CORBA::Contained_ptr tmp =
-            CORBA::Contained::_narrow (this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::Contained::_narrow (this->ir_current_.in ());
 
           this->move_queue_.enqueue_tail (tmp);
 
@@ -378,29 +343,24 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_enum (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_exception::visit_enum")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_exception::visit_enum"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -408,14 +368,11 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_exception::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this union already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -432,9 +389,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
                 CORBA::IDLType::_duplicate (visitor.ir_current ());
 
               CORBA::Contained_ptr tmp =
-                CORBA::Contained::_narrow (visitor.ir_current ()
-                                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::Contained::_narrow (visitor.ir_current ());
 
               // Since the enclosing ExceptionDef hasn't been created
               // yet, we don't have a scope, so this nested UnionDef
@@ -453,29 +408,24 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_union (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_exception::visit_union")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_exception::visit_union"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index 63ff0eaefbf..65ea38e73fa 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -30,8 +30,7 @@ ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void)
 int
 ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If this operation is already in the repository (for example, if
       // we are processing the IDL file a second time inadvertently), we
@@ -39,9 +38,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       // compiler front end would have told us.
 
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (!CORBA::is_nil (prev_def.in ()))
         {
@@ -96,14 +93,10 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
           ex = ex_iter.item ();
 
           prev_def =
-            be_global->repository ()->lookup_id (ex->repoID ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          exceptions[i] = 
-            CORBA::ExceptionDef::_narrow (prev_def.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            be_global->repository ()->lookup_id (ex->repoID ());
+
+          exceptions[i] =
+            CORBA::ExceptionDef::_narrow (prev_def.in ());
         }
 
       // Build the context list.
@@ -140,9 +133,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       AST_Type *return_type = node->return_type ();
 
       // Updates ir_current_.
-      this->get_referenced_type (return_type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->get_referenced_type (return_type);
 
       // Is the operation oneway?
       CORBA::OperationMode mode = node->flags () == AST_Operation::OP_oneway
@@ -162,9 +153,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
           if (nt == AST_Decl::NT_interface)
             {
               CORBA::InterfaceDef_var iface =
-                CORBA::InterfaceDef::_narrow (current_scope
-                                              ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::InterfaceDef::_narrow (current_scope);
 
               CORBA::OperationDef_var new_def =
                 iface->create_operation (node->repoID (),
@@ -174,16 +163,12 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
                                          mode,
                                          this->params_,
                                          exceptions,
-                                         contexts
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                         contexts);
             }
           else
             {
               CORBA::ValueDef_var vtype =
-                CORBA::ValueDef::_narrow (current_scope
-                                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::ValueDef::_narrow (current_scope);
 
               CORBA::OperationDef_var new_def =
                 vtype->create_operation (node->repoID (),
@@ -193,9 +178,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
                                          mode,
                                          this->params_,
                                          exceptions,
-                                         contexts
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                         contexts);
             }
         }
       else
@@ -210,16 +193,14 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_operation::visit_operation")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_operation::visit_operation"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -233,13 +214,10 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
 
   AST_Type *arg_type = node->field_type ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Updates ir_current_.
-      this->get_referenced_type (arg_type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->get_referenced_type (arg_type);
 
       this->params_[this->index_].type_def =
         CORBA::IDLType::_duplicate (this->ir_current_.in ());
@@ -265,16 +243,14 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
 
       ++this->index_;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_operation::visit_argument")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_operation::visit_argument"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 6e3f4a4bbe5..bfc8b72d17c 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -43,8 +43,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
   this->members_.length (nfields);
   AST_Field **f = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Visit each field.
       for (CORBA::ULong i = 0; i < nfields; ++i)
@@ -91,9 +90,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                     CORBA::IDLType::_duplicate (visitor.ir_current ());
 
                   CORBA::Contained_ptr tmp =
-                    CORBA::Contained::_narrow (visitor.ir_current ()
-                                               ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    CORBA::Contained::_narrow (visitor.ir_current ());
 
                   this->move_queue_.enqueue_tail (tmp);
                 }
@@ -115,9 +112,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->get_referenced_type (ft);
             }
 
           this->members_[i].name =
@@ -132,16 +127,14 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
             CORBA::IDLType::_duplicate (this->ir_current_.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_scope")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_scope"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -149,13 +142,10 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -187,9 +177,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
                 node->local_name ()->get_string (),
                 node->version (),
                 dummyMembers
-                ACE_ENV_ARG_PARAMETER
               );
-          ACE_TRY_CHECK;
 
           // Then recurse into the real structure members (which corrupts ir_current_)
           if (this->visit_scope (node) == -1)
@@ -208,7 +196,6 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           this->ir_current_= CORBA::StructDef::_duplicate (struct_def.in ());
           struct_def->members( this->members_ );
 
-          ACE_TRY_CHECK;
 
           size_t size = this->move_queue_.size ();
 
@@ -217,27 +204,21 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
               CORBA::Contained_var traveller;
 
               CORBA::Container_var new_container =
-                CORBA::Container::_narrow (this->ir_current_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::Container::_narrow (this->ir_current_.in ());
 
               for (size_t i = 0; i < size; ++i)
                 {
                   this->move_queue_.dequeue_head (traveller);
-                  
+
                   CORBA::String_var name =
-                    traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    traveller->name ();
 
                   CORBA::String_var version =
-                    traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    traveller->version ();
 
                   traveller->move (new_container.in (),
                                    name.in (),
-                                   version.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                   version.in ());
                 }
             }
 
@@ -251,29 +232,24 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_structure (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_structure")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_structure"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -281,14 +257,11 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this enum already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -317,14 +290,10 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
                                           node->local_name ()->get_string (),
                                           node->version (),
                                           members
-                                          ACE_ENV_ARG_PARAMETER
                                         );
-          ACE_TRY_CHECK;
 
           CORBA::Contained_ptr tmp =
-            CORBA::Contained::_narrow (this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::Contained::_narrow (this->ir_current_.in ());
 
           // Since the enclosing StructDef hasn't been created
           // yet, we don't have a scope, so this nested EnumDef
@@ -342,29 +311,24 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_enum (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_enum")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_enum"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -372,14 +336,11 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_structure::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this union already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -396,9 +357,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
                 CORBA::IDLType::_duplicate (visitor.ir_current ());
 
               CORBA::Contained_ptr tmp =
-                CORBA::Contained::_narrow (visitor.ir_current ()
-                                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::Contained::_narrow (visitor.ir_current ());
 
               // Since the enclosing StructDef hasn't been created
               // yet, we don't have a scope, so this nested UnionDef
@@ -417,29 +376,24 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_union (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_structure::visit_union")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_structure::visit_union"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 57e82d66ddb..b8ad1e4dfd3 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -53,8 +53,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
   // Index into members_.
   CORBA::ULong index = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Visit each field.
       for (CORBA::ULong i = 0; i < nfields; ++i)
@@ -103,9 +102,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                     CORBA::IDLType::_duplicate (visitor.ir_current ());
 
                   CORBA::Contained_ptr tmp =
-                    CORBA::Contained::_narrow (visitor.ir_current ()
-                                              ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    CORBA::Contained::_narrow (visitor.ir_current ());
 
                   this->move_queue_.enqueue_tail (tmp);
                 }
@@ -127,9 +124,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->get_referenced_type (ft);
             }
 
           // Get the case label(s).
@@ -200,16 +195,14 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_union::visit_scope")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_union::visit_scope"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -217,14 +210,11 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this struct already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -241,9 +231,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
                 CORBA::IDLType::_duplicate (visitor.ir_current ());
 
               CORBA::Contained_ptr tmp =
-                CORBA::Contained::_narrow (visitor.ir_current ()
-                                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::Contained::_narrow (visitor.ir_current ());
 
               // Since the enclosing UnionDef hasn't been created
               // yet, we don't have a scope, so this nested StructDef
@@ -262,29 +250,24 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_structure (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_union::visit_structure")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_union::visit_structure"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -292,14 +275,11 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Is this enum already in the respository?
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
@@ -326,14 +306,10 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
                                           node->local_name ()->get_string (),
                                           node->version (),
                                           members
-                                          ACE_ENV_ARG_PARAMETER
                                         );
-          ACE_TRY_CHECK;
 
           CORBA::Contained_ptr tmp =
-            CORBA::Contained::_narrow (this->ir_current_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::Contained::_narrow (this->ir_current_.in ());
 
           // Since the enclosing UnionDef hasn't been created
           // yet, we don't have a scope, so this nested EnumDef
@@ -351,29 +327,24 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_enum (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_union::visit_enum")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_union::visit_enum"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -381,13 +352,10 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_union::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        be_global->repository ()->lookup_id (node->repoID ());
 
       if (CORBA::is_nil (prev_def.in ()))
         {
@@ -400,9 +368,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           if (disc_type->node_type () == AST_Decl::NT_enum)
             {
               CORBA::Contained_var disc_def =
-                be_global->repository ()->lookup_id (disc_type->repoID ()
-                                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                be_global->repository ()->lookup_id (disc_type->repoID ());
 
               if (CORBA::is_nil (disc_def.in ()))
                 {
@@ -417,12 +383,9 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                 }
 
               CORBA::IDLType_var idl_def =
-                CORBA::IDLType::_narrow (disc_def.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::IDLType::_narrow (disc_def.in ());
 
-              this->disc_tc_ = idl_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->disc_tc_ = idl_def->type ();
             }
 
           if (this->visit_scope (node) == -1)
@@ -457,7 +420,6 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                     node->version (),
                     this->ir_current_.in (),
                     this->members_
-                    ACE_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -484,11 +446,9 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                                    node->version (),
                                    this->ir_current_.in (),
                                    this->members_
-                                   ACE_ENV_ARG_PARAMETER
                                 );
             }
 
-          ACE_TRY_CHECK;
 
           size_t size = this->move_queue_.size ();
 
@@ -497,26 +457,20 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
               CORBA::Contained_var traveller;
 
               CORBA::Container_var new_container =
-                CORBA::Container::_narrow (this->ir_current_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::Container::_narrow (this->ir_current_.in ());
 
               for (size_t i = 0; i < size; ++i)
                 {
                   this->move_queue_.dequeue_head (traveller);
 
-                  CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  CORBA::String_var name = traveller->name ();
 
                   CORBA::String_var version =
-                    traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    traveller->version ();
 
                   traveller->move (new_container.in (),
                                    name.in (),
-                                   version.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                   version.in ());
                 }
             }
 
@@ -530,29 +484,24 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prev_def->destroy ();
 
               // This call will take the other branch.
               return this->visit_union (node);
             }
 
           this->ir_current_ =
-            CORBA::IDLType::_narrow (prev_def.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::IDLType::_narrow (prev_def.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (
-          ACE_ANY_EXCEPTION,
-          ACE_TEXT ("ifr_adding_visitor_union::visit_union")
-        );
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "ifr_adding_visitor_union::visit_union"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 467dd213950..0a6d92ee0c8 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -29,8 +29,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
 
       AST_Decl *d = 0;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           // Continue until each element is visited.
           while (!si.is_done ())
@@ -56,32 +55,27 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
                 }
 
               CORBA::Contained_var top_level =
-                be_global->repository ()->lookup_id (d->repoID ()
-                                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                be_global->repository ()->lookup_id (d->repoID ());
 
               if (!CORBA::is_nil (top_level.in ()))
                 {
                   // All we have to do is call destroy() on each IR object
                   // in the global scope, because destroy() works on all
                   // the contents recursively.
-                  top_level->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  top_level->destroy ();
                 }
 
               si.next ();
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
-              ACE_TEXT ("ifr_removing_visitor::visit_scope")
-            );
+          ex._tao_print_exception (
+            ACE_TEXT (
+              "ifr_removing_visitor::visit_scope"));
 
           return -1;
         }
-      ACE_ENDTRY;
     }
 
   return 0;
@@ -90,13 +84,10 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
 int
 ifr_removing_visitor::visit_root (AST_Root *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Container_var new_scope =
-        CORBA::Container::_narrow (be_global->repository ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::Container::_narrow (be_global->repository ());
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
         {
@@ -133,14 +124,12 @@ ifr_removing_visitor::visit_root (AST_Root *node)
           );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("visit_root"));
+      ex._tao_print_exception (ACE_TEXT ("visit_root"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h b/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
index 0eae91fc49e..46e38822075 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor_macro.h
@@ -18,7 +18,6 @@
                                 TAO_GUARD_FAILURE, \
                                 0), \
                               CORBA::COMPLETED_NO)); \
-  ACE_TRY_CHECK
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 9f222a54739..67044b8191c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -31,17 +31,16 @@ ImR_Activator_Loader::ImR_Activator_Loader (void)
 // is currently written with the assumption that it's running
 // in its own orb.
 int
-ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
+ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRY
+  try
     {
       int err = this->opts_.init (argc, argv);
       if (err != 0)
         return -1;
 
       // Creates it's own internal orb, which we must run later
-      err = this->service_.init (this->opts_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      err = this->service_.init (this->opts_);
       if (err != 0)
         return -1;
 
@@ -50,11 +49,10 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
       this->runner_.reset (new ImR_Activator_ORB_Runner (*this));
       this->runner_->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -62,28 +60,24 @@ int
 ImR_Activator_Loader::fini (void)
 {
   ACE_ASSERT (this->runner_.get() != 0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int ret = this->service_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int ret = this->service_.fini ();
 
       this->runner_->wait ();
       this->runner_.reset (0);
       return ret;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Object_ptr
 ImR_Activator_Loader::create_object (CORBA::ORB_ptr,
                                   int,
-                                  ACE_TCHAR **
-                                  ACE_ENV_ARG_DECL)
+                                  ACE_TCHAR **)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN(CORBA::NO_IMPLEMENT (), CORBA::Object::_nil ());
@@ -92,18 +86,15 @@ ImR_Activator_Loader::create_object (CORBA::ORB_ptr,
 int
 ImR_Activator_Loader::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      return this->service_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      return this->service_.run ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR, "Exception in ImR_Locator_ORB_Runner()\n"));
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 ACE_FACTORY_DEFINE (Activator, ImR_Activator_Loader)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
index 2871c38e56b..c41f2c947b3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -23,14 +23,13 @@ class Activator_Export ImR_Activator_Loader : public TAO_Object_Loader
 public:
   ImR_Activator_Loader(void);
 
-  virtual int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
 
   virtual int fini (void);
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[]
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
 
  // Unlike other service objects, we have our own orb.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index eac94f086bb..81cf67856de 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -68,11 +68,9 @@ Activator_NT_Service::svc (void)
       return -1;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int status = server.init (opts);
 
       if (status == -1)
         {
@@ -82,11 +80,9 @@ Activator_NT_Service::svc (void)
       else
         {
           report_status (SERVICE_RUNNING);
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
 
-          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          status = server.fini ();
 
           report_status (SERVICE_STOPPED);
 
@@ -94,19 +90,18 @@ Activator_NT_Service::svc (void)
         if (status != -1)
             return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, IMR_ACTIVATOR_DISPLAY_NAME);
+      sysex._tao_print_exception (IMR_ACTIVATOR_DISPLAY_NAME);
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, IMR_ACTIVATOR_DISPLAY_NAME);
+      userex._tao_print_exception (IMR_ACTIVATOR_DISPLAY_NAME);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, IMR_ACTIVATOR_DISPLAY_NAME);
+      ex._tao_print_exception (IMR_ACTIVATOR_DISPLAY_NAME);
     }
-  ACE_ENDTRY;
 
   report_status (SERVICE_STOPPED);
   return -1;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index e68bdbcf4f9..021fecad545 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -26,8 +26,7 @@ ImR_Adapter::init (PortableServer::ServantLocator_ptr servant)
 
 CORBA::Boolean
 ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
-                                        const char *name
-                                        ACE_ENV_ARG_DECL)
+                                        const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (! CORBA::is_nil(parent));
@@ -37,57 +36,48 @@ ImR_Adapter::unknown_adapter (PortableServer::POA_ptr parent,
 
   const char *exception_message = "Null Message";
 
-  ACE_TRY
+  try
     {
       // Servant Retention Policy
       exception_message = "While PortableServer::POA::create_servant_retention_policy";
       policies[0] =
-        parent->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        parent->create_servant_retention_policy (PortableServer::NON_RETAIN);
 
       // Request Processing Policy
       exception_message = "While PortableServer::POA::create_request_processing_policy";
       policies[1] =
-        parent->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        parent->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
       PortableServer::POAManager_var poa_manager =
-        parent->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        parent->the_POAManager ();
 
       exception_message = "While create_POA";
       PortableServer::POA_var child =
         parent->create_POA (name,
                             poa_manager.in (),
-                            policies
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            policies);
 
       exception_message = "While unknown_adapter::policy->destroy";
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       exception_message = "While child->the_activator";
-      child->the_activator (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child->the_activator (this);
 
       exception_message = "While unknown_adapter, set_servant_manager";
-      child->set_servant_manager (this->servant_locator_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child->set_servant_manager (this->servant_locator_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                   "IMR_Adapter_Activator::unknown_adapter - %s\n",
                   exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "System Exception");
+      ex._tao_print_exception ("System Exception");
       return 0;
     }
-  ACE_ENDTRY;
 
   // Finally, now everything is fine
   return 1;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
index d62d8f3cfcf..eda7d41a054 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
@@ -46,7 +46,6 @@ public:
   virtual CORBA::Boolean unknown_adapter (
     PortableServer::POA_ptr parent,
     const char *name
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
index 2cebbc590bd..d1d4686e993 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
@@ -24,7 +24,7 @@ void AsyncStartupWaiter_i::debug (bool dbg)
 }
 
 void AsyncStartupWaiter_i::wait_for_startup (AMH_AsyncStartupWaiterResponseHandler_ptr rh,
-   const char* name ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
+   const char* name) ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PendingListPtr plst;
   pending_.find(name, plst);
@@ -64,18 +64,16 @@ AsyncStartupWaiter_i::send_response (ImplementationRepository::AMH_AsyncStartupW
   si->partial_ior = partial_ior;
   si->ior = ior;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      rh.wait_for_startup (si.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rh.wait_for_startup (si.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (debug_)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AsyncStartupWaiter_i::send_response ()");
+        ex._tao_print_exception (
+          "AsyncStartupWaiter_i::send_response ()");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -118,20 +116,18 @@ AsyncStartupWaiter_i::unblock_all (const char* name) {
 
   for (size_t i = 0; i < tmp.size(); ++i)
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
         ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_var& rh = tmp[i];
 
-        rh->wait_for_startup (si.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        rh->wait_for_startup (si.in ());
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
         if (debug_)
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AsyncStartupWaiter_i::unblock_all ()");
+          ex._tao_print_exception (
+            "AsyncStartupWaiter_i::unblock_all ()");
       }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
index b4b527e1d40..33c824f5165 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.h
@@ -48,7 +48,7 @@ public:
 
   void wait_for_startup (
    ImplementationRepository::AMH_AsyncStartupWaiterResponseHandler_ptr rh,
-   const char* name ACE_ENV_ARG_DECL)
+   const char* name)
    ACE_THROW_SPEC ((CORBA::SystemException));
 
   void unblock_one(const char* name, const char* partial_ior, const char* ior, bool queue);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 7337af511e9..6f4b0b2830c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -33,26 +33,22 @@ ImR_Forwarder::ImR_Forwarder (ImR_Locator_i& imr_impl)
 }
 
 void
-ImR_Forwarder::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+ImR_Forwarder::init (CORBA::ORB_ptr orb)
 {
   ACE_ASSERT (! CORBA::is_nil(orb));
   this->orb_ = orb;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var tmp =
-        orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("POACurrent");
 
       this->poa_current_var_ =
-        PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::Current::_narrow (tmp.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "ImR_Forwarder::init() Exception ignored.\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (this->poa_current_var_.in ()));
 }
 
@@ -68,14 +64,13 @@ PortableServer::Servant
 ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
                           PortableServer::POA_ptr poa,
                           const char *,
-                          PortableServer::ServantLocator::Cookie &
-                          ACE_ENV_ARG_DECL)
+                          PortableServer::ServantLocator::Cookie &)
     ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest))
 {
   ACE_ASSERT (! CORBA::is_nil(poa));
   CORBA::Object_var forward_obj;
 
-  ACE_TRY
+  try
     {
       CORBA::String_var server_name = poa->the_name();
 
@@ -85,8 +80,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
       // The activator stores a partial ior with each server. We can
       // just tack on the current ObjectKey to get a valid ior for
       // the desired server.
-      CORBA::String_var pior = locator_.activate_server_by_name (server_name.in (), false ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var pior = locator_.activate_server_by_name (server_name.in (), false);
 
       ACE_CString ior = pior.in ();
 
@@ -95,9 +89,11 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
       if (ior.find ("corbaloc:") != 0 || ior[ior.length () - 1] != '/')
         {
           ACE_ERROR ((LM_ERROR, "ImR_Forwarder::preinvoke () Invalid corbaloc ior.\n\t<%s>\n", ior.c_str()));
-          ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST (
-            CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-            CORBA::COMPLETED_NO));
+          throw CORBA::OBJECT_NOT_EXIST (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_IMPLREPO_MINOR_CODE,
+              0),
+            CORBA::COMPLETED_NO);
         }
 
       CORBA::String_var key_str;
@@ -115,30 +111,33 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
         ACE_DEBUG ((LM_DEBUG, "ImR: Forwarding invocation on <%s> to <%s>\n", server_name.in(), ior.c_str()));
 
       forward_obj =
-        this->orb_->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior.c_str ());
     }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+  catch (const ImplementationRepository::CannotActivate&)
     {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound&)
     {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Forwarder");
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      ex._tao_print_exception ("Forwarder");
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   if (!CORBA::is_nil (forward_obj.in ()))
     ACE_THROW_RETURN (PortableServer::ForwardRequest (forward_obj.in ()), 0);
@@ -155,7 +154,6 @@ ImR_Forwarder::postinvoke (const PortableServer::ObjectId &,
                            const char *,
                            PortableServer::ServantLocator::Cookie,
                            PortableServer::Servant
-                           ACE_ENV_ARG_DECL_NOT_USED
                            ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
index 31bf107b602..91b009f194e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
@@ -49,7 +49,6 @@ public:
     PortableServer::POA_ptr poa,
     const char * operation,
     PortableServer::ServantLocator::Cookie &cookie
-    ACE_ENV_ARG_DECL
   ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest));
 
   virtual void postinvoke (
@@ -58,10 +57,9 @@ public:
     const char * operation,
     PortableServer::ServantLocator::Cookie the_cookie,
     PortableServer::Servant the_servant
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void init(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  void init(CORBA::ORB_ptr orb);
 
 private:
   /// Where we find out where to forward to.
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
index 3057a8d6622..afa06a09a1f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -20,11 +20,11 @@ INS_Locator::INS_Locator (ImR_Locator_i& loc)
 }
 
 char *
-INS_Locator::locate (const char* object_key ACE_ENV_ARG_DECL)
+INS_Locator::locate (const char* object_key)
 ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_ASSERT (object_key != 0);
-  ACE_TRY
+  try
     {
       ACE_CString key (object_key);
       ssize_t poaidx = key.find ('/');
@@ -37,8 +37,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
         ACE_DEBUG ((LM_DEBUG, "ImR: Activating server <%s>.\n", key.c_str ()));
 
       CORBA::String_var located =
-        this->imr_locator_.activate_server_by_object (key.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->imr_locator_.activate_server_by_object (key.c_str ());
 
       ACE_CString tmp = located.in ();
       tmp += object_key;
@@ -48,17 +47,20 @@ ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 
       return CORBA::string_dup (tmp.c_str ());
     }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+  catch (const ImplementationRepository::CannotActivate&)
     {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound&)
     {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-        CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
index 88fca61b5ba..82a69c31a7b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
@@ -42,7 +42,7 @@ public:
   INS_Locator (ImR_Locator_i& loc);
 
   /// Locate the appropriate IOR.
-  char* locate (const char *object_key ACE_ENV_ARG_DECL)
+  char* locate (const char *object_key)
     ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
 
 private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
index 34da1320caf..09effd0c661 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp
@@ -25,17 +25,14 @@ ImR_Activator_Shutdown::ImR_Activator_Shutdown (ImR_Activator_i &act)
 void
 ImR_Activator_Shutdown::operator() (int /*which_signal*/)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    this->act_.shutdown (true ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->act_.shutdown (true);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: ");
+    ex._tao_print_exception ("ImR Activator: ");
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -46,11 +43,9 @@ run_standalone (Activator_Options& opts)
   ImR_Activator_Shutdown killer (server);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int status = server.init (opts);
 
       if (status == -1)
         {
@@ -59,31 +54,28 @@ run_standalone (Activator_Options& opts)
       else
         {
           // Run the server if it is initialized correctly.
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
 
           // End the server after its work is done.
-          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          status = server.fini ();
 
           if (status == -1)
             return 1;
         }
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unknown Exception");
+      ex._tao_print_exception ("Unknown Exception");
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index 10054ccacff..db232316c29 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -28,15 +28,13 @@ ImR_Activator_i::ImR_Activator_i (void)
 }
 
 static PortableServer::POA_ptr
-createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_ENV_ARG_DECL)
+createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name)
 {
   PortableServer::LifespanPolicy_var life =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
   PortableServer::IdAssignmentPolicy_var assign =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
   CORBA::PolicyList pols;
   pols.length (2);
@@ -45,13 +43,10 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
 
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   PortableServer::POA_var poa =
-    root_poa->create_POA(poa_name, mgr.in (), pols ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(PortableServer::POA::_nil ());
+    root_poa->create_POA(poa_name, mgr.in (), pols);
 
-  life->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-  assign->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  life->destroy ();
+  assign->destroy ();
 
   return poa._retn ();
 }
@@ -63,27 +58,24 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
 void
 ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr activator)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->debug_ > 1)
         ACE_DEBUG( (LM_DEBUG, "ImR Activator: Contacting ImplRepoService...\n"));
 
       // First, resolve the ImR, without this we can go no further
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("ImplRepoService");
 
       this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE,
         this->orb_->orb_core ()->reactor ());
 
-      locator_ = ImplementationRepository::Locator::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      locator_ = ImplementationRepository::Locator::_narrow (obj.in ());
 
       if (!CORBA::is_nil (locator_.in ()))
         {
           this->registration_token_ =
-            locator_->register_activator (name_.c_str (), activator ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            locator_->register_activator (name_.c_str (), activator);
 
           if (debug_ > 0)
             ACE_DEBUG((LM_DEBUG, "ImR Activator: Registered with ImR.\n"));
@@ -91,19 +83,19 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti
           return;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (debug_ > 1)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: Can't register with ImR.");
+        ex._tao_print_exception (
+          "ImR Activator: Can't register with ImR.");
     }
-  ACE_ENDTRY;
 
   if (debug_ > 0)
     ACE_DEBUG ((LM_DEBUG, "ImR Activator: Not registered with ImR.\n"));
 }
 
 int
-ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts ACE_ENV_ARG_DECL)
+ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts)
 {
   ACE_ASSERT(! CORBA::is_nil (orb));
   orb_ = CORBA::ORB::_duplicate (orb);
@@ -114,36 +106,29 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
       name_ = opts.name();
     }
 
-  ACE_TRY
+  try
     {
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
       ACE_ASSERT (! CORBA::is_nil (obj.in ()));
-      this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (obj.in ());
       ACE_ASSERT (! CORBA::is_nil(this->root_poa_.in ()));
 
       // The activator must use a persistent POA so that it can be started before the
       // locator in some scenarios, such as when the locator persists its database, and
       // wants to reconnect to running activators to auto_start some servers.
       this->imr_poa_ = createPersistentPOA (this->root_poa_.in (),
-        "ImR_Activator" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        "ImR_Activator");
       ACE_ASSERT (! CORBA::is_nil(this->imr_poa_.in ()));
 
       // Activate ourself
       PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_Activator");
-      this->imr_poa_->activate_object_with_id (id.in (), this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->imr_poa_->activate_object_with_id (id.in (), this);
+      obj = this->imr_poa_->id_to_reference (id.in ());
       ImplementationRepository::Activator_var activator =
-        ImplementationRepository::Activator::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ImplementationRepository::Activator::_narrow (obj.in ());
       ACE_ASSERT(! CORBA::is_nil (activator.in ()));
 
-      CORBA::String_var ior = this->orb_->object_to_string (activator.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var ior = this->orb_->object_to_string (activator.in ());
 
       if (this->debug_ > 0)
         ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str ()));
@@ -163,10 +148,8 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
       this->register_with_imr (activator.in ()); // no throw
 
       PortableServer::POAManager_var poaman =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
+      poaman->activate ();
 
       if (this->debug_ > 1)
         {
@@ -188,18 +171,17 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
           ACE_OS::fclose (fp);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::init_with_orb");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "ImR_Activator_i::init_with_orb");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
-ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
+ImR_Activator_i::init (Activator_Options& opts)
 {
   ACE_CString cmdline = opts.cmdline();
   // Must use IOR style objrefs, because URLs sometimes get mangled when passed
@@ -209,97 +191,87 @@ ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
   int argc = av.argc ();
 
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, av.argv (), "TAO_ImR_Activator" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    CORBA::ORB_init (argc, av.argv (), "TAO_ImR_Activator");
 
-  int ret = this->init_with_orb(orb.in (), opts ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  int ret = this->init_with_orb(orb.in (), opts);
 
   return ret;
 }
 
 int
-ImR_Activator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Activator_i::fini (void)
 {
-  ACE_TRY_EX (try_block_1)
+  try
     {
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shutting down...\n"));
 
       this->process_mgr_.close ();
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (try_block_1);
+      this->root_poa_->destroy (1, 1);
 
       if (! CORBA::is_nil (this->locator_.in ()) && this->registration_token_ != 0)
         {
           this->locator_->unregister_activator (name_.c_str(),
-            this->registration_token_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (try_block_1);
+            this->registration_token_);
         }
     }
-  ACE_CATCH(CORBA::COMM_FAILURE, ex)
+  catch (const CORBA::COMM_FAILURE&)
     {
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n"));
     }
-  ACE_CATCH(CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT&)
     {
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: fini");
-    ACE_RE_THROW_EX (try_block_1);
+    ex._tao_print_exception ("ImR Activator: fini");
+    throw;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
-  ACE_TRY_EX (try_block_2)
+  try
     {
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (try_block_2);
+      this->orb_->destroy ();
 
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR Activator: Shut down successfully.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR Activator: fini 2");
-      ACE_RE_THROW_EX (try_block_2);
+      ex._tao_print_exception ("ImR Activator: fini 2");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
-ImR_Activator_i::run (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Activator_i::run (void)
 {
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
   return 0;
 }
 
 void
-ImR_Activator_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Activator_i::shutdown (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  shutdown (false ACE_ENV_ARG_PARAMETER);
+  shutdown (false);
 }
 
 void
-ImR_Activator_i::shutdown (bool wait_for_completion ACE_ENV_ARG_DECL)
+ImR_Activator_i::shutdown (bool wait_for_completion)
 {
-  this->orb_->shutdown (wait_for_completion ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (wait_for_completion);
 }
 
 void
 ImR_Activator_i::start_server(const char* name,
                               const char* cmdline,
                               const char* dir,
-                              const ImplementationRepository::EnvironmentList & env ACE_ENV_ARG_DECL)
+                              const ImplementationRepository::EnvironmentList & env)
                               ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::CannotActivate))
 {
   if (debug_ > 1)
@@ -334,7 +306,9 @@ ImR_Activator_i::start_server(const char* name,
       ACE_ERROR ((LM_ERROR,
         "ImR Activator: Cannot start server <%s> using <%s>\n", name, cmdline));
 
-      ACE_THROW(ImplementationRepository::CannotActivate(CORBA::string_dup ("Process Creation Failed")));
+      throw ImplementationRepository::CannotActivate(
+        CORBA::string_dup (
+          "Process Creation Failed"));
       return;
     }
   else
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index 7b62dc525cf..ad84089c25e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
@@ -67,27 +67,27 @@ public:
    const char* name,
    const char* cmdline,
    const char* dir,
-   const ImplementationRepository::EnvironmentList & env ACE_ENV_ARG_DECL)
+   const ImplementationRepository::EnvironmentList & env)
    ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::CannotActivate));
 
-  void shutdown(ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown(void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Initialize the Server state - parsing arguments and waiting.
-  int init (Activator_Options& opts ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (Activator_Options& opts);
 
   /// Cleans up any state created by init*.
-  int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int fini (void);
 
   /// Runs the orb.
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (void);
 
   /// Shutdown the orb.
-  void shutdown (bool wait_for_completion ACE_ENV_ARG_DECL);
+  void shutdown (bool wait_for_completion);
 
 private:
 
-  int init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts);
 
   void register_with_imr(ImplementationRepository::Activator_ptr activator);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
index 12be58dd8cd..c11ec1201d9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.cpp
@@ -23,17 +23,14 @@ ImR_Locator_Shutdown::ImR_Locator_Shutdown (ImR_Locator_i &imr)
 void
 ImR_Locator_Shutdown::operator () (int /*which_signal*/)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->imr_.shutdown (true ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->imr_.shutdown (true);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR: ");
+      ex._tao_print_exception ("ImR: ");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -44,11 +41,9 @@ run_standalone (Options& opts)
   ImR_Locator_Shutdown killer (server);
   Service_Shutdown kill_contractor(killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int status = server.init (opts);
       if (status == -1)
         {
           return 1;
@@ -56,31 +51,28 @@ run_standalone (Options& opts)
       else
         {
           // Run the server if it is initialized correctly.
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
 
           // End the server after its work is done.
-          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          status = server.fini ();
 
           if (status == -1)
             return 1;
         }
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unknown Exception");
+      ex._tao_print_exception ("Unknown Exception");
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 333e8c59ccc..7b9dfe74f2f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -30,15 +30,13 @@ static const ACE_Time_Value DEFAULT_SERVER_TIMEOUT (0, 10 * 1000); // 10ms
 static const ACE_Time_Value DEFAULT_SHUTDOWN_TIMEOUT (0, 5000 * 1000);
 
 static PortableServer::POA_ptr
-createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_ENV_ARG_DECL) {
+createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) {
 
   PortableServer::LifespanPolicy_var life =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
   PortableServer::IdAssignmentPolicy_var assign =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
   CORBA::PolicyList pols;
   pols.length (2);
@@ -47,13 +45,10 @@ createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name ACE_
 
   PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
   PortableServer::POA_var poa =
-    root_poa->create_POA (poa_name, mgr.in (), pols ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->create_POA (poa_name, mgr.in (), pols);
 
-  life->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-  assign->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  life->destroy ();
+  assign->destroy ();
 
   return poa._retn ();
 }
@@ -83,7 +78,7 @@ ImR_Locator_i::~ImR_Locator_i (void)
 }
 
 int
-ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL)
+ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts)
 {
   orb_ = CORBA::ORB::_duplicate (orb);
   debug_ = opts.debug ();
@@ -92,60 +87,45 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
   ping_interval_ = opts.ping_interval ();
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RootPOA");
+  this->root_poa_ = PortableServer::POA::_narrow (obj.in ());
   ACE_ASSERT (! CORBA::is_nil (this->root_poa_.in ()));
 
-  this->forwarder_.init (orb ACE_ENV_ARG_PARAMETER);
+  this->forwarder_.init (orb);
   this->adapter_.init (& this->forwarder_);
 
   // Register the Adapter_Activator reference to be the RootPOA's
   // Adapter Activator.
-  root_poa_->the_activator (&this->adapter_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa_->the_activator (&this->adapter_);
 
   // Use a persistent POA so that any IOR
   this->imr_poa_ = createPersistentPOA (this->root_poa_.in (),
-                                        "ImplRepo_Service" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                        "ImplRepo_Service");
   ACE_ASSERT (! CORBA::is_nil (this->imr_poa_.in ()));
 
   waiter_svt_.debug (debug_ > 1);
   PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_AsyncStartupWaiter");
-  this->imr_poa_->activate_object_with_id (id.in (), &waiter_svt_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->imr_poa_->activate_object_with_id (id.in (), &waiter_svt_);
+  obj = this->imr_poa_->id_to_reference (id.in ());
   if (startup_timeout_ > ACE_Time_Value::zero)
     {
       obj = set_timeout_policy (obj.in (), startup_timeout_);
     }
-  waiter_ = ImplementationRepository::AsyncStartupWaiter::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  waiter_ = ImplementationRepository::AsyncStartupWaiter::_narrow (obj.in ());
 
   id = PortableServer::string_to_ObjectId ("ImplRepo_Service");
-  this->imr_poa_->activate_object_with_id (id.in (), this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->imr_poa_->activate_object_with_id (id.in (), this);
 
-  obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  obj = this->imr_poa_->id_to_reference (id.in ());
+  CORBA::String_var ior = this->orb_->object_to_string (obj.in ());
 
   // Register the ImR for use with INS
-  obj = orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  IORTable::Table_var ior_table = IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  obj = orb->resolve_initial_references ("IORTable");
+  IORTable::Table_var ior_table = IORTable::Table::_narrow (obj.in ());
   ACE_ASSERT (! CORBA::is_nil (ior_table.in ()));
-  ior_table->bind ("ImplRepoService", ior.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  ior_table->bind ("ImR", ior.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  ior_table->set_locator (this->ins_locator_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  ior_table->bind ("ImplRepoService", ior.in ());
+  ior_table->bind ("ImR", ior.in ());
+  ior_table->set_locator (this->ins_locator_.in ());
 
   // Set up multicast support (if enabled)
   if (opts.multicast ())
@@ -168,14 +148,10 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
 
   // Activate the two poa managers
   PortableServer::POAManager_var poaman =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  poaman = this->imr_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->the_POAManager ();
+  poaman->activate ();
+  poaman = this->imr_poa_->the_POAManager ();
+  poaman->activate ();
 
   // We write the ior file last so that the tests can know we are ready.
   if (opts.ior_filename ().length () > 0)
@@ -194,7 +170,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
 }
 
 int
-ImR_Locator_i::init (Options& opts ACE_ENV_ARG_DECL)
+ImR_Locator_i::init (Options& opts)
 {
   ACE_CString cmdline = opts.cmdline ();
   cmdline += " -orbcollocation no -orbuseimr 0";
@@ -202,15 +178,13 @@ ImR_Locator_i::init (Options& opts ACE_ENV_ARG_DECL)
   int argc = av.argc ();
   char** argv = av.argv ();
 
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO_ImR_Locator" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  int err = this->init_with_orb (orb.in (), opts ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO_ImR_Locator");
+  int err = this->init_with_orb (orb.in (), opts);
   return err;
 }
 
 int
-ImR_Locator_i::run (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Locator_i::run (void)
 {
   if (debug_ > 0)
     {
@@ -235,16 +209,14 @@ ImR_Locator_i::run (ACE_ENV_SINGLE_ARG_DECL)
                   debug (),
                   read_only_ ? "True" : "False"));
     }
-  this->auto_start_servers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->auto_start_servers ();
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
   return 0;
 }
 
 void
-ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers ACE_ENV_ARG_DECL)
+ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers)
                         ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (servers != 0 && this->repository_.servers ().current_size () > 0)
@@ -270,22 +242,20 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers ACE_E
 
       for (size_t i = 0; i < acts.size (); ++i)
         {
-          ACE_TRY
+          try
             {
-              acts[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              acts[i]->shutdown ();
               acts[i] = ImplementationRepository::Activator::_nil ();
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               ++shutdown_errs;
               if (debug_ > 1)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR: shutdown activator");
+                  ex._tao_print_exception (
+                    "ImR: shutdown activator");
                 }
             }
-          ACE_ENDTRY;
-          ACE_CHECK;
         }
       if (debug_ > 0 && shutdown_errs > 0)
         {
@@ -294,41 +264,37 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers ACE_E
     }
   // Technically, we should wait for all the activators to unregister, but
   // ,for now at least, it doesn't seem worth it.
-  shutdown (false ACE_ENV_ARG_PARAMETER);
+  shutdown (false);
 }
 
 void
-ImR_Locator_i::shutdown (bool wait_for_completion ACE_ENV_ARG_DECL)
+ImR_Locator_i::shutdown (bool wait_for_completion)
 {
-  this->orb_->shutdown (wait_for_completion ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (wait_for_completion);
 }
 
 int
-ImR_Locator_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Locator_i::fini (void)
 {
-  ACE_TRY
+  try
     {
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR: Shutting down...\n"));
 
       teardown_multicast ();
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_->destroy (1, 1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
 
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Shut down successfully.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::fini");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("ImR_Locator_i::fini");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -401,8 +367,7 @@ ImR_Locator_i::setup_multicast (ACE_Reactor* reactor, const char* ior)
 
 CORBA::Long
 ImR_Locator_i::register_activator (const char* aname,
-                                   ImplementationRepository::Activator_ptr activator
-                                   ACE_ENV_ARG_DECL)
+                                   ImplementationRepository::Activator_ptr activator)
                                    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (aname != 0);
@@ -411,11 +376,9 @@ ImR_Locator_i::register_activator (const char* aname,
   // Before we can register the activator, we need to ensure that any existing
   // registration is purged.
   this->unregister_activator_i (aname);
-  ACE_CHECK_RETURN (0);
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (activator ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (activator);
 
   CORBA::Long token = ACE_OS::gettimeofday ().msec ();
 
@@ -431,8 +394,7 @@ ImR_Locator_i::register_activator (const char* aname,
 
 void
 ImR_Locator_i::unregister_activator (const char* aname,
-                                     CORBA::Long token
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Long token)
                                      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (aname != 0);
@@ -447,7 +409,6 @@ ImR_Locator_i::unregister_activator (const char* aname,
         }
 
       this->unregister_activator_i (aname);
-      ACE_CHECK;
 
       if (this->debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Activator %s unregistered.\n", aname));
@@ -468,7 +429,7 @@ ImR_Locator_i::unregister_activator_i (const char* aname)
 }
 
 void
-ImR_Locator_i::notify_child_death (const char* name ACE_ENV_ARG_DECL_NOT_USED)
+ImR_Locator_i::notify_child_death (const char* name)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (name != 0);
@@ -495,7 +456,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 }
 
 void
-ImR_Locator_i::activate_server (const char* server ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_server (const char* server)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -505,11 +466,11 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
   // This is the version called by tao_imr to activate the server, manually
   // starting it if necessary.
-  activate_server_by_name (server, true ACE_ENV_ARG_PARAMETER);
+  activate_server_by_name (server, true);
 }
 
 char*
-ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_server_by_name (const char* name, bool manual_start)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -525,11 +486,11 @@ ACE_THROW_SPEC ((CORBA::SystemException,
       ACE_THROW_RETURN (ImplementationRepository::NotFound (), 0);
     }
 
-  return activate_server_i (*info, manual_start ACE_ENV_ARG_PARAMETER);
+  return activate_server_i (*info, manual_start);
 }
 
 char*
-ImR_Locator_i::activate_server_by_object (const char* object_name ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_server_by_object (const char* object_name)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -543,18 +504,18 @@ ACE_THROW_SPEC ((CORBA::SystemException,
   if (pos != ACE_CString::npos)
     server_name = server_name.substr (pos + 1);
 
-  return activate_server_by_name (server_name.c_str (), false ACE_ENV_ARG_PARAMETER);
+  return activate_server_by_name (server_name.c_str (), false);
 }
 
 char*
-ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
 {
   if (info.activation_mode == ImplementationRepository::PER_CLIENT)
     {
-      return activate_perclient_server_i (info, manual_start ACE_ENV_ARG_PARAMETER);
+      return activate_perclient_server_i (info, manual_start);
     }
 
   while (true)
@@ -591,14 +552,12 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
       // Note: We already updated info with StartupInfo in server_is_running ()
       ImplementationRepository::StartupInfo_var si =
-        start_server (info, manual_start, info.waiting_clients
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        start_server (info, manual_start, info.waiting_clients);
     }
 }
 
 char*
-ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start ACE_ENV_ARG_DECL)
+ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -607,9 +566,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
   do
     {
       ImplementationRepository::StartupInfo* psi =
-        start_server (info, manual_start, shared_info->waiting_clients
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        start_server (info, manual_start, shared_info->waiting_clients);
 
       if (psi != 0)
         {
@@ -642,7 +599,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 ImplementationRepository::StartupInfo*
 ImR_Locator_i::start_server (Server_Info& info, bool manual_start,
-                             int& waiting_clients ACE_ENV_ARG_DECL)
+                             int& waiting_clients)
 ACE_THROW_SPEC ((CORBA::SystemException,
                 ImplementationRepository::NotFound,
                 ImplementationRepository::CannotActivate))
@@ -674,7 +631,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
                         (CORBA::string_dup ("No activator registered for server.")), 0);
     }
 
-  ACE_TRY
+  try
     {
       ++waiting_clients;
 
@@ -693,9 +650,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
                                           info.name.c_str (),
                                           info.cmdline.c_str (),
                                           info.dir.c_str (),
-                                          info.env_vars
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                          info.env_vars);
         }
 
       if (info.partial_ior.length () == 0)
@@ -706,8 +661,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
             }
 
           ImplementationRepository::StartupInfo_var si =
-            waiter_->wait_for_startup (info.name.c_str () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            waiter_->wait_for_startup (info.name.c_str ());
 
           --waiting_clients;
           info.starting = false;
@@ -724,7 +678,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
           info.starting = false;
         }
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT&)
     {
       --waiting_clients;
       info.starting = false;
@@ -738,7 +692,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
           info.reset ();
         }
     }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+  catch (const ImplementationRepository::CannotActivate&)
     {
       --waiting_clients;
       info.starting = false;
@@ -746,18 +700,17 @@ ACE_THROW_SPEC ((CORBA::SystemException,
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Activator cannot start <%s>.\n", info.name.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       --waiting_clients;
       info.starting = false;
       if (debug_ > 0)
         ACE_DEBUG ((LM_DEBUG, "ImR: Unexpected exception while starting <%s>.\n", info.name.c_str ()));
       if (debug_ > 1)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+        ex._tao_print_exception ("");
       ainfo->reset ();
       info.reset ();
     }
-  ACE_ENDTRY;
   return 0; // This is not a corba call, so a zero should be ok
 }
 
@@ -766,7 +719,7 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
 {
   CORBA::Object_var ret (CORBA::Object::_duplicate (obj));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       TimeBase::TimeT timeout;
       ORBSVCS_Time::Time_Value_to_TimeT (timeout, to);
@@ -775,14 +728,11 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
 
       CORBA::PolicyList policies (1);
       policies.length (1);
-      policies[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, tmp ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0] = orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, tmp);
 
-      ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       if (CORBA::is_nil (ret.in ()))
         {
@@ -793,19 +743,18 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
           ret = CORBA::Object::_duplicate (obj);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::set_timeout_policy ()");
+      ex._tao_print_exception (
+        "ImR_Locator_i::set_timeout_policy ()");
     }
-  ACE_ENDTRY;
 
   return ret._retn ();
 }
 
 void
 ImR_Locator_i::add_or_update_server (const char* server,
-                                const ImplementationRepository::StartupOptions &options
-                                ACE_ENV_ARG_DECL)
+                                const ImplementationRepository::StartupOptions &options)
                                 ACE_THROW_SPEC ((CORBA::SystemException,
                                   ImplementationRepository::NotFound))
 {
@@ -814,9 +763,11 @@ ImR_Locator_i::add_or_update_server (const char* server,
   if (this->read_only_)
     {
       ACE_DEBUG ((LM_DEBUG, "ImR: Cannot add/update server <%s> due to locked database.\n", server));
-      ACE_THROW (CORBA::NO_PERMISSION (
-                                       CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-                                       CORBA::COMPLETED_NO));
+      throw CORBA::NO_PERMISSION (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
 
   if (debug_ > 0)
@@ -889,7 +840,7 @@ ImR_Locator_i::add_or_update_server (const char* server,
 }
 
 void
-ImR_Locator_i::remove_server (const char* name ACE_ENV_ARG_DECL)
+ImR_Locator_i::remove_server (const char* name)
 ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
   ACE_ASSERT (name != 0);
@@ -897,9 +848,11 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
     {
       ACE_ERROR ((LM_ERROR,
                   "ImR: Can't remove server <%s> due to locked database.\n", name));
-      ACE_THROW (CORBA::NO_PERMISSION (
-                                       CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-                                       CORBA::COMPLETED_NO));
+      throw CORBA::NO_PERMISSION (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_IMPLREPO_MINOR_CODE,
+          0),
+        CORBA::COMPLETED_NO);
     }
 
   // Note : This will be safe, because any Server_Info_Ptr objects will still
@@ -915,13 +868,11 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
             ACE_DEBUG ((LM_DEBUG, "ImR: Removing Server <%s>...\n", name));
 
           PortableServer::POA_var poa = findPOA (name);
-          ACE_CHECK;
           if (! CORBA::is_nil (poa.in ()))
             {
               bool etherealize = true;
               bool wait = false;
-              poa->destroy (etherealize, wait ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              poa->destroy (etherealize, wait);
             }
           if (this->debug_ > 0)
             ACE_DEBUG ((LM_DEBUG, "ImR: Removed Server <%s>.\n", name));
@@ -931,28 +882,26 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
     {
       ACE_ERROR ((LM_ERROR,
                   "ImR: Can't remove unknown server <%s>.\n", name));
-      ACE_THROW (ImplementationRepository::NotFound ());
+      throw ImplementationRepository::NotFound ();
     }
 }
 
 PortableServer::POA_ptr
 ImR_Locator_i::findPOA (const char* name)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       bool activate_it = false;
-      return root_poa_->find_POA (name, activate_it ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      return root_poa_->find_POA (name, activate_it);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {// Ignore
     }
-  ACE_ENDTRY;
   return PortableServer::POA::_nil ();
 }
 
 void
-ImR_Locator_i::shutdown_server (const char* server ACE_ENV_ARG_DECL)
+ImR_Locator_i::shutdown_server (const char* server)
 ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
   ACE_ASSERT (server != 0);
@@ -965,7 +914,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
     {
       ACE_ERROR ((LM_ERROR,
                   "ImR: shutdown_server () Cannot find info for server <%s>\n", server));
-      ACE_THROW (ImplementationRepository::NotFound ());
+      throw ImplementationRepository::NotFound ();
     }
 
   connect_server (*info);
@@ -974,19 +923,17 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
     {
       ACE_ERROR ((LM_ERROR,
                   "ImR: shutdown_server () Cannot connect to server <%s>\n", server));
-      ACE_THROW (ImplementationRepository::NotFound ());
+      throw ImplementationRepository::NotFound ();
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var obj = set_timeout_policy (info->server.in (), DEFAULT_SHUTDOWN_TIMEOUT);
       ImplementationRepository::ServerObject_var server =
-        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
+      server->shutdown ();
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT&)
     {
       info->reset ();
       int err = this->repository_.update_server (*info);
@@ -998,16 +945,15 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
         {
           ACE_DEBUG ((LM_DEBUG, "ImR: Timeout while waiting for <%s> shutdown.\n", server));
         }
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       if (this->debug_ > 1)
         {
           ACE_DEBUG ((LM_DEBUG, "ImR: Exception ignored while shutting down <%s>\n", server));
         }
     }
-  ACE_ENDTRY;
 
   // Note : In most cases this has already been done in the server_is_shutting_down ()
   // operation, but it doesn't hurt to update it again.
@@ -1021,8 +967,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 void
 ImR_Locator_i::server_is_running (const char* name,
                                   const char* partial_ior,
-                                  ImplementationRepository::ServerObject_ptr server
-                                  ACE_ENV_ARG_DECL)
+                                  ImplementationRepository::ServerObject_ptr server)
                                   ACE_THROW_SPEC ((CORBA::SystemException,
                                   ImplementationRepository::NotFound))
 {
@@ -1033,8 +978,7 @@ ImR_Locator_i::server_is_running (const char* name,
   if (this->debug_ > 0)
     ACE_DEBUG ((LM_DEBUG, "ImR: Server %s is running at %s.\n", name, partial_ior));
 
-  CORBA::String_var ior = orb_->object_to_string (server ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var ior = orb_->object_to_string (server);
 
   if (this->debug_ > 1)
     ACE_DEBUG ((LM_DEBUG, "ImR: Server %s callback at %s.\n", name, ior.in ()));
@@ -1077,7 +1021,7 @@ ImR_Locator_i::server_is_running (const char* name,
         {
           waiter_svt_.unblock_one (name, partial_ior, ior.in (), true);
         }
-        else if (this->debug_ > 1) 
+        else if (this->debug_ > 1)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("ImR - Ignoring server_is_running due to no ")
@@ -1088,7 +1032,7 @@ ImR_Locator_i::server_is_running (const char* name,
 }
 
 void
-ImR_Locator_i::server_is_shutting_down (const char* server ACE_ENV_ARG_DECL_NOT_USED)
+ImR_Locator_i::server_is_shutting_down (const char* server)
 ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 {
   ACE_ASSERT (server != 0);
@@ -1115,8 +1059,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound))
 
 void
 ImR_Locator_i::find (const char* server,
-                     ImplementationRepository::ServerInformation_out imr_info
-                     ACE_ENV_ARG_DECL)
+                     ImplementationRepository::ServerInformation_out imr_info)
                      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (server != 0);
@@ -1125,7 +1068,7 @@ ImR_Locator_i::find (const char* server,
   Server_Info_Ptr info = this->repository_.get_server (server);
   if (! info.null ())
     {
-      imr_info = info->createImRServerInfo (ACE_ENV_SINGLE_ARG_PARAMETER);
+      imr_info = info->createImRServerInfo ();
 
       if (this->debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR: Found server %s.\n", server));
@@ -1141,7 +1084,6 @@ void
 ImR_Locator_i::list (CORBA::ULong how_many,
                      ImplementationRepository::ServerInformationList_out server_list,
                      ImplementationRepository::ServerInformationIterator_out server_iterator
-                     ACE_ENV_ARG_DECL
                      ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->debug_ > 1)
@@ -1176,7 +1118,7 @@ ImR_Locator_i::list (CORBA::ULong how_many,
 
       Server_Info_Ptr info = entry->int_id_;
 
-      ImplementationRepository::ServerInformation_var imr_info = info->createImRServerInfo (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ImplementationRepository::ServerInformation_var imr_info = info->createImRServerInfo ();
       server_list[i] = *imr_info;
     }
 
@@ -1193,23 +1135,18 @@ ImR_Locator_i::list (CORBA::ULong how_many,
 
       PortableServer::ServantBase_var tmp (imr_iter);
 
-      ACE_TRY
+      try
         {
           PortableServer::ObjectId_var id =
-            this->imr_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          CORBA::Object_var obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->imr_poa_->activate_object (imr_iter);
+          CORBA::Object_var obj = this->imr_poa_->id_to_reference (id.in ());
           server_iterator = ImplementationRepository::
-            ServerInformationIterator::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            ServerInformationIterator::_unchecked_narrow (obj.in ());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
@@ -1230,12 +1167,10 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
   if (! CORBA::is_nil (info.activator.in ()) || info.ior.length () == 0)
     return;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var obj =
-        this->orb_->string_to_object (info.ior.c_str ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (info.ior.c_str ());
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -1249,8 +1184,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
         }
 
       info.activator =
-        ImplementationRepository::Activator::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ImplementationRepository::Activator::_unchecked_narrow (obj.in ());
 
       if (CORBA::is_nil (info.activator.in ()))
         {
@@ -1261,15 +1195,14 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR: Connected to activator <%s>\n", info.name.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       info.reset ();
     }
-  ACE_ENDTRY;
 }
 
 void
-ImR_Locator_i::auto_start_servers (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Locator_i::auto_start_servers (void)
 {
   if (this->repository_.servers ().current_size () == 0)
     return;
@@ -1285,28 +1218,25 @@ ImR_Locator_i::auto_start_servers (ACE_ENV_SINGLE_ARG_DECL)
       Server_Info_Ptr info = server_entry->int_id_;
       ACE_ASSERT (! info.null ());
 
-      ACE_TRY
+      try
         {
           if (info->activation_mode == ImplementationRepository::AUTO_START
               && info->cmdline.length () > 0)
             {
-              this->activate_server_i (*info, true ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->activate_server_i (*info, true);
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           if (this->debug_ > 1)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "ImR: AUTO_START Could not activate <%s>\n",
                           server_entry->ext_id_.c_str ()));
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "AUTO_START");
+              ex._tao_print_exception ("AUTO_START");
             }
           // Ignore exceptions
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
@@ -1324,10 +1254,9 @@ ImR_Locator_i::connect_server (Server_Info& info)
       return; // can't connect
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::Object_var obj = orb_->string_to_object (info.ior.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb_->string_to_object (info.ior.c_str ());
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -1338,8 +1267,7 @@ ImR_Locator_i::connect_server (Server_Info& info)
       obj = set_timeout_policy (obj.in (), DEFAULT_SERVER_TIMEOUT);
 
       info.server =
-        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
 
       if (CORBA::is_nil (info.server.in ()))
         {
@@ -1350,11 +1278,10 @@ ImR_Locator_i::connect_server (Server_Info& info)
       if (debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR: Connected to server <%s>\n", info.name.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       info.reset ();
     }
-  ACE_ENDTRY;
 }
 
 bool
@@ -1407,7 +1334,6 @@ int
 ImR_Locator_i::is_alive_i (Server_Info& info)
 {
   // This is used by the ACE_TRY below when exceptions are turned off.
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (info.ior.length () == 0 || info.partial_ior.length () == 0)
     {
@@ -1465,14 +1391,13 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
       return 0;
     }
 
-  ACE_TRY
+  try
     {
       // Make a copy, in case the info is updated during the ping.
       ImplementationRepository::ServerObject_var server = info.server;
 
       // This will timeout if it takes too long
-      server->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->ping ();
 
       if (debug_ > 1)
         {
@@ -1481,7 +1406,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
         }
       info.last_ping = ACE_OS::gettimeofday ();
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       const CORBA::ULong BITS_5_THRU_12_MASK = 0x00000f80;
       switch (ex.minor () & BITS_5_THRU_12_MASK)
@@ -1520,7 +1445,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
         return 0;
         }
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT&)
     {
       if (debug_ > 1)
         {
@@ -1532,17 +1457,16 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
       // about the timeout. In any case, we're only guaranteeing that the
       // server is alive, not that it's responsive.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (debug_ > 1)
         {
           ACE_DEBUG ((LM_DEBUG, "ImR: <%s> Unexpected Ping exception. alive=false\n", info.name.c_str ()));
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\n");
+          ex._tao_print_exception ("\n");
         }
       info.last_ping = ACE_Time_Value::zero;
       return false;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index 895105f29f8..ac1a543ba22 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -42,19 +42,19 @@ public:
   ~ImR_Locator_i (void);
 
   /// Initialize the service, creating its own orb, poa, etc.
-  int init (Options& opts ACE_ENV_ARG_DECL);
+  int init (Options& opts);
 
   /// Same as above, but use the given orb
-  int init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL);
+  int init_with_orb (CORBA::ORB_ptr orb, Options& opts);
 
   /// Cleans up any state created by init*.
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int fini (void);
 
   /// Run using the orb reference created during init()
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
 
   /// Shutdown the orb.
-  void shutdown (bool wait_for_completion ACE_ENV_ARG_DECL);
+  void shutdown (bool wait_for_completion);
 
   int debug() const;
   // Note : See the IDL for descriptions of the operations.
@@ -62,76 +62,72 @@ public:
   // Activator->Locator
 
   virtual CORBA::Long register_activator (const char* name,
-    ImplementationRepository::Activator_ptr admin
-    ACE_ENV_ARG_DECL)
+    ImplementationRepository::Activator_ptr admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void unregister_activator (const char* name,
-    CORBA::Long token ACE_ENV_ARG_DECL)
+    CORBA::Long token)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void notify_child_death (const char* name ACE_ENV_ARG_DECL)
+  virtual void notify_child_death (const char* name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // tao_imr->Locator
 
-  virtual void activate_server (const char * name
-    ACE_ENV_ARG_DECL)
+  virtual void activate_server (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
   virtual void add_or_update_server (const char * name,
-    const ImplementationRepository::StartupOptions &options ACE_ENV_ARG_DECL)
+    const ImplementationRepository::StartupOptions &options)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-  virtual void remove_server (const char * name ACE_ENV_ARG_DECL)
+  virtual void remove_server (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-  virtual void shutdown_server (const char * name ACE_ENV_ARG_DECL)
+  virtual void shutdown_server (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
   virtual void find (const char * name,
-    ImplementationRepository::ServerInformation_out info ACE_ENV_ARG_DECL)
+    ImplementationRepository::ServerInformation_out info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void list (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator ACE_ENV_ARG_DECL)
+    ImplementationRepository::ServerInformationIterator_out server_iterator)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown(CORBA::Boolean activators, CORBA::Boolean servers ACE_ENV_ARG_DECL)
+  virtual void shutdown(CORBA::Boolean activators, CORBA::Boolean servers)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Server->Locator
 
   virtual void server_is_running (const char* name,
     const char* partial_ior,
-    ImplementationRepository::ServerObject_ptr server_object
-    ACE_ENV_ARG_DECL)
+    ImplementationRepository::ServerObject_ptr server_object)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
-  virtual void server_is_shutting_down (const char * name ACE_ENV_ARG_DECL)
+  virtual void server_is_shutting_down (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException, ImplementationRepository::NotFound));
 
   // Used by the INS_Locator to start a sever given an object name
-  char* activate_server_by_object (const char* object_name ACE_ENV_ARG_DECL)
+  char* activate_server_by_object (const char* object_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
 
-  char* activate_server_by_name (const char * name, bool manual_start ACE_ENV_ARG_DECL)
+  char* activate_server_by_name (const char * name, bool manual_start)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
 
 private:
 
-  char* activate_server_i (Server_Info& info, bool manual_start ACE_ENV_ARG_DECL)
+  char* activate_server_i (Server_Info& info, bool manual_start)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
 
-  char* activate_perclient_server_i (Server_Info info, bool manual_start ACE_ENV_ARG_DECL)
+  char* activate_perclient_server_i (Server_Info info, bool manual_start)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
 
   ImplementationRepository::StartupInfo*
-    start_server(Server_Info& info, bool manual_start, int& waiting_clients
-                 ACE_ENV_ARG_DECL)
+    start_server(Server_Info& info, bool manual_start, int& waiting_clients)
     ACE_THROW_SPEC ((CORBA::SystemException,
     ImplementationRepository::NotFound,
     ImplementationRepository::CannotActivate));
@@ -149,7 +145,7 @@ private:
   Activator_Info_Ptr get_activator (const ACE_CString& name);
   void connect_activator (Activator_Info& info);
 
-  void auto_start_servers(ACE_ENV_SINGLE_ARG_DECL);
+  void auto_start_servers(void);
 
   CORBA::Object_ptr set_timeout_policy(CORBA::Object_ptr obj, const ACE_Time_Value& to);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index 1ed369991c2..b30cb4ab1f3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -22,8 +22,7 @@ ImR_Iterator::ImR_Iterator (CORBA::ULong n, Locator_Repository& repo, PortableSe
 
 CORBA::Boolean
 ImR_Iterator::next_n (CORBA::ULong how_many,
-                      ImplementationRepository::ServerInformationList_out server_list
-                      ACE_ENV_ARG_DECL)
+                      ImplementationRepository::ServerInformationList_out server_list)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (server_list,
@@ -81,11 +80,9 @@ ImR_Iterator::next_n (CORBA::ULong how_many,
 
 
 void
-ImR_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+ImR_Iterator::destroy (void)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid = poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa_->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::ObjectId_var oid = poa_->servant_to_id (this);
+  poa_->deactivate_object (oid.in());
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index d592146fbb7..eced1e66db8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -39,11 +39,10 @@ public:
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index be8dd5e0e1f..36d09e380e6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -28,15 +28,13 @@ ImR_Locator_Loader::ImR_Locator_Loader()
 int
 ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int err = this->opts_.init (argc, argv);
       if (err != 0)
         return -1;
 
-      err = this->service_.init (this->opts_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      err = this->service_.init (this->opts_);
       if (err != 0)
         return -1;
 
@@ -45,11 +43,10 @@ ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
       this->runner_.reset(new ImR_Locator_ORB_Runner (*this));
       this->runner_->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -57,28 +54,24 @@ int
 ImR_Locator_Loader::fini (void)
 {
   ACE_ASSERT(this->runner_.get () != 0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int ret = this->service_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int ret = this->service_.fini ();
 
       this->runner_->wait ();
       this->runner_.reset (0);
       return ret;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return -1;
 }
 
 CORBA::Object_ptr
 ImR_Locator_Loader::create_object (CORBA::ORB_ptr,
                                   int,
-                                  ACE_TCHAR**
-                                  ACE_ENV_ARG_DECL)
+                                  ACE_TCHAR**)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT(), CORBA::Object::_nil ());
@@ -87,18 +80,15 @@ ImR_Locator_Loader::create_object (CORBA::ORB_ptr,
 int
 ImR_Locator_Loader::run(void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      return this->service_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      return this->service_.run ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR((LM_ERROR, "Exception in ImR_Locator_ORB_Runner ()\n"));
       return -1;
     }
-  ACE_ENDTRY;
 }
 
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
index ca90c61c6fb..06f7ed93b4b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -28,8 +28,7 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[]
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
 
  // Unlike other service objects, we have our own orb.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index e13a4f8080f..59a9f6434c9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -68,11 +68,9 @@ Locator_NT_Service::svc (void)
       return -1;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int status = server.init (opts ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int status = server.init (opts);
 
       if (status == -1)
         {
@@ -82,11 +80,9 @@ Locator_NT_Service::svc (void)
       else
         {
           report_status (SERVICE_RUNNING);
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
 
-          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          status = server.fini ();
 
           report_status (SERVICE_STOPPED);
 
@@ -94,19 +90,18 @@ Locator_NT_Service::svc (void)
         if (status != -1)
             return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, IMR_LOCATOR_DISPLAY_NAME);
+      sysex._tao_print_exception (IMR_LOCATOR_DISPLAY_NAME);
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, IMR_LOCATOR_DISPLAY_NAME);
+      userex._tao_print_exception (IMR_LOCATOR_DISPLAY_NAME);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, IMR_LOCATOR_DISPLAY_NAME);
+      ex._tao_print_exception (IMR_LOCATOR_DISPLAY_NAME);
     }
-  ACE_ENDTRY;
 
   report_status (SERVICE_STOPPED);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index 91f8d7fa1be..ed15f71c699 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -31,7 +31,7 @@ Server_Info::Server_Info
 }
 
 ImplementationRepository::ServerInformation*
-Server_Info::createImRServerInfo (ACE_ENV_SINGLE_ARG_DECL)
+Server_Info::createImRServerInfo (void)
 {
   ImplementationRepository::ServerInformation* info;
   ACE_NEW_THROW_EX (info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
index e6c3a910f3b..4e3bcd06d66 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
@@ -41,7 +41,7 @@ struct Server_Info
     );
 
   /// Convert to the corba type
-  ImplementationRepository::ServerInformation* createImRServerInfo(ACE_ENV_SINGLE_ARG_DECL);
+  ImplementationRepository::ServerInformation* createImRServerInfo(void);
 
   void reset();
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 9febb1ae406..e4c24429e85 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -43,12 +43,10 @@ TAO_IMR_i::init (int argc, char **argv)
 
   const char *exception_message = "Null Message";
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "tao_imr_i" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "tao_imr_i");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -56,8 +54,7 @@ TAO_IMR_i::init (int argc, char **argv)
 
       // Get the ImplRepo object
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("ImplRepoService");
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -68,8 +65,7 @@ TAO_IMR_i::init (int argc, char **argv)
       exception_message = "While narrowing ImR";
 
       this->imr_ =
-        ImplementationRepository::Administration::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ImplementationRepository::Administration::_narrow (obj.in ());
 
       if (CORBA::is_nil (imr_.in ()))
         {
@@ -79,13 +75,12 @@ TAO_IMR_i::init (int argc, char **argv)
 
       this->op_->set_imr (this->imr_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ex._tao_print_exception ("Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -698,37 +693,34 @@ int
 TAO_IMR_Op_Activate::run (void)
 {
   ACE_ASSERT(! CORBA::is_nil(imr_));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->imr_->activate_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->imr_->activate_server (this->server_name_.c_str ());
       ACE_DEBUG ((LM_DEBUG,
         "Successfully Activated server <%s>\n",
         this->server_name_.c_str ()));
     }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+  catch (const ImplementationRepository::CannotActivate& ex)
     {
       ACE_ERROR ((LM_ERROR, "Cannot activate server <%s>, reason: <%s>\n",
         this->server_name_.c_str (),
         ex.reason.in ()));
       return TAO_IMR_Op::CANNOT_ACTIVATE;
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound&)
     {
       ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", this->server_name_.c_str ()));
       return TAO_IMR_Op::NOT_FOUND;
     }
-  ACE_CATCH (PortableServer::ForwardRequest, ex)
+  catch (const PortableServer::ForwardRequest&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Activating Server");
+      ex._tao_print_exception ("Activating Server");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -741,39 +733,35 @@ TAO_IMR_Op_Autostart::run (void)
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->imr_->list (0,
         server_list,
-        server_iter
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_iter);
 
       ACE_ASSERT(CORBA::is_nil (server_iter.in ()));
 
       CORBA::ULong len = server_list->length ();
       for (CORBA::ULong i = 0; i < len; ++i)
         {
-          ACE_TRY_EX (inside)
+          try
             {
-              this->imr_->activate_server (server_list[i].server.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (inside);
+              this->imr_->activate_server (server_list[i].server.in ());
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, server_list[i].server.in ());
+              ex._tao_print_exception (
+                server_list[i].server.in (
+                  ));
               // Ignore exception
             }
-          ACE_ENDTRY;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "autostart");
+      ex._tao_print_exception ("autostart");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -785,7 +773,7 @@ TAO_IMR_Op_IOR::run (void)
 
   // Create a corbaloc string
   // Todo : Most of this logic duplicates that in the POA.cpp
-  ACE_TRY_NEW_ENV
+  try
     {
       if (CORBA::is_nil (this->imr_)
         || !this->imr_->_stubobj ()
@@ -799,8 +787,7 @@ TAO_IMR_Op_IOR::run (void)
 
       CORBA::String_var imr_str =
         this->imr_->_stubobj ()->
-        profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        profile_in_use ()->to_string ();
 
       // Search for "corbaloc:" alone, without the protocol.  This code
       // should be protocol neutral.
@@ -849,12 +836,11 @@ TAO_IMR_Op_IOR::run (void)
         ACE_OS::fclose (file);
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "IOR");
+      ex._tao_print_exception ("IOR");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -867,8 +853,7 @@ TAO_IMR_Op_List::run (void)
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If there is a server name, list only that server.  Otherwise, look
       // at all of them.
@@ -876,9 +861,7 @@ TAO_IMR_Op_List::run (void)
         {
           this->imr_->list (0,
             server_list.out(),
-            server_iter.out()
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            server_iter.out());
 
           if (server_list->length() == 0)
           {
@@ -895,25 +878,23 @@ TAO_IMR_Op_List::run (void)
         {
           ImplementationRepository::ServerInformation_var si;
 
-          this->imr_->find (this->server_name_.c_str (), si ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->imr_->find (this->server_name_.c_str (), si);
 
           this->verbose_server_information_ = 1;
 
           this->display_server_information (si.in ());
         }
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound&)
     {
       ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", this->server_name_.c_str ()));
       return TAO_IMR_Op::NOT_FOUND;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "List");
+      ex._tao_print_exception ("List");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -923,32 +904,29 @@ TAO_IMR_Op_Remove::run (void)
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->imr_->remove_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->imr_->remove_server (this->server_name_.c_str ());
 
       ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n",
         this->server_name_.c_str ()));
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound&)
     {
       ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n",
         this->server_name_.c_str ()));
       return TAO_IMR_Op::NOT_FOUND;
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, ex)
+  catch (const CORBA::NO_PERMISSION&)
     {
       ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
       return TAO_IMR_Op::NO_PERMISSION;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Removing Server");
+      ex._tao_print_exception ("Removing Server");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -958,31 +936,28 @@ TAO_IMR_Op_Shutdown::run (void)
 {
   ACE_ASSERT (! CORBA::is_nil(imr_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->imr_->shutdown_server (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->imr_->shutdown_server (this->server_name_.c_str ());
 
       ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n",
         this->server_name_.c_str ()));
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+  catch (const ImplementationRepository::NotFound&)
     {
       ACE_ERROR ((LM_ERROR, "Server <%s> already shut down.\n", this->server_name_.c_str ()));
       return TAO_IMR_Op::NOT_FOUND;
     }
-  ACE_CATCH(CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT&)
     {
       ACE_DEBUG ((LM_DEBUG, "Timeout waiting for <%s> to shutdown.\n",
         this->server_name_.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down Server");
+      ex._tao_print_exception ("Shutting Down Server");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -992,25 +967,22 @@ TAO_IMR_Op_ShutdownRepo::run (void)
 {
   ACE_ASSERT(! CORBA::is_nil(imr_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       bool servers = false; // not implemented yet, if ever
-      this->imr_->shutdown (activators_, servers ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->imr_->shutdown (activators_, servers);
 
       ACE_DEBUG ((LM_DEBUG, "ImR shutdown initiated.\n"));
     }
-  ACE_CATCH(CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT&)
     {
       ACE_DEBUG ((LM_DEBUG, "Timeout waiting for ImR shutdown.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Shutting Down ImR");
+      ex._tao_print_exception ("Shutting Down ImR");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
@@ -1024,12 +996,10 @@ TAO_IMR_Op_Register::run (void)
   ImplementationRepository::StartupOptions  local;
   ImplementationRepository::StartupOptions* options = NULL;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->imr_->find(this->server_name_.c_str (),
-        server_information.out() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_information.out());
 
       if (server_name_ == server_information->server.in())
         {
@@ -1078,22 +1048,20 @@ TAO_IMR_Op_Register::run (void)
             this->server_name_.c_str (), options->activator.in ()));
         }
 
-      this->imr_->add_or_update_server (this->server_name_.c_str (), *options ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->imr_->add_or_update_server (this->server_name_.c_str (), *options);
 
       ACE_DEBUG((LM_DEBUG, "Successfully registered <%s>.\n", this->server_name_.c_str ()));
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, ex)
+  catch (const CORBA::NO_PERMISSION&)
     {
       ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
       return TAO_IMR_Op::NO_PERMISSION;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Updating server");
+      ex._tao_print_exception ("Updating server");
       return TAO_IMR_Op::UNKNOWN;
     }
-  ACE_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index 3e2270c5442..bbb2430d7ee 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -28,7 +28,7 @@ Criteria_Evaluator::~Criteria_Evaluator ()
 }
 
 LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *
-Criteria_Evaluator::getInitialization (ACE_ENV_SINGLE_ARG_DECL)
+Criteria_Evaluator::getInitialization (void)
 {
   LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *sequence_ptr = 0;
 
@@ -46,7 +46,7 @@ Criteria_Evaluator::getInitialization (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-Criteria_Evaluator::getFilter (ACE_ENV_SINGLE_ARG_DECL)
+Criteria_Evaluator::getFilter (void)
 {
   const char* string;
   CORBA::Any value;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index d170b8fdca1..346685a6993 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -28,16 +28,16 @@ public:
   Criteria_Evaluator (const CosLifeCycle::Criteria &criteria);
   ~Criteria_Evaluator (void);
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (void);
 
-  char * getFilter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  char * getFilter (void);
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (void)
     {
       return 0;
     }
 
-  char * getPreferences (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  char * getPreferences (void)
     {
       return 0;
     }
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index f088231c4f2..311a4876080 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -22,8 +22,8 @@
 #include "Factory_Trader.h"
 #include "orbsvcs/CosTradingC.h"
 
-ACE_RCSID (LifeCycle_Service, 
-           Factory_Trader, 
+ACE_RCSID (LifeCycle_Service,
+           Factory_Trader,
            "$Id$")
 
 // This const char * is used for adding a new type to the service repository
@@ -38,7 +38,7 @@ Factory_Trader::Factory_Trader (int debug_level)
     support_Attributes_ptr_(0),
     debug_level_ (debug_level)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       int argc = 0;
       // create the trader
@@ -50,18 +50,16 @@ Factory_Trader::Factory_Trader (int debug_level)
 
       // Set the service type repository
       support_Attributes_ptr_->type_repos
-                     (this->repository_._this (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+                     (this->repository_._this ());
 
       // Add the "Factory" type to the repository
       this->add_type ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "LifeCycle Server: (Factory_Trader::Factory_Trader) Failed adding a new type.\n");
+      ex._tao_print_exception (
+        "LifeCycle Server: (Factory_Trader::Factory_Trader) Failed adding a new type.\n");
     }
-  ACE_ENDTRY;
   // @@ ACE_CHECK?  No way to pass back any exceptions.
 }
 
@@ -74,7 +72,7 @@ Factory_Trader::~Factory_Trader ()
 void
 Factory_Trader::add_type ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // define the new type
       CosTradingRepos::ServiceTypeRepository::PropStruct propStruct_name;
@@ -104,16 +102,12 @@ Factory_Trader::add_type ()
       this->repository_.add_type (CORBA::string_dup("GenericFactory"),
                                   GENERIC_FACTORY_INTERFACE_REPOSITORY_ID,
                                   propStructSeq,
-                                  superTypeSeq
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  superTypeSeq);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "LifeCycle Server: (Factory_Trader::init).\n");
+      ex._tao_print_exception ("LifeCycle Server: (Factory_Trader::init).\n");
     }
-  ACE_ENDTRY;
   // @@ ACE_CHECK
 }
 
@@ -124,7 +118,7 @@ Factory_Trader::_cxx_export (const char * name,
                              const char * description,
                              const CORBA::Object_ptr object_ptr)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (CORBA::is_nil(object_ptr))
         {
@@ -149,18 +143,14 @@ Factory_Trader::_cxx_export (const char * name,
       // invoke the export method on the Register interface of the Trading Service
       register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr),
                                  CORBA::string_dup("GenericFactory"),
-                                 propertySeq
-                                 ACE_ENV_ARG_PARAMETER);
+                                 propertySeq);
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "LifeCycle Server (Factory_Trader::export): "
-                           "Failed to export factory.\n");
+      ex._tao_print_exception (
+        "LifeCycle Server (Factory_Trader::export): ""Failed to export factory.\n");
     }
-  ACE_ENDTRY;
   // @@ ACE_CHECK*
 }
 
@@ -168,7 +158,7 @@ Factory_Trader::_cxx_export (const char * name,
 CORBA::Object_ptr
 Factory_Trader::query (const char* constraint)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CosTrading::Lookup::SpecifiedProps specifiedProps;
       specifiedProps._d(CosTrading::Lookup::all);
@@ -195,8 +185,7 @@ Factory_Trader::query (const char* constraint)
                          CosTrading::OfferSeq_out(offerSeq_ptr),               // results
                          CosTrading::OfferIterator_out(offerIterator_ptr),     // more results
                          CosTrading::PolicyNameSeq_out(policyNameSeq_ptr)      // Policies
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
       // Initialize
       CORBA::Object_ptr object_ptr = 0;
@@ -224,11 +213,11 @@ Factory_Trader::query (const char* constraint)
         }
       return object_ptr;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Factory_Trader::query: Failed.\n");
+      ex._tao_print_exception (
+        "Factory_Trader::query: Failed.\n");
     }
-  ACE_ENDTRY;
   // @@ ACE_CHECK_RETURN (?)
   return 0;
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 0a3c9a68cf8..3466db31bb4 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -29,26 +29,23 @@ Life_Cycle_Service_Server::Life_Cycle_Service_Server (void)
 
 Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Unbind the Factory Finder.
       CosNaming::Name generic_Factory_Name (2);
       generic_Factory_Name.length (2);
       generic_Factory_Name[0].id = CORBA::string_dup ("LifeCycle_Service");
-      this->namingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->namingContext_var_->unbind (generic_Factory_Name);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "User Exception");
+      ex._tao_print_exception ("User Exception");
     }
-  ACE_ENDTRY;
 }
 
 int
 Life_Cycle_Service_Server::init (int argc,
-                                 ACE_TCHAR *argv[]
-                                  ACE_ENV_ARG_DECL)
+                                 ACE_TCHAR *argv[])
 {
   int retval = 0;
 
@@ -56,9 +53,7 @@ Life_Cycle_Service_Server::init (int argc,
   ACE_Argv_Type_Converter command(argc, argv);
 
   retval = this->orb_manager_.init (command.get_argc(),
-                                    command.get_ASCII_argv()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                    command.get_ASCII_argv());
 
   if (retval == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,13 +62,11 @@ Life_Cycle_Service_Server::init (int argc,
                       -1);
 
   // Activate the POA manager
-  retval = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  retval = this->orb_manager_.activate_poa_manager ();
 
   if (retval == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "activate_poa_manager"), -1);
 
-  ACE_CHECK_RETURN (-1);
 
   this->parse_args (command.get_argc(), command.get_TCHAR_argv());
 
@@ -83,15 +76,13 @@ Life_Cycle_Service_Server::init (int argc,
 
   // Activate the object.
   CORBA::String_var str  =
-    this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_);
 
   if (this->debug_level_ >= 2)
     ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%s>\n", ACE_TEXT_CHAR_TO_TCHAR(str.in ())));
 
   // Register the LifeCycle Service with the Naming Service.
-  ACE_TRY
+  try
     {
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
@@ -99,18 +90,15 @@ Life_Cycle_Service_Server::init (int argc,
 
       // Get the Naming Service object reference.
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_manager_.orb()->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (namingObj_var.in ()))
         ACE_ERROR ((LM_ERROR,
                    " LifeCycle_Service: Unable get the Naming Service.\n"));
 
       // Narrow the object reference to a Naming Context.
-      namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
+      namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in ());
 
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingContext_var_.in ()))
         ACE_ERROR ((LM_ERROR,
@@ -124,37 +112,33 @@ Life_Cycle_Service_Server::init (int argc,
       life_Cycle_Service_Name.length (1);
       life_Cycle_Service_Name[0].id = CORBA::string_dup ("Life_Cycle_Service");
 
-      CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this();
 
       namingContext_var_->bind (life_Cycle_Service_Name,
-                                tmp
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                tmp);
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT("LifeCycle_Service: Bound the LifeCycle Service to the Naming Context.\n")));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Life_Cycle_Service_Server::init");
+      ex._tao_print_exception (
+        "Life_Cycle_Service_Server::init");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 
 int
-Life_Cycle_Service_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Life_Cycle_Service_Server::run (void)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT("\nLifeCycle Service: Life_Cycle_Service_Server is running\n")));
 
-  orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb_manager_.orb()->run ();
 
   return 0;
 }
@@ -201,26 +185,22 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 {
   Life_Cycle_Service_Server life_Cycle_Service_Server;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       int check = life_Cycle_Service_Server.init (argc,
-                                                  argv
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  argv);
 
       if (check)
         return 1;
       else
         {
-          life_Cycle_Service_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK
+          life_Cycle_Service_Server.run ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "LifeCycleService::main");
+      ex._tao_print_exception ("LifeCycleService::main");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index 35355e5368e..112c0e431b5 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -38,11 +38,10 @@ public:
   // Destructor
 
   int init (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+            ACE_TCHAR *argv[]);
   // Initialize the Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
   u_int parse_args (int argc,
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index a1e011451b8..0bf2b51d52f 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -19,8 +19,8 @@
 
 #include "LifeCycle_Service_i.h"
 
-ACE_RCSID (LifeCycle_Service, 
-           LifeCycle_Service_i, 
+ACE_RCSID (LifeCycle_Service,
+           LifeCycle_Service_i,
            "$Id$")
 
 // Constructor
@@ -37,8 +37,7 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void)
 
 
 CORBA::Boolean
-Life_Cycle_Service_i::supports (const CosLifeCycle::Key &
-                                ACE_ENV_ARG_DECL_NOT_USED)
+Life_Cycle_Service_i::supports (const CosLifeCycle::Key &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -46,8 +45,7 @@ Life_Cycle_Service_i::supports (const CosLifeCycle::Key &
 
 CORBA::Object_ptr
 Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
-                                     const CosLifeCycle::Criteria &the_criteria
-                                     ACE_ENV_ARG_DECL)
+                                     const CosLifeCycle::Criteria &the_criteria)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLifeCycle::NoFactory,
                    CosLifeCycle::InvalidCriteria,
@@ -67,8 +65,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n"));
 
-      char* filter = criteria_Evaluator.getFilter (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      char* filter = criteria_Evaluator.getFilter ();
 
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: query(%s) will be called.\n",filter));
@@ -96,21 +93,17 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
       else
         {
           CosLifeCycle::GenericFactory_var genericFactory_var;
-          ACE_TRY
+          try
             {
               genericFactory_var =
-                CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr
-                                                       ACE_ENV_ARG_PARAMETER);
-              // ACE_TRY_CHECK;
+                CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               // see if there is an exception, if yes then throw the
               // NoFactory exception throw a NoFactory exception
-              ACE_TRY_THROW (CosLifeCycle::NoFactory (factory_key));
+              throw CosLifeCycle::NoFactory (factory_key);
             }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN (0);
 
           if (CORBA::is_nil (genericFactory_var.in()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -122,9 +115,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
 
           // Now retrieve the Object obj ref corresponding to the key.
           CORBA::Object_var object_var = genericFactory_var->create_object (factory_key,
-                                                                            the_criteria
-                                                                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                                                            the_criteria);
 
           if (this->debug_level_ >= 2)
             ACE_DEBUG ((LM_DEBUG,
@@ -152,8 +143,7 @@ void
 Life_Cycle_Service_i::register_factory (const char * name,
                                         const char * location,
                                         const char * description,
-                                        CORBA::Object_ptr object
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        CORBA::Object_ptr object)
   ACE_THROW_SPEC (( CORBA::SystemException))
 {
   if (factory_trader_ptr_ == 0)
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index 2997da242a5..327ae2c4b20 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -29,15 +29,13 @@ public:
   Life_Cycle_Service_i (int debug_level = 1);
   ~Life_Cycle_Service_i (void);
 
-  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key
-                           ACE_ENV_ARG_DECL)
+  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
-                                   const CosLifeCycle::Criteria &the_criteria
-                                   ACE_ENV_ARG_DECL)
+                                   const CosLifeCycle::Criteria &the_criteria)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -49,8 +47,7 @@ public:
   void register_factory (const char * name,
                          const char * location,
                          const char * description,
-                         CORBA::Object_ptr object
-                         ACE_ENV_ARG_DECL)
+                         CORBA::Object_ptr object)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
   // Registers a factory with specified properties
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index b95c5ca9c6b..99a2392ba3a 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -40,8 +40,7 @@ usage (const ACE_TCHAR * cmd)
 void
 parse_args (int argc,
             ACE_TCHAR *argv[],
-            int & default_strategy
-            ACE_ENV_ARG_DECL)
+            int & default_strategy)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("o:s:h"));
 
@@ -77,7 +76,7 @@ parse_args (int argc,
 
         default:
           ::usage (argv[0]);
-          ACE_THROW (CORBA::BAD_PARAM ());
+          throw CORBA::BAD_PARAM ();
         }
     }
 }
@@ -97,21 +96,16 @@ TAO_LB_run_load_manager (void * orb_arg)
   //    delivered to this thread on Linux.
   ACE_Sig_Guard signal_guard;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO Load Manager");
+      ex._tao_print_exception ("TAO Load Manager");
 
       return reinterpret_cast<void *> (-1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (reinterpret_cast<void *> (-1));
 
   return 0;
 }
@@ -120,33 +114,24 @@ TAO_LB_run_load_manager (void * orb_arg)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // The usual server side boilerplate code.
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // "built-in" strategies are the following:
       //   0 = RoundRobin
@@ -157,9 +142,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Check the non-ORB arguments.
       ::parse_args (argc,
                     argv,
-                    default_strategy
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    default_strategy);
 
       TAO_LB_LoadManager * lm = 0;
       ACE_NEW_THROW_EX (lm,
@@ -169,16 +152,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableServer::ServantBase_var safe_lm = lm;
 
       // Initalize the LoadManager servant.
       lm->init (orb->orb_core ()->reactor (),
                 orb.in (),
-                root_poa.in ()
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                root_poa.in ());
 
       PortableGroup::Properties props (1);
       props.length (1);
@@ -208,32 +188,22 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       props[0].val <<= strategy_info;
 
-      lm->set_default_properties (props
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      lm->set_default_properties (props);
 
       CosLoadBalancing::LoadManager_var load_manager =
-        lm->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        lm->_this ();
 
       CORBA::String_var str =
-        orb->object_to_string (load_manager.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (load_manager.in ());
 
       // to support corbaloc
       // Get a reference to the IOR table.
-      CORBA::Object_var tobj = orb->resolve_initial_references ("IORTable"
-                                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var tobj = orb->resolve_initial_references ("IORTable");
 
-      IORTable::Table_var table = IORTable::Table::_narrow (tobj.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      IORTable::Table_var table = IORTable::Table::_narrow (tobj.in ());
 
       // bind your stringified IOR in the IOR table
-      table->bind ("LoadManager", str.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      table->bind ("LoadManager", str.in ());
 
       FILE * lm_ior = ACE_OS::fopen (lm_ior_file, "w");
       ACE_OS::fprintf (lm_ior, "%s", str.in ());
@@ -282,29 +252,25 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       //    handler thread shuts down the ORB before it is run, the
       //    below call to ORB::run() will throw a CORBA::BAD_INV_ORDER
       //    exception.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Wait for the signal handler thread to finish
       // before the process exits.
       signal_handler.wait ();
 #endif  /* linux && ACE_HAS_THREADS */
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-//   ACE_CATCH (PortableGroup::InvalidProperty, ex)
+//   catch (const PortableGroup::InvalidProperty& ex)
 //     {
 //       ACE_DEBUG ((LM_DEBUG, "Property ----> %s\n", ex.nam[0].id.in ()));
 //     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO Load Manager");
+      ex._tao_print_exception ("TAO Load Manager");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index b0bb0a36701..d2f4003bb36 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -48,8 +48,7 @@ usage (const ACE_TCHAR * cmd)
 
 void
 parse_args (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL)
+            ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("l:k:t:s:i:m:h"));
 
@@ -89,7 +88,7 @@ parse_args (int argc,
                            ACE_TEXT ("ERROR: Invalid push interval: %s\n"),
                            s));
 
-              ACE_THROW (CORBA::BAD_PARAM ());
+              throw CORBA::BAD_PARAM ();
             }
           break;
 
@@ -100,7 +99,7 @@ parse_args (int argc,
 
         default:
           ::usage (argv[0]);
-          ACE_THROW (CORBA::BAD_PARAM ());
+          throw CORBA::BAD_PARAM ();
         }
     }
 }
@@ -120,21 +119,16 @@ TAO_LB_run_load_monitor (void * orb_arg)
   //    delivered to this thread on Linux.
   ACE_Sig_Guard signal_guard;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO Load Monitor");
+      ex._tao_print_exception ("TAO Load Monitor");
 
       return reinterpret_cast<void *> (-1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (reinterpret_cast<void *> (-1));
 
   return 0;
 }
@@ -143,29 +137,23 @@ TAO_LB_run_load_monitor (void * orb_arg)
 
 CosLoadBalancing::LoadMonitor_ptr
 get_load_monitor (CORBA::ORB_ptr orb,
-                  PortableServer::POA_ptr root_poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr root_poa)
 {
   if (::custom_monitor_ior != 0)
     {
       CORBA::Object_var obj =
-        orb->string_to_object (::custom_monitor_ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
+        orb->string_to_object (::custom_monitor_ior);
 
-      return CosLoadBalancing::LoadMonitor::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      return CosLoadBalancing::LoadMonitor::_narrow (obj.in ());
     }
   else
     {
       // The POA is only needed for the built-in load monitors since
       // they must be activated.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
+      poa_manager->activate ();
 
       if (ACE_OS::strcasecmp (::mtype, "CPU") == 0)
         {
@@ -174,12 +162,11 @@ get_load_monitor (CORBA::ORB_ptr orb,
                             TAO_LB_CPU_Load_Average_Monitor (::location_id,
                                                 ::location_kind),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
 
           // Transfer ownership to the POA.
           PortableServer::ServantBase_var s = monitor;
 
-          return monitor->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          return monitor->_this ();
         }
       else if (ACE_OS::strcasecmp (::mtype, "Disk") == 0
                || ACE_OS::strcasecmp (::mtype, "Memory") == 0
@@ -211,19 +198,15 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
                        CosLoadBalancing::LoadMonitor_ptr monitor,
                        TAO_LB_Push_Handler * handler,
                        ACE_Reactor * reactor,
-                       long & timer_id
-                       ACE_ENV_ARG_DECL)
+                       long & timer_id)
 {
   if (ACE_OS::strcasecmp (::mstyle, "PULL") == 0)
     {
       PortableGroup::Location_var location =
-        monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        monitor->the_location ();
 
       manager->register_load_monitor (location.in (),
-                                      monitor
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                      monitor);
     }
   else if (ACE_OS::strcasecmp (::mstyle, "PUSH") == 0)
     {
@@ -240,7 +223,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
                       ACE_TEXT ("ERROR: Unable to schedule timer for ")
                       ACE_TEXT ("\"PUSH\" style load monitoring.\n")));
 
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
     }
   else
@@ -250,60 +233,44 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
                   ACE_TEXT ("style: <%s>.\n"),
                   ::mstyle));
 
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw CORBA::BAD_PARAM ();
     }
 }
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // The usual server side boilerplate code.
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       // Check the non-ORB arguments.
       ::parse_args (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    argv);
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       CosLoadBalancing::LoadMonitor_var load_monitor =
         ::get_load_monitor (orb.in (),
-                            root_poa.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            root_poa.in ());
 
       PortableGroup::Location_var location =
-        load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        load_monitor->the_location ();
 
       // The "LoadManager" reference should have already been
       // registered with the ORB by its ORBInitializer.
-      obj = orb->resolve_initial_references ("LoadManager"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var load_manager =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       // This "push" handler will only be used if the load monitor
       // style is "PUSH".
@@ -319,9 +286,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                load_monitor.in (),
                                &push_handler,
                                reactor,
-                               timer_id
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               timer_id);
 
       CosLoadBalancing::LoadManager_ptr tmp;;
 
@@ -362,9 +327,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // load monitoring case.
       if (timer_id == -1)
         {
-          load_manager->remove_load_monitor (location.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          load_manager->remove_load_monitor (location.in ());
         }
 #else
       // Activate/register the signal handler that (attempts) to
@@ -384,8 +347,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       //    handler thread shuts down the ORB before it is run, the
       //    below call to ORB::run() will throw a CORBA::BAD_INV_ORDER
       //    exception.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Wait for the signal handler thread to finish
       // before the process exits.
@@ -401,17 +363,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           // Just keep going.  We're shutting down anyway.
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO Load Monitor");
+      ex._tao_print_exception ("TAO Load Monitor");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
index 3153f62e98a..1d333942057 100644
--- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.cpp
@@ -21,22 +21,18 @@ TAO_LB_Monitor_Signal_Handler::TAO_LB_Monitor_Signal_Handler (
 int
 TAO_LB_Monitor_Signal_Handler::perform_cleanup (int signum)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Deregister the LoadMonitor from the LoadManager in the PULL
       // load monitoring case.
       if (!CORBA::is_nil (this->load_manager_.in ()))
         {
-          this->load_manager_->remove_load_monitor (this->location_
-                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->load_manager_->remove_load_monitor (this->location_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception");
+      ex._tao_print_exception ("Caught exception");
 
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Problem during LoadMonitor cleanup "
@@ -44,8 +40,6 @@ TAO_LB_Monitor_Signal_Handler::perform_cleanup (int signum)
                          signum),
                         -1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return this->TAO_LB_Signal_Handler::perform_cleanup (signum);
 }
diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
index de2f9ef1f51..f63d8e11bc4 100644
--- a/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Push_Handler.cpp
@@ -23,12 +23,10 @@ TAO_LB_Push_Handler::handle_timeout (
   const ACE_Time_Value & /* current_time */,
   const void * /* arg */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosLoadBalancing::LoadList_var loads =
-        this->monitor_->loads (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->monitor_->loads ();
 
 //       ACE_DEBUG ((LM_DEBUG,
 //                   "PUSHING LOAD:\n"
@@ -38,20 +36,16 @@ TAO_LB_Push_Handler::handle_timeout (
 //                   loads[0].value));
 
       this->manager_->push_loads (this->location_,
-                                  loads.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  loads.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Catch the exception and ignore it.
       //  @@ Yah?
 
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "(%P|%t) Push_Handler::handle_timeout()\n");
+        ex._tao_print_exception ("(%P|%t) Push_Handler::handle_timeout()\n");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
index e6c646c9833..bfa9e0956a7 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -113,35 +113,27 @@ TAO_LB_Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
 int
 TAO_LB_Signal_Handler::perform_cleanup (int signum)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Shutdown the POA.
       //
       // Shutting down the POA will cause servants "owned" by the POA
       // to be destroyed.  Servants will then have the opportunity to
       // clean up all resources they are responsible for.
-      this->poa_->destroy (1, 1
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_->destroy (1, 1);
 
       // Now shutdown the ORB.
-      this->orb_->shutdown (1
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->shutdown (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception");
+      ex._tao_print_exception ("Caught exception");
 
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Problem during cleanup initiated by signal %d.\n",
                          signum),
                         -1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
index 55900325fcc..bc99c5e9ed0 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Server.cpp
@@ -34,8 +34,7 @@ Logging_Svc_Shutdown::operator() (int which_signal)
                 "Basic_Logging_Service: shutting down on signal %d\n",
                 which_signal));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  (void) this->svc_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  (void) this->svc_.shutdown ();
 }
 
 // Driver function for the Basic_Logging_Service
@@ -48,32 +47,27 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Logging_Svc_Shutdown killer (service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int rc;
 
-      rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rc = service.init (argc, argv);
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the Telecom Log Service.\n"),
                           1);
 
-      rc = service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rc = service.run ();
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to start the Telecom Log Service.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start the Telecom Log Service.\n");
+      ex._tao_print_exception ("Failed to start the Telecom Log Service.\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index 54f2829e160..607b2f29bcd 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -26,31 +26,22 @@ Basic_Logging_Service::~Basic_Logging_Service (void)
 }
 
 void
-Basic_Logging_Service::init_ORB (int& argc, char *argv []
-                                 ACE_ENV_ARG_DECL)
+Basic_Logging_Service::init_ORB (int& argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 }
 
 int
@@ -102,12 +93,10 @@ Basic_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+Basic_Logging_Service::init (int argc, char *argv[])
 {
   // initialize the ORB.
-  this->init_ORB (argc, argv
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->init_ORB (argc, argv);
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
@@ -115,28 +104,21 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   // Activate the basic log factory
   DsLogAdmin::BasicLogFactory_var obj =
     this->basic_log_factory_.activate (this->orb_.in (),
-                                       this->poa_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                       this->poa_.in ());
   ACE_ASSERT (!CORBA::is_nil (obj.in ()));
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (obj.in ());
 
   if (true)
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ());
-      ACE_CHECK_RETURN (-1);
 
       adapter->bind("BasicLogService", ior.in ());
-      ACE_CHECK_RETURN (-1);
     }
 
   if (this->ior_file_name_ != 0)
@@ -169,42 +151,35 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   if (this->bind_to_naming_service_)
     {
       // Resolve the naming service.
-      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->resolve_naming_service ();
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->rebind (name,
-                             obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                             obj.in ());
     }
 
   return 0;
 }
 
 void
-Basic_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Basic_Logging_Service::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
-Basic_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Basic_Logging_Service::run (void)
 {
   if (this->nthreads_ > 0)
     {
@@ -215,8 +190,7 @@ Basic_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
       return 0;
     }
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
 
   return 0;
 }
@@ -224,23 +198,20 @@ Basic_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 int
 Basic_Logging_Service::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Basic_Logging_Service::shutdown (void)
 {
   if (this->bind_to_naming_service_)
     {
@@ -248,9 +219,7 @@ Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
-      this->naming_->unbind (name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->naming_->unbind (name);
     }
 
   // shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
index 91af3e22296..8bb63d5fa73 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
@@ -39,27 +39,26 @@ class Basic_Logging_Service
   virtual ~Basic_Logging_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
 protected:
-  void init_ORB (int& argc, char *argv []
-                 ACE_ENV_ARG_DECL);
+  void init_ORB (int& argc, char *argv []);
   // initialize the ORB.
 
   int parse_args (int argc, char *argv []);
   // Parses the command line arguments.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
index bcbd1a3f592..a4e95b568e4 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
@@ -34,8 +34,7 @@ Logging_Svc_Shutdown::operator() (int which_signal)
                 "Event_Logging_Service: shutting down on signal %d\n",
                 which_signal));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  (void) this->svc_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  (void) this->svc_.shutdown ();
 }
 
 // Driver function for the Event_Logging_Service
@@ -50,32 +49,27 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Logging_Svc_Shutdown killer (service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int rc;
 
-      rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rc = service.init (argc, argv);
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the Telecom Log Service.\n"),
                           1);
 
-      rc = service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rc = service.run ();
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to start the Telecom Log Service.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start the Telecom Log Service.\n");
+      ex._tao_print_exception ("Failed to start the Telecom Log Service.\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index 6020302f152..66964651c06 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -27,31 +27,22 @@ Event_Logging_Service::~Event_Logging_Service (void)
 }
 
 void
-Event_Logging_Service::init_ORB (int& argc, char *argv []
-				 ACE_ENV_ARG_DECL)
+Event_Logging_Service::init_ORB (int& argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 }
 
 int
@@ -103,12 +94,10 @@ Event_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+Event_Logging_Service::init (int argc, char *argv[])
 {
   // initialize the ORB.
-  this->init_ORB (argc, argv
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->init_ORB (argc, argv);
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
@@ -120,28 +109,21 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
   DsEventLogAdmin::EventLogFactory_var obj =
     this->event_log_factory_->activate (this->orb_.in (),
-                                        this->poa_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                        this->poa_.in ());
   ACE_ASSERT (!CORBA::is_nil (obj.in ()));
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (obj.in ());
 
   if (true)
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ());
-      ACE_CHECK_RETURN (-1);
 
       adapter->bind("EventLogService", ior.in ());
-      ACE_CHECK_RETURN (-1);
     }
 
   if (this->ior_file_name_ != 0)
@@ -173,8 +155,7 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   if (this->bind_to_naming_service_)
     {
       // Resolve the naming service.
-      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->resolve_naming_service ();
 
       // Register the Event Log Factory.
       CosNaming::Name name (1);
@@ -182,34 +163,28 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->rebind (name,
-                             obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                             obj.in ());
     }
 
   return 0;
 }
 
 void
-Event_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Event_Logging_Service::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
-Event_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Event_Logging_Service::run (void)
 {
   if (this->nthreads_ > 0)
     {
@@ -220,8 +195,7 @@ Event_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
       return 0;
     }
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
 
   return 0;
 }
@@ -229,23 +203,20 @@ Event_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 int
 Event_Logging_Service::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Event_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Event_Logging_Service::shutdown (void)
 {
   if (this->bind_to_naming_service_)
     {
@@ -253,9 +224,7 @@ Event_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
-      this->naming_->unbind (name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->naming_->unbind (name);
     }
 
   // shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
index 36be03ed34d..2104309ecee 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
@@ -40,27 +40,26 @@ class Event_Logging_Service
   virtual ~Event_Logging_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
 protected:
-  void init_ORB (int& argc, char *argv []
-                 ACE_ENV_ARG_DECL);
+  void init_ORB (int& argc, char *argv []);
   // initialize the ORB.
 
   int parse_args (int argc, char *argv []);
   // Parses the command line arguments.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
index 14b848c2d27..db653aadbbb 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
@@ -34,8 +34,7 @@ Logging_Svc_Shutdown::operator() (int which_signal)
                 "Notify_Logging_Service: shutting down on signal %d\n",
                 which_signal));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  (void) this->svc_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  (void) this->svc_.shutdown ();
 }
 
 // Driver function for the Notify_Logging_Service.
@@ -48,32 +47,27 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Logging_Svc_Shutdown killer (service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int rc;
 
-      rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rc = service.init (argc, argv);
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the Telecom Log Service.\n"),
                           1);
 
-      rc = service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rc = service.run ();
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to start the Telecom Log Service.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start the Telecom Log Service.\n");
+      ex._tao_print_exception ("Failed to start the Telecom Log Service.\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index 00f6f2e038d..8de11dd73a0 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -28,14 +28,11 @@ Notify_Logging_Service::~Notify_Logging_Service (void)
 }
 
 int
-Notify_Logging_Service::init_ORB (int& argc, char *argv []
-                                  ACE_ENV_ARG_DECL)
+Notify_Logging_Service::init_ORB (int& argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                "");
 
   this->notify_service_ = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFY_DEF_EMO_FACTORY_NAME);
 
@@ -46,9 +43,7 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
     }
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,16 +51,12 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
                       -1);
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   return 0;
 }
@@ -119,24 +110,20 @@ Notify_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-Notify_Logging_Service::init (int argc, char *argv[]
-                          ACE_ENV_ARG_DECL)
+Notify_Logging_Service::init (int argc, char *argv[])
 {
   // initialize the ORB.
-  if (this->init_ORB (argc, argv
-                      ACE_ENV_ARG_PARAMETER) != 0)
+  if (this->init_ORB (argc, argv) != 0)
     return -1;
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->notify_service_->init_service (this->orb_.in ());
 
   // Activate the factory
   this->notify_factory_ =
-    notify_service_->create (this->poa_.in ()
-                            ACE_ENV_ARG_PARAMETER);
+    notify_service_->create (this->poa_.in ());
 
   ACE_NEW_THROW_EX (this->notify_log_factory_,
                       TAO_NotifyLogFactory_i (this->notify_factory_.in ()),
@@ -144,28 +131,21 @@ Notify_Logging_Service::init (int argc, char *argv[]
 
   DsNotifyLogAdmin::NotifyLogFactory_var obj =
     notify_log_factory_->activate (this->orb_.in (),
-                                   this->poa_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   this->poa_.in ());
 
-  ACE_CHECK_RETURN (-1);
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (obj.in ());
 
   if (true)
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ());
-      ACE_CHECK_RETURN (-1);
 
       adapter->bind("NotifyLogService", ior.in ());
-      ACE_CHECK_RETURN (-1);
     }
 
   if (this->ior_file_name_ != 0)
@@ -198,42 +178,35 @@ Notify_Logging_Service::init (int argc, char *argv[]
   if (this->bind_to_naming_service_)
     {
       // Resolve the naming service.
-      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->resolve_naming_service ();
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->rebind (name,
-                             obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                             obj.in ());
     }
 
   return 0;
 }
 
 void
-Notify_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Logging_Service::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
-Notify_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Logging_Service::run (void)
 {
   if (this->nthreads_ > 0)
     {
@@ -244,8 +217,7 @@ Notify_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
       return 0;
     }
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
 
   return 0;
 }
@@ -253,23 +225,20 @@ Notify_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 int
 Notify_Logging_Service::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Logging_Service::shutdown (void)
 {
   if (this->bind_to_naming_service_)
     {
@@ -277,9 +246,7 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
-      this->naming_->unbind (name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->naming_->unbind (name);
     }
 
   // shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
index ed1202bcd9b..64247a620fa 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
@@ -44,27 +44,26 @@ class Notify_Logging_Service
   virtual ~Notify_Logging_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[]);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
   // Shutdown the Telecom Service.
   // Returns 0 on success, -1 on error.
 
 protected:
-  int init_ORB (int& argc, char *argv []
-                ACE_ENV_ARG_DECL);
+  int init_ORB (int& argc, char *argv []);
   // initialize the ORB.
 
   int parse_args (int argc, char *argv[]);
   // Parses the command line arguments.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Resolve the naming service.
 
   int svc ();
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
index 5b3ba58a51d..d8abedffe36 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Server.cpp
@@ -35,8 +35,7 @@ Logging_Svc_Shutdown::operator() (int which_signal)
                 "RTEvent_Logging_Service: shutting down on signal %d\n",
                 which_signal));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  (void) this->svc_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  (void) this->svc_.shutdown ();
 }
 
 // Driver function for the RTEvent_Logging_Service
@@ -51,32 +50,27 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Logging_Svc_Shutdown killer (service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int rc;
 
-      rc = service.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rc = service.init (argc, argv);
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the Telecom Log Service.\n"),
                           1);
 
-      rc = service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rc = service.run ();
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to start the Telecom Log Service.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start the Telecom Log Service.\n");
+      ex._tao_print_exception ("Failed to start the Telecom Log Service.\n");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index fa49a6952ed..6d46dfea129 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -25,31 +25,22 @@ RTEvent_Logging_Service::~RTEvent_Logging_Service (void)
 }
 
 void
-RTEvent_Logging_Service::init_ORB (int& argc, char *argv[]
-                                   ACE_ENV_ARG_DECL)
+RTEvent_Logging_Service::init_ORB (int& argc, char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 }
 
 
@@ -102,12 +93,10 @@ RTEvent_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
+RTEvent_Logging_Service::init (int argc, char* argv[])
 {
   // initialize the ORB.
-  this->init_ORB (argc, argv
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->init_ORB (argc, argv);
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
@@ -118,8 +107,7 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
                     CORBA::NO_MEMORY ());
 
   if (this->rtevent_log_factory_->init (orb_.in (),
-                                        poa_.in ()
-                                        ACE_ENV_ARG_PARAMETER) != 0)
+                                        poa_.in ()) != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%P|%t) Unable to initialize "
@@ -128,26 +116,20 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
     }
 
   RTEventLogAdmin::EventLogFactory_var obj =
-    this->rtevent_log_factory_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->rtevent_log_factory_->activate ();
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (obj.in ());
 
   if (true)
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ());
-      ACE_CHECK_RETURN (-1);
 
       adapter->bind("RTEventLogService", ior.in ());
-      ACE_CHECK_RETURN (-1);
     }
 
   if (this->ior_file_name_ != 0)
@@ -179,42 +161,35 @@ RTEvent_Logging_Service::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
   if (this->bind_to_naming_service_)
     {
       // Resolve the naming service.
-      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->resolve_naming_service ();
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
       this->naming_->rebind (name,
-                             obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                             obj.in ());
     }
 
   return 0;
 }
 
 void
-RTEvent_Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+RTEvent_Logging_Service::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
-RTEvent_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+RTEvent_Logging_Service::run (void)
 {
   if (this->nthreads_ > 0)
     {
@@ -225,8 +200,7 @@ RTEvent_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
       return 0;
     }
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
 
   return 0;
 }
@@ -234,23 +208,20 @@ RTEvent_Logging_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 int
 RTEvent_Logging_Service::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-RTEvent_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+RTEvent_Logging_Service::shutdown (void)
 {
   if (this->bind_to_naming_service_)
     {
@@ -258,9 +229,7 @@ RTEvent_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
-      this->naming_->unbind (name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->naming_->unbind (name);
     }
 
   // shutdown the ORB.
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
index 535fea9fbe0..31db988dc4f 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
@@ -34,30 +34,29 @@ public:
   // = Initialization and termination methods.
   RTEvent_Logging_Service (void);
   // Constructor.
-  
+
   virtual ~RTEvent_Logging_Service (void);
   // Destructor.
 
   int init (int argc, char* argv[]);
   // Initializes the Telecom Log Service.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
     // Run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
 protected:
-  void init_ORB (int& argc, char *argv []
-		 ACE_ENV_ARG_DECL);
+  void init_ORB (int& argc, char *argv []);
   // initializes the ORB.
 
   int parse_args (int argc, char* argv[]);
   // parse the command line args
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Resolve the naming service.
 
   int svc ();
@@ -88,7 +87,7 @@ private:
 
   bool bind_to_naming_service_;
   // If true, bind to naming service
-	
+
   int nthreads_;
   // Number of worker threads.
 };
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 506d38edb32..2c1a9364ed6 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -22,7 +22,7 @@ AutoFinalizer::AutoFinalizer (TAO_NT_Naming_Service &service)
 
 AutoFinalizer::~AutoFinalizer ()
 {
-  service_.report_status (SERVICE_STOPPED);  
+  service_.report_status (SERVICE_STOPPED);
   ACE_DEBUG ((LM_DEBUG, "Reported service stoped\n"));
 }
 
@@ -52,31 +52,28 @@ TAO_NT_Naming_Service::handle_control (DWORD control_code)
   if (control_code == SERVICE_CONTROL_SHUTDOWN
       || control_code == SERVICE_CONTROL_STOP)
     {
-      // Just in case any of the following method calls 
+      // Just in case any of the following method calls
       // throws in a way we do not expect.
       // This instance's destructor will notify the OS.
       AutoFinalizer afinalizer (*this);
 
       report_status (SERVICE_STOP_PENDING);
-      
+
       // This must be all that needs to be done since this method is executing
       // in a separate thread from the one running the reactor.
       // When the reactor is stopped it calls ORB::destroy(), which in turn
       // calls ORB::shutdown(1) *and* unbinds the ORB from the ORB table.
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
-          TAO_ORB_Core_instance ()->orb ()->shutdown (1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          TAO_ORB_Core_instance ()->orb ()->shutdown (1);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // What should we do here? Even the log messages are not
           // showing up, since the thread that runs this is not an ACE
           // thread. It is allways spawned/controlled by Windows ...
         }
-      ACE_ENDTRY;
     }
   else
   {
@@ -168,8 +165,7 @@ TAO_NT_Naming_Service::svc (void)
                            argv_) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Just in case handle_control does not get the chance
       // to execute, or is never called by Windows. This instance's
@@ -179,18 +175,14 @@ TAO_NT_Naming_Service::svc (void)
       ACE_DEBUG ((LM_INFO, "Notifying Windows of service startup\n"));
       report_status (SERVICE_RUNNING);
 
-      naming_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_INFO, "Exception in service - exitting\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO NT Naming Service");
+      ex._tao_print_exception ("TAO NT Naming Service");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   ACE_DEBUG ((LM_INFO, "Exiting gracefully\n"));
   return 0;
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 65631eb726e..0bfcc78a1fc 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -49,19 +49,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                        ACE_TEXT("Failed to start the Naming Service.\n")),
                       1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      naming_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NamingService");
+      ex._tao_print_exception ("NamingService");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   naming_service.fini ();
 
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 22e055649e3..cee5062bfff 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -30,16 +30,14 @@ TAO_Naming_Service::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Initialize the ORB
       this->orb_ =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
 
       // Parse the args for '-t' option. If '-t' option is passed, do
       // the needful and then remove the option from the list of
@@ -55,13 +53,11 @@ TAO_Naming_Service::init (int argc,
       if (result == -1)
         return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::init");
+      ex._tao_print_exception ("TAO_Naming_Service::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -105,49 +101,43 @@ TAO_Naming_Service::parse_args (int &argc,
 
 // Run the ORB event loop.
 int
-TAO_Naming_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Service::run (void)
 {
   if (time_ == 0)
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->orb_->run ();
     }
   else
     {
       ACE_Time_Value tv (time_);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->orb_->run (tv);
     }
 
   return 0;
 }
 
 void
-TAO_Naming_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Service::shutdown (void)
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 int
 TAO_Naming_Service::fini (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   this->my_naming_server_.fini();
 
-  ACE_TRY
+  try
   {
     // destroy implies shutdown
-    this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->destroy ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::fini");
+    ex._tao_print_exception ("TAO_Naming_Service::fini");
     return -1;
   }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index 2ad9cb1f7dd..de82fd02b4c 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -44,10 +44,10 @@ public:
   virtual int fini (void);
   // The opposite of init().
 
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (void);
   // Run the TAO_Naming_Service.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void shutdown (void);
   // Shut down the TAO_Naming_Service; you must still call fini().
 
   virtual ~TAO_Naming_Service (void);
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index 57cee4c14ed..9ad03908c0c 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -129,24 +129,19 @@ TAO_NT_Notify_Service::svc (void)
 {
   TAO_Notify_Service_Driver notify_service;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      if (notify_service.init (argc_, argv_ ACE_ENV_ARG_PARAMETER) == -1)
+      if (notify_service.init (argc_, argv_) == -1)
         return -1;
 
       report_status (SERVICE_RUNNING);
-      notify_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      notify_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO NT Notify Service");
+      ex._tao_print_exception ("TAO NT Notify Service");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index 2e74141b15d..aa652e311fe 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "Notify_Service.h"
+#include "orbsvcs/orbsvcs/Notify/Properties.h"
 
 // Must include this file to get a static initializer
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
@@ -47,27 +48,30 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   Notify_Service_Shutdown_Functor killer (notify_service);
   Service_Shutdown kill_contractor (killer);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_NEW_ENV
+  try
     {
-      int result = notify_service.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // Set the properties instance before initializing the notify
+      // service.  Using the static singleton can cause static
+      // destruction issues between the properties instance and
+      // statically allocated type code structures.
+      TAO_Notify_Properties properties;
+      TAO_Notify_Properties::instance (&properties);
+
+      int result = notify_service.init (argc, argv);
 
        if (result == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("Failed to initialize the Notification Service.\n")),
                           1);
 
-      notify_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      notify_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT("Failed to run the Notification Service\n"));
+      ex._tao_print_exception (
+        ACE_TEXT ("Failed to run the Notification Service\n"));
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index ed5898ccb63..2eb34764ab2 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -36,22 +36,17 @@ TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void)
 }
 
 int
-TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []
-                                     ACE_ENV_ARG_DECL)
+TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv [])
 {
   // Copy command line parameter.
   ACE_Argv_Type_Converter command_line(argc, argv);
 
   this->orb_ = CORBA::ORB_init (command_line.get_argc(),
                                 command_line.get_ASCII_argv(),
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                "");
 
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,46 +54,37 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []
                       -1);
 
   this->poa_ =
-    PortableServer::POA::_narrow (object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   return 0;
 }
 
 int
-TAO_Notify_Service_Driver::init_dispatching_ORB (int& argc, ACE_TCHAR *argv []
-                              ACE_ENV_ARG_DECL)
+TAO_Notify_Service_Driver::init_dispatching_ORB (int& argc, ACE_TCHAR *argv [])
 {
   // Copy command line parameter.
   ACE_Argv_Type_Converter command_line(argc, argv);
 
   this->dispatching_orb_ = CORBA::ORB_init (command_line.get_argc(),
                                 command_line.get_ASCII_argv(),
-                                "dispatcher"
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                "dispatcher");
 
   return 0;
 }
 
 int
-TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
-                                 ACE_ENV_ARG_DECL)
+TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[])
 {
   if (this->parse_args(argc, argv) != 0)
     return -1;
 
   // initalize the ORB.
-  if (this->init_ORB (argc, argv
-                      ACE_ENV_ARG_PARAMETER) != 0)
+  if (this->init_ORB (argc, argv) != 0)
     return -1;
 
   this->notify_service_ = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFICATION_SERVICE_NAME);
@@ -116,19 +102,16 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 
   if (this->separate_dispatching_orb_)
     {
-      if (this->init_dispatching_ORB (argc, argv
-                                      ACE_ENV_ARG_PARAMETER) != 0)
+      if (this->init_dispatching_ORB (argc, argv) != 0)
         {
           return -1;
         }
 
-      this->notify_service_->init_service2 (this->orb_.in (), this->dispatching_orb_.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->notify_service_->init_service2 (this->orb_.in (), this->dispatching_orb_.in());
     }
   else
     {
-      this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->notify_service_->init_service (this->orb_.in ());
     }
 
   if (this->nthreads_ > 0) // we have chosen to run in a thread pool.
@@ -156,8 +139,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
   if (this->use_name_svc_)
     {
       // Resolve the naming service.
-      int ns_ret = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      int ns_ret = this->resolve_naming_service ();
 
       if (ns_ret != 0)
         return -1;
@@ -168,21 +150,17 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 
   // Activate the factory
   this->notify_factory_ =
-    notify_service_->create (this->poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    notify_service_->create (this->poa_.in ());
 
   ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
 
   if (this->bootstrap_) // Enable corbaloc usage
     {
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        IORTable::Table::_narrow (table_object.in ());
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable. corbaloc support not enabled.\n"));
@@ -190,12 +168,8 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
       else
         {
           CORBA::String_var ior =
-            this->orb_->object_to_string (this->notify_factory_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-          adapter->bind (this->notify_factory_name_.c_str (), ior.in ()
-                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            this->orb_->object_to_string (this->notify_factory_.in ());
+          adapter->bind (this->notify_factory_name_.c_str (), ior.in ());
         }
     }
 
@@ -206,15 +180,11 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
       ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
 
       CosNaming::Name_var name =
-        this->naming_->to_name (this->notify_factory_name_.c_str ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->naming_->to_name (this->notify_factory_name_.c_str ());
 
 
       this->naming_->rebind (name.in (),
-                             this->notify_factory_.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                             this->notify_factory_.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Registered with the naming service as: %s\n",
@@ -231,18 +201,12 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
           CosNotifyChannelAdmin::EventChannel_var ec =
             this->notify_factory_->create_channel (initial_qos,
                                                    initial_admin,
-                                                   id
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                                   id);
 
-          name = this->naming_->to_name (this->notify_channel_name_.c_str ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          name = this->naming_->to_name (this->notify_channel_name_.c_str ());
 
           this->naming_->rebind (name.in (),
-                                 ec.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                 ec.in ());
 
           ACE_DEBUG ((LM_DEBUG,
                       "Registered an Event Channel with the naming service as: %s\n",
@@ -254,9 +218,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
   // Write IOR to a file, if asked.
   // Note: do this last to ensure that we're up and running before the file is written
   CORBA::String_var str =
-    this->orb_->object_to_string (this->notify_factory_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (this->notify_factory_.in ());
 
   if (this->ior_output_file_)
     {
@@ -275,12 +237,10 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
 }
 
 int
-TAO_Notify_Service_Driver::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Service_Driver::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
@@ -289,14 +249,13 @@ TAO_Notify_Service_Driver::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
                       -1);
 
   this->naming_ =
-    CosNaming::NamingContextExt::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CosNaming::NamingContextExt::_narrow (naming_obj.in ());
 
   return 0;
 }
 
 int
-TAO_Notify_Service_Driver::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Service_Driver::run (void)
 {
   if (TAO_debug_level > 0 )
     ACE_DEBUG ((LM_DEBUG, "%s: Running the Notification Service\n",
@@ -308,27 +267,22 @@ TAO_Notify_Service_Driver::run (ACE_ENV_SINGLE_ARG_DECL)
       return 0;
     }
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
 
   return 0;
 }
 
 void
-TAO_Notify_Service_Driver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Service_Driver::shutdown (void)
 {
   // Deactivate.
   if (this->use_name_svc_ && !CORBA::is_nil (this->naming_.in ()))
     {
       // Unbind from the naming service.
       CosNaming::Name_var name =
-        this->naming_->to_name (this->notify_factory_name_.c_str ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_->to_name (this->notify_factory_name_.c_str ());
 
-      this->naming_->unbind (name.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->naming_->unbind (name.in ());
     }
 
   // shutdown the ORB.
@@ -478,7 +432,7 @@ Worker::svc (void)
   // just disabling it altogether.  It doesn't provide much value, and
   // makes service startup needlessly more verbose.  See bugzilla 2477
   // for details.
-  
+
   ACE_hthread_t current;
   ACE_Thread::self (current);
 
@@ -492,16 +446,13 @@ Worker::svc (void)
   ACE_DEBUG ((LM_DEBUG, "Activated Worker Thread to run the ORB @ priority:%d \n", priority));
 #endif
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index ddf7203b146..1967f1b0a8f 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -70,16 +70,15 @@ class TAO_Notify_Service_Driver
   virtual ~TAO_Notify_Service_Driver (void);
   // Destructor.
 
-  int init (int argc, ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+  int init (int argc, ACE_TCHAR *argv[]);
   // Initializes the Service.
   // Returns 0 on success, -1 on error.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // run the Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void shutdown (void);
   // Shutdown the Service.
   // Returns 0 on success, -1 on error.
 
@@ -87,16 +86,14 @@ class TAO_Notify_Service_Driver
   // CosNotifyChannelAdmin::EventChannelFactory_var obj;
   //
 protected:
-  int init_ORB (int& argc, ACE_TCHAR *argv []
-                ACE_ENV_ARG_DECL);
+  int init_ORB (int& argc, ACE_TCHAR *argv []);
   // initialize the ORB.
-  int init_dispatching_ORB (int& argc, ACE_TCHAR *argv []
-                ACE_ENV_ARG_DECL);
+  int init_dispatching_ORB (int& argc, ACE_TCHAR *argv []);
   // initialize the dispatching ORB.
 
   TAO_Notify_Service* notify_service_;
 
-  int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int resolve_naming_service (void);
   // Resolve the naming service.
 
   int parse_args (int& argc, ACE_TCHAR *argv []);
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
index fe23670c74e..f070e65ec31 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
@@ -29,17 +29,13 @@ TAO_PSDL_Code_Gen::~TAO_PSDL_Code_Gen (void)
 int
 TAO_PSDL_Code_Gen::set_codec (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Obtain a reference to the CodecFactory.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("CodecFactory"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("CodecFactory");
 
   IOP::CodecFactory_var codec_factory =
-    IOP::CodecFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    IOP::CodecFactory::_narrow (obj.in ());
 
   // Set up a structure that contains information necessary to
   // create a GIOP 1.1 CDR encapsulation Codec.
@@ -50,8 +46,7 @@ TAO_PSDL_Code_Gen::set_codec (void)
 
   // Obtain the CDR encapsulation Codec.
   this->codec_ =
-    codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    codec_factory->create_codec (encoding);
 
   if (this->codec_.in () == 0)
     {
@@ -64,8 +59,7 @@ TAO_PSDL_Code_Gen::set_codec (void)
 
 int
 TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
-                                     const char *string_obj_ref
-                                     ACE_ENV_ARG_DECL)
+                                     const char *string_obj_ref)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Invoke the helper encode method which will
@@ -74,9 +68,7 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
   // hash_map to the database.
 
   // Encode the stringified object reference to a CORBA::OctetSeq *
-  CORBA::OctetSeq_var octet_seq = this->encode (string_obj_ref
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::OctetSeq_var octet_seq = this->encode (string_obj_ref);
 
   // Insert the new entry to the hash map which contains all the
   // name-octet_seq entries. And, write the hash_map to a file.
@@ -100,8 +92,7 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
 }
 
 const char *
-TAO_PSDL_Code_Gen::get_obj_ref (const char *name
-                                ACE_ENV_ARG_DECL)
+TAO_PSDL_Code_Gen::get_obj_ref (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get from the hash_map saved in the database, the corresponding entry
@@ -117,9 +108,7 @@ TAO_PSDL_Code_Gen::get_obj_ref (const char *name
   if (result == 0)
     {
       // Decode the octet_seq.
-      const char *obj_ref = this->decode (octet_seq
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      const char *obj_ref = this->decode (octet_seq);
 
       return CORBA::string_dup (obj_ref);
     }
@@ -134,8 +123,7 @@ TAO_PSDL_Code_Gen::get_obj_ref (const char *name
 
 
 CORBA::OctetSeq *
-TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
-                           ACE_ENV_ARG_DECL)
+TAO_PSDL_Code_Gen::encode (const char *string_obj_ref)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any data;
@@ -143,8 +131,7 @@ TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
 
   CORBA::OctetSeq *encoded_data = 0;
 
-  encoded_data = this->codec_->encode (data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  encoded_data = this->codec_->encode (data);
 
   CORBA::OctetSeq_var safe_encoded_data = encoded_data;
 
@@ -152,17 +139,14 @@ TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
 }
 
 const char *
-TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data
-                           ACE_ENV_ARG_DECL)
+TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *extracted_value;
 
   // Extract the data from the octet sequence.
   CORBA::Any_var decoded_data =
-    this->codec_->decode (data
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->codec_->decode (data);
 
   decoded_data.in() >>= extracted_value;
 
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
index 60bfb96a508..7ec81dfdc5e 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
@@ -46,32 +46,28 @@ class TAO_PSDL_Export TAO_PSDL_Code_Gen
   /// Initializes a IOP::CodecFactory and IOP::Codec to take care of
   /// the marshalling and demarshalling of data.
   int set_codec (void);
-  
+
   /// Method to save the name-stringified object reference pair
   /// to the database. Returns -1 on failure.
   int set_name_obj_ref (const char *name,
-                        const char *string_obj_ref
-                        ACE_ENV_ARG_DECL)
+                        const char *string_obj_ref)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the stringified form of the object reference given the name
   /// of the object.
-  const char *get_obj_ref (const char *name
-                           ACE_ENV_ARG_DECL)
+  const char *get_obj_ref (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
 
   /// Helper method which serializes the data and saves it to the
   /// database.
-  CORBA::OctetSeq *encode (const char *string_obj_ref
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OctetSeq *encode (const char *string_obj_ref)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// Helper method to get the octet sequence
-  const char *decode (const CORBA::OctetSeq &data
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  const char *decode (const CORBA::OctetSeq &data)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// File where the persistent data is stored.
diff --git a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
index b9644240c23..65932b082f1 100644
--- a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
@@ -165,12 +165,12 @@ TAO_PSDL_Exception_Visitor::print_class_for_exception (void)
   *ps_sh << "\n";
   *ps_sh << "      virtual void _tao_encode (\n";
   *ps_sh << "          TAO_OutputCDR &\n";
-  *ps_sh << "          ACE_ENV_ARG_DECL_NOT_USED\n";
+  *ps_sh << "\n";
   *ps_sh << "        ) const;\n";
   *ps_sh << "      \n";
   *ps_sh << "      virtual void _tao_decode (\n";
   *ps_sh << "          TAO_InputCDR &\n";
-  *ps_sh << "          ACE_ENV_ARG_DECL_NOT_USED\n";
+  *ps_sh << "\n";
   *ps_sh << "        );\n";
   *ps_sh << "      \n";
 
diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
index 597d23a7005..e90926cd1fa 100644
--- a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
@@ -226,7 +226,7 @@ TAO_PSDL_Interface_Visitor::print_for_forward_dcl (void)
 
   *ps_sh << "CORBA::Object *";
   ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_NOT_USED";
+  *ps_sh << "";
 
   ps_sh->decr_indent (0);
   ps_sh->nl ();
@@ -382,7 +382,7 @@ TAO_PSDL_Interface_Visitor::print_for_forward_dcl (void)
   *ps_sh << "CORBA::Object *";
   ps_sh->nl ();
 
-  *ps_sh << "ACE_ENV_ARG_DECL_NOT_USED";
+  *ps_sh << "";
 
   ps_sh->decr_indent (0);
   ps_sh->nl ();
@@ -471,13 +471,13 @@ TAO_PSDL_Interface_Visitor::print_class_for_interface (void)
 
   *ps_sh << "static " << this->interface_name_ << "_ptr _narrow (";  ps_sh->nl ();
   *ps_sh << "CORBA::Object_ptr obj";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ");";  ps_sh->nl ();
 
   *ps_sh << "static " << this->interface_name_
          << "_ptr _unchecked_narrow (";  ps_sh->nl ();
   *ps_sh << "CORBA::Object_ptr obj";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ");";  ps_sh->nl ();
 
   *ps_sh << "static " << this->interface_name_ << "_ptr _nil (void)";  ps_sh->nl ();
@@ -504,7 +504,7 @@ TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
 
   *ps_sh << "virtual CORBA::Boolean _is_a (";  ps_sh->nl ();
   *ps_sh << "const CORBA::Char *type_id";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ");";  ps_sh->nl ();
 
   *ps_sh << "virtual void *_tao_QueryInterface (ptrdiff_t type);";  ps_sh->nl ();
@@ -620,7 +620,7 @@ TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
   *ps_sh << "virtual ~_TAO_" << this->interface_name_ << "_Proxy_Broker (void);";  ps_sh->nl ();
   *ps_sh << "virtual _TAO_" << this->interface_name_ << "_Proxy_Impl &select_proxy (";  ps_sh->nl ();
   *ps_sh << this->interface_name_ << "*object";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ") = 0;";  ps_sh->nl ();
 
   *ps_sh << "protected:";  ps_sh->nl ();
@@ -659,7 +659,7 @@ TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
 
   *ps_sh << "virtual _TAO_" << this->interface_name_ << "_Proxy_Impl &select_proxy (";  ps_sh->nl ();
   *ps_sh << this->interface_name_ << "*object";  ps_sh->nl ();
-  *ps_sh << "ACE_ENV_ARG_DECL";  ps_sh->nl ();
+  *ps_sh << "";  ps_sh->nl ();
   *ps_sh << ");";  ps_sh->nl ();
 
   *ps_sh << "private:";  ps_sh->nl ();
@@ -771,7 +771,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   *ps_si << "CORBA::Object *p";
   ps_si->nl ();
 
-  *ps_si << "ACE_ENV_ARG_DECL";   ps_si->nl ();
+  *ps_si << "";   ps_si->nl ();
   *ps_si << ")";
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -781,7 +781,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "return " << this->interface_name_
-         << "::_narrow (p ACE_ENV_ARG_PARAMETER);";
+         << "::_narrow (p);";
   ps_si->decr_indent (0);
   ps_si->nl ();
   *ps_si << "}";
@@ -1126,7 +1126,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "CORBA::Object *p";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_DECL";   ps_si->nl ();
+  *ps_si << "";   ps_si->nl ();
   *ps_si << ")";
 
   ps_si->decr_indent (0);
@@ -1137,7 +1137,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "return ::" << this->interface_name_
-         << "::_narrow (p ACE_ENV_ARG_PARAMETER);";
+         << "::_narrow (p);";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -1474,7 +1474,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0);
   ps_si->nl ();
   *ps_si << "::" << this->interface_name_ << " *";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_DECL_NOT_USED";   ps_si->nl ();
+  *ps_si << "";   ps_si->nl ();
   *ps_si << ")";
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -1600,7 +1600,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0);
   ps_si->nl ();
   *ps_si << "CORBA::Object_ptr obj";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_DECL";
+  *ps_si << "";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -1629,9 +1629,8 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "CORBA::Boolean is_a = obj->_is_a (\"IDL:"
-         << this->interface_name_ << ":1.0\" ACE_ENV_ARG_PARAMETER);";
+         << this->interface_name_ << ":1.0\");";
   ps_si->nl ();
-  *ps_si << "ACE_CHECK_RETURN (" << this->interface_name_ << "::_nil ());";   ps_si->nl ();
 
   *ps_si << "if (is_a == 0)";
   ps_si->incr_indent (0);
@@ -1646,7 +1645,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "return " << this->interface_name_
-         << "::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);";
+         << "::_unchecked_narrow (obj);";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -1661,7 +1660,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0);
   ps_si->nl ();
   *ps_si << "CORBA::Object_ptr obj";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_DECL_NOT_USED";   ps_si->nl ();
+  *ps_si << "";   ps_si->nl ();
   *ps_si << ")";
 
   ps_si->decr_indent (0);
@@ -1857,7 +1856,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "CORBA::Boolean " << this->interface_name_
-         << "::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)";   ps_si->nl ();
+         << "::_is_a (const CORBA::Char *value)";   ps_si->nl ();
 
   *ps_si << "{";
   ps_si->incr_indent (0);
@@ -1880,7 +1879,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
 
   ps_si->incr_indent (0);
   ps_si->nl ();
-  *ps_si << "return this->Object::_is_a (value ACE_ENV_ARG_PARAMETER);";
+  *ps_si << "return this->Object::_is_a (value);";
   ps_si->decr_indent (0);
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -2142,7 +2141,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0);
   ps_si->nl ();
   *ps_si << "_tc_" << this->interface_name_ << "";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_PARAMETER";
+  *ps_si << "";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -2151,7 +2150,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->decr_indent (0);
   ps_si->decr_indent (0);
   ps_si->nl ();
-  *ps_si << "ACE_TRY_CHECK;";
+;
 
   ps_si->nl ();
   ps_si->nl ();
@@ -2322,7 +2321,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->nl ();
 
   *ps_si << "obj.in ()";   ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_PARAMETER";
+  *ps_si << "";
 
   ps_si->decr_indent (0);
   ps_si->nl ();
@@ -2333,7 +2332,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
   ps_si->decr_indent (0);
   ps_si->nl ();
 
-  *ps_si << "ACE_TRY_CHECK;";   ps_si->nl ();
+;   ps_si->nl ();
   *ps_si << "return 1;";
 
   ps_si->decr_indent (0);
diff --git a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
index 49f72b07b7e..87662739954 100644
--- a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
@@ -369,12 +369,12 @@ TAO_PSDL_Struct_Visitor::gen_code_for_si (void)
   ps_si->incr_indent (0); ps_si->nl ();
 
   *ps_si << "_tc_" << this->struct_name_ << ""; ps_si->nl ();
-  *ps_si << "ACE_ENV_ARG_PARAMETER";
+  *ps_si << "";
 
   ps_si->decr_indent (0); ps_si->nl ();
 
   *ps_si << ");"; ps_si->nl ();
-  *ps_si << "ACE_TRY_CHECK;"; ps_si->nl ();
+; ps_si->nl ();
 
   *ps_si << "if (result == 0)"; ps_si->nl ();
 
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 83e325bcde7..8e9c433e38b 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -50,23 +50,19 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
   CORBA::ORB_var orb;
   PortableServer::POAManager_ptr poa_manager;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Initialize ORB manager.
-      this->orb_manager_.init (command_line.get_argc(), command_line.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_manager_.init (command_line.get_argc(), command_line.get_ASCII_argv());
 
       orb = this->orb_manager_.orb ();
-      ACE_TRY_CHECK;
 
       poa_manager = this->orb_manager_.poa_manager ();
-      ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Check the non-ORB arguments.  this needs to come before we
       // initialize the scheduler implementation so that we know which
@@ -79,26 +75,16 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
       // Construct a scheduler implementation of the specified type.
       switch (this->scheduler_type_)
         {
-
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
           case RECONFIG:
             ACE_NEW_THROW_EX (scheduler_impl_,
                               RECONFIG_SCHED_TYPE,
                               CORBA::NO_MEMORY ());
-            ACE_TRY_CHECK;
             break;
 
-#endif  /* __GNUC__ */
-
           case CONFIG:
             ACE_NEW_THROW_EX (scheduler_impl_,
                               CONFIG_SCHED_TYPE,
                               CORBA::NO_MEMORY ());
-            ACE_TRY_CHECK;
             break;
 
           default:
@@ -109,24 +95,20 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
 
       // Locate the naming service.
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to locate the Naming Service.\n"),
                           -1);
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       RtecScheduler::Scheduler_var scheduler =
-        this->scheduler_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->scheduler_impl_->_this ();
 
       CORBA::String_var scheduler_ior_string =
-        orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (scheduler.in ());
 
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%s>\n"),
                             ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ())));
@@ -135,8 +117,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup (this->service_name_.rep());
-      naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_context->rebind (schedule_name, scheduler.in ());
 
       if (this->ior_file_name_.rep() != 0)
         {
@@ -162,12 +143,11 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Scheduling_Service::init");
+      ex._tao_print_exception ("TAO_Scheduling_Service::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -176,10 +156,10 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
 // Runs the TAO_Scheduling_Service.
 
 int
-TAO_Scheduling_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Scheduling_Service::run (void)
 {
   // Run the ORB manager.
-  return this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->orb_manager_.run ();
 }
 
 
@@ -207,11 +187,6 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
           this->ior_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ());
           break;
 
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
         case 's':
           if (ACE_OS::strcasecmp (ACE_TEXT("CONFIG"), get_opt.optarg) == 0)
             {
@@ -236,16 +211,9 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
             }
           break;
 
-#endif /* __GNUC__ */
-
         case '?':
         default:
 
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
           ACE_DEBUG ((LM_DEBUG,
                       "Usage: %s "
                       "[-n service_name] "
@@ -255,18 +223,6 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
                       "\n",
                       argv[0]));
 
-#else /* __GNUC__ <= 2.8 */
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "Usage: %s "
-                      "[-n service_name] "
-                      "[-p pid_file_name] "
-                      "[-o ior_file_name] "
-                      "\n",
-                      argv[0]));
-
-#endif /* __GNUC__ */
-
           return -1;
         }
     }
@@ -276,7 +232,7 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
 
 int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_Scheduling_Service scheduling_service;
 
@@ -289,15 +245,13 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "%s; running scheduling service\n", __FILE__));
 
-      scheduling_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      scheduling_service.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "schedule_service");
+      ex._tao_print_exception ("schedule_service");
           return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
index 3ffa5426945..37b436330ef 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
@@ -1,26 +1,20 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs/Scheduling_Service/Scheduling_Service
-//
-// = FILENAME
-//    Scheduling_Service.h
-//
-// = DESCRIPTION
-//      This class implements the functionality of a Scheduling Service in
-//      a stand-alone process.
-//
-// = AUTHORS
-//      Chris Gill (cdgill@cs.wustl.edu) Based on the original
-//      Scheduling Service program by David Levine
-//      (levine@cs.wustl.edu) and Carlos O'Ryan (coryan@cs.wustl.edu),
-//      and on the Naming Service program implementation by Marina
-//      Spivak (marina@cs.wustl.edu) and Nagarajan Surendran
-//      (naga@cs.wustl.edu)
-//
-// ============================================================================
+//=============================================================================
+/**
+ *  @file    Scheduling_Service.h
+ *
+ *  $Id$
+ *
+ *    This class implements the functionality of a Scheduling Service in
+ *    a stand-alone process.
+ *
+ *
+ *  @author   Chris Gill (cdgill@cs.wustl.edu) Based on the original
+ *  Scheduling Service program by David Levine (levine@cs.wustl.edu) and
+ *  Carlos O'Ryan (coryan@cs.wustl.edu)
+ *  @author  and on the Naming Service program implementation by Marina   Spivak (marina@cs.wustl.edu) and Nagarajan Surendran   (naga@cs.wustl.edu)
+ */
+//=============================================================================
+
 
 #ifndef TAO_SCHEDULING_SERVICE_H
 #define TAO_SCHEDULING_SERVICE_H
@@ -33,69 +27,64 @@
 #include "orbsvcs/Sched/Config_Scheduler.h"
 #include "ace/SString.h"
 
+/**
+ * @class TAO_Scheduling_Service
+ *
+ * @brief Defines a class that encapsulates the implementation of the
+ * TAO Scheduling Service.
+ *
+ * This class makes use of the TAO_Reconfig_Scheduler and
+ * ACE_Config_Scheduler classes to implement the Scheduling Service.
+ */
 class TAO_Scheduling_Service
 {
-  // = TITLE
-  //   Defines a class that encapsulates the implementation of the
-  //   TAO Scheduling Service.
-  //
-  // = DESCRIPTION
-  //   This class makes use of the <TAO_Reconfig_Scheduler> and
-  //   <ACE_Config_Scheduler> classes to implement the Scheduling Service.
 public:
+  /// Default Constructor.
   TAO_Scheduling_Service (void);
-  // Default Constructor.
 
+  /// Constructor taking the command-line arguments.
   TAO_Scheduling_Service (int argc, ACE_TCHAR* argv[]);
-  // Constructor taking the command-line arguments.
 
+  /// Initialize the Scheduling Service with the arguments.
   int init (int argc, ACE_TCHAR* argv[]);
-  // Initialize the Scheduling Service with the arguments.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  // Run the TAO_Scheduling_Service.
+  /// Run the TAO_Scheduling_Service.
+  int run (void);
 
+  /// Destructor.
   ~TAO_Scheduling_Service (void);
-  // Destructor.
 
 private:
   typedef ACE_Config_Scheduler CONFIG_SCHED_TYPE;
 
-// The templatized method parameters needed by the reconfig scheduler
-// class template are hopelessly broken on pre-2.8 versions of g++.
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
-(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-
   typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy,
                                  TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE;
 
-#endif  /* __GNUC__ */
-
   enum Scheduler_Type {CONFIG, RECONFIG};
 
+  /// parses the arguments.
   int parse_args (int argc, ACE_TCHAR* argv[]);
-  // parses the arguments.
 
+  /// The ORB manager.  This must be the first thing in the
   TAO_ORB_Manager orb_manager_;
-  // The ORB manager.  This must be the first thing in the
 
+  /// Scheduler instance.
   POA_RtecScheduler::Scheduler *scheduler_impl_;
-  // Scheduler instance.
 
+  /// Name of the IOR output file.
   ACE_CString ior_file_name_;
-  // Name of the IOR output file.
 
+  /// Name of the process id output file.
   ACE_CString pid_file_name_;
-  // Name of the process id output file.
 
+  /// Name used to register the service.
   ACE_CString service_name_;
-  // Name used to register the service.
 
+  /// Type of scheduler with which to instantiate the service.
   Scheduler_Type scheduler_type_;
-  // Type of scheduler with which to instantiate the service.
 
+  /// A reference to the ORB, to shut it down properly.
   CORBA::ORB_var orb_;
-  // A reference to the ORB, to shut it down properly.
 };
 
 #endif /* TAO_SCHEDULING_SERVICE_H */
diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
index b711c0e363b..7063ce4f534 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
@@ -39,15 +39,13 @@ extern "C" void handler (int)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter argcon (argc, argv);
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
-                         "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP);
 
@@ -55,8 +53,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           ACE_Time_Value tv (5, 0);
 
-          orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->perform_work (tv);
 
           ACE_DEBUG ((LM_DEBUG,
                       "Reconfig flag = %d\n",
@@ -67,11 +64,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, argv[0]);
+      ex._tao_print_exception (argv[0]);
     }
-  ACE_ENDTRY;
 
   return -1;
 }
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index ab42e2787f7..12c5d3a7f6a 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -59,8 +59,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
 
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       for (char *str = ACE_OS::strtok (data, "\n");
            str != 0 ;
@@ -71,9 +70,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
                       ACE_TEXT_CHAR_TO_TCHAR(str)));
 
           CORBA::Object_var objref =
-            this->orb_->string_to_object (str
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->string_to_object (str);
 
           // Return if the server reference is nil.
           if (CORBA::is_nil (objref.in ()))
@@ -85,18 +82,15 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
             }
 
           CosTime::TimeService_ptr server =
-            CosTime::TimeService::_narrow (objref.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CosTime::TimeService::_narrow (objref.in ());
 
           this->insert_server (server);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception"));
+      ex._tao_print_exception (ACE_TEXT("Exception"));
     }
-  ACE_ENDTRY;
 
   ACE_OS::close (f_handle);
   ior_buffer.alloc ()->free (data);
@@ -177,8 +171,7 @@ Clerk_i::parse_args (int argc,
 int
 Clerk_i::get_first_IOR (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       char host_name[MAXHOSTNAMELEN];
 
@@ -194,15 +187,11 @@ Clerk_i::get_first_IOR (void)
 
       // Resolve name.
       CORBA::Object_var temp_object =
-        this->naming_client_->resolve (server_context_name
-                                       ACE_ENV_ARG_PARAMETER);
+        this->naming_client_->resolve (server_context_name);
 
-      ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var server_context =
-        CosNaming::NamingContext::_narrow (temp_object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (temp_object.in ());
 
       if (CORBA::is_nil (server_context.in ()))
         ACE_DEBUG ((LM_DEBUG,
@@ -219,14 +208,10 @@ Clerk_i::get_first_IOR (void)
       server_name[0].id = bindings_list[0u].binding_name[0].id;
 
       temp_object =
-        server_context->resolve (server_name
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_context->resolve (server_name);
 
       CosTime::TimeService_var obj =
-        CosTime::TimeService::_narrow (temp_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosTime::TimeService::_narrow (temp_object.in ());
 
       if (CORBA::is_nil (obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -246,12 +231,11 @@ Clerk_i::get_first_IOR (void)
                            ACE_TEXT("[CLERK] Process/Thread Id : (%P/%t) Unable to get next N IORs ")),
                           -1);;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception"));
+      ex._tao_print_exception (ACE_TEXT("Exception"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -264,17 +248,14 @@ int
 Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
                       CosNaming::NamingContext_var server_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosNaming::Binding_var binding;
 
       if (!CORBA::is_nil (iter.in ()))
         {
-          while (iter->next_one (binding.out ()
-                                 ACE_ENV_ARG_PARAMETER))
+          while (iter->next_one (binding.out ()))
             {
-              ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT("Getting IOR of the server: %s\n\n"),
@@ -285,30 +266,23 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
               server_name[0].id = binding->binding_name[0].id;
 
               CORBA::Object_var temp_object =
-                server_context->resolve (server_name
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                server_context->resolve (server_name);
 
               CosTime::TimeService_ptr server =
-                CosTime::TimeService::_narrow (temp_object.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CosTime::TimeService::_narrow (temp_object.in ());
 
               this->insert_server (server);
             }
 
-          ACE_TRY_CHECK;
         }
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT("Unexpected exception in next_n_IORs\n"));
+      ex._tao_print_exception (
+        ACE_TEXT ("Unexpected exception in next_n_IORs\n"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -327,8 +301,7 @@ Clerk_i::init_naming_service ()
 int
 Clerk_i::create_clerk (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // Create a new clerk object. Pass it the timer value, the set
@@ -345,9 +318,7 @@ Clerk_i::create_clerk (void)
 
       // Convert the clerk reference to a string.
       CORBA::String_var objref_clerk =
-        this->orb_->object_to_string (this->time_service_clerk_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (this->time_service_clerk_.in ());
 
       // Print the clerk IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
@@ -366,12 +337,11 @@ Clerk_i::create_clerk (void)
       // Register the clerk implementation with the Interface
       // Repository.  init_IR();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception"));
+      ex._tao_print_exception (ACE_TEXT("Exception"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -382,8 +352,7 @@ Clerk_i::create_clerk (void)
 int
 Clerk_i::register_clerk (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Bind the Clerk in its appropriate Context.
 
@@ -391,18 +360,15 @@ Clerk_i::register_clerk (void)
       clerk_context_name.length (1);
       clerk_context_name[0].id = CORBA::string_dup ("ClerkContext");
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY_EX(bind_new_context)
+      try
         {
           CosNaming::NamingContext_var clerk_context =
 	    this->naming_client_->bind_new_context(clerk_context_name);
-	  ACE_TRY_CHECK_EX(bind_new_context);
 	}
-      ACE_CATCH(CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
 	  // OK, naming context already exists.
         }
-      ACE_ENDTRY;
 
       char host_name[MAXHOSTNAMELEN];
       char clerk_mc_name[MAXHOSTNAMELEN];
@@ -419,17 +385,14 @@ Clerk_i::register_clerk (void)
       clerk_name[1].id = CORBA::string_dup (clerk_mc_name);
 
       this->naming_client_->rebind (clerk_name,
-                                     this->time_service_clerk_.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     this->time_service_clerk_.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT("(%P|%t) Exception from init_naming_service ()\n"));
+      ex._tao_print_exception (
+        ACE_TEXT ("(%P|%t) Exception from init_naming_service ()\n"));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -438,10 +401,9 @@ Clerk_i::register_clerk (void)
 
 int
 Clerk_i::init (int argc,
-               ACE_TCHAR *argv[]
-               ACE_ENV_ARG_DECL)
+               ACE_TCHAR *argv[])
 {
-  ACE_TRY
+  try
     {
       // Make a copy of command line parameter.
       ACE_Argv_Type_Converter command(argc, argv);
@@ -455,20 +417,16 @@ Clerk_i::init (int argc,
 
 
       this->orb_manager_.init (command.get_argc(),
-                               command.get_ASCII_argv()
-                               ACE_ENV_ARG_PARAMETER);
+                               command.get_ASCII_argv());
 
-      ACE_TRY_CHECK;
 
       if (this->orb_manager_.init_child_poa (command.get_argc(),
                                              command.get_ASCII_argv(),
-                                             "child_poa"
-                                             ACE_ENV_ARG_PARAMETER) == -1)
+                                             "child_poa") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("%p\n"),
                            ACE_TEXT("init_child_poa")),
                           -1);
-      ACE_TRY_CHECK;
 
       // Get the ORB.
       this->orb_ = this->orb_manager_.orb ();
@@ -511,37 +469,34 @@ Clerk_i::init (int argc,
       // Close the open file handler.
       // ACE_OS::fclose (this->ior_fp_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT("(%P|%t) Exception in Clerk_i::init ()\n"));
+      ex._tao_print_exception (
+        ACE_TEXT ("(%P|%t) Exception in Clerk_i::init ()\n"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 int
-Clerk_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Clerk_i::run (void)
 {
-  ACE_TRY
+  try
     {
       // Run the main event loop for the ORB.
-      int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int r = this->orb_manager_.run ();
 
       if (r == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) Clerk_i::run")),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT("(%P|%t) Exception in Clerk_i::run ()\n"));
+      ex._tao_print_exception (
+        ACE_TEXT ("(%P|%t) Exception in Clerk_i::run ()\n"));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index 9f3f9283837..bd9ce302f01 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -51,11 +51,10 @@ public:
   // Set of available Time servers.
 
   int init (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+            ACE_TCHAR *argv[]);
   // Initialize the Clerk state - parsing arguments and waiting.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
 private:
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index b1c846e398f..be7e2adfc7d 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -81,8 +81,7 @@ Server_i::init_naming_service ()
 int
 Server_i::create_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // Create a new server object.
@@ -93,21 +92,15 @@ Server_i::create_server (void)
       // Register a servant with the child poa.
       CORBA::String_var server_str =
         this->orb_manager_.activate_under_child_poa ("server",
-                                                     this->time_service_server_impl_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                     this->time_service_server_impl_);
 
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("server");
 
       CORBA::Object_var server_ref =
-        this->orb_manager_.child_poa ()->id_to_reference (id.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.child_poa ()->id_to_reference (id.in ());
 
-      this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in ());
 
       // All this !! just to register a servant with the child poa.
       // Instead of using _this ().
@@ -115,9 +108,7 @@ Server_i::create_server (void)
       //Convert the server reference to a string.
 
       CORBA::String_var objref_server =
-        this->orb_->object_to_string (server_ref.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (server_ref.in ());
 
       // Print the server IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
@@ -136,13 +127,12 @@ Server_i::create_server (void)
           ACE_OS::fclose (this->ior_output_file_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT("Exception in Server_i::create_server ()"));
+      ex._tao_print_exception (
+        ACE_TEXT ("Exception in Server_i::create_server ()"));
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -153,25 +143,21 @@ Server_i::create_server (void)
 int
 Server_i::register_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosNaming::Name server_context_name;
       server_context_name.length (1);
       server_context_name[0].id = CORBA::string_dup ("ServerContext");
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY_EX(bind_new_context)
+      try
         {
           CosNaming::NamingContext_var server_context =
 	    this->naming_client_->bind_new_context(server_context_name);
-          ACE_TRY_CHECK_EX(bind_new_context);
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
 	  // OK, naming context already exists.
 	}
-      ACE_ENDTRY;
 
       char host_name[MAXHOSTNAMELEN];
       char server_mc_name[MAXHOSTNAMELEN];
@@ -188,21 +174,18 @@ Server_i::register_server (void)
       // to the Naming Server.
 
       this->naming_client_->rebind (server_name,
-                                    this->time_service_server_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    this->time_service_server_.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("Binding ServerContext -> %s\n"),
                   ACE_TEXT_CHAR_TO_TCHAR(server_name[1].id.in ())));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT("(%P|%t) Exception from Register Server ()\n"));
+      ex._tao_print_exception (
+        ACE_TEXT ("(%P|%t) Exception from Register Server ()\n"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -213,10 +196,9 @@ Server_i::register_server (void)
 
 int
 Server_i::init (int argc,
-                ACE_TCHAR *argv[]
-                ACE_ENV_ARG_DECL)
+                ACE_TCHAR *argv[])
 {
-  ACE_TRY
+  try
     {
       // Make a copy of command line parameter.
       ACE_Argv_Type_Converter command(argc, argv);
@@ -227,9 +209,7 @@ Server_i::init (int argc,
       int retval = this->orb_manager_.init_child_poa (
                       command.get_argc(),
                       command.get_ASCII_argv(),
-                      "time_server"
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      "time_server");
 
       if (retval == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -238,8 +218,7 @@ Server_i::init (int argc,
                            -1);
 
       // Activate the POA Manager.
-      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_manager_.activate_poa_manager ();
 
       int result = this->parse_args (command.get_argc(), command.get_TCHAR_argv());
 
@@ -259,12 +238,11 @@ Server_i::init (int argc,
       this->register_server ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Exception:"));
+      ex._tao_print_exception (ACE_TEXT("Exception:"));
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -273,10 +251,9 @@ Server_i::init (int argc,
 // Run the event loop for ORB.
 
 int
-Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Server_i::run (void)
 {
-  int retval = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int retval = this->orb_manager_.run ();
 
   if (retval == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index 7889d95e37b..2727cc51ec8 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -41,11 +41,10 @@ public:
   // Destructor.
 
   int init (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+            ACE_TCHAR *argv[]);
   // Initialize the Server state.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
   int init_naming_service ();
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index 97d8d30a3db..8a0347b8c09 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -15,30 +15,26 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service clerk\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int r = clerk.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int r = clerk.init (argc, argv);
       if (r == -1)
         return 1;
       else
         {
-          clerk.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          clerk.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index a265a39ed35..4b2714a3c24 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -15,31 +15,27 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service server\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int r = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int r = server.init (argc, argv);
 
       if (r == -1)
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
index 21bbeee0fa2..c9edd7d053c 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
@@ -10,28 +10,25 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   Trading_Service trader;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       int check =
-        trader.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        trader.init (argc, argv);
 
       if (check != -1)
         {
-          trader.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          trader.run ();
         }
       else
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the trader.\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Trading Service");
+      ex._tao_print_exception ("Trading Service");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index d77402f07e2..3b644cb93bd 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -49,8 +49,7 @@ Trading_Service::~Trading_Service (void)
 
 int
 Trading_Service::init (int argc,
-                       ACE_TCHAR *argv[]
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       ACE_TCHAR *argv[])
 {
   int result_trader =
     this->trading_loader_.init (argc, argv);
@@ -62,13 +61,12 @@ Trading_Service::init (int argc,
 }
 
 int
-Trading_Service::run (ACE_ENV_SINGLE_ARG_DECL)
+Trading_Service::run (void)
 {
   Trading_Shutdown trading_shutdown (*this);
 
   int return_value =
-    this->trading_loader_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->trading_loader_.run ();
 
   return return_value;
 }
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index 951b67e6ecf..b33337661f7 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -63,11 +63,10 @@ public:
   // Destructor
 
   int init (int argc,
-            ACE_TCHAR *argv[]
-            ACE_ENV_ARG_DECL);
+            ACE_TCHAR *argv[]);
   // Initialize the Trading Service with arguments.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the Trading Service.
 
   int shutdown (void);
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 78b17a2bac9..9ec72d46d84 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -24,8 +24,7 @@ TAO_CosEventChannelFactory_i::~TAO_CosEventChannelFactory_i (void)
 int
 TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
                                     const char* child_poa_name,
-                                    CosNaming::NamingContext_ptr naming
-                                    ACE_ENV_ARG_DECL)
+                                    CosNaming::NamingContext_ptr naming)
 {
   // Check if we have a parent poa.
   if (CORBA::is_nil (poa))
@@ -37,14 +36,10 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
   // Create a UNIQUE_ID and USER_ID policy because we want the POA
   // to detect duplicates for us.
   PortableServer::IdUniquenessPolicy_var idpolicy =
-    poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID);
 
   PortableServer::IdAssignmentPolicy_var assignpolicy =
-    poa->create_id_assignment_policy (PortableServer::USER_ID
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Create a PolicyList
   CORBA::PolicyList policy_list;
@@ -55,23 +50,18 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
     PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ());
 
   PortableServer::POAManager_ptr manager =
-    poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->the_POAManager ();
   // @@ Pradeep : TODO - find a way to destroy the policy_list if we return here.
 
   // Create the child POA.
   this->poa_ = poa->create_POA (child_poa_name,
                                 manager,
-                                policy_list
-                                ACE_ENV_ARG_PARAMETER);
+                                policy_list);
 
-  ACE_CHECK_RETURN (-1);
 
-  idpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  idpolicy->destroy ();
 
-  assignpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  assignpolicy->destroy ();
 
   //this->poa_ =  PortableServer::POA::_duplicate (poa);
   // uncomment this if we want to use the parent poa for some reason.
@@ -80,8 +70,7 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
 
 CosEventChannelAdmin::EventChannel_ptr
 TAO_CosEventChannelFactory_i::create (const char * channel_id,
-                                      CORBA::Boolean store_in_naming_service
-                                      ACE_ENV_ARG_DECL)
+                                      CORBA::Boolean store_in_naming_service)
   ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventChannelFactory::DuplicateChannel,
@@ -92,15 +81,14 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
 
   CosEventChannelAdmin::EventChannel_var ec_return;
 
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId (channel_id);
 
       // let all those contained in FactoryEC use the default POA.
       // We only need the FactoryEC's to be unique!
-      PortableServer::POA_ptr defPOA = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POA_ptr defPOA = this->_default_POA ();
 
       TAO_CEC_EventChannel_Attributes attr (defPOA, defPOA);
 
@@ -108,23 +96,18 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
       ACE_NEW_THROW_EX (impl,
                         TAO_CEC_EventChannel (attr, 0, 0),
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
 
       auto_ptr <TAO_CEC_EventChannel> ec (impl);
 
-      impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      impl->activate ();
 
       this->poa_->activate_object_with_id (oid.in (),
-                                           ec.get ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           ec.get ());
 
       ec.release ();
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->id_to_reference (oid.in ());
 
       if (store_in_naming_service &&
           !CORBA::is_nil (this->naming_.in ()))
@@ -134,55 +117,51 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
           name[0].id = CORBA::string_dup (channel_id);
 
           this->naming_->rebind (name,
-                                 obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                 obj.in ());
         }
 
       ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
     }
-  ACE_CATCH (PortableServer::POA::ServantAlreadyActive, sa_ex)
+  catch (const PortableServer::POA::ServantAlreadyActive&)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
                         ec_return._retn ());
     }
-  ACE_CATCH (PortableServer::POA::ObjectAlreadyActive, oaa_ex)
+  catch (const PortableServer::POA::ObjectAlreadyActive&)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
                         ec_return._retn ());
     }
-  ACE_CATCH (PortableServer::POA::WrongPolicy, wp_ex)
+  catch (const PortableServer::POA::WrongPolicy&)
     {
       ACE_THROW_RETURN (CORBA::UNKNOWN (),
                         ec_return._retn ());
     }
-  ACE_CATCH (PortableServer::POA::ObjectNotActive, ona_ex)
+  catch (const PortableServer::POA::ObjectNotActive&)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, nf_ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_CATCH (CosNaming::NamingContext::CannotProceed, cp_ex)
+  catch (const CosNaming::NamingContext::CannotProceed&)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, in_ex)
+  catch (const CosNaming::NamingContext::InvalidName&)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ab)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
                         ec_return._retn ());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (ec_return._retn ());
 
   return ec_return._retn ();
 }
@@ -192,7 +171,6 @@ TAO_CosEventChannelFactory_i::destroy
 (
  const char * channel_id,
  CORBA::Boolean unbind_from_naming_service
- ACE_ENV_ARG_DECL
  )
  ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -201,24 +179,19 @@ TAO_CosEventChannelFactory_i::destroy
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
-  ACE_TRY
+  try
     {
       // Get hold of the objectid first.
       PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId (channel_id);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->id_to_reference (oid.in ());
 
       CosEventChannelAdmin::EventChannel_var fact_ec =
-        CosEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
 
-      fact_ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fact_ec->destroy ();
 
       // Remove from the naming service.
       if (unbind_from_naming_service &&
@@ -228,36 +201,31 @@ TAO_CosEventChannelFactory_i::destroy
           name.length (1);
           name[0].id = CORBA::string_dup (channel_id);
 
-          this->naming_->unbind (name
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->naming_->unbind (name);
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, nf_ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       return; // don't bother the user with exceptions if unbind fails.
     }
-  ACE_CATCH (CosNaming::NamingContext::CannotProceed, cp_ex)
+  catch (const CosNaming::NamingContext::CannotProceed&)
     {
       return; // don't bother the user with exceptions if unbind fails.
     }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, in_ex)
+  catch (const CosNaming::NamingContext::InvalidName&)
     {
       return; // don't bother the user with exceptions if unbind fails.
     }
-  ACE_CATCH (CORBA::UserException, ue) // Translate any other user exception.
+  catch (const CORBA::UserException&)// Translate any other user exception.
     {
-      ACE_THROW (CosEventChannelFactory::NoSuchChannel ());
+      throw CosEventChannelFactory::NoSuchChannel ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 CosEventChannelAdmin::EventChannel_ptr
 TAO_CosEventChannelFactory_i::find
 (
  const char * channel_id
- ACE_ENV_ARG_DECL
  )
   ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -268,25 +236,21 @@ TAO_CosEventChannelFactory_i::find
 
   CosEventChannelAdmin::EventChannel_var ec_return;
 
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId (channel_id);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->id_to_reference (oid.in ());
 
       ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
     }
-  ACE_CATCH (CORBA::UserException, ue) // Translate any user exception.
+  catch (const CORBA::UserException&)// Translate any user exception.
     {
       ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
                         ec_return._retn ());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (ec_return._retn ());
 
   return ec_return._retn ();
 }
@@ -295,7 +259,6 @@ char*
 TAO_CosEventChannelFactory_i::find_channel_id
 (
  CosEventChannelAdmin::EventChannel_ptr channel
- ACE_ENV_ARG_DECL
  )
   ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -305,22 +268,18 @@ TAO_CosEventChannelFactory_i::find_channel_id
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
   CORBA::String_var str_return;
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId_var oid =
-        this->poa_->reference_to_id (channel
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->reference_to_id (channel);
 
       str_return = PortableServer::ObjectId_to_string (oid.in ());
     }
-  ACE_CATCH (CORBA::UserException, ue) // Translate any user exception.
+  catch (const CORBA::UserException&)// Translate any user exception.
     {
       ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
                         str_return._retn ());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (str_return._retn ());
 
   return str_return._retn ();
 }
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index f1a137b5372..0afbde49bd2 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -42,8 +42,7 @@ class TAO_CosEventChannelFactory_i :
 
   int init (PortableServer::POA_ptr poa,
             const char* child_poa_name,
-            CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil ()
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+            CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil ());
   // This method creates a child poa with <poa> as the
   // parent. It also accepts a Naming_Context which is used to register
   // the event channels if specified.
@@ -58,7 +57,7 @@ class TAO_CosEventChannelFactory_i :
   //    doesn't have to be exposed through the IDL interface. Anyway,
   //    there must be a way to cleanup any resources created by the
   //    factory, and you must avoid CORBA calls in the destructor,
-  //    first because you won't have an ACE_ENV_SINGLE_ARG_PARAMETER and second because
+  //    first because you won't have an and second because
   //    exceptions in destructors are evil.
   // @@ Pradeep: anyway you can just use exceptions and not return -1?
 
@@ -67,7 +66,6 @@ class TAO_CosEventChannelFactory_i :
     (
      const char * channel_id,
      CORBA::Boolean store_in_naming_service
-     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -79,7 +77,6 @@ class TAO_CosEventChannelFactory_i :
     (
      const char * channel_id,
      CORBA::Boolean unbind_from_naming_service
-     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -89,7 +86,6 @@ class TAO_CosEventChannelFactory_i :
   virtual CosEventChannelAdmin::EventChannel_ptr find
     (
      const char * channel_id
-     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -99,7 +95,6 @@ class TAO_CosEventChannelFactory_i :
   virtual char * find_channel_id
     (
      CosEventChannelAdmin::EventChannel_ptr channel
-     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 72c9ebc763b..44632007a6a 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -21,39 +21,35 @@ public:
   virtual ~FactoryClient (void);
   // destructor.
 
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Try to get hold of a running naming service.
 
-  void resolve_factory (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_factory (void);
   // Try to resolve the factory from the Naming service.
 
   CosEventChannelFactory::ChannelFactory_ptr
-  create_factory (ACE_ENV_SINGLE_ARG_DECL);
+  create_factory (void);
   // Create a local Factory and also set the <factory_>.
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void run_test (void);
   // Runs a couple of tests to check if the factory behaves correctly.
 
 protected:
   CosEventChannelAdmin::EventChannel_ptr
       create_channel (const char *channel_id,
-                     CosEventChannelFactory::ChannelFactory_ptr factory
-                     ACE_ENV_ARG_DECL);
+                     CosEventChannelFactory::ChannelFactory_ptr factory);
   // Create a channel.
 
-  void destroy_channel (const char *channel_id
-                       ACE_ENV_ARG_DECL);
+  void destroy_channel (const char *channel_id);
   // Destroy the channel.
 
-  void find_channel (const char* channel_id
-                    ACE_ENV_ARG_DECL);
+  void find_channel (const char* channel_id);
   // Find a channel.
 
-  void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
-                       ACE_ENV_ARG_DECL);
+  void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel);
   // Find a channel.
 
   // = Protected Data members.
@@ -87,37 +83,31 @@ FactoryClient::~FactoryClient (void)
 
 void
 FactoryClient::init_ORB (int argc,
-                       char *argv []
-                       ACE_ENV_ARG_DECL)
+                       char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 }
 
 void
-FactoryClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+FactoryClient::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 
   this->use_naming_service = 1;
 }
 
 void
-FactoryClient::resolve_factory (ACE_ENV_SINGLE_ARG_DECL)
+FactoryClient::resolve_factory (void)
 {
   ACE_ASSERT (this->use_naming_service == 1);
 
@@ -126,18 +116,14 @@ FactoryClient::resolve_factory (ACE_ENV_SINGLE_ARG_DECL)
   name[0].id = CORBA::string_dup (this->factory_name_);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_context_->resolve (name);
 
   this->factory_ =
-    CosEventChannelFactory::ChannelFactory::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosEventChannelFactory::ChannelFactory::_narrow (obj.in ());
 }
 
 CosEventChannelFactory::ChannelFactory_ptr
-FactoryClient::create_factory (ACE_ENV_SINGLE_ARG_DECL)
+FactoryClient::create_factory (void)
 {
   ACE_THROW_RETURN (CORBA::UNKNOWN (),
                     CosEventChannelFactory::ChannelFactory::_nil ());
@@ -145,8 +131,7 @@ FactoryClient::create_factory (ACE_ENV_SINGLE_ARG_DECL)
 
 CosEventChannelAdmin::EventChannel_ptr
 FactoryClient::create_channel (const char *channel_id,
-                            CosEventChannelFactory::ChannelFactory_ptr factory
-                              ACE_ENV_ARG_DECL)
+                            CosEventChannelFactory::ChannelFactory_ptr factory)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Trying to create channel %s\n", channel_id));
@@ -154,12 +139,10 @@ FactoryClient::create_channel (const char *channel_id,
   CosEventChannelAdmin::EventChannel_var ec =
     CosEventChannelAdmin::EventChannel::_nil ();
 
-  ACE_TRY
+  try
     {
       ec = factory->create (channel_id,
-                            this->use_naming_service
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            this->use_naming_service);
 
       ACE_ASSERT (!CORBA::is_nil (ec.in ()));
 
@@ -167,96 +150,75 @@ FactoryClient::create_channel (const char *channel_id,
                   "Created Cos Event Channel \"%s \"\n",
                   channel_id));
     }
- ACE_CATCH (CORBA::UserException, ue)
+ catch (const CORBA::UserException& ue)
    {
-     ACE_PRINT_EXCEPTION (ue,
-                          "User Exception in createChannel: ");
+     ue._tao_print_exception ("User Exception in createChannel: ");
      return CosEventChannelAdmin::EventChannel::_nil ();
    }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "System Exception in createChannel: ");
+      se._tao_print_exception ("System Exception in createChannel: ");
       return CosEventChannelAdmin::EventChannel::_nil ();
     }
-  ACE_ENDTRY;
 
   return ec._retn ();
 }
 
 void
-FactoryClient::destroy_channel (const char *channel_id
-                               ACE_ENV_ARG_DECL)
+FactoryClient::destroy_channel (const char *channel_id)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Destroying Cos Event Channel \"%s \"\n",
               channel_id));
 
   this->factory_->destroy (channel_id,
-                           use_naming_service
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           use_naming_service);
 }
 
 void
-FactoryClient::find_channel (const char* channel_id
-                            ACE_ENV_ARG_DECL)
+FactoryClient::find_channel (const char* channel_id)
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "trying to find the Channel \"%s \"\n",
                   channel_id));
 
       CosEventChannelAdmin::EventChannel_var channel =
-        this->factory_->find (channel_id
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->factory_->find (channel_id);
 
 
       CORBA::String_var str =
-        orb_->object_to_string (channel.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (channel.in ());
 
       ACE_DEBUG ((LM_DEBUG,
               "Find returned - %s \n",
                   str.in ()));
 
-      this->find_channel_id (channel.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->find_channel_id (channel.in ());
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "User Exception in findchannel: ");
+      ue._tao_print_exception ("User Exception in findchannel: ");
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "System Exception in findchannel: ");
+      se._tao_print_exception ("System Exception in findchannel: ");
     }
-  ACE_ENDTRY;
 }
 
 void
-FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
-                                ACE_ENV_ARG_DECL)
+FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel)
 {
   CORBA::String_var str =
-    orb_->object_to_string (channel
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb_->object_to_string (channel);
 
   ACE_DEBUG ((LM_DEBUG,
               "trying to find the Channel %s \n",
               str.in ()));
 
   char *channel_id =
-    this->factory_->find_channel_id (channel
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->factory_->find_channel_id (channel);
 
   ACE_DEBUG ((LM_DEBUG,
               "find returned %s\n", channel_id));
@@ -267,7 +229,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
  */
 
 void
-FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL)
+FactoryClient::run_test (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->factory_.in ()));
 
@@ -276,87 +238,53 @@ FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL)
 
   // create the first cosec
   cosec[0] = this->create_channel (channel_id[0],
-                                   this->factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   this->factory_.in ());
 
  // create the second cosec
   cosec[1] = this->create_channel (channel_id[1],
-                                   this->factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   this->factory_.in ());
 
   // create the third cosec
   cosec[2] = this->create_channel (channel_id[2],
-                                   this->factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   this->factory_.in ());
 
   // see it we can destroy this one..
-  this->destroy_channel (channel_id[2]
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_channel (channel_id[2]);
 
   // see if we can find it?
-  this->find_channel_id (cosec[2].in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->find_channel_id (cosec[2].in ());
 
   // see if we can create it again?
   cosec[2] = this->create_channel (channel_id[2],
-                                   this->factory_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   this->factory_.in ());
 
   // try and find a channel that does not exist.
-  this->find_channel ("areyouthere?"
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->find_channel ("areyouthere?");
 
   // see if it can detect duplicates.
   this->create_channel (channel_id[2],
-                        this->factory_.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        this->factory_.in ());
 
   // see if it can give us the id?
-  this->find_channel_id (cosec[0].in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->find_channel_id (cosec[0].in ());
 
-  this->find_channel_id (cosec[1].in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->find_channel_id (cosec[1].in ());
 
-  this->find_channel_id (cosec[2].in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->find_channel_id (cosec[2].in ());
 
   // check if we can get the channels from the id.
-  this->find_channel (channel_id[0]
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->find_channel (channel_id[0]);
 
-  this->find_channel (channel_id[1]
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->find_channel (channel_id[1]);
 
-  this->find_channel (channel_id[2]
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->find_channel (channel_id[2]);
 
   //destroy them all.
-  this->destroy_channel (channel_id[0]
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_channel (channel_id[0]);
 
-  this->destroy_channel (channel_id[1]
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_channel (channel_id[1]);
 
-  this->destroy_channel (channel_id[2]
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_channel (channel_id[2]);
 
   // end of testing.
   ACE_DEBUG ((LM_DEBUG,
@@ -368,51 +296,42 @@ main (int argc, char *argv [])
 {
   ACE_DEBUG ((LM_DEBUG,
               "The FactoryClient will test the Cos Event Channel Factory\n"));
-  ACE_TRY_NEW_ENV
+  try
     {
       FactoryClient ft;
 
       ft.init_ORB (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   argv);
 
-      ACE_TRY_EX (naming)
+      try
         {
-          ft.resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (naming);
+          ft.resolve_naming_service ();
 
-          ft.resolve_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (naming);
+          ft.resolve_factory ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Failed to resolve the naming service");
+          ex._tao_print_exception ("Failed to resolve the naming service");
           ACE_DEBUG ((LM_DEBUG,
                       "Creating a local Factory\n"));
           // TBD:
-          ft.create_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ft.create_factory ();
         }
-      ACE_ENDTRY;
 
-      ft.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ft.run_test ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "test failed: User Exception in FactoryClient: ");
+      ue._tao_print_exception (
+        "test failed: User Exception in FactoryClient: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "test failed: System Exception in FactoryClient: ");
+      se._tao_print_exception (
+        "test failed: System Exception in FactoryClient: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index 845ee110d77..ce42d9e6b87 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -52,14 +52,11 @@ FactoryDriver::parse_args (int argc, char *argv [])
 int
 FactoryDriver::start (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              ""
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              "");
 
       if (this->parse_args (argc, argv) == -1)
         return -1;
@@ -70,9 +67,7 @@ FactoryDriver::start (int argc, char *argv [])
                       -1);
 
       CORBA::Object_var poa_object  =
-        orb_->resolve_initial_references("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -80,18 +75,14 @@ FactoryDriver::start (int argc, char *argv [])
                           -1);
 
       root_poa_ =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+        root_poa_->the_POAManager ();
 
-      ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate ();
 
-      ACE_TRY_CHECK;
 
       // Initialization of the naming service.
       if (naming_client_.init (orb_.in ()) != 0)
@@ -105,25 +96,20 @@ FactoryDriver::start (int argc, char *argv [])
 
       if (factory_servant_->init (root_poa_.in (),
                                   child_poa_name_,
-                                  context.in ()
-                                 ACE_ENV_ARG_PARAMETER) != 0)
+                                  context.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Unable to initialize "
                            "the factory. \n"),
                           1);
 
       // activate the factory in the root poa.
-      factory_ = factory_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      factory_ = factory_servant_->_this ();
 
       // Give the ownership to the POA.
-      factory_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+      factory_servant_->_remove_ref ();
 
-      ACE_TRY_CHECK;
       CORBA::String_var
-        str = orb_->object_to_string (factory_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        str = orb_->object_to_string (factory_.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "CosEvent_Service: The Cos Event Channel Factory IOR is <%s>\n",
@@ -133,29 +119,23 @@ FactoryDriver::start (int argc, char *argv [])
       name.length (1);
       name[0].id = CORBA::string_dup (factoryName_);
       naming_client_->rebind (name,
-                              factory_.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              factory_.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Registered with the naming service as %s\n", factoryName_));
 
       orb_->run ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "cosecfactory: ");
+      ue._tao_print_exception ("cosecfactory: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "cosecfactory: ");
+      se._tao_print_exception ("cosecfactory: ");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index 68f393240e7..fc4bd909e0e 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -18,31 +18,22 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void)
 }
 
 void
-RtEC_Based_CosEC::init_ORB  (int& argc, char *argv []
-                             ACE_ENV_ARG_DECL)
+RtEC_Based_CosEC::init_ORB  (int& argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 
   CORBA::Object_var poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 }
 
 int
@@ -99,45 +90,35 @@ RtEC_Based_CosEC::parse_args (int argc, char *argv [])
 }
 
 void
-RtEC_Based_CosEC::startup (int argc, char *argv[]
-                           ACE_ENV_ARG_DECL)
+RtEC_Based_CosEC::startup (int argc, char *argv[])
 {
   ACE_DEBUG ((LM_DEBUG,
               "Starting up the CosEvent Service...\n"));
 
   // initalize the ORB.
-  this->init_ORB (argc, argv
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_ORB (argc, argv);
 
   if (this->parse_args (argc, argv) == -1)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
-  this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->resolve_naming_service ();
 
   this->init (this->poa_.in (),
               this->poa_.in (),
               this->eventTypeIds_,
               this->eventSourceIds_,
-              this->source_type_pairs_
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+              this->source_type_pairs_);
 
-  this->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->activate ();
 
   // Register ourselves with the naming service.
   ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
 
   CORBA::Object_var obj =
-    this->poa_->servant_to_reference (this
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->servant_to_reference (this);
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->object_to_string (obj.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "The CosEC IOR is <%s>\n", str.in ()));
@@ -147,9 +128,7 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
   name[0].id = CORBA::string_dup (this->service_name);
 
   this->naming_->rebind (name,
-                         obj.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         obj.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "Registered with the naming service as: %s\n",
@@ -157,29 +136,27 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-RtEC_Based_CosEC::create_rtec (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::create_rtec (void)
 {
   // see if the user wants a local RtEC..
   if (this->remote_rtec_ == 0)
-    return CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return CosEC_ServantBase::create_rtec ();
   else
     return 0;
 }
 
 void
-RtEC_Based_CosEC::activate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::activate_rtec (void)
 {
   // see if the user wants to use a local RtEC..
   if (this->remote_rtec_ == 0)
     {
-      CosEC_ServantBase::activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CosEC_ServantBase::activate_rtec ();
     }
   else
     {
       // Try to locate a remote rtec.
-      this->locate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->locate_rtec ();
 
       // Use the return value to check success.
       if (CORBA::is_nil (this->rtec_.in ()))
@@ -189,18 +166,17 @@ RtEC_Based_CosEC::activate_rtec (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-RtEC_Based_CosEC::deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::deactivate_rtec (void)
 {
   // Check if the local rtec is to be deactivated.
   if (this->remote_rtec_ == 0)
     {
-      CosEC_ServantBase::deactivate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CosEC_ServantBase::deactivate_rtec ();
     }
 }
 
 void
-RtEC_Based_CosEC::locate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::locate_rtec (void)
 {
   CosNaming::Name ref_name (1);
   ref_name.length (1);
@@ -208,67 +184,54 @@ RtEC_Based_CosEC::locate_rtec (ACE_ENV_SINGLE_ARG_DECL)
     CORBA::string_dup (this->rt_service_name);
 
   CORBA::Object_var obj =
-    this->naming_->resolve (ref_name
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_->resolve (ref_name);
 
   this->rtec_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
 }
 
 void
-RtEC_Based_CosEC::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("NameService");
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 int
 RtEC_Based_CosEC::run (void)
 {
   ACE_DEBUG ((LM_DEBUG, "%s: Running the CosEventService\n", __FILE__));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-RtEC_Based_CosEC::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::shutdown (void)
 {
   // Deactivate.
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 
   // Unbind from the naming service.
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (this->service_name);
 
-  this->naming_->unbind (name
-                         ACE_ENV_ARG_PARAMETER);
+  this->naming_->unbind (name);
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
@@ -282,12 +245,10 @@ main (int argc, char *argv[])
 
   RtEC_Based_CosEC service;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       service.startup (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       argv);
 
       if (service.run () == -1)
         {
@@ -297,13 +258,11 @@ main (int argc, char *argv[])
                             1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start CosEventService");
+      ex._tao_print_exception ("Failed to start CosEventService");
       return 1;
     }
-  ACE_ENDTRY;
 
   service.shutdown ();
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index 72f1bd8224f..38e44aebee7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -43,8 +43,7 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
   int parse_args (int argc, char *argv []);
   // Parses the command line arguments.
 
-  void startup (int argc, char *argv[]
-               ACE_ENV_ARG_DECL);
+  void startup (int argc, char *argv[]);
   // Initializes the COS Event Service.
   // Returns 0 on success, -1 on error.
 
@@ -52,30 +51,29 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
   // run the COS Event Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void shutdown (void);
   // Shutdown the COS Event Service.
   // Returns 0 on success, -1 on error.
 
 protected:
   // = Methods from CosEC_ServantBase
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (ACE_ENV_SINGLE_ARG_DECL);
+  create_rtec (void);
   // Create a local rtec.
 
-  virtual void activate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void activate_rtec (void);
   // Activates the rtec.
 
-  virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void deactivate_rtec (void);
   // Deactivates the rtec.
 
-  void init_ORB (int& argc, char *argv []
-                 ACE_ENV_ARG_DECL);
+  void init_ORB (int& argc, char *argv []);
   // initialize the ORB.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Resolve the naming service.
 
-  void locate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+  void locate_rtec (void);
   // Locate a rtec.
 
   // = Data members
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
index 8aa8fcdb042..8f682906fc3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
@@ -26,15 +26,14 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   RtecEventChannelAdmin::ProxyPushSupplier_var rtecproxypushsupplier =
-    this->rtec_consumeradmin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxysupplier_nil);
+    this->rtec_consumeradmin_->obtain_push_supplier ();
 
   TAO_CosEC_ProxyPushSupplier_i *proxypushsupplier;
 
@@ -47,19 +46,17 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     auto_proxysupplier (proxypushsupplier);
 
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj =
-    auto_proxysupplier.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxysupplier_nil);
+    auto_proxysupplier.get ()->_this ();
 
    // give the ownership to the POA.
-  auto_proxysupplier.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxysupplier_nil);
+  auto_proxysupplier.get ()->_remove_ref ();
 
   auto_proxysupplier.release ();
   return proxy_obj;
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
index e6142c993ef..e9895d9c3ab 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
@@ -47,12 +47,12 @@ public:
             RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
 
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier(ACE_ENV_SINGLE_ARG_DECL)
+    obtain_push_supplier(void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPushSupplier_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier(ACE_ENV_SINGLE_ARG_DECL)
+    obtain_pull_supplier(void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPullSupplier_ptr.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index 543fb669bf8..f3df43e46d5 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -34,8 +34,7 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
                          PortableServer::POA_ptr poa,
                          char *,
                          char *,
-                         char *
-                         ACE_ENV_ARG_DECL)
+                         char *)
 {
   ACE_ASSERT (!CORBA::is_nil (thispoa));
   ACE_ASSERT (!CORBA::is_nil (poa));
@@ -45,12 +44,10 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
   this->poa_ = PortableServer::POA::_duplicate (poa);
 
   auto_ptr<POA_RtecEventChannelAdmin::EventChannel>
-    auto_rtec_servant_ (this->create_rtec (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+    auto_rtec_servant_ (this->create_rtec ());
 
   auto_ptr<TAO_CosEC_EventChannel_i>
-    auto_cosec_servant_ (this->create_cosec (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+    auto_cosec_servant_ (this->create_cosec ());
 
   // if all the servants were allocated then set the class pointers.
   this->rtec_servant_ = auto_rtec_servant_.release ();
@@ -58,18 +55,16 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
 }
 
 int
-CosEC_ServantBase::activate (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::activate (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
 
   // Activate the Rtec
-  this->activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->activate_rtec ();
 
   // Activate the CosEC
-  int retval = this->activate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int retval = this->activate_cosec ();
   if (retval != 0)
     return -1;
 
@@ -77,35 +72,27 @@ CosEC_ServantBase::activate (ACE_ENV_SINGLE_ARG_DECL)
    // Note that the POA is <thispoa_>
 
    PortableServer::ObjectId_var oid =
-     this->thispoa_->activate_object (this
-                                      ACE_ENV_ARG_PARAMETER);
-   ACE_CHECK_RETURN (-1);
+     this->thispoa_->activate_object (this);
 
-   this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-   ACE_CHECK_RETURN (-1);
+   this->_remove_ref ();
 
    CORBA::Object_var obj =
-     this->thispoa_->id_to_reference (oid.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-   ACE_CHECK_RETURN (-1);
+     this->thispoa_->id_to_reference (oid.in ());
 
    return 0; // success.
 }
 
 int
-CosEC_ServantBase::activate (const char* servant_id
-                             ACE_ENV_ARG_DECL)
+CosEC_ServantBase::activate (const char* servant_id)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
 
   // Activate the Rtec
-  this->activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->activate_rtec ();
 
   // Activate the CosEC
-  int retval = this->activate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int retval = this->activate_cosec ();
   if (retval != 0)
     return -1;
 
@@ -115,44 +102,34 @@ CosEC_ServantBase::activate (const char* servant_id
   // Activate ourselves.
   // Note that the POA is <thispoa_>
   this->thispoa_->activate_object_with_id (oid.in (),
-                                           this
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                           this);
 
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->_remove_ref ();
 
   CORBA::Object_var obj =
-    this->thispoa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->thispoa_->id_to_reference (oid.in ());
 
   return 0; // success.
 }
 
 void
-CosEC_ServantBase::activate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::activate_rtec (void)
 {
   // Activate the Rtec
   PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (this->rtec_servant_
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->activate_object (this->rtec_servant_);
 
-  this->rtec_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->rtec_servant_->_remove_ref ();
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->id_to_reference (oid.in ());
 
   this->rtec_ =
     RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
 }
 
 int
-CosEC_ServantBase::activate_cosec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::activate_cosec (void)
 {
  // Initialize the CosEC servant.
   RtecBase::handle_t supp_handle = 0;
@@ -176,24 +153,17 @@ CosEC_ServantBase::activate_cosec (ACE_ENV_SINGLE_ARG_DECL)
 
   if (this->cosec_servant_->init (consumerqos,
                                   supplierqos,
-                                  this->rtec_.in ()
-                                  ACE_ENV_ARG_PARAMETER) != 0)
+                                  this->rtec_.in ()) != 0)
     return -1;
-  ACE_CHECK_RETURN (-1);
 
   // Activate the CosEC
   PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (this->cosec_servant_
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->activate_object (this->cosec_servant_);
 
-  this->cosec_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->cosec_servant_->_remove_ref ();
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->id_to_reference (oid.in ());
 
   this->cosec_ =
     CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -201,84 +171,69 @@ CosEC_ServantBase::activate_cosec (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CosEC_ServantBase::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::deactivate (void)
 {
   // Deactivate all those we control...
-  this->deactivate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate_rtec ();
 
-  this->deactivate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate_cosec ();
 
   // Finally we go away..
   PortableServer::ObjectId_var oid =
-    this->thispoa_->servant_to_id (this
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->thispoa_->servant_to_id (this);
 
   // deactivate from the poa.
-  this->thispoa_->deactivate_object (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->thispoa_->deactivate_object (oid.in ());
 }
 
 void
-CosEC_ServantBase::deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::deactivate_rtec (void)
 {
   // Deactivate the rtec.
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this->rtec_servant_
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->servant_to_id (this->rtec_servant_);
 
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->deactivate_object (oid.in ());
 }
 
 void
-CosEC_ServantBase::deactivate_cosec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::deactivate_cosec (void)
 {
   // Deactivate the cosec.
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this->cosec_servant_
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->servant_to_id (this->cosec_servant_);
 
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->deactivate_object (oid.in ());
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-CosEC_ServantBase::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::for_consumers (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->cosec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->cosec_->for_consumers ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-CosEC_ServantBase::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::for_suppliers (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->cosec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->cosec_->for_suppliers ();
 }
 
 void
-CosEC_ServantBase::destroy (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate all the contained servants and ourselves.
   // The poa will "destroy" the ref counted servants.
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::create_rtec (void)
 {
   // Create the RtEC servant.
   TAO_EC_Event_Channel_Attributes attr (this->poa_.in (),
@@ -287,20 +242,18 @@ CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (_rtec_servant,
                     TAO_EC_Event_Channel (attr),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return _rtec_servant;
 }
 
 TAO_CosEC_EventChannel_i*
-CosEC_ServantBase::create_cosec (ACE_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::create_cosec (void)
 {
   // Create the CosEC servant.
   TAO_CosEC_EventChannel_i* _cosec_servant;
   ACE_NEW_THROW_EX (_cosec_servant,
                     TAO_CosEC_EventChannel_i (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return _cosec_servant;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
index 2738ff890fe..26eaf55e438 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -50,55 +50,54 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
                      PortableServer::POA_ptr poa,
                      char *eventTypeIds,
                      char *eventSourceIds,
-                     char *source_type_pairs
-                     ACE_ENV_ARG_DECL);
+                     char *source_type_pairs);
   // This method creates a local scheduler, rtec and cosec.
   // The POA <poa> specified here is used when <activate> is called to
   // activate the contained servants.
   // The POA <thispoa> is used to activate this.
 
-  int activate (ACE_ENV_SINGLE_ARG_DECL);
+  int activate (void);
   // Activates the CosEC with <thispoa_> and friends with the <poa_>
 
-  int activate (const char* servant_id ACE_ENV_ARG_DECL);
+  int activate (const char* servant_id);
   // If the servant_id is not nil then it is used to supply the object id
   // for <this> servant.
 
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (void);
   // Deactivates the CosEC and friends with the POA.
 
   // =  POA_CosEventChannelAdmin::EventChannel methods.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys this Event Channel object.
 
  protected:
   // = RtEC creation, activation and deactivation methods.
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (ACE_ENV_SINGLE_ARG_DECL);
+  create_rtec (void);
   // Create a local rtec.
 
-  virtual void activate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void activate_rtec (void);
   // Activates the rtec.
 
-  virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void deactivate_rtec (void);
   // Deactivates the rtec.
 
   // = CosEC creation, activation and deactivation methods.
   TAO_CosEC_EventChannel_i*
-  create_cosec (ACE_ENV_SINGLE_ARG_DECL);
+  create_cosec (void);
   // Create a local cosec.
 
-  int activate_cosec (ACE_ENV_SINGLE_ARG_DECL);
+  int activate_cosec (void);
   // Activates the cosec.
 
-  void deactivate_cosec (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate_cosec (void);
   // Deactivates the cosec.
 
   void init_SupplierQOS (RtecBase::handle_t supp_handle,
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
index e5dd9fb0348..6559d30c427 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -19,8 +19,7 @@ TAO_CosEC_EventChannel_i::~TAO_CosEC_EventChannel_i (void)
 int
 TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
                                 const RtecEventChannelAdmin::SupplierQOS &supplierqos,
-                                RtecEventChannelAdmin::EventChannel_ptr rtec
-                                ACE_ENV_ARG_DECL)
+                                RtecEventChannelAdmin::EventChannel_ptr rtec)
 {
   // Allocate the admins..
   TAO_CosEC_ConsumerAdmin_i *consumer_;
@@ -38,36 +37,30 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
   auto_ptr <TAO_CosEC_SupplierAdmin_i> auto_supplier_ (supplier_);
 
   RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin =
-    rtec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    rtec->for_consumers ();
 
   if (auto_consumer_.get ()->init (consumerqos,
                                    rtec_consumeradmin) == -1)
     return -1;
 
   this->consumeradmin_ =
-    auto_consumer_.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    auto_consumer_.get ()->_this ();
 
   // give the ownership to the POA.
-  auto_consumer_.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  auto_consumer_.get ()->_remove_ref ();
 
   RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin =
-    rtec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    rtec->for_suppliers ();
 
   if (auto_supplier_.get ()->init (supplierqos,
                                    rtec_supplieradmin) == -1)
     return -1;
 
   this->supplieradmin_ =
-    auto_supplier_.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    auto_supplier_.get ()->_this ();
 
   // give the ownership to the POA.
-  auto_supplier_.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  auto_supplier_.get ()->_remove_ref ();
 
   this->consumer_admin_ = auto_consumer_.release ();
   this->supplier_admin_ = auto_supplier_.release ();
@@ -76,7 +69,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CosEC_EventChannel_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_EventChannel_i::for_consumers (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
@@ -86,7 +79,7 @@ TAO_CosEC_EventChannel_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CosEC_EventChannel_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_EventChannel_i::for_suppliers (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
@@ -96,29 +89,24 @@ TAO_CosEC_EventChannel_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_CosEC_EventChannel_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_EventChannel_i::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the CosEventChannel
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::ObjectId_var id = poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 
   this->supplieradmin_ =  CosEventChannelAdmin::SupplierAdmin::_nil ();
   this->consumeradmin_ =  CosEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
-TAO_CosEC_EventChannel_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_EventChannel_i::shutdown (void)
 {
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy ();
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
index 74f25ca3ec2..82e16cc01fd 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -50,26 +50,25 @@ public:
 
   int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
             const RtecEventChannelAdmin::SupplierQOS &supplierqos,
-            RtecEventChannelAdmin::EventChannel_ptr rtec
-            ACE_ENV_ARG_DECL);
+            RtecEventChannelAdmin::EventChannel_ptr rtec);
   // Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
   // -1 on error, 0 on success.
 
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The for_consumers method will return the same ConsumerAdmin_ptr
   // everytime its called.
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The for_suppliers method will return the same SupplierAdmin_ptr
   // everytime its called.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys this Event Channel object.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
   // destroys this Event Channel object and <delete>s this object.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index 5870b6c33c7..626c6226fed 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -31,7 +31,7 @@ public:
   ~TAO_CosEC_PushSupplierWrapper (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the push supplier.
 
@@ -63,25 +63,19 @@ TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void)
 }
 
 void
-TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_->disconnect_push_supplier ();
 
   // Deactivate the supplier proxy
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 
   // @@ If we keep a list remember to remove this object from the
   // list.
@@ -102,8 +96,7 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void)
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data
-                                     ACE_ENV_ARG_DECL)
+TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::Event buffer[1];
@@ -136,65 +129,51 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data
 
   e.data.any_value = data;
 
-  this->proxypushconsumer_->push (events
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxypushconsumer_->push (events);
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->proxypushconsumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxypushconsumer_->disconnect_push_consumer ();
 
   // Deactivate the ProxyPushConsumer
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier
-                                                      ACE_ENV_ARG_DECL)
+TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected))
 {
   if (this->connected ())
-    ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+    throw CosEventChannelAdmin::AlreadyConnected ();
 
   TAO_CosEC_PushSupplierWrapper *wrapper;
 
   ACE_NEW_THROW_EX (wrapper,
                     TAO_CosEC_PushSupplierWrapper (push_supplier),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   auto_ptr <TAO_CosEC_PushSupplierWrapper>
     auto_wrapper (wrapper);
 
   RtecEventComm::PushSupplier_ptr rtecpushsupplier
-    = auto_wrapper.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    = auto_wrapper.get ()->_this ();
 
   // give the ownership to the POA.
-  auto_wrapper.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  auto_wrapper.get ()->_remove_ref ();
 
   this->proxypushconsumer_->connect_push_supplier
     (rtecpushsupplier,
-     this->qos_
-     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+     this->qos_);
 
   this->wrapper_ = auto_wrapper.release ();
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
index b780b88d90a..3d56f52ed16 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -53,17 +53,15 @@ public:
   ~TAO_CosEC_ProxyPushConsumer_i (void);
   // Destructor.
 
-  virtual void push (const CORBA::Any &data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any &data)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Suppliers call this method to pass data to connected consumers.
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the supplier from the event communication.
 
-  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier
-                                     ACE_ENV_ARG_DECL)
+  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
   // Connects a push supplier.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index 866c8a9e1a3..5e64a573392 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -30,12 +30,11 @@ public:
   ~TAO_CosEC_PushConsumerWrapper (void);
   // Destructor.
 
-  virtual void push (const RtecEventComm::EventSet & data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet & data)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is called by the RTEvent Channel to supply data.
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the consumer from the event channel.
 
@@ -61,48 +60,38 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper ()
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set
-                                     ACE_ENV_ARG_DECL)
+TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0;
        i < set.length ();
        ++i)
     {
-      ACE_TRY
+      try
         {
-          this->consumer_->push (set[i].data.any_value
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->consumer_->push (set[i].data.any_value);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore the exception...
         }
-      ACE_ENDTRY;
     }
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the supplier proxy.
-  this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_->disconnect_push_consumer ();
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 
   // @@ If we keep a list remember to remove this object from the
   // list.
@@ -124,64 +113,52 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void)
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pps_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->pps_->disconnect_push_supplier ();
 
   // Deactivate the supplier proxy
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 
   // @@ If we keep a list remember to remove this object from the
   // list.
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
-                                                      ACE_ENV_ARG_DECL)
+TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError))
 {
   if (this->connected ())
-    ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+    throw CosEventChannelAdmin::AlreadyConnected ();
 
   if (push_consumer == CosEventComm::PushConsumer::_nil())
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   TAO_CosEC_PushConsumerWrapper *wrapper;
   ACE_NEW_THROW_EX (wrapper,
                     TAO_CosEC_PushConsumerWrapper (push_consumer),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   auto_ptr <TAO_CosEC_PushConsumerWrapper> auto_wrapper (wrapper);
 
   // @@ This code is not exception safe.
   RtecEventComm::PushConsumer_ptr  rtecpushconsumer =
-    auto_wrapper.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    auto_wrapper.get ()->_this ();
 
   // give the ownership to the POA.
-  auto_wrapper.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  auto_wrapper.get ()->_remove_ref ();
 
   this->pps_->connect_push_consumer (rtecpushconsumer,
-                                     this->qos_
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                     this->qos_);
 
   this->wrapper_ = auto_wrapper.release ();
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
index 199a596c0bf..bb26a3ef8fa 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -46,12 +46,11 @@ public:
   ~TAO_CosEC_ProxyPushSupplier_i (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Ends the event communication and disposes this object.
 
-  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer
-                                     ACE_ENV_ARG_DECL)
+  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
index 97af59df51a..09fd6da3817 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
@@ -26,15 +26,14 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 
   RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer =
-    this->rtec_supplieradmin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxyconsumer_nil);
+    this->rtec_supplieradmin_->obtain_push_consumer ();
 
   TAO_CosEC_ProxyPushConsumer_i *proxypushconsumer;
 
@@ -46,19 +45,17 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     auto_proxyconsumer (proxypushconsumer);
 
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj =
-    auto_proxyconsumer.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxyconsumer_nil);
+    auto_proxyconsumer.get ()->_this ();
 
    // give the ownership to the POA.
-  auto_proxyconsumer.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxyconsumer_nil);
+  auto_proxyconsumer.get ()->_remove_ref ();
 
   auto_proxyconsumer.release ();
   return proxy_obj;
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
index 7642b282601..7a7c39daf94 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
@@ -49,12 +49,12 @@ public:
   // error.
 
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+    obtain_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPushConsumer_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer(ACE_ENV_SINGLE_ARG_DECL)
+    obtain_pull_consumer(void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPullConsumer_ptr.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index bd0b2585f86..8598acf7d98 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -9,32 +9,24 @@ main (int argc, char *argv [])
 {
   Basic basic;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      basic.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      basic.init (argc, argv);
 
-      basic.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      basic.run ();
 
-      basic.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      basic.shutdown ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "CosEC_Basic user exception: ");
+      ue._tao_print_exception ("CosEC_Basic user exception: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "CosEC_Basic system exception: ");
+      se._tao_print_exception ("CosEC_Basic system exception: ");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   return 0;
 }
@@ -50,108 +42,81 @@ Basic::~Basic (void)
 }
 
 void
-Basic::init (int argc, char *argv[]
-                   ACE_ENV_ARG_DECL)
+Basic::init (int argc, char *argv[])
 {
-  this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_ORB (argc, argv);
 
-  this->init_CosEC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_CosEC ();
 }
 
 void
-Basic::init_ORB  (int argc, char *argv []
-                        ACE_ENV_ARG_DECL)
+Basic::init_ORB  (int argc, char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 
   CORBA::Object_var poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR ((LM_ERROR,
                 " (%P|%t) Unable to initialize the POA.\n"));
 
   root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 }
 
 void
-Basic::init_CosEC (ACE_ENV_SINGLE_ARG_DECL)
+Basic::init_CosEC (void)
 {
   CosEC_ServantBase *ec = 0;
 
   ACE_NEW_THROW_EX (ec,
                     CosEC_ServantBase (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableServer::ServantBase_var ec_var (ec);
 
   ec->init (this->root_poa_.in(),
             this->root_poa_.in(),
-            0,0,0
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+            0,0,0);
 
-  int retval = ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  int retval = ec->activate ();
 
   if (retval == -1)
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
   // @@ look for more descriptive exception to throw here
 
   CORBA::Object_var obj =
-    this->root_poa_->servant_to_reference (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->root_poa_->servant_to_reference (ec);
 
   this->cos_ec_ =
-    CosEventChannelAdmin::EventChannel::_narrow (obj._retn ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosEventChannelAdmin::EventChannel::_narrow (obj._retn ());
 }
 
 void
-Basic::run (ACE_ENV_SINGLE_ARG_DECL)
+Basic::run (void)
 {
   // Create an Any type to pass to the Cos EC.
   CORBA::Any any;
   any <<= (CORBA::Long)50;
 
   this->consumer_.open (this->cos_ec_.in (),
-                        this->orb_.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        this->orb_.in ());
 
-  this->consumer_.connect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_.connect ();
 
-  this->supplier_.open (this->cos_ec_.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_.open (this->cos_ec_.in ());
 
-  this->supplier_.connect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_.connect ();
 
-  this->supplier_.send_event (any
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_.send_event (any);
 
   // this->orb_->run ();
   // @@ commenting out the run-shutdown mechanism for now because it gives
@@ -163,14 +128,11 @@ Basic::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Basic::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Basic::shutdown (void)
 {
-  this->supplier_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_.close ();
 
-  this->consumer_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_.close ();
 
-  this->cos_ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->cos_ec_->destroy ();
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
index df713f5766f..333049506ef 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
@@ -36,23 +36,23 @@ public:
   ~Basic (void);
   // Destructor.
 
-  void init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv[]);
   // Starts up an ORB and the CosEC.
   // Returns 0 on success, -1 on error.
 
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
   // Connects a consumer and a supplier to the CosEC and sends 1 event
   // across.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
   // Closes down the CosEC.
 
 private:
-  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[]);
   // initializes the ORB.
   // Returns 0 on success, -1 on error.
 
-  void init_CosEC (ACE_ENV_SINGLE_ARG_DECL);
+  void init_CosEC (void);
   // initializes the COS EC.
   // Returns 0 on success, -1 on error.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index 03259f3a123..b2385f752dc 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -5,63 +5,54 @@
 
 void
 Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::ORB_ptr orb
-                     ACE_ENV_ARG_DECL)
+                     CORBA::ORB_ptr orb)
 {
   this->orb_ = orb;
 
   // = Connect as a consumer.
   this->consumer_admin_ =
-    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_consumers ();
 }
 
 void
-Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::close (void)
 {
-  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect ();
 
   this->consumer_admin_ =
     CosEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
-Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::connect (void)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   CosEventComm::PushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_admin_->obtain_push_supplier ();
 
-  this->supplier_proxy_->connect_push_consumer (objref.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->connect_push_consumer (objref.in ());
 }
 
 void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier ();
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-Consumer::push (const CORBA::Any &
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const CORBA::Any &)
  ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -74,7 +65,7 @@ Consumer::push (const CORBA::Any &
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -82,15 +73,10 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
index c1ced5cbc08..d1d61414dbb 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -33,29 +33,27 @@ class Consumer : public POA_CosEventComm::PushConsumer
 
 public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::ORB_ptr orb
-             ACE_ENV_ARG_DECL);
+             CORBA::ORB_ptr orb);
   // This method connects the consumer to the EC.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Disconnect from the EC.
 
-  void connect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (void);
   // Connect the Consumer to the EventChannel.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
-  virtual void push (const CORBA::Any &data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any &data)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
       ));
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index 59cfc9cd251..886bf57af84 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -4,67 +4,57 @@
 #include "Supplier.h"
 
 void
-Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
-                     ACE_ENV_ARG_DECL)
+Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
-    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_suppliers ();
 }
 
 void
-Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::close (void)
 {
-  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect ();
 
   this->supplier_admin_ =
     CosEventChannelAdmin::SupplierAdmin::_nil ();
 }
 
 void
-Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::connect (void)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->supplier_admin_->obtain_push_consumer ();
 
-  CosEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosEventComm::PushSupplier_var objref = this->_this ();
 
-  this->consumer_proxy_->connect_push_supplier (objref.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->connect_push_supplier (objref.in ());
 }
 
 void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer ();
 
   this->consumer_proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-Supplier::send_event (const CORBA::Any & data
-                           ACE_ENV_ARG_DECL)
+Supplier::send_event (const CORBA::Any & data)
 {
-  this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->push (data);
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect_push_supplier (void)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -72,15 +62,10 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
index 413244fc4f4..1d2d6a0117a 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -31,23 +31,21 @@ class Supplier : public POA_CosEventComm::PushSupplier
   //   The Supplier is a simple Push Supplier that connects to
   //   the CosEC and sends events to it.
 public:
-  void open (CosEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+  void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the supplier to the EC.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Disconnect from the EC.
 
-  void connect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (void);
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the EC, but do not forget about it or close it.
 
-  void send_event (const CORBA::Any &data
-                   ACE_ENV_ARG_DECL);
+  void send_event (const CORBA::Any &data);
   // Send one event.
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 9cdb697eff1..5755ed1d97d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -44,61 +44,52 @@ Consumer::parse_args (int argc, char *argv [])
 }
 
 void
-Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel
-                     ACE_ENV_ARG_DECL)
+Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 {
   // = Connect as a consumer.
   this->consumer_admin_ =
-    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_consumers ();
 }
 
 void
-Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::close (void)
 {
-  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect ();
 
   this->consumer_admin_ =
     CosEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
-Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::connect (void)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   CosEventComm::PushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_admin_->obtain_push_supplier ();
 
-  this->supplier_proxy_->connect_push_consumer (objref.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->connect_push_consumer (objref.in ());
 }
 
 void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier ();
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-Consumer::push (const CORBA::Any &
-                     ACE_ENV_ARG_DECL)
+Consumer::push (const CORBA::Any &)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -121,15 +112,14 @@ Consumer::push (const CORBA::Any &
                   "(%P):%s\n",
                   "exiting the consumer."));
 
-      this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->close ();
 
       this->shutdown ();
     }
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -137,40 +127,28 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 int
 Consumer::init_Consumer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
    {
-      this->open (this->cos_ec_
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->open (this->cos_ec_);
 
-      this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Consumer::connect (void)\n");
+      ex._tao_print_exception ("Exception in Consumer::connect (void)\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index ce523fed960..757c4a062cd 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -40,29 +40,27 @@ public:
   int init_Consumer (void);
   // Initialize the Consumer.
 
-  void open (CosEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+  void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the consumer to the EC.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Disconnect from the EC.
 
-  void connect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (void);
   // Connect the Consumer to the EventChannel.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
-  virtual void push (const CORBA::Any &data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any &data)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
       ));
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index 4af0b93b9aa..a0ebbe627fc 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -39,19 +39,14 @@ Multiple::init (int argc, char *argv[])
 int
 Multiple::init_ORB  (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    ""
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "");
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,25 +54,18 @@ Multiple::init_ORB  (int argc, char *argv [])
                           -1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Multiple::init_ORB\n");
+      ex._tao_print_exception ("Exception in Multiple::init_ORB\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -85,8 +73,7 @@ Multiple::init_ORB  (int argc, char *argv [])
 int
 Multiple::init_CosEC (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialization of the naming service.
       if (this->naming_client_.init (this->orb_.in ()) != 0)
@@ -101,26 +88,19 @@ Multiple::init_CosEC (void)
         CORBA::string_dup (this->service_name);
 
       CORBA::Object_var EC_obj =
-        this->naming_client_->resolve (ec_ref_name
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_client_->resolve (ec_ref_name);
 
       // The CORBA::Object_var object is downcast to
       // CosEventChannelAdmin::EventChannel
       // using the <_narrow> method.
       this->cos_ec_ =
-        CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Multiple::init_ORB\n");
+      ex._tao_print_exception ("Exception in Multiple::init_ORB\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -128,17 +108,14 @@ Multiple::init_CosEC (void)
 int
 Multiple::runORB (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 7d9a03c9261..3a0e1addb11 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -43,67 +43,57 @@ Supplier::parse_args (int argc, char *argv [])
 }
 
 void
-Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
-                     ACE_ENV_ARG_DECL)
+Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
-    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_suppliers ();
 }
 
 void
-Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::close (void)
 {
-  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect ();
 
   this->supplier_admin_ =
     CosEventChannelAdmin::SupplierAdmin::_nil ();
 }
 
 void
-Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::connect (void)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->supplier_admin_->obtain_push_consumer ();
 
-  CosEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosEventComm::PushSupplier_var objref = this->_this ();
 
-  this->consumer_proxy_->connect_push_supplier (objref.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->connect_push_supplier (objref.in ());
 }
 
 void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer ();
 
   this->consumer_proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-Supplier::send_event (const CORBA::Any & data
-                           ACE_ENV_ARG_DECL)
+Supplier::send_event (const CORBA::Any & data)
 {
-  this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->push (data);
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((
         CORBA::SystemException
         ))
@@ -111,35 +101,26 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 void
 Supplier::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create an Any type to pass to the Cos EC.
       CORBA::Any any;
       any <<= CORBA::Long (50);
 
-      this->open (this->cos_ec_
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->open (this->cos_ec_);
 
-      this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P):sending %d events...\n",
@@ -149,24 +130,18 @@ Supplier::run (void)
            count != 0;
            count--)
         {
-          this->send_event (any
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->send_event (any);
         }
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P):Done!. exiting now..\n"));
 
-      this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->close ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in CosEC_Multiple::run\n");
+      ex._tao_print_exception ("Exception in CosEC_Multiple::run\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index 29b213cd31f..1041ae6a163 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -37,23 +37,21 @@ public:
   Supplier ();
   // Constructor.
 
-  void open (CosEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+  void open (CosEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the supplier to the EC.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Disconnect from the EC.
 
-  void connect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (void);
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the EC, but do not forget about it or close it.
 
-  void send_event (const CORBA::Any &data
-                   ACE_ENV_ARG_DECL);
+  void send_event (const CORBA::Any &data);
   // Send one event.
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index bcf4fcfc551..6934b616a9a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -25,13 +25,11 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
@@ -45,44 +43,33 @@ Consumer::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (argv[1]);
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        CosEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosEventChannelAdmin::EventChannel::_narrow (object.in ());
 
       // The canonical protocol to connect to the EC
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       CosEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       CosEventComm::PushConsumer_var consumer =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
-      supplier->connect_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier->connect_push_consumer (consumer.in ());
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
@@ -95,18 +82,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const CORBA::Any &
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const CORBA::Any &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count_ ++;
@@ -119,12 +104,12 @@ Consumer::push (const CORBA::Any &
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 7156353e483..2915b51441e 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -40,10 +40,9 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const CORBA::Any &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index 07a78aea874..9f43341d23b 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -18,13 +18,11 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         {
@@ -34,31 +32,24 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       TAO_CEC_EventChannel_Attributes attributes (poa.in (),
                                                   poa.in ());
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (event_channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -86,12 +77,11 @@ main (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index 3886f6d085a..e87e81c10b4 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -25,13 +25,11 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (argc <= 1)
         {
@@ -41,44 +39,33 @@ Supplier::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (argv[1]);
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        CosEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosEventChannelAdmin::EventChannel::_narrow (object.in ());
 
       // The canonical protocol to connect to the EC
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       CosEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       CosEventComm::PushSupplier_var supplier =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
-      consumer->connect_push_supplier (supplier.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->connect_push_supplier (supplier.in ());
 
       // Push the events...
       ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
@@ -88,41 +75,34 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != 2000; ++i)
         {
-          consumer->push (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer->push (event);
           ACE_OS::sleep (sleep_time);
         }
 
       // Disconnect from the EC
-      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->disconnect_push_consumer ();
 
       // Destroy the EC....
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index 4fdc39bfa08..ca9e1267edb 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
@@ -40,7 +40,7 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index db6437a39bd..123e0604a04 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -5,57 +5,45 @@
 #include "Country_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (CosEC_Examples, 
-           Consumer, 
+ACE_RCSID (CosEC_Examples,
+           Consumer,
            "$Id$")
 
 int
 main (int argc, char* argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_obj.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel using the Naming Service.
-      CORBA::Object_var nam_obj = 
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      CORBA::Object_var nam_obj =
+        orb->resolve_initial_references ("NameService" );
 
       CosNaming::NamingContext_var root_context =
-        CosNaming::NamingContext::_narrow(nam_obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow(nam_obj.in ());
 
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup ("CountryEventChannel");
 
-      CORBA::Object_var ec_obj = 
+      CORBA::Object_var ec_obj =
         root_context->resolve(channel_name);
-      ACE_TRY_CHECK;
 
       // Downcast the object reference to a TypedEventChannel reference
       CosTypedEventChannelAdmin::TypedEventChannel_var typed_event_channel =
-        CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ());
 
       // Initialise the Country Impl
       Country_i country (orb.in ());
@@ -63,19 +51,15 @@ main (int argc, char* argv[])
 
       // Connect to the typed channel
       CosTypedEventChannelAdmin::TypedConsumerAdmin_var typed_consumer_admin =
-        typed_event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        typed_event_channel->for_consumers ();
 
       CosEventChannelAdmin::ProxyPushSupplier_var proxy_push_supplier =
-        typed_consumer_admin->obtain_typed_push_supplier (_tc_Country->id()
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        typed_consumer_admin->obtain_typed_push_supplier (_tc_Country->id());
 
       proxy_push_supplier->connect_push_consumer (typed_consumer.in () );
 
       CORBA::String_var str =
-         orb->object_to_string (typed_consumer.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         orb->object_to_string (typed_consumer.in ());
 
       const char* ior_file_name = "Consumer.ior";
       FILE *output_file=
@@ -96,19 +80,16 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "...ORB shutdown\n"));
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 0);
 
       // Destroy the ORB
       orb->destroy ();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "main");
+      ex._tao_print_exception ("main");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
index bbf4b03a030..cb0a13b15a6 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp
@@ -9,51 +9,49 @@ Country_i::Country_i (CORBA::ORB_ptr orb) :
   orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
-  
+
 // Implementation skeleton destructor
 Country_i::~Country_i (void)
 {
 }
-  
+
 void Country_i::update_population (const char * country,
-                                   CORBA::Long population
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   CORBA::Long population)
   ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   //Add your implementation here
   ACE_DEBUG ((LM_DEBUG, "Country %s has population %d\n",
-              country, population));  
+              country, population));
 }
-  
+
 CORBA::Object_ptr
-Country_i::get_typed_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Country_i::get_typed_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   //Add your implementation here
   ACE_DEBUG ((LM_DEBUG, "Country_i::get_typed_consumer called...\n"));
 
-  Country_var ret = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  Country_var ret = this->_this ();
 
   ACE_DEBUG ((LM_DEBUG, "...returning CORBA::Object_ptr for Country_i\n"));
 
   return Country::_duplicate(ret.in ());
 }
-  
+
 void
 Country_i::push (const CORBA::Any & /* data */
-                 ACE_ENV_ARG_DECL_NOT_USED)
+                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 
 {
   //Add your implementation here
 }
-  
+
 void
-Country_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Country_i::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
@@ -62,19 +60,15 @@ Country_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
 
   // Deactivate the impl
   PortableServer::POA_var t_poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+    this->_default_POA ();
+
   PortableServer::ObjectId_var t_id =
-    t_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    t_poa->servant_to_id (this);
 
-  t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  t_poa->deactivate_object (t_id.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Country_i::disconnect_push_consumer, ")
               ACE_TEXT ("calling ORB shutdown...\n")));
-  orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
index 3d658086c47..11231abba89 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.h
@@ -15,26 +15,24 @@
 class Country_i : public virtual POA_Country
 {
 public:
-  //Constructor 
+  //Constructor
   Country_i (CORBA::ORB_ptr orb);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Country_i (void);
-  
+
   virtual void update_population (const char * country,
-                                  CORBA::Long population
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Long population)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Object_ptr get_typed_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Object_ptr get_typed_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void push (const CORBA::Any & data
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any & data)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index d384fad33cf..2617c8f9daf 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -10,82 +10,63 @@ int
 main (int argc, char* argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Obtain the event channel using the Naming Service.
-      CORBA::Object_var nam_obj = 
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      CORBA::Object_var nam_obj =
+        orb->resolve_initial_references ("NameService" );
 
       CosNaming::NamingContext_var root_context =
-        CosNaming::NamingContext::_narrow(nam_obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow(nam_obj.in ());
 
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup ("CountryEventChannel");
 
-      CORBA::Object_var ec_obj = 
+      CORBA::Object_var ec_obj =
         root_context->resolve(channel_name);
-      ACE_TRY_CHECK;
 
       // Downcast the object reference to a TypedEventChannel reference
       CosTypedEventChannelAdmin::TypedEventChannel_var typed_event_channel =
-        CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosTypedEventChannelAdmin::TypedEventChannel::_narrow(ec_obj.in ());
 
       // Connect to the typed channel
       CosTypedEventChannelAdmin::TypedSupplierAdmin_var typed_supplier_admin =
-        typed_event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        typed_event_channel->for_suppliers ();
 
       CosTypedEventChannelAdmin::TypedProxyPushConsumer_var typed_proxy_push_consumer =
-        typed_supplier_admin->obtain_typed_push_consumer (_tc_Country->id()
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        typed_supplier_admin->obtain_typed_push_consumer (_tc_Country->id());
 
-      typed_proxy_push_consumer->connect_push_supplier (CosEventComm::PushSupplier::_nil()
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      typed_proxy_push_consumer->connect_push_supplier (CosEventComm::PushSupplier::_nil());
 
       // Obtain the interface from the event channel
-      CORBA::Object_var typed_consumer = 
-        typed_proxy_push_consumer->get_typed_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var typed_consumer =
+        typed_proxy_push_consumer->get_typed_consumer();
 
       // Narrow the interface
       Country_var typed_supplier = Country::_narrow(typed_consumer.in () );
-      ACE_TRY_CHECK;
 
       // Invoke the events...
       for (int i = 0; i != 100; ++i)
         {
-          typed_supplier->update_population ("England", i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          typed_supplier->update_population ("England", i);
         }
 
       // Disconnect from the EC
-      typed_proxy_push_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      typed_proxy_push_consumer->disconnect_push_consumer ();
 
       // Destroy the EC....
-      typed_event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      typed_event_channel->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "main");
+      ex._tao_print_exception ("main");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
index ed3b767e2f4..a2ef5f64119 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
@@ -11,15 +11,13 @@
 #include "ReplicaController.h"
 
 void
-ORB_Initializer::pre_init (PortableInterceptor::ORBInitInfo_ptr
-                           ACE_ENV_ARG_DECL_NOT_USED)
+ORB_Initializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
-                            ACE_ENV_ARG_DECL)
+ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate slot id.
@@ -45,12 +43,9 @@ ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
                           ENOMEM),
                       CORBA::COMPLETED_NO));
 
-    ACE_CHECK;
 
     interceptor = tmp_interceptor;
   }
 
-  info->add_server_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor.in ());
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
index d11b2a41aa2..219ef9fa590 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h
@@ -15,13 +15,11 @@ class ORB_Initializer :
 public:
 
   virtual void
-  pre_init (PortableInterceptor::ORBInitInfo_ptr info
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void
-  post_init (PortableInterceptor::ORBInitInfo_ptr info
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index 09f6561e04e..0f39c065b71 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -54,29 +54,24 @@ get_state ()
 void Checkpointable::
 associate_state (CORBA::ORB_ptr orb, CORBA::Any const& state)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::Object_var pic_obj =
-      orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER);
+      orb->resolve_initial_references ("PICurrent");
 
-    ACE_TRY_CHECK;
 
     PortableInterceptor::Current_var pic =
       PortableInterceptor::Current::_narrow (
-        pic_obj.in () ACE_ENV_ARG_PARAMETER);
+        pic_obj.in ());
 
-    ACE_TRY_CHECK;
 
-    pic->set_slot (state_slot_id (), state ACE_ENV_ARG_PARAMETER);
+    pic->set_slot (state_slot_id (), state);
 
-    ACE_TRY_CHECK;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+    ex._tao_print_exception ("Caught exception:");
   }
-  ACE_ENDTRY;
 }
 
 // ReplyLogger
@@ -92,23 +87,19 @@ ReplicaController::
 ReplicaController (CORBA::ORB_ptr orb)
     : orb_ (CORBA::ORB::_duplicate (orb))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::Object_var poa_object =
-      orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb_->resolve_initial_references ("RootPOA");
 
     root_poa_ = PortableServer::POA::_narrow (
-      poa_object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      poa_object.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+    ex._tao_print_exception ("Caught exception:");
     ACE_OS::abort ();
   }
-  ACE_ENDTRY;
 
   // Generate member id
   ACE_Utils::UUID uuid;
@@ -225,21 +216,19 @@ namespace
 {
   FT::FTRequestServiceContext*
   extract_context (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
+    PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException));
 }
 
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
 void
 ReplicaController::tao_ft_interception_point (
   PortableInterceptor::ServerRequestInfo_ptr ri,
-  CORBA::OctetSeq_out ocs
-  ACE_ENV_ARG_DECL)
+  CORBA::OctetSeq_out ocs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   FT::FTRequestServiceContext_var ftr (
-    extract_context (ri ACE_ENV_ARG_PARAMETER));
+    extract_context (ri));
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Received request from %s with rid %i\n",
@@ -269,12 +258,11 @@ ReplicaController::tao_ft_interception_point (
 
 void
 ReplicaController::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::FTRequestServiceContext_var ftr (
-    extract_context (ri ACE_ENV_ARG_PARAMETER));
+    extract_context (ri));
 
 
   ACE_DEBUG ((LM_DEBUG,
@@ -286,15 +274,13 @@ ReplicaController::send_reply (
   // Prepare reply for logging.
 
   CORBA::Any_var result =
-    ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->result ();
 
   TAO_OutputCDR cdr;
   result->impl ()->marshal_value (cdr);
 
   Dynamic::ParameterList_var pl =
-    ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->arguments ();
 
   CORBA::ULong len = pl->length ();
 
@@ -437,14 +423,11 @@ ReplicaController::send_reply (
 namespace
 {
   FT::FTRequestServiceContext*
-  extract_context (PortableInterceptor::ServerRequestInfo_ptr ri
-                   ACE_ENV_ARG_DECL)
+  extract_context (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     IOP::ServiceContext_var svc =
-      ri->get_request_service_context (IOP::FT_REQUEST
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      ri->get_request_service_context (IOP::FT_REQUEST);
 
     TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
                       svc->context_data.length ());
@@ -454,7 +437,7 @@ namespace
     if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     {
       //@@ what to throw?
-      ACE_THROW (CORBA::BAD_CONTEXT ());
+      throw CORBA::BAD_CONTEXT ();
     }
 
     cdr.reset_byte_order (static_cast<int> (byte_order));
@@ -482,7 +465,7 @@ namespace
     if (!cdr.good_bit ())
     {
       //@@ what to throw?
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
     return req._retn ();
@@ -491,7 +474,7 @@ namespace
 
 
 char*
-ReplicaController::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ReplicaController::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ReplicaController");
@@ -499,8 +482,7 @@ ReplicaController::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 ReplicaController::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -508,23 +490,21 @@ ReplicaController::send_exception (
 
 void
 ReplicaController::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-ReplicaController::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ReplicaController::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ReplicaController::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -533,8 +513,7 @@ ReplicaController::receive_request_service_contexts (
 
 void
 ReplicaController::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
index 6c7bcadb647..fe4e1aa1f86 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h
@@ -40,54 +40,48 @@ public:
 
 public:
   virtual char *
-  name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void
-  destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
   virtual void
   tao_ft_interception_point (
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    CORBA::OctetSeq_out ocs
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    CORBA::OctetSeq_out ocs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
   virtual void
   receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void
   receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void
   send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void
   send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void
   send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
index d3c4a92cde6..20d9f800e63 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
@@ -39,8 +39,7 @@ set_state (CORBA::Any const& state)
 
 
 CORBA::Short
-RolyPoly_i::number (char *&str
-                ACE_ENV_ARG_DECL_NOT_USED)
+RolyPoly_i::number (char *&str)
   ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E))
 {
   CORBA::string_free (str);
@@ -63,10 +62,10 @@ RolyPoly_i::number (char *&str
 }
 
 void
-RolyPoly_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+RolyPoly_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n"));
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
index 86098f033e9..99cc4b79c68 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
@@ -28,11 +28,11 @@ public:
   // RolyPoly
   //
   virtual CORBA::Short
-  number (char *&s ACE_ENV_ARG_DECL)
+  number (char *&s)
     ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E));
 
   virtual void
-  shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
index af43025ffa2..46c4224eea9 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
@@ -55,14 +55,11 @@ main (int argc, char *argv[])
 {
   int status = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Client ORB");
 
       if (::parse_args (argc, argv) != 0) return -1;
 
@@ -99,20 +96,16 @@ main (int argc, char *argv[])
         CORBA::Object_var object_primary;
 
         object_primary =
-          orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
+          orb->string_to_object (ior->c_str());
 
-        ACE_CHECK_RETURN (-1);
 
         // Get an object reference for the ORBs IORManipultion object!
         CORBA::Object_ptr IORM =
           orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                           0
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (-1);
+                                           0);
 
         TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-          TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (-1);
+          TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM);
 
 
         // Create the list
@@ -120,23 +113,21 @@ main (int argc, char *argv[])
         iors.length(ior_strs.size ());
         size_t cntr = 0;
         iors [cntr] = CORBA::Object::_duplicate (object_primary.in ());
-        
+
         while (ior_iter.advance ())
           {
             ++cntr;
             ior_iter.next (ior);
             ACE_DEBUG ((LM_DEBUG, "IOR%d: %s\n",cntr, ior->c_str ()));
             iors [cntr] =
-              orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
+              orb->string_to_object (ior->c_str());
 
-            ACE_CHECK_RETURN (-1);
           }
 
         ACE_DEBUG ((LM_DEBUG, "Prepare to merge IORs.\n"));
         // Create a merged set 1;
-        object = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+        object = iorm->merge_iors (iors);
 
-        ACE_CHECK_RETURN (-1);
 
 
         FT::TagFTGroupTaggedComponent ft_tag_component;
@@ -163,15 +154,11 @@ main (int argc, char *argv[])
 
         // Set the property
         CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                                    object.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (-1);
+                                                    object.in ());
 
         retval = iorm->set_primary (&iogr_prop,
                                     object_primary.in (),
-                                    object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (-1);
+                                    object.in ());
 
       }
       else
@@ -181,13 +168,11 @@ main (int argc, char *argv[])
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to extract the only IOR string\n"),
                             -1);
-        object = orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        object = orb->string_to_object (ior->c_str());
       }
 
       RolyPoly_var server =
-        RolyPoly::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RolyPoly::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
       {
@@ -205,8 +190,7 @@ main (int argc, char *argv[])
 
         try
         {
-          number = server->number (str.inout ()
-                                   ACE_ENV_ARG_PARAMETER);
+          number = server->number (str.inout ());
         }
         catch (RolyPoly::E const& e)
         {
@@ -216,7 +200,6 @@ main (int argc, char *argv[])
           continue;
         }
 
-        ACE_TRY_CHECK;
 
         ACE_DEBUG ((LM_INFO,
                     "client: received %d\n",
@@ -224,16 +207,13 @@ main (int argc, char *argv[])
         ACE_OS::sleep (1);
       }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
index 65c0587a9b7..b5c1a01a4d9 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
@@ -42,8 +42,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (::parse_args (argc, argv) != 0) return -1;
 
@@ -55,17 +54,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "Server ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -73,12 +68,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       RolyPoly_i* roly_poly_impl;
 
@@ -89,17 +82,14 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer (roly_poly_impl);
 
       RolyPoly_var t =
-        roly_poly_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roly_poly_impl->_this ();
 
       CORBA::PolicyList policies;  // Empty policy list.
 
       CORBA::String_var ior =
-        orb->object_to_string (t.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (t.in ());
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       FILE *output_file= ACE_OS::fopen (ior_file, "w");
       if (output_file == 0)
@@ -117,24 +107,19 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Server is ready\n"));
 
       // Run the ORB event loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 9b2da4d88c8..ece45247c66 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -252,7 +252,7 @@ int TestClient::svc()
   {
     ACE_ERROR((LM_ERROR,"CORBA client error with (%d.%d.%d.%d):%s\n",
                threadNum, i, objIter, requestIter, currentIOR.c_str()));
-    ACE_PRINT_EXCEPTION(ex, "");
+    ex._tao_print_exception ("");
   }
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index 5864e974d00..d62ce2c7645 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -74,7 +74,7 @@ int main (int argc, char* argv[])
     orb->destroy();
 
   } catch (CORBA::Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "Combined Service:");
+    e._tao_print_exception ("Combined Service:");
   }
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
index 0bab1bfd6aa..2985512d78c 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
@@ -55,7 +55,7 @@ int main(int argc, char* argv[]) {
     Object_var obj = orb->resolve_initial_references("ServiceConfig");
     ServiceConfigurator_var sc = ServiceConfigurator::_narrow(obj.in());
     ACE_ASSERT(! is_nil(sc.in()));
- 
+
     if (directive.length() > 0) {
       ACE_DEBUG((LM_DEBUG, "Controller: sending directive <%s>...\n", directive.c_str()));
       sc->process_directive(directive.c_str());
@@ -67,7 +67,7 @@ int main(int argc, char* argv[]) {
 
     return 0;
   } catch (CORBA::Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "Controller:");
+    e._tao_print_exception ("Controller:");
   }
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
index 8566023c945..2ee3c788095 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -63,7 +63,7 @@ DynServer_Loader::DynServer_Loader(void)
 }
 
 int
-DynServer_Loader::init (int argc, ACE_TCHAR* argv[] ACE_ENV_ARG_DECL)
+DynServer_Loader::init (int argc, ACE_TCHAR* argv[])
 {
   try {
 
@@ -111,7 +111,7 @@ DynServer_Loader::init (int argc, ACE_TCHAR* argv[] ACE_ENV_ARG_DECL)
     ACE_DEBUG((LM_DEBUG, "dynserver: running.\n"));
 
   } catch (Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "DynServer::init()");
+    e._tao_print_exception ("DynServer::init()");
   }
   return 0;
 }
@@ -135,7 +135,7 @@ DynServer_Loader::fini (void)
     return 0;
 
   } catch (Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "DynServer::fini()");
+    e._tao_print_exception ("DynServer::fini()");
   }
   return -1;
 }
@@ -143,8 +143,7 @@ DynServer_Loader::fini (void)
 Object_ptr
 DynServer_Loader::create_object (ORB_ptr,
                                  int,
-                                 ACE_TCHAR **
-                                 ACE_ENV_ARG_DECL)
+                                 ACE_TCHAR **)
                                  ACE_THROW_SPEC ((SystemException))
 {
   ACE_THROW_RETURN(NO_IMPLEMENT(), Object::_nil());
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 0976425f762..b74936e8804 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -19,12 +19,12 @@
 
 using namespace CORBA;
 
-int 
-main (int argc, char* argv[]) 
+int
+main (int argc, char* argv[])
 {
-  try 
+  try
     {
- 
+
       ORB_var orb = ORB_init (argc, argv);
 
       Object_var obj = orb->resolve_initial_references ("Test");
@@ -34,14 +34,14 @@ main (int argc, char* argv[])
       Long n = test->get ();
       Long m = test->get ();
       assertTrue (m == n + 1);
- 
+
       ACE_DEBUG ((LM_DEBUG, "All tests ran successfully.\n"));
 
       return 0;
-    } 
-  catch (CORBA::Exception& e) 
+    }
+  catch (CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "test:");
+      e._tao_print_exception ("test:");
     }
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index a3d821fde70..2298cb7bf6c 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -21,7 +21,7 @@ public:
   }
   virtual ~test_i (void) {
   }
-  virtual CORBA::Long get (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) {
+  virtual CORBA::Long get (void) ACE_THROW_SPEC ((CORBA::SystemException)) {
     ACE_DEBUG((LM_DEBUG, "dynserver: get() %d\n", ++n_));
     return n_;
   }
@@ -41,7 +41,7 @@ POA_ptr createPersistPOA(const char* name, POA_ptr root_poa, POAManager_ptr poam
 int main(int argc, char* argv[]) {
 
   try {
- 
+
     ORB_var orb = ORB_init(argc, argv);
 
     Object_var obj = orb->resolve_initial_references("RootPOA");
@@ -87,7 +87,7 @@ int main(int argc, char* argv[]) {
     orb->destroy();
 
   } catch (CORBA::Exception& e) {
-    ACE_PRINT_EXCEPTION(e, "TestServer::init()");
+    e._tao_print_exception ("TestServer::init()");
   }
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index f6239df905c..d6da384d62b 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -20,16 +20,14 @@ ORBInitializer::ORBInitializer (void)
 
 void
 ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -40,14 +38,11 @@ ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var sr_interceptor =
     this->interceptor_;
 
-  info->add_server_request_interceptor (sr_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (sr_interceptor.in ());
 
   PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor;
   ACE_NEW_THROW_EX (reject_interceptor,
@@ -57,14 +52,11 @@ ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor =
     reject_interceptor;
 
-  info->add_server_request_interceptor (safe_reject_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (safe_reject_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
index b366f733e93..ac320b21e63 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h
@@ -58,12 +58,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index 431ebd7622f..efe8447563c 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -31,7 +31,7 @@ RPS_Monitor::~RPS_Monitor (void)
 }
 
 CosLoadBalancing::Location *
-RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+RPS_Monitor::the_location (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
@@ -42,13 +42,12 @@ RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return location;
 }
 
 CosLoadBalancing::LoadList *
-RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+RPS_Monitor::loads (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
@@ -72,7 +71,6 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CosLoadBalancing::LoadList_var load_list = tmp;
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
index fb623e0852e..048cd1bb10f 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h
@@ -50,8 +50,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Location * the_location ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the average CPU load at the location which this
@@ -61,8 +60,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::LoadList * loads ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
index 8deb50cae85..a1a291b4a94 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.cpp
@@ -15,22 +15,21 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void)
 }
 
 char *
-ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -39,8 +38,7 @@ ServerRequestInterceptor::receive_request_service_contexts (
 
 void
 ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -48,16 +46,14 @@ ServerRequestInterceptor::receive_request (
 
 void
 ServerRequestInterceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -65,8 +61,7 @@ ServerRequestInterceptor::send_exception (
 
 void
 ServerRequestInterceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
index 7768134b610..15e73de4d43 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -61,38 +61,33 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
index 59c96439de0..cdd1fd226e1 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
@@ -27,8 +27,8 @@ StockFactory::get_stock (const char *symbol)
 }
 
 void
-StockFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+StockFactory::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
index 47bf026ce81..0d721a9a0d3 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
@@ -17,7 +17,7 @@ public:
   Test::Stock_ptr get_stock (const char *symbol)
     throw (Test::Invalid_Stock_Symbol);
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
index 47508dba78e..c229a673084 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
@@ -51,22 +51,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::StockFactory_var stockfactory =
-        Test::StockFactory::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::StockFactory::_narrow (tmp.in ());
 
       if (CORBA::is_nil (stockfactory.in ()))
         {
@@ -92,19 +89,15 @@ main (int argc, char *argv[])
                       price));
         }
 
-      //stockfactory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      //ACE_TRY_CHECK;
+      //stockfactory->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client.cpp:");
+      ex._tao_print_exception ("Exception caught in client.cpp:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 66d41596ce8..84f89ecb79b 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -74,18 +74,13 @@ parse_args (int argc, char *argv[])
 CORBA::Object_ptr
 join_object_group (CORBA::ORB_ptr orb,
                    CosLoadBalancing::LoadManager_ptr lm,
-                   const PortableGroup::Location & location
-                   ACE_ENV_ARG_PARAMETER)
+                   const PortableGroup::Location & location)
 {
   CORBA::Object_var ns_object =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (ns_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    CosNaming::NamingContext::_narrow (ns_object.in ());
 
   CosNaming::Name name (1);
   name.length (1);
@@ -95,13 +90,11 @@ join_object_group (CORBA::ORB_ptr orb,
 
   CORBA::Object_var group;
 
-  ACE_TRY
+  try
     {
-      group = nc->resolve (name
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      group = nc->resolve (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& )
     {
       // Object group not created.  Create one.
       const char repository_id[] = "IDL:Test/StockFactory:1.0";
@@ -123,16 +116,12 @@ join_object_group (CORBA::ORB_ptr orb,
 
       group = lm->create_object (repository_id,
                                  criteria,
-                                 fcid.out ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 fcid.out ());
 
-      ACE_TRY_EX (foo)
+      try
         {
           nc->bind (name,
-                    group.in ()
-                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+                    group.in ());
 
           PortableGroup::Properties props (1);
           props.length (1);
@@ -194,45 +183,31 @@ join_object_group (CORBA::ORB_ptr orb,
 
           props[0].val <<= strategy_info;
 
-          lm->set_default_properties (props
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          lm->set_default_properties (props);
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
           // Somebody beat us to creating the object group.  Clean up
           // the one we created.
-          lm->delete_object (fcid.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          lm->delete_object (fcid.in ());
 
-          group = nc->resolve (name
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          group = nc->resolve (name);
         }
-      ACE_ENDTRY;
-      ACE_TRY_CHECK;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   StockFactory * stockfactory_impl;
   ACE_NEW_THROW_EX (stockfactory_impl,
                     StockFactory (orb, number),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var owner_transfer (stockfactory_impl);
 
   Test::StockFactory_var stockfactory =
-    stockfactory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    stockfactory_impl->_this ();
 
   group = lm->add_member (group.in (),
                           location,
-                          stockfactory.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                          stockfactory.in ());
 
   return group._retn ();
 }
@@ -240,7 +215,7 @@ join_object_group (CORBA::ORB_ptr orb,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ORBInitializer *initializer = 0;
       ACE_NEW_RETURN (initializer,
@@ -249,19 +224,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -269,63 +239,48 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::Object_var lm_object =
-        orb->resolve_initial_references ("LoadManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var load_manager =
-        CosLoadBalancing::LoadManager::_narrow (lm_object.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosLoadBalancing::LoadManager::_narrow (lm_object.in ());
 
       RPS_Monitor * monitor_servant;
       ACE_NEW_THROW_EX (monitor_servant,
                         RPS_Monitor (initializer->interceptor ()),
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
 
       PortableServer::ServantBase_var safe_monitor_servant (monitor_servant);
 
       CosLoadBalancing::LoadMonitor_var load_monitor =
-        monitor_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        monitor_servant->_this ();
 
       PortableGroup::Location_var location =
-        load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        load_monitor->the_location ();
 
       CORBA::Object_var stockfactory =
         ::join_object_group (orb.in (),
                              load_manager.in (),
-                             location.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             location.in ());
 
       TAO_LB_LoadAlert & alert_servant = initializer->load_alert ();
 
       CosLoadBalancing::LoadAlert_var load_alert =
-        alert_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        alert_servant._this ();
 
 
       CORBA::String_var ior =
-        orb->object_to_string (stockfactory.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (stockfactory.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -338,33 +293,24 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       load_manager->register_load_monitor (location.in (),
-                                           load_monitor.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           load_monitor.in ());
 
       load_manager->register_load_alert (location.in (),
-                                         load_alert.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         load_alert.in ());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "lb_server exception");
+      ex._tao_print_exception ("lb_server exception");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index 6c4fd3a47b3..b69c80ac456 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -25,65 +25,52 @@ TLS_Client::~TLS_Client ()
 }
 
 void
-TLS_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+TLS_Client::init (int argc, char *argv [])
 {
-  init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  resolve_TLS_Basic_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  init_ORB (argc, argv);
+  resolve_naming_service ();
+  resolve_TLS_Basic_factory ();
 }
 
 void
 TLS_Client::init_ORB (int argc,
-                      char *argv []
-                      ACE_ENV_ARG_DECL)
+                      char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 }
 
 void
-TLS_Client::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+TLS_Client::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
-TLS_Client::resolve_TLS_Basic_factory (ACE_ENV_SINGLE_ARG_DECL)
+TLS_Client::resolve_TLS_Basic_factory (void)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (BASIC_TLS_LOG_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_context_->resolve (name);
 
   this->basic_log_factory_ =
-    DsLogAdmin::BasicLogFactory::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    DsLogAdmin::BasicLogFactory::_narrow (obj.in ());
 }
 
 void
-TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
+TLS_Client::run_tests (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->basic_log_factory_.in ()));
 
@@ -100,9 +87,7 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
   DsLogAdmin::BasicLog_var basic_log =
     this->basic_log_factory_->create (logfullaction,
                                       max_size,
-                                      logid
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      logid);
 
   ACE_DEBUG ((LM_DEBUG,
               "Create returned logid = %d\n",logid));
@@ -118,17 +103,14 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG,
               "Writing %d records...\n", LOG_EVENT_COUNT));
-  basic_log->write_records (any_seq ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  basic_log->write_records (any_seq);
 
   ACE_DEBUG ((LM_DEBUG,
               "Calling BasicLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-  CORBA::ULongLong retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULongLong retval = basic_log->get_n_records ();
 #else
-  CORBA::Long retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-  ACE_CHECK;
+  CORBA::Long retval = basic_log->get_n_records ().lo();
 #endif
 
   ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
@@ -136,11 +118,9 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               "Calling BasicLog::get_current_size...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-  retval = basic_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  retval = basic_log->get_current_size ();
 #else
-  retval = basic_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-  ACE_CHECK;
+  retval = basic_log->get_current_size ().lo();
 #endif
 
   ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -166,17 +146,14 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               "Deleting records... \n"));
 
-  retval = basic_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  retval = basic_log->delete_records (QUERY_LANG, QUERY_2);
 
   ACE_DEBUG ((LM_DEBUG,
               "Calling BasicLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-  retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  retval = basic_log->get_n_records ();
 #else
-  retval = basic_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-  ACE_CHECK;
+  retval = basic_log->get_n_records ().lo();
 #endif
 
   ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
@@ -184,15 +161,12 @@ TLS_Client::run_tests (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-  retval = basic_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  retval = basic_log->get_current_size ();
 #else
-  retval = basic_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-  ACE_CHECK;
+  retval = basic_log->get_current_size ().lo();
 #endif
 
   ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
 
-  basic_log->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  basic_log->destroy ();
 }
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
index b06ffc65f92..505e6adae5b 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
@@ -31,20 +31,20 @@ class TLS_Client
   TLS_Client (void);
   ~TLS_Client ();
 
-  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv []);
   // Init the Client.
 
-  void run_tests (ACE_ENV_SINGLE_ARG_DECL);
+  void run_tests (void);
   // Run the tests..
 
  protected:
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Try to get hold of a running naming service.
 
-  void resolve_TLS_Basic_factory (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_TLS_Basic_factory (void);
   // Try to resolve the TLS factory from the Naming service.
 
   // = Data Members
@@ -58,6 +58,6 @@ class TLS_Client
   // The basic log factory from the Log Service.
 
 
- 
+
 };
 #endif /* TLS_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp
index 3b5098b43ad..e3fb93ff58c 100644
--- a/TAO/orbsvcs/examples/Log/Basic/main.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp
@@ -11,29 +11,23 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   TLS_Client client; // Telecom Log Service Client
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv
-                   ACE_ENV_ARG_PARAMETER); //Init the Client
-      ACE_TRY_CHECK;
+      client.init (argc, argv); //Init the Client
 
-      client.run_tests (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
+      client.run_tests (); //Init the Client
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "TLS_Client user error: ");
+      ue._tao_print_exception ("TLS_Client user error: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "TLS_Client system error: ");
+      se._tao_print_exception ("TLS_Client system error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index 1b102beac2f..47d97183f2a 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -27,65 +27,52 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
       this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (),0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (EVENT_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (name);
 
       this->event_log_factory_ =
-        DsEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DsEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
       this->supplier_ =
         this->event_log_factory_->obtain_push_supplier ();
 
       CosEventComm::PushConsumer_var consumer =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->_this ();
 
-      this->supplier_->connect_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER);
+      this->supplier_->connect_push_consumer (consumer.in ());
 
       orb_->run ();
 
@@ -96,18 +83,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const CORBA::Any &
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const CORBA::Any &)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -120,12 +105,12 @@ Consumer::push (const CORBA::Any &
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index 946299dc55d..d552c48d738 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
@@ -42,11 +42,10 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const CORBA::Any &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index f65f4a420e9..67b4f42765d 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -30,39 +30,30 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
 
       CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 
       CosNaming::Name name (1);
@@ -70,14 +61,10 @@ Supplier::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup (EVENT_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (name);
 
       this->event_log_factory_ =
-        DsEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DsEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
       ACE_ASSERT (!CORBA::is_nil (this->event_log_factory_.in ()));
 
@@ -98,24 +85,22 @@ Supplier::run (int argc, char* argv[])
         this->event_log_factory_->create (logfullaction,
                                           max_size,
                                           threshold,
-                                          logid
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          logid);
 
 
       ACE_DEBUG ((LM_DEBUG,
                   "Create returned logid = %d\n",logid));
 
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_log->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+        event_log->for_suppliers ();
 
       this->consumer_ =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+        supplier_admin->obtain_push_consumer ();
 
       CosEventComm::PushSupplier_var supplier =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->_this ();
 
-      this->consumer_->connect_push_supplier (supplier.in () ACE_ENV_ARG_PARAMETER);
+      this->consumer_->connect_push_supplier (supplier.in ());
 
       // Create some fake log events.
       CORBA::Any event;
@@ -123,21 +108,18 @@ Supplier::run (int argc, char* argv[])
 
       for (int d = 0; d < LOG_EVENT_COUNT; d++)
         {
-          this->consumer_->push (event ACE_ENV_ARG_PARAMETER);
+          this->consumer_->push (event);
         }
 
       ACE_DEBUG ((LM_DEBUG,
                   "Writing %d records...\n", LOG_EVENT_COUNT));
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      CORBA::ULongLong retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULongLong retval = event_log->get_n_records ();
 #else
-      CORBA::Long retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+      CORBA::Long retval = event_log->get_n_records ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
@@ -145,11 +127,9 @@ Supplier::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_current_size...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = event_log->get_current_size ();
 #else
-      retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+      retval = event_log->get_current_size ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -174,17 +154,14 @@ Supplier::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Deleting records... \n"));
 
-      retval = event_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = event_log->delete_records (QUERY_LANG, QUERY_2);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = event_log->get_n_records ();
 #else
-      retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+      retval = event_log->get_n_records ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
@@ -192,48 +169,40 @@ Supplier::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = event_log->get_current_size ();
 #else
-      retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+      retval = event_log->get_current_size ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
 
      // Disconnect from the EC
-      this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->consumer_->disconnect_push_consumer ();
 
       // Destroy the EC....
-      //event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      event_log->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      //event_channel->destroy ();
+      event_log->destroy ();
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
 
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->deactivate_object (id.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 0);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
index c37b9a5c9df..bc989ce8643 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  An example of using the Event_Logging_Service.
- *  
+ *
  *
  *
  *  @author D A Hanvey (d.hanvey@qub.ac.uk)
@@ -42,7 +42,7 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 0d27c8860d3..6f5ca7c53f0 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -35,43 +35,34 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
       this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 
       CosNaming::Name name (1);
@@ -79,38 +70,29 @@ Consumer::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup (NOTIFY_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (name);
 
       this->notify_log_factory_ =
-        DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ());
 
       CosNotifyComm::PushConsumer_var objref =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       ACE_ASSERT (!CORBA::is_nil (objref.in ()));
 
       CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-        this->notify_log_factory_->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->notify_log_factory_->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_);
 
       ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
 
       this->proxy_supplier_ =
         CosNotifyChannelAdmin::ProxyPushSupplier::
-        _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        _narrow (proxysupplier.in ());
 
       ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-      proxy_supplier_->connect_any_push_consumer (objref.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy_supplier_->connect_any_push_consumer (objref.in ());
 
       orb_->run ();
 
@@ -121,18 +103,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const CORBA::Any &event
-    ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const CORBA::Any &event)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -149,21 +129,19 @@ Consumer::push (const CORBA::Any &event
 
 void
 Consumer::disconnect_push_consumer
-   (ACE_ENV_SINGLE_ARG_DECL)
+   (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   this->proxy_supplier_->
-    disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    disconnect_push_supplier();
 }
 
 void
 Consumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq & /*removed*/)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index 0a125e95824..0d2498223fb 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
@@ -56,7 +56,6 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -64,8 +63,7 @@ protected:
       ));
 
   // = StructuredPushSupplier methods
-virtual void push (const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+virtual void push (const CORBA::Any &event)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -73,7 +71,6 @@ virtual void push (const CORBA::Any &event
 
 
   virtual void disconnect_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 86fbfd2be3c..f84ba7374ab 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -39,28 +39,23 @@ Supplier::~Supplier ()
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
 
 
       CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 
       CosNaming::Name name (1);
@@ -68,14 +63,10 @@ Supplier::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup (NOTIFY_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (name);
 
       this->notify_log_factory_ =
-        DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ());
 
       ACE_ASSERT (!CORBA::is_nil (this->notify_log_factory_.in ()));
 
@@ -98,10 +89,8 @@ Supplier::run (int argc, char* argv[])
                                           threshold,
                                           initial_qos,
                                           initial_admin,
-                                          logid
-                                          ACE_ENV_ARG_PARAMETER);
+                                          logid);
 
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Create returned logid = %d\n",logid));
@@ -124,13 +113,11 @@ Supplier::run (int argc, char* argv[])
       ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
       CosNotifyFilter::FilterFactory_var ffact =
-        notify_log_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        notify_log_->default_filter_factory ();
 
       // setup a filter at the consumer admin
       CosNotifyFilter::Filter_var sa_filter =
-        ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ffact->create_filter (TCL_GRAMMAR);
 
       ACE_ASSERT (!CORBA::is_nil (sa_filter.in ()));
 
@@ -140,19 +127,16 @@ Supplier::run (int argc, char* argv[])
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER);
 
-      sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sa_filter->add_constraints (constraint_list);
 
-      supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_admin_->add_filter (sa_filter.in ());
 
       // startup the first supplier
       ACE_NEW_THROW_EX (supplier_1,
-                        Filter_StructuredPushSupplier (ACE_ENV_SINGLE_ARG_PARAMETER),
+                        Filter_StructuredPushSupplier (),
                         CORBA::NO_MEMORY ());
 
-      supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_1->connect (supplier_admin_.in ());
 
       // operations:
       CosNotification::StructuredEvent event;
@@ -197,19 +181,16 @@ Supplier::run (int argc, char* argv[])
         // any
         event.remainder_of_body <<= (CORBA::Long)k;
 
-        supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        supplier_1->send_event (event);
       }
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling NotifyLog get_n_records...\n"));
 
 #ifndef ACE_LACKS_LONGLONG_T
-      CORBA::ULongLong retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULongLong retval = notify_log_->get_n_records ();
 #else
-      CORBA::Long retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+      CORBA::Long retval = notify_log_->get_n_records ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
@@ -217,11 +198,9 @@ Supplier::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Calling NotifyLog::get_current_size...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-       retval = notify_log_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+       retval = notify_log_->get_current_size ();
 #else
-       retval = notify_log_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+       retval = notify_log_->get_current_size ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -246,17 +225,14 @@ Supplier::run (int argc, char* argv[])
      ACE_DEBUG ((LM_DEBUG,
                  "Deleting records... \n"));
 
-     retval = notify_log_->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     retval = notify_log_->delete_records (QUERY_LANG, QUERY_2);
 
      ACE_DEBUG ((LM_DEBUG,
                  "Calling NotifyLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-     retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     retval = notify_log_->get_n_records ();
 #else
-     retval = notify_log_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-     ACE_TRY_CHECK;
+     retval = notify_log_->get_n_records ().lo();
 #endif
 
      ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
@@ -264,11 +240,9 @@ Supplier::run (int argc, char* argv[])
 
      ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-     retval = notify_log_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     retval = notify_log_->get_current_size ();
 #else
-     retval = notify_log_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-     ACE_TRY_CHECK;
+     retval = notify_log_->get_current_size ().lo();
 #endif
 
      ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -276,17 +250,16 @@ Supplier::run (int argc, char* argv[])
      this->notify_log_->destroy();
 
      }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 
-Filter_StructuredPushSupplier::Filter_StructuredPushSupplier  (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Filter_StructuredPushSupplier::Filter_StructuredPushSupplier  (void)
 {
 }
 
@@ -295,43 +268,37 @@ Filter_StructuredPushSupplier::~Filter_StructuredPushSupplier ()
 }
 
 void
-Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL)
+Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
-Filter_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Filter_StructuredPushSupplier::disconnect (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_consumer_->disconnect_structured_push_consumer();
 }
 
 void
 Filter_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq & /*removed */)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -342,17 +309,16 @@ Filter_StructuredPushSupplier::subscription_change
 
 void
 Filter_StructuredPushSupplier::send_event
-   (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+   (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
 Filter_StructuredPushSupplier::disconnect_structured_push_supplier
-   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
index bd4e26f2fda..0326d711dc6 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
@@ -77,19 +77,17 @@ class Filter_StructuredPushSupplier
   //
  public:
   // = Initialization and Termination code
-  Filter_StructuredPushSupplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  Filter_StructuredPushSupplier (void);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the supplier.
 
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
   // Send one event.
 
 protected:
@@ -108,7 +106,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -117,7 +114,6 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index a9ce5387a62..17a8ff1634a 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -28,13 +28,11 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
@@ -48,68 +46,52 @@ Consumer::run (int argc, char* argv[])
         }
 */
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
 /*      object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (argv[1]);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
 */
 
      // Obtain the event channel
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (EVENT_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (name);
 
       this->event_log_factory_ =
-        RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
 
       // The canonical protocol to connect to the EC
 
       this->supplier_ =
-        this->event_log_factory_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->event_log_factory_->obtain_push_supplier ();
 
       RtecEventComm::PushConsumer_var consumer =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       // Simple subscription, but usually the helper classes in
       // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -125,9 +107,7 @@ Consumer::run (int argc, char* argv[])
       h1.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
-      this->supplier_->connect_push_consumer (consumer.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->supplier_->connect_push_consumer (consumer.in (), qos);
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
@@ -140,18 +120,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (events);
@@ -164,12 +142,12 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index 5c908495901..b4009a41576 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
@@ -43,10 +43,9 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 1a2de3ca9b9..e9a9215b19f 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -33,13 +33,11 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
 
 /*
@@ -56,42 +54,32 @@ Supplier::run (int argc, char* argv[])
      // this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
 /*      object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (argv[1]);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
 */
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references (NAMING_SERVICE_NAME);
 
       // Need to check return value for errors.
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_THROW_RETURN (CORBA::UNKNOWN (), 0);
 
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 
       CosNaming::Name name (1);
@@ -99,14 +87,10 @@ Supplier::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup (EVENT_TLS_LOG_FACTORY_NAME);
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (name);
 
       this->event_log_factory_ =
-        RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
       ACE_ASSERT (!CORBA::is_nil (this->event_log_factory_.in ()));
 
@@ -130,9 +114,7 @@ Supplier::run (int argc, char* argv[])
         this->event_log_factory_->create (logfullaction,
                                           max_size,
                                           threshold,
-                                          logid
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          logid);
 
 
       ACE_DEBUG ((LM_DEBUG,
@@ -140,16 +122,13 @@ Supplier::run (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_log->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_log->for_suppliers ();
 
       this->consumer_ =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       RtecEventComm::PushSupplier_var supplier =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
 
       // Simple publication, but usually the helper classes in
@@ -161,9 +140,7 @@ Supplier::run (int argc, char* argv[])
       h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h0.source = 1;                      // first free event source
 
-      this->consumer_->connect_push_supplier (supplier.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->consumer_->connect_push_supplier (supplier.in (), qos);
 
 
       // Create some fake log events.
@@ -178,23 +155,19 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != LOG_EVENT_COUNT; ++i)
         {
-          this->consumer_->push (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->consumer_->push (event);
           ACE_OS::sleep (sleep_time);
         }
 
       ACE_DEBUG ((LM_DEBUG,
                   "Writing %d records...\n", LOG_EVENT_COUNT));
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      CORBA::ULongLong retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULongLong retval = event_log->get_n_records ();
 #else
-      CORBA::Long retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+      CORBA::Long retval = event_log->get_n_records ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Number of records in Log = %d \n", retval));
@@ -202,11 +175,9 @@ Supplier::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_current_size...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = event_log->get_current_size ();
 #else
-      retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+      retval = event_log->get_current_size ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
@@ -231,17 +202,14 @@ Supplier::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Deleting records... \n"));
 
-      retval = event_log->delete_records (QUERY_LANG, QUERY_2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = event_log->delete_records (QUERY_LANG, QUERY_2);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Calling EventLog::get_n_records...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = event_log->get_n_records ();
 #else
-      retval = event_log->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+      retval = event_log->get_n_records ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Number of records in Log after delete = %d \n",
@@ -249,48 +217,40 @@ Supplier::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Geting the current_size again...\n"));
 #ifndef ACE_LACKS_LONGLONG_T
-      retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = event_log->get_current_size ();
 #else
-      retval = event_log->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER).lo();
-      ACE_TRY_CHECK;
+      retval = event_log->get_current_size ().lo();
 #endif
 
       ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d \n", retval));
 
      // Disconnect from the EC
-     this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->consumer_->disconnect_push_consumer ();
 
      // Destroy the EC....
-     //event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-     event_log->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     //event_channel->destroy ();
+     event_log->destroy ();
 
      // Deactivate this object...
      PortableServer::ObjectId_var id =
-       poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
-     poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       poa->servant_to_id (this);
+     poa->deactivate_object (id.in ());
 
      // Destroy the POA
-     poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa->destroy (1, 0);
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
index 170a98db896..9404dd76d52 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  An example of using the RTEvent_Logging_Service.
- *  
+ *
  *
  *
  *  @author D A Hanvey (d.hanvey@qub.ac.uk)
@@ -43,7 +43,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index 3e6109e1ee1..9bd46c2a5a7 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -145,8 +145,7 @@ private:
   //
   virtual void
   offer_change (EventTypeSeq const&,
-                EventTypeSeq const&
-                ACE_ENV_ARG_DECL_NOT_USED)
+                EventTypeSeq const&)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType))
   {
@@ -156,7 +155,7 @@ private:
   // StructuredPushSupplier interface.
   //
   virtual void
-  push_structured_event (StructuredEvent const& e ACE_ENV_ARG_DECL_NOT_USED)
+  push_structured_event (StructuredEvent const& e)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected))
   {
@@ -182,7 +181,7 @@ private:
 
 
   virtual void
-  disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  disconnect_structured_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // We don't care.
@@ -206,7 +205,7 @@ private:
 int
 main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     ORB_var orb (ORB_init (argc, argv));
 
@@ -222,9 +221,7 @@ main (int argc, char* argv[])
     // Activate the root POA.
     //
     CORBA::Object_var obj (
-      orb->resolve_initial_references ("RootPOA"
-                                       ACE_ENV_ARG_PARAMETER));
-    ACE_TRY_CHECK;
+      orb->resolve_initial_references ("RootPOA"));
 
     PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ()));
 
@@ -254,14 +251,11 @@ main (int argc, char* argv[])
     }
 
 
-    ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ns->init_service (orb.in ());
 
     // Create the channel factory.
     //
-    EventChannelFactory_var factory (ns->create (root_poa.in ()
-                                                 ACE_ENV_ARG_PARAMETER));
-    ACE_TRY_CHECK;
+    EventChannelFactory_var factory (ns->create (root_poa.in ()));
 
     if (is_nil (factory.in ()))
     {
@@ -328,19 +322,16 @@ main (int argc, char* argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
   {
-    ACE_PRINT_EXCEPTION (ue,
-                         "User exception: ");
+    ue._tao_print_exception ("User exception: ");
     return 1;
   }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
   {
-    ACE_PRINT_EXCEPTION (se,
-                         "System exception: ");
+    se._tao_print_exception ("System exception: ");
     return 1;
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
index f34fd4bd09c..19187fdb325 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.cpp
@@ -191,7 +191,7 @@ tracker ()
 }
 
 void Gate::
-push_structured_event (StructuredEvent const& e ACE_ENV_ARG_DECL_NOT_USED)
+push_structured_event (StructuredEvent const& e)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
@@ -249,7 +249,7 @@ push_structured_event (StructuredEvent const& e ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void Gate::
-disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+disconnect_structured_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We don't care.
@@ -257,8 +257,7 @@ disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void Gate::
 offer_change (EventTypeSeq const&,
-              EventTypeSeq const&
-              ACE_ENV_ARG_DECL_NOT_USED)
+              EventTypeSeq const&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
 {
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
index 312bb6b5a20..d4838d078ff 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Gate.h
@@ -52,22 +52,20 @@ private:
   //
   virtual void
   offer_change (CosNotification::EventTypeSeq const&,
-                CosNotification::EventTypeSeq const&
-                ACE_ENV_ARG_DECL)
+                CosNotification::EventTypeSeq const&)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
 
   // StructuredPushSupplier interface.
   //
   virtual void
-  push_structured_event (CosNotification::StructuredEvent const& e
-                         ACE_ENV_ARG_DECL)
+  push_structured_event (CosNotification::StructuredEvent const& e)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
 
 
   virtual void
-  disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  disconnect_structured_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
index 2751694dcd7..214179c6803 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
@@ -35,7 +35,7 @@ using namespace CosNotifyChannelAdmin;
 int
 main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     ORB_var orb (ORB_init (argc, argv));
 
@@ -50,9 +50,7 @@ main (int argc, char* argv[])
     // Activate the root POA.
     //
     CORBA::Object_var obj (
-      orb->resolve_initial_references ("RootPOA"
-                                       ACE_ENV_ARG_PARAMETER));
-    ACE_TRY_CHECK;
+      orb->resolve_initial_references ("RootPOA"));
 
     PortableServer::POA_var root_poa (PortableServer::POA::_narrow (obj.in ()));
 
@@ -82,14 +80,11 @@ main (int argc, char* argv[])
     }
 
 
-    ns->init_service (orb.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ns->init_service (orb.in ());
 
     // Create the channel factory.
     //
-    EventChannelFactory_var factory (ns->create (root_poa.in ()
-                                                 ACE_ENV_ARG_PARAMETER));
-    ACE_TRY_CHECK;
+    EventChannelFactory_var factory (ns->create (root_poa.in ()));
 
     if (is_nil (factory.in ()))
     {
@@ -179,19 +174,16 @@ main (int argc, char* argv[])
 
     return 0;
   }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
   {
-    ACE_PRINT_EXCEPTION (ue,
-                         "User exception: ");
+    ue._tao_print_exception ("User exception: ");
     return 1;
   }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
   {
-    ACE_PRINT_EXCEPTION (se,
-                         "System exception: ");
+    se._tao_print_exception ("System exception: ");
     return 1;
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index a2aa9dbf434..9f9d0c62cac 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -28,38 +28,29 @@ FilterClient::~FilterClient ()
 }
 
 void
-FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+FilterClient::init (int argc, char *argv [])
 {
-  init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  init_ORB (argc, argv);
 
-  resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  resolve_naming_service ();
 
-  resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  resolve_Notify_factory ();
 
-  create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  create_EC ();
 
-  create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  create_supplieradmin ();
 
-  create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  create_consumeradmin ();
 
-  create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  create_consumers ();
 
-  create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  create_suppliers ();
 }
 
 void
-FilterClient::run (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::run (void)
 {
-  send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  send_events ();
 
   if (g_result_count != EVENTS_EXPECTED_TO_RECEIVE)
     { // if we still need to wait for events, run the orb.
@@ -77,19 +68,14 @@ FilterClient::done (void)
 
 void
 FilterClient::init_ORB (int argc,
-                      char *argv []
-                      ACE_ENV_ARG_DECL)
+                      char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
     {
@@ -98,86 +84,70 @@ FilterClient::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 }
 
 void
-FilterClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
-FilterClient::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::resolve_Notify_factory (void)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_context_->resolve (name);
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
 }
 
 void
-FilterClient::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-FilterClient::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::create_supplieradmin (void)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_->new_for_suppliers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   CosNotifyFilter::FilterFactory_var ffact =
-    ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_->default_filter_factory ();
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var sa_filter =
-    ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ffact->create_filter (TCL_GRAMMAR);
 
   ACE_ASSERT (!CORBA::is_nil (sa_filter.in ()));
 
@@ -187,32 +157,27 @@ FilterClient::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER);
 
-  sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  sa_filter->add_constraints (constraint_list);
 
-  supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_admin_->add_filter (sa_filter.in ());
 }
 
 void
-FilterClient:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient:: create_consumeradmin (void)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_->new_for_consumers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   CosNotifyFilter::FilterFactory_var ffact =
-    ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_->default_filter_factory ();
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var ca_filter =
-    ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ffact->create_filter (TCL_GRAMMAR);
 
   ACE_ASSERT (!CORBA::is_nil (ca_filter.in ()));
 
@@ -227,55 +192,49 @@ FilterClient:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER);
 
-  ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ca_filter->add_constraints (constraint_list);
 
-  consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_admin_->add_filter (ca_filter.in ());
 }
 
 void
-FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::create_consumers (void)
 {
   // startup the first consumer.
   ACE_NEW_THROW_EX (consumer_1,
                     Filter_StructuredPushConsumer (this, "consumer1"),
                     CORBA::NO_MEMORY ());
 
-  consumer_1->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->connect (consumer_admin_.in ());
 
   // startup the second consumer.
   ACE_NEW_THROW_EX (consumer_2,
                     Filter_StructuredPushConsumer (this, "consumer2"),
                     CORBA::NO_MEMORY ());
 
-  consumer_2->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_2->connect (consumer_admin_.in ());
 }
 
 void
-FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::create_suppliers (void)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
                     Filter_StructuredPushSupplier ("supplier1"),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (supplier_admin_.in ());
 
   // startup the second supplier
   ACE_NEW_THROW_EX (supplier_2,
                     Filter_StructuredPushSupplier ("supplier2"),
                     CORBA::NO_MEMORY ());
 
-  supplier_2->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_2->connect (supplier_admin_.in ());
 }
 
 void
-FilterClient::send_events (ACE_ENV_SINGLE_ARG_DECL)
+FilterClient::send_events (void)
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -320,11 +279,9 @@ FilterClient::send_events (ACE_ENV_SINGLE_ARG_DECL)
       // any
       event.remainder_of_body <<= (CORBA::Long)i;
 
-      supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_1->send_event (event);
 
-      supplier_2->send_event (event ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_2->send_event (event);
     }
 }
 
@@ -340,45 +297,39 @@ Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void)
 }
 
 void
-Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL)
+Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    _narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_supplier_->connect_structured_push_consumer (objref.in ());
 }
 
 void
-Filter_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Filter_StructuredPushConsumer::disconnect (void)
 {
   this->proxy_supplier_->
-    disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    disconnect_structured_push_supplier();
 }
 
 void
 Filter_StructuredPushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -389,8 +340,7 @@ Filter_StructuredPushConsumer::offer_change
 
 void
 Filter_StructuredPushConsumer::push_structured_event
-   (const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED)
+   (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -416,7 +366,7 @@ Filter_StructuredPushConsumer::push_structured_event
 
 void
 Filter_StructuredPushConsumer::disconnect_structured_push_consumer
-   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -437,43 +387,38 @@ Filter_StructuredPushSupplier::~Filter_StructuredPushSupplier ()
 }
 
 void
-Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL)
+Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
-Filter_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Filter_StructuredPushSupplier::disconnect (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_consumer_->disconnect_structured_push_consumer();
 }
 
 void
 Filter_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -484,20 +429,19 @@ Filter_StructuredPushSupplier::subscription_change
 
 void
 Filter_StructuredPushSupplier::send_event
-   (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+   (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   ACE_DEBUG ((LM_DEBUG,
               "%s is sending an event \n", my_name_.fast_rep ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
 Filter_StructuredPushSupplier::disconnect_structured_push_supplier
-   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index e7f9cd236a4..6f4263808f6 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -40,41 +40,41 @@ class FilterClient
   ~FilterClient ();
   // Destructor
 
-  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv []);
   // Init the Client.
 
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
   // Run the demo.
 
   void done (void);
   // Consumer calls done, We're done.
 
  protected:
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_Notify_factory (void);
   // Try to resolve the Notify factory from the Naming service.
 
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create an EC.
 
-  void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL);
+  void create_supplieradmin(void);
   // Create the Supplier Admin.
 
-  void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL);
+  void create_consumeradmin (void);
   // Create the Consumer Admin.
 
-  void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  void create_consumers (void);
   // Create and initialize the consumers.
 
-  void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void create_suppliers (void);
   // create and initialize the suppliers.
 
-  void send_events (ACE_ENV_SINGLE_ARG_DECL);
+  void send_events (void);
   // send the events.
 
   // = Data Members
@@ -140,11 +140,11 @@ class Filter_StructuredPushConsumer
   Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect (void);
   // Disconnect from the supplier.
 
 protected:
@@ -170,7 +170,6 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -180,7 +179,6 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -188,7 +186,6 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -211,16 +208,14 @@ class Filter_StructuredPushSupplier
   Filter_StructuredPushSupplier (const char* my_name);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the supplier.
 
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
   // Send one event.
 
 protected:
@@ -242,7 +237,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -251,7 +245,6 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
index 845f7ab68f7..5d095aa8faa 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
@@ -8,28 +8,22 @@ main (int argc, char *argv [])
 {
   FilterClient client;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv
-                   ACE_ENV_ARG_PARAMETER); //Init the Client
-      ACE_TRY_CHECK;
+      client.init (argc, argv); //Init the Client
 
-      client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.run ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "TLS_Client user error: ");
+      ue._tao_print_exception ("TLS_Client user error: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "Filter system error: ");
+      se._tao_print_exception ("Filter system error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl
index d0e3f39101f..2bfe48b730d 100755
--- a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl
+++ b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $experiment_timeout = 60;
 $startup_timeout = 60;
 
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
index 17d2109cfb0..17adfa7d657 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp
@@ -17,51 +17,46 @@ TAO_Notify_Lanes_Consumer::~TAO_Notify_Lanes_Consumer (void)
 }
 
 void
-TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type ACE_ENV_ARG_DECL)
+TAO_Notify_Lanes_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type)
 {
   this->default_POA_ = poa;
   this->admin_ = admin;
   this->event_type_ = event_type;
 
-  this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connect ();
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Lanes_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Lanes_Consumer::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_Lanes_Consumer::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Lanes_Consumer::run (void)
 {
   // Nothing to do.
 }
 
 void
-TAO_Notify_Lanes_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::connect (void)
 {
   // Activate the consumer with the default_POA_
-  CosNotifyComm::StructuredPushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyComm::StructuredPushConsumer_var objref = this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     this->admin_->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                     , proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                     , proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
-    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_supplier_->connect_structured_push_consumer (objref.in ());
 
   // Call subscription_change to inform the supplier that this consumer is available.
   CosNotification::EventTypeSeq added (1);
@@ -71,21 +66,19 @@ TAO_Notify_Lanes_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
   added[0].domain_name = CORBA::string_dup ("TEST_DOMAIN");
   added[0].type_name = CORBA::string_dup (this->event_type_.c_str ());
 
-  this->proxy_supplier_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_supplier_->subscription_change (added, removed);
 }
 
 void
-TAO_Notify_Lanes_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::disconnect (void)
 {
-  this->proxy_supplier_->disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_supplier_->disconnect_structured_push_supplier();
 }
 
 void
 TAO_Notify_Lanes_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/,
                                const CosNotification::EventTypeSeq & /*removed*/
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -95,19 +88,17 @@ TAO_Notify_Lanes_Consumer::offer_change (const CosNotification::EventTypeSeq & /
 }
 
 void
-TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
                    ))
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Check the current threads priority.
       RTCORBA::Priority thread_priority =
-        this->orb_objects_.current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_objects_.current_->the_priority ();
 
       const CosNotification::PropertySeq& prop_seq = notification.header.variable_header;
 
@@ -128,44 +119,37 @@ TAO_Notify_Lanes_Consumer::push_structured_event (const CosNotification::Structu
         ACE_DEBUG ((LM_DEBUG, "(%P, %t) Error: Event priority and thread priority are different. \n"));
 
       // Disconnect from the EC
-      this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect ();
 
       // Deactivate this object.
-      this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->deactivate ();
 
       // We received the event, shutdown the ORB.
       this->orb_objects_.orb_->shutdown (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Consumer error "));
+      ex._tao_print_exception (ACE_TEXT ("Consumer error "));
 
       return;
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_Notify_Lanes_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::deactivate (void)
 {
-  PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+  PortableServer::POA_var poa (this->_default_POA ());
 
-  PortableServer::ObjectId_var id (poa->servant_to_id (this
-                                                       ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
+  PortableServer::ObjectId_var id (poa->servant_to_id (this));
 
-  poa->deactivate_object (id.in()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in());
 }
 
 void
-TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer::disconnect_structured_push_consumer (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index 0f3c3d76dd9..f1f16034ae1 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -35,10 +35,10 @@ public:
   TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
-  void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, ACE_CString& event_type);
 
   /// Run
-  void run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void run (void);
 
 protected:
   // = Data members
@@ -66,23 +66,22 @@ protected:
   virtual ~TAO_Notify_Lanes_Consumer (void);
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
   /// Connect the Consumer to the EventChannel.
   /// Creates a new proxy supplier and connects to it.
-  void connect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (void);
 
   /// Disconnect the supplier.
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Deactivate.
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (void);
 
   // = NotifyPublish method
   virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -92,7 +91,6 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -100,7 +98,6 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 942d444d0cf..7515eafacf3 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -55,32 +55,27 @@ TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[])
 }
 
 void
-TAO_Notify_Lanes_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer_Client::initialize (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Initializing Consumer Client with lane priority = %d, event type = (%s)\n"
               , this->lane_priority_, this->event_type_.c_str ()));
 
   PortableServer::POAManager_var poa_manager =
-    this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_objects_.root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 
   // Resolve the Notification Factory.
-  CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory ();
 
   // Find the EventChannel created by the supplier.
-  CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels ();
 
   CosNotifyChannelAdmin::EventChannel_var ec;
 
   if (channel_seq->length() > 0)
     {
-      ec = ecf->get_event_channel (channel_seq[0] ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ec = ecf->get_event_channel (channel_seq[0]);
     }
   else
     {
@@ -92,23 +87,21 @@ TAO_Notify_Lanes_Consumer_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin.in ()));
 
-  PortableServer::POA_var rt_poa = this->create_rt_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var rt_poa = this->create_rt_poa ();
 
   // Create a Consumer
   this->consumer_ = new TAO_Notify_Lanes_Consumer (this->orb_objects_);
 
   // Initialize it.
-  this->consumer_->init (rt_poa, consumer_admin, this->event_type_ ACE_ENV_ARG_PARAMETER);
+  this->consumer_->init (rt_poa, consumer_admin, this->event_type_);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer_Client::create_rt_poa (void)
 {
   PortableServer::POA_var rt_poa;
 
@@ -117,15 +110,12 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Policy_var lanes_policy;
 
   CORBA::Policy_var activation_policy =
-    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   // Create a priority model policy.
   priority_model_policy =
     this->orb_objects_.rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED
-                                                              , 0
-                                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+                                                              , 0);
 
   RTCORBA::ThreadpoolLanes lanes (1);
   lanes.length (1);
@@ -149,15 +139,11 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
                                                               allow_borrowing,
                                                               allow_request_buffering,
                                                               max_buffered_requests,
-                                                              max_request_buffer_size
-                                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+                                                              max_request_buffer_size);
 
   // Create a thread-pool policy.
   lanes_policy =
-    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id);
 
   CORBA::PolicyList poa_policy_list;
 
@@ -167,46 +153,38 @@ TAO_Notify_Lanes_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
   poa_policy_list[2] = lanes_policy;
 
   PortableServer::POAManager_var poa_manager =
-    this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+    this->orb_objects_.root_poa_->the_POAManager ();
 
   rt_poa = this->orb_objects_.root_poa_->create_POA ("RT POA!",
                                                      poa_manager.in (),
-                                                     poa_policy_list
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+                                                     poa_policy_list);
 
   return rt_poa._retn ();
 }
 
 void
-TAO_Notify_Lanes_Consumer_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Consumer_Client::run (void)
 {
-  this->consumer_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_->run ();
 }
 
 int
 TAO_Notify_Lanes_Consumer_Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize this threads priority.
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_objects_.current_->the_priority (0);
 
-      this->initialize (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
-      ACE_TRY_CHECK;
+      this->initialize (); //Init the Client
 
-      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier error "));
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -214,19 +192,16 @@ TAO_Notify_Lanes_Consumer_Client::svc (void)
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize an ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       TAO_Notify_ORB_Objects orb_objects;
 
-      orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_objects.init (orb);
 
       TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
 
@@ -258,12 +233,10 @@ main (int argc, char *argv [])
       orb_run_task.thr_mgr ()->wait ();
       client.thr_mgr ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Consumer Client error "));
+      ex._tao_print_exception (ACE_TEXT ("Consumer Client error "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
index 31193b994f2..8160df2c847 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
@@ -39,10 +39,10 @@ public:
   ~TAO_Notify_Lanes_Consumer_Client ();
 
   /// Init
-  void initialize (ACE_ENV_SINGLE_ARG_DECL);
+  void initialize (void);
 
   /// Run
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
 
   /// Parse Args
   int parse_args (int argc, char *argv[]);
@@ -52,7 +52,7 @@ public:
 
 protected:
   /// Create an RT POA with a single lane at the specified RT Priority.
-  PortableServer::POA_ptr create_rt_poa (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr create_rt_poa (void);
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
index b26b9dbb0ec..420ece6b765 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp
@@ -9,42 +9,28 @@ TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
 }
 
 void
-TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL)
+TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb)
 {
   this->orb_ = orb;
 
-  CORBA::Object_var object =  this->orb_->resolve_initial_references("RootPOA"
-                                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object =  this->orb_->resolve_initial_references("RootPOA");
 
-  this->root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->root_poa_ = PortableServer::POA::_narrow (object.in ());
 
   // Resolve the RTORB.
-  object = this->orb_->resolve_initial_references ("RTORB"
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  object = this->orb_->resolve_initial_references ("RTORB");
 
-  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ());
 
   // Resolve the Current
-  object = this->orb_->resolve_initial_references ("RTCurrent"
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  object = this->orb_->resolve_initial_references ("RTCurrent");
 
-  this->current_ = RTCORBA::Current::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->current_ = RTCORBA::Current::_narrow (object.in ());
 
   // Resolve the Naming service
-  object = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  object = this->orb_->resolve_initial_references ("NameService");
 
-  this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ()
-                                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ());
 }
 
 TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
@@ -52,7 +38,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ORB_Objects::notify_factory (void)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf;
 
@@ -61,11 +47,9 @@ TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var object = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ecf._retn ());
+  CORBA::Object_var object = this->naming_->resolve (name);
 
-  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ecf._retn ());
+  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in());
 
   return ecf._retn ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
index e846e43303b..ddd8ed23da8 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
@@ -35,10 +35,10 @@ public:
   ~TAO_Notify_ORB_Objects ();
 
   /// Resolves all the references.
-  void init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL);
+  void init (CORBA::ORB_var& orb);
 
   /// Resolve Notification
-  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
 
   ///= Public Data
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
index 953328f78c5..0b181bdf553 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp
@@ -16,18 +16,15 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task ()
 int
 TAO_Notify_ORB_Run_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_objects_.current_->the_priority (0);
 
-      this->orb_objects_.orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_objects_.orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
index 8b3a2a50862..44c4a0fd1a6 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp
@@ -20,17 +20,17 @@ TAO_Notify_Lanes_Supplier::~TAO_Notify_Lanes_Supplier ()
 }
 
 void
-TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count ACE_ENV_ARG_DECL)
+TAO_Notify_Lanes_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count)
 {
   // First initialize the class members.
   this->admin_ = admin;
   this->expected_consumer_count_ = expected_consumer_count;
 
-  this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connect ();
 }
 
 void
-TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::run (void)
 {
   // The Priority at which we send the first event to the first consumer.
   RTCORBA::Priority priority = 1;
@@ -50,13 +50,11 @@ TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i < this->expected_consumer_count_; ++i, ++priority)
     {
       // Set this threads priority.
-      this->orb_objects_.current_->the_priority (priority ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_objects_.current_->the_priority (priority);
 
       // Make sure the priority was set, get the priority of the current thread.
       RTCORBA::Priority thread_priority =
-        this->orb_objects_.current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->orb_objects_.current_->the_priority ();
 
       // We will send this event.
       CosNotification::StructuredEvent event;
@@ -83,74 +81,64 @@ TAO_Notify_Lanes_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
                   "(%P, %t) Supplier is sending an event of type %s at priority %d\n", type, thread_priority));
 
       // send the event
-      this->send_event (event ACE_ENV_ARG_PARAMETER);
+      this->send_event (event);
     } // repeat for the next consumer at the next priority.
 
   // Disconnect from the EC
-  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect ();
 
   // Deactivate this object.
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate ();
 
   // we're done. shutdown the ORB to exit the process.
   this->orb_objects_.orb_->shutdown (1);
 }
 
 void
-TAO_Notify_Lanes_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::connect (void)
 {
   // Activate the supplier object.
-  CosNotifyComm::StructuredPushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyComm::StructuredPushSupplier_var objref = this->_this ();
 
   // Obtain the proxy.
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     this->admin_->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                     , proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                     , proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
   // connect to the proxyconsumer.
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
-TAO_Notify_Lanes_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::disconnect (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_consumer_->disconnect_structured_push_consumer();
 }
 
 void
-TAO_Notify_Lanes_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::deactivate (void)
 {
-  PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+  PortableServer::POA_var poa (this->_default_POA ());
 
-  PortableServer::ObjectId_var id (poa->servant_to_id (this
-                                                       ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
+  PortableServer::ObjectId_var id (poa->servant_to_id (this));
 
-  poa->deactivate_object (id.in()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in());
 }
 
 void
 TAO_Notify_Lanes_Supplier::subscription_change (const CosNotification::EventTypeSeq & added,
                                       const CosNotification::EventTypeSeq & /*removed */
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -167,19 +155,18 @@ TAO_Notify_Lanes_Supplier::subscription_change (const CosNotification::EventType
 }
 
 void
-TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_Lanes_Supplier::send_event (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
-TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier::disconnect_structured_push_supplier (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
index db4a8f816cd..f7c96ab45c1 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
@@ -36,26 +36,26 @@ class TAO_Notify_Lanes_Supplier
   TAO_Notify_Lanes_Supplier (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
-  void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count ACE_ENV_ARG_DECL);
+  void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int count);
 
   /// Run
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
 
 protected:
   // = Protected Methods
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy consumer and connects to it.
-  void connect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (void);
 
   /// Disconnect the supplier.
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Deactivate.
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (void);
 
   /// Send one event.
-  virtual void send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
 
   /// Destructor
   virtual ~TAO_Notify_Lanes_Supplier ();
@@ -64,7 +64,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -72,7 +71,7 @@ protected:
       ));
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_structured_push_supplier (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 2acb6bcc18b..40b7845407f 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -61,24 +61,20 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[])
 }
 
 void
-TAO_Notify_Lanes_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::initialize (void)
 {
   PortableServer::POAManager_var poa_manager =
-    this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_objects_.root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 
-  CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec ();
 
   // Create a Supplier Admin
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
 
@@ -86,16 +82,15 @@ TAO_Notify_Lanes_Supplier_Client::initialize (ACE_ENV_SINGLE_ARG_DECL)
   this->supplier_ = new TAO_Notify_Lanes_Supplier (this->orb_objects_);
 
   // Initialize it.
-  this->supplier_->init (supplier_admin, this->consumer_count_ ACE_ENV_ARG_PARAMETER);
+  this->supplier_->init (supplier_admin, this->consumer_count_);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::create_ec (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec._retn ());
+  CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory ();
 
   // Create an EventChannel
   CosNotification::QoSProperties qos;
@@ -106,9 +101,7 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
 
   ec = ecf->create_channel (qos,
                             admin,
-                            id
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec._retn ());
+                            id);
 
   // Set the Qos : 2 Lanes
   NotifyExt::ThreadPoolLanesParams tpl_params;
@@ -148,27 +141,24 @@ TAO_Notify_Lanes_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
   qos[0].value <<= tpl_params;
 
   // Note that instead of <set_qos>, the <qos> can also be passed while creating the channel.
-  ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec._retn ());
+  ec->set_qos (qos);
 
   return ec._retn ();
 }
 
 void
-TAO_Notify_Lanes_Supplier_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::run (void)
 {
   /// First, signal that the supplier is ready.
-  this->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->write_ior ();
 
-  this->supplier_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_->run ();
 }
 
 void
-TAO_Notify_Lanes_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lanes_Supplier_Client::write_ior (void)
 {
-  CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this ();
 
   // Write the ior to a file to signal waiting consumers.
   FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_TEXT("w"));
@@ -176,8 +166,7 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
   if (ior_output_file != 0)
     {
       CORBA::String_var str =
-        this->orb_objects_.orb_->object_to_string (objref.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->orb_objects_.orb_->object_to_string (objref.in ());
 
       ACE_OS::fprintf (ior_output_file,
                        "%s",
@@ -189,24 +178,19 @@ TAO_Notify_Lanes_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
 int
 TAO_Notify_Lanes_Supplier_Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_objects_.current_->the_priority (0);
 
-      this->initialize (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
-      ACE_TRY_CHECK;
+      this->initialize (); //Init the Client
 
-      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier error "));
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -214,20 +198,17 @@ TAO_Notify_Lanes_Supplier_Client::svc (void)
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize an ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       // Create a holder for the common ORB Objects.
       TAO_Notify_ORB_Objects orb_objects;
 
-      orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_objects.init (orb);
 
       /* Run the ORB in a seperate thread */
       TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
@@ -261,12 +242,10 @@ main (int argc, char *argv [])
       orb_run_task.thr_mgr ()->wait ();
       client.thr_mgr ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier Client error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier Client error "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
index 7dd4eb19259..9761d77481a 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
@@ -36,10 +36,10 @@ public:
   ~TAO_Notify_Lanes_Supplier_Client ();
 
   /// Init
-  void initialize (ACE_ENV_SINGLE_ARG_DECL);
+  void initialize (void);
 
   /// Run
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
 
   /// Parse Args
   int parse_args (int argc, char *argv[]);
@@ -49,10 +49,10 @@ public:
 
 protected:
   /// Create an EC
-  CosNotifyChannelAdmin::EventChannel_ptr create_ec (ACE_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::EventChannel_ptr create_ec (void);
 
   /// Write ior to file.
-  void write_ior (ACE_ENV_SINGLE_ARG_DECL);
+  void write_ior (void);
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl
index 390e0b5ed06..bce0d70c03e 100755
--- a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl
+++ b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 # Lanes Example
 #
 
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index a7a0e96183f..2e3c6a5ff22 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -31,31 +31,22 @@ Subscribe::~Subscribe ()
 }
 
 void
-Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+Subscribe::init (int argc, char *argv [])
 {
-  init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  init_ORB (argc, argv);
+  resolve_naming_service ();
+  resolve_Notify_factory ();
+  create_EC ();
+  create_supplieradmin ();
+  create_consumeradmin ();
+  create_consumers ();
+  create_suppliers ();
 }
 
 void
-Subscribe::run (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::run (void)
 {
-  this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_events ();
 
   if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb.
     { // if we still need to wait for events, run the orb.
@@ -73,19 +64,14 @@ Subscribe::done (void)
 
 void
 Subscribe::init_ORB (int argc,
-                      char *argv []
-                      ACE_ENV_ARG_DECL)
+                      char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
     {
@@ -94,120 +80,98 @@ Subscribe::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 }
 
 void
-Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
-Subscribe::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::resolve_Notify_factory (void)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_context_->resolve (name);
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
 }
 
 void
-Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-Subscribe::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_supplieradmin (void)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_->new_for_suppliers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 }
 
 void
-Subscribe:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe:: create_consumeradmin (void)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_->new_for_consumers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
 
 void
-Subscribe::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_consumers (void)
 {
   consumer_1_ = new Subscribe_StructuredPushConsumer (this);
-  consumer_1_->connect (this->consumer_admin_.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1_->connect (this->consumer_admin_.in ());
 
   consumer_2_ = new Subscribe_StructuredPushConsumer (this);
-  consumer_2_->connect (this->consumer_admin_.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_2_->connect (this->consumer_admin_.in ());
 }
 
 void
-Subscribe::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::create_suppliers (void)
 {
   supplier_1_ = new Subscribe_StructuredPushSupplier ();
-  supplier_1_->connect (this->supplier_admin_.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1_->connect (this->supplier_admin_.in ());
 
   supplier_2_ = new Subscribe_StructuredPushSupplier ();
-  supplier_2_->connect (this->supplier_admin_.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_2_->connect (this->supplier_admin_.in ());
 }
 
 void
-Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe::send_events (void)
 {
   // Setup the CA to receive event_type : "domain_A", "Type_a"
   CosNotification::EventTypeSeq added(1);
@@ -217,8 +181,7 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
   added[0].domain_name =  CORBA::string_dup (DOMAIN_A);
   added[0].type_name = CORBA::string_dup (TYPE_A);
 
-  this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->subscription_change (added, removed);
 
   // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b"
   CosNotification::EventTypeSeq added_1(1);
@@ -229,9 +192,7 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
   added_1.length (1);
   removed_1.length (0);
 
-  this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1);
 
   // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c"
   CosNotification::EventTypeSeq added_2(1);
@@ -242,9 +203,7 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
   added_2.length (1);
   removed_2.length (0);
 
-  this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2);
 
   // Create the events - one of each type
   // Event 1
@@ -283,12 +242,9 @@ Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
  // let supplier 1 send all these events
   for (int i = 0; i < 1; ++i)
     {
-      supplier_1_->send_event (event1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      supplier_1_->send_event (event2 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      supplier_1_->send_event (event3 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_1_->send_event (event1);
+      supplier_1_->send_event (event2);
+      supplier_1_->send_event (event3);
     }
 }
 
@@ -304,46 +260,39 @@ Subscribe_StructuredPushConsumer::~Subscribe_StructuredPushConsumer ()
 
 void
 Subscribe_StructuredPushConsumer::connect
-   (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-    ACE_ENV_ARG_DECL)
+   (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    _narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_supplier_->connect_structured_push_consumer (objref.in ());
 }
 
 void
-Subscribe_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe_StructuredPushConsumer::disconnect (void)
 {
   this->proxy_supplier_->
-    disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    disconnect_structured_push_supplier();
 }
 
 void
 Subscribe_StructuredPushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -354,8 +303,7 @@ Subscribe_StructuredPushConsumer::offer_change
 
 void
 Subscribe_StructuredPushConsumer::push_structured_event
-   (const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED)
+   (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -376,7 +324,7 @@ Subscribe_StructuredPushConsumer::push_structured_event
 
 void
 Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer
-   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -402,44 +350,38 @@ Subscribe_StructuredPushSupplier::~Subscribe_StructuredPushSupplier ()
 
 void
 Subscribe_StructuredPushSupplier::connect
-   (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-    ACE_ENV_ARG_DECL)
+   (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
-Subscribe_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Subscribe_StructuredPushSupplier::disconnect (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_consumer_->disconnect_structured_push_consumer();
 }
 
 void
 Subscribe_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -450,18 +392,16 @@ Subscribe_StructuredPushSupplier::subscription_change
 
 void
 Subscribe_StructuredPushSupplier::send_event
-   (const CosNotification::StructuredEvent& event
-    ACE_ENV_ARG_DECL)
+   (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
 Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier
-   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index 126b842a4ca..e309467114b 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -35,41 +35,41 @@ class Subscribe
   Subscribe (void);
   ~Subscribe ();
 
-  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv []);
   // Init the Client.
 
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
   // Run the demo.
 
   void done (void);
   // Called when all events we are waiting for have occured.
 
  protected:
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_Notify_factory (void);
   // Try to resolve the Notify factory from the Naming service.
 
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create an EC.
 
-  void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL);
+  void create_supplieradmin(void);
   // Create the Supplier Admin.
 
-  void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL);
+  void create_consumeradmin (void);
   // Create the Consumer Admin.
 
-  void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  void create_consumers (void);
   // Create and initialize the consumers.
 
-  void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void create_suppliers (void);
   // create and initialize the suppliers.
 
-  void send_events (ACE_ENV_SINGLE_ARG_DECL);
+  void send_events (void);
   // send the events.
 
   // = Data Members
@@ -129,11 +129,11 @@ class Subscribe_StructuredPushConsumer
   Subscribe_StructuredPushConsumer (Subscribe* subscribe);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect (void);
   // Disconnect from the supplier.
 
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
@@ -158,7 +158,6 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -168,7 +167,6 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -176,7 +174,6 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -199,16 +196,14 @@ class Subscribe_StructuredPushSupplier
   Subscribe_StructuredPushSupplier (void);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy consumer and connects to it.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the supplier.
 
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
   // Send one event.
 
 protected:
@@ -227,7 +222,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -236,7 +230,6 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
index b817728c231..05c916eab0d 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
@@ -8,28 +8,22 @@ main (int argc, char *argv [])
 {
   Subscribe client;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv
-                   ACE_ENV_ARG_PARAMETER); //Init the Client
-      ACE_TRY_CHECK;
+      client.init (argc, argv); //Init the Client
 
-      client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.run ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
-                           "TLS_Client user error: ");
+      ue._tao_print_exception ("TLS_Client user error: ");
       return 1;
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
-                           "Filter system error: ");
+      se._tao_print_exception ("Filter system error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl
index 0f8121f3a6f..a7c607e45f9 100755
--- a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $experiment_timeout = 60;
 $startup_timeout = 60;
 
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
index 3f8b943dba2..29cabc964bb 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.cpp
@@ -29,7 +29,7 @@ TAO_Notify_ThreadPool_Consumer::~TAO_Notify_ThreadPool_Consumer (void)
 
 void
 TAO_Notify_ThreadPool_Consumer::init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin,
-                       int proxy_supplier_thread_count, int max_events, long delay ACE_ENV_ARG_DECL)
+                       int proxy_supplier_thread_count, int max_events, long delay)
 {
   this->default_POA_ = poa;
   this->admin_ = admin;
@@ -39,35 +39,33 @@ TAO_Notify_ThreadPool_Consumer::init (PortableServer::POA_var& poa, CosNotifyCha
 
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Consumer Delay = %d, param = %d\n", delay_.sec (), delay));
 
-  this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connect ();
 }
 
 PortableServer::POA_ptr
-TAO_Notify_ThreadPool_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ThreadPool_Consumer::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ThreadPool_Consumer::run (void)
 {
   // Nothing to do.
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer::connect (void)
 {
   // Activate the consumer with the default_POA_
-  CosNotifyComm::StructuredPushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyComm::StructuredPushConsumer_var objref = this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier;
 
   if (this->proxy_supplier_thread_count_ != 0)
     {
       // Narrow to the extended interface.
-      NotifyExt::ConsumerAdmin_var admin_ext = NotifyExt::ConsumerAdmin::_narrow (this->admin_.in ()ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      NotifyExt::ConsumerAdmin_var admin_ext = NotifyExt::ConsumerAdmin::_narrow (this->admin_.in ());
 
       NotifyExt::ThreadPoolParams tp_params = { NotifyExt::CLIENT_PROPAGATED, 0,
                                                 0, this->proxy_supplier_thread_count_, 0, 0, 0, 0, 0 };
@@ -79,28 +77,23 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 
       // Obtain the proxy. The QoS is applied to the POA in which the Proxy is hosted.
       proxysupplier = admin_ext->obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                                                   , proxy_supplier_id_, qos ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                                                   , proxy_supplier_id_, qos);
     }
   else
     {
       proxysupplier = this->admin_->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                                       , proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                                       , proxy_supplier_id_);
     }
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
-    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_supplier_->connect_structured_push_consumer (objref.in ());
 
   // Call subscription_change to inform the supplier that this consumer is available.
   CosNotification::EventTypeSeq added (1);
@@ -115,24 +108,22 @@ TAO_Notify_ThreadPool_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 
   added[0].type_name = CORBA::string_dup (type);
 
-  this->proxy_supplier_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_supplier_->subscription_change (added, removed);
 
   ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Consumer %d with %d threads at the ProxySupplier\n", proxy_supplier_id_,
               this->proxy_supplier_thread_count_));
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer::disconnect (void)
 {
-  this->proxy_supplier_->disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_supplier_->disconnect_structured_push_supplier();
 }
 
 void
 TAO_Notify_ThreadPool_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/,
                                const CosNotification::EventTypeSeq & /*removed*/
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -143,7 +134,7 @@ TAO_Notify_ThreadPool_Consumer::offer_change (const CosNotification::EventTypeSe
 
 void
 TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
-                                            ACE_ENV_ARG_DECL)
+                                            )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -167,12 +158,10 @@ TAO_Notify_ThreadPool_Consumer::push_structured_event (const CosNotification::St
       this->t_last_ = ACE_OS::gethrtime ();
 
       // Disconnect from the EC
-      this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->disconnect ();
 
       // Deactivate this object.
-      this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->deactivate ();
 
       // We received the event, shutdown the ORB.
       this->orb_objects_.orb_->shutdown (1);
@@ -195,25 +184,20 @@ TAO_Notify_ThreadPool_Consumer::dump_throughput (void)
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer::deactivate (void)
 {
-  PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+  PortableServer::POA_var poa (this->_default_POA ());
 
-  PortableServer::ObjectId_var id (poa->servant_to_id (this
-                                                       ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
+  PortableServer::ObjectId_var id (poa->servant_to_id (this));
 
-  poa->deactivate_object (id.in()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in());
 }
 
 void
-TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer::disconnect_structured_push_consumer (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
index 0af5b74d5fa..3d2b581f8bd 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
@@ -36,10 +36,10 @@ public:
   TAO_Notify_ThreadPool_Consumer (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
-  void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, int proxy_supplier_thread_count, int max_events, long delay ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_var& poa, CosNotifyChannelAdmin::ConsumerAdmin_var& admin, int proxy_supplier_thread_count, int max_events, long delay);
 
   /// Run
-  void run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void run (void);
 
   /// Print the consumer throughput
   void dump_throughput (void);
@@ -51,22 +51,21 @@ protected:
 
   /// Connect the Consumer to the EventChannel.
   /// Creates a new proxy supplier and connects to it.
-  void connect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (void);
 
   /// Disconnect the supplier.
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Deactivate.
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (void);
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
   // = NotifyPublish method
   virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -76,7 +75,6 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -84,7 +82,6 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 480dbb5005c..13bce82edd1 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -62,29 +62,24 @@ TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[])
 }
 
 void
-TAO_Notify_ThreadPool_Consumer_Client::_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer_Client::_init (void)
 {
   PortableServer::POAManager_var poa_manager =
-    this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_objects_.root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 
   // Resolve the Notification Factory.
-  CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory ();
 
   // Find the EventChannel created by the supplier.
-  CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyChannelAdmin::ChannelIDSeq_var channel_seq = ecf->get_all_channels ();
 
   CosNotifyChannelAdmin::EventChannel_var ec;
 
   if (channel_seq->length() > 0)
     {
-      ec = ecf->get_event_channel (channel_seq[0] ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ec = ecf->get_event_channel (channel_seq[0]);
     }
   else
     {
@@ -96,23 +91,21 @@ TAO_Notify_ThreadPool_Consumer_Client::_init (ACE_ENV_SINGLE_ARG_DECL)
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin.in ()));
 
-  PortableServer::POA_var rt_poa = this->create_rt_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var rt_poa = this->create_rt_poa ();
 
   // Create a Consumer
   this->consumer_ = new TAO_Notify_ThreadPool_Consumer (this->orb_objects_);
 
   // Initialize it.
-  this->consumer_->init (rt_poa, consumer_admin, this->proxy_supplier_thread_count_, this->max_events_, this->delay_ ACE_ENV_ARG_PARAMETER);
+  this->consumer_->init (rt_poa, consumer_admin, this->proxy_supplier_thread_count_, this->max_events_, this->delay_);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (void)
 {
   PortableServer::POA_var rt_poa;
 
@@ -121,15 +114,12 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Policy_var thread_pool_policy;
 
   CORBA::Policy_var activation_policy =
-    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+    this->orb_objects_.root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   // Create a priority model policy.
   priority_model_policy =
     this->orb_objects_.rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED
-                                                              , 0
-                                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+                                                              , 0);
 
   CORBA::ULong stacksize = 0;
   CORBA::ULong static_threads = 1;
@@ -147,14 +137,10 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
                                                    default_priority,
                                                    allow_request_buffering,
                                                    max_buffered_requests,
-                                                   max_request_buffer_size
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+                                                   max_request_buffer_size);
 
   thread_pool_policy =
-    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+    this->orb_objects_.rt_orb_->create_threadpool_policy (threadpool_id);
 
   CORBA::PolicyList poa_policy_list;
 
@@ -164,22 +150,19 @@ TAO_Notify_ThreadPool_Consumer_Client::create_rt_poa (ACE_ENV_SINGLE_ARG_DECL)
   poa_policy_list[2] = thread_pool_policy;
 
   PortableServer::POAManager_var poa_manager =
-    this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+    this->orb_objects_.root_poa_->the_POAManager ();
 
   rt_poa = this->orb_objects_.root_poa_->create_POA ("RT POA!",
                                                      poa_manager.in (),
-                                                     poa_policy_list
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (rt_poa._retn ());
+                                                     poa_policy_list);
 
   return rt_poa._retn ();
 }
 
 void
-TAO_Notify_ThreadPool_Consumer_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Consumer_Client::run (void)
 {
-  this->consumer_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_->run ();
 }
 
 void
@@ -191,25 +174,20 @@ TAO_Notify_ThreadPool_Consumer_Client::dump_stats (void)
 int
 TAO_Notify_ThreadPool_Consumer_Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize this threads priority.
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_objects_.current_->the_priority (0);
 
-      this->_init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
-      ACE_TRY_CHECK;
+      this->_init (); //Init the Client
 
-      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier error "));
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -217,19 +195,16 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void)
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize an ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       TAO_Notify_ORB_Objects orb_objects;
 
-      orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_objects.init (orb);
 
       TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
 
@@ -263,12 +238,10 @@ main (int argc, char *argv [])
 
           client.dump_stats ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Consumer Client error "));
+      ex._tao_print_exception (ACE_TEXT ("Consumer Client error "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
index 158c1005daa..2967b227fcf 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
@@ -39,10 +39,10 @@ public:
   ~TAO_Notify_ThreadPool_Consumer_Client ();
 
   /// Init
-  void _init (ACE_ENV_SINGLE_ARG_DECL);
+  void _init (void);
 
   /// Run
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
 
   /// Parse Args
   int parse_args (int argc, char *argv[]);
@@ -55,7 +55,7 @@ public:
 
 protected:
   /// Create an RT POA with a single threadpool.
-  PortableServer::POA_ptr create_rt_poa (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr create_rt_poa (void);
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
index b26b9dbb0ec..420ece6b765 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp
@@ -9,42 +9,28 @@ TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void)
 }
 
 void
-TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL)
+TAO_Notify_ORB_Objects::init (CORBA::ORB_var& orb)
 {
   this->orb_ = orb;
 
-  CORBA::Object_var object =  this->orb_->resolve_initial_references("RootPOA"
-                                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object =  this->orb_->resolve_initial_references("RootPOA");
 
-  this->root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->root_poa_ = PortableServer::POA::_narrow (object.in ());
 
   // Resolve the RTORB.
-  object = this->orb_->resolve_initial_references ("RTORB"
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  object = this->orb_->resolve_initial_references ("RTORB");
 
-  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ());
 
   // Resolve the Current
-  object = this->orb_->resolve_initial_references ("RTCurrent"
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  object = this->orb_->resolve_initial_references ("RTCurrent");
 
-  this->current_ = RTCORBA::Current::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->current_ = RTCORBA::Current::_narrow (object.in ());
 
   // Resolve the Naming service
-  object = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  object = this->orb_->resolve_initial_references ("NameService");
 
-  this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ()
-                                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->naming_ = CosNaming::NamingContextExt::_narrow (object.in ());
 }
 
 TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
@@ -52,7 +38,7 @@ TAO_Notify_ORB_Objects::~TAO_Notify_ORB_Objects ()
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ORB_Objects::notify_factory (void)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf;
 
@@ -61,11 +47,9 @@ TAO_Notify_ORB_Objects::notify_factory (ACE_ENV_SINGLE_ARG_DECL)
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var object = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ecf._retn ());
+  CORBA::Object_var object = this->naming_->resolve (name);
 
-  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ecf._retn ());
+  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in());
 
   return ecf._retn ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
index 7ca6ab99442..6be4c596901 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
@@ -34,10 +34,10 @@ public:
   ~TAO_Notify_ORB_Objects ();
 
   /// Resolves all the references.
-  void init (CORBA::ORB_var& orb ACE_ENV_ARG_DECL);
+  void init (CORBA::ORB_var& orb);
 
   /// Resolve Notification
-  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void);
 
   ///= Public Data
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
index 953328f78c5..0b181bdf553 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp
@@ -16,18 +16,15 @@ TAO_Notify_ORB_Run_Task::~TAO_Notify_ORB_Run_Task ()
 int
 TAO_Notify_ORB_Run_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_objects_.current_->the_priority (0);
 
-      this->orb_objects_.orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_objects_.orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
index bb29cbd1af7..d7f25a61eb8 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp
@@ -23,7 +23,7 @@ TAO_Notify_ThreadPool_Supplier::~TAO_Notify_ThreadPool_Supplier ()
 
 void
 TAO_Notify_ThreadPool_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count ,int max_events,
-                       int proxy_consumer_thread_count ACE_ENV_ARG_DECL)
+                       int proxy_consumer_thread_count)
 {
   // First initialize the class members.
   this->admin_ = admin;
@@ -31,11 +31,11 @@ TAO_Notify_ThreadPool_Supplier::init (CosNotifyChannelAdmin::SupplierAdmin_var&
   this->max_events_ = max_events;
   this->proxy_consumer_thread_count_ = proxy_consumer_thread_count;
 
-  this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connect ();
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::run (void)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
@@ -56,34 +56,32 @@ TAO_Notify_ThreadPool_Supplier::run (ACE_ENV_SINGLE_ARG_DECL)
       for (int j = 0; j < this->expected_consumer_count_; ++j)
         {
           // send the event
-          this->send_event (this->event_[j] ACE_ENV_ARG_PARAMETER);
+          this->send_event (this->event_[j]);
         }
     }
 
   // Disconnect from the EC
-  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect ();
 
   // Deactivate this object.
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate ();
 
   // we're done. shutdown the ORB to exit the process.
   this->orb_objects_.orb_->shutdown (1);
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::connect (void)
 {
   // Activate the supplier object.
-  CosNotifyComm::StructuredPushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyComm::StructuredPushSupplier_var objref = this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer;
 
   if (this->proxy_consumer_thread_count_ != 0)
     {
       // Narrow to the extended interface.
-      NotifyExt::SupplierAdmin_var admin_ext = NotifyExt::SupplierAdmin::_narrow (this->admin_.in ()ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      NotifyExt::SupplierAdmin_var admin_ext = NotifyExt::SupplierAdmin::_narrow (this->admin_.in ());
 
       NotifyExt::ThreadPoolParams tp_params = { NotifyExt::CLIENT_PROPAGATED, 0,
                                                 0, this->proxy_consumer_thread_count_, 0, 0, 0, 0, 0 };
@@ -95,62 +93,52 @@ TAO_Notify_ThreadPool_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
 
       // Obtain the proxy. The QoS is applied to the POA in which the Proxy is hosted.
       proxyconsumer = admin_ext->obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                                                   , proxy_consumer_id_, qos ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                                                   , proxy_consumer_id_, qos);
     }
   else
     {
       // Obtain the proxy.
       proxyconsumer = this->admin_->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT
-                                                                       , proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                                       , proxy_consumer_id_);
     }
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
   // connect to the proxyconsumer.
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 
   ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Supplier %d with %d threads at the ProxyConsumer\n", proxy_consumer_id_,
               this->proxy_consumer_thread_count_));
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::disconnect (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_consumer_->disconnect_structured_push_consumer();
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::deactivate (void)
 {
-  PortableServer::POA_var poa (this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+  PortableServer::POA_var poa (this->_default_POA ());
 
-  PortableServer::ObjectId_var id (poa->servant_to_id (this
-                                                       ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
+  PortableServer::ObjectId_var id (poa->servant_to_id (this));
 
-  poa->deactivate_object (id.in()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in());
 }
 
 void
 TAO_Notify_ThreadPool_Supplier::subscription_change (const CosNotification::EventTypeSeq & added,
                                       const CosNotification::EventTypeSeq & /*removed */
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -176,19 +164,18 @@ TAO_Notify_ThreadPool_Supplier::subscription_change (const CosNotification::Even
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::send_event (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->push_structured_event (event);
 }
 
 void
-TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier::disconnect_structured_push_supplier (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate ();
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
index e5238d0af7e..4f46c83ac87 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
@@ -38,26 +38,26 @@ public:
 
   /// Init
   void init (CosNotifyChannelAdmin::SupplierAdmin_var& admin, int expected_consumer_count, int max_events,
-             int proxy_consumer_thread_count ACE_ENV_ARG_DECL);
+             int proxy_consumer_thread_count);
 
   /// Run
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
 
 protected:
   // = Protected Methods
 
   /// Connect the Supplier to the EventChannel.
   /// Creates a new proxy consumer and connects to it.
-  void connect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (void);
 
   /// Disconnect the supplier.
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Deactivate.
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (void);
 
   /// Send one event.
-  virtual void send_event (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
 
   /// Destructor
   virtual ~TAO_Notify_ThreadPool_Supplier ();
@@ -66,7 +66,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -74,7 +73,7 @@ protected:
       ));
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_structured_push_supplier (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index fb8dcf0c8ad..509520dfe09 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -80,24 +80,20 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[])
 }
 
 void
-TAO_Notify_ThreadPool_Supplier_Client::_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier_Client::_init (void)
 {
   PortableServer::POAManager_var poa_manager =
-    this->orb_objects_.root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_objects_.root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 
-  CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyChannelAdmin::EventChannel_var ec = this->create_ec ();
 
   // Create a Supplier Admin
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
 
@@ -105,17 +101,15 @@ TAO_Notify_ThreadPool_Supplier_Client::_init (ACE_ENV_SINGLE_ARG_DECL)
   this->supplier_ = new TAO_Notify_ThreadPool_Supplier (this->orb_objects_);
 
   // Initialize it.
-  this->supplier_->init (supplier_admin, this->consumer_count_, this->max_events_, this->proxy_consumer_thread_count_
-                         ACE_ENV_ARG_PARAMETER);
+  this->supplier_->init (supplier_admin, this->consumer_count_, this->max_events_, this->proxy_consumer_thread_count_);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier_Client::create_ec (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec._retn ());
+  CosNotifyChannelAdmin::EventChannelFactory_var ecf = this->orb_objects_.notify_factory ();
 
   // Create an EventChannel
   CosNotification::QoSProperties qos;
@@ -126,9 +120,7 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
 
   ec = ecf->create_channel (qos,
                             admin,
-                            id
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec._retn ());
+                            id);
 
   // Set the Qos
   // See $TAO_ROOT/orbsvcs/orbsvcs/NotifyExt.idl
@@ -143,8 +135,7 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
       qos[0].value <<= tp_params;
 
       // Note that instead of <set_qos>, the <qos> can also be passed while creating the channel.
-      ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (ec._retn ());
+      ec->set_qos (qos);
     }
 
   ACE_DEBUG ((LM_DEBUG, "(%P,%t) Created Event Channel with %d threads\n", this->ec_thread_count_));
@@ -153,20 +144,18 @@ TAO_Notify_ThreadPool_Supplier_Client::create_ec (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_ThreadPool_Supplier_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier_Client::run (void)
 {
   /// First, signal that the supplier is ready.
-  this->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->write_ior ();
 
-  this->supplier_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_->run ();
 }
 
 void
-TAO_Notify_ThreadPool_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ThreadPool_Supplier_Client::write_ior (void)
 {
-  CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyComm::StructuredPushSupplier_var objref = this->supplier_->_this ();
 
   // Write the ior to a file to signal waiting consumers.
   FILE *ior_output_file = ACE_OS::fopen (this->ior_file_name_.c_str (), ACE_TEXT("w"));
@@ -174,8 +163,7 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
   if (ior_output_file != 0)
     {
       CORBA::String_var str =
-        this->orb_objects_.orb_->object_to_string (objref.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->orb_objects_.orb_->object_to_string (objref.in ());
 
       ACE_OS::fprintf (ior_output_file,
                        "%s",
@@ -187,24 +175,19 @@ TAO_Notify_ThreadPool_Supplier_Client::write_ior (ACE_ENV_SINGLE_ARG_DECL)
 int
 TAO_Notify_ThreadPool_Supplier_Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_objects_.current_->the_priority (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_objects_.current_->the_priority (0);
 
-      this->_init (ACE_ENV_SINGLE_ARG_PARAMETER); //Init the Client
-      ACE_TRY_CHECK;
+      this->_init (); //Init the Client
 
-      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier error "));
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -212,20 +195,17 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void)
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize an ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       // Create a holder for the common ORB Objects.
       TAO_Notify_ORB_Objects orb_objects;
 
-      orb_objects.init (orb ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_objects.init (orb);
 
       /* Run the ORB in a seperate thread */
       TAO_Notify_ORB_Run_Task orb_run_task (orb_objects);
@@ -259,12 +239,10 @@ main (int argc, char *argv [])
       orb_run_task.thr_mgr ()->wait ();
       client.thr_mgr ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          ACE_TEXT ("Supplier Client error "));
+      ex._tao_print_exception (ACE_TEXT ("Supplier Client error "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
index b54786ea808..be8f97fc337 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
@@ -35,10 +35,10 @@ public:
   ~TAO_Notify_ThreadPool_Supplier_Client ();
 
   /// Init
-  void _init (ACE_ENV_SINGLE_ARG_DECL);
+  void _init (void);
 
   /// Run
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
 
   /// Parse Args
   int parse_args (int argc, char *argv[]);
@@ -48,10 +48,10 @@ public:
 
 protected:
   /// Create an EC
-  CosNotifyChannelAdmin::EventChannel_ptr create_ec (ACE_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::EventChannel_ptr create_ec (void);
 
   /// Write ior to file.
-  void write_ior (ACE_ENV_SINGLE_ARG_DECL);
+  void write_ior (void);
 
   /// ORB Objects.
   TAO_Notify_ORB_Objects orb_objects_;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl
index ee84d7e73e3..7b1f312f80d 100755
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 # ThreadPool Example
 #
 
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
index ecc1d6e1055..8730f4dfcec 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
@@ -15,21 +15,16 @@ Gateway_ObjRef_Factory (
 CORBA::Object_ptr
 Gateway_ObjRef_Factory::
 make_object (const char *interface_repository_id,
-             const PortableInterceptor::ObjectId & id
-             ACE_ENV_ARG_DECL)
+             const PortableInterceptor::ObjectId & id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
     this->old_factory_->make_object (interface_repository_id,
-                                     id
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                     id);
 
   CORBA::Object_ptr object_ptr =
     this->gateway_object_factory_->create_object (interface_repository_id,
-                                                  object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                                  object.in ());
 
   return object_ptr;
 }
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
index 3af0da985b3..e0bcb4bbb67 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
@@ -26,8 +26,7 @@ public:
 
   virtual CORBA::Object_ptr make_object (
       const char *repository_id,
-      const PortableInterceptor::ObjectId &id
-      ACE_ENV_ARG_DECL)
+      const PortableInterceptor::ObjectId &id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
index f4ce9754556..1b2b044effd 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
@@ -29,8 +29,7 @@ Gateway_i (CORBA::ORB_ptr orb,
 }
 
 void
-Gateway_i::invoke (CORBA::ServerRequest_ptr request
-                   ACE_ENV_ARG_DECL)
+Gateway_i::invoke (CORBA::ServerRequest_ptr request)
 {
   PortableServer::ObjectId_var target_id =
     this->poa_current_->get_object_id ();
@@ -39,14 +38,11 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
     PortableServer::ObjectId_to_string (target_id.in ());
 
   CORBA::Object_var target_object =
-    this->orb_->string_to_object (stringified_object_id.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->string_to_object (stringified_object_id.in ());
 
   // Use the IfR interfaces to query the NVList for this object...
   CORBA::InterfaceDef_var target_interface =
-    target_object->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    target_object->_get_interface ();
 
   if (CORBA::is_nil (target_interface.in ()))
     {
@@ -65,8 +61,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
 
   // Save the result typecode...
   CORBA::TypeCode_var result_typecode =
-    operation.in ()->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    operation.in ()->result ();
 
   CORBA::ParDescriptionSeq_var parameters =
     operation.in ()->params ();
@@ -74,9 +69,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
   // Build the NVList based on the info from the IfR
   CORBA::NVList_ptr arguments;
   this->orb_->create_list (parameters->length (),
-                           arguments
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           arguments);
 
   CORBA::Flags flags = 0;
 
@@ -107,22 +100,18 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
 
       arguments->add_value (parameters[i].name,
                             any,
-                            flags
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                            flags);
     }
 
   // Extract the values of the arguments from the DSI ServerRequest
-  request->arguments (arguments ACE_ENV_ARG_PARAMETER);
+  request->arguments (arguments);
 
   // Use the NVList (with values) to create a DII Request...
   CORBA::Request_var dii_request;
 
   CORBA::NamedValue *named_value = 0;
 
-  this->orb_->create_named_value (named_value
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->create_named_value (named_value);
 
   CORBA::ContextList *context_list = 0;
   CORBA::ExceptionList *exceptions = 0;
@@ -134,29 +123,26 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
                                   exceptions,
                                   context_list, /* Context List */
                                   dii_request.inout (),
-                                  CORBA::Flags (0)
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  CORBA::Flags (0));
 
   // Set the return type...
   dii_request->set_return_type (result_typecode.in ());
 
-  ACE_TRY
+  try
     {
       // Make the DII request
-      dii_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dii_request->invoke ();
 
       // At this point the NVList contains all the out and inout
       // arguments, but we need to extract the return value...
     }
-  ACE_CATCH (CORBA::UnknownUserException, user_ex)
+  catch (CORBA::UnknownUserException& user_ex)
     {
       // Pass the exception back to the server request...
       request->set_exception (user_ex.exception ());
       return;
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
       CORBA::Any any;
       any <<= sys_ex;
@@ -164,8 +150,9 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
       request->set_exception (any);
       return;
     }
-  ACE_CATCHANY;
-  ACE_ENDTRY;
+  catch (const CORBA::Exception&)
+    {
+    }
 
   request->set_result (dii_request->return_value ());
   // Using the same NVList for both the DSI Server Request and the DII
@@ -174,8 +161,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
 
 CORBA::RepositoryId
 Gateway_i::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               PortableServer::POA_ptr)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h
index a49d7a1e73a..16ff2ca5d56 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h
@@ -32,13 +32,11 @@ public:
   Gateway_i (CORBA::ORB_ptr orb,
              PortableServer::Current_ptr poa_current);
 
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL);
+  virtual void invoke (CORBA::ServerRequest_ptr request);
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL);
+      PortableServer::POA_ptr poa);
 
  private:
 
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index 32c4e9ce579..d6e510b8edf 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -14,13 +14,11 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb,
 
 CORBA::Object_ptr
 Object_Factory_i::create_object (const char *interface_repository_id,
-                                 CORBA::Object_ptr gatewayed_object
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::Object_ptr gatewayed_object)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var stringified_object =
-    this->orb_->object_to_string (gatewayed_object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    this->orb_->object_to_string (gatewayed_object);
 
   const PortableServer::ObjectId_var id =
     PortableServer::string_to_ObjectId (stringified_object.in ());
@@ -31,7 +29,6 @@ Object_Factory_i::create_object (const char *interface_repository_id,
   ACE_UNUSED_ARG(interface_repository_id);
 /*
   TAO_POA *poa = dynamic_cast <TAO_POA *> (this->gateway_poa_);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableInterceptor::ObjectReferenceTemplate *ort_template =
     poa->get_adapter_template();
@@ -41,9 +38,8 @@ Object_Factory_i::create_object (const char *interface_repository_id,
 
   CORBA::Object_ptr object_ptr =
     ort->make_object (interface_repository_id,
-                      *obj_id
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());*/
+                      *obj_id);
+*/
 
   return CORBA::Object::_nil();
 }
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
index add32112dbd..35febb7b331 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
@@ -32,8 +32,7 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory
 
   CORBA::Object_ptr
     create_object (const char *interface_repository_id,
-                   CORBA::Object_ptr gatewayed_object
-                   ACE_ENV_ARG_DECL)
+                   CORBA::Object_ptr gatewayed_object)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 2cd8117b443..8806a482225 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -21,14 +21,14 @@ Server_IORInterceptor::~Server_IORInterceptor (void)
 
 
 char *
-Server_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_IORInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_IORInterceptor");
 }
 
 void
-Server_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_IORInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::release (this->gateway_object_factory_);
@@ -37,40 +37,33 @@ Server_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Server_IORInterceptor::establish_components (
-    PortableInterceptor::IORInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::IORInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_IORInterceptor::components_established (
-    PortableInterceptor::IORInfo_ptr ior_info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::IORInfo_ptr ior_info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Gateway_ObjRef_Factory *my_factory = 0;
 
   PortableInterceptor::ObjectReferenceFactory_var current_factory =
-    ior_info->current_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ior_info->current_factory ();
 
   ACE_NEW_THROW_EX (my_factory,
                     Gateway_ObjRef_Factory (this->gateway_object_factory_,
                                             current_factory.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
-  ior_info->current_factory (my_factory
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ior_info->current_factory (my_factory);
 }
 
 void
 Server_IORInterceptor::adapter_manager_state_changed (
     const char *,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::AdapterState)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -78,8 +71,7 @@ Server_IORInterceptor::adapter_manager_state_changed (
 void
 Server_IORInterceptor:: adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::AdapterState)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index da243325d05..50e62b9e707 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -36,34 +36,30 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
index 93fd158c07b..c9aeca5ca75 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
@@ -13,27 +13,22 @@ ACE_RCSID (ORT,
 void
 Server_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_IORInterceptor_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
-    info->resolve_initial_references ("Gateway_Object_Factory"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    info->resolve_initial_references ("Gateway_Object_Factory");
 
   /// Narrow it down correctly.
   Gateway::Object_Factory_var gateway_object_factory =
-    Gateway::Object_Factory::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    Gateway::Object_Factory::_narrow (obj.in ());
 
   /// Check for nil reference
   if (CORBA::is_nil (gateway_object_factory.in ()))
@@ -49,11 +44,8 @@ Server_IORInterceptor_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::IORInterceptor_var ior_interceptor = gateway;
 
-  info->add_ior_interceptor (ior_interceptor.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_ior_interceptor (ior_interceptor.in ());
 }
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
index 5fd0887f014..51af3ab3a94 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
@@ -25,13 +25,11 @@ class Server_IORInterceptor_ORBInitializer
 
   //@{
   /// The pre-initialization hook.
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The post-initialization hook.
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp
index 699985a1993..49cb266aa2e 100644
--- a/TAO/orbsvcs/examples/ORT/client.cpp
+++ b/TAO/orbsvcs/examples/ORT/client.cpp
@@ -35,23 +35,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "client_sum_orb");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       ORT::sum_server_var server =
-        ORT::sum_server::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ORT::sum_server::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -65,21 +61,17 @@ main (int argc, char *argv[])
       CORBA::ULong b = 3;
 
       CORBA::ULong result = server->add_variables (a,
-                                                   b
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   b);
 
       if (result != 8)
         ACE_DEBUG ((LM_DEBUG,
                     "Error: Add Variables did not return the right value\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ORT example on client side :");
+      ex._tao_print_exception ("ORT example on client side :");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
index d52bc63f0f2..171295c1325 100644
--- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp
+++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
@@ -36,29 +36,23 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "gateway_server_orb"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "gateway_server_orb");
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       /// Resolve reference to RootPOA
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       /// Narrow it down correctly.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       /// Check for nil references
       if (CORBA::is_nil (root_poa.in ()))
@@ -68,12 +62,10 @@ main (int argc, char *argv[])
 
       /// Get poa_manager reference
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       /// Activate it.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ///@}
 
@@ -81,27 +73,19 @@ main (int argc, char *argv[])
       policies.length (3);
 
       policies [0] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN);
 
       policies [1] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
-                                                    ACE_ENV_ARG_PARAMETER);
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT);
 
-      ACE_TRY_CHECK;
 
       policies [2] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
       PortableServer::POA_var gateway_poa =
         root_poa->create_POA ("Gateway_POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       for (CORBA::ULong i = 0; i != policies.length (); ++i) {
         policies[i]->destroy ();
@@ -109,15 +93,11 @@ main (int argc, char *argv[])
 
       // Get the POA Current object reference
       obj =
-        orb->resolve_initial_references ("POACurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("POACurrent");
 
       // Narrow the object reference to a POA Current reference
       PortableServer::Current_var poa_current =
-        PortableServer::Current::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::Current::_narrow (obj.in ());
 
       Gateway_i *gateway;
 
@@ -125,10 +105,8 @@ main (int argc, char *argv[])
                         Gateway_i (orb.in (),
                                    poa_current.in ()),
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
 
-      gateway_poa->set_servant (gateway ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway_poa->set_servant (gateway);
 
       /// Get the ObjectID
       PortableServer::ObjectId_var oid =
@@ -141,13 +119,10 @@ main (int argc, char *argv[])
                         Object_Factory_i (orb.in (),
                                           gateway_poa.in ()),
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
 
       /// Activate the Object_Factory_i Object
       gateway_poa->activate_object_with_id (oid.in (),
-                                            object_factory
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            object_factory);
 
       // Get the object reference.
       CORBA::Object_var gateway_object_factory =
@@ -155,9 +130,7 @@ main (int argc, char *argv[])
 
       /// Convert the object reference to a string format.
       CORBA::String_var ior =
-        orb->object_to_string (gateway_object_factory.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (gateway_object_factory.in ());
 
       /// If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
@@ -173,17 +146,14 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ORT test (gateway_server):");
+      ex._tao_print_exception ("ORT test (gateway_server):");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp
index 1b76cecb393..3980941b2f5 100644
--- a/TAO/orbsvcs/examples/ORT/server.cpp
+++ b/TAO/orbsvcs/examples/ORT/server.cpp
@@ -37,8 +37,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -52,9 +51,7 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer_var =
         orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer_var.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer_var.in ());
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
@@ -63,23 +60,18 @@ main (int argc, char *argv[])
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "server_sum_orb"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "server_sum_orb");
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       // Resolve reference to RootPOA
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow it down correctly.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Check for nil references
       if (CORBA::is_nil (root_poa.in ()))
@@ -89,25 +81,20 @@ main (int argc, char *argv[])
 
       // Get poa_manager reference
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Activate it.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // initialize the sum_server
       sum_server_i sum_server_impl;
 
       // Activate
-      obj = sum_server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = sum_server_impl._this ();
 
       // Narrow it down.
       ORT::sum_server_var sum_server =
-        ORT::sum_server::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ORT::sum_server::_narrow (obj.in ());
 
       // Check for nil reference
       if (CORBA::is_nil (sum_server.in ()))
@@ -118,8 +105,7 @@ main (int argc, char *argv[])
 
       // Convert the object reference to a string format.
       CORBA::String_var ior =
-        orb->object_to_string (sum_server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (sum_server.in ());
 
       // If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
@@ -135,18 +121,15 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_INFO, "Successful.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ORT example server:");
+      ex._tao_print_exception ("ORT example server:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
index 9b14117125e..31987a4feab 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
@@ -12,8 +12,7 @@ sum_server_i::sum_server_i ()
 
 CORBA::Long
 sum_server_i::add_variables (CORBA::Long a,
-                             CORBA::Long b
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             CORBA::Long b)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return a+b;
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h
index ea38c4ae7ab..e093073e790 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.h
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h
@@ -31,8 +31,7 @@ class sum_server_i : public virtual POA_ORT::sum_server
 
   /// add variables method
   CORBA::Long add_variables (CORBA::Long a,
-                             CORBA::Long b
-                             ACE_ENV_ARG_DECL)
+                             CORBA::Long b)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/examples/PSS/Server_i.cpp b/TAO/orbsvcs/examples/PSS/Server_i.cpp
index 0d5e1bcfe43..70480aacaa9 100644
--- a/TAO/orbsvcs/examples/PSS/Server_i.cpp
+++ b/TAO/orbsvcs/examples/PSS/Server_i.cpp
@@ -13,7 +13,7 @@ Server_i::~Server_i (void)
 }
 
 char *
-Server_i::get_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_i::get_status (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("active");
diff --git a/TAO/orbsvcs/examples/PSS/Server_i.h b/TAO/orbsvcs/examples/PSS/Server_i.h
index 5f5937e24a5..24f406c9223 100644
--- a/TAO/orbsvcs/examples/PSS/Server_i.h
+++ b/TAO/orbsvcs/examples/PSS/Server_i.h
@@ -26,12 +26,12 @@
 class Server_i : public virtual POA_Simple_Server::Server
 {
  public:
-  
+
   Server_i ();
-  
+
   ~Server_i ();
-  
-  virtual char *get_status (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+  virtual char *get_status (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
index 91add5d9900..67fc0001a77 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
@@ -54,62 +54,49 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       if (parse_args (argc, argv) == -1)
         return -1;
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Activate the POA Manager
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       // Id Assignment policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       // We use a different POA, otherwise the user would have to change
       // the object key each time it invokes the server.
       PortableServer::POA_var poa =
         root_poa->create_POA ("Simple_Naming",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POAs over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0;
@@ -117,8 +104,7 @@ main (int argc, char *argv[])
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       Naming_Context_i simple_naming_i (orb.in ());
@@ -128,9 +114,7 @@ main (int argc, char *argv[])
         simple_naming_i._this ();
 
       CORBA::String_var string_obj_ref =
-        orb->object_to_string (simple_naming.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (simple_naming.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -142,23 +126,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", string_obj_ref.in ());
       ACE_OS::fclose (output_file);
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected excpeption in PSS Test");
+      ex._tao_print_exception ("Unexpected excpeption in PSS Test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
index 41178b04976..efdfdc48b71 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.cpp
@@ -20,28 +20,24 @@ Naming_Context_i::~Naming_Context_i ()
 
 int
 Naming_Context_i::bind (const char *n,
-                        const char *obj
-                        ACE_ENV_ARG_DECL)
+                        const char *obj)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Save the binding to database.
   int result =
-    this->code_gen_->set_name_obj_ref (n, obj ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->code_gen_->set_name_obj_ref (n, obj);
 
   return result;
 }
 
 char *
-Naming_Context_i::find (const char *n
-                        ACE_ENV_ARG_DECL)
+Naming_Context_i::find (const char *n)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the Stringified object reference corresponding to
   // 'n'
   CORBA::String_var obj_ref =
-    this->code_gen_->get_obj_ref (n ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->code_gen_->get_obj_ref (n);
 
   return CORBA::string_dup (obj_ref.in ());
 }
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h
index 1306d245f9b..84bb1e2bed4 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming_i.h
@@ -36,12 +36,10 @@ class Naming_Context_i : public virtual POA_Simple_Naming::Naming_Context
   ~Naming_Context_i (void);
 
   virtual int bind (const char *n,
-                    const char *obj
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                    const char *obj)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char *find (const char *n
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char *find (const char *n)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/PSS/client.cpp b/TAO/orbsvcs/examples/PSS/client.cpp
index a634a736993..a4193064877 100644
--- a/TAO/orbsvcs/examples/PSS/client.cpp
+++ b/TAO/orbsvcs/examples/PSS/client.cpp
@@ -26,67 +26,50 @@
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "" /* the ORB name, it can be anything! */);
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
       // Activate the POA Manager
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Get a reference to Simple_Naming
       CORBA::Object_var simple_naming_object =
-        orb->resolve_initial_references ("Simple_Naming" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("Simple_Naming");
 
       // Narrow down the reference
       Simple_Naming::Naming_Context_var simple_naming =
-        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in());
 
       Simple_Naming::Name name = CORBA::string_dup ("Server");
 
       CORBA::String_var ior_string =
-        simple_naming->find (name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        simple_naming->find (name);
 
       // Connect to the server
       CORBA::Object_var tmp =
-        orb->string_to_object(ior_string.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior_string.in ());
 
       Simple_Server::Server_var server =
-        Simple_Server::Server::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::Server::_narrow (tmp.in ());
 
       CORBA::String_var status =
-        server->get_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->get_status ();
 
       if (ACE_OS::strcmp (status.in (), "active") != 0)
         {
@@ -95,13 +78,10 @@ int main (int argc, char *argv [])
           return -1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client raised an exception:\n");
-      ACE_CHECK_RETURN (-1);
+      ex._tao_print_exception ("Client raised an exception:\n");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/PSS/server.cpp b/TAO/orbsvcs/examples/PSS/server.cpp
index 0f305dfae1d..4a1e4e042d3 100644
--- a/TAO/orbsvcs/examples/PSS/server.cpp
+++ b/TAO/orbsvcs/examples/PSS/server.cpp
@@ -27,82 +27,61 @@ ACE_RCSID (PSS, client, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
       // Activate the POA Manager
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_i server_i;
 
       Simple_Server::Server_var server = server_i._this ();
 
       CORBA::String_var string_obj_ref =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // Get a reference to Simple_Naming
       CORBA::Object_var simple_naming_object =
-        orb->resolve_initial_references ("Simple_Naming"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("Simple_Naming");
 
       // Narrow down the reference
       Simple_Naming::Naming_Context_var simple_naming =
-        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Naming::Naming_Context::_narrow (simple_naming_object.in());
 
       Simple_Naming::Name name = CORBA::string_dup ("Server");
 
       // Bind the name to stringified objecte refernce
       simple_naming->bind (CORBA::string_dup (name),
-                           string_obj_ref.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           string_obj_ref.in ());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected excpeption in PSS Test");
+      ex._tao_print_exception ("Unexpected excpeption in PSS Test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index 05b214aabbc..e170689137b 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -35,8 +35,7 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First parse our command line options
       if (this->parse_args(argc, argv) != 0)
@@ -46,29 +45,23 @@ Consumer::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
       this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -76,21 +69,17 @@ Consumer::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (ecname);
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       if (CORBA::is_nil (event_channel.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -99,16 +88,13 @@ Consumer::run (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       RtecEventComm::PushConsumer_var consumer =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       ACE_ConsumerQOS_Factory qos;
       qos.start_disjunction_group ();
@@ -121,9 +107,7 @@ Consumer::run (int argc, char* argv[])
                       MY_EVENT_TYPE + i,  // Event Type
                       0);             // handle to the rt_info
         }
-      supplier->connect_push_consumer (consumer.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier->connect_push_consumer (consumer.in (), qos);
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
@@ -136,18 +120,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -167,13 +149,13 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 int
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index c8268e1c3ea..8541290d29a 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
@@ -37,10 +37,9 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   // The skeleton methods.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index a25e9f67569..e474a7706d7 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -34,8 +34,7 @@ EC::run (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First parse our command line options
       if (this->parse_args(argc, argv) != 0)
@@ -45,41 +44,32 @@ EC::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var rootpoa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var root_poa_manager =
-        rootpoa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rootpoa->the_POAManager ();
 
       // Create persistent POA
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
-        rootpoa->create_id_assignment_policy (PortableServer::USER_ID
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rootpoa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        rootpoa->create_lifespan_policy (PortableServer::PERSISTENT
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rootpoa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       ACE_CString poaname = "POA";
       PortableServer::POA_var child_poa_ =
          rootpoa->create_POA (poaname.c_str (),
                           root_poa_manager.in (),
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
+                          policies);
 
       // Create a local event channel and register it with the RootPOA.
       TAO_EC_Event_Channel_Attributes attributes (rootpoa.in (), rootpoa.in ());
@@ -91,23 +81,18 @@ EC::run (int argc, char* argv[])
 
       PortableServer::ObjectId_var ecId = PortableServer::string_to_ObjectId(ecname);
 
-      child_poa_->activate_object_with_id(ecId.in(), &ec_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child_poa_->activate_object_with_id(ecId.in(), &ec_impl);
 
-      CORBA::Object_var ec_obj = child_poa_->id_to_reference(ecId.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var ec_obj = child_poa_->id_to_reference(ecId.in());
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow(ec_obj.in());
 
       // Find the Naming Service.
-      object = orb->resolve_initial_references("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->resolve_initial_references("NameService");
 
       CosNaming::NamingContextExt_var naming_context =
-        CosNaming::NamingContextExt::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContextExt::_narrow(object.in());
 
       // Create a name.
       CosNaming::Name name;
@@ -116,22 +101,19 @@ EC::run (int argc, char* argv[])
       name[0].kind = CORBA::string_dup ("");
 
       // Register with the name server
-      naming_context->rebind (name, ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_context->rebind (name, ec.in ());
 
-      root_poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa_manager->activate ();
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC::run");
+      ex._tao_print_exception ("EC::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index c1be767ffd8..14cefe9d1e7 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -35,8 +35,7 @@ Gateway::run (int argc, char* argv[])
 {
   TAO_EC_Gateway_IIOP_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First parse our command line options
       if (this->parse_args(argc, argv) != 0)
@@ -46,25 +45,19 @@ Gateway::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,29 +65,24 @@ Gateway::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name supplierecname (1);
       supplierecname.length (1);
       supplierecname[0].id = CORBA::string_dup (supplierec);
 
       CORBA::Object_var supplierec_obj =
-        naming_context->resolve (supplierecname ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (supplierecname);
 
       CosNaming::Name consumerecname (1);
       consumerecname.length (1);
       consumerecname[0].id = CORBA::string_dup (consumerec);
 
       CORBA::Object_var consumerec_obj =
-        naming_context->resolve (consumerecname ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (consumerecname);
 
       RtecEventChannelAdmin::EventChannel_var supplier_event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (supplierec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (supplierec_obj.in ());
 
       if (CORBA::is_nil (supplier_event_channel.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -102,9 +90,7 @@ Gateway::run (int argc, char* argv[])
                           1);
 
       RtecEventChannelAdmin::EventChannel_var consumer_event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (consumerec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (consumerec_obj.in ());
 
       if (CORBA::is_nil (consumer_event_channel.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -113,46 +99,36 @@ Gateway::run (int argc, char* argv[])
 
       TAO_EC_Gateway_IIOP gateway;
 
-      gateway.init(supplier_event_channel.in(), consumer_event_channel.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway.init(supplier_event_channel.in(), consumer_event_channel.in());
 
       PortableServer::ObjectId_var gateway_oid =
-         poa->activate_object(&gateway ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         poa->activate_object(&gateway);
 
       CORBA::Object_var gateway_obj =
-         poa->id_to_reference(gateway_oid.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         poa->id_to_reference(gateway_oid.in());
 
        RtecEventChannelAdmin::Observer_var obs =
-         RtecEventChannelAdmin::Observer::_narrow(gateway_obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         RtecEventChannelAdmin::Observer::_narrow(gateway_obj.in());
 
        RtecEventChannelAdmin::Observer_Handle local_ec_obs_handle =
-         consumer_event_channel->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         consumer_event_channel->append_observer (obs.in ());
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
       orb->run ();
 
-      consumer_event_channel->remove_observer (local_ec_obs_handle
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_event_channel->remove_observer (local_ec_obs_handle);
 
-      poa->deactivate_object (gateway_oid.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->deactivate_object (gateway_oid.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Gateway::run");
+      ex._tao_print_exception ("Gateway::run");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index aad09c037e8..39d93a1f5ad 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -35,8 +35,7 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First parse our command line options
       if (this->parse_args(argc, argv) != 0)
@@ -46,25 +45,19 @@ Supplier::run (int argc, char* argv[])
 
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,34 +65,27 @@ Supplier::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup (ecname);
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       RtecEventComm::PushSupplier_var supplier =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       // Publish the events the supplier provides.
       ACE_SupplierQOS_Factory qos;
@@ -108,9 +94,7 @@ Supplier::run (int argc, char* argv[])
                   0,                 // handle to the rt_info structure
                   1);                // number of calls
 
-      consumer->connect_push_supplier (supplier.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->connect_push_supplier (supplier.in (), qos);
 
       // Push the events...
       ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
@@ -132,41 +116,34 @@ Supplier::run (int argc, char* argv[])
                          "Supplier (%P|%t): %d events send\n",
                          i));
             }
-          consumer->push (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer->push (event);
           ACE_OS::sleep (sleep_time);
         }
 
       // Disconnect from the EC
-      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->disconnect_push_consumer ();
 
       // Destroy the EC....
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
index 98e87ec39d2..e42042c197d 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
@@ -36,7 +36,7 @@ public:
   // = The RtecEventComm::PushSupplier methods
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
index 4f23249c145..20ff6a10b22 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp
@@ -9,8 +9,7 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -25,7 +24,7 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
index bdbdbaad894..51bacf725b8 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.h
@@ -44,10 +44,9 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 };
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index 3a01a04e9c0..a80a268c4fb 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -49,13 +49,11 @@ main (int argc, char* argv[])
   TAO_EC_Kokyu_Factory::init_svcs ();
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         {
@@ -65,16 +63,12 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -97,8 +91,7 @@ main (int argc, char* argv[])
         }
 
       RtecScheduler::Scheduler_var scheduler =
-        sched_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sched_impl->_this ();
 
       // ****************************************************************
       TAO_EC_Event_Channel_Attributes attributes (poa.in (),
@@ -107,8 +100,7 @@ main (int argc, char* argv[])
 
       TAO_EC_Event_Channel ec_impl (attributes);
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
       // ****************************************************************
 
       // Create a consumer, intialize its RT_Info structures, and
@@ -117,12 +109,10 @@ main (int argc, char* argv[])
       Consumer consumer_impl1, consumer_impl2;
 
       RtecScheduler::handle_t consumer1_rt_info =
-        scheduler->create ("consumer1" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("consumer1");
 
       RtecScheduler::handle_t consumer2_rt_info =
-        scheduler->create ("consumer2" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("consumer2");
 
       //consumer's rate will get propagated from the supplier.
       //so no need to specify a period here. Specifying
@@ -138,9 +128,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       tmp,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      RtecScheduler::OPERATION);
 
       scheduler->set (consumer2_rt_info,
                       RtecScheduler::VERY_HIGH_CRITICALITY,
@@ -149,9 +137,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_HIGH_IMPORTANCE,
                       tmp,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      RtecScheduler::OPERATION);
 
       ACE_ConsumerQOS_Factory consumer_qos1, consumer_qos2;
       //consumer_qos.start_disjunction_group ();
@@ -180,49 +166,38 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy1 =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy2 =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       RtecEventComm::PushConsumer_var consumer1 =
-        consumer_impl1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_impl1._this ();
 
       RtecEventComm::PushConsumer_var consumer2 =
-        consumer_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_impl2._this ();
 
       ACE_DEBUG ((LM_DEBUG, "connecting consumers\n"));
       ACE_DEBUG ((LM_DEBUG, "connecting consumer1\n"));
       supplier_proxy1->connect_push_consumer (consumer1.in (),
-                                             consumer_qos1.get_ConsumerQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             consumer_qos1.get_ConsumerQOS ());
 
       ACE_DEBUG ((LM_DEBUG, "connecting consumer2\n"));
       supplier_proxy2->connect_push_consumer (consumer2.in (),
-                                             consumer_qos2.get_ConsumerQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             consumer_qos2.get_ConsumerQOS ());
 
       ACE_DEBUG ((LM_DEBUG, "consumers connected\n"));
 
       // ****************************************************************
 
       RtecScheduler::handle_t supplier1_rt_info =
-        scheduler->create ("supplier1" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("supplier1");
 
       RtecScheduler::handle_t supplier2_rt_info =
-        scheduler->create ("supplier2" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("supplier2");
 
       RtecEventComm::EventSourceID supplier_id1 = 1, supplier_id2 = 2;
       ACE_SupplierQOS_Factory supplier_qos1, supplier_qos2;
@@ -237,40 +212,31 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy1 =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy2 =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       Supplier supplier_impl1(supplier_id1, consumer_proxy1.in ());
       Supplier supplier_impl2(supplier_id2, consumer_proxy2.in ());
 
       RtecEventComm::PushSupplier_var supplier1 =
-        supplier_impl1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_impl1._this ();
 
       RtecEventComm::PushSupplier_var supplier2 =
-        supplier_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_impl2._this ();
 
       ACE_DEBUG ((LM_DEBUG, "connecting suppliers\n"));
       ACE_DEBUG ((LM_DEBUG, "connecting supplier1\n"));
       consumer_proxy1->connect_push_supplier (supplier1.in (),
-                                             supplier_qos1.get_SupplierQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             supplier_qos1.get_SupplierQOS ());
 
       ACE_DEBUG ((LM_DEBUG, "connecting supplier2\n"));
       consumer_proxy2->connect_push_supplier (supplier2.in (),
-                                             supplier_qos2.get_SupplierQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             supplier_qos2.get_SupplierQOS ());
       ACE_DEBUG ((LM_DEBUG, "suppliers connected\n"));
 
       // ****************************************************************
@@ -282,8 +248,7 @@ main (int argc, char* argv[])
       Timeout_Consumer timeout_consumer_impl2(&supplier_impl2);
 
       RtecScheduler::handle_t supplier1_timeout_consumer_rt_info =
-        scheduler->create ("supplier1_timeout_consumer" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("supplier1_timeout_consumer");
 
       //Period = 1sec
       tv.set (1,0);
@@ -296,13 +261,10 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       tmp,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      RtecScheduler::OPERATION);
 
       RtecScheduler::handle_t supplier2_timeout_consumer_rt_info =
-        scheduler->create ("supplier2_timeout_consumer" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("supplier2_timeout_consumer");
 
       //Period = 3sec
       tv.set (3, 0);
@@ -315,9 +277,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_HIGH_IMPORTANCE,
                       tmp,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      RtecScheduler::OPERATION);
 
       ACE_ConsumerQOS_Factory timer_qos1, timer_qos2;
       timer_qos1.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
@@ -328,33 +288,25 @@ main (int argc, char* argv[])
                               supplier2_timeout_consumer_rt_info);
 
       RtecEventChannelAdmin::ProxyPushSupplier_var timeout_supplier_proxy1 =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       RtecEventChannelAdmin::ProxyPushSupplier_var timeout_supplier_proxy2 =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       RtecEventComm::PushConsumer_var safe_timeout_consumer1 =
-        timeout_consumer_impl1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        timeout_consumer_impl1._this ();
 
       RtecEventComm::PushConsumer_var safe_timeout_consumer2 =
-        timeout_consumer_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        timeout_consumer_impl2._this ();
 
       ACE_DEBUG ((LM_DEBUG, "connecting timeout consumers\n"));
       timeout_supplier_proxy1->
         connect_push_consumer (safe_timeout_consumer1.in (),
-                               timer_qos1.get_ConsumerQOS ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               timer_qos1.get_ConsumerQOS ());
 
       timeout_supplier_proxy2->
         connect_push_consumer (safe_timeout_consumer2.in (),
-                               timer_qos2.get_ConsumerQOS ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               timer_qos2.get_ConsumerQOS ());
 
       ACE_DEBUG ((LM_DEBUG, "timeout consumers connected\n"));
 
@@ -365,16 +317,12 @@ main (int argc, char* argv[])
       scheduler->add_dependency (supplier1_timeout_consumer_rt_info,
                                  supplier1_rt_info,
                                  1,
-                                 RtecBase::TWO_WAY_CALL
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 RtecBase::TWO_WAY_CALL);
 
       scheduler->add_dependency (supplier2_timeout_consumer_rt_info,
                                  supplier2_rt_info,
                                  1,
-                                 RtecBase::TWO_WAY_CALL
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 RtecBase::TWO_WAY_CALL);
 
       // ****************************************************************
 
@@ -420,9 +368,7 @@ main (int argc, char* argv[])
                                      infos.out (),
                                      dependencies.out (),
                                      configs.out (),
-                                     anomalies.out ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     anomalies.out ());
 
       // Dump the schedule to a file..
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
@@ -457,13 +403,11 @@ main (int argc, char* argv[])
 //         {
 //           if (i % 2 == 0)
 //             {
-//               consumer_proxy1->push (event1 ACE_ENV_ARG_PARAMETER);
-//               ACE_TRY_CHECK;
+//               consumer_proxy1->push (event1);
 //             }
 //           else
 //             {
-//               consumer_proxy2->push (event2 ACE_ENV_ARG_PARAMETER);
-//               ACE_TRY_CHECK;
+//               consumer_proxy2->push (event2);
 //             }
 
 //           ACE_Time_Value rate (0, 10000);
@@ -471,11 +415,10 @@ main (int argc, char* argv[])
 //         }
 
       ACE_DEBUG ((LM_DEBUG, "(%t) activating EC\n"));
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
       ACE_DEBUG ((LM_DEBUG, "EC activated\n"));
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      orb->run ();
 
       // ****************************************************************
 
@@ -484,12 +427,11 @@ main (int argc, char* argv[])
       // just a simple demo so we are going to be lazy.
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
index 11b8f70666b..ec77f956c8b 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp
@@ -15,7 +15,7 @@ Supplier::Supplier (RtecEventComm::EventSourceID id,
 }
 
 void
-Supplier::timeout_occured (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::timeout_occured (void)
 {
   RtecEventComm::EventSet event (1);
   if (id_ == 1)
@@ -33,11 +33,11 @@ Supplier::timeout_occured (ACE_ENV_SINGLE_ARG_DECL)
       event[0].header.ttl    = 1;
     }
 
-  consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
+  consumer_proxy_->push (event);
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -48,8 +48,7 @@ Timeout_Consumer::Timeout_Consumer (Supplier* supplier)
 }
 
 void
-Timeout_Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL)
+Timeout_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -60,11 +59,11 @@ Timeout_Consumer::push (const RtecEventComm::EventSet& events
     }
 
   ACE_DEBUG ((LM_DEBUG, "(%t) Timeout Event received\n"));
-  supplier_impl_->timeout_occured (ACE_ENV_SINGLE_ARG_PARAMETER);
+  supplier_impl_->timeout_occured ();
 }
 
 void
-Timeout_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Timeout_Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
index 977586a3ec0..0ca45a86b8f 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.h
@@ -46,11 +46,11 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
-  void timeout_occured (ACE_ENV_SINGLE_ARG_DECL);    
+  void timeout_occured (void);
 
 private:
   RtecEventComm::EventSourceID id_;
@@ -64,8 +64,8 @@ class Timeout_Consumer : public POA_RtecEventComm::PushConsumer
   //
   // = DESCRIPTION
   //   This class is a consumer of timeout events from EC.
-  //   It registers for timeout event with EC and calls 
-  //   the 
+  //   It registers for timeout event with EC and calls
+  //   the
   //
 public:
   Timeout_Consumer (Supplier * supplier_impl);
@@ -73,15 +73,14 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
-  
+
 private:
-  Supplier *supplier_impl_;  
+  Supplier *supplier_impl_;
 };
 
 #endif /* SUPPLIER_H */
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index 05fd4d9c983..c7ba18ae47b 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -11,8 +11,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
-                      RtecUDPAdmin::UDP_Addr_out addr
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      RtecUDPAdmin::UDP_Addr_out addr)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
index 8439914f22b..deeced433db 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
@@ -40,8 +40,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index b85abca57ee..4f5bbb2cc1e 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -14,16 +14,13 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   ACE_ENV_ARG_DECL)
+Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   this->proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
   RtecEventComm::PushConsumer_var me =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Simple subscription, but usually the helper classes in
   // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -41,43 +38,35 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
   h1.type   = ACE_ES_EVENT_UNDEFINED;  // first free event type
   h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-  this->proxy_->connect_push_consumer (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_push_consumer (me.in (), qos);
 }
 
 void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
 {
-  ACE_TRY
+  try
     {
       // Disconnect from the proxy
-      this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->proxy_->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions
     }
-  ACE_ENDTRY;
   this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   // Deactivate this object
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   // Get the Object Id used for the servant..
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
   // Deactivate the object
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -97,7 +86,7 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index 536404b824b..9985ca129d6 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -37,19 +37,17 @@ public:
   Consumer (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect to the Event Channel
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index f61cb958eeb..a2be1b837cd 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -38,19 +38,17 @@ main (int argc, char* argv[])
   // and defined in $ACE_ROOT/ace/CORBA_macros.h.
   // If your platform supports native exceptions, and TAO was compiled
   // with native exception support then you can simply use try/catch
-  // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument.
+  // and avoid the argument.
   // Unfortunately many embedded systems cannot use exceptions due to
   // the space and time overhead.
   //
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // **************** HERE STARTS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
@@ -67,16 +65,12 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // **************** THAT COMPLETS THE ORB SETUP
 
@@ -98,15 +92,13 @@ main (int argc, char* argv[])
       // that may involve creating some threads.
       // But it should always be invoked because several internal data
       // structures are initialized at that point.
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       // The event channel is activated as any other CORBA servant.
       // In this case we use the simple implicit activation with the
       // RootPOA
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
 
@@ -142,8 +134,7 @@ main (int argc, char* argv[])
       // Now we create and activate the servant
       AddrServer as_impl (addr);
       RtecUDPAdmin::AddrServer_var address_server =
-        as_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        as_impl._this ();
 
       // We need a local socket to send the data, open it and check
       // that everything is OK:
@@ -158,9 +149,7 @@ main (int argc, char* argv[])
       TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create();
       sender->init (event_channel.in (),
                     address_server.in (),
-                    endpoint
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    endpoint);
 
       // Now we connect the sender as a consumer of events, it will
       // receive any event from any source and send it to the "right"
@@ -174,8 +163,7 @@ main (int argc, char* argv[])
       sub.dependencies[0].event.header.source =
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-      sender->connect (sub ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->connect (sub);
 
       // To receive events we need to setup an event handler:
       TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver = TAO_ECG_UDP_Receiver::create();
@@ -191,18 +179,14 @@ main (int argc, char* argv[])
       // required by all the local consumer.
       // Then it register for the multicast groups that carry those
       // events:
-      mcast_eh.open (event_channel.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mcast_eh.open (event_channel.in ());
 
       // Again the receiver connects to the event channel as a
       // supplier of events, using the Observer features to detect
       // local consumers and their interests:
       receiver->init (event_channel.in (),
                       endpoint,
-                      address_server.in ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      address_server.in ());
 
       // The Receiver is also a supplier of events.  The exact type of
       // events is only known to the application, because it depends
@@ -221,8 +205,7 @@ main (int argc, char* argv[])
       pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY;
       pub.is_gateway = 1;
 
-      receiver->connect (pub ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      receiver->connect (pub);
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
 
@@ -232,20 +215,14 @@ main (int argc, char* argv[])
       // channel
       Consumer consumer;
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer.connect (consumer_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
+      consumer.connect (consumer_admin.in ());
 
       // And now create a supplier
       Supplier supplier;
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier.connect (supplier_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
+      supplier.connect (supplier_admin.in ());
 
       // **************** THAT COMPLETES THE CLIENT SETUP
 
@@ -257,8 +234,7 @@ main (int argc, char* argv[])
       for (int i = 0; i != 1000; ++i)
         {
           CORBA::Boolean there_is_work =
-            orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending ();
           if (there_is_work)
             {
               // We use a TAO extension. The CORBA mechanism does not
@@ -266,13 +242,11 @@ main (int argc, char* argv[])
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work (tv);
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
-          supplier.perform_push (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          supplier.perform_push ();
         }
 
       // **************** THAT COMPLETES THE EVENT LOOP
@@ -280,14 +254,11 @@ main (int argc, char* argv[])
       // **************** HERE STARTS THE CLEANUP CODE
 
       // First the easy ones
-      supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier.disconnect ();
+      consumer.disconnect ();
 
       // Now let us close the Receiver
-      receiver->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      receiver->shutdown ();
 
       int r = mcast_eh.shutdown ();
 
@@ -298,14 +269,12 @@ main (int argc, char* argv[])
         }
 
       // And also close the sender of events
-      sender->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->shutdown ();
 
       // The event channel must be destroyed, so it can release its
       // resources, and inform all the clients that are still
       // connected that it is going away.
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // Deactivating the event channel implementation is not strictly
       // required, the POA will do it for us, but it is good manners:
@@ -316,37 +285,31 @@ main (int argc, char* argv[])
         // is the root POA, but the code is more robust if we don't
         // rely on that.
         PortableServer::POA_var poa =
-          ec_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          ec_impl._default_POA ();
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          poa->servant_to_id (&ec_impl);
         // Deactivate the object
-        poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        poa->deactivate_object (oid.in ());
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // Finally destroy the ORB
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // **************** THAT COMPLETES THE CLEANUP CODE
 
       ACE_DEBUG ((LM_DEBUG,
                   "MCast example terminated\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index f835dcb6daa..205518d540d 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -13,16 +13,13 @@ Supplier::Supplier (void)
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                   ACE_ENV_ARG_DECL)
+Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   this->proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
 
   RtecEventComm::PushSupplier_var me =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Simple publication, but usually the helper classes in
   // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -35,39 +32,32 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
   h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
   h0.source = 1;                      // first free event source
 
-  this->proxy_->connect_push_supplier (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_push_supplier (me.in (), qos);
 }
 
 void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
 {
   // Disconnect from the EC
-  ACE_TRY
+  try
     {
-      this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->proxy_->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
 }
 
 void
-Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::perform_push (void)
 {
-  ACE_TRY
+  try
     {
       // The event type and source must match our publications
       RtecEventComm::EventSet event (1);
@@ -77,17 +67,15 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
       // Avoid loops throught the event channel federations
       event[0].header.ttl    = 1;
 
-      this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->proxy_->push (event);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 7c591f5fdb7..67c885b6d08 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -38,19 +38,18 @@ public:
   Supplier (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect to the event channel
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the event channel
 
-  void perform_push (ACE_ENV_SINGLE_ARG_DECL);
+  void perform_push (void);
   // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 4f23249c145..20ff6a10b22 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -9,8 +9,7 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -25,7 +24,7 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index bdbdbaad894..51bacf725b8 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -44,10 +44,9 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 };
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index bb27f0bad68..24b985f0f69 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -29,13 +29,11 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         {
@@ -45,28 +43,22 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
 #if 0
       // Obtain a reference to the naming service...
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 #endif /* 0 */
 
       // ****************************************************************
@@ -92,8 +84,7 @@ main (int argc, char* argv[])
         }
 
       RtecScheduler::Scheduler_var scheduler =
-        sched_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sched_impl->_this ();
 
 #if 0
       // Bind the scheduler with the naming service so clients
@@ -104,9 +95,7 @@ main (int argc, char* argv[])
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
       // Register the servant with the Naming Context....
-      naming_context->rebind (schedule_name, scheduler.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_context->rebind (schedule_name, scheduler.in ());
 #endif /* 0 */
 
       // ****************************************************************
@@ -117,13 +106,11 @@ main (int argc, char* argv[])
 
       TAO_EC_Event_Channel ec_impl (attributes);
       ACE_DEBUG ((LM_DEBUG, "activating EC\n"));
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
       ACE_DEBUG ((LM_DEBUG, "EC activated\n"));
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // ****************************************************************
 
@@ -133,8 +120,7 @@ main (int argc, char* argv[])
       Consumer consumer_impl;
 
       RtecScheduler::handle_t consumer_rt_info1 =
-        scheduler->create ("consumer_event_1" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("consumer_event_1");
 
       // Let's say that the execution time for event 1 is 2
       // milliseconds...
@@ -148,13 +134,10 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       time,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      RtecScheduler::OPERATION);
 
       RtecScheduler::handle_t consumer_rt_info2 =
-        scheduler->create ("consumer_event_2" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("consumer_event_2");
 
       // Let's say that the execution time for event 2 is 1
       // milliseconds...
@@ -167,9 +150,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       time,
                       0,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      RtecScheduler::OPERATION);
 
       ACE_ConsumerQOS_Factory consumer_qos;
       consumer_qos.start_disjunction_group ();
@@ -182,22 +163,17 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       RtecEventComm::PushConsumer_var consumer =
-        consumer_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_impl._this ();
 
       ACE_DEBUG ((LM_DEBUG, "connecting consumer\n"));
       supplier_proxy->connect_push_consumer (consumer.in (),
-                                             consumer_qos.get_ConsumerQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             consumer_qos.get_ConsumerQOS ());
       ACE_DEBUG ((LM_DEBUG, "consumer connected\n"));
 
       // ****************************************************************
@@ -205,8 +181,7 @@ main (int argc, char* argv[])
       Supplier supplier_impl;
 
       RtecScheduler::handle_t supplier_rt_info1 =
-        scheduler->create ("supplier_event_1" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("supplier_event_1");
 
       // The execution times are set to reasonable values, but
       // actually they are changed on the real execution, i.e. we
@@ -224,13 +199,10 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0,
                       1,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      RtecScheduler::OPERATION);
 
       RtecScheduler::handle_t supplier_rt_info2 =
-        scheduler->create ("supplier_event_2" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler->create ("supplier_event_2");
 
       // The execution times are set to reasonable values, but
       // actually they are changed on the real execution, i.e. we
@@ -247,9 +219,7 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0,
                       1,
-                      RtecScheduler::OPERATION
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      RtecScheduler::OPERATION);
 
       RtecEventComm::EventSourceID supplier_id = 1;
       ACE_SupplierQOS_Factory supplier_qos;
@@ -264,22 +234,17 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       RtecEventComm::PushSupplier_var supplier =
-        supplier_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_impl._this ();
 
       ACE_DEBUG ((LM_DEBUG, "connecting supplier\n"));
       consumer_proxy->connect_push_supplier (supplier.in (),
-                                             supplier_qos.get_SupplierQOS ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             supplier_qos.get_SupplierQOS ());
       ACE_DEBUG ((LM_DEBUG, "supplier connected\n"));
 
       // ****************************************************************
@@ -316,9 +281,7 @@ main (int argc, char* argv[])
                                          infos.out (),
                                          deps.out (),
                                          configs.out (),
-                                         anomalies.out ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         anomalies.out ());
 
           // Dump the schedule to a file..
           ACE_Scheduler_Factory::dump_schedule (infos.in (),
@@ -350,13 +313,11 @@ main (int argc, char* argv[])
         {
           if (i % 2 == 0)
             {
-              consumer_proxy->push (event1 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              consumer_proxy->push (event1);
             }
           else
             {
-              consumer_proxy->push (event2 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              consumer_proxy->push (event2);
             }
 
           ACE_Time_Value rate (0, 10000);
@@ -370,12 +331,11 @@ main (int argc, char* argv[])
       // just a simple demo so we are going to be lazy.
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index 947378d616a..9411ec8c3b3 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -11,7 +11,7 @@ Supplier::Supplier (void)
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index b0391f7602b..d255d1e8c7f 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -44,7 +44,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index e8af9a77ed8..8ed196efb49 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -27,34 +27,27 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
       this->orb_ = orb.in ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -62,34 +55,27 @@ Consumer::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       RtecEventComm::PushConsumer_var consumer =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       // Simple subscription, but usually the helper classes in
       // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -105,9 +91,7 @@ Consumer::run (int argc, char* argv[])
       h1.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
-      supplier->connect_push_consumer (consumer.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier->connect_push_consumer (consumer.in (), qos);
 
       // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
@@ -120,18 +104,16 @@ Consumer::run (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer::run");
+      ex._tao_print_exception ("Consumer::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -151,12 +133,12 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index 19005b96ec1..af6a05b2b3b 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -41,10 +41,9 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index a3bd5e5740d..c7941fd665f 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -19,30 +19,23 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
 	  CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
 	  // Obtain the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -50,19 +43,16 @@ main (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
 	  TAO_EC_Event_Channel_Attributes attributes (poa.in (),
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // Create a name.
       CosNaming::Name name;
@@ -71,13 +61,11 @@ main (int argc, char* argv[])
       name[0].kind = CORBA::string_dup ("");
 
       // Register with the name server
-      naming_context->bind (name, event_channel.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_context->bind (name, event_channel.in ());
 
       // Example code: How to write ior to file
       CORBA::String_var ior =
-        orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (event_channel.in ());
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -103,12 +91,11 @@ main (int argc, char* argv[])
       // work_pending()/perform_work() to do more interesting stuff.
       // Check the supplier for the proper way to do cleanup.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 21ced08639e..02afe5f88d2 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -27,30 +27,23 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // Obtain the event channel from the naming service
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,34 +51,27 @@ Supplier::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       RtecEventComm::PushSupplier_var supplier =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       // Simple publication, but usually the helper classes in
       // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -96,9 +82,7 @@ Supplier::run (int argc, char* argv[])
       h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h0.source = 1;                      // first free event source
 
-      consumer->connect_push_supplier (supplier.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->connect_push_supplier (supplier.in (), qos);
 
       // Push the events...
       ACE_Time_Value sleep_time (0, 10000); // 10 milliseconds
@@ -111,41 +95,34 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != 2000; ++i)
         {
-          consumer->push (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer->push (event);
           ACE_OS::sleep (sleep_time);
         }
 
       // Disconnect from the EC
-      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->disconnect_push_consumer ();
 
       // Destroy the EC....
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
 
       // Destroy the POA
-      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Supplier::run");
+      ex._tao_print_exception ("Supplier::run");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index b1fce544ccc..edc8bd098a4 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -41,7 +41,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index 2153014c111..84448bc0c75 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -14,14 +14,13 @@ static int authorize_1 = 1;
 static int authorize_2 = 1;
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL)
+SLevel1_Server_i::authorize_level1 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   /// Get a reference to the SecurityCurrent object.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("SecurityCurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    orb->resolve_initial_references ("SecurityCurrent");
 
     /// Narrow it down correctly.
   SecurityLevel1::Current_var current =
@@ -110,7 +109,7 @@ SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL)
 
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+SLevel1_Server_i::authorize_level2 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// If the owner of this invocation is authorized to invoke this
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
index d284e65c293..0e7ae144123 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -25,10 +25,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server
   SLevel1_Server_i ();
 
   ///
-  CORBA::Boolean authorize_level1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean authorize_level1 (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean authorize_level2 (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static int authorized_1;
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index b7779c65615..921caee09c5 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -34,22 +34,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       SLevel1_Server_var server =
-        SLevel1_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        SLevel1_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -60,8 +57,7 @@ main (int argc, char *argv [])
         }
 
       CORBA::Boolean authorized =
-        server->authorize_level1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->authorize_level1 ();
 
       if (authorized == 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -70,19 +66,15 @@ main (int argc, char *argv [])
         ACE_DEBUG ((LM_DEBUG,
                     "DENIED: You Do NOT have enough privileges\n"));
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index 2b39bda82e3..da28207b229 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -11,17 +11,15 @@ const char *ior_output_file = 0;
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       /// Our regular ORB Initialization.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       /// Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -30,19 +28,15 @@ main (int argc, char *argv[])
 
       /// Narrow down the reference to the currect interface.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       SLevel1_Server_i level1_server ();
 
       SLevel1_Server_var server =
-        level1_server._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        level1_server._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -60,16 +54,14 @@ main (int argc, char *argv[])
       // Start the ORB
       orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCH (CORBA::SytemException, ex)
+  catch (const CORBA::SytemException& )
     {
       ACE_DEBUG ((LM_DEBUG,
                   "System Exception raised: %s", ex));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index 507bdde5847..0286282ca72 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -67,24 +64,19 @@ main (int argc, char *argv[])
           char *line = buf.read ('\n');
           if (line == 0)
             break;
-          server->send_line (line ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->send_line (line);
           buf.alloc ()->free (line);
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 97a4beace1c..9dd9fd398e8 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -37,15 +37,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,12 +51,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -66,12 +62,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -88,26 +82,21 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
       ACE_OS::sleep (5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 93ba5bb076d..858fc2c99d6 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -9,15 +9,14 @@
 ACE_RCSID(Send_File, test_i, "$Id$")
 
 void
-Simple_Server_i::send_line (const char *line
-                            ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::send_line (const char *line)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "%s\n", line));
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
index f0c4aa7be58..dce0675446b 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
@@ -31,11 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void send_line (const char *line
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void send_line (const char *line)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index a3bd5a0947f..3c7269ca701 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -80,12 +80,11 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void)
 // Stop the transfer of data of the stream
 // Empty the_spec means apply operation to all flows
 void
-TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
-                            ACE_ENV_ARG_DECL)
+TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
       // @@Call stop on the Related MediaCtrl.  call stop on the flow
       // connections.
@@ -100,8 +99,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
                 if (this->flow_connection_map_.find (flow_name_key,
                                                      flow_connection_entry) == 0)
                   {
-                    flow_connection_entry->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    ACE_TRY_CHECK;
+                    flow_connection_entry->stop ();
                   }
               }
           else
@@ -111,30 +109,26 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
               FlowConnection_Map_Entry *entry;
               for (;iterator.next (entry) !=  0;iterator.advance ())
                 {
-                  entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  entry->int_id_->stop ();
                 }
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::stop");
+      ex._tao_print_exception ("TAO_Basic_StreamCtrl::stop");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Start the transfer of data in the stream.
 // Empty the_spec means apply operation to all flows
 void
-TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
-                             ACE_ENV_ARG_DECL)
+TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
       // @@Call start on the Related MediaCtrl.
 
@@ -150,8 +144,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
                 if (this->flow_connection_map_.find (flow_name_key,
                                                      flow_connection_entry) == 0)
                   {
-                    flow_connection_entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    ACE_TRY_CHECK;
+                    flow_connection_entry->int_id_->start ();
                   }
               }
           else
@@ -161,19 +154,16 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
               FlowConnection_Map_Entry *entry = 0;
               for (;iterator.next (entry) !=  0;iterator.advance ())
                 {
-                  entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  entry->int_id_->start ();
                 }
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::start");
+      ex._tao_print_exception ("TAO_Basic_StreamCtrl::start");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Tears down the stream. This will close the connection, and delete
@@ -181,12 +171,11 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
 // the_spec means apply operation to all flows
 
 void
-TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
-                               ACE_ENV_ARG_DECL)
+TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
       // call stop on the flow connections.
       if (this->flow_connection_map_.current_size () > 0)
@@ -200,8 +189,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
                 FlowConnection_Map::ENTRY *flow_connection_entry = 0;
                 if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0)
                   {
-                    flow_connection_entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    ACE_TRY_CHECK;
+                    flow_connection_entry->int_id_->destroy ();
                   }
               }
           }
@@ -212,19 +200,16 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
               FlowConnection_Map_Entry *entry = 0;
               for (;iterator.next (entry) !=  0;iterator.advance ())
                 {
-                  entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  entry->int_id_->destroy ();
                 }
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::destroy");
+      ex._tao_print_exception ("TAO_Basic_StreamCtrl::destroy");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Changes the QoS associated with the stream
@@ -232,8 +217,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
 CORBA::Boolean
 
 TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
-                                  const AVStreams::flowSpec &/*flowspec*/
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  const AVStreams::flowSpec &/*flowspec*/)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed))
@@ -244,8 +228,7 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
 // Used by StreamEndPoint and VDev to inform StreamCtrl of events.
 // E.g., loss of flow, reestablishment of flow, etc..
 void
-TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -256,8 +239,7 @@ TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*t
 void
 TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
                                     const char  *fp_name,
-                                    const CORBA::Any &fp_settings
-                                    ACE_ENV_ARG_DECL)
+                                    const CORBA::Any &fp_settings)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::FPError))
@@ -265,15 +247,13 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
 {
   if (!CORBA::is_nil (this->sep_a_.in ()))
     {
-      this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings);
     }
 }
 
 // Gets the flow connection.
 CORBA::Object_ptr
-TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name
-                                           ACE_ENV_ARG_DECL)
+TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported))
@@ -293,25 +273,22 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name
 // Sets the flow connection.
 void
 TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
-                                           CORBA::Object_ptr flow_connection_obj
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::Object_ptr flow_connection_obj)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::notSupported))
 {
   AVStreams::FlowConnection_var flow_connection;
-  ACE_TRY
+  try
     {
-      flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::set_flow_connection");
+      ex._tao_print_exception (
+        "TAO_Basic_StreamCtrl::set_flow_connection");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
   // add the flowname and the flowconnection to the hashtable.
   this->flows_.length (this->flow_count_ + 1);
   this->flows_ [this->flow_count_++] = CORBA::string_dup (flow_name);
@@ -319,7 +296,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
   if (this->flow_connection_map_.bind (flow_name_key, flow_connection) != 0)
   {
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%N,%l) Cannot find flow: %s\n", flow_name ));
-    ACE_THROW (AVStreams::noSuchFlow ());// is this right?
+    throw AVStreams::noSuchFlow ();// is this right?
   }
 }
 
@@ -333,8 +310,7 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
 
 CORBA::Boolean
 TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */,
-                           const AVStreams::streamQoS &/* qos_spec */
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           const AVStreams::streamQoS &/* qos_spec */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -376,21 +352,17 @@ bool
 MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const
 {
   CORBA::Boolean result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       result =
-        this->mmdevice_->_is_equivalent (hash_key.mmdevice_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->mmdevice_->_is_equivalent (hash_key.mmdevice_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MMDevice_Map_Hash_Key::operator == ");
+      ex._tao_print_exception (
+        "MMDevice_Map_Hash_Key::operator == ");
       return false;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (false);
 
   return result;
 }
@@ -401,29 +373,21 @@ operator < (const MMDevice_Map_Hash_Key &left,
 {
   bool result = false;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       const CORBA::ULong left_hash =
-        left.mmdevice_->_hash (left.hash_maximum_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        left.mmdevice_->_hash (left.hash_maximum_);
 
       const CORBA::ULong right_hash =
-        right.mmdevice_->_hash (right.hash_maximum_
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        right.mmdevice_->_hash (right.hash_maximum_);
 
       result = left_hash < right_hash;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "operator < for MMDevice_Map_Hash_Key");
+      ex._tao_print_exception ("operator < for MMDevice_Map_Hash_Key");
       return false;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (false);
 
   return result;
 }
@@ -432,20 +396,15 @@ u_long
 MMDevice_Map_Hash_Key::hash (void)  const
 {
   u_long result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      result = this->mmdevice_->_hash (this->hash_maximum_
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->mmdevice_->_hash (this->hash_maximum_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MMDevice_Map_Hash_Key::hash");
+      ex._tao_print_exception ("MMDevice_Map_Hash_Key::hash");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return result;
 }
 
@@ -456,11 +415,9 @@ MMDevice_Map_Hash_Key::hash (void)  const
 TAO_StreamCtrl::TAO_StreamCtrl (void)
   :mcastconfigif_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->streamctrl_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->streamctrl_ = this->_this ();
       char buf [BUFSIZ];
       int result = ACE_OS::hostname (buf, BUFSIZ);
       unsigned long ipaddr = 0;
@@ -468,12 +425,10 @@ TAO_StreamCtrl::TAO_StreamCtrl (void)
         ipaddr = ACE_OS::inet_addr (buf);
       this->source_id_ = TAO_AV_RTCP::alloc_srcid (ipaddr);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::TAO_StreamCtrl");
+      ex._tao_print_exception ("TAO_StreamCtrl::TAO_StreamCtrl");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 TAO_StreamCtrl::~TAO_StreamCtrl (void)
@@ -485,52 +440,44 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void)
 // Stop the transfer of data of the stream
 // Empty the_spec means apply operation to all flows
 void
-TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
-                      ACE_ENV_ARG_DECL)
+TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
-      TAO_Basic_StreamCtrl::stop (flow_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_Basic_StreamCtrl::stop (flow_spec);
       if (this->flow_connection_map_.current_size () > 0)
         return;
       MMDevice_Map_Iterator a_iterator (this->mmdevice_a_map_);
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry->int_id_.sep_->stop (flow_spec);
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry->int_id_.sep_->stop (flow_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::stop");
+      ex._tao_print_exception ("TAO_Basic_StreamCtrl::stop");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Start the transfer of data in the stream.
 // Empty the_spec means apply operation to all flows
 void
-TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
-                       ACE_ENV_ARG_DECL)
+TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
-      TAO_Basic_StreamCtrl::start (flow_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_Basic_StreamCtrl::start (flow_spec);
       if (this->flow_connection_map_.current_size () > 0)
         return;
 
@@ -538,38 +485,32 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry->int_id_.sep_->start (flow_spec);
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry->int_id_.sep_->start (flow_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::start");
+      ex._tao_print_exception ("TAO_StreamCtrl::start");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Tears down the stream. This will close the connection, and delete
 // the streamendpoint and vdev associated with this stream
 // Empty the_spec means apply operation to all flows
 void
-TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
-                         ACE_ENV_ARG_DECL)
+TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow))
 {
-  ACE_TRY
+  try
     {
-      TAO_Basic_StreamCtrl::destroy (flow_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_Basic_StreamCtrl::destroy (flow_spec);
       if (this->flow_connection_map_.current_size () > 0)
         return;
 
@@ -577,23 +518,19 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry->int_id_.sep_->destroy (flow_spec);
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry->int_id_.sep_->destroy (flow_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::destroy");
+      ex._tao_print_exception ("TAO_StreamCtrl::destroy");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   int result = TAO_AV_Core::deactivate_servant (this);
   if (result < 0)
@@ -608,14 +545,13 @@ CORBA::Boolean
 TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                            AVStreams::MMDevice_ptr b_party,
                            AVStreams::streamQoS &the_qos,
-                           const AVStreams::flowSpec &the_flows
-                           ACE_ENV_ARG_DECL)
+                           const AVStreams::flowSpec &the_flows)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
 {
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (a_party) && CORBA::is_nil (b_party))
         ACE_ERROR_RETURN ((LM_ERROR, "Both parties are nil\n"), 0);
@@ -657,9 +593,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                     the_qos,
                                     met_qos,
                                     named_vdev.inout (),
-                                    the_flows
-                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                    the_flows);
 
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_A: succeeded\n"));
@@ -667,31 +601,23 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               CORBA::Any streamctrl_any;
               streamctrl_any <<= this->streamctrl_.in ();
               this->sep_a_->define_property ("Related_StreamCtrl",
-                                             streamctrl_any
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                             streamctrl_any);
 
               CORBA::Any vdev_a_any;
               vdev_a_any <<= this->vdev_a_.in ();
               this->sep_a_->define_property ("Related_VDev",
-                                             vdev_a_any
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                             vdev_a_any);
 
               CORBA::Any streamendpoint_a_any;
               streamendpoint_a_any <<= this->sep_a_.in ();
               this->vdev_a_->define_property ("Related_StreamEndpoint",
-                                              streamendpoint_a_any
-                                              ACE_ENV_ARG_PARAMETER);
+                                              streamendpoint_a_any);
 
-              ACE_TRY_CHECK;
 
               CORBA::Any mmdevice_a_any;
               mmdevice_a_any <<= a_party;
               this->vdev_a_->define_property ("Related_MMDevice",
-                                              mmdevice_a_any
-                                              ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                              mmdevice_a_any);
 
               // add the mmdevice, sep and vdev to the map.
               MMDevice_Map_Entry map_entry;
@@ -728,46 +654,34 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                     the_qos,
                                     met_qos,
                                     named_vdev.inout (),
-                                    the_flows
-                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                    the_flows);
 
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n"));
 
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                           "\n(%P|%t)stream_endpoint_b_ = %s",
-                          TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()
-                                                                              ACE_ENV_ARG_PARAMETER)));
-              ACE_TRY_CHECK;
+                          TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ())));
               // Define ourselves as the related_streamctrl property of the sep.
               CORBA::Any streamctrl_any;
               streamctrl_any <<= this->streamctrl_.in ();
               this->sep_b_->define_property ("Related_StreamCtrl",
-                                             streamctrl_any
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                             streamctrl_any);
 
               CORBA::Any vdev_b_any;
               vdev_b_any <<= this->vdev_b_.in ();
               this->sep_b_->define_property ("Related_VDev",
-                                             vdev_b_any
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                             vdev_b_any);
 
               CORBA::Any streamendpoint_b_any;
               streamendpoint_b_any <<= this->sep_b_.in ();
               this->vdev_b_->define_property ("Related_StreamEndpoint",
-                                              streamendpoint_b_any
-                                              ACE_ENV_ARG_PARAMETER);
+                                              streamendpoint_b_any);
 
-              ACE_TRY_CHECK;
 
               CORBA::Any mmdevice_b_any;
               mmdevice_b_any <<= b_party;
               this->vdev_b_->define_property ("Related_MMDevice",
-                                              mmdevice_b_any
-                                              ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                              mmdevice_b_any);
               // add the mmdevice, sep and vdev to the map.
               MMDevice_Map_Entry map_entry;
               MMDevice_Map_Hash_Key key (b_party);
@@ -791,14 +705,10 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           sep_a_peer_any <<= this->sep_b_.in();
           sep_b_peer_any <<= this->sep_a_.in();
           this->sep_a_->define_property ("PeerAdapter",
-                                          sep_a_peer_any
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                          sep_a_peer_any);
 
           this->sep_b_->define_property ("PeerAdapter",
-                                         sep_b_peer_any
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         sep_b_peer_any);
         }
 
       // In the full profile case there's no VDev.
@@ -807,39 +717,33 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           // Now set the source id for this A endpoint.
           // If the sep contains flow producers then set the source ids for those
           // instead.
-          ACE_TRY_EX (set_source_id)
+          try
             {
-              CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows"
-                                                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (set_source_id);
+              CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows");
               AVStreams::flowSpec_var flows;
               *flows_any >>= flows.out ();
               for (CORBA::ULong i=0; i< flows->length ();++i)
                 {
                   CORBA::Object_var fep_obj =
-                    this->sep_a_->get_fep (flows [i] ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (set_source_id);
-                  ACE_TRY_EX (producer_check)
+                    this->sep_a_->get_fep (flows [i]);
+                  try
                     {
                       AVStreams::FlowProducer_var producer =
-                        AVStreams::FlowProducer::_narrow (fep_obj.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (producer_check);
+                        AVStreams::FlowProducer::_narrow (fep_obj.in ());
                       producer->set_source_id (this->source_id_++);
                     }
-                  ACE_CATCHANY
+                  catch (const CORBA::Exception& ex)
                     {
                       if (TAO_debug_level > 0)
                         ACE_DEBUG ((LM_DEBUG, " %s ", static_cast<char const*>(flows[i])));
 
-                      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "producer_check: not a producer");
+                      ex._tao_print_exception (
+                        "producer_check: not a producer");
 
                     }
-                  ACE_ENDTRY;
-                  ACE_CHECK_RETURN (0);
                 }
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               // Since the full profile failed try setting the source id
               // for the sep instead.
@@ -847,27 +751,21 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               // many producers who do not have flow interfaces. Then
               // the streamctrl has to give an array of source ids to
               // the sep.
-              this->sep_a_->set_source_id (this->source_id_++
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->sep_a_->set_source_id (this->source_id_++);
             }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN (0);
           if (!this->mcastconfigif_)
             {
               ACE_NEW_RETURN (this->mcastconfigif_,
                               TAO_MCastConfigIf,
                               0);
               // @@: Deactivating the object thru poa means calling remove_ref after _this.
-              this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->mcastconfigif_ptr_ = this->mcastconfigif_->_this ();
             }
           // Multicast source being added.
           CORBA::Boolean result = this->vdev_a_->set_Mcast_peer (this->streamctrl_.in (),
                                                                  this->mcastconfigif_ptr_.in (),
                                                                  the_qos,
-                                                                 the_flows
-                                                                 ACE_ENV_ARG_PARAMETER);
+                                                                 the_flows);
           if (!result)
             ACE_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0);
         }
@@ -881,43 +779,36 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                 ACE_ERROR_RETURN ((LM_ERROR, "first add a source and then a sink\n"), 0);
               this->mcastconfigif_->set_peer (this->vdev_b_.in (),
                                               the_qos,
-                                              the_flows
-                                              ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                              the_flows);
             }
 
           int connect_leaf_success = 0;
-          ACE_TRY_EX (connect_leaf)
+          try
             {
               // @@: define null interfaces for Atm so that they can be implemented once
               //  ACE adds support for ATM multicast.
               connect_leaf_success = this->sep_a_->connect_leaf (this->sep_b_.in (),
                                                                  the_qos,
-                                                                 the_flows
-                                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (connect_leaf);
+                                                                 the_flows);
               connect_leaf_success = 1;
             }
-          ACE_CATCH (AVStreams::notSupported, ex)
+          catch (const AVStreams::notSupported&)
             {
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "connect_leaf failed\n"));
               connect_leaf_success = 0;
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::bind_devs");
+              ex._tao_print_exception (
+                "TAO_StreamCtrl::bind_devs");
             }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN (0);
           if (!connect_leaf_success)
             {
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n"));
               AVStreams::flowSpec connect_flows = the_flows;
-              this->sep_a_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-              this->sep_b_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->sep_a_->multiconnect (the_qos, connect_flows);
+              this->sep_b_->multiconnect (the_qos, connect_flows);
             }
         }
 
@@ -940,9 +831,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               this->bind (this->sep_a_.in (),
                           this->sep_b_.in (),
                           the_qos,
-                          the_flows
-                          ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                          the_flows);
 
 
 
@@ -958,38 +847,30 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               this->vdev_a_->set_peer (this->streamctrl_.in (),
                                        this->vdev_b_.in (),
                                        the_qos,
-                                       the_flows
-                                       ACE_ENV_ARG_PARAMETER);
+                                       the_flows);
 
-              ACE_TRY_CHECK;
               this->vdev_b_->set_peer (this->streamctrl_.in (),
                                        this->vdev_a_.in (),
                                        the_qos,
-                                       the_flows
-                                       ACE_ENV_ARG_PARAMETER);
+                                       the_flows);
 
-              ACE_TRY_CHECK;
 
               // Now connect the streams together. This will
               // establish the connection
               CORBA::Boolean result  =
                 this->sep_a_->connect (this->sep_b_.in (),
                                        the_qos,
-                                       the_flows
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       the_flows);
               if (result == 0)
                 ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0);
           }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::bind_devs");
+      ex._tao_print_exception ("TAO_StreamCtrl::bind_devs");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
@@ -999,8 +880,7 @@ CORBA::Boolean
 TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       AVStreams::StreamEndPoint_B_ptr sep_b,
                       AVStreams::streamQoS &stream_qos,
-                      const AVStreams::flowSpec &flow_spec
-                      ACE_ENV_ARG_DECL)
+                      const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -1010,7 +890,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
   this->sep_b_ = AVStreams::StreamEndPoint_B::_duplicate(sep_b);
 
   int result = 0;
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (sep_a_.in() ) ||
           CORBA::is_nil (sep_b_.in() ))
@@ -1023,26 +903,20 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
       CORBA::Any sep_any;
       sep_any <<= sep_b;
       sep_a_->define_property ("PeerAdapter",
-                              sep_any
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              sep_any);
       sep_any <<= sep_a;
       sep_b_->define_property ("PeerAdapter",
-                              sep_any
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              sep_any);
       // since its full profile we do the viable stream setup algorithm.
       // get the flows for the A streamendpoint.
       // the flows spec is empty and hence we do a exhaustive match.
       AVStreams::flowSpec a_flows, b_flows;
       CORBA::Any_var flows_any;
-      flows_any = sep_a_->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      flows_any = sep_a_->get_property_value ("Flows");
       AVStreams::flowSpec *temp_flows;
       flows_any.in () >>= temp_flows;
       a_flows = *temp_flows;
-      flows_any = sep_b_->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      flows_any = sep_b_->get_property_value ("Flows");
       flows_any.in () >>= temp_flows;
       b_flows = *temp_flows;
       u_int i;
@@ -1059,13 +933,9 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           const char *flowname = a_flows[i];
           // get the flowendpoint references.
           CORBA::Object_var fep_obj =
-            sep_a_->get_fep (flowname
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            sep_a_->get_fep (flowname);
           AVStreams::FlowEndPoint_var fep =
-            AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            AVStreams::FlowEndPoint::_narrow (fep_obj.in ());
           ACE_CString fep_key (flowname);
           result = a_fep_map->bind (fep_key, fep);
           if (result == -1)
@@ -1077,13 +947,9 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           const char *flowname = b_flows[i];
           // get the flowendpoint references.
           CORBA::Object_var fep_obj =
-            sep_b->get_fep (flowname
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            sep_b->get_fep (flowname);
           AVStreams::FlowEndPoint_var fep =
-            AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            AVStreams::FlowEndPoint::_narrow (fep_obj.in ());
           ACE_CString fep_key (flowname);
           result = b_fep_map->bind (fep_key, fep);
           if (result == -1)
@@ -1138,7 +1004,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
       // uses the first match policy.
       FlowEndPoint_Map_Iterator a_feps_iterator (*map_a);
       FlowEndPoint_Map_Entry *a_feps_entry, *b_feps_entry;
-      ACE_TRY_EX (flow_connect)
+      try
         {
 
           for (;a_feps_iterator.next (a_feps_entry) != 0;
@@ -1146,8 +1012,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
             {
               AVStreams::FlowEndPoint_var fep_a = a_feps_entry->int_id_;
               AVStreams::FlowEndPoint_var connected_to =
-                fep_a->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (flow_connect);
+                fep_a->get_connected_fep ();
 
               if (!CORBA::is_nil (connected_to.in ()))
                 {
@@ -1163,8 +1028,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                   AVStreams::FlowConnection_var flow_connection;
 
                   AVStreams::FlowEndPoint_var connected_to =
-                    fep_b->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (flow_connect);
+                    fep_b->get_connected_fep ();
 
                   if (!CORBA::is_nil (connected_to.in ()))
                     {
@@ -1172,45 +1036,32 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       continue;
                     }
 
-                  if (fep_a->is_fep_compatible (fep_b.in()
-                                                ACE_ENV_ARG_PARAMETER) == 1)
+                  if (fep_a->is_fep_compatible (fep_b.in()) == 1)
                     {
-                      ACE_TRY_CHECK_EX (flow_connect);
                       // assume that flow names are same so that we
                       // can use either of them.
                       CORBA::Object_var flow_connection_obj;
                       CORBA::Any_var flowname_any =
-                        fep_a->get_property_value ("FlowName"
-                                                   ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (flow_connect);
+                        fep_a->get_property_value ("FlowName");
                       const char *flowname = 0;
                       flowname_any.in () >>= flowname;
-                      ACE_TRY_EX (flow_connection)
+                      try
                         {
                           flow_connection_obj =
-                            this->get_flow_connection (flowname
-                                                       ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connection);
+                            this->get_flow_connection (flowname);
                           flow_connection =
-                            AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connection);
+                            AVStreams::FlowConnection::_narrow (flow_connection_obj.in ());
                         }
-                      ACE_CATCHANY
+                      catch (const CORBA::Exception&)
                         {
                           TAO_FlowConnection *flowConnection;
                           ACE_NEW_RETURN (flowConnection,
                                           TAO_FlowConnection,
                                           0);
-                          flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connect);
+                          flow_connection = flowConnection->_this ();
                           this->set_flow_connection (flowname,
-                                                     flow_connection.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connect);
+                                                     flow_connection.in ());
                         }
-                      ACE_ENDTRY;
-                      ACE_CHECK_RETURN (0);
 
                       // make sure that a_feps is flow_producer
                       // and b_feps is flow_consumer
@@ -1221,29 +1072,21 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       AVStreams::FlowProducer_var producer;
                       AVStreams::FlowConsumer_var consumer;
 
-                      ACE_TRY_EX (producer_check)
+                      try
                         {
                           producer =
-                            AVStreams::FlowProducer::_narrow (fep_a.in()
-                                                              ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (producer_check);
+                            AVStreams::FlowProducer::_narrow (fep_a.in());
                           consumer =
-                            AVStreams::FlowConsumer::_narrow (fep_b.in()
-                                                              ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (producer_check);
+                            AVStreams::FlowConsumer::_narrow (fep_b.in());
 
                           // If the types don't match then try in
                           // the opposite order
                           if (CORBA::is_nil (producer.in ()))
                             {
                               producer =
-                                AVStreams::FlowProducer::_narrow (fep_b.in()
-                                                                  ACE_ENV_ARG_PARAMETER);
-                              ACE_TRY_CHECK_EX (producer_check);
+                                AVStreams::FlowProducer::_narrow (fep_b.in());
                               consumer =
-                                AVStreams::FlowConsumer::_narrow (fep_a.in()
-                                                                  ACE_ENV_ARG_PARAMETER);
-                              ACE_TRY_CHECK_EX (producer_check);
+                                AVStreams::FlowConsumer::_narrow (fep_a.in());
                             }
                           // At this point they should both be
                           // non-nil
@@ -1252,21 +1095,17 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                           ACE_ASSERT (!CORBA::is_nil (producer.in ()));
                           ACE_ASSERT (!CORBA::is_nil (consumer.in ()));
                         }
-                      ACE_CATCHANY
+                      catch (const CORBA::Exception&)
                         {
                           //Yamuna : Recheck this
-                          ACE_RE_THROW;//_EX (producer_check);
+                          throw;//_EX (producer_check);
                         }
-                      ACE_ENDTRY;
-                      ACE_CHECK_RETURN (0);
                       CORBA::String_var fep_a_name, fep_b_name;
-                      flowname_any = fep_a->get_property_value ("FlowName"
-                                                                ACE_ENV_ARG_PARAMETER);
+                      flowname_any = fep_a->get_property_value ("FlowName");
                       const char *temp_name;
                       flowname_any.in () >>= temp_name;
                       fep_a_name = CORBA::string_dup (temp_name);
-                      flowname_any = fep_b->get_property_value ("FlowName"
-                                                                ACE_ENV_ARG_PARAMETER);
+                      flowname_any = fep_b->get_property_value ("FlowName");
                       flowname_any.in () >>= temp_name;
                       fep_b_name = CORBA::string_dup (temp_name);
                       AVStreams::QoS flow_qos;
@@ -1284,43 +1123,34 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                         }
                       flow_connection->connect (producer.in (),
                                                 consumer.in (),
-                                                flow_qos
-                                                ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (flow_connect);
+                                                flow_qos);
                     }
                 }
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_StreamCtrl::bind:flow_connect block");
+          ex._tao_print_exception ("TAO_StreamCtrl::bind:flow_connect block");
           return 0;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // error was thrown because one of the streamendpoints is light profile.
       // Now connect the streams together
       this->sep_a_->connect (this->sep_b_.in (),
                              stream_qos,
-                             flow_spec
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             flow_spec);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
 void
-TAO_StreamCtrl::unbind (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StreamCtrl::unbind (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       if (this->flow_connection_map_.current_size () > 0)
         return;
@@ -1332,29 +1162,24 @@ TAO_StreamCtrl::unbind (ACE_ENV_SINGLE_ARG_DECL)
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry->int_id_.sep_->destroy (flow_spec);
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry->int_id_.sep_->destroy (flow_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::unbind");
+      ex._tao_print_exception ("TAO_StreamCtrl::unbind");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
-                              const AVStreams::flowSpec &/* the_spec */
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              const AVStreams::flowSpec &/* the_spec */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow))
@@ -1363,8 +1188,7 @@ TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
 
 void
 TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
-                            const AVStreams::flowSpec & /* the_spec */
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            const AVStreams::flowSpec & /* the_spec */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow))
@@ -1373,8 +1197,7 @@ TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
 
 AVStreams::VDev_ptr
 TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
-                                  AVStreams::StreamEndPoint_out sep
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  AVStreams::StreamEndPoint_out sep)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed))
 {
@@ -1395,8 +1218,7 @@ TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
 CORBA::Boolean
 
 TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
-                            const AVStreams::flowSpec &the_spec
-                            ACE_ENV_ARG_DECL)
+                            const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
@@ -1413,7 +1235,7 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
     }
   else
     {
-      ACE_TRY
+      try
         {
           AVStreams::flowSpec in_flowspec;
           AVStreams::flowSpec out_flowspec;
@@ -1465,23 +1287,19 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
 
           if (in_flowspec.length () != 0)
             {
-              this->vdev_a_->modify_QoS (new_qos, in_flowspec ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->vdev_a_->modify_QoS (new_qos, in_flowspec);
             }
 
           if (out_flowspec.length () != 0)
             {
-              this->vdev_b_->modify_QoS (new_qos, out_flowspec ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->vdev_b_->modify_QoS (new_qos, out_flowspec);
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::modify_QoS");
+          ex._tao_print_exception ("TAO_StreamCtrl::modify_QoS");
           return 0;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
 
     }
   return 1;
@@ -1505,64 +1323,56 @@ TAO_MCastConfigIf::~TAO_MCastConfigIf (void)
 CORBA::Boolean
 TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
                              AVStreams::streamQoS & qos,
-                             const AVStreams::flowSpec & flow_spec
-                             ACE_ENV_ARG_DECL)
+                             const AVStreams::flowSpec & flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       Peer_Info *info;
       ACE_NEW_RETURN (info,
                       Peer_Info,
                       0);
-      info->peer_ = AVStreams::VDev::_narrow (peer ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      info->peer_ = AVStreams::VDev::_narrow (peer);
       info->qos_ = qos;
       info->flow_spec_ = flow_spec;
       this->peer_list_.insert_tail (info);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MCastConfigIf::set_peer");
+      ex._tao_print_exception ("TAO_MCastConfigIf::set_peer");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
-TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration
-                              ACE_ENV_ARG_DECL)
+TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Peer_Info *info;
-  ACE_TRY
+  try
     {
       for (this->peer_list_iterator_.first ();
            (info = this->peer_list_iterator_.next ()) != 0;
            this->peer_list_iterator_.advance ())
         {
-          info->peer_->configure (a_configuration ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          info->peer_->configure (a_configuration);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MCastConfigIf::set_configure");
+      ex._tao_print_exception (
+        "TAO_MCastConfigIf::set_configure");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 
 void
-TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->initial_configuration_ = initial;
@@ -1571,13 +1381,12 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
 TAO_MCastConfigIf::set_format (const char * flowName,
-                               const char * format_name
-                               ACE_ENV_ARG_DECL)
+                               const char * format_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
   Peer_Info *info;
-  ACE_TRY
+  try
     {
       for (this->peer_list_iterator_.first ();
            (info = this->peer_list_iterator_.next ()) != 0;
@@ -1585,31 +1394,27 @@ TAO_MCastConfigIf::set_format (const char * flowName,
         {
           if (this->in_flowSpec (info->flow_spec_, flowName))
             {
-              info->peer_->set_format (flowName, format_name ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              info->peer_->set_format (flowName, format_name);
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MCastConfigIf::set_format");
+      ex._tao_print_exception ("TAO_MCastConfigIf::set_format");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
 TAO_MCastConfigIf::set_dev_params (const char * flowName,
-                                   const CosPropertyService::Properties & new_params
-                                   ACE_ENV_ARG_DECL)
+                                   const CosPropertyService::Properties & new_params)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
 {
   Peer_Info *info;
-  ACE_TRY
+  try
     {
 
       for (this->peer_list_iterator_.first ();
@@ -1618,18 +1423,16 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName,
         {
           if (this->in_flowSpec (info->flow_spec_, flowName))
             {
-              info->peer_->set_dev_params (flowName, new_params ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              info->peer_->set_dev_params (flowName, new_params);
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MCastConfigIf::set_dev_params");
+      ex._tao_print_exception (
+        "TAO_MCastConfigIf::set_dev_params");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
@@ -1672,22 +1475,19 @@ TAO_Base_StreamEndPoint::handle_open (void)
 }
 
 int
-TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec &
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec &)
 {
   return 0;
 }
 
 int
-TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec &
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec &)
 {
   return 0;
 }
 
 int
-TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &)
 {
   return 0;
 }
@@ -1711,8 +1511,7 @@ TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &)
 
 // The following function is for backward compatibility.
 CORBA::Boolean
-TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &)
 {
   return 1;
 }
@@ -1796,8 +1595,7 @@ TAO_StreamEndPoint::TAO_StreamEndPoint (void)
 CORBA::Boolean
 TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                              AVStreams::streamQoS &qos,
-                             const AVStreams::flowSpec &the_spec
-                             ACE_ENV_ARG_DECL)
+                             const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -1807,7 +1605,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
     ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect ()\n"));
   CORBA::Boolean retv = 0;
   this->peer_sep_ = AVStreams::StreamEndPoint::_duplicate (responder);
-  ACE_TRY_EX (negotiate)
+  try
     {
       if (!CORBA::is_nil (this->negotiator_.in ()))
         {
@@ -1822,30 +1620,25 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
             {
               CORBA::Boolean result =
                 this->negotiator_->negotiate (peer_negotiator,
-                                              qos
-                                              ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (negotiate);
+                                              qos);
               if (!result)
                 if (TAO_debug_level > 0)
                   ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect (): negotiate failed\n"));
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::negotiate");
+      ex._tao_print_exception ("TAO_StreamEndPoint::negotiate");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
-  ACE_TRY_EX (available_protocols)
+  try
     {
       if (this->protocols_.length () > 0)
         {
           // choose protocols based on what the remote endpoint can support.
           CORBA::Any_var protocols_any =
-            responder->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (available_protocols);
+            responder->get_property_value ("AvailableProtocols");
           AVStreams::protocolSpec peer_protocols;
           AVStreams::protocolSpec *temp_protocols;
           protocols_any.in () >>= temp_protocols;
@@ -1863,13 +1656,11 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Availableprotocols property not defined\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  ACE_TRY
+  try
     {
       AVStreams::streamQoS network_qos;
       if (qos.length () > 0)
@@ -1923,15 +1714,12 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
         ACE_ERROR_RETURN ((LM_ERROR, "%N:%l TAO_AV_Core::init_forward_flows failed\n"), 0);
 
 
-      AVStreams::StreamEndPoint_var streamendpoint = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      AVStreams::StreamEndPoint_var streamendpoint = this->_this ();
 
       retv = responder->request_connection (streamendpoint.in (),
                                             0,
                                             network_qos,
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            flow_spec);
 
       if (TAO_debug_level > 0)
          ACE_DEBUG ((LM_DEBUG, "%N:%l request_connection returned %d\n", retv));
@@ -1969,13 +1757,11 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
       // Make the upcall to the app
       retv = this->handle_postconnect (flow_spec);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::connect");
+      ex._tao_print_exception ("TAO_StreamEndPoint::connect");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return retv;
 }
 
@@ -1997,14 +1783,12 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos,
 // Empty the_spec --> apply to all flows
 
 void
-TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
-                          ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   // Make the upcall into the app
-  this->handle_stop (flow_spec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->handle_stop (flow_spec);
 
   if (flow_spec.length () > 0)
     {
@@ -2049,15 +1833,13 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
 // Start the physical flow of data on the stream
 // Empty the_spec --> apply to all flows
 void
-TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
-                           ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n"));
   // Make the upcall into the app
-  this->handle_start (flow_spec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->handle_start (flow_spec);
 
   if (flow_spec.length () > 0)
     {
@@ -2140,19 +1922,16 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
 
 // Close the connection
 void
-TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
-                             ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
-  CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev"
-                                                      ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev");
 
   AVStreams::VDev_ptr vdev;
 
   vdev_any.in() >>= vdev;
-  CORBA::Any_var mc_any = vdev->get_property_value ("Related_MediaCtrl"
-                                                    ACE_ENV_ARG_PARAMETER);
+  CORBA::Any_var mc_any = vdev->get_property_value ("Related_MediaCtrl");
 
   // The Related_MediaCtrl property was inserted as a CORBA::Object, so we
   // must extract it as the same type.
@@ -2265,7 +2044,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
     }
 
   // Make the upcall into the app
-  //  this->handle_destroy (the_spec ACE_ENV_ARG_PARAMETER);
+  //  this->handle_destroy (the_spec);
   //
 }
 
@@ -2275,8 +2054,7 @@ CORBA::Boolean
 TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiator*/,
                                         CORBA::Boolean /*is_mcast*/,
                                         AVStreams::streamQoS &qos,
-                                        AVStreams::flowSpec &flow_spec
-                                        ACE_ENV_ARG_DECL)
+                                        AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpDenied,
                    AVStreams::noSuchFlow,
@@ -2289,7 +2067,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
                 "\n(%P|%t) TAO_StreamEndPoint::request_connection called"));
 
   int result = 0;
-  ACE_TRY
+  try
     {
       AVStreams::streamQoS network_qos;
       if (qos.length () > 0)
@@ -2352,24 +2130,19 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
         return 0;
 
       // Make the upcall to the app
-      result = this->handle_connection_requested (flow_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->handle_connection_requested (flow_spec);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_StreamEndpoint::request_connection");
+      ex._tao_print_exception ("TAO_StreamEndpoint::request_connection");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return result;
 }
 
 int
 TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
-                                const AVStreams::flowSpec &the_flows
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                const AVStreams::flowSpec &the_flows)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -2405,8 +2178,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
 // Refers to modification of transport QoS.
 CORBA::Boolean
 TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
-                                const AVStreams::flowSpec &the_flows
-                                ACE_ENV_ARG_DECL)
+                                const AVStreams::flowSpec &the_flows)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
@@ -2415,8 +2187,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
   ACE_DEBUG ((LM_DEBUG,
               "TAO_StreamEndPoint::modify_QoS\n"));
 
-  int result =  this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  int result =  this->change_qos (new_qos, the_flows);
 
   if (result != 0)
     return 0;
@@ -2428,35 +2199,30 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
 // Sets the list of protocols this streamendpoint can understand.
 
 CORBA::Boolean
-TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols
-                                              ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::Any protocol_restriction_any;
 
       protocol_restriction_any <<= protocols;
       this->define_property ("ProtocolRestriction",
-                             protocol_restriction_any
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             protocol_restriction_any);
       this->protocols_ = protocols;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::set_protocol_restriction");
+      ex._tao_print_exception (
+        "TAO_StreamEndPoint::set_protocol_restriction");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
 
 void
-TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::streamOpFailed))
@@ -2469,8 +2235,7 @@ TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec
 void
 TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
                                   const char *fp_name,
-                                  const CORBA::Any &fp_settings
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  const CORBA::Any &fp_settings)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::FPError))
@@ -2483,8 +2248,7 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
 
 
 CORBA::Object_ptr
-TAO_StreamEndPoint::get_fep (const char *flow_name
-                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_StreamEndPoint::get_fep (const char *flow_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow))
@@ -2497,15 +2261,14 @@ TAO_StreamEndPoint::get_fep (const char *flow_name
 }
 
 char*
-TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
-                                            ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
   ACE_CString flow_name;
 
-  ACE_TRY
+  try
     {
       // exception implies the flow name is not defined and is system
       // generated.
@@ -2517,67 +2280,55 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
       CORBA::Any flowname_any;
       flowname_any <<= flow_name.c_str ();
       fep->define_property ("Flow",
-                            flowname_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            flowname_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_StreamEndPoint::add_fep");
+      ex._tao_print_exception ("TAO_StreamEndPoint::add_fep");
       return 0;
     }
-  ACE_ENDTRY;
   return ACE_OS::strdup( flow_name.c_str () );
 }
 
 char*
-TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
-                               ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
   CORBA::String_var flow_name;
-  ACE_TRY
+  try
     {
       CORBA::Any_var flow_name_any =
-        fep->get_property_value ("FlowName" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        fep->get_property_value ("FlowName");
 
       const char *tmp;
       flow_name_any >>= tmp;
       flow_name = CORBA::string_dup (tmp);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       flow_name =
-        this->add_fep_i_add_property (fep ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->add_fep_i_add_property (fep);
     }
-  ACE_ENDTRY;
   return flow_name._retn ();
 }
 
 char *
-TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
-                             ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
   AVStreams::FlowEndPoint_var fep =
-    AVStreams::FlowEndPoint::_narrow (fep_obj ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    AVStreams::FlowEndPoint::_narrow (fep_obj);
 
   CORBA::String_var flow_name =
-    this->add_fep_i (fep.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->add_fep_i (fep.in ());
 
-  ACE_TRY
+  try
     {
-      fep->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fep->lock ();
       // Add it to the sequence of flowNames supported.
       // put the flowname and the flowendpoint in a hashtable.
       ACE_CString fep_name_key (CORBA::string_dup (flow_name.in ()));
@@ -2593,34 +2344,30 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
       CORBA::Any flows_any;
       flows_any <<= this->flows_;
       this->define_property ("Flows",
-                             flows_any
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             flows_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::add_fep");
+      ex._tao_print_exception ("TAO_StreamEndPoint::add_fep");
       return 0;
     }
-  ACE_ENDTRY;
   return flow_name._retn ();
 }
 
 
 void
-TAO_StreamEndPoint::remove_fep (const char *flow_name
-                                ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::remove_fep (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       ACE_CString fep_name_key (flow_name);
       AVStreams::FlowEndPoint_var fep_entry;
       // Remove the fep from the hash table.
       if (this->fep_map_.unbind (fep_name_key, fep_entry)!= 0)
-        ACE_THROW (AVStreams::streamOpFailed ());
+        throw AVStreams::streamOpFailed ();
       // redefine the "Flows" property
       AVStreams::flowSpec new_flows (this->flows_.length ());
       for (u_int i=0, j=0 ; i <this->flows_.length (); i++)
@@ -2631,51 +2378,42 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name
       flows <<= new_flows;
       this->flows_ = new_flows;
       this->define_property ("Flows",
-                             flows
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             flows);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::remove_fep");
+      ex._tao_print_exception ("TAO_StreamEndPoint::remove_fep");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Sets the negotiator object.
 void
-TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
-                                    ACE_ENV_ARG_DECL)
+TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::Any negotiator;
       negotiator <<= new_negotiator;
       this->define_property ("Negotiator",
-                             negotiator
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             negotiator);
       this->negotiator_ = AVStreams::Negotiator::_duplicate (new_negotiator);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::set_negotiator");
+      ex._tao_print_exception (
+        "TAO_StreamEndPoint::set_negotiator");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 
 // Sets the public key used for this streamendpoint.
 void
 TAO_StreamEndPoint::set_key (const char *flow_name,
-                             const AVStreams::key & the_key
-                             ACE_ENV_ARG_DECL)
+                             const AVStreams::key & the_key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       this->key_ = the_key;
       CORBA::Any PublicKey;
@@ -2683,22 +2421,17 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
       char PublicKey_property [BUFSIZ];
       ACE_OS::sprintf (PublicKey_property, "%s_PublicKey", flow_name);
       this->define_property (PublicKey_property,
-                             PublicKey
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             PublicKey);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint::set_key");
+      ex._tao_print_exception ("TAO_StreamEndPoint::set_key");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Set the source id.
 void
-TAO_StreamEndPoint::set_source_id (CORBA::Long source_id
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+TAO_StreamEndPoint::set_source_id (CORBA::Long source_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
@@ -2706,8 +2439,7 @@ TAO_StreamEndPoint::set_source_id (CORBA::Long source_id
 
 CORBA::Boolean
 TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/,
-                                  AVStreams::flowSpec &/*flow_spec*/
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  AVStreams::flowSpec &/*flow_spec*/)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n"));
@@ -2757,15 +2489,14 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void)
 // IP Multicast style connect.
 CORBA::Boolean
 TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
-                                    AVStreams::flowSpec &flow_spec
-                                    ACE_ENV_ARG_DECL)
+                                    AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPointA::multiconnect\n"));
-  ACE_TRY
+  try
     {
       int result = 0;
       TAO_AV_QoS qos (stream_qos);
@@ -2789,7 +2520,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
           // fep set for that flowconnection.
           if (this->fep_map_.find (mcast_key, flow_endpoint) == 0)
             {
-              ACE_TRY_EX (narrow)
+              try
                 {
                   AVStreams::QoS flow_qos;
                   result = qos.get_flow_qos (forward_entry->flowname (), flow_qos);
@@ -2797,35 +2528,28 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s\n", forward_entry->flowname ()));
                   // Narrow it to FlowProducer.
                   AVStreams::FlowProducer_var producer;
-                  producer = AVStreams::FlowProducer::_narrow (flow_endpoint.in() ACE_ENV_ARG_PARAMETER);
+                  producer = AVStreams::FlowProducer::_narrow (flow_endpoint.in());
                   //
-                  ACE_TRY_CHECK_EX (narrow);
                   // Else narrow succeeeded.
                   if (!CORBA::is_nil (producer.in ()))
                     {
                       AVStreams::FlowConnection_var flow_connection;
-                      ACE_TRY_EX (flow_connection)
+                      try
                         {
                           if (CORBA::is_nil (this->streamctrl_.in ()))
                               {
                                 CORBA::Any_var streamctrl_any;
-                                streamctrl_any = this->get_property_value ("Related_StreamCtrl"
-                                                                           ACE_ENV_ARG_PARAMETER);
-                                ACE_TRY_CHECK;
+                                streamctrl_any = this->get_property_value ("Related_StreamCtrl");
                                 AVStreams::StreamCtrl_ptr streamctrl;
                                 streamctrl_any.in () >>= streamctrl;
                                 this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (streamctrl);
                               }
 
                           CORBA::Object_var flow_connection_obj =
-                            this->streamctrl_->get_flow_connection (forward_entry->flowname ()
-                                                                    ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connection);
-                          flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
-                                                                                ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK_EX (flow_connection);
+                            this->streamctrl_->get_flow_connection (forward_entry->flowname ());
+                          flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ());
                         }
-                      ACE_CATCHANY
+                      catch (const CORBA::Exception&)
                         {
                           TAO_FlowConnection *flowConnection;
                           ACE_NEW_RETURN (flowConnection,
@@ -2835,39 +2559,29 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                           flowConnection->set_mcast_addr (this->mcast_addr_, this->mcast_port_);
                           this->mcast_port_++;
                           flowConnection->set_protocol (forward_entry->carrier_protocol_str ());
-                          flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                          flow_connection = flowConnection->_this ();
                           this->streamctrl_->set_flow_connection (forward_entry->flowname (),
-                                                                  flow_connection.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                                                                  flow_connection.in ());
                         }
-                      ACE_ENDTRY;
-                      ACE_CHECK_RETURN (0);
                       if (ACE_OS::strcmp (forward_entry->flow_protocol_str (), "") != 0)
                         {
                           CORBA::Any fp_settings;
                           flow_connection->use_flow_protocol (forward_entry->flow_protocol_str (),
-                                                              fp_settings
-                                                              ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                                                              fp_settings);
                         }
                       result = flow_connection->add_producer (producer.in (),
-                                                              flow_qos
-                                                              ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                                                              flow_qos);
                       if (result == 0)
                         ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0);
                     }
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
                   // Narrow failed and since its not a flowproducer its an error.
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "FlowProducer::_narrow");
+                  ex._tao_print_exception (
+                    "FlowProducer::_narrow");
                   ACE_ERROR_RETURN ((LM_ERROR, "sep_a doesn't contain a flowproducer"), 0);
                 }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (0);
             }
           else
             {
@@ -2939,13 +2653,12 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint_A::multiconnect");
+      ex._tao_print_exception (
+        "TAO_StreamEndPoint_A::multiconnect");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
@@ -2953,8 +2666,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
 CORBA::Boolean
 TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
                                     AVStreams::streamQoS & /* the_qos */,
-                                    const AVStreams::flowSpec & /* the_flows */
-                                    ACE_ENV_ARG_DECL)
+                                    const AVStreams::flowSpec & /* the_flows */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -2967,8 +2679,7 @@ TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */
 // Multicast not supported yet.
 void
 TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
-                                       const AVStreams::flowSpec & /* theSpec */
-                                       ACE_ENV_ARG_DECL)
+                                       const AVStreams::flowSpec & /* theSpec */)
 
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
@@ -2976,7 +2687,7 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep
                    AVStreams::notSupported))
 {
 
-  ACE_THROW (AVStreams::notSupported ());
+  throw AVStreams::notSupported ();
 
 }
 
@@ -2996,8 +2707,7 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void)
 
 CORBA::Boolean
 TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
-                                    AVStreams::flowSpec &flow_spec
-                                    ACE_ENV_ARG_DECL)
+                                    AVStreams::flowSpec &flow_spec)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -3005,7 +2715,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
                      AVStreams::FPError))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint_B::multiconnect\n"));
-  ACE_TRY
+  try
     {
       int result = 0;
       TAO_AV_QoS qos (stream_qos);
@@ -3021,54 +2731,43 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
           if (this->fep_map_.find (mcast_key, flow_endpoint ) == 0)
             {
               AVStreams::FlowConsumer_var consumer;
-              ACE_TRY_EX (narrow)
+              try
                 {
-                  consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (narrow);
+                  consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in ());
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "FlowConsumer::_narrow");
+                  ex._tao_print_exception (
+                    "FlowConsumer::_narrow");
                   ACE_ERROR_RETURN ((LM_ERROR, "sep_b doesn't contain a flowconsumer"), 0);
                 }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (0);
               AVStreams::QoS flow_qos;
               result = qos.get_flow_qos (forward_entry->flowname (), flow_qos);
               if (result < 0)
                 if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s", forward_entry->flowname ()));
               AVStreams::FlowConnection_var flow_connection;
-              ACE_TRY_EX (flow_connection)
+              try
                 {
                   if (CORBA::is_nil (this->streamctrl_.in ()))
                     {
                       CORBA::Any_var streamctrl_any;
-                      streamctrl_any = this->get_property_value ("Related_StreamCtrl"
-                                                                 ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                      streamctrl_any = this->get_property_value ("Related_StreamCtrl");
                       AVStreams::StreamCtrl_ptr streamctrl;
                       streamctrl_any.in () >>= streamctrl;
                       this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (streamctrl);
                     }
                   CORBA::Object_var flow_connection_obj =
-                    this->streamctrl_->get_flow_connection (forward_entry->flowname ()
-                                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (flow_connection);
-                  flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
-                                                                        ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (flow_connection);
+                    this->streamctrl_->get_flow_connection (forward_entry->flowname ());
+                  flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ());
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint_B::multiconnect::get_flow_connection");
+                  ex._tao_print_exception (
+                    "TAO_StreamEndPoint_B::multiconnect::get_flow_connection");
                   return 0;
                 }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (0);
               result = flow_connection->add_consumer (consumer.in (),
-                                                      flow_qos
-                                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                      flow_qos);
               if (result == 0)
                 ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0);
             }
@@ -3118,13 +2817,12 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamEndPoint_B::multiconnect");
+      ex._tao_print_exception (
+        "TAO_StreamEndPoint_B::multiconnect");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
@@ -3148,8 +2846,7 @@ CORBA::Boolean
 TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                     AVStreams::VDev_ptr the_peer_dev,
                     AVStreams::streamQoS &the_qos,
-                    const AVStreams::flowSpec &the_spec
-                    ACE_ENV_ARG_DECL)
+                    const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -3159,7 +2856,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
   ACE_UNUSED_ARG (the_spec);
 
   CORBA::Boolean result = 0;
-  ACE_TRY
+  try
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called\n"));
@@ -3168,40 +2865,31 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
       CORBA::Any anyval;
       anyval <<= the_peer_dev;
       this->define_property ("Related_VDev",
-                             anyval
-                             ACE_ENV_ARG_PARAMETER);
+                             anyval);
 
-      ACE_TRY_CHECK;
 
       this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (the_ctrl);
       this->peer_ = AVStreams::VDev::_duplicate (the_peer_dev);
 
       CORBA::Any_var anyptr;
-      anyptr = this->peer_->get_property_value ("Related_MediaCtrl"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      anyptr = this->peer_->get_property_value ("Related_MediaCtrl");
 
       CORBA::Object_ptr media_ctrl_obj = 0;
 
       anyptr.in () >>= CORBA::Any::to_object(media_ctrl_obj);
-      ACE_TRY_CHECK;
 
-      result = this->set_media_ctrl (media_ctrl_obj ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->set_media_ctrl (media_ctrl_obj);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_VDev::set_peer");
+      ex._tao_print_exception ("TAO_VDev::set_peer");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return result;
 }
 
 CORBA::Boolean
-TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl)
 
 {
   //  since the media ctrl is not stored or used, delete it.
@@ -3216,8 +2904,7 @@ CORBA::Boolean
 TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
                           AVStreams::MCastConfigIf_ptr mcast_peer,
                           AVStreams::streamQoS &/* the_qos */,
-                          const AVStreams::flowSpec &/* the_spec */
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const AVStreams::flowSpec &/* the_spec */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -3229,8 +2916,7 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
 
 // applications should override this to handle configuration changes.
 void
-TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/
-                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -3240,12 +2926,11 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/
 // sets the media format used for the flowname as a property.
 void
 TAO_VDev::set_format (const char *flowName,
-                      const char *format_name
-                      ACE_ENV_ARG_DECL)
+                      const char *format_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
-  ACE_TRY
+  try
     {
       if (flowName == 0 || format_name == 0)
         ACE_ERROR ((LM_ERROR, "TAO_VDev::set_format: flowName or format_name is null\n"));
@@ -3254,30 +2939,25 @@ TAO_VDev::set_format (const char *flowName,
       CORBA::Any format;
       format <<= format_name;
       this->define_property (format_property,
-                             format
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             format);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_VDev::set_format");
+      ex._tao_print_exception ("TAO_VDev::set_format");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
   return;
 }
 
 // sets the device parameters for the flowname as a property.
 void
 TAO_VDev::set_dev_params (const char *flowName,
-                          const CosPropertyService::Properties &new_params
-                          ACE_ENV_ARG_DECL)
+                          const CosPropertyService::Properties &new_params)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       if (flowName == 0)
         ACE_ERROR ((LM_ERROR, "TAO_VDev::set_dev_params:flowName is null\n"));
@@ -3286,25 +2966,20 @@ TAO_VDev::set_dev_params (const char *flowName,
       CORBA::Any devParams;
       devParams <<= new_params;
       this->define_property (devParams_property,
-                             devParams
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             devParams);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_VDev::set_dev_params");
+      ex._tao_print_exception ("TAO_VDev::set_dev_params");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
   return;
 }
 
 // QoS Modification should be handled by the application currently.
 CORBA::Boolean
 TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
-                      const AVStreams::flowSpec &flowspec
-                      ACE_ENV_ARG_DECL)
+                      const AVStreams::flowSpec &flowspec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
@@ -3323,15 +2998,12 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
           AVStreams::StreamEndPoint_A_ptr sep_a;
 
           CORBA::Any_ptr streamendpoint_a_any =
-          this->get_property_value ("Related_StreamEndpoint"
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->get_property_value ("Related_StreamEndpoint");
 
           *streamendpoint_a_any >>= sep_a;
           if (sep_a != 0)
             {
-              sep_a->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (0);
+              sep_a->modify_QoS (the_qos, flowspec);
             }
           else ACE_DEBUG ((LM_DEBUG,
                            "Stream EndPoint Not Found\n"));
@@ -3341,12 +3013,9 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
           AVStreams::StreamEndPoint_B_ptr sep_b;
 
           CORBA::Any_ptr streamendpoint_b_any =
-          this->get_property_value ("Related_StreamEndpoint"
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->get_property_value ("Related_StreamEndpoint");
           *streamendpoint_b_any >>= sep_b;
-          sep_b->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          sep_b->modify_QoS (the_qos, flowspec);
         }
   }
   return 1;
@@ -3375,38 +3044,31 @@ AVStreams::StreamCtrl_ptr
 TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
                     AVStreams::streamQoS &the_qos,
                     CORBA::Boolean_out is_met,
-                    const AVStreams::flowSpec &the_spec
-                    ACE_ENV_ARG_DECL)
+                    const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
 {
   AVStreams::StreamCtrl_ptr streamctrl (AVStreams::StreamCtrl::_nil ());
-  ACE_TRY
+  try
     {
       ACE_UNUSED_ARG (is_met);
       ACE_NEW_RETURN (this->stream_ctrl_,
                       TAO_StreamCtrl,
                       0);
-      AVStreams::MMDevice_var mmdevice = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      AVStreams::MMDevice_var mmdevice = this->_this ();
       this->stream_ctrl_->bind_devs (peer_device,
                                      mmdevice.in (),
                                      the_qos,
-                                     the_spec
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      streamctrl = this->stream_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     the_spec);
+      streamctrl = this->stream_ctrl_->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::bind");
+      ex._tao_print_exception ("TAO_MMDevice::bind");
       return streamctrl;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (streamctrl);
   return streamctrl;
 }
 
@@ -3415,8 +3077,7 @@ AVStreams::StreamCtrl_ptr
 TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
                           AVStreams::streamQoS &the_qos,
                           CORBA::Boolean_out is_met,
-                          const AVStreams::flowSpec &the_spec
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const AVStreams::flowSpec &the_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -3437,21 +3098,19 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                           AVStreams::streamQoS &the_qos,
                           CORBA::Boolean_out met_qos,
                           char *&/*named_vdev*/,
-                          const AVStreams::flowSpec &flow_spec
-                          ACE_ENV_ARG_DECL)
+                          const AVStreams::flowSpec &flow_spec)
 {
   AVStreams::StreamEndPoint_A_ptr sep_a (AVStreams::StreamEndPoint_A::_nil ());
   AVStreams::StreamEndPoint_B_ptr sep_b (AVStreams::StreamEndPoint_B::_nil ());
   AVStreams::StreamEndPoint_ptr sep (AVStreams::StreamEndPoint::_nil ());
-  ACE_TRY
+  try
     {
       switch (type)
         {
         case MMDEVICE_A:
           {
             if (this->endpoint_strategy_->create_A (sep_a,
-                                                    the_vdev
-                                                    ACE_ENV_ARG_PARAMETER) == -1)
+                                                    the_vdev) == -1)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "TAO_MMDevice::create_A_B (%P|%t) - "
                                  "error in create_A\n"),
@@ -3462,8 +3121,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
         case MMDEVICE_B:
           {
             if (this->endpoint_strategy_->create_B (sep_b,
-                                                    the_vdev
-                                                    ACE_ENV_ARG_PARAMETER) == -1)
+                                                    the_vdev) == -1)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "TAO_MMDevice::create_A_B (%P|%t) - "
                                  "error in create_B\n"),
@@ -3474,7 +3132,6 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
         default:
           break;
         }
-      ACE_TRY_CHECK;
       if (this->fdev_map_.current_size () > 0)
         {
           TAO_AV_QoS qos (the_qos);
@@ -3486,41 +3143,34 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
               ACE_CString flow_key (forward_entry.flowname ());
               AVStreams::FDev_var flow_dev;
               AVStreams::FlowConnection_var flowconnection;
-              ACE_TRY_EX (flowconnection)
+              try
                 {
                   // Get the flowconnection for this flow.
                   //static int blah = 0; if(blah == 1){blah=0; abort();}else{blah=1;}
                   CORBA::Object_var flowconnection_obj =
-                    streamctrl->get_flow_connection (forward_entry.flowname () ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (flowconnection);
+                    streamctrl->get_flow_connection (forward_entry.flowname ());
                         printf("successfully called get_flow_connection\n");
                   if (!CORBA::is_nil (flowconnection_obj.in ()))
                     {
-                      flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in ()
-                                                                           ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (flowconnection);
+                      flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in ());
                     }
                 }
-              ACE_CATCH(AVStreams::noSuchFlow, nsf)
+              catch (const AVStreams::noSuchFlow&)
                 {
                           TAO_FlowConnection *flowConnection;
                           ACE_NEW_RETURN (flowConnection,
                                           TAO_FlowConnection,
                                           0);
-                          flowconnection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                          flowconnection = flowConnection->_this ();
                           streamctrl->set_flow_connection (forward_entry.flowname(),
-                                                     flowconnection.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-                          ACE_TRY_CHECK;
+                                                     flowconnection.in ());
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
                   //if (TAO_debug_level >= 0)
-                    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_a::get_flow_connection");
+                    ex._tao_print_exception (
+                      "TAO_MMDevice::create_a::get_flow_connection");
                 }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (0);
 
               int result = this->fdev_map_.find (flow_key, flow_dev);
               if (result < 0)
@@ -3547,8 +3197,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_producer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       named_fdev.inout ());
                         }
                         break;
                       case MMDEVICE_B:
@@ -3557,12 +3206,10 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_consumer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       named_fdev.inout ());
                         }
                         break;
                       }
-                    ACE_TRY_CHECK;
                   }
                   break;
                 case TAO_FlowSpec_Entry::TAO_AV_DIR_OUT:
@@ -3578,8 +3225,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_consumer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       named_fdev.inout ());
                         }
                         break;
                       case MMDEVICE_B:
@@ -3591,12 +3237,10 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_producer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       named_fdev.inout ());
                         }
                         break;
                       }
-                    ACE_TRY_CHECK;
                   }
                   break;
                 default:
@@ -3604,21 +3248,16 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                 }
               CORBA::Any flowname_any;
               flowname_any <<= forward_entry.flowname ();
-              flow_endpoint->define_property ("FlowName", flowname_any ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-              sep->add_fep (flow_endpoint.in ()
-                            ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              flow_endpoint->define_property ("FlowName", flowname_any);
+              sep->add_fep (flow_endpoint.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_A");
+      ex._tao_print_exception ("TAO_MMDevice::create_A");
       return sep;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (sep);
   return sep;
 }
 
@@ -3628,8 +3267,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
                         AVStreams::streamQoS &stream_qos,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
-                        const AVStreams::flowSpec &flow_spec
-                        ACE_ENV_ARG_DECL)
+                        const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -3639,21 +3277,18 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
 {
   AVStreams::StreamEndPoint_A_ptr sep_a = 0;
   AVStreams::StreamEndPoint_var sep;
-  ACE_TRY
+  try
     {
-      sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec);
+      sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in());
 
       ACE_ASSERT( !CORBA::is_nil( sep_a ) );
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_A");
+      ex._tao_print_exception ("TAO_MMDevice::create_A");
       return sep_a;
     }
-  ACE_ENDTRY;
 
   return sep_a;
 }
@@ -3665,8 +3300,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
                         AVStreams::streamQoS &stream_qos,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
-                        const AVStreams::flowSpec &flow_spec
-                        ACE_ENV_ARG_DECL)
+                        const AVStreams::flowSpec &flow_spec)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -3677,22 +3311,18 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
   AVStreams::StreamEndPoint_B_ptr sep_b = AVStreams::StreamEndPoint_B::_nil ();
   AVStreams::StreamEndPoint_var sep;
 
-  ACE_TRY
+  try
     {
-      sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec);
+      sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in());
 
       ACE_ASSERT ( !CORBA::is_nil( sep_b ) );
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_B");
+      ex._tao_print_exception ("TAO_MMDevice::create_B");
       return sep_b;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (sep_b);
   return sep_b;
 }
 
@@ -3700,8 +3330,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
 // destroys the streamendpoint and the Vdev.
 void
 TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
-                       const char * /* vdev_name */
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       const char * /* vdev_name */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -3714,8 +3343,7 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
 }
 
 char *
-TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
-                          ACE_ENV_ARG_DECL)
+TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed))
@@ -3726,60 +3354,52 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
                   0);
   CORBA::String_var flow_name = tmp;
 
-  ACE_TRY
+  try
     {
       // exception implies the flow name is not defined and is system
       // generated.
       ACE_OS::sprintf (tmp, "flow%d", flow_num_++);
       CORBA::Any flowname_any;
       flowname_any <<= flow_name.in ();
-      fdev->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fdev->define_property ("Flow", flowname_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::add_fdev");
+      ex._tao_print_exception ("TAO_MMDevice::add_fdev");
       return 0;
     }
-  ACE_ENDTRY;
   return flow_name._retn ();
 }
 
 // Adds the fdev object to the MMDevice.
 char *
-TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
-                        ACE_ENV_ARG_DECL)
+TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed))
 {
   CORBA::String_var flow_name;
   AVStreams::FDev_var fdev;
-  ACE_TRY_EX (flow_name)
+  try
     {
       CORBA::Any_ptr flow_name_any;
-      fdev = AVStreams::FDev::_narrow (fdev_obj ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (flow_name);
+      fdev = AVStreams::FDev::_narrow (fdev_obj);
 
       if (CORBA::is_nil (fdev.in ()))
           return 0;
 
 
-      flow_name_any = fdev->get_property_value ("Flow" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (flow_name);
+      flow_name_any = fdev->get_property_value ("Flow");
 
       const char *tmp;
       *flow_name_any >>= tmp;
       flow_name = CORBA::string_dup (tmp);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       flow_name =
-        this->add_fdev_i (fdev.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->add_fdev_i (fdev.in ());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
 
   // Add it to the sequence of flowNames supported.
@@ -3796,27 +3416,22 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
   // define/modify the "Flows" property.
   CORBA::Any flows_any;
   flows_any <<= this->flows_;
-  ACE_TRY_EX (flows)
+  try
     {
       this->define_property ("Flows",
-                             flows_any
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (flows);
+                             flows_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::add_fdev");
+      ex._tao_print_exception ("TAO_MMDevice::add_fdev");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return flow_name._retn ();
 }
 
 // Gets the FDev object associated with this flow.
 CORBA::Object_ptr
-TAO_MMDevice::get_fdev (const char *flow_name
-                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_MMDevice::get_fdev (const char *flow_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow))
@@ -3831,20 +3446,19 @@ TAO_MMDevice::get_fdev (const char *flow_name
 
 // Removes the fdev from this MMDevice.
 void
-TAO_MMDevice::remove_fdev (const char *flow_name
-                           ACE_ENV_ARG_DECL)
+TAO_MMDevice::remove_fdev (const char *flow_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow,
                    AVStreams::streamOpFailed))
 {
-  ACE_TRY
+  try
     {
       ACE_CString fdev_name_key (flow_name);
       AVStreams::FDev_var fdev_entry;
       // Remove the fep from the hash table.
       if (this->fdev_map_.unbind (fdev_name_key, fdev_entry)!= 0)
-        ACE_THROW (AVStreams::streamOpFailed ());
+        throw AVStreams::streamOpFailed ();
 
       AVStreams::flowSpec new_flows (this->flows_.length ());
       for (u_int i=0, j=0 ; i <this->flows_.length (); i++)
@@ -3855,16 +3469,12 @@ TAO_MMDevice::remove_fdev (const char *flow_name
       flows <<= new_flows;
       this->flows_ = new_flows;
       this->define_property ("Flows",
-                             flows
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             flows);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::remove_fdev");
+      ex._tao_print_exception ("TAO_MMDevice::remove_fdev");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // destructor.
@@ -3908,10 +3518,10 @@ TAO_FlowConnection::set_protocol (const char *protocol)
 
 // stop this flow.
 void
-TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::stop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin
         ();
@@ -3919,8 +3529,7 @@ TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL)
              this->flow_producer_set_.end ();
            producer_begin != producer_end; ++producer_begin)
         {
-          (*producer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (*producer_begin)->stop ();
         }
       FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
         ();
@@ -3928,25 +3537,22 @@ TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL)
              this->flow_consumer_set_.end ();
            consumer_begin != consumer_end; ++consumer_begin)
         {
-          (*consumer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (*consumer_begin)->stop ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::stop");
+      ex._tao_print_exception ("TAO_FlowConnection::stop");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // start this flow.
 void
-TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::start (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
         ();
@@ -3954,8 +3560,7 @@ TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL)
              this->flow_consumer_set_.end ();
            consumer_begin != consumer_end; ++consumer_begin)
         {
-          (*consumer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (*consumer_begin)->start ();
         }
       FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin
         ();
@@ -3963,25 +3568,22 @@ TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL)
              this->flow_producer_set_.end ();
            producer_begin != producer_end; ++producer_begin)
         {
-          (*producer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (*producer_begin)->start ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::start");
+      ex._tao_print_exception ("TAO_FlowConnection::start");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // destroy this flow.
 void
-TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin
         ();
@@ -3989,8 +3591,7 @@ TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
              this->flow_producer_set_.end ();
            producer_begin != producer_end; ++producer_begin)
         {
-          (*producer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (*producer_begin)->destroy ();
         }
       FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
         ();
@@ -3998,17 +3599,14 @@ TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
              this->flow_consumer_set_.end ();
            consumer_begin != consumer_end; ++consumer_begin)
         {
-          (*consumer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (*consumer_begin)->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::destroy");
+      ex._tao_print_exception ("TAO_FlowConnection::destroy");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
   int result = TAO_AV_Core::deactivate_servant (this);
   if (result < 0)
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowConnection::destroy failed\n"));
@@ -4016,8 +3614,7 @@ TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
 
 // modify the QoS for this flow.
 CORBA::Boolean
-TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed))
 {
@@ -4028,8 +3625,7 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
 // use the specified flow protocol for this flow.
 CORBA::Boolean
 TAO_FlowConnection::use_flow_protocol (const char * fp_name,
-                                       const CORBA::Any & fp_settings
-                                       ACE_ENV_ARG_DECL)
+                                       const CORBA::Any & fp_settings)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::FPError,
                    AVStreams::notSupported))
@@ -4043,8 +3639,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
        producer_begin != producer_end; ++producer_begin)
     {
       (*producer_begin)->use_flow_protocol
-        (fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        (fp_name, fp_settings);
     }
   FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
     ();
@@ -4053,15 +3648,13 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
        consumer_begin != consumer_end; ++consumer_begin)
     {
       (*consumer_begin)->use_flow_protocol
-        (fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        (fp_name, fp_settings);
     }
   return 1;
 }
 
 void
-TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (the_event);
@@ -4070,47 +3663,38 @@ TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event
 CORBA::Boolean
 TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
                                   AVStreams::FDev_ptr b_party,
-                                  AVStreams::QoS & flow_qos
-                                  ACE_ENV_ARG_DECL)
+                                  AVStreams::QoS & flow_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
                    AVStreams::QoSRequestFailed))
 {
   CORBA::Boolean result = 0;
-  ACE_TRY
+  try
     {
-      AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      AVStreams::FlowConnection_var flowconnection = this->_this ();
       CORBA::Boolean met_qos;
       CORBA::String_var named_fdev ((const char *)"");
       AVStreams::FlowProducer_var producer =
         a_party->create_producer (flowconnection.in (),
                                   flow_qos,
                                   met_qos,
-                                  named_fdev.inout ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  named_fdev.inout ());
       AVStreams::FlowConsumer_var consumer =
         b_party->create_consumer (flowconnection.in (),
                                   flow_qos,
                                   met_qos,
-                                  named_fdev.inout ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  named_fdev.inout ());
       result = this->connect (producer.in (),
                               consumer.in (),
-                              flow_qos
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              flow_qos);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::connect_devs");
+      ex._tao_print_exception (
+        "TAO_FlowConnection::connect_devs");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return result;
 }
 
@@ -4118,14 +3702,13 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
 CORBA::Boolean
 TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
                              AVStreams::FlowConsumer_ptr consumer,
-                             AVStreams::QoS & the_qos
-                             ACE_ENV_ARG_DECL)
+                             AVStreams::QoS & the_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::formatMismatch,
                    AVStreams::FEPMismatch,
                    AVStreams::alreadyConnected))
 {
-  ACE_TRY
+  try
     {
 
       AVStreams::FlowProducer_ptr flow_producer =
@@ -4136,28 +3719,21 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
       this->flow_producer_set_.insert (flow_producer);
       this->flow_consumer_set_.insert (flow_consumer);
       AVStreams::FlowConnection_var flowconnection =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       flow_producer->set_peer (flowconnection.in (),
                                flow_consumer,
-                               the_qos
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               the_qos);
 
       flow_consumer->set_peer (flowconnection.in (),
                                flow_producer,
-                               the_qos
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               the_qos);
 
       char *consumer_address =
         flow_consumer->go_to_listen (the_qos,
                                      0, // false for is_mcast
                                      flow_producer,
-                                     this->fp_name_.inout ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     this->fp_name_.inout ());
 
       if (ACE_OS::strcmp (consumer_address, "") == 0)
         {
@@ -4165,14 +3741,10 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
           consumer_address = flow_producer->go_to_listen (the_qos,
                                                           0, // false for is_mcast
                                                           flow_consumer,
-                                                          this->fp_name_.inout ()
-                                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                          this->fp_name_.inout ());
           flow_consumer->connect_to_peer (the_qos,
                                           consumer_address,
-                                          this->fp_name_.inout ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                          this->fp_name_.inout ());
           // @@ Naga: We have to find means to set the reverse channel for the producer.
           // Its broken in the point-to_point case for UDP.
         }
@@ -4181,23 +3753,19 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
           if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowConnection::connect_to_peer addres: %s", consumer_address));
           flow_producer->connect_to_peer (the_qos,
                                           consumer_address,
-                                          this->fp_name_.inout ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                          this->fp_name_.inout ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::connect");
+      ex._tao_print_exception ("TAO_FlowConnection::connect");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
 
 CORBA::Boolean
-TAO_FlowConnection::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConnection::disconnect (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return  0;
@@ -4205,13 +3773,12 @@ TAO_FlowConnection::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Boolean
 TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
-                                  AVStreams::QoS & the_qos
-                                  ACE_ENV_ARG_DECL)
+                                  AVStreams::QoS & the_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::alreadyConnected,
                    AVStreams::notSupported))
 {
-  ACE_TRY
+  try
     {
           AVStreams::FlowProducer_ptr flow_producer =
             AVStreams::FlowProducer::_duplicate (producer);
@@ -4224,8 +3791,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
           FlowProducer_SetItor end = this->flow_producer_set_.end ();
           for (; begin != end; ++begin)
             {
-              if ((*begin)->_is_equivalent (producer
-                                            ACE_ENV_ARG_PARAMETER))
+              if ((*begin)->_is_equivalent (producer))
               // producer exists in the set, a duplicate.
               ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1);
             }
@@ -4259,10 +3825,8 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
           char *address = flow_producer->connect_mcast (the_qos,
                                                         met_qos,
                                                         mcast_address,
-                                                        this->fp_name_.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
+                                                        this->fp_name_.in ());
 
-          ACE_TRY_CHECK;
           if (this->producer_address_.in () == 0)
             {
               TAO_Forward_FlowSpec_Entry entry ("", "", "", "", address);
@@ -4283,35 +3847,29 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
               ACE_NEW_RETURN (this->mcastconfigif_i_,
                               TAO_MCastConfigIf,
                               0);
-              this->mcastconfigif_ = this->mcastconfigif_i_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->mcastconfigif_ = this->mcastconfigif_i_->_this ();
             }
-          AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          AVStreams::FlowConnection_var flowconnection = this->_this ();
           flow_producer->set_Mcast_peer (flowconnection.in (),
                                          this->mcastconfigif_.in (),
-                                         the_qos
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         the_qos);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::add_producer");
+      ex._tao_print_exception (
+        "TAO_FlowConnection::add_producer");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
 CORBA::Boolean
 TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
-                                  AVStreams::QoS & the_qos
-                                  ACE_ENV_ARG_DECL)
+                                  AVStreams::QoS & the_qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::alreadyConnected))
 {
-  ACE_TRY
+  try
     {
       AVStreams::FlowConsumer_ptr flow_consumer =
         AVStreams::FlowConsumer::_duplicate (consumer);
@@ -4319,8 +3877,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
       FlowConsumer_SetItor end = this->flow_consumer_set_.end ();
       for (; begin != end; ++begin)
         {
-          if ((*begin)->_is_equivalent (consumer
-                                        ACE_ENV_ARG_PARAMETER))
+          if ((*begin)->_is_equivalent (consumer))
             // Consumer exists in the set, a duplicate.
             ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1);
         }
@@ -4344,23 +3901,17 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
 
       if (!this->ip_multicast_)
         {
-          flow_consumer->set_protocol_restriction (protocols
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          flow_consumer->set_protocol_restriction (protocols);
           char * address =
             flow_consumer->go_to_listen (the_qos,
                                          1,
                                          flow_producer,
-                                         this->fp_name_.inout ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         this->fp_name_.inout ());
           CORBA::Boolean is_met;
           flow_producer->connect_mcast (the_qos,
                                         is_met,
                                         address,
-                                        this->fp_name_.inout ()
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                        this->fp_name_.inout ());
         }
        else
         {
@@ -4371,17 +3922,15 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
           // IP Multicasting.
           flow_consumer->connect_to_peer (the_qos,
                                           this->producer_address_.in (),
-                                          this->fp_name_.inout ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->fp_name_.inout ());
 
           //  char * address =
           //             flow_consumer->go_to_listen (the_qos,
           //                                          1,
           //                                          flow_producer,
           //                                          this->fp_name_.inout ()
-          //                                          ACE_ENV_ARG_PARAMETER);
+          //);
 
-          //            ACE_TRY_CHECK;
         }
       if (CORBA::is_nil (this->mcastconfigif_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR, "TAO_FlowConnection::add_consumer: first add a producer and then a consumer\n"), 0);
@@ -4392,23 +3941,19 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
       stream_qos [0] = the_qos;
       this->mcastconfigif_->set_peer (flow_consumer,
                                       stream_qos,
-                                      flow_spec
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      flow_spec);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowConnection::add_consumer");
+      ex._tao_print_exception (
+        "TAO_FlowConnection::add_consumer");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
 CORBA::Boolean
-TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notConnected))
 {
@@ -4448,18 +3993,13 @@ TAO_FlowEndPoint::open (const char *flowname,
   this->format_ = format;
 
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Any flowname_any;
       flowname_any <<= flowname;
       this->define_property ("FlowName",
-                             flowname_any
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->set_format (format
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             flowname_any);
+      this->set_format (format);
       this->protocol_addresses_ = protocols;
       AVStreams::protocolSpec protocol_spec (protocols.length ());
       protocol_spec.length (protocols.length ());
@@ -4474,17 +4014,13 @@ TAO_FlowEndPoint::open (const char *flowname,
                         "[%s]\n",
                         static_cast<char const*>(protocol_spec[i])));
         }
-      this->set_protocol_restriction (protocol_spec
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->set_protocol_restriction (protocol_spec);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndPoint::open");
+      ex._tao_print_exception ("TAO_FlowEndPoint::open");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -4499,7 +4035,7 @@ TAO_FlowEndPoint::set_flowname (const char *flowname)
 // used by one flowconnection so that multiple connections cant use
 // the same flowendpoint.
 CORBA::Boolean
-TAO_FlowEndPoint::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::lock (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // lock the current flowendpoint
@@ -4512,7 +4048,7 @@ TAO_FlowEndPoint::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // unlocks the flowendpoint , becomes free to be used in another flow.
 void
-TAO_FlowEndPoint::unlock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::unlock (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->lock_ = 0;
@@ -4520,7 +4056,7 @@ TAO_FlowEndPoint::unlock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-TAO_FlowEndPoint::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int result = TAO_AV_Core::deactivate_servant (this);
@@ -4533,7 +4069,7 @@ TAO_FlowEndPoint::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 AVStreams::StreamEndPoint_ptr
-TAO_FlowEndPoint::related_sep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_sep (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -4541,23 +4077,21 @@ TAO_FlowEndPoint::related_sep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep
-                               ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->related_sep_ = AVStreams::StreamEndPoint::_duplicate (related_sep);
 }
 
 AVStreams::FlowConnection_ptr
-TAO_FlowEndPoint::related_flow_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_flow_connection (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ());
 }
 
 void
-TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->related_flow_connection_ = AVStreams::FlowConnection::_duplicate (related_flow_connection);
@@ -4565,7 +4099,7 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related
 
 // returns the connected peer for this flow
 AVStreams::FlowEndPoint_ptr
-TAO_FlowEndPoint::get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::get_connected_fep (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notConnected,
                    AVStreams::notSupported))
@@ -4575,90 +4109,76 @@ TAO_FlowEndPoint::get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Boolean
 TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
-                                     const CORBA::Any &
-                                     ACE_ENV_ARG_DECL)
+                                     const CORBA::Any &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::FPError,
                    AVStreams::notSupported))
 {
-  ACE_TRY
+  try
     {
       // Define the property called FlowProtocol
       CORBA::Any flowname_property;
       flowname_property <<= fp_name;
       this->define_property ("FlowProtocol",
-                             flowname_property
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             flowname_property);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndPoint::use_flow_protocol");
+      ex._tao_print_exception (
+        "TAO_FlowEndPoint::use_flow_protocol");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
 void
-TAO_FlowEndPoint::set_format (const char * format
-                              ACE_ENV_ARG_DECL)
+TAO_FlowEndPoint::set_format (const char * format)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
   this->format_ = format;
-  ACE_TRY
+  try
     {
       // make this a property so that is_fep_compatible can query this and
       // check if 2 flowendpoints are compatible.
       CORBA::Any format_val;
       format_val <<= format;
       this->define_property ("Format",
-                             format_val
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             format_val);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndpoint::set_format");
+      ex._tao_print_exception ("TAO_FlowEndpoint::set_format");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings
-                                  ACE_ENV_ARG_DECL)
+TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
 {
   this->dev_params_ = new_settings;
-  ACE_TRY
+  try
     {
       CORBA::Any DevParams_property;
       DevParams_property <<= new_settings;
       this->define_property ("DevParams",
-                             DevParams_property
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             DevParams_property);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndPoint::set_dev_params");
+      ex._tao_print_exception (
+        "TAO_FlowEndPoint::set_dev_params");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols
-                                            ACE_ENV_ARG_DECL)
+TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
-  ACE_TRY
+  try
     {
       u_int i = 0;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
@@ -4670,13 +4190,9 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
       CORBA::Any AvailableProtocols_property;
       AvailableProtocols_property <<= protocols;
       this->define_property ("AvailableProtocols",
-                             AvailableProtocols_property
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             AvailableProtocols_property);
       AVStreams::protocolSpec *temp_spec;
-      CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols"
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols");
       temp_any.in () >>= temp_spec;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
       for (i=0;i<temp_spec->length ();i++)
@@ -4686,23 +4202,21 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
         }
       this->protocols_ = protocols;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowEndpoint::set_protocol_restriction");
+      ex._tao_print_exception (
+        "TAO_FlowEndpoint::set_protocol_restriction");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 CORBA::Boolean
-TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
-                                     ACE_ENV_ARG_DECL)
+TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::formatMismatch,
                    AVStreams::deviceQosMismatch))
 {
   const char *exception_message = "";
-  ACE_TRY
+  try
     {
       // check whether the passed flowendpoint is compatible with this flowendpoint.
       // should we check for the availableFormats and choose one format.
@@ -4711,18 +4225,14 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
       CORBA::String_var my_format, peer_format;
 
       exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format";
-      format_ptr = this->get_property_value ("Format"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      format_ptr = this->get_property_value ("Format");
 
       const char *temp_format;
       format_ptr.in () >>= temp_format;
       my_format = CORBA::string_dup (temp_format);
       // get my peer's format value
       exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]";
-      format_ptr = peer_fep->get_property_value ("Format"
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      format_ptr = peer_fep->get_property_value ("Format");
       format_ptr.in () >>= temp_format;
       peer_format = CORBA::string_dup (temp_format);
       if (ACE_OS::strcmp (my_format.in (),
@@ -4736,17 +4246,13 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
 
       exception_message =
         "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols";
-      AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols"
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols");
       AvailableProtocols_ptr.in () >>= temp_protocols;
       my_protocol_spec = *temp_protocols;
 
       exception_message =
         "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]";
-      AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols"
-                                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols");
       AvailableProtocols_ptr.in () >>= temp_protocols;
       peer_protocol_spec = *temp_protocols;
 
@@ -4771,27 +4277,22 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
       if (!protocol_match)
         return 0;
     }
-  ACE_CATCH (CosPropertyService::PropertyNotFound, nf)
+  catch (const CosPropertyService::PropertyNotFound& nf)
     {
-      ACE_PRINT_EXCEPTION (nf,
-                           exception_message);
+      nf._tao_print_exception (exception_message);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_FlowEndPoint::is_fep_compatible");
+      ex._tao_print_exception ("TAO_FlowEndPoint::is_fep_compatible");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
 CORBA::Boolean
 TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                             AVStreams::FlowEndPoint_ptr the_peer_fep,
-                            AVStreams::QoS & /* the_qos */
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            AVStreams::QoS & /* the_qos */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
@@ -4804,8 +4305,7 @@ TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */,
 CORBA::Boolean
 TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                                   AVStreams::MCastConfigIf_ptr mcast_peer,
-                                  AVStreams::QoS & /* the_qos */
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  AVStreams::QoS & /* the_qos */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed))
 {
@@ -4818,8 +4318,7 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
                                   AVStreams::QoS & /*the_qos*/,
                                   CORBA::Boolean /*is_mcast*/,
                                   AVStreams::FlowEndPoint_ptr peer_fep,
-                                  char *& flowProtocol
-                                  ACE_ENV_ARG_DECL)
+                                  char *& flowProtocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -4840,15 +4339,11 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
   AVStreams::protocolSpec my_protocol_spec, peer_protocol_spec;
   AVStreams::protocolSpec *temp_protocols;
   CORBA::Any_var AvailableProtocols_ptr =
-    peer_fep->get_property_value ("AvailableProtocols"
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    peer_fep->get_property_value ("AvailableProtocols");
   AvailableProtocols_ptr.in () >>= temp_protocols;
   peer_protocol_spec = *temp_protocols;
   AvailableProtocols_ptr =
-    this->get_property_value ("AvailableProtocols"
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_property_value ("AvailableProtocols");
   AvailableProtocols_ptr.in () >>= temp_protocols;
   my_protocol_spec = *temp_protocols;
   int protocol_match = 0;
@@ -4911,8 +4406,7 @@ CORBA::Boolean
 TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
                                      AVStreams::QoS & /*the_qos*/,
                                      const char * address,
-                                     const char * use_flow_protocol
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     const char * use_flow_protocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -4975,8 +4469,7 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname,
 
 // gets the reverse channel for feedback.
 char *
-TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -4984,7 +4477,7 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowProducer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowProducer::stop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -4997,7 +4490,7 @@ TAO_FlowProducer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_FlowProducer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowProducer::start (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5020,8 +4513,7 @@ char *
 TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
-                                char *& flowProtocol
-                                ACE_ENV_ARG_DECL)
+                                char *& flowProtocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -5031,15 +4523,13 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
                                the_qos,
                                is_mcast,
                                peer_fep,
-                               flowProtocol
-                               ACE_ENV_ARG_PARAMETER);
+                               flowProtocol);
 }
 
 CORBA::Boolean
 TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
-                                   const char * use_flow_protocol
-                                   ACE_ENV_ARG_DECL)
+                                   const char * use_flow_protocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -5048,16 +4538,14 @@ TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
   return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_PRODUCER,
                                   the_qos,
                                   address,
-                                  use_flow_protocol
-                                  ACE_ENV_ARG_PARAMETER);
+                                  use_flow_protocol);
 }
 //  Connect to a IP multicast address.
 char *
 TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
                                  CORBA::Boolean_out /* is_met */,
                                  const char *address,
-                                 const char * use_flow_protocol
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 const char * use_flow_protocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::notSupported,
@@ -5100,31 +4588,25 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
 
 // sets the key for this flow.
 void
-TAO_FlowProducer::set_key (const AVStreams::key & the_key
-                           ACE_ENV_ARG_DECL)
+TAO_FlowProducer::set_key (const AVStreams::key & the_key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::Any anyval;
       anyval <<= the_key;
       this->define_property ("PublicKey",
-                             anyval
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             anyval);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_FlowProducer::set_key");
+      ex._tao_print_exception ("TAO_FlowProducer::set_key");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // source id to be used to distinguish this source from others.
 void
-TAO_FlowProducer::set_source_id (CORBA::Long source_id
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO_FlowProducer::set_source_id (CORBA::Long source_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
@@ -5149,7 +4631,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname,
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowConsumer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConsumer::stop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5159,7 +4641,7 @@ TAO_FlowConsumer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_FlowConsumer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConsumer::start (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5174,8 +4656,7 @@ char *
 TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
-                                char *& flowProtocol
-                                ACE_ENV_ARG_DECL)
+                                char *& flowProtocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -5185,15 +4666,13 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
                                the_qos,
                                is_mcast,
                                peer_fep,
-                               flowProtocol
-                               ACE_ENV_ARG_PARAMETER);
+                               flowProtocol);
 }
 
 CORBA::Boolean
 TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
-                                   const char * use_flow_protocol
-                                   ACE_ENV_ARG_DECL)
+                                   const char * use_flow_protocol)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -5202,8 +4681,7 @@ TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
   return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_CONSUMER,
                                   the_qos,
                                   address,
-                                  use_flow_protocol
-                                  ACE_ENV_ARG_PARAMETER);
+                                  use_flow_protocol);
 }
 
 //------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 38c3c75e711..e71d0896172 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -83,15 +83,13 @@ public:
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
-  virtual void stop (const AVStreams::flowSpec &the_spec
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
-  virtual void start (const AVStreams::flowSpec &the_spec
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -100,39 +98,34 @@ public:
    * the streamendpoint and vdev associated with this stream
    * Empty the_spec means apply operation to all flows
    */
-  virtual void destroy (const AVStreams::flowSpec &the_spec
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Changes the QoS associated with the stream
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_spec
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
 
   /// Used by StreamEndPoint and VDev to inform StreamCtrl of events.
   /// E.g., loss of flow, reestablishment of flow, etc..
-  virtual void push_event (const struct CosPropertyService::Property & the_event
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void push_event (const struct CosPropertyService::Property & the_event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to control the flow protocol parameters.
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
-                             const CORBA::Any &fp_settings
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             const CORBA::Any &fp_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::FPError));
 
   /// Not implemented in the light profile, will raise the notsupported
   /// exception
-  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name
-                                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported));
@@ -140,8 +133,7 @@ public:
   /// Not implemented in the light profile, will raise the notsupported
   /// exception
   virtual void set_flow_connection (const char *flow_name,
-                                    CORBA::Object_ptr flow_connection
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    CORBA::Object_ptr flow_connection)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported));
@@ -177,8 +169,7 @@ class TAO_AV_Export TAO_Negotiator
 {
 public:
   virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator,
-                                    const AVStreams::streamQoS &qos_spec
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    const AVStreams::streamQoS &qos_spec)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -235,15 +226,13 @@ public:
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
-  virtual void stop (const AVStreams::flowSpec &the_spec
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
-  virtual void start (const AVStreams::flowSpec &the_spec
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -252,8 +241,7 @@ public:
    * the streamendpoint and vdev associated with this stream
    * Empty the_spec means apply operation to all flows
    */
-  virtual void destroy (const AVStreams::flowSpec &the_spec
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -267,8 +255,7 @@ public:
   virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party,
                                     AVStreams::MMDevice_ptr b_party,
                                     AVStreams::streamQoS& the_qos,
-                                    const AVStreams::flowSpec& the_flows
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    const AVStreams::flowSpec& the_flows)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -282,44 +269,39 @@ public:
   virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party,
                                AVStreams::StreamEndPoint_B_ptr b_party,
                                AVStreams::streamQoS &the_qos,
-                               const AVStreams::flowSpec &the_flows
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               const AVStreams::flowSpec &the_flows)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed));
 
   virtual void unbind_dev (AVStreams::MMDevice_ptr dev,
-                           const AVStreams::flowSpec & the_spec
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           const AVStreams::flowSpec & the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow));
 
   /// Unbind the_ep from the stream. Empty the_spec means apply to all flows.
   virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
-                             const AVStreams::flowSpec &the_spec
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow));
 
   /// unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
-  virtual void unbind (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void unbind (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed));
 
   virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
-                                                AVStreams::StreamEndPoint_out sep
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                AVStreams::StreamEndPoint_out sep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed));
 
   /// Changes the QoS associated with the stream
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_spec
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
@@ -369,29 +351,24 @@ public:
 
   virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
                                    AVStreams::streamQoS & the_qos,
-                                   const AVStreams::flowSpec & the_spec
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   const AVStreams::flowSpec & the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
 
-  virtual void configure (const CosPropertyService::Property & a_configuration
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void configure (const CosPropertyService::Property & a_configuration)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_initial_configuration (const CosPropertyService::Properties & initial
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_initial_configuration (const CosPropertyService::Properties & initial)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_format (const char * flowName,
-                           const char * format_name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           const char * format_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   virtual void set_dev_params (const char * flowName,
-                               const CosPropertyService::Properties & new_params
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               const CosPropertyService::Properties & new_params)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
@@ -477,16 +454,13 @@ public:
   virtual int handle_close (void);
 
   /// Application needs to define this
-  virtual int handle_stop (const AVStreams::flowSpec &the_spec
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual int handle_stop (const AVStreams::flowSpec &the_spec);
 
   /// Application needs to define this
-  virtual int handle_start (const AVStreams::flowSpec &the_spec
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual int handle_start (const AVStreams::flowSpec &the_spec);
 
   /// Application needs to define this
-  virtual int handle_destroy (const AVStreams::flowSpec &the_spec
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual int handle_destroy (const AVStreams::flowSpec &the_spec);
 
   /// Application needs to define this
   virtual CORBA::Boolean handle_preconnect (AVStreams::flowSpec &the_spec);
@@ -495,8 +469,7 @@ public:
   virtual CORBA::Boolean handle_postconnect (AVStreams::flowSpec &the_spec);
 
   /// Application needs to define this
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
-                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -547,28 +520,24 @@ public:
   TAO_StreamEndPoint (void);
 
    /// Stop the stream. Empty the_spec means, for all the flows
-  virtual void stop (const AVStreams::flowSpec &the_spec
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the stream, Empty the_spec means, for all the flows
-  virtual void start (const AVStreams::flowSpec &the_spec
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Destroy the stream, Empty the_spec means, for all the flows
-  virtual void destroy (const AVStreams::flowSpec &the_spec
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Called by StreamCtrl. responder is the peer to connect to
   virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
                                   AVStreams::streamQoS& qos_spec,
-                                  const AVStreams::flowSpec& the_spec
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  const AVStreams::flowSpec& the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -579,8 +548,7 @@ public:
   virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
                                              CORBA::Boolean is_mcast,
                                              AVStreams::streamQoS &qos,
-                                             AVStreams::flowSpec &the_spec
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpDenied,
                      AVStreams::noSuchFlow,
@@ -589,24 +557,20 @@ public:
 
   /// Change the transport qos on a stream
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_flows
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const AVStreams::flowSpec &the_flows)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
 
   virtual int change_qos (AVStreams::streamQoS &new_qos,
-                          const AVStreams::flowSpec &the_flows
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                          const AVStreams::flowSpec &the_flows);
 
   /// Used to restrict the set of protocols
-  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec
-                                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// disconnect the flows
-  virtual void disconnect (const AVStreams::flowSpec &the_spec
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void disconnect (const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::streamOpFailed));
@@ -614,65 +578,55 @@ public:
   /// Used to control the flow
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
-                             const CORBA::Any &fp_settings
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             const CORBA::Any &fp_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::FPError));
 
   /// Not implemented in the light profile, throws notsupported
-  virtual CORBA::Object_ptr get_fep (const char *flow_name
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr get_fep (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow));
 
   /// Not implemented in the light profile, throws notsupported
-  virtual char * add_fep (CORBA::Object_ptr the_fep
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * add_fep (CORBA::Object_ptr the_fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Not implemented in the light profile, throws notsupported
-  virtual void remove_fep (const char *fep_name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void remove_fep (const char *fep_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Used to "attach" a negotiator to the endpoint
-  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used for public key encryption.
   virtual void set_key (const char *flow_name,
-                        const AVStreams::key & the_key
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                        const AVStreams::key & the_key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to set a unique id for packets sent by this streamendpoint
-  virtual void set_source_id (CORBA::Long source_id
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_source_id (CORBA::Long source_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destructor
   virtual ~TAO_StreamEndPoint (void);
 
   CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                               AVStreams::flowSpec &the_spec
-                               ACE_ENV_ARG_DECL);
+                               AVStreams::flowSpec &the_spec);
 
 protected:
   /// Helper methods to implement add_fep()
-  char* add_fep_i (AVStreams::FlowEndPoint_ptr fep
-                   ACE_ENV_ARG_DECL)
+  char* add_fep_i (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
-  char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
-                                ACE_ENV_ARG_DECL)
+  char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
@@ -736,8 +690,7 @@ public:
 
   /// Used for ATM-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                                       AVStreams::flowSpec &the_spec
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -746,8 +699,7 @@ public:
   /// Used for ATM-style multicast
   virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                        AVStreams::streamQoS &the_qos,
-                                       const AVStreams::flowSpec &the_flows
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       const AVStreams::flowSpec &the_flows)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -756,8 +708,7 @@ public:
 
   /// Used to remove a multicast leaf
   virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
-                                const AVStreams::flowSpec &theSpec
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                const AVStreams::flowSpec &theSpec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -788,8 +739,7 @@ public:
 
   /// Used for internet-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                                       AVStreams::flowSpec &the_spec
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -818,8 +768,7 @@ public:
   virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                                    AVStreams::VDev_ptr the_peer_dev,
                                    AVStreams::streamQoS &the_qos,
-                                   const AVStreams::flowSpec &the_spec
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -829,39 +778,34 @@ public:
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                          AVStreams::streamQoS &the_qos,
-                                         const AVStreams::flowSpec &the_spec
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
 
   /// Called by the peer VDev to configure the device (catch all)
-  virtual void configure (const CosPropertyService::Property &the_config_mesg
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void configure (const CosPropertyService::Property &the_config_mesg)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// Used to set a format on a flowname
   virtual void set_format (const char *flowName,
-                           const char *format_name
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           const char *format_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// Used to set device parameters
   virtual void set_dev_params (const char *flowName,
-                               const CosPropertyService::Properties &new_params
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               const CosPropertyService::Properties &new_params)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// Called to change QoS of the device
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos,
-                                     const AVStreams::flowSpec &the_spec
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
@@ -872,8 +816,7 @@ protected:
   virtual ~TAO_VDev (void);
 
   /// hook called after set_peer is done to set the media ctrl of the peer vdev.
-  virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl);
 
   /// My stream controller
   AVStreams::StreamCtrl_var streamctrl_;
@@ -908,16 +851,14 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec
-                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                     const AVStreams::flowSpec &the_spec);
 
   /// Can be used to request the MMDevice to create a new StreamCtrl,
   /// and call bind_devs on it
   virtual AVStreams::StreamCtrl_ptr  bind (AVStreams::MMDevice_ptr peer_device,
                                            AVStreams::streamQoS &the_qos,
                                            CORBA::Boolean_out is_met,
-                                           const AVStreams::flowSpec &the_spec
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -927,8 +868,7 @@ public:
   virtual AVStreams::StreamCtrl_ptr  bind_mcast (AVStreams::MMDevice_ptr first_peer,
                                                  AVStreams::streamQoS &the_qos,
                                                  CORBA::Boolean_out is_met,
-                                                 const AVStreams::flowSpec &the_spec
-                                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                 const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -940,8 +880,7 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec
-                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -955,8 +894,7 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec
-                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                     const AVStreams::flowSpec &the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -966,28 +904,24 @@ public:
 
   /// Remove the StreamEndPoint and the related vdev
   virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep,
-                        const char *vdev_name
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                        const char *vdev_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// Not supported in the light profile, raises notsupported
-  virtual char * add_fdev (CORBA::Object_ptr the_fdev
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * add_fdev (CORBA::Object_ptr the_fdev)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Not supported in the light profile, raises notsupported
-  virtual CORBA::Object_ptr get_fdev (const char *flow_name
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr get_fdev (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow));
 
   /// Not supported in the light profile, raises notsupported
-  virtual void remove_fdev (const char *flow_name
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void remove_fdev (const char *flow_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow,
@@ -998,8 +932,7 @@ public:
 
 protected:
   /// Helper method to implement add_fdev()
-  char* add_fdev_i (AVStreams::FDev_ptr fdev
-                    ACE_ENV_ARG_DECL)
+  char* add_fdev_i (AVStreams::FDev_ptr fdev)
       ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed));
@@ -1047,42 +980,38 @@ public:
   TAO_FlowConnection (void);
 
   /// stop this flow.
-  virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// start this flow.
-  virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// destroy this flow.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// modify the QoS for this flow.
-  virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed));
 
   /// use the specified flow protocol for this flow.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
-                                            const CORBA::Any & fp_settings
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            const CORBA::Any & fp_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::FPError,
                      AVStreams::notSupported));
 
   /// pushes an event , to be handled by the application.
-  virtual void push_event (const AVStreams::streamEvent & the_event
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void push_event (const AVStreams::streamEvent & the_event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// connect 2 Flow Devices.
   virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party,
                                        AVStreams::FDev_ptr b_party,
-                                       AVStreams::QoS & the_qos
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -1091,35 +1020,31 @@ public:
   /// Connect a flow producer and consumer under this flow connection.
   virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer,
                                   AVStreams::FlowConsumer_ptr flow_consumer,
-                                  AVStreams::QoS & the_qos
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::formatMismatch,
                      AVStreams::FEPMismatch,
                      AVStreams::alreadyConnected));
 
   /// disconnect this flow connection.
-  virtual CORBA::Boolean disconnect (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean disconnect (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// adds the producer to this flow connection.
   virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer,
-                                       AVStreams::QoS & the_qos
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::alreadyConnected,
                      AVStreams::notSupported));
 
   /// adds a consumer to this flow connection.
   virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
-                                       AVStreams::QoS & the_qos
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::alreadyConnected));
 
   /// drops a flow endpoint from the flow.
-  virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notConnected));
 
@@ -1179,75 +1104,68 @@ public:
                                    TAO_AV_Protocol_Object *object);
 
   /// lock the flow endpoint for a particular flow.
-  virtual CORBA::Boolean lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean lock (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// unlock the flow endpoint for subsequent use.
-  virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void unlock (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// destroy this flow.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// get method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual AVStreams::StreamEndPoint_ptr related_sep(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual AVStreams::StreamEndPoint_ptr related_sep(void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// set method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual AVStreams::FlowConnection_ptr related_flow_connection(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual AVStreams::FlowConnection_ptr related_flow_connection(void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // accessor for the related flow connection attribute.
 
   /// set method for the related flow connection attribute.
-  virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// returns the other flowendpoint to which this is connected.
-  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notConnected,
                      AVStreams::notSupported));
 
   //// use the specified flow protocol.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
-                                            const CORBA::Any & fp_settings
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            const CORBA::Any & fp_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::FPError,
                      AVStreams::notSupported));
 
   /// sets the data format.
-  virtual void set_format (const char * format
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_format (const char * format)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// sets the device parameters.
-  virtual void set_dev_params (const CosPropertyService::Properties & new_settings
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_dev_params (const CosPropertyService::Properties & new_settings)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// sets the list of protocols to be used.
-  virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// checks whether the passed flowendpoint is compatible with this.
-  virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::formatMismatch,
                      AVStreams::deviceQosMismatch));
@@ -1255,8 +1173,7 @@ public:
   /// sets the peer flowendpoint.
   virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc,
                                    AVStreams::FlowEndPoint_ptr the_peer_fep,
-                                   AVStreams::QoS & the_qos
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
@@ -1264,8 +1181,7 @@ public:
   /// sets the multicast peer flowendpoint, not implemented.
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
-                                         AVStreams::QoS & the_qos
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         AVStreams::QoS & the_qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed));
 
@@ -1277,8 +1193,7 @@ public:
    */
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1288,8 +1203,7 @@ public:
   virtual CORBA::Boolean connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
                                             AVStreams::QoS & the_qos,
                                             const char * address,
-                                            const char * use_flow_protocol
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1303,8 +1217,7 @@ public:
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               char *& flowProtocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1315,8 +1228,7 @@ public:
                                  AVStreams::QoS & the_qos,
                                  CORBA::Boolean is_mcast,
                                  AVStreams::FlowEndPoint_ptr peer,
-                                 char *& flowProtocol
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 char *& flowProtocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1371,23 +1283,21 @@ public:
    * UDP if the producer is listening and the consumer connects (logically) then the producer needs to
    * know the reverse channel on its peer fep to send data to.
    */
-  virtual char * get_rev_channel (const char * pcol_name
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * get_rev_channel (const char * pcol_name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// start this flow, to be overridden by the application.
-  virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               char *& flowProtocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1395,8 +1305,7 @@ public:
 
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1406,8 +1315,7 @@ public:
   virtual char * connect_mcast (AVStreams::QoS & the_qos,
                                 CORBA::Boolean_out is_met,
                                 const char * address,
-                                const char * use_flow_protocol
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::notSupported,
@@ -1417,14 +1325,12 @@ public:
 
 
   /// sets the public key  to be used for encryption of the data.
-  virtual void set_key (const AVStreams::key & the_key
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_key (const AVStreams::key & the_key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// sets the source id of this flow producer so that it can be used
   /// to distinguish this producer from others in the multicast case.
-  virtual void set_source_id (CORBA::Long source_id
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_source_id (CORBA::Long source_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -1446,18 +1352,17 @@ public:
                     const char *format);
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// start this flow, to be overridden by the application.
-  virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               char *& flowProtocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1465,8 +1370,7 @@ public:
 
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          const char * use_flow_protocol)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1488,34 +1392,28 @@ public:
   TAO_MediaControl (void);
 
   virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin,
-                                                  AVStreams::PositionKey a_key
-                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                  AVStreams::PositionKey a_key)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::MediaControl::PostionKeyNotSupported)) =0;
 
-  virtual void set_media_position (const AVStreams::Position & a_position
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_media_position (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::MediaControl::PostionKeyNotSupported,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void start (const AVStreams::Position & a_position
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void pause (const AVStreams::Position & a_position
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pause (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void resume (const AVStreams::Position & a_position
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void resume (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void stop (const AVStreams::Position & a_position
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (const AVStreams::Position & a_position)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 830f8fe5e98..d0ae69f37e9 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -154,8 +154,7 @@ TAO_AV_Core::reactor (void)
 
 int
 TAO_AV_Core::init (CORBA::ORB_ptr orb,
-                   PortableServer::POA_ptr poa
-                   ACE_ENV_ARG_DECL_NOT_USED)
+                   PortableServer::POA_ptr poa)
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init "));
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -587,11 +586,10 @@ TAO_AV_Acceptor*
 TAO_AV_Core::get_acceptor (const char *flowname)
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
 
       TAO_AV_AcceptorSetItor acceptor =  this->acceptor_registry_->begin ();
-      ACE_TRY_CHECK;
 
       TAO_AV_AcceptorSetItor end =
         this->acceptor_registry_->end ();
@@ -602,11 +600,10 @@ TAO_AV_Core::get_acceptor (const char *flowname)
             return *acceptor;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_AV_Core::get_acceptor");
+      ex._tao_print_exception ("TAO_AV_Core::get_acceptor");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -614,11 +611,10 @@ int
 TAO_AV_Core::remove_acceptor (const char *flowname)
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
 
       TAO_AV_AcceptorSetItor acceptor =  this->acceptor_registry_->begin ();
-      ACE_TRY_CHECK;
 
       TAO_AV_AcceptorSetItor end =
         this->acceptor_registry_->end ();
@@ -632,11 +628,10 @@ TAO_AV_Core::remove_acceptor (const char *flowname)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_AV_Core::get_acceptor");
+      ex._tao_print_exception ("TAO_AV_Core::get_acceptor");
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -1131,27 +1126,19 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant)
   // the servant when all pending requests on this servant are
   // complete.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      PortableServer::POA_var poa = servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POA_var poa = servant->_default_POA ();
 
-      PortableServer::ObjectId_var id = poa->servant_to_id (servant
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var id = poa->servant_to_id (servant);
 
-      poa->deactivate_object (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "deactivate_servant");
+      ex._tao_print_exception ("deactivate_servant");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index 4a8f29aa137..96f0899756b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -95,8 +95,7 @@ public:
   ~TAO_AV_Core (void);
 
   int init (CORBA::ORB_ptr orb,
-            PortableServer::POA_ptr poa
-            ACE_ENV_ARG_DECL);
+            PortableServer::POA_ptr poa);
   int run (void);
   int stop_run (void);
   int init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 4d15bdd853a..97019baa2b0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -46,8 +46,7 @@ TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void)
 // and the remaining calls will fail automagically
 int
 TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */,
-                                    AVStreams::VDev_ptr & /* vdev */
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    AVStreams::VDev_ptr & /* vdev */)
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "(%P|%t) Error creating A endpoint\n"),
@@ -60,8 +59,7 @@ TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_
 // and the remaining calls will fail automagically
 int
 TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */,
-                                    AVStreams::VDev_ptr & /*vdev */
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    AVStreams::VDev_ptr & /*vdev */)
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "(%P|%t) Error creating B endpoint\n"),
@@ -150,68 +148,59 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
                        "remove"),
                       -1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Get ourselves a Naming service
-      this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->bind_to_naming_service ();
 
       // Get the stream endpoint created by the child from the naming service
-      this->get_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->get_stream_endpoint ();
 
       // Get the Vdev created by the child from the naming service
-      this->get_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->get_vdev ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy::activate");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy::activate");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 // Get ourselves a Naming service reference
 int
-TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void)
 {
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (this->naming_context_.in ()) == 0)
         return 0;
 
       CORBA::Object_var naming_obj =
-        TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to resolve the Name Service.\n"),
                           -1);
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 // Get the VDev created in the child process from the namingservice
 int
-TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy::get_vdev (void)
 {
-  ACE_TRY
+  try
     {
       char vdev_name [BUFSIZ];
       ACE_OS::sprintf (vdev_name,
@@ -229,15 +218,11 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL)
 
       // Get the CORBA::Object
       CORBA::Object_var vdev =
-        this->naming_context_->resolve (VDev_Name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (VDev_Name);
 
       // Narrow it
       this->vdev_ =
-        AVStreams::VDev::_narrow (vdev.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        AVStreams::VDev::_narrow (vdev.in ());
 
       // Check if valid
       if (CORBA::is_nil (this->vdev_.in() ))
@@ -245,13 +230,12 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL)
                            " could not resolve Stream_Endpoint_B in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy::get_vdev");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy::get_vdev");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -273,8 +257,7 @@ TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void)
 // the "A" type endpoint creator
 int
 TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                                           AVStreams::VDev_ptr &vdev
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           AVStreams::VDev_ptr &vdev)
 {
   // use the baseclass activate
   if (this->activate () == -1)
@@ -291,9 +274,9 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s
 
 // Gets the stream endpoint object reference from the naming service
 int
-TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void)
 {
-  ACE_TRY
+  try
     {
       char stream_endpoint_name[BUFSIZ];
       ACE_OS::sprintf (stream_endpoint_name,
@@ -312,15 +295,11 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL
 
       // Get the CORBA::Object
       CORBA::Object_var stream_endpoint_a =
-        this->naming_context_->resolve (Stream_Endpoint_A_Name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (Stream_Endpoint_A_Name);
 
       // Narrow the reference
       this->stream_endpoint_a_ =
-        AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in ());
 
       // Check for validity
       if (CORBA::is_nil (this->stream_endpoint_a_.in() ))
@@ -328,13 +307,12 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL
                            " could not resolve Stream_Endpoint_A in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -356,10 +334,9 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void)
 // Creates and returns a "B" type endpoint
 int
 TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                                              AVStreams::VDev_ptr &vdev
-                                              ACE_ENV_ARG_DECL)
+                                              AVStreams::VDev_ptr &vdev)
 {
-  ACE_TRY
+  try
     {
     if (this->activate () == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -367,27 +344,24 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
                         -1);
 
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n",
-                TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in()
-                                                                    ACE_ENV_ARG_PARAMETER)));
-    ACE_TRY_CHECK;
+                TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in())));
     stream_endpoint = AVStreams::StreamEndPoint_B::_duplicate ( this->stream_endpoint_b_.in() );
     vdev = AVStreams::VDev::_duplicate( this->vdev_.in() );
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy_B::create_B\n");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy_B::create_B\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 // Gets the B type stream_endpoint from the Naming service
 int
-TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void)
 {
-  ACE_TRY
+  try
     {
       char stream_endpoint_name[BUFSIZ];
       ACE_OS::sprintf (stream_endpoint_name,
@@ -406,15 +380,11 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL
 
       // Get the CORBA::Object reference
       CORBA::Object_var stream_endpoint_b =
-        this->naming_context_->resolve (Stream_Endpoint_B_Name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_context_->resolve (Stream_Endpoint_B_Name);
 
       // Narrow the reference
       this->stream_endpoint_b_ =
-        AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in ());
 
       // Check for validity
       if (CORBA::is_nil (this->stream_endpoint_b_.in() ))
@@ -422,13 +392,12 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL
                            " could not resolve Stream_Endpoint_B in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 2cc9158853b..a5c26d990a2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -49,13 +49,11 @@ public:
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
   /// Called by the MMDevice, when it needs to create an B type endpoint
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
 protected:
   /// The "A" stream endpoint
@@ -93,18 +91,18 @@ public:
 
 protected:
   /// Bind to the naming service
-  virtual int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int bind_to_naming_service (void);
 
   /**
    * Get the object reference for the newly created stream
    * endpoint (which will be in the child process)
    * Subclasses will define the functionality for this
    */
-  virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual int get_stream_endpoint (void) = 0;
 
   /// Get the Vdev object reference for the newly created
   /// endpoint
-  virtual int get_vdev (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int get_vdev (void);
 
   /// Naming context
   CosNaming::NamingContext_var naming_context_;
@@ -140,11 +138,10 @@ public:
 protected:
   /// Creates an "A" type stream endpoint, and a vdev
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
   /// Gets the "A" type stream endpoint from the child process
-  virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int get_stream_endpoint (void);
 
 };
 
@@ -168,12 +165,11 @@ public:
 protected:
   /// Creates a "B" type stream endpoint, and a vdev
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
 
   /// Gets the object reference of the "B" type streamendpoint.
-  virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int get_stream_endpoint (void);
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index b52287ef621..33b8aadd13d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -28,47 +28,31 @@ template <class T_StreamEndpoint, class T_VDev, class T_MediaCtrl>
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Endpoint_Reactive_Strategy (void)
 {
   // Do not allow exceptions to escape from the destructor
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if(this->stream_endpoint_a_servant_ )
         {
-          stream_endpoint_a_servant_->_remove_ref (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          stream_endpoint_a_servant_->_remove_ref ();
         }
 
       if(this->stream_endpoint_b_servant_)
         {
-          stream_endpoint_b_servant_->_remove_ref (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          stream_endpoint_b_servant_->_remove_ref ();
         }
 
       if(this->vdev_servant_)
         {
-          vdev_servant_->_remove_ref (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          vdev_servant_->_remove_ref ();
         }
 
       if(this->media_ctrl_servant_)
         {
-          media_ctrl_servant_->_remove_ref (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          media_ctrl_servant_->_remove_ref ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-    }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-  ACE_ENDTRY;
 
 }
 
@@ -77,50 +61,39 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->activate_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->activate_stream_endpoint ();
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n"));
 
-      this->activate_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->activate_vdev ();
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n"));
 
-      this->activate_mediactrl (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->activate_mediactrl ();
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Endpoint_Reactive_Strategy::activate");
+      ex._tao_print_exception (
+        "TAO_Endpoint_Reactive_Strategy::activate");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant)
 {
 
   PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->poa_->activate_object (servant);
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->poa_->id_to_reference (id.in ());
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->orb_->object_to_string (obj.in ());
 
   return str._retn ();
 }
@@ -129,9 +102,9 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate VDev into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (void)
 {
-  ACE_TRY
+  try
     {
       // Bridge pattern. Allow subclasses to override this behavior
       T_VDev *vdev = 0;
@@ -140,22 +113,19 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 
       // Activate the object under the root poa.
 //      CORBA::String_var vdev_ior = this->activate_with_poa (vdev,
-//                                                            ACE_ENV_ARG_PARAMETER);
-//      ACE_TRY_CHECK;
+//);
 //      if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n",
 //                  vdev_ior. in ()));
 
       // Save the object reference, so that create_A can return it
-      this->vdev_ = vdev->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->vdev_ = vdev->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy::activate_vdev");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Reactive_Strategy::activate_vdev");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -163,9 +133,9 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate the media_controller
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (void)
 {
-  ACE_TRY
+  try
     {
       // Bridge pattern. Subclasses can override this
       if (this->make_mediactrl ( media_ctrl_servant_ ) == -1)
@@ -174,26 +144,21 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
       // Associate the media controller object reference with the vdev, as per the OMG spec
       CORBA::Any anyval;
       media_ctrl_obj_
-        = media_ctrl_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = media_ctrl_servant_->_this ();
 
       anyval <<= media_ctrl_obj_.in();
 
-      ACE_TRY_CHECK;
 
      this->vdev_->define_property ("Related_MediaCtrl",
-                                   anyval
-                                   ACE_ENV_ARG_PARAMETER);
+                                   anyval);
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -265,8 +230,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                                                                                      AVStreams::VDev_ptr &vdev
-                                                                                      ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
+                                                                                      AVStreams::VDev_ptr &vdev)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -282,9 +246,9 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea
 // Put the stream_endpoint into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
 {
-  ACE_TRY
+  try
     {
 
       // Use the bridge method
@@ -292,16 +256,14 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
         return -1;
 
       // Save the object references, so that create_a can return them
-      this->stream_endpoint_a_ = this->stream_endpoint_a_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->stream_endpoint_a_ = this->stream_endpoint_a_servant_->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -335,23 +297,21 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini
 // Activate stream_endpoint
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (void)
 {
-  ACE_TRY
+  try
     {
       if (this->make_stream_endpoint ( this->stream_endpoint_b_servant_ ) == -1)
         return -1;
 
-      this->stream_endpoint_b_ = this->stream_endpoint_b_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->stream_endpoint_b_ = this->stream_endpoint_b_servant_->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint");
+      ex._tao_print_exception (
+        "TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -359,8 +319,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                                                                                      AVStreams::VDev_ptr &vdev
-                                                                                      ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
+                                                                                      AVStreams::VDev_ptr &vdev)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -398,8 +357,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
                                                                        CORBA::ORB_ptr orb,
                                                                        PortableServer::POA_ptr poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_ = orb;
 
@@ -407,28 +365,22 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
 
       // create the objects and activate them in the poa
       this->activate_objects (argc,
-                              argv
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              argv);
 
       // Get ourselves a naming_service object reference
-      this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->bind_to_naming_service ();
 
       // Register the vdev with the naming service
-      this->register_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->register_vdev ();
 
       // register the stream_endpoing with the naming_service
-      this->register_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->register_stream_endpoint ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Child_Process");
+      ex._tao_print_exception ("TAO_Child_Process");
       return -1;
     }
-  ACE_ENDTRY;
 
   // release the semaphore the parent is waiting on
   if (this->release_semaphore () == -1)
@@ -441,24 +393,17 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant
-                                                                                 ACE_ENV_ARG_DECL)
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant)
 {
 
   PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->poa_->activate_object (servant);
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->poa_->id_to_reference (id.in ());
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->orb_->object_to_string (obj.in ());
 
   return str._retn ();
 }
@@ -467,10 +412,9 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects (int /*argc*/,
-                                                                                 char ** /*argv*/
-                                                                                 ACE_ENV_ARG_DECL)
+                                                                                 char ** /*argv*/)
 {
-  ACE_TRY
+  try
     {
       // bridge method to make a new stream endpoint
       if (this->make_stream_endpoint (this->stream_endpoint_) == -1)
@@ -485,74 +429,62 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
         return -1;
 
       // activate the stream_endpoint
-      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_
-                                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_);
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                                            "(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n",
                                            stream_endpoint_ior.in ()));
 
       // activate the vdev
-      CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_);
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                                            "(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n",
                                            vdev_ior.in ()));
 
       // activate the media controller
-      CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_
-                                                                  ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_);
 
-      ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::init ");
+      ex._tao_print_exception ("TAO_AV_Child_Process::init ");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 // Bind to the namingservice
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (void)
 {
-  ACE_TRY
+  try
     {
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to resolve the Name Service.\n"),
                           -1);
       //  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::bind_to_naming_service");
+      ex._tao_print_exception (
+        "TAO_AV_Child_Process::bind_to_naming_service");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 // register the vdev with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (void)
 {
-  ACE_TRY
+  try
     {
       char vdev_name [BUFSIZ];
       ACE_OS::sprintf (vdev_name,
@@ -569,50 +501,39 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (AC
       // make the media controller a property of the vdev
       CORBA::Any media_ctrl_property;
       media_ctrl_obj_ =
-        this->media_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->media_ctrl_->_this ();
 
       this->vdev_->define_property ("Related_MediaCtrl",
-                                    media_ctrl_obj_.in()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    media_ctrl_obj_.in());
 
-      vdev_obj_ = this->vdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      vdev_obj_ = this->vdev_->_this ();
 
-      ACE_TRY_CHECK;
-      ACE_TRY_EX (bind)
+      try
         {
           // Register the vdev with the naming server.
           this->naming_context_->bind (this->vdev_name_,
-                                       vdev_obj_.in()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bind);
+                                       vdev_obj_.in());
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
           // If the object was already there, replace the older reference
           // with this one
           this->naming_context_->rebind (this->vdev_name_,
-                                         vdev_obj_.in()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         vdev_obj_.in());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::register_vdev");
+          ex._tao_print_exception (
+            "TAO_AV_Child_Process::register_vdev");
           return -1;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::register_vdev");
+      ex._tao_print_exception (
+        "TAO_AV_Child_Process::register_vdev");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -621,18 +542,15 @@ template <class T_StreamEndpoint_B, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_Value *tv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"orb.run ()");
+      ex._tao_print_exception ("orb.run ()");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -672,37 +590,31 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
 // register the stream_endpoint with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (void)
 {
   CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil ();
-  ACE_TRY
+  try
     {
-      stream_endpoint_obj = this->stream_endpoint_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      stream_endpoint_obj = this->stream_endpoint_->_this ();
 
       // Create a name for the video control object
       // subclasses can define their own name for the streamendpoint
       // Register the stream endpoint object with the naming server.
       this->naming_context_->bind (this->stream_endpoint_name_,
-                                   stream_endpoint_obj
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   stream_endpoint_obj);
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
+  catch (const CosNaming::NamingContext::AlreadyBound& )
     {
       // if the name was already there, replace the reference with the new one
       this->naming_context_->rebind (this->stream_endpoint_name_,
-                                     stream_endpoint_obj
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     stream_endpoint_obj);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Endpoint_Reactive_Strategy::activate");
+      ex._tao_print_exception (
+        "TAO_Endpoint_Reactive_Strategy::activate");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -746,26 +658,20 @@ int
 TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
 {
   // Remove the names from the naming service
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (this->naming_context_.in ()) == 0)
         return 0;
-      this->naming_context_->unbind (this->stream_endpoint_name_
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->naming_context_->unbind (this->stream_endpoint_name_);
 
-      this->naming_context_->unbind (this->vdev_name_
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->naming_context_->unbind (this->vdev_name_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Endpoint_Process_Strategy::activate");
+      ex._tao_print_exception (
+        "TAO_Endpoint_Process_Strategy::activate");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index 45210da5406..5e8683715ba 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -41,13 +41,13 @@ protected:
   virtual int activate (void);
 
   /// activates the stream_endpoint with the POA
-  virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual int activate_stream_endpoint (void) = 0;
 
   /// activates the vdev with the POA
-  virtual int activate_vdev (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int activate_vdev (void);
 
   /// activates the media controller with the POA
-  virtual int activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int activate_mediactrl (void);
 
   /// Bridge method to create a vdev, a la Acceptor. Applications
   /// can override this
@@ -62,7 +62,7 @@ protected:
   virtual int make_mediactrl (T_MediaCtrl *&media_ctrl);
 
 
-  char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL);
+  char* activate_with_poa (PortableServer::Servant servant);
 
   CORBA::ORB_var orb_;
 
@@ -101,12 +101,11 @@ public:
 
   /// Overrides the base class stream_endpoint activator, to activate
   /// an "A" type endpoint
-  virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int activate_stream_endpoint (void);
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 
 };
 
@@ -132,12 +131,11 @@ public:
 
   /// Overrides the base class stream_endpoint activator, to activate
   /// a "B" type endpoint
-  virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int activate_stream_endpoint (void);
 
   /// Called by the MMDevice, when it needs to create a B type endpoint
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev
-                        ACE_ENV_ARG_DECL);
+                        AVStreams::VDev_ptr &vdev);
 };
 
 // ----------------------------------------------------------------------
@@ -173,23 +171,22 @@ protected:
    * return them to the client
    */
   int activate_objects (int argc,
-                        char **argv
-                        ACE_ENV_ARG_DECL);
+                        char **argv);
 
   ///activate the servant with the poa
-  char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL);
+  char* activate_with_poa (PortableServer::Servant servant);
 
   /// Removes the vdev and streamendpoint names from the naming service.
   int unbind_names (void);
 
   /// Binds to the naming service
-  int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int bind_to_naming_service (void);
 
   /// Registers vdev with the naming service
-  int register_vdev (ACE_ENV_SINGLE_ARG_DECL);
+  int register_vdev (void);
 
   /// Registers stream_endpoint with the naming service
-  int register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
+  int register_stream_endpoint (void);
 
   /// Releases the semaphore on which the parent is waiting on
   int release_semaphore ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index c2e6683d223..19c338b876f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -22,22 +22,17 @@ template <class T_Producer, class T_Consumer>
 TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname)
   :flowname_ (flowname)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Any flowname_any;
       flowname_any <<= flowname;
       this->define_property ("Flow",
-                             flowname_any
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             flowname_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::TAO_FDev");
+      ex._tao_print_exception ("TAO_FDev::TAO_FDev");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 template <class T_Producer, class T_Consumer>
@@ -57,22 +52,17 @@ template <class T_Producer, class T_Consumer>
 void
 TAO_FDev<T_Producer, T_Consumer>::flowname (const char *flow_name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Any flowname_any;
       flowname_any <<= flow_name;
       this->define_property ("Flow",
-                             flowname_any
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             flowname_any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::flowname");
+      ex._tao_print_exception ("TAO_FDev::flowname");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
   this->flowname_ = flow_name;
 }
 
@@ -81,8 +71,7 @@ AVStreams::FlowProducer_ptr
 TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr the_requester,
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
-                                                   char *& named_fdev
-                                                   ACE_ENV_ARG_DECL)
+                                                   char *& named_fdev)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -93,8 +82,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr
   return this->make_producer (the_requester,
                               the_qos,
                               met_qos,
-                              named_fdev
-                              ACE_ENV_ARG_PARAMETER);
+                              named_fdev);
 }
 
 template <class T_Producer, class T_Consumer>
@@ -103,26 +91,22 @@ AVStreams::FlowProducer_ptr
 TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /* the_requester */,
                                                  AVStreams::QoS & /* the_qos */,
                                                  CORBA::Boolean_out /* met_qos */,
-                                                 char *& /* named_fdev */
-                                                 ACE_ENV_ARG_DECL)
+                                                 char *& /* named_fdev */)
 {
   AVStreams::FlowProducer_ptr producer = AVStreams::FlowProducer::_nil ();
-  ACE_TRY
+  try
     {
       // Activate the producer implementation under the Root POA.
       T_Producer *producer_i;
       ACE_NEW_RETURN (producer_i, T_Producer, 0);
       this->producer_list_.insert_tail (producer_i);
-      producer = producer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      producer = producer_i->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::make_producer");
+      ex._tao_print_exception ("TAO_FDev::make_producer");
       return producer;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (producer);
   return producer;
 }
 
@@ -132,27 +116,23 @@ AVStreams::FlowConsumer_ptr
 TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /* the_requester */,
                                                  AVStreams::QoS & /* the_qos */,
                                                  CORBA::Boolean_out /* met_qos */,
-                                                 char *& /* named_fdev */
-                                                 ACE_ENV_ARG_DECL)
+                                                 char *& /* named_fdev */)
 {
   AVStreams::FlowConsumer_ptr consumer = AVStreams::FlowConsumer::_nil ();
-  ACE_TRY
+  try
     {
       // Activate the consumer implementation under the Root POA.
       T_Consumer *consumer_i;
       ACE_NEW_RETURN (consumer_i, T_Consumer, 0 );
 
       this->consumer_list_.insert_tail (consumer_i);
-      consumer = consumer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer = consumer_i->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FDev::make_consumer");
+      ex._tao_print_exception ("TAO_FDev::make_consumer");
       return consumer;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (consumer);
   return consumer;
 }
 
@@ -161,8 +141,7 @@ AVStreams::FlowConsumer_ptr
 TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
-                                                   char *& named_fdev
-                                                   ACE_ENV_ARG_DECL)
+                                                   char *& named_fdev)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -172,8 +151,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr
   return this->make_consumer (the_requester,
                               the_qos,
                               met_qos,
-                              named_fdev
-                              ACE_ENV_ARG_PARAMETER);
+                              named_fdev);
 }
 
 template <class T_Producer, class T_Consumer>
@@ -181,8 +159,7 @@ template <class T_Producer, class T_Consumer>
 AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device,
                                         AVStreams::QoS & the_qos,
-                                        CORBA::Boolean_out is_met
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Boolean_out is_met)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::QoSRequestFailed))
@@ -190,7 +167,6 @@ TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device,
   ACE_UNUSED_ARG (peer_device);
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
-  ACE_CHECK_RETURN (0);
   return 0;
 }
 
@@ -199,8 +175,7 @@ template <class T_Producer, class T_Consumer>
 AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
                                               AVStreams::QoS & the_qos,
-                                              CORBA::Boolean_out is_met
-                                              ACE_ENV_ARG_DECL)
+                                              CORBA::Boolean_out is_met)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::QoSRequestFailed))
@@ -208,15 +183,13 @@ TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
   ACE_UNUSED_ARG (first_peer);
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
-  ACE_CHECK_RETURN (0);
   return 0;
 }
 
 template <class T_Producer, class T_Consumer>
 void
 TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */,
-                                           const char * /* fdev_name */
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           const char * /* fdev_name */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index d0810ab65e1..d600e9d1a32 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -47,8 +47,7 @@ public:
   AVStreams::FlowProducer_ptr create_producer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev
-                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                       char *& named_fdev)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -60,15 +59,13 @@ public:
   virtual AVStreams::FlowProducer_ptr make_producer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev
-                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                       char *& named_fdev);
 
   /// create a flow consumer object.
   virtual AVStreams::FlowConsumer_ptr create_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev
-                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                       char *& named_fdev)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -80,14 +77,12 @@ public:
   virtual AVStreams::FlowConsumer_ptr make_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev
-                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                       char *& named_fdev);
 
   /// bind this FDev with another FDev.
   virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device,
                                               AVStreams::QoS & the_qos,
-                                              CORBA::Boolean_out is_met
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              CORBA::Boolean_out is_met)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::QoSRequestFailed));
@@ -95,16 +90,14 @@ public:
   /// multicast bind is not implemented yet.
   virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer,
                                                     AVStreams::QoS & the_qos,
-                                                    CORBA::Boolean_out is_met
-                                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                    CORBA::Boolean_out is_met)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::QoSRequestFailed));
 
   /// destroys this FDev.
   virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep,
-                        const char * fdev_name
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                        const char * fdev_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 87feb7f4b9a..aabcdf92487 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -320,7 +320,6 @@ int
 TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n"));
@@ -376,8 +375,7 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
 
                   AVStreams::Negotiator_var remote_negotiator;
                   this->negotiator_->negotiate (remote_negotiator.in (),
-                                                new_qos
-                                                ACE_ENV_ARG_PARAMETER);
+                                                new_qos);
                 }
             }
     }
@@ -888,7 +886,6 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
 int
 TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   int result = 0;
 
   //  TAO_AV_Callback *callback = 0;
@@ -1033,22 +1030,19 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 
   AVStreams::Negotiator_ptr negotiator;
 
-  ACE_TRY_EX (negotiator)
+  try
     {
       CORBA::Any_ptr negotiator_any =
-        this->endpoint_->get_property_value ("Negotiator"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (negotiator);
+        this->endpoint_->get_property_value ("Negotiator");
 
       *negotiator_any >>= negotiator;
       handler->negotiator (negotiator);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%N,%l) Negotiator Not Found \n"));
     }
-  ACE_ENDTRY;
 
   this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler);
   this->entry_->protocol_object (object);
@@ -1167,7 +1161,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
 {
   ACE_UNUSED_ARG (flow_comp);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   int result = 0;
   this->entry_ = entry;
   this->flowname_ = entry->flowname ();
@@ -1323,23 +1316,20 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
 
   AVStreams::Negotiator_ptr negotiator;
 
-  ACE_TRY_EX (negotiator)
+  try
     {
       CORBA::Any_ptr negotiator_any =
-        this->endpoint_->get_property_value ("Negotiator"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (negotiator);
+        this->endpoint_->get_property_value ("Negotiator");
 
       *negotiator_any >>= negotiator;
       handler->negotiator (negotiator);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Negotiator not found for flow %s\n",
                   this->entry_->flowname ()));
     }
-  ACE_ENDTRY;
 
   flow_handler->protocol_object (object);
 
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index f79296289ab..2185c7146c7 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -12,28 +12,25 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TARGET> void
-ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events
-                                        ACE_ENV_ARG_DECL)
+ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  target_->push (events ACE_ENV_ARG_PARAMETER);
+  target_->push (events);
 }
 
 template<class TARGET> void
-ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL)
+ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer ()
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  target_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+  target_->disconnect_push_consumer ();
 }
 
 template<class TARGET> void
-ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL)
+ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier ()
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  target_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  target_->disconnect_push_supplier ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 9f56182745b..5f5a0b217ae 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -45,12 +45,11 @@ public:
   ACE_PushConsumer_Adapter (TARGET *target);
 
   /// Forwards to target_.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
   /// Forwards to target_.
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
 private:
@@ -74,7 +73,7 @@ public:
   ACE_PushSupplier_Adapter (TARGET *target);
 
   /// Forwards to target_.
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 3e62837cfdb..b1c0dc9822a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -20,8 +20,8 @@
 #include "orbsvcs/Concurrency/CC_Lock.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (Concurrency, 
-           CC_Lock, 
+ACE_RCSID (Concurrency,
+           CC_Lock,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -43,7 +43,7 @@ CC_Lock::~CC_Lock (void)
 }
 
 void
-CC_Lock::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CC_Lock::lock (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::lock\n"));
@@ -51,7 +51,7 @@ CC_Lock::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Boolean
-CC_Lock::try_lock (ACE_ENV_SINGLE_ARG_DECL)
+CC_Lock::try_lock (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::try_lock. "));
@@ -86,17 +86,17 @@ CC_Lock::try_lock (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CC_Lock::unlock (ACE_ENV_SINGLE_ARG_DECL)
+CC_Lock::unlock (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::unlock\n"));
   if (lock_held_ == 0)
-    ACE_THROW (CosConcurrencyControl::LockNotHeld ());
+    throw CosConcurrencyControl::LockNotHeld ();
 
   int success = 0; //semaphore_.release ();
 
   if (success == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   lock_held_--;
 
@@ -106,8 +106,7 @@ CC_Lock::unlock (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode
-                      ACE_ENV_ARG_DECL)
+CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::change_mode\n"));
@@ -117,7 +116,7 @@ CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode
   // write lock
 
   if (lock_held_ == 0)
-    ACE_THROW (CosConcurrencyControl::LockNotHeld ());
+    throw CosConcurrencyControl::LockNotHeld ();
 
   this->mode_ = new_mode;
 }
@@ -205,7 +204,7 @@ void CC_LockModeIterator::First (void)
   current_ = CosConcurrencyControl::intention_read;
 }
 
-void CC_LockModeIterator::Next (ACE_ENV_SINGLE_ARG_DECL)
+void CC_LockModeIterator::Next (void)
 {
   switch (current_)
     {
@@ -222,9 +221,9 @@ void CC_LockModeIterator::Next (ACE_ENV_SINGLE_ARG_DECL)
       current_ = CosConcurrencyControl::write;
       break;
     case CosConcurrencyControl::write:
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     default:
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index 622f973a9df..1972caff85f 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -60,18 +60,17 @@ public:
   ~CC_Lock (void);
 
   /// Acquires this lock. Blocks until lock is obtained
-  void lock (ACE_ENV_SINGLE_ARG_DECL);
+  void lock (void);
 
   /// Tries to acquire this lock. If it is not possible to acquire the
   /// lock, false is returned
-  CORBA::Boolean try_lock (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Boolean try_lock (void);
 
   /// Releases this lock.
-  void unlock (ACE_ENV_SINGLE_ARG_DECL);
+  void unlock (void);
 
   /// Changes the mode of this lock.
-  void change_mode (CosConcurrencyControl::lock_mode new_mode
-                   ACE_ENV_ARG_DECL);
+  void change_mode (CosConcurrencyControl::lock_mode new_mode);
 
   /// Sets the mode_ of the lock. Used in initialization
   void set_mode (CosConcurrencyControl::lock_mode mode);
@@ -130,7 +129,7 @@ public:
 
   /// Advance the iterator to the next element
   /// Throws exception if out of range
-  void Next(ACE_ENV_SINGLE_ARG_DECL);
+  void Next(void);
 
   /// Returns true if the iterator has reached the last element
   CORBA::Boolean IsDone(void);
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 91ef3d63be5..2a35c3b7c6c 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -27,17 +27,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CC_LockSet::CC_LockSet (void)
   : related_lockset_ (0)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->Init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->Init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_LockSet::CC_LockSet (void)");
+      ex._tao_print_exception ("CC_LockSet::CC_LockSet (void)");
     }
-  ACE_ENDTRY;
 }
 
 // Constructor used to create related lock sets.
@@ -45,23 +42,20 @@ CC_LockSet::CC_LockSet (void)
 CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
   : related_lockset_ (related)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->Init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->Init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_LockSet::CC_LockSet (...)");
+      ex._tao_print_exception ("CC_LockSet::CC_LockSet (...)");
     }
-  ACE_ENDTRY;
 }
 
 // Initialization.
 
 void
-CC_LockSet::Init (ACE_ENV_SINGLE_ARG_DECL)
+CC_LockSet::Init (void)
 {
   // Set the mode of the statically allocated locks
   lock_[CC_IR] = 0;
@@ -72,7 +66,7 @@ CC_LockSet::Init (ACE_ENV_SINGLE_ARG_DECL)
 
   // Acquire the semaphore in order to be able to put requests on hold
   if (semaphore_.acquire () == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 }
 
 // Destructor
@@ -97,8 +91,7 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr)
 // Locks the lock in the desired mode. Blocks until success.
 
 void
-CC_LockSet::lock (CosConcurrencyControl::lock_mode mode
-                  ACE_ENV_ARG_DECL)
+CC_LockSet::lock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n"));
@@ -112,14 +105,13 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode
   // the FIFO properties of ACE_Token!
   if (this->lock_i (lm) == 1)
     if (semaphore_.acquire () == -1)
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
 }
 
 // Tries to lock. If it is not possible false is returned.
 
 CORBA::Boolean
-CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode
-                      ACE_ENV_ARG_DECL_NOT_USED)
+CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockModeEnum lm = lmconvert (mode);
@@ -159,8 +151,7 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode)
 // Unlock the lock
 
 void
-CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
-                    ACE_ENV_ARG_DECL)
+CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -172,7 +163,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mlock_);
 
   if (lock_[lm] == 0) // This lock is not held.
-    ACE_THROW (CosConcurrencyControl::LockNotHeld());
+    throw CosConcurrencyControl::LockNotHeld();
   else
     lock_[lm]--;
 
@@ -188,7 +179,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
       if (compatible (lock_on_queue) == 1)
         {
           if (semaphore_.release () == -1)
-            ACE_THROW (CORBA::INTERNAL ());
+            throw CORBA::INTERNAL ();
           lock_[lock_on_queue]++;
         }
       else
@@ -204,8 +195,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
 
 void
 CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
-                         CosConcurrencyControl::lock_mode new_mode
-                         ACE_ENV_ARG_DECL)
+                         CosConcurrencyControl::lock_mode new_mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -215,14 +205,13 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
   CC_LockModeEnum lm_new = lmconvert (new_mode);
 
   if (this->lock_held (lm_held) == 0) // This lock is not held
-    ACE_THROW (CosConcurrencyControl::LockNotHeld());
+    throw CosConcurrencyControl::LockNotHeld();
   else if (this->change_mode_i (lm_held, lm_new)==1)
     {
-      this->unlock (held_mode ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->unlock (held_mode);
 
       if (semaphore_.acquire () == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
   //  this->dump ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 1d01ebeef27..b38884f9ae8 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -92,26 +92,22 @@ public:
 
   // = CosConcurrencyControl methods
   /// Acquires this lock. Blocks until lock is obtained
-  virtual void lock (CosConcurrencyControl::lock_mode mode
-                     ACE_ENV_ARG_DECL)
+  virtual void lock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Tries to acquire this lock. If it is not possible to acquire the
   /// lock, false is returned
-  virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode
-                                   ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Releases this lock.
-  virtual void unlock (CosConcurrencyControl::lock_mode mode
-                       ACE_ENV_ARG_DECL)
+  virtual void unlock (CosConcurrencyControl::lock_mode mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld));
 
   /// Changes the mode of this lock.
   virtual void change_mode (CosConcurrencyControl::lock_mode held_mode,
-                            CosConcurrencyControl::lock_mode new_mode
-                            ACE_ENV_ARG_DECL)
+                            CosConcurrencyControl::lock_mode new_mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld));
 
@@ -126,7 +122,7 @@ private:
 
   /// Initiatlizes the lock set array and acquires the initial
   /// semaphore.
-  void Init (ACE_ENV_SINGLE_ARG_DECL);
+  void Init (void);
 
   /// Returns true if the held lock and the requested lock are compatible
   CORBA::Boolean compatible (CC_LockModeEnum mr);
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index dfe17f3913a..092216de5ef 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -27,7 +27,7 @@ CC_LockSetFactory::~CC_LockSetFactory (void)
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_LockSetFactory::create (ACE_ENV_SINGLE_ARG_DECL)
+CC_LockSetFactory::create (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
@@ -37,14 +37,12 @@ CC_LockSetFactory::create (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (ls,
                     CC_LockSet,
                     CORBA::NO_MEMORY());
-  ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
 
-  return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return ls->_this ();
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which
-                                   ACE_ENV_ARG_DECL)
+CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
@@ -54,9 +52,8 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which
   ACE_NEW_THROW_EX (ls,
                     CC_LockSet (which),
                     CORBA::NO_MEMORY());
-  ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
 
-  return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return ls->_this ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index 6a02b8ed68d..a1d1fbd238a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * file for detailed descriptions apart from the comments in
  * this file.
  */
-class TAO_Concurrency_Serv_Export CC_LockSetFactory 
+class TAO_Concurrency_Serv_Export CC_LockSetFactory
   : public POA_CosConcurrencyControl::LockSetFactory
 {
 public:
@@ -47,13 +47,11 @@ public:
   /// Destructor.
   ~CC_LockSetFactory (void);
 
-  virtual CosConcurrencyControl::LockSet_ptr create (
-      ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosConcurrencyControl::LockSet_ptr create ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosConcurrencyControl::LockSet_ptr create_related (
-      CosConcurrencyControl::LockSet_ptr which
-      ACE_ENV_ARG_DECL)
+      CosConcurrencyControl::LockSet_ptr which)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
index b12a3a41e57..5a008bc1d59 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -31,25 +31,21 @@ TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void)
 int
 TAO_Concurrency_Loader::init (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, 0);
 
       // This function call initializes the Concurrency Service
       CORBA::Object_var object =
-        this->create_object (orb.in (), argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->create_object (orb.in (), argc, argv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ Should we log this???
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -64,21 +60,16 @@ TAO_Concurrency_Loader::fini (void)
 CORBA::Object_ptr
 TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb,
                                        int /* argc */,
-                                       char * /* argv */ []
-                                       ACE_ENV_ARG_DECL)
+                                       char * /* argv */ [])
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    orb->resolve_initial_references ("RootPOA");
   PortableServer::POA_var poa =
-    PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    PortableServer::POA::_narrow (object.in ());
   PortableServer::POAManager_var poa_manager =
-    poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    poa->the_POAManager ();
+  poa_manager->activate ();
 
   return this->concurrency_server_.init (orb, poa.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index b49ae60f6f8..56d900178d1 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -50,8 +50,7 @@ public:
   /// This function call initializes the Concurrency Service given a
   /// reference to the ORB and the command line parameters.
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                   int argc, char *argv[]
-                                   ACE_ENV_ARG_DECL)
+                                   int argc, char *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index 570cef2f20f..df98c3160d2 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -40,47 +40,38 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
 {
   CORBA::Object_var obj;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // @@ Huh?!?
 
       this->poa_= PortableServer::POA::_duplicate (poa);
 
       // Get the naming context ptr to NameService.
-      //      ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("ConcurrencyService");
 
       poa->activate_object_with_id (id.in (),
-                                    &this->lock_set_factory_
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    &this->lock_set_factory_);
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
       obj =
-        poa->id_to_reference (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->id_to_reference (id.in ());
 
       CORBA::String_var str =
-        orb->object_to_string (obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "listening as object <%s>\n",
                   str.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Concurrency Service");
+      ex._tao_print_exception ("Concurrency Service");
       return CORBA::Object::_nil ();
     }
-  ACE_ENDTRY;
 
   return obj._retn ();
 }
@@ -88,27 +79,22 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb,
 int
 TAO_Concurrency_Server::fini (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId_var id =
         this->poa_->servant_to_id (&this->lock_set_factory_);
 
-      this->poa_->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               ACE_TEXT ("TAO_Concurrency_Server"));
+          ex._tao_print_exception (ACE_TEXT ("TAO_Concurrency_Server"));
         }
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index ac6dce9b64a..02f47b5c48b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -32,90 +32,77 @@ TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void)
 }
 
 void
-TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event
-                             ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event)
 {
   TAO_CEC_Propagate_Event_Push push_worker (event);
 
-  this->push_admin_.for_each (&push_worker
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->push_admin_.for_each (&push_worker);
 
   TAO_CEC_Propagate_Event_Pull pull_worker (event);
 
-  this->pull_admin_.for_each (&pull_worker
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->pull_admin_.for_each (&pull_worker);
 }
 
 void
-TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->push_admin_.connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.connected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->push_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.reconnected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->push_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.disconnected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  this->pull_admin_.connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.connected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  this->pull_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.reconnected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  this->pull_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.disconnected (supplier);
 }
 
 void
-TAO_CEC_ConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ConsumerAdmin::shutdown (void)
 {
-  this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->push_admin_.shutdown ();
 
-  this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->pull_admin_.shutdown ();
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ConsumerAdmin::obtain_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->push_admin_.obtain ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->pull_admin_.obtain ();
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ConsumerAdmin::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -123,19 +110,17 @@ TAO_CEC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // ****************************************************************
 
 void
-TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
+  supplier->push (this->event_);
 }
 
 // ****************************************************************
 
 void
-TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
+  supplier->push (this->event_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index aba60f615c6..3f85a431cb5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -47,7 +47,7 @@ class TAO_CEC_EventChannel;
  * externally.
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin 
+class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin
   : public POA_CosEventChannelAdmin::ConsumerAdmin
 {
 public:
@@ -62,44 +62,35 @@ public:
   virtual ~TAO_CEC_ConsumerAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-                 ACE_ENV_ARG_DECL);
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker);
 
   /// Push the event to all the consumers
-  void push (const CORBA::Any &event
-             ACE_ENV_ARG_DECL);
+  void push (const CORBA::Any &event);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_CEC_ProxyPullSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPullSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPullSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void connected (TAO_CEC_ProxyPullSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPullSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPullSupplier*);
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (void);
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_supplier (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-      obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_pull_supplier (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// The Event Channel we belong to
@@ -123,8 +114,7 @@ class TAO_CEC_Propagate_Event_Push : public TAO_ESF_Worker<TAO_CEC_ProxyPushSupp
 public:
   TAO_CEC_Propagate_Event_Push (const CORBA::Any& event);
 
-  void work (TAO_CEC_ProxyPushSupplier *supplier
-             ACE_ENV_ARG_DECL);
+  void work (TAO_CEC_ProxyPushSupplier *supplier);
 
 private:
   /// The event
@@ -138,8 +128,7 @@ class TAO_CEC_Propagate_Event_Pull : public TAO_ESF_Worker<TAO_CEC_ProxyPullSupp
 public:
   TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event);
 
-  void work (TAO_CEC_ProxyPullSupplier *supplier
-             ACE_ENV_ARG_DECL);
+  void work (TAO_CEC_ProxyPullSupplier *supplier);
 
 private:
   /// The event
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
index d7761a1f51d..e98ce75077c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
@@ -6,18 +6,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker)
 {
-  this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.for_each (worker);
 }
 
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker)
 {
-  this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.for_each (worker);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index 5c0068aa874..570fe05a684 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -30,21 +30,18 @@ TAO_CEC_ConsumerControl::shutdown (void)
 }
 
 void
-TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier *)
 {
 }
 
 void
-TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier *)
 {
 }
 
 void
 TAO_CEC_ConsumerControl::system_exception (TAO_CEC_ProxyPushSupplier *,
-                                           CORBA::SystemException &
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index b0c0f22ceaa..6cfc3961cfe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -67,21 +67,18 @@ public:
    * has been destroyed.  The strategy has to (at the very least),
    * reclaim all the resources attached to that object.
    */
-  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy);
 
   /**
    * Invoked by helper classes when they detect that a consumer no
    * longer exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
   /// Do we need to disconnect this supplier?  The parameter type for
   /// proxy is PortableServer::ServantBase* due to the fact that this
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index 14c6d6c21ca..9b671f519f2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -29,35 +29,31 @@ TAO_CEC_Reactive_Dispatching::shutdown (void)
 
 void
 TAO_CEC_Reactive_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy,
-                                    const CORBA::Any& event
-                                    ACE_ENV_ARG_DECL)
+                                    const CORBA::Any& event)
 {
-  proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (event);
 }
 
 void
 TAO_CEC_Reactive_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                           CORBA::Any& event
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::Any& event)
 {
-  proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (event);
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
 TAO_CEC_Reactive_Dispatching::invoke (TAO_CEC_ProxyPushSupplier* proxy,
-                                      const TAO_CEC_TypedEvent& typed_event
-                                      ACE_ENV_ARG_DECL)
+                                      const TAO_CEC_TypedEvent& typed_event)
 {
-  proxy->reactive_invoke_to_consumer (typed_event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_invoke_to_consumer (typed_event);
 }
 
 void
 TAO_CEC_Reactive_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                             TAO_CEC_TypedEvent& typed_event
-                                             ACE_ENV_ARG_DECL)
+                                             TAO_CEC_TypedEvent& typed_event)
 {
-  proxy->reactive_invoke_to_consumer (typed_event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_invoke_to_consumer (typed_event);
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index 48806cdafba..02086605a55 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -61,18 +61,14 @@ public:
 
   /// The consumer represented by <proxy> should receive <event>.
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
-                     const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                     const CORBA::Any &event) = 0;
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                            CORBA::Any &event
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                            CORBA::Any &event) = 0;
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                       const TAO_CEC_TypedEvent &typed_event
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                       const TAO_CEC_TypedEvent &typed_event) = 0;
   virtual void invoke_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                              TAO_CEC_TypedEvent &typed_event
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                              TAO_CEC_TypedEvent &typed_event) = 0;
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 };
 
@@ -97,18 +93,14 @@ public:
   virtual void activate (void);
   virtual void shutdown (void);
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
-                     const CORBA::Any &event
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     const CORBA::Any &event);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                            CORBA::Any &event
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                            CORBA::Any &event);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                       const TAO_CEC_TypedEvent &typed_event
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       const TAO_CEC_TypedEvent &typed_event);
   virtual void invoke_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                              TAO_CEC_TypedEvent &typed_event
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              TAO_CEC_TypedEvent &typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 5911d5c109d..fdb8a9f003d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -24,7 +24,7 @@ TAO_CEC_Dispatching_Task::svc (void)
   int done = 0;
   while (!done)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           ACE_Message_Block *mb;
           if (this->getq (mb) == -1)
@@ -43,28 +43,24 @@ TAO_CEC_Dispatching_Task::svc (void)
               continue;
             }
 
-          int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int result = command->execute ();
 
           ACE_Message_Block::release (mb);
 
           if (result == -1)
             done = 1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "EC (%P|%t) exception in dispatching queue");
+          ex._tao_print_exception ("EC (%P|%t) exception in dispatching queue");
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
 
 void
 TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy,
-                                CORBA::Any& event
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Any& event)
 {
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -72,8 +68,7 @@ TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy,
   void* buf = this->allocator_->malloc (sizeof (TAO_CEC_Push_Command));
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   ACE_Message_Block *mb =
     new (buf) TAO_CEC_Push_Command (proxy,
@@ -86,8 +81,7 @@ TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy,
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
 TAO_CEC_Dispatching_Task::invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                                  TAO_CEC_TypedEvent& typed_event
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_CEC_TypedEvent& typed_event)
 {
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -95,8 +89,7 @@ TAO_CEC_Dispatching_Task::invoke (TAO_CEC_ProxyPushSupplier *proxy,
   void* buf = this->allocator_->malloc (sizeof (TAO_CEC_Invoke_Command));
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   ACE_Message_Block *mb =
     new (buf) TAO_CEC_Invoke_Command (proxy,
@@ -116,7 +109,7 @@ TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void)
 // ****************************************************************
 
 int
-TAO_CEC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_Shutdown_Task_Command::execute (void)
 {
   return -1;
 }
@@ -129,10 +122,9 @@ TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void)
 }
 
 int
-TAO_CEC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_Push_Command::execute (void)
 {
-  this->proxy_->push_to_consumer (this->event_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->proxy_->push_to_consumer (this->event_);
   return 0;
 }
 
@@ -145,10 +137,9 @@ TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command (void)
 }
 
 int
-TAO_CEC_Invoke_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_Invoke_Command::execute (void)
 {
-  this->proxy_->invoke_to_consumer (this->typed_event_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->proxy_->invoke_to_consumer (this->typed_event_);
   return 0;
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index 5c213395a89..a17ed20d9d1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -54,13 +54,11 @@ public:
   virtual int svc (void);
 
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
-                     CORBA::Any& event
-                     ACE_ENV_ARG_DECL);
+                     CORBA::Any& event);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                       TAO_CEC_TypedEvent& typed_event
-                       ACE_ENV_ARG_DECL);
+                       TAO_CEC_TypedEvent& typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 private:
@@ -87,7 +85,7 @@ public:
   virtual ~TAO_CEC_Dispatch_Command (void);
 
   /// Command callback
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
+  virtual int execute (void) = 0;
 };
 
 // ****************************************************************
@@ -99,7 +97,7 @@ public:
   TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (void);
 };
 
 // ****************************************************************
@@ -117,7 +115,7 @@ public:
   virtual ~TAO_CEC_Push_Command (void);
 
   /// Command callback
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (void);
 
 private:
   /// The proxy
@@ -143,7 +141,7 @@ public:
   virtual ~TAO_CEC_Invoke_Command (void);
 
   /// Command callback
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (void);
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
index f00965a58b2..f5ae3599809 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -21,22 +21,20 @@ TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void)
 
 // The DSI invoke request
 void
-TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request
-                                             ACE_ENV_ARG_DECL)
+TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Trap the _is_a request
   if (ACE_OS::strcmp ("_is_a", request->operation () ) == 0)
     {
-      this->is_a (request ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->is_a (request);
     }
   else
     {
       CORBA::NVList_ptr list;
 
       // Get the operation paramter information from the IFR cache.
-      TAO_CEC_Operation_Params *oper_params = 
+      TAO_CEC_Operation_Params *oper_params =
         this->typed_event_channel_->find_from_ifr_cache (request->operation () );
 
       if (oper_params == 0)
@@ -47,69 +45,56 @@ TAO_CEC_DynamicImplementationServer::invoke (CORBA::ServerRequest_ptr request
                           ACE_TEXT ("***** Operation not found in IFR cache *****\n")));
             }
 
-          this->typed_event_channel_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->typed_event_channel_->create_list (0, list);
         }
       else
         {
           // Populate the NVList from the parameter information.
-          this->typed_event_channel_->create_operation_list (oper_params, list
-                                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          
+          this->typed_event_channel_->create_operation_list (oper_params, list);
+
           // Get the operation arguments. This ahould demarshal correctly.
-          request->arguments (list ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          request->arguments (list);
 
           // Populate the TypedEvent with the list and operation name.
           TAO_CEC_TypedEvent typed_event (list, request->operation () );
 
           // Pass the TypedEvent to the TypedProxyPushConsumer
-          this->typed_pp_consumer_->invoke (typed_event ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->typed_pp_consumer_->invoke (typed_event);
         }
     }
 }
 
 CORBA::RepositoryId
 TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::ObjectId &,
-                                                         PortableServer::POA_ptr
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                                         PortableServer::POA_ptr)
   ACE_THROW_SPEC (())
 {
   return CORBA::string_dup (repository_id_);
 }
 
 PortableServer::POA_ptr
-TAO_CEC_DynamicImplementationServer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_DynamicImplementationServer::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
-                                           ACE_ENV_ARG_DECL)
+TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request)
 {
   CORBA::NVList_ptr list;
 
-  this->typed_event_channel_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_event_channel_->create_list (0, list);
 
   CORBA::Any any_1;
   any_1._tao_set_typecode(CORBA::_tc_string);
 
   list->add_value ("value",
                    any_1,
-                   CORBA::ARG_IN
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   CORBA::ARG_IN);
 
-  request->arguments (list 
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  request->arguments (list);
 
-  CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::NamedValue_ptr nv = list->item (0);
 
   CORBA::Any_ptr ap = nv->value ();
   const char *value;
@@ -123,8 +108,7 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
     }
 
   const char *object_id =
-    CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::_tc_Object->id ();
 
   if (TAO_debug_level >= 10)
     {
@@ -153,27 +137,26 @@ TAO_CEC_DynamicImplementationServer::is_a (CORBA::ServerRequest_ptr request
                           ACE_TEXT ("***** is_a using base interface %s *****\n"),
                           this->typed_event_channel_->base_interfaces (base) ));
             }
-          
+
           if (ACE_OS::strcmp (value, this->typed_event_channel_->base_interfaces (base) ) == 0)
             {
               result = 1;
             }
         }
     }
-  
+
   if (TAO_debug_level >= 10)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("***** is_a returning %d *****\n"),
                   result));
     }
-  
+
   CORBA::Any result_any;
   CORBA::Any::from_boolean from_boolean (result);
   result_any <<= from_boolean;
 
-  request->set_result (result_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  request->set_result (result_any);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
index 80d065c6c83..dbaf7a259b7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
@@ -38,28 +38,24 @@ public:
                                        TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer,
                                        TAO_CEC_TypedEventChannel *typed_event_channel);
 
-  //Destructor 
+  //Destructor
   virtual ~TAO_CEC_DynamicImplementationServer (void);
 
   // = The DynamicImplementation methods.
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL)
+  virtual void invoke (CORBA::ServerRequest_ptr request)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL
     )
       ACE_THROW_SPEC (());
 
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL
     );
 
   // Handles the _is_a call
-  virtual void is_a (CORBA::ServerRequest_ptr request
-                     ACE_ENV_ARG_DECL);
+  virtual void is_a (CORBA::ServerRequest_ptr request);
 
 private:
   // The POA
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 6d85505f431..3decba50304 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -74,7 +74,7 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void)
 }
 
 void
-TAO_CEC_EventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_EventChannel::activate (void)
 {
   this->dispatching_->activate ();
   this->pulling_strategy_->activate ();
@@ -83,7 +83,7 @@ TAO_CEC_EventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::shutdown (void)
 {
   this->dispatching_->shutdown ();
   this->pulling_strategy_->shutdown ();
@@ -91,145 +91,113 @@ TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   this->consumer_control_->shutdown ();
 
   PortableServer::POA_var consumer_poa =
-    this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_admin_->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_poa->servant_to_id (this->consumer_admin_);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
   PortableServer::POA_var supplier_poa =
-    this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->supplier_admin_->_default_POA ();
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_poa->servant_to_id (this->supplier_admin_);
+  supplier_poa->deactivate_object (supplier_id.in ());
 
-  this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->shutdown ();
 
-  this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->shutdown ();
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer)
 {
-  this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->connected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer)
 {
-  this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->reconnected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer)
 {
-  this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->disconnected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer)
 {
-  this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->connected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer)
 {
-  this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->reconnected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer)
 {
-  this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->disconnected (consumer);
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->connected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->reconnected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->disconnected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier)
 {
-  this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->connected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier)
 {
-  this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->reconnected (supplier);
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier)
 {
-  this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->disconnected (supplier);
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CEC_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::for_consumers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->consumer_admin_->_this ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CEC_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::for_suppliers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_admin_->_this ();
 }
 
 void
-TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown ();
 }
 
 CORBA::Policy_ptr TAO_CEC_EventChannel::create_roundtrip_timeout_policy
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index e7ac5d173e2..d26f2731cea 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -133,11 +133,11 @@ public:
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void activate (void);
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void shutdown (void);
 
   /// Access the dispatching module....
   TAO_CEC_Dispatching* dispatching (void) const;
@@ -198,33 +198,21 @@ public:
 
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_CEC_ProxyPullConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPullConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPullConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushConsumer*);
+  virtual void reconnected (TAO_CEC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_CEC_ProxyPushConsumer*);
+  virtual void connected (TAO_CEC_ProxyPullConsumer*);
+  virtual void reconnected (TAO_CEC_ProxyPullConsumer*);
+  virtual void disconnected (TAO_CEC_ProxyPullConsumer*);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_CEC_ProxyPullSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPullSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPullSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void connected (TAO_CEC_ProxyPullSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPullSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPullSupplier*);
 
   // Simple flags to control the EC behavior, set by the application
   // at construction time.
@@ -243,17 +231,17 @@ public:
   /// The default implementation is:
   ///    this->consumer_admin ()->_this (env);
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+      for_consumers (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The default implementation is:
   ///    this->supplier_admin ()->_this (env);
   virtual CosEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+      for_suppliers (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Commit suicide.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ServantRetryMap& get_servant_retry_map (void);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index e9a9e726717..e2259d6df85 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -54,30 +54,26 @@ TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader (void)
 int
 TAO_CEC_Event_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // ORB initialization boiler plate...
       this->orb_=
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
 
       CORBA::Object_var obj =
-        this->create_object (this->orb_.in (), command_line.get_argc(), command_line.get_TCHAR_argv() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->create_object (this->orb_.in (), command_line.get_argc(), command_line.get_TCHAR_argv());
 
       if (CORBA::is_nil (obj.in() ))
         return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, argv[0]);
+      ex._tao_print_exception (argv[0]);
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -85,11 +81,10 @@ TAO_CEC_Event_Loader::init (int argc, ACE_TCHAR *argv[])
 CORBA::Object_ptr
 TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                      int argc,
-                                     ACE_TCHAR *argv[]
-                                     ACE_ENV_ARG_DECL)
+                                     ACE_TCHAR *argv[])
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       // ****************************************************************
 
@@ -192,16 +187,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
 
       // POA initialization and activation ...
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
 
       // ****************************************************************
@@ -226,18 +217,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                                  this->factory_,
                                                  this->terminate_flag_);
 
-      this->ec_impl_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->ec_impl_->activate ();
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->ec_impl_->_this ();
 
       if (ior_file != 0)
         {
           CORBA::String_var ior =
-            orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->object_to_string (event_channel.in ());
 
           FILE *iorf = ACE_OS::fopen (ior_file, ACE_TEXT("w"));
           if (iorf != 0)
@@ -266,14 +254,10 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
       if (this->bind_to_naming_service_)
         {
           CORBA::Object_var obj =
-            orb->resolve_initial_references ("NameService"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("NameService");
 
           this->naming_context_ =
-            CosNaming::NamingContext::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CosNaming::NamingContext::_narrow (obj.in ());
 
           this->channel_name_.length (1);
           this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name));
@@ -281,16 +265,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
           if (use_rebind)
             {
               this->naming_context_->rebind (this->channel_name_,
-                                      event_channel.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                      event_channel.in ());
             }
           else
             {
               this->naming_context_->bind (this->channel_name_,
-                                    event_channel.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                    event_channel.in ());
             }
         }
           return CosEventChannelAdmin::EventChannel::_duplicate (event_channel.in () );
@@ -312,8 +292,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
           CORBA::Repository_var interface_repository;
 
           CORBA::Object_var ifr_obj_var =
-            orb->resolve_initial_references ("InterfaceRepository" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("InterfaceRepository");
 
           if (CORBA::is_nil(ifr_obj_var.in () ))
             {
@@ -326,9 +305,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
             }
           else
             {
-              interface_repository = CORBA::Repository::_narrow(ifr_obj_var.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              interface_repository = CORBA::Repository::_narrow(ifr_obj_var.in ());
 
               if (CORBA::is_nil(interface_repository.in () ))
                 {
@@ -367,18 +344,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                                                 this->factory_,
                                                                 this->terminate_flag_);
 
-          this->typed_ec_impl_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->typed_ec_impl_->activate ();
 
           CosTypedEventChannelAdmin::TypedEventChannel_var event_channel =
-            this->typed_ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->typed_ec_impl_->_this ();
 
           if (ior_file != 0)
             {
               CORBA::String_var ior =
-                orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->object_to_string (event_channel.in ());
 
               FILE *iorf = ACE_OS::fopen (ior_file, ACE_TEXT("w"));
               if (iorf != 0)
@@ -407,14 +381,10 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
           if (this->bind_to_naming_service_)
             {
               CORBA::Object_var obj =
-                orb->resolve_initial_references ("NameService"
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->resolve_initial_references ("NameService");
 
               this->naming_context_ =
-                CosNaming::NamingContext::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CosNaming::NamingContext::_narrow (obj.in ());
 
               this->channel_name_.length (1);
               this->channel_name_[0].id = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(service_name));
@@ -422,16 +392,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
               if (use_rebind)
                 {
                   this->naming_context_->rebind (this->channel_name_,
-                                                 event_channel.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                                 event_channel.in ());
                 }
               else
                 {
                   this->naming_context_->bind (this->channel_name_,
-                                               event_channel.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                               event_channel.in ());
                 }
             }
           return CosTypedEventChannelAdmin::TypedEventChannel::_duplicate (event_channel.in () );
@@ -440,12 +406,11 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
 
       // ****************************************************************
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, argv[0]);
+      ex._tao_print_exception (argv[0]);
       return CORBA::Object::_nil ();
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -454,62 +419,49 @@ TAO_CEC_Event_Loader::fini (void)
   //   + Since it was activated with _this() you have to do the
   //   canonical:
   //     get_object_id
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
       if(this->typed_ec_impl_)
         {
           // Release the resources of the Typed Event Channel
-          this->typed_ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->typed_ec_impl_->destroy ();
 
           // Deactivate the Typed EC
           // This will raise an exception if destroy == 1
           PortableServer::POA_var t_poa =
-          this->typed_ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->typed_ec_impl_->_default_POA ();
 
           PortableServer::ObjectId_var t_id =
-          t_poa->servant_to_id (this->typed_ec_impl_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          t_poa->servant_to_id (this->typed_ec_impl_);
 
-          t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          t_poa->deactivate_object (t_id.in ());
         }
 #else
       // Release the resources of the Event Channel
-      this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->ec_impl_->destroy ();
 
       // Deactivate the EC
       PortableServer::POA_var poa =
-        this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->ec_impl_->_default_POA ();
 
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this->ec_impl_);
 
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->deactivate_object (id.in ());
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Do Nothing
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
-  ACE_TRY_EX (foo)
+  try
     {
       // Unbind the Naming Service
       if (this->bind_to_naming_service_)
         {
-          this->naming_context_->unbind (this->channel_name_
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          this->naming_context_->unbind (this->channel_name_);
         }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -520,13 +472,11 @@ TAO_CEC_Event_Loader::fini (void)
       delete this->attributes_;
       delete this->ec_impl_;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Do Nothing
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index 28bfe57bad7..4af10142439 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -59,8 +59,7 @@ public:
    */
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[]
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 41f29d8a59e..487c4079285 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -63,45 +63,41 @@ TAO_CEC_MT_Dispatching::shutdown (void)
 
 void
 TAO_CEC_MT_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy,
-                              const CORBA::Any& event
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::Any& event)
 {
   CORBA::Any event_copy = event;
-  this->push_nocopy (proxy, event_copy ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, event_copy);
 }
 
 void
 TAO_CEC_MT_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                     CORBA::Any& event
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Any& event)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.push (proxy, event ACE_ENV_ARG_PARAMETER);
+  this->task_.push (proxy, event);
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
 TAO_CEC_MT_Dispatching::invoke (TAO_CEC_ProxyPushSupplier* proxy,
-                                const TAO_CEC_TypedEvent& typed_event
-                                ACE_ENV_ARG_DECL)
+                                const TAO_CEC_TypedEvent& typed_event)
 {
   TAO_CEC_TypedEvent typed_event_copy = typed_event;
-  this->invoke_nocopy (proxy, typed_event_copy ACE_ENV_ARG_PARAMETER);
+  this->invoke_nocopy (proxy, typed_event_copy);
 }
 
 void
 TAO_CEC_MT_Dispatching::invoke_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                       TAO_CEC_TypedEvent& typed_event
-                                       ACE_ENV_ARG_DECL)
+                                       TAO_CEC_TypedEvent& typed_event)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.invoke (proxy, typed_event ACE_ENV_ARG_PARAMETER);
+  this->task_.invoke (proxy, typed_event);
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index 458110cad9a..1d393773576 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -51,18 +51,14 @@ public:
   virtual void activate (void);
   virtual void shutdown (void);
   virtual void push (TAO_CEC_ProxyPushSupplier* proxy,
-                     const CORBA::Any & event
-                     ACE_ENV_ARG_DECL);
+                     const CORBA::Any & event);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                            CORBA::Any& event
-                            ACE_ENV_ARG_DECL);
+                            CORBA::Any& event);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   virtual void invoke (TAO_CEC_ProxyPushSupplier *proxy,
-                       const TAO_CEC_TypedEvent & typed_event
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       const TAO_CEC_TypedEvent & typed_event);
   virtual void invoke_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                              TAO_CEC_TypedEvent & typed_event
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              TAO_CEC_TypedEvent & typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index ba48e98cea8..53a57550bd7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -44,47 +44,40 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
 
 void
 TAO_CEC_ProxyPullConsumer::activate (
-    CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullConsumer_var result;
-  ACE_TRY
+  try
     {
-      result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       result = CosEventChannelAdmin::ProxyPullConsumer::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy = result._retn ();
 }
 
 void
-TAO_CEC_ProxyPullConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 // NOTE: There is some amount of duplicated code here, but it is
@@ -94,8 +87,7 @@ TAO_CEC_ProxyPullConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any*
 TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
-    CORBA::Boolean_out has_event
-    ACE_ENV_ARG_DECL)
+    CORBA::Boolean_out has_event)
 {
   has_event = 0;
   CosEventComm::PullSupplier_var supplier;
@@ -104,7 +96,6 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
             ACE_Lock, ace_mon, *this->lock_,
             CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK_RETURN (0);
 
     if (this->is_connected_i () == 0)
       return 0; // ACE_THROW (CosEventComm::Disconnected ());????
@@ -120,37 +111,31 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
   TAO_CEC_SupplierControl *control =
                  this->event_channel_->supplier_control ();
 
-  ACE_TRY
+  try
     {
-      any = supplier->try_pull (has_event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      any = supplier->try_pull (has_event);
 
       // Inform the control that we got something from the supplier
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
-      control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      control->supplier_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ Should not happen
     }
-  ACE_ENDTRY;
   return any._retn ();
 }
 
 CORBA::Any*
-TAO_CEC_ProxyPullConsumer::pull_from_supplier (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::pull_from_supplier ()
 {
   CosEventComm::PullSupplier_var supplier;
   {
@@ -158,7 +143,6 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier (
             ACE_Lock, ace_mon, *this->lock_,
             CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK_RETURN (0);
 
     if (this->is_connected_i () == 0)
       return 0; // ACE_THROW (CosEventComm::Disconnected ());????
@@ -171,31 +155,27 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier (
   }
 
   CORBA::Any_var any;
-  ACE_TRY
+  try
     {
-      any = supplier->pull (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      any = supplier->pull ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ This is where the policies for misbehaving suppliers
       //    should kick in.... for the moment just ignore them.
     }
-  ACE_ENDTRY;
   return any._retn ();
 }
 
 CORBA::Boolean
 TAO_CEC_ProxyPullConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var supplier;
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
-    ACE_CHECK_RETURN (0);
 
     disconnected = 0;
     if (this->is_connected_i () == 0)
@@ -211,14 +191,14 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return supplier->_non_existent ();
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_CEC_ProxyPullConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::shutdown (void)
 {
   CosEventComm::PullSupplier_var supplier;
 
@@ -227,28 +207,24 @@ TAO_CEC_ProxyPullConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     supplier = this->supplier_._retn ();
   }
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 
   if (CORBA::is_nil (supplier.in ()))
     return;
 
-  ACE_TRY
+  try
     {
-      supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier->disconnect_pull_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions, we must isolate other clients from
       // failures on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -282,26 +258,24 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
-      CosEventComm::PullSupplier_ptr pull_supplier
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PullSupplier_ptr pull_supplier)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
   // Nil PullSuppliers are illegal
   if (CORBA::is_nil (pull_supplier))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i ())
       {
         if (this->event_channel_->supplier_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed, go ahead and disconnect the
         // consumer...
@@ -316,10 +290,8 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
               TAO_CEC_Unlock, ace_mon, reverse_lock,
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
 
-          this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->event_channel_->disconnected (this);
         }
 
         // What if a second thread connected us after this?
@@ -330,7 +302,7 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 CosEventComm::PullSupplier_ptr
@@ -361,8 +333,7 @@ TAO_CEC_ProxyPullConsumer::apply_policy (CosEventComm::PullSupplier_ptr pre)
 }
 
 void
-TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullSupplier_var supplier;
@@ -372,10 +343,9 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
+      throw CORBA::BAD_INV_ORDER (); // @@ add user exception?
 
     supplier = this->supplier_._retn ();
 
@@ -383,39 +353,36 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->disconnected (this);
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
-          supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          supplier->disconnect_pull_supplier ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore exceptions, we must isolate other clients from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPullConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullConsumer::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPullConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullConsumer::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullConsumer::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 033e4e5476f..4ef91c2091b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -58,12 +58,11 @@ public:
 
   /// Activate in the POA
   virtual void  activate (
-      CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy
-      ACE_ENV_ARG_DECL)
+      CosEventChannelAdmin::ProxyPullConsumer_ptr &activated_proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no supplier is connected...
@@ -74,20 +73,18 @@ public:
   CosEventComm::PullSupplier_ptr supplier (void) const;
 
   /// Pulls from the supplier, verifies that it is connected.
-  CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event
-                                      ACE_ENV_ARG_DECL);
-  CORBA::Any* pull_from_supplier (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event);
+  CORBA::Any* pull_from_supplier (void);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (void);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
@@ -95,17 +92,16 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPullConsumer methods...
   virtual void connect_pull_supplier (
-                CosEventComm::PullSupplier_ptr pull_supplier
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PullSupplier_ptr pull_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
-  virtual void disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_pull_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
 protected:
   /// Set the supplier, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index ecadbc25ecf..8098635c66e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -43,51 +43,44 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void)
 
 void
 TAO_CEC_ProxyPullSupplier::activate (
-    CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullSupplier_var result;
-  ACE_TRY
+  try
     {
-      result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       result = CosEventChannelAdmin::ProxyPullSupplier::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy = result._retn ();
 }
 
 void
-TAO_CEC_ProxyPullSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_CEC_ProxyPullSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::shutdown (void)
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -98,41 +91,35 @@ TAO_CEC_ProxyPullSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     consumer = this->consumer_._retn ();
   }
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 
   if (CORBA::is_nil (consumer.in ()))
     return;
 
-  ACE_TRY
+  try
     {
-      consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->disconnect_pull_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions, we must isolate other clients from
       // problems on this one.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
 TAO_CEC_ProxyPullSupplier::consumer_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var consumer;
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
-    ACE_CHECK_RETURN (0);
 
     disconnected = 0;
     if (this->is_connected_i () == 0)
@@ -148,15 +135,14 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer->_non_existent ();
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event)
 {
   if (this->is_connected () == 0)
     return;
@@ -170,7 +156,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event
 }
 
 CORBA::Any *
-TAO_CEC_ProxyPullSupplier::pull (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::pull (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventComm::Disconnected))
 {
@@ -191,8 +177,7 @@ TAO_CEC_ProxyPullSupplier::pull (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any *
-TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   has_event = 0;
@@ -247,8 +232,7 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
-      CosEventComm::PullConsumer_ptr pull_consumer
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PullConsumer_ptr pull_consumer)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -257,12 +241,11 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i ())
       {
         if (this->event_channel_->consumer_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed....
         this->cleanup_i ();
@@ -277,10 +260,8 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
               TAO_CEC_Unlock, ace_mon, reverse_lock,
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
 
-          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->event_channel_->reconnected (this);
         }
         return;
       }
@@ -290,7 +271,7 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 CosEventComm::PullConsumer_ptr
@@ -322,8 +303,7 @@ TAO_CEC_ProxyPullSupplier::apply_policy (CosEventComm::PullConsumer_ptr pre)
 }
 
 void
-TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullConsumer_var consumer;
@@ -333,10 +313,9 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
 
     consumer = this->consumer_._retn ();
 
@@ -344,44 +323,40 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->disconnected (this);
 
   if (CORBA::is_nil (consumer.in ()))
     return;
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
-          consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer->disconnect_pull_consumer ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // problems on this one.
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ProxySupplier::disconnect_pull_supplier");
+          ex._tao_print_exception ("ProxySupplier::disconnect_pull_supplier");
         }
-      ACE_ENDTRY;
     }
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPullSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPullSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index fa84ba336da..534549e1859 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -65,12 +65,11 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy
-      ACE_ENV_ARG_DECL)
+      CosEventChannelAdmin::ProxyPullSupplier_ptr &activated_proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no consumer is connected...
@@ -85,32 +84,28 @@ public:
   CosEventComm::PullConsumer_ptr consumer (void) const;
 
   /// The event channel is shutting down
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected);
 
   /// Push an event into the queue.
-  void push (const CORBA::Any &event
-             ACE_ENV_ARG_DECL);
+  void push (const CORBA::Any &event);
 
   // = The CosEventChannelAdmin::ProxyPullSupplier methods...
   virtual void connect_pull_consumer (
-                CosEventComm::PullConsumer_ptr pull_consumer
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PullConsumer_ptr pull_consumer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
-  virtual CORBA::Any * pull (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Any * pull (void)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual void disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_pull_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Increment and decrement the reference count.
@@ -118,9 +113,9 @@ public:
   CORBA::ULong _decr_refcnt (void);
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
 protected:
   /// Set the consumer, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index c65d0968f98..6fad8240c31 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -44,60 +44,51 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void)
 
 void
 TAO_CEC_ProxyPushConsumer::activate (
-    CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_var result;
-  ACE_TRY
+  try
     {
-      result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       result  =  CosEventChannelAdmin::ProxyPushConsumer::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy =  result._retn ();
 }
 
 void
-TAO_CEC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
 TAO_CEC_ProxyPushConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var supplier;
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
-    ACE_CHECK_RETURN (0);
 
     disconnected = false;
     if (!this->is_connected_i ())
@@ -113,14 +104,14 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return supplier->_non_existent ();
 #else
   return false;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::shutdown (void)
 {
   CosEventComm::PushSupplier_var supplier;
 
@@ -129,29 +120,25 @@ TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     supplier = this->supplier_._retn ();
     this->connected_ = false;
   }
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 
   if (CORBA::is_nil (supplier.in ()))
     return;
 
-  ACE_TRY
+  try
     {
-      supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions, we must isolate other clients from
       // failures on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -186,8 +173,7 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPushConsumer::connect_push_supplier (
-      CosEventComm::PushSupplier_ptr push_supplier
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PushSupplier_ptr push_supplier)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -196,12 +182,11 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i ())
       {
         if (this->event_channel_->supplier_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed, go ahead and disconnect the
         // consumer...
@@ -216,10 +201,8 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
               TAO_CEC_Unlock, ace_mon, reverse_lock,
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
 
-          this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->event_channel_->disconnected (this);
         }
 
         // What if a second thread connected us after this?
@@ -231,7 +214,7 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 CosEventComm::PushSupplier_ptr
@@ -263,8 +246,7 @@ TAO_CEC_ProxyPushConsumer::apply_policy (CosEventComm::PushSupplier_ptr pre)
 }
 
 void
-TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -274,14 +256,11 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event
   if (!ace_mon.locked ())
     return;
 
-  this->event_channel_->consumer_admin ()->push (event
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->consumer_admin ()->push (event);
 }
 
 void
-TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushSupplier_var supplier;
@@ -291,10 +270,9 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (!this->is_connected_i ())
-      ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
+      throw CORBA::BAD_INV_ORDER (); // @@ add user exception?
 
     supplier = this->supplier_._retn ();
 
@@ -302,42 +280,39 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->disconnected (this);
 
   if (CORBA::is_nil (supplier.in ()))
     return;
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
-          supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          supplier->disconnect_push_supplier ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore exceptions, we must isolate other clients from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushConsumer::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushConsumer::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushConsumer::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 574670778c5..9ea04838f5d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -60,12 +60,11 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy
-      ACE_ENV_ARG_DECL)
+      CosEventChannelAdmin::ProxyPushConsumer_ptr &activated_proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return false if no supplier is connected...
@@ -80,11 +79,10 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (void);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
@@ -92,20 +90,18 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
-                CosEventComm::PushSupplier_ptr push_supplier
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PushSupplier_ptr push_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
-  virtual void push (const CORBA::Any& event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const CORBA::Any& event)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
 protected:
   /// Set the supplier, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index b213428c4ed..cab237cbb77 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -97,51 +97,44 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void)
 
 void
 TAO_CEC_ProxyPushSupplier::activate (
-    CosEventChannelAdmin::ProxyPushSupplier_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::ProxyPushSupplier_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_var result;
-  ACE_TRY
+  try
     {
-      result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       result = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy = result._retn ();
 }
 
 void
-TAO_CEC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::shutdown (void)
 {
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   if (this->is_typed_ec () )
@@ -154,28 +147,24 @@ TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
             ACE_Lock, ace_mon, *this->lock_,
             CORBA::INTERNAL ());
         // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-        ACE_CHECK;
 
         typed_consumer = this->typed_consumer_._retn ();
       }
 
-      this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->deactivate ();
 
       if (CORBA::is_nil (typed_consumer.in ()))
         return;
 
-      ACE_TRY_EX (typed)
+      try
         {
-          typed_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (typed);
+          typed_consumer->disconnect_push_consumer ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore exceptions, we must isolate other clients from
           // problems on this one.
         }
-      ACE_ENDTRY;
     } /* this->is_typed_ec */
   else
     {
@@ -190,28 +179,24 @@ TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     consumer = this->consumer_._retn ();
   }
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 
   if (CORBA::is_nil (consumer.in ()))
     return;
 
-  ACE_TRY
+  try
     {
-      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions, we must isolate other clients from
       // problems on this one.
     }
-  ACE_ENDTRY;
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     } /* ! this->is_typed_ec */
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
@@ -220,8 +205,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 typedef TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier> Destroy_Guard;
 
 void
-TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
-                                 ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -240,9 +224,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
 
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->event_channel_->dispatching ()->push (this,
-                                                  event
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                  event);
     }
   }
 }
@@ -251,8 +233,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
 typedef TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_TypedEventChannel,TAO_CEC_ProxyPushSupplier> Destroy_Guard_Typed;
 
 void
-TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event
-                                   ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event)
 {
   Destroy_Guard_Typed auto_destroy (this->refcount_,
                                     this->typed_event_channel_,
@@ -271,17 +252,14 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event
 
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->typed_event_channel_->dispatching ()->invoke (this,
-                                                          typed_event
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                          typed_event);
     }
   }
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 void
-TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -300,9 +278,7 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event
 
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->event_channel_->dispatching ()->push_nocopy (this,
-                                                         event
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                         event);
     }
   }
 }
@@ -353,15 +329,14 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPushSupplier::connect_push_consumer (
-      CosEventComm::PushConsumer_ptr push_consumer
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PushConsumer_ptr push_consumer)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected,
                      CosEventChannelAdmin::TypeError))
 {
   // Nil PushConsumers are illegal
   if (CORBA::is_nil (push_consumer))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   {
 
@@ -381,33 +356,27 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
         // _is_a (during _narrow) and get_typed_consumer invocations.
         // They are eventually assigned onto this object inside the Guard.
         CosTypedEventComm::TypedPushConsumer_var local_typed_consumer =
-          CosTypedEventComm::TypedPushConsumer::_narrow (push_consumer
-                                                         ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          CosTypedEventComm::TypedPushConsumer::_narrow (push_consumer);
 
         // Obtain the typed object interface from the consumer
         CORBA::Object_var local_typed_consumer_obj =
-          CORBA::Object::_duplicate (local_typed_consumer->get_typed_consumer (
-                                             ACE_ENV_SINGLE_ARG_PARAMETER) );
-        ACE_CHECK;
+          CORBA::Object::_duplicate (local_typed_consumer->get_typed_consumer () );
 
         {
           ACE_GUARD_THROW_EX (
               ACE_Lock, ace_mon, *this->lock_,
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
 
           if (this->is_connected_i ())
             {
               if (this->typed_event_channel_->consumer_reconnect () == 0)
-                ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+                throw CosEventChannelAdmin::AlreadyConnected ();
 
               // Re-connections are allowed....
               this->cleanup_i ();
 
               this->typed_consumer_ = apply_policy (local_typed_consumer.in () );
-              ACE_CHECK;
 
               TAO_CEC_Unlock reverse_lock (*this->lock_);
 
@@ -416,27 +385,22 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
                     TAO_CEC_Unlock, ace_mon, reverse_lock,
                     CORBA::INTERNAL ());
                 // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-                ACE_CHECK;
 
-                this->typed_event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
+                this->typed_event_channel_->reconnected (this);
               }
               return;
 
             }
 
           this->typed_consumer_ = apply_policy (local_typed_consumer.in () );
-          ACE_CHECK;
 
           // Store the typed object interface from the consumer
           this->typed_consumer_obj_ =
             apply_policy_obj (local_typed_consumer_obj.in () );
-          ACE_CHECK;
         }
 
         // Notify the event channel...
-        this->typed_event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        this->typed_event_channel_->connected (this);
 
       } /* this->is_typed_ec */
     else
@@ -456,12 +420,11 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i ())
       {
         if (this->event_channel_->consumer_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed....
         this->cleanup_i ();
@@ -475,10 +438,8 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
               TAO_CEC_Unlock, ace_mon, reverse_lock,
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
 
-          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->event_channel_->reconnected (this);
         }
         return;
       }
@@ -487,8 +448,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->connected (this);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
       } /* ! this->is_typed_ec */
@@ -551,8 +511,7 @@ TAO_CEC_ProxyPushSupplier::apply_policy
 #endif
 
 void
-TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushConsumer_var consumer;
@@ -565,10 +524,9 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     if (this->is_typed_ec () )
@@ -590,17 +548,14 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   if (this->is_typed_ec () )
     {
-      this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->typed_event_channel_->disconnected (this);
     }
   else
     {
-      this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->event_channel_->disconnected (this);
     }
 #else
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->disconnected (this);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   // Disconnect callbacks
@@ -609,19 +564,17 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
     {
       if (this->typed_event_channel_->disconnect_callbacks ())
         {
-          ACE_TRY_EX (typed)
+          try
             {
-              typed_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (typed);
+              typed_consumer->disconnect_push_consumer ();
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
               // Ignore exceptions, we must isolate other clients from
               // problems on this one.
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "ProxySupplier::disconnect_push_supplier");
+              ex._tao_print_exception (
+                "ProxySupplier::disconnect_push_supplier");
             }
-          ACE_ENDTRY;
         }
     } /* this->is_typed_ec */
   else
@@ -630,19 +583,16 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
-          consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer->disconnect_push_consumer ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // problems on this one.
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ProxySupplier::disconnect_push_supplier");
+          ex._tao_print_exception ("ProxySupplier::disconnect_push_supplier");
         }
-      ACE_ENDTRY;
     }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -651,8 +601,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
 }
 
 void
-TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
-                                             ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event)
 {
   CosEventComm::PushConsumer_var consumer;
   {
@@ -660,7 +609,6 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
             ACE_Lock, ace_mon, *this->lock_,
             CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i () == 0)
       return; // ACE_THROW (CosEventComm::Disconnected ());????
@@ -671,37 +619,31 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
 
   TAO_CEC_ConsumerControl *control =
                this->event_channel_->consumer_control ();
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->push (event);
 
       // Inform the control that we were able to push something
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
-      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Shouldn't happen, but does not hurt
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
-    const CORBA::Any& event
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any& event)
 {
   CosEventComm::PushConsumer_var consumer;
   {
@@ -716,46 +658,42 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
   TAO_CEC_ConsumerControl *control =
                   this->event_channel_->consumer_control ();
 
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->push (event);
 
       // Inform the control that we were able to push something
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
        if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer");
+          not_used._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer");
         }
-     control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+     control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (sysex, "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer");
+          sysex._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer");
         }
 
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Shouldn't happen, but does not hurt
     }
-  ACE_ENDTRY;
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
-TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event
-                                               ACE_ENV_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event)
 {
   CORBA::Object_var typed_consumer_obj;
 
@@ -767,7 +705,6 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
             ACE_Lock, ace_mon, *this->lock_,
             CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i () == 0)
       return; // ACE_THROW (CosEventComm::Disconnected ());????
@@ -780,7 +717,7 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
                this->typed_event_channel_->consumer_control ();
 
   // Create the DII request
-  ACE_TRY
+  try
     {
       typed_consumer_obj_->_create_request (0, // ctx
                                             typed_event.operation_,
@@ -789,53 +726,47 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
                                             0, // exception_list,
                                             0, // context_list,
                                             target_request.inout(),
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Call the DII invoke for the operation on the target object
-      target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      target_request->invoke ();
 
       // Inform the control that we were able to invoke something
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
+          not_used._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
         }
-      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (sysex, "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
+          sysex._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
         }
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Shouldn't happen, but does not hurt
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ACE_ANY_EXCEPTION raised during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
+          ex._tao_print_exception (
+            "ex raised during TAO_CEC_ProxyPushSupplier::invoke_to_consumer");
         }
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
-    const TAO_CEC_TypedEvent& typed_event
-    ACE_ENV_ARG_DECL)
+    const TAO_CEC_TypedEvent& typed_event)
 {
   CORBA::Object_var typed_consumer_obj;
 
@@ -861,7 +792,7 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
                   this->typed_event_channel_->consumer_control ();
 
   // Create the DII request
-  ACE_TRY
+  try
     {
       typed_consumer_obj_->_create_request (0, // ctx
                                             typed_event.operation_,
@@ -870,60 +801,53 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
                                             0, // exception_list,
                                             0, // context_list,
                                             target_request.inout(),
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Call the DII invoke for the operation on the target object
-      target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      target_request->invoke ();
 
       // Inform the control that we were able to invoke something
       control->successful_transmission(this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST& not_used)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (not_used, "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
+          not_used._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
         }
-      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (sysex, "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
+          sysex._tao_print_exception (
+            "during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
         }
       control->system_exception (this,
-                                 sysex
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ACE_ANY_EXCEPTION raised during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
+          ex._tao_print_exception (
+            "ex raised during TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer");
         }
     }
-  ACE_ENDTRY;
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 CORBA::Boolean
 TAO_CEC_ProxyPushSupplier::consumer_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var consumer;
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
-    ACE_CHECK_RETURN (0);
 
     disconnected = 0;
     if (this->is_connected_i () == 0)
@@ -956,26 +880,26 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer->_non_existent ();
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushSupplier::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushSupplier::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushSupplier::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index d6fd0f41987..a5f7531a37b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -76,12 +76,11 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosEventChannelAdmin::ProxyPushSupplier_ptr &
-      ACE_ENV_ARG_DECL)
+      CosEventChannelAdmin::ProxyPushSupplier_ptr &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no consumer is connected...
@@ -96,29 +95,22 @@ public:
   CosEventComm::PushConsumer_ptr consumer (void) const;
 
   /// The event channel is shutting down
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
   /// Internal methods to push an event to each consumer.
-  virtual void push (const CORBA::Any &event
-                     ACE_ENV_ARG_DECL);
-  virtual void push_nocopy (CORBA::Any &event
-                            ACE_ENV_ARG_DECL);
+  virtual void push (const CORBA::Any &event);
+  virtual void push_nocopy (CORBA::Any &event);
   /// Internal methods to invoke a typed event to each consumer.
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-  virtual void invoke (const TAO_CEC_TypedEvent& typed_event
-                       ACE_ENV_ARG_DECL);
+  virtual void invoke (const TAO_CEC_TypedEvent& typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /// Pushes to the consumer, verifies that it is connected.
-  void push_to_consumer (const CORBA::Any &event
-                         ACE_ENV_ARG_DECL);
-  void reactive_push_to_consumer (const CORBA::Any &event
-                                  ACE_ENV_ARG_DECL);
+  void push_to_consumer (const CORBA::Any &event);
+  void reactive_push_to_consumer (const CORBA::Any &event);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-  void invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event
-                           ACE_ENV_ARG_DECL);
-  void reactive_invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event
-                                    ACE_ENV_ARG_DECL);
+  void invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event);
+  void reactive_invoke_to_consumer (const TAO_CEC_TypedEvent &typed_event);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /**
@@ -126,17 +118,15 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected);
 
   // = The CosEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
-                CosEventComm::PushConsumer_ptr push_consumer
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PushConsumer_ptr push_consumer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Increment and decrement the reference count.
@@ -144,9 +134,9 @@ public:
   CORBA::ULong _decr_refcnt (void);
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
 protected:
   /// Set the consumer, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index 791dda5c1d2..8c1fd3efb1a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -56,12 +56,9 @@ public:
 
 #if 0
   /// Some strategies may want to keep track of connected consumers.
-  virtual void connected (TAO_CEC_ProxyPullConsumer *
-                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
-  virtual void reconnected (TAO_CEC_ProxyPullConsumer *
-                            ACE_ENV_ARG_DECL_NOT_USED) = 0;
-  virtual void diconnected (TAO_CEC_ProxyPullConsumer *
-                            ACE_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void connected (TAO_CEC_ProxyPullConsumer *) = 0;
+  virtual void reconnected (TAO_CEC_ProxyPullConsumer *) = 0;
+  virtual void diconnected (TAO_CEC_ProxyPullConsumer *) = 0;
 #endif /* 0 */
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index d6c54e6d063..edefe1fccab 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -2,7 +2,7 @@
 
 // Note: This class controls the behaviour of consumers connected to both
 // the Typed and Un-typed Event Channels.  A check must be made in the code
-// to ensure the correct EC is referenced. 
+// to ensure the correct EC is referenced.
 
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
@@ -93,8 +93,7 @@ TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl (void)
 }
 
 void
-TAO_CEC_Reactive_ConsumerControl::query_consumers (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_Reactive_ConsumerControl::query_consumers ()
 {
   TAO_CEC_Ping_Push_Consumer push_worker (this);
 
@@ -102,23 +101,17 @@ TAO_CEC_Reactive_ConsumerControl::query_consumers (
   if (this->typed_event_channel_)
     {
       // Typed EC
-      this->typed_event_channel_->typed_consumer_admin ()->for_each (&push_worker
-                                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->typed_event_channel_->typed_consumer_admin ()->for_each (&push_worker);
     }
   else
     {
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   // Un-typed EC
-  this->event_channel_->consumer_admin ()->for_each (&push_worker
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->consumer_admin ()->for_each (&push_worker);
 
   TAO_CEC_Ping_Pull_Consumer pull_worker (this);
-  this->event_channel_->consumer_admin ()->for_each (&pull_worker
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->consumer_admin ()->for_each (&pull_worker);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     }
@@ -208,67 +201,53 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout (
       const ACE_Time_Value &,
       const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::ADD_OVERRIDE);
 
-      ACE_TRY_EX (query)
+      try
         {
           // Query the state of the consumers...
-          this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (query);
+          this->query_consumers ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_CEC_Reactive_ConsumerControl::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Pre-compute the policy list to the set the right timeout
       // value...
@@ -283,9 +262,7 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -301,11 +278,10 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
          return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -325,13 +301,11 @@ TAO_CEC_Reactive_ConsumerControl::shutdown (void)
 
 void
 TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_CEC_ProxyPushSupplier *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_ProxyPushSupplier *proxy)
 {
-  ACE_TRY
+  try
     {
-      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_supplier ();
 
       if (TAO_debug_level >= 10)
         {
@@ -339,46 +313,40 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
                       ACE_TEXT ("ProxyPushSupplier disconnected due to consumer_not_exist\n")));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist"));
+      ex._tao_print_exception (
+        ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist"));
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_CEC_ProxyPullSupplier *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_ProxyPullSupplier *proxy)
 {
-  ACE_TRY
+  try
     {
-      proxy->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_pull_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist"));
+      ex._tao_print_exception (
+        ACE_TEXT ("Reactive_ConsumerControl::consumer_not_exist"));
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_Reactive_ConsumerControl::system_exception (
       TAO_CEC_ProxyPushSupplier *proxy,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       if (this->need_to_disconnect (proxy))
         {
-          proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          proxy->disconnect_push_supplier ();
 
           if (TAO_debug_level >= 10)
             {
@@ -387,11 +355,10 @@ TAO_CEC_Reactive_ConsumerControl::system_exception (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
@@ -414,79 +381,65 @@ TAO_CEC_ConsumerControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier->consumer_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->control_->consumer_not_exist (supplier);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (supplier))
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier->consumer_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->control_->consumer_not_exist (supplier);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (supplier))
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 16f6923d049..2b185f00534 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -111,13 +111,10 @@ public:
   // = Documented in TAO_CEC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy);
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
   /// Do we need to disconnect this supplier?  The parameter type for
   /// proxy is PortableServer::ServantBase* due to the fact that this
@@ -131,7 +128,7 @@ public:
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  void query_consumers (void);
 
 private:
   /// The polling rate
@@ -180,8 +177,7 @@ class TAO_CEC_Ping_Push_Consumer
 public:
   TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control);
 
-  virtual void work (TAO_CEC_ProxyPushSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPushSupplier *supplier);
 
 private:
   TAO_CEC_ConsumerControl *control_;
@@ -195,8 +191,7 @@ class TAO_CEC_Ping_Pull_Consumer
 public:
   TAO_CEC_Ping_Pull_Consumer (TAO_CEC_ConsumerControl *control);
 
-  virtual void work (TAO_CEC_ProxyPullSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPullSupplier *supplier);
 
 private:
   TAO_CEC_ConsumerControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index fd58a376e20..4c695f29823 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -50,52 +50,41 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout (
       const ACE_Time_Value &,
       const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::ADD_OVERRIDE);
 
-      ACE_TRY_EX (query)
+      try
         {
           TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (),
                                      this->event_channel_->supplier_control ());
 
-          this->event_channel_->supplier_admin ()->for_each (&worker
-                                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (query);
+          this->event_channel_->supplier_admin ()->for_each (&worker);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -109,18 +98,14 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
   if (timer_id_ == -1)
     return;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Pre-compute the policy list to the set the right timeout
       // value...
@@ -135,14 +120,11 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+               any);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 }
 
@@ -175,29 +157,24 @@ TAO_CEC_Pulling_Strategy_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
-                          ACE_ENV_ARG_DECL)
+TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer)
 {
   CORBA::Boolean has_event = 0;
   CORBA::Any_var any;
 
-  ACE_TRY
+  try
     {
-      any = consumer->try_pull_from_supplier (has_event
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      any = consumer->try_pull_from_supplier (has_event);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
       return;
     }
-  ACE_ENDTRY;
 
   if (has_event)
     {
-      this->consumer_admin_->push (any.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumer_admin_->push (any.in ());
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index 43a8735e82b..feba800d772 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -129,8 +129,7 @@ public:
   TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin,
                       TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_ProxyPullConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPullConsumer *consumer);
 
 private:
   /// Used to propagate the events.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index cd355c6c968..e819882e7ce 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -2,7 +2,7 @@
 
 // Note: This class controls the behaviour of suppliers connected to both
 // the Typed and Un-typed Event Channels.  A check must be made in the code
-// to ensure the correct EC is referenced. 
+// to ensure the correct EC is referenced.
 
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_SupplierAdmin.h"
@@ -94,8 +94,7 @@ TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl (void)
 }
 
 void
-TAO_CEC_Reactive_SupplierControl::query_suppliers (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_Reactive_SupplierControl::query_suppliers ()
 {
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
   if (this->typed_event_channel_)
@@ -103,9 +102,7 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers (
       // Typed EC
       TAO_CEC_Ping_Typed_Push_Supplier push_worker (this);
 
-      this->typed_event_channel_->typed_supplier_admin ()->for_each (&push_worker
-                                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->typed_event_channel_->typed_supplier_admin ()->for_each (&push_worker);
     }
   else
     {
@@ -113,14 +110,10 @@ TAO_CEC_Reactive_SupplierControl::query_suppliers (
 
   // Un-typed EC
   TAO_CEC_Ping_Push_Supplier push_worker (this);
-  this->event_channel_->supplier_admin ()->for_each (&push_worker
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->supplier_admin ()->for_each (&push_worker);
 
   TAO_CEC_Ping_Pull_Supplier pull_worker (this);
-  this->event_channel_->supplier_admin ()->for_each (&pull_worker
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->supplier_admin ()->for_each (&pull_worker);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
     }
@@ -209,67 +202,53 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout (
       const ACE_Time_Value &,
       const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::ADD_OVERRIDE);
 
-      ACE_TRY_EX (query)
+      try
         {
           // Query the state of the suppliers...
-          this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (query);
+          this->query_suppliers ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_CEC_Reactive_SupplierControl::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Pre-compute the policy list to the set the right timeout
       // value...
@@ -284,9 +263,7 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -302,11 +279,10 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -326,76 +302,64 @@ TAO_CEC_Reactive_SupplierControl::shutdown (void)
 
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_CEC_ProxyPushConsumer *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_ProxyPushConsumer *proxy)
 {
-  ACE_TRY
+  try
     {
-      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_CEC_TypedProxyPushConsumer *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_TypedProxyPushConsumer *proxy)
 {
-  ACE_TRY
+  try
     {
-      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_CEC_ProxyPullConsumer *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_CEC_ProxyPullConsumer *proxy)
 {
-  ACE_TRY
+  try
     {
-      proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_pull_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_CEC_Reactive_SupplierControl::system_exception (
       TAO_CEC_ProxyPullConsumer *proxy,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       if (this->need_to_disconnect (proxy))
         {
-          proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          proxy->disconnect_pull_consumer ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
@@ -418,120 +382,99 @@ TAO_CEC_SupplierControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer->supplier_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (consumer))
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
-TAO_CEC_Ping_Typed_Push_Supplier::work (TAO_CEC_TypedProxyPushConsumer *consumer
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Typed_Push_Supplier::work (TAO_CEC_TypedProxyPushConsumer *consumer)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer->supplier_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (consumer))
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer->supplier_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& )
     {
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT& )
     {
       if (this->control_->need_to_disconnect (consumer))
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index da0433e2385..09960543375 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -109,17 +109,13 @@ public:
   // = Documented in TAO_CEC_SupplierControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy);
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-  virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
-  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy);
   virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
   /// Do we need to disconnect this supplier?  The parameter type for
   /// proxy is PortableServer::ServantBase* due to the fact that this
@@ -133,7 +129,7 @@ public:
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void query_suppliers (void);
 
 private:
   /// The polling rate
@@ -181,8 +177,7 @@ class TAO_CEC_Ping_Push_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPushConsum
 public:
   TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPushConsumer *consumer);
 
 private:
   TAO_CEC_SupplierControl *control_;
@@ -196,8 +191,7 @@ class TAO_CEC_Ping_Typed_Push_Supplier : public TAO_ESF_Worker<TAO_CEC_TypedProx
 public:
   TAO_CEC_Ping_Typed_Push_Supplier (TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_TypedProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_TypedProxyPushConsumer *consumer);
 
 private:
   TAO_CEC_SupplierControl *control_;
@@ -211,8 +205,7 @@ class TAO_CEC_Ping_Pull_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPullConsum
 public:
   TAO_CEC_Ping_Pull_Supplier (TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_ProxyPullConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_CEC_ProxyPullConsumer *consumer);
 
 private:
   TAO_CEC_SupplierControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index 6735b37cf40..a0c900ff46a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -31,75 +31,67 @@ TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void)
 }
 
 PortableServer::POA_ptr
-TAO_CEC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_SupplierAdmin::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer)
 {
-  this->push_admin_.connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.connected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer)
 {
-  this->push_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.reconnected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer)
 {
-  this->push_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.disconnected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer)
 {
-  this->pull_admin_.connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.connected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer)
 {
-  this->pull_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.reconnected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer)
 {
-  this->pull_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.disconnected (consumer);
 }
 
 void
-TAO_CEC_SupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_SupplierAdmin::shutdown (void)
 {
-  this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->push_admin_.shutdown ();
 
-  this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->pull_admin_.shutdown ();
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_SupplierAdmin::obtain_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->push_admin_.obtain ();
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_SupplierAdmin::obtain_pull_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->pull_admin_.obtain ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 7a9b06f4c3c..8712301644f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -51,7 +51,7 @@ class TAO_CEC_EventChannel;
  * externally.
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin 
+class TAO_Event_Serv_Export TAO_CEC_SupplierAdmin
   : public POA_CosEventChannelAdmin::SupplierAdmin
 {
 public:
@@ -62,41 +62,33 @@ public:
   virtual ~TAO_CEC_SupplierAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker);
 
   /// Keep track of connected consumers.
-  virtual void connected (TAO_CEC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_CEC_ProxyPullConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPullConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPullConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushConsumer*);
+  virtual void reconnected (TAO_CEC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_CEC_ProxyPushConsumer*);
+  virtual void connected (TAO_CEC_ProxyPullConsumer*);
+  virtual void reconnected (TAO_CEC_ProxyPullConsumer*);
+  virtual void disconnected (TAO_CEC_ProxyPullConsumer*);
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (void);
 
   // = The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_consumer (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-      obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_pull_consumer (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// The Event Channel we belong to
@@ -105,11 +97,11 @@ private:
   /// The push and pull aspects are implemented using these classes
   TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,
                       TAO_CEC_ProxyPushConsumer,
-                      CosEventChannelAdmin::ProxyPushConsumer> 
+                      CosEventChannelAdmin::ProxyPushConsumer>
     push_admin_;
   TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,
                       TAO_CEC_ProxyPullConsumer,
-                      CosEventChannelAdmin::ProxyPullConsumer> 
+                      CosEventChannelAdmin::ProxyPullConsumer>
     pull_admin_;
 
   /// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
index ec420d2c576..991386a0370 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
@@ -6,18 +6,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker)
 {
-  this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->push_admin_.for_each (worker);
 }
 
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker)
 {
-  this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->pull_admin_.for_each (worker);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index e9b79b992cd..114603f9913 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -27,29 +27,25 @@ TAO_CEC_SupplierControl::shutdown (void)
 }
 
 void
-TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer *)
 {
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 void
-TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *)
 {
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 void
-TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer *
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer *)
 {
 }
 
 void
 TAO_CEC_SupplierControl::system_exception (TAO_CEC_ProxyPullConsumer *,
-                                           CORBA::SystemException &
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 4de8fc0c3f6..8d7be499bd8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -75,12 +75,10 @@ public:
    * not exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy);
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-  virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_TypedProxyPushConsumer *proxy);
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
   /**
@@ -88,13 +86,11 @@ public:
    * not exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
   /// Do we need to disconnect this supplier?  The parameter type for
   /// proxy is PortableServer::ServantBase* due to the fact that this
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index eb44b1cbf9f..1b369165694 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -28,49 +28,41 @@ TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin (void)
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::invoke (const TAO_CEC_TypedEvent& typed_event
-                                    ACE_ENV_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::invoke (const TAO_CEC_TypedEvent& typed_event)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_Propagate_Typed_Event typed_event_worker (typed_event, this->typed_event_channel_);
 
-  this->typed_push_admin_.for_each (&typed_event_worker
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_push_admin_.for_each (&typed_event_worker);
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier
-                                       ACE_ENV_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->typed_push_admin_.connected (supplier ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.connected (supplier);
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                         ACE_ENV_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->typed_push_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.reconnected (supplier);
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                          ACE_ENV_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  this->typed_push_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.disconnected (supplier);
 }
 
 void
-TAO_CEC_TypedConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::shutdown (void)
 {
-  this->typed_push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_push_admin_.shutdown ();
 }
 
 CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier (
     const char * /*supported_interface*/
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -83,7 +75,6 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_pull_supplier (
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
     const char * uses_interface
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -92,33 +83,32 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier (
 
 {
   // Register the consumer uses_interface with the EC
-  int result = this->typed_event_channel_->consumer_register_uses_interace (uses_interface ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  int result = this->typed_event_channel_->consumer_register_uses_interace (uses_interface);
 
   if (result == -1)
     {
       ACE_THROW_RETURN (CosTypedEventChannelAdmin::NoSuchImplementation (), 0);
     }
 
-  return this->typed_push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->typed_push_admin_.obtain ();
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 PortableServer::POA_ptr
-TAO_CEC_TypedConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedConsumerAdmin::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -126,10 +116,9 @@ TAO_CEC_TypedConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // ****************************************************************
 
 void
-TAO_CEC_Propagate_Typed_Event::work (TAO_CEC_ProxyPushSupplier *supplier
-                                     ACE_ENV_ARG_DECL)
+TAO_CEC_Propagate_Typed_Event::work (TAO_CEC_ProxyPushSupplier *supplier)
 {
-  supplier->invoke (this->typed_event_ ACE_ENV_ARG_PARAMETER);
+  supplier->invoke (this->typed_event_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 6fd7eeb02dd..45b8002f12b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -46,48 +46,43 @@ public:
   virtual ~TAO_CEC_TypedConsumerAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker);
 
   /// Invoke the typed event on all the consumers
-  virtual void invoke (const TAO_CEC_TypedEvent& typed_event
-                       ACE_ENV_ARG_DECL)
+  virtual void invoke (const TAO_CEC_TypedEvent& typed_event)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*);
 
   /// The typed event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (void);
 
   // = The CosTypedEventChannelAdmin::TypedConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_typed_push_supplier (const char * uses_interface ACE_ENV_ARG_DECL)
+    obtain_typed_push_supplier (const char * uses_interface)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::NoSuchImplementation));
   virtual CosTypedEventChannelAdmin::TypedProxyPullSupplier_ptr
-    obtain_typed_pull_supplier (const char * supported_interface ACE_ENV_ARG_DECL)
+    obtain_typed_pull_supplier (const char * supported_interface)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::InterfaceNotSupported));
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    obtain_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    obtain_pull_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// The Event Channel we belong to
@@ -108,8 +103,7 @@ public:
   TAO_CEC_Propagate_Typed_Event (const TAO_CEC_TypedEvent& typed_event,
                                  TAO_CEC_TypedEventChannel* typed_event_channel);
 
-  void work (TAO_CEC_ProxyPushSupplier *supplier
-             ACE_ENV_ARG_DECL);
+  void work (TAO_CEC_ProxyPushSupplier *supplier);
 
 private:
   /// The typed event
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
index 37a0dd30d28..95f43d05ee6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
@@ -6,10 +6,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_CEC_TypedConsumerAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker)
 {
-  this->typed_push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.for_each (worker);
 }
 
 ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index 66c4a913cdd..aa0da5850e8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -76,7 +76,7 @@ TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void)
 }
 
 void
-TAO_CEC_TypedEventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedEventChannel::activate (void)
 {
   this->dispatching_->activate ();
   this->consumer_control_->activate ();
@@ -101,49 +101,38 @@ namespace
 }
 
 void
-TAO_CEC_TypedEventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedEventChannel::shutdown (void)
 {
   this->dispatching_->shutdown ();
   this->supplier_control_->shutdown ();
   this->consumer_control_->shutdown ();
 
   PortableServer::POA_var typed_consumer_poa =
-    this->typed_consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->typed_consumer_admin_->_default_POA ();
   PortableServer::ObjectId_var typed_consumer_id =
-    typed_consumer_poa->servant_to_id (this->typed_consumer_admin_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  typed_consumer_poa->deactivate_object (typed_consumer_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    typed_consumer_poa->servant_to_id (this->typed_consumer_admin_);
+  typed_consumer_poa->deactivate_object (typed_consumer_id.in ());
 
   PortableServer::POA_var typed_supplier_poa =
-    this->typed_supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->typed_supplier_admin_->_default_POA ();
   PortableServer::ObjectId_var typed_supplier_id =
-    typed_supplier_poa->servant_to_id (this->typed_supplier_admin_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  typed_supplier_poa->deactivate_object (typed_supplier_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    typed_supplier_poa->servant_to_id (this->typed_supplier_admin_);
+  typed_supplier_poa->deactivate_object (typed_supplier_id.in ());
 
-  this->typed_supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_supplier_admin_->shutdown ();
 
-  this->typed_consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_consumer_admin_->shutdown ();
 
   if (destroy_on_shutdown_)
     {
       // Deactivate the Typed EC
       PortableServer::POA_var t_poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->_default_POA ();
 
       PortableServer::ObjectId_var t_id =
-        t_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        t_poa->servant_to_id (this);
 
-      t_poa->deactivate_object (t_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      t_poa->deactivate_object (t_id.in ());
 
       ACE_Event_Handler *timer;
       ACE_NEW (timer, ShutdownHandler (this->orb_.in ()));
@@ -153,51 +142,39 @@ TAO_CEC_TypedEventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_CEC_TypedEventChannel::connected (TAO_CEC_TypedProxyPushConsumer* consumer
-                                      ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::connected (TAO_CEC_TypedProxyPushConsumer* consumer)
 {
-  this->typed_supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_supplier_admin_->connected (consumer);
 }
 
 void
-TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_TypedProxyPushConsumer* consumer
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_TypedProxyPushConsumer* consumer)
 {
-  this->typed_supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_supplier_admin_->reconnected (consumer);
 }
 
 void
-TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_TypedProxyPushConsumer* consumer
-                                         ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_TypedProxyPushConsumer* consumer)
 {
-  this->typed_supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_supplier_admin_->disconnected (consumer);
 }
 
 void
-TAO_CEC_TypedEventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier
-                                      ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->typed_consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_consumer_admin_->connected (supplier);
 }
 
 void
-TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->typed_consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_consumer_admin_->reconnected (supplier);
 }
 
 void
-TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                         ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier)
 {
-  this->typed_consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_consumer_admin_->disconnected (supplier);
 }
 
 // Find from the ifr cache the operation and return the parameter array pointer.
@@ -271,20 +248,17 @@ TAO_CEC_TypedEventChannel::clear_ifr_cache (void)
 // All the operations and their parameters are then inserted in the ifr cache.
 // Function returns 0 if successful or -1 on a failure.
 int
-TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
-                                                        ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_)
 {
-  ACE_TRY
+  try
     {
       // Lookup the Interface Name in the IFR
       CORBA::Contained_var contained =
-        this->interface_repository_->lookup_id (interface_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->interface_repository_->lookup_id (interface_);
 
       // Narrow the interface
       CORBA::InterfaceDef_var interface =
-        CORBA::InterfaceDef::_narrow (contained.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::InterfaceDef::_narrow (contained.in ());
 
       if (CORBA::is_nil (interface.in () ))
         {
@@ -300,8 +274,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
         {
           // Obtain the full interface description
           CORBA::InterfaceDef::FullInterfaceDescription_var fid =
-            interface->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            interface->describe_interface ();
 
           // Obtain the base interfaces
           this->base_interfaces_ = fid->base_interfaces;
@@ -378,24 +351,24 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
             }
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (sysex, "during TAO_CEC_TypedEventChannel::cache_interface_description");
+          sysex._tao_print_exception (
+            "during TAO_CEC_TypedEventChannel::cache_interface_description");
         }
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ACE_ANY_EXCEPTION raised during TAO_CEC_TypedEventChannel::cache_interface_description");
+          ex._tao_print_exception (
+            "ex raised during TAO_CEC_TypedEventChannel::cache_interface_description");
         }
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -408,8 +381,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_
 // If neither a consumer nor a supplier has registered an interface,
 // the function calls cache_interface_description and returns 0 if successful.
 int
-TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_interface
-                                                            ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_interface)
 {
   // Check if a consumer has already registered an interface with the typed EC
   if (this->uses_interface_.length() > 0)
@@ -452,8 +424,7 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int
   else
     {
       // Neither a consumer nor a supplier has connected yet
-      int result = cache_interface_description (uses_interface ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      int result = cache_interface_description (uses_interface);
 
       if (result == 0)
         {
@@ -472,8 +443,7 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int
 // If neither a consumer nor a supplier has registered an interface,
 // the function calls cache_interface_description and returns 0 if successful.
 int
-TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *supported_interface
-                                                                  ACE_ENV_ARG_DECL)
+TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *supported_interface)
 {
   // Check if a supplier has already registered an interface with the typed EC
   if (this->supported_interface_.length() > 0)
@@ -516,8 +486,7 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su
   else
     {
       // Neither a consumer nor a supplier has connected yet
-      int result = cache_interface_description (supported_interface ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      int result = cache_interface_description (supported_interface);
 
       if (result == 0)
         {
@@ -530,11 +499,9 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su
 // Function creates a NVList and populates it from the parameter information.
 void
 TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper_params,
-                                                  CORBA::NVList_out new_list
-                                                  ACE_ENV_ARG_DECL)
+                                                  CORBA::NVList_out new_list)
 {
-  this->orb_->create_list (0, new_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->create_list (0, new_list);
 
   for (CORBA::ULong param=0; param<oper_params->num_params_; param++)
     {
@@ -544,46 +511,41 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper
 
       new_list->add_value (oper_params->parameters_[param].name_. in (),
                            any_1,
-                           oper_params->parameters_[param].direction_
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                           oper_params->parameters_[param].direction_);
     }
 }
 
 // Function creates an empty NVList.
 void
 TAO_CEC_TypedEventChannel::create_list (CORBA::Long count,
-                                        CORBA::NVList_out new_list
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::NVList_out new_list)
 {
-  this->orb_->create_list (count, new_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->create_list (count, new_list);
 }
 
 // The CosTypedEventChannelAdmin::TypedEventChannel methods...
 CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
-TAO_CEC_TypedEventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedEventChannel::for_consumers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->typed_consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->typed_consumer_admin_->_this ();
 }
 
 CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr
-TAO_CEC_TypedEventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedEventChannel::for_suppliers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->typed_supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->typed_supplier_admin_->_this ();
 }
 
 void
-TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedEventChannel::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!destroyed_)
     {
       destroyed_ = 1;
-      this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->shutdown ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index dcec1e0713c..10cf213a0fd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -142,11 +142,11 @@ public:
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void activate (void);
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void shutdown (void);
 
   /// Access the dispatching module....
   TAO_CEC_Dispatching* dispatching (void) const;
@@ -195,21 +195,15 @@ public:
 
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_TypedProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_TypedProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_TypedProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_TypedProxyPushConsumer*);
+  virtual void reconnected (TAO_CEC_TypedProxyPushConsumer*);
+  virtual void disconnected (TAO_CEC_TypedProxyPushConsumer*);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*);
 
   /// Can the consumers reconnect to the EC?
   int consumer_reconnect (void) const;
@@ -229,10 +223,10 @@ public:
   TAO_CEC_Operation_Params * find_from_ifr_cache (const char *operation);
 
   /// Function allows consumer admin to register the uses interface
-  int consumer_register_uses_interace (const char *uses_interface ACE_ENV_ARG_DECL);
+  int consumer_register_uses_interace (const char *uses_interface);
 
   /// Function allows supplier admin to register the supported interface
-  int supplier_register_supported_interface (const char *supported_interface ACE_ENV_ARG_DECL);
+  int supplier_register_supported_interface (const char *supported_interface);
 
   /// Function to return the supported_interface_
   const char * supported_interface (void) const;
@@ -245,24 +239,22 @@ public:
 
   /// Function populates the NVList from the provide param information
   virtual void create_operation_list (TAO_CEC_Operation_Params *oper_params,
-                                      CORBA::NVList_out new_list
-                                      ACE_ENV_ARG_DECL);
+                                      CORBA::NVList_out new_list);
 
   /// Function creates an empty NVList
   virtual void create_list (CORBA::Long count,
-                            CORBA::NVList_out new_list
-                            ACE_ENV_ARG_DECL);
+                            CORBA::NVList_out new_list);
 
   // = The CosTypedEventChannelAdmin::TypedEventChannel methods...
   virtual ::CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr
-    for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+    for_consumers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr
-    for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+    for_suppliers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ServantRetryMap& get_servant_retry_map (void);
@@ -273,7 +265,7 @@ public:
 
 protected:
   /// Function caches the full interface description from the IFR
-  int cache_interface_description (const char *interface ACE_ENV_ARG_DECL);
+  int cache_interface_description (const char *interface);
 
   /// Insert a operation/parameter into the IFR cache
   int insert_into_ifr_cache (const char *operation, TAO_CEC_Operation_Params *parameters);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index d352ff988c9..44490753e28 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -46,30 +46,24 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer
                                          this,
                                          this->typed_event_channel_);
 
-  ACE_TRY_NEW_ENV {
+  try{
     // tempporary fix, should put this into some init function.
 
     this->oid_ =
-      this->default_POA_->activate_object (this->dsi_impl_
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+      this->default_POA_->activate_object (this->dsi_impl_);
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 }
 
 // Implementation skeleton destructor
 TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void)
 {
-  ACE_TRY_NEW_ENV {
-    this->default_POA_->deactivate_object (this->oid_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    this->default_POA_->deactivate_object (this->oid_.in ());
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 
   delete dsi_impl_;
 
@@ -79,60 +73,51 @@ TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void)
 
 void
 TAO_CEC_TypedProxyPushConsumer::activate (
-    CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy
-    ACE_ENV_ARG_DECL)
+    CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTypedEventChannelAdmin::TypedProxyPushConsumer_var result;
-  ACE_TRY
+  try
     {
-      result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = this->_this ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       result = CosTypedEventChannelAdmin::TypedProxyPushConsumer::_nil ();
     }
-  ACE_ENDTRY;
   activated_proxy = result._retn ();
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::deactivate (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
 TAO_CEC_TypedProxyPushConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var supplier;
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
-    ACE_CHECK_RETURN (0);
 
     disconnected = 0;
     if (this->is_connected_i () == 0)
@@ -149,14 +134,14 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return supplier->_non_existent ();
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::shutdown (void)
 {
   CosEventComm::PushSupplier_var supplier;
 
@@ -165,29 +150,25 @@ TAO_CEC_TypedProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     supplier = this->typed_supplier_._retn ();
     this->connected_ = 0;
   }
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 
   if (CORBA::is_nil (supplier.in ()))
     return;
 
-  ACE_TRY
+  try
     {
-      supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions, we must isolate other clients from
       // failures on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -222,8 +203,7 @@ TAO_CEC_TypedProxyPushConsumer::_decr_refcnt (void)
 
 void
 TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
-      CosEventComm::PushSupplier_ptr push_supplier
-      ACE_ENV_ARG_DECL)
+      CosEventComm::PushSupplier_ptr push_supplier)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -232,12 +212,11 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i ())
       {
         if (this->typed_event_channel_->supplier_reconnect () == 0)
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed, go ahead and disconnect the
         // consumer...
@@ -252,10 +231,8 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
               TAO_CEC_Unlock, ace_mon, reverse_lock,
               CORBA::INTERNAL ());
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
 
-          this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->typed_event_channel_->disconnected (this);
         }
 
         // What if a second thread connected us after this?
@@ -267,7 +244,7 @@ TAO_CEC_TypedProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->typed_event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->typed_event_channel_->connected (this);
 }
 
 CosEventComm::PushSupplier_ptr
@@ -297,16 +274,14 @@ TAO_CEC_TypedProxyPushConsumer::apply_policy
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::push (const CORBA::Any& /* event */
-                                      ACE_ENV_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::push (const CORBA::Any& /* event */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushSupplier_var supplier;
@@ -316,10 +291,9 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
+      throw CORBA::BAD_INV_ORDER (); // @@ add user exception?
 
     supplier = this->typed_supplier_._retn ();
 
@@ -327,61 +301,56 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->typed_event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_event_channel_->disconnected (this);
 
   if (!CORBA::is_nil (supplier.in ()))
     {
       if (this->typed_event_channel_->disconnect_callbacks ())
         {
-          ACE_TRY
+          try
             {
-              supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              supplier->disconnect_push_supplier ();
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               // Ignore exceptions, we must isolate other clients from
               // failures on this one.
             }
-          ACE_ENDTRY;
         }
     }
 }
 
 PortableServer::POA_ptr
-TAO_CEC_TypedProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedProxyPushConsumer::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedProxyPushConsumer::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedProxyPushConsumer::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
 
 CORBA::Object_ptr
-TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   CORBA::Object_var server =
-         default_POA_->id_to_reference (this->oid_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
+         default_POA_->id_to_reference (this->oid_.in ());
 
   return CORBA::Object::_duplicate (server.in());
 }
 
 void
-TAO_CEC_TypedProxyPushConsumer::invoke (const TAO_CEC_TypedEvent& typed_event
-                                        ACE_ENV_ARG_DECL)
+TAO_CEC_TypedProxyPushConsumer::invoke (const TAO_CEC_TypedEvent& typed_event)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_TypedProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -391,8 +360,7 @@ TAO_CEC_TypedProxyPushConsumer::invoke (const TAO_CEC_TypedEvent& typed_event
   if (!ace_mon.locked ())
     return;
 
-  this->typed_event_channel_->typed_consumer_admin ()->invoke (typed_event
-                                                               ACE_ENV_ARG_PARAMETER);
+  this->typed_event_channel_->typed_consumer_admin ()->invoke (typed_event);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index 1e4e92bf612..6f8b2e53b07 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -51,12 +51,11 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-      CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy
-      ACE_ENV_ARG_DECL)
+      CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr &activated_proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -64,11 +63,10 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// The event channel is shutting down
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (void);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
@@ -76,32 +74,28 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods (abstract overloads)...
   virtual void connect_push_supplier (
-                CosEventComm::PushSupplier_ptr push_supplier
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CosEventComm::PushSupplier_ptr push_supplier)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
 
-  virtual void push (const CORBA::Any& event
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const CORBA::Any& event)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void invoke (const TAO_CEC_TypedEvent& typed_event
-                       ACE_ENV_ARG_DECL)
+  virtual void invoke (const TAO_CEC_TypedEvent& typed_event)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)...
   virtual CORBA::Object_ptr get_typed_consumer (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
 protected:
   // The guard needs access to the following protected methods.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index fe047155c0f..d1e7bd34c1a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -25,43 +25,38 @@ TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin (void)
 }
 
 PortableServer::POA_ptr
-TAO_CEC_TypedSupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_TypedSupplierAdmin::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_TypedSupplierAdmin::connected (TAO_CEC_TypedProxyPushConsumer *consumer
-                                       ACE_ENV_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::connected (TAO_CEC_TypedProxyPushConsumer *consumer)
 {
-  this->typed_push_admin_.connected (consumer ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.connected (consumer);
 }
 
 void
-TAO_CEC_TypedSupplierAdmin::reconnected (TAO_CEC_TypedProxyPushConsumer *consumer
-                                         ACE_ENV_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::reconnected (TAO_CEC_TypedProxyPushConsumer *consumer)
 {
-  this->typed_push_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.reconnected (consumer);
 }
 
 void
-TAO_CEC_TypedSupplierAdmin::disconnected (TAO_CEC_TypedProxyPushConsumer *consumer
-                                          ACE_ENV_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::disconnected (TAO_CEC_TypedProxyPushConsumer *consumer)
 {
-  this->typed_push_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.disconnected (consumer);
 }
 
 void
-TAO_CEC_TypedSupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::shutdown (void)
 {
-  this->typed_push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->typed_push_admin_.shutdown ();
 }
 
 CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
     const char * supported_interface
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -69,21 +64,19 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_push_consumer (
   ))
 
 {
-  int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  int result = this->typed_event_channel_->supplier_register_supported_interface (supported_interface);
 
   if (result == -1)
     {
       ACE_THROW_RETURN (CosTypedEventChannelAdmin::InterfaceNotSupported (),0);
     }
 
-  return this->typed_push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->typed_push_admin_.obtain ();
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer (
     const char * /* uses_interface */
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -95,14 +88,14 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer (
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index d7c29fb9f81..a804e384981 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -44,45 +44,39 @@ public:
   virtual ~TAO_CEC_TypedSupplierAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker
-                 ACE_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker);
 
   /// Keep track of connected consumers.
-  virtual void connected (TAO_CEC_TypedProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_CEC_TypedProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_CEC_TypedProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_TypedProxyPushConsumer*);
+  virtual void reconnected (TAO_CEC_TypedProxyPushConsumer*);
+  virtual void disconnected (TAO_CEC_TypedProxyPushConsumer*);
 
   /// The typed event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (void);
 
   // = The CosTypedEventChannelAdmin::TypedSupplierAdmin methods...
   virtual CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr
-    obtain_typed_push_consumer (const char * supported_interface
-                                ACE_ENV_ARG_DECL)
+    obtain_typed_push_consumer (const char * supported_interface)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::InterfaceNotSupported));
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_typed_pull_consumer (const char * uses_interface
-                                ACE_ENV_ARG_DECL)
+    obtain_typed_pull_consumer (const char * uses_interface)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosTypedEventChannelAdmin::NoSuchImplementation));
 
   // = The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    obtain_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    obtain_pull_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
index 4a3111bc176..0ef62fc3cfa 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
@@ -6,10 +6,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
 TAO_CEC_TypedSupplierAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker)
 {
-  this->typed_push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->typed_push_admin_.for_each (worker);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index ea15a0e703e..4e56069fc2a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -23,13 +23,12 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    for_each (TAO_ESF_Worker<PROXY> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<PROXY> *worker)
 {
   // @@ Use an allocator for this memory...
   PROXY **proxies = 0;
   size_t size = 0;
-  ACE_TRY
+  try
     {
       {
         ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
@@ -54,13 +53,12 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
       worker->set_size(size);
       for (PROXY **j = proxies; j != proxies + size; ++j)
         {
-          worker->work (*j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          worker->work (*j);
           (*j)->_decr_refcnt ();
         }
       delete[] proxies;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       for (PROXY **j = proxies; j != proxies + size; ++j)
         {
@@ -69,50 +67,46 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
         }
       delete[] proxies;
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    connected (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index d5c7c22fcd8..d2c8b254260 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -43,15 +43,11 @@ public:
   TAO_ESF_Copy_On_Read (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy_Collection methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL);
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
+  virtual void connected (PROXY *proxy);
+  virtual void reconnected (PROXY *proxy);
+  virtual void disconnected (PROXY *proxy);
+  virtual void shutdown (void);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index cd6173e3181..a51b175716f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -67,8 +67,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    for_each (TAO_ESF_Worker<PROXY> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<PROXY> *worker)
 {
   Read_Guard ace_mon (this->mutex_,
                       this->collection_);
@@ -77,15 +76,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   ITERATOR end = ace_mon.collection->collection.end ();
   for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i)
     {
-      worker->work (*i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      worker->work (*i);
     }
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    connected (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected (PROXY *proxy)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -94,13 +91,12 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.connected (proxy ACE_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.connected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -109,13 +105,12 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.reconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -123,12 +118,12 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.disconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
 {
   // We need to perform a copy to follow the protocol.
   Write_Guard ace_mon (this->mutex_,
@@ -137,7 +132,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ace_mon.copy->collection.shutdown ();
 }
 
 template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index d4a6d9af9c1..0d5f9e32001 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -132,15 +132,11 @@ public:
   ~TAO_ESF_Copy_On_Write (void);
 
   // = The TAO_ESF_Proxy methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL);
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
+  virtual void connected (PROXY *proxy);
+  virtual void reconnected (PROXY *proxy);
+  virtual void disconnected (PROXY *proxy);
+  virtual void shutdown (void);
 
 private:
   typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 67c61362f21..9388b45d74c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -46,8 +46,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    for_each (TAO_ESF_Worker<PROXY> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<PROXY> *worker)
 {
   ACE_GUARD (Busy_Lock, ace_mon, this->lock_);
 
@@ -55,8 +54,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work (*i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      worker->work (*i);
 
   }
 }
@@ -109,19 +107,16 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    connected (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected (PROXY *proxy)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   proxy->_incr_refcnt ();
   if (this->busy_count_ == 0)
     {
       // We can add the object immediately
-      this->connected_i (proxy ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->connected_i (proxy);
     }
   else
     {
@@ -136,19 +131,16 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   proxy->_incr_refcnt ();
   if (this->busy_count_ == 0)
     {
       // We can reconnect the object immediately
-      this->reconnected_i (proxy ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->reconnected_i (proxy);
     }
   else
     {
@@ -163,18 +155,15 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   if (this->busy_count_ == 0)
     {
       // We can remove the object immediately
-      this->disconnected_i (proxy ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->disconnected_i (proxy);
     }
   else
     {
@@ -189,17 +178,15 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   if (this->busy_count_ == 0)
     {
       // We can shutdown the object immediately
-      this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->shutdown_i ();
     }
   else
     {
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 350f756867e..36742c93d80 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -95,13 +95,10 @@ public:
   int idle (void);
   int execute_delayed_operations (void);
 
-  void connected_i (PROXY *proxy
-                    ACE_ENV_ARG_DECL);
-  void reconnected_i (PROXY *proxy
-                    ACE_ENV_ARG_DECL);
-  void disconnected_i (PROXY *proxy
-                     ACE_ENV_ARG_DECL);
-  void shutdown_i (ACE_ENV_SINGLE_ARG_DECL);
+  void connected_i (PROXY *proxy);
+  void reconnected_i (PROXY *proxy);
+  void disconnected_i (PROXY *proxy);
+  void shutdown_i (void);
 
   typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command;
   typedef TAO_ESF_Reconnected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command;
@@ -109,15 +106,11 @@ public:
   typedef TAO_ESF_Shutdown_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE> > Shutdown_Command;
 
   // = The TAO_ESF_Proxy methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL);
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
+  virtual void connected (PROXY *proxy);
+  virtual void reconnected (PROXY *proxy);
+  virtual void disconnected (PROXY *proxy);
+  virtual void shutdown (void);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
index 4a2192e5a18..c042ea793c5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
@@ -6,33 +6,30 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    connected_i (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected_i (PROXY *proxy)
 {
-  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    reconnected_i (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected_i (PROXY *proxy)
 {
-  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    disconnected_i (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected_i (PROXY *proxy)
 {
-  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown_i (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown_i (void)
 {
-  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index e47522719c4..96b47940659 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -18,14 +18,12 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                             *static_cast<CORBA::Environment*> (arg));
-      this->target_->connected_i (this->object_
-                                  ACE_ENV_ARG_PARAMETER);
+      this->target_->connected_i (this->object_);
     }
   else
     {
       ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
-      this->target_->connected_i (this->object_
-                                  ACE_ENV_ARG_PARAMETER);
+      this->target_->connected_i (this->object_);
     }
 
   return 0;
@@ -40,14 +38,12 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *static_cast<CORBA::Environment*> (arg));
-      this->target_->reconnected_i (this->object_
-                                    ACE_ENV_ARG_PARAMETER);
+      this->target_->reconnected_i (this->object_);
     }
   else
     {
       ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
-      this->target_->reconnected_i (this->object_
-                                    ACE_ENV_ARG_PARAMETER);
+      this->target_->reconnected_i (this->object_);
     }
   return 0;
 }
@@ -61,14 +57,12 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *static_cast<CORBA::Environment*> (arg));
-      this->target_->disconnected_i (this->object_
-                                     ACE_ENV_ARG_PARAMETER);
+      this->target_->disconnected_i (this->object_);
     }
   else
     {
       ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
-      this->target_->disconnected_i (this->object_
-                                     ACE_ENV_ARG_PARAMETER);
+      this->target_->disconnected_i (this->object_);
     }
   return 0;
 }
@@ -82,12 +76,12 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg)
     {
       ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *static_cast<CORBA::Environment*> (arg));
-      this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->target_->shutdown_i ();
     }
   else
     {
       ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
-      this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->target_->shutdown_i ();
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index ff3e7daa3c4..fc265f99772 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -30,8 +30,7 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
 
 template<class PROXY, class C, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
-    for_each (TAO_ESF_Worker<PROXY> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<PROXY> *worker)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
@@ -39,8 +38,7 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work ((*i) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      worker->work ((*i));
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
index 574f6f559db..6d3c084f8d8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -34,15 +34,11 @@ public:
   TAO_ESF_Immediate_Changes (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL);
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker);
+  virtual void connected (PROXY *proxy);
+  virtual void reconnected (PROXY *proxy);
+  virtual void disconnected (PROXY *proxy);
+  virtual void shutdown (void);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
index ac26e4d5800..68de9828bbb 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
@@ -6,43 +6,40 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    connected (PROXY *proxy
-               ACE_ENV_ARG_DECL)
+    connected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 40afd8d452f..474ccde8989 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -22,35 +22,32 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    peer_connected (PEER *peer
-                    ACE_ENV_ARG_DECL)
+    peer_connected (PEER *peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->for_each (&worker);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    peer_reconnected (PEER *peer
-                      ACE_ENV_ARG_DECL)
+    peer_reconnected (PEER *peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->for_each (&worker);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    peer_disconnected (PEER *peer
-                       ACE_ENV_ARG_DECL)
+    peer_disconnected (PEER *peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->for_each (&worker);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 95a188cf661..5e1c81f3194 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -41,17 +41,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * the PROXY interface must implement:
  *
  * @verbatim
- * void connected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
- * void reconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
- * void disconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void connected (PEER *peer) throw ();
+ * void reconnected (PEER *peer) throw ();
+ * void disconnected (PEER *peer) throw ();
  * @endverbatim
  *
  * Similarly, the PEER interface must implement:
  *
  * @verbatim
- * void connected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
- * void reconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
- * void disconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void connected (PROXY *proxy) throw ();
+ * void reconnected (PROXY *proxy) throw ();
+ * void disconnected (PROXY *proxy) throw ();
  * @endverbatim
  */
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
@@ -69,8 +69,7 @@ public:
    * has invoked the connect_xxx_yyy() method.
    * The default implementation is a no-op.
    */
-  virtual void peer_connected (PEER *peer
-                               ACE_ENV_ARG_DECL)
+  virtual void peer_connected (PEER *peer)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -79,8 +78,7 @@ public:
    * The default implementation delegates on the collection
    * <reconnected> method
    */
-  virtual void peer_reconnected (PEER *peer
-                                 ACE_ENV_ARG_DECL)
+  virtual void peer_reconnected (PEER *peer)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -88,8 +86,7 @@ public:
    * removes the object from the collection and deactivates the
    * proxy.
    */
-  virtual void peer_disconnected (PEER *peer
-                                  ACE_ENV_ARG_DECL)
+  virtual void peer_disconnected (PEER *peer)
       ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index 7016971b2f3..ad5c499c685 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -12,40 +12,37 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class P, class R> void
-TAO_ESF_Peer_Connected<P,R>::work (P *proxy
-                                   ACE_ENV_ARG_DECL)
+TAO_ESF_Peer_Connected<P,R>::work (P *proxy)
 {
-  proxy->connected (this->peer_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+  proxy->connected (this->peer_);
+// Shouldn't happen, just following the discipline
 
-  this->peer_->connected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+  this->peer_->connected (proxy);
+// Shouldn't happen, just following the discipline
 }
 
 // ****************************************************************
 
 template<class P, class R> void
-TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy
-                                     ACE_ENV_ARG_DECL)
+TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy)
 {
-  proxy->reconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+  proxy->reconnected (this->peer_);
+// Shouldn't happen, just following the discipline
 
-  this->peer_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+  this->peer_->reconnected (proxy);
+// Shouldn't happen, just following the discipline
 }
 
 // ****************************************************************
 
 template<class P, class R> void
-TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy
-                                      ACE_ENV_ARG_DECL)
+TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy)
 {
-  proxy->disconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+  proxy->disconnected (this->peer_);
+// Shouldn't happen, just following the discipline
 
-  this->peer_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Shouldn't happen, just following the discipline
+  this->peer_->disconnected (proxy);
+// Shouldn't happen, just following the discipline
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
index 913a3403549..9f38e791afe 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
@@ -35,8 +35,7 @@ class TAO_ESF_Peer_Connected : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Peer_Connected (PEER *peer);
 
-  void work (PROXY *proxy
-             ACE_ENV_ARG_DECL);
+  void work (PROXY *proxy);
 
 private:
   PEER* peer_;
@@ -58,8 +57,7 @@ class TAO_ESF_Peer_Reconnected : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Peer_Reconnected (PEER *peer);
 
-  void work (PROXY *proxy
-             ACE_ENV_ARG_DECL);
+  void work (PROXY *proxy);
 
 private:
   PEER* peer_;
@@ -81,8 +79,7 @@ class TAO_ESF_Peer_Disconnected : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Peer_Disconnected (PEER *peer);
 
-  void work (PROXY *proxy
-             ACE_ENV_ARG_DECL);
+  void work (PROXY *proxy);
 
 private:
   PEER* peer_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 68407b8a0ea..6c842836abc 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -28,7 +28,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE*
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    obtain (ACE_ENV_SINGLE_ARG_DECL)
+    obtain (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PROXY* proxy;
@@ -36,63 +36,57 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
   TAO_ESF_RefCountedRef<PROXY> holder (proxy);
 
-  ACE_TYPENAME PROXY::_ptr_type r;
-  proxy->activate (r ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (INTERFACE::_nil ());
+  typename PROXY::_ptr_type r;
+  proxy->activate (r);
 
-  ACE_TYPENAME PROXY::_var_type result = r;
+  typename PROXY::_var_type result = r;
 
-  this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (INTERFACE::_nil ());
+  this->collection_->connected (proxy);
 
   return result._retn ();
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
-  this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK; // Cannot happen, just following the discipline.
+  this->collection_->for_each (&worker);
+// Cannot happen, just following the discipline.
 
-  this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_->shutdown ();
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    connected (PROXY *
-               ACE_ENV_ARG_DECL_NOT_USED)
+    connected (PROXY *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    reconnected (PROXY *proxy
-                 ACE_ENV_ARG_DECL)
+    reconnected (PROXY *proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_->reconnected (proxy);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    disconnected (PROXY *proxy
-                  ACE_ENV_ARG_DECL)
+    disconnected (PROXY *proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  proxy->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK; // Cannot happen, just following the discipline.
+  proxy->deactivate ();
+// Cannot happen, just following the discipline.
 
-  ACE_TRY
+  try
     {
-      this->collection_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->collection_->disconnected (proxy);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ In the future the collections may raise exceptions to
       // report errors (such as out of memory or things like that).
@@ -102,7 +96,6 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
       // resources" or something similar, and i've never seen a spec
       // that has an exception for "could not acquire a mutex".
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index e42104dae90..e16e340bb1c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -56,7 +56,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * // The T_var for the IDL interface implemented by the PROXY.
  *
  * PROXY::_ptr_type
- * PROXY::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw ();
+ * PROXY::activate (void) throw ();
  * // activate the proxy and return the object reference
  * @endverbatim
  *
@@ -72,8 +72,7 @@ public:
   virtual ~TAO_ESF_Proxy_Admin (void);
 
   /// Iterate over its internal collection.
-  void for_each (TAO_ESF_Worker<PROXY> *worker
-                 ACE_ENV_ARG_DECL)
+  void for_each (TAO_ESF_Worker<PROXY> *worker)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @todo We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but
@@ -83,7 +82,7 @@ public:
   // code is supposed to run under TAO only.
   /// Create a new PROXY and activate it.
   virtual INTERFACE*
-      obtain (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -91,7 +90,7 @@ public:
    * down. Invoke <shutdown> on all the proxies, cleanup the
    * collection and prepare to terminate.
    */
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -99,8 +98,7 @@ public:
    * has invoked the connect_xxx_yyy() method.
    * The default implementation is a no-op.
    */
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL)
+  virtual void connected (PROXY *proxy)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -109,8 +107,7 @@ public:
    * The default implementation delegates on the collection
    * <reconnected> method
    */
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL)
+  virtual void reconnected (PROXY *proxy)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -118,8 +115,7 @@ public:
    * removes the object from the collection and deactivates the
    * proxy.
    */
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL)
+  virtual void disconnected (PROXY *proxy)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
index 882e6c9c056..dfb7f2a7429 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
@@ -6,11 +6,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class EC,class P,class I> ACE_INLINE void
 TAO_ESF_Proxy_Admin<EC,P,I>::
-    for_each (TAO_ESF_Worker<P> *worker
-              ACE_ENV_ARG_DECL)
+    for_each (TAO_ESF_Worker<P> *worker)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->for_each (worker ACE_ENV_ARG_PARAMETER);
+  this->collection_->for_each (worker);
 }
 
 template <class C>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index ceaeda03db0..86ed4f5bf86 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -132,13 +132,11 @@ public:
    * member of the collection.
    * This encapsulates
    */
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         ACE_ENV_ARG_DECL) = 0;
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker) = 0;
 
   /// Insert a new element into the collection.  The collection assumes
   /// ownership of the element.
-  virtual void connected (PROXY *proxy
-                          ACE_ENV_ARG_DECL) = 0;
+  virtual void connected (PROXY *proxy) = 0;
 
   /**
    * Insert an element into the collection.  No errors can be raised
@@ -147,15 +145,13 @@ public:
    * <proxy->_decr_refcnt()> if the element is already present in the
    * collection.
    */
-  virtual void reconnected (PROXY *proxy
-                            ACE_ENV_ARG_DECL) = 0;
+  virtual void reconnected (PROXY *proxy) = 0;
 
   /// Remove an element from the collection.
-  virtual void disconnected (PROXY *proxy
-                             ACE_ENV_ARG_DECL) = 0;
+  virtual void disconnected (PROXY *proxy) = 0;
 
   /// The EC is shutting down, must release all the elements.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void shutdown (void) = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index 3b9a49c729c..39d0c271894 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -17,8 +17,7 @@ TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List (void)
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -38,8 +37,7 @@ TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -63,8 +61,7 @@ TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy)
 {
   int r = this->impl_.remove (proxy);
   if (r != 0)
@@ -77,7 +74,7 @@ TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::shutdown (void)
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index a50358146d3..3fb57afd60d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -51,20 +51,17 @@ public:
   size_t size (void) const;
 
   /// Insert a new element to the collection
-  void connected (PROXY *
-                  ACE_ENV_ARG_DECL_NOT_USED);
+  void connected (PROXY *);
 
   /// Insert a new element that could be there already.
-  void reconnected (PROXY *
-                    ACE_ENV_ARG_DECL_NOT_USED);
+  void reconnected (PROXY *);
 
   /// Remove an element from the collection
-  void disconnected (PROXY *
-                     ACE_ENV_ARG_DECL_NOT_USED);
+  void disconnected (PROXY *);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shutdown (void);
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index f3bcdaa5a6b..3afe6bbc7e3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -17,8 +17,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::TAO_ESF_Proxy_RB_Tree (void)
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy)
 {
   int r = this->impl_.bind (proxy, 1);
   if (r == 0)
@@ -38,8 +37,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy)
 {
   int r = this->impl_.rebind (proxy, 1);
   if (r == 0)
@@ -61,8 +59,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy)
 {
   int r = this->impl_.unbind (proxy);
   if (r != 0)
@@ -75,7 +72,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (void)
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
index 34a4fe9522e..489defef7c1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -78,19 +78,16 @@ public:
   size_t size (void) const;
 
   /// Insert a new element to the collection
-  void connected (PROXY *
-                  ACE_ENV_ARG_DECL_NOT_USED);
+  void connected (PROXY *);
 
   /// Insert a new element that could be there already.
-  void reconnected (PROXY *
-                    ACE_ENV_ARG_DECL_NOT_USED);
+  void reconnected (PROXY *);
   /// Remove an element from the collection
-  void disconnected (PROXY *
-                     ACE_ENV_ARG_DECL_NOT_USED);
+  void disconnected (PROXY *);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shutdown (void);
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index e7347443f4c..21c1ec6be72 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -13,19 +13,16 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY> void
-TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
-                                     ACE_ENV_ARG_DECL)
+TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy)
 {
-  ACE_TRY
+  try
     {
-      proxy->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Do not propagate any exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
index 6f9af5a6705..40a0dd6ec9c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -29,8 +29,7 @@ class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Shutdown_Proxy (void);
 
-  void work (PROXY *proxy
-             ACE_ENV_ARG_DECL);
+  void work (PROXY *proxy);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
index 94041cc6555..d623ac6643c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -50,8 +50,7 @@ public:
   virtual void set_size(size_t size);
 
   /// Callback interface.
-  virtual void work (Object *object
-                     ACE_ENV_ARG_DECL) = 0;
+  virtual void work (Object *object) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index 092af3fa7f8..b23273e6a41 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -46,18 +46,16 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
   CORBA::TypeCode_var type = any_ref.type ();
   CORBA::TCKind corba_type = CORBA::tk_null;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      corba_type = type->kind ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ Seth: Don't know what else to do. Make sure we can tell
       // when this constructor fails.
       return;
     }
-  ACE_ENDTRY;
 
   this->type_ =
     TAO_ETCL_Literal_Constraint::comparable_type (type.in ());
@@ -329,27 +327,23 @@ TAO_ETCL_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
   TAO_Literal_Type return_value = TAO_UNKNOWN;
   CORBA::TCKind kind = CORBA::tk_null;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      kind = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      kind = type->kind ();
 
       CORBA::TypeCode_var tmp = CORBA::TypeCode::_duplicate (type);
 
       while (kind == CORBA::tk_alias)
         {
-          tmp = tmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tmp = tmp->content_type ();
 
-          kind = tmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          kind = tmp->kind ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return return_value;
     }
-  ACE_ENDTRY;
   // Since this is a "top level try block, no need to check again.
 
   switch (kind)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index 8c79e6415f6..676d9b62b71 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -66,8 +66,7 @@ public:
   virtual int handle_input (ACE_SOCK_Dgram& dgram) = 0;
 
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL) = 0;
+                         RtecUDPAdmin::UDP_Addr_out addr) = 0;
 };
 
 typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_Handler_Shutdown,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 7ab74bdf599..6a9b79ce970 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -16,8 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_ECG_CDR_Message_Sender::init (
-      TAO_ECG_Refcounted_Endpoint endpoint_rptr
-      ACE_ENV_ARG_DECL)
+      TAO_ECG_Refcounted_Endpoint endpoint_rptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (endpoint_rptr.get () == 0
@@ -25,7 +24,7 @@ TAO_ECG_CDR_Message_Sender::init (
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): "
                             "nil or unitialized endpoint argument.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   this->endpoint_rptr_ = endpoint_rptr;
@@ -33,15 +32,14 @@ TAO_ECG_CDR_Message_Sender::init (
 
 void
 TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
-                                           const ACE_INET_Addr &addr
-                                           ACE_ENV_ARG_DECL)
+                                           const ACE_INET_Addr &addr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->endpoint_rptr_.get () == 0)
     {
       ACE_ERROR ((LM_ERROR, "Attempt to invoke send_message() "
                             "on non-initialized sender object.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   CORBA::ULong max_fragment_payload = this->mtu () -
@@ -99,9 +97,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                fragment_id,
                                fragment_count,
                                iov,
-                               iovcnt
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                               iovcnt);
           ++fragment_id;
           fragment_offset += max_fragment_payload;
 
@@ -127,9 +123,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                fragment_id,
                                fragment_count,
                                iov,
-                               iovcnt
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                               iovcnt);
           ++fragment_id;
           fragment_offset += max_fragment_payload;
 
@@ -148,9 +142,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                                fragment_id,
                                fragment_count,
                                iov,
-                               iovcnt
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                               iovcnt);
           ++fragment_id;
           fragment_offset += fragment_size;
 
@@ -172,9 +164,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
                            fragment_id,
                            fragment_count,
                            iov,
-                           iovcnt
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                           iovcnt);
       ++fragment_id;
       fragment_offset += fragment_size;
 
@@ -197,8 +187,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
                                            CORBA::ULong fragment_id,
                                            CORBA::ULong fragment_count,
                                            iovec iov[],
-                                           int iovcnt
-                                           ACE_ENV_ARG_DECL)
+                                           int iovcnt)
 {
   CORBA::ULong header[TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE
                      / sizeof(CORBA::ULong)
@@ -269,7 +258,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
         {
           ACE_ERROR ((LM_ERROR, "Send of mcast fragment failed (%m).\n"));
           // @@ TODO Use a Event Channel specific exception
-          ACE_THROW (CORBA::COMM_FAILURE ());
+          throw CORBA::COMM_FAILURE ();
         }
       else
         {
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index 3c22ae7efb4..1faa1eb22bd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -94,12 +94,11 @@ public:
    * sender is no longer needed.  If shutdown () is not called by the
    * user, cleanup activities will be performed by the destructor.
    */
-  void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr
-             ACE_ENV_ARG_DECL)
+  void init (TAO_ECG_Refcounted_Endpoint endpoint_rptr)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown this component.  Frees up the endpoint.
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
   //@}
 
   /// Setters/getters.
@@ -132,8 +131,7 @@ public:
    * to send later via the reactor.
    */
   void send_message (const TAO_OutputCDR &cdr,
-                     const ACE_INET_Addr &addr
-                     ACE_ENV_ARG_DECL)
+                     const ACE_INET_Addr &addr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -153,8 +151,7 @@ private:
                       CORBA::ULong fragment_id,
                       CORBA::ULong fragment_count,
                       iovec iov[],
-                      int iovcnt
-                      ACE_ENV_ARG_DECL);
+                      int iovcnt);
 
   /**
    * Count the number of fragments that will be required to send the
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
index aa1242d07fe..f754037692f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
@@ -15,7 +15,7 @@ TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc)
 }
 
 ACE_INLINE void
-TAO_ECG_CDR_Message_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ECG_CDR_Message_Sender::shutdown (void)
 {
   // Release the endpoint.
   TAO_ECG_Refcounted_Endpoint empty_endpoint_rptr;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index ad383d44565..5dcd07128ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -124,8 +124,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
 void
 TAO_ECG_Complex_Address_Server::get_addr (
                          const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         RtecUDPAdmin::UDP_Addr_out addr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long key;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index 28e2277a04d..286aa5fe160 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -70,8 +70,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Prints out complete content of the address server. Useful for
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
index b5b65cc294b..c093e008c15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -27,15 +27,13 @@ TAO_ECG_ConsumerEC_Control::shutdown (void)
 }
 
 void
-TAO_ECG_ConsumerEC_Control::event_channel_not_exist (TAO_EC_Gateway_IIOP *
-                                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ECG_ConsumerEC_Control::event_channel_not_exist (TAO_EC_Gateway_IIOP *)
 {
 }
 
 void
 TAO_ECG_ConsumerEC_Control::system_exception (TAO_EC_Gateway_IIOP *,
-                                              CORBA::SystemException &
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+                                              CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
index a8141829787..8e7e6478408 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
@@ -66,14 +66,12 @@ public:
    * has been destroyed.  The strategy has to (at the very least),
    * reclaim all the resources attached to that object.
    */
-  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP * gateway
-                                        ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP * gateway);
 
   /// Some system exception was raised while trying to contact the
   /// event channel
   virtual void system_exception (TAO_EC_Gateway_IIOP * gateway,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 9c4851c70c1..6200c868e9b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -36,20 +36,19 @@ TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void)
 }
 
 void
-TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   if (!this->receiver_)
     {
       // We are shut down.
-      ACE_THROW (CORBA::INTERNAL());
+      throw CORBA::INTERNAL();
     }
 
   if (CORBA::is_nil (ec))
     {
       ACE_ERROR ((LM_ERROR,  "TAO_ECG_Mcast_EH::open(): "
                              "nil ec argument"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Create and activate Event Channel Observer.
@@ -58,26 +57,21 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
 
   if (!this->observer_.in ())
     {
-      ACE_THROW (CORBA::NO_MEMORY ());
+      throw CORBA::NO_MEMORY ();
     }
 
   TAO_EC_Object_Deactivator observer_deactivator;
   RtecEventChannelAdmin::Observer_var observer_ref;
   PortableServer::POA_var poa =
-    this->observer_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->observer_->_default_POA ();
 
   activate (observer_ref,
             poa.in (),
             this->observer_.in (),
-            observer_deactivator
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+            observer_deactivator);
 
   RtecEventChannelAdmin::Observer_Handle handle =
-    ec->append_observer (observer_ref.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->append_observer (observer_ref.in ());
 
   this->observer_->set_deactivator (observer_deactivator);
   this->auto_observer_disconnect_.set_command
@@ -136,16 +130,13 @@ TAO_ECG_Mcast_EH::handle_input (ACE_HANDLE fd)
 
 void
 TAO_ECG_Mcast_EH::update_consumer (
-         const RtecEventChannelAdmin::ConsumerQOS& sub
-    ACE_ENV_ARG_DECL)
+         const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Address_Set multicast_addresses;
 
   this->compute_required_subscriptions (sub,
-                                        multicast_addresses
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        multicast_addresses);
 
   this->delete_unwanted_subscriptions (multicast_addresses);
 
@@ -155,8 +146,7 @@ TAO_ECG_Mcast_EH::update_consumer (
 void
 TAO_ECG_Mcast_EH::compute_required_subscriptions (
     const RtecEventChannelAdmin::ConsumerQOS& sub,
-    Address_Set& multicast_addresses
-    ACE_ENV_ARG_DECL)
+    Address_Set& multicast_addresses)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong count = sub.dependencies.length ();
@@ -170,8 +160,7 @@ TAO_ECG_Mcast_EH::compute_required_subscriptions (
         }
       RtecUDPAdmin::UDP_Addr addr;
 
-      this->receiver_->get_addr (header, addr ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->receiver_->get_addr (header, addr);
 
       ACE_INET_Addr inet_addr (addr.port, addr.ipaddr);
       // Ignore errors, if the element is in the set we simply ignore
@@ -277,18 +266,16 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh)
 
 void
 TAO_ECG_Mcast_EH::Observer::update_consumer (
-    const RtecEventChannelAdmin::ConsumerQOS& sub
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->eh_)
-    this->eh_->update_consumer (sub ACE_ENV_ARG_PARAMETER);
+    this->eh_->update_consumer (sub);
 }
 
 void
 TAO_ECG_Mcast_EH::Observer::update_supplier (
-    const RtecEventChannelAdmin::SupplierQOS&
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const RtecEventChannelAdmin::SupplierQOS&)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 79393ced36c..968a7d4fb07 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -84,8 +84,7 @@ public:
    * the user MUST call shutdown () when handler is no longer needed
    * (and its reactor still exists).
    */
-  void open (RtecEventChannelAdmin::EventChannel_ptr ec
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void open (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// TAO_ECG_Handler_Shutdown method.
   /**
@@ -124,12 +123,10 @@ private:
     /// Event Channel Observer methods
     //@{
     virtual void update_consumer (
-        const RtecEventChannelAdmin::ConsumerQOS& sub
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException));
     virtual void update_supplier (
-        const RtecEventChannelAdmin::SupplierQOS& pub
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        const RtecEventChannelAdmin::SupplierQOS& pub)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -147,8 +144,7 @@ private:
 
   /// The Observer method.  Subscribe/unsubscribe to multicast groups
   /// according to changes in consumer subscriptions.
-  void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
-                        ACE_ENV_ARG_DECL)
+  void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -173,8 +169,7 @@ private:
    */
   void compute_required_subscriptions (
         const RtecEventChannelAdmin::ConsumerQOS& sub,
-              Address_Set& multicast_addresses
-              ACE_ENV_ARG_DECL)
+              Address_Set& multicast_addresses)
               ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Unsubscribe from any multicast addresses we are currently
@@ -220,7 +215,7 @@ private:
     Observer_Disconnect_Command (const Observer_Disconnect_Command &rhs);
     Observer_Disconnect_Command & operator= (const Observer_Disconnect_Command & rhs);
 
-    void execute (ACE_ENV_SINGLE_ARG_DECL);
+    void execute (void);
 
   private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
index 587c2721944..109d5104934 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
@@ -45,7 +45,7 @@ Observer_Disconnect_Command::operator= (
 
 ACE_INLINE void
 TAO_ECG_Mcast_EH::
-Observer_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+Observer_Disconnect_Command::execute (void)
 {
   if (CORBA::is_nil (this->ec_.in ()))
     // We are not connected.
@@ -54,8 +54,7 @@ Observer_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
   RtecEventChannelAdmin::EventChannel_var release_ec =
     this->ec_._retn ();
 
-  release_ec->remove_observer (this->handle_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  release_ec->remove_observer (this->handle_);
 }
 
 //***************************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index fc88ebf5ee9..f99eea7758d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -416,8 +416,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
 TAO_ECG_Refcounted_Handler
 TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
                                      RtecEventChannelAdmin::EventChannel_ptr ec,
-                                     ACE_Reactor *reactor
-                                     ACE_ENV_ARG_DECL)
+                                     ACE_Reactor *reactor)
 {
   TAO_ECG_Refcounted_Handler handler;
 
@@ -450,8 +449,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
 
       h->reactor (reactor);
 
-      h->open (ec ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_ECG_Refcounted_Handler ());
+      h->open (ec);
     }
 
   else if (this->handler_type_ == ECG_HANDLER_UDP)
@@ -490,8 +488,7 @@ TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
 TAO_ECG_Mcast_Gateway::init_sender (
                                RtecEventChannelAdmin::EventChannel_ptr ec,
                                RtecUDPAdmin::AddrServer_ptr address_server,
-                               TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                               ACE_ENV_ARG_DECL)
+                               TAO_ECG_Refcounted_Endpoint endpoint_rptr)
 {
   TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
     sender (TAO_ECG_UDP_Sender::create ());
@@ -500,9 +497,7 @@ TAO_ECG_Mcast_Gateway::init_sender (
 
   sender->init (ec,
                 address_server,
-                endpoint_rptr
-                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> ());
+                endpoint_rptr);
 
   TAO_EC_Auto_Command<UDP_Sender_Shutdown> sender_shutdown;
   sender_shutdown.set_command (UDP_Sender_Shutdown (sender));
@@ -511,8 +506,7 @@ TAO_ECG_Mcast_Gateway::init_sender (
     {
       // Client supplied consumer qos.  Use it.
       this->consumer_qos_.is_gateway = 1;
-      sender->connect (this->consumer_qos_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> ());
+      sender->connect (this->consumer_qos_);
     }
   else
     {
@@ -526,8 +520,7 @@ TAO_ECG_Mcast_Gateway::init_sender (
         const_cast<RtecEventChannelAdmin::ConsumerQOS &> (consumer_qos_factory.get_ConsumerQOS ());
       qos.is_gateway = 1;
 
-      sender->connect (qos ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> ());
+      sender->connect (qos);
     }
 
   sender_shutdown.disallow_command ();
@@ -538,8 +531,7 @@ TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
 TAO_ECG_Mcast_Gateway::init_receiver (
                                RtecEventChannelAdmin::EventChannel_ptr ec,
                                RtecUDPAdmin::AddrServer_ptr address_server,
-                               TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                               ACE_ENV_ARG_DECL)
+                               TAO_ECG_Refcounted_Endpoint endpoint_rptr)
 {
   TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
     receiver (TAO_ECG_UDP_Receiver::create ());
@@ -548,9 +540,7 @@ TAO_ECG_Mcast_Gateway::init_receiver (
 
   receiver->init (ec,
                   endpoint_rptr,
-                  address_server
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> ());
+                  address_server);
 
   TAO_EC_Auto_Command<UDP_Receiver_Shutdown> receiver_shutdown;
   receiver_shutdown.set_command (UDP_Receiver_Shutdown (receiver));
@@ -563,8 +553,7 @@ TAO_ECG_Mcast_Gateway::init_receiver (
     const_cast<RtecEventChannelAdmin::SupplierQOS &> (supplier_qos_factory.get_SupplierQOS ());
   qos.is_gateway = 1;
 
-  receiver->connect (qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> ());
+  receiver->connect (qos);
 
   receiver_shutdown.disallow_command ();
   return receiver;
@@ -572,33 +561,30 @@ TAO_ECG_Mcast_Gateway::init_receiver (
 
 void
 TAO_ECG_Mcast_Gateway::verify_args (CORBA::ORB_ptr orb,
-                                    RtecEventChannelAdmin::EventChannel_ptr ec
-                                    ACE_ENV_ARG_DECL)
+                                    RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   if (CORBA::is_nil (ec))
     {
       ACE_ERROR ((LM_ERROR,
                   "Nil event channel argument passed to "
                   "TAO_ECG_Mcast_Gateway::run().\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   if (CORBA::is_nil (orb))
     {
       ACE_ERROR ((LM_ERROR,
                   "Nil orb argument passed to "
                   "TAO_ECG_Mcast_Gateway::run().\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 }
 
 void
 TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
-                            RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+                            RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   // Verify args.
-  this->verify_args (orb, ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->verify_args (orb, ec);
 
   // Auto-cleanup objects.
   TAO_EC_Object_Deactivator address_server_deactivator;
@@ -612,21 +598,18 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
     {
       ACE_DEBUG ((LM_ERROR,
                   "Unable to create address server.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   RtecUDPAdmin::AddrServer_var address_server;
 
   PortableServer::POA_var poa =
-    address_server_servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    address_server_servant->_default_POA ();
 
   activate (address_server,
             poa.in (),
             address_server_servant.in (),
-            address_server_deactivator
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+            address_server_deactivator);
 
   TAO_ECG_Refcounted_Endpoint endpoint_rptr;
   TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender;
@@ -638,17 +621,15 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
       endpoint_rptr = this->init_endpoint ();
       if (endpoint_rptr.get () == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       sender = this->init_sender (ec,
                                   address_server.in (),
-                                  endpoint_rptr
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                  endpoint_rptr);
       if (!sender.in ())
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       sender_shutdown.set_command (UDP_Sender_Shutdown (sender));
@@ -663,12 +644,10 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
 
       receiver = this->init_receiver (ec,
                                       address_server.in (),
-                                      endpoint_rptr
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                      endpoint_rptr);
       if (!receiver.in ())
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       receiver_shutdown.set_command (UDP_Receiver_Shutdown (receiver));
@@ -676,12 +655,10 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
       TAO_ECG_Refcounted_Handler
         handler_rptr (this->init_handler (receiver.in (),
                                           ec,
-                                          reactor
-                                          ACE_ENV_ARG_PARAMETER));
-      ACE_CHECK;
+                                          reactor));
       if (handler_rptr.get () == 0)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
       receiver->set_handler_shutdown (handler_rptr);
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index d25df608dec..b8bc1797d1b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -220,8 +220,7 @@ public:
   /// The main method - create, configure and run federation
   /// components according to the specified configuration.
   void run (CORBA::ORB_ptr orb,
-            RtecEventChannelAdmin::EventChannel_ptr ec
-            ACE_ENV_ARG_DECL);
+            RtecEventChannelAdmin::EventChannel_ptr ec);
 
 private:
 
@@ -229,8 +228,7 @@ private:
   //@{
   /// Check that arguments to run() are not nil.
   void verify_args (CORBA::ORB_ptr orb,
-                    RtecEventChannelAdmin::EventChannel_ptr ec
-                    ACE_ENV_ARG_DECL);
+                    RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Verifies configuration values specified through init() make sense.
   int validate_configuration (void);
@@ -244,22 +242,19 @@ private:
   TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
         init_sender (RtecEventChannelAdmin::EventChannel_ptr ec,
                      RtecUDPAdmin::AddrServer_ptr address_server,
-                     TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                     ACE_ENV_ARG_DECL);
+                     TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
   TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver>
         init_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
                        RtecUDPAdmin::AddrServer_ptr address_server,
-                       TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                       ACE_ENV_ARG_DECL);
+                       TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
   TAO_ECG_Refcounted_Endpoint init_endpoint (void);
 
   TAO_ECG_Refcounted_Handler
         init_handler (TAO_ECG_Dgram_Handler *recv,
                       RtecEventChannelAdmin::EventChannel_ptr ec,
-                      ACE_Reactor * reactor
-                      ACE_ENV_ARG_DECL);
+                      ACE_Reactor * reactor);
   //@}
 
   /// Flags controlling configuration.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index 0906d59820f..1a3c54d765e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -34,40 +34,33 @@ TAO_ECG_Reactive_ConsumerEC_Control::~TAO_ECG_Reactive_ConsumerEC_Control (void)
 }
 
 void
-TAO_ECG_Reactive_ConsumerEC_Control::query_eventchannel (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_Reactive_ConsumerEC_Control::query_eventchannel ()
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        gateway_->consumer_ec_non_existent (disconnected
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        gateway_->consumer_ec_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->event_channel_not_exist (gateway_);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
-      this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->event_channel_not_exist (gateway_);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT&)
     {
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->event_channel_not_exist (gateway_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -83,59 +76,46 @@ TAO_ECG_Reactive_ConsumerEC_Control::handle_timeout (
   // RELATIVE_RT_TIMEOUT_POLICY set here in effect.
 
   // @@ TODO: should use Guard to set and reset policies.
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::ADD_OVERRIDE);
 
       // Query the state of the consumers...
-      this->query_eventchannel (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->query_eventchannel ();
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Timeout for polling state (default = 10 msec)
       TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -146,9 +126,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -164,11 +142,10 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -189,48 +166,42 @@ TAO_ECG_Reactive_ConsumerEC_Control::shutdown (void)
 
 void
 TAO_ECG_Reactive_ConsumerEC_Control::event_channel_not_exist (
-      TAO_EC_Gateway_IIOP* gateway
-      ACE_ENV_ARG_DECL)
+      TAO_EC_Gateway_IIOP* gateway)
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "EC_Reactive_ConsumerControl(%P|%t) - "
                   "channel %x does not exists\n"));
       gateway->cleanup_consumer_ec ();
 
-      gateway->cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway->cleanup_consumer_proxies ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_EC_Reactive_ConsumerControl::event_channel_not_exist");
+      ex._tao_print_exception (
+        "TAO_EC_Reactive_ConsumerControl::event_channel_not_exist");
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_ECG_Reactive_ConsumerEC_Control::system_exception (
       TAO_EC_Gateway_IIOP* gateway,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       gateway->cleanup_consumer_ec ();
 
-      gateway->cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway->cleanup_consumer_proxies ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
index e7ccad73c2a..c8ff19af961 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -84,16 +84,14 @@ public:
   // = Documented in TAO_EC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway
-                                        ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway);
   virtual void system_exception (TAO_EC_Gateway_IIOP *gateway,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_eventchannel (ACE_ENV_SINGLE_ARG_DECL);
+  void query_eventchannel (void);
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
index 2e14b4da681..9358fbc65af 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -34,90 +34,74 @@ TAO_ECG_Reconnect_ConsumerEC_Control::~TAO_ECG_Reconnect_ConsumerEC_Control (voi
 }
 
 void
-TAO_ECG_Reconnect_ConsumerEC_Control::try_reconnect (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_Reconnect_ConsumerEC_Control::try_reconnect ()
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-      gateway_->consumer_ec_non_existent (disconnected
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway_->consumer_ec_non_existent (disconnected);
       if (!non_existent)
         {
-          this->reconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->reconnect();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_ECG_Reconnect_ConsumerEC_Control::reconnect (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_Reconnect_ConsumerEC_Control::reconnect ()
 {
-  ACE_TRY
+  try
     {
       is_consumer_ec_connected_ = 1;
 
-      gateway_->reconnect_consumer_ec(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway_->reconnect_consumer_ec();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_ECG_Reconnect_ConsumerEC_Control::query_eventchannel (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_Reconnect_ConsumerEC_Control::query_eventchannel ()
 {
-  ACE_TRY
+  try
     {
       if (is_consumer_ec_connected_ == 1)
         {
           CORBA::Boolean disconnected;
           CORBA::Boolean non_existent =
-            gateway_->consumer_ec_non_existent (disconnected
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            gateway_->consumer_ec_non_existent (disconnected);
           if (non_existent && !disconnected)
             {
-              this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->event_channel_not_exist (gateway_);
             }
         }
       else
         {
-           this->try_reconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-           ACE_TRY_CHECK;
+           this->try_reconnect();
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
-      this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->event_channel_not_exist (gateway_);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT&)
     {
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->event_channel_not_exist (gateway_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->event_channel_not_exist (gateway_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -132,59 +116,46 @@ TAO_ECG_Reconnect_ConsumerEC_Control::handle_timeout (
   // remote calls will be carried out with with
   // RELATIVE_RT_TIMEOUT_POLICY set here in effect.
   // @@ TODO: should use Guard to set and reset policies.
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::ADD_OVERRIDE);
 
       // Query the state of the consumers...
-      this->query_eventchannel (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->query_eventchannel ();
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Timeout for polling state (default = 10 msec)
       TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -195,9 +166,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -213,11 +182,10 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -238,38 +206,33 @@ TAO_ECG_Reconnect_ConsumerEC_Control::shutdown (void)
 
 void
 TAO_ECG_Reconnect_ConsumerEC_Control::event_channel_not_exist (
-      TAO_EC_Gateway_IIOP* gateway
-      ACE_ENV_ARG_DECL)
+      TAO_EC_Gateway_IIOP* gateway)
 {
-  ACE_TRY
+  try
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "ECG_Reconnect_ConsumerControl(%P|%t) - "
       //            "channel %x does not exists\n"));
       is_consumer_ec_connected_ = 0;
 
-      gateway->suspend_supplier_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway->suspend_supplier_ec ();
 
-      gateway->cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway->cleanup_consumer_proxies ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_EC_Reconnect_ConsumerControl::event_channel_not_exist");
+      ex._tao_print_exception (
+        "TAO_EC_Reconnect_ConsumerControl::event_channel_not_exist");
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_ECG_Reconnect_ConsumerEC_Control::system_exception (
       TAO_EC_Gateway_IIOP* gateway,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       // The current implementation is very strict, and kicks out a
       // client on the first system exception. We may
@@ -286,17 +249,14 @@ TAO_ECG_Reconnect_ConsumerEC_Control::system_exception (
       //            "channel %x does not exists system except\n"));
       is_consumer_ec_connected_ = 0;
 
-      gateway->suspend_supplier_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway->suspend_supplier_ec ();
 
-      gateway->cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway->cleanup_consumer_proxies ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
index b1f4a6c2987..710a20fcb3b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
@@ -89,22 +89,20 @@ public:
   // = Documented in TAO_EC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway
-                                        ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void event_channel_not_exist (TAO_EC_Gateway_IIOP *gateway);
   virtual void system_exception (TAO_EC_Gateway_IIOP *gateway,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_eventchannel (ACE_ENV_SINGLE_ARG_DECL);
+  void query_eventchannel (void);
 
   /// Look if we can reconnect again.
-  void try_reconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void try_reconnect (void);
 
   /// Reconnect to the consumer ec.
-  void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void reconnect (void);
 
 private:
   /// The polling rate
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
index 25d111d0a07..a115866b93a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
@@ -25,8 +25,7 @@ TAO_ECG_Simple_Address_Server::init (const char *mcast_addr)
 void
 TAO_ECG_Simple_Address_Server::get_addr (
     const RtecEventComm::EventHeader& /*header*/,
-    RtecUDPAdmin::UDP_Addr_out addr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    RtecUDPAdmin::UDP_Addr_out addr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // unsigned long
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index 482661168e0..8ff36c72745 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -44,8 +44,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 1d903fdeb2b..4c7871f5e89 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -29,8 +29,7 @@ TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void)
 void
 TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                             TAO_ECG_Refcounted_Endpoint ignore_from,
-                            RtecUDPAdmin::AddrServer_ptr addr_server
-                            ACE_ENV_ARG_DECL)
+                            RtecUDPAdmin::AddrServer_ptr addr_server)
 {
   // Verify arguments.
   // <addr_server> is allowed to be nil.  But then, if get_addr () method
@@ -40,7 +39,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::init(): "
                   "<lcl_ec> argument is nil.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   this->cdr_receiver_.init (ignore_from);
@@ -53,15 +52,14 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
 }
 
 void
-TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub
-                               ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub)
 {
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     {
       ACE_ERROR ((LM_ERROR,
                   "Error initializing TAO_ECG_UDP_Receiver: "
                   "init() hasn't been called before connect().\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (pub.publications.length () == 0)
@@ -69,24 +67,21 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::connect(): "
                   "0-length publications argument.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->new_connect (pub ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->new_connect (pub);
     }
   else
     {
-      this->reconnect (pub ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->reconnect (pub);
     }
 }
 
 void
-TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
-                                   ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub)
 {
   // Activate with poa.
   RtecEventComm::PushSupplier_var supplier_ref;
@@ -96,24 +91,18 @@ TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
   activate (supplier_ref,
             poa.in (),
             this,
-            deactivator
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+            deactivator);
 
   // Connect as a supplier to the local EC.
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->lcl_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->lcl_ec_->for_suppliers ();
 
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
   ECG_Receiver_Auto_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
 
   proxy->connect_push_supplier (supplier_ref.in (),
-                                pub
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                pub);
 
   // Update resource managers.
   this->consumer_proxy_ = proxy._retn ();
@@ -122,43 +111,38 @@ TAO_ECG_UDP_Receiver::new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
 }
 
 void
-TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub
-                                 ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub)
 {
   // Obtain our object reference from the POA.
   RtecEventComm::PushSupplier_var supplier_ref;
   PortableServer::POA_var poa = this->_default_POA ();
 
-  CORBA::Object_var obj = poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var obj = poa->servant_to_reference (this);
   supplier_ref =
-    RtecEventComm::PushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RtecEventComm::PushSupplier::_narrow (obj.in ());
 
   if (CORBA::is_nil (supplier_ref.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Reconnect.
   this->consumer_proxy_->connect_push_supplier (supplier_ref.in (),
-                                                pub
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                pub);
 }
 
 void
-TAO_ECG_UDP_Receiver::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Receiver::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Prevent attempts to disconnect.
   this->auto_proxy_disconnect_.disallow_command ();
 
-  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown ();
 }
 
 void
-TAO_ECG_UDP_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ECG_UDP_Receiver::shutdown (void)
 {
   if (this->handler_rptr_.get ())
     this->handler_rptr_->shutdown ();
@@ -199,8 +183,7 @@ TAO_ECG_Event_CDR_Decoder::decode (TAO_InputCDR &cdr)
 int
 TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Make sure we are connected to the Event Channel before proceeding
       // any further.
@@ -210,8 +193,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
                       "TAO_ECG_UDP_Receiver::handle_input() "
                       "called but the Receiver is not connected "
                       "to an event channel. Shutting down the Receiver.\n"));
-          this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->shutdown ();
 
           return 0;
         }
@@ -232,18 +214,16 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
                             0);
         }
 
-      this->consumer_proxy_->push (cdr_decoder.events ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->consumer_proxy_->push (cdr_decoder.events);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                   "Caught and swallowed EXCEPTION in "
                   "ECG_UDP_Receiver::handle_input: %s\n",
-                  ACE_ANY_EXCEPTION._info ().c_str ()));
+                  ex._info ().c_str ()));
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 4d8002aa862..34c19e3eeaa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -83,7 +83,7 @@ public:
   TAO_ECG_UDP_Receiver_Disconnect_Command &
    operator= (const TAO_ECG_UDP_Receiver_Disconnect_Command & rhs);
 
-  void execute (ACE_ENV_SINGLE_ARG_DECL);
+  void execute (void);
 
 private:
 
@@ -136,8 +136,7 @@ public:
    */
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
              TAO_ECG_Refcounted_Endpoint ignore_from,
-             RtecUDPAdmin::AddrServer_ptr addr_server
-             ACE_ENV_ARG_DECL);
+             RtecUDPAdmin::AddrServer_ptr addr_server);
 
   /// Connect or reconnect to the EC with the given publications.
   /**
@@ -145,8 +144,7 @@ public:
    * necessary, the EC must have reconnects enabled in order for this
    * method to succeed.
    */
-  void connect (const RtecEventChannelAdmin::SupplierQOS& pub
-                ACE_ENV_ARG_DECL);
+  void connect (const RtecEventChannelAdmin::SupplierQOS& pub);
 
   /// Set the handler we must notify when shutdown occurs.  (This is
   /// the handler that alerts us when data is available on udp/mcast socket.)
@@ -161,20 +159,19 @@ public:
    * result in decrementing of the reference count (due to
    * deactivation) and deletion of the object.
    */
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
   //@}
 
   /// Accessor.
   /// Call the RtecUDPAdmin::AddrServer::get_addr.  Throws exception
   /// if nill Address Server was specified in init ().
   void get_addr (const RtecEventComm::EventHeader& header,
-                 RtecUDPAdmin::UDP_Addr_out addr
-                 ACE_ENV_ARG_DECL);
+                 RtecUDPAdmin::UDP_Addr_out addr);
 
   /// The PushSupplier idl method.
   /// Invokes shutdown (), which may result in the object being deleted, if
   /// refcounting is used to manage its lifetime.
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// TAO_ECG_Dgram_Handler method.
@@ -197,12 +194,10 @@ private:
   /// Helpers for the connect() method.
   //@{
   // Establishes connection to the Event Channel for the first time.
-  void new_connect (const RtecEventChannelAdmin::SupplierQOS& pub
-                    ACE_ENV_ARG_DECL);
+  void new_connect (const RtecEventChannelAdmin::SupplierQOS& pub);
 
   // Updates existing connection to the Event Channel.
-  void reconnect (const RtecEventChannelAdmin::SupplierQOS& pub
-                  ACE_ENV_ARG_DECL);
+  void reconnect (const RtecEventChannelAdmin::SupplierQOS& pub);
   //@}
 
   /// Event Channel to which we act as a supplier.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
index 47eb3d83958..8c0ab413f76 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
@@ -41,7 +41,7 @@ TAO_ECG_UDP_Receiver_Disconnect_Command::operator= (
 
 ACE_INLINE void
 TAO_ECG_UDP_Receiver_Disconnect_Command::
-execute (ACE_ENV_SINGLE_ARG_DECL)
+execute (void)
 {
   if (CORBA::is_nil (this->proxy_.in ()))
     // We are not connected.
@@ -50,8 +50,7 @@ execute (ACE_ENV_SINGLE_ARG_DECL)
   RtecEventChannelAdmin::ProxyPushConsumer_var release_proxy =
     this->proxy_._retn ();
 
-  release_proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  release_proxy->disconnect_push_consumer ();
 }
 
 //***************************************************************************
@@ -86,8 +85,7 @@ TAO_ECG_UDP_Receiver::set_handler_shutdown (
 
 ACE_INLINE void
 TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header,
-                                RtecUDPAdmin::UDP_Addr_out addr
-                                ACE_ENV_ARG_DECL)
+                                RtecUDPAdmin::UDP_Addr_out addr)
 {
   if (CORBA::is_nil (this->addr_server_.in ()))
     {
@@ -96,11 +94,10 @@ TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header,
                   "nil Address Server was supplied during "
                   "initialization through init().\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
-  this->addr_server_->get_addr (header, addr
-                                ACE_ENV_ARG_PARAMETER);
+  this->addr_server_->get_addr (header, addr);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index 2cfc4b5f35f..f3c26bba399 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -32,25 +32,23 @@ TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void)
 void
 TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                           RtecUDPAdmin::AddrServer_ptr addr_server,
-                          TAO_ECG_Refcounted_Endpoint endpoint_rptr
-                          ACE_ENV_ARG_DECL)
+                          TAO_ECG_Refcounted_Endpoint endpoint_rptr)
 {
   if (CORBA::is_nil (lcl_ec))
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): "
                             "<lcl_ec> argument is nil."));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (CORBA::is_nil (addr_server))
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): "
                             "address server argument is nil."));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
-  this->cdr_sender_.init (endpoint_rptr ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->cdr_sender_.init (endpoint_rptr);
 
   this->lcl_ec_ =
     RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec);
@@ -60,38 +58,34 @@ TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
 }
 
 void
-TAO_ECG_UDP_Sender::connect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                             ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Sender::connect (const RtecEventChannelAdmin::ConsumerQOS& sub)
 {
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     {
       ACE_ERROR ((LM_ERROR, "Error initializing TAO_ECG_UDP_Sender: "
                             "init() has not been called before connect()."));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (sub.dependencies.length () == 0)
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::connect(): "
                             "0-length subscriptions argument."));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->new_connect (sub ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->new_connect (sub);
     }
   else
     {
-      this->reconnect (sub ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->reconnect (sub);
     }
 }
 
 void
-TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                                 ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub)
 {
   // Activate with poa.
   RtecEventComm::PushConsumer_var consumer_ref;
@@ -101,24 +95,18 @@ TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
   activate (consumer_ref,
             poa.in (),
             this,
-            deactivator
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+            deactivator);
 
   // Connect as a consumer to the local EC.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->lcl_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->lcl_ec_->for_consumers ();
 
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
   ECG_Sender_Auto_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
 
   proxy->connect_push_consumer (consumer_ref.in (),
-                                sub
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                sub);
 
   // Update resource managers.
   this->supplier_proxy_ = proxy._retn ();
@@ -127,43 +115,38 @@ TAO_ECG_UDP_Sender::new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
 }
 
 void
-TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                               ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub)
 {
   // Obtain our object reference from the POA.
   RtecEventComm::PushConsumer_var consumer_ref;
   PortableServer::POA_var poa = this->_default_POA ();
 
-  CORBA::Object_var obj = poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var obj = poa->servant_to_reference (this);
   consumer_ref =
-    RtecEventComm::PushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RtecEventComm::PushConsumer::_narrow (obj.in ());
 
   if (CORBA::is_nil (consumer_ref.in ()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Reconnect.
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
-                                                sub
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                sub);
 }
 
 void
-TAO_ECG_UDP_Sender::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Sender::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Prevent attempts to disconnect.
   this->auto_proxy_disconnect_.disallow_command ();
 
-  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown ();
 }
 
 void
-TAO_ECG_UDP_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Sender::shutdown (void)
 {
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -174,13 +157,11 @@ TAO_ECG_UDP_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
 
   this->deactivator_.deactivate ();
-  this->cdr_sender_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->cdr_sender_.shutdown ();
 }
 
 void
-TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
-                          ACE_ENV_ARG_DECL)
+TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -218,18 +199,16 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
       cdr.write_ulong (1);
       if (!(cdr << header)
           || !(cdr << e.data))
-        ACE_THROW (CORBA::MARSHAL ());
+        throw CORBA::MARSHAL ();
 
       // Grab the right mcast group for this event...
       RtecUDPAdmin::UDP_Addr udp_addr;
-      this->addr_server_->get_addr (header, udp_addr ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->addr_server_->get_addr (header, udp_addr);
 
       ACE_INET_Addr inet_addr (udp_addr.port,
                                udp_addr.ipaddr);
 
-      this->cdr_sender_.send_message (cdr, inet_addr ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->cdr_sender_.send_message (cdr, inet_addr);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 6210db74d1d..29b7306ab74 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -83,7 +83,7 @@ public:
   TAO_ECG_UDP_Sender_Disconnect_Command &
    operator= (const TAO_ECG_UDP_Sender_Disconnect_Command & rhs);
 
-  void execute (ACE_ENV_SINGLE_ARG_DECL);
+  void execute (void);
 
 private:
 
@@ -136,8 +136,7 @@ public:
    */
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
              RtecUDPAdmin::AddrServer_ptr addr_server,
-             TAO_ECG_Refcounted_Endpoint endpoint_rptr
-             ACE_ENV_ARG_DECL);
+             TAO_ECG_Refcounted_Endpoint endpoint_rptr);
 
   /// Connect or reconnect to the EC with the given subscriptions.
   /**
@@ -145,8 +144,7 @@ public:
    * necessary, the EC must have reconnects enabled in order for this
    * method to succeed.
    */
-  void connect (const RtecEventChannelAdmin::ConsumerQOS &sub
-                ACE_ENV_ARG_DECL);
+  void connect (const RtecEventChannelAdmin::ConsumerQOS &sub);
 
   /// Deactivate from POA and disconnect from EC, if necessary.  Shut
   /// down all sender components.
@@ -154,7 +152,7 @@ public:
    * Calling this method may result in decrementing of the reference
    * count (due to deactivation) and deletion of the object.
    */
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
   //@}
 
   /// Accessors.
@@ -176,10 +174,9 @@ public:
   //@{
   /// Invokes shutdown (), which may result in the object being deleted, if
   /// refcounting is used to manage its lifetime.
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet &events)
       ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -194,12 +191,10 @@ private:
   /// Helpers for the connect() method.
   //@{
   // Establishes connection to the Event Channel for the first time.
-  void new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                    ACE_ENV_ARG_DECL);
+  void new_connect (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
   // Updates existing connection to the Event Channel.
-  void reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub
-                  ACE_ENV_ARG_DECL);
+  void reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub);
   //@}
 
   /// Proxy used to receive events from the Event Channel.
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
index c58a7a81ca8..db0e235abbd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
@@ -80,7 +80,7 @@ TAO_ECG_UDP_Sender_Disconnect_Command::operator= (
 }
 
 ACE_INLINE void
-TAO_ECG_UDP_Sender_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Sender_Disconnect_Command::execute (void)
 {
   if (CORBA::is_nil (this->proxy_.in ()))
     // We are not connected.
@@ -89,8 +89,7 @@ TAO_ECG_UDP_Sender_Disconnect_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
   RtecEventChannelAdmin::ProxyPushSupplier_var release_proxy =
     this->proxy_._retn ();
 
-  release_proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  release_proxy->disconnect_push_supplier ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 715979d31a9..335f20b9854 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -55,14 +55,12 @@ TAO_EC_And_Filter::size (void) const
 
 int
 TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
-                           TAO_EC_QOS_Info& qos_info
-                           ACE_ENV_ARG_DECL)
+                           TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      int n = (*i)->filter (event, qos_info);
       if (n == 0)
         return 0;
     }
@@ -70,8 +68,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
   // All children accepted the event, push up...
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->parent ()->push (event, qos_info);
     }
 
   return 1;
@@ -79,14 +76,12 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                  TAO_EC_QOS_Info& qos_info
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      int n = (*i)->filter_nocopy (event, qos_info);
       if (n == 0)
         return 0;
     }
@@ -94,8 +89,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
   // All children accepted the event, push up...
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->parent ()->push (event, qos_info);
     }
 
   return 1;
@@ -103,15 +97,13 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_And_Filter::push (const RtecEventComm::EventSet&,
-                         TAO_EC_QOS_Info&
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         TAO_EC_QOS_Info&)
 {
 }
 
 void
 TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&,
-                                TAO_EC_QOS_Info&
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                TAO_EC_QOS_Info&)
 {
 }
 
@@ -161,8 +153,7 @@ TAO_EC_And_Filter::can_match (
 int
 TAO_EC_And_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info&
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info&)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index 67c9614af70..64279931341 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -53,23 +53,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_And_Filter (const TAO_EC_And_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index 26f4df71ff0..fc231d2186d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -27,8 +27,7 @@ TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Basic_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos
-    ACE_ENV_ARG_DECL_NOT_USED) const
+    RtecEventChannelAdmin::ConsumerQOS& qos) const
 {
   CORBA::ULong pos = 0;
   return this->recursive_build (supplier, qos, pos);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 91e4c61105f..1c6815b3695 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -51,8 +51,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 
 private:
   /// Recursively build the filter tree.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index 7701ba4d1d1..5a2c20f3083 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -41,8 +41,7 @@ TAO_EC_Bitmask_Filter::size (void) const
 
 int
 TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
     return 0;
@@ -51,13 +50,12 @@ TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) == 0)
     return 0;
 
-  return this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->child_->filter (event, qos_info);
 }
 
 int
 TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
     return 0;
@@ -66,25 +64,23 @@ TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) == 0)
     return 0;
 
-  return this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->child_->filter_nocopy (event, qos_info);
 }
 
 void
 TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info &qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info &qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info);
 }
 
 void
 TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event,
-                                    TAO_EC_QOS_Info &qos_info
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info &qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
@@ -113,8 +109,7 @@ TAO_EC_Bitmask_Filter::can_match (
 int
 TAO_EC_Bitmask_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index bc2a3469d00..6a0ff879165 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -70,23 +70,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Bitmask_Filter (const TAO_EC_Bitmask_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
index 3759342a5e9..81912d74e57 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
@@ -15,16 +15,13 @@ TAO_EC_Channel_Destroyer_Functor::operator() (
                            TAO_EC_Event_Channel_Base * event_channel)
   ACE_THROW_SPEC (())
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index e8fae3ae659..ff6f91ecd91 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -80,16 +80,14 @@ TAO_EC_Conjunction_Filter::size (void) const
 
 int
 TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (this->current_child_ = this->begin ();
        this->current_child_ != end;
        ++this->current_child_)
     {
-      int n = (*this->current_child_)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      int n = (*this->current_child_)->filter (event, qos_info);
       if (n != 0)
         return n;
     }
@@ -98,16 +96,14 @@ TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      int n = (*i)->filter_nocopy (event, qos_info);
       if (n != 0)
         return n;
     }
@@ -116,8 +112,7 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   CORBA::Long pos = this->current_child_ - this->begin ();
   int w = pos / bits_per_word;
@@ -133,15 +128,14 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
       this->event_[l + i] = event[i];
     }
   if (this->all_received () && this->parent () != 0)
-    this->parent ()->push_nocopy (this->event_, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (this->event_, qos_info);
 }
 
 void
 TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                        TAO_EC_QOS_Info& qos_info
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_QOS_Info& qos_info)
 {
-  this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push (event, qos_info);
 }
 
 void
@@ -200,8 +194,7 @@ TAO_EC_Conjunction_Filter::can_match (
 int
 TAO_EC_Conjunction_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info&
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info&)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index e50d6b37867..830e5f49ef3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -55,23 +55,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
   typedef unsigned int Word;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index 73bf25fff47..d12e6b6fb52 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -26,14 +26,14 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void)
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_EC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ConsumerAdmin::obtain_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->obtain ();
 }
 
 PortableServer::POA_ptr
-TAO_EC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ConsumerAdmin::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 60e45de355a..c6804bd5dcb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -63,11 +63,11 @@ public:
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_supplier (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index 007d90bd404..f037ca17b53 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -27,15 +27,13 @@ TAO_EC_ConsumerControl::shutdown (void)
 }
 
 void
-TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier *
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier *)
 {
 }
 
 void
 TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *,
-                                          CORBA::SystemException &
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 281fe09f0d3..91ae370d1d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -66,14 +66,12 @@ public:
    * has been destroyed.  The strategy has to (at the very least),
    * reclaim all the resources attached to that object.
    */
-  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL);
+  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy);
 
   /// Some system exception was raised while trying to contact the
   /// consumer
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL);
+                                 CORBA::SystemException &);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
index e3bca47a2d0..321bb4b733b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -25,8 +25,7 @@ TAO_EC_Default_ProxyPushConsumer::~TAO_EC_Default_ProxyPushConsumer (void)
 void
 TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
       RtecEventComm::PushSupplier_ptr push_supplier,
-      const RtecEventChannelAdmin::SupplierQOS& qos
-      ACE_ENV_ARG_DECL)
+      const RtecEventChannelAdmin::SupplierQOS& qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecEventChannelAdmin::AlreadyConnected))
 {
@@ -35,12 +34,11 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i ())
       {
         if (this->event_channel_->supplier_reconnect () == 0)
-          ACE_THROW (RtecEventChannelAdmin::AlreadyConnected ());
+          throw RtecEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed, go ahead and disconnect the
         // consumer...
@@ -55,10 +53,8 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
               TAO_EC_Unlock, ace_mon, reverse_lock,
               CORBA::INTERNAL ());
           // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
 
-          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->event_channel_->reconnected (this);
         }
 
         // A separate thread could have connected siomultaneously,
@@ -84,12 +80,11 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 void
-TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event
-                                        ACE_ENV_ARG_DECL)
+TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -99,14 +94,11 @@ TAO_EC_Default_ProxyPushConsumer::push (const RtecEventComm::EventSet& event
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->push (event, this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ace_mon.filter->push (event, this);
 }
 
 void
-TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushSupplier_var supplier;
@@ -117,7 +109,6 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     connected = this->is_connected_i ();
     supplier = this->supplier_._retn ();
@@ -128,8 +119,7 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->disconnected (this);
 
   if (CORBA::is_nil (supplier.in ()))
     {
@@ -138,54 +128,50 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer (
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
-          supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          supplier->disconnect_push_supplier ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore exceptions, we must isolate other clients from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
 PortableServer::POA_ptr
-TAO_EC_Default_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushConsumer::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_EC_Default_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushConsumer::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_EC_Default_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushConsumer::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
 
 void
 TAO_EC_Default_ProxyPushConsumer::activate (
-   RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy
-   ACE_ENV_ARG_DECL)
+   RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  proxy = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy = this->_this ();
 }
 
 PortableServer::ObjectId
-TAO_EC_Default_ProxyPushConsumer::object_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushConsumer::object_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var result =
-    this->default_POA_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    this->default_POA_->servant_to_id (this);
   return result.in ();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index e08d7d4c092..5e518a211bf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -49,32 +49,29 @@ public:
   virtual ~TAO_EC_Default_ProxyPushConsumer (void);
 
  virtual void activate (
-     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::SupplierQOS& qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecEventChannelAdmin::AlreadyConnected));
-  virtual void push (const RtecEventComm::EventSet& event
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& event)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
 private:
 
   virtual PortableServer::ObjectId
-         object_id (ACE_ENV_SINGLE_ARG_DECL)
+         object_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
index a431afb219f..5b2b612d69c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp
@@ -28,27 +28,25 @@ TAO_EC_Default_ProxyPushSupplier::~TAO_EC_Default_ProxyPushSupplier (void)
 void
 TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
       RtecEventComm::PushConsumer_ptr push_consumer,
-      const RtecEventChannelAdmin::ConsumerQOS& qos
-      ACE_ENV_ARG_DECL)
+      const RtecEventChannelAdmin::ConsumerQOS& qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected,
                      RtecEventChannelAdmin::TypeError))
 {
   // Nil PushConsumers are illegal
   if (CORBA::is_nil (push_consumer))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i ())
       {
         if (this->event_channel_->consumer_reconnect () == 0)
-          ACE_THROW (RtecEventChannelAdmin::AlreadyConnected ());
+          throw RtecEventChannelAdmin::AlreadyConnected ();
 
         // Re-connections are allowed....
         this->cleanup_i ();
@@ -58,9 +56,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
         this->qos_ = qos;
         this->child_ =
           this->event_channel_->filter_builder ()->build (this,
-                                                          this->qos_
-                                                          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                                          this->qos_);
 
         this->adopt_child (this->child_);
 
@@ -71,10 +67,8 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
               TAO_EC_Unlock, ace_mon, reverse_lock,
               CORBA::INTERNAL ());
           // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
 
-          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->event_channel_->reconnected (this);
         }
 
         // A separate thread could have connected simultaneously,
@@ -89,9 +83,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
       {
         // Validate connection during connect.
         CORBA::PolicyList_var unused;
-        int status = push_consumer->_validate_connection (unused
-                                                          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        int status = push_consumer->_validate_connection (unused);
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
         ACE_DEBUG ((LM_DEBUG, "Validated connection to PushConsumer on connect. Status[%d]\n", status));
 #else
@@ -111,20 +103,17 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer (
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
     this->child_ =
       this->event_channel_->filter_builder ()->build (this,
-                                                      this->qos_
-                                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                                      this->qos_);
 
     this->adopt_child (this->child_);
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this);
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushConsumer_var consumer;
@@ -135,7 +124,6 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
     // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     connected = this->is_connected_i ();
     consumer = this->consumer_._retn ();
@@ -145,8 +133,7 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->disconnected (this);
 
   if (!connected)
     {
@@ -155,72 +142,65 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier (
 
   if (this->event_channel_->disconnect_callbacks ())
     {
-      ACE_TRY
+      try
         {
-          consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer->disconnect_push_consumer ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // Ignore exceptions, we must isolate other clients from
           // problems on this one.
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ProxySupplier::disconnect_push_supplier");
+          ex._tao_print_exception ("ProxySupplier::disconnect_push_supplier");
         }
-      ACE_ENDTRY;
     }
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushSupplier::suspend_connection (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->suspend_connection_locked (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->suspend_connection_locked ();
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushSupplier::resume_connection (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->resume_connection_locked (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->resume_connection_locked ();
 }
 
 PortableServer::POA_ptr
-TAO_EC_Default_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushSupplier::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushSupplier::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_EC_Default_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Default_ProxyPushSupplier::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
 
 void
 TAO_EC_Default_ProxyPushSupplier::activate (
-   RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy
-   ACE_ENV_ARG_DECL)
+   RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  proxy = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy = this->_this ();
 }
 
 PortableServer::ObjectId
-TAO_EC_Default_ProxyPushSupplier::object_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Default_ProxyPushSupplier::object_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var result =
-    this->default_POA_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
+    this->default_POA_->servant_to_id (this);
 
   return result.in ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index ae59254ea93..d577085e134 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -44,34 +44,32 @@ public:
   virtual ~TAO_EC_Default_ProxyPushSupplier (void);
 
   void activate (
-     RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// IDL methods.
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void suspend_connection (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void resume_connection (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
 private:
 
   virtual PortableServer::ObjectId
-            object_id (ACE_ENV_SINGLE_ARG_DECL)
+            object_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 9016401e2f4..51b47cc607c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -56,16 +56,14 @@ TAO_EC_Disjunction_Filter::size (void) const
 
 int
 TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      int n = (*i)->filter (event, qos_info);
       if (n != 0)
         return n;
     }
@@ -74,16 +72,14 @@ TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      int n = (*i)->filter (event, qos_info);
       if (n != 0)
         return n;
     }
@@ -92,20 +88,18 @@ TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Disjunction_Filter::push (const RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info);
 }
 
 void
 TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
@@ -154,8 +148,7 @@ TAO_EC_Disjunction_Filter::can_match (
 int
 TAO_EC_Disjunction_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index 06585acb46d..7c95f0a32d6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -54,23 +54,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Disjunction_Filter (const TAO_EC_Disjunction_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 14fc0cc7860..3c1561a5cfe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -68,13 +68,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info &qos_info
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                     TAO_EC_QOS_Info &qos_info) = 0;
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                            TAO_EC_QOS_Info &qos_info) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 0dcbf675bd9..a691cefb1d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -71,8 +71,7 @@ int
 TAO_EC_Simple_Queue_Full_Action::queue_full_action (TAO_EC_Dispatching_Task * /*task*/,
                                                     TAO_EC_ProxyPushSupplier * /*proxy*/,
                                                     RtecEventComm::PushConsumer_ptr /*consumer*/,
-                                                    RtecEventComm::EventSet& /*event*/
-                                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                                    RtecEventComm::EventSet& /*event*/)
 {
   return this->queue_full_action_return_value_;
 }
@@ -103,7 +102,7 @@ TAO_EC_Dispatching_Task::svc (void)
   int done = 0;
   while (!done)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           ACE_Message_Block *mb = 0;
           if (this->getq (mb) == -1)
@@ -122,20 +121,17 @@ TAO_EC_Dispatching_Task::svc (void)
               continue;
             }
 
-          int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int result = command->execute ();
 
           ACE_Message_Block::release (mb);
 
           if (result == -1)
             done = 1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "EC (%P|%t) exception in dispatching queue");
+          ex._tao_print_exception ("EC (%P|%t) exception in dispatching queue");
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
@@ -143,16 +139,13 @@ TAO_EC_Dispatching_Task::svc (void)
 void
 TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
                                RtecEventComm::PushConsumer_ptr consumer,
-                               RtecEventComm::EventSet& event
-                               ACE_ENV_ARG_DECL)
+                               RtecEventComm::EventSet& event)
 {
   if (this->msg_queue()->is_full ())
     {
       int action =
         this->queue_full_service_object_->queue_full_action (this, proxy,
-                                                             consumer, event
-                                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                             consumer, event);
 
       if (action == TAO_EC_Queue_Full_Service_Object::SILENTLY_DISCARD)
         return;
@@ -165,8 +158,7 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
   void* buf = this->allocator_->malloc (sizeof (TAO_EC_Push_Command));
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   ACE_Message_Block *mb =
     new (buf) TAO_EC_Push_Command (proxy,
@@ -186,7 +178,7 @@ TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void)
 // ****************************************************************
 
 int
-TAO_EC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Shutdown_Task_Command::execute (void)
 {
   return -1;
 }
@@ -199,11 +191,10 @@ TAO_EC_Push_Command::~TAO_EC_Push_Command (void)
 }
 
 int
-TAO_EC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Push_Command::execute (void)
 {
   this->proxy_->push_to_consumer (this->consumer_.in (),
-                                  this->event_
-                                   ACE_ENV_ARG_PARAMETER);
+                                  this->event_);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 3fcdc312679..87dadae0b03 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -50,8 +50,7 @@ public:
   virtual int queue_full_action (TAO_EC_Dispatching_Task *task,
                                  TAO_EC_ProxyPushSupplier *proxy,
                                  RtecEventComm::PushConsumer_ptr consumer,
-                                 RtecEventComm::EventSet& event
-                                 ACE_ENV_ARG_DECL) = 0;
+                                 RtecEventComm::EventSet& event) = 0;
 };
 
 class TAO_RTEvent_Serv_Export TAO_EC_Simple_Queue_Full_Action :
@@ -71,8 +70,7 @@ public:
   virtual int queue_full_action (TAO_EC_Dispatching_Task *task,
                                  TAO_EC_ProxyPushSupplier *proxy,
                                  RtecEventComm::PushConsumer_ptr consumer,
-                                 RtecEventComm::EventSet& event
-                                 ACE_ENV_ARG_DECL);
+                                 RtecEventComm::EventSet& event);
 
 protected:
   int queue_full_action_return_value_;
@@ -109,8 +107,7 @@ public:
 
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
-                     RtecEventComm::EventSet& event
-                     ACE_ENV_ARG_DECL);
+                     RtecEventComm::EventSet& event);
 
 private:
   /// An per-task allocator
@@ -141,7 +138,7 @@ public:
   virtual ~TAO_EC_Dispatch_Command (void);
 
   /// Command callback
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
+  virtual int execute (void) = 0;
 };
 
 // ****************************************************************
@@ -153,7 +150,7 @@ public:
   TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (void);
 };
 
 // ****************************************************************
@@ -172,7 +169,7 @@ public:
   virtual ~TAO_EC_Push_Command (void);
 
   /// Command callback
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (void);
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index b10f5168dda..831bd3f1be5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -109,7 +109,7 @@ TAO_EC_Event_Channel_Base::create_strategies (void)
 }
 
 void
-TAO_EC_Event_Channel_Base::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Event_Channel_Base::activate (void)
 {
   {
     // First check if the EC is idle, if it is not then we need to
@@ -133,7 +133,7 @@ TAO_EC_Event_Channel_Base::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_EC_Event_Channel_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel_Base::shutdown (void)
 {
   {
     // First check if the EC is already active, if it is not then we
@@ -151,11 +151,9 @@ TAO_EC_Event_Channel_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   this->deactivate_supplier_admin ();
   this->deactivate_consumer_admin ();
 
-  this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->shutdown ();
 
-  this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->shutdown ();
 
   {
     // Wait until all the shutdown() operations return before marking
@@ -169,185 +167,142 @@ TAO_EC_Event_Channel_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_EC_Event_Channel_Base::deactivate_supplier_admin (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::POA_var supplier_poa =
-        this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->supplier_admin_->_default_POA ();
       PortableServer::ObjectId_var supplier_id =
-        supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_poa->servant_to_id (this->supplier_admin_);
+      supplier_poa->deactivate_object (supplier_id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
             // The deactivation can throw...
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_EC_Event_Channel_Base::deactivate_consumer_admin (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableServer::POA_var consumer_poa =
-        this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->consumer_admin_->_default_POA ();
       PortableServer::ObjectId_var consumer_id =
-        consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_poa->servant_to_id (this->consumer_admin_);
+      consumer_poa->deactivate_object (consumer_id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
             // The deactivation can throw...
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushConsumer* consumer
-                                      ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushConsumer* consumer)
 {
-  this->consumer_admin_->peer_connected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->peer_connected (consumer);
+  this->supplier_admin_->connected (consumer);
+  this->observer_strategy_->connected (consumer);
 }
 
 void
-TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushConsumer* consumer
-                                        ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushConsumer* consumer)
 {
-  this->consumer_admin_->peer_reconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->peer_reconnected (consumer);
+  this->supplier_admin_->reconnected (consumer);
+  this->observer_strategy_->connected (consumer);
 }
 
 void
-TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushConsumer* consumer
-                                         ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushConsumer* consumer)
 {
-  this->consumer_admin_->peer_disconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->observer_strategy_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->peer_disconnected (consumer);
+  this->supplier_admin_->disconnected (consumer);
+  this->observer_strategy_->disconnected (consumer);
 }
 
 void
-TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushSupplier* supplier
-                                      ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::connected (TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->supplier_admin_->peer_connected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->peer_connected (supplier);
+  this->consumer_admin_->connected (supplier);
+  this->observer_strategy_->connected (supplier);
 }
 
 void
-TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushSupplier* supplier
-                                        ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::reconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->supplier_admin_->peer_reconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->peer_reconnected (supplier);
+  this->consumer_admin_->reconnected (supplier);
+  this->observer_strategy_->connected (supplier);
 }
 
 void
-TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier
-                                         ACE_ENV_ARG_DECL)
+TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->supplier_admin_->peer_disconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->observer_strategy_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->peer_disconnected (supplier);
+  this->consumer_admin_->disconnected (supplier);
+  this->observer_strategy_->disconnected (supplier);
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_EC_Event_Channel_Base::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel_Base::for_consumers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->consumer_admin_->_this ();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_EC_Event_Channel_Base::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel_Base::for_suppliers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_admin_->_this ();
 }
 
 void
-TAO_EC_Event_Channel_Base::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel_Base::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown ();
 }
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Event_Channel_Base::append_observer (
-       RtecEventChannelAdmin::Observer_ptr observer
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_ptr observer)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->observer_strategy_->append_observer (observer
-                                                    ACE_ENV_ARG_PARAMETER);
+  return this->observer_strategy_->append_observer (observer);
 }
 
 void
 TAO_EC_Event_Channel_Base::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_Handle handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->observer_strategy_->remove_observer (handle
-                                             ACE_ENV_ARG_PARAMETER);
+  this->observer_strategy_->remove_observer (handle);
 }
 
 void
 TAO_EC_Event_Channel_Base::for_each_consumer (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker
-                    ACE_ENV_ARG_DECL)
+                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->consumer_admin_->for_each (worker
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->for_each (worker);
 }
 
 void
 TAO_EC_Event_Channel_Base::for_each_supplier (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker
-                    ACE_ENV_ARG_DECL)
+                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->supplier_admin_->for_each (worker
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->for_each (worker);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 9027e64de4a..20df5b0d3a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -116,20 +116,18 @@ public:
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void activate (void);
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void shutdown (void);
 
   virtual void for_each_consumer (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker
-                    ACE_ENV_ARG_DECL)
+                    TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> *worker)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void for_each_supplier (
-                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker
-                    ACE_ENV_ARG_DECL)
+                    TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> *worker)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Access the dispatching module....
@@ -193,21 +191,15 @@ public:
 
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushConsumer*);
+  virtual void reconnected (TAO_EC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier*
-                            ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushSupplier*);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*);
 
   // Simple flags to control the EC behavior, set by the application
   // at construction time.
@@ -227,31 +219,29 @@ public:
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   /// The default implementation is:
-  ///    this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ///    this->consumer_admin ()->_this ();
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+      for_consumers (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The default implementation is:
-  ///    this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ///    this->supplier_admin ()->_this ();
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+      for_suppliers (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Commit suicide.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void
-      remove_observer (RtecEventChannelAdmin::Observer_Handle
-                       ACE_ENV_ARG_DECL)
+      remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index b8c32a6ad68..ef641d07bbf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -44,56 +44,48 @@ TAO_EC_Filter::size (void) const
 }
 
 void
-TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info)
 {
   ACE_UNUSED_ARG (qos_info);
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
+  throw CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
 // ****************************************************************
 
 int
 TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL)
+                            TAO_EC_QOS_Info& qos_info)
 {
   // This is a leaf, no need to query any children, and we accept all
   // events, so push it.
-  this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->push (event, qos_info);
   return 1;
 }
 
 int
 TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   // This is a leaf, no need to query any children, and we accept all
   // events, so push it.
-  this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->push_nocopy (event, qos_info);
   return 1;
 }
 
 void
 TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event,
-                          TAO_EC_QOS_Info& qos_info
-                          ACE_ENV_ARG_DECL)
+                          TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info);
 }
 
 void
 TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
@@ -120,8 +112,7 @@ TAO_EC_Null_Filter::can_match (const RtecEventComm::EventHeader&) const
 int
 TAO_EC_Null_Filter::add_dependencies (
       const RtecEventComm::EventHeader &,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 
 {
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index a08dcf7a711..a0909dcec8b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -95,11 +95,9 @@ public:
    * EC_ProxyPushSupplier take an event rather than a set?
    */
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL) = 0;
+                      TAO_EC_QOS_Info& qos_info) = 0;
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL) = 0;
+                             TAO_EC_QOS_Info& qos_info) = 0;
 
   /**
    * This is called by the children when they accept an event and
@@ -108,11 +106,9 @@ public:
    * not const then filter can take ownership of the event.
    */
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL) = 0;
+                     TAO_EC_QOS_Info& qos_info) = 0;
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL) = 0;
+                            TAO_EC_QOS_Info& qos_info) = 0;
 
   /// Clear any saved state, must reset and assume no events have been
   /// received.
@@ -143,8 +139,7 @@ public:
    * fairly soon.
    */
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL) = 0;
+                                const TAO_EC_QOS_Info& qos_info) = 0;
 
   /**
    * Obtain the QOS information for this filter, the default
@@ -152,8 +147,7 @@ public:
    * support scheduling information implement this method.
    * @return Returns 0 on success and -1 on failure
    */
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   /// The parent...
@@ -184,23 +178,18 @@ public:
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index 8f1bbdb6ea1..f06edd5439c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -24,8 +24,7 @@ TAO_EC_Null_Filter_Builder::~TAO_EC_Null_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Null_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *,
-    RtecEventChannelAdmin::ConsumerQOS&
-    ACE_ENV_ARG_DECL_NOT_USED) const
+    RtecEventChannelAdmin::ConsumerQOS&) const
 {
   return new TAO_EC_Null_Filter;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index 45d8a6e573b..58ddcd276bd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -50,8 +50,7 @@ public:
   /// returned.
   virtual TAO_EC_Filter*
       build (TAO_EC_ProxyPushSupplier *supplier,
-             RtecEventChannelAdmin::ConsumerQOS& qos
-             ACE_ENV_ARG_DECL) const = 0;
+             RtecEventChannelAdmin::ConsumerQOS& qos) const = 0;
 
 };
 
@@ -75,8 +74,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 965e6a9daf6..4553477035d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -54,7 +54,7 @@ public:
 
   /// The gateway must disconnect from all the relevant event channels,
   /// or any other communication media (such as multicast groups).
-  virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
+  virtual void close (void) = 0;
 
   /// Obtain and modify the observer handle.
   void observer_handle (RtecEventChannelAdmin::Observer_Handle h);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index cf58d8cbd06..b21479fe024 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -61,18 +61,16 @@ TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void)
 
 int
 TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
-                           RtecEventChannelAdmin::EventChannel_ptr consumer_ec
-                           ACE_ENV_ARG_DECL)
+                           RtecEventChannelAdmin::EventChannel_ptr consumer_ec)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
-  return this->init_i (supplier_ec, consumer_ec ACE_ENV_ARG_PARAMETER);
+  return this->init_i (supplier_ec, consumer_ec);
 }
 
 int
 TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
-                             RtecEventChannelAdmin::EventChannel_ptr consumer_ec
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             RtecEventChannelAdmin::EventChannel_ptr consumer_ec)
 {
   if (CORBA::is_nil (this->supplier_ec_.in ()) && CORBA::is_nil (this->consumer_ec_.in ()))
   {
@@ -97,15 +95,15 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec
 }
 
 void
-TAO_EC_Gateway_IIOP::close (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::close (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->close_i ();
 }
 
 void
-TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -116,22 +114,20 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_DECL)
       return;
     }
 
-  this->cleanup_consumer_proxies_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->cleanup_consumer_proxies_i ();
 }
 
 void
-TAO_EC_Gateway_IIOP::close_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::close_i (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
-  this->disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect_consumer_proxies_i ();
 
-  this->disconnect_supplier_proxy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect_supplier_proxy_i ();
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (void)
 {
   if (this->consumer_proxy_map_.current_size () > 0)
     {
@@ -142,15 +138,13 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL)
           RtecEventComm::PushConsumer_ptr consumer = (*j).int_id_;
           if (CORBA::is_nil (consumer))
             continue;
-          ACE_TRY
+          try
             {
-              consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              consumer->disconnect_push_consumer ();
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
             }
-          ACE_ENDTRY;
           CORBA::release (consumer);
         }
       // Remove all the elements on the map.  Calling close() does not
@@ -160,8 +154,7 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL)
 
   if (!CORBA::is_nil (this->default_consumer_proxy_.in ()))
     {
-      this->default_consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->default_consumer_proxy_->disconnect_push_consumer ();
 
       this->default_consumer_proxy_ =
         RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -169,12 +162,11 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (void)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_proxy_->disconnect_push_supplier ();
 
       this->supplier_proxy_ =
         RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -182,7 +174,7 @@ TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_EC_Gateway_IIOP::reconnect_consumer_ec(ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::reconnect_consumer_ec(void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -192,13 +184,12 @@ TAO_EC_Gateway_IIOP::reconnect_consumer_ec(ACE_ENV_SINGLE_ARG_DECL)
       return;
     }
 
-  this->update_consumer_i (c_qos_ ACE_ENV_ARG_PARAMETER);
+  this->update_consumer_i (c_qos_);
 }
 
 void
 TAO_EC_Gateway_IIOP::update_consumer (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::ConsumerQOS& c_qos)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (c_qos.dependencies.length () == 0)
@@ -214,11 +205,11 @@ TAO_EC_Gateway_IIOP::update_consumer (
       return;
     }
 
-  this->update_consumer_i (c_qos ACE_ENV_ARG_PARAMETER);
+  this->update_consumer_i (c_qos);
 }
 
 void
-TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i (void)
 {
   if (this->consumer_proxy_map_.current_size () > 0)
     {
@@ -246,11 +237,9 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USE
 
 void
 TAO_EC_Gateway_IIOP::update_consumer_i (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::ConsumerQOS& c_qos)
 {
-  this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->close_i ();
 
   if (CORBA::is_nil (this->consumer_ec_.in ())
       || CORBA::is_nil (this->supplier_ec_.in ()))
@@ -258,19 +247,16 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i \n"));
 
-  this->open_i (c_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->open_i (c_qos);
 }
 
 void
 TAO_EC_Gateway_IIOP::open_i (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::ConsumerQOS& c_qos)
 {
   // = Connect as a supplier to the consumer EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->consumer_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_ec_->for_suppliers ();
 
   RtecEventChannelAdmin::ConsumerQOS sub = c_qos;
   sub.is_gateway = 1;
@@ -307,8 +293,7 @@ TAO_EC_Gateway_IIOP::open_i (
           //ACE_DEBUG ((LM_DEBUG,
           //            "ECG (%t)    binding source %d\n",
           //            sid));
-          proxy = supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          proxy = supplier_admin->obtain_push_consumer ();
           this->consumer_proxy_map_.bind (sid, proxy);
         }
     }
@@ -322,8 +307,7 @@ TAO_EC_Gateway_IIOP::open_i (
 
       // Obtain a reference to our supplier personality...
       RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->supplier_._this ();
 
       // For each subscription by source build the set of publications
       // (they may several, by type, for instance) and connect to the
@@ -365,9 +349,7 @@ TAO_EC_Gateway_IIOP::open_i (
           // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Supplier "));
           // ACE_SupplierQOS_Factory::debug (pub);
           (*j).int_id_->connect_push_supplier (supplier_ref.in (),
-                                               pub
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                               pub);
         }
     }
 
@@ -407,56 +389,46 @@ TAO_EC_Gateway_IIOP::open_i (
 
       // Obtain a reference to our supplier personality...
       RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->supplier_._this ();
 
       // Obtain the consumer....
       this->default_consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       pub.publications.length (c);
       // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier "));
       // ACE_SupplierQOS_Factory::debug (pub);
       this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (),
-                                                            pub
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                            pub);
     }
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->supplier_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->supplier_ec_->for_consumers ();
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
   this->consumer_is_active_ = 1;
   RtecEventComm::PushConsumer_var consumer_ref =
-    this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_._this ();
 
   // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer "));
   // ACE_ConsumerQOS_Factory::debug (sub);
 
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
-                                                sub
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                sub);
 }
 
 void
 TAO_EC_Gateway_IIOP::update_supplier (
-    const RtecEventChannelAdmin::SupplierQOS&
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const RtecEventChannelAdmin::SupplierQOS&)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing...
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Gateway_IIOP::disconnect_push_consumer (void)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //             "ECG (%t): Supplier-consumer received "
@@ -464,7 +436,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Gateway_IIOP::disconnect_push_supplier (void)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //            "ECG (%t): Supplier received "
@@ -472,8 +444,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
-                           ACE_ENV_ARG_DECL)
+TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events)
 {
   // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) - \n"));
 
@@ -522,8 +493,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
         out[0].header.ttl--;
 
       // ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n"));
-      this->push_to_consumer(proxy, out ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->push_to_consumer(proxy, out);
     }
 
   {
@@ -534,15 +504,13 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
     if (this->busy_count_ == 0 && this->cleanup_posted_ != 0)
       {
         this->cleanup_posted_ = 0;
-        this->cleanup_consumer_proxies_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->cleanup_consumer_proxies_i ();
       }
 
     if (this->busy_count_ == 0 && this->update_posted_ != 0)
       {
         this->update_posted_ = 0;
-        this->update_consumer_i (this->c_qos_ ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        this->update_consumer_i (this->c_qos_);
       }
   }
 }
@@ -550,66 +518,53 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
 void
 TAO_EC_Gateway_IIOP::push_to_consumer (
     RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-    const RtecEventComm::EventSet& event
-    ACE_ENV_ARG_DECL)
+    const RtecEventComm::EventSet& event)
 {
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->push (event);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
-      ec_control_->event_channel_not_exist (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_control_->event_channel_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       ec_control_->system_exception (this,
-                                     sysex
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Shouldn't happen.
     }
-  ACE_ENDTRY;
 }
 
 int
-TAO_EC_Gateway_IIOP::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::shutdown (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
   ec_control_->shutdown();
 
-  this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->close_i ();
 
   if (this->supplier_is_active_)
     {
       PortableServer::POA_var poa =
-        this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->supplier_._default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        poa->servant_to_id (&this->supplier_);
+      poa->deactivate_object (id.in ());
       this->supplier_is_active_ = 0;
     }
 
   if (this->consumer_is_active_)
     {
       PortableServer::POA_var poa =
-        this->consumer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->consumer_._default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->consumer_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        poa->servant_to_id (&this->consumer_);
+      poa->deactivate_object (id.in ());
       this->consumer_is_active_ = 0;
     }
 
@@ -661,15 +616,13 @@ TAO_EC_Gateway_IIOP::is_consumer_ec_connected_i (void) const
 
 CORBA::Boolean
 TAO_EC_Gateway_IIOP::consumer_ec_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var consumer_ec;
   {
     ACE_GUARD_THROW_EX (
         TAO_SYNCH_MUTEX, ace_mon, this->lock_,
         CORBA::INTERNAL ());
-    ACE_CHECK_RETURN (0);
 
     disconnected = 0;
     if (this->is_consumer_ec_connected_i () == 0)
@@ -682,31 +635,29 @@ TAO_EC_Gateway_IIOP::consumer_ec_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return consumer_ec->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_ec->_non_existent ();
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_EC_Gateway_IIOP::suspend_supplier_ec (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::suspend_supplier_ec (void)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 0)
     {
-      this->supplier_proxy_->suspend_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_proxy_->suspend_connection ();
 
       supplier_ec_suspended_ = 1;
     }
 }
 
 void
-TAO_EC_Gateway_IIOP::resume_supplier_ec (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::resume_supplier_ec (void)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 1)
     {
-      this->supplier_proxy_->resume_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_proxy_->resume_connection ();
 
       supplier_ec_suspended_ = 0;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 6f957042c3a..03d35384fe7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -74,38 +74,33 @@ public:
    * @return 0 in case of success, -1 in case of failure
    */
   int init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
-            RtecEventChannelAdmin::EventChannel_ptr consumer_ec
-            ACE_ENV_ARG_DECL);
+            RtecEventChannelAdmin::EventChannel_ptr consumer_ec);
 
   /// The channel is disconnecting.
-  void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void disconnect_push_supplier (void);
 
   /// The channel is disconnecting.
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void disconnect_push_consumer (void);
 
   /// This is the consumer side behavior, it pushes the events to the
   /// local event channel.
-  void push (const RtecEventComm::EventSet &events
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void push (const RtecEventComm::EventSet &events);
 
   /// Disconnect and shutdown the gateway
-  int shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int shutdown (void);
 
   // The following methods are documented in the base class.
-  virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void close (void);
+  virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Let the gateway reconnect itself to the consumer ec given exisiting QoS
-  void reconnect_consumer_ec(ACE_ENV_SINGLE_ARG_DECL);
+  void reconnect_consumer_ec(void);
 
   /// Check whether the consumer event channel is non existent or not
-  CORBA::Boolean consumer_ec_non_existent (CORBA::Boolean_out disconnected
-                                           ACE_ENV_ARG_DECL);
+  CORBA::Boolean consumer_ec_non_existent (CORBA::Boolean_out disconnected);
 
   /**
    * Cleanup all consumer proxies we have without trying to tell the
@@ -113,7 +108,7 @@ public:
    * the consumer proxy administration in case we know that the consumers
    * are all unreachable.
    */
-  void cleanup_consumer_proxies (ACE_ENV_SINGLE_ARG_DECL);
+  void cleanup_consumer_proxies (void);
 
   /// Cleanup the connection to the consumer ec. Doesn't call anything on the
   /// ec again, just set the object to nil
@@ -124,36 +119,34 @@ public:
   int cleanup_supplier_ec (void);
 
   /// Suspend the connection to the supplier ec
-  void suspend_supplier_ec (ACE_ENV_SINGLE_ARG_DECL);
+  void suspend_supplier_ec (void);
 
   /// Resume the connection to the supplier ec
-  void resume_supplier_ec (ACE_ENV_SINGLE_ARG_DECL);
+  void resume_supplier_ec (void);
 
 private:
-  void close_i (ACE_ENV_SINGLE_ARG_DECL);
+  void close_i (void);
 
   /// Disconnect the supplier proxy
-  void disconnect_supplier_proxy_i (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect_supplier_proxy_i (void);
 
   /// Disconnect all consumer proxies
-  void disconnect_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect_consumer_proxies_i (void);
 
   /// Remove all consumer proxies without calling disconnect on them
-  void cleanup_consumer_proxies_i (ACE_ENV_SINGLE_ARG_DECL);
+  void cleanup_consumer_proxies_i (void);
 
-  void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub
-                          ACE_ENV_ARG_DECL);
+  void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
   /// Create all connections to consumer ec and to supplier ec.
-  void open_i (const RtecEventChannelAdmin::ConsumerQOS& sub
-               ACE_ENV_ARG_DECL);
+  void open_i (const RtecEventChannelAdmin::ConsumerQOS& sub);
 
   /// Helper method to see if consumer ec is connected
   CORBA::Boolean is_consumer_ec_connected_i (void) const;
 
   /// Push the @a event to the @a consumer.
   void push_to_consumer (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                         const RtecEventComm::EventSet& event ACE_ENV_ARG_DECL);
+                         const RtecEventComm::EventSet& event);
 
   void cleanup_consumer_ec_i (void);
 
@@ -162,8 +155,7 @@ private:
 protected:
   /// Do the real work in init()
   int init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
-              RtecEventChannelAdmin::EventChannel_ptr consumer_ec
-              ACE_ENV_ARG_DECL);
+              RtecEventChannelAdmin::EventChannel_ptr consumer_ec);
 
 protected:
   /// Lock to synchronize internal changes
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 1b1a0d4479e..319d1167fad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/Event/EC_Gateway_Sched.h"
 #include "orbsvcs/Time_Utilities.h"
 
-ACE_RCSID (Event, 
-           EC_Gateway_sched, 
+ACE_RCSID (Event,
+           EC_Gateway_sched,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -24,24 +24,21 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
                            RtecScheduler::Scheduler_ptr supplier_sched,
                            RtecScheduler::Scheduler_ptr consumer_sched,
                            const char* consumer_name,
-                           const char* supplier_name
-                           ACE_ENV_ARG_DECL)
+                           const char* supplier_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  this->init_i (supplier_ec, consumer_ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_i (supplier_ec, consumer_ec);
 
   // @@ Should we throw a system exception here?
   if (CORBA::is_nil (supplier_sched)
       || CORBA::is_nil (consumer_sched)
       || consumer_name == 0
       || supplier_name == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   this->supplier_info_ =
-    supplier_sched->create (supplier_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_sched->create (supplier_name);
 
   // @@ TODO Many things are hard-coded in the RT_Info here.
 
@@ -57,13 +54,10 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
                        RtecScheduler::VERY_LOW_IMPORTANCE,
                        time,
                        0,
-                       RtecScheduler::OPERATION
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                       RtecScheduler::OPERATION);
 
   this->consumer_info_ =
-    consumer_sched->create (consumer_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_sched->create (consumer_name);
 
   tv = ACE_Time_Value (0, 500);
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
@@ -74,9 +68,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr supplier_ec,
                        RtecScheduler::VERY_LOW_IMPORTANCE,
                        time,
                        1,
-                       RtecScheduler::REMOTE_DEPENDANT
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                       RtecScheduler::REMOTE_DEPENDANT);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index 5267546de17..a9d0cb609bb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -49,8 +49,7 @@ public:
              RtecScheduler::Scheduler_ptr supplier_sched,
              RtecScheduler::Scheduler_ptr consumer_sched,
              const char* consumer_name,
-             const char* supplier_name
-             ACE_ENV_ARG_DECL);
+             const char* supplier_name);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index 9e39ef1f631..8d701f9f8fb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -13,20 +13,17 @@ ACE_RCSID(Event, EC_Group_Scheduling, "$Id$")
 void
 TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
-      TAO_EC_ProxyPushConsumer *
-      ACE_ENV_ARG_DECL_NOT_USED)
+      TAO_EC_ProxyPushConsumer *)
 {
 }
 
 void
 TAO_EC_Group_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                         TAO_EC_ProxyPushConsumer *,
-                                        TAO_EC_Supplier_Filter *filter
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_Supplier_Filter *filter)
 {
   TAO_EC_QOS_Info event_info;
   // @@ yuck...
   filter->push_scheduled_event (const_cast<RtecEventComm::EventSet&> (event),
-                                event_info
-                                ACE_ENV_ARG_PARAMETER);
+                                event_info);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
index 1a9b35f07e2..1df8922ec23 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
@@ -36,12 +36,10 @@ public:
   // Read EC_Scheduling_Strategy.h for more details
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL);
+      TAO_EC_ProxyPushConsumer *consumer);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL);
+                               TAO_EC_Supplier_Filter *filter);
 
 private:
   TAO_EC_Group_Scheduling (const TAO_EC_Group_Scheduling&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index 7c20f6e0c66..7271282ef5a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -55,19 +55,16 @@ TAO_EC_Kokyu_Dispatching::activate (void)
 void
 TAO_EC_Kokyu_Dispatching::setup_lanes (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   // Query the scheduler togetConfig_Infos
   RtecScheduler::Config_Info_Set_var configs;
-  ACE_TRY
+  try
     {
       this->scheduler_->get_config_infos(configs.out());
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
 
   //might be no Config_Infos in the set (if none passed to scheduler_)
 
@@ -114,19 +111,17 @@ void
 TAO_EC_Kokyu_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                 RtecEventComm::PushConsumer_ptr consumer,
                                 const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info&     qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info&     qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                        RtecEventComm::PushConsumer_ptr consumer,
                                        RtecEventComm::EventSet& event,
-                                       TAO_EC_QOS_Info& qos_info
-                                       ACE_ENV_ARG_DECL)
+                                       TAO_EC_QOS_Info& qos_info)
 {
     if (this->dispatcher_.get () == 0)
         this->setup_lanes ();
@@ -135,8 +130,7 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
       this->allocator_->malloc (sizeof (TAO_EC_Kokyu_Push_Command ));
 
     if (buf == 0)
-      ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   // Create Dispatch_Command
   TAO_EC_Kokyu_Push_Command *cmd =
@@ -186,23 +180,19 @@ TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command(void)
 int
 TAO_EC_Kokyu_Push_Command::execute ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "(%t) Command object executed.\n"));
 
       this->proxy_->push_to_consumer (this->consumer_.in (),
-                                      this->event_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      this->event_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
index 3e8f0e7c98e..ce61893e2c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -67,13 +67,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
 private:
   ACE_Allocator *allocator_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
index ab2015ea52d..d3700e473f2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp
@@ -56,27 +56,23 @@ TAO_EC_Kokyu_Filter::size (void) const
 
 int
 TAO_EC_Kokyu_Filter::filter (const RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
-  return this->body_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->body_->filter (event, qos_info);
 }
 
 int
 TAO_EC_Kokyu_Filter::filter_nocopy (RtecEventComm::EventSet &event,
-                                    TAO_EC_QOS_Info& qos_info
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info& qos_info)
 {
-  return this->body_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->body_->filter_nocopy (event, qos_info);
 }
 
 // This is private, so we can make it inline in the .cpp file...
 void
-TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info)
 {
-  this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_rt_info ();
 
   qos_info.rt_info = this->rt_info_;
   switch (this->info_type_)
@@ -94,9 +90,7 @@ TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
         this->scheduler_->priority (this->rt_info_,
                                     os_priority,
                                     p_subpriority,
-                                    p_priority
-                                     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                    p_priority);
         qos_info.preemption_priority = p_priority;
       }
     }
@@ -104,31 +98,25 @@ TAO_EC_Kokyu_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
 
 void
 TAO_EC_Kokyu_Filter::push (const RtecEventComm::EventSet &event,
-                           TAO_EC_QOS_Info& qos_info
-                           ACE_ENV_ARG_DECL)
+                           TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->compute_qos_info (qos_info);
 
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->parent ()->push (event, qos_info);
     }
 }
 
 void
 TAO_EC_Kokyu_Filter::push_nocopy (RtecEventComm::EventSet &event,
-                                  TAO_EC_QOS_Info& qos_info
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->compute_qos_info (qos_info);
 
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->parent ()->push_nocopy (event, qos_info);
     }
 }
 
@@ -178,14 +166,12 @@ supplier2<-----|
 
 int
 TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
-                                       const TAO_EC_QOS_Info &qos_info
-                                       ACE_ENV_ARG_DECL)
+                                       const TAO_EC_QOS_Info &qos_info)
 {
 #ifdef EC_KOKYU_LOGGING
   ACE_DEBUG ((LM_DEBUG, "Entering EC_Kokyu_Filter::add_dependencies\n"));
 #endif
-  this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->init_rt_info ();
 
 #ifdef EC_KOKYU_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -195,23 +181,18 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
 
   //this call the add_dependencies() on con/disjunction filter
   int matches = this->body_->add_dependencies (header,
-                                               qos_info
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                               qos_info);
 
   if (matches != 0)
     {
 #ifdef EC_KOKYU_LOGGING
       ACE_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches != 0\n"));
-#endif 
+#endif
       this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1,
-                                        RtecBase::ONE_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                        RtecBase::ONE_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->scheduler_->get (qos_info.rt_info);
       ACE_DEBUG ((LM_DEBUG, "[%s][%d] ----> [%s][%d]\n",
                   this->name_.c_str (),
                   this->rt_info_,
@@ -222,17 +203,16 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
     {
 #ifdef EC_KOKYU_LOGGING
       ACE_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches == 0\n"));
-#endif 
+#endif
     }
 
 #ifdef EC_KOKYU_LOGGING
   ACE_DEBUG ((LM_DEBUG, "about to iterate thru children\n"));
-#endif  
+#endif
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      (*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      (*i)->add_dependencies (header, qos_info);
     }
 #ifdef EC_KOKYU_LOGGING
   ACE_DEBUG ((LM_DEBUG, "Exiting EC_Kokyu_Filter: add_dependencies\n"));
@@ -241,17 +221,15 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
 }
 
 void
-TAO_EC_Kokyu_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+TAO_EC_Kokyu_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info)
 {
-  this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_rt_info ();
 
   qos_info.rt_info = this->rt_info_;
 }
 
 void
-TAO_EC_Kokyu_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Kokyu_Filter::init_rt_info (void)
 {
   if (this->rt_info_computed_)
     return;
@@ -269,9 +247,7 @@ TAO_EC_Kokyu_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          0, // quantum
                          0, // threads
-                         this->info_type_
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         this->info_type_);
 #endif  //ifdef'ed by VS
 
 #if 0 //ifdef changed from 1 to 0 by VS
@@ -280,13 +256,10 @@ TAO_EC_Kokyu_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
       this->scheduler_->add_dependency (this->rt_info_,
                                         this->body_info_,
                                         1,
-                                        RtecBase::TWO_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                        RtecBase::TWO_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->scheduler_->get (this->body_info_);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
                   this->name_.c_str ()));
@@ -297,13 +270,10 @@ TAO_EC_Kokyu_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
   this->scheduler_->add_dependency (this->parent_info_,
                                     this->rt_info_,
                                     1,
-                                    RtecBase::TWO_WAY_CALL
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    RtecBase::TWO_WAY_CALL);
 
   RtecScheduler::RT_Info_var info =
-    this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->scheduler_->get (this->parent_info_);
   ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
               this->name_.c_str (),
               info->entry_point.in ()));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index 09f521997d4..63c1d6ac284 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -66,36 +66,29 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
+  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   TAO_EC_Kokyu_Filter (const TAO_EC_Kokyu_Filter&);
   TAO_EC_Kokyu_Filter& operator= (const TAO_EC_Kokyu_Filter&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
+  void init_rt_info (void);
 
   /// Compute a new qos_info to push up.
-  void compute_qos_info (TAO_EC_QOS_Info& qos_info
-                         ACE_ENV_ARG_DECL);
+  void compute_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   /// The RT_Info handle for this object
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index 6012492d79a..ed8e4d4e1b3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -44,8 +44,7 @@ TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Kokyu_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos
-    ACE_ENV_ARG_DECL) const
+    RtecEventChannelAdmin::ConsumerQOS& qos) const
 {
   CORBA::ULong i=0,found=0;
   CORBA::ULong pos = 0;
@@ -56,8 +55,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
     this->event_channel_->scheduler ();
 
   RtecScheduler::Scheduler_var scheduler =
-    RtecScheduler::Scheduler::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    RtecScheduler::Scheduler::_narrow (tmp.in ());
 
 #ifdef EC_KOKYU_LOGGING
   for (i=0; i<qos.dependencies.length (); ++i)
@@ -120,9 +118,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
 #endif
 
       RtecScheduler::RT_Info_var final_consumer_rt_info =
-        scheduler->get ( h_final_consumer_rt_info
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        scheduler->get ( h_final_consumer_rt_info);
 
       final_consumer_rep_name = final_consumer_rt_info->entry_point.in ();
       final_consumer_rep_name += "#rep";
@@ -134,9 +130,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
 
       //create an rt_info corresponding to this rep.
       h_final_consumer_rep_rt_info =
-        scheduler->create (final_consumer_rep_name.c_str ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        scheduler->create (final_consumer_rep_name.c_str ());
 #ifdef EC_KOKYU_LOGGING
       ACE_DEBUG ((LM_DEBUG, "consumer rep created\n"));
 #endif
@@ -151,8 +145,7 @@ TAO_EC_Kokyu_Filter_Builder::build (
     this->recursive_build (supplier, qos, pos,
                            scheduler.in (),
                            h_final_consumer_rep_rt_info  //parent_info
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                           );
 
 #ifdef EC_KOKYU_LOGGING
   ACE_DEBUG ((LM_DEBUG,
@@ -173,15 +166,12 @@ TAO_EC_Kokyu_Filter_Builder::build (
       //add the dependency between the root in the filter hierarchy and
       //the final consumer
       TAO_EC_QOS_Info qos_info;
-      kokyu_filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      kokyu_filter->get_qos_info (qos_info);
 
       scheduler->add_dependency (h_final_consumer_rt_info,
                                  qos_info.rt_info,
                                  1,
-                                 RtecBase::ONE_WAY_CALL
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                 RtecBase::ONE_WAY_CALL);
     }
   return filter;
 }
@@ -192,8 +182,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    RtecScheduler::handle_t parent_info
-    ACE_ENV_ARG_DECL) const
+    RtecScheduler::handle_t parent_info) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -209,9 +198,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                            scheduler, name);
 
       pos++; // Consume the designator
 
@@ -225,9 +212,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               conj_rt_info
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                               conj_rt_info);
         }
 
       TAO_EC_Kokyu_Filter *filter;
@@ -242,9 +227,8 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
                                            RtecScheduler::CONJUNCTION),
                       0);
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info);
       // @@
-      ACE_CHECK_RETURN (0);
       return filter;
     }
 
@@ -256,9 +240,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                            scheduler, name);
 
       pos++; // Consume the designator
 
@@ -272,9 +254,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               disj_rt_info
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                               disj_rt_info);
         }
       TAO_EC_Kokyu_Filter *filter;
       ACE_NEW_RETURN (filter,
@@ -289,9 +269,8 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
                       0);
 
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info);
       // @@
-      ACE_CHECK_RETURN (0);
       return filter;
     }
     else if (e.header.type == ACE_ES_EVENT_TIMEOUT
@@ -316,8 +295,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
 
         TAO_EC_QOS_Info qos_info;
         qos_info.rt_info =
-          scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+          scheduler->create (name.c_str ());
 
         // Convert the time to the proper units....
         RtecScheduler::Period_t period =
@@ -336,16 +314,12 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
                         consumer_rt_info_ptr->importance,
                         0, // quantum
                         1, // threads
-                        RtecScheduler::OPERATION
-                        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+                        RtecScheduler::OPERATION);
 
         scheduler->add_dependency (qos_info.rt_info,
                                    h_consumer_rt_info,
                                    1,
-                                   RtecBase::TWO_WAY_CALL
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+                                   RtecBase::TWO_WAY_CALL);
 #endif //by VS
 
         pos++;
@@ -362,8 +336,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
       pos++;
       return this->recursive_build (supplier, qos, pos,
                                     scheduler,
-                                    parent_info
-                                    ACE_ENV_ARG_PARAMETER);
+                                    parent_info);
     }
   else
     {
@@ -384,8 +357,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
     }
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (parent_info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    scheduler->get (parent_info);
 
   ACE_CString name = info->entry_point.in ();
 
@@ -402,9 +374,8 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build (
                   0);
 
   TAO_EC_QOS_Info qos_info;
-  filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+  filter->get_qos_info (qos_info);
   // @@
-  ACE_CHECK_RETURN (0);
   return filter;
 }
 
@@ -413,8 +384,7 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    ACE_CString& name
-    ACE_ENV_ARG_DECL) const
+    ACE_CString& name) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -428,9 +398,7 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
           ACE_CString child_name;
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                child_name);
 
           if (i == 0)
             name += "(";
@@ -453,9 +421,7 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
 
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                child_name);
 
           if (i == 0)
             name += "(";
@@ -484,8 +450,7 @@ TAO_EC_Kokyu_Filter_Builder:: recursive_name (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    scheduler->get (body_info);
 
   name = info->entry_point.in ();
   name += "#rep";
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
index e63b901bab4..3bd52930bce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
@@ -50,8 +50,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 
 private:
   /// Recursively build the filter tree.
@@ -59,15 +58,13 @@ private:
                                   RtecEventChannelAdmin::ConsumerQOS& qos,
                                   CORBA::ULong& pos,
                                   RtecScheduler::Scheduler_ptr scheduler,
-                                  RtecScheduler::handle_t parent_info
-                                  ACE_ENV_ARG_DECL) const;
+                                  RtecScheduler::handle_t parent_info) const;
 
   /// Build the name recursively...
   void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos,
                        CORBA::ULong& pos,
                        RtecScheduler::Scheduler_ptr scheduler,
-                       ACE_CString &name
-                       ACE_ENV_ARG_DECL) const;
+                       ACE_CString &name) const;
 
   /// Count the number of children of the current node, i.e. until a
   /// conjunction or disjunction starts.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index 8d7e32b9c8e..891cc55c412 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -21,8 +21,7 @@ TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling (void)
 void
 TAO_EC_Kokyu_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL)
+      TAO_EC_ProxyPushConsumer *consumer)
 {
   const RtecEventChannelAdmin::SupplierQOS& qos =
     consumer->publications ();
@@ -40,21 +39,17 @@ TAO_EC_Kokyu_Scheduling::add_proxy_supplier_dependencies (
       this->scheduler_->priority (qos_info.rt_info,
                                   os_priority,
                                   p_subpriority,
-                                  p_priority
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                  p_priority);
       qos_info.preemption_priority = p_priority;
 
-      supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier->add_dependencies (header, qos_info);
     }
 }
 
 void
 TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                             TAO_EC_ProxyPushConsumer *consumer,
-                                            TAO_EC_Supplier_Filter *filter
-                                            ACE_ENV_ARG_DECL)
+                                            TAO_EC_Supplier_Filter *filter)
 {
   RtecEventChannelAdmin::SupplierQOS qos =
     consumer->publications ();
@@ -84,15 +79,11 @@ TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
           this->scheduler_->priority (qos_info.rt_info,
                                       os_priority,
                                       p_subpriority,
-                                      p_priority
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                      p_priority);
           qos_info.preemption_priority = p_priority;
         }
 
-      filter->push_scheduled_event (single_event, qos_info
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      filter->push_scheduled_event (single_event, qos_info);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index 0384ea70e8f..58d774e8ae4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -48,19 +48,17 @@ public:
 
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL);
+      TAO_EC_ProxyPushConsumer *consumer);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL);
+                               TAO_EC_Supplier_Filter *filter);
 
 private:
   TAO_EC_Kokyu_Scheduling (const TAO_EC_Kokyu_Scheduling&);
   TAO_EC_Kokyu_Scheduling& operator= (const TAO_EC_Kokyu_Scheduling&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
+  void init_rt_info (void);
 
 private:
   /// The scheduler we are going to use
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
index 2884f04108d..87b31282a2d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
@@ -27,18 +27,15 @@ TAO_EC_Object_Deactivator::deactivate (void)
 {
   if (this->deactivate_ && !CORBA::is_nil (this->poa_.in ()))
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       this->deactivate_ = 0;
-      this->poa_->deactivate_object (id_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_->deactivate_object (id_);
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
       // The deactivation can throw...
     }
-    ACE_ENDTRY;
   }
 }
 
@@ -122,17 +119,14 @@ TAO_EC_ORB_Holder::~TAO_EC_ORB_Holder (void)
 {
   if (!CORBA::is_nil (this->orb_.in ()))
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
-        this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->orb_->destroy ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
         // Ignore.
       }
-    ACE_ENDTRY;
   }
 }
 
@@ -155,17 +149,14 @@ TAO_EC_Event_Channel_Holder::~TAO_EC_Event_Channel_Holder (void)
 {
   if (!CORBA::is_nil (this->ec_.in ()))
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
-        this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->ec_->destroy ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
         // Ignore.
       }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
index d454d0c1233..360f6d11744 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
@@ -16,33 +16,28 @@ void
 activate (T & obj_ref,
           PortableServer::POA_ptr poa,
           PortableServer::ServantBase * servant,
-          TAO_EC_Object_Deactivator & suggested_object_deactivator
-          ACE_ENV_ARG_DECL)
+          TAO_EC_Object_Deactivator & suggested_object_deactivator)
 {
   // Activate the servant into the POA.
   PortableServer::ObjectId_var obj_id =
-    poa->activate_object (servant
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->activate_object (servant);
 
   suggested_object_deactivator.set_values (poa, obj_id.in ());
 
   // Get the object reference of the activated object.
   CORBA::Object_var obj =
-    poa->id_to_reference (obj_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id_to_reference (obj_id.in ());
 
   // Don't try to use T::_obj_type::_narrow, some compilers don't like it so
   // do this in two steps
   typedef typename T::_obj_type my_object_type;
 
   obj_ref =
-    my_object_type::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    my_object_type::_narrow (obj.in());
 
   if (CORBA::is_nil (obj_ref.in ()))
   {
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
index 0a3d886138a..1755c5af6d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -35,8 +35,7 @@ template <typename T>
 void activate (T & obj_ref,
                PortableServer::POA_ptr poa,
                PortableServer::ServantBase * servant,
-               TAO_EC_Object_Deactivator & object_deactivator
-               ACE_ENV_ARG_DECL);
+               TAO_EC_Object_Deactivator & object_deactivator);
 
 
 //***************************************************************************
@@ -48,7 +47,7 @@ void activate (T & obj_ref,
  *
  * Template argument requirements:
  *
- * Has void execute (ACE_ENV_SINGLE_ARG_DECL); method which
+ * Has void execute (void); method which
  * can throw ONLY CORBA exceptions.
  * Has default and copy constructors.
  *
@@ -84,7 +83,7 @@ class TAO_EC_Shutdown_Command
 public:
   TAO_EC_Shutdown_Command (void);
   TAO_EC_Shutdown_Command (T target);
-  void execute (ACE_ENV_SINGLE_ARG_DECL);
+  void execute (void);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
index e93998fee0f..a3378730e7a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
@@ -55,16 +55,14 @@ TAO_EC_Auto_Command<T>::execute (void)
     {
       this->allow_command_ = 0;
 
-      ACE_TRY_NEW_ENV
+      try
         {
-          this->command_.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->command_.execute ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // ignore.
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -101,12 +99,11 @@ TAO_EC_Shutdown_Command<T>::TAO_EC_Shutdown_Command (T target)
 
 template <class T>
 ACE_INLINE void
-TAO_EC_Shutdown_Command<T>::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Shutdown_Command<T>::execute (void)
 {
   if (this->target_.in ())
     {
-      this->target_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->target_->shutdown ();
     }
 }
 
@@ -138,16 +135,14 @@ TAO_EC_Servant_Var(TAO_EC_Servant_Var<T> const & rhs)
 {
   if (ptr_)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
-          ptr_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ptr_->_add_ref ();
         }
-      ACE_CATCHALL
+      catch (...)
         {
-	  ACE_RE_THROW;
+	  throw;
         }
-	ACE_ENDTRY;
     }
 }
 
@@ -189,15 +184,13 @@ ACE_INLINE TAO_EC_Servant_Var<T>::
   // destructor.
   if (ptr_ != 0)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
-      ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ptr_->_remove_ref ();
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index 096ae4c3ba0..118a5b086fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -68,25 +68,23 @@ void
 TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                              RtecEventComm::PushConsumer_ptr consumer,
                              const RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                     RtecEventComm::PushConsumer_ptr consumer,
                                     RtecEventComm::EventSet& event,
-                                    TAO_EC_QOS_Info&
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info&)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
+  this->task_.push (proxy, consumer, event);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index b38b5a160fd..4bdb60096a3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -53,13 +53,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 0ab3197ef29..cff73bd1cd3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -42,8 +42,7 @@ TAO_EC_Masked_Type_Filter::size (void) const
 
 int
 TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
     return 0;
@@ -54,16 +53,14 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
 
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->parent ()->push (event, qos_info);
     }
   return 1;
 }
 
 int
 TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
     return 0;
@@ -74,23 +71,20 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
   if (this->parent () != 0)
     {
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->parent ()->push_nocopy (event, qos_info);
     }
   return 1;
 }
 
 void
 TAO_EC_Masked_Type_Filter::push (const RtecEventComm::EventSet &,
-                                 TAO_EC_QOS_Info &
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 TAO_EC_QOS_Info &)
 {
 }
 
 void
 TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &,
-                                        TAO_EC_QOS_Info &
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        TAO_EC_QOS_Info &)
 {
 }
 
@@ -119,8 +113,7 @@ TAO_EC_Masked_Type_Filter::can_match (
 int
 TAO_EC_Masked_Type_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 97a83d622ea..27b86da6ada 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -55,23 +55,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Masked_Type_Filter (const TAO_EC_Masked_Type_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 204685379ac..577da9bf02f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -37,16 +37,13 @@ TAO_EC_Negation_Filter::size (void) const
 
 int
 TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info& qos_info)
 {
   int n =
-    this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->child_->filter (event, qos_info);
   if (this->parent () != 0 && n == 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->parent ()->push (event, qos_info);
       return 1;
     }
   return 0;
@@ -54,16 +51,13 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   int n =
-    this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->child_->filter_nocopy (event, qos_info);
   if (this->parent () != 0 && n == 0)
     {
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->parent ()->push_nocopy (event, qos_info);
       return 1;
     }
   return 0;
@@ -71,15 +65,13 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Negation_Filter::push (const RtecEventComm::EventSet&,
-                                 TAO_EC_QOS_Info&
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 TAO_EC_QOS_Info&)
 {
 }
 
 void
 TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&,
-                                        TAO_EC_QOS_Info&
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        TAO_EC_QOS_Info&)
 {
 }
 
@@ -105,8 +97,7 @@ TAO_EC_Negation_Filter::can_match (
 int
 TAO_EC_Negation_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index f4f141f0e27..fad7ad3b3b7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -53,23 +53,18 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Negation_Filter (const TAO_EC_Negation_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index f9ddf2d9f68..cfec105b9a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -13,16 +13,14 @@ ACE_RCSID(Event, EC_Null_Scheduling, "$Id$")
 void
 TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
-      TAO_EC_ProxyPushConsumer *
-      ACE_ENV_ARG_DECL_NOT_USED)
+      TAO_EC_ProxyPushConsumer *)
 {
 }
 
 void
 TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                         TAO_EC_ProxyPushConsumer *,
-                                        TAO_EC_Supplier_Filter *filter
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_Supplier_Filter *filter)
 {
   for (CORBA::ULong j = 0; j < event.length (); ++j)
     {
@@ -32,8 +30,6 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
       RtecEventComm::EventSet single_event (1, 1, buffer, 0);
 
       TAO_EC_QOS_Info event_info;
-      filter->push_scheduled_event (single_event, event_info
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      filter->push_scheduled_event (single_event, event_info);
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index fff1ad22617..9c685e6cc86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -39,12 +39,10 @@ public:
   // Read EC_Scheduling_Strategy.h for more details
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL);
+      TAO_EC_ProxyPushConsumer *consumer);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL);
+                               TAO_EC_Supplier_Filter *filter);
 
 private:
   TAO_EC_Null_Scheduling (const TAO_EC_Null_Scheduling&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 6dddfd74ecc..aaa334439b5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -25,8 +25,7 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Null_ObserverStrategy::append_observer (
-       RtecEventChannelAdmin::Observer_ptr
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_ptr)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -39,37 +38,32 @@ TAO_EC_Null_ObserverStrategy::append_observer (
 
 void
 TAO_EC_Null_ObserverStrategy::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  ACE_THROW (RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
+  throw RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER();
 }
 
 void
-TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
@@ -83,8 +77,7 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Basic_ObserverStrategy::append_observer (
-       RtecEventChannelAdmin::Observer_ptr obs
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_ptr obs)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -94,7 +87,6 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK_RETURN (0);
 
     this->handle_generator_++;
     Observer_Entry entry (this->handle_generator_,
@@ -107,16 +99,12 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
   }
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->fill_qos (c_qos);
+  obs->update_consumer (c_qos);
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->fill_qos (s_qos);
+  obs->update_supplier (s_qos);
 
   return this->handle_generator_;
 }
@@ -124,8 +112,7 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
 
 void
 TAO_EC_Basic_ObserverStrategy::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_Handle handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -133,21 +120,17 @@ TAO_EC_Basic_ObserverStrategy::remove_observer (
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
       RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-  ACE_CHECK;
 
   if (this->observers_.unbind (handle) == -1)
-    ACE_THROW (
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
+    throw RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER();
 }
 
 int
 TAO_EC_Basic_ObserverStrategy::create_observer_list (
-                                RtecEventChannelAdmin::Observer_var *&lst
-                                ACE_ENV_ARG_DECL)
+                                RtecEventChannelAdmin::Observer_var *&lst)
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                  RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-  ACE_CHECK_RETURN (0);
 
   int size = static_cast<int> (this->observers_.current_size ());
   RtecEventChannelAdmin::Observer_var *tmp;
@@ -173,117 +156,96 @@ TAO_EC_Basic_ObserverStrategy::create_observer_list (
 
 void
 TAO_EC_Basic_ObserverStrategy::connected (
-    TAO_EC_ProxyPushConsumer *consumer
-    ACE_ENV_ARG_DECL)
+    TAO_EC_ProxyPushConsumer *consumer)
 {
-  this->supplier_qos_update (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_qos_update (consumer);
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::disconnected (
-    TAO_EC_ProxyPushConsumer* consumer
-    ACE_ENV_ARG_DECL)
+    TAO_EC_ProxyPushConsumer* consumer)
 {
-  this->supplier_qos_update (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_qos_update (consumer);
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::supplier_qos_update (
-                                        TAO_EC_ProxyPushConsumer *consumer
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_ProxyPushConsumer *consumer)
 {
   if (consumer->publications ().is_gateway)
     return;
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->fill_qos (s_qos);
 
   RtecEventChannelAdmin::Observer_var *tmp = 0;
-  int size = this->create_observer_list (tmp ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  int size = this->create_observer_list (tmp);
   ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp);
 
   for (int i = 0; i != size; ++i)
     {
-      ACE_TRY
+      try
         {
-          copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          copy[i]->update_supplier (s_qos);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore exceptions, we must isolate other observers from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::connected (
-    TAO_EC_ProxyPushSupplier* supplier
-    ACE_ENV_ARG_DECL)
+    TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->consumer_qos_update (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_qos_update (supplier);
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::disconnected (
-    TAO_EC_ProxyPushSupplier* supplier
-    ACE_ENV_ARG_DECL)
+    TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->consumer_qos_update (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_qos_update (supplier);
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::consumer_qos_update (
-                                        TAO_EC_ProxyPushSupplier *supplier
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_ProxyPushSupplier *supplier)
 {
   if (supplier->subscriptions ().is_gateway)
     return;
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->fill_qos (c_qos);
 
   RtecEventChannelAdmin::Observer_var *tmp = 0;
-  int size = this->create_observer_list (tmp ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  int size = this->create_observer_list (tmp);
   ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy (tmp);
 
   for (int i = 0; i != size; ++i)
     {
-      ACE_TRY
+      try
         {
-          copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          copy[i]->update_consumer (c_qos);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore exceptions, we must isolate other observers from
           // failures on this one.
         }
-      ACE_ENDTRY;
     }
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::fill_qos (
-      RtecEventChannelAdmin::ConsumerQOS &qos
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::ConsumerQOS &qos)
 {
   Headers headers;
 
   TAO_EC_Accumulate_Supplier_Headers worker (headers);
-  this->event_channel_->for_each_consumer (&worker
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->for_each_consumer (&worker);
 
   RtecEventChannelAdmin::DependencySet& dep = qos.dependencies;
 
@@ -303,15 +265,12 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
 
 void
 TAO_EC_Basic_ObserverStrategy::fill_qos (
-      RtecEventChannelAdmin::SupplierQOS &qos
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::SupplierQOS &qos)
 {
   Headers headers;
 
   TAO_EC_Accumulate_Consumer_Headers worker (headers);
-  this->event_channel_->for_each_supplier (&worker
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->for_each_supplier (&worker);
 
   qos.publications.length (static_cast<CORBA::ULong> (headers.current_size ()));
 
@@ -331,19 +290,16 @@ TAO_EC_Reactive_ObserverStrategy::~TAO_EC_Reactive_ObserverStrategy (void)
 
 void
 TAO_EC_Reactive_ObserverStrategy::supplier_qos_update (
-                                        TAO_EC_ProxyPushConsumer *consumer
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_ProxyPushConsumer *consumer)
 {
   if (consumer->publications ().is_gateway)
     return;
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->fill_qos (s_qos);
 
   Observer_Map copy;
-  this->create_observer_map (copy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->create_observer_map (copy);
 
   Observer_Map_Iterator end = copy.end ();
   for (Observer_Map_Iterator i  = copy.begin ();
@@ -351,48 +307,41 @@ TAO_EC_Reactive_ObserverStrategy::supplier_qos_update (
        ++i)
     {
       Observer_Entry& entry = (*i).int_id_;
-      ACE_TRY
+      try
         {
-          entry.observer->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry.observer->update_supplier (s_qos);
         }
-      ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+      catch (const CORBA::OBJECT_NOT_EXIST&)
         {
           // Exception occured while updating observer, so remove it from the
           // observer list
-          this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->observer_not_exists (entry);
         }
-      ACE_CATCH (CORBA::TRANSIENT, transient)
+      catch (const CORBA::TRANSIENT&)
         {
           // Exception occured while updating observer, so remove it from the
           // observer list
-          this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->observer_not_exists (entry);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
     }
 }
 
 void
 TAO_EC_Reactive_ObserverStrategy::consumer_qos_update (
-                                        TAO_EC_ProxyPushSupplier *supplier
-                                        ACE_ENV_ARG_DECL)
+                                        TAO_EC_ProxyPushSupplier *supplier)
 {
   if (supplier->subscriptions ().is_gateway)
     return;
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->fill_qos (c_qos);
 
   Observer_Map copy;
-  this->create_observer_map (copy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->create_observer_map (copy);
 
   Observer_Map_Iterator end = copy.end ();
   for (Observer_Map_Iterator i  = copy.begin ();
@@ -400,40 +349,34 @@ TAO_EC_Reactive_ObserverStrategy::consumer_qos_update (
        ++i)
     {
       Observer_Entry& entry = (*i).int_id_;
-      ACE_TRY
+      try
         {
-          entry.observer->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          entry.observer->update_consumer (c_qos);
         }
-      ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+      catch (const CORBA::OBJECT_NOT_EXIST&)
         {
           // Exception occured while updating observer, so remove it from the
           // observer list
-          this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->observer_not_exists (entry);
         }
-      ACE_CATCH (CORBA::TRANSIENT, transient)
+      catch (const CORBA::TRANSIENT&)
         {
           // Exception occured while updating observer, so remove it from the
           // observer list
-          this->observer_not_exists (entry ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->observer_not_exists (entry);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore all exceptions
         }
-      ACE_ENDTRY;
     }
 }
 
 int
-TAO_EC_Reactive_ObserverStrategy::create_observer_map (Observer_Map &map
-                                                       ACE_ENV_ARG_DECL)
+TAO_EC_Reactive_ObserverStrategy::create_observer_map (Observer_Map &map)
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                  RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-  ACE_CHECK_RETURN (0);
 
   Observer_Map_Iterator end = this->observers_.end ();
   for (Observer_Map_Iterator i  = this->observers_.begin ();
@@ -454,26 +397,22 @@ TAO_EC_Reactive_ObserverStrategy::create_observer_map (Observer_Map &map
 }
 
 void
-TAO_EC_Reactive_ObserverStrategy::observer_not_exists (Observer_Entry& observer
-                                                       ACE_ENV_ARG_DECL)
+TAO_EC_Reactive_ObserverStrategy::observer_not_exists (Observer_Entry& observer)
 {
-  ACE_TRY
+  try
     {
-      this->remove_observer(observer.handle ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->remove_observer(observer.handle);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
 
 void
-TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier)
 {
   const RtecEventChannelAdmin::ConsumerQOS& sub =
     supplier->subscriptions ();
@@ -494,8 +433,7 @@ TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier
 // ****************************************************************
 
 void
-TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer)
 {
   const RtecEventChannelAdmin::SupplierQOS& pub =
     consumer->publications ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 86baeedcdc9..6bf462dccf0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -64,16 +64,14 @@ public:
 
   /// The basic methods to support the EC strategies.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
     = 0;
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -82,17 +80,13 @@ public:
 
   /// Used by the EC to inform the ObserverStrategy that a Consumer has
   /// connected or disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void connected (TAO_EC_ProxyPushConsumer*) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*) = 0;
 
   /// Used by the EC to inform the ObserverStrategy that a Supplier has
   /// connected or disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void connected (TAO_EC_ProxyPushSupplier*) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*) = 0;
 };
 
 // ****************************************************************
@@ -113,27 +107,21 @@ public:
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
-  virtual void connected (TAO_EC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_EC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*);
+  virtual void connected (TAO_EC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*);
 };
 
 // ****************************************************************
@@ -166,27 +154,21 @@ public:
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
-  virtual void connected (TAO_EC_ProxyPushConsumer*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void connected (TAO_EC_ProxyPushSupplier*
-                          ACE_ENV_ARG_DECL_NOT_USED);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushConsumer*);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*);
+  virtual void connected (TAO_EC_ProxyPushSupplier*);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*);
 
   /**
    * @struct Observer_Entry
@@ -230,24 +212,19 @@ protected:
   /// Helpers.
   //@{
   /// Recompute EC consumer subscriptions and send them out to all observers.
-  virtual void consumer_qos_update (TAO_EC_ProxyPushSupplier *supplier
-                                    ACE_ENV_ARG_DECL);
+  virtual void consumer_qos_update (TAO_EC_ProxyPushSupplier *supplier);
 
   /// Recompute EC supplier publications and send them out to all observers.
-  virtual void supplier_qos_update (TAO_EC_ProxyPushConsumer *consumer
-                                    ACE_ENV_ARG_DECL);
+  virtual void supplier_qos_update (TAO_EC_ProxyPushConsumer *consumer);
 
   /// Compute consumer QOS.
-  void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos
-                 ACE_ENV_ARG_DECL);
+  void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos);
   /// Compute supplier QOS.
-  void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos
-                 ACE_ENV_ARG_DECL);
+  void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos);
 
   /// Copies all current observers into an array and passes it
   /// back to the caller through @a lst.  Returns the size of the array.
-  int create_observer_list (RtecEventChannelAdmin::Observer_var *&lst
-                            ACE_ENV_ARG_DECL);
+  int create_observer_list (RtecEventChannelAdmin::Observer_var *&lst);
   //@}
 
 protected:
@@ -298,24 +275,20 @@ protected:
   /// Helpers.
   //@{
   /// Recompute EC consumer subscriptions and send them out to all observers.
-  virtual void consumer_qos_update (TAO_EC_ProxyPushSupplier *supplier
-                                    ACE_ENV_ARG_DECL);
+  virtual void consumer_qos_update (TAO_EC_ProxyPushSupplier *supplier);
 
   /// Recompute EC supplier publications and send them out to all observers.
-  virtual void supplier_qos_update (TAO_EC_ProxyPushConsumer *consumer
-                                    ACE_ENV_ARG_DECL);
+  virtual void supplier_qos_update (TAO_EC_ProxyPushConsumer *consumer);
 
   /**
    * Copies all current observers into a map and passes it
    * back to the caller through @a map.
    * @return Returns the size of the map.
    */
-  int create_observer_map (Observer_Map &map
-                           ACE_ENV_ARG_DECL);
+  int create_observer_map (Observer_Map &map);
 
   /// The observer doesn't exist anymore
-  void observer_not_exists (Observer_Entry& observer
-                            ACE_ENV_ARG_DECL);
+  void observer_not_exists (Observer_Entry& observer);
   //@}
 };
 
@@ -328,8 +301,7 @@ public:
   /// Constructor
   TAO_EC_Accumulate_Supplier_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
 
-  virtual void work (TAO_EC_ProxyPushSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushSupplier *supplier);
 
 private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
@@ -344,8 +316,7 @@ public:
   /// Constructor
   TAO_EC_Accumulate_Consumer_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
 
-  virtual void work (TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushConsumer *consumer);
 
 private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 5a222b54ddd..37f99bf81da 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -55,21 +55,18 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
 
   this->consumer_ = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ Ignore exceptions
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -95,8 +92,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
           ACE_DEBUG ((LM_DEBUG, "  matched\n"));
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
-          this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->collection_->connected (supplier);
           return;
         }
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
@@ -106,8 +102,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
 }
 
 void
-TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier
-                                         ACE_ENV_ARG_DECL)
+TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -128,47 +123,42 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier
       if (supplier->can_match (event.header))
         {
           //          ACE_DEBUG ((LM_DEBUG, "  matched %x\n", supplier));
-          this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->collection_->connected (supplier);
           return;
         }
     }
-  this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (supplier);
 }
 
 void
-TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier
-                                          ACE_ENV_ARG_DECL)
+TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
-  this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (supplier);
 }
 
 void
-TAO_EC_Per_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Per_Supplier_Filter::shutdown (void)
 {
-  this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_->shutdown ();
 }
 
 void
 TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event,
-                                  TAO_EC_ProxyPushConsumer *consumer
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_ProxyPushConsumer *consumer)
 {
   TAO_EC_Scheduling_Strategy* scheduling_strategy =
     this->event_channel_->scheduling_strategy ();
   scheduling_strategy->schedule_event (event,
                                        consumer,
-                                       this
-                                       ACE_ENV_ARG_PARAMETER);
+                                       this);
 }
 
 void
 TAO_EC_Per_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event,
-                                                  const TAO_EC_QOS_Info &event_info
-                                                  ACE_ENV_ARG_DECL)
+                                                  const TAO_EC_QOS_Info &event_info)
 {
   TAO_EC_Filter_Worker worker (event, event_info);
-  this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
+  this->collection_->for_each (&worker);
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index 62d9836fed2..2d0947dc512 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -53,19 +53,14 @@ public:
   // = The TAO_EC_Supplier_Filter methods.
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
-                             ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void shutdown (void);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL_NOT_USED);
+                     TAO_EC_ProxyPushConsumer *consumer);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
-                                     const TAO_EC_QOS_Info &event_info
-                                     ACE_ENV_ARG_DECL);
+                                     const TAO_EC_QOS_Info &event_info);
   virtual CORBA::ULong _decr_refcnt (void);
   virtual CORBA::ULong _incr_refcnt (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index 9aea7f9ebd7..580c0e4d4d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -26,8 +26,7 @@ TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Prefix_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos
-    ACE_ENV_ARG_DECL_NOT_USED) const
+    RtecEventChannelAdmin::ConsumerQOS& qos) const
 {
   CORBA::ULong pos = 0;
   return this->recursive_build (supplier, qos, pos);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index afa9b699e82..01c5a950642 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -48,8 +48,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 
 private:
   /// Recursively build the filter tree.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 1e41905c0ca..f44f34ba32c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -38,10 +38,9 @@ TAO_EC_Priority_Dispatching::activate (void)
      ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   for (int i = 0; i < this->ntasks_; ++i)
     {
-      ACE_TRY
+      try
         {
           RtecScheduler::Period_t period =
             ACE_CU64_TO_CU32 (ACE_Scheduler_Rates[i]);
@@ -49,8 +48,7 @@ TAO_EC_Priority_Dispatching::activate (void)
           ACE_OS::sprintf (buf, "Dispatching_Task-%d.us", period);
 
           RtecScheduler::handle_t rt_info =
-            this->scheduler_->create (buf ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->scheduler_->create (buf);
 
           this->scheduler_->set (rt_info,
                                  RtecScheduler::VERY_LOW_CRITICALITY,
@@ -61,15 +59,12 @@ TAO_EC_Priority_Dispatching::activate (void)
                                  RtecScheduler::VERY_LOW_IMPORTANCE,
                                  0, // quantum
                                  1, // threads
-                                 RtecScheduler::OPERATION
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                 RtecScheduler::OPERATION);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore exceptions..
         }
-      ACE_ENDTRY;
 
       ACE_NEW (this->tasks_[i],
                TAO_EC_Dispatching_Task (&this->thread_manager_));
@@ -110,19 +105,17 @@ void
 TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                    RtecEventComm::PushConsumer_ptr consumer,
                                    const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                           RtecEventComm::PushConsumer_ptr consumer,
                                           RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_EC_QOS_Info& qos_info)
 {
   if (this->tasks_ == 0)
     this->activate ();
@@ -135,7 +128,7 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
     }
 
 
-  this->tasks_[i]->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
+  this->tasks_[i]->push (proxy, consumer, event);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index ebbb6cd6085..1c7c6413c92 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -62,13 +62,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index 345f9c89a01..7bd17246249 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -21,8 +21,7 @@ TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void)
 void
 TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL)
+      TAO_EC_ProxyPushConsumer *consumer)
 {
   ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n",
               supplier, consumer));
@@ -41,21 +40,17 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
       this->scheduler_->priority (qos_info.rt_info,
                                   os_priority,
                                   p_subpriority,
-                                  p_priority
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                  p_priority);
       qos_info.preemption_priority = p_priority;
 
-      supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier->add_dependencies (header, qos_info);
     }
 }
 
 void
 TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                             TAO_EC_ProxyPushConsumer *consumer,
-                                            TAO_EC_Supplier_Filter *filter
-                                            ACE_ENV_ARG_DECL)
+                                            TAO_EC_Supplier_Filter *filter)
 {
   RtecEventChannelAdmin::SupplierQOS qos =
     consumer->publications ();
@@ -85,15 +80,11 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event
           this->scheduler_->priority (qos_info.rt_info,
                                       os_priority,
                                       p_subpriority,
-                                      p_priority
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                      p_priority);
           qos_info.preemption_priority = p_priority;
         }
 
-      filter->push_scheduled_event (single_event, qos_info
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      filter->push_scheduled_event (single_event, qos_info);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index 0bcf644848a..8fa6953dac9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -47,19 +47,17 @@ public:
 
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL);
+      TAO_EC_ProxyPushConsumer *consumer);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL);
+                               TAO_EC_Supplier_Filter *filter);
 
 private:
   TAO_EC_Priority_Scheduling (const TAO_EC_Priority_Scheduling&);
   TAO_EC_Priority_Scheduling& operator= (const TAO_EC_Priority_Scheduling&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
+  void init_rt_info (void);
 
 private:
   /// The scheduler we are going to use
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 315f0a968ce..c68688c480b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -44,15 +44,13 @@ TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void)
 
 CORBA::Boolean
 TAO_EC_ProxyPushConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var supplier;
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
-    ACE_CHECK_RETURN (0);
 
     disconnected = 0;
     if (this->is_connected_i () == 0)
@@ -68,15 +66,14 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return supplier->_non_existent ();
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier
-                                     ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -85,12 +82,11 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->connected (supplier ACE_ENV_ARG_PARAMETER);
+  ace_mon.filter->connected (supplier);
 }
 
 void
-TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -99,12 +95,11 @@ TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->reconnected (supplier ACE_ENV_ARG_PARAMETER);
+  ace_mon.filter->reconnected (supplier);
 }
 
 void
-TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier
-                                        ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -113,34 +108,31 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->disconnected (supplier ACE_ENV_ARG_PARAMETER);
+  ace_mon.filter->disconnected (supplier);
 }
 
 void
-TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer*
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer*
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::shutdown_hook (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::shutdown_hook (void)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushConsumer::shutdown (void)
 {
   RtecEventComm::PushSupplier_var supplier;
 
@@ -148,40 +140,34 @@ TAO_EC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     supplier = this->supplier_._retn ();
     this->connected_ = 0;
 
-    this->shutdown_hook (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    this->shutdown_hook ();
 
     if (this->filter_ != 0)
       {
-        this->filter_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->filter_->shutdown ();
 
         this->cleanup_i ();
       }
   }
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 
   if (CORBA::is_nil (supplier.in ()))
     return;
 
-  ACE_TRY
+  try
     {
-      supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions, we must isolate other clients from
       // failures on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -200,24 +186,21 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void)
 }
 
 void
-TAO_EC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushConsumer::deactivate (void)
 {
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId id =
-          this->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->default_POA_->deactivate_object (id ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          this->object_id ();
+      this->default_POA_->deactivate_object (id);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 5ffb2b12c08..5fa313c5857 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -68,16 +68,14 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-          RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy
-          ACE_ENV_ARG_DECL)
+          RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Deactivate from the POA
-  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void deactivate (void);
 
   /// Disconnect this from
-  virtual void disconnect_push_consumer (
-            ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void disconnect_push_consumer () = 0;
 
   /// Return 0 if no supplier is connected...
   CORBA::Boolean is_connected (void) const;
@@ -94,29 +92,22 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected);
 
   /// Concrete implementations can use this methods to keep track of
   /// the consumers interested in this events.
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
-                             ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
 
   /// Usually implemented as no-ops, but some configurations may
   /// require this methods.
-  virtual void connected (TAO_EC_ProxyPushConsumer* consumer
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer
-                             ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushConsumer* consumer);
+  virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer);
 
   /// The event channel is shutting down
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (void);
 
   /// The QoS (subscription) used to connect to the EC, assumes the
   /// locks are held, use with care!
@@ -172,11 +163,11 @@ protected:
 
 private:
   /// Template method hooks.
-  virtual void shutdown_hook (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown_hook (void);
   virtual void refcount_zero_hook (void);
 
   virtual PortableServer::ObjectId
-            object_id (ACE_ENV_SINGLE_ARG_DECL)
+            object_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 0512c4962cf..51bd5ee6d0e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -46,55 +46,47 @@ TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void)
 }
 
 void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer
-                                     ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer)
 {
   TAO_EC_Scheduling_Strategy *s =
     this->event_channel_->scheduling_strategy ();
 
   s->add_proxy_supplier_dependencies (this,
-                                      consumer
-                                       ACE_ENV_ARG_PARAMETER);
+                                      consumer);
 }
 
 void
-TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer)
 {
   TAO_EC_Scheduling_Strategy *s =
     this->event_channel_->scheduling_strategy ();
 
   s->add_proxy_supplier_dependencies (this,
-                                      consumer
-                                       ACE_ENV_ARG_PARAMETER);
+                                      consumer);
 }
 
 void
-TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier*
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::shutdown (void)
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -104,7 +96,6 @@ TAO_EC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     int connected = this->is_connected_i ();
 
@@ -114,23 +105,20 @@ TAO_EC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       this->cleanup_i ();
   }
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 
   if (CORBA::is_nil (consumer.in ()))
     return;
 
-  ACE_TRY
+  try
     {
-      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions, we must isolate other clients from
       // problems on this one.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -146,24 +134,21 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void)
 }
 
 void
-TAO_EC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (())
+TAO_EC_ProxyPushSupplier::deactivate (void) ACE_THROW_SPEC (())
 {
-  ACE_TRY
+  try
     {
       PortableServer::ObjectId id =
-        this->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->default_POA_->deactivate_object (id ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->object_id ();
+      this->default_POA_->deactivate_object (id);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Exceptions here should not be propagated.  They usually
       // indicate that an object is beign disconnected twice, or some
       // race condition, but not a fault that the user needs to know
       // about.
     }
-  ACE_ENDTRY;
 }
 
 CORBA::ULong
@@ -198,8 +183,7 @@ typedef TAO_ESF_Proxy_RefCount_Guard<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushS
 
 int
 TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
-                                  TAO_EC_QOS_Info& qos_info
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_QOS_Info& qos_info)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -210,22 +194,19 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
     ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
             RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK_RETURN (0);
 
     if (this->is_connected_i () == 0)
       return 0;
 
     result =
-      this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->child_->filter (event, qos_info);
   }
   return result;
 }
 
 int
 TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
-                                         TAO_EC_QOS_Info& qos_info
-                                         ACE_ENV_ARG_DECL)
+                                         TAO_EC_QOS_Info& qos_info)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -236,22 +217,19 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
     ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
             RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK_RETURN (0);
 
     if (this->is_connected_i () == 0)
       return 0;
 
     result =
-      this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->child_->filter_nocopy (event, qos_info);
   }
   return result;
 }
 
 void
 TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info& qos_info)
 {
   // The mutex is already held by the caller (usually the filter()
   // method)
@@ -275,9 +253,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
   RtecEventComm::PushConsumer_var consumer =
     RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ());
 
-  this->pre_dispatch_hook (const_cast<RtecEventComm::EventSet&> (event)
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->pre_dispatch_hook (const_cast<RtecEventComm::EventSet&> (event));
 
   {
     // We have to release the lock to avoid dead-locks.
@@ -285,14 +261,11 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
 
     ACE_GUARD_THROW_EX (TAO_EC_Unlock, ace_mon, reverse_lock,
                         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     this->event_channel_->dispatching ()->push (this,
                                                 consumer.in (),
                                                 event,
-                                                qos_info
-                                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                                qos_info);
   }
 
   if (this->child_ != 0)
@@ -300,15 +273,13 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
 }
 
 void
-TAO_EC_ProxyPushSupplier::pre_dispatch_hook (RtecEventComm::EventSet&
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::pre_dispatch_hook (RtecEventComm::EventSet&)
 {
 }
 
 void
 TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
-                                       TAO_EC_QOS_Info& qos_info
-                                       ACE_ENV_ARG_DECL)
+                                       TAO_EC_QOS_Info& qos_info)
 {
   // The mutex is already held by the caller (usually the filter()
   // method)
@@ -332,22 +303,18 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
   RtecEventComm::PushConsumer_var consumer =
     RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ());
 
-  this->pre_dispatch_hook (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->pre_dispatch_hook (event);
 
   {
     TAO_EC_Unlock reverse_lock (*this->lock_);
 
     ACE_GUARD_THROW_EX (TAO_EC_Unlock, ace_mon, reverse_lock,
                         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     this->event_channel_->dispatching ()->push_nocopy (this,
                                                        consumer.in (),
                                                        event,
-                                                       qos_info
-                                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                                       qos_info);
   }
 
   if (this->child_ != 0)
@@ -357,14 +324,12 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_ProxyPushSupplier::push_to_consumer (
     RtecEventComm::PushConsumer_ptr consumer,
-    const RtecEventComm::EventSet& event
-    ACE_ENV_ARG_DECL)
+    const RtecEventComm::EventSet& event)
 {
   {
     ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
             RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
 
     if (this->is_connected_i () == 0)
       return; // ACE_THROW (RtecEventComm::Disconnected ());????
@@ -373,12 +338,11 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
       return;
   }
 
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->push (event);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
       // Do not report errors for old consumers
       // NOTE: The comparison below is not completely correct, it
@@ -392,11 +356,10 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
           TAO_EC_ConsumerControl *control =
             this->event_channel_->consumer_control ();
 
-          control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          control->consumer_not_exist (this);
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       // Do not report errors for old consumers
       // NOTE: The comparison below is not completely correct, it
@@ -411,65 +374,54 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
             this->event_channel_->consumer_control ();
 
           control->system_exception (this,
-                                     sysex
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                     sysex);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Shouldn't happen, but does not hurt
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
     RtecEventComm::PushConsumer_ptr consumer,
-    const RtecEventComm::EventSet& event
-    ACE_ENV_ARG_DECL)
+    const RtecEventComm::EventSet& event)
 {
-  ACE_TRY
+  try
     {
-      consumer->push (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->push (event);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
       TAO_EC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
-      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      control->consumer_not_exist (this);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (CORBA::SystemException& sysex)
     {
       TAO_EC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
       control->system_exception (this,
-                                 sysex
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 sysex);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Shouldn't happen
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
 TAO_EC_ProxyPushSupplier::consumer_non_existent (
-      CORBA::Boolean_out disconnected
-      ACE_ENV_ARG_DECL)
+      CORBA::Boolean_out disconnected)
 {
   CORBA::Object_var consumer;
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
-    ACE_CHECK_RETURN (0);
 
     disconnected = 0;
     if (this->is_connected_i () == 0)
@@ -482,7 +434,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer->_non_existent ();
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -519,17 +471,14 @@ TAO_EC_ProxyPushSupplier::can_match (
 int
 TAO_EC_ProxyPushSupplier::add_dependencies (
       const RtecEventComm::EventHeader &header,
-      const TAO_EC_QOS_Info &qos_info
-      ACE_ENV_ARG_DECL)
+      const TAO_EC_QOS_Info &qos_info)
 {
   ACE_GUARD_THROW_EX (
           ACE_Lock, ace_mon, *this->lock_,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK_RETURN (0);
 
   return this->child_->add_dependencies (header,
-                                         qos_info
-                                         ACE_ENV_ARG_PARAMETER);
+                                         qos_info);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index c0a4b442c82..9b80a1241f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -68,17 +68,15 @@ public:
 
   /// Activate in the POA
   virtual void activate (
-       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Deactivate from the POA
-  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (void)
     ACE_THROW_SPEC (());
 
   /// Disconnect this from
-  virtual void disconnect_push_supplier (
-            ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void disconnect_push_supplier () = 0;
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected (void) const;
@@ -97,24 +95,18 @@ public:
 
   /// Concrete implementations can use this methods to keep track of
   /// the suppliers that publish its events.
-  virtual void connected (TAO_EC_ProxyPushConsumer *consumer
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer
-                            ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushConsumer *consumer);
+  virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer);
 
   /// Usually implemented as no-ops, but some configurations may
   /// require this methods.
-  virtual void connected (TAO_EC_ProxyPushSupplier *supplier
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier
-                             ACE_ENV_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushSupplier *supplier);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier);
 
   /// The event channel is shutting down
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
   /// Pushes to the consumer, verifies that it is connected and that it
   /// is not suspended.
@@ -124,19 +116,16 @@ public:
    * may have changed.
    */
   void push_to_consumer (RtecEventComm::PushConsumer_ptr consumer,
-                         const RtecEventComm::EventSet &event
-                         ACE_ENV_ARG_DECL);
+                         const RtecEventComm::EventSet &event);
   void reactive_push_to_consumer (RtecEventComm::PushConsumer_ptr consumer,
-                                  const RtecEventComm::EventSet &event
-                                  ACE_ENV_ARG_DECL);
+                                  const RtecEventComm::EventSet &event);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
-                                        ACE_ENV_ARG_DECL);
+  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
@@ -144,23 +133,18 @@ public:
 
   // = The TAO_EC_Filter methods, only push() is implemented...
   virtual int filter (const RtecEventComm::EventSet &event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info &qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info &qos_info);
   virtual void push (const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info &qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader &header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader &header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 protected:
   /// Set the consumer, used by some implementations to change the
@@ -168,13 +152,13 @@ protected:
   void consumer (RtecEventComm::PushConsumer_ptr consumer);
   void consumer_i (RtecEventComm::PushConsumer_ptr consumer);
 
-  void suspend_connection_i (ACE_ENV_SINGLE_ARG_DECL)
+  void suspend_connection_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void resume_connection_i (ACE_ENV_SINGLE_ARG_DECL)
+  void resume_connection_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void suspend_connection_locked (ACE_ENV_SINGLE_ARG_DECL)
+  void suspend_connection_locked (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void resume_connection_locked (ACE_ENV_SINGLE_ARG_DECL)
+  void resume_connection_locked (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The private version (without locking) of is_connected().
@@ -213,10 +197,9 @@ private:
 
   /// Template method hooks.
   virtual void refcount_zero_hook (void);
-  virtual void pre_dispatch_hook (RtecEventComm::EventSet&
-                                  ACE_ENV_ARG_DECL);
+  virtual void pre_dispatch_hook (RtecEventComm::EventSet&);
   virtual PortableServer::ObjectId
-            object_id (ACE_ENV_SINGLE_ARG_DECL)
+            object_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
index c64085ea2e1..efe0d76ae82 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
@@ -5,43 +5,41 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE void
-TAO_EC_ProxyPushSupplier::suspend_connection_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::suspend_connection_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->suspended_ = 1;
 }
 
 ACE_INLINE void
-TAO_EC_ProxyPushSupplier::suspend_connection_locked (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::suspend_connection_locked (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
             CORBA::INTERNAL ());
   // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
 
-  this->suspend_connection_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->suspend_connection_i ();
 }
 
 ACE_INLINE void
-TAO_EC_ProxyPushSupplier::resume_connection_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::resume_connection_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->suspended_ = 0;
 }
 
 ACE_INLINE void
-TAO_EC_ProxyPushSupplier::resume_connection_locked (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::resume_connection_locked (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
             CORBA::INTERNAL ());
   // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
 
-  this->resume_connection_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->resume_connection_i ();
 }
 
 ACE_INLINE CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
index 557a2b4f708..f6c327c190e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
@@ -15,16 +15,13 @@ TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() (
                        RtecEventComm::PushSupplier_ptr supplier)
   ACE_THROW_SPEC (())
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier->disconnect_push_supplier ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -32,16 +29,13 @@ TAO_EC_Consumer_Proxy_Disconnect_Functor::operator() (
                        RtecEventComm::PushConsumer_ptr consumer)
   ACE_THROW_SPEC (())
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer->disconnect_push_consumer ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index f57b86ae813..5668c79f14e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -70,23 +70,20 @@ void
 TAO_EC_RTCORBA_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                              RtecEventComm::PushConsumer_ptr consumer,
                              const RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                          RtecEventComm::PushConsumer_ptr consumer,
                                          RtecEventComm::EventSet& event,
-                                         TAO_EC_QOS_Info&
-                                         ACE_ENV_ARG_DECL)
+                                         TAO_EC_QOS_Info&)
 {
   RTCORBA::Priority current_priority =
-    this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->the_priority ();
 
   for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i)
     {
@@ -96,9 +93,7 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
       // @@ If there were no threads available we may need to create
       // some...
 
-      this->tasks_[i].push (proxy, consumer, event
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->tasks_[i].push (proxy, consumer, event);
       break;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
index cb6e87fdad2..48598c1bb4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
@@ -51,13 +51,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
 private:
   /// The thread pools...
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index 087ffc53b03..b5da2246bfe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -40,38 +40,27 @@ TAO_EC_Dispatching*
 TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
 {
   TAO_EC_Dispatching *dispatching = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // @@ The ORBId could be important!!!
       int argc = 0;
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, 0, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, 0, "");
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("PriorityMappingManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PriorityMappingManager");
 
       RTCORBA::PriorityMappingManager_var priority_mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityMappingManager::_narrow (obj.in ());
 
       RTCORBA::PriorityMapping *priority_mapping =
         priority_mapping_manager->mapping ();
 
       obj =
-        orb->resolve_initial_references ("RTCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (obj.in ());
 
       ACE_NEW_RETURN (dispatching,
                       TAO_EC_RTCORBA_Dispatching (this->lanes_,
@@ -79,10 +68,9 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
                                                   current.in ()),
                       0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return dispatching;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index 5cc0e3bf3c5..4b2e439b0c7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -42,13 +42,10 @@ TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void)
 }
 
 void
-TAO_EC_Reactive_ConsumerControl::query_consumers (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Reactive_ConsumerControl::query_consumers ()
 {
   TAO_EC_Ping_Consumer worker (this);
-  this->event_channel_->for_each_consumer (&worker
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->for_each_consumer (&worker);
 }
 
 void
@@ -64,59 +61,46 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout (
   // RELATIVE_RT_TIMEOUT_POLICY set here in effect.
 
   // @@ TODO: should use Guard to set and reset policies.
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::ADD_OVERRIDE);
 
       // Query the state of the consumers...
-      this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->query_consumers ();
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_EC_Reactive_ConsumerControl::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Timeout for polling state (default = 10 msec)
       TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -127,9 +111,7 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -145,11 +127,10 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -169,33 +150,28 @@ TAO_EC_Reactive_ConsumerControl::shutdown (void)
 
 void
 TAO_EC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_EC_ProxyPushSupplier *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_EC_ProxyPushSupplier *proxy)
 {
-  ACE_TRY
+  try
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "EC_Reactive_ConsumerControl(%P|%t) - "
       //            "Consumer %x does not exists\n", long(proxy)));
-      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Reactive_ConsumerControl::consumer_not_exist");
+      ex._tao_print_exception ("Reactive_ConsumerControl::consumer_not_exist");
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_EC_Reactive_ConsumerControl::system_exception (
       TAO_EC_ProxyPushSupplier *proxy,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       // The current implementation is very strict, and kicks out a
       // client on the first system exception. We may
@@ -207,14 +183,12 @@ TAO_EC_Reactive_ConsumerControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
@@ -237,40 +211,33 @@ TAO_EC_ConsumerControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier
-                            ACE_ENV_ARG_DECL)
+TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier->consumer_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->consumer_not_exist (supplier);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
-      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->control_->consumer_not_exist (supplier);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT&)
     {
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->control_->consumer_not_exist (supplier);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index bcbf77a74a2..cb6120a511f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -88,16 +88,14 @@ public:
   // = Documented in TAO_EC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy);
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  void query_consumers (void);
 
 private:
   /// The polling rate
@@ -137,8 +135,7 @@ class TAO_EC_Ping_Consumer : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
 public:
   TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control);
 
-  virtual void work (TAO_EC_ProxyPushSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushSupplier *supplier);
 
 private:
   TAO_EC_ConsumerControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
index eb7b1bd5b7d..bffad152a77 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -26,20 +26,18 @@ void
 TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                    RtecEventComm::PushConsumer_ptr consumer,
                                    const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info&
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info&)
 {
-  proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (consumer, event);
 }
 
 void
 TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                           RtecEventComm::PushConsumer_ptr consumer,
                                           RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info&
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_EC_QOS_Info&)
 {
-  proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (consumer, event);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
index 0ef3be3bedb..97a701572ff 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
@@ -49,13 +49,11 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info &qos_info
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     TAO_EC_QOS_Info &qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                            TAO_EC_QOS_Info &qos_info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index e6e08c409d5..40e96be4414 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -42,13 +42,10 @@ TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void)
 }
 
 void
-TAO_EC_Reactive_SupplierControl::query_suppliers (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Reactive_SupplierControl::query_suppliers ()
 {
   TAO_EC_Ping_Supplier worker (this);
-  this->event_channel_->for_each_supplier (&worker
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->for_each_supplier (&worker);
 }
 
 void
@@ -56,59 +53,46 @@ TAO_EC_Reactive_SupplierControl::handle_timeout (
       const ACE_Time_Value &,
       const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Query the state of the Current object *before* we initiate
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->policy_current_->get_policy_overrides (types);
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::ADD_OVERRIDE);
 
       // Query the state of the suppliers...
-      this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->query_suppliers ();
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   CORBA::SET_OVERRIDE);
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 int
 TAO_EC_Reactive_SupplierControl::activate (void)
 {
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (tmp.in ());
 
       // Timeout for polling state (default = 10 msec)
       TimeBase::TimeT timeout = timeout_.usec() * 10;
@@ -119,9 +103,7 @@ TAO_EC_Reactive_SupplierControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any
-               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+               any);
 
       // Only schedule the timer, when the rate is not zero
       if (this->rate_ != ACE_Time_Value::zero)
@@ -137,11 +119,10 @@ TAO_EC_Reactive_SupplierControl::activate (void)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
   return 0;
@@ -161,31 +142,27 @@ TAO_EC_Reactive_SupplierControl::shutdown (void)
 
 void
 TAO_EC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_EC_ProxyPushConsumer *proxy
-      ACE_ENV_ARG_DECL)
+      TAO_EC_ProxyPushConsumer *proxy)
 {
-  ACE_TRY
+  try
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "EC_Reactive_SupplierControl(%P|%t) - "
       //            "Consumer %x does not exists\n", long(proxy)));
-      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_EC_Reactive_SupplierControl::system_exception (
       TAO_EC_ProxyPushConsumer *proxy,
-      CORBA::SystemException & /* exception */
-      ACE_ENV_ARG_DECL)
+      CORBA::SystemException & /* exception */)
 {
-  ACE_TRY
+  try
     {
       // The current implementation is very strict, and kicks out a
       // client on the first system exception. We may
@@ -197,14 +174,12 @@ TAO_EC_Reactive_SupplierControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions..
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
@@ -227,40 +202,33 @@ TAO_EC_SupplierControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer
-                            ACE_ENV_ARG_DECL)
+TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer)
 {
-  ACE_TRY
+  try
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer->supplier_non_existent (disconnected);
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->control_->supplier_not_exist (consumer);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient)
+  catch (const CORBA::TRANSIENT&)
     {
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->control_->supplier_not_exist (consumer);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index a2e37e70acf..ba91956541b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -99,16 +99,14 @@ public:
   // = Documented in TAO_EC_SupplierControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy);
   virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void query_suppliers (void);
 
 private:
   /// The polling rate
@@ -148,8 +146,7 @@ class TAO_EC_Ping_Supplier : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
 public:
   TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control);
 
-  virtual void work (TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushConsumer *consumer);
 
 private:
   TAO_EC_SupplierControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 3eb8e03e214..82910313264 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -54,27 +54,23 @@ TAO_EC_Sched_Filter::size (void) const
 
 int
 TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
-  return this->body_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->body_->filter (event, qos_info);
 }
 
 int
 TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event,
-                                    TAO_EC_QOS_Info& qos_info
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info& qos_info)
 {
-  return this->body_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+  return this->body_->filter_nocopy (event, qos_info);
 }
 
 // This is private, so we can make it inline in the .cpp file...
 void
-TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
-                                       ACE_ENV_ARG_DECL)
+TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info)
 {
-  this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_rt_info ();
 
   qos_info.rt_info = this->rt_info_;
   switch (this->info_type_)
@@ -92,9 +88,7 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
         this->scheduler_->priority (this->rt_info_,
                                     os_priority,
                                     p_subpriority,
-                                    p_priority
-                                     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                    p_priority);
         qos_info.preemption_priority = p_priority;
       }
     }
@@ -102,31 +96,25 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
 
 void
 TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event,
-                           TAO_EC_QOS_Info& qos_info
-                           ACE_ENV_ARG_DECL)
+                           TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->compute_qos_info (qos_info);
 
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->parent ()->push (event, qos_info);
     }
 }
 
 void
 TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event,
-                                  TAO_EC_QOS_Info& qos_info
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->compute_qos_info (qos_info);
 
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->parent ()->push_nocopy (event, qos_info);
     }
 }
 
@@ -150,27 +138,20 @@ TAO_EC_Sched_Filter::can_match (const RtecEventComm::EventHeader& header) const
 
 int
 TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
-                                       const TAO_EC_QOS_Info &qos_info
-                                       ACE_ENV_ARG_DECL)
+                                       const TAO_EC_QOS_Info &qos_info)
 {
-  this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->init_rt_info ();
 
   int matches = this->body_->add_dependencies (header,
-                                               qos_info
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                               qos_info);
 
   if (matches != 0)
     {
       this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1,
-                                        RtecBase::TWO_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                        RtecBase::TWO_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->scheduler_->get (qos_info.rt_info);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   this->name_.c_str (),
                   info->entry_point.in ()));
@@ -179,24 +160,21 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      (*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      (*i)->add_dependencies (header, qos_info);
     }
   return 0;
 }
 
 void
-TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info)
 {
-  this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_rt_info ();
 
   qos_info.rt_info = this->rt_info_;
 }
 
 void
-TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_Sched_Filter::init_rt_info (void)
 {
   if (this->rt_info_computed_)
     return;
@@ -212,9 +190,7 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          0, // quantum
                          0, // threads
-                         this->info_type_
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         this->info_type_);
 
 #if 0
   ChildrenIterator end = this->end ();
@@ -223,18 +199,14 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
       TAO_EC_Filter* filter = *i;
 
       TAO_EC_QOS_Info child;
-      filter->get_qos_info (child ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      filter->get_qos_info (child);
 
       this->scheduler_->add_dependency (this->rt_info_,
                                         child.rt_info, 1,
-                                        RtecBase::TWO_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                        RtecBase::TWO_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (child.rt_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->scheduler_->get (child.rt_info);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
                   this->name_.c_str ()));
@@ -248,13 +220,10 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
       this->scheduler_->add_dependency (this->rt_info_,
                                         this->body_info_,
                                         1,
-                                        RtecBase::TWO_WAY_CALL
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                        RtecBase::TWO_WAY_CALL);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->scheduler_->get (this->body_info_);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
                   this->name_.c_str ()));
@@ -265,13 +234,10 @@ TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
   this->scheduler_->add_dependency (this->parent_info_,
                                     this->rt_info_,
                                     1,
-                                    RtecBase::TWO_WAY_CALL
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    RtecBase::TWO_WAY_CALL);
 
   RtecScheduler::RT_Info_var info =
-    this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->scheduler_->get (this->parent_info_);
   ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
               this->name_.c_str (),
               info->entry_point.in ()));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index 5645a6eac92..6178a49f8f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -66,36 +66,29 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
+  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   TAO_EC_Sched_Filter (const TAO_EC_Sched_Filter&);
   TAO_EC_Sched_Filter& operator= (const TAO_EC_Sched_Filter&);
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
+  void init_rt_info (void);
 
   /// Compute a new qos_info to push up.
-  void compute_qos_info (TAO_EC_QOS_Info& qos_info
-                         ACE_ENV_ARG_DECL);
+  void compute_qos_info (TAO_EC_QOS_Info& qos_info);
 
 private:
   /// The RT_Info handle for this object
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 833c19b2aac..374a0a67cf0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -26,26 +26,22 @@ TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Sched_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos
-    ACE_ENV_ARG_DECL) const
+    RtecEventChannelAdmin::ConsumerQOS& qos) const
 {
   CORBA::ULong pos = 0;
   CORBA::Object_var tmp =
     this->event_channel_->scheduler ();
 
   RtecScheduler::Scheduler_var scheduler =
-    RtecScheduler::Scheduler::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    RtecScheduler::Scheduler::_narrow (tmp.in ());
 
   // @@ How do we figure out which parent???
   RtecScheduler::handle_t parent_info =
-    scheduler->lookup ("Dispatching_Task-250000.us" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    scheduler->lookup ("Dispatching_Task-250000.us");
 
   return this->recursive_build (supplier, qos, pos,
                                 scheduler.in (),
-                                parent_info
-                                 ACE_ENV_ARG_PARAMETER);
+                                parent_info);
 }
 
 TAO_EC_Filter*
@@ -54,8 +50,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    RtecScheduler::handle_t parent_info
-    ACE_ENV_ARG_DECL) const
+    RtecScheduler::handle_t parent_info) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -64,13 +59,10 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                            scheduler, name);
 
       RtecScheduler::handle_t rt_info =
-        scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        scheduler->create (name.c_str ());
 
       pos++; // Consume the designator
       CORBA::ULong n = this->count_children (qos, pos);
@@ -81,9 +73,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               rt_info
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                               rt_info);
         }
 
       TAO_EC_Sched_Filter *filter;
@@ -98,9 +88,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                                            RtecScheduler::CONJUNCTION),
                       0);
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info);
       // @@
-      ACE_CHECK_RETURN (0);
       return filter;
     }
 
@@ -109,13 +98,10 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                            scheduler, name);
 
       RtecScheduler::handle_t rt_info =
-        scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        scheduler->create (name.c_str ());
 
       pos++; // Consume the designator
       CORBA::ULong n = this->count_children (qos, pos);
@@ -126,9 +112,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               rt_info
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                               rt_info);
         }
       TAO_EC_Sched_Filter *filter;
       ACE_NEW_RETURN (filter,
@@ -143,9 +127,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                       0);
 
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info);
       // @@
-      ACE_CHECK_RETURN (0);
       return filter;
     }
 
@@ -164,8 +147,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
 
       TAO_EC_QOS_Info qos_info;
       qos_info.rt_info =
-        scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        scheduler->create (name.c_str ());
 
       // Convert the time to the proper units....
       RtecScheduler::Period_t period =
@@ -180,16 +162,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0, // quantum
                       1, // threads
-                      RtecScheduler::OPERATION
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                      RtecScheduler::OPERATION);
 
       scheduler->add_dependency (qos_info.rt_info,
                                  parent_info,
                                  1,
-                                 RtecBase::TWO_WAY_CALL
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                 RtecBase::TWO_WAY_CALL);
 
       return new TAO_EC_Timeout_Filter (this->event_channel_,
                                         supplier,
@@ -201,15 +179,13 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    scheduler->get (body_info);
 
   ACE_CString name = info->entry_point.in ();
   name += "#rep";
 
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    scheduler->create (name.c_str ());
 
   pos++;
   TAO_EC_Sched_Filter *filter;
@@ -224,9 +200,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                   0);
 
   TAO_EC_QOS_Info qos_info;
-  filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
+  filter->get_qos_info (qos_info);
   // @@
-  ACE_CHECK_RETURN (0);
   return filter;
 }
 
@@ -235,8 +210,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    ACE_CString& name
-    ACE_ENV_ARG_DECL) const
+    ACE_CString& name) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -250,9 +224,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
           ACE_CString child_name;
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                child_name);
 
           if (i == 0)
             name += "(";
@@ -275,9 +247,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
 
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                child_name);
 
           if (i == 0)
             name += "(";
@@ -306,8 +276,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    scheduler->get (body_info);
 
   name = info->entry_point.in ();
   name += "#rep";
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index 8c088259450..0cf0577f6a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -50,8 +50,7 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos
-                        ACE_ENV_ARG_DECL) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos) const;
 
 private:
   /// Recursively build the filter tree.
@@ -59,15 +58,13 @@ private:
                                   RtecEventChannelAdmin::ConsumerQOS& qos,
                                   CORBA::ULong& pos,
                                   RtecScheduler::Scheduler_ptr scheduler,
-                                  RtecScheduler::handle_t parent_info
-                                  ACE_ENV_ARG_DECL) const;
+                                  RtecScheduler::handle_t parent_info) const;
 
   /// Build the name recursively...
   void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos,
                        CORBA::ULong& pos,
                        RtecScheduler::Scheduler_ptr scheduler,
-                       ACE_CString &name
-                       ACE_ENV_ARG_DECL) const;
+                       ACE_CString &name) const;
 
   /// Count the number of children of the current node, i.e. until a
   /// conjunction or disjunction starts.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 08d3a6bf5c2..b0ebc96cd20 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -54,15 +54,13 @@ public:
   /// Add all the dependencies between @a supplier and @a consumer
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer
-      ACE_ENV_ARG_DECL) = 0;
+      TAO_EC_ProxyPushConsumer *consumer) = 0;
 
   /// Schedule an event set and deliver them to the filter in the
   /// desired order and grouping.
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
-                               TAO_EC_Supplier_Filter *filter
-                               ACE_ENV_ARG_DECL) = 0;
+                               TAO_EC_Supplier_Filter *filter) = 0;
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index fb555cf3e95..6856520575c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -24,14 +24,14 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void)
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_EC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_SupplierAdmin::obtain_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->obtain ();
 }
 
 PortableServer::POA_ptr
-TAO_EC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_SupplierAdmin::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 44e9edb8dc9..57e05628b48 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -55,11 +55,11 @@ public:
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_consumer (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 7d73bfbaf53..3b9fa1c3563 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -27,15 +27,13 @@ TAO_EC_SupplierControl::shutdown (void)
 }
 
 void
-TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer *
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer *)
 {
 }
 
 void
 TAO_EC_SupplierControl::system_exception (TAO_EC_ProxyPushConsumer *,
-                                          CORBA::SystemException &
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::SystemException &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index e4247d13b5b..23194f3304c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -64,14 +64,12 @@ public:
    * not exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy
-                                   ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy);
 
   /// Some system exception was raised while trying to contact the
   /// supplier
   virtual void system_exception (TAO_EC_ProxyPushConsumer * proxy,
-                                 CORBA::SystemException &
-                                 ACE_ENV_ARG_DECL_NOT_USED);
+                                 CORBA::SystemException &);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index dcd69dbd794..dfe1f96394d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -19,11 +19,10 @@ TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void)
 // ****************************************************************
 
 void
-TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier
-                            ACE_ENV_ARG_DECL)
+TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier)
 {
   TAO_EC_QOS_Info qos_info = this->event_info_;
-  supplier->filter (this->event_, qos_info ACE_ENV_ARG_PARAMETER);
+  supplier->filter (this->event_, qos_info);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 30de7bc3afc..200543baba2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -93,27 +93,22 @@ public:
 
   /// Concrete implementations can use this methods to keep track of
   /// the consumers interested in this events.
-  virtual void connected (TAO_EC_ProxyPushSupplier *supplier
-                          ACE_ENV_ARG_DECL) = 0;
-  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier
-                          ACE_ENV_ARG_DECL) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier
-                             ACE_ENV_ARG_DECL) = 0;
+  virtual void connected (TAO_EC_ProxyPushSupplier *supplier) = 0;
+  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier) = 0;
 
   /// The event channel is shutting down.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void shutdown (void) = 0;
 
   /// The ProxyPushConsumer delegates on this class to actually send
   /// the event.
   virtual void push (const RtecEventComm::EventSet &event,
-                     TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL) = 0;
+                     TAO_EC_ProxyPushConsumer *consumer) = 0;
 
   /// Events are first scheduled by the TAO_EC_Scheduling_Strategy,
   /// and then pushed through this class again.
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
-                                     const TAO_EC_QOS_Info &event_info
-                                     ACE_ENV_ARG_DECL) = 0;
+                                     const TAO_EC_QOS_Info &event_info) = 0;
 
   /// Increment and decrement the reference count, locking must be
   /// provided by the user.
@@ -129,8 +124,7 @@ public:
   TAO_EC_Filter_Worker (RtecEventComm::EventSet &event,
                         const TAO_EC_QOS_Info &event_info);
 
-  virtual void work (TAO_EC_ProxyPushSupplier *supplier
-                     ACE_ENV_ARG_DECL);
+  virtual void work (TAO_EC_ProxyPushSupplier *supplier);
 
 private:
   /// The event we push on each case, use a reference to avoid copies.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index f6bcde8d4cf..962a359017e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -39,8 +39,7 @@ TAO_EC_TPC_Dispatching::~TAO_EC_TPC_Dispatching ()
 }
 
 int
-TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
@@ -96,8 +95,7 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer
 }
 
 int
-TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consumer
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consumer)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
@@ -170,19 +168,17 @@ void
 TAO_EC_TPC_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                              RtecEventComm::PushConsumer_ptr consumer,
                              const RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL)
+                             TAO_EC_QOS_Info& qos_info)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info);
 }
 
 void
 TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                     RtecEventComm::PushConsumer_ptr consumer,
                                     RtecEventComm::EventSet& event,
-                                    TAO_EC_QOS_Info&
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_EC_QOS_Info&)
 {
   if (TAO_EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer));
@@ -198,8 +194,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
     }
   else
     {
-      dtask->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      dtask->push (proxy, consumer, event);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index d507f3f5c1d..b7ece85cb30 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -52,16 +52,14 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
 
-  int add_consumer (RtecEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL);
-  int remove_consumer (RtecEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL);
+  int add_consumer (RtecEventComm::PushConsumer_ptr consumer);
+  int remove_consumer (RtecEventComm::PushConsumer_ptr consumer);
 
 private:
   // Use our own thread manager
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index a5b23525b1e..09b2c3fdcac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -22,7 +22,7 @@ TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching ()
   TAO_EC_Dispatching* dispatcher = this->event_channel_->dispatching ();
   TAO_EC_TPC_Dispatching* tpcdispatcher =
     dynamic_cast<TAO_EC_TPC_Dispatching*>(dispatcher);
-  return tpcdispatcher;  
+  return tpcdispatcher;
 }
 
 TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
@@ -36,20 +36,15 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void)
 }
 
 void
-TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  RtecEventComm::PushConsumer_var emulated_exceptions_suck = 
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  RtecEventComm::PushConsumer_var emulated_exceptions_suck =
+    this->_this ();
 
-  this->tpc_dispatching ()->remove_consumer (emulated_exceptions_suck.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->tpc_dispatching ()->remove_consumer (emulated_exceptions_suck.in ());
 
-  BASECLASS::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  BASECLASS::disconnect_push_consumer ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
index 9fb7ff1dc0c..586d6218b5c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
@@ -35,7 +35,7 @@ public:
   TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec);
   virtual ~TAO_EC_TPC_ProxyPushConsumer (void);
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 756de632952..26b206d447d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -21,7 +21,7 @@ TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void)
 }
 
 void
-TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_EC_TPC_debug_level > 0)
@@ -32,12 +32,9 @@ TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL
 
   if (this->is_connected_i ())
     {
-      this->tpc_dispatching ()->remove_consumer (this->consumer_.in()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->tpc_dispatching ()->remove_consumer (this->consumer_.in());
     }
-  BASECLASS::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  BASECLASS::disconnect_push_supplier ();
 
   if (TAO_EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): leave EC_TPC_ProxySupplier::disconnect_push_supplier (%@)\n", this));
@@ -54,14 +51,12 @@ TAO_EC_TPC_ProxyPushSupplier::tpc_dispatching ()
 void
 TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
       RtecEventComm::PushConsumer_ptr push_consumer,
-      const RtecEventChannelAdmin::ConsumerQOS& qos
-      ACE_ENV_ARG_DECL)
+      const RtecEventChannelAdmin::ConsumerQOS& qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected,
                      RtecEventChannelAdmin::TypeError))
 {
-  BASECLASS::connect_push_consumer (push_consumer, qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  BASECLASS::connect_push_consumer (push_consumer, qos);
 
   if (TAO_EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n",
@@ -70,7 +65,7 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
   TAO_EC_TPC_Dispatching* tpcdispatcher = this->tpc_dispatching ();
 
   // the new dispatching task gets automatically created
-  tpcdispatcher->add_consumer (push_consumer ACE_ENV_ARG_PARAMETER);
+  tpcdispatcher->add_consumer (push_consumer);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
index 3a6ad49db16..ceda25e79fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
@@ -29,26 +29,25 @@ class TAO_RTEvent_Serv_Export TAO_EC_TPC_ProxyPushSupplier :
 public:
   /// Constructor
   TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection);
-  
+
   /// Dtor
   virtual ~TAO_EC_TPC_ProxyPushSupplier (void);
 
   /*! These are overriden from the base class in order to maintain the
        map in the dispatcher class. */
-  
+
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL_NOT_USED)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  
-private:  
+
+private:
   typedef TAO_EC_Default_ProxyPushSupplier BASECLASS;
   TAO_EC_TPC_Dispatching* tpc_dispatching ();
 };
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index d775c458a12..8191211f5bc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -11,8 +11,8 @@
 #include "orbsvcs/Event/EC_Timeout_Filter.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event, 
-           EC_Timeout_Filter, 
+ACE_RCSID (Event,
+           EC_Timeout_Filter,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -69,27 +69,23 @@ TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void)
 
 void
 TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event,
-                                      TAO_EC_QOS_Info& qos_info
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_EC_QOS_Info& qos_info)
 {
   qos_info.timer_id_ = this->id_;
 
   if (this->supplier_ != 0)
     this->supplier_->filter (event,
-                             qos_info
-                              ACE_ENV_ARG_PARAMETER);
+                             qos_info);
 }
 
 int
 TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
-                               TAO_EC_QOS_Info &qos_info
-                               ACE_ENV_ARG_DECL)
+                               TAO_EC_QOS_Info &qos_info)
 {
   if (qos_info.timer_id_ == this->id_
       && this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->parent ()->push (event, qos_info);
       return 1;
     }
   return 0;
@@ -97,14 +93,12 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
 
 int
 TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
-                                      TAO_EC_QOS_Info &qos_info
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_EC_QOS_Info &qos_info)
 {
   if (qos_info.timer_id_ == this->id_
       && this->parent () != 0)
     {
-      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->parent ()->push_nocopy (event, qos_info);
       return 1;
     }
   return 0;
@@ -112,15 +106,13 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
 
 void
 TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet&,
-                          TAO_EC_QOS_Info&
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          TAO_EC_QOS_Info&)
 {
 }
 
 void
 TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&,
-                                    TAO_EC_QOS_Info&
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    TAO_EC_QOS_Info&)
 {
 }
 
@@ -162,8 +154,7 @@ TAO_EC_Timeout_Filter::can_match (
 int
 TAO_EC_Timeout_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index b9d5fbbacc3..4fce96dcfeb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -60,29 +60,23 @@ public:
 
   /// Callback from the Timeout_Generator
   void push_to_proxy (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Timeout_Filter (const TAO_EC_Timeout_Filter&);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 2b55f24a2d6..453af4eeaf2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -8,8 +8,8 @@
 #include "orbsvcs/Event/EC_Timeout_Generator.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event, 
-           EC_Timeout_Generator, 
+ACE_RCSID (Event,
+           EC_Timeout_Generator,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -35,7 +35,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
   if (filter == 0)
     return 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       RtecEventComm::Event e;
       e.header.type = filter->type ();
@@ -45,15 +45,12 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
 
       TAO_EC_QOS_Info qos_info = filter->qos_info ();
       filter->push_to_proxy (single_event,
-                             qos_info
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             qos_info);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index c5d3dc1b72c..93f1264d176 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -31,49 +31,42 @@ TAO_EC_Trivial_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer*)
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier*
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier*
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Trivial_Supplier_Filter::shutdown (void)
 {
 }
 
 void
 TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event,
-                                      TAO_EC_ProxyPushConsumer *consumer
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_EC_ProxyPushConsumer *consumer)
 {
   TAO_EC_Scheduling_Strategy* scheduling_strategy =
     this->event_channel_->scheduling_strategy ();
   scheduling_strategy->schedule_event (event,
                                        consumer,
-                                       this
-                                       ACE_ENV_ARG_PARAMETER);
+                                       this);
 }
 
 void
 TAO_EC_Trivial_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event,
-                                                      const TAO_EC_QOS_Info &event_info
-                                                      ACE_ENV_ARG_DECL)
+                                                      const TAO_EC_QOS_Info &event_info)
 {
   TAO_EC_Filter_Worker worker (event, event_info);
-  this->event_channel_->for_each_consumer (&worker
-                                           ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->for_each_consumer (&worker);
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 617bd87f6d7..7b35833fc62 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -53,19 +53,14 @@ public:
   // = The TAO_EC_Supplier_Filter methods.
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier
-                          ACE_ENV_ARG_DECL);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
-                            ACE_ENV_ARG_DECL);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
-                             ACE_ENV_ARG_DECL);
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier);
+  virtual void shutdown (void);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_ProxyPushConsumer *consumer
-                     ACE_ENV_ARG_DECL_NOT_USED);
+                     TAO_EC_ProxyPushConsumer *consumer);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
-                                     const TAO_EC_QOS_Info &event_info
-                                     ACE_ENV_ARG_DECL);
+                                     const TAO_EC_QOS_Info &event_info);
   virtual CORBA::ULong _decr_refcnt (void);
   virtual CORBA::ULong _incr_refcnt (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index d52f1d869aa..f4f99440f0c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -13,16 +13,14 @@ TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header
 
 int
 TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL)
+                            TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
-    return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER);
+    return this->filter_set (event, qos_info);
 
   if (this->can_match (event[0].header))
     {
-      this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->push (event, qos_info);
       return 1;
     }
   return 0;
@@ -30,16 +28,14 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info
-                                   ACE_ENV_ARG_DECL)
+                                   TAO_EC_QOS_Info& qos_info)
 {
   if (event.length () != 1)
-    return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER);
+    return this->filter_set (event, qos_info);
 
   if (this->can_match (event[0].header))
     {
-      this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->push_nocopy (event, qos_info);
       return 1;
     }
   return 0;
@@ -47,20 +43,18 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event,
-                          TAO_EC_QOS_Info& qos_info
-                          ACE_ENV_ARG_DECL)
+                          TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info);
 }
 
 void
 TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_EC_QOS_Info& qos_info)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info);
 }
 
 void
@@ -113,16 +107,14 @@ TAO_EC_Type_Filter::can_match (
 int
 TAO_EC_Type_Filter::add_dependencies (
       const RtecEventComm::EventHeader& header,
-      const TAO_EC_QOS_Info &
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const TAO_EC_QOS_Info &)
 {
   return this->can_match (header);
 }
 
 int
 TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info
-                                ACE_ENV_ARG_DECL)
+                                TAO_EC_QOS_Info& qos_info)
 {
   CORBA::ULong maximum = event.length ();
   if (event.maximum () == 0)
@@ -141,8 +133,7 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event,
   if (matched.length () == 0)
     return 0;
 
-  this->push (matched, qos_info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->push (matched, qos_info);
 
   return 1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index 12a0660bf72..ba115eab809 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -43,23 +43,18 @@ public:
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info
-                      ACE_ENV_ARG_DECL);
+                      TAO_EC_QOS_Info& qos_info);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info
-                             ACE_ENV_ARG_DECL);
+                             TAO_EC_QOS_Info& qos_info);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info
-                     ACE_ENV_ARG_DECL);
+                     TAO_EC_QOS_Info& qos_info);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info
-                            ACE_ENV_ARG_DECL);
+                            TAO_EC_QOS_Info& qos_info);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info
-                                ACE_ENV_ARG_DECL);
+                                const TAO_EC_QOS_Info &qos_info);
 
 private:
   TAO_EC_Type_Filter (const TAO_EC_Type_Filter&);
@@ -67,8 +62,7 @@ private:
 
   /// Filter an EventSet that contains more than one event.
   int filter_set (const RtecEventComm::EventSet& event,
-                  TAO_EC_QOS_Info& qos_info
-                  ACE_ENV_ARG_DECL);
+                  TAO_EC_QOS_Info& qos_info);
 
 private:
   /// Encapsulate the type/source that we must match.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index eba83581c8d..a52e42d1ca7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -2,8 +2,8 @@
 
 #include "orbsvcs/Event/EC_UDP_Admin.h"
 
-ACE_RCSID (Event, 
-           EC_UDP_Admin, 
+ACE_RCSID (Event,
+           EC_UDP_Admin,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -19,8 +19,7 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void)
 
 void
 TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header,
-                                    RtecUDPAdmin::UDP_Addr_out addr
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    RtecUDPAdmin::UDP_Addr_out addr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr.ipaddr = header.type;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 7e5ccff9920..1b2600c1178 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -46,8 +46,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index 03d6f4a56b6..4a35a62a269 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -15,26 +15,20 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_FT_ClientORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_FT_ClientORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_policy_factories (info);
 
 
-  this->register_client_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_client_request_interceptors (info);
 
 
 
@@ -42,8 +36,7 @@ TAO_FT_ClientORBInitializer::post_init (
 
 void
 TAO_FT_ClientORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register the FTCORBA policy factories.
@@ -61,7 +54,6 @@ TAO_FT_ClientORBInitializer::register_policy_factories (
                          TAO::VMCID,
                          ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   policy_factory = temp_factory;
 
@@ -71,30 +63,23 @@ TAO_FT_ClientORBInitializer::register_policy_factories (
 
   CORBA::PolicyType type = FT::REQUEST_DURATION_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policy_factory.in ());
 
   type = FT::HEARTBEAT_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policy_factory.in ());
 
   /*
   type = FT::HEARTBEAT_ENABLED_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policy_factory.in ());
   */
 }
 
 
 void
 TAO_FT_ClientORBInitializer::register_client_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr cri =
@@ -107,9 +92,7 @@ TAO_FT_ClientORBInitializer::register_client_request_interceptors (
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = cri;
 
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
index c0383c99cbc..278a80f3c4b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h
@@ -39,26 +39,22 @@ class TAO_FT_ClientORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register FTCORBA policy factories.
   void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register the necessary interceptors.
   void register_client_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 852e1c2c97b..56c9b3f7a63 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -14,18 +14,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_FT_ClientPolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &val
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &val)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
 
   if (type ==  FT::REQUEST_DURATION_POLICY)
-    return TAO_FT_Request_Duration_Policy::create (val
-                                                   ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Request_Duration_Policy::create (val);
   else if (type == FT::HEARTBEAT_POLICY)
-    return TAO_FT_Heart_Beat_Policy::create (val
-                                             ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Heart_Beat_Policy::create (val);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
index 7ee620338b9..0e16efe8059 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
@@ -43,8 +43,7 @@ class TAO_FT_ClientPolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const CORBA::Any &value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 638639dfb10..758e9dc7019 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -15,22 +15,21 @@ ACE_RCSID(FaultTolerance, FT_ClientPolicy_i, "$Id$")
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TimeBase::TimeT
-TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::request_duration_policy_value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_duration_;
 }
 
 CORBA::PolicyType
-TAO_FT_Request_Duration_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::REQUEST_DURATION_POLICY;
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
-                                        ACE_ENV_ARG_DECL)
+TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val)
 {
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
@@ -42,7 +41,6 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
                     TAO_FT_Request_Duration_Policy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
@@ -58,20 +56,19 @@ TAO_FT_Request_Duration_Policy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Request_Duration_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Request_Duration_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_FT_Request_Duration_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -97,7 +94,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
 /*****************************************************************/
 
 FT::HeartbeatPolicyValue
-TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::HeartbeatPolicyValue val;
@@ -110,8 +107,7 @@ TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_US
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
-                                  ACE_ENV_ARG_DECL)
+TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 {
   FT::HeartbeatPolicyValue *value = 0;
   if ((val >>= value) == 0)
@@ -125,14 +121,13 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
                                               value->heartbeat_timeout),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_POLICY;
@@ -140,14 +135,13 @@ TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Policy * tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
@@ -163,7 +157,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
 }
 
 void
-TAO_FT_Heart_Beat_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index a1bbf81174e..7ccdac2f82a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -56,26 +56,22 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_FT_Request_Duration_Policy *clone (void) const;
 
   // = The FT::RequestDurationPolicy methods
-  virtual TimeBase::TimeT request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::TimeT request_duration_policy_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
@@ -111,26 +107,22 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_FT_Heart_Beat_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL)
+  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 1da0a14348d..368385946fc 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -48,22 +48,21 @@ namespace TAO
   }
 
   char *
-  FT_ClientRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  FT_ClientRequest_Interceptor::name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->name_);
   }
 
   void
-  FT_ClientRequest_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  FT_ClientRequest_Interceptor::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ClientRequest_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Do Nothing
@@ -71,16 +70,14 @@ namespace TAO
 
   void
   FT_ClientRequest_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
   {
     if (TAO_debug_level > 3)
       {
         CORBA::String_var op =
-          ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          ri->operation ();
 
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO_FT (%P|%t) - %s called for %s\n"),
@@ -89,41 +86,32 @@ namespace TAO
       }
 
     IOP::TaggedComponent_var tp;
-    ACE_TRY
+    try
       {
         tp =
-          ri->get_effective_component (IOP::TAG_FT_GROUP
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          ri->get_effective_component (IOP::TAG_FT_GROUP);
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
         return;
       }
-    ACE_ENDTRY;
 
     this->group_version_context (ri,
-                                 tp
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                 tp);
 
-    this->request_service_context (ri
-                                   ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->request_service_context (ri);
   }
 
   void
   FT_ClientRequest_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ClientRequest_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
@@ -131,7 +119,7 @@ namespace TAO
 
     if (!tao_ri)
       {
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
 
     TimeBase::TimeT expires = tao_ri->tao_ft_expiration_time ();
@@ -144,18 +132,17 @@ namespace TAO
 
     PortableInterceptor::ReplyStatus status = -1;
 
-    ACE_TRY
+    try
     {
-       status = ri->reply_status(ACE_ENV_SINGLE_ARG_PARAMETER);
+       status = ri->reply_status();
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
        // No reply status => Not a location forward.
        return;
     }
-    ACE_ENDTRY;
 
-    if (status ==  PortableInterceptor::LOCATION_FORWARD)
+    if (status == PortableInterceptor::LOCATION_FORWARD)
       {
         // We are in an FT request and a location forward has been received.
 
@@ -171,19 +158,18 @@ namespace TAO
 
             // The spec says throw a SYSTEM_EXCEPTION, but doesn't specify which one.
             // I think a TRANSIENT is the most suitable.
-            ACE_THROW (CORBA::TRANSIENT (
+            throw CORBA::TRANSIENT (
               CORBA::SystemException::_tao_minor_code (
-              TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
-              errno),
-              CORBA::COMPLETED_NO));
+                TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
+                errno),
+              CORBA::COMPLETED_NO);
           }
       }
   }
 
   void
   FT_ClientRequest_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
   {
@@ -191,8 +177,7 @@ namespace TAO
     // @@ Will be used later.
     // Do a check for policy in which this can be done..
     PortableInterceptor::ReplyStatus rs =
-      ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      ri->reply_status ();
 
     if (rs != PortableInterceptor::SYSTEM_EXCEPTION)
       {
@@ -200,8 +185,7 @@ namespace TAO
       }
 
     CORBA::Any_var ex =
-      ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      ri->received_exception ();
 
     TAO_OutputCDR cdr;
 
@@ -218,8 +202,7 @@ namespace TAO
     if (!(icdr.read_string (rep_id.out ()) &&
           icdr.read_ulong (min) &&
           icdr.read_ulong (cs)))
-      ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
-                                 CORBA::COMPLETED_MAYBE));
+      throw CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_MAYBE);
 
     cs = CORBA::CompletionStatus (cs);
 
@@ -231,21 +214,17 @@ namespace TAO
     // which the ORB should understand
     if (ACE_OS_String::strcmp (rep_id.in (),
                                "IDL:omg.org/CORBA/TRANSIENT:1.0") == 0)
-      ACE_THROW (CORBA::TRANSIENT (min,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (min, CORBA::COMPLETED_NO);
     else if (ACE_OS_String::strcmp (rep_id.in (),
                                   "IDL:omg.org/CORBA/COMM_FAILURE:1.0") == 0)
-      ACE_THROW (CORBA::COMM_FAILURE (min,
-                                      CORBA::COMPLETED_NO));
+      throw CORBA::COMM_FAILURE (min, CORBA::COMPLETED_NO);
     else if (ACE_OS_String::strcmp (rep_id.in (),
                                     "IDL:omg.org/CORBA/NO_REPONSE:1.0") == 0)
-      ACE_THROW (CORBA::NO_RESPONSE (min,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::NO_RESPONSE (min, CORBA::COMPLETED_NO);
 
     else if (ACE_OS_String::strcmp (rep_id.in (),
                                     "IDL:omg.org/CORBA/OBJ_ADAPTER:1.0") == 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER (min,
-                                   CORBA::COMPLETED_NO));
+    throw CORBA::OBJ_ADAPTER (min, CORBA::COMPLETED_NO);
     cout << "Didnt throw exception " << endl;
 #endif /*if 0*/
     return;
@@ -255,11 +234,10 @@ namespace TAO
   void
     FT_ClientRequest_Interceptor::group_version_context (
     PortableInterceptor::ClientRequestInfo_ptr ri,
-    IOP::TaggedComponent* tp
-    ACE_ENV_ARG_DECL)
+    IOP::TaggedComponent* tp)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_TRY
+    try
     {
       // Grab the object group version
       // @@ NOTE: This involves an allocation and a dellocation. This is
@@ -276,8 +254,7 @@ namespace TAO
       FT::TagFTGroupTaggedComponent gtc;
 
       if ((cdr >> gtc) == 0)
-        ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-        CORBA::COMPLETED_NO));
+        throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
       IOP::ServiceContext sc;
       sc.context_id = IOP::FT_GROUP_VERSION;
@@ -306,37 +283,30 @@ namespace TAO
 
       // Add this context to the service context list.
       ri->add_request_service_context (sc,
-        0
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        0);
 
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
       // Not much can be done anyway. Just keep quiet
       // ACE_RE_THROW;
     }
-    ACE_ENDTRY;
-    ACE_CHECK;
 
     return;
   }
 
   void
     FT_ClientRequest_Interceptor::request_service_context (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_TRY
+    try
     {
       IOP::ServiceContext sc;
       sc.context_id = IOP::FT_REQUEST;
 
       CORBA::Policy_var policy =
-        ri->get_request_policy (FT::REQUEST_DURATION_POLICY
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_request_policy (FT::REQUEST_DURATION_POLICY);
 
       FT::FTRequestServiceContext ftrsc;
       ftrsc.client_id =
@@ -346,7 +316,7 @@ namespace TAO
 
       if (!tao_ri)
         {
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       if (tao_ri->tao_ft_expiration_time ())
@@ -362,9 +332,7 @@ namespace TAO
 
           ftrsc.retention_id = ++this->retention_id_;
           ftrsc.expiration_time =
-              this->request_expiration_time (policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              this->request_expiration_time (policy.in ());
 
           tao_ri->tao_ft_retention_id (ftrsc.retention_id);
           tao_ri->tao_ft_expiration_time (ftrsc.expiration_time);
@@ -395,32 +363,25 @@ namespace TAO
 
       // Add this context to the service context list.
       ri->add_request_service_context (sc,
-        0
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        0);
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
       // ACE_RE_THROW;
     }
-    ACE_ENDTRY;
-    ACE_CHECK;
     return;
   }
 
   TimeBase::TimeT
   FT_ClientRequest_Interceptor::request_expiration_time (
-    CORBA::Policy *policy
-    ACE_ENV_ARG_DECL)
+    CORBA::Policy *policy)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     FT::RequestDurationPolicy_var p;
 
     if (policy != 0)
       {
-        p =  FT::RequestDurationPolicy::_narrow (policy
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+        p =  FT::RequestDurationPolicy::_narrow (policy);
       }
 
     TimeBase::TimeT t = 0;
@@ -428,8 +389,7 @@ namespace TAO
     if (p.in ())
       {
         t =
-        p->request_duration_policy_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+        p->request_duration_policy_value ();
       }
     else
       {
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
index 51f92c674d9..6c8e4424575 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -76,33 +76,28 @@ namespace TAO
     FT_ClientRequest_Interceptor (void);
 
     /// Canonical name of the interceptor.
-    virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+    virtual char * name (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
-                            ACE_ENV_ARG_DECL)
+    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL)
+    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                                ACE_ENV_ARG_DECL)
+    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                    ACE_ENV_ARG_DECL)
+    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
@@ -113,16 +108,13 @@ namespace TAO
   private:
 
     void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri,
-                                IOP::TaggedComponent* tp
-                                ACE_ENV_ARG_DECL)
+                                IOP::TaggedComponent* tp)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void request_service_context (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL)
+    void request_service_context (PortableInterceptor::ClientRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    TimeBase::TimeT request_expiration_time (CORBA::Policy *policy
-                                             ACE_ENV_ARG_DECL)
+    TimeBase::TimeT request_expiration_time (CORBA::Policy *policy)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index 280b95cab98..3a785fe5698 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -24,8 +24,7 @@ TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void)
 
 
 TAO_Invocation_Endpoint_Selector *
-TAO_FT_Endpoint_Selector_Factory::get_selector (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Endpoint_Selector_Factory::get_selector ()
 {
     if (this->ft_endpoint_selector_ == 0)
     {
@@ -40,7 +39,6 @@ TAO_FT_Endpoint_Selector_Factory::get_selector (
           ACE_NEW_THROW_EX (ft_endpoint_selector_,
                             TAO_FT_Invocation_Endpoint_Selector (),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (0);
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
index d2a6462b4e0..e8c5e72f783 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
@@ -52,8 +52,7 @@ public:
 
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (
-      ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Invocation_Endpoint_Selector *get_selector ();
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index 413bce96aaf..c83f99101e1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -23,8 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_property (
-    CORBA::Object_ptr &ior
-    ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+    CORBA::Object_ptr &ior)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::Invalid_IOR))
 {
@@ -77,8 +76,7 @@ TAO_FT_IOGR_Property::set_property (
 
 CORBA::Boolean
 TAO_FT_IOGR_Property::is_primary_set (
-    CORBA::Object_ptr ior
-    ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+    CORBA::Object_ptr ior)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -92,8 +90,7 @@ TAO_FT_IOGR_Property::is_primary_set (
 
 CORBA::Object_ptr
 TAO_FT_IOGR_Property::get_primary (
-    CORBA::Object_ptr ior
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr ior)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -144,7 +141,6 @@ TAO_FT_IOGR_Property::get_primary (
 
   CORBA::Object_var new_obj = temp_obj;
 
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Clean up in case of errors.
   if (CORBA::is_nil (new_obj.in ()))
@@ -165,8 +161,7 @@ TAO_FT_IOGR_Property::get_primary (
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_primary (
     CORBA::Object_ptr &ior1,
-    CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr ior2)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound,
@@ -346,8 +341,7 @@ TAO_FT_IOGR_Property::get_primary_profile (
 CORBA::Boolean
 TAO_FT_IOGR_Property::get_tagged_component (
     const CORBA::Object_ptr iogr,
-    FT::TagFTGroupTaggedComponent &fgtc
-    ACE_ENV_ARG_DECL) const
+    FT::TagFTGroupTaggedComponent &fgtc) const
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Stub *stub =
@@ -399,8 +393,7 @@ TAO_FT_IOGR_Property::get_tagged_component (
 
 CORBA::Boolean
 TAO_FT_IOGR_Property::remove_primary_tag (
-    CORBA::Object_ptr &iogr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CORBA::Object_ptr &iogr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the MProfile
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index cc888e28e31..36cdbfbfdf8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -67,8 +67,7 @@ public:
 
   /// Set the property for the IOGR
   virtual CORBA::Boolean set_property (
-      CORBA::Object_ptr &ior
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr &ior)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       TAO_IOP::Invalid_IOR
@@ -77,8 +76,7 @@ public:
   /// Set <ior1> as  primary which is a part of <ior2>
   virtual CORBA::Boolean set_primary (
       CORBA::Object_ptr &ior1,
-      CORBA::Object_ptr ior2
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr ior2)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       TAO_IOP::NotFound,
@@ -87,8 +85,7 @@ public:
 
   /// Get the primary member from the IOGR <ior>
   virtual CORBA::Object_ptr get_primary (
-      CORBA::Object_ptr ior
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr ior)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -96,15 +93,13 @@ public:
 
   /// Is there a primary available for <ior>
   virtual CORBA::Boolean is_primary_set (
-      CORBA::Object_ptr ior
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr ior)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual CORBA::Boolean remove_primary_tag (
-      CORBA::Object_ptr &iogr
-      ACE_ENV_ARG_DECL)
+      CORBA::Object_ptr &iogr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Reset the underlying tagged components held by the class
@@ -114,8 +109,7 @@ public:
   /// Extract the TagFTGroupTaggedComponent inside the <ior>
   CORBA::Boolean get_tagged_component (
       const CORBA::Object_ptr iogr,
-      FT::TagFTGroupTaggedComponent &ft_group
-      ACE_ENV_ARG_DECL) const
+      FT::TagFTGroupTaggedComponent &ft_group) const
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 3243d7ea5fd..cdc5d50b363 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -29,30 +29,24 @@ TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void)
 void
 TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
     TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *val
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *val)
 {
   bool retval =
     this->select_primary (r,
-                          val
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          val);
 
   if (retval)
     return;
 
   retval =
     this->select_secondary (r,
-                            val
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            val);
 
   if (retval == false)
     {
       // If we get here, we completely failed to find an endpoint selector
       // that we know how to use, so throw an exception.
-      ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
   return;
@@ -61,8 +55,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
 bool
 TAO_FT_Invocation_Endpoint_Selector::select_primary (
     TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *max_wait_time
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *max_wait_time)
 {
   // Grab the forwarded list
   TAO_MProfile *prof_list =
@@ -89,9 +82,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
       TAO_Profile *tmp = prof_list->get_profile (i);
 
       bool retval =
-        this->check_profile_for_primary (tmp
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        this->check_profile_for_primary (tmp);
 
       // Choose a non-primary
       if (retval == true && tmp != 0)
@@ -99,9 +90,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
           retval =
             this->try_connect (r,
                                tmp,
-                               max_wait_time
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (false);
+                               max_wait_time);
 
           if (retval == true)
             return true;
@@ -114,8 +103,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
 bool
 TAO_FT_Invocation_Endpoint_Selector::select_secondary (
     TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *max_wait_time
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *max_wait_time)
 {
   // Grab the forwarded list
   TAO_MProfile *prof_list =
@@ -141,9 +129,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_secondary (
         prof_list->get_profile (i);
 
       bool retval =
-        this->check_profile_for_primary (tmp
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        this->check_profile_for_primary (tmp);
 
       // Choose a non-primary
       if (retval == false && tmp != 0)
@@ -151,9 +137,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_secondary (
           retval =
             this->try_connect (r,
                                tmp,
-                               max_wait_time
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (false);
+                               max_wait_time);
 
           if (retval == true)
             return true;
@@ -167,8 +151,7 @@ bool
 TAO_FT_Invocation_Endpoint_Selector::try_connect (
     TAO::Profile_Transport_Resolver *r,
     TAO_Profile *profile,
-    ACE_Time_Value *max_wait_time
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *max_wait_time)
 {
   r->profile (profile);
 
@@ -184,9 +167,7 @@ TAO_FT_Invocation_Endpoint_Selector::try_connect (
 
       bool retval =
         r->try_connect (&desc,
-                        max_wait_time
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                        max_wait_time);
 
       // @@ Good place to handle timeouts.. We can omit timeouts and
       // go ahead looking for other things... There are some small
@@ -206,8 +187,7 @@ TAO_FT_Invocation_Endpoint_Selector::try_connect (
 
 bool
 TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
-    TAO_Profile *pfile
-    ACE_ENV_ARG_DECL_NOT_USED)
+    TAO_Profile *pfile)
 {
   if (pfile == 0)
     return false;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index ae3a473ea34..e9c849e40eb 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -59,32 +59,27 @@ public:
   /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h  for details of
   /// documentation.
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
-                                ACE_Time_Value *val
-                                ACE_ENV_ARG_DECL);
+                                ACE_Time_Value *val);
 
 protected:
   /// Select the primary and try connecting to it.
   bool select_primary (TAO::Profile_Transport_Resolver *r,
-                       ACE_Time_Value *val
-                       ACE_ENV_ARG_DECL);
+                       ACE_Time_Value *val);
 
   /// Select the secondary and try connecting to it. Returns true if
   /// successfull.
   bool select_secondary (TAO::Profile_Transport_Resolver *r,
-                         ACE_Time_Value *val
-                         ACE_ENV_ARG_DECL);
+                         ACE_Time_Value *val);
 
   /// Helper method that tries to establish connections with all the
   /// endpoints in the profile.
   bool try_connect (TAO::Profile_Transport_Resolver *r,
                     TAO_Profile *profile,
-                    ACE_Time_Value *max_wait_time
-                    ACE_ENV_ARG_DECL);
+                    ACE_Time_Value *max_wait_time);
 
   /// Helper method that checks whether the profile is a primary or
   /// not.
-  bool check_profile_for_primary (TAO_Profile *
-                                  ACE_ENV_ARG_DECL);
+  bool check_profile_for_primary (TAO_Profile *);
 
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 3e2a732dd62..05312105af0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -18,35 +18,26 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_FT_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_FT_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_policy_factories (info);
 
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_server_request_interceptors (info);
 
-  this->register_client_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_client_request_interceptors (info);
 }
 
 void
 TAO_FT_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register the FTCORBA policy factories.
@@ -64,7 +55,6 @@ TAO_FT_ORBInitializer::register_policy_factories (
                          TAO::VMCID,
                          ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   policy_factory = temp_factory;
 
@@ -74,21 +64,15 @@ TAO_FT_ORBInitializer::register_policy_factories (
 
   CORBA::PolicyType type = FT::REQUEST_DURATION_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policy_factory.in ());
 
   type = FT::HEARTBEAT_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policy_factory.in ());
 
   type = FT::HEARTBEAT_ENABLED_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policy_factory.in ());
 
   // Transfer ownership of the policy factory to the registry.
   (void) policy_factory._retn ();
@@ -96,8 +80,7 @@ TAO_FT_ORBInitializer::register_policy_factories (
 
 void
 TAO_FT_ORBInitializer::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -110,16 +93,13 @@ TAO_FT_ORBInitializer::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
 void
 TAO_FT_ORBInitializer::register_client_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr cri =
@@ -132,9 +112,7 @@ TAO_FT_ORBInitializer::register_client_request_interceptors (
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = cri;
 
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
index 8493a77ddac..e3c00a8dc2a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
@@ -40,31 +40,26 @@ class TAO_FT_ORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register FTCORBA policy factories.
   void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void register_client_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
index 74758912067..95419a3a405 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
@@ -15,21 +15,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_FT_PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &val
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &val)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
 
   if (type ==  FT::REQUEST_DURATION_POLICY)
-    return  TAO_FT_Request_Duration_Policy::create (val
-                                                    ACE_ENV_ARG_PARAMETER);
+    return  TAO_FT_Request_Duration_Policy::create (val);
   else if (type == FT::HEARTBEAT_POLICY)
-    return TAO_FT_Heart_Beat_Policy::create (val
-                                             ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Heart_Beat_Policy::create (val);
   else if (type == FT::HEARTBEAT_ENABLED_POLICY)
-    return TAO_FT_Heart_Beat_Enabled_Policy::create (val
-                                                     ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Heart_Beat_Enabled_Policy::create (val);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
index bb71603c077..849f149480e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
@@ -45,8 +45,7 @@ class TAO_FT_PolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const CORBA::Any &value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index c24aa921d17..053e1951e89 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -12,22 +12,21 @@ ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$")
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TimeBase::TimeT
-TAO_FT_Request_Duration_Policy::request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::request_duration_policy_value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_duration_;
 }
 
 CORBA::PolicyType
-TAO_FT_Request_Duration_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::REQUEST_DURATION_POLICY;
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
-                                        ACE_ENV_ARG_DECL)
+TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val)
 {
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
@@ -39,7 +38,6 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
                     TAO_FT_Request_Duration_Policy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
@@ -55,20 +53,19 @@ TAO_FT_Request_Duration_Policy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Request_Duration_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Request_Duration_Policy* tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_FT_Request_Duration_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -96,7 +93,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
 /*****************************************************************/
 
 FT::HeartbeatPolicyValue
-TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::HeartbeatPolicyValue val;
@@ -109,8 +106,7 @@ TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_US
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
-                                  ACE_ENV_ARG_DECL)
+TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 {
   FT::HeartbeatPolicyValue *value;
   if ((val >>= value) == 0)
@@ -124,14 +120,13 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
                                               value->heartbeat_timeout),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_POLICY;
@@ -139,14 +134,13 @@ TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Policy * tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
@@ -162,7 +156,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
 }
 
 void
-TAO_FT_Heart_Beat_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -190,8 +184,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
 /******************************************************************/
 
 CORBA::Boolean
-TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->heartbeat_enabled_value_;
@@ -199,8 +192,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
-                                          ACE_ENV_ARG_DECL)
+TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val)
 {
   CORBA::Boolean value;
 
@@ -213,13 +205,12 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
                     TAO_FT_Heart_Beat_Enabled_Policy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_ENABLED_POLICY;
@@ -227,14 +218,13 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Enabled_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Enabled_Policy * tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
@@ -251,7 +241,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
 
 
 void
-TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index 8fd5f3a1fc8..b4706c0b528 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -54,26 +54,22 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_FT_Request_Duration_Policy *clone (void) const;
 
   // = The FT::RequestDurationPolicy methods
-  virtual TimeBase::TimeT request_duration_policy_value (ACE_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::TimeT request_duration_policy_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
@@ -109,26 +105,22 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   /// Returns a copy of <this>.
   virtual TAO_FT_Heart_Beat_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL)
+  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
@@ -170,8 +162,7 @@ public:
   TAO_FT_Heart_Beat_Enabled_Policy (
       const TAO_FT_Heart_Beat_Enabled_Policy &rhs);
 
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
@@ -180,20 +171,16 @@ public:
   virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual CORBA::Boolean heartbeat_enabled_policy_value (
-      ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean heartbeat_enabled_policy_value ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 77b99f3035a..99537c5b495 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -16,31 +16,24 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_FT_ServerORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_FT_ServerORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_policy_factories (info);
 
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_server_request_interceptors (info);
 }
 
 void
 TAO_FT_ServerORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register the FTCORBA policy factories.
@@ -58,7 +51,6 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
                          TAO::VMCID,
                          ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   policy_factory = temp_factory;
 
@@ -69,16 +61,13 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
 
   CORBA::PolicyType type = FT::HEARTBEAT_ENABLED_POLICY;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policy_factory.in ());
 }
 
 
 void
 TAO_FT_ServerORBInitializer::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -91,9 +80,7 @@ TAO_FT_ServerORBInitializer::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
index 0e2711ed429..c328b8ccfd3 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h
@@ -39,26 +39,22 @@ class TAO_FT_ServerORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register FTCORBA policy factories.
   void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index e1c8fcea33b..3e208e650c7 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -17,15 +17,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_FT_ServerPolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &val
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &val)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
 
   if (type == FT::HEARTBEAT_ENABLED_POLICY)
-    return TAO_FT_Heart_Beat_Enabled_Policy::create (val
-                                                     ACE_ENV_ARG_PARAMETER);
+    return TAO_FT_Heart_Beat_Enabled_Policy::create (val);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
index 2ae22af9f48..b1f8c50e3fc 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
@@ -43,8 +43,7 @@ class TAO_FT_ServerPolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const CORBA::Any &value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index 25e079b7692..a5279d8f3a5 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -14,8 +14,7 @@ ACE_RCSID(FaultTolerance, FT_ServerPolicy_i, "$Id$")
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
-TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->heartbeat_enabled_value_;
@@ -23,8 +22,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
-                                          ACE_ENV_ARG_DECL)
+TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val)
 {
   CORBA::Boolean value;
 
@@ -37,13 +35,12 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
                     TAO_FT_Heart_Beat_Enabled_Policy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_ENABLED_POLICY;
@@ -51,14 +48,13 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Enabled_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Enabled_Policy * tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
@@ -74,7 +70,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
 }
 
 void
-TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index 6019cdc8f70..0fb86dbeb7a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -49,8 +49,7 @@ public:
   TAO_FT_Heart_Beat_Enabled_Policy (
       const TAO_FT_Heart_Beat_Enabled_Policy &rhs);
 
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA::Policy_ptr create (const CORBA::Any& val);
 
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
@@ -59,20 +58,16 @@ public:
   virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const;
 
   // = The FT::HeartBeatPolicy methods
-  virtual CORBA::Boolean heartbeat_enabled_policy_value (
-      ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean heartbeat_enabled_policy_value ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 64866cc36ed..f609b5c34e9 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -29,69 +29,58 @@ namespace TAO
   }
 
   char *
-  FT_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  FT_ServerRequest_Interceptor::name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup ("TAO_FT_ServerRequest_Interceptor");
   }
 
   void
-  FT_ServerRequest_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  FT_ServerRequest_Interceptor::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ServerRequest_Interceptor::receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
     // Check for the group version service context
-    ACE_TRY
+    try
       {
         IOP::ServiceContext_var sc =
-          ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
-        this->check_iogr_version (sc.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->check_iogr_version (sc.in ());
       }
-    ACE_CATCH (CORBA::BAD_PARAM, ex)
+    catch (const CORBA::BAD_PARAM&)
       {
         // No group version context, no problem just return.
         return;
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
-        ACE_RE_THROW;
+        throw;
       }
-    ACE_ENDTRY;
-    ACE_CHECK;
 
   }
 
   void
   FT_ServerRequest_Interceptor::receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
     // Check for the group version service context
     CORBA::String_var op =
-      ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      ri->operation ();
 
     if (ACE_OS::strcmp (op.in (),
                         "tao_update_object_group") == 0)
     {
-      this->update_iogr (ri
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->update_iogr (ri);
     }
 
     // Else the world is fine
@@ -99,16 +88,14 @@ namespace TAO
 
   void
   FT_ServerRequest_Interceptor::send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr
-      ACE_ENV_ARG_DECL_NOT_USED)
+      PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   FT_ServerRequest_Interceptor::send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr
-      ACE_ENV_ARG_DECL_NOT_USED)
+      PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
@@ -116,8 +103,7 @@ namespace TAO
 
   void
   FT_ServerRequest_Interceptor::send_other (
-      PortableInterceptor::ServerRequestInfo_ptr
-      ACE_ENV_ARG_DECL_NOT_USED)
+      PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
@@ -125,8 +111,7 @@ namespace TAO
 
   void
   FT_ServerRequest_Interceptor::check_iogr_version (
-      const IOP::ServiceContext &svc
-      ACE_ENV_ARG_DECL)
+      const IOP::ServiceContext &svc)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
@@ -143,8 +128,7 @@ namespace TAO
     FT::FTGroupVersionServiceContext fgvsc;
 
     if ((cdr >> fgvsc) == 0)
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
 
     if (fgvsc.object_group_ref_version >
@@ -160,18 +144,17 @@ namespace TAO
              this->object_group_ref_version_)
       {
         // Notice that this is a permanent forward.
-        ACE_THROW (PortableInterceptor::ForwardRequest (
-                   this->iogr_.in()));
+        throw PortableInterceptor::ForwardRequest (this->iogr_.in());
       }
     else if ((fgvsc.object_group_ref_version ==
              this->object_group_ref_version_) &&
              !this->is_primary_)
       {
-        ACE_THROW (CORBA::TRANSIENT (
-                       CORBA::SystemException::_tao_minor_code (
-                       TAO::VMCID,
-                       EINVAL),
-                       CORBA::COMPLETED_NO));
+        throw CORBA::TRANSIENT (
+          CORBA::SystemException::_tao_minor_code (
+            TAO::VMCID,
+            EINVAL),
+          CORBA::COMPLETED_NO);
       }
     else
       {
@@ -181,15 +164,13 @@ namespace TAO
 
   void
   FT_ServerRequest_Interceptor::update_iogr (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (this->orb_.in () == 0)
       {
         CORBA::String_var orb_id =
-          ri->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          ri->orb_id ();
 
         int argc = 0;
         char **argv = 0;
@@ -197,20 +178,17 @@ namespace TAO
         this->orb_ =
           CORBA::ORB_init (argc,
                            argv,
-                           orb_id.in ()
-                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                           orb_id.in ());
       }
 
     Dynamic::ParameterList_var param =
-      ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      ri->arguments ();
 
     // this is only for checking the tao_update_object_group operation
     // which accepts three parameters, i.e.,an iogr as a string,
     // a version object and a boolean.
     if (param->length () != 3 )
-      ACE_THROW (CORBA::TRANSIENT ());
+      throw CORBA::TRANSIENT ();
 
     const char *str = 0;
 
@@ -221,16 +199,14 @@ namespace TAO
     CORBA::String_var obj (str);
 
     this->iogr_ =
-      this->orb_->string_to_object (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+      this->orb_->string_to_object (obj.in ());
 
-    ACE_CHECK;
 
     // @@ This exception is a hack to let the RM know that we have
     // received and updated the IOGR. We will add a special minor code
     // soon.
     if (this->iogr_.in ())
-      ACE_THROW (CORBA::TRANSACTION_ROLLEDBACK ());
+      throw CORBA::TRANSACTION_ROLLEDBACK ();
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
index 78c188d597d..9e5e2b6e869 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h
@@ -69,51 +69,44 @@ namespace TAO
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+    virtual char * name (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
     virtual void receive_request (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
     virtual void send_reply (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void send_exception (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
     virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
     //@}
   private:
 
-    void check_iogr_version (const IOP::ServiceContext &svc
-                             ACE_ENV_ARG_DECL)
+    void check_iogr_version (const IOP::ServiceContext &svc)
       ACE_THROW_SPEC ((CORBA::SystemException,
            PortableInterceptor::ForwardRequest));
 
     void update_iogr (
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 36813b33d7d..2ca544403fe 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -37,10 +37,10 @@ TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks (void)
   delete this->profile_lock_;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_FT_Service_Callbacks::select_profile (const TAO_MProfile &mprofile,
     TAO_Profile *&pfile)
-{  
+{
   CORBA::ULong sz =
     mprofile.size ();
 
@@ -270,8 +270,7 @@ TAO_FT_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_pt
 TAO::Invocation_Status
 TAO_FT_Service_Callbacks::raise_comm_failure (
     IOP::ServiceContextList &context_list,
-    TAO_Profile *profile
-    ACE_ENV_ARG_DECL)
+    TAO_Profile *profile)
 {
   if (this->restart_policy_check (context_list,
                                   profile))
@@ -290,8 +289,7 @@ TAO_FT_Service_Callbacks::raise_comm_failure (
 TAO::Invocation_Status
 TAO_FT_Service_Callbacks::raise_transient_failure (
     IOP::ServiceContextList &service,
-    TAO_Profile *profile
-    ACE_ENV_ARG_DECL_NOT_USED)
+    TAO_Profile *profile)
 {
   if (this->restart_policy_check (service,
                                   profile))
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index b2f0403176f..de694bb723c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -77,15 +77,13 @@ public:
   /// reinvocaton.
   virtual TAO::Invocation_Status raise_comm_failure (
       IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
+      TAO_Profile *profile);
 
   /// Check whether we need to raise an exception or go for a
   /// reinvocaton.
   virtual TAO::Invocation_Status raise_transient_failure (
       IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
+      TAO_Profile *profile);
 
   static TimeBase::TimeT now (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
index e4ee1d43f28..3c74fec8208 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
@@ -16,20 +16,17 @@ FTRT_ClientORB_Initializer::FTRT_ClientORB_Initializer (int transaction_depth)
 
 void
 FTRT_ClientORB_Initializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTRT_ClientORB_Initializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  info->add_client_request_interceptor (client_interceptor_.in()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_client_request_interceptor (client_interceptor_.in());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
index 7bfd0791eb1..355ff4bb270 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
@@ -42,12 +42,10 @@ public:
   /// Priority mapping types
   FTRT_ClientORB_Initializer (int transaction_depth);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
index 1cc5d2fd2de..054fe0838e3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp
@@ -29,35 +29,33 @@ FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor (void)
 }
 
 char *
-FTRT_ClientORB_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FTRT_ClientORB_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-FTRT_ClientORB_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FTRT_ClientORB_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTRT_ClientORB_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTRT_ClientORB_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   ACE_TRACE("FTRT_ClientORB_Interceptor::send_request");
-  ACE_TRY
+  try
   {
     // Add FT_REQUEST context
     IOP::ServiceContext sc;
@@ -89,38 +87,30 @@ FTRT_ClientORB_Interceptor::send_request (
       }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-    ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ri->add_request_service_context (sc, 0);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     // Not much can be done anyway. Just keep quiet
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 FTRT_ClientORB_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRACE("FTRT_ClientORB_Interceptor::receive_reply");
 
 
   IOP::ServiceContext_var service_context;
-  ACE_TRY {
+  try{
     service_context =
-      ri->get_reply_service_context(FTRT::FT_FORWARD
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      ri->get_reply_service_context(FTRT::FT_FORWARD);
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception&){
     return;
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
 
   const char * buf =
@@ -134,7 +124,7 @@ FTRT_ClientORB_Interceptor::receive_reply (
 
   if (cdr >> obj) {
     // update the target
-     CORBA::Object_var target = ri->target(ACE_ENV_SINGLE_ARG_PARAMETER);
+     CORBA::Object_var target = ri->target();
      target->_stubobj ()->base_profiles ( obj->_stubobj()->base_profiles() );
      ACE_DEBUG((LM_DEBUG, "target object updated\n"));
   }
@@ -142,8 +132,7 @@ FTRT_ClientORB_Interceptor::receive_reply (
 
 void
 FTRT_ClientORB_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -151,8 +140,7 @@ FTRT_ClientORB_Interceptor::receive_other (
 
 void
 FTRT_ClientORB_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
index 81512859796..304a186c184 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
@@ -47,32 +47,27 @@ public:
   virtual ~FTRT_ClientORB_Interceptor ();
 
   /// Canonical name of the interceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index adac1b323a4..5dd426e4846 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -52,7 +52,7 @@ namespace TAO_FTRT {
 
 
       // Register the ORB initializer.
-      ACE_TRY_NEW_ENV
+      try
       {
         PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
           PortableInterceptor::ORBInitializer::_nil ();
@@ -66,21 +66,16 @@ namespace TAO_FTRT {
           TAO::VMCID,
           ENOMEM),
           CORBA::COMPLETED_NO));
-        ACE_TRY_CHECK;
         orb_initializer = temp_orb_initializer;
 
-        PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        PortableInterceptor::register_orb_initializer (orb_initializer.in ());
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-          "Unexpected exception caught while "
-          "initializing the TransactionDepth");
+        ex._tao_print_exception (
+          "Unexpected exception caught while ""initializing the TransactionDepth");
         return 1;
       }
-      ACE_ENDTRY;
 
       return 0;
   }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
index 0bae38d051d..f6bdc76f5e0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp
@@ -48,37 +48,28 @@ int  AMI_Primary_Replication_Strategy::release (void)
 
 int AMI_Primary_Replication_Strategy::svc()
 {
-  ACE_TRY_NEW_ENV {
+  try{
     int argc = 0;
     char** argv = 0;
     orb_ = CORBA::ORB_init (argc, argv);
-    ACE_TRY_CHECK;
 
-    root_poa_ =  resolve_init<PortableServer::POA>(orb_.in(), "RootPOA"
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    root_poa_ =  resolve_init<PortableServer::POA>(orb_.in(), "RootPOA");
 
     // create POAManager
-    mgr_ = root_poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    mgr_ = root_poa_->the_POAManager();
 
 
-    mgr_->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    mgr_->activate();
 
     PortableServer::IdUniquenessPolicy_var id_uniqueness_policy =
-      root_poa_->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK
+      root_poa_->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID);
 
     TAO::Utils::PolicyList_Destroyer policy_list(3);
     policy_list.length(1);
     policy_list[0] = PortableServer::IdUniquenessPolicy::_duplicate(
         id_uniqueness_policy.in()
       );
-    poa_ = create_persistent_poa(root_poa_, mgr_, "AMI_Update", policy_list
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    poa_ = create_persistent_poa(root_poa_, mgr_, "AMI_Update", policy_list);
 
     id_uniqueness_policy->destroy();
 
@@ -89,12 +80,11 @@ int AMI_Primary_Replication_Strategy::svc()
     }
     orb_->destroy();
   }
-  ACE_CATCHANY {
-    ACE_PRINT_EXCEPTION(ex, "AMI_Primary_Replication_Strategy::svc");
+  catch (const CORBA::Exception& ex){
+    ex._tao_print_exception ("AMI_Primary_Replication_Strategy::svc");
     running_ = false;
     return -1;
   }
-  ACE_ENDTRY;
   running_ = false;
   return 0;
 }
@@ -103,16 +93,14 @@ void
 AMI_Primary_Replication_Strategy::replicate_request(
   const FTRT::State& state,
   RollbackOperation rollback,
-  const FtRtecEventChannelAdmin::ObjectId& oid
-  ACE_ENV_ARG_DECL)
+  const FtRtecEventChannelAdmin::ObjectId& oid)
 {
    ACE_Auto_Event event;
    Update_Manager* manager = 0;
    bool success = false;
 
     FTRT::TransactionDepth transaction_depth =
-      Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER);
-   ACE_CHECK;
+      Request_Context_Repository().get_transaction_depth();
 
    const FtRtecEventChannelAdmin::EventChannelList& backups =
      GroupInfoPublisher::instance()->backups();
@@ -121,7 +109,7 @@ AMI_Primary_Replication_Strategy::replicate_request(
 
    if ((size_t)transaction_depth > num_backups) {
      TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n");
-     ACE_THROW(FTRT::TransactionDepthTooHigh());
+     throw FTRT::TransactionDepthTooHigh();
    }
 
    ACE_NEW_THROW_EX(manager,
@@ -129,54 +117,46 @@ AMI_Primary_Replication_Strategy::replicate_request(
                     CORBA::NO_MEMORY());
 
 
-   Request_Context_Repository().set_transaction_depth(0 ACE_ENV_ARG_PARAMETER);
-   ACE_CHECK;
+   Request_Context_Repository().set_transaction_depth(0);
 
    for (size_t i = 0; i < num_backups; ++i)  {
       PortableServer::ObjectId oid;
-      ACE_TRY_EX(block1) {
-          FTRT::AMI_UpdateableHandler_ptr handler = handler_.activate(manager, i, oid
-                                                                   ACE_ENV_ARG_PARAMETER);
+      try{
+          FTRT::AMI_UpdateableHandler_ptr handler = handler_.activate(manager, i, oid);
 
-          ACE_TRY_CHECK_EX(block1);
           FtRtecEventChannelAdmin::EventChannel_ptr obj = backups[i];
           // send set_update request to all the backup replicas
 
-          obj->sendc_set_update(handler, state
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(block1);
+          obj->sendc_set_update(handler, state);
        }
-       ACE_CATCHANY {
-         ACE_PRINT_EXCEPTION(ex, "AMI_Primary_Replication_Strategy::replicate_request : ");
+       catch (const CORBA::Exception& ex){
+         ex._tao_print_exception (
+           "AMI_Primary_Replication_Strategy::replicate_request : ");
          manager->handle_exception(i);
          if (oid.length())
            poa_->deactivate_object(oid);
        }
-       ACE_ENDTRY;
    }
    // wait until the first transaction_depth replicas replied.
    event.wait();
 
    if (!success) { // replication failed, transaction depth too high
      for (size_t i =0; i < num_backups; ++i)  {
-       ACE_TRY_EX(block2) {
-         (backups[i]->*rollback)(oid ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK_EX(block2);
+       try{
+         (backups[i]->*rollback)(oid);
        }
-       ACE_CATCHALL {
+       catch (...){
        }
-       ACE_ENDTRY;
      }
      TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n");
-     ACE_THROW(FTRT::TransactionDepthTooHigh());
+     throw FTRT::TransactionDepthTooHigh();
    }
 
 }
 
 void
 AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
-                                             CORBA::ULong object_group_ref_version
-                                             ACE_ENV_ARG_DECL)
+                                             CORBA::ULong object_group_ref_version)
 {
   ACE_Auto_Event event;
   const FtRtecEventChannelAdmin::EventChannelList& backups =
@@ -187,34 +167,29 @@ AMI_Primary_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
   // The extra one is to prevent the event been signaled prematurely.
 
   PortableServer::ObjectId_var oid =
-    root_poa_->activate_object(&add_member_handler ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa_->activate_object(&add_member_handler);
 
   TAO::Utils::Implicit_Deactivator deactivator(&add_member_handler);
 
   CORBA::Object_var obj =
-    root_poa_->id_to_reference(oid.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa_->id_to_reference(oid.in());
 
   FTRT::AMI_ObjectGroupManagerHandler_var handler =
-    FTRT::AMI_ObjectGroupManagerHandler::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    FTRT::AMI_ObjectGroupManagerHandler::_narrow(obj.in());
 
   for (unsigned i = 0; i < num_backups; ++i) {
-    ACE_TRY {
+    try{
       backups[i]->sendc_add_member(handler.in(),
                                    info,
-                                   object_group_ref_version
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   object_group_ref_version);
     }
-    ACE_CATCHALL {
-      add_member_handler.add_member_excep(0 ACE_ENV_ARG_PARAMETER);
+    catch (...){
+      add_member_handler.add_member_excep(0);
     }
-    ACE_ENDTRY;
   }
   // decrement the number of members so the event can be signaled once
   // all replys have been received.
-  add_member_handler.add_member_excep(0 ACE_ENV_ARG_PARAMETER);
+  add_member_handler.add_member_excep(0);
 
   event.wait();
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
index 24d44799505..2d73e64e0bf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
@@ -41,11 +41,9 @@ public:
   virtual ~AMI_Primary_Replication_Strategy();
   virtual void replicate_request(const FTRT::State& state,
                                    RollbackOperation rollback,
-                                   const FtRtecEventChannelAdmin::ObjectId& oid
-                                   ACE_ENV_ARG_DECL);
+                                   const FtRtecEventChannelAdmin::ObjectId& oid);
   virtual void add_member(const FTRT::ManagerInfo & info,
-                          CORBA::ULong object_group_ref_version
-                          ACE_ENV_ARG_DECL);
+                          CORBA::ULong object_group_ref_version);
   virtual int  acquire_read (void);
   virtual int  acquire_write (void);
   virtual int  release (void);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
index b4073479419..d8d4a8ceef0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp
@@ -25,8 +25,7 @@ void
 AMI_Replication_Strategy::replicate_request(
   const FTRT::State& state,
   RollbackOperation rollback,
-  const FtRtecEventChannelAdmin::ObjectId& oid
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const FtRtecEventChannelAdmin::ObjectId& oid)
 {
   ACE_UNUSED_ARG(state);
   ACE_UNUSED_ARG(rollback);
@@ -35,8 +34,7 @@ AMI_Replication_Strategy::replicate_request(
 
 void
 AMI_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
-                                     CORBA::ULong object_group_ref_version
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     CORBA::ULong object_group_ref_version)
 {
   ACE_UNUSED_ARG(info);
   ACE_UNUSED_ARG(object_group_ref_version);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
index 8c25f96305d..866f1523798 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
@@ -40,11 +40,9 @@ public:
   ~AMI_Replication_Strategy();
   virtual void replicate_request(const FTRT::State& state,
     RollbackOperation rollback,
-    const FtRtecEventChannelAdmin::ObjectId& oid
-    ACE_ENV_ARG_DECL);
+    const FtRtecEventChannelAdmin::ObjectId& oid);
   virtual void add_member(const FTRT::ManagerInfo & info,
-                          CORBA::ULong object_group_ref_version
-                          ACE_ENV_ARG_DECL);
+                          CORBA::ULong object_group_ref_version);
   virtual Replication_Strategy* make_primary_strategy();
 
   virtual int  acquire_read (void);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
index 50a4a5f4dff..69f5e906f1d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -27,10 +27,9 @@ Basic_Replication_Strategy::~Basic_Replication_Strategy()
 }
 
 void
-Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL)
+Basic_Replication_Strategy::check_validity(void)
 {
-    FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number();
 
     TAO_FTRTEC::Log(1 , "check_validity : sequence no = %d\n", sequence_num_);
 
@@ -46,29 +45,25 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL)
       FTRT::OutOfSequence exception;
       exception.current = this->sequence_num_;
       TAO_FTRTEC::Log(3, "Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n", this->sequence_num_);
-      ACE_THROW(FTRT::OutOfSequence(exception));
+      throw FTRT::OutOfSequence(exception);
     }
     else
       this->sequence_num_++;
 }
 
 void twoway_set_update(FtRtecEventChannelAdmin::EventChannel_var successor,
-                       const FTRT::State& state
-                       ACE_ENV_ARG_DECL)
+                       const FTRT::State& state)
 {
   bool finished = true;
   do {
-    ACE_TRY {
-      successor->set_update(state ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    try{
+      successor->set_update(state);
     }
-    ACE_CATCH(CORBA::COMM_FAILURE, ex) {
+    catch (const CORBA::COMM_FAILURE& ex){
       if (ex.minor() == 6)   finished = false;
       else
-        ACE_RE_THROW;
+        throw;
     }
-    ACE_ENDTRY;
-    ACE_CHECK;
   } while(!finished);
 }
 
@@ -76,15 +71,13 @@ void
 Basic_Replication_Strategy::replicate_request(
   const FTRT::State& state,
   RollbackOperation rollback,
-  const FtRtecEventChannelAdmin::ObjectId& oid
-  ACE_ENV_ARG_DECL)
+  const FtRtecEventChannelAdmin::ObjectId& oid)
 {
   ACE_UNUSED_ARG(rollback);
   ACE_UNUSED_ARG(oid);
 
   FTRT::TransactionDepth transaction_depth =
-    Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    Request_Context_Repository().get_transaction_depth();
 
   GroupInfoPublisherBase * info_publisher = GroupInfoPublisher::instance();
   FtRtecEventChannelAdmin::EventChannel_var successor = info_publisher->successor();
@@ -93,50 +86,41 @@ Basic_Replication_Strategy::replicate_request(
       this->sequence_num_++;
 
     TAO_FTRTEC::Log(1, "replicate_request : sequence no = %d\n", sequence_num_);
-    Request_Context_Repository().set_sequence_number(sequence_num_
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Request_Context_Repository().set_sequence_number(sequence_num_);
 
-    Request_Context_Repository().set_transaction_depth(transaction_depth-1 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Request_Context_Repository().set_transaction_depth(transaction_depth-1);
 
     if (transaction_depth > 1) {
-      twoway_set_update(successor, state ACE_ENV_ARG_PARAMETER);
+      twoway_set_update(successor, state);
     }
     else {
-      ACE_TRY_EX(ONEWAY_SET_UPDATE) {
-        successor->oneway_set_update(state ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX(ONEWAY_SET_UPDATE);
+      try{
+        successor->oneway_set_update(state);
       }
-      ACE_CATCHANY {
+      catch (const CORBA::Exception&){
       }
-      ACE_ENDTRY;
     }
   }
   else if (transaction_depth > 1) {
     TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n");
-    ACE_THROW(FTRT::TransactionDepthTooHigh());
+    throw FTRT::TransactionDepthTooHigh();
   }
 }
 
 void
 Basic_Replication_Strategy::add_member(const FTRT::ManagerInfo & info,
-                                       CORBA::ULong object_group_ref_version
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ULong object_group_ref_version)
 {
   FtRtecEventChannelAdmin::EventChannel_var successor = GroupInfoPublisher::instance()->successor();
   bool finished = true;
   do {
-    ACE_TRY {
-      successor->add_member(info, object_group_ref_version ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    try{
+      successor->add_member(info, object_group_ref_version);
     }
-    ACE_CATCH(CORBA::COMM_FAILURE, ex) {
+    catch (const CORBA::COMM_FAILURE& ex){
       if (ex.minor() == 6) finished = false;
-      else ACE_RE_THROW;
+      else throw;
     }
-    ACE_ENDTRY;
-    ACE_CHECK;
   } while (!finished);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
index 50b18dd95ee..0a458fe1123 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
@@ -35,15 +35,13 @@ public:
   Basic_Replication_Strategy(bool mt);
   ~Basic_Replication_Strategy();
 
-  virtual void check_validity(ACE_ENV_SINGLE_ARG_DECL);
+  virtual void check_validity(void);
 
   virtual void replicate_request(const FTRT::State& state,
     RollbackOperation rollback,
-    const FtRtecEventChannelAdmin::ObjectId& oid
-    ACE_ENV_ARG_DECL);
+    const FtRtecEventChannelAdmin::ObjectId& oid);
   virtual void add_member(const FTRT::ManagerInfo & info,
-                          CORBA::ULong object_group_ref_version
-                          ACE_ENV_ARG_DECL);
+                          CORBA::ULong object_group_ref_version);
 
   virtual int  acquire_read (void);
   virtual int  acquire_write (void);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index 14ec7a5c533..83d7e6c3079 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -29,23 +29,21 @@ TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void)
 
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_FTEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG,"obtain_push_supplier\n" ));
-  return obtain_proxy(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return obtain_proxy();
 }
 
 void
 TAO_FTEC_ConsumerAdmin::disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj)
 {
-  ACE_TRY_NEW_ENV {
-    obj->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    obj->disconnect_push_supplier();
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
index 042172fc555..dbaf815d55e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
@@ -61,7 +61,7 @@ public:
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_supplier (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   void disconnect(RtecEventChannelAdmin::ProxyPushSupplier_ptr obj);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
index a2e2b7a29cd..67e075d97e0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -38,8 +38,7 @@ TAO_FTEC_Event_Channel::~TAO_FTEC_Event_Channel()
 void setup_object_group(TAO_FTEC_Event_Channel* es,
                        CosNaming::NamingContext_ptr naming_context,
                        TAO_FTEC_Event_Channel::MEMBERSHIP membership,
-                       FtRtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL)
+                       FtRtecEventChannelAdmin::EventChannel_ptr ec)
 {
     if (membership != TAO_FTEC_Event_Channel::UNSPECIFIED) {// register to naming service
       FTRT::ManagerInfoList member_list;
@@ -48,28 +47,23 @@ void setup_object_group(TAO_FTEC_Event_Channel* es,
       member_list[0].ior = FTRT::ObjectGroupManager::_duplicate(ec);
 
       if (membership == TAO_FTEC_Event_Channel::PRIMARY)
-        es->create_group(member_list, 0
-            ACE_ENV_ARG_PARAMETER);
+        es->create_group(member_list, 0);
 
       else { // BACKUP
         FtRtecEventChannelAdmin::EventChannel_var primary =
           resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context,
-            FTRTEC::Identification_Service::instance()->name()
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            FTRTEC::Identification_Service::instance()->name());
 
         ACE_DEBUG((LM_DEBUG, "Got Primary address from Naming Service\n"));
 
-        primary->join_group(member_list[0] ACE_ENV_ARG_PARAMETER);
+        primary->join_group(member_list[0]);
       }
-      ACE_CHECK;
     }
 }
 
 
 FtRtecEventChannelAdmin::EventChannel_ptr
-TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
-                                 ACE_ENV_ARG_DECL)
+TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership)
 {
     FTRTEC::Fault_Detector_Loader* detector_loader =
       ACE_Dynamic_Service<FTRTEC::Fault_Detector_Loader>::instance("FTRTEC_Fault_Detector");
@@ -81,8 +75,7 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
 
     // initialize naming_contex
     CosNaming::NamingContext_var naming_context
-      = resolve_init<CosNaming::NamingContext>(orb_.in(), "NameService"
-                                                ACE_ENV_ARG_PARAMETER);
+      = resolve_init<CosNaming::NamingContext>(orb_.in(), "NameService");
     // initialize group info publisher
     GroupInfoPublisher::instance()->set_naming_context(naming_context);
 
@@ -94,14 +87,12 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
     Request_Context_Repository().init(orb_.in());
 
     // get POAManager
-    PortableServer::POAManager_var mgr = poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    PortableServer::POAManager_var mgr = poa_->the_POAManager();
 
     TAO::Utils::PolicyList_Destroyer policy_list(2);
 
     persistent_poa_ =
-      create_persistent_poa(poa_, mgr, "FTEC_Persistant_POA", policy_list ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      create_persistent_poa(poa_, mgr, "FTEC_Persistant_POA", policy_list);
 
     // Activate the Event channel implementation
 
@@ -127,21 +118,16 @@ TAO_FTEC_Event_Channel::activate(TAO_FTEC_Event_Channel::MEMBERSHIP membership
 
     ec->activate_object(orb_,
                         supplier_admin_object_id,
-                        consumer_admin_object_id
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+                        consumer_admin_object_id);
 
     FtRtecEventChannelAdmin::EventChannel_var result;
-    activate_object_with_id(result.out(), persistent_poa_.in(), this, object_id
-                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    activate_object_with_id(result.out(), persistent_poa_.in(), this, object_id);
 
 
     setup_object_group(this,
                        naming_context.in(),
                        membership,
-                       result.in()
-                       ACE_ENV_ARG_PARAMETER);
+                       result.in());
   return result._retn();
 }
 
@@ -153,7 +139,6 @@ void TAO_FTEC_Event_Channel::set_listener(TAO_FTEC_Become_Primary_Listener* list
 
 void TAO_FTEC_Event_Channel::set_update (
         const FTRT::State & s
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -161,59 +146,56 @@ void TAO_FTEC_Event_Channel::set_update (
         , FTRT::OutOfSequence
       ))
 {
-    ec_impl_->set_update(s ACE_ENV_ARG_PARAMETER);
+    ec_impl_->set_update(s);
 }
 
 void TAO_FTEC_Event_Channel::oneway_set_update (
         const FTRT::State & s
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-    ec_impl_->set_update(s ACE_ENV_ARG_PARAMETER);
+    ec_impl_->set_update(s);
 }
 
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_FTEC_Event_Channel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel::for_consumers (void)
         ACE_THROW_SPEC ((CORBA::SystemException))
 {
-    return ec_impl_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
+    return ec_impl_->for_consumers();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_FTEC_Event_Channel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel::for_suppliers (void)
         ACE_THROW_SPEC ((CORBA::SystemException))
 {
-    return ec_impl_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
+    return ec_impl_->for_suppliers();
 }
 
 
 void
-TAO_FTEC_Event_Channel::set_state (const FTRT::State & s ACE_ENV_ARG_DECL)
+TAO_FTEC_Event_Channel::set_state (const FTRT::State & s)
   ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState))
 {
   ACE_DEBUG((LM_DEBUG, "TAO_FTEC_Event_Channel::set_state\n"));
-  ec_impl_->set_state(s ACE_ENV_ARG_PARAMETER);
+  ec_impl_->set_state(s);
 }
 
 void
-TAO_FTEC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Fault_Detector::instance())
     Fault_Detector::instance()->stop();
 
-  ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec_impl_->destroy ();
   this->orb_->shutdown ();
 }
 
 RtecEventChannelAdmin::Observer_Handle
-TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr
-                                ACE_ENV_ARG_DECL)
+TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -223,12 +205,11 @@ TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr
   /// throw an exception for the moment
   ACE_THROW_RETURN(RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(), 0);
 
-  //return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER);
+  //return this->ec_impl_->append_observer (observer);
 }
 
 void
-TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle
-                                ACE_ENV_ARG_DECL)
+TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -236,9 +217,9 @@ TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle
 {
   /// we have yet to implement the replication of observers
   /// throw an exception for the moment
-  ACE_THROW(RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
+  throw RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER();
 
-  //ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
+  //ec_impl_->remove_observer (handle);
 }
 
 
@@ -247,78 +228,71 @@ CORBA::Boolean
 TAO_FTEC_Event_Channel::start (
         FTRT::FaultListener_ptr listener,
         FTRT::Location_out location
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  return ec_impl_->start(listener, location ACE_ENV_ARG_PARAMETER);
+  return ec_impl_->start(listener, location);
 }
 
 void
 TAO_FTEC_Event_Channel::create_group (
         const FTRT::ManagerInfoList & info_list,
         CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       , FTRT::PredecessorUnreachable
       ))
 {
-  ec_impl_->create_group(info_list, object_group_ref_version ACE_ENV_ARG_PARAMETER);
+  ec_impl_->create_group(info_list, object_group_ref_version);
 }
 
 void
 TAO_FTEC_Event_Channel::join_group (
         const FTRT::ManagerInfo & info
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->join_group(info ACE_ENV_ARG_PARAMETER);
+  ec_impl_->join_group(info);
 }
 
 void
 TAO_FTEC_Event_Channel::add_member (
         const FTRT::ManagerInfo & info,
         CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->add_member(info, object_group_ref_version ACE_ENV_ARG_PARAMETER);
+  ec_impl_->add_member(info, object_group_ref_version);
 }
 
 void
 TAO_FTEC_Event_Channel::remove_member (
         const FTRT::Location & crashed_location,
-        CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL)
+        CORBA::ULong object_group_ref_version)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
   ec_impl_->remove_member(crashed_location,
-                            object_group_ref_version
-                ACE_ENV_ARG_PARAMETER);
+                            object_group_ref_version);
 }
 
 void
 TAO_FTEC_Event_Channel::replica_crashed (
         const FTRT::Location & location
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->replica_crashed(location ACE_ENV_ARG_PARAMETER);
+  ec_impl_->replica_crashed(location);
 }
 
 
@@ -328,15 +302,13 @@ TAO_FTEC_Event_Channel::replica_crashed (
 TAO_FTEC_Event_Channel::connect_push_consumer (
         RtecEventComm::PushConsumer_ptr push_consumer,
         const RtecEventChannelAdmin::ConsumerQOS & qos
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , RtecEventChannelAdmin::TypeError
       ))
 {
-  return ec_impl_->connect_push_consumer(push_consumer, qos
-                                         ACE_ENV_ARG_PARAMETER);
+  return ec_impl_->connect_push_consumer(push_consumer, qos);
 }
 
 
@@ -344,76 +316,65 @@ TAO_FTEC_Event_Channel::connect_push_consumer (
 TAO_FTEC_Event_Channel::connect_push_supplier (
         RtecEventComm::PushSupplier_ptr push_supplier,
         const RtecEventChannelAdmin::SupplierQOS & qos
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  return ec_impl_->connect_push_supplier(push_supplier, qos
-                                         ACE_ENV_ARG_PARAMETER);
+  return ec_impl_->connect_push_supplier(push_supplier, qos);
 
 }
 
 void
 TAO_FTEC_Event_Channel::disconnect_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->disconnect_push_supplier(oid
-                                     ACE_ENV_ARG_PARAMETER);
+  ec_impl_->disconnect_push_supplier(oid);
 }
 
 void
 TAO_FTEC_Event_Channel::disconnect_push_consumer (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  ec_impl_->disconnect_push_consumer(oid
-                                     ACE_ENV_ARG_PARAMETER);
+  ec_impl_->disconnect_push_consumer(oid);
 }
 
 void
 TAO_FTEC_Event_Channel::suspend_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , FtRtecEventComm::InvalidObjectID
       ))
 {
-  ec_impl_->suspend_push_supplier(oid
-                        ACE_ENV_ARG_PARAMETER);
+  ec_impl_->suspend_push_supplier(oid);
 }
 
 void
 TAO_FTEC_Event_Channel::resume_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , FtRtecEventComm::InvalidObjectID
       ))
 {
-  ec_impl_->resume_push_supplier(oid
-                                 ACE_ENV_ARG_PARAMETER);
+  ec_impl_->resume_push_supplier(oid);
 }
 
 void
 TAO_FTEC_Event_Channel::push (
         const FtRtecEventChannelAdmin::ObjectId & oid,
         const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -421,8 +382,7 @@ TAO_FTEC_Event_Channel::push (
       ))
 {
   ec_impl_->push(oid,
-                 data
-                 ACE_ENV_ARG_PARAMETER);
+                 data);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index 397aa0af43e..a82b2fddcc8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -52,7 +52,7 @@ public:
    *
    */
   FtRtecEventChannelAdmin::EventChannel_ptr
-    activate(MEMBERSHIP membership ACE_ENV_ARG_DECL);
+    activate(MEMBERSHIP membership);
 
   /**
    * Registers a listener to accept the notication when this object
@@ -64,22 +64,22 @@ public:
   /// RtecEventChannelAdmin::EventChannel Interface
 
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+    for_consumers (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+    for_suppliers (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer ACE_ENV_ARG_DECL)
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
       RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
 
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle ACE_ENV_ARG_DECL)
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle)
     ACE_THROW_SPEC ((CORBA::SystemException,RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
       RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
 
@@ -87,89 +87,76 @@ public:
 
       virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer (
         RtecEventComm::PushConsumer_ptr push_consumer,
-        const RtecEventChannelAdmin::ConsumerQOS & qos
-        ACE_ENV_ARG_DECL)
+        const RtecEventChannelAdmin::ConsumerQOS & qos)
       ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::TypeError)) ;
 
 
     virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier (
         RtecEventComm::PushSupplier_ptr push_supplier,
-        const RtecEventChannelAdmin::SupplierQOS & qos
-        ACE_ENV_ARG_DECL)
+        const RtecEventChannelAdmin::SupplierQOS & qos)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     virtual void disconnect_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL)
+        const FtRtecEventChannelAdmin::ObjectId & oid)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void disconnect_push_consumer (
-        const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL)
+        const FtRtecEventChannelAdmin::ObjectId & oid)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     virtual void suspend_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL)
+        const FtRtecEventChannelAdmin::ObjectId & oid)
       ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID));
 
     virtual void resume_push_supplier (
-        const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL)
+        const FtRtecEventChannelAdmin::ObjectId & oid)
       ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID)) ;
 
     virtual void push (
         const FtRtecEventChannelAdmin::ObjectId & oid,
-        const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL)
+        const RtecEventComm::EventSet & data)
       ACE_THROW_SPEC ((CORBA::SystemException, FtRtecEventComm::InvalidObjectID));
 
   /// FTRT::GroupManager Interfaces
   /// These are used for inter-replica communications
 
   void set_state (
-    const FTRT::State & s ACE_ENV_ARG_DECL)
+    const FTRT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidState));
 
-  virtual void set_update (const FTRT::State & s ACE_ENV_ARG_DECL)
+  virtual void set_update (const FTRT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate, FTRT::OutOfSequence));
 
-  virtual void oneway_set_update (const FTRT::State & s ACE_ENV_ARG_DECL)
+  virtual void oneway_set_update (const FTRT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   virtual CORBA::Boolean start (
         FTRT::FaultListener_ptr listener,
-        FTRT::Location_out cur
-        ACE_ENV_ARG_DECL)
+        FTRT::Location_out cur)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void create_group (
         const FTRT::ManagerInfoList & info_list,
-        CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL)
+        CORBA::ULong object_group_ref_version)
       ACE_THROW_SPEC ((CORBA::SystemException, FTRT::PredecessorUnreachable)) ;
 
     virtual void join_group (
         const FTRT::ManagerInfo & info
-        ACE_ENV_ARG_DECL
       )ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     virtual void add_member (
         const FTRT::ManagerInfo & info,
-        CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL)
+        CORBA::ULong object_group_ref_version)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     virtual void remove_member (
         const FTRT::Location & crashed_location,
-        CORBA::ULong object_group_ref_version
-        ACE_ENV_ARG_DECL)
+        CORBA::ULong object_group_ref_version)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void replica_crashed (
-        const FTRT::Location & location
-        ACE_ENV_ARG_DECL)
+        const FTRT::Location & location)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index 0d85bbe8155..5171b434179 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -21,54 +21,42 @@ ACE_RCSID (EventChannel,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void obtain_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
-                          FtRtecEventChannelAdmin::Operation& op
-                          ACE_ENV_ARG_DECL)
+                          FtRtecEventChannelAdmin::Operation& op)
 {
-  ec->consumer_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ec->consumer_admin()->obtain_proxy(op);
 }
 
 void obtain_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
-                          FtRtecEventChannelAdmin::Operation& op
-                          ACE_ENV_ARG_DECL)
+                          FtRtecEventChannelAdmin::Operation& op)
 {
-  ec->supplier_admin()->obtain_proxy(op ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ec->supplier_admin()->obtain_proxy(op);
 }
 
 void obtain_push_consumer_and_connect(TAO_FTEC_Event_Channel_Impl* ec,
                            const FtRtecEventChannelAdmin::ObjectId& oid,
                            RtecEventComm::PushSupplier_ptr push_supplier,
-                           const RtecEventChannelAdmin::SupplierQOS & qos
-                           ACE_ENV_ARG_DECL)
+                           const RtecEventChannelAdmin::SupplierQOS & qos)
 {
-  Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().set_object_id(oid);
 
   RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
-    ec->supplier_admin()->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ec->supplier_admin()->obtain();
 
-  ACE_CHECK;
 
-  ACE_TRY {
-    consumer->connect_push_supplier(push_supplier, qos
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    consumer->connect_push_supplier(push_supplier, qos);
   }
-  ACE_CATCHALL {
+  catch (...){
     ec->supplier_admin()->disconnect(consumer.in());
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 
 void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
-                           FtRtecEventChannelAdmin::Operation& op
-                           ACE_ENV_ARG_DECL)
+                           FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->supplier_poa();
-  ACE_CHECK;
   FtRtecEventChannelAdmin::Connect_push_supplier_param& param
     = op.param.connect_supplier_param();
 
@@ -79,50 +67,39 @@ void connect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
     obtain_push_consumer_and_connect(ec,
                                      op.object_id,
                                      param.push_supplier.in(),
-                                     param.qos
-                                     ACE_ENV_ARG_PARAMETER);
+                                     param.qos);
   }
   else {
     proxy->connect_push_supplier(param.push_supplier.in(),
-      param.qos
-      ACE_ENV_ARG_PARAMETER);
+      param.qos);
   }
-  ACE_CHECK;
 }
 
 void obtain_push_supplier_and_connect(TAO_FTEC_Event_Channel_Impl* ec,
                            const FtRtecEventChannelAdmin::ObjectId& oid,
                            RtecEventComm::PushConsumer_ptr push_consumer,
-                           const RtecEventChannelAdmin::ConsumerQOS & qos
-                           ACE_ENV_ARG_DECL)
+                           const RtecEventChannelAdmin::ConsumerQOS & qos)
 {
-  Request_Context_Repository().set_object_id(oid ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().set_object_id(oid);
 
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-    ec->consumer_admin()->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ec->consumer_admin()->obtain();
 
-  ACE_CHECK;
 
-  ACE_TRY {
-    supplier->connect_push_consumer(push_consumer, qos
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    supplier->connect_push_consumer(push_consumer, qos);
   }
-  ACE_CATCHALL {
+  catch (...){
     ec->consumer_admin()->disconnect(supplier.in());
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 
 void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
-                           FtRtecEventChannelAdmin::Operation& op
-                           ACE_ENV_ARG_DECL)
+                           FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->consumer_poa();
-  ACE_CHECK;
   FtRtecEventChannelAdmin::Connect_push_consumer_param& param
     = op.param.connect_consumer_param();
 
@@ -132,90 +109,71 @@ void connect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
     obtain_push_supplier_and_connect(ec,
                                      op.object_id,
                                      param.push_consumer.in(),
-                                     param.qos
-                                     ACE_ENV_ARG_PARAMETER);
+                                     param.qos);
   }
   else {
     proxy->connect_push_consumer(param.push_consumer.in(),
-      param.qos
-      ACE_ENV_ARG_PARAMETER);
+      param.qos);
   }
-  ACE_CHECK;
 }
 
 void disconnect_push_supplier(TAO_FTEC_Event_Channel_Impl* ec,
-                              FtRtecEventChannelAdmin::Operation& op
-                              ACE_ENV_ARG_DECL)
+                              FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->consumer_poa();
-  ACE_CHECK;
 
   TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id);
 
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FTRT::InvalidUpdate());
+    throw FTRT::InvalidUpdate();
 
-  ACE_CHECK;
-  proxy->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->disconnect_push_supplier();
 }
 
 void disconnect_push_consumer(TAO_FTEC_Event_Channel_Impl* ec,
-                              FtRtecEventChannelAdmin::Operation& op
-                              ACE_ENV_ARG_DECL)
+                              FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->supplier_poa();
-  ACE_CHECK;
 
   TAO_FTEC_ProxyPushConsumer* proxy = ec->find_proxy_push_consumer(op.object_id);
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FTRT::InvalidUpdate());
+    throw FTRT::InvalidUpdate();
 
-  ACE_CHECK;
-  proxy->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->disconnect_push_consumer();
 }
 
 
 void suspend_connection (TAO_FTEC_Event_Channel_Impl* ec,
-                         FtRtecEventChannelAdmin::Operation& op
-                         ACE_ENV_ARG_DECL)
+                         FtRtecEventChannelAdmin::Operation& op)
 {
   PortableServer::POA_var poa= ec->consumer_poa();
-  ACE_CHECK;
 
   TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id);
 
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FTRT::InvalidUpdate());
+    throw FTRT::InvalidUpdate();
 
-  ACE_CHECK;
-  proxy->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->suspend_connection();
 }
 
 void resume_connection(TAO_FTEC_Event_Channel_Impl* ec,
-                       FtRtecEventChannelAdmin::Operation& op
-                       ACE_ENV_ARG_DECL)
+                       FtRtecEventChannelAdmin::Operation& op)
 {
   TAO_FTEC_ProxyPushSupplier* proxy = ec->find_proxy_push_supplier(op.object_id);
 
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FTRT::InvalidUpdate());
+    throw FTRT::InvalidUpdate();
 
-  ACE_CHECK;
-  proxy->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->resume_connection();
 }
 
 
 typedef void (*Set_update_fun)(TAO_FTEC_Event_Channel_Impl* ec,
-                               FtRtecEventChannelAdmin::Operation& op
-                               ACE_ENV_ARG_DECL);
+                               FtRtecEventChannelAdmin::Operation& op);
 
 Set_update_fun const update_table[] = {
     &obtain_push_supplier,
@@ -257,49 +215,42 @@ void
 TAO_FTEC_Event_Channel_Impl::activate_object (
   CORBA::ORB_var orb,
   const FtRtecEventComm::ObjectId& supplier_admin_oid,
-  const FtRtecEventComm::ObjectId& consumer_admin_oid
-  ACE_ENV_ARG_DECL)
+  const FtRtecEventComm::ObjectId& consumer_admin_oid)
 {
 
-  iogr_maker_.init(orb.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  iogr_maker_.init(orb.in());
 
-  TAO_EC_Event_Channel_Base::activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_EC_Event_Channel_Base::activate();
 
-  supplier_admin()->activate(supplier_admin_oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_admin()->activate(supplier_admin_oid);
 
-  consumer_admin()->activate(consumer_admin_oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_admin()->activate(consumer_admin_oid);
 }
 
 
 
 // = The RtecEventChannelAdmin::EventChannel methods...
 /// The default implementation is:
-///    this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+///    this->consumer_admin ()->_this ();
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_FTEC_Event_Channel_Impl::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel_Impl::for_consumers (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Object_var obj = consumer_admin()->reference(ACE_ENV_SINGLE_ARG_PARAMETER);
-  obj = IOGR_Maker::instance()->forge_iogr(obj.in()
-    ACE_ENV_ARG_PARAMETER);
-  return RtecEventChannelAdmin::ConsumerAdmin::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = consumer_admin()->reference();
+  obj = IOGR_Maker::instance()->forge_iogr(obj.in());
+  return RtecEventChannelAdmin::ConsumerAdmin::_narrow(obj.in());
 }
 
 
 /// The default implementation is:
-///    this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+///    this->supplier_admin ()->_this ();
 RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_FTEC_Event_Channel_Impl::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_Event_Channel_Impl::for_suppliers (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Object_var obj = supplier_admin()->reference(ACE_ENV_SINGLE_ARG_PARAMETER);
-  obj = IOGR_Maker::instance()->forge_iogr(obj.in()
-    ACE_ENV_ARG_PARAMETER);
-  return RtecEventChannelAdmin::SupplierAdmin::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = supplier_admin()->reference();
+  obj = IOGR_Maker::instance()->forge_iogr(obj.in());
+  return RtecEventChannelAdmin::SupplierAdmin::_narrow(obj.in());
 }
 
 
@@ -307,12 +258,10 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 TAO_FTEC_Event_Channel_Impl::connect_push_consumer (
         RtecEventComm::PushConsumer_ptr push_consumer,
         const RtecEventChannelAdmin::ConsumerQOS & qos
-        ACE_ENV_ARG_DECL
       )
 {
   CORBA::Any_var any
-    = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    = Request_Context_Repository().get_cached_result();
 
   FtRtecEventChannelAdmin::ObjectId *oid;
 
@@ -329,15 +278,13 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer (
 
   FtRtecEventChannelAdmin::ObjectId_var  object_id = oid;
 
-  Request_Context_Repository().generate_object_id(*oid ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().generate_object_id(*oid);
 
   obtain_push_supplier_and_connect(this,
                                    object_id.in(),
                                    push_consumer,
-                                   qos
-                                   ACE_ENV_ARG_PARAMETER);
+                                   qos);
 
-  ACE_CHECK_RETURN(0);
 
   return object_id._retn();
 }
@@ -347,12 +294,10 @@ TAO_FTEC_Event_Channel_Impl::connect_push_consumer (
 TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
         RtecEventComm::PushSupplier_ptr push_supplier,
         const RtecEventChannelAdmin::SupplierQOS & qos
-        ACE_ENV_ARG_DECL
       )
 {
   CORBA::Any_var any
-    = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    = Request_Context_Repository().get_cached_result();
 
   FtRtecEventChannelAdmin::ObjectId *oid;
 
@@ -368,15 +313,13 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
   ACE_NEW_THROW_EX(oid, FtRtecEventChannelAdmin::ObjectId, CORBA::NO_MEMORY());
   FtRtecEventChannelAdmin::ObjectId_var object_id = oid;
 
-  Request_Context_Repository().generate_object_id(*oid ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().generate_object_id(*oid);
 
   obtain_push_consumer_and_connect(this,
                                    object_id.in(),
                                    push_supplier,
-                                   qos
-                                   ACE_ENV_ARG_PARAMETER);
+                                   qos);
 
-  ACE_CHECK_RETURN(0);
 
   return object_id._retn();
 
@@ -384,7 +327,6 @@ TAO_FTEC_Event_Channel_Impl::connect_push_supplier (
 
 void TAO_FTEC_Event_Channel_Impl::disconnect_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
 {
   if (Request_Context_Repository().is_executed_request())
@@ -395,14 +337,11 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_supplier (
   if (proxy == NULL) // proxy not found
     return;
 
-  ACE_CHECK;
-  proxy->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->disconnect_push_supplier();
 }
 
 void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
 {
   if (Request_Context_Repository().is_executed_request())
@@ -413,14 +352,11 @@ void TAO_FTEC_Event_Channel_Impl::disconnect_push_consumer (
   if (proxy == NULL) // proxy not found
     return;
 
-  ACE_CHECK;
-  proxy->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->disconnect_push_consumer();
 }
 
 void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
 {
   if (Request_Context_Repository().is_executed_request())
@@ -429,17 +365,14 @@ void TAO_FTEC_Event_Channel_Impl::suspend_push_supplier (
   TAO_FTEC_ProxyPushSupplier* proxy = this->find_proxy_push_supplier(oid);
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FtRtecEventComm::InvalidObjectID());
+    throw FtRtecEventComm::InvalidObjectID();
 
-  ACE_CHECK;
-  proxy->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->suspend_connection();
 }
 
 
 void TAO_FTEC_Event_Channel_Impl::resume_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       )
 {
   if (Request_Context_Repository().is_executed_request())
@@ -448,25 +381,22 @@ void TAO_FTEC_Event_Channel_Impl::resume_push_supplier (
   TAO_FTEC_ProxyPushSupplier* proxy = this->find_proxy_push_supplier(oid);
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FtRtecEventComm::InvalidObjectID());
+    throw FtRtecEventComm::InvalidObjectID();
 
-  ACE_CHECK;
-  proxy->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->resume_connection();
 }
 
 void TAO_FTEC_Event_Channel_Impl::push (
         const FtRtecEventChannelAdmin::ObjectId & oid,
         const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL
       )
 {
   TAO_FTEC_ProxyPushConsumer* proxy = this->find_proxy_push_consumer(oid);
 
   if (proxy == NULL) // proxy not found
-    ACE_THROW(FtRtecEventComm::InvalidObjectID());
+    throw FtRtecEventComm::InvalidObjectID();
 
-  proxy->push(data ACE_ENV_ARG_PARAMETER);
+  proxy->push(data);
 }
 
 
@@ -474,20 +404,16 @@ void TAO_FTEC_Event_Channel_Impl::push (
 
 void TAO_FTEC_Event_Channel_Impl::get_state (
                                         FtRtecEventChannelAdmin::EventChannelState & state
-                                        ACE_ENV_ARG_DECL
                                         )
 {
   FtEventServiceInterceptor::instance()->get_state(state.cached_operation_results);
-  this->supplier_admin()->get_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->consumer_admin()->get_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin()->get_state(state.supplier_admin_state);
+  this->consumer_admin()->get_state(state.consumer_admin_state);
 }
 
 
 
-void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat
-                                             ACE_ENV_ARG_DECL)
+void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat)
 {
   FtRtecEventChannelAdmin::EventChannelState state;
 
@@ -495,29 +421,25 @@ void TAO_FTEC_Event_Channel_Impl::set_state (const FTRT::State & stat
   cdr >> state;
 
   FtEventServiceInterceptor::instance()->set_state(state.cached_operation_results);
-  this->supplier_admin()->set_state(state.supplier_admin_state ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->consumer_admin()->set_state(state.consumer_admin_state ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin()->set_state(state.supplier_admin_state);
+  this->consumer_admin()->set_state(state.consumer_admin_state);
 }
 
 
-void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s
-                                         ACE_ENV_ARG_DECL)
+void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s)
   ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate))
 {
-  FTRTEC::Replication_Service::instance()->check_validity(ACE_ENV_SINGLE_ARG_PARAMETER);
+  FTRTEC::Replication_Service::instance()->check_validity();
 
   if (!Request_Context_Repository().is_executed_request()) {
     Safe_InputCDR cdr((const char*)s.get_buffer(), s.length());
 
     FtRtecEventChannelAdmin::Operation_var op(new FtRtecEventChannelAdmin::Operation);
     if (!(cdr >> *op)) {
-      ACE_THROW(FTRT::InvalidUpdate() );
+      throw FTRT::InvalidUpdate();
     }
 
-    (update_table[op->param._d()])(this, *op ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    (update_table[op->param._d()])(this, *op);
 
   }
 }
@@ -539,43 +461,37 @@ TAO_FTEC_SupplierAdmin* TAO_FTEC_Event_Channel_Impl::supplier_admin (void) const
 TAO_FTEC_ProxyPushSupplier*
 TAO_FTEC_Event_Channel_Impl::find_proxy_push_supplier(const FtRtecEventChannelAdmin::ObjectId& id)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     PortableServer::POA_var poa = consumer_poa();
 
     const PortableServer::Servant servant = poa->id_to_servant(
-      reinterpret_cast<const PortableServer::ObjectId&> (id)
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      reinterpret_cast<const PortableServer::ObjectId&> (id));
     POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr obj =
       dynamic_cast<POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr> (servant);
 
     return static_cast<TAO_FTEC_ProxyPushSupplier*> (obj);
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
   return 0;
 }
 
 TAO_FTEC_ProxyPushConsumer*
 TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAdmin::ObjectId& id)
 {
-  ACE_TRY_NEW_ENV {
+  try{
     PortableServer::POA_var poa= supplier_poa();
 
     const PortableServer::Servant servant = poa->id_to_servant(
-      reinterpret_cast<const PortableServer::ObjectId&> (id)
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      reinterpret_cast<const PortableServer::ObjectId&> (id));
 
     POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr obj =
       dynamic_cast<POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr> (servant);
 
     return static_cast<TAO_FTEC_ProxyPushConsumer*> (obj);
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index ba6c2e1bc0d..6ae1dd368fd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -44,26 +44,24 @@ public:
   virtual void activate_object (
     CORBA::ORB_var orb,
     const FtRtecEventComm::ObjectId& supplier_admin_oid,
-    const FtRtecEventComm::ObjectId& consumer_admin_oid
-    ACE_ENV_ARG_DECL);
+    const FtRtecEventComm::ObjectId& consumer_admin_oid);
 
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+      for_consumers (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+      for_suppliers (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void get_state (FtRtecEventChannelAdmin::EventChannelState & s
-                  ACE_ENV_ARG_DECL);
+  void get_state (FtRtecEventChannelAdmin::EventChannelState & s);
 
-  void set_state (const FTRT::State & stat ACE_ENV_ARG_DECL);
+  void set_state (const FTRT::State & stat);
 
-  void set_update (const FTRT::State & s ACE_ENV_ARG_DECL)
+  void set_update (const FTRT::State & s)
       ACE_THROW_SPEC ((CORBA::SystemException, FTRT::InvalidUpdate));
 
   /// EventChannelFacade Interface
@@ -71,40 +69,33 @@ public:
    virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_consumer (
         RtecEventComm::PushConsumer_ptr push_consumer,
         const RtecEventChannelAdmin::ConsumerQOS & qos
-        ACE_ENV_ARG_DECL
       );
 
 
     virtual ::FtRtecEventChannelAdmin::ObjectId * connect_push_supplier (
         RtecEventComm::PushSupplier_ptr push_supplier,
         const RtecEventChannelAdmin::SupplierQOS & qos
-        ACE_ENV_ARG_DECL
       );
 
     virtual void disconnect_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       );
 
     virtual void disconnect_push_consumer (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       );
 
     virtual void suspend_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       );
 
     virtual void resume_push_supplier (
         const FtRtecEventChannelAdmin::ObjectId & oid
-        ACE_ENV_ARG_DECL
       );
 
     virtual void push (
         const FtRtecEventChannelAdmin::ObjectId & oid,
         const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL
       );
 
   ////////////////////////////////////////////
@@ -121,8 +112,7 @@ public:
   TAO_FTEC_ProxyPushConsumer* find_proxy_push_consumer(const FtRtecEventChannelAdmin::ObjectId& id);
 
 
-  CORBA::Object_var make_iogr(CORBA::Object_ptr obj
-                              ACE_ENV_ARG_DECL);
+  CORBA::Object_var make_iogr(CORBA::Object_ptr obj);
 
 protected:
   TAO_FTEC_Basic_Factory* factory();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
index 80c7ba30a06..5ea216610e2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp
@@ -60,7 +60,6 @@ TAO_FTEC_Group_Manager::~TAO_FTEC_Group_Manager()
 CORBA::Boolean TAO_FTEC_Group_Manager::start (
         FTRT::FaultListener_ptr listener,
         FTRT::Location_out cur
-        ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -74,8 +73,7 @@ CORBA::Boolean TAO_FTEC_Group_Manager::start (
 
 void TAO_FTEC_Group_Manager::create_group (
     const FTRT::ManagerInfoList & info_list,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL)
+    CORBA::ULong object_group_ref_version)
 {
   TAO_FTRTEC::Log(1, "create_group\n");
 
@@ -85,11 +83,9 @@ void TAO_FTEC_Group_Manager::create_group (
 
   GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
   GroupInfoPublisherBase::Info_ptr info (
-    publisher->setup_info(impl_->info_list, 
+    publisher->setup_info(impl_->info_list,
                           impl_->my_position,
-                          object_group_ref_version
-                          ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
+                          object_group_ref_version));
 
   publisher->update_info(info);
 
@@ -99,7 +95,7 @@ void TAO_FTEC_Group_Manager::create_group (
     Fault_Detector* detector = Fault_Detector::instance();
     if ( detector->connect(impl_->info_list[impl_->my_position-1].the_location) == -1) {
       ACE_DEBUG((LM_DEBUG, "Cannot connect to predecesor\n"));
-      ACE_THROW(FTRT::PredecessorUnreachable());
+      throw FTRT::PredecessorUnreachable();
     }
   }
 
@@ -107,29 +103,24 @@ void TAO_FTEC_Group_Manager::create_group (
     = publisher->successor();
 
   if (!CORBA::is_nil(successor.in())) {
-    successor->create_group(info_list, object_group_ref_version
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    successor->create_group(info_list, object_group_ref_version);
   }
 }
 
 void TAO_FTEC_Group_Manager::join_group (
-    const FTRT::ManagerInfo & info
-    ACE_ENV_ARG_DECL)
+    const FTRT::ManagerInfo & info)
 {
   TAO_FTRTEC::Log(1, "join group\n");
   if (impl_->my_position == 0) {
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc);
-    add_member(info, IOGR_Maker::instance()->get_ref_version()+1
-               ACE_ENV_ARG_PARAMETER);
+    add_member(info, IOGR_Maker::instance()->get_ref_version()+1);
   }
 }
 
 void TAO_FTEC_Group_Manager::add_member (
     const FTRT::ManagerInfo & info,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL)
+    CORBA::ULong object_group_ref_version)
 {
   TAO_FTRTEC::Log(1, "add_member location = <%s>\n",
     (const char*)info.the_location[0].id);
@@ -146,11 +137,9 @@ void TAO_FTEC_Group_Manager::add_member (
 
   GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
   GroupInfoPublisherBase::Info_ptr group_info (
-    publisher->setup_info(new_impl->info_list, 
+    publisher->setup_info(new_impl->info_list,
                           new_impl->my_position,
-                          object_group_ref_version
-                    ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
+                          object_group_ref_version));
 
   int last_one = (impl_->my_position == impl_->info_list.length()-1);
 
@@ -158,12 +147,10 @@ void TAO_FTEC_Group_Manager::add_member (
   {
     // I am not the last of replica, tell my successor that
     // a new member has joined in.
-    ACE_TRY_EX(block) {
-      FTRTEC::Replication_Service::instance()->add_member(info, object_group_ref_version
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block);
+    try{
+      FTRTEC::Replication_Service::instance()->add_member(info, object_group_ref_version);
     }
-    ACE_CATCHANY {
+    catch (const CORBA::Exception&){
       // Unable to send request to all the successors.
       // Now this node become the last replica of the object group.
       // update the info list again
@@ -176,15 +163,11 @@ void TAO_FTEC_Group_Manager::add_member (
       GroupInfoPublisherBase::Info_ptr group_info1 (
         publisher->setup_info(new_impl->info_list,
                               new_impl->my_position,
-                              object_group_ref_version
-                              ACE_ENV_ARG_PARAMETER));
-      ACE_CHECK;
+                              object_group_ref_version));
       ACE_AUTO_PTR_RESET(group_info, group_info1.release(), GroupInfoPublisherBase::Info);
 
       last_one = true;
     }
-    ACE_ENDTRY;
-    ACE_CHECK;
   }
 
   if (last_one)
@@ -192,7 +175,7 @@ void TAO_FTEC_Group_Manager::add_member (
     // this is the last replica in the list
     // synchornize the state with the newly joined replica.
     FtRtecEventChannelAdmin::EventChannelState state;
-    get_state(state ACE_ENV_ARG_PARAMETER);
+    get_state(state);
 
     TAO_OutputCDR cdr;
     cdr << state;
@@ -239,12 +222,9 @@ void TAO_FTEC_Group_Manager::add_member (
     }
 
     TAO_FTRTEC::Log(2, "Setting state\n");
-    info.ior->set_state(s ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    info.ior->set_state(s);
     info.ior->create_group(new_impl->info_list,
-                           object_group_ref_version
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                           object_group_ref_version);
     TAO_FTRTEC::Log(2, "After create_group\n");
   }
 
@@ -266,20 +246,17 @@ void remove_item(SEQ & seq, int position)
 }
 
 void TAO_FTEC_Group_Manager::replica_crashed (
-    const FTRT::Location & location
-    ACE_ENV_ARG_DECL)
+    const FTRT::Location & location)
 {
   TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::replica_crashed\n");
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc);
-    remove_member(location, IOGR_Maker::instance()->get_ref_version()+1
-                  ACE_ENV_ARG_PARAMETER);
+    remove_member(location, IOGR_Maker::instance()->get_ref_version()+1);
 }
 
 void TAO_FTEC_Group_Manager::remove_member (
     const FTRT::Location & crashed_location,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL)
+    CORBA::ULong object_group_ref_version)
 {
   // find my position of this EventChannel in the group
   unsigned  crashed_pos = find_by_location(impl_->info_list, crashed_location);
@@ -296,11 +273,9 @@ void TAO_FTEC_Group_Manager::remove_member (
   GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
 
   GroupInfoPublisherBase::Info_ptr info (
-    publisher->setup_info(impl_->info_list, 
+    publisher->setup_info(impl_->info_list,
                           impl_->my_position,
-                          object_group_ref_version
-                          ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
+                          object_group_ref_version));
   publisher->update_info(info);
 
   FtRtecEventChannelAdmin::EventChannel_var successor =
@@ -308,15 +283,12 @@ void TAO_FTEC_Group_Manager::remove_member (
 
   IOGR_Maker::instance()->set_ref_version(object_group_ref_version);
   if (!CORBA::is_nil(successor.in())) {
-    ACE_TRY {
+    try{
     successor->remove_member(crashed_location,
-                             object_group_ref_version
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             object_group_ref_version);
     }
-    ACE_CATCHALL {
+    catch (...){
     }
-    ACE_ENDTRY;
   }
 
   TAO_FTRTEC::Log(3, "my_position = %d, crashed_pos = %d\n", impl_->my_position, crashed_pos);
@@ -333,45 +305,34 @@ void TAO_FTEC_Group_Manager::connection_closed()
   // crashed_location will be repliaced by its successor.
   FTRT::Location crashed_location = impl_->info_list[impl_->my_position-1].the_location;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (impl_->my_position > 1) {
     // if I am not the new primary, tell the new primary
-    ACE_TRY_EX(block1) {
+    try{
       TAO_IOP::TAO_IOR_Manipulation::IORList iors;
       iors.length(impl_->my_position-1);
       for (size_t i = 0; i < impl_->my_position-1; ++i)
         iors[i] = CORBA::Object::_duplicate(impl_->info_list[i].ior.in());
 
       CORBA::Object_var obj =
-        IOGR_Maker::instance()->merge_iors(iors
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block1);
+        IOGR_Maker::instance()->merge_iors(iors);
 
       FtRtecEventChannelAdmin::EventChannel_var primary =
-        FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block1);
-      primary->replica_crashed(crashed_location
-                          ACE_ENV_ARG_PARAMETER);
+        FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
+      primary->replica_crashed(crashed_location);
 
-      ACE_TRY_CHECK_EX(block1);
       return;
     }
-    ACE_CATCHANY {
+    catch (const CORBA::Exception&){
     }
-    ACE_ENDTRY;
   }
 
-  ACE_TRY_EX(block2) {
+  try{
     remove_member(crashed_location,
-                  IOGR_Maker::instance()->increment_ref_version()
-                  ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block2);
+                  IOGR_Maker::instance()->increment_ref_version());
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception&){
   }
-  ACE_ENDTRY;
 
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
index 0d06c156bf5..b154e25448f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
@@ -35,37 +35,30 @@ public:
 
   virtual CORBA::Boolean start (
         FTRT::FaultListener_ptr listener,
-        FTRT::Location_out cur
-        ACE_ENV_ARG_DECL)
+        FTRT::Location_out cur)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   void create_group (
     const FTRT::ManagerInfoList & info_list,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL);
+    CORBA::ULong object_group_ref_version);
 
   void join_group (
-    const FTRT::ManagerInfo & info
-    ACE_ENV_ARG_DECL);
+    const FTRT::ManagerInfo & info);
 
   void add_member (
     const FTRT::ManagerInfo & info,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL);
+    CORBA::ULong object_group_ref_version);
 
   void remove_member (
     const FTRT::Location & crashed_location,
-    CORBA::ULong object_group_ref_version
-    ACE_ENV_ARG_DECL);
+    CORBA::ULong object_group_ref_version);
 
   void replica_crashed (
-    const FTRT::Location & location
-    ACE_ENV_ARG_DECL);
+    const FTRT::Location & location);
 
 private:
   virtual void get_state (
         FtRtecEventChannelAdmin::EventChannelState & s
-        ACE_ENV_ARG_DECL
       )=0;
 
   virtual void connection_closed();
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
index 410377e8a80..75ee7462d2b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -15,21 +15,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 FTEC_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FTEC_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  Request_Context_Repository().allocate_slots(info ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Request_Context_Repository().allocate_slots(info);
 
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor;
   PortableInterceptor::ClientRequestInterceptor_ptr ctmp;
@@ -37,13 +34,10 @@ FTEC_ORBInitializer::post_init (
   ACE_NEW_THROW_EX(ctmp,
                    TAO_Set_Update_Interceptor,
                    CORBA::NO_MEMORY());
-  ACE_CHECK;
 
   client_interceptor = ctmp;
 
-  info->add_client_request_interceptor (client_interceptor.in()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (client_interceptor.in());
 
   PortableInterceptor::ServerRequestInterceptor_var  server_interceptor;
   PortableInterceptor::ServerRequestInterceptor_ptr  stmp;
@@ -53,16 +47,13 @@ FTEC_ORBInitializer::post_init (
                 CORBA::NO_MEMORY());
   server_interceptor = stmp;
 
-  info->add_server_request_interceptor (server_interceptor.in()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in());
   ACE_NEW_THROW_EX(stmp,
                 FtEventServiceInterceptor,
                 CORBA::NO_MEMORY());
   server_interceptor = stmp;
 
-  info->add_server_request_interceptor (server_interceptor.in()
-                                        ACE_ENV_ARG_PARAMETER);
+  info->add_server_request_interceptor (server_interceptor.in());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
index 07377cd40e1..80502fc5245 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
@@ -27,12 +27,10 @@ class FTEC_ORBInitializer
   , public virtual TAO_Local_RefCounted_Object
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
index 3f489f9540f..74aea4e3390 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -31,32 +31,26 @@ TAO_FTEC_ProxyPushConsumer::id() const
   /// Activate in the POA
 void
 TAO_FTEC_ProxyPushConsumer::activate (
-     RtecEventChannelAdmin::ProxyPushConsumer_ptr &result
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::ProxyPushConsumer_ptr &result)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   result = RtecEventChannelAdmin::ProxyPushConsumer::_nil();
-  ACE_TRY {
-    object_id_ = Request_Context_Repository().get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    PortableServer::POA_var poa = _default_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    object_id_ = Request_Context_Repository().get_object_id();
+    PortableServer::POA_var poa = _default_POA();
+    activate_object_with_id(result, poa.in(), this, id());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "");
+    ex._tao_print_exception ("");
     // ignore exceptions
   }
-  ACE_ENDTRY;
 }
 
     // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
 void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::SupplierQOS& qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected))
 {
@@ -70,27 +64,22 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier (
   param.qos = qos;
   update.param.connect_supplier_param(param);
 
-  Inherited::connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::connect_push_supplier(push_supplier, qos);
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-                           &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                           &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_consumer);
   }
-  ACE_CATCHALL {
-    this->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_RE_THROW;
+  catch (...){
+    this->disconnect_push_consumer();
+    throw;
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
-void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
@@ -99,14 +88,12 @@ void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DE
   update.object_id = id();
   update.param._d(FtRtecEventChannelAdmin::DISCONNECT_PUSH_CONSUMER);
 
-  Inherited::disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::disconnect_push_consumer();
 
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
   ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
-  svc->replicate_request(update, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  svc->replicate_request(update, 0);
 }
 
 void TAO_FTEC_ProxyPushConsumer::get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state)
@@ -120,14 +107,12 @@ void TAO_FTEC_ProxyPushConsumer::get_state(FtRtecEventChannelAdmin::ProxyPushCon
   }
 }
 
-void TAO_FTEC_ProxyPushConsumer::set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state
-                                           ACE_ENV_ARG_DECL)
+void TAO_FTEC_ProxyPushConsumer::set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state)
 {
   if (!CORBA::is_nil(state.parameter.info().push_supplier.in()) )
   {
     Inherited::connect_push_supplier(state.parameter.info().push_supplier.in(),
-                     state.parameter.info().qos
-                     ACE_ENV_ARG_PARAMETER);
+                     state.parameter.info().qos);
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index 518e4f73eb0..2e45f985862 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -34,28 +34,25 @@ public:
   TAO_FTEC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel);
 
   virtual void activate (
-     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::ProxyPushConsumer_ptr &proxy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::SupplierQOS& qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   const FtRtecEventChannelAdmin::ObjectId& id() const;
   void get_state(FtRtecEventChannelAdmin::ProxyPushConsumerStat& state);
-  void set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state
-                 ACE_ENV_ARG_DECL);
+  void set_state(const FtRtecEventChannelAdmin::ProxyPushConsumerStat& state);
 
   typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-    (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
+    (const FtRtecEventChannelAdmin::ObjectId&);
 
   static const RollbackOperation rollback_obtain;
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
index 62fad4ef9d7..e215955c4d5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -30,33 +30,27 @@ TAO_FTEC_ProxyPushSupplier::id() const
     /// Activate in the POA
 void
 TAO_FTEC_ProxyPushSupplier::activate (
-       RtecEventChannelAdmin::ProxyPushSupplier_ptr &result
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::ProxyPushSupplier_ptr &result)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   result =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil();
-  ACE_TRY {
-    object_id_ = Request_Context_Repository().get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    PortableServer::POA_var poa = _default_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    activate_object_with_id(result, poa.in(), this, id() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    object_id_ = Request_Context_Repository().get_object_id();
+    PortableServer::POA_var poa = _default_POA();
+    activate_object_with_id(result, poa.in(), this, id());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     // ignore exceptions
   }
-  ACE_ENDTRY;
 }
 
     // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
 void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError))
@@ -71,26 +65,22 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer (
   param.qos = qos;
   update.param.connect_consumer_param(param);
 
-  Inherited::connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::connect_push_consumer(push_consumer, qos);
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
 
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-      &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      &FtRtecEventChannelAdmin::EventChannelFacade::disconnect_push_supplier);
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
 }
 
 
-void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
@@ -100,18 +90,16 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DE
   update.object_id = id();
   update.param._d(FtRtecEventChannelAdmin::DISCONNECT_PUSH_SUPPLIER);
 
-  Inherited::disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::disconnect_push_supplier();
   FTRTEC::Replication_Service *svc = FTRTEC::Replication_Service::instance();
 
   ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
-  svc->replicate_request(update, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  svc->replicate_request(update, 0);
 }
 
 
-void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::suspend_connection (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
@@ -121,55 +109,47 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
   update.object_id = id();
   update.param._d(FtRtecEventChannelAdmin::SUSPEND_CONNECTION);
 
-  Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::suspend_connection();
 
-  ACE_TRY
+  try
   {
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-      &FtRtecEventChannelAdmin::EventChannelFacade::resume_push_supplier
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      &FtRtecEventChannelAdmin::EventChannelFacade::resume_push_supplier);
   }
-  ACE_CATCHALL {
-    this->resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_RE_THROW;
+  catch (...){
+    this->resume_connection();
+    throw;
   }
-  ACE_ENDTRY;
 }
 
-void TAO_FTEC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::resume_connection (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (Request_Context_Repository().is_executed_request())
     return;
 
-  Request_Context_Repository().set_object_id(id() ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().set_object_id(id());
   FtRtecEventChannelAdmin::Operation update;
   update.object_id = id();
   update.param._d(FtRtecEventChannelAdmin::RESUME_CONNECTION);
 
-  Inherited::resume_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Inherited::resume_connection();
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
 
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(update,
-      &FtRtecEventChannelAdmin::EventChannelFacade::suspend_push_supplier
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      &FtRtecEventChannelAdmin::EventChannelFacade::suspend_push_supplier);
   }
-  ACE_CATCHALL {
-    this->suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_RE_THROW;
+  catch (...){
+    this->suspend_connection();
+    throw;
   }
-  ACE_ENDTRY;
 }
 
 
@@ -186,16 +166,14 @@ void TAO_FTEC_ProxyPushSupplier::get_state(FtRtecEventChannelAdmin::ProxyPushSup
 }
 
 
-void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state
-                                           ACE_ENV_ARG_DECL)
+void TAO_FTEC_ProxyPushSupplier::set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state)
 {
   if (!CORBA::is_nil(state.parameter.info().push_consumer.in()))
   {
     Inherited::connect_push_consumer(state.parameter.info().push_consumer.in(),
-      state.parameter.info().qos
-      ACE_ENV_ARG_PARAMETER);
+      state.parameter.info().qos);
     if (state.suspended)
-      Inherited::suspend_connection(ACE_ENV_SINGLE_ARG_PARAMETER);
+      Inherited::suspend_connection();
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
index 34c38f96400..90ad86d0101 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -35,32 +35,29 @@ public:
                            int validate_connection);
     /// Activate in the POA
  virtual void activate (
-       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::ProxyPushSupplier_ptr &proxy)
    ACE_THROW_SPEC ((CORBA::SystemException));
     // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void suspend_connection (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void resume_connection (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   const FtRtecEventChannelAdmin::ObjectId& id() const;
 
   void get_state(FtRtecEventChannelAdmin::ProxyPushSupplierStat& state);
-  void set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state
-                 ACE_ENV_ARG_DECL);
+  void set_state(const FtRtecEventChannelAdmin::ProxyPushSupplierStat& state);
 
   typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-    (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
+    (const FtRtecEventChannelAdmin::ObjectId&);
 
   static const RollbackOperation rollback_obtain;
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index 74a666746cc..7b1d6ff5b5a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -27,23 +27,21 @@ TAO_FTEC_SupplierAdmin::~TAO_FTEC_SupplierAdmin()
 
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_FTEC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FTEC_SupplierAdmin::obtain_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return obtain_proxy(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return obtain_proxy();
 }
 
 void
 TAO_FTEC_SupplierAdmin::disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj)
 {
-  ACE_TRY_NEW_ENV {
-    obj->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    obj->disconnect_push_consumer();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
index 814061c0263..cd1e66b26ac 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
@@ -67,7 +67,7 @@ public:
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_consumer (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   void disconnect(RtecEventChannelAdmin::ProxyPushConsumer_ptr obj);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
index 5fb7d08ad06..2ce6b5872e7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp
@@ -23,30 +23,26 @@ FT_ProxyAdmin_Base::~FT_ProxyAdmin_Base()
 }
 
 void
-FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid
-                             ACE_ENV_ARG_DECL)
+FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid)
 {
   poa_->activate_object_with_id(
-    reinterpret_cast<const PortableServer::ObjectId&> (oid), 
-    servant_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    reinterpret_cast<const PortableServer::ObjectId&> (oid),
+    servant_);
   object_id_ = oid;
 }
 
 
 const FtRtecEventComm::ObjectId&
-FT_ProxyAdmin_Base::object_id(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+FT_ProxyAdmin_Base::object_id(void) const
 {
   return object_id_;
 }
 
 
 CORBA::Object_var
-FT_ProxyAdmin_Base::reference(ACE_ENV_SINGLE_ARG_DECL) const
+FT_ProxyAdmin_Base::reference(void) const
 {
-  return poa_->servant_to_reference(servant_
-                                    ACE_ENV_ARG_PARAMETER);
+  return poa_->servant_to_reference(servant_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
index 2c639c0ce6f..f94b549a7b9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
@@ -30,13 +30,12 @@ public:
   FT_ProxyAdmin_Base(PortableServer::ServantBase* servant,
               PortableServer::POA_var poa);
   virtual ~FT_ProxyAdmin_Base();
-  void activate(const FtRtecEventComm::ObjectId& oid
-              ACE_ENV_ARG_DECL);
+  void activate(const FtRtecEventComm::ObjectId& oid);
 
-  const FtRtecEventComm::ObjectId& object_id(ACE_ENV_SINGLE_ARG_DECL) const;
+  const FtRtecEventComm::ObjectId& object_id(void) const;
 
   /// Returns an CORBA object reference when the servant is activated
-  CORBA::Object_var reference(ACE_ENV_SINGLE_ARG_DECL) const;
+  CORBA::Object_var reference(void) const;
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
index 188bdcab7e8..5eed0465310 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -19,49 +19,39 @@ template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 void
 FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface,State>::obtain_proxy (
-  const FtRtecEventChannelAdmin::Operation& op
-  ACE_ENV_ARG_DECL)
+  const FtRtecEventChannelAdmin::Operation& op)
 {
-  Request_Context_Repository().set_object_id(op.object_id
-                                     ACE_ENV_ARG_PARAMETER);
+  Request_Context_Repository().set_object_id(op.object_id);
 
   ProxyInterface_var result
-    =  admin_->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    =  admin_->obtain();
 
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
-  ACE_TRY   {
+  try{
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
 
     svc->replicate_request(op,
-      Proxy::rollback_obtain
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      Proxy::rollback_obtain);
   }
-  ACE_CATCHALL {
+  catch (...){
     admin_->disconnect(result.in());
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 typename FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::ProxyInterface_ptr
-FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_ENV_SINGLE_ARG_DECL)
+FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (void)
 {
-  CORBA::Any_var any = Request_Context_Repository().get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+  CORBA::Any_var any = Request_Context_Repository().get_cached_result();
 
   CORBA::Object_var obj;
   if (any >>= CORBA::Any::to_object(obj))
-    return ProxyInterface::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    return ProxyInterface::_narrow(obj.in());
 
   FtRtecEventChannelAdmin::ObjectId oid;
-  Request_Context_Repository().generate_object_id(oid
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+  Request_Context_Repository().generate_object_id(oid);
 
   FtRtecEventChannelAdmin::Operation update;
 
@@ -69,29 +59,22 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_E
   update.param._d(EC_PROXY_ADMIN::OBTAIN_ID);
 
   ProxyInterface_var result
-    =  admin_->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    =  admin_->obtain();
 
-  ACE_TRY {
+  try{
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Read_Guard<FTRTEC::Replication_Service> locker(*svc);
-    obj = IOGR_Maker::instance()->forge_iogr(result.in()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    obj = IOGR_Maker::instance()->forge_iogr(result.in());
 
-    result = ProxyInterface::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    result = ProxyInterface::_narrow(obj.in());
 
     svc->replicate_request(update,
-      Proxy::rollback_obtain
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      Proxy::rollback_obtain);
   }
-  ACE_CATCHALL {
+  catch (...){
     admin_->disconnect(result.in());
-    ACE_RE_THROW;
+    throw;
   }
-  ACE_ENDTRY;
 
   return result._retn();
 }
@@ -100,47 +83,37 @@ FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::obtain_proxy (ACE_E
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::get_state(
-  State& state
-  ACE_ENV_ARG_DECL)
+  State& state)
 {
   typename EC_PROXY_ADMIN::StateWorker worker(state.proxies);
-  admin_->for_each(&worker ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  admin_->for_each(&worker);
 }
 
 template <class EC_PROXY_ADMIN, class Proxy,
           class ProxyInterface, class State>
 void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state(
-  const State& state
-  ACE_ENV_ARG_DECL)
+  const State& state)
 {
   for (size_t i =0; i < state.proxies.length(); ++i)
   {
     const typename Proxy::State& proxy_state
       = state.proxies[i];
 
-    Request_Context_Repository().set_object_id(proxy_state.object_id
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Request_Context_Repository().set_object_id(proxy_state.object_id);
 
     ProxyInterface_var
-      proxy_ior = admin_->obtain(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      proxy_ior = admin_->obtain();
 
     typedef typename Proxy::Skeleton Skeleton;
     const void *temp = &proxy_state.object_id;
     const PortableServer::ObjectId *oid =
       reinterpret_cast<const PortableServer::ObjectId *> (temp);
-    const PortableServer::Servant servant = 
-      poa_->id_to_servant (*oid ACE_ENV_ARG_PARAMETER);
+    const PortableServer::Servant servant =
+      poa_->id_to_servant (*oid);
 
-    ACE_CHECK;
     Skeleton skeleton = dynamic_cast<Skeleton> (servant);
-    ACE_CHECK;
 
-    static_cast<Proxy*> (skeleton)->set_state(proxy_state
-                                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    static_cast<Proxy*> (skeleton)->set_state(proxy_state);
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
index 92e2bf0ad6d..ea95d97b08f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
@@ -33,14 +33,13 @@ public:
   FT_ProxyAdmin(EC_PROXY_ADMIN* admin,
               PortableServer::POA_var poa);
 
-  ProxyInterface_ptr obtain_proxy (ACE_ENV_SINGLE_ARG_DECL);
+  ProxyInterface_ptr obtain_proxy (void);
 
   /// this is used for updating the state
-  void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op
-                    ACE_ENV_ARG_DECL);
+  void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op);
 
-  void get_state(State& state ACE_ENV_ARG_DECL);
-  void set_state(const State& state ACE_ENV_ARG_DECL);
+  void get_state(State& state);
+  void set_state(const State& state);
 private:
   EC_PROXY_ADMIN* admin_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index ee750df8f22..ddf0f152674 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -19,63 +19,46 @@ ACE_RCSID (EventChannel,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL)
+CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-  CORBA::String_var orb_id = ri->orb_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+  CORBA::String_var orb_id = ri->orb_id();
 
   int argc =0;
   char** argv =0;
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, orb_id.in()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, orb_id.in());
 
   PortableServer::POA_var poa =
-    resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+    resolve_init<PortableServer::POA>(orb.in(), "RootPOA");
 
   PortableInterceptor::AdapterName_var adaptor_name =
-    ri->adapter_name(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+    ri->adapter_name();
 
   for (size_t i = 1; i < adaptor_name->length(); ++i) {
-    poa = poa->find_POA((*adaptor_name)[i] , false
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(CORBA::Object::_nil());
+    poa = poa->find_POA((*adaptor_name)[i] , false);
   }
 
   CORBA::OctetSeq_var oid =
-    ri->object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+    ri->object_id();
 
   CORBA::Object_var obj =
-    poa->id_to_reference(oid.in()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+    poa->id_to_reference(oid.in());
 
   return obj._retn();
 }
 
-CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL)
+CORBA::Object_ptr get_forward(PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   CORBA::Object_var target =
-    get_target(ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+    get_target(ri);
 
   TAO::ObjectKey_var key =
-    target->_key(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+    target->_key();
 
   CORBA::Object_var iogr =
     GroupInfoPublisher::instance()->group_reference();
 
   CORBA::Object_var forward =
-    IOGR_Maker::instance()->ior_replace_key(iogr.in(), key.in()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+    IOGR_Maker::instance()->ior_replace_key(iogr.in(), key.in());
 
   return forward._retn();
 }
@@ -89,55 +72,47 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor()
 {
 }
 
-char * ForwardCtrlServerInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+char * ForwardCtrlServerInterceptor::name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup("ForwardCtrlServerInterceptor");
 }
 
-void ForwardCtrlServerInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void ForwardCtrlServerInterceptor::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                    ACE_ENV_ARG_DECL)
+void ForwardCtrlServerInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
                                                     ACE_THROW_SPEC ((CORBA::SystemException,
                                                     PortableInterceptor::ForwardRequest))
 {
-  ACE_TRY {
+  try{
     IOP::ServiceContext_var service_context =
-      ri->get_request_service_context(IOP::FT_GROUP_VERSION
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      ri->get_request_service_context(IOP::FT_GROUP_VERSION);
   }
-  ACE_CATCHANY {
+  catch (const CORBA::Exception&){
     // not an FT call , continue to process the request
     return;
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   GroupInfoPublisherBase* publisher = GroupInfoPublisher::instance();
   if (!publisher->is_primary()) {
     // I am not primary, forword the request to primary
-    CORBA::Object_var forward = get_forward(ri
-      ACE_ENV_ARG_PARAMETER);
+    CORBA::Object_var forward = get_forward(ri);
 
-    ACE_THROW (PortableInterceptor::ForwardRequest (forward.in()));
+    throw PortableInterceptor::ForwardRequest (forward.in());
   }
 }
 
 void ForwardCtrlServerInterceptor::receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_NOT_USED)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
 }
 
-FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_context
-                                               ACE_ENV_ARG_DECL)
+FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_context)
 {
   Safe_InputCDR cdr (reinterpret_cast<const char*> (service_context->context_data.get_buffer ()),
                       service_context->context_data.length ());
@@ -160,34 +135,27 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c
 
 
 
-void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::ServiceContext_var service_context;
   FT::ObjectGroupRefVersion version=0;
 
-  ACE_TRY_EX(block1)
+  try
   {
-    if (!ri->response_expected(ACE_ENV_SINGLE_ARG_PARAMETER))
+    if (!ri->response_expected())
       return;
-    ACE_TRY_CHECK_EX(block1);
 
     service_context =
-      ri->get_request_service_context(IOP::FT_GROUP_VERSION
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+      ri->get_request_service_context(IOP::FT_GROUP_VERSION);
     // get the ref version service context
     version =
-      get_ft_group_version(service_context
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+      get_ft_group_version(service_context);
   }
-  ACE_CATCHALL {
+  catch (...){
     // not an FT call , continue to reply the request
     return;
   }
-  ACE_ENDTRY;
 
   // pass a new IOGR if the client use an outdated version
 
@@ -198,10 +166,8 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
   if (version < maker->get_ref_version()) {
     ACE_DEBUG((LM_DEBUG, "Outdated IOGR version, passing new IOGR\n"));
 
-    ACE_TRY_EX(block2) {
-      CORBA::Object_var forward = get_forward(ri
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block2);
+    try{
+      CORBA::Object_var forward = get_forward(ri);
 
       IOP::ServiceContext sc;
       sc.context_id = FTRT::FT_FORWARD;
@@ -211,7 +177,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
       //ACE_THROW (CORBA::MARSHAL ());
 
       if ((cdr << forward.in() ) == 0 )
-        ACE_THROW (CORBA::MARSHAL ());
+        throw CORBA::MARSHAL ();
 
       ACE_Message_Block mb;
       ACE_CDR::consolidate(&mb, cdr.begin());
@@ -231,27 +197,23 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
         }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-      ri->add_reply_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block2);
+      ri->add_reply_service_context (sc, 0);
 
       ACE_DEBUG((LM_DEBUG, "reply_service_context added\n"));
     }
-    ACE_CATCHALL {
+    catch (...){
     }
-    ACE_ENDTRY;
   }
 
 }
 
-void ForwardCtrlServerInterceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
+void ForwardCtrlServerInterceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
 {
 }
 
-void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_NOT_USED)
+void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
index d53dc682b0e..533fd02215c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
@@ -28,34 +28,29 @@ public:
   ForwardCtrlServerInterceptor();
   ~ForwardCtrlServerInterceptor();
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index 779396ce1ee..ccfd9d70465 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -81,11 +81,9 @@ void
 retrieve_ft_request_context(
                             PortableInterceptor::ServerRequestInfo_ptr ri,
                             IOP::ServiceContext_var& service_context,
-                            FT::FTRequestServiceContext& ft_request_service_context
-                            ACE_ENV_ARG_DECL)
+                            FT::FTRequestServiceContext& ft_request_service_context)
 {
-  service_context = ri->get_request_service_context(IOP::FT_REQUEST ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  service_context = ri->get_request_service_context(IOP::FT_REQUEST);
 
   const char * buf =
     reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
@@ -96,33 +94,29 @@ retrieve_ft_request_context(
   CORBA::Boolean byte_order;
 
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   cdr.reset_byte_order (static_cast<int> (byte_order));
 
 
   if ((cdr >> ft_request_service_context) == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
 }
 
 FTRT::TransactionDepth
 get_transaction_depth_context(
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   IOP::ServiceContext_var service_context;
-  ACE_TRY {
-    service_context = ri->get_request_service_context(FTRT::FT_TRANSACTION_DEPTH
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    service_context = ri->get_request_service_context(FTRT::FT_TRANSACTION_DEPTH);
   }
-  ACE_CATCH  (CORBA::BAD_PARAM, ex)
+  catch (const CORBA::BAD_PARAM&)
   {
     ACE_DEBUG((LM_DEBUG, "Received request without transaction depth context\n"));
     return -1;
   }
-  ACE_ENDTRY;
 
   const char * buf =
     reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
@@ -145,14 +139,11 @@ get_transaction_depth_context(
 
 FTRT::SequenceNumber
 get_sequence_number_context(
-                            PortableInterceptor::ServerRequestInfo_ptr ri
-                            ACE_ENV_ARG_DECL)
+                            PortableInterceptor::ServerRequestInfo_ptr ri)
 {
   FTRT::SequenceNumber result;
   IOP::ServiceContext_var service_context;
-  service_context = ri->get_request_service_context(FTRT::FT_SEQUENCE_NUMBER
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+  service_context = ri->get_request_service_context(FTRT::FT_SEQUENCE_NUMBER);
 
   const char * buf =
     reinterpret_cast<const char *> (service_context->context_data.get_buffer ());
@@ -193,22 +184,21 @@ FtEventServiceInterceptor::instance()
 }
 
 char *
-FtEventServiceInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FtEventServiceInterceptor::name (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FtEventServiceInterceptor");
 }
 
 void
-FtEventServiceInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FtEventServiceInterceptor::destroy (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FtEventServiceInterceptor::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
   PortableInterceptor::ForwardRequest))
 {
@@ -216,26 +206,22 @@ FtEventServiceInterceptor::receive_request_service_contexts (
 
 
 void
-FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                            ACE_ENV_ARG_DECL)
+FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
                                             ACE_THROW_SPEC ((CORBA::SystemException,
                                             PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
   if (ACE_OS::strcmp(operation.in(), "push") == 0) {
     TAO_FTRTEC::Log(3, "Received push command\n");
     return;
   }
 
-  ACE_TRY_EX(block1) {
+  try{
     FT::FTRequestServiceContext ft_request_service_context;
     IOP::ServiceContext_var service_context;
     retrieve_ft_request_context(ri,
       service_context,
-      ft_request_service_context
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+      ft_request_service_context);
 
     bool is_new_request = request_table_.is_new_request(
       ft_request_service_context.client_id.in(),
@@ -247,60 +233,43 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn
         request_table_.get_result(ft_request_service_context.client_id.in());
     }
 
-    Request_Context_Repository().set_cached_result(ri, cached_result
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
-    Request_Context_Repository().set_ft_request_service_context(ri, service_context
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+    Request_Context_Repository().set_cached_result(ri, cached_result);
+    Request_Context_Repository().set_ft_request_service_context(ri, service_context);
 
-    ACE_TRY_EX(block2) {
+    try{
 
       FTRT::TransactionDepth transaction_depth =
-        get_transaction_depth_context(ri
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block2);
+        get_transaction_depth_context(ri);
 
-      Request_Context_Repository().set_transaction_depth(ri, transaction_depth
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(block2);
+      Request_Context_Repository().set_transaction_depth(ri, transaction_depth);
     }
-    ACE_CATCH  (CORBA::BAD_PARAM, ex)   {
+    catch (const CORBA::BAD_PARAM&){
     }
-    ACE_ENDTRY;
 
     FTRT::SequenceNumber sequence_no =
-      get_sequence_number_context(ri ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+      get_sequence_number_context(ri);
 
-    Request_Context_Repository().set_sequence_number(ri, sequence_no
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(block1);
+    Request_Context_Repository().set_sequence_number(ri, sequence_no);
   }
-  ACE_CATCH  (CORBA::BAD_PARAM, ex)   {
+  catch (const CORBA::BAD_PARAM&){
   }
-  ACE_ENDTRY;
 }
 
 void
-FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                       ACE_ENV_ARG_DECL)
+FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
                                        ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::FTRequestServiceContext ft_request_service_context;
   IOP::ServiceContext_var service_context;
 
-  ACE_TRY {
+  try{
     retrieve_ft_request_context(ri,
       service_context,
-      ft_request_service_context
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      ft_request_service_context);
   }
-  ACE_CATCH (CORBA::BAD_PARAM, ex) {
+  catch (const CORBA::BAD_PARAM&){
     return;
   }
-  ACE_ENDTRY;
 
   request_table_.update(ft_request_service_context.client_id.in(),
     ft_request_service_context.retention_id,
@@ -309,16 +278,14 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt
 
 void
 FtEventServiceInterceptor::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-FtEventServiceInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+FtEventServiceInterceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr)
                                        ACE_THROW_SPEC ((CORBA::SystemException,
                                        PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 09a28a81257..4e7d566c74c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -54,42 +54,36 @@ public:
   ~FtEventServiceInterceptor();
 
   static FtEventServiceInterceptor* instance();
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
   void get_state(FtRtecEventChannelAdmin::CachedOptionResults& state);
   void set_state(const FtRtecEventChannelAdmin::CachedOptionResults& state);
 private:
-  PortableInterceptor::Current_var pic(PortableInterceptor::ServerRequestInfo_ptr ri
-                                       ACE_ENV_ARG_DECL);
+  PortableInterceptor::Current_var pic(PortableInterceptor::ServerRequestInfo_ptr ri);
 
   CORBA::ORB_var orb_;
   CachedRequestTable request_table_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 63d7801689e..a1c85c10f83 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -66,8 +66,7 @@ GroupInfoPublisherBase::backups() const
 GroupInfoPublisherBase::Info*
 GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
                                    int my_position,
-                                   CORBA::ULong object_group_ref_version
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::ULong object_group_ref_version)
 {
   Info_ptr result(new Info);
 
@@ -85,14 +84,10 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
   }
 
   CORBA::Object_var obj =
-    IOGR_Maker::instance()->make_iogr(iors,object_group_ref_version
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    IOGR_Maker::instance()->make_iogr(iors,object_group_ref_version);
 
   result->iogr =
-    ::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    ::FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
 
   ACE_DEBUG((LM_DEBUG, "In setup_info\n"));
   //log_obj_endpoints(result->iogr.in());
@@ -107,14 +102,10 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
       iors[i] = CORBA::Object::_duplicate(info_list[i+ my_position+1].ior.in());
     }
 
-    obj =  IOGR_Maker::instance()->merge_iors(iors
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    obj =  IOGR_Maker::instance()->merge_iors(iors);
 
     result->successor =
-      FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
   }
   /*
   else {
@@ -133,11 +124,9 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
   for (i = 0; i < successors_length; ++i)  {
     result->backups[i] =
       FtRtecEventChannelAdmin::EventChannel::_narrow(
-      info_list[i+ my_position+1].ior.in()
-      ACE_ENV_ARG_PARAMETER);
+      info_list[i+ my_position+1].ior.in());
     //CORBA::PolicyList_var pols;
     //result->backups[i]->_validate_connection (pols.out ());
-    ACE_CHECK_RETURN(0);
   }
   return result.release();
 }
@@ -154,15 +143,13 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info)
 
     if (!CORBA::is_nil(naming_context_.in())) {
       TAO_FTRTEC::Log(1, "Registering to the Name Service\n");
-      ACE_TRY_NEW_ENV {
+      try{
         naming_context_->rebind(FTRTEC::Identification_Service::instance()->name(),
-          info->iogr.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          info->iogr.in());
       }
-      ACE_CATCHALL {
+      catch (...){
         /// there's nothing we can do if the naming service is down
       }
-      ACE_ENDTRY;
     }
   }
   info_ = info;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index 8268bb2dd89..d21db5c3fa8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -54,8 +54,7 @@ public:
 
   Info* setup_info(const FTRT::ManagerInfoList & info_list,
               int my_position,
-              CORBA::ULong object_group_ref_version
-              ACE_ENV_ARG_DECL);
+              CORBA::ULong object_group_ref_version);
 
   void update_info(Info_ptr& info);
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index e64501e5e18..89dd7b88898 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -25,12 +25,10 @@ IOGR_Maker::IOGR_Maker()
 }
 
 void
-IOGR_Maker::init(CORBA::ORB_ptr orb
-                 ACE_ENV_ARG_DECL)
+IOGR_Maker::init(CORBA::ORB_ptr orb)
 {
     iorm_ = resolve_init<TAO_IOP::TAO_IOR_Manipulation>(orb,
-                                                        TAO_OBJID_IORMANIPULATION
-                                                        ACE_ENV_ARG_PARAMETER);
+                                                        TAO_OBJID_IORMANIPULATION);
     ft_tag_component_.group_domain_id = "ft_eventchannel";
     ft_tag_component_.object_group_id = 0;
     ft_tag_component_.object_group_ref_version = 0;
@@ -45,12 +43,11 @@ IOGR_Maker::instance()
 }
 
 CORBA::Object_ptr
-IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list
-                       ACE_ENV_ARG_DECL)
+IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list)
 {
   CORBA::Object_var obj;
   if (list.length() != 1)
-    obj = iorm_->merge_iors(list ACE_ENV_ARG_PARAMETER);
+    obj = iorm_->merge_iors(list);
   else
     obj = CORBA::Object::_duplicate(list[0]);
   return obj._retn();
@@ -59,20 +56,16 @@ IOGR_Maker::merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList& list
 
 CORBA::Object_ptr
 IOGR_Maker::make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList& list,
-                      CORBA::ULong object_group_ref_version
-                      ACE_ENV_ARG_DECL)
+                      CORBA::ULong object_group_ref_version)
 {
   /// generate a new IOGR if the object group changes.
-  CORBA::Object_var obj = merge_iors(list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
+  CORBA::Object_var obj = merge_iors(list);
 
   FT::TagFTGroupTaggedComponent ft_tag_component(ft_tag_component_);
   /// the generated IOGR should use a new object_group_ref_version
   ft_tag_component.object_group_ref_version = object_group_ref_version;
-  set_tag_components(obj.in(), list[0], ft_tag_component
-                     ACE_ENV_ARG_PARAMETER);
+  set_tag_components(obj.in(), list[0], ft_tag_component);
 
-  ACE_CHECK_RETURN(CORBA::Object::_nil());
   return obj._retn();
 }
 
@@ -84,8 +77,7 @@ void replace_key(char* ior, char* end_ior,
 
 
 CORBA::Object_ptr
-IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL)
+IOGR_Maker::forge_iogr(CORBA::Object_ptr obj)
 {
   /// forge an IOGR whose object_key is the same with that of \a obj.
   CORBA::Object_var merged;
@@ -93,11 +85,9 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
   FtRtecEventChannelAdmin::EventChannel_var successor
     = GroupInfoPublisher::instance()->successor();
   if (! CORBA::is_nil(successor.in())) {
-    TAO::ObjectKey_var newkey = obj->_key(ACE_ENV_SINGLE_ARG_PARAMETER);
+    TAO::ObjectKey_var newkey = obj->_key();
 
-    CORBA::Object_var new_base = ior_replace_key(successor.in(), newkey.in()
-                                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(CORBA::Object::_nil());
+    CORBA::Object_var new_base = ior_replace_key(successor.in(), newkey.in());
 
     if (CORBA::is_nil( new_base.in() ))
       return CORBA::Object::_nil();
@@ -107,9 +97,7 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
     TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
     TAO_Stub *stub = orb_core->create_stub (CORBA::string_dup(obj->_stubobj ()->type_id.in ()), // give the id string
-      base_profiles
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      base_profiles);
 
     // Make the stub memory allocation exception safe for the duration
     // of this method.
@@ -127,25 +115,20 @@ IOGR_Maker::forge_iogr(CORBA::Object_ptr obj
 
 
     merged =
-      iorm_->add_profiles(obj, temp_obj
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      iorm_->add_profiles(obj, temp_obj);
   }
   else
     merged = CORBA::Object::_duplicate(obj);
 
-  set_tag_components(merged.in(), obj, ft_tag_component_
-                     ACE_ENV_ARG_PARAMETER);
+  set_tag_components(merged.in(), obj, ft_tag_component_);
 
-  ACE_CHECK_RETURN(CORBA::Object::_nil ());
 
   return merged._retn();
 }
 
 CORBA::Object_ptr
 IOGR_Maker::ior_replace_key(CORBA::Object_ptr obj,
-                            const TAO::ObjectKey& key
-                            ACE_ENV_ARG_DECL)
+                            const TAO::ObjectKey& key)
 {
     TAO_OutputCDR out_cdr;
     if (!(out_cdr << obj))
@@ -155,8 +138,7 @@ IOGR_Maker::ior_replace_key(CORBA::Object_ptr obj,
 
     ACE_CDR::consolidate(&mb, out_cdr.begin());
 
-    TAO::ObjectKey_var old_key = obj->_key(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN(CORBA::Object::_nil ());
+    TAO::ObjectKey_var old_key = obj->_key();
 
     replace_key(mb.base(), mb.end(),
                 old_key.in(), key);
@@ -242,26 +224,20 @@ IOGR_Maker::get_ref_version() const
 
 void
 IOGR_Maker::set_tag_components(
-  CORBA::Object_ptr merged, 
+  CORBA::Object_ptr merged,
   CORBA::Object_ptr primary,
-  FT::TagFTGroupTaggedComponent& ft_tag_component
-  ACE_ENV_ARG_DECL)
+  FT::TagFTGroupTaggedComponent& ft_tag_component)
 {
     // set the primary
     TAO_FT_IOGR_Property prop (ft_tag_component);
 
 
-    prop.remove_primary_tag(merged
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    prop.remove_primary_tag(merged);
 
-    iorm_->set_primary (&prop, merged, primary
-                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    iorm_->set_primary (&prop, merged, primary);
       // Set the property
     iorm_->set_property (&prop,
-                        merged
-                        ACE_ENV_ARG_PARAMETER);
+                        merged);
 
 
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
index cbc933a61c8..682405edeb2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
@@ -27,8 +27,7 @@ class IOGR_Maker
 public:
   IOGR_Maker();
 
-  void init(CORBA::ORB_ptr orb
-            ACE_ENV_ARG_DECL);
+  void init(CORBA::ORB_ptr orb);
 
   /// instance() will only return a valid object after an
   /// instance is explicitly created by client and init() is called.
@@ -36,22 +35,18 @@ public:
 
    /// Create a new object reference by merging the profiles lists in the
    /// supplied list of one or more object references.
-  CORBA::Object_ptr merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList&
-                              ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr merge_iors(const TAO_IOP::TAO_IOR_Manipulation::IORList&);
 
    /// Create a new IOGR (with FT_PRIMARY and FT_GROUP components) by merging
    /// the profiles lists in the supplied list of one or more object references.
   CORBA::Object_ptr make_iogr(const TAO_IOP::TAO_IOR_Manipulation::IORList&,
-                              CORBA::ULong object_group_ref_version
-                              ACE_ENV_ARG_DECL);
+                              CORBA::ULong object_group_ref_version);
 
   /// Make an new IOGR with obj as primary.
-  CORBA::Object_ptr forge_iogr(CORBA::Object_ptr obj
-                               ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr forge_iogr(CORBA::Object_ptr obj);
 
   CORBA::Object_ptr ior_replace_key(CORBA::Object_ptr obj,
-                                    const TAO::ObjectKey& key
-                                    ACE_ENV_ARG_DECL);
+                                    const TAO::ObjectKey& key);
 
   bool copy_ft_group_component(CORBA::Object_ptr obj);
 
@@ -62,10 +57,9 @@ public:
   CORBA::ULong get_ref_version() const;
 
 private:
-  void set_tag_components(CORBA::Object_ptr merged, 
+  void set_tag_components(CORBA::Object_ptr merged,
                           CORBA::Object_ptr primary,
-                          FT::TagFTGroupTaggedComponent& ft_tag_component
-                          ACE_ENV_ARG_DECL);
+                          FT::TagFTGroupTaggedComponent& ft_tag_component);
   TAO_IOP::TAO_IOR_Manipulation_var iorm_;
   FT::TagFTGroupTaggedComponent ft_tag_component_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
index fbb8c4166a4..37a69cd8ceb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
@@ -11,8 +11,7 @@ ObjectGroupManagerHandler::ObjectGroupManagerHandler(
 
 void
 ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
-                                  const FTRT::Location & the_location
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  const FTRT::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ami_return_val);
@@ -20,27 +19,25 @@ ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
 }
 
 void
-ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void ObjectGroupManagerHandler::create_group (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void ObjectGroupManagerHandler::create_group (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 
 void
-ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-ObjectGroupManagerHandler::add_member (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::add_member (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (--num_backups_ ==0)
@@ -48,22 +45,20 @@ ObjectGroupManagerHandler::add_member (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *
-                                             ACE_ENV_ARG_DECL)
+ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->add_member(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->add_member();
 }
 
 void
-ObjectGroupManagerHandler::set_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::set_state (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder *
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+ObjectGroupManagerHandler::set_state_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index 8a3938a6c65..252d0df335d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -23,33 +23,28 @@ class ObjectGroupManagerHandler
 public:
   ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups);
   virtual void start (CORBA::Boolean ami_return_val,
-                      const FTRT::Location & the_location
-                      ACE_ENV_ARG_DECL)
+                      const FTRT::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start_excep (::Messaging::ExceptionHolder * excep_holder
-                            ACE_ENV_ARG_DECL)
+  virtual void start_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void create_group (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void create_group (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder
-                                   ACE_ENV_ARG_DECL)
+  virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void add_member (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void add_member (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder
-                                 ACE_ENV_ARG_DECL)
+  virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_state (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void set_state (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder
-                                ACE_ENV_ARG_DECL)
+  virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   ACE_Auto_Event& evt_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
index 8708b6a33d7..08b889297b7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -26,8 +26,7 @@ void ProxyConsumerStateWorker::set_size(size_t size)
   index_ = 0;
 }
 
-void ProxyConsumerStateWorker::work(TAO_EC_ProxyPushConsumer* object
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+void ProxyConsumerStateWorker::work(TAO_EC_ProxyPushConsumer* object)
 {
   TAO_FTEC_ProxyPushConsumer* proxy =
     static_cast<TAO_FTEC_ProxyPushConsumer*> (object);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
index 1610cd90ef1..c4335787ee7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
@@ -31,8 +31,7 @@ public:
   ~ProxyConsumerStateWorker();
 
   virtual void set_size(size_t size);
-  virtual void work(TAO_EC_ProxyPushConsumer* object
-                    ACE_ENV_ARG_DECL);
+  virtual void work(TAO_EC_ProxyPushConsumer* object);
 private:
   int index_;
   FtRtecEventChannelAdmin::ProxyConsumerStates& consumerStates_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
index 5618c2d373f..8f47fd1c894 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
@@ -27,8 +27,7 @@ void ProxySupplierStateWorker::set_size(size_t size)
   index_ = 0;
 }
 
-void ProxySupplierStateWorker::work(TAO_EC_ProxyPushSupplier* object
-            ACE_ENV_ARG_DECL_NOT_USED)
+void ProxySupplierStateWorker::work(TAO_EC_ProxyPushSupplier* object)
 {
   TAO_FTEC_ProxyPushSupplier* proxy =
     static_cast<TAO_FTEC_ProxyPushSupplier*> (object);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
index cf9516d100d..3d3cc9aae16 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
@@ -31,8 +31,7 @@ public:
   ~ProxySupplierStateWorker();
 
   virtual void set_size(size_t size);
-  virtual void work(TAO_EC_ProxyPushSupplier* object
-            ACE_ENV_ARG_DECL);
+  virtual void work(TAO_EC_ProxyPushSupplier* object);
 private:
   int index_;
   FtRtecEventChannelAdmin::ProxySupplierStates& supplierStates_;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
index 753cd359248..37e068530ee 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp
@@ -77,7 +77,7 @@ namespace FTRTEC
 
      ACE_AUTO_PTR_RESET (replication_strategy, strategy, Replication_Strategy);
 
-      ACE_TRY_NEW_ENV
+      try
       {
         PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
           PortableInterceptor::ORBInitializer::_nil ();
@@ -87,21 +87,16 @@ namespace FTRTEC
         ACE_NEW_THROW_EX (temp_orb_initializer,
           FTEC_ORBInitializer,
           CORBA::NO_MEMORY ());
-        ACE_TRY_CHECK;
         orb_initializer = temp_orb_initializer;
 
-        PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        PortableInterceptor::register_orb_initializer (orb_initializer.in ());
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-          "Unexpected exception caught while "
-          "initializing the TransactionDepth");
+        ex._tao_print_exception (
+          "Unexpected exception caught while ""initializing the TransactionDepth");
         return -1;
       }
-      ACE_ENDTRY;
     return 0;
   }
 
@@ -120,15 +115,14 @@ namespace FTRTEC
     }
   }
 
-  void Replication_Service::check_validity(ACE_ENV_SINGLE_ARG_DECL)
+  void Replication_Service::check_validity(void)
   {
-    replication_strategy->check_validity(ACE_ENV_SINGLE_ARG_PARAMETER);
+    replication_strategy->check_validity();
   }
 
 
   void Replication_Service::replicate_request(const FtRtecEventChannelAdmin::Operation& update,
-    RollbackOperation rollback
-    ACE_ENV_ARG_DECL)
+    RollbackOperation rollback)
   {
     TAO_OutputCDR cdr;
     cdr << update;
@@ -156,15 +150,13 @@ namespace FTRTEC
     replication_strategy->replicate_request(
       state,
       rollback,
-      update.object_id
-      ACE_ENV_ARG_PARAMETER);
+      update.object_id);
   }
 
   void Replication_Service::add_member(const FTRT::ManagerInfo & info,
-                                       CORBA::ULong object_group_ref_version
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ULong object_group_ref_version)
   {
-    replication_strategy->add_member(info, object_group_ref_version ACE_ENV_ARG_PARAMETER);
+    replication_strategy->add_member(info, object_group_ref_version);
   }
 
   int  Replication_Service::acquire_read (void)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index e1deca2f103..9d9d9dd128d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -45,10 +45,10 @@ namespace FTRTEC
     /**
      * Used for checking if the incoming replication message is out of sequence.
      */
-    void check_validity(ACE_ENV_SINGLE_ARG_DECL);
+    void check_validity(void);
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-      (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
+      (const FtRtecEventChannelAdmin::ObjectId&);
 
    /**
     * Replicate a request.
@@ -57,16 +57,14 @@ namespace FTRTEC
     * @param rollback The rollback operation when the replication failed.
     */
     void replicate_request(const FtRtecEventChannelAdmin::Operation& update,
-      RollbackOperation rollback
-      ACE_ENV_ARG_DECL);
+      RollbackOperation rollback);
 
    /**
     * Inform the backup replicas that a new replica has joined the object
     * group.
     */
     void add_member(const FTRT::ManagerInfo & info,
-                    CORBA::ULong object_group_ref_version
-                    ACE_ENV_ARG_DECL);
+                    CORBA::ULong object_group_ref_version);
 
     int  acquire_read (void);
     int  acquire_write (void);
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
index f7cc5f524f7..db6c4497c52 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
@@ -21,7 +21,7 @@ Replication_Strategy::~Replication_Strategy()
 
 
 void
-Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Replication_Strategy::check_validity(void)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
index 8c661ee0ee8..17bbebfbe16 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -37,10 +37,10 @@ public:
    * used for basic replication strategy. It throws FTRT::OutOfSequence when the
    * incoming request is not valid.
    */
-    virtual void check_validity(ACE_ENV_SINGLE_ARG_DECL);
+    virtual void check_validity(void);
 
     typedef void (FtRtecEventChannelAdmin::EventChannelFacade::*RollbackOperation)
-      (const FtRtecEventChannelAdmin::ObjectId& ACE_ENV_ARG_DECL);
+      (const FtRtecEventChannelAdmin::ObjectId&);
 
   /**
    * Replicate a request.
@@ -51,16 +51,14 @@ public:
    */
     virtual void replicate_request(const FTRT::State& state,
                                    RollbackOperation rollback,
-                                   const FtRtecEventChannelAdmin::ObjectId& oid
-                                   ACE_ENV_ARG_DECL)=0;
+                                   const FtRtecEventChannelAdmin::ObjectId& oid)=0;
 
   /**
    * Inform the backup replicas that a new replica has joined the object
    * group.
    */
   virtual void add_member(const FTRT::ManagerInfo & info,
-                          CORBA::ULong object_group_ref_version
-                          ACE_ENV_ARG_DECL)=0;
+                          CORBA::ULong object_group_ref_version)=0;
 
   virtual Replication_Strategy* make_primary_strategy();
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index f04af729152..4247e0e285c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -27,14 +27,13 @@ ACE_TSS<FtRtecEventChannelAdmin::ObjectId> oid;
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info
-            ACE_ENV_ARG_DECL)
+Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info)
 {
-  object_id_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  cached_result_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  seq_num_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ft_request_service_context_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  transaction_depth_slot = info->allocate_slot_id(ACE_ENV_SINGLE_ARG_PARAMETER);
+  object_id_slot = info->allocate_slot_id();
+  cached_result_slot = info->allocate_slot_id();
+  seq_num_slot = info->allocate_slot_id();
+  ft_request_service_context_slot = info->allocate_slot_id();
+  transaction_depth_slot = info->allocate_slot_id();
 }
 
 void
@@ -44,40 +43,31 @@ Request_Context_Repository::init(CORBA::ORB_ptr the_orb)
 }
 
 void Request_Context_Repository::generate_object_id(
-  FtRtecEventChannelAdmin::ObjectId& oid
-  ACE_ENV_ARG_DECL)
+  FtRtecEventChannelAdmin::ObjectId& oid)
 {
   oid.length(sizeof(UUID));
   UUID::create(oid.get_buffer());
-  set_object_id(oid
-                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  set_object_id(oid);
 }
 
 void
 Request_Context_Repository::set_object_id(
-  const FtRtecEventChannelAdmin::ObjectId& object_id
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const FtRtecEventChannelAdmin::ObjectId& object_id)
 {
   /*
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
   CORBA::Any a;
   a <<= object_id;
-  pic->set_slot(object_id_slot, a
-                ACE_ENV_ARG_PARAMETER);
+  pic->set_slot(object_id_slot, a);
 
-  ACE_CHECK;
   */
   *oid = object_id;
 }
 
 FtRtecEventChannelAdmin::ObjectId_var
-get_object_id(CORBA::Any_var a
-              ACE_ENV_ARG_DECL)
+get_object_id(CORBA::Any_var a)
 {
   FtRtecEventChannelAdmin::ObjectId *object_id, *r;
   FtRtecEventChannelAdmin::ObjectId_var result;
@@ -95,20 +85,15 @@ get_object_id(CORBA::Any_var a
 
 
 FtRtecEventChannelAdmin::ObjectId_var
-Request_Context_Repository::get_object_id(ACE_ENV_SINGLE_ARG_DECL)
+Request_Context_Repository::get_object_id(void)
 {
   /*
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var());
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
-  CORBA::Any_var a = pic->get_slot(object_id_slot
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var());
+  CORBA::Any_var a = pic->get_slot(object_id_slot);
 
-  return ::get_object_id(a
-                         ACE_ENV_ARG_PARAMETER);
+  return ::get_object_id(a);
   */
   FtRtecEventChannelAdmin::ObjectId *object_id;
   ACE_NEW_THROW_EX(object_id,
@@ -119,98 +104,79 @@ Request_Context_Repository::get_object_id(ACE_ENV_SINGLE_ARG_DECL)
 
 FtRtecEventChannelAdmin::ObjectId_var
 Request_Context_Repository::get_object_id(
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-  CORBA::Any_var a = ri->get_slot(object_id_slot
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(FtRtecEventChannelAdmin::ObjectId_var());
+  CORBA::Any_var a = ri->get_slot(object_id_slot);
 
-  return ::get_object_id(a
-                         ACE_ENV_ARG_PARAMETER);
+  return ::get_object_id(a);
 
 }
 
 void
 Request_Context_Repository::set_cached_result(
   PortableInterceptor::ServerRequestInfo_ptr ri,
-  const CORBA::Any& result
-  ACE_ENV_ARG_DECL)
+  const CORBA::Any& result)
 {
   ri->set_slot(cached_result_slot,
-               result ACE_ENV_ARG_PARAMETER);
+               result);
 }
 
 CORBA::Any_ptr
-Request_Context_Repository::get_cached_result(ACE_ENV_SINGLE_ARG_DECL)
+Request_Context_Repository::get_cached_result(void)
 {
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
-  CORBA::Any_var a = pic->get_slot(cached_result_slot
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+  CORBA::Any_var a = pic->get_slot(cached_result_slot);
   return a._retn();
 }
 
 bool Request_Context_Repository::is_executed_request()
 {
-  ACE_TRY_NEW_ENV {
-    CORBA::Any_var any = get_cached_result(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    CORBA::Any_var any = get_cached_result();
     CORBA::TypeCode_var type = any->type();
-    CORBA::TCKind const kind = type->kind(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::TCKind const kind = type->kind();
     return kind != CORBA::tk_null;
   }
-  ACE_CATCHALL {
+  catch (...){
   }
-  ACE_ENDTRY;
   return false;
 }
 
 void
 Request_Context_Repository::set_sequence_number(
   PortableInterceptor::ServerRequestInfo_ptr ri,
-  FTRT::SequenceNumber seq_num
-  ACE_ENV_ARG_DECL)
+  FTRT::SequenceNumber seq_num)
 {
   CORBA::Any a;
 
   a <<= seq_num;
 
-  ri->set_slot(seq_num_slot, a ACE_ENV_ARG_PARAMETER);
+  ri->set_slot(seq_num_slot, a);
 }
 
 void
 Request_Context_Repository::set_sequence_number(
-  FTRT::SequenceNumber seq_num
-  ACE_ENV_ARG_DECL)
+  FTRT::SequenceNumber seq_num)
 {
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
   CORBA::Any a;
 
   a <<= seq_num;
 
-  pic->set_slot(seq_num_slot, a ACE_ENV_ARG_PARAMETER);
+  pic->set_slot(seq_num_slot, a);
 }
 
 
 FTRT::SequenceNumber
-Request_Context_Repository::get_sequence_number(ACE_ENV_SINGLE_ARG_DECL)
+Request_Context_Repository::get_sequence_number(void)
 {
   PortableInterceptor::Current_var pic =
-    resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
-  CORBA::Any_var a = pic->get_slot(seq_num_slot ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
+  CORBA::Any_var a = pic->get_slot(seq_num_slot);
   FTRT::SequenceNumber result  = 0;
   a >>= result;
   return result;
@@ -218,11 +184,9 @@ Request_Context_Repository::get_sequence_number(ACE_ENV_SINGLE_ARG_DECL)
 
 FTRT::SequenceNumber
 Request_Context_Repository::get_sequence_number(
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-  CORBA::Any_var a = ri->get_slot(seq_num_slot ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+  CORBA::Any_var a = ri->get_slot(seq_num_slot);
   FTRT::SequenceNumber result  = 0;
   a >>= result;
   return result;
@@ -231,63 +195,48 @@ Request_Context_Repository::get_sequence_number(
 void
 Request_Context_Repository::set_ft_request_service_context(
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    IOP::ServiceContext_var service_context
-    ACE_ENV_ARG_DECL)
+    IOP::ServiceContext_var service_context)
 {
   CORBA::Any a;
   a <<= service_context.in();
-  ri->set_slot(ft_request_service_context_slot,a
-               ACE_ENV_ARG_PARAMETER);
+  ri->set_slot(ft_request_service_context_slot,a);
 }
 
 CORBA::Any_var
 Request_Context_Repository::get_ft_request_service_context(
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-  return ri->get_slot(ft_request_service_context_slot
-                   ACE_ENV_ARG_PARAMETER);
+  return ri->get_slot(ft_request_service_context_slot);
 }
 
 void
 Request_Context_Repository::set_transaction_depth(
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    FTRT::TransactionDepth depth
-    ACE_ENV_ARG_DECL)
+    FTRT::TransactionDepth depth)
 {
   CORBA::Any a;
   a <<= depth;
-  ri->set_slot(transaction_depth_slot,a
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ri->set_slot(transaction_depth_slot,a);
 }
 
 void
 Request_Context_Repository::set_transaction_depth(
-    FTRT::TransactionDepth depth
-    ACE_ENV_ARG_DECL)
+    FTRT::TransactionDepth depth)
 {
   PortableInterceptor::Current_var pic =
-      resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
   CORBA::Any a;
   a <<= depth;
-  pic->set_slot(transaction_depth_slot,a
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  pic->set_slot(transaction_depth_slot,a);
 }
 
 
 FTRT::TransactionDepth
 Request_Context_Repository::get_transaction_depth(
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
 {
-  CORBA::Any_var a = ri->get_slot(transaction_depth_slot
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+  CORBA::Any_var a = ri->get_slot(transaction_depth_slot);
   FTRT::TransactionDepth result=0;
   a >>= result;
   return result;
@@ -295,17 +244,12 @@ Request_Context_Repository::get_transaction_depth(
 }
 
 FTRT::TransactionDepth
-Request_Context_Repository::get_transaction_depth(
-    ACE_ENV_SINGLE_ARG_DECL)
+Request_Context_Repository::get_transaction_depth()
 {
   PortableInterceptor::Current_var pic =
-      resolve_init<PortableInterceptor::Current>(orb, "PICurrent"
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+      resolve_init<PortableInterceptor::Current>(orb, "PICurrent");
 
-  CORBA::Any_var a = pic->get_slot(transaction_depth_slot
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+  CORBA::Any_var a = pic->get_slot(transaction_depth_slot);
 
   FTRT::TransactionDepth result=0;
   a >>= result;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
index 542f58937ea..87e727382ec 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
@@ -54,61 +54,47 @@ public:
    * Used by ORBInitializer to allocate required slots for
    * FTEC.
    */
-  void allocate_slots(PortableInterceptor::ORBInitInfo_ptr info
-            ACE_ENV_ARG_DECL);
+  void allocate_slots(PortableInterceptor::ORBInitInfo_ptr info);
 
 
-  void generate_object_id(FtRtecEventChannelAdmin::ObjectId& object_id
-                          ACE_ENV_ARG_DECL);
-  void set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id
-                     ACE_ENV_ARG_DECL);
-  FtRtecEventChannelAdmin::ObjectId_var get_object_id(ACE_ENV_SINGLE_ARG_DECL);
+  void generate_object_id(FtRtecEventChannelAdmin::ObjectId& object_id);
+  void set_object_id(const FtRtecEventChannelAdmin::ObjectId& object_id);
+  FtRtecEventChannelAdmin::ObjectId_var get_object_id(void);
   FtRtecEventChannelAdmin::ObjectId_var
-    get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri
-                  ACE_ENV_ARG_DECL);
+    get_object_id(PortableInterceptor::ServerRequestInfo_ptr ri);
 
   void set_cached_result(PortableInterceptor::ServerRequestInfo_ptr ri,
-                         const CORBA::Any& result
-                         ACE_ENV_ARG_DECL);
+                         const CORBA::Any& result);
 
-  CORBA::Any_ptr get_cached_result(ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Any_ptr get_cached_result(void);
   bool is_executed_request();
 
   void set_sequence_number(PortableInterceptor::ServerRequestInfo_ptr ri,
-                           FTRT::SequenceNumber
-                           ACE_ENV_ARG_DECL);
+                           FTRT::SequenceNumber);
 
-  void set_sequence_number(FTRT::SequenceNumber
-                           ACE_ENV_ARG_DECL);
-  FTRT::SequenceNumber get_sequence_number(PortableInterceptor::ClientRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL);
+  void set_sequence_number(FTRT::SequenceNumber);
+  FTRT::SequenceNumber get_sequence_number(PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  FTRT::SequenceNumber get_sequence_number(ACE_ENV_SINGLE_ARG_DECL);
+  FTRT::SequenceNumber get_sequence_number(void);
 
   void set_ft_request_service_context(
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    IOP::ServiceContext_var service_context
-    ACE_ENV_ARG_DECL);
+    IOP::ServiceContext_var service_context);
 
   CORBA::Any_var get_ft_request_service_context(
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL);
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   void set_transaction_depth(
     PortableInterceptor::ServerRequestInfo_ptr ri,
-    FTRT::TransactionDepth depth
-    ACE_ENV_ARG_DECL);
+    FTRT::TransactionDepth depth);
 
  void set_transaction_depth(
-    FTRT::TransactionDepth depth
-    ACE_ENV_ARG_DECL);
+    FTRT::TransactionDepth depth);
 
- FTRT::TransactionDepth get_transaction_depth(
-    ACE_ENV_SINGLE_ARG_DECL);
+ FTRT::TransactionDepth get_transaction_depth();
 
  FTRT::TransactionDepth get_transaction_depth(
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL);
+    PortableInterceptor::ClientRequestInfo_ptr);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 58e96befd06..9434df42bf9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -21,22 +21,21 @@ TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor (void)
 }
 
 char *
-TAO_Set_Update_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Set_Update_Interceptor::name (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-TAO_Set_Update_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Set_Update_Interceptor::destroy (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_Set_Update_Interceptor::send_poll (
-                                   PortableInterceptor::ClientRequestInfo_ptr
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   PortableInterceptor::ClientRequestInfo_ptr)
                                    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
@@ -44,40 +43,35 @@ TAO_Set_Update_Interceptor::send_poll (
 
 void
 TAO_Set_Update_Interceptor::send_request (
-                                      PortableInterceptor::ClientRequestInfo_ptr ri
-                                      ACE_ENV_ARG_DECL)
+                                      PortableInterceptor::ClientRequestInfo_ptr ri)
                                       ACE_THROW_SPEC ((CORBA::SystemException,
                                       PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   if (strcmp(operation.in(), "set_update")==0 ||
     strcmp(operation.in(), "oneway_set_update") ==0) {
-      CORBA::Any_var a = Request_Context_Repository().get_ft_request_service_context(ri
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var a = Request_Context_Repository().get_ft_request_service_context(ri);
 
       IOP::ServiceContext* sc;
 
       if ((a.in() >>= sc) ==0)
         return;
 
-      ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_request_service_context (*sc, 0);
 
       FTRT::TransactionDepth transaction_depth =
-        Request_Context_Repository().get_transaction_depth(ri ACE_ENV_ARG_PARAMETER);
+        Request_Context_Repository().get_transaction_depth(ri);
       TAO_OutputCDR cdr;
       ACE_Message_Block mb;
 
       if (transaction_depth) {
         if (!(cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
-          ACE_THROW (CORBA::MARSHAL ());
+          throw CORBA::MARSHAL ();
 
         // Add Transaction Depth Context
         if ((cdr << transaction_depth) == 0)
-          ACE_THROW (CORBA::MARSHAL ());
+          throw CORBA::MARSHAL ();
         sc->context_id = FTRT::FT_TRANSACTION_DEPTH;
 
         ACE_CDR::consolidate(&mb, cdr.begin());
@@ -97,8 +91,7 @@ TAO_Set_Update_Interceptor::send_request (
           }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-        ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        ri->add_request_service_context (*sc, 0);
 
         cdr.reset();
       }
@@ -106,14 +99,14 @@ TAO_Set_Update_Interceptor::send_request (
       // Add Sequence Number Context
 
       FTRT::SequenceNumber sequence_number =
-        Request_Context_Repository().get_sequence_number(ri ACE_ENV_ARG_PARAMETER);
+        Request_Context_Repository().get_sequence_number(ri);
 
       ACE_DEBUG((LM_DEBUG, "send_request : sequence_number = %d\n", sequence_number));
       if (sequence_number != 0) {
         if (!(cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
-          ACE_THROW (CORBA::MARSHAL ());
+          throw CORBA::MARSHAL ();
         if ((cdr << sequence_number) == 0)
-          ACE_THROW (CORBA::MARSHAL ());
+          throw CORBA::MARSHAL ();
         sc->context_id = FTRT::FT_SEQUENCE_NUMBER;
 
         ACE_CDR::consolidate(&mb, cdr.begin());
@@ -133,24 +126,21 @@ TAO_Set_Update_Interceptor::send_request (
           }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-        ri->add_request_service_context (*sc, 0 ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        ri->add_request_service_context (*sc, 0);
       }
     }
 }
 
 void
 TAO_Set_Update_Interceptor::receive_reply (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_Set_Update_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -158,8 +148,7 @@ TAO_Set_Update_Interceptor::receive_other (
 
 void
 TAO_Set_Update_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
index c164c238281..e8f28530c9d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
@@ -47,33 +47,28 @@ public:
   virtual ~TAO_Set_Update_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
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
     PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
     PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
     PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index fadeb16f0e0..5806ef940fd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -23,35 +23,29 @@ UpdateableHandler::~UpdateableHandler()
 
 FTRT::AMI_UpdateableHandler_ptr UpdateableHandler::activate(
   Update_Manager* mgr, int id,
-  PortableServer::ObjectId& object_id
-  ACE_ENV_ARG_DECL)
+  PortableServer::ObjectId& object_id)
 {
   object_id.length(sizeof(mgr) + sizeof(id));
   memcpy(object_id.get_buffer(), &mgr, sizeof(mgr));
   memcpy(object_id.get_buffer() + sizeof(mgr), &id, sizeof(id));
   strategy_->poa()->activate_object_with_id(object_id,
-                                            this
-                                            ACE_ENV_ARG_PARAMETER);
+                                            this);
   CORBA::Object_var object = strategy_->poa()->id_to_reference(
-    object_id
-    ACE_ENV_ARG_PARAMETER);
+    object_id);
 
-  return FTRT::AMI_UpdateableHandler::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
+  return FTRT::AMI_UpdateableHandler::_narrow(object.in());
 }
 
 
 
-void UpdateableHandler::dispatch(UpdateableHandler::Handler handler ACE_ENV_ARG_DECL)
+void UpdateableHandler::dispatch(UpdateableHandler::Handler handler)
 {
   PortableServer::Current_var current =
     resolve_init<PortableServer::Current>(strategy_->orb(),
-    "POACurrent"
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    "POACurrent");
 
   PortableServer::ObjectId_var object_id =
-    current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    current->get_object_id();
 
   Update_Manager* mgr;
   int id;
@@ -67,34 +61,30 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler ACE_ENV_ARG_
 }
 
 void UpdateableHandler::set_update (
-                                    ACE_ENV_SINGLE_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                     CORBA::SystemException
                                     ))
 {
   ACE_DEBUG((LM_DEBUG,"Received reply from "));
-  dispatch(&Update_Manager::handle_reply ACE_ENV_ARG_PARAMETER);
+  dispatch(&Update_Manager::handle_reply);
 }
 void UpdateableHandler::set_update_excep (
   ::Messaging::ExceptionHolder * excep_holder
-  ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
   CORBA::SystemException
   ))
 {
   ACE_DEBUG((LM_DEBUG, "Received Exception from"));
-  ACE_TRY {
+  try{
     excep_holder->raise_exception();
-    ACE_TRY_CHECK;
   }
-  ACE_CATCHANY {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A corba exception\n");
+  catch (const CORBA::Exception& ex){
+    ex._tao_print_exception ("A corba exception\n");
   }
-  ACE_ENDTRY;
 
-  dispatch(&Update_Manager::handle_exception ACE_ENV_ARG_PARAMETER);
+  dispatch(&Update_Manager::handle_exception);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
index 48f621bc1ef..14bb614b20d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
@@ -31,21 +31,18 @@ public:
 
     FTRT::AMI_UpdateableHandler_ptr activate(
       Update_Manager* mgr, int id,
-      PortableServer::ObjectId& oid
-      ACE_ENV_ARG_DECL);
+      PortableServer::ObjectId& oid);
     typedef void (Update_Manager::*Handler)(int);
 
-    void dispatch(Handler handler ACE_ENV_ARG_DECL) ;
+    void dispatch(Handler handler) ;
 
     virtual void set_update (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         ));
     virtual void set_update_excep (
         ::Messaging::ExceptionHolder * excep_holder
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
index fe5cd5dbe41..8485efd4868 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
@@ -11,37 +11,27 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
                                               PortableServer::POAManager_var mgr,
                                               const char* name,
-                                              CORBA::PolicyList& policy_list
-                                              ACE_ENV_ARG_DECL)
+                                              CORBA::PolicyList& policy_list)
 {
   PortableServer::POA_var result;
     PortableServer::LifespanPolicy_var lifespan =
-    root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(result);
+    root_poa->create_lifespan_policy(PortableServer::PERSISTENT);
 
   // create a USER_ID IdAssignmentPolicy object
   PortableServer::IdAssignmentPolicy_var assign =
-    root_poa->create_id_assignment_policy(PortableServer::USER_ID
-    ACE_ENV_ARG_PARAMETER);
-   ACE_CHECK_RETURN(result);
+    root_poa->create_id_assignment_policy(PortableServer::USER_ID);
 
   // create PolicyList.
   size_t orig_len =  policy_list.length();
   policy_list.length(orig_len+2);
-   ACE_CHECK_RETURN(result);
   policy_list[orig_len+0]=
     PortableServer::LifespanPolicy::_duplicate(lifespan.in());
-   ACE_CHECK_RETURN(result);
   policy_list[orig_len+1]=
     PortableServer::IdAssignmentPolicy::_duplicate(assign.in());
-   ACE_CHECK_RETURN(result);
 
   // create the child POA
-  result = root_poa->create_POA(name, mgr.in(), policy_list
-    ACE_ENV_ARG_PARAMETER);
+  result = root_poa->create_POA(name, mgr.in(), policy_list);
 
-   ACE_CHECK_RETURN(result);
 
   return result;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
index cd41683ea61..ccd5357e8a9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
@@ -22,8 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 PortableServer::POA_var create_persistent_poa(PortableServer::POA_var root_poa,
                                               PortableServer::POAManager_var mgr,
                                               const char* name,
-                                              CORBA::PolicyList& policy_list
-                                              ACE_ENV_ARG_DECL);
+                                              CORBA::PolicyList& policy_list);
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index afbbaf3d051..f36a3765d6c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -24,7 +24,7 @@ public:
   ~FTEC_Gateway_ConsumerAdmin();
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_supplier (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
   FTEC_Gateway_Impl* impl_;
 };
@@ -37,7 +37,7 @@ public:
   ~FTEC_Gateway_SupplierAdmin();
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_consumer (void)
           ACE_THROW_SPEC ((CORBA::SystemException));
   FTEC_Gateway_Impl* impl_;
 };
@@ -51,16 +51,15 @@ public:
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL_NOT_USED)
+                const RtecEventChannelAdmin::ConsumerQOS &qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void suspend_connection (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void resume_connection (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   FTEC_Gateway_Impl* impl_;
 };
@@ -72,17 +71,15 @@ public:
   FTEC_Gateway_ProxyPushConsumer(FTEC_Gateway_Impl* impl);
   ~FTEC_Gateway_ProxyPushConsumer();
 
-  virtual void push (const RtecEventComm::EventSet & data
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void push (const RtecEventComm::EventSet & data)
       ACE_THROW_SPEC ((CORBA::SystemException));
       // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos
-                ACE_ENV_ARG_DECL_NOT_USED)
+                const RtecEventChannelAdmin::SupplierQOS& qos)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   FTEC_Gateway_Impl* impl_;
@@ -93,10 +90,10 @@ class PushConsumerHandler : public POA_FtRtecEventComm::AMI_PushConsumerHandler
 public:
   PushConsumerHandler();
   ~PushConsumerHandler();
-  virtual void push (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void push (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void push_excep (::Messaging::ExceptionHolder * excep_holder ACE_ENV_ARG_DECL)
+  virtual void push_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -106,13 +103,13 @@ public:
 class Interceptor_Destoryer : public TAO_ORB_Core
 {
 public:
-  inline static void execute(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) {
-    static_cast<Interceptor_Destoryer*> (orb->orb_core())->do_it(ACE_ENV_SINGLE_ARG_PARAMETER);
+  inline static void execute(CORBA::ORB_ptr orb) {
+    static_cast<Interceptor_Destoryer*> (orb->orb_core())->do_it();
   }
 private:
   Interceptor_Destoryer();
-  inline void do_it(ACE_ENV_SINGLE_ARG_DECL) {
-    destroy_interceptors(ACE_ENV_SINGLE_ARG_PARAMETER);
+  inline void do_it(void) {
+    destroy_interceptors();
   };
 };
 
@@ -158,7 +155,7 @@ FTEC_Gateway::~FTEC_Gateway()
 }
 
 RtecEventChannelAdmin::EventChannel_ptr
-FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
+FTEC_Gateway::activate(PortableServer::POA_ptr root_poa)
 {
   PortableServer::POA_var poa;
   PortableServer::POAManager_var mgr;
@@ -166,42 +163,30 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
   if (impl_->local_orb) {
     int argc = 0;
     char** argv = 0;
-    impl_->orb = CORBA::ORB_init(argc, argv, "FTEC_GatewayORB"
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    impl_->orb = CORBA::ORB_init(argc, argv, "FTEC_GatewayORB");
 
-    Interceptor_Destoryer::execute(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
+    Interceptor_Destoryer::execute(impl_->orb.in());
 
-    poa = resolve_init<PortableServer::POA>(impl_->orb.in(), "RootPOA"
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    poa = resolve_init<PortableServer::POA>(impl_->orb.in(), "RootPOA");
 
-    mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    mgr = poa->the_POAManager();
 
-    mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
+    mgr->activate();
   }
   else {
     poa = PortableServer::POA::_duplicate(root_poa);
-    mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
+    mgr = poa->the_POAManager();
   }
-  ACE_CHECK_RETURN(0);
 
   PortableServer::IdUniquenessPolicy_var id_uniqueness_policy =
-    poa->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    poa->create_id_uniqueness_policy(PortableServer::MULTIPLE_ID);
 
   PortableServer::LifespanPolicy_var lifespan =
-    poa->create_lifespan_policy(PortableServer::PERSISTENT
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    poa->create_lifespan_policy(PortableServer::PERSISTENT);
 
   // create a USER_ID IdAssignmentPolicy object
   PortableServer::IdAssignmentPolicy_var assign =
-    poa->create_id_assignment_policy(PortableServer::USER_ID
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    poa->create_id_assignment_policy(PortableServer::USER_ID);
 
   CORBA::PolicyList policy_list;
   policy_list.length(3);
@@ -213,9 +198,7 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
   policy_list[2]=
     PortableServer::IdAssignmentPolicy::_duplicate(assign.in());
 
-  impl_->poa = poa->create_POA("gateway_poa", mgr.in(), policy_list
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+  impl_->poa = poa->create_POA("gateway_poa", mgr.in(), policy_list);
 
   id_uniqueness_policy->destroy();
   lifespan->destroy();
@@ -227,79 +210,71 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa ACE_ENV_ARG_DECL)
 
   RtecEventChannelAdmin::EventChannel_var gateway;
 
-  activate_object_with_id(gateway.out(), impl_->poa.in(), this, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+  activate_object_with_id(gateway.out(), impl_->poa.in(), this, oid);
   ++oid[9];
   activate_object_with_id(impl_->consumer_admin.out(),
     impl_->poa.in(),
     &impl_->consumer_admin_servant,
-    oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    oid);
   ++oid[9];
   activate_object_with_id(impl_->supplier_admin.out(),
     impl_->poa.in(),
     &impl_->supplier_admin_servant,
-    oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    oid);
 
   return gateway._retn();
 }
 
 //= The RtecEventChannelAdmin::EventChannel methods
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-FTEC_Gateway::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FTEC_Gateway::for_consumers (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(impl_->consumer_admin.in());
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-FTEC_Gateway::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FTEC_Gateway::for_suppliers (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n"));
   return RtecEventChannelAdmin::SupplierAdmin::_duplicate(impl_->supplier_admin.in());
 }
 
-void FTEC_Gateway::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void FTEC_Gateway::destroy (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   impl_->ftec->destroy();
 }
 
 RtecEventChannelAdmin::Observer_Handle
-FTEC_Gateway::append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                               ACE_ENV_ARG_DECL)
+FTEC_Gateway::append_observer (RtecEventChannelAdmin::Observer_ptr observer)
                                ACE_THROW_SPEC ((
                                CORBA::SystemException,
                                RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
                                RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return impl_->ftec->append_observer(observer ACE_ENV_ARG_PARAMETER);
+  return impl_->ftec->append_observer(observer);
 }
 
-void FTEC_Gateway::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
-                                    ACE_ENV_ARG_DECL)
+void FTEC_Gateway::remove_observer (RtecEventChannelAdmin::Observer_Handle handle)
                                     ACE_THROW_SPEC ((
                                     CORBA::SystemException,
                                     RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
                                     RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  impl_->ftec->remove_observer(handle ACE_ENV_ARG_PARAMETER);
+  impl_->ftec->remove_observer(handle);
 }
 
 void FTEC_Gateway::push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consumer,
-                        const RtecEventComm::EventSet & data
-                        ACE_ENV_ARG_DECL)
+                        const RtecEventComm::EventSet & data)
 {
   PortableServer::ObjectId_var object_id =
-    impl_->poa->reference_to_id(proxy_consumer  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    impl_->poa->reference_to_id(proxy_consumer);
   FtRtecEventComm::ObjectId** result;
   memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**));
 
-  impl_->ftec->push(**result, data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  impl_->ftec->push(**result, data);
 }
 
 
@@ -315,7 +290,7 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin()
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -329,7 +304,7 @@ ACE_THROW_SPEC ((CORBA::SystemException))
   RtecEventChannelAdmin::ProxyPushSupplier_ptr result;
   activate_object_with_id(result, impl_->poa.in(),
                          &impl_->proxy_supplier_servant,
-                         local_oid ACE_ENV_ARG_PARAMETER);
+                         local_oid);
   return result;
 }
 
@@ -346,7 +321,7 @@ FTEC_Gateway_SupplierAdmin::~FTEC_Gateway_SupplierAdmin()
 
 // = The RtecEventChannelAdmin::SupplierAdmin methods...
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-FTEC_Gateway_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+FTEC_Gateway_SupplierAdmin::obtain_push_consumer (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FtRtecEventComm::ObjectId** remote_proxy_oid_ptr;
@@ -359,23 +334,20 @@ ACE_THROW_SPEC ((CORBA::SystemException))
   RtecEventChannelAdmin::ProxyPushConsumer_ptr result;
   activate_object_with_id(result, impl_->poa.in(),
                           &impl_->proxy_consumer_servant,
-                          local_oid ACE_ENV_ARG_PARAMETER);
+                          local_oid);
   return result;
 }
 
 
 FtRtecEventComm::ObjectId**
-get_remote_oid_ptr(CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+get_remote_oid_ptr(CORBA::ORB_ptr orb)
 {
   PortableServer::Current_var current =
     resolve_init<PortableServer::Current>(orb,
-    "POACurrent"
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    "POACurrent");
 
   PortableServer::ObjectId_var object_id =
-    current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    current->get_object_id();
 
   FtRtecEventComm::ObjectId** result;
   memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**));
@@ -397,47 +369,38 @@ FTEC_Gateway_ProxyPushSupplier::~FTEC_Gateway_ProxyPushSupplier()
 // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
 void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer (
   RtecEventComm::PushConsumer_ptr push_consumer,
-  const RtecEventChannelAdmin::ConsumerQOS &qos
-  ACE_ENV_ARG_DECL)
+  const RtecEventChannelAdmin::ConsumerQOS &qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
     RtecEventChannelAdmin::AlreadyConnected,
     RtecEventChannelAdmin::TypeError))
 {
 
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
 
-  *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos);
 }
 
-void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  impl_->ftec->disconnect_push_supplier(**oid_ptr ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  impl_->ftec->disconnect_push_supplier(**oid_ptr);
   delete *oid_ptr;
   delete oid_ptr;
 }
 
-void FTEC_Gateway_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+void FTEC_Gateway_ProxyPushSupplier::suspend_connection (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  impl_->ftec->suspend_push_supplier(**oid_ptr ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  impl_->ftec->suspend_push_supplier(**oid_ptr);
 }
 
-void FTEC_Gateway_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+void FTEC_Gateway_ProxyPushSupplier::resume_connection (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  impl_->ftec->resume_push_supplier(**oid_ptr ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  impl_->ftec->resume_push_supplier(**oid_ptr);
 }
 
 /// FTEC_Gateway_ProxyPushConsumer
@@ -454,47 +417,38 @@ FTEC_Gateway_ProxyPushConsumer::~FTEC_Gateway_ProxyPushConsumer()
 
 // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
 
-void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data
-                         ACE_ENV_ARG_DECL)
+void FTEC_Gateway_ProxyPushConsumer::push (const RtecEventComm::EventSet & data)
                          ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
 
   /*
   if (CORBA::is_nil(impl_->push_handler.in())) {
-    impl_->push_handler = impl_->push_handler_servant._this(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    impl_->push_handler = impl_->push_handler_servant._this();
   }
 
   impl_->ftec->sendc_push (impl_->push_handler.in(),
                            **oid_ptr,
-                           data ACE_ENV_ARG_PARAMETER);
+                           data);
  */
-  impl_->ftec->push(**oid_ptr, data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  impl_->ftec->push(**oid_ptr, data);
 }
 
 void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier (
   RtecEventComm::PushSupplier_ptr push_supplier,
-  const RtecEventChannelAdmin::SupplierQOS& qos
-  ACE_ENV_ARG_DECL)
+  const RtecEventChannelAdmin::SupplierQOS& qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
     RtecEventChannelAdmin::AlreadyConnected))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos);
 }
 
-void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  impl_->ftec->disconnect_push_consumer(**oid_ptr ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in());
+  impl_->ftec->disconnect_push_consumer(**oid_ptr);
   delete *oid_ptr;
   delete oid_ptr;
 }
@@ -507,13 +461,12 @@ PushConsumerHandler::~PushConsumerHandler()
 {
 }
 
-void PushConsumerHandler::push (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void PushConsumerHandler::push (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder *
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
index 3db7660c7ad..61dc86eaec3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -31,42 +31,38 @@ namespace TAO_FTRTEC
       ~FTEC_Gateway();
 
       RtecEventChannelAdmin::EventChannel_ptr activate
-          (PortableServer::POA_ptr poa
-            ACE_ENV_ARG_DECL);
+          (PortableServer::POA_ptr poa);
 
       RtecEventChannelAdmin::EventChannel_ptr
-        _this(ACE_ENV_SINGLE_ARG_DECL);
+        _this(void);
 
       //= The RtecEventChannelAdmin::EventChannel methods
       virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-        for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+        for_consumers (void)
           ACE_THROW_SPEC((CORBA::SystemException));
 
       virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-        for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+        for_suppliers (void)
           ACE_THROW_SPEC((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      virtual void destroy (void)
          ACE_THROW_SPEC((CORBA::SystemException));
 
       virtual RtecEventChannelAdmin::Observer_Handle
         append_observer
-          (RtecEventChannelAdmin::Observer_ptr observer
-           ACE_ENV_ARG_DECL) ACE_THROW_SPEC((
+          (RtecEventChannelAdmin::Observer_ptr observer) ACE_THROW_SPEC((
                              CORBA::SystemException,
                              RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
                              RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
 
       virtual void remove_observer
-        (RtecEventChannelAdmin::Observer_Handle
-         ACE_ENV_ARG_DECL)  ACE_THROW_SPEC((
+        (RtecEventChannelAdmin::Observer_Handle)  ACE_THROW_SPEC((
                             CORBA::SystemException,
                             RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
                             RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
 
       void push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consumer,
-                const RtecEventComm::EventSet & data
-                ACE_ENV_ARG_DECL);
+                const RtecEventComm::EventSet & data);
   private:
       struct FTEC_Gateway_Impl  *impl_;
   };
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
index 4a4869aece4..e0d60d7d4ce 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
@@ -6,10 +6,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FTRTEC {
   ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr
-    FTEC_Gateway::_this(ACE_ENV_SINGLE_ARG_DECL)
+    FTEC_Gateway::_this(void)
   {
     PortableServer::POA_var poa = _default_POA();
-    return activate(poa.in() ACE_ENV_ARG_PARAMETER);
+    return activate(poa.in());
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
index 9913cc8c8c9..c9fa2c626bd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
@@ -20,22 +20,17 @@ void
 activate_object_with_id (T * &result,
                          PortableServer::POA_ptr poa,
                          PortableServer::ServantBase *servant,
-                         const FtRtecEventComm::ObjectId &oid
-                         ACE_ENV_ARG_DECL)
+                         const FtRtecEventComm::ObjectId &oid)
 {
   const PortableServer::ObjectId& id =
     reinterpret_cast<const PortableServer::ObjectId&> (oid);
   poa->activate_object_with_id(id,
-                               servant
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               servant);
 
   CORBA::Object_var object =
-    poa->id_to_reference(id
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id_to_reference(id);
 
-  result = T::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
+  result = T::_narrow(object.in());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
index c489912d527..c09ee873041 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
@@ -18,20 +18,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 template<class T>
 typename T::_ptr_type
 resolve_init (CORBA::ORB_ptr orb,
-              const char *id ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+              const char *id)
 {
     typename T::_var_type ref;
     CORBA::Object_var     obj;
-    ACE_TRY
+    try
     {
       CORBA::Object_var obj;
-      obj = orb->resolve_initial_references(id ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references(id);
 
-      ref = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+      ref = T::_narrow(obj.in());
     }
 
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
       ACE_ERROR((
                   LM_ERROR,
@@ -43,10 +42,9 @@ resolve_init (CORBA::ORB_ptr orb,
                     LM_ERROR,
                     "    due to narrowing problem\n"
               ));
-      ACE_RE_THROW;
+      throw;
     }
 
-    ACE_ENDTRY;
     return ref._retn();
 }
 
@@ -54,16 +52,14 @@ resolve_init (CORBA::ORB_ptr orb,
 template<class T>
 typename T::_ptr_type
 resolve (CosNaming::NamingContext_ptr context,
-         const CosNaming::Name &id
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+         const CosNaming::Name &id)
 {
     CORBA::Object_var obj;
-    obj = context->resolve(id ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(T::_nil());
+    obj = context->resolve(id);
 
     ACE_ASSERT(!CORBA::is_nil(obj.in()));
 
-    typename T::_var_type ref = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    typename T::_var_type ref = T::_narrow(obj.in());
     return ref._retn();
 }
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index bb17e23bb3b..b41499fce78 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -190,9 +190,9 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *,
   this->active_connect_strategy_->synch_options (timeout,
                                                  synch_options);
 
-  // The code used to set the timeout to zero, with the intent of 
+  // The code used to set the timeout to zero, with the intent of
   // polling the reactor for connection completion. However, the side-effect
-  // was to cause the connection to timeout immediately. 
+  // was to cause the connection to timeout immediately.
 
   // This is where we need to set the ACE::HTBP::Stream to the connection
   // handler.
@@ -347,7 +347,7 @@ TAO::HTIOP::Connector::create_profile (TAO_InputCDR& cdr)
  * @brief Create a profile with a given endpoint.
  */
 TAO_Profile *
-TAO::HTIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO::HTIOP::Connector::make_profile (void)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -362,7 +362,6 @@ TAO::HTIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
index 62e06d6a988..eccbb782a3d 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
@@ -107,7 +107,7 @@ namespace TAO
 
       /// More TAO_Connector methods, please check the documentation on
       /// Transport_Connector.h
-      virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
+      virtual TAO_Profile *make_profile (void);
 
       /// Cancel the passed cvs handler from the connector
       /// Its not clear what it means to cancel in HTIOP, since there's no
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index 63d4a82db22..03d827bba4c 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -114,8 +114,7 @@ TAO::HTIOP::Profile::decode_profile (TAO_InputCDR& cdr)
 }
 
 void
-TAO::HTIOP::Profile::parse_string_i (const char *ior
-                                   ACE_ENV_ARG_DECL)
+TAO::HTIOP::Profile::parse_string_i (const char *ior)
 {
   // Pull off the "hostname:port#token/" part of the objref
   // Copy the string because we are going to modify it...
@@ -125,11 +124,11 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior
   if (okd == 0 || okd == ior)
     {
       // No object key delimiter or no hostname specified.
-      ACE_THROW (CORBA::INV_OBJREF
-                 (CORBA::SystemException::_tao_minor_code
-                  (TAO::VMCID,
-                   EINVAL),
-                  CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF(
+        CORBA::SystemException::_tao_minor_code(
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   // Length of host string.
@@ -140,11 +139,11 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior
   if (cp_pos == ior)
     {
       // No hostname specified!  It is required by the spec.
-      ACE_THROW (CORBA::INV_OBJREF
-                 (CORBA::SystemException::_tao_minor_code
-                  (TAO::VMCID,
-                   EINVAL),
-                  CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF(
+        CORBA::SystemException::_tao_minor_code(
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
   else if (cp_pos != 0)
     {
@@ -194,11 +193,11 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior
                         ACE_TEXT ("cannot determine hostname")));
 
           // @@ What's the right exception to throw here?
-          ACE_THROW (CORBA::INV_OBJREF
-                     (CORBA::SystemException::_tao_minor_code
-                      (TAO::VMCID,
-                       EINVAL),
-                      CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF(
+            CORBA::SystemException::_tao_minor_code(
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
       else
         this->endpoint_.host_ = CORBA::string_dup (tmp_host);
@@ -236,8 +235,7 @@ TAO::HTIOP::Profile::do_is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO::HTIOP::Profile::hash (CORBA::ULong max
-                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO::HTIOP::Profile::hash (CORBA::ULong max)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -285,7 +283,7 @@ TAO::HTIOP::Profile::add_endpoint (TAO::HTIOP::Endpoint *endp)
 }
 
 char *
-TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::HTIOP::Profile::to_string (void)
 {
   CORBA::String_var key;
   TAO::ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
index 938666a6bfc..ef0dc3fa9dc 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
@@ -88,7 +88,7 @@ namespace TAO
        * This is used to create url-style reference.  Only one
        * endpoint is included into the string.
        */
-      virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
+      virtual char * to_string (void);
 
       /**
        * Endpoints are transmitted using TAO-proprietory tagged component.
@@ -112,16 +112,14 @@ namespace TAO
       void add_endpoint (Endpoint *endp);
 
       /// Return a hash value for this object.
-      virtual CORBA::ULong hash (CORBA::ULong max
-                                 ACE_ENV_ARG_DECL);
+      virtual CORBA::ULong hash (CORBA::ULong max);
 
     protected:
 
       /// Template methods. Please see Profile.h for the documentation.
       virtual int decode_profile (TAO_InputCDR &cdr);
       virtual int decode_endpoints (void);
-      virtual void parse_string_i (const char *string
-                                   ACE_ENV_ARG_DECL);
+      virtual void parse_string_i (const char *string);
       virtual void create_profile_body (TAO_OutputCDR &cdr) const;
       virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index 9c7831e7387..1dc902aea56 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/AbstractInterfaceDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService, 
-           AbstractInterfaceDef_i, 
+ACE_RCSID (IFRService,
+           AbstractInterfaceDef_i,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -25,29 +25,25 @@ TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_AbstractInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AbstractInterfaceDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_AbstractInterface;
 }
 
 CORBA::Boolean
-TAO_AbstractInterfaceDef_i::is_a (const char *interface_id
-                                  ACE_ENV_ARG_DECL)
+TAO_AbstractInterfaceDef_i::is_a (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_a_i (interface_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (interface_id);
 }
 
 CORBA::Boolean
-TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id
-                                    ACE_ENV_ARG_DECL)
+TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0)
@@ -55,8 +51,7 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id
       return 1;
     }
 
-  return this->TAO_InterfaceDef_i::is_a_i (interface_id
-                                           ACE_ENV_ARG_PARAMETER);
+  return this->TAO_InterfaceDef_i::is_a_i (interface_id);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
index b753a1afa16..6d63cbf1b50 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
@@ -52,20 +52,17 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 308a637d9ac..1dc15433676 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -26,26 +26,25 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_AliasDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AliasDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Alias;
 }
 
 CORBA::TypeCode_ptr
-TAO_AliasDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -71,29 +70,26 @@ TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
      ACE_THROW_RETURN ( CORBA::OBJECT_NOT_EXIST(), CORBA::TypeCode::_nil () );
   }
 
-  CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::TypeCode_var tc = impl->type_i ();
 
   return this->repo_->tc_factory ()->create_alias_tc (id.c_str (),
                                                       name.c_str (),
-                                                      tc.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      tc.in ());
 }
 
 CORBA::IDLType_ptr
-TAO_AliasDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::original_type_def (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  this->update_key ();
 
-  return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->original_type_def_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::original_type_def_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString original_type;
@@ -103,31 +99,24 @@ TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (original_type,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def
-                                   ACE_ENV_ARG_DECL)
+TAO_AliasDef_i::original_type_def (CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->original_type_def_i (original_type_def
-                             ACE_ENV_ARG_PARAMETER);
+  this->original_type_def_i (original_type_def);
 }
 
 void
-TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *original_type =
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
index 7cc9c8826ca..c49b2b306c1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
@@ -51,43 +51,36 @@ public:
   virtual ~TAO_AliasDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::IDLType_ptr original_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr original_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr original_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr original_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr original_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void original_type_def_i (
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr original_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index 70022598977..1ca4f010a9b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -24,31 +24,29 @@ TAO_ArrayDef_i::~TAO_ArrayDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ArrayDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ArrayDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Array;
 }
 
 void
-TAO_ArrayDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_ArrayDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only if it is (w)string, fixed, array or sequence.
-  this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_element_type ();
 
   ACE_TString name;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -61,49 +59,44 @@ TAO_ArrayDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var element_typecode =
-    this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+    this->element_type_i ();
 
-  CORBA::ULong length = this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::ULong length = this->length_i ();
 
   return this->repo_->tc_factory ()->create_array_tc (
                                          length,
                                          element_typecode.in ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
 CORBA::ULong
-TAO_ArrayDef_i::length (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::length (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->length_i ();
 }
 
 CORBA::ULong
-TAO_ArrayDef_i::length_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ArrayDef_i::length_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int length = 0;
@@ -115,22 +108,18 @@ TAO_ArrayDef_i::length_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_ArrayDef_i::length (CORBA::ULong length
-                        ACE_ENV_ARG_DECL)
+TAO_ArrayDef_i::length (CORBA::ULong length)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->length_i (length
-                  ACE_ENV_ARG_PARAMETER);
+  this->length_i (length);
 }
 
 void
-TAO_ArrayDef_i::length_i (CORBA::ULong length
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ArrayDef_i::length_i (CORBA::ULong length)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -139,19 +128,18 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->element_type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -162,23 +150,22 @@ TAO_ArrayDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
     TAO_IFR_Service_Utils::path_to_idltype (element_path,
                                             this->repo_);
 
-  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_ArrayDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type_def (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  this->update_key ();
 
-  return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->element_type_def_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type_def_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -188,35 +175,27 @@ TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (element_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def
-                                  ACE_ENV_ARG_DECL)
+TAO_ArrayDef_i::element_type_def (CORBA::IDLType_ptr element_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->element_type_def_i (element_type_def
-                            ACE_ENV_ARG_PARAMETER);
+  this->element_type_def_i (element_type_def);
 }
 
 void
-TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
-                                    ACE_ENV_ARG_DECL)
+TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_element_type ();
 
   char *new_element_path =
     TAO_IFR_Service_Utils::reference_to_path (element_type_def);
@@ -228,7 +207,6 @@ TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
 
 void
 TAO_ArrayDef_i::destroy_element_type (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -266,8 +244,7 @@ TAO_ArrayDef_i::destroy_element_type (
       TAO_IDLType_i *impl = this->repo_->select_idltype (def_kind);
       impl->section_key (element_key);
 
-      impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      impl->destroy_i ();
 
       break;
     }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
index ec0d6966f8d..34242a7312c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
@@ -50,90 +50,74 @@ public:
   virtual ~TAO_ArrayDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong length (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong length ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ULong length_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ULong length_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void length (
-      CORBA::ULong length
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong length)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void length_i (
-      CORBA::ULong length
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong length)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr element_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr element_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr element_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr element_type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr element_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr element_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr element_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr element_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr element_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void element_type_def_i (
-      CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr element_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void destroy_element_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy_element_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys an anonymous non-primitive element type.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index 0d9ce3b6a42..2c6b43db85d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -28,33 +28,31 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_AttributeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Attribute;
 }
 
 CORBA::Contained::Description *
-TAO_AttributeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::describe (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_AttributeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::describe_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
                     CORBA::Contained::Description,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::Contained::Description_var retval = desc_ptr;
 
@@ -65,28 +63,25 @@ TAO_AttributeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                   CORBA::AttributeDescription,
                   0);
 
-  this->make_description (*ad
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->make_description (*ad);
 
   retval->value <<= ad;
   return retval._retn ();
 }
 
 CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -98,23 +93,22 @@ TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     TAO_IFR_Service_Utils::path_to_idltype (type_path,
                                             this->repo_);
 
-  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_AttributeDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type_def (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  this->update_key ();
 
-  return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_def_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type_def_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -124,34 +118,26 @@ TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (type_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+                                              this->repo_);
 
-  CORBA::IDLType_var retval = CORBA::IDLType::_narrow (obj.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  CORBA::IDLType_var retval = CORBA::IDLType::_narrow (obj.in ());
 
   return retval._retn ();
 }
 
 void
-TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def
-                              ACE_ENV_ARG_DECL)
+TAO_AttributeDef_i::type_def (CORBA::IDLType_ptr type_def)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->type_def_i (type_def
-                    ACE_ENV_ARG_PARAMETER);
+  this->type_def_i (type_def);
 }
 
 void
-TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *type_path =
@@ -163,19 +149,18 @@ TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def
 }
 
 CORBA::AttributeMode
-TAO_AttributeDef_i::mode (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::mode (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ATTR_NORMAL);
+  this->update_key ();
 
-  return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->mode_i ();
 }
 
 CORBA::AttributeMode
-TAO_AttributeDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::mode_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int mode = 0;
@@ -187,22 +172,18 @@ TAO_AttributeDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_AttributeDef_i::mode (CORBA::AttributeMode mode
-                          ACE_ENV_ARG_DECL)
+TAO_AttributeDef_i::mode (CORBA::AttributeMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->mode_i (mode
-                ACE_ENV_ARG_PARAMETER);
+  this->mode_i (mode);
 }
 
 void
-TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode
-                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -213,15 +194,12 @@ TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode
 void
 TAO_AttributeDef_i::make_description (
     CORBA::AttributeDescription &ad
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ad.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ad.name = this->name_i ();
 
-  ad.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ad.id = this->id_i ();
 
   ACE_TString container_id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -230,18 +208,15 @@ TAO_AttributeDef_i::make_description (
 
   ad.defined_in = container_id.c_str ();
 
-  ad.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ad.version = this->version_i ();
 
-  ad.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ad.type = this->type_i ();
 
-  ad.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ad.mode = this->mode_i ();
 }
 
 CORBA::ExceptionDefSeq *
-TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::get_exceptions (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -292,7 +267,6 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (get_ed_seq,
                     CORBA::ExceptionDefSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   get_ed_seq->length (size);
   CORBA::ExceptionDefSeq_var retval = get_ed_seq;
@@ -305,20 +279,16 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception,
                                               path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                              this->repo_);
 
-      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
 }
 
 CORBA::ExceptionDefSeq *
-TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::put_exceptions (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -369,7 +339,6 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (put_ed_seq,
                     CORBA::ExceptionDefSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   put_ed_seq->length (size);
   CORBA::ExceptionDefSeq_var retval = put_ed_seq;
@@ -382,13 +351,9 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception,
                                               path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                              this->repo_);
 
-      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
index d08b3dfa119..6f222d8947f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
@@ -52,80 +52,66 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::IDLType_ptr type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::IDLType_ptr type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
       CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
       CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::AttributeMode mode (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::AttributeMode mode_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void make_description (
       CORBA::AttributeDescription &ad
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Common code for InterfaceDef to call in
@@ -133,12 +119,10 @@ public:
 
   // These two are called by Contained::move().
   CORBA::ExceptionDefSeq *get_exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExceptionDefSeq *put_exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
index 43e5f4b3ffa..7c600bfc838 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -34,21 +34,18 @@ TAO_ComponentContainer_i::create_component (
     const char *version,
     CORBA::ComponentIR::ComponentDef_ptr base_component,
     const CORBA::InterfaceDefSeq &supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+  this->update_key ();
 
   return this->create_component_i (id,
                                    name,
                                    version,
                                    base_component,
-                                   supports_interfaces
-                                   ACE_ENV_ARG_PARAMETER);
+                                   supports_interfaces);
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
@@ -58,7 +55,6 @@ TAO_ComponentContainer_i::create_component_i (
     const char *version,
     CORBA::ComponentIR::ComponentDef_ptr base_component,
     const CORBA::InterfaceDefSeq &supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -76,9 +72,7 @@ TAO_ComponentContainer_i::create_component_i (
         &TAO_ComponentContainer_i::same_as_tmp_name,
         version,
         "defns"
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
 
   if (! CORBA::is_nil (base_component))
     {
@@ -97,9 +91,7 @@ TAO_ComponentContainer_i::create_component_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_ComponentDef_i::name_clash,
                                           new_key,
                                           this->repo_,
-                                          CORBA::dk_Component
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+                                          CORBA::dk_Component);
 
       // Store the id for this - that's what ComponentDescription takes.
       ACE_TString base_id;
@@ -146,12 +138,9 @@ TAO_ComponentContainer_i::create_component_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Component,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ());
 }
 
 CORBA::ComponentIR::HomeDef_ptr
@@ -163,14 +152,12 @@ TAO_ComponentContainer_i::create_home (
     CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const CORBA::InterfaceDefSeq &supports_interfaces,
     CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
+  this->update_key ();
 
   return this->create_home_i (id,
                               name,
@@ -178,8 +165,7 @@ TAO_ComponentContainer_i::create_home (
                               base_home,
                               managed_component,
                               supports_interfaces,
-                              primary_key
-                              ACE_ENV_ARG_PARAMETER);
+                              primary_key);
 }
 
 CORBA::ComponentIR::HomeDef_ptr
@@ -191,7 +177,6 @@ TAO_ComponentContainer_i::create_home_i (
     CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const CORBA::InterfaceDefSeq &supports_interfaces,
     CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -209,9 +194,7 @@ TAO_ComponentContainer_i::create_home_i (
         &TAO_ComponentContainer_i::same_as_tmp_name,
         version,
         "defns"
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
 
   char *base_path = 0;
 
@@ -275,12 +258,9 @@ TAO_ComponentContainer_i::create_home_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Home,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ComponentIR::HomeDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::HomeDef::_narrow (obj.in ());
 }
 
 CORBA::ComponentIR::EventDef_ptr
@@ -295,14 +275,12 @@ TAO_ComponentContainer_i::create_event (
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::ExtInitializerSeq &initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EventDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
+  this->update_key ();
 
   return this->create_event_i (id,
                                name,
@@ -313,8 +291,7 @@ TAO_ComponentContainer_i::create_event (
                                is_truncatable,
                                abstract_base_values,
                                supported_interfaces,
-                               initializers
-                               ACE_ENV_ARG_PARAMETER);
+                               initializers);
 }
 
 CORBA::ComponentIR::EventDef_ptr
@@ -329,7 +306,6 @@ TAO_ComponentContainer_i::create_event_i (
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::ExtInitializerSeq &initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -347,9 +323,7 @@ TAO_ComponentContainer_i::create_event_i (
         &TAO_ComponentContainer_i::same_as_tmp_name,
         version,
         "defns"
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
 
   this->repo_->config ()->set_integer_value (new_key,
                                              "is_custom",
@@ -380,9 +354,7 @@ TAO_ComponentContainer_i::create_event_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                           new_key,
                                           this->repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
+                                          CORBA::dk_Value);
 
       ACE_TString base_value_id;
       this->repo_->config ()->get_string_value (TAO_IFR_Service_Utils::tmp_key_,
@@ -551,12 +523,9 @@ TAO_ComponentContainer_i::create_event_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Event,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ComponentIR::EventDef::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::EventDef::_narrow (obj.in ());
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
index bc1c9e9fec6..b12a80ada92 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
@@ -59,7 +59,6 @@ public:
       const char *version,
       CORBA::ComponentIR::ComponentDef_ptr base_component,
       const CORBA::InterfaceDefSeq &supports_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -69,7 +68,6 @@ public:
       const char *version,
       CORBA::ComponentIR::ComponentDef_ptr base_component,
       const CORBA::InterfaceDefSeq &supports_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -81,7 +79,6 @@ public:
       CORBA::ComponentIR::ComponentDef_ptr managed_component,
       const CORBA::InterfaceDefSeq &supports_interfaces,
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -93,7 +90,6 @@ public:
       CORBA::ComponentIR::ComponentDef_ptr managed_component,
       const CORBA::InterfaceDefSeq &supports_interfaces,
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -108,7 +104,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -123,7 +118,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
index eb42f8bb52b..a521c6767df 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -83,26 +83,25 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ComponentDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ComponentDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Component;
 }
 
 void
-TAO_ComponentDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our special subsections first, then call destroy_i
@@ -112,59 +111,48 @@ TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
       "provides",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
   TAO_IFR_Generic_Utils<TAO_UsesDef_i>::destroy_special (
       "uses",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
   TAO_IFR_Generic_Utils<TAO_EmitsDef_i>::destroy_special (
       "emits",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
   TAO_IFR_Generic_Utils<TAO_PublishesDef_i>::destroy_special (
       "publishes",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
   TAO_IFR_Generic_Utils<TAO_ConsumesDef_i>::destroy_special (
       "consumes",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
-  this->TAO_ExtInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->TAO_ExtInterfaceDef_i::destroy_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ComponentDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::describe (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::describe_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::ComponentDescription cd;
@@ -173,9 +161,7 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                                               cd,
                                               this->repo_,
                                               this->section_key_
-                                              ACE_ENV_ARG_PARAMETER
                                             );
-  ACE_CHECK_RETURN (0);
 
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -273,19 +259,15 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 
       TAO_ExtAttributeDef_i impl (this->repo_);
       impl.section_key (attr_key);
-      impl.fill_description (cd.attributes[i]
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      impl.fill_description (cd.attributes[i]);
     }
 
-  cd.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  cd.type = this->type_i ();
 
   CORBA::Contained::Description *cont_desc_ptr = 0;
   ACE_NEW_THROW_EX (cont_desc_ptr,
                     CORBA::Contained::Description,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
   CORBA::Contained::Description_var retval = cont_desc_ptr;
 
   cont_desc_ptr->kind = CORBA::dk_Component;
@@ -295,19 +277,18 @@ TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_ComponentDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -323,24 +304,22 @@ TAO_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
   return this->repo_->tc_factory ()->create_component_tc (
                                          id.c_str (),
                                          name.c_str ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
 CORBA::InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::supported_interfaces (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->supported_interfaces_i ();
 }
 
 CORBA::InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::supported_interfaces_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InterfaceDefSeq *seq = 0;
@@ -376,13 +355,9 @@ TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
                                                     path);
           tmp =
             TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                                      this->repo_);
 
-          retval[i] = CORBA::InterfaceDef::_narrow (tmp.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          retval[i] = CORBA::InterfaceDef::_narrow (tmp.in ());
         }
     }
 
@@ -392,23 +367,19 @@ TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_ComponentDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->supported_interfaces_i (supported_interfaces
-                                ACE_ENV_ARG_PARAMETER);
+  this->supported_interfaces_i (supported_interfaces);
 }
 
 void
 TAO_ComponentDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -445,9 +416,7 @@ TAO_ComponentDef_i::supported_interfaces_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_InterfaceDef_i::name_clash,
                                           this->section_key_,
                                           this->repo_,
-                                          this->def_kind ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          this->def_kind ());
 
       char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->repo_->config ()->set_string_value (supported_key,
@@ -457,19 +426,18 @@ TAO_ComponentDef_i::supported_interfaces_i (
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
-TAO_ComponentDef_i::base_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::base_component (void)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+  this->update_key ();
 
-  return this->base_component_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->base_component_i ();
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
-TAO_ComponentDef_i::base_component_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::base_component_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString base_id;
@@ -483,34 +451,27 @@ TAO_ComponentDef_i::base_component_i (ACE_ENV_SINGLE_ARG_DECL)
       return CORBA::ComponentIR::ComponentDef::_nil ();
     }
 
-  CORBA::Contained_var obj = this->repo_->lookup_id (base_id.fast_rep ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+  CORBA::Contained_var obj = this->repo_->lookup_id (base_id.fast_rep ());
 
-  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ());
 }
 
 void
 TAO_ComponentDef_i::base_component (
     CORBA::ComponentIR::ComponentDef_ptr base_component
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->base_component_i (base_component
-                          ACE_ENV_ARG_PARAMETER);
+  this->base_component_i (base_component);
 }
 
 void
 TAO_ComponentDef_i::base_component_i (
     CORBA::ComponentIR::ComponentDef_ptr base_component
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -536,9 +497,7 @@ TAO_ComponentDef_i::base_component_i (
   TAO_IFR_Service_Utils::name_exists (&TAO_ComponentDef_i::name_clash,
                                       this->section_key_,
                                       this->repo_,
-                                      CORBA::dk_Component
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      CORBA::dk_Component);
 
   this->repo_->config ()->set_string_value (
                               this->section_key_,
@@ -553,20 +512,17 @@ TAO_ComponentDef_i::create_provides (
     const char *name,
     const char *version,
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ProvidesDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::ProvidesDef::_nil ());
+  this->update_key ();
 
   return this->create_provides_i (id,
                                   name,
                                   version,
-                                  interface_type
-                                  ACE_ENV_ARG_PARAMETER);
+                                  interface_type);
 }
 
 CORBA::ComponentIR::ProvidesDef_ptr
@@ -575,7 +531,6 @@ TAO_ComponentDef_i::create_provides_i (
     const char *name,
     const char *version,
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -590,8 +545,7 @@ TAO_ComponentDef_i::create_provides_i (
                        0,
                        this->repo_,
                        CORBA::dk_Provides,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 CORBA::ComponentIR::UsesDef_ptr
@@ -599,21 +553,18 @@ TAO_ComponentDef_i::create_uses (const char *id,
                                  const char *name,
                                  const char *version,
                                  CORBA::InterfaceDef_ptr interface_type,
-                                 CORBA::Boolean is_multiple
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::Boolean is_multiple)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::UsesDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::UsesDef::_nil ());
+  this->update_key ();
 
   return this->create_uses_i (id,
                               name,
                               version,
                               interface_type,
-                              is_multiple
-                              ACE_ENV_ARG_PARAMETER);
+                              is_multiple);
 }
 
 CORBA::ComponentIR::UsesDef_ptr
@@ -621,8 +572,7 @@ TAO_ComponentDef_i::create_uses_i (const char *id,
                                    const char *name,
                                    const char *version,
                                    CORBA::InterfaceDef_ptr interface_type,
-                                   CORBA::Boolean is_multiple
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::Boolean is_multiple)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -636,36 +586,31 @@ TAO_ComponentDef_i::create_uses_i (const char *id,
                        is_multiple,
                        this->repo_,
                        CORBA::dk_Uses,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 CORBA::ComponentIR::EmitsDef_ptr
 TAO_ComponentDef_i::create_emits (const char *id,
                                   const char *name,
                                   const char *version,
-                                  CORBA::ValueDef_ptr value
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::EmitsDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::EmitsDef::_nil ());
+  this->update_key ();
 
   return this->create_emits_i (id,
                                name,
                                version,
-                               value
-                               ACE_ENV_ARG_PARAMETER);
+                               value);
 }
 
 CORBA::ComponentIR::EmitsDef_ptr
 TAO_ComponentDef_i::create_emits_i (const char *id,
                                     const char *name,
                                     const char *version,
-                                    CORBA::ValueDef_ptr value
-                                    ACE_ENV_ARG_DECL)
+                                    CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -679,36 +624,31 @@ TAO_ComponentDef_i::create_emits_i (const char *id,
                        0,
                        this->repo_,
                        CORBA::dk_Emits,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 CORBA::ComponentIR::PublishesDef_ptr
 TAO_ComponentDef_i::create_publishes (const char *id,
                                       const char *name,
                                       const char *version,
-                                      CORBA::ValueDef_ptr value
-                                      ACE_ENV_ARG_DECL)
+                                      CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::PublishesDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::PublishesDef::_nil ());
+  this->update_key ();
 
   return this->create_publishes_i (id,
                                    name,
                                    version,
-                                   value
-                                   ACE_ENV_ARG_PARAMETER);
+                                   value);
 }
 
 CORBA::ComponentIR::PublishesDef_ptr
 TAO_ComponentDef_i::create_publishes_i (const char *id,
                                         const char *name,
                                         const char *version,
-                                        CORBA::ValueDef_ptr value
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -722,36 +662,31 @@ TAO_ComponentDef_i::create_publishes_i (const char *id,
                        0,
                        this->repo_,
                        CORBA::dk_Publishes,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 CORBA::ComponentIR::ConsumesDef_ptr
 TAO_ComponentDef_i::create_consumes (const char *id,
                                      const char *name,
                                      const char *version,
-                                     CORBA::ValueDef_ptr value
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::ConsumesDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::ConsumesDef::_nil ());
+  this->update_key ();
 
   return this->create_consumes_i (id,
                                   name,
                                   version,
-                                  value
-                                  ACE_ENV_ARG_PARAMETER);
+                                  value);
 }
 
 CORBA::ComponentIR::ConsumesDef_ptr
 TAO_ComponentDef_i::create_consumes_i (const char *id,
                                        const char *name,
                                        const char *version,
-                                       CORBA::ValueDef_ptr value
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ValueDef_ptr value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -765,28 +700,24 @@ TAO_ComponentDef_i::create_consumes_i (const char *id,
                        0,
                        this->repo_,
                        CORBA::dk_Consumes,
-                       this->section_key_
-                       ACE_ENV_ARG_PARAMETER);
+                       this->section_key_);
 }
 
 int
 TAO_ComponentDef_i::name_clash (const char *name)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_Container_i::tmp_name_holder_ = name;
       TAO_IFR_Service_Utils::name_exists (&TAO_Container_i::same_as_tmp_name,
                                           TAO_IFR_Service_Utils::tmp_key_,
                                           TAO_IFR_Service_Utils::repo_,
-                                          CORBA::dk_Component
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          CORBA::dk_Component);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
index 0c05918d563..86d789c6842 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
@@ -55,88 +55,73 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ComponentIR::ComponentDef_ptr base_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::ComponentDef_ptr base_component_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_component (
       CORBA::ComponentIR::ComponentDef_ptr base_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_component_i (
       CORBA::ComponentIR::ComponentDef_ptr base_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -145,7 +130,6 @@ public:
       const char *name,
       const char *version,
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -154,7 +138,6 @@ public:
       const char *name,
       const char *version,
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -164,7 +147,6 @@ public:
       const char *version,
       CORBA::InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -174,7 +156,6 @@ public:
       const char *version,
       CORBA::InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -183,7 +164,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -192,7 +172,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -201,7 +180,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -210,7 +188,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -219,7 +196,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -228,7 +204,6 @@ public:
       const char *name,
       const char *version,
       CORBA::ValueDef_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
index f0efb71adb1..f361f887fc3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -14,8 +14,8 @@
 #include "orbsvcs/IFRService/ProvidesDef_i.h"
 #include "orbsvcs/IFRService/UsesDef_i.h"
 
-ACE_RCSID (IFRService, 
-           ComponentRepository_i, 
+ACE_RCSID (IFRService,
+           ComponentRepository_i,
            "$Id$")
 
 
@@ -28,8 +28,8 @@ TAO_ComponentRepository_i::TAO_ComponentRepository_i (
   )
   : TAO_IRObject_i (0),
     TAO_Container_i (0),
-    TAO_Repository_i (orb, 
-                      poa, 
+    TAO_Repository_i (orb,
+                      poa,
                       config),
     TAO_ComponentContainer_i (0)
 {
@@ -41,14 +41,11 @@ TAO_ComponentRepository_i::~TAO_ComponentRepository_i (void)
 
 int
 TAO_ComponentRepository_i::create_servants_and_poas (
-    ACE_ENV_SINGLE_ARG_DECL
   )
 {
-  int status = 
+  int status =
     this->TAO_Repository_i::create_servants_and_poas (
-        ACE_ENV_SINGLE_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (-1);
 
   if (status != 0)
     {
@@ -60,51 +57,39 @@ TAO_ComponentRepository_i::create_servants_and_poas (
 
   // ID Assignment Policy.
   policies[0] =
-    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID 
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Lifespan Policy.
   policies[1] =
-    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT 
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1); 
+    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
   // Request Processing Policy.
   policies[2] =
     this->root_poa_->create_request_processing_policy (
-        PortableServer::USE_DEFAULT_SERVANT 
-        ACE_ENV_ARG_PARAMETER
+        PortableServer::USE_DEFAULT_SERVANT
       );
-  ACE_CHECK_RETURN (-1);
 
   // Servant Retention Policy.
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
-        PortableServer::NON_RETAIN 
-        ACE_ENV_ARG_PARAMETER
+        PortableServer::NON_RETAIN
       );
-  ACE_CHECK_RETURN (-1);
 
   // Id Uniqueness Policy.
   policies[4] =
     this->root_poa_->create_id_uniqueness_policy (
-        PortableServer::MULTIPLE_ID 
-        ACE_ENV_ARG_PARAMETER
+        PortableServer::MULTIPLE_ID
       );
-  ACE_CHECK_RETURN (-1);
 
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->the_POAManager ();
 
 #define GEN_IR_OBJECT(name) \
   this-> name ## _poa_ = \
     this->root_poa_->create_POA (#name "_poa", \
                                  poa_manager.in (), \
-                                 policies \
-                                 ACE_ENV_ARG_PARAMETER); \
-  ACE_CHECK_RETURN (-1); \
+                                 policies); \
+\
   TAO_ ## name ## _i * name ## _impl = 0; \
   ACE_NEW_RETURN (name ## _impl, \
                   TAO_ ## name ## _i (this), \
@@ -119,9 +104,7 @@ TAO_ComponentRepository_i::create_servants_and_poas (
   PortableServer::ServantBase_var name ## _safety ( \
       this-> name ## _servant_ \
     ); \
-  this-> name ## _poa_->set_servant (this-> name ## _servant_ \
-                                     ACE_ENV_ARG_PARAMETER); \
-  ACE_CHECK_RETURN (-1);
+  this-> name ## _poa_->set_servant (this-> name ## _servant_);
 
   CONCRETE_IR_OBJECT_TYPES
 
@@ -133,8 +116,7 @@ TAO_ComponentRepository_i::create_servants_and_poas (
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      policy->destroy ();
     }
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
index 7690ee20edc..8b126b100f8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
@@ -71,7 +71,7 @@ public:
   virtual ~TAO_ComponentRepository_i (void);
   // Destructor.
 
-  virtual int create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int create_servants_and_poas (void);
   // We create a default servant servant for each IR Object
   // type and its corresponding POA.
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index 3ca04650d04..f8b9a707618 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -31,46 +31,41 @@ TAO_ConstantDef_i::~TAO_ConstantDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ConstantDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ConstantDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Constant;
 }
 
 CORBA::Contained::Description *
-TAO_ConstantDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::describe (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::describe_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
                     CORBA::Contained::Description,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  retval->kind = this->def_kind ();
 
   CORBA::ConstantDescription cd;
 
-  cd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  cd.name = this->name_i ();
 
-  cd.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  cd.id = this->id_i ();
 
   ACE_TString container_id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -78,14 +73,11 @@ TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                                             container_id);
   cd.defined_in = container_id.c_str ();
 
-  cd.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  cd.version = this->version_i ();
 
-  cd.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  cd.type = this->type_i ();
 
-  CORBA::Any_var val = this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Any_var val = this->value_i ();
 
   cd.value = val.in ();
 
@@ -94,19 +86,18 @@ TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_ConstantDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_ConstantDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -117,23 +108,22 @@ TAO_ConstantDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
   TAO_IDLType_i *impl = TAO_IFR_Service_Utils::path_to_idltype (type_path,
                                                                 this->repo_);
 
-  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_ConstantDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type_def (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  this->update_key ();
 
-  return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_def_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type_def_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -143,31 +133,24 @@ TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (type_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def
-                             ACE_ENV_ARG_DECL)
+TAO_ConstantDef_i::type_def (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->type_def_i (type_def
-                    ACE_ENV_ARG_PARAMETER);
+  this->type_def_i (type_def);
 }
 
 void
-TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def
-                               ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type_def);
@@ -178,23 +161,21 @@ TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def
 }
 
 CORBA::Any *
-TAO_ConstantDef_i::value (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->value_i ();
 }
 
 CORBA::Any *
-TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::value_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_var tc = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_var tc = this->type_i ();
 
   void *ref = 0;
   size_t length = 0;
@@ -218,14 +199,12 @@ TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     CORBA::Any,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   TAO::Unknown_IDL_Type *impl = 0;
   ACE_NEW_THROW_EX (impl,
                     TAO::Unknown_IDL_Type (tc.in (),
                                            in_cdr),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->replace (impl);
   safety.release ();
@@ -233,34 +212,27 @@ TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_ConstantDef_i::value (const CORBA::Any &value
-                          ACE_ENV_ARG_DECL)
+TAO_ConstantDef_i::value (const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->value_i (value
-                 ACE_ENV_ARG_PARAMETER);
+  this->value_i (value);
 }
 
 void
-TAO_ConstantDef_i::value_i (const CORBA::Any &value
-                            ACE_ENV_ARG_DECL)
+TAO_ConstantDef_i::value_i (const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var my_tc =
-    this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->type_i ();
 
   CORBA::TypeCode_var val_tc = value.type ();
 
   CORBA::Boolean const equal_tc =
-    my_tc.in ()->equal (val_tc.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    my_tc.in ()->equal (val_tc.in ());
 
   if (!equal_tc)
     {
@@ -285,8 +257,7 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value
       mb = in.steal_contents ();
     }
 
-  CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = val_tc->kind ();
 
   switch (kind)
   {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
index f9243f6d58c..d19c6294980 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
@@ -50,75 +50,62 @@ public:
   virtual ~TAO_ConstantDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
-      CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Any *value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Any *value ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Any *value_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Any *value_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void value (
-      const CORBA::Any &value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::Any &value)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void value_i (
-      const CORBA::Any &value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::Any &value)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
index 0b6b8311b7e..ce389958510 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
@@ -5,8 +5,8 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/ConsumesDef_i.h"
 
-ACE_RCSID (IFRService, 
-           ConsumesDef_i, 
+ACE_RCSID (IFRService,
+           ConsumesDef_i,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -25,7 +25,7 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ConsumesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ConsumesDef_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Consumes;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
index 2bbbef43916..748a33e4a26 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
@@ -53,7 +53,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index b61b34ea4a1..5f2d8d419e5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -28,19 +28,18 @@ TAO_Contained_i::~TAO_Contained_i (void)
 }
 
 void
-TAO_Contained_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -96,19 +95,18 @@ TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-TAO_Contained_i::id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->id_i ();
 }
 
 char *
-TAO_Contained_i::id_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::id_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -120,22 +118,18 @@ TAO_Contained_i::id_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Contained_i::id (const char *id
-                     ACE_ENV_ARG_DECL)
+TAO_Contained_i::id (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->id_i (id
-              ACE_ENV_ARG_PARAMETER);
+  this->id_i (id);
 }
 
 void
-TAO_Contained_i::id_i (const char *id
-                       ACE_ENV_ARG_DECL)
+TAO_Contained_i::id_i (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString tmp;
@@ -147,8 +141,7 @@ TAO_Contained_i::id_i (const char *id
        == 0)
     {
       // Repository id already exists.
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
   // Get the old id.
@@ -180,19 +173,18 @@ TAO_Contained_i::id_i (const char *id
 }
 
 char *
-TAO_Contained_i::name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->name_i ();
 }
 
 char *
-TAO_Contained_i::name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::name_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -204,19 +196,18 @@ TAO_Contained_i::name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-TAO_Contained_i::version (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::version (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->version_i ();
 }
 
 char *
-TAO_Contained_i::version_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::version_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -228,33 +219,26 @@ TAO_Contained_i::version_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Contained_i::name (const char *name
-                       ACE_ENV_ARG_DECL)
+TAO_Contained_i::name (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->name_i (name
-                ACE_ENV_ARG_PARAMETER);
+  this->name_i (name);
 }
 
 void
-TAO_Contained_i::name_i (const char *name
-                         ACE_ENV_ARG_DECL)
+TAO_Contained_i::name_i (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if name already exists in this container.
-  CORBA::Boolean exists = this->name_exists (name
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Boolean exists = this->name_exists (name);
 
   if (exists)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 3, CORBA::COMPLETED_NO);
     }
 
   // Reset the local name.
@@ -280,22 +264,18 @@ TAO_Contained_i::name_i (const char *name
 }
 
 void
-TAO_Contained_i::version (const char *version
-                          ACE_ENV_ARG_DECL)
+TAO_Contained_i::version (const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->version_i (version
-                   ACE_ENV_ARG_PARAMETER);
+  this->version_i (version);
 }
 
 void
-TAO_Contained_i::version_i (const char *version
-                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Contained_i::version_i (const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -304,19 +284,18 @@ TAO_Contained_i::version_i (const char *version
 }
 
 CORBA::Container_ptr
-TAO_Contained_i::defined_in (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::defined_in (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::Container::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Container::_nil ());
+  this->update_key ();
 
-  return this->defined_in_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->defined_in_i ();
 }
 
 CORBA::Container_ptr
-TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::defined_in_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
@@ -337,31 +316,26 @@ TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (container_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Container::_nil ());
+                                              this->repo_);
 
-  CORBA::Container_var retval = CORBA::Container::_narrow (obj.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Container::_nil ());
+  CORBA::Container_var retval = CORBA::Container::_narrow (obj.in ());
 
   return retval._retn ();
 }
 
 char *
-TAO_Contained_i::absolute_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::absolute_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->absolute_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->absolute_name_i ();
 }
 
 char *
-TAO_Contained_i::absolute_name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::absolute_name_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString absolute_name;
@@ -373,7 +347,7 @@ TAO_Contained_i::absolute_name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Repository_ptr
-TAO_Contained_i::containing_repository (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::containing_repository (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->repo_->repo_objref ();
@@ -381,7 +355,6 @@ TAO_Contained_i::containing_repository (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Contained::Description *
 TAO_Contained_i::describe (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -391,7 +364,6 @@ TAO_Contained_i::describe (
 
 CORBA::Contained::Description *
 TAO_Contained_i::describe_i (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -402,25 +374,21 @@ TAO_Contained_i::describe_i (
 void
 TAO_Contained_i::move (CORBA::Container_ptr new_container,
                        const char *new_name,
-                       const char *new_version
-                       ACE_ENV_ARG_DECL)
+                       const char *new_version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
   this->move_i (new_container,
                 new_name,
                 new_version,
-                1
-                ACE_ENV_ARG_PARAMETER);
+                1);
 }
 
 CORBA::Boolean
-TAO_Contained_i::name_exists (const char *name
-                              ACE_ENV_ARG_DECL)
+TAO_Contained_i::name_exists (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
@@ -435,8 +403,7 @@ TAO_Contained_i::name_exists (const char *name
       TAO_IFR_Service_Utils::name_exists (&TAO_Contained_i::same_as_tmp_name,
                                           root_key,
                                           this->repo_,
-                                          CORBA::dk_Repository
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::dk_Repository);
       return 0;
     }
 
@@ -538,8 +505,7 @@ void
 TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                          const char *new_name,
                          const char *new_version,
-                         CORBA::Boolean cleanup
-                         ACE_ENV_ARG_DECL)
+                         CORBA::Boolean cleanup)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Repository_var my_repo = this->repo_->repo_objref ();
@@ -569,11 +535,9 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
     }
 
   CORBA::DefinitionKind my_dk =
-    this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->def_kind ();
 
-  CORBA::String_var id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var id = this->id_i ();
 
   // If an exception is thrown, this must be restored.
   ACE_TString my_path;
@@ -593,8 +557,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
   as_contained.section_key (container_key);
 
   CORBA::String_var container_id =
-    as_contained.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    as_contained.id_i ();
 
   ACE_TString new_id (container_id.in ());
   new_id =
@@ -603,7 +566,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
   TAO_Container_i container_impl (this->repo_);
   container_impl.section_key (container_key);
 
-  ACE_TRY
+  try
     {
       // Call the appropriate create function.
       switch (my_dk)
@@ -614,8 +577,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::EnumMemberSeq_var members =
-            impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.members_i ();
 
           if (container_dk == CORBA::dk_Struct
               || container_dk == CORBA::dk_Union
@@ -623,18 +585,14 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                      new_name);
             }
 
           CORBA::EnumDef_var new_defn =
             container_impl.create_enum_i (new_id.c_str (),
                                           new_name,
                                           new_version,
-                                          members.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                          members.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -648,16 +606,13 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::IDLType_var otype =
-            impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.original_type_def_i ();
 
           CORBA::AliasDef_var new_defn =
             container_impl.create_alias_i (new_id.c_str (),
                                           new_name,
                                           new_version,
-                                          otype.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                          otype.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -669,9 +624,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
         {
           container_impl.create_native_i (new_id.c_str (),
                                           new_name,
-                                          new_version
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                          new_version);
           break;
         }
         case CORBA::dk_ValueBox:
@@ -680,16 +633,13 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::IDLType_var otype =
-            impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.original_type_def_i ();
 
           CORBA::ValueBoxDef_var new_defn =
             container_impl.create_value_box_i (new_id.c_str (),
                                               new_name,
                                               new_version,
-                                              otype.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                              otype.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
@@ -703,8 +653,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::StructMemberSeq_var members =
-            impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.members_i ();
 
           if (container_dk == CORBA::dk_Struct
               || container_dk == CORBA::dk_Union
@@ -712,25 +661,20 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                      new_name);
             }
 
           CORBA::StructDef_var new_defn =
             container_impl.create_struct_i (new_id.c_str (),
                                             new_name,
                                             new_version,
-                                            members.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                            members.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
           container_impl.update_refs (new_path.c_str ());
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -740,12 +684,10 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::IDLType_var disc_type =
-            impl.discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.discriminator_type_def_i ();
 
           CORBA::UnionMemberSeq_var members =
-            impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.members_i ();
 
           if (container_dk == CORBA::dk_Struct
               || container_dk == CORBA::dk_Union
@@ -753,9 +695,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                      new_name);
             }
 
           CORBA::UnionDef_var new_defn =
@@ -763,16 +703,13 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                            new_name,
                                            new_version,
                                            disc_type.in (),
-                                           members.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                           members.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
           container_impl.update_refs (new_path.c_str ());
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -781,12 +718,9 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           CORBA::ModuleDef_var new_defn =
             container_impl.create_module_i (new_id.c_str (),
                                             new_name,
-                                            new_version
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                            new_version);
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -796,19 +730,15 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::StructMemberSeq_var members =
-            impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.members_i ();
 
           CORBA::ExceptionDef_var new_defn =
             container_impl.create_exception_i (new_id.c_str (),
                                                new_name,
                                                new_version,
-                                               members.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               members.in ());
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -818,23 +748,19 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::InterfaceDefSeq_var bases =
-            impl.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.base_interfaces_i ();
 
           CORBA::InterfaceDef_var new_defn =
             container_impl.create_interface_i (new_id.c_str (),
                                                new_name,
                                                new_version,
-                                               bases.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               bases.in ());
 
           ACE_TString new_path =
             TAO_IFR_Service_Utils::reference_to_path (new_defn.in ());
           container_impl.update_refs (new_path.c_str ());
 
-          this->move_contents (new_defn.in ()
-                               ACE_ENV_ARG_PARAMETER);
+          this->move_contents (new_defn.in ());
 
           break;
         }
@@ -844,19 +770,15 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::IDLType_var type_def =
-            impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.type_def_i ();
 
-          CORBA::Any_var value = impl.value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::Any_var value = impl.value_i ();
 
           container_impl.create_constant_i (new_id.c_str (),
                                             new_name,
                                             new_version,
                                             type_def.in (),
-                                            value.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                            value.in ());
           break;
         }
         case CORBA::dk_Attribute:
@@ -865,12 +787,10 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::IDLType_var type_def =
-            impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.type_def_i ();
 
           CORBA::AttributeMode mode =
-            impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.mode_i ();
 
           if (container_dk == CORBA::dk_Interface)
             {
@@ -881,9 +801,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                        new_name,
                                        new_version,
                                        type_def.in (),
-                                       mode
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       mode);
               break;
             }
           else if (container_dk == CORBA::dk_Value)
@@ -895,15 +813,14 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                        new_name,
                                        new_version,
                                        type_def.in (),
-                                       mode
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       mode);
               break;
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 4,
+                CORBA::COMPLETED_NO);
             }
         }
         case CORBA::dk_Operation:
@@ -912,24 +829,19 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           impl.section_key (this->section_key_);
 
           CORBA::IDLType_var result =
-            impl.result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.result_def_i ();
 
           CORBA::OperationMode mode =
-            impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.mode_i ();
 
           CORBA::ParDescriptionSeq_var params =
-            impl.params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.params_i ();
 
           CORBA::ExceptionDefSeq_var exceptions =
-            impl.exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.exceptions_i ();
 
           CORBA::ContextIdSeq_var contexts =
-            impl.contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            impl.contexts_i ();
 
           if (container_dk == CORBA::dk_Interface)
             {
@@ -943,9 +855,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                        mode,
                                        params.in (),
                                        exceptions.in (),
-                                       contexts.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       contexts.in ());
               break;
             }
           else if (container_dk == CORBA::dk_Value)
@@ -960,15 +870,14 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                        mode,
                                        params.in (),
                                        exceptions.in (),
-                                       contexts.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       contexts.in ());
               break;
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 4,
+                CORBA::COMPLETED_NO);
             }
         }
         case CORBA::dk_Value:
@@ -988,7 +897,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
           break;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // If the move was not successful, we must restore this.
       this->repo_->config ()->set_string_value (
@@ -996,10 +905,8 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
                                   id.in (),
                                   my_path
                                 );
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   if (cleanup)
     {
@@ -1046,8 +953,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
 void
 TAO_Contained_i::move_pre_process (CORBA::Container_ptr container,
                                    const char *contained_path,
-                                   const char *name
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *container_path =
@@ -1101,8 +1007,7 @@ TAO_Contained_i::move_pre_process (CORBA::Container_ptr container,
 }
 
 void
-TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
-                                ACE_ENV_ARG_DECL)
+TAO_Contained_i::move_contents (CORBA::Container_ptr new_container)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -1154,15 +1059,12 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
               impl->move_i (new_container,
                             name.c_str (),
                             version.c_str (),
-                            0
-                            ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                            0);
             }
         }
     }
 
-  CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::DefinitionKind kind = this->def_kind ();
 
   // Specific to InterfaceDef_i and ValueDef_i
   if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value)
@@ -1205,9 +1107,7 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
               impl.move_i (new_container,
                            name.c_str (),
                            version.c_str (),
-                           0
-                           ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                           0);
             }
         }
 
@@ -1248,9 +1148,7 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
               impl.move_i (new_container,
                            name.c_str (),
                            version.c_str (),
-                           0
-                           ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                           0);
             }
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
index 5729837ce3b..3abe7761641 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
@@ -52,121 +52,99 @@ public:
   // Destructor.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *id_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void id (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void id_i (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *name_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void name (
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void name_i (
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *version (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *version_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void version (
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void version_i (
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Container_ptr defined_in (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Container_ptr defined_in_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *absolute_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *absolute_name_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Repository_ptr containing_repository (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void move (
       CORBA::Container_ptr new_container,
       const char *new_name,
       const char *new_version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -179,7 +157,6 @@ protected:
       const char *new_name,
       const char *new_version,
       CORBA::Boolean cleanup
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Engine for move() with an extra 'cleanup'
@@ -190,7 +167,6 @@ protected:
 private:
   CORBA::Boolean name_exists (
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Check if <name> already exists in our container
@@ -205,7 +181,6 @@ private:
       CORBA::Container_ptr container,
       const char *contained_path,
       const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Mangle the names of references that are also
@@ -215,7 +190,6 @@ private:
 
   void move_contents (
       CORBA::Container_ptr new_container
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Recursively calls move_i for definitions,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index b729699e35e..9d50d1214c8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -35,19 +35,18 @@ TAO_Container_i::~TAO_Container_i (void)
 }
 
 void
-TAO_Container_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Container_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Container_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int index = 0;
@@ -96,8 +95,7 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
                                                         this->repo_);
 
               CORBA::DefinitionKind def_kind =
-                impl->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+                impl->def_kind ();
 
               switch (def_kind)
               {
@@ -109,8 +107,7 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
                 case CORBA::dk_Fixed:
                 case CORBA::dk_Array:
                 case CORBA::dk_Sequence:
-                  impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_CHECK;
+                  impl->destroy_i ();
                   break;
                 default:
                   // No other types can be defined in this section of the struct.
@@ -162,8 +159,7 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
           TAO_Contained_i *impl = this->repo_->select_contained (def_kind);
           impl->section_key (defn_key);
 
-          impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          impl->destroy_i ();
         }
 
       // Restore our original section key, in case this method was
@@ -177,22 +173,18 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Contained_ptr
-TAO_Container_i::lookup (const char *search_name
-                         ACE_ENV_ARG_DECL)
+TAO_Container_i::lookup (const char *search_name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Contained::_nil ());
+  this->update_key ();
 
-  return this->lookup_i (search_name
-                         ACE_ENV_ARG_PARAMETER);
+  return this->lookup_i (search_name);
 }
 
 CORBA::Contained_ptr
-TAO_Container_i::lookup_i (const char *search_name
-                           ACE_ENV_ARG_DECL)
+TAO_Container_i::lookup_i (const char *search_name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key iter_key;
@@ -397,41 +389,33 @@ TAO_Container_i::lookup_i (const char *search_name
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Contained::_nil ());
+                                              this->repo_);
 
-  return CORBA::Contained::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::Contained::_narrow (obj.in ());
 }
 
 CORBA::ContainedSeq *
 TAO_Container_i::contents (CORBA::DefinitionKind limit_type,
-                           CORBA::Boolean exclude_inherited
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Boolean exclude_inherited)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
   return this->contents_i (limit_type,
-                           exclude_inherited
-                           ACE_ENV_ARG_PARAMETER);
+                           exclude_inherited);
 }
 
 CORBA::ContainedSeq *
 TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
-                             CORBA::Boolean exclude_inherited
-                             ACE_ENV_ARG_DECL)
+                             CORBA::Boolean exclude_inherited)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ContainedSeq *contents = 0;
   ACE_NEW_THROW_EX (contents,
                     CORBA::ContainedSeq,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::ContainedSeq_var retval = contents;
   retval->length (0);
@@ -507,8 +491,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
 
   // Base interfaces
 
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::DefinitionKind def_kind = this->def_kind ();
 
   if (def_kind == CORBA::dk_Interface)
     {
@@ -522,9 +505,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
           iface.interface_contents (kind_queue,
                                     path_queue,
                                     limit_type,
-                                    exclude_inherited
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                    exclude_inherited);
         }
     }
 
@@ -542,14 +523,10 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (next_kind,
                                               next_path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                              this->repo_);
 
       CORBA::Contained_var next_cont =
-        CORBA::Contained::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        CORBA::Contained::_narrow (obj.in ());
 
       retval[j] = next_cont._retn ();
     }
@@ -561,28 +538,24 @@ CORBA::ContainedSeq *
 TAO_Container_i::lookup_name (const char *search_name,
                               CORBA::Long levels_to_search,
                               CORBA::DefinitionKind limit_type,
-                              CORBA::Boolean exclude_inherited
-                              ACE_ENV_ARG_DECL)
+                              CORBA::Boolean exclude_inherited)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
   return this->lookup_name_i (search_name,
                               levels_to_search,
                               limit_type,
-                              exclude_inherited
-                              ACE_ENV_ARG_PARAMETER);
+                              exclude_inherited);
 }
 
 CORBA::ContainedSeq *
 TAO_Container_i::lookup_name_i (const char *search_name,
                                 CORBA::Long levels_to_search,
                                 CORBA::DefinitionKind limit_type,
-                                CORBA::Boolean exclude_inherited
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Boolean exclude_inherited)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -593,8 +566,7 @@ TAO_Container_i::lookup_name_i (const char *search_name,
                                search_name,
                                levels_to_search,
                                limit_type,
-                               exclude_inherited
-                               ACE_ENV_ARG_PARAMETER);
+                               exclude_inherited);
 
   CORBA::ULong size = static_cast<CORBA::ULong> (kind_queue.size ());
 
@@ -602,7 +574,6 @@ TAO_Container_i::lookup_name_i (const char *search_name,
   ACE_NEW_THROW_EX (holder,
                     CORBA::ContainedSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::ContainedSeq_var retval = holder;
   retval->length (size);
@@ -618,14 +589,10 @@ TAO_Container_i::lookup_name_i (const char *search_name,
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (next_kind,
                                               next_path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                              this->repo_);
 
       CORBA::Contained_var next_cont =
-        CORBA::Contained::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        CORBA::Contained::_narrow (obj.in ());
 
       retval[i] = next_cont._retn ();
     }
@@ -636,32 +603,26 @@ TAO_Container_i::lookup_name_i (const char *search_name,
 CORBA::Container::DescriptionSeq *
 TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type,
                                     CORBA::Boolean exclude_inherited,
-                                    CORBA::Long max_returned_objs
-                                    ACE_ENV_ARG_DECL)
+                                    CORBA::Long max_returned_objs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
   return this->describe_contents_i (limit_type,
                                     exclude_inherited,
-                                    max_returned_objs
-                                    ACE_ENV_ARG_PARAMETER);
+                                    max_returned_objs);
 }
 
 CORBA::Container::DescriptionSeq *
 TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
                                       CORBA::Boolean exclude_inherited,
-                                      CORBA::Long max_returned_objs
-                                      ACE_ENV_ARG_DECL)
+                                      CORBA::Long max_returned_objs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ContainedSeq_var contents = this->contents_i (limit_type,
-                                                      exclude_inherited
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                      exclude_inherited);
 
   CORBA::ULong length = contents->length ();
   CORBA::ULong ret_len = 0;
@@ -681,7 +642,6 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
   ACE_NEW_THROW_EX (desc_seq,
                     CORBA::Container::DescriptionSeq (ret_len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   desc_seq->length (ret_len);
   CORBA::Container::DescriptionSeq_var retval = desc_seq;
@@ -700,8 +660,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
       impl = TAO_IFR_Service_Utils::path_to_contained (contained_path,
                                                        this->repo_);
 
-      desc = impl->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      desc = impl->describe_i ();
 
       retval[i].contained_object = CORBA::Contained::_duplicate (contents[i]);
 
@@ -715,26 +674,22 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
 CORBA::ModuleDef_ptr
 TAO_Container_i::create_module (const char *id,
                                 const char *name,
-                                const char *version
-                                ACE_ENV_ARG_DECL)
+                                const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ModuleDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ());
+  this->update_key ();
 
   return this->create_module_i (id,
                                 name,
-                                version
-                                ACE_ENV_ARG_PARAMETER);
+                                version);
 }
 
 CORBA::ModuleDef_ptr
 TAO_Container_i::create_module_i (const char *id,
                                   const char *name,
-                                  const char *version
-                                  ACE_ENV_ARG_DECL)
+                                  const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // new_key is not needed when creating a module, but it is needed
@@ -751,20 +706,15 @@ TAO_Container_i::create_module_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ());
+                                          "defns");
 
   // Create the object reference.
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Module,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ComponentIR::ModuleDef::_narrow (obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ModuleDef::_narrow (obj.in ());
 }
 
 CORBA::ConstantDef_ptr
@@ -772,21 +722,18 @@ TAO_Container_i::create_constant (const char *id,
                                   const char *name,
                                   const char *version,
                                   CORBA::IDLType_ptr type,
-                                  const CORBA::Any &value
-                                  ACE_ENV_ARG_DECL)
+                                  const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ConstantDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
+  this->update_key ();
 
   return this->create_constant_i (id,
                                   name,
                                   version,
                                   type,
-                                  value
-                                  ACE_ENV_ARG_PARAMETER);
+                                  value);
 }
 
 CORBA::ConstantDef_ptr
@@ -794,8 +741,7 @@ TAO_Container_i::create_constant_i (const char *id,
                                     const char *name,
                                     const char *version,
                                     CORBA::IDLType_ptr type,
-                                    const CORBA::Any &value
-                                    ACE_ENV_ARG_DECL)
+                                    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -810,9 +756,7 @@ TAO_Container_i::create_constant_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
+                                          "defns");
 
   // Get the path to our type and store it.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -842,8 +786,7 @@ TAO_Container_i::create_constant_i (const char *id,
 
   CORBA::TypeCode_var val_tc = value.type ();
 
-  CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
+  CORBA::TCKind kind = val_tc->kind ();
 
   switch (kind)
   {
@@ -873,40 +816,33 @@ TAO_Container_i::create_constant_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Constant,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ConstantDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::ConstantDef::_narrow (obj.in ());
 }
 
 CORBA::StructDef_ptr
 TAO_Container_i::create_struct (const char *id,
                                 const char *name,
                                 const char *version,
-                                const CORBA::StructMemberSeq &members
-                                ACE_ENV_ARG_DECL)
+                                const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::StructDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
+  this->update_key ();
 
   return this->create_struct_i (id,
                                 name,
                                 version,
-                                members
-                                ACE_ENV_ARG_PARAMETER);
+                                members);
 }
 
 CORBA::StructDef_ptr
 TAO_Container_i::create_struct_i (const char *id,
                                   const char *name,
                                   const char *version,
-                                  const CORBA::StructMemberSeq &members
-                                  ACE_ENV_ARG_DECL)
+                                  const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -921,9 +857,7 @@ TAO_Container_i::create_struct_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
+                                          "defns");
 
   // Open a section for the struct's members.
   ACE_Configuration_Section_Key refs_key;
@@ -962,8 +896,7 @@ TAO_Container_i::create_struct_i (const char *id,
     }
 
   CORBA::DefinitionKind def_kind =
-    this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
+    this->def_kind ();
 
   if (def_kind == CORBA::dk_Struct
       || def_kind == CORBA::dk_Union
@@ -977,12 +910,9 @@ TAO_Container_i::create_struct_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Struct,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::StructDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::StructDef::_narrow (obj.in ());
 }
 
 CORBA::UnionDef_ptr
@@ -990,21 +920,18 @@ TAO_Container_i::create_union (const char *id,
                                const char *name,
                                const char *version,
                                CORBA::IDLType_ptr discriminator_type,
-                               const CORBA::UnionMemberSeq &members
-                               ACE_ENV_ARG_DECL)
+                               const CORBA::UnionMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::UnionDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
+  this->update_key ();
 
   return this->create_union_i (id,
                                name,
                                version,
                                discriminator_type,
-                               members
-                               ACE_ENV_ARG_PARAMETER);
+                               members);
 }
 
 CORBA::UnionDef_ptr
@@ -1012,8 +939,7 @@ TAO_Container_i::create_union_i (const char *id,
                                  const char *name,
                                  const char *version,
                                  CORBA::IDLType_ptr discriminator_type,
-                                 const CORBA::UnionMemberSeq &members
-                                 ACE_ENV_ARG_DECL)
+                                 const CORBA::UnionMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1028,9 +954,7 @@ TAO_Container_i::create_union_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
+                                          "defns");
 
   // Add a field to hold the path to the discriminator type.
   char *disc_path =
@@ -1077,13 +1001,11 @@ TAO_Container_i::create_union_i (const char *id,
                                                 member_path);
 
       this->store_label (member_key,
-                         members[i].label
-                         ACE_ENV_ARG_PARAMETER);
+                         members[i].label);
     }
 
   CORBA::DefinitionKind def_kind =
-    this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
+    this->def_kind ();
 
   if (def_kind == CORBA::dk_Struct
       || def_kind == CORBA::dk_Union
@@ -1097,40 +1019,33 @@ TAO_Container_i::create_union_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Union,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::UnionDef::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::UnionDef::_narrow (obj.in ());
 }
 
 CORBA::EnumDef_ptr
 TAO_Container_i::create_enum (const char *id,
                               const char *name,
                               const char *version,
-                              const CORBA::EnumMemberSeq &members
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::EnumDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
+  this->update_key ();
 
   return this->create_enum_i (id,
                               name,
                               version,
-                              members
-                              ACE_ENV_ARG_PARAMETER);
+                              members);
 }
 
 CORBA::EnumDef_ptr
 TAO_Container_i::create_enum_i (const char *id,
                                 const char *name,
                                 const char *version,
-                                const CORBA::EnumMemberSeq &members
-                                ACE_ENV_ARG_DECL)
+                                const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1145,9 +1060,7 @@ TAO_Container_i::create_enum_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
+                                          "defns");
 
   // Store the member count of the enum.
   CORBA::ULong count = members.length ();
@@ -1172,8 +1085,7 @@ TAO_Container_i::create_enum_i (const char *id,
     }
 
   CORBA::DefinitionKind def_kind =
-    this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
+    this->def_kind ();
 
   if (def_kind == CORBA::dk_Struct
       || def_kind == CORBA::dk_Union
@@ -1187,40 +1099,33 @@ TAO_Container_i::create_enum_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Enum,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::EnumDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::EnumDef::_narrow (obj.in ());
 }
 
 CORBA::AliasDef_ptr
 TAO_Container_i::create_alias (const char *id,
                                const char *name,
                                const char *version,
-                               CORBA::IDLType_ptr original_type
-                               ACE_ENV_ARG_DECL)
+                               CORBA::IDLType_ptr original_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::AliasDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AliasDef::_nil ());
+  this->update_key ();
 
   return this->create_alias_i (id,
                                name,
                                version,
-                               original_type
-                               ACE_ENV_ARG_PARAMETER);
+                               original_type);
 }
 
 CORBA::AliasDef_ptr
 TAO_Container_i::create_alias_i (const char *id,
                                  const char *name,
                                  const char *version,
-                                 CORBA::IDLType_ptr original_type
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::IDLType_ptr original_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1235,9 +1140,7 @@ TAO_Container_i::create_alias_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AliasDef::_nil ());
+                                          "defns");
 
   // Get the path to our original type and store it.
   char *unalias_path =
@@ -1251,40 +1154,33 @@ TAO_Container_i::create_alias_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Alias,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AliasDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::AliasDef::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::AliasDef::_narrow (obj.in ());
 }
 
 CORBA::InterfaceDef_ptr
 TAO_Container_i::create_interface (const char *id,
                                    const char *name,
                                    const char *version,
-                                   const CORBA::InterfaceDefSeq &base_interfaces
-                                   ACE_ENV_ARG_DECL)
+                                   const CORBA::InterfaceDefSeq &base_interfaces)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+  this->update_key ();
 
   return this->create_interface_i (id,
                                    name,
                                    version,
-                                   base_interfaces
-                                   ACE_ENV_ARG_PARAMETER);
+                                   base_interfaces);
 }
 
 CORBA::InterfaceDef_ptr
 TAO_Container_i::create_interface_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     const CORBA::InterfaceDefSeq &base_interfaces
-                                     ACE_ENV_ARG_DECL)
+                                     const CORBA::InterfaceDefSeq &base_interfaces)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1299,9 +1195,7 @@ TAO_Container_i::create_interface_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+                                          "defns");
 
   CORBA::ULong length = base_interfaces.length ();
 
@@ -1333,12 +1227,9 @@ TAO_Container_i::create_interface_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Interface,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::InterfaceDef::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+  return CORBA::InterfaceDef::_narrow (obj.in ());
 }
 
 CORBA::ValueDef_ptr
@@ -1353,14 +1244,12 @@ TAO_Container_i::create_value (
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::InitializerSeq &initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+  this->update_key ();
 
   return this->create_value_i (id,
                                name,
@@ -1371,8 +1260,7 @@ TAO_Container_i::create_value (
                                is_truncatable,
                                abstract_base_values,
                                supported_interfaces,
-                               initializers
-                               ACE_ENV_ARG_PARAMETER);
+                               initializers);
 }
 
 CORBA::ValueDef_ptr
@@ -1387,7 +1275,6 @@ TAO_Container_i::create_value_i (
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces,
     const CORBA::InitializerSeq &initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1404,9 +1291,7 @@ TAO_Container_i::create_value_i (
                                base_value,
                                is_truncatable,
                                abstract_base_values,
-                               supported_interfaces
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+                               supported_interfaces);
 
   TAO_IFR_Generic_Utils<CORBA::InitializerSeq>::set_initializers (
       initializers,
@@ -1418,32 +1303,26 @@ TAO_Container_i::create_value_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Value,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ValueDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueDef::_narrow (obj.in ());
 }
 
 CORBA::ValueBoxDef_ptr
 TAO_Container_i::create_value_box (const char *id,
                                    const char *name,
                                    const char *version,
-                                   CORBA::IDLType_ptr original_type_def
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueBoxDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ());
+  this->update_key ();
 
   return this->create_value_box_i (id,
                                    name,
                                    version,
-                                   original_type_def
-                                   ACE_ENV_ARG_PARAMETER);
+                                   original_type_def);
 }
 
 CORBA::ValueBoxDef_ptr
@@ -1451,7 +1330,7 @@ TAO_Container_i::create_value_box_i (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA::IDLType_ptr original_type_def
-                                     ACE_ENV_ARG_DECL )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1466,9 +1345,7 @@ TAO_Container_i::create_value_box_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ());
+                                          "defns");
 
   // Get the path to our original type and store it.
   char *boxed_path =
@@ -1482,40 +1359,33 @@ TAO_Container_i::create_value_box_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_ValueBox,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ValueBoxDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueBoxDef::_narrow (obj.in ());
 }
 
 CORBA::ExceptionDef_ptr
 TAO_Container_i::create_exception (const char *id,
                                    const char *name,
                                    const char *version,
-                                   const CORBA::StructMemberSeq &members
-                                   ACE_ENV_ARG_DECL)
+                                   const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExceptionDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ());
+  this->update_key ();
 
   return this->create_exception_i (id,
                                    name,
                                    version,
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
+                                   members);
 }
 
 CORBA::ExceptionDef_ptr
 TAO_Container_i::create_exception_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     const CORBA::StructMemberSeq &members
-                                     ACE_ENV_ARG_DECL)
+                                     const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1530,9 +1400,7 @@ TAO_Container_i::create_exception_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ());
+                                          "defns");
 
   ACE_Configuration_Section_Key refs_key;
   this->repo_->config ()->open_section (new_key,
@@ -1573,37 +1441,30 @@ TAO_Container_i::create_exception_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ExceptionDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExceptionDef::_narrow (obj.in ());
 }
 
 CORBA::NativeDef_ptr
 TAO_Container_i::create_native (const char *id,
                                 const char *name,
-                                const char *version
-                                ACE_ENV_ARG_DECL)
+                                const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::NativeDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NativeDef::_nil ());
+  this->update_key ();
 
   return this->create_native_i (id,
                                 name,
-                                version
-                                ACE_ENV_ARG_PARAMETER);
+                                version);
 }
 
 CORBA::NativeDef_ptr
 TAO_Container_i::create_native_i (const char *id,
                                   const char *name,
-                                  const char *version
-                                  ACE_ENV_ARG_DECL)
+                                  const char *version)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1618,20 +1479,15 @@ TAO_Container_i::create_native_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NativeDef::_nil ());
+                                          "defns");
 
   // Create the object reference.
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Native,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NativeDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::NativeDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::NativeDef::_narrow (obj.in ());
 }
 
 CORBA::AbstractInterfaceDef_ptr
@@ -1640,20 +1496,17 @@ TAO_Container_i::create_abstract_interface (
     const char *name,
     const char *version,
     const CORBA::AbstractInterfaceDefSeq &base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::AbstractInterfaceDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ());
+  this->update_key ();
 
   return this->create_abstract_interface_i (id,
                                             name,
                                             version,
-                                            base_interfaces
-                                            ACE_ENV_ARG_PARAMETER);
+                                            base_interfaces);
 }
 
 CORBA::AbstractInterfaceDef_ptr
@@ -1662,7 +1515,6 @@ TAO_Container_i::create_abstract_interface_i (
     const char *name,
     const char *version,
     const CORBA::AbstractInterfaceDefSeq &base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1678,9 +1530,7 @@ TAO_Container_i::create_abstract_interface_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ());
+                                          "defns");
 
   CORBA::ULong length = base_interfaces.length ();
 
@@ -1712,12 +1562,9 @@ TAO_Container_i::create_abstract_interface_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_AbstractInterface,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::AbstractInterfaceDef::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+  return CORBA::AbstractInterfaceDef::_narrow (obj.in ());
 }
 
 CORBA::LocalInterfaceDef_ptr
@@ -1726,20 +1573,17 @@ TAO_Container_i::create_local_interface (
     const char *name,
     const char *version,
     const CORBA::InterfaceDefSeq &base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::LocalInterfaceDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ());
+  this->update_key ();
 
   return this->create_local_interface_i (id,
                                          name,
                                          version,
-                                         base_interfaces
-                                         ACE_ENV_ARG_PARAMETER);
+                                         base_interfaces);
 }
 
 CORBA::LocalInterfaceDef_ptr
@@ -1748,7 +1592,6 @@ TAO_Container_i::create_local_interface_i (
     const char *name,
     const char *version,
     const CORBA::InterfaceDefSeq &base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1764,9 +1607,7 @@ TAO_Container_i::create_local_interface_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ());
+                                          "defns");
 
   CORBA::ULong length = base_interfaces.length ();
 
@@ -1798,12 +1639,9 @@ TAO_Container_i::create_local_interface_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_LocalInterface,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::LocalInterfaceDef::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return CORBA::LocalInterfaceDef::_narrow (obj.in ());
 }
 
 CORBA::ExtValueDef_ptr
@@ -1818,14 +1656,12 @@ TAO_Container_i::create_ext_value (
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtValueDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtValueDef::_nil ());
+  this->update_key ();
 
   return this->create_ext_value_i (id,
                                    name,
@@ -1836,8 +1672,7 @@ TAO_Container_i::create_ext_value (
                                    is_truncatable,
                                    abstract_base_values,
                                    supported_interfaces,
-                                   initializers
-                                   ACE_ENV_ARG_PARAMETER);
+                                   initializers);
 }
 
 CORBA::ExtValueDef_ptr
@@ -1852,7 +1687,6 @@ TAO_Container_i::create_ext_value_i (
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1869,9 +1703,7 @@ TAO_Container_i::create_ext_value_i (
                                base_value,
                                is_truncatable,
                                abstract_base_values,
-                               supported_interfaces
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtValueDef::_nil ());
+                               supported_interfaces);
 
   /// This does not handle the initializer exceptions, so we do that below.
   TAO_IFR_Generic_Utils<CORBA::ExtInitializerSeq>::set_initializers (
@@ -1912,12 +1744,9 @@ TAO_Container_i::create_ext_value_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Value,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtValueDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ExtValueDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::ExtValueDef::_narrow (obj.in ());
 }
 
 int
@@ -1940,7 +1769,6 @@ TAO_Container_i::lookup_name_recursive (
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL
     )
 {
   ACE_Configuration_Section_Key defns_key;
@@ -2019,15 +1847,12 @@ TAO_Container_i::lookup_name_recursive (
                                               ? -1
                                               : levels_to_search - 1,
                                            limit_type,
-                                           exclude_inherited
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                                           exclude_inherited);
             }
         }
     }
 
-  CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::DefinitionKind kind = this->def_kind ();
 
   if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value)
     {
@@ -2256,14 +2081,12 @@ TAO_Container_i::lookup_op (
 
 void
 TAO_Container_i::store_label (ACE_Configuration_Section_Key key,
-                              const CORBA::Any &value
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var tc = value.type ();
 
-  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = tc->kind ();
 
   u_int result = 0;
   int default_label = 0;
@@ -2494,7 +2317,6 @@ TAO_Container_i::create_value_common (
     CORBA::Boolean is_truncatable,
     const CORBA::ValueDefSeq &abstract_base_values,
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -2509,9 +2331,7 @@ TAO_Container_i::create_value_common (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "defns"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (path);
+                                          "defns");
 
   this->repo_->config ()->set_integer_value (new_key,
                                              "is_custom",
@@ -2541,9 +2361,7 @@ TAO_Container_i::create_value_common (
       TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                           new_key,
                                           this->repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (path);
+                                          CORBA::dk_Value);
 
       ACE_TString base_value_id;
       this->repo_->config ()->get_string_value (TAO_IFR_Service_Utils::tmp_key_,
@@ -2591,9 +2409,7 @@ TAO_Container_i::create_value_common (
           TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                               new_key,
                                               this->repo_,
-                                              CORBA::dk_Value
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (path);
+                                              CORBA::dk_Value);
 
           this->repo_->config ()->get_string_value (
               TAO_IFR_Service_Utils::tmp_key_,
@@ -2662,9 +2478,7 @@ TAO_Container_i::create_value_common (
           TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                               new_key,
                                               this->repo_,
-                                              CORBA::dk_Value
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (path);
+                                              CORBA::dk_Value);
 
           this->repo_->config ()->get_string_value (
               TAO_IFR_Service_Utils::tmp_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
index ab8e833579b..8ca8e62b07c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -58,39 +58,33 @@ public:
   // Destructor.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove our contents.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained_ptr lookup (
       const char *search_name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Contained_ptr lookup_i (
       const char *search_name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ContainedSeq *contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ContainedSeq *contents_i (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -99,7 +93,6 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -108,7 +101,6 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -116,7 +108,6 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -124,7 +115,6 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -132,7 +122,6 @@ public:
       const char *id,
       const char *name,
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -140,7 +129,6 @@ public:
       const char *id,
       const char *name,
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -150,7 +138,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -160,7 +147,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -169,7 +155,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -178,7 +163,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -188,7 +172,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr discriminator_type,
       const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -198,7 +181,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr discriminator_type,
       const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -207,7 +189,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -216,7 +197,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -225,7 +205,6 @@ public:
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -234,7 +213,6 @@ public:
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -243,7 +221,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -252,7 +229,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -267,7 +243,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
       const CORBA::InitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -282,7 +257,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq & supported_interfaces,
       const CORBA::InitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -291,7 +265,6 @@ public:
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -300,7 +273,6 @@ public:
       const char *name,
       const char *version,
       CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -309,7 +281,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -318,7 +289,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -326,7 +296,6 @@ public:
       const char *id,
       const char *name,
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -334,7 +303,6 @@ public:
       const char *id,
       const char *name,
       const char *version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -343,7 +311,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::AbstractInterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -352,7 +319,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::AbstractInterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -361,7 +327,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -370,7 +335,6 @@ public:
       const char *name,
       const char *version,
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -385,7 +349,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -400,7 +363,6 @@ public:
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces,
       const CORBA::ExtInitializerSeq &initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -420,7 +382,6 @@ protected:
    void store_label (
       ACE_Configuration_Section_Key key,
       const CORBA::Any &value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Store a union member's label value.
@@ -446,8 +407,7 @@ private:
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      CORBA::Boolean exclude_inherited);
 
   ACE_TString create_value_common (
       CORBA::DefinitionKind container_kind,
@@ -462,7 +422,6 @@ private:
       CORBA::Boolean is_truncatable,
       const CORBA::ValueDefSeq &abstract_base_values,
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL
     );
   // Common code for create_value_i and create_ext_value_i.
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
index 0cbe4a4093d..c31ea85374a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/EmitsDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService, 
-           EmitsDef_i, 
+ACE_RCSID (IFRService,
+           EmitsDef_i,
            "$Id$")
 
 
@@ -22,7 +22,7 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EmitsDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EmitsDef_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Emits;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
index 5d8e93fdeba..518a12b290b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
@@ -53,7 +53,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index 5273788b6de..90a70b66fdb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -26,26 +26,25 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EnumDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EnumDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Enum;
 }
 
 CORBA::TypeCode_ptr
-TAO_EnumDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -58,29 +57,26 @@ TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "name",
                                             name);
 
-  CORBA::EnumMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::EnumMemberSeq_var members = this->members_i ();
 
   return this->repo_->tc_factory ()->create_enum_tc (id.c_str (),
                                                      name.c_str (),
-                                                     members.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     members.in ());
 }
 
 CORBA::EnumMemberSeq *
-TAO_EnumDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::members (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->members_i ();
 }
 
 CORBA::EnumMemberSeq *
-TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::members_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -92,7 +88,6 @@ TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     CORBA::EnumMemberSeq (count),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->length (count);
 
@@ -117,22 +112,18 @@ TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members
-                        ACE_ENV_ARG_DECL)
+TAO_EnumDef_i::members (const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->members_i (members
-                   ACE_ENV_ARG_PARAMETER);
+  this->members_i (members);
 }
 
 void
-TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
index 0bd5b265451..a9f901135bf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
@@ -51,43 +51,36 @@ public:
   virtual ~TAO_EnumDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::EnumMemberSeq *members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::EnumMemberSeq *members ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::EnumMemberSeq *members_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::EnumMemberSeq *members_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::EnumMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::EnumMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
index cd62666f25d..e682d651f52 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/EventDef_i.h"
 
-ACE_RCSID (IFRService, 
-           EventDef_i, 
+ACE_RCSID (IFRService,
+           EventDef_i,
            "$Id$")
 
 
@@ -25,68 +25,62 @@ TAO_EventDef_i::~TAO_EventDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EventDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EventDef_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Event;
 }
 
 void
-TAO_EventDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_EventDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::destroy_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // An event type is a restriction of a value type, not an extension.
-  this->TAO_ExtValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->TAO_ExtValueDef_i::destroy_i ();
 }
 
 CORBA::Contained::Description *
-TAO_EventDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::describe (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_EventDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::describe_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_ValueDef_i::describe_i ();
 }
 
 CORBA::Boolean
-TAO_EventDef_i::is_a (const char *event_id
-                      ACE_ENV_ARG_DECL)
+TAO_EventDef_i::is_a (const char *event_id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_a_i (event_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (event_id);
 }
 
 CORBA::Boolean
-TAO_EventDef_i::is_a_i (const char *event_id
-                        ACE_ENV_ARG_DECL)
+TAO_EventDef_i::is_a_i (const char *event_id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (event_id, "IDL:omg.org/CORBA/EventBase:1.0") == 0)
@@ -94,8 +88,7 @@ TAO_EventDef_i::is_a_i (const char *event_id
       return 1;
     }
 
-  return this->TAO_ValueDef_i::is_a_i (event_id
-                                       ACE_ENV_ARG_PARAMETER);
+  return this->TAO_ValueDef_i::is_a_i (event_id);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
index a1e280a2882..9746d4289d7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
@@ -52,43 +52,36 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Boolean is_a (
       const char *event_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *event_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index f3d1a44a8f4..71d487f0cdd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -27,21 +27,18 @@ TAO_EventPortDef_i::~TAO_EventPortDef_i (void)
 
 CORBA::ComponentIR::EventDef_ptr
 TAO_EventPortDef_i::event (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::EventDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
+  this->update_key ();
 
-  return this->event_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_i ();
 }
 
 CORBA::ComponentIR::EventDef_ptr
 TAO_EventPortDef_i::event_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -49,34 +46,27 @@ TAO_EventPortDef_i::event_i (
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "base_type",
                                             holder);
-  CORBA::Contained_var obj = this->repo_->lookup_id (holder.fast_rep ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::EventDef::_nil ());
+  CORBA::Contained_var obj = this->repo_->lookup_id (holder.fast_rep ());
 
-  return CORBA::ComponentIR::EventDef::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::EventDef::_narrow (obj.in ());
 }
 
 void
 TAO_EventPortDef_i::event (
     CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->event_i (event
-                 ACE_ENV_ARG_PARAMETER);
+  this->event_i (event);
 }
 
 void
 TAO_EventPortDef_i::event_i (
     CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -110,23 +100,19 @@ TAO_EventPortDef_i::event_i (
 CORBA::Boolean
 TAO_EventPortDef_i::is_a (
     const char *event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_a_i (event_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (event_id);
 }
 
 CORBA::Boolean
 TAO_EventPortDef_i::is_a_i (
     const char *event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -144,24 +130,22 @@ TAO_EventPortDef_i::is_a_i (
                                        0);
   TAO_EventDef_i impl (this->repo_);
   impl.section_key (key);
-  return impl.is_a_i (event_id
-                      ACE_ENV_ARG_PARAMETER);
+  return impl.is_a_i (event_id);
 }
 
 CORBA::Contained::Description *
-TAO_EventPortDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventPortDef_i::describe (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_EventPortDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventPortDef_i::describe_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::EventPortDescription epd;
@@ -170,9 +154,7 @@ TAO_EventPortDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                                               epd,
                                               this->repo_,
                                               this->section_key_
-                                              ACE_ENV_ARG_PARAMETER
                                             );
-  ACE_CHECK_RETURN (0);
 
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -191,7 +173,7 @@ TAO_EventPortDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::DefinitionKind
-TAO_EventPortDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EventPortDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_none;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
index dc84527d41f..0c292797cbb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
@@ -55,36 +55,30 @@ public:
   /// Destructor
 
   virtual CORBA::ComponentIR::EventDef_ptr event (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::EventDef_ptr event_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void event (
       CORBA::ComponentIR::EventDef_ptr event
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void event_i (
       CORBA::ComponentIR::EventDef_ptr event
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
       const char *event_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *event_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -92,20 +86,17 @@ public:
   /// implemented here.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
 private:
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Dummy method so we can consolidate derived class methods
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 33b7c9eee99..44fd01ab2f8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -27,71 +27,63 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ExceptionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ExceptionDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Exception;
 }
 
 void
-TAO_ExceptionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_ExceptionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Container_i::destroy_i ();
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Contained_i::destroy_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ExceptionDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::describe (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::describe_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
                     CORBA::Contained::Description,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  retval->kind = this->def_kind ();
 
   CORBA::ExceptionDescription ed;
 
-  ed.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ed.name = this->name_i ();
 
-  ed.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ed.id = this->id_i ();
 
   ACE_TString container_id;
 
@@ -101,11 +93,9 @@ TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 
   ed.defined_in = container_id.c_str ();
 
-  ed.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ed.version = this->version_i ();
 
-  ed.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ed.type = this->type_i ();
 
   retval->value <<= ed;
 
@@ -113,19 +103,18 @@ TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_ExceptionDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -139,31 +128,28 @@ TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             name);
 
   CORBA::StructMemberSeq_var members =
-    this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+    this->members_i ();
 
   return this->repo_->tc_factory ()->create_exception_tc (
                                          id.c_str (),
                                          name.c_str (),
                                          members.in ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
 CORBA::StructMemberSeq *
-TAO_ExceptionDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::members (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->members_i ();
 }
 
 CORBA::StructMemberSeq *
-TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::members_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -232,7 +218,6 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (members,
                     CORBA::StructMemberSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   members->length (size);
 
@@ -256,13 +241,9 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
       obj =
         TAO_IFR_Service_Utils::create_objref (kind,
                                               path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                              this->repo_);
 
-      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ());
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
                                            path,
@@ -272,35 +253,29 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
       impl = TAO_IFR_Service_Utils::path_to_idltype (path,
                                                      this->repo_);
 
-      retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[k].type = impl->type_i ();
     }
 
   return retval._retn ();
 }
 
 void
-TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members
-                             ACE_ENV_ARG_DECL)
+TAO_ExceptionDef_i::members (const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->members_i (members
-                   ACE_ENV_ARG_PARAMETER);
+  this->members_i (members);
 }
 
 void
-TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members
-                               ACE_ENV_ARG_DECL)
+TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Container_i::destroy_i ();
 
   CORBA::ULong count = members.length ();
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
index 88dd3e8bbd5..ae7c11bbc7f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
@@ -52,65 +52,54 @@ public:
   virtual ~TAO_ExceptionDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::StructMemberSeq *members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::StructMemberSeq *members ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::StructMemberSeq *members_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::StructMemberSeq *members_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::StructMemberSeq & members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA::StructMemberSeq & members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::StructMemberSeq & members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
index 82ffce83d05..7daca75390d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService, 
-           ExtAbstractInterfaceDef_i, 
+ACE_RCSID (IFRService,
+           ExtAbstractInterfaceDef_i,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -29,15 +29,14 @@ TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i (void)
 // Just call the base class version, this is here only to
 // disambiguate multiple inheritance.
 void
-TAO_ExtAbstractInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExtAbstractInterfaceDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  TAO_AbstractInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_AbstractInterfaceDef_i::destroy_i ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
index e79471d8e11..46b883aa6b0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
@@ -56,7 +56,6 @@ public:
   // Destructor
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
index 62405fe8393..c71daebd1a3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -28,21 +28,18 @@ TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i (void)
 
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::get_exceptions (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->get_exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->get_exceptions_i ();
 }
 
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::get_exceptions_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -53,9 +50,7 @@ TAO_ExtAttributeDef_i::get_exceptions_i (
   CORBA::ExcDescriptionSeq_var safe_retval = retval;
 
   this->fill_exceptions (*retval,
-                         "get_excepts"
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                         "get_excepts");
 
   return safe_retval._retn ();
 }
@@ -63,23 +58,19 @@ TAO_ExtAttributeDef_i::get_exceptions_i (
 void
 TAO_ExtAttributeDef_i::get_exceptions (
     const CORBA::ExcDescriptionSeq &get_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->get_exceptions_i (get_exceptions
-                          ACE_ENV_ARG_PARAMETER);
+  this->get_exceptions_i (get_exceptions);
 }
 
 void
 TAO_ExtAttributeDef_i::get_exceptions_i (
     const CORBA::ExcDescriptionSeq &get_exceptions
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -89,21 +80,18 @@ TAO_ExtAttributeDef_i::get_exceptions_i (
 
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::set_exceptions (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->set_exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->set_exceptions_i ();
 }
 
 CORBA::ExcDescriptionSeq *
 TAO_ExtAttributeDef_i::set_exceptions_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -114,9 +102,7 @@ TAO_ExtAttributeDef_i::set_exceptions_i (
   CORBA::ExcDescriptionSeq_var safe_retval = retval;
 
   this->fill_exceptions (*retval,
-                         "put_excepts"
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                         "put_excepts");
 
   return safe_retval._retn ();
 }
@@ -124,23 +110,19 @@ TAO_ExtAttributeDef_i::set_exceptions_i (
 void
 TAO_ExtAttributeDef_i::set_exceptions (
     const CORBA::ExcDescriptionSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->set_exceptions_i (set_exceptions
-                          ACE_ENV_ARG_PARAMETER);
+  this->set_exceptions_i (set_exceptions);
 }
 
 void
 TAO_ExtAttributeDef_i::set_exceptions_i (
     const CORBA::ExcDescriptionSeq &set_exceptions
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -150,21 +132,18 @@ TAO_ExtAttributeDef_i::set_exceptions_i (
 
 CORBA::ExtAttributeDescription *
 TAO_ExtAttributeDef_i::describe_attribute (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_attribute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_attribute_i ();
 }
 
 CORBA::ExtAttributeDescription *
 TAO_ExtAttributeDef_i::describe_attribute_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -174,9 +153,7 @@ TAO_ExtAttributeDef_i::describe_attribute_i (
                   0);
   CORBA::ExtAttributeDescription_var safe_retval = retval;
 
-  this->fill_description (*retval
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->fill_description (*retval);
 
   return safe_retval._retn ();
 }
@@ -184,15 +161,12 @@ TAO_ExtAttributeDef_i::describe_attribute_i (
 void
 TAO_ExtAttributeDef_i::fill_description (
     CORBA::ExtAttributeDescription &desc
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  desc.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.name = this->name_i ();
 
-  desc.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.id = this->id_i ();
 
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -200,29 +174,22 @@ TAO_ExtAttributeDef_i::fill_description (
                                             holder);
   desc.defined_in = holder.fast_rep ();
 
-  desc.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.id = this->id_i ();
 
-  desc.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.type = this->type_i ();
 
-  desc.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.mode = this->mode_i ();
 
   this->fill_exceptions (desc.get_exceptions,
-                         "get_excepts"
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         "get_excepts");
 
   this->fill_exceptions (desc.put_exceptions,
-                         "put_excepts"
-                         ACE_ENV_ARG_PARAMETER);
+                         "put_excepts");
 }
 
 void
 TAO_ExtAttributeDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
-                                        const char *sub_section
-                                        ACE_ENV_ARG_DECL)
+                                        const char *sub_section)
 {
   ACE_Configuration_Section_Key excepts_key;
   int status =
@@ -267,8 +234,7 @@ TAO_ExtAttributeDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
 
       TAO_ExceptionDef_i impl (this->repo_);
       impl.section_key (except_key);
-      exceptions[i].type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      exceptions[i].type = impl.type_i ();
 
       this->repo_->config ()->get_string_value (except_key,
                                                 "container_id",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
index f4d9e54b665..8fe264559e3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
@@ -52,56 +52,46 @@ public:
   // Destructor
 
   virtual CORBA::ExcDescriptionSeq *get_exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExcDescriptionSeq *get_exceptions_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void get_exceptions (
       const CORBA::ExcDescriptionSeq &get_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void get_exceptions_i (
       const CORBA::ExcDescriptionSeq &get_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ExcDescriptionSeq *set_exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExcDescriptionSeq *set_exceptions_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_exceptions (
       const CORBA::ExcDescriptionSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void set_exceptions_i (
       const CORBA::ExcDescriptionSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ExtAttributeDescription *describe_attribute (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExtAttributeDescription *describe_attribute_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -109,7 +99,6 @@ public:
   // ComponentDescription.
   void fill_description (
       CORBA::ExtAttributeDescription &desc
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -117,8 +106,7 @@ private:
   /// Common code for the set and get varieties.
 
   void fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
-                        const char *sub_section
-                        ACE_ENV_ARG_DECL);
+                        const char *sub_section);
 
   void exceptions (const char *sub_section,
                    const CORBA::ExcDescriptionSeq &exceptions);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
index 3b802bcb762..f857c37adb0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService, 
-           ExtLocalInterfaceDef_i, 
+ACE_RCSID (IFRService,
+           ExtLocalInterfaceDef_i,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -29,15 +29,14 @@ TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i (void)
 // Just call the base class version, this is here only to
 // disambiguate multiple inheritance.
 void
-TAO_ExtLocalInterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ExtLocalInterfaceDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  TAO_LocalInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  TAO_LocalInterfaceDef_i::destroy_i ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
index 1e5eec3bcf2..fcf64d09eb7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
@@ -55,7 +55,6 @@ public:
   // Destructor
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 410fd91c7d9..51b596f3b33 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -30,21 +30,18 @@ TAO_ExtValueDef_i::~TAO_ExtValueDef_i (void)
 
 CORBA::ExtInitializerSeq *
 TAO_ExtValueDef_i::ext_initializers (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->ext_initializers_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ext_initializers_i ();
 }
 
 CORBA::ExtInitializerSeq *
 TAO_ExtValueDef_i::ext_initializers_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -124,26 +121,19 @@ TAO_ExtValueDef_i::ext_initializers_i (
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           retval[i].members[j].type =
-            impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            impl->type_i ();
 
           obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                                      this->repo_);
 
           retval[i].members[j].type_def =
-            CORBA::IDLType::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            CORBA::IDLType::_narrow (obj.in ());
         }
 
       this->fill_exceptions (retval[i].exceptions,
                              initializer_key,
-                             "excepts"
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                             "excepts");
     }
 
   return retval._retn ();
@@ -152,23 +142,19 @@ TAO_ExtValueDef_i::ext_initializers_i (
 void
 TAO_ExtValueDef_i::ext_initializers (
     const CORBA::ExtInitializerSeq &ext_initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->ext_initializers_i (ext_initializers
-                            ACE_ENV_ARG_PARAMETER);
+  this->ext_initializers_i (ext_initializers);
 }
 
 void
 TAO_ExtValueDef_i::ext_initializers_i (
     const CORBA::ExtInitializerSeq &ext_initializers
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -213,21 +199,18 @@ TAO_ExtValueDef_i::ext_initializers_i (
 
 CORBA::ExtValueDef::ExtFullValueDescription *
 TAO_ExtValueDef_i::describe_ext_value (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_ext_value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_ext_value_i ();
 }
 
 CORBA::ExtValueDef::ExtFullValueDescription *
 TAO_ExtValueDef_i::describe_ext_value_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -319,16 +302,14 @@ TAO_ExtValueDef_i::describe_ext_value_i (
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->operations[i].result =
-            idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            idl_type->type_i ();
 
           this->repo_->config ()->get_integer_value (op_key,
                                                      "mode",
                                                      val);
           fv_desc->operations[i].mode = static_cast<CORBA::OperationMode> (val);
           CORBA::TCKind kind =
-            fv_desc->operations[i].result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            fv_desc->operations[i].result->kind ();
 
           if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY
               && kind != CORBA::tk_void)
@@ -382,21 +363,16 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                     TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                             this->repo_);
                   fv_desc->operations[i].parameters[j].type =
-                    idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                    idl_type->type_i ();
 
                   obj =
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
-                                               ACE_ENV_ARG_PARAMETER
                                              );
-                  ACE_CHECK_RETURN (0);
 
                   fv_desc->operations[i].parameters[j].type_def =
-                    CORBA::IDLType::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                    CORBA::IDLType::_narrow (obj.in ());
 
                   this->repo_->config ()->get_integer_value (param_key,
                                                              "mode",
@@ -461,8 +437,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                   TAO_ExceptionDef_i impl (this->repo_);
                   impl.section_key (except_def_key);
                   fv_desc->operations[i].exceptions[j].type =
-                    impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                    impl.type_i ();
                 }
             }
         }
@@ -520,8 +495,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->attributes[i].type =
-            idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            idl_type->type_i ();
 
           this->repo_->config ()->expand_path (this->repo_->root_key (),
                                                holder,
@@ -535,16 +509,12 @@ TAO_ExtValueDef_i::describe_ext_value_i (
 
           this->fill_exceptions (fv_desc->attributes[i].get_exceptions,
                                  attr_key,
-                                 "get_excepts"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                 "get_excepts");
 
 
           this->fill_exceptions (fv_desc->attributes[i].put_exceptions,
                                  attr_key,
-                                 "put_excepts"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                 "put_excepts");
         }
     }
 
@@ -605,19 +575,14 @@ TAO_ExtValueDef_i::describe_ext_value_i (
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->members[i].type =
-            idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            idl_type->type_i ();
 
           obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                                      this->repo_);
 
           fv_desc->members[i].type_def =
-            CORBA::IDLType::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            CORBA::IDLType::_narrow (obj.in ());
         }
     }
 
@@ -689,29 +654,22 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                     TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                              this->repo_);
                   fv_desc->initializers[i].members[j].type =
-                    impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                    impl->type_i ();
 
                   obj =
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
-                                               ACE_ENV_ARG_PARAMETER
                                              );
-                  ACE_CHECK_RETURN (0);
 
                   fv_desc->initializers[i].members[j].type_def =
-                    CORBA::IDLType::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                    CORBA::IDLType::_narrow (obj.in ());
                 }
             }
 
           this->fill_exceptions (fv_desc->initializers[i].exceptions,
                                  initializer_key,
-                                 "excepts"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                 "excepts");
         }
     }
 
@@ -737,8 +695,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
                                             "base_value",
                                             holder);
   fv_desc->base_value = holder.fast_rep ();
-  fv_desc->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  fv_desc->type = this->type_i ();
 
   return retval._retn ();
 }
@@ -752,14 +709,12 @@ TAO_ExtValueDef_i::create_ext_attribute (
     CORBA::AttributeMode mode,
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtAttributeDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+  this->update_key ();
 
   return this->create_ext_attribute_i (id,
                                        name,
@@ -767,8 +722,7 @@ TAO_ExtValueDef_i::create_ext_attribute (
                                        type,
                                        mode,
                                        get_exceptions,
-                                       set_exceptions
-                                       ACE_ENV_ARG_PARAMETER);
+                                       set_exceptions);
 }
 
 CORBA::ExtAttributeDef_ptr
@@ -780,7 +734,6 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
     CORBA::AttributeMode mode,
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -798,9 +751,7 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "attrs"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+                                          "attrs");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -826,14 +777,10 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Attribute,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+                                          this->repo_);
 
   CORBA::ExtAttributeDef_var retval =
-    CORBA::ExtAttributeDef::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+    CORBA::ExtAttributeDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -841,8 +788,7 @@ TAO_ExtValueDef_i::create_ext_attribute_i (
 void
 TAO_ExtValueDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
                                     ACE_Configuration_Section_Key &key,
-                                    const char *sub_section
-                                    ACE_ENV_ARG_DECL)
+                                    const char *sub_section)
 {
   ACE_Configuration_Section_Key excepts_key;
   int status =
@@ -887,8 +833,7 @@ TAO_ExtValueDef_i::fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
 
       TAO_ExceptionDef_i impl (this->repo_);
       impl.section_key (except_key);
-      exceptions[i].type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      exceptions[i].type = impl.type_i ();
 
       this->repo_->config ()->get_string_value (except_key,
                                                 "container_id",
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
index d2390a47c4a..b23c69a8c1a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
@@ -52,34 +52,28 @@ public:
   // Destructor
 
   virtual CORBA::ExtInitializerSeq *ext_initializers (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExtInitializerSeq *ext_initializers_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void ext_initializers (
       const CORBA::ExtInitializerSeq &ext_initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void ext_initializers_i (
       const CORBA::ExtInitializerSeq &ext_initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ExtValueDef::ExtFullValueDescription *describe_ext_value_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -91,7 +85,6 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -103,7 +96,6 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -118,8 +110,7 @@ private:
 
   void fill_exceptions (CORBA::ExcDescriptionSeq &exceptions,
                         ACE_Configuration_Section_Key &key,
-                        const char *sub_section
-                        ACE_ENV_ARG_DECL);
+                        const char *sub_section);
 
   void exceptions (ACE_Configuration_Section_Key &key,
                    const char *sub_section,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
index f1fd5ae8157..af181277e96 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/FactoryDef_i.h"
 
-ACE_RCSID (IFRService, 
-           FactoryDef_i, 
+ACE_RCSID (IFRService,
+           FactoryDef_i,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -23,7 +23,7 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FactoryDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FactoryDef_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Factory;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
index 38a366914ec..0d4a5f59b5d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
@@ -51,7 +51,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
index 6fffd784ad3..8cd8f91422f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/FinderDef_i.h"
 
-ACE_RCSID (IFRService, 
-           FinderDef_i, 
+ACE_RCSID (IFRService,
+           FinderDef_i,
            "$Id$")
 
 
@@ -22,7 +22,7 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FinderDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FinderDef_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Finder;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
index e8ad0a283d7..12784c9c11e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
@@ -52,7 +52,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
index f8fdc472f04..002d747bd15 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/FixedDef_i.h"
 
-ACE_RCSID (IFRService, 
-           FixedDef_i, 
+ACE_RCSID (IFRService,
+           FixedDef_i,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -20,45 +20,43 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FixedDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FixedDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Fixed;
 }
 
 void
-TAO_FixedDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_FixedDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FixedDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA::TypeCode_ptr
-TAO_FixedDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_FixedDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FixedDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -66,19 +64,18 @@ TAO_FixedDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::UShort
-TAO_FixedDef_i::digits (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::digits (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->digits_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->digits_i ();
 }
 
 CORBA::UShort
-TAO_FixedDef_i::digits_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
+TAO_FixedDef_i::digits_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -86,41 +83,37 @@ TAO_FixedDef_i::digits_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG
 }
 
 void
-TAO_FixedDef_i::digits (CORBA::UShort digits
-                        ACE_ENV_ARG_DECL)
+TAO_FixedDef_i::digits (CORBA::UShort digits)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->digits_i (digits
-                  ACE_ENV_ARG_PARAMETER);
+  this->digits_i (digits);
 }
 
 void
 TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA::Short
-TAO_FixedDef_i::scale (ACE_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::scale (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->scale_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->scale_i ();
 }
 
 CORBA::Short
-TAO_FixedDef_i::scale_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FixedDef_i::scale_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -128,22 +121,19 @@ TAO_FixedDef_i::scale_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_FixedDef_i::scale (CORBA::Short scale
-                       ACE_ENV_ARG_DECL)
+TAO_FixedDef_i::scale (CORBA::Short scale)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->scale_i (scale
-                 ACE_ENV_ARG_PARAMETER);
+  this->scale_i (scale);
 }
 
 void
 TAO_FixedDef_i::scale_i (CORBA::Short /* scale */
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
index 326bc90185b..9b65f9b02dc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
@@ -51,75 +51,62 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::UShort digits (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::UShort digits_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void digits (
       CORBA::UShort digits
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void digits_i (
       CORBA::UShort digits
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Short scale (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Short scale_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void scale (
       CORBA::Short scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void scale_i (
       CORBA::Short scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index 4e8a1741f56..f8ae5fb993e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -36,26 +36,25 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_HomeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_HomeDef_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Home;
 }
 
 void
-TAO_HomeDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_HomeDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::destroy_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our special subsections first, then call destroy_i
@@ -65,35 +64,30 @@ TAO_HomeDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
       "factories",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
   TAO_IFR_Generic_Utils<TAO_FinderDef_i>::destroy_special (
       "finders",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
-  this->TAO_ExtInterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->TAO_ExtInterfaceDef_i::destroy_i ();
 }
 
 CORBA::Contained::Description *
-TAO_HomeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::describe (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::describe_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::HomeDescription home_desc;
@@ -101,9 +95,7 @@ TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
   TAO_IFR_Desc_Utils<CORBA::ComponentIR::HomeDescription,
                      TAO_HomeDef_i>::fill_desc_begin (home_desc,
                                                       this->repo_,
-                                                      this->section_key_
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                      this->section_key_);
 
   ACE_TString holder;
   int status =
@@ -143,31 +135,22 @@ TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                                            0);
       TAO_ValueDef_i impl (this->repo_);
       impl.section_key (tmp_key);
-      impl.fill_value_description (home_desc.primary_key
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      impl.fill_value_description (home_desc.primary_key);
     }
 
   this->fill_op_desc_seq (this->section_key_,
                           home_desc.factories,
-                          "factories"
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                          "factories");
 
   this->fill_op_desc_seq (this->section_key_,
                           home_desc.finders,
-                          "finders"
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                          "finders");
 
   this->fill_op_desc_seq (this->section_key_,
                           home_desc.operations,
-                          "ops"
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                          "ops");
 
-  home_desc.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  home_desc.type = this->type_i ();
 
   CORBA::Contained::Description *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -180,19 +163,18 @@ TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_HomeDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::type (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_HomeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::type_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -206,24 +188,22 @@ TAO_HomeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             name);
 
   return this->repo_->tc_factory ()->create_home_tc (id.fast_rep (),
-                                                     name.fast_rep ()
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                     name.fast_rep ());
 }
 
 CORBA::ComponentIR::HomeDef_ptr
-TAO_HomeDef_i::base_home (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::base_home (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
+  this->update_key ();
 
-  return this->base_home_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->base_home_i ();
 }
 
 CORBA::ComponentIR::HomeDef_ptr
-TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::base_home_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString path;
@@ -239,34 +219,27 @@ TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::HomeDef::_nil ());
+                                              this->repo_);
 
-  return CORBA::ComponentIR::HomeDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::HomeDef::_narrow (obj.in ());
 }
 
 void
 TAO_HomeDef_i::base_home (
     CORBA::ComponentIR::HomeDef_ptr base_home
-    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->base_home_i (base_home
-                     ACE_ENV_ARG_PARAMETER);
+  this->base_home_i (base_home);
 }
 
 void
 TAO_HomeDef_i::base_home_i (
     CORBA::ComponentIR::HomeDef_ptr base_home
-    ACE_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -278,21 +251,18 @@ TAO_HomeDef_i::base_home_i (
 
 CORBA::InterfaceDefSeq *
 TAO_HomeDef_i::supported_interfaces (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->supported_interfaces_i ();
 }
 
 CORBA::InterfaceDefSeq *
 TAO_HomeDef_i::supported_interfaces_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -330,13 +300,9 @@ TAO_HomeDef_i::supported_interfaces_i (
                                                 stringified,
                                                 holder);
       obj = TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                      this->repo_);
 
-      safe_retval[i] = CORBA::InterfaceDef::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      safe_retval[i] = CORBA::InterfaceDef::_narrow (obj.in ());
     }
 
   return safe_retval._retn ();
@@ -345,23 +311,19 @@ TAO_HomeDef_i::supported_interfaces_i (
 void
 TAO_HomeDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->supported_interfaces_i (supported_interfaces
-                                ACE_ENV_ARG_PARAMETER);
+  this->supported_interfaces_i (supported_interfaces);
 }
 
 void
 TAO_HomeDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -397,19 +359,18 @@ TAO_HomeDef_i::supported_interfaces_i (
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
-TAO_HomeDef_i::managed_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::managed_component (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+  this->update_key ();
 
-  return this->managed_component_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->managed_component_i ();
 }
 
 CORBA::ComponentIR::ComponentDef_ptr
-TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::managed_component_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString path;
@@ -418,34 +379,27 @@ TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL)
                                             path);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::ComponentDef::_nil ());
+                                              this->repo_);
 
-  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::ComponentDef::_narrow (obj.in ());
 }
 
 void
 TAO_HomeDef_i::managed_component (
     CORBA::ComponentIR::ComponentDef_ptr managed_component
-    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->managed_component_i (managed_component
-                             ACE_ENV_ARG_PARAMETER);
+  this->managed_component_i (managed_component);
 }
 
 void
 TAO_HomeDef_i::managed_component_i (
     CORBA::ComponentIR::ComponentDef_ptr managed_component
-    ACE_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -456,19 +410,18 @@ TAO_HomeDef_i::managed_component_i (
 }
 
 CORBA::ValueDef_ptr
-TAO_HomeDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::primary_key (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+  this->update_key ();
 
-  return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->primary_key_i ();
 }
 
 CORBA::ValueDef_ptr
-TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::primary_key_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString path;
@@ -484,34 +437,27 @@ TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+                                              this->repo_);
 
-  return CORBA::ValueDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueDef::_narrow (obj.in ());
 }
 
 void
 TAO_HomeDef_i::primary_key (
     CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->primary_key_i (primary_key
-                       ACE_ENV_ARG_PARAMETER);
+  this->primary_key_i (primary_key);
 }
 
 void
 TAO_HomeDef_i::primary_key_i (
     CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -533,21 +479,18 @@ TAO_HomeDef_i::create_factory (const char *id,
                                const char *name,
                                const char *version,
                                const CORBA::ParDescriptionSeq &params,
-                               const CORBA::ExceptionDefSeq &exceptions
-                               ACE_ENV_ARG_DECL)
+                               const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FactoryDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::FactoryDef::_nil ());
+  this->update_key ();
 
   return this->create_factory_i (id,
                                  name,
                                  version,
                                  params,
-                                 exceptions
-                                 ACE_ENV_ARG_PARAMETER);
+                                 exceptions);
 }
 
 CORBA::ComponentIR::FactoryDef_ptr
@@ -557,7 +500,6 @@ TAO_HomeDef_i::create_factory_i (
     const char *version,
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions
-    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -567,12 +509,9 @@ TAO_HomeDef_i::create_factory_i (
                                                version,
                                                "factories",
                                                params,
-                                               exceptions
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::FactoryDef::_nil ());
+                                               exceptions);
 
-  return CORBA::ComponentIR::FactoryDef::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::FactoryDef::_narrow (obj.in ());
 }
 
 CORBA::ComponentIR::FinderDef_ptr
@@ -580,21 +519,18 @@ TAO_HomeDef_i::create_finder (const char *id,
                               const char *name,
                               const char *version,
                               const CORBA::ParDescriptionSeq &params,
-                              const CORBA::ExceptionDefSeq &exceptions
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ComponentIR::FinderDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::FinderDef::_nil ());
+  this->update_key ();
 
   return this->create_finder_i (id,
                                 name,
                                 version,
                                 params,
-                                exceptions
-                                ACE_ENV_ARG_PARAMETER);
+                                exceptions);
 }
 
 CORBA::ComponentIR::FinderDef_ptr
@@ -604,7 +540,6 @@ TAO_HomeDef_i::create_finder_i (
     const char *version,
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions
-    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -614,12 +549,9 @@ TAO_HomeDef_i::create_finder_i (
                                                version,
                                                "finders",
                                                params,
-                                               exceptions
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ComponentIR::FinderDef::_nil ());
+                                               exceptions);
 
-  return CORBA::ComponentIR::FinderDef::_narrow (obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::ComponentIR::FinderDef::_narrow (obj.in ());
 }
 
 CORBA::Object_ptr
@@ -629,8 +561,7 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
                               const char *version,
                               const char *sub_section,
                               const CORBA::ParDescriptionSeq &params,
-                              const CORBA::ExceptionDefSeq &exceptions
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::ExceptionDefSeq &exceptions)
 {
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -646,9 +577,7 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          sub_section
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                          sub_section);
 
   // Set the 'result' field with the path of our managed component.
   ACE_TString managed_path;
@@ -748,15 +677,13 @@ TAO_HomeDef_i::create_common (CORBA::DefinitionKind created_kind,
   return
     TAO_IFR_Service_Utils::create_objref (created_kind,
                                           result_path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
+                                          this->repo_);
 }
 
 void
 TAO_HomeDef_i::fill_op_desc_seq (ACE_Configuration_Section_Key &key,
                                  CORBA::OpDescriptionSeq &ods,
-                                 const char *sub_section
-                                 ACE_ENV_ARG_DECL)
+                                 const char *sub_section)
 {
   ods.length (0);
   ACE_Configuration_Section_Key sub_key;
@@ -783,17 +710,14 @@ TAO_HomeDef_i::fill_op_desc_seq (ACE_Configuration_Section_Key &key,
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->fill_op_desc (sub_key,
                           ods[i],
-                          stringified
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                          stringified);
     }
 }
 
 void
 TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
                              CORBA::OperationDescription &od,
-                             const char *sub_section
-                             ACE_ENV_ARG_DECL)
+                             const char *sub_section)
 {
   ACE_Configuration_Section_Key op_key;
   this->repo_->config ()->open_section (key,
@@ -805,9 +729,7 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
       od,
       this->repo_,
       op_key
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
   ACE_TString result_path;
   this->repo_->config ()->get_string_value (key,
@@ -816,13 +738,11 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
   TAO_IDLType_i *result =
     TAO_IFR_Service_Utils::path_to_idltype (result_path,
                                             this->repo_);
-  od.result = result->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  od.result = result->type_i ();
 
   TAO_OperationDef_i impl (this->repo_);
   impl.section_key (op_key);
-  od.mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  od.mode = impl.mode_i ();
 
   TAO_IFR_Strseq_Utils<CORBA::ContextIdSeq>::fill_string_seq (
       "contexts",
@@ -833,21 +753,17 @@ TAO_HomeDef_i::fill_op_desc (ACE_Configuration_Section_Key &key,
 
   this->fill_param_desc_seq (op_key,
                              od.parameters,
-                             "params"
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                             "params");
 
   this->fill_exc_desc_seq (op_key,
                            od.exceptions,
-                           "excepts"
-                           ACE_ENV_ARG_PARAMETER);
+                           "excepts");
 }
 
 void
 TAO_HomeDef_i::fill_param_desc_seq (ACE_Configuration_Section_Key &key,
                                     CORBA::ParDescriptionSeq &pds,
-                                    const char *sub_section
-                                    ACE_ENV_ARG_DECL)
+                                    const char *sub_section)
 {
   pds.length (0);
   ACE_Configuration_Section_Key params_key;
@@ -874,17 +790,14 @@ TAO_HomeDef_i::fill_param_desc_seq (ACE_Configuration_Section_Key &key,
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->fill_param_desc (params_key,
                              pds[i],
-                             stringified
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             stringified);
     }
 }
 
 void
 TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
                                 CORBA::ParameterDescription &pd,
-                                const char *sub_section
-                                ACE_ENV_ARG_DECL)
+                                const char *sub_section)
 {
   ACE_Configuration_Section_Key param_key;
   this->repo_->config ()->open_section (key,
@@ -901,18 +814,13 @@ TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
                                             holder);
   TAO_IDLType_i *impl = TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                                 this->repo_);
-  pd.type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  pd.type = impl->type_i ();
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              this->repo_);
 
-  pd.type_def = CORBA::IDLType::_narrow (obj.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  pd.type_def = CORBA::IDLType::_narrow (obj.in ());
 
   CORBA::ULong val;
   this->repo_->config ()->get_integer_value (param_key,
@@ -924,8 +832,7 @@ TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key,
 void
 TAO_HomeDef_i::fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
                                   CORBA::ExcDescriptionSeq &eds,
-                                  const char *sub_section
-                                  ACE_ENV_ARG_DECL)
+                                  const char *sub_section)
 {
   eds.length (0);
   ACE_Configuration_Section_Key excepts_key;
@@ -952,17 +859,14 @@ TAO_HomeDef_i::fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->fill_exc_desc (excepts_key,
                            eds[i],
-                           stringified
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                           stringified);
     }
 }
 
 void
 TAO_HomeDef_i::fill_exc_desc (ACE_Configuration_Section_Key &key,
                               CORBA::ExceptionDescription &ed,
-                              const char *sub_section
-                              ACE_ENV_ARG_DECL)
+                              const char *sub_section)
 {
   ACE_TString path;
   this->repo_->config ()->get_string_value (key,
@@ -982,19 +886,17 @@ TAO_HomeDef_i::fill_exc_desc (ACE_Configuration_Section_Key &key,
                                               ed,
                                               this->repo_,
                                               except_def_key
-                                              ACE_ENV_ARG_PARAMETER
                                             );
 
   TAO_ExceptionDef_i impl (this->repo_);
   impl.section_key (except_def_key);
-  ed.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ed.type = impl.type_i ();
 }
 
 void
 TAO_HomeDef_i::fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
                                    CORBA::ExtAttrDescriptionSeq &eads,
-                                   const char *sub_section
-                                   ACE_ENV_ARG_DECL)
+                                   const char *sub_section)
 {
   eads.length (0);
   ACE_Configuration_Section_Key attrs_key;
@@ -1021,17 +923,14 @@ TAO_HomeDef_i::fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->fill_attr_desc (attrs_key,
                             eads[i],
-                            stringified
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                            stringified);
     }
 }
 
 void
 TAO_HomeDef_i::fill_attr_desc (ACE_Configuration_Section_Key &key,
                                CORBA::ExtAttributeDescription &ead,
-                               const char *sub_section
-                               ACE_ENV_ARG_DECL)
+                               const char *sub_section)
 {
   ACE_Configuration_Section_Key attr_key;
   this->repo_->config ()->open_section (key,
@@ -1043,16 +942,13 @@ TAO_HomeDef_i::fill_attr_desc (ACE_Configuration_Section_Key &key,
                                               ead,
                                               this->repo_,
                                               attr_key
-                                              ACE_ENV_ARG_PARAMETER
                                             );
-  ACE_CHECK;
 
   TAO_AttributeDef_i impl (this->repo_);
   impl.section_key (attr_key);
-  ead.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ead.type = impl.type_i ();
 
-  ead.mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ead.mode = impl.mode_i ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
index 7436829cb68..ed65ff0c98b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
@@ -55,131 +55,108 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::ComponentIR::HomeDef_ptr base_home (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::HomeDef_ptr base_home_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_home (
       CORBA::ComponentIR::HomeDef_ptr base_home
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_home_i (
       CORBA::ComponentIR::HomeDef_ptr base_home
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq &supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ComponentIR::ComponentDef_ptr managed_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ComponentIR::ComponentDef_ptr managed_component_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void managed_component (
       CORBA::ComponentIR::ComponentDef_ptr managed_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void managed_component_i (
       CORBA::ComponentIR::ComponentDef_ptr managed_component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ValueDef_ptr primary_key (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ValueDef_ptr primary_key_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void primary_key (
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void primary_key_i (
       CORBA::ValueDef_ptr primary_key
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -189,7 +166,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -199,7 +175,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -209,7 +184,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -219,7 +193,6 @@ public:
       const char *version,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -233,48 +206,39 @@ private:
       const char *sub_section,
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL
     );
 
   void fill_op_desc_seq (ACE_Configuration_Section_Key &key,
                          CORBA::OpDescriptionSeq &ods,
-                         const char *sub_section
-                         ACE_ENV_ARG_DECL);
+                         const char *sub_section);
 
   void fill_op_desc (ACE_Configuration_Section_Key &key,
                      CORBA::OperationDescription &od,
-                     const char *sub_section
-                     ACE_ENV_ARG_DECL);
+                     const char *sub_section);
 
   void fill_param_desc_seq (ACE_Configuration_Section_Key &key,
                             CORBA::ParDescriptionSeq &pds,
-                            const char *sub_section
-                            ACE_ENV_ARG_DECL);
+                            const char *sub_section);
 
   void fill_param_desc (ACE_Configuration_Section_Key &key,
                         CORBA::ParameterDescription &pd,
-                        const char *sub_section
-                        ACE_ENV_ARG_DECL);
+                        const char *sub_section);
 
   void fill_exc_desc_seq (ACE_Configuration_Section_Key &key,
                           CORBA::ExcDescriptionSeq &eds,
-                          const char *sub_section
-                          ACE_ENV_ARG_DECL);
+                          const char *sub_section);
 
   void fill_exc_desc (ACE_Configuration_Section_Key &key,
                       CORBA::ExceptionDescription &ed,
-                      const char *sub_section
-                      ACE_ENV_ARG_DECL);
+                      const char *sub_section);
 
   void fill_attr_desc_seq (ACE_Configuration_Section_Key &key,
                            CORBA::ExtAttrDescriptionSeq &eads,
-                           const char *sub_section
-                           ACE_ENV_ARG_DECL);
+                           const char *sub_section);
 
   void fill_attr_desc (ACE_Configuration_Section_Key &key,
                        CORBA::ExtAttributeDescription &ead,
-                       const char *sub_section
-                       ACE_ENV_ARG_DECL);
+                       const char *sub_section);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
index 8935d63aae6..edcd9b89dc9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h
@@ -53,14 +53,12 @@ public:
   virtual ~TAO_IDLType_i (void);
   // Destructor.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index 3395db49bd8..bd701288a82 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:603
 
 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_BASES_CPP_
@@ -89,13 +89,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -107,13 +107,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINED__SARG_TRAITS_)
 #define _CORBA_CONTAINED__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Contained>
     : public
@@ -127,13 +127,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_)
 #define _CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::Contained::Description>
     : public
@@ -145,13 +145,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -165,13 +165,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -185,13 +185,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::Container::DescriptionSeq>
     : public
@@ -203,13 +203,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_MODULEDEF__SARG_TRAITS_)
 #define _CORBA_MODULEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ModuleDef>
     : public
@@ -223,13 +223,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONSTANTDEF__SARG_TRAITS_)
 #define _CORBA_CONSTANTDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ConstantDef>
     : public
@@ -243,13 +243,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -263,13 +263,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_STRUCTDEF__SARG_TRAITS_)
 #define _CORBA_STRUCTDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::StructDef>
     : public
@@ -283,13 +283,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_UNIONDEF__SARG_TRAITS_)
 #define _CORBA_UNIONDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::UnionDef>
     : public
@@ -303,13 +303,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ENUMDEF__SARG_TRAITS_)
 #define _CORBA_ENUMDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::EnumDef>
     : public
@@ -323,13 +323,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ALIASDEF__SARG_TRAITS_)
 #define _CORBA_ALIASDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::AliasDef>
     : public
@@ -343,13 +343,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::InterfaceDef>
     : public
@@ -363,13 +363,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -381,13 +381,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_EXCEPTIONDEF__SARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ExceptionDef>
     : public
@@ -401,13 +401,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_NATIVEDEF__SARG_TRAITS_)
 #define _CORBA_NATIVEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::NativeDef>
     : public
@@ -421,13 +421,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
 #define _CORBA_VALUEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueDef>
     : public
@@ -441,13 +441,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ValueDefSeq>
     : public
@@ -459,13 +459,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEBOXDEF__SARG_TRAITS_)
 #define _CORBA_VALUEBOXDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueBoxDef>
     : public
@@ -479,13 +479,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::AbstractInterfaceDef>
     : public
@@ -499,13 +499,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
@@ -517,13 +517,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__SARG_TRAITS_)
 #define _CORBA_LOCALINTERFACEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::LocalInterfaceDef>
     : public
@@ -537,13 +537,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_EXTVALUEDEF__SARG_TRAITS_)
 #define _CORBA_EXTVALUEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ExtValueDef>
     : public
@@ -557,13 +557,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTAINEDSEQ__SARG_TRAITS_)
 #define _CORBA_CONTAINEDSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ContainedSeq>
     : public
@@ -575,13 +575,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::StructMemberSeq>
     : public
@@ -593,13 +593,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InitializerSeq>
     : public
@@ -611,13 +611,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -629,13 +629,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -647,13 +647,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -688,13 +688,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -706,13 +706,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Contained>
     : public
@@ -727,13 +727,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_)
 #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::Contained::Description>
     : public
@@ -745,13 +745,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Repository>
     : public
@@ -766,13 +766,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Container>
     : public
@@ -787,13 +787,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::Container::DescriptionSeq>
     : public
@@ -805,13 +805,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_MODULEDEF__ARG_TRAITS_)
 #define _CORBA_MODULEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ModuleDef>
     : public
@@ -826,13 +826,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_)
 #define _CORBA_CONSTANTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ConstantDef>
     : public
@@ -847,13 +847,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -868,13 +868,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_)
 #define _CORBA_STRUCTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::StructDef>
     : public
@@ -889,13 +889,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_UNIONDEF__ARG_TRAITS_)
 #define _CORBA_UNIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::UnionDef>
     : public
@@ -910,13 +910,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ENUMDEF__ARG_TRAITS_)
 #define _CORBA_ENUMDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::EnumDef>
     : public
@@ -931,13 +931,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ALIASDEF__ARG_TRAITS_)
 #define _CORBA_ALIASDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AliasDef>
     : public
@@ -952,13 +952,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -973,13 +973,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -991,13 +991,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExceptionDef>
     : public
@@ -1012,13 +1012,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_)
 #define _CORBA_NATIVEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::NativeDef>
     : public
@@ -1033,13 +1033,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -1054,13 +1054,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
@@ -1072,13 +1072,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_)
 #define _CORBA_VALUEBOXDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueBoxDef>
     : public
@@ -1093,13 +1093,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AbstractInterfaceDef>
     : public
@@ -1114,13 +1114,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
@@ -1132,13 +1132,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::LocalInterfaceDef>
     : public
@@ -1153,13 +1153,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_)
 #define _CORBA_EXTVALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExtValueDef>
     : public
@@ -1174,13 +1174,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTAINEDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContainedSeq>
     : public
@@ -1192,13 +1192,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::StructMemberSeq>
     : public
@@ -1210,13 +1210,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
     : public
@@ -1228,13 +1228,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -1246,13 +1246,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -1264,13 +1264,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -1418,9 +1418,9 @@ CORBA__TAO_IRObject_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_IRObject_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1430,7 +1430,7 @@ CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::IRObject::IRObject (void)
@@ -1449,11 +1449,11 @@ POA_CORBA::IRObject::~IRObject (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_def_kind_IRObject
     : public TAO::Upcall_Command
   {
@@ -1467,20 +1467,18 @@ POA_CORBA::IRObject::~IRObject (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::DefinitionKind> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->def_kind (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->def_kind ();
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1489,30 +1487,29 @@ POA_CORBA::IRObject::~IRObject (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::IRObject::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
 
@@ -1520,7 +1517,7 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1531,15 +1528,14 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class destroy_IRObject
     : public TAO::Upcall_Command
   {
@@ -1549,50 +1545,47 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
       : servant_ (servant)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
-      this->servant_->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->servant_->destroy ();
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
   };
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::IRObject::destroy_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
 
   destroy_IRObject command (
     impl);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1603,20 +1596,19 @@ void POA_CORBA::IRObject::destroy_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_IRObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1630,27 +1622,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1660,36 +1650,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::IRObject::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  
+
   _is_a_IRObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1700,15 +1689,14 @@ void POA_CORBA::IRObject::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_IRObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1722,20 +1710,18 @@ void POA_CORBA::IRObject::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1745,34 +1731,33 @@ void POA_CORBA::IRObject::_is_a_skel (
 
 
 void POA_CORBA::IRObject::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  
+
   _non_existent_IRObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1783,15 +1768,14 @@ void POA_CORBA::IRObject::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_IRObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1805,20 +1789,18 @@ void POA_CORBA::IRObject::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1828,34 +1810,33 @@ void POA_CORBA::IRObject::_non_existent_skel (
 
 
 void POA_CORBA::IRObject::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  
+
   _repository_id_IRObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1866,59 +1847,57 @@ void POA_CORBA::IRObject::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::IRObject::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_IRObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1932,20 +1911,18 @@ void POA_CORBA::IRObject::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::IRObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1955,34 +1932,33 @@ void POA_CORBA::IRObject::_interface_skel (
 
 
 void POA_CORBA::IRObject::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IRObject * const impl =
     static_cast<POA_CORBA::IRObject *> (servant);
-  
+
   _get_component_IRObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1993,13 +1969,11 @@ void POA_CORBA::IRObject::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::IRObject::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -2026,39 +2000,36 @@ const char* POA_CORBA::IRObject::_interface_repository_id (void) const
 void POA_CORBA::IRObject::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::IRObject *
-POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::IRObject::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::IRObject STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -2173,9 +2144,9 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -9,  -2, -12,  -2,   4,   5,  -1,  50,   8, -45,  11,  -1, -46,  14, 
-       15,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
+       -9,  -2, -12,  -2,   4,   5,  -1,  50,   8, -45,  11,  -1, -46,  14,
+       15,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2224,9 +2195,9 @@ CORBA__TAO_Contained_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_Contained_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -2236,7 +2207,7 @@ CORBA__TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::Contained::Contained (void)
@@ -2256,11 +2227,11 @@ POA_CORBA::Contained::~Contained (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_id_Contained
     : public TAO::Upcall_Command
   {
@@ -2274,20 +2245,18 @@ POA_CORBA::Contained::~Contained (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->id ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2296,30 +2265,29 @@ POA_CORBA::Contained::~Contained (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2327,7 +2295,7 @@ void POA_CORBA::Contained::_get_id_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2338,15 +2306,14 @@ void POA_CORBA::Contained::_get_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_id_Contained
     : public TAO::Upcall_Command
   {
@@ -2360,21 +2327,19 @@ void POA_CORBA::Contained::_get_id_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->id (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2383,32 +2348,31 @@ void POA_CORBA::Contained::_get_id_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2416,7 +2380,7 @@ void POA_CORBA::Contained::_set_id_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2427,15 +2391,14 @@ void POA_CORBA::Contained::_set_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_name_Contained
     : public TAO::Upcall_Command
   {
@@ -2449,20 +2412,18 @@ void POA_CORBA::Contained::_set_id_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Identifier>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->name (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->name ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2471,30 +2432,29 @@ void POA_CORBA::Contained::_set_id_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Identifier>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2502,7 +2462,7 @@ void POA_CORBA::Contained::_get_name_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2513,15 +2473,14 @@ void POA_CORBA::Contained::_get_name_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_name_Contained
     : public TAO::Upcall_Command
   {
@@ -2535,21 +2494,19 @@ void POA_CORBA::Contained::_get_name_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->name (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2558,32 +2515,31 @@ void POA_CORBA::Contained::_get_name_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_name
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2591,7 +2547,7 @@ void POA_CORBA::Contained::_set_name_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2602,15 +2558,14 @@ void POA_CORBA::Contained::_set_name_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_version_Contained
     : public TAO::Upcall_Command
   {
@@ -2624,20 +2579,18 @@ void POA_CORBA::Contained::_set_name_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->version (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->version ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2646,30 +2599,29 @@ void POA_CORBA::Contained::_set_name_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2677,7 +2629,7 @@ void POA_CORBA::Contained::_get_version_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2688,15 +2640,14 @@ void POA_CORBA::Contained::_get_version_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_version_Contained
     : public TAO::Upcall_Command
   {
@@ -2710,21 +2661,19 @@ void POA_CORBA::Contained::_get_version_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->version (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2733,32 +2682,31 @@ void POA_CORBA::Contained::_get_version_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_version
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2766,7 +2714,7 @@ void POA_CORBA::Contained::_set_version_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2777,15 +2725,14 @@ void POA_CORBA::Contained::_set_version_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_defined_in_Contained
     : public TAO::Upcall_Command
   {
@@ -2799,20 +2746,18 @@ void POA_CORBA::Contained::_set_version_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Container>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Container> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->defined_in (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->defined_in ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2821,30 +2766,29 @@ void POA_CORBA::Contained::_set_version_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Container>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2852,7 +2796,7 @@ void POA_CORBA::Contained::_get_defined_in_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2863,15 +2807,14 @@ void POA_CORBA::Contained::_get_defined_in_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_absolute_name_Contained
     : public TAO::Upcall_Command
   {
@@ -2885,20 +2828,18 @@ void POA_CORBA::Contained::_get_defined_in_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ScopedName>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ScopedName> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->absolute_name (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->absolute_name ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2907,30 +2848,29 @@ void POA_CORBA::Contained::_get_defined_in_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ScopedName>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -2938,7 +2878,7 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2949,15 +2889,14 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_containing_repository_Contained
     : public TAO::Upcall_Command
   {
@@ -2971,20 +2910,18 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Repository>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Repository> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->containing_repository (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->containing_repository ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2993,30 +2930,29 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Repository>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -3024,7 +2960,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3035,15 +2971,14 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_Contained
     : public TAO::Upcall_Command
   {
@@ -3057,20 +2992,18 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Contained::Description> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->describe (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->describe ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3079,30 +3012,29 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::describe_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -3110,7 +3042,7 @@ void POA_CORBA::Contained::describe_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3121,15 +3053,14 @@ void POA_CORBA::Contained::describe_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class move_Contained
     : public TAO::Upcall_Command
   {
@@ -3143,35 +3074,33 @@ void POA_CORBA::Contained::describe_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Container>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Container> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       this->servant_->move (
         arg_1
         , arg_2
-        , arg_3
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        , arg_3);
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3180,26 +3109,25 @@ void POA_CORBA::Contained::describe_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Contained::move_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Container>::in_arg_val _tao_new_container;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_new_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_new_version;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -3207,9 +3135,9 @@ void POA_CORBA::Contained::move_skel (
       &_tao_new_name,
       &_tao_new_version
     };
-  
+
   static size_t const nargs = 4;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
 
@@ -3217,7 +3145,7 @@ void POA_CORBA::Contained::move_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3228,20 +3156,19 @@ void POA_CORBA::Contained::move_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_Contained_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3255,27 +3182,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3285,36 +3210,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::Contained::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  
+
   _is_a_Contained_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3325,15 +3249,14 @@ void POA_CORBA::Contained::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_Contained_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3347,20 +3270,18 @@ void POA_CORBA::Contained::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3370,34 +3291,33 @@ void POA_CORBA::Contained::_is_a_skel (
 
 
 void POA_CORBA::Contained::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  
+
   _non_existent_Contained_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3408,15 +3328,14 @@ void POA_CORBA::Contained::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_Contained_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3430,20 +3349,18 @@ void POA_CORBA::Contained::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3453,34 +3370,33 @@ void POA_CORBA::Contained::_non_existent_skel (
 
 
 void POA_CORBA::Contained::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  
+
   _repository_id_Contained_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3491,59 +3407,57 @@ void POA_CORBA::Contained::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::Contained::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_Contained_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3557,20 +3471,18 @@ void POA_CORBA::Contained::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::Contained * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3580,34 +3492,33 @@ void POA_CORBA::Contained::_interface_skel (
 
 
 void POA_CORBA::Contained::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Contained * const impl =
     static_cast<POA_CORBA::Contained *> (servant);
-  
+
   _get_component_Contained_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3618,13 +3529,11 @@ void POA_CORBA::Contained::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::Contained::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -3655,39 +3564,36 @@ const char* POA_CORBA::Contained::_interface_repository_id (void) const
 void POA_CORBA::Contained::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::Contained *
-POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Contained::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::Contained STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3809,9 +3715,9 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,   6,   7,  -1, -10,  -2,   8,   9, -44, 
-      -12,  -2, -42,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22, 
-       -1,  -1,  23,  24,  25,  26,  27,  28,  -1,  -1,  29,  -1,  30, 
+       -1,  -1,  -1,  -1,  -1,  -1,   6,   7,  -1, -10,  -2,   8,   9, -44,
+      -12,  -2, -42,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22,
+       -1,  -1,  23,  24,  25,  26,  27,  28,  -1,  -1,  29,  -1,  30,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3860,9 +3766,9 @@ CORBA__TAO_Container_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_Container_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3872,7 +3778,7 @@ CORBA__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_Container_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::Container::Container (void)
@@ -3892,11 +3798,11 @@ POA_CORBA::Container::~Container (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class lookup_Container
     : public TAO::Upcall_Command
   {
@@ -3910,27 +3816,25 @@ POA_CORBA::Container::~Container (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Contained> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ScopedName> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->lookup (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3939,32 +3843,31 @@ POA_CORBA::Container::~Container (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::lookup_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Contained>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_val _tao_search_name;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_search_name
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -3972,7 +3875,7 @@ void POA_CORBA::Container::lookup_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3983,15 +3886,14 @@ void POA_CORBA::Container::lookup_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class contents_Container
     : public TAO::Upcall_Command
   {
@@ -4005,34 +3907,32 @@ void POA_CORBA::Container::lookup_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ContainedSeq> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       retval =
         this->servant_->contents (
           arg_1
-          , arg_2
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_2);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4041,34 +3941,33 @@ void POA_CORBA::Container::lookup_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::contents_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_limit_type,
       &_tao_exclude_inherited
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4076,7 +3975,7 @@ void POA_CORBA::Container::contents_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4087,15 +3986,14 @@ void POA_CORBA::Container::contents_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class lookup_name_Container
     : public TAO::Upcall_Command
   {
@@ -4109,48 +4007,46 @@ void POA_CORBA::Container::contents_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ContainedSeq> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Long> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->lookup_name (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_4);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4159,27 +4055,26 @@ void POA_CORBA::Container::contents_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_search_name;
   TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search;
   TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4188,9 +4083,9 @@ void POA_CORBA::Container::lookup_name_skel (
       &_tao_limit_type,
       &_tao_exclude_inherited
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4198,7 +4093,7 @@ void POA_CORBA::Container::lookup_name_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4209,15 +4104,14 @@ void POA_CORBA::Container::lookup_name_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_contents_Container
     : public TAO::Upcall_Command
   {
@@ -4231,41 +4125,39 @@ void POA_CORBA::Container::lookup_name_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Container::DescriptionSeq> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Long> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       retval =
         this->servant_->describe_contents (
           arg_1
           , arg_2
-          , arg_3
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_3);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4274,26 +4166,25 @@ void POA_CORBA::Container::lookup_name_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
   TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4301,9 +4192,9 @@ void POA_CORBA::Container::describe_contents_skel (
       &_tao_exclude_inherited,
       &_tao_max_returned_objs
     };
-  
+
   static size_t const nargs = 4;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4311,7 +4202,7 @@ void POA_CORBA::Container::describe_contents_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4322,15 +4213,14 @@ void POA_CORBA::Container::describe_contents_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_module_Container
     : public TAO::Upcall_Command
   {
@@ -4344,41 +4234,39 @@ void POA_CORBA::Container::describe_contents_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ModuleDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       retval =
         this->servant_->create_module (
           arg_1
           , arg_2
-          , arg_3
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_3);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4387,26 +4275,25 @@ void POA_CORBA::Container::describe_contents_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_module_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4414,9 +4301,9 @@ void POA_CORBA::Container::create_module_skel (
       &_tao_name,
       &_tao_version
     };
-  
+
   static size_t const nargs = 4;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4424,7 +4311,7 @@ void POA_CORBA::Container::create_module_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4435,15 +4322,14 @@ void POA_CORBA::Container::create_module_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_constant_Container
     : public TAO::Upcall_Command
   {
@@ -4457,55 +4343,53 @@ void POA_CORBA::Container::create_module_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ConstantDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::Any>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Any> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_constant (
           arg_1
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_5);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4514,28 +4398,27 @@ void POA_CORBA::Container::create_module_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::Any>::in_arg_val _tao_value;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4545,9 +4428,9 @@ void POA_CORBA::Container::create_constant_skel (
       &_tao_type,
       &_tao_value
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4555,7 +4438,7 @@ void POA_CORBA::Container::create_constant_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4566,15 +4449,14 @@ void POA_CORBA::Container::create_constant_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_struct_Container
     : public TAO::Upcall_Command
   {
@@ -4588,48 +4470,46 @@ void POA_CORBA::Container::create_constant_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::StructDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::StructDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_struct (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_4);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4638,27 +4518,26 @@ void POA_CORBA::Container::create_constant_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::StructDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4667,9 +4546,9 @@ void POA_CORBA::Container::create_struct_skel (
       &_tao_version,
       &_tao_members
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4677,7 +4556,7 @@ void POA_CORBA::Container::create_struct_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4688,15 +4567,14 @@ void POA_CORBA::Container::create_struct_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_union_Container
     : public TAO::Upcall_Command
   {
@@ -4710,55 +4588,53 @@ void POA_CORBA::Container::create_struct_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::UnionDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::UnionDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::UnionMemberSeq> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_union (
           arg_1
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_5);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4767,28 +4643,27 @@ void POA_CORBA::Container::create_struct_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_union_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::UnionDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type;
   TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4798,9 +4673,9 @@ void POA_CORBA::Container::create_union_skel (
       &_tao_discriminator_type,
       &_tao_members
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4808,7 +4683,7 @@ void POA_CORBA::Container::create_union_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4819,15 +4694,14 @@ void POA_CORBA::Container::create_union_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_enum_Container
     : public TAO::Upcall_Command
   {
@@ -4841,48 +4715,46 @@ void POA_CORBA::Container::create_union_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::EnumDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::EnumDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::EnumMemberSeq> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_enum (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_4);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4891,27 +4763,26 @@ void POA_CORBA::Container::create_union_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::EnumDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4920,9 +4791,9 @@ void POA_CORBA::Container::create_enum_skel (
       &_tao_version,
       &_tao_members
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -4930,7 +4801,7 @@ void POA_CORBA::Container::create_enum_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4941,15 +4812,14 @@ void POA_CORBA::Container::create_enum_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_alias_Container
     : public TAO::Upcall_Command
   {
@@ -4963,48 +4833,46 @@ void POA_CORBA::Container::create_enum_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::AliasDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AliasDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_alias (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_4);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5013,27 +4881,26 @@ void POA_CORBA::Container::create_enum_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AliasDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5042,9 +4909,9 @@ void POA_CORBA::Container::create_alias_skel (
       &_tao_version,
       &_tao_original_type
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5052,7 +4919,7 @@ void POA_CORBA::Container::create_alias_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5063,15 +4930,14 @@ void POA_CORBA::Container::create_alias_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_interface_Container
     : public TAO::Upcall_Command
   {
@@ -5085,48 +4951,46 @@ void POA_CORBA::Container::create_alias_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_interface (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_4);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5135,27 +4999,26 @@ void POA_CORBA::Container::create_alias_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5164,9 +5027,9 @@ void POA_CORBA::Container::create_interface_skel (
       &_tao_version,
       &_tao_base_interfaces
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5174,7 +5037,7 @@ void POA_CORBA::Container::create_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5185,15 +5048,14 @@ void POA_CORBA::Container::create_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_value_Container
     : public TAO::Upcall_Command
   {
@@ -5207,74 +5069,74 @@ void POA_CORBA::Container::create_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq> (
           this->operation_details_,
           this->args_,
           8);
-        
+
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
           this->operation_details_,
           this->args_,
           9);
-        
+
       TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type arg_10 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InitializerSeq> (
           this->operation_details_,
           this->args_,
           10);
-        
+
       retval =
         this->servant_->create_value (
           arg_1
@@ -5286,11 +5148,9 @@ void POA_CORBA::Container::create_interface_skel (
           , arg_7
           , arg_8
           , arg_9
-          , arg_10
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_10);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5299,21 +5159,20 @@ void POA_CORBA::Container::create_interface_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -5325,7 +5184,7 @@ void POA_CORBA::Container::create_value_skel (
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
   TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5340,9 +5199,9 @@ void POA_CORBA::Container::create_value_skel (
       &_tao_supported_interfaces,
       &_tao_initializers
     };
-  
+
   static size_t const nargs = 11;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5350,7 +5209,7 @@ void POA_CORBA::Container::create_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5361,15 +5220,14 @@ void POA_CORBA::Container::create_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_value_box_Container
     : public TAO::Upcall_Command
   {
@@ -5383,48 +5241,46 @@ void POA_CORBA::Container::create_value_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueBoxDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_value_box (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_4);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5433,27 +5289,26 @@ void POA_CORBA::Container::create_value_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5462,9 +5317,9 @@ void POA_CORBA::Container::create_value_box_skel (
       &_tao_version,
       &_tao_original_type_def
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5472,7 +5327,7 @@ void POA_CORBA::Container::create_value_box_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5483,15 +5338,14 @@ void POA_CORBA::Container::create_value_box_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_exception_Container
     : public TAO::Upcall_Command
   {
@@ -5505,48 +5359,46 @@ void POA_CORBA::Container::create_value_box_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExceptionDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_exception (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_4);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5555,27 +5407,26 @@ void POA_CORBA::Container::create_value_box_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5584,9 +5435,9 @@ void POA_CORBA::Container::create_exception_skel (
       &_tao_version,
       &_tao_members
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5594,7 +5445,7 @@ void POA_CORBA::Container::create_exception_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5605,15 +5456,14 @@ void POA_CORBA::Container::create_exception_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_native_Container
     : public TAO::Upcall_Command
   {
@@ -5627,41 +5477,39 @@ void POA_CORBA::Container::create_exception_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::NativeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::NativeDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       retval =
         this->servant_->create_native (
           arg_1
           , arg_2
-          , arg_3
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_3);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5670,26 +5518,25 @@ void POA_CORBA::Container::create_exception_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_native_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::NativeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5697,9 +5544,9 @@ void POA_CORBA::Container::create_native_skel (
       &_tao_name,
       &_tao_version
     };
-  
+
   static size_t const nargs = 4;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5707,7 +5554,7 @@ void POA_CORBA::Container::create_native_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5718,15 +5565,14 @@ void POA_CORBA::Container::create_native_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_abstract_interface_Container
     : public TAO::Upcall_Command
   {
@@ -5740,48 +5586,46 @@ void POA_CORBA::Container::create_native_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AbstractInterfaceDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AbstractInterfaceDefSeq> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_abstract_interface (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_4);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5790,27 +5634,26 @@ void POA_CORBA::Container::create_native_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5819,9 +5662,9 @@ void POA_CORBA::Container::create_abstract_interface_skel (
       &_tao_version,
       &_tao_base_interfaces
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5829,7 +5672,7 @@ void POA_CORBA::Container::create_abstract_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5840,15 +5683,14 @@ void POA_CORBA::Container::create_abstract_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_local_interface_Container
     : public TAO::Upcall_Command
   {
@@ -5862,48 +5704,46 @@ void POA_CORBA::Container::create_abstract_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::LocalInterfaceDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       retval =
         this->servant_->create_local_interface (
           arg_1
           , arg_2
           , arg_3
-          , arg_4
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_4);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5912,27 +5752,26 @@ void POA_CORBA::Container::create_abstract_interface_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5941,9 +5780,9 @@ void POA_CORBA::Container::create_local_interface_skel (
       &_tao_version,
       &_tao_base_interfaces
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -5951,7 +5790,7 @@ void POA_CORBA::Container::create_local_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5962,15 +5801,14 @@ void POA_CORBA::Container::create_local_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_ext_value_Container
     : public TAO::Upcall_Command
   {
@@ -5984,74 +5822,74 @@ void POA_CORBA::Container::create_local_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtValueDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq> (
           this->operation_details_,
           this->args_,
           8);
-        
+
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
           this->operation_details_,
           this->args_,
           9);
-        
+
       TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq> (
           this->operation_details_,
           this->args_,
           10);
-        
+
       retval =
         this->servant_->create_ext_value (
           arg_1
@@ -6063,11 +5901,9 @@ void POA_CORBA::Container::create_local_interface_skel (
           , arg_7
           , arg_8
           , arg_9
-          , arg_10
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_10);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6076,21 +5912,20 @@ void POA_CORBA::Container::create_local_interface_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Container::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -6102,7 +5937,7 @@ void POA_CORBA::Container::create_ext_value_skel (
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
   TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -6117,9 +5952,9 @@ void POA_CORBA::Container::create_ext_value_skel (
       &_tao_supported_interfaces,
       &_tao_initializers
     };
-  
+
   static size_t const nargs = 11;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
 
@@ -6127,7 +5962,7 @@ void POA_CORBA::Container::create_ext_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6138,20 +5973,19 @@ void POA_CORBA::Container::create_ext_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_Container_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6165,27 +5999,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6195,36 +6027,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::Container::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  
+
   _is_a_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6235,15 +6066,14 @@ void POA_CORBA::Container::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_Container_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6257,20 +6087,18 @@ void POA_CORBA::Container::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6280,34 +6108,33 @@ void POA_CORBA::Container::_is_a_skel (
 
 
 void POA_CORBA::Container::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  
+
   _non_existent_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6318,15 +6145,14 @@ void POA_CORBA::Container::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_Container_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6340,20 +6166,18 @@ void POA_CORBA::Container::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6363,34 +6187,33 @@ void POA_CORBA::Container::_non_existent_skel (
 
 
 void POA_CORBA::Container::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  
+
   _repository_id_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6401,59 +6224,57 @@ void POA_CORBA::Container::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::Container::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_Container_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6467,20 +6288,18 @@ void POA_CORBA::Container::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::Container * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6490,34 +6309,33 @@ void POA_CORBA::Container::_interface_skel (
 
 
 void POA_CORBA::Container::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Container * const impl =
     static_cast<POA_CORBA::Container *> (servant);
-  
+
   _get_component_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6528,13 +6346,11 @@ void POA_CORBA::Container::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::Container::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -6565,39 +6381,36 @@ const char* POA_CORBA::Container::_interface_repository_id (void) const
 void POA_CORBA::Container::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::Container *
-POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Container::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::Container STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6733,9 +6546,9 @@ CORBA__TAO_IDLType_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_IDLType_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -6745,7 +6558,7 @@ CORBA__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::IDLType::IDLType (void)
@@ -6765,11 +6578,11 @@ POA_CORBA::IDLType::~IDLType (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_IDLType
     : public TAO::Upcall_Command
   {
@@ -6783,20 +6596,18 @@ POA_CORBA::IDLType::~IDLType (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->type ();
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6805,30 +6616,29 @@ POA_CORBA::IDLType::~IDLType (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::IDLType::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
 
@@ -6836,7 +6646,7 @@ void POA_CORBA::IDLType::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6847,20 +6657,19 @@ void POA_CORBA::IDLType::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_IDLType_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6874,27 +6683,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6904,36 +6711,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::IDLType::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  
+
   _is_a_IDLType_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6944,15 +6750,14 @@ void POA_CORBA::IDLType::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_IDLType_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6966,20 +6771,18 @@ void POA_CORBA::IDLType::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6989,34 +6792,33 @@ void POA_CORBA::IDLType::_is_a_skel (
 
 
 void POA_CORBA::IDLType::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  
+
   _non_existent_IDLType_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7027,15 +6829,14 @@ void POA_CORBA::IDLType::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_IDLType_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7049,20 +6850,18 @@ void POA_CORBA::IDLType::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7072,34 +6871,33 @@ void POA_CORBA::IDLType::_non_existent_skel (
 
 
 void POA_CORBA::IDLType::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  
+
   _repository_id_IDLType_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7110,59 +6908,57 @@ void POA_CORBA::IDLType::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::IDLType::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_IDLType_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7176,20 +6972,18 @@ void POA_CORBA::IDLType::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::IDLType * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7199,34 +6993,33 @@ void POA_CORBA::IDLType::_interface_skel (
 
 
 void POA_CORBA::IDLType::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::IDLType * const impl =
     static_cast<POA_CORBA::IDLType *> (servant);
-  
+
   _get_component_IDLType_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7237,13 +7030,11 @@ void POA_CORBA::IDLType::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::IDLType::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7274,39 +7065,36 @@ const char* POA_CORBA::IDLType::_interface_repository_id (void) const
 void POA_CORBA::IDLType::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::IDLType *
-POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::IDLType::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::IDLType STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7422,9 +7210,9 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
+       -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7473,9 +7261,9 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -7485,7 +7273,7 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::TypedefDef::TypedefDef (void)
@@ -7507,16 +7295,16 @@ POA_CORBA::TypedefDef::~TypedefDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_TypedefDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7530,27 +7318,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::TypedefDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7560,36 +7346,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::TypedefDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  
+
   _is_a_TypedefDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7600,15 +7385,14 @@ void POA_CORBA::TypedefDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_TypedefDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7622,20 +7406,18 @@ void POA_CORBA::TypedefDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::TypedefDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7645,34 +7427,33 @@ void POA_CORBA::TypedefDef::_is_a_skel (
 
 
 void POA_CORBA::TypedefDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  
+
   _non_existent_TypedefDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7683,15 +7464,14 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_TypedefDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7705,20 +7485,18 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::TypedefDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7728,34 +7506,33 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
 
 
 void POA_CORBA::TypedefDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  
+
   _repository_id_TypedefDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7766,59 +7543,57 @@ void POA_CORBA::TypedefDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::TypedefDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_TypedefDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7832,20 +7607,18 @@ void POA_CORBA::TypedefDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::TypedefDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7855,34 +7628,33 @@ void POA_CORBA::TypedefDef::_interface_skel (
 
 
 void POA_CORBA::TypedefDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::TypedefDef * const impl =
     static_cast<POA_CORBA::TypedefDef *> (servant);
-  
+
   _get_component_TypedefDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7893,13 +7665,11 @@ void POA_CORBA::TypedefDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::TypedefDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7938,39 +7708,36 @@ const char* POA_CORBA::TypedefDef::_interface_repository_id (void) const
 void POA_CORBA::TypedefDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::TypedefDef *
-POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::TypedefDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::TypedefDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
index 21a0ef54637..001a3580327 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
@@ -79,53 +79,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::IRObject *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -134,7 +126,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -144,14 +135,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -161,7 +150,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
   };
 
@@ -188,53 +176,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::Contained *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -243,7 +223,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -253,7 +232,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -261,7 +239,6 @@ namespace POA_CORBA
 
     virtual void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -271,14 +248,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -288,7 +263,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -296,7 +270,6 @@ namespace POA_CORBA
 
     virtual void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -306,14 +279,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -323,7 +294,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -331,7 +301,6 @@ namespace POA_CORBA
 
     virtual void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -341,14 +310,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -358,14 +325,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -375,14 +340,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -392,14 +355,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -409,7 +370,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -419,7 +379,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -429,7 +388,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -437,7 +395,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -448,7 +405,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -475,53 +431,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::Container *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -531,7 +479,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -541,7 +488,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -550,7 +496,6 @@ namespace POA_CORBA
     virtual ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -560,7 +505,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -571,7 +515,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -581,7 +524,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -591,7 +533,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -601,7 +542,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -611,7 +551,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -621,7 +560,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -633,7 +571,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -643,7 +580,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -654,7 +590,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -664,7 +599,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -676,7 +610,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -686,7 +619,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -697,7 +629,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -707,7 +638,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -718,7 +648,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -728,7 +657,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -739,7 +667,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -749,7 +676,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -766,7 +692,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -776,7 +701,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -787,7 +711,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -797,7 +720,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -808,7 +730,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -818,7 +739,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -828,7 +748,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -838,7 +757,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -849,7 +767,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -859,7 +776,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -870,7 +786,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -880,7 +795,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -897,7 +811,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -907,7 +820,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -915,7 +827,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -926,7 +837,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -953,53 +863,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::IDLType *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1008,7 +910,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1018,7 +919,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1026,7 +926,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1037,7 +936,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1065,53 +963,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::TypedefDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1121,7 +1011,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1132,7 +1021,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1140,7 +1028,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1148,7 +1035,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1156,7 +1042,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1164,7 +1049,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1172,7 +1056,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1180,7 +1063,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1188,7 +1070,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1196,7 +1077,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1204,7 +1084,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1215,7 +1094,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1226,7 +1104,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1234,7 +1111,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
index b1c86bdf5b9..f258bf2a6a4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
@@ -36,7 +36,6 @@ POA_CORBA::Contained::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Contained *> (servant);
@@ -44,7 +43,6 @@ POA_CORBA::Contained::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -57,7 +55,6 @@ POA_CORBA::Contained::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Contained *> (servant);
@@ -65,7 +62,6 @@ POA_CORBA::Contained::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -75,7 +71,6 @@ POA_CORBA::Container::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Container *> (servant);
@@ -83,7 +78,6 @@ POA_CORBA::Container::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -96,7 +90,6 @@ POA_CORBA::Container::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Container *> (servant);
@@ -104,7 +97,6 @@ POA_CORBA::Container::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -114,7 +106,6 @@ POA_CORBA::IDLType::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::IDLType *> (servant);
@@ -122,7 +113,6 @@ POA_CORBA::IDLType::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -135,7 +125,6 @@ POA_CORBA::IDLType::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::IDLType *> (servant);
@@ -143,7 +132,6 @@ POA_CORBA::IDLType::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -153,7 +141,6 @@ POA_CORBA::TypedefDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -161,7 +148,6 @@ POA_CORBA::TypedefDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -174,7 +160,6 @@ POA_CORBA::TypedefDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -182,7 +167,6 @@ POA_CORBA::TypedefDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -192,7 +176,6 @@ POA_CORBA::TypedefDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -200,7 +183,6 @@ POA_CORBA::TypedefDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -210,7 +192,6 @@ POA_CORBA::TypedefDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -218,7 +199,6 @@ POA_CORBA::TypedefDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -228,7 +208,6 @@ POA_CORBA::TypedefDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -236,7 +215,6 @@ POA_CORBA::TypedefDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -246,7 +224,6 @@ POA_CORBA::TypedefDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -254,7 +231,6 @@ POA_CORBA::TypedefDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -264,7 +240,6 @@ POA_CORBA::TypedefDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -272,7 +247,6 @@ POA_CORBA::TypedefDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -282,7 +256,6 @@ POA_CORBA::TypedefDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -290,7 +263,6 @@ POA_CORBA::TypedefDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -300,7 +272,6 @@ POA_CORBA::TypedefDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -308,7 +279,6 @@ POA_CORBA::TypedefDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -318,7 +288,6 @@ POA_CORBA::TypedefDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -326,7 +295,6 @@ POA_CORBA::TypedefDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -336,7 +304,6 @@ POA_CORBA::TypedefDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -344,7 +311,6 @@ POA_CORBA::TypedefDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -357,7 +323,6 @@ POA_CORBA::TypedefDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -365,7 +330,6 @@ POA_CORBA::TypedefDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -378,7 +342,6 @@ POA_CORBA::TypedefDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -386,7 +349,6 @@ POA_CORBA::TypedefDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -396,7 +358,6 @@ POA_CORBA::TypedefDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::TypedefDef *> (servant);
@@ -404,7 +365,6 @@ POA_CORBA::TypedefDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
index cf226a5d3c5..1ce7d87c23e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
@@ -80,14 +80,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -97,7 +95,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -150,14 +147,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -167,7 +162,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -177,7 +171,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -188,7 +181,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -198,7 +190,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -209,7 +200,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -219,7 +209,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -230,7 +219,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -240,7 +228,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -250,7 +237,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -260,7 +246,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -270,7 +255,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -283,7 +267,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -336,14 +319,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -353,7 +334,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -364,7 +344,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -376,7 +355,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -390,7 +368,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -403,7 +380,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -416,7 +392,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -431,7 +406,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -445,7 +419,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -460,7 +433,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -474,7 +446,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -488,7 +459,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -502,7 +472,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -522,7 +491,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -536,7 +504,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -550,7 +517,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -563,7 +529,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -577,7 +542,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -591,7 +555,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -611,7 +574,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -664,14 +626,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -681,7 +641,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -691,7 +650,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -744,14 +702,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -761,7 +717,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -771,7 +726,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -782,7 +736,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -792,7 +745,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -803,7 +755,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -813,7 +764,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -824,7 +774,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -834,7 +783,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -844,7 +792,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -854,7 +801,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -864,7 +810,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -877,7 +822,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -887,7 +831,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
index 9a0772db14d..fccfd0f9853 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
@@ -83,7 +83,7 @@ POA_CORBA::IRObject_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -95,7 +95,7 @@ POA_CORBA::IRObject_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -113,45 +113,41 @@ POA_CORBA::IRObject_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::IRObject_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::IRObject_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->IRObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->IRObject::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::IRObject_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::IRObject_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -208,7 +204,7 @@ POA_CORBA::Contained_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -220,7 +216,7 @@ POA_CORBA::Contained_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -238,71 +234,64 @@ POA_CORBA::Contained_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Contained_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Contained_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->Contained::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->Contained::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::Contained_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -310,33 +299,29 @@ void POA_CORBA::Contained_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -344,33 +329,29 @@ void POA_CORBA::Contained_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::Contained_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -378,75 +359,66 @@ void POA_CORBA::Contained_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::Contained_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::Contained_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::Contained_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::Contained_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -454,7 +426,6 @@ void POA_CORBA::Contained_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -464,7 +435,6 @@ void POA_CORBA::Contained_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -521,7 +491,7 @@ POA_CORBA::Container_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -533,7 +503,7 @@ POA_CORBA::Container_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -551,55 +521,50 @@ POA_CORBA::Container_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Container_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Container_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->Container::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->Container::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::Container_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::Container_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::Container_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -607,18 +572,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::Container_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -627,11 +590,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -640,7 +602,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -651,11 +612,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -663,7 +623,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -673,11 +632,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -685,7 +643,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -695,11 +652,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -709,7 +665,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -721,11 +676,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -734,7 +688,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -745,11 +698,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -759,7 +711,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -771,11 +722,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -784,7 +734,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -795,11 +744,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -808,7 +756,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -819,11 +766,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -832,7 +778,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -843,11 +788,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -862,7 +806,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -879,11 +822,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -892,7 +834,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -903,11 +844,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -916,7 +856,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -927,11 +866,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -939,7 +877,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -949,11 +886,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -962,7 +898,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -973,11 +908,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -986,7 +920,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -997,11 +930,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1016,7 +948,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1033,7 +964,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1090,7 +1020,7 @@ POA_CORBA::IDLType_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -1102,7 +1032,7 @@ POA_CORBA::IDLType_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -1120,61 +1050,55 @@ POA_CORBA::IDLType_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::IDLType_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::IDLType_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->IDLType::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->IDLType::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::IDLType_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::IDLType_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::IDLType_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1231,7 +1155,7 @@ POA_CORBA::TypedefDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -1243,7 +1167,7 @@ POA_CORBA::TypedefDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -1261,71 +1185,64 @@ POA_CORBA::TypedefDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::TypedefDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::TypedefDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->TypedefDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->TypedefDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::TypedefDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1333,33 +1250,29 @@ void POA_CORBA::TypedefDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1367,33 +1280,29 @@ void POA_CORBA::TypedefDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::TypedefDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1401,75 +1310,66 @@ void POA_CORBA::TypedefDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::TypedefDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::TypedefDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::TypedefDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::TypedefDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1477,7 +1377,6 @@ void POA_CORBA::TypedefDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1487,23 +1386,20 @@ void POA_CORBA::TypedefDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::TypedefDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index 119645a9727..37c591e83b7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:603
 
 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_BASICS_CPP_
@@ -89,13 +89,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -107,13 +107,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINED__SARG_TRAITS_)
 #define _CORBA_CONTAINED__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Contained>
     : public
@@ -127,13 +127,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -147,13 +147,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -167,13 +167,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -187,13 +187,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -205,13 +205,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::StructMemberSeq>
     : public
@@ -223,13 +223,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExcDescriptionSeq>
     : public
@@ -241,13 +241,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -259,13 +259,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_)
 #define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -277,13 +277,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_PRIMITIVEDEF__SARG_TRAITS_)
 #define _CORBA_PRIMITIVEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::PrimitiveDef>
     : public
@@ -297,13 +297,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_STRINGDEF__SARG_TRAITS_)
 #define _CORBA_STRINGDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::StringDef>
     : public
@@ -317,13 +317,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_SEQUENCEDEF__SARG_TRAITS_)
 #define _CORBA_SEQUENCEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::SequenceDef>
     : public
@@ -337,13 +337,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ARRAYDEF__SARG_TRAITS_)
 #define _CORBA_ARRAYDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ArrayDef>
     : public
@@ -357,13 +357,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_WSTRINGDEF__SARG_TRAITS_)
 #define _CORBA_WSTRINGDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::WstringDef>
     : public
@@ -377,13 +377,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_FIXEDDEF__SARG_TRAITS_)
 #define _CORBA_FIXEDDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::FixedDef>
     : public
@@ -397,13 +397,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_PRIMITIVEKIND__SARG_TRAITS_)
 #define _CORBA_PRIMITIVEKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::PrimitiveKind>
     : public
@@ -415,13 +415,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -433,13 +433,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_)
 #define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::AttributeMode>
     : public
@@ -451,13 +451,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::AttributeDef>
     : public
@@ -471,13 +471,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtAttributeDescription>
     : public
@@ -489,13 +489,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -509,13 +509,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::OperationMode>
     : public
@@ -527,13 +527,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -545,13 +545,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ContextIdSeq>
     : public
@@ -563,13 +563,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_)
 #define _CORBA_OPERATIONDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::OperationDef>
     : public
@@ -583,13 +583,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
@@ -601,13 +601,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
@@ -642,13 +642,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -660,13 +660,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
 #define _CORBA_CONTAINED__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Contained>
     : public
@@ -681,13 +681,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Repository>
     : public
@@ -702,13 +702,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Container>
     : public
@@ -723,13 +723,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -744,13 +744,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -762,13 +762,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::StructMemberSeq>
     : public
@@ -780,13 +780,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExcDescriptionSeq>
     : public
@@ -798,13 +798,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::UnionMemberSeq>
     : public
@@ -816,13 +816,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::EnumMemberSeq>
     : public
@@ -834,13 +834,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_)
 #define _CORBA_PRIMITIVEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::PrimitiveDef>
     : public
@@ -855,13 +855,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_STRINGDEF__ARG_TRAITS_)
 #define _CORBA_STRINGDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::StringDef>
     : public
@@ -876,13 +876,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_)
 #define _CORBA_SEQUENCEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::SequenceDef>
     : public
@@ -897,13 +897,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_)
 #define _CORBA_ARRAYDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ArrayDef>
     : public
@@ -918,13 +918,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_)
 #define _CORBA_WSTRINGDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::WstringDef>
     : public
@@ -939,13 +939,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_)
 #define _CORBA_FIXEDDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::FixedDef>
     : public
@@ -960,13 +960,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_)
 #define _CORBA_PRIMITIVEKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::PrimitiveKind>
     : public
@@ -978,13 +978,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -996,13 +996,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::AttributeMode>
     : public
@@ -1014,13 +1014,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
     : public
@@ -1035,13 +1035,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtAttributeDescription>
     : public
@@ -1053,13 +1053,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -1074,13 +1074,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
@@ -1092,13 +1092,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -1110,13 +1110,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
     : public
@@ -1128,13 +1128,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
 #define _CORBA_OPERATIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::OperationDef>
     : public
@@ -1149,13 +1149,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
@@ -1167,13 +1167,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
@@ -1317,11 +1317,11 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12,  13, 
-       14,  15,  16, -19,  -2, -22,  -2,  17,  18, -63,  -1,  21, -64,  24, 
-       -1,  25,  -1,  26,  27,  28,  29,  30,  31,  32,  33,  -1,  34,  35, 
-       36,  37,  38,  39,  -1,  40,  -1,  -1,  -1,  41,  42,  -1,  -1,  -1, 
-       -1,  43, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12,  13,
+       14,  15,  16, -19,  -2, -22,  -2,  17,  18, -63,  -1,  21, -64,  24,
+       -1,  25,  -1,  26,  27,  28,  29,  30,  31,  32,  33,  -1,  34,  35,
+       36,  37,  38,  39,  -1,  40,  -1,  -1,  -1,  41,  42,  -1,  -1,  -1,
+       -1,  43,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1370,9 +1370,9 @@ CORBA__TAO_Repository_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_Repository_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1382,7 +1382,7 @@ CORBA__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::Repository::Repository (void)
@@ -1403,11 +1403,11 @@ POA_CORBA::Repository::~Repository (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class lookup_id_Repository
     : public TAO::Upcall_Command
   {
@@ -1421,27 +1421,25 @@ POA_CORBA::Repository::~Repository (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Contained> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->lookup_id (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1450,32 +1448,31 @@ POA_CORBA::Repository::~Repository (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Repository::lookup_id_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Contained>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_search_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_search_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1483,7 +1480,7 @@ void POA_CORBA::Repository::lookup_id_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1494,15 +1491,14 @@ void POA_CORBA::Repository::lookup_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class get_canonical_typecode_Repository
     : public TAO::Upcall_Command
   {
@@ -1516,27 +1512,25 @@ void POA_CORBA::Repository::lookup_id_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::TypeCode>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->get_canonical_typecode (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1545,32 +1539,31 @@ void POA_CORBA::Repository::lookup_id_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Repository::get_canonical_typecode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::TypeCode>::in_arg_val _tao_tc;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_tc
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1578,7 +1571,7 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1589,15 +1582,14 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class get_primitive_Repository
     : public TAO::Upcall_Command
   {
@@ -1611,27 +1603,25 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::PrimitiveDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::PrimitiveKind> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->get_primitive (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1640,32 +1630,31 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Repository::get_primitive_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_val _tao_kind;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_kind
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1673,7 +1662,7 @@ void POA_CORBA::Repository::get_primitive_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1684,15 +1673,14 @@ void POA_CORBA::Repository::get_primitive_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_string_Repository
     : public TAO::Upcall_Command
   {
@@ -1706,27 +1694,25 @@ void POA_CORBA::Repository::get_primitive_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::StringDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::StringDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->create_string (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1735,32 +1721,31 @@ void POA_CORBA::Repository::get_primitive_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Repository::create_string_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::StringDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1768,7 +1753,7 @@ void POA_CORBA::Repository::create_string_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1779,15 +1764,14 @@ void POA_CORBA::Repository::create_string_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_wstring_Repository
     : public TAO::Upcall_Command
   {
@@ -1801,27 +1785,25 @@ void POA_CORBA::Repository::create_string_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::WstringDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::WstringDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->create_wstring (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1830,32 +1812,31 @@ void POA_CORBA::Repository::create_string_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Repository::create_wstring_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::WstringDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1863,7 +1844,7 @@ void POA_CORBA::Repository::create_wstring_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1874,15 +1855,14 @@ void POA_CORBA::Repository::create_wstring_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_sequence_Repository
     : public TAO::Upcall_Command
   {
@@ -1896,34 +1876,32 @@ void POA_CORBA::Repository::create_wstring_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::SequenceDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       retval =
         this->servant_->create_sequence (
           arg_1
-          , arg_2
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_2);
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1932,34 +1910,33 @@ void POA_CORBA::Repository::create_wstring_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Repository::create_sequence_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound,
       &_tao_element_type
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -1967,7 +1944,7 @@ void POA_CORBA::Repository::create_sequence_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1978,15 +1955,14 @@ void POA_CORBA::Repository::create_sequence_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_array_Repository
     : public TAO::Upcall_Command
   {
@@ -2000,34 +1976,32 @@ void POA_CORBA::Repository::create_sequence_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ArrayDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       retval =
         this->servant_->create_array (
           arg_1
-          , arg_2
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_2);
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2036,34 +2010,33 @@ void POA_CORBA::Repository::create_sequence_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Repository::create_array_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_length;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_length,
       &_tao_element_type
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -2071,7 +2044,7 @@ void POA_CORBA::Repository::create_array_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2082,15 +2055,14 @@ void POA_CORBA::Repository::create_array_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_fixed_Repository
     : public TAO::Upcall_Command
   {
@@ -2104,34 +2076,32 @@ void POA_CORBA::Repository::create_array_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::FixedDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::FixedDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::UShort>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::UShort> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Short>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Short> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       retval =
         this->servant_->create_fixed (
           arg_1
-          , arg_2
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_2);
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2140,34 +2110,33 @@ void POA_CORBA::Repository::create_array_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::Repository::create_fixed_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::FixedDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits;
   TAO::SArg_Traits< ::CORBA::Short>::in_arg_val _tao_scale;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_digits,
       &_tao_scale
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
 
@@ -2175,7 +2144,7 @@ void POA_CORBA::Repository::create_fixed_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2186,20 +2155,19 @@ void POA_CORBA::Repository::create_fixed_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_Repository_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2213,27 +2181,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2243,36 +2209,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::Repository::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  
+
   _is_a_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2283,15 +2248,14 @@ void POA_CORBA::Repository::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_Repository_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2305,20 +2269,18 @@ void POA_CORBA::Repository::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2328,34 +2290,33 @@ void POA_CORBA::Repository::_is_a_skel (
 
 
 void POA_CORBA::Repository::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  
+
   _non_existent_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2366,15 +2327,14 @@ void POA_CORBA::Repository::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_Repository_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2388,20 +2348,18 @@ void POA_CORBA::Repository::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2411,34 +2369,33 @@ void POA_CORBA::Repository::_non_existent_skel (
 
 
 void POA_CORBA::Repository::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  
+
   _repository_id_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2449,59 +2406,57 @@ void POA_CORBA::Repository::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::Repository::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_Repository_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2515,20 +2470,18 @@ void POA_CORBA::Repository::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::Repository * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2538,34 +2491,33 @@ void POA_CORBA::Repository::_interface_skel (
 
 
 void POA_CORBA::Repository::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Repository * const impl =
     static_cast<POA_CORBA::Repository *> (servant);
-  
+
   _get_component_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2576,13 +2528,11 @@ void POA_CORBA::Repository::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::Repository::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -2617,39 +2567,36 @@ const char* POA_CORBA::Repository::_interface_repository_id (void) const
 void POA_CORBA::Repository::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::Repository *
-POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Repository::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::Repository STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -2782,11 +2729,11 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -1,  -1,  -7,  -2,   5,   6, -67, 
-       -9,  -2, -65,  11,  -1, -19,  -2,  12,  13,  14,  -1,  15,  16,  17, 
-       18, -73,  21,  22,  23, -26,  -2,  24,  25, -67,  28,  -1,  29, -32, 
-       -2,  30,  -1,  31,  -1, -69,  -1,  -1,  -1,  34,  35,  36,  37,  -1, 
-       -1,  -1,  -1,  -1,  38,  -1,  -1,  39, 
+       -1,  -1,  -1,  -1,   4,  -1,  -1,  -1,  -1,  -7,  -2,   5,   6, -67,
+       -9,  -2, -65,  11,  -1, -19,  -2,  12,  13,  14,  -1,  15,  16,  17,
+       18, -73,  21,  22,  23, -26,  -2,  24,  25, -67,  28,  -1,  29, -32,
+       -2,  30,  -1,  31,  -1, -69,  -1,  -1,  -1,  34,  35,  36,  37,  -1,
+       -1,  -1,  -1,  -1,  38,  -1,  -1,  39,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2835,9 +2782,9 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -2847,7 +2794,7 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ModuleDef::ModuleDef (void)
@@ -2869,16 +2816,16 @@ POA_CORBA::ModuleDef::~ModuleDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ModuleDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2892,27 +2839,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ModuleDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2922,36 +2867,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ModuleDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  
+
   _is_a_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2962,15 +2906,14 @@ void POA_CORBA::ModuleDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ModuleDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2984,20 +2927,18 @@ void POA_CORBA::ModuleDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ModuleDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3007,34 +2948,33 @@ void POA_CORBA::ModuleDef::_is_a_skel (
 
 
 void POA_CORBA::ModuleDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  
+
   _non_existent_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3045,15 +2985,14 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ModuleDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3067,20 +3006,18 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ModuleDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3090,34 +3027,33 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
 
 
 void POA_CORBA::ModuleDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  
+
   _repository_id_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3128,59 +3064,57 @@ void POA_CORBA::ModuleDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ModuleDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ModuleDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3194,20 +3128,18 @@ void POA_CORBA::ModuleDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ModuleDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3217,34 +3149,33 @@ void POA_CORBA::ModuleDef::_interface_skel (
 
 
 void POA_CORBA::ModuleDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ModuleDef * const impl =
     static_cast<POA_CORBA::ModuleDef *> (servant);
-  
+
   _get_component_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3255,13 +3186,11 @@ void POA_CORBA::ModuleDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ModuleDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -3300,39 +3229,36 @@ const char* POA_CORBA::ModuleDef::_interface_repository_id (void) const
 void POA_CORBA::ModuleDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ModuleDef *
-POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ModuleDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ModuleDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3452,9 +3378,9 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed char lookup[] =
     {
-      -12,  -3, -15,  -2,   4,   5,  -1,  53,   8,  48, -46,  -1, -46,  17, 
-       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2, 
-      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26, 
+      -12,  -3, -15,  -2,   4,   5,  -1,  53,   8,  48, -46,  -1, -46,  17,
+       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2,
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3503,9 +3429,9 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3515,7 +3441,7 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ConstantDef::ConstantDef (void)
@@ -3536,11 +3462,11 @@ POA_CORBA::ConstantDef::~ConstantDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -3554,20 +3480,18 @@ POA_CORBA::ConstantDef::~ConstantDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->type ();
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3576,30 +3500,29 @@ POA_CORBA::ConstantDef::~ConstantDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ConstantDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -3607,7 +3530,7 @@ void POA_CORBA::ConstantDef::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3618,15 +3541,14 @@ void POA_CORBA::ConstantDef::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_def_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -3640,20 +3562,18 @@ void POA_CORBA::ConstantDef::_get_type_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->type_def ();
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3662,30 +3582,29 @@ void POA_CORBA::ConstantDef::_get_type_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ConstantDef::_get_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -3693,7 +3612,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3704,15 +3623,14 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_type_def_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -3726,21 +3644,19 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3749,32 +3665,31 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ConstantDef::_set_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -3782,7 +3697,7 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3793,15 +3708,14 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_value_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -3815,20 +3729,18 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Any>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Any> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->value (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->value ();
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3837,30 +3749,29 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ConstantDef::_get_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Any>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -3868,7 +3779,7 @@ void POA_CORBA::ConstantDef::_get_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3879,15 +3790,14 @@ void POA_CORBA::ConstantDef::_get_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_value_ConstantDef
     : public TAO::Upcall_Command
   {
@@ -3901,21 +3811,19 @@ void POA_CORBA::ConstantDef::_get_value_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Any>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Any> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->value (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3924,32 +3832,31 @@ void POA_CORBA::ConstantDef::_get_value_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ConstantDef::_set_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Any>::in_arg_val _tao_value;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_value
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
 
@@ -3957,7 +3864,7 @@ void POA_CORBA::ConstantDef::_set_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3968,20 +3875,19 @@ void POA_CORBA::ConstantDef::_set_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ConstantDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -3995,27 +3901,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4025,36 +3929,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ConstantDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  
+
   _is_a_ConstantDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4065,15 +3968,14 @@ void POA_CORBA::ConstantDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ConstantDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -4087,20 +3989,18 @@ void POA_CORBA::ConstantDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4110,34 +4010,33 @@ void POA_CORBA::ConstantDef::_is_a_skel (
 
 
 void POA_CORBA::ConstantDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  
+
   _non_existent_ConstantDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4148,15 +4047,14 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ConstantDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -4170,20 +4068,18 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4193,34 +4089,33 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
 
 
 void POA_CORBA::ConstantDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  
+
   _repository_id_ConstantDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4231,59 +4126,57 @@ void POA_CORBA::ConstantDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ConstantDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ConstantDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -4297,20 +4190,18 @@ void POA_CORBA::ConstantDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ConstantDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4320,34 +4211,33 @@ void POA_CORBA::ConstantDef::_interface_skel (
 
 
 void POA_CORBA::ConstantDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstantDef * const impl =
     static_cast<POA_CORBA::ConstantDef *> (servant);
-  
+
   _get_component_ConstantDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4358,13 +4248,11 @@ void POA_CORBA::ConstantDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ConstantDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -4399,39 +4287,36 @@ const char* POA_CORBA::ConstantDef::_interface_repository_id (void) const
 void POA_CORBA::ConstantDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ConstantDef *
-POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ConstantDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ConstantDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -4567,11 +4452,11 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15, 
-       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1, 
-      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62, 
-       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1, 
-       40,  41,  42,  -1,  43, 
+       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15,
+       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1,
+      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62,
+       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1,
+       40,  41,  42,  -1,  43,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4620,9 +4505,9 @@ CORBA__TAO_StructDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_StructDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -4632,7 +4517,7 @@ CORBA__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::StructDef::StructDef (void)
@@ -4656,11 +4541,11 @@ POA_CORBA::StructDef::~StructDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_members_StructDef
     : public TAO::Upcall_Command
   {
@@ -4674,20 +4559,18 @@ POA_CORBA::StructDef::~StructDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::StructMemberSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->members (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->members ();
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4696,30 +4579,29 @@ POA_CORBA::StructDef::~StructDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::StructDef::_get_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
 
@@ -4727,7 +4609,7 @@ void POA_CORBA::StructDef::_get_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4738,15 +4620,14 @@ void POA_CORBA::StructDef::_get_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_members_StructDef
     : public TAO::Upcall_Command
   {
@@ -4760,21 +4641,19 @@ void POA_CORBA::StructDef::_get_members_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->members (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4783,32 +4662,31 @@ void POA_CORBA::StructDef::_get_members_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::StructDef::_set_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_members
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
 
@@ -4816,7 +4694,7 @@ void POA_CORBA::StructDef::_set_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4827,20 +4705,19 @@ void POA_CORBA::StructDef::_set_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_StructDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -4854,27 +4731,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4884,36 +4759,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::StructDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  
+
   _is_a_StructDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4924,15 +4798,14 @@ void POA_CORBA::StructDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_StructDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -4946,20 +4819,18 @@ void POA_CORBA::StructDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4969,34 +4840,33 @@ void POA_CORBA::StructDef::_is_a_skel (
 
 
 void POA_CORBA::StructDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  
+
   _non_existent_StructDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5007,15 +4877,14 @@ void POA_CORBA::StructDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_StructDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5029,20 +4898,18 @@ void POA_CORBA::StructDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5052,34 +4919,33 @@ void POA_CORBA::StructDef::_non_existent_skel (
 
 
 void POA_CORBA::StructDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  
+
   _repository_id_StructDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5090,59 +4956,57 @@ void POA_CORBA::StructDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::StructDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_StructDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5156,20 +5020,18 @@ void POA_CORBA::StructDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::StructDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5179,34 +5041,33 @@ void POA_CORBA::StructDef::_interface_skel (
 
 
 void POA_CORBA::StructDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StructDef * const impl =
     static_cast<POA_CORBA::StructDef *> (servant);
-  
+
   _get_component_StructDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5217,13 +5078,11 @@ void POA_CORBA::StructDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::StructDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -5270,39 +5129,36 @@ const char* POA_CORBA::StructDef::_interface_repository_id (void) const
 void POA_CORBA::StructDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::StructDef *
-POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::StructDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::StructDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5441,13 +5297,13 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -87,  10,  11,  -1,  -1, 
-       -1,  -1,  -1,  -1,  12,  -1,  -1, -14,  -2,  13,  -1, -17,  -2, -91, 
-      -21,  -2,  16,  -1, -92,  -1, -23,  -2,  19,  20, -95, -25,  -2, -92, 
-      -88,  27,  -1,  -1,  28,  29,  30,  31,  32,  33,  34,  35,  -1,  36, 
-       37,  38,  39,  -1, -40,  -2, -87,  -1,  -1,  -1,  -1,  42,  -1,  -1, 
-       -1,  -1,  43,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44, 
-       -1,  45, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -87,  10,  11,  -1,  -1,
+       -1,  -1,  -1,  -1,  12,  -1,  -1, -14,  -2,  13,  -1, -17,  -2, -91,
+      -21,  -2,  16,  -1, -92,  -1, -23,  -2,  19,  20, -95, -25,  -2, -92,
+      -88,  27,  -1,  -1,  28,  29,  30,  31,  32,  33,  34,  35,  -1,  36,
+       37,  38,  39,  -1, -40,  -2, -87,  -1,  -1,  -1,  -1,  42,  -1,  -1,
+       -1,  -1,  43,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44,
+       -1,  45,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5496,9 +5352,9 @@ CORBA__TAO_UnionDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_UnionDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -5508,7 +5364,7 @@ CORBA__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::UnionDef::UnionDef (void)
@@ -5532,11 +5388,11 @@ POA_CORBA::UnionDef::~UnionDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_discriminator_type_UnionDef
     : public TAO::Upcall_Command
   {
@@ -5550,20 +5406,18 @@ POA_CORBA::UnionDef::~UnionDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->discriminator_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->discriminator_type ();
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5572,30 +5426,29 @@ POA_CORBA::UnionDef::~UnionDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::UnionDef::_get_discriminator_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -5603,7 +5456,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5614,15 +5467,14 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_discriminator_type_def_UnionDef
     : public TAO::Upcall_Command
   {
@@ -5636,20 +5488,18 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->discriminator_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->discriminator_type_def ();
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5658,30 +5508,29 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -5689,7 +5538,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5700,15 +5549,14 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_discriminator_type_def_UnionDef
     : public TAO::Upcall_Command
   {
@@ -5722,21 +5570,19 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->discriminator_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5745,32 +5591,31 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_discriminator_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -5778,7 +5623,7 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5789,15 +5634,14 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_members_UnionDef
     : public TAO::Upcall_Command
   {
@@ -5811,20 +5655,18 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::UnionMemberSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->members (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->members ();
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5833,30 +5675,29 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::UnionDef::_get_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -5864,7 +5705,7 @@ void POA_CORBA::UnionDef::_get_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5875,15 +5716,14 @@ void POA_CORBA::UnionDef::_get_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_members_UnionDef
     : public TAO::Upcall_Command
   {
@@ -5897,21 +5737,19 @@ void POA_CORBA::UnionDef::_get_members_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::UnionMemberSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->members (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5920,32 +5758,31 @@ void POA_CORBA::UnionDef::_get_members_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::UnionDef::_set_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_members
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
 
@@ -5953,7 +5790,7 @@ void POA_CORBA::UnionDef::_set_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5964,20 +5801,19 @@ void POA_CORBA::UnionDef::_set_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_UnionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5991,27 +5827,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6021,36 +5855,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::UnionDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  
+
   _is_a_UnionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6061,15 +5894,14 @@ void POA_CORBA::UnionDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_UnionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6083,20 +5915,18 @@ void POA_CORBA::UnionDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6106,34 +5936,33 @@ void POA_CORBA::UnionDef::_is_a_skel (
 
 
 void POA_CORBA::UnionDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  
+
   _non_existent_UnionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6144,15 +5973,14 @@ void POA_CORBA::UnionDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_UnionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6166,20 +5994,18 @@ void POA_CORBA::UnionDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6189,34 +6015,33 @@ void POA_CORBA::UnionDef::_non_existent_skel (
 
 
 void POA_CORBA::UnionDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  
+
   _repository_id_UnionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6227,59 +6052,57 @@ void POA_CORBA::UnionDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::UnionDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_UnionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6293,20 +6116,18 @@ void POA_CORBA::UnionDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::UnionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6316,34 +6137,33 @@ void POA_CORBA::UnionDef::_interface_skel (
 
 
 void POA_CORBA::UnionDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::UnionDef * const impl =
     static_cast<POA_CORBA::UnionDef *> (servant);
-  
+
   _get_component_UnionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6354,13 +6174,11 @@ void POA_CORBA::UnionDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::UnionDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -6407,39 +6225,36 @@ const char* POA_CORBA::UnionDef::_interface_repository_id (void) const
 void POA_CORBA::UnionDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::UnionDef *
-POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::UnionDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::UnionDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6557,9 +6372,9 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 
   static const signed char lookup[] =
     {
-      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6608,9 +6423,9 @@ CORBA__TAO_EnumDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_EnumDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -6620,7 +6435,7 @@ CORBA__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::EnumDef::EnumDef (void)
@@ -6643,11 +6458,11 @@ POA_CORBA::EnumDef::~EnumDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_members_EnumDef
     : public TAO::Upcall_Command
   {
@@ -6661,20 +6476,18 @@ POA_CORBA::EnumDef::~EnumDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::EnumMemberSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->members (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->members ();
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6683,30 +6496,29 @@ POA_CORBA::EnumDef::~EnumDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::EnumDef::_get_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
 
@@ -6714,7 +6526,7 @@ void POA_CORBA::EnumDef::_get_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6725,15 +6537,14 @@ void POA_CORBA::EnumDef::_get_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_members_EnumDef
     : public TAO::Upcall_Command
   {
@@ -6747,21 +6558,19 @@ void POA_CORBA::EnumDef::_get_members_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::EnumMemberSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->members (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6770,32 +6579,31 @@ void POA_CORBA::EnumDef::_get_members_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::EnumDef::_set_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_members
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
 
@@ -6803,7 +6611,7 @@ void POA_CORBA::EnumDef::_set_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6814,20 +6622,19 @@ void POA_CORBA::EnumDef::_set_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_EnumDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6841,27 +6648,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6871,36 +6676,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::EnumDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  
+
   _is_a_EnumDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6911,15 +6715,14 @@ void POA_CORBA::EnumDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_EnumDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6933,20 +6736,18 @@ void POA_CORBA::EnumDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6956,34 +6757,33 @@ void POA_CORBA::EnumDef::_is_a_skel (
 
 
 void POA_CORBA::EnumDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  
+
   _non_existent_EnumDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6994,15 +6794,14 @@ void POA_CORBA::EnumDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_EnumDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7016,20 +6815,18 @@ void POA_CORBA::EnumDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7039,34 +6836,33 @@ void POA_CORBA::EnumDef::_non_existent_skel (
 
 
 void POA_CORBA::EnumDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  
+
   _repository_id_EnumDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7077,59 +6873,57 @@ void POA_CORBA::EnumDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::EnumDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_EnumDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7143,20 +6937,18 @@ void POA_CORBA::EnumDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::EnumDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7166,34 +6958,33 @@ void POA_CORBA::EnumDef::_interface_skel (
 
 
 void POA_CORBA::EnumDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::EnumDef * const impl =
     static_cast<POA_CORBA::EnumDef *> (servant);
-  
+
   _get_component_EnumDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7204,13 +6995,11 @@ void POA_CORBA::EnumDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::EnumDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7253,39 +7042,36 @@ const char* POA_CORBA::EnumDef::_interface_repository_id (void) const
 void POA_CORBA::EnumDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::EnumDef *
-POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::EnumDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::EnumDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7403,9 +7189,9 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7454,9 +7240,9 @@ CORBA__TAO_AliasDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_AliasDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -7466,7 +7252,7 @@ CORBA__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::AliasDef::AliasDef (void)
@@ -7489,11 +7275,11 @@ POA_CORBA::AliasDef::~AliasDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_original_type_def_AliasDef
     : public TAO::Upcall_Command
   {
@@ -7507,20 +7293,18 @@ POA_CORBA::AliasDef::~AliasDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->original_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->original_type_def ();
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7529,30 +7313,29 @@ POA_CORBA::AliasDef::~AliasDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::AliasDef::_get_original_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
 
@@ -7560,7 +7343,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7571,15 +7354,14 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_original_type_def_AliasDef
     : public TAO::Upcall_Command
   {
@@ -7593,21 +7375,19 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->original_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7616,32 +7396,31 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::AliasDef::_set_original_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_original_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
 
@@ -7649,7 +7428,7 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7660,20 +7439,19 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_AliasDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7687,27 +7465,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7717,36 +7493,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::AliasDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  
+
   _is_a_AliasDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7757,15 +7532,14 @@ void POA_CORBA::AliasDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_AliasDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7779,20 +7553,18 @@ void POA_CORBA::AliasDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7802,34 +7574,33 @@ void POA_CORBA::AliasDef::_is_a_skel (
 
 
 void POA_CORBA::AliasDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  
+
   _non_existent_AliasDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7840,15 +7611,14 @@ void POA_CORBA::AliasDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_AliasDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7862,20 +7632,18 @@ void POA_CORBA::AliasDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7885,34 +7653,33 @@ void POA_CORBA::AliasDef::_non_existent_skel (
 
 
 void POA_CORBA::AliasDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  
+
   _repository_id_AliasDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7923,59 +7690,57 @@ void POA_CORBA::AliasDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::AliasDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_AliasDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7989,20 +7754,18 @@ void POA_CORBA::AliasDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::AliasDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -8012,34 +7775,33 @@ void POA_CORBA::AliasDef::_interface_skel (
 
 
 void POA_CORBA::AliasDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AliasDef * const impl =
     static_cast<POA_CORBA::AliasDef *> (servant);
-  
+
   _get_component_AliasDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8050,13 +7812,11 @@ void POA_CORBA::AliasDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::AliasDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -8099,39 +7859,36 @@ const char* POA_CORBA::AliasDef::_interface_repository_id (void) const
 void POA_CORBA::AliasDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::AliasDef *
-POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AliasDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::AliasDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8247,9 +8004,9 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
+       -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8298,9 +8055,9 @@ CORBA__TAO_NativeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_NativeDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -8310,7 +8067,7 @@ CORBA__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::NativeDef::NativeDef (void)
@@ -8333,16 +8090,16 @@ POA_CORBA::NativeDef::~NativeDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_NativeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8356,27 +8113,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::NativeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -8386,36 +8141,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::NativeDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  
+
   _is_a_NativeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8426,15 +8180,14 @@ void POA_CORBA::NativeDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_NativeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8448,20 +8201,18 @@ void POA_CORBA::NativeDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::NativeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -8471,34 +8222,33 @@ void POA_CORBA::NativeDef::_is_a_skel (
 
 
 void POA_CORBA::NativeDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  
+
   _non_existent_NativeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8509,15 +8259,14 @@ void POA_CORBA::NativeDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_NativeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8531,20 +8280,18 @@ void POA_CORBA::NativeDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::NativeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -8554,34 +8301,33 @@ void POA_CORBA::NativeDef::_non_existent_skel (
 
 
 void POA_CORBA::NativeDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  
+
   _repository_id_NativeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8592,59 +8338,57 @@ void POA_CORBA::NativeDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::NativeDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_NativeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -8658,20 +8402,18 @@ void POA_CORBA::NativeDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::NativeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -8681,34 +8423,33 @@ void POA_CORBA::NativeDef::_interface_skel (
 
 
 void POA_CORBA::NativeDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::NativeDef * const impl =
     static_cast<POA_CORBA::NativeDef *> (servant);
-  
+
   _get_component_NativeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8719,13 +8460,11 @@ void POA_CORBA::NativeDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::NativeDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -8768,39 +8507,36 @@ const char* POA_CORBA::NativeDef::_interface_repository_id (void) const
 void POA_CORBA::NativeDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::NativeDef *
-POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::NativeDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::NativeDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8937,9 +8673,9 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -8949,7 +8685,7 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::PrimitiveDef::PrimitiveDef (void)
@@ -8970,11 +8706,11 @@ POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_kind_PrimitiveDef
     : public TAO::Upcall_Command
   {
@@ -8988,20 +8724,18 @@ POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::PrimitiveKind> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->kind (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->kind ();
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -9010,30 +8744,29 @@ POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::PrimitiveDef::_get_kind_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
 
@@ -9041,7 +8774,7 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9052,20 +8785,19 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_PrimitiveDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9079,27 +8811,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -9109,36 +8839,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::PrimitiveDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  
+
   _is_a_PrimitiveDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9149,15 +8878,14 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_PrimitiveDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9171,20 +8899,18 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -9194,34 +8920,33 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
 
 
 void POA_CORBA::PrimitiveDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  
+
   _non_existent_PrimitiveDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9232,15 +8957,14 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_PrimitiveDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9254,20 +8978,18 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -9277,34 +8999,33 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
 
 
 void POA_CORBA::PrimitiveDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  
+
   _repository_id_PrimitiveDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9315,59 +9036,57 @@ void POA_CORBA::PrimitiveDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::PrimitiveDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_PrimitiveDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9381,20 +9100,18 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::PrimitiveDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -9404,34 +9121,33 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
 
 
 void POA_CORBA::PrimitiveDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::PrimitiveDef * const impl =
     static_cast<POA_CORBA::PrimitiveDef *> (servant);
-  
+
   _get_component_PrimitiveDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9442,13 +9158,11 @@ void POA_CORBA::PrimitiveDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::PrimitiveDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -9483,39 +9197,36 @@ const char* POA_CORBA::PrimitiveDef::_interface_repository_id (void) const
 void POA_CORBA::PrimitiveDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::PrimitiveDef *
-POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::PrimitiveDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::PrimitiveDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -9622,8 +9333,8 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9, 
-       10,  11,  -1,  -1,  12,  13,  14, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9,
+       10,  11,  -1,  -1,  12,  13,  14,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9672,9 +9383,9 @@ CORBA__TAO_StringDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_StringDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -9684,7 +9395,7 @@ CORBA__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::StringDef::StringDef (void)
@@ -9705,11 +9416,11 @@ POA_CORBA::StringDef::~StringDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_bound_StringDef
     : public TAO::Upcall_Command
   {
@@ -9723,20 +9434,18 @@ POA_CORBA::StringDef::~StringDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->bound (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->bound ();
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -9745,30 +9454,29 @@ POA_CORBA::StringDef::~StringDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::StringDef::_get_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
 
@@ -9776,7 +9484,7 @@ void POA_CORBA::StringDef::_get_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9787,15 +9495,14 @@ void POA_CORBA::StringDef::_get_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_bound_StringDef
     : public TAO::Upcall_Command
   {
@@ -9809,21 +9516,19 @@ void POA_CORBA::StringDef::_get_bound_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->bound (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -9832,32 +9537,31 @@ void POA_CORBA::StringDef::_get_bound_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::StringDef::_set_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
 
@@ -9865,7 +9569,7 @@ void POA_CORBA::StringDef::_set_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9876,20 +9580,19 @@ void POA_CORBA::StringDef::_set_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_StringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9903,27 +9606,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -9933,36 +9634,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::StringDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  
+
   _is_a_StringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9973,15 +9673,14 @@ void POA_CORBA::StringDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_StringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -9995,20 +9694,18 @@ void POA_CORBA::StringDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -10018,34 +9715,33 @@ void POA_CORBA::StringDef::_is_a_skel (
 
 
 void POA_CORBA::StringDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  
+
   _non_existent_StringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10056,15 +9752,14 @@ void POA_CORBA::StringDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_StringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -10078,20 +9773,18 @@ void POA_CORBA::StringDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -10101,34 +9794,33 @@ void POA_CORBA::StringDef::_non_existent_skel (
 
 
 void POA_CORBA::StringDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  
+
   _repository_id_StringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10139,59 +9831,57 @@ void POA_CORBA::StringDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::StringDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_StringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -10205,20 +9895,18 @@ void POA_CORBA::StringDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::StringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -10228,34 +9916,33 @@ void POA_CORBA::StringDef::_interface_skel (
 
 
 void POA_CORBA::StringDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::StringDef * const impl =
     static_cast<POA_CORBA::StringDef *> (servant);
-  
+
   _get_component_StringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10266,13 +9953,11 @@ void POA_CORBA::StringDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::StringDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -10307,39 +9992,36 @@ const char* POA_CORBA::StringDef::_interface_repository_id (void) const
 void POA_CORBA::StringDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::StringDef *
-POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::StringDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::StringDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -10446,8 +10128,8 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9, 
-       10,  11,  -1,  -1,  12,  13,  14, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9,
+       10,  11,  -1,  -1,  12,  13,  14,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -10496,9 +10178,9 @@ CORBA__TAO_WstringDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_WstringDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -10508,7 +10190,7 @@ CORBA__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::WstringDef::WstringDef (void)
@@ -10529,11 +10211,11 @@ POA_CORBA::WstringDef::~WstringDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_bound_WstringDef
     : public TAO::Upcall_Command
   {
@@ -10547,20 +10229,18 @@ POA_CORBA::WstringDef::~WstringDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->bound (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->bound ();
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -10569,30 +10249,29 @@ POA_CORBA::WstringDef::~WstringDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::WstringDef::_get_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
 
@@ -10600,7 +10279,7 @@ void POA_CORBA::WstringDef::_get_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10611,15 +10290,14 @@ void POA_CORBA::WstringDef::_get_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_bound_WstringDef
     : public TAO::Upcall_Command
   {
@@ -10633,21 +10311,19 @@ void POA_CORBA::WstringDef::_get_bound_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->bound (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -10656,32 +10332,31 @@ void POA_CORBA::WstringDef::_get_bound_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::WstringDef::_set_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
 
@@ -10689,7 +10364,7 @@ void POA_CORBA::WstringDef::_set_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10700,20 +10375,19 @@ void POA_CORBA::WstringDef::_set_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_WstringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -10727,27 +10401,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -10757,36 +10429,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::WstringDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  
+
   _is_a_WstringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10797,15 +10468,14 @@ void POA_CORBA::WstringDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_WstringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -10819,20 +10489,18 @@ void POA_CORBA::WstringDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -10842,34 +10510,33 @@ void POA_CORBA::WstringDef::_is_a_skel (
 
 
 void POA_CORBA::WstringDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  
+
   _non_existent_WstringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10880,15 +10547,14 @@ void POA_CORBA::WstringDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_WstringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -10902,20 +10568,18 @@ void POA_CORBA::WstringDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -10925,34 +10589,33 @@ void POA_CORBA::WstringDef::_non_existent_skel (
 
 
 void POA_CORBA::WstringDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  
+
   _repository_id_WstringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10963,59 +10626,57 @@ void POA_CORBA::WstringDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::WstringDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_WstringDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -11029,20 +10690,18 @@ void POA_CORBA::WstringDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::WstringDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -11052,34 +10711,33 @@ void POA_CORBA::WstringDef::_interface_skel (
 
 
 void POA_CORBA::WstringDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::WstringDef * const impl =
     static_cast<POA_CORBA::WstringDef *> (servant);
-  
+
   _get_component_WstringDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11090,13 +10748,11 @@ void POA_CORBA::WstringDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::WstringDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -11131,39 +10787,36 @@ const char* POA_CORBA::WstringDef::_interface_repository_id (void) const
 void POA_CORBA::WstringDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::WstringDef *
-POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::WstringDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::WstringDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -11273,9 +10926,9 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -29,  -1,  -1,   9, 
-       10,  11, -15,  -2,  12,  13,  14, -32,  -1,  -1,  -1,  -1,  -1,  17, 
-      
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -29,  -1,  -1,   9,
+       10,  11, -15,  -2,  12,  13,  14, -32,  -1,  -1,  -1,  -1,  -1,  17,
+
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -11324,9 +10977,9 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -11336,7 +10989,7 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::SequenceDef::SequenceDef (void)
@@ -11357,11 +11010,11 @@ POA_CORBA::SequenceDef::~SequenceDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_bound_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -11375,20 +11028,18 @@ POA_CORBA::SequenceDef::~SequenceDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->bound (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->bound ();
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -11397,30 +11048,29 @@ POA_CORBA::SequenceDef::~SequenceDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::SequenceDef::_get_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -11428,7 +11078,7 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11439,15 +11089,14 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_bound_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -11461,21 +11110,19 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->bound (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -11484,32 +11131,31 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::SequenceDef::_set_bound_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_bound
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -11517,7 +11163,7 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11528,15 +11174,14 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_element_type_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -11550,20 +11195,18 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->element_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->element_type ();
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -11572,30 +11215,29 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::SequenceDef::_get_element_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -11603,7 +11245,7 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11614,15 +11256,14 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_element_type_def_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -11636,20 +11277,18 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->element_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->element_type_def ();
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -11658,30 +11297,29 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::SequenceDef::_get_element_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -11689,7 +11327,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11700,15 +11338,14 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_element_type_def_SequenceDef
     : public TAO::Upcall_Command
   {
@@ -11722,21 +11359,19 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->element_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -11745,32 +11380,31 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::SequenceDef::_set_element_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_element_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
 
@@ -11778,7 +11412,7 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11789,20 +11423,19 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_SequenceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -11816,27 +11449,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -11846,36 +11477,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::SequenceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  
+
   _is_a_SequenceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11886,15 +11516,14 @@ void POA_CORBA::SequenceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_SequenceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -11908,20 +11537,18 @@ void POA_CORBA::SequenceDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -11931,34 +11558,33 @@ void POA_CORBA::SequenceDef::_is_a_skel (
 
 
 void POA_CORBA::SequenceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  
+
   _non_existent_SequenceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11969,15 +11595,14 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_SequenceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -11991,20 +11616,18 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -12014,34 +11637,33 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
 
 
 void POA_CORBA::SequenceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  
+
   _repository_id_SequenceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12052,59 +11674,57 @@ void POA_CORBA::SequenceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::SequenceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_SequenceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -12118,20 +11738,18 @@ void POA_CORBA::SequenceDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::SequenceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -12141,34 +11759,33 @@ void POA_CORBA::SequenceDef::_interface_skel (
 
 
 void POA_CORBA::SequenceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::SequenceDef * const impl =
     static_cast<POA_CORBA::SequenceDef *> (servant);
-  
+
   _get_component_SequenceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12179,13 +11796,11 @@ void POA_CORBA::SequenceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::SequenceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -12220,39 +11835,36 @@ const char* POA_CORBA::SequenceDef::_interface_repository_id (void) const
 void POA_CORBA::SequenceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::SequenceDef *
-POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::SequenceDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::SequenceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -12362,8 +11974,8 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -9,  -2,   5,  -1,   6,  -1,   7,   8, -29,  -1,  11, 
-       12,  13,  -1,  14,  15, -16,  -2, -23, 
+       -1,  -1,  -1,  -9,  -2,   5,  -1,   6,  -1,   7,   8, -29,  -1,  11,
+       12,  13,  -1,  14,  15, -16,  -2, -23,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12412,9 +12024,9 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -12424,7 +12036,7 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ArrayDef::ArrayDef (void)
@@ -12445,11 +12057,11 @@ POA_CORBA::ArrayDef::~ArrayDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_length_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -12463,20 +12075,18 @@ POA_CORBA::ArrayDef::~ArrayDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->length (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->length ();
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -12485,30 +12095,29 @@ POA_CORBA::ArrayDef::~ArrayDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ArrayDef::_get_length_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ULong>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -12516,7 +12125,7 @@ void POA_CORBA::ArrayDef::_get_length_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12527,15 +12136,14 @@ void POA_CORBA::ArrayDef::_get_length_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_length_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -12549,21 +12157,19 @@ void POA_CORBA::ArrayDef::_get_length_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->length (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -12572,32 +12178,31 @@ void POA_CORBA::ArrayDef::_get_length_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ArrayDef::_set_length_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_length;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_length
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -12605,7 +12210,7 @@ void POA_CORBA::ArrayDef::_set_length_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12616,15 +12221,14 @@ void POA_CORBA::ArrayDef::_set_length_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_element_type_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -12638,20 +12242,18 @@ void POA_CORBA::ArrayDef::_set_length_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->element_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->element_type ();
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -12660,30 +12262,29 @@ void POA_CORBA::ArrayDef::_set_length_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ArrayDef::_get_element_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -12691,7 +12292,7 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12702,15 +12303,14 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_element_type_def_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -12724,20 +12324,18 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->element_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->element_type_def ();
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -12746,30 +12344,29 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ArrayDef::_get_element_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -12777,7 +12374,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12788,15 +12385,14 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_element_type_def_ArrayDef
     : public TAO::Upcall_Command
   {
@@ -12810,21 +12406,19 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->element_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -12833,32 +12427,31 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ArrayDef::_set_element_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_element_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
 
@@ -12866,7 +12459,7 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12877,20 +12470,19 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ArrayDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -12904,27 +12496,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -12934,36 +12524,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ArrayDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  
+
   _is_a_ArrayDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12974,15 +12563,14 @@ void POA_CORBA::ArrayDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ArrayDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -12996,20 +12584,18 @@ void POA_CORBA::ArrayDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -13019,34 +12605,33 @@ void POA_CORBA::ArrayDef::_is_a_skel (
 
 
 void POA_CORBA::ArrayDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  
+
   _non_existent_ArrayDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13057,15 +12642,14 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ArrayDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -13079,20 +12663,18 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -13102,34 +12684,33 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
 
 
 void POA_CORBA::ArrayDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  
+
   _repository_id_ArrayDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13140,59 +12721,57 @@ void POA_CORBA::ArrayDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ArrayDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ArrayDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -13206,20 +12785,18 @@ void POA_CORBA::ArrayDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ArrayDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -13229,34 +12806,33 @@ void POA_CORBA::ArrayDef::_interface_skel (
 
 
 void POA_CORBA::ArrayDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ArrayDef * const impl =
     static_cast<POA_CORBA::ArrayDef *> (servant);
-  
+
   _get_component_ArrayDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13267,13 +12843,11 @@ void POA_CORBA::ArrayDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ArrayDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -13308,39 +12882,36 @@ const char* POA_CORBA::ArrayDef::_interface_repository_id (void) const
 void POA_CORBA::ArrayDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ArrayDef *
-POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ArrayDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ArrayDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -13476,11 +13047,11 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15, 
-       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1, 
-      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62, 
-       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1, 
-       40,  41,  42,  -1,  43, 
+       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15,
+       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1,
+      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62,
+       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1,
+       40,  41,  42,  -1,  43,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -13529,9 +13100,9 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -13541,7 +13112,7 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExceptionDef::ExceptionDef (void)
@@ -13563,11 +13134,11 @@ POA_CORBA::ExceptionDef::~ExceptionDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_ExceptionDef
     : public TAO::Upcall_Command
   {
@@ -13581,20 +13152,18 @@ POA_CORBA::ExceptionDef::~ExceptionDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->type ();
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -13603,30 +13172,29 @@ POA_CORBA::ExceptionDef::~ExceptionDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExceptionDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
 
@@ -13634,7 +13202,7 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13645,15 +13213,14 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_members_ExceptionDef
     : public TAO::Upcall_Command
   {
@@ -13667,20 +13234,18 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::StructMemberSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->members (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->members ();
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -13689,30 +13254,29 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExceptionDef::_get_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
 
@@ -13720,7 +13284,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13731,15 +13295,14 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_members_ExceptionDef
     : public TAO::Upcall_Command
   {
@@ -13753,21 +13316,19 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->members (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -13776,32 +13337,31 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExceptionDef::_set_members_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_members
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
 
@@ -13809,7 +13369,7 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13820,20 +13380,19 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExceptionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -13847,27 +13406,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -13877,36 +13434,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ExceptionDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  
+
   _is_a_ExceptionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13917,15 +13473,14 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExceptionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -13939,20 +13494,18 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -13962,34 +13515,33 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
 
 
 void POA_CORBA::ExceptionDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  
+
   _non_existent_ExceptionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14000,15 +13552,14 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExceptionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -14022,20 +13573,18 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -14045,34 +13594,33 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
 
 
 void POA_CORBA::ExceptionDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  
+
   _repository_id_ExceptionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14083,59 +13631,57 @@ void POA_CORBA::ExceptionDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ExceptionDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExceptionDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -14149,20 +13695,18 @@ void POA_CORBA::ExceptionDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ExceptionDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -14172,34 +13716,33 @@ void POA_CORBA::ExceptionDef::_interface_skel (
 
 
 void POA_CORBA::ExceptionDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExceptionDef * const impl =
     static_cast<POA_CORBA::ExceptionDef *> (servant);
-  
+
   _get_component_ExceptionDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14210,13 +13753,11 @@ void POA_CORBA::ExceptionDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExceptionDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -14255,39 +13796,36 @@ const char* POA_CORBA::ExceptionDef::_interface_repository_id (void) const
 void POA_CORBA::ExceptionDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ExceptionDef *
-POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExceptionDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExceptionDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -14407,9 +13945,9 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 
   static const signed char lookup[] =
     {
-       -9,  -5, -15,  -2,   4,   5,  -1,  50,   8, -45,  14,  -1, -46,  17, 
-       18,  19,  -1,  20,  21,  -1,  22,  -6,  -2,  23,  -1,  -1, -24,  -2, 
-      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26, 
+       -9,  -5, -15,  -2,   4,   5,  -1,  50,   8, -45,  14,  -1, -46,  17,
+       18,  19,  -1,  20,  21,  -1,  22,  -6,  -2,  23,  -1,  -1, -24,  -2,
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -14458,9 +13996,9 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -14470,7 +14008,7 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::AttributeDef::AttributeDef (void)
@@ -14491,11 +14029,11 @@ POA_CORBA::AttributeDef::~AttributeDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -14509,20 +14047,18 @@ POA_CORBA::AttributeDef::~AttributeDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->type ();
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -14531,30 +14067,29 @@ POA_CORBA::AttributeDef::~AttributeDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::AttributeDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -14562,7 +14097,7 @@ void POA_CORBA::AttributeDef::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14573,15 +14108,14 @@ void POA_CORBA::AttributeDef::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_def_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -14595,20 +14129,18 @@ void POA_CORBA::AttributeDef::_get_type_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->type_def ();
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -14617,30 +14149,29 @@ void POA_CORBA::AttributeDef::_get_type_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::AttributeDef::_get_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -14648,7 +14179,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14659,15 +14190,14 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_type_def_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -14681,21 +14211,19 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -14704,32 +14232,31 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::AttributeDef::_set_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -14737,7 +14264,7 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14748,15 +14275,14 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_mode_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -14770,20 +14296,18 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeMode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->mode (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->mode ();
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -14792,30 +14316,29 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::AttributeDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -14823,7 +14346,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14834,15 +14357,14 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_mode_AttributeDef
     : public TAO::Upcall_Command
   {
@@ -14856,21 +14378,19 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->mode (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -14879,32 +14399,31 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::AttributeDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_mode
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
 
@@ -14912,7 +14431,7 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14923,20 +14442,19 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_AttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -14950,27 +14468,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -14980,36 +14496,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::AttributeDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  
+
   _is_a_AttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15020,15 +14535,14 @@ void POA_CORBA::AttributeDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_AttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -15042,20 +14556,18 @@ void POA_CORBA::AttributeDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -15065,34 +14577,33 @@ void POA_CORBA::AttributeDef::_is_a_skel (
 
 
 void POA_CORBA::AttributeDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  
+
   _non_existent_AttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15103,15 +14614,14 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_AttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -15125,20 +14635,18 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -15148,34 +14656,33 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
 
 
 void POA_CORBA::AttributeDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  
+
   _repository_id_AttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15186,59 +14693,57 @@ void POA_CORBA::AttributeDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::AttributeDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_AttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -15252,20 +14757,18 @@ void POA_CORBA::AttributeDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::AttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -15275,34 +14778,33 @@ void POA_CORBA::AttributeDef::_interface_skel (
 
 
 void POA_CORBA::AttributeDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AttributeDef * const impl =
     static_cast<POA_CORBA::AttributeDef *> (servant);
-  
+
   _get_component_AttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15313,13 +14815,11 @@ void POA_CORBA::AttributeDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::AttributeDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -15354,39 +14854,36 @@ const char* POA_CORBA::AttributeDef::_interface_repository_id (void) const
 void POA_CORBA::AttributeDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::AttributeDef *
-POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AttributeDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::AttributeDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -15511,10 +15008,10 @@ TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -6,  -5,   4,   5,  -1, -12,  -2, -50,  11,  -1, -48,  -1, 
-       -1,  14, -16,  -4,  15, -46, -20,  -2, -45,  22,  -1,  -1,  -1,  23, 
-       24,  25,  -1,  26,  -1,  27,  -1,  -1, -28,  -2, -45,  -1,  30,  -1, 
-       -1,  31, 
+       -1,  -1,  -6,  -5,   4,   5,  -1, -12,  -2, -50,  11,  -1, -48,  -1,
+       -1,  14, -16,  -4,  15, -46, -20,  -2, -45,  22,  -1,  -1,  -1,  23,
+       24,  25,  -1,  26,  -1,  27,  -1,  -1, -28,  -2, -45,  -1,  30,  -1,
+       -1,  31,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -15563,9 +15060,9 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -15575,7 +15072,7 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtAttributeDef::ExtAttributeDef (void)
@@ -15597,11 +15094,11 @@ POA_CORBA::ExtAttributeDef::~ExtAttributeDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_get_exceptions_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -15615,20 +15112,18 @@ POA_CORBA::ExtAttributeDef::~ExtAttributeDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExcDescriptionSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->get_exceptions (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->get_exceptions ();
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -15637,30 +15132,29 @@ POA_CORBA::ExtAttributeDef::~ExtAttributeDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -15668,7 +15162,7 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15679,15 +15173,14 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_get_exceptions_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -15701,21 +15194,19 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExcDescriptionSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->get_exceptions (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -15724,32 +15215,31 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_get_exceptions
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -15757,7 +15247,7 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15768,15 +15258,14 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_set_exceptions_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -15790,20 +15279,18 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExcDescriptionSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->set_exceptions (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->set_exceptions ();
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -15812,30 +15299,29 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -15843,7 +15329,7 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15854,15 +15340,14 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_set_exceptions_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -15876,21 +15361,19 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExcDescriptionSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->set_exceptions (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -15899,32 +15382,31 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_set_exceptions
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -15932,7 +15414,7 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -15943,15 +15425,14 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_attribute_ExtAttributeDef
     : public TAO::Upcall_Command
   {
@@ -15965,20 +15446,18 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDescription> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->describe_attribute (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->describe_attribute ();
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -15987,30 +15466,29 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
 
@@ -16018,7 +15496,7 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16029,20 +15507,19 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtAttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -16056,27 +15533,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -16086,36 +15561,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ExtAttributeDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  
+
   _is_a_ExtAttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16126,15 +15600,14 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtAttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -16148,20 +15621,18 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -16171,34 +15642,33 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
 
 
 void POA_CORBA::ExtAttributeDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  
+
   _non_existent_ExtAttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16209,15 +15679,14 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtAttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -16231,20 +15700,18 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -16254,34 +15721,33 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
 
 
 void POA_CORBA::ExtAttributeDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  
+
   _repository_id_ExtAttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16292,59 +15758,57 @@ void POA_CORBA::ExtAttributeDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ExtAttributeDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtAttributeDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -16358,20 +15822,18 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ExtAttributeDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -16381,34 +15843,33 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
 
 
 void POA_CORBA::ExtAttributeDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAttributeDef * const impl =
     static_cast<POA_CORBA::ExtAttributeDef *> (servant);
-  
+
   _get_component_ExtAttributeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16419,13 +15880,11 @@ void POA_CORBA::ExtAttributeDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtAttributeDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -16464,39 +15923,36 @@ const char* POA_CORBA::ExtAttributeDef::_interface_repository_id (void) const
 void POA_CORBA::ExtAttributeDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ExtAttributeDef *
-POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtAttributeDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtAttributeDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -16627,7 +16083,7 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
       if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
         {
             {
-              const TAO_operation_db_entry   *resword; 
+              const TAO_operation_db_entry   *resword;
 
               switch (key)
                 {
@@ -16728,9 +16184,9 @@ CORBA__TAO_OperationDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_OperationDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -16740,7 +16196,7 @@ CORBA__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::OperationDef::OperationDef (void)
@@ -16761,11 +16217,11 @@ POA_CORBA::OperationDef::~OperationDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_result_OperationDef
     : public TAO::Upcall_Command
   {
@@ -16779,20 +16235,18 @@ POA_CORBA::OperationDef::~OperationDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->result (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->result ();
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -16801,30 +16255,29 @@ POA_CORBA::OperationDef::~OperationDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_get_result_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -16832,7 +16285,7 @@ void POA_CORBA::OperationDef::_get_result_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16843,15 +16296,14 @@ void POA_CORBA::OperationDef::_get_result_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_result_def_OperationDef
     : public TAO::Upcall_Command
   {
@@ -16865,20 +16317,18 @@ void POA_CORBA::OperationDef::_get_result_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->result_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->result_def ();
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -16887,30 +16337,29 @@ void POA_CORBA::OperationDef::_get_result_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_get_result_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -16918,7 +16367,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -16929,15 +16378,14 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_result_def_OperationDef
     : public TAO::Upcall_Command
   {
@@ -16951,21 +16399,19 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->result_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -16974,32 +16420,31 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_set_result_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_result_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17007,7 +16452,7 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17018,15 +16463,14 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_params_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17040,20 +16484,18 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ParDescriptionSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->params (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->params ();
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17062,30 +16504,29 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_get_params_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17093,7 +16534,7 @@ void POA_CORBA::OperationDef::_get_params_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17104,15 +16545,14 @@ void POA_CORBA::OperationDef::_get_params_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_params_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17126,21 +16566,19 @@ void POA_CORBA::OperationDef::_get_params_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->params (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17149,32 +16587,31 @@ void POA_CORBA::OperationDef::_get_params_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_set_params_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_params
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17182,7 +16619,7 @@ void POA_CORBA::OperationDef::_set_params_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17193,15 +16630,14 @@ void POA_CORBA::OperationDef::_set_params_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_mode_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17215,20 +16651,18 @@ void POA_CORBA::OperationDef::_set_params_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::OperationMode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::OperationMode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->mode (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->mode ();
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17237,30 +16671,29 @@ void POA_CORBA::OperationDef::_set_params_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::OperationMode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17268,7 +16701,7 @@ void POA_CORBA::OperationDef::_get_mode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17279,15 +16712,14 @@ void POA_CORBA::OperationDef::_get_mode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_mode_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17301,21 +16733,19 @@ void POA_CORBA::OperationDef::_get_mode_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->mode (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17324,32 +16754,31 @@ void POA_CORBA::OperationDef::_get_mode_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_mode
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17357,7 +16786,7 @@ void POA_CORBA::OperationDef::_set_mode_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17368,15 +16797,14 @@ void POA_CORBA::OperationDef::_set_mode_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_contexts_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17390,20 +16818,18 @@ void POA_CORBA::OperationDef::_set_mode_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ContextIdSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->contexts (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->contexts ();
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17412,30 +16838,29 @@ void POA_CORBA::OperationDef::_set_mode_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_get_contexts_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17443,7 +16868,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17454,15 +16879,14 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_contexts_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17476,21 +16900,19 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->contexts (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17499,32 +16921,31 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_set_contexts_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_contexts
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17532,7 +16953,7 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17543,15 +16964,14 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_exceptions_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17565,20 +16985,18 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExceptionDefSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->exceptions (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->exceptions ();
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17587,30 +17005,29 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17618,7 +17035,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17629,15 +17046,14 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_exceptions_OperationDef
     : public TAO::Upcall_Command
   {
@@ -17651,21 +17067,19 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->exceptions (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17674,32 +17088,31 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::OperationDef::_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_exceptions
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
 
@@ -17707,7 +17120,7 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17718,20 +17131,19 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_OperationDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -17745,27 +17157,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17775,36 +17185,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::OperationDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  
+
   _is_a_OperationDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17815,15 +17224,14 @@ void POA_CORBA::OperationDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_OperationDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -17837,20 +17245,18 @@ void POA_CORBA::OperationDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17860,34 +17266,33 @@ void POA_CORBA::OperationDef::_is_a_skel (
 
 
 void POA_CORBA::OperationDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  
+
   _non_existent_OperationDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17898,15 +17303,14 @@ void POA_CORBA::OperationDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_OperationDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -17920,20 +17324,18 @@ void POA_CORBA::OperationDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -17943,34 +17345,33 @@ void POA_CORBA::OperationDef::_non_existent_skel (
 
 
 void POA_CORBA::OperationDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  
+
   _repository_id_OperationDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -17981,59 +17382,57 @@ void POA_CORBA::OperationDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::OperationDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_OperationDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -18047,20 +17446,18 @@ void POA_CORBA::OperationDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::OperationDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -18070,34 +17467,33 @@ void POA_CORBA::OperationDef::_interface_skel (
 
 
 void POA_CORBA::OperationDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::OperationDef * const impl =
     static_cast<POA_CORBA::OperationDef *> (servant);
-  
+
   _get_component_OperationDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18108,13 +17504,11 @@ void POA_CORBA::OperationDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::OperationDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -18149,39 +17543,36 @@ const char* POA_CORBA::OperationDef::_interface_repository_id (void) const
 void POA_CORBA::OperationDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::OperationDef *
-POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::OperationDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::OperationDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -18321,12 +17712,12 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1, 
-       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84, 
-       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27, 
-       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40, 
-       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1,
+       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84,
+       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27,
+       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40,
+       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -18375,9 +17766,9 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -18387,7 +17778,7 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::InterfaceDef::InterfaceDef (void)
@@ -18410,11 +17801,11 @@ POA_CORBA::InterfaceDef::~InterfaceDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_base_interfaces_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -18428,20 +17819,18 @@ POA_CORBA::InterfaceDef::~InterfaceDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->base_interfaces (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->base_interfaces ();
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -18450,30 +17839,29 @@ POA_CORBA::InterfaceDef::~InterfaceDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -18481,7 +17869,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18492,15 +17880,14 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_base_interfaces_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -18514,21 +17901,19 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->base_interfaces (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -18537,32 +17922,31 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_base_interfaces
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -18570,7 +17954,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18581,15 +17965,14 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class is_a_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -18603,27 +17986,25 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -18632,32 +18013,31 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::InterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_interface_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_interface_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -18665,7 +18045,7 @@ void POA_CORBA::InterfaceDef::is_a_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18676,15 +18056,14 @@ void POA_CORBA::InterfaceDef::is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_interface_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -18698,20 +18077,18 @@ void POA_CORBA::InterfaceDef::is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef::FullInterfaceDescription> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->describe_interface (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->describe_interface ();
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -18720,30 +18097,29 @@ void POA_CORBA::InterfaceDef::is_a_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::InterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -18751,7 +18127,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18762,15 +18138,14 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_attribute_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -18784,55 +18159,53 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_attribute (
           arg_1
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_5);
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -18841,28 +18214,27 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::InterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -18872,9 +18244,9 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
       &_tao_type,
       &_tao_mode
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -18882,7 +18254,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -18893,15 +18265,14 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_operation_InterfaceDef
     : public TAO::Upcall_Command
   {
@@ -18915,62 +18286,62 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::OperationDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_8 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq> (
           this->operation_details_,
           this->args_,
           8);
-        
+
       retval =
         this->servant_->create_operation (
           arg_1
@@ -18980,11 +18351,9 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
           , arg_5
           , arg_6
           , arg_7
-          , arg_8
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_8);
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -18993,21 +18362,20 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::InterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::OperationDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -19017,7 +18385,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
   TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -19030,9 +18398,9 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
       &_tao_exceptions,
       &_tao_contexts
     };
-  
+
   static size_t const nargs = 9;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
 
@@ -19040,7 +18408,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19051,20 +18419,19 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_InterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -19078,27 +18445,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -19108,36 +18473,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::InterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  
+
   _is_a_InterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19148,15 +18512,14 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_InterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -19170,20 +18533,18 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -19193,34 +18554,33 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
 
 
 void POA_CORBA::InterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  
+
   _non_existent_InterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19231,15 +18591,14 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_InterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -19253,20 +18612,18 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -19276,34 +18633,33 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
 
 
 void POA_CORBA::InterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  
+
   _repository_id_InterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19314,59 +18670,57 @@ void POA_CORBA::InterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::InterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_InterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -19380,20 +18734,18 @@ void POA_CORBA::InterfaceDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::InterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -19403,34 +18755,33 @@ void POA_CORBA::InterfaceDef::_interface_skel (
 
 
 void POA_CORBA::InterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceDef * const impl =
     static_cast<POA_CORBA::InterfaceDef *> (servant);
-  
+
   _get_component_InterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19441,13 +18792,11 @@ void POA_CORBA::InterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::InterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -19490,39 +18839,36 @@ const char* POA_CORBA::InterfaceDef::_interface_repository_id (void) const
 void POA_CORBA::InterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::InterfaceDef *
-POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::InterfaceDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::InterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -19658,9 +19004,9 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function ( ::CORBA::Objec
 int
 CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -19670,7 +19016,7 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Stub_Factory_Initializer_Scarecro
       reinterpret_cast<size_t> (CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::InterfaceAttrExtension::InterfaceAttrExtension (void)
@@ -19689,11 +19035,11 @@ POA_CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_ext_interface_InterfaceAttrExtension
     : public TAO::Upcall_Command
   {
@@ -19707,20 +19053,18 @@ POA_CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->describe_ext_interface (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->describe_ext_interface ();
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -19729,30 +19073,29 @@ POA_CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
 
@@ -19760,7 +19103,7 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19771,15 +19114,14 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_ext_attribute_InterfaceAttrExtension
     : public TAO::Upcall_Command
   {
@@ -19793,56 +19135,56 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       retval =
         this->servant_->create_ext_attribute (
           arg_1
@@ -19851,11 +19193,9 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
           , arg_4
           , arg_5
           , arg_6
-          , arg_7
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_7);
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -19864,21 +19204,20 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -19887,7 +19226,7 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -19899,9 +19238,9 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
       &_tao_get_exceptions,
       &_tao_set_exceptions
     };
-  
+
   static size_t const nargs = 8;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
 
@@ -19909,7 +19248,7 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -19920,20 +19259,19 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_InterfaceAttrExtension_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -19947,27 +19285,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -19977,36 +19313,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  
+
   _is_a_InterfaceAttrExtension_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20017,15 +19352,14 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_InterfaceAttrExtension_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20039,20 +19373,18 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -20062,34 +19394,33 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
 
 
 void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  
+
   _non_existent_InterfaceAttrExtension_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20100,15 +19431,14 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_InterfaceAttrExtension_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20122,20 +19452,18 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -20145,34 +19473,33 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
 
 
 void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  
+
   _repository_id_InterfaceAttrExtension_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20183,59 +19510,57 @@ void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::InterfaceAttrExtension::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_InterfaceAttrExtension_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20249,20 +19574,18 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::InterfaceAttrExtension * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -20272,34 +19595,33 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
 
 
 void POA_CORBA::InterfaceAttrExtension::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::InterfaceAttrExtension * const impl =
     static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
-  
+
   _get_component_InterfaceAttrExtension_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20310,13 +19632,11 @@ void POA_CORBA::InterfaceAttrExtension::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::InterfaceAttrExtension::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -20343,39 +19663,36 @@ const char* POA_CORBA::InterfaceAttrExtension::_interface_repository_id (void) c
 void POA_CORBA::InterfaceAttrExtension::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::InterfaceAttrExtension *
-POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::InterfaceAttrExtension::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::InterfaceAttrExtension STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -20517,12 +19834,12 @@ TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79, 
-      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21, 
-       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1, 
-       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40, 
-       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1, 
-       47,  -1,  -1,  48, 
+       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79,
+      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21,
+       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1,
+       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40,
+       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1,
+       47,  -1,  -1,  48,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -20571,9 +19888,9 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -20583,7 +19900,7 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtInterfaceDef::ExtInterfaceDef (void)
@@ -20608,16 +19925,16 @@ POA_CORBA::ExtInterfaceDef::~ExtInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20631,27 +19948,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ExtInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -20661,36 +19976,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ExtInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  
+
   _is_a_ExtInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20701,15 +20015,14 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20723,20 +20036,18 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ExtInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -20746,34 +20057,33 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
 
 
 void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  
+
   _non_existent_ExtInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20784,15 +20094,14 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20806,20 +20115,18 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ExtInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -20829,34 +20136,33 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
 
 
 void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  
+
   _repository_id_ExtInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20867,59 +20173,57 @@ void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ExtInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -20933,20 +20237,18 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ExtInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -20956,34 +20258,33 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
 
 
 void POA_CORBA::ExtInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
-  
+
   _get_component_ExtInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -20994,13 +20295,11 @@ void POA_CORBA::ExtInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -21051,39 +20350,36 @@ const char* POA_CORBA::ExtInterfaceDef::_interface_repository_id (void) const
 void POA_CORBA::ExtInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ExtInterfaceDef *
-POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtInterfaceDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -21223,12 +20519,12 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1, 
-       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84, 
-       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27, 
-       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40, 
-       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1,
+       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84,
+       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27,
+       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40,
+       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -21277,9 +20573,9 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
 int
 CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -21289,7 +20585,7 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
       reinterpret_cast<size_t> (CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::AbstractInterfaceDef::AbstractInterfaceDef (void)
@@ -21313,16 +20609,16 @@ POA_CORBA::AbstractInterfaceDef::~AbstractInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_AbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -21336,27 +20632,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::AbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -21366,36 +20660,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  
+
   _is_a_AbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -21406,15 +20699,14 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_AbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -21428,20 +20720,18 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::AbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -21451,34 +20741,33 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
 
 
 void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  
+
   _non_existent_AbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -21489,15 +20778,14 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_AbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -21511,20 +20799,18 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::AbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -21534,34 +20820,33 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
 
 
 void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  
+
   _repository_id_AbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -21572,59 +20857,57 @@ void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::AbstractInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_AbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -21638,20 +20921,18 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::AbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -21661,34 +20942,33 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
 
 
 void POA_CORBA::AbstractInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::AbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
-  
+
   _get_component_AbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -21699,13 +20979,11 @@ void POA_CORBA::AbstractInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::AbstractInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -21752,39 +21030,36 @@ const char* POA_CORBA::AbstractInterfaceDef::_interface_repository_id (void) con
 void POA_CORBA::AbstractInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::AbstractInterfaceDef *
-POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AbstractInterfaceDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::AbstractInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -21926,12 +21201,12 @@ TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79, 
-      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21, 
-       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1, 
-       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40, 
-       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1, 
-       47,  -1,  -1,  48, 
+       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79,
+      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21,
+       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1,
+       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40,
+       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1,
+       47,  -1,  -1,  48,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -21980,9 +21255,9 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Obje
 int
 CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -21992,7 +21267,7 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
       reinterpret_cast<size_t> (CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef (void)
@@ -22018,16 +21293,16 @@ POA_CORBA::ExtAbstractInterfaceDef::~ExtAbstractInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtAbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22041,27 +21316,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ExtAbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -22071,36 +21344,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  
+
   _is_a_ExtAbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22111,15 +21383,14 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtAbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22133,20 +21404,18 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ExtAbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -22156,34 +21425,33 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
 
 
 void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  
+
   _non_existent_ExtAbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22194,15 +21462,14 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtAbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22216,20 +21483,18 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ExtAbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -22239,34 +21504,33 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
 
 
 void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  
+
   _repository_id_ExtAbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22277,59 +21541,57 @@ void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtAbstractInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22343,20 +21605,18 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ExtAbstractInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -22366,34 +21626,33 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
 
 
 void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtAbstractInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
-  
+
   _get_component_ExtAbstractInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22404,13 +21663,11 @@ void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -22465,39 +21722,36 @@ const char* POA_CORBA::ExtAbstractInterfaceDef::_interface_repository_id (void)
 void POA_CORBA::ExtAbstractInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ExtAbstractInterfaceDef *
-POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtAbstractInterfaceDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtAbstractInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -22637,12 +21891,12 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1, 
-       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84, 
-       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27, 
-       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40, 
-       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1,
+       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84,
+       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27,
+       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40,
+       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -22691,9 +21945,9 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr
 int
 CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -22703,7 +21957,7 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::LocalInterfaceDef::LocalInterfaceDef (void)
@@ -22727,16 +21981,16 @@ POA_CORBA::LocalInterfaceDef::~LocalInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_LocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22750,27 +22004,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::LocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -22780,36 +22032,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::LocalInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  
+
   _is_a_LocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22820,15 +22071,14 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_LocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22842,20 +22092,18 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::LocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -22865,34 +22113,33 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
 
 
 void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  
+
   _non_existent_LocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22903,15 +22150,14 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_LocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -22925,20 +22171,18 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::LocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -22948,34 +22192,33 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
 
 
 void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  
+
   _repository_id_LocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -22986,59 +22229,57 @@ void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::LocalInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_LocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23052,20 +22293,18 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::LocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -23075,34 +22314,33 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
 
 
 void POA_CORBA::LocalInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::LocalInterfaceDef * const impl =
     static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
-  
+
   _get_component_LocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23113,13 +22351,11 @@ void POA_CORBA::LocalInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::LocalInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -23166,39 +22402,36 @@ const char* POA_CORBA::LocalInterfaceDef::_interface_repository_id (void) const
 void POA_CORBA::LocalInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::LocalInterfaceDef *
-POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::LocalInterfaceDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::LocalInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -23340,12 +22573,12 @@ TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79, 
-      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21, 
-       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1, 
-       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40, 
-       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1, 
-       47,  -1,  -1,  48, 
+       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -79,
+      -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21,
+       22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1,
+       32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40,
+       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1,
+       47,  -1,  -1,  48,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -23394,9 +22627,9 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
 int
 CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -23406,7 +22639,7 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
       reinterpret_cast<size_t> (CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (void)
@@ -23432,16 +22665,16 @@ POA_CORBA::ExtLocalInterfaceDef::~ExtLocalInterfaceDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtLocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23455,27 +22688,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ExtLocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -23485,36 +22716,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  
+
   _is_a_ExtLocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23525,15 +22755,14 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtLocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23547,20 +22776,18 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ExtLocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -23570,34 +22797,33 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
 
 
 void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  
+
   _non_existent_ExtLocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23608,15 +22834,14 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtLocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23630,20 +22855,18 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ExtLocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -23653,34 +22876,33 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
 
 
 void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  
+
   _repository_id_ExtLocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23691,59 +22913,57 @@ void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtLocalInterfaceDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -23757,20 +22977,18 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ExtLocalInterfaceDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -23780,34 +22998,33 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
 
 
 void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtLocalInterfaceDef * const impl =
     static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
-  
+
   _get_component_ExtLocalInterfaceDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -23818,13 +23035,11 @@ void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -23879,39 +23094,36 @@ const char* POA_CORBA::ExtLocalInterfaceDef::_interface_repository_id (void) con
 void POA_CORBA::ExtLocalInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ExtLocalInterfaceDef *
-POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtLocalInterfaceDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtLocalInterfaceDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
index 4082020639a..a98ed5c6385 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
@@ -79,53 +79,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::Repository *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -135,7 +127,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::Contained_ptr lookup_id (
         const char * search_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -145,7 +136,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -153,7 +143,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::TypeCode_ptr get_canonical_typecode (
         ::CORBA::TypeCode_ptr tc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -163,7 +152,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -171,7 +159,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         ::CORBA::PrimitiveKind kind
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -181,7 +168,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -189,7 +175,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::StringDef_ptr create_string (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -199,7 +184,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -207,7 +191,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::WstringDef_ptr create_wstring (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -217,7 +200,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -226,7 +208,6 @@ namespace POA_CORBA
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         ::CORBA::ULong bound,
         ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -236,7 +217,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -245,7 +225,6 @@ namespace POA_CORBA
     virtual ::CORBA::ArrayDef_ptr create_array (
         ::CORBA::ULong length,
         ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -255,7 +234,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -264,7 +242,6 @@ namespace POA_CORBA
     virtual ::CORBA::FixedDef_ptr create_fixed (
         ::CORBA::UShort digits,
         ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -274,7 +251,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -282,7 +258,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -293,7 +268,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -304,7 +278,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -315,7 +288,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -326,7 +298,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -337,7 +308,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -348,7 +318,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -359,7 +328,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -370,7 +338,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -381,7 +348,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -392,7 +358,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -403,7 +368,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -414,7 +378,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -425,7 +388,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -436,7 +398,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -447,7 +408,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -458,7 +418,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -469,7 +428,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -480,7 +438,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -491,7 +448,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -519,53 +475,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ModuleDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -575,7 +523,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -586,7 +533,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -597,7 +543,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -608,7 +553,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -619,7 +563,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -630,7 +573,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -641,7 +583,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -652,7 +593,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -663,7 +603,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -674,7 +613,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -685,7 +623,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -696,7 +633,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -707,7 +643,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -718,7 +653,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -729,7 +663,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -740,7 +673,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -751,7 +683,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -762,7 +693,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -773,7 +703,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -784,7 +713,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -792,7 +720,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -800,7 +727,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -808,7 +734,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -816,7 +741,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -824,7 +748,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -832,7 +755,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -840,7 +762,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -848,7 +769,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -856,7 +776,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -867,7 +786,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -878,7 +796,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -905,53 +822,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ConstantDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -960,7 +869,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -970,14 +878,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -987,7 +893,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -995,7 +900,6 @@ namespace POA_CORBA
 
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1005,14 +909,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Any * value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1022,7 +924,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1030,7 +931,6 @@ namespace POA_CORBA
 
     virtual void value (
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1040,7 +940,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1048,7 +947,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1059,7 +957,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1067,7 +964,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1075,7 +971,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1083,7 +978,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1091,7 +985,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1099,7 +992,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1107,7 +999,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1115,7 +1006,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1123,7 +1013,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1131,7 +1020,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1142,7 +1030,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1153,7 +1040,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1181,53 +1067,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::StructDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1236,7 +1114,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::StructMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1246,7 +1123,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1254,7 +1130,6 @@ namespace POA_CORBA
 
     virtual void members (
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1264,7 +1139,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1272,7 +1146,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1283,7 +1156,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1291,7 +1163,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1299,7 +1170,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1307,7 +1177,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1315,7 +1184,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1323,7 +1191,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1331,7 +1198,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1339,7 +1205,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1347,7 +1212,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1355,7 +1219,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1366,7 +1229,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1377,7 +1239,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1385,7 +1246,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1396,7 +1256,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1407,7 +1266,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1418,7 +1276,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1429,7 +1286,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1440,7 +1296,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1451,7 +1306,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1462,7 +1316,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1473,7 +1326,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1484,7 +1336,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1495,7 +1346,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1506,7 +1356,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1517,7 +1366,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1528,7 +1376,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1539,7 +1386,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1550,7 +1396,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1561,7 +1406,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1572,7 +1416,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1583,7 +1426,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1611,53 +1453,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::UnionDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1666,7 +1500,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr discriminator_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1676,14 +1509,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr discriminator_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1693,7 +1524,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1701,7 +1531,6 @@ namespace POA_CORBA
 
     virtual void discriminator_type_def (
         ::CORBA::IDLType_ptr discriminator_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1711,14 +1540,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::UnionMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1728,7 +1555,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1736,7 +1562,6 @@ namespace POA_CORBA
 
     virtual void members (
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1746,7 +1571,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1754,7 +1578,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1765,7 +1588,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1773,7 +1595,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1781,7 +1602,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1789,7 +1609,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1797,7 +1616,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1805,7 +1623,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1813,7 +1630,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1821,7 +1637,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1829,7 +1644,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1837,7 +1651,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1848,7 +1661,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1859,7 +1671,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1867,7 +1678,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1878,7 +1688,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1889,7 +1698,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1900,7 +1708,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1911,7 +1718,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1922,7 +1728,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1933,7 +1738,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1944,7 +1748,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1955,7 +1758,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1966,7 +1768,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1977,7 +1778,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1988,7 +1788,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1999,7 +1798,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2010,7 +1808,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2021,7 +1818,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2032,7 +1828,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2043,7 +1838,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2054,7 +1848,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2065,7 +1858,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2092,53 +1884,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::EnumDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2147,7 +1931,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::EnumMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2157,7 +1940,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -2165,7 +1947,6 @@ namespace POA_CORBA
 
     virtual void members (
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2175,7 +1956,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2183,7 +1963,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2194,7 +1973,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2202,7 +1980,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2210,7 +1987,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2218,7 +1994,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2226,7 +2001,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2234,7 +2008,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2242,7 +2015,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2250,7 +2022,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2258,7 +2029,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2266,7 +2036,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2277,7 +2046,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2288,7 +2056,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2296,7 +2063,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2323,53 +2089,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::AliasDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2378,7 +2136,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr original_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2388,7 +2145,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -2396,7 +2152,6 @@ namespace POA_CORBA
 
     virtual void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2406,7 +2161,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2414,7 +2168,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2425,7 +2178,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2433,7 +2185,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2441,7 +2192,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2449,7 +2199,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2457,7 +2206,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2465,7 +2213,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2473,7 +2220,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2481,7 +2227,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2489,7 +2234,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2497,7 +2241,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2508,7 +2251,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2519,7 +2261,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2527,7 +2268,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2554,53 +2294,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::NativeDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2610,7 +2342,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2621,7 +2352,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2629,7 +2359,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2637,7 +2366,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2645,7 +2373,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2653,7 +2380,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2661,7 +2387,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2669,7 +2394,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2677,7 +2401,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2685,7 +2408,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2693,7 +2415,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2704,7 +2425,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2715,7 +2435,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2723,7 +2442,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2750,53 +2468,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::PrimitiveDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2805,7 +2515,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::PrimitiveKind kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2815,7 +2524,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2823,7 +2531,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2834,7 +2541,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2842,7 +2548,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -2869,53 +2574,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::StringDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2924,7 +2621,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2934,7 +2630,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -2942,7 +2637,6 @@ namespace POA_CORBA
 
     virtual void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2952,7 +2646,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2960,7 +2653,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2971,7 +2663,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2979,7 +2670,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3006,53 +2696,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::WstringDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -3061,7 +2743,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3071,7 +2752,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3079,7 +2759,6 @@ namespace POA_CORBA
 
     virtual void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3089,7 +2768,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -3097,7 +2775,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3108,7 +2785,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3116,7 +2792,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3143,53 +2818,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::SequenceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -3198,7 +2865,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3208,7 +2874,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3216,7 +2881,6 @@ namespace POA_CORBA
 
     virtual void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3226,14 +2890,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr element_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3243,14 +2905,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr element_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3260,7 +2920,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3268,7 +2927,6 @@ namespace POA_CORBA
 
     virtual void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3278,7 +2936,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -3286,7 +2943,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3297,7 +2953,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3305,7 +2960,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3332,53 +2986,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ArrayDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -3387,7 +3033,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ULong length (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3397,7 +3042,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3405,7 +3049,6 @@ namespace POA_CORBA
 
     virtual void length (
         ::CORBA::ULong length
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3415,14 +3058,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr element_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3432,14 +3073,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr element_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3449,7 +3088,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3457,7 +3095,6 @@ namespace POA_CORBA
 
     virtual void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3467,7 +3104,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -3475,7 +3111,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3486,7 +3121,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3494,7 +3128,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3522,53 +3155,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExceptionDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -3577,7 +3202,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3587,14 +3211,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::StructMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3604,7 +3226,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -3612,7 +3233,6 @@ namespace POA_CORBA
 
     virtual void members (
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3622,7 +3242,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -3630,7 +3249,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3641,7 +3259,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3649,7 +3266,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3657,7 +3273,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3665,7 +3280,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3673,7 +3287,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3681,7 +3294,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3689,7 +3301,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3697,7 +3308,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3705,7 +3315,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -3713,7 +3322,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3724,7 +3332,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3735,7 +3342,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3746,7 +3352,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3757,7 +3362,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3768,7 +3372,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3779,7 +3382,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3790,7 +3392,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3801,7 +3402,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3812,7 +3412,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3823,7 +3422,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3834,7 +3432,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3845,7 +3442,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3856,7 +3452,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3867,7 +3462,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3878,7 +3472,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3889,7 +3482,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3900,7 +3492,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3911,7 +3502,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3922,7 +3512,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -3933,7 +3522,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -3960,53 +3548,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::AttributeDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -4015,7 +3595,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4025,14 +3604,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4042,7 +3619,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4050,7 +3626,6 @@ namespace POA_CORBA
 
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4060,14 +3635,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::AttributeMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4077,7 +3650,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4085,7 +3657,6 @@ namespace POA_CORBA
 
     virtual void mode (
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4095,7 +3666,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -4103,7 +3673,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4114,7 +3683,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4122,7 +3690,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4130,7 +3697,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4138,7 +3704,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4146,7 +3711,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4154,7 +3718,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4162,7 +3725,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4170,7 +3732,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4178,7 +3739,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4186,7 +3746,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4197,7 +3756,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4208,7 +3766,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -4235,53 +3792,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtAttributeDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -4290,7 +3839,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExcDescriptionSeq * get_exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4300,7 +3848,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4308,7 +3855,6 @@ namespace POA_CORBA
 
     virtual void get_exceptions (
         const ::CORBA::ExcDescriptionSeq & get_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4318,14 +3864,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExcDescriptionSeq * set_exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4335,7 +3879,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4343,7 +3886,6 @@ namespace POA_CORBA
 
     virtual void set_exceptions (
         const ::CORBA::ExcDescriptionSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4353,14 +3895,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExtAttributeDescription * describe_attribute (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4370,7 +3910,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -4378,7 +3917,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4389,7 +3927,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4397,7 +3934,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4405,7 +3941,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4413,7 +3948,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4421,7 +3955,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4429,7 +3962,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4437,7 +3969,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4445,7 +3976,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4453,7 +3983,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4461,7 +3990,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4472,7 +4000,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4483,7 +4010,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4491,7 +4017,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4499,7 +4024,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4507,7 +4031,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4515,7 +4038,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4523,7 +4045,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -4550,53 +4071,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::OperationDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -4605,7 +4118,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr result (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4615,14 +4127,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr result_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4632,7 +4142,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4640,7 +4149,6 @@ namespace POA_CORBA
 
     virtual void result_def (
         ::CORBA::IDLType_ptr result_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4650,14 +4158,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ParDescriptionSeq * params (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4667,7 +4173,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4675,7 +4180,6 @@ namespace POA_CORBA
 
     virtual void params (
         const ::CORBA::ParDescriptionSeq & params
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4685,14 +4189,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::OperationMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4702,7 +4204,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4710,7 +4211,6 @@ namespace POA_CORBA
 
     virtual void mode (
         ::CORBA::OperationMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4720,14 +4220,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ContextIdSeq * contexts (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4737,7 +4235,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4745,7 +4242,6 @@ namespace POA_CORBA
 
     virtual void contexts (
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4755,14 +4251,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExceptionDefSeq * exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4772,7 +4266,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -4780,7 +4273,6 @@ namespace POA_CORBA
 
     virtual void exceptions (
         const ::CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4790,7 +4282,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -4798,7 +4289,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4809,7 +4299,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4817,7 +4306,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4825,7 +4313,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4833,7 +4320,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4841,7 +4327,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4849,7 +4334,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4857,7 +4341,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4865,7 +4348,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4873,7 +4355,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -4881,7 +4362,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4892,7 +4372,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -4903,7 +4382,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -4932,53 +4410,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::InterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -4987,7 +4457,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4997,7 +4466,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5005,7 +4473,6 @@ namespace POA_CORBA
 
     virtual void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5015,7 +4482,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5023,7 +4489,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5033,14 +4498,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5050,7 +4513,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5062,7 +4524,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5072,7 +4533,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5087,7 +4547,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5097,7 +4556,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -5105,7 +4563,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5116,7 +4573,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5127,7 +4583,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5138,7 +4593,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5149,7 +4603,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5160,7 +4613,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5171,7 +4623,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5182,7 +4633,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5193,7 +4643,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5204,7 +4653,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5215,7 +4663,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5226,7 +4673,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5237,7 +4683,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5248,7 +4693,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5259,7 +4703,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5270,7 +4713,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5281,7 +4723,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5292,7 +4733,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5303,7 +4743,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5314,7 +4753,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5322,7 +4760,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5330,7 +4767,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5338,7 +4774,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5346,7 +4781,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5354,7 +4788,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5362,7 +4795,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5370,7 +4802,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5378,7 +4809,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5386,7 +4816,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5397,7 +4826,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5408,7 +4836,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5416,7 +4843,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -5443,53 +4869,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::InterfaceAttrExtension *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -5498,7 +4916,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5508,7 +4925,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -5522,7 +4938,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5532,7 +4947,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
   };
 
@@ -5560,53 +4974,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -5616,7 +5022,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5627,7 +5032,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5638,7 +5042,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5649,7 +5052,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5660,7 +5062,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5671,7 +5072,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5682,7 +5082,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5693,7 +5092,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5704,7 +5102,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5715,7 +5112,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5726,7 +5122,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5737,7 +5132,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5748,7 +5142,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5759,7 +5152,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5770,7 +5162,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5781,7 +5172,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5792,7 +5182,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5803,7 +5192,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5814,7 +5202,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5825,7 +5212,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5833,7 +5219,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5841,7 +5226,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5849,7 +5233,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5857,7 +5240,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5865,7 +5247,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5873,7 +5254,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5881,7 +5261,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5889,7 +5268,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5897,7 +5275,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5908,7 +5285,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5919,7 +5295,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5927,7 +5302,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5935,7 +5309,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -5943,7 +5316,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5954,7 +5326,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5965,7 +5336,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5976,7 +5346,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5987,7 +5356,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -5998,7 +5366,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6009,7 +5376,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -6036,53 +5402,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::AbstractInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -6092,7 +5450,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6103,7 +5460,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6114,7 +5470,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6125,7 +5480,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6136,7 +5490,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6147,7 +5500,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6158,7 +5510,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6169,7 +5520,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6180,7 +5530,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6191,7 +5540,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6202,7 +5550,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6213,7 +5560,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6224,7 +5570,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6235,7 +5580,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6246,7 +5590,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6257,7 +5600,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6268,7 +5610,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6279,7 +5620,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6290,7 +5630,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6301,7 +5640,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6309,7 +5647,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6317,7 +5654,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6325,7 +5661,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6333,7 +5668,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6341,7 +5675,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6349,7 +5682,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6357,7 +5689,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6365,7 +5696,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6373,7 +5703,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6384,7 +5713,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6395,7 +5723,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6403,7 +5730,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6411,7 +5737,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6419,7 +5744,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6430,7 +5754,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6441,7 +5764,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6452,7 +5774,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6463,7 +5784,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -6491,53 +5811,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtAbstractInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -6547,7 +5859,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6558,7 +5869,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6569,7 +5879,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6580,7 +5889,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6591,7 +5899,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6602,7 +5909,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6613,7 +5919,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6624,7 +5929,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6635,7 +5939,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6646,7 +5949,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6657,7 +5959,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6668,7 +5969,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6679,7 +5979,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6690,7 +5989,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6701,7 +5999,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6712,7 +6009,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6723,7 +6019,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6734,7 +6029,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6745,7 +6039,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6756,7 +6049,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6764,7 +6056,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6772,7 +6063,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6780,7 +6070,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6788,7 +6077,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6796,7 +6084,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6804,7 +6091,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6812,7 +6098,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6820,7 +6105,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6828,7 +6112,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6839,7 +6122,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6850,7 +6132,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6858,7 +6139,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6866,7 +6146,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -6874,7 +6153,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6885,7 +6163,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6896,7 +6173,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6907,7 +6183,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6918,7 +6193,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6929,7 +6203,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -6940,7 +6213,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -6967,53 +6239,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::LocalInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -7023,7 +6287,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7034,7 +6297,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7045,7 +6307,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7056,7 +6317,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7067,7 +6327,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7078,7 +6337,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7089,7 +6347,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7100,7 +6357,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7111,7 +6367,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7122,7 +6377,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7133,7 +6387,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7144,7 +6397,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7155,7 +6407,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7166,7 +6417,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7177,7 +6427,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7188,7 +6437,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7199,7 +6447,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7210,7 +6457,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7221,7 +6467,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7232,7 +6477,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7240,7 +6484,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7248,7 +6491,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7256,7 +6498,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7264,7 +6505,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7272,7 +6512,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7280,7 +6519,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7288,7 +6526,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7296,7 +6533,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7304,7 +6540,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7315,7 +6550,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7326,7 +6560,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7334,7 +6567,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7342,7 +6574,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7350,7 +6581,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7361,7 +6591,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7372,7 +6601,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7383,7 +6611,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7394,7 +6621,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -7422,53 +6648,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtLocalInterfaceDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -7478,7 +6696,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7489,7 +6706,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7500,7 +6716,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7511,7 +6726,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7522,7 +6736,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7533,7 +6746,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7544,7 +6756,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7555,7 +6766,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7566,7 +6776,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7577,7 +6786,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7588,7 +6796,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7599,7 +6806,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7610,7 +6816,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7621,7 +6826,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7632,7 +6836,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7643,7 +6846,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7654,7 +6856,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7665,7 +6866,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7676,7 +6876,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7687,7 +6886,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7695,7 +6893,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7703,7 +6900,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7711,7 +6907,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7719,7 +6914,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7727,7 +6921,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7735,7 +6928,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7743,7 +6935,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7751,7 +6942,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7759,7 +6949,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7770,7 +6959,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7781,7 +6969,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7789,7 +6976,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7797,7 +6983,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -7805,7 +6990,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7816,7 +7000,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7827,7 +7010,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7838,7 +7020,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7849,7 +7030,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7860,7 +7040,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -7871,7 +7050,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
index 302ffa66e28..84f2af6e371 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
@@ -36,7 +36,6 @@ POA_CORBA::Repository::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -44,7 +43,6 @@ POA_CORBA::Repository::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -57,7 +55,6 @@ POA_CORBA::Repository::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -65,7 +62,6 @@ POA_CORBA::Repository::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -78,7 +74,6 @@ POA_CORBA::Repository::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -86,7 +81,6 @@ POA_CORBA::Repository::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -99,7 +93,6 @@ POA_CORBA::Repository::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -107,7 +100,6 @@ POA_CORBA::Repository::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -120,7 +112,6 @@ POA_CORBA::Repository::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -128,7 +119,6 @@ POA_CORBA::Repository::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -141,7 +131,6 @@ POA_CORBA::Repository::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -149,7 +138,6 @@ POA_CORBA::Repository::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -162,7 +150,6 @@ POA_CORBA::Repository::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -170,7 +157,6 @@ POA_CORBA::Repository::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -183,7 +169,6 @@ POA_CORBA::Repository::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -191,7 +176,6 @@ POA_CORBA::Repository::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -204,7 +188,6 @@ POA_CORBA::Repository::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -212,7 +195,6 @@ POA_CORBA::Repository::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -225,7 +207,6 @@ POA_CORBA::Repository::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -233,7 +214,6 @@ POA_CORBA::Repository::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -246,7 +226,6 @@ POA_CORBA::Repository::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -254,7 +233,6 @@ POA_CORBA::Repository::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -267,7 +245,6 @@ POA_CORBA::Repository::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -275,7 +252,6 @@ POA_CORBA::Repository::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -288,7 +264,6 @@ POA_CORBA::Repository::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -296,7 +271,6 @@ POA_CORBA::Repository::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -309,7 +283,6 @@ POA_CORBA::Repository::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -317,7 +290,6 @@ POA_CORBA::Repository::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -330,7 +302,6 @@ POA_CORBA::Repository::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -338,7 +309,6 @@ POA_CORBA::Repository::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -351,7 +321,6 @@ POA_CORBA::Repository::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -359,7 +328,6 @@ POA_CORBA::Repository::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -372,7 +340,6 @@ POA_CORBA::Repository::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -380,7 +347,6 @@ POA_CORBA::Repository::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -393,7 +359,6 @@ POA_CORBA::Repository::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -401,7 +366,6 @@ POA_CORBA::Repository::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -414,7 +378,6 @@ POA_CORBA::Repository::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -422,7 +385,6 @@ POA_CORBA::Repository::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -435,7 +397,6 @@ POA_CORBA::Repository::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::Repository *> (servant);
@@ -443,7 +404,6 @@ POA_CORBA::Repository::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -453,7 +413,6 @@ POA_CORBA::ModuleDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -461,7 +420,6 @@ POA_CORBA::ModuleDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -474,7 +432,6 @@ POA_CORBA::ModuleDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -482,7 +439,6 @@ POA_CORBA::ModuleDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -495,7 +451,6 @@ POA_CORBA::ModuleDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -503,7 +458,6 @@ POA_CORBA::ModuleDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -516,7 +470,6 @@ POA_CORBA::ModuleDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -524,7 +477,6 @@ POA_CORBA::ModuleDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -537,7 +489,6 @@ POA_CORBA::ModuleDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -545,7 +496,6 @@ POA_CORBA::ModuleDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -558,7 +508,6 @@ POA_CORBA::ModuleDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -566,7 +515,6 @@ POA_CORBA::ModuleDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -579,7 +527,6 @@ POA_CORBA::ModuleDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -587,7 +534,6 @@ POA_CORBA::ModuleDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -600,7 +546,6 @@ POA_CORBA::ModuleDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -608,7 +553,6 @@ POA_CORBA::ModuleDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -621,7 +565,6 @@ POA_CORBA::ModuleDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -629,7 +572,6 @@ POA_CORBA::ModuleDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -642,7 +584,6 @@ POA_CORBA::ModuleDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -650,7 +591,6 @@ POA_CORBA::ModuleDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -663,7 +603,6 @@ POA_CORBA::ModuleDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -671,7 +610,6 @@ POA_CORBA::ModuleDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -684,7 +622,6 @@ POA_CORBA::ModuleDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -692,7 +629,6 @@ POA_CORBA::ModuleDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -705,7 +641,6 @@ POA_CORBA::ModuleDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -713,7 +648,6 @@ POA_CORBA::ModuleDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -726,7 +660,6 @@ POA_CORBA::ModuleDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -734,7 +667,6 @@ POA_CORBA::ModuleDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -747,7 +679,6 @@ POA_CORBA::ModuleDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -755,7 +686,6 @@ POA_CORBA::ModuleDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -768,7 +698,6 @@ POA_CORBA::ModuleDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -776,7 +705,6 @@ POA_CORBA::ModuleDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -789,7 +717,6 @@ POA_CORBA::ModuleDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -797,7 +724,6 @@ POA_CORBA::ModuleDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -810,7 +736,6 @@ POA_CORBA::ModuleDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -818,7 +743,6 @@ POA_CORBA::ModuleDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -831,7 +755,6 @@ POA_CORBA::ModuleDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -839,7 +762,6 @@ POA_CORBA::ModuleDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -852,7 +774,6 @@ POA_CORBA::ModuleDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -860,7 +781,6 @@ POA_CORBA::ModuleDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -870,7 +790,6 @@ POA_CORBA::ModuleDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -878,7 +797,6 @@ POA_CORBA::ModuleDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -888,7 +806,6 @@ POA_CORBA::ModuleDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -896,7 +813,6 @@ POA_CORBA::ModuleDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -906,7 +822,6 @@ POA_CORBA::ModuleDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -914,7 +829,6 @@ POA_CORBA::ModuleDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -924,7 +838,6 @@ POA_CORBA::ModuleDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -932,7 +845,6 @@ POA_CORBA::ModuleDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -942,7 +854,6 @@ POA_CORBA::ModuleDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -950,7 +861,6 @@ POA_CORBA::ModuleDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -960,7 +870,6 @@ POA_CORBA::ModuleDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -968,7 +877,6 @@ POA_CORBA::ModuleDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -978,7 +886,6 @@ POA_CORBA::ModuleDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -986,7 +893,6 @@ POA_CORBA::ModuleDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -996,7 +902,6 @@ POA_CORBA::ModuleDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -1004,7 +909,6 @@ POA_CORBA::ModuleDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1014,7 +918,6 @@ POA_CORBA::ModuleDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -1022,7 +925,6 @@ POA_CORBA::ModuleDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1035,7 +937,6 @@ POA_CORBA::ModuleDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -1043,7 +944,6 @@ POA_CORBA::ModuleDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1056,7 +956,6 @@ POA_CORBA::ModuleDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ModuleDef *> (servant);
@@ -1064,7 +963,6 @@ POA_CORBA::ModuleDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1074,7 +972,6 @@ POA_CORBA::ConstantDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1082,7 +979,6 @@ POA_CORBA::ConstantDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1095,7 +991,6 @@ POA_CORBA::ConstantDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1103,7 +998,6 @@ POA_CORBA::ConstantDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1113,7 +1007,6 @@ POA_CORBA::ConstantDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1121,7 +1014,6 @@ POA_CORBA::ConstantDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1131,7 +1023,6 @@ POA_CORBA::ConstantDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1139,7 +1030,6 @@ POA_CORBA::ConstantDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1149,7 +1039,6 @@ POA_CORBA::ConstantDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1157,7 +1046,6 @@ POA_CORBA::ConstantDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1167,7 +1055,6 @@ POA_CORBA::ConstantDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1175,7 +1062,6 @@ POA_CORBA::ConstantDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1185,7 +1071,6 @@ POA_CORBA::ConstantDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1193,7 +1078,6 @@ POA_CORBA::ConstantDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1203,7 +1087,6 @@ POA_CORBA::ConstantDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1211,7 +1094,6 @@ POA_CORBA::ConstantDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1221,7 +1103,6 @@ POA_CORBA::ConstantDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1229,7 +1110,6 @@ POA_CORBA::ConstantDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1239,7 +1119,6 @@ POA_CORBA::ConstantDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1247,7 +1126,6 @@ POA_CORBA::ConstantDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1257,7 +1135,6 @@ POA_CORBA::ConstantDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1265,7 +1142,6 @@ POA_CORBA::ConstantDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1278,7 +1154,6 @@ POA_CORBA::ConstantDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1286,7 +1161,6 @@ POA_CORBA::ConstantDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1299,7 +1173,6 @@ POA_CORBA::ConstantDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ConstantDef *> (servant);
@@ -1307,7 +1180,6 @@ POA_CORBA::ConstantDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1317,7 +1189,6 @@ POA_CORBA::StructDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1325,7 +1196,6 @@ POA_CORBA::StructDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1338,7 +1208,6 @@ POA_CORBA::StructDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1346,7 +1215,6 @@ POA_CORBA::StructDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1356,7 +1224,6 @@ POA_CORBA::StructDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1364,7 +1231,6 @@ POA_CORBA::StructDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1374,7 +1240,6 @@ POA_CORBA::StructDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1382,7 +1247,6 @@ POA_CORBA::StructDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1392,7 +1256,6 @@ POA_CORBA::StructDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1400,7 +1263,6 @@ POA_CORBA::StructDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1410,7 +1272,6 @@ POA_CORBA::StructDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1418,7 +1279,6 @@ POA_CORBA::StructDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1428,7 +1288,6 @@ POA_CORBA::StructDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1436,7 +1295,6 @@ POA_CORBA::StructDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1446,7 +1304,6 @@ POA_CORBA::StructDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1454,7 +1311,6 @@ POA_CORBA::StructDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1464,7 +1320,6 @@ POA_CORBA::StructDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1472,7 +1327,6 @@ POA_CORBA::StructDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1482,7 +1336,6 @@ POA_CORBA::StructDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1490,7 +1343,6 @@ POA_CORBA::StructDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1500,7 +1352,6 @@ POA_CORBA::StructDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1508,7 +1359,6 @@ POA_CORBA::StructDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1521,7 +1371,6 @@ POA_CORBA::StructDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1529,7 +1378,6 @@ POA_CORBA::StructDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1542,7 +1390,6 @@ POA_CORBA::StructDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1550,7 +1397,6 @@ POA_CORBA::StructDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1560,7 +1406,6 @@ POA_CORBA::StructDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1568,7 +1413,6 @@ POA_CORBA::StructDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1581,7 +1425,6 @@ POA_CORBA::StructDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1589,7 +1432,6 @@ POA_CORBA::StructDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1602,7 +1444,6 @@ POA_CORBA::StructDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1610,7 +1451,6 @@ POA_CORBA::StructDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1623,7 +1463,6 @@ POA_CORBA::StructDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1631,7 +1470,6 @@ POA_CORBA::StructDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1644,7 +1482,6 @@ POA_CORBA::StructDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1652,7 +1489,6 @@ POA_CORBA::StructDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1665,7 +1501,6 @@ POA_CORBA::StructDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1673,7 +1508,6 @@ POA_CORBA::StructDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1686,7 +1520,6 @@ POA_CORBA::StructDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1694,7 +1527,6 @@ POA_CORBA::StructDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1707,7 +1539,6 @@ POA_CORBA::StructDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1715,7 +1546,6 @@ POA_CORBA::StructDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1728,7 +1558,6 @@ POA_CORBA::StructDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1736,7 +1565,6 @@ POA_CORBA::StructDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1749,7 +1577,6 @@ POA_CORBA::StructDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1757,7 +1584,6 @@ POA_CORBA::StructDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1770,7 +1596,6 @@ POA_CORBA::StructDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1778,7 +1603,6 @@ POA_CORBA::StructDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1791,7 +1615,6 @@ POA_CORBA::StructDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1799,7 +1622,6 @@ POA_CORBA::StructDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1812,7 +1634,6 @@ POA_CORBA::StructDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1820,7 +1641,6 @@ POA_CORBA::StructDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1833,7 +1653,6 @@ POA_CORBA::StructDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1841,7 +1660,6 @@ POA_CORBA::StructDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1854,7 +1672,6 @@ POA_CORBA::StructDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1862,7 +1679,6 @@ POA_CORBA::StructDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1875,7 +1691,6 @@ POA_CORBA::StructDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1883,7 +1698,6 @@ POA_CORBA::StructDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1896,7 +1710,6 @@ POA_CORBA::StructDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1904,7 +1717,6 @@ POA_CORBA::StructDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1917,7 +1729,6 @@ POA_CORBA::StructDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1925,7 +1736,6 @@ POA_CORBA::StructDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1938,7 +1748,6 @@ POA_CORBA::StructDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::StructDef *> (servant);
@@ -1946,7 +1755,6 @@ POA_CORBA::StructDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1956,7 +1764,6 @@ POA_CORBA::UnionDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -1964,7 +1771,6 @@ POA_CORBA::UnionDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1977,7 +1783,6 @@ POA_CORBA::UnionDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -1985,7 +1790,6 @@ POA_CORBA::UnionDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1995,7 +1799,6 @@ POA_CORBA::UnionDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2003,7 +1806,6 @@ POA_CORBA::UnionDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2013,7 +1815,6 @@ POA_CORBA::UnionDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2021,7 +1822,6 @@ POA_CORBA::UnionDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2031,7 +1831,6 @@ POA_CORBA::UnionDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2039,7 +1838,6 @@ POA_CORBA::UnionDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2049,7 +1847,6 @@ POA_CORBA::UnionDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2057,7 +1854,6 @@ POA_CORBA::UnionDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2067,7 +1863,6 @@ POA_CORBA::UnionDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2075,7 +1870,6 @@ POA_CORBA::UnionDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2085,7 +1879,6 @@ POA_CORBA::UnionDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2093,7 +1886,6 @@ POA_CORBA::UnionDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2103,7 +1895,6 @@ POA_CORBA::UnionDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2111,7 +1902,6 @@ POA_CORBA::UnionDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2121,7 +1911,6 @@ POA_CORBA::UnionDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2129,7 +1918,6 @@ POA_CORBA::UnionDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2139,7 +1927,6 @@ POA_CORBA::UnionDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2147,7 +1934,6 @@ POA_CORBA::UnionDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2160,7 +1946,6 @@ POA_CORBA::UnionDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2168,7 +1953,6 @@ POA_CORBA::UnionDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2181,7 +1965,6 @@ POA_CORBA::UnionDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2189,7 +1972,6 @@ POA_CORBA::UnionDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2199,7 +1981,6 @@ POA_CORBA::UnionDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2207,7 +1988,6 @@ POA_CORBA::UnionDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2220,7 +2000,6 @@ POA_CORBA::UnionDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2228,7 +2007,6 @@ POA_CORBA::UnionDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2241,7 +2019,6 @@ POA_CORBA::UnionDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2249,7 +2026,6 @@ POA_CORBA::UnionDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2262,7 +2038,6 @@ POA_CORBA::UnionDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2270,7 +2045,6 @@ POA_CORBA::UnionDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2283,7 +2057,6 @@ POA_CORBA::UnionDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2291,7 +2064,6 @@ POA_CORBA::UnionDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2304,7 +2076,6 @@ POA_CORBA::UnionDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2312,7 +2083,6 @@ POA_CORBA::UnionDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2325,7 +2095,6 @@ POA_CORBA::UnionDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2333,7 +2102,6 @@ POA_CORBA::UnionDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2346,7 +2114,6 @@ POA_CORBA::UnionDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2354,7 +2121,6 @@ POA_CORBA::UnionDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2367,7 +2133,6 @@ POA_CORBA::UnionDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2375,7 +2140,6 @@ POA_CORBA::UnionDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2388,7 +2152,6 @@ POA_CORBA::UnionDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2396,7 +2159,6 @@ POA_CORBA::UnionDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2409,7 +2171,6 @@ POA_CORBA::UnionDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2417,7 +2178,6 @@ POA_CORBA::UnionDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2430,7 +2190,6 @@ POA_CORBA::UnionDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2438,7 +2197,6 @@ POA_CORBA::UnionDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2451,7 +2209,6 @@ POA_CORBA::UnionDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2459,7 +2216,6 @@ POA_CORBA::UnionDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2472,7 +2228,6 @@ POA_CORBA::UnionDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2480,7 +2235,6 @@ POA_CORBA::UnionDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2493,7 +2247,6 @@ POA_CORBA::UnionDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2501,7 +2254,6 @@ POA_CORBA::UnionDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2514,7 +2266,6 @@ POA_CORBA::UnionDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2522,7 +2273,6 @@ POA_CORBA::UnionDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2535,7 +2285,6 @@ POA_CORBA::UnionDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2543,7 +2292,6 @@ POA_CORBA::UnionDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2556,7 +2304,6 @@ POA_CORBA::UnionDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2564,7 +2311,6 @@ POA_CORBA::UnionDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2577,7 +2323,6 @@ POA_CORBA::UnionDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::UnionDef *> (servant);
@@ -2585,7 +2330,6 @@ POA_CORBA::UnionDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2595,7 +2339,6 @@ POA_CORBA::EnumDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2603,7 +2346,6 @@ POA_CORBA::EnumDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2616,7 +2358,6 @@ POA_CORBA::EnumDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2624,7 +2365,6 @@ POA_CORBA::EnumDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2634,7 +2374,6 @@ POA_CORBA::EnumDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2642,7 +2381,6 @@ POA_CORBA::EnumDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2652,7 +2390,6 @@ POA_CORBA::EnumDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2660,7 +2397,6 @@ POA_CORBA::EnumDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2670,7 +2406,6 @@ POA_CORBA::EnumDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2678,7 +2413,6 @@ POA_CORBA::EnumDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2688,7 +2422,6 @@ POA_CORBA::EnumDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2696,7 +2429,6 @@ POA_CORBA::EnumDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2706,7 +2438,6 @@ POA_CORBA::EnumDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2714,7 +2445,6 @@ POA_CORBA::EnumDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2724,7 +2454,6 @@ POA_CORBA::EnumDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2732,7 +2461,6 @@ POA_CORBA::EnumDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2742,7 +2470,6 @@ POA_CORBA::EnumDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2750,7 +2477,6 @@ POA_CORBA::EnumDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2760,7 +2486,6 @@ POA_CORBA::EnumDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2768,7 +2493,6 @@ POA_CORBA::EnumDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2778,7 +2502,6 @@ POA_CORBA::EnumDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2786,7 +2509,6 @@ POA_CORBA::EnumDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2799,7 +2521,6 @@ POA_CORBA::EnumDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2807,7 +2528,6 @@ POA_CORBA::EnumDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2820,7 +2540,6 @@ POA_CORBA::EnumDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2828,7 +2547,6 @@ POA_CORBA::EnumDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2838,7 +2556,6 @@ POA_CORBA::EnumDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::EnumDef *> (servant);
@@ -2846,7 +2563,6 @@ POA_CORBA::EnumDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2856,7 +2572,6 @@ POA_CORBA::AliasDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2864,7 +2579,6 @@ POA_CORBA::AliasDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2877,7 +2591,6 @@ POA_CORBA::AliasDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2885,7 +2598,6 @@ POA_CORBA::AliasDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2895,7 +2607,6 @@ POA_CORBA::AliasDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2903,7 +2614,6 @@ POA_CORBA::AliasDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2913,7 +2623,6 @@ POA_CORBA::AliasDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2921,7 +2630,6 @@ POA_CORBA::AliasDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2931,7 +2639,6 @@ POA_CORBA::AliasDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2939,7 +2646,6 @@ POA_CORBA::AliasDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2949,7 +2655,6 @@ POA_CORBA::AliasDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2957,7 +2662,6 @@ POA_CORBA::AliasDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2967,7 +2671,6 @@ POA_CORBA::AliasDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2975,7 +2678,6 @@ POA_CORBA::AliasDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2985,7 +2687,6 @@ POA_CORBA::AliasDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -2993,7 +2694,6 @@ POA_CORBA::AliasDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3003,7 +2703,6 @@ POA_CORBA::AliasDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3011,7 +2710,6 @@ POA_CORBA::AliasDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3021,7 +2719,6 @@ POA_CORBA::AliasDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3029,7 +2726,6 @@ POA_CORBA::AliasDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3039,7 +2735,6 @@ POA_CORBA::AliasDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3047,7 +2742,6 @@ POA_CORBA::AliasDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3060,7 +2754,6 @@ POA_CORBA::AliasDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3068,7 +2761,6 @@ POA_CORBA::AliasDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3081,7 +2773,6 @@ POA_CORBA::AliasDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3089,7 +2780,6 @@ POA_CORBA::AliasDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3099,7 +2789,6 @@ POA_CORBA::AliasDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::AliasDef *> (servant);
@@ -3107,7 +2796,6 @@ POA_CORBA::AliasDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3117,7 +2805,6 @@ POA_CORBA::NativeDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3125,7 +2812,6 @@ POA_CORBA::NativeDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3138,7 +2824,6 @@ POA_CORBA::NativeDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3146,7 +2831,6 @@ POA_CORBA::NativeDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3156,7 +2840,6 @@ POA_CORBA::NativeDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3164,7 +2847,6 @@ POA_CORBA::NativeDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3174,7 +2856,6 @@ POA_CORBA::NativeDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3182,7 +2863,6 @@ POA_CORBA::NativeDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3192,7 +2872,6 @@ POA_CORBA::NativeDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3200,7 +2879,6 @@ POA_CORBA::NativeDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3210,7 +2888,6 @@ POA_CORBA::NativeDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3218,7 +2895,6 @@ POA_CORBA::NativeDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3228,7 +2904,6 @@ POA_CORBA::NativeDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3236,7 +2911,6 @@ POA_CORBA::NativeDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3246,7 +2920,6 @@ POA_CORBA::NativeDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3254,7 +2927,6 @@ POA_CORBA::NativeDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3264,7 +2936,6 @@ POA_CORBA::NativeDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3272,7 +2943,6 @@ POA_CORBA::NativeDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3282,7 +2952,6 @@ POA_CORBA::NativeDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3290,7 +2959,6 @@ POA_CORBA::NativeDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3300,7 +2968,6 @@ POA_CORBA::NativeDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3308,7 +2975,6 @@ POA_CORBA::NativeDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3321,7 +2987,6 @@ POA_CORBA::NativeDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3329,7 +2994,6 @@ POA_CORBA::NativeDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3342,7 +3006,6 @@ POA_CORBA::NativeDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3350,7 +3013,6 @@ POA_CORBA::NativeDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3360,7 +3022,6 @@ POA_CORBA::NativeDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::NativeDef *> (servant);
@@ -3368,7 +3029,6 @@ POA_CORBA::NativeDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3378,7 +3038,6 @@ POA_CORBA::PrimitiveDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::PrimitiveDef *> (servant);
@@ -3386,7 +3045,6 @@ POA_CORBA::PrimitiveDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3399,7 +3057,6 @@ POA_CORBA::PrimitiveDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::PrimitiveDef *> (servant);
@@ -3407,7 +3064,6 @@ POA_CORBA::PrimitiveDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3417,7 +3073,6 @@ POA_CORBA::PrimitiveDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::PrimitiveDef *> (servant);
@@ -3425,7 +3080,6 @@ POA_CORBA::PrimitiveDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3435,7 +3089,6 @@ POA_CORBA::StringDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::StringDef *> (servant);
@@ -3443,7 +3096,6 @@ POA_CORBA::StringDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3456,7 +3108,6 @@ POA_CORBA::StringDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::StringDef *> (servant);
@@ -3464,7 +3115,6 @@ POA_CORBA::StringDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3474,7 +3124,6 @@ POA_CORBA::StringDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::StringDef *> (servant);
@@ -3482,7 +3131,6 @@ POA_CORBA::StringDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3492,7 +3140,6 @@ POA_CORBA::WstringDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::WstringDef *> (servant);
@@ -3500,7 +3147,6 @@ POA_CORBA::WstringDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3513,7 +3159,6 @@ POA_CORBA::WstringDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::WstringDef *> (servant);
@@ -3521,7 +3166,6 @@ POA_CORBA::WstringDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3531,7 +3175,6 @@ POA_CORBA::WstringDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::WstringDef *> (servant);
@@ -3539,7 +3182,6 @@ POA_CORBA::WstringDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3549,7 +3191,6 @@ POA_CORBA::SequenceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -3557,7 +3198,6 @@ POA_CORBA::SequenceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3570,7 +3210,6 @@ POA_CORBA::SequenceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -3578,7 +3217,6 @@ POA_CORBA::SequenceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3588,7 +3226,6 @@ POA_CORBA::SequenceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::SequenceDef *> (servant);
@@ -3596,7 +3233,6 @@ POA_CORBA::SequenceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3606,7 +3242,6 @@ POA_CORBA::ArrayDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -3614,7 +3249,6 @@ POA_CORBA::ArrayDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3627,7 +3261,6 @@ POA_CORBA::ArrayDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -3635,7 +3268,6 @@ POA_CORBA::ArrayDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3645,7 +3277,6 @@ POA_CORBA::ArrayDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ArrayDef *> (servant);
@@ -3653,7 +3284,6 @@ POA_CORBA::ArrayDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3663,7 +3293,6 @@ POA_CORBA::ExceptionDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3671,7 +3300,6 @@ POA_CORBA::ExceptionDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3684,7 +3312,6 @@ POA_CORBA::ExceptionDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3692,7 +3319,6 @@ POA_CORBA::ExceptionDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3702,7 +3328,6 @@ POA_CORBA::ExceptionDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3710,7 +3335,6 @@ POA_CORBA::ExceptionDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3720,7 +3344,6 @@ POA_CORBA::ExceptionDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3728,7 +3351,6 @@ POA_CORBA::ExceptionDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3738,7 +3360,6 @@ POA_CORBA::ExceptionDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3746,7 +3367,6 @@ POA_CORBA::ExceptionDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3756,7 +3376,6 @@ POA_CORBA::ExceptionDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3764,7 +3383,6 @@ POA_CORBA::ExceptionDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3774,7 +3392,6 @@ POA_CORBA::ExceptionDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3782,7 +3399,6 @@ POA_CORBA::ExceptionDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3792,7 +3408,6 @@ POA_CORBA::ExceptionDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3800,7 +3415,6 @@ POA_CORBA::ExceptionDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3810,7 +3424,6 @@ POA_CORBA::ExceptionDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3818,7 +3431,6 @@ POA_CORBA::ExceptionDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3828,7 +3440,6 @@ POA_CORBA::ExceptionDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3836,7 +3447,6 @@ POA_CORBA::ExceptionDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3846,7 +3456,6 @@ POA_CORBA::ExceptionDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3854,7 +3463,6 @@ POA_CORBA::ExceptionDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3867,7 +3475,6 @@ POA_CORBA::ExceptionDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3875,7 +3482,6 @@ POA_CORBA::ExceptionDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3888,7 +3494,6 @@ POA_CORBA::ExceptionDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3896,7 +3501,6 @@ POA_CORBA::ExceptionDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3909,7 +3513,6 @@ POA_CORBA::ExceptionDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3917,7 +3520,6 @@ POA_CORBA::ExceptionDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3930,7 +3532,6 @@ POA_CORBA::ExceptionDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3938,7 +3539,6 @@ POA_CORBA::ExceptionDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3951,7 +3551,6 @@ POA_CORBA::ExceptionDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3959,7 +3558,6 @@ POA_CORBA::ExceptionDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3972,7 +3570,6 @@ POA_CORBA::ExceptionDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -3980,7 +3577,6 @@ POA_CORBA::ExceptionDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3993,7 +3589,6 @@ POA_CORBA::ExceptionDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4001,7 +3596,6 @@ POA_CORBA::ExceptionDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4014,7 +3608,6 @@ POA_CORBA::ExceptionDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4022,7 +3615,6 @@ POA_CORBA::ExceptionDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4035,7 +3627,6 @@ POA_CORBA::ExceptionDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4043,7 +3634,6 @@ POA_CORBA::ExceptionDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4056,7 +3646,6 @@ POA_CORBA::ExceptionDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4064,7 +3653,6 @@ POA_CORBA::ExceptionDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4077,7 +3665,6 @@ POA_CORBA::ExceptionDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4085,7 +3672,6 @@ POA_CORBA::ExceptionDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4098,7 +3684,6 @@ POA_CORBA::ExceptionDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4106,7 +3691,6 @@ POA_CORBA::ExceptionDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4119,7 +3703,6 @@ POA_CORBA::ExceptionDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4127,7 +3710,6 @@ POA_CORBA::ExceptionDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4140,7 +3722,6 @@ POA_CORBA::ExceptionDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4148,7 +3729,6 @@ POA_CORBA::ExceptionDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4161,7 +3741,6 @@ POA_CORBA::ExceptionDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4169,7 +3748,6 @@ POA_CORBA::ExceptionDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4182,7 +3760,6 @@ POA_CORBA::ExceptionDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4190,7 +3767,6 @@ POA_CORBA::ExceptionDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4203,7 +3779,6 @@ POA_CORBA::ExceptionDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4211,7 +3786,6 @@ POA_CORBA::ExceptionDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4224,7 +3798,6 @@ POA_CORBA::ExceptionDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4232,7 +3805,6 @@ POA_CORBA::ExceptionDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4245,7 +3817,6 @@ POA_CORBA::ExceptionDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4253,7 +3824,6 @@ POA_CORBA::ExceptionDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4266,7 +3836,6 @@ POA_CORBA::ExceptionDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExceptionDef *> (servant);
@@ -4274,7 +3843,6 @@ POA_CORBA::ExceptionDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4284,7 +3852,6 @@ POA_CORBA::AttributeDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4292,7 +3859,6 @@ POA_CORBA::AttributeDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4305,7 +3871,6 @@ POA_CORBA::AttributeDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4313,7 +3878,6 @@ POA_CORBA::AttributeDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4323,7 +3887,6 @@ POA_CORBA::AttributeDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4331,7 +3894,6 @@ POA_CORBA::AttributeDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4341,7 +3903,6 @@ POA_CORBA::AttributeDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4349,7 +3910,6 @@ POA_CORBA::AttributeDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4359,7 +3919,6 @@ POA_CORBA::AttributeDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4367,7 +3926,6 @@ POA_CORBA::AttributeDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4377,7 +3935,6 @@ POA_CORBA::AttributeDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4385,7 +3942,6 @@ POA_CORBA::AttributeDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4395,7 +3951,6 @@ POA_CORBA::AttributeDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4403,7 +3958,6 @@ POA_CORBA::AttributeDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4413,7 +3967,6 @@ POA_CORBA::AttributeDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4421,7 +3974,6 @@ POA_CORBA::AttributeDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4431,7 +3983,6 @@ POA_CORBA::AttributeDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4439,7 +3990,6 @@ POA_CORBA::AttributeDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4449,7 +3999,6 @@ POA_CORBA::AttributeDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4457,7 +4006,6 @@ POA_CORBA::AttributeDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4467,7 +4015,6 @@ POA_CORBA::AttributeDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4475,7 +4022,6 @@ POA_CORBA::AttributeDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4488,7 +4034,6 @@ POA_CORBA::AttributeDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4496,7 +4041,6 @@ POA_CORBA::AttributeDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4509,7 +4053,6 @@ POA_CORBA::AttributeDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AttributeDef *> (servant);
@@ -4517,7 +4060,6 @@ POA_CORBA::AttributeDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4527,7 +4069,6 @@ POA_CORBA::ExtAttributeDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4535,7 +4076,6 @@ POA_CORBA::ExtAttributeDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4548,7 +4088,6 @@ POA_CORBA::ExtAttributeDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4556,7 +4095,6 @@ POA_CORBA::ExtAttributeDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4566,7 +4104,6 @@ POA_CORBA::ExtAttributeDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4574,7 +4111,6 @@ POA_CORBA::ExtAttributeDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4584,7 +4120,6 @@ POA_CORBA::ExtAttributeDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4592,7 +4127,6 @@ POA_CORBA::ExtAttributeDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4602,7 +4136,6 @@ POA_CORBA::ExtAttributeDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4610,7 +4143,6 @@ POA_CORBA::ExtAttributeDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4620,7 +4152,6 @@ POA_CORBA::ExtAttributeDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4628,7 +4159,6 @@ POA_CORBA::ExtAttributeDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4638,7 +4168,6 @@ POA_CORBA::ExtAttributeDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4646,7 +4175,6 @@ POA_CORBA::ExtAttributeDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4656,7 +4184,6 @@ POA_CORBA::ExtAttributeDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4664,7 +4191,6 @@ POA_CORBA::ExtAttributeDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4674,7 +4200,6 @@ POA_CORBA::ExtAttributeDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4682,7 +4207,6 @@ POA_CORBA::ExtAttributeDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4692,7 +4216,6 @@ POA_CORBA::ExtAttributeDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4700,7 +4223,6 @@ POA_CORBA::ExtAttributeDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4710,7 +4232,6 @@ POA_CORBA::ExtAttributeDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4718,7 +4239,6 @@ POA_CORBA::ExtAttributeDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4731,7 +4251,6 @@ POA_CORBA::ExtAttributeDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4739,7 +4258,6 @@ POA_CORBA::ExtAttributeDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4752,7 +4270,6 @@ POA_CORBA::ExtAttributeDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4760,7 +4277,6 @@ POA_CORBA::ExtAttributeDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4770,7 +4286,6 @@ POA_CORBA::ExtAttributeDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4778,7 +4293,6 @@ POA_CORBA::ExtAttributeDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4788,7 +4302,6 @@ POA_CORBA::ExtAttributeDef::_get_type_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4796,7 +4309,6 @@ POA_CORBA::ExtAttributeDef::_get_type_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4806,7 +4318,6 @@ POA_CORBA::ExtAttributeDef::_set_type_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4814,7 +4325,6 @@ POA_CORBA::ExtAttributeDef::_set_type_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4824,7 +4334,6 @@ POA_CORBA::ExtAttributeDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4832,7 +4341,6 @@ POA_CORBA::ExtAttributeDef::_get_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4842,7 +4350,6 @@ POA_CORBA::ExtAttributeDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::AttributeDef * const impl = static_cast<POA_CORBA::ExtAttributeDef *> (servant);
@@ -4850,7 +4357,6 @@ POA_CORBA::ExtAttributeDef::_set_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4860,7 +4366,6 @@ POA_CORBA::OperationDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4868,7 +4373,6 @@ POA_CORBA::OperationDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4881,7 +4385,6 @@ POA_CORBA::OperationDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4889,7 +4392,6 @@ POA_CORBA::OperationDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4899,7 +4401,6 @@ POA_CORBA::OperationDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4907,7 +4408,6 @@ POA_CORBA::OperationDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4917,7 +4417,6 @@ POA_CORBA::OperationDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4925,7 +4424,6 @@ POA_CORBA::OperationDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4935,7 +4433,6 @@ POA_CORBA::OperationDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4943,7 +4440,6 @@ POA_CORBA::OperationDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4953,7 +4449,6 @@ POA_CORBA::OperationDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4961,7 +4456,6 @@ POA_CORBA::OperationDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4971,7 +4465,6 @@ POA_CORBA::OperationDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4979,7 +4472,6 @@ POA_CORBA::OperationDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4989,7 +4481,6 @@ POA_CORBA::OperationDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -4997,7 +4488,6 @@ POA_CORBA::OperationDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5007,7 +4497,6 @@ POA_CORBA::OperationDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5015,7 +4504,6 @@ POA_CORBA::OperationDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5025,7 +4513,6 @@ POA_CORBA::OperationDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5033,7 +4520,6 @@ POA_CORBA::OperationDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5043,7 +4529,6 @@ POA_CORBA::OperationDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5051,7 +4536,6 @@ POA_CORBA::OperationDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5064,7 +4548,6 @@ POA_CORBA::OperationDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5072,7 +4555,6 @@ POA_CORBA::OperationDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5085,7 +4567,6 @@ POA_CORBA::OperationDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::OperationDef *> (servant);
@@ -5093,7 +4574,6 @@ POA_CORBA::OperationDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5103,7 +4583,6 @@ POA_CORBA::InterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5111,7 +4590,6 @@ POA_CORBA::InterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5124,7 +4602,6 @@ POA_CORBA::InterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5132,7 +4609,6 @@ POA_CORBA::InterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5145,7 +4621,6 @@ POA_CORBA::InterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5153,7 +4628,6 @@ POA_CORBA::InterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5166,7 +4640,6 @@ POA_CORBA::InterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5174,7 +4647,6 @@ POA_CORBA::InterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5187,7 +4659,6 @@ POA_CORBA::InterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5195,7 +4666,6 @@ POA_CORBA::InterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5208,7 +4678,6 @@ POA_CORBA::InterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5216,7 +4685,6 @@ POA_CORBA::InterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5229,7 +4697,6 @@ POA_CORBA::InterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5237,7 +4704,6 @@ POA_CORBA::InterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5250,7 +4716,6 @@ POA_CORBA::InterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5258,7 +4723,6 @@ POA_CORBA::InterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5271,7 +4735,6 @@ POA_CORBA::InterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5279,7 +4742,6 @@ POA_CORBA::InterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5292,7 +4754,6 @@ POA_CORBA::InterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5300,7 +4761,6 @@ POA_CORBA::InterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5313,7 +4773,6 @@ POA_CORBA::InterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5321,7 +4780,6 @@ POA_CORBA::InterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5334,7 +4792,6 @@ POA_CORBA::InterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5342,7 +4799,6 @@ POA_CORBA::InterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5355,7 +4811,6 @@ POA_CORBA::InterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5363,7 +4818,6 @@ POA_CORBA::InterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5376,7 +4830,6 @@ POA_CORBA::InterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5384,7 +4837,6 @@ POA_CORBA::InterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5397,7 +4849,6 @@ POA_CORBA::InterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5405,7 +4856,6 @@ POA_CORBA::InterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5418,7 +4868,6 @@ POA_CORBA::InterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5426,7 +4875,6 @@ POA_CORBA::InterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5439,7 +4887,6 @@ POA_CORBA::InterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5447,7 +4894,6 @@ POA_CORBA::InterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5460,7 +4906,6 @@ POA_CORBA::InterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5468,7 +4913,6 @@ POA_CORBA::InterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5481,7 +4925,6 @@ POA_CORBA::InterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5489,7 +4932,6 @@ POA_CORBA::InterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5502,7 +4944,6 @@ POA_CORBA::InterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5510,7 +4951,6 @@ POA_CORBA::InterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5520,7 +4960,6 @@ POA_CORBA::InterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5528,7 +4967,6 @@ POA_CORBA::InterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5538,7 +4976,6 @@ POA_CORBA::InterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5546,7 +4983,6 @@ POA_CORBA::InterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5556,7 +4992,6 @@ POA_CORBA::InterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5564,7 +4999,6 @@ POA_CORBA::InterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5574,7 +5008,6 @@ POA_CORBA::InterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5582,7 +5015,6 @@ POA_CORBA::InterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5592,7 +5024,6 @@ POA_CORBA::InterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5600,7 +5031,6 @@ POA_CORBA::InterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5610,7 +5040,6 @@ POA_CORBA::InterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5618,7 +5047,6 @@ POA_CORBA::InterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5628,7 +5056,6 @@ POA_CORBA::InterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5636,7 +5063,6 @@ POA_CORBA::InterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5646,7 +5072,6 @@ POA_CORBA::InterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5654,7 +5079,6 @@ POA_CORBA::InterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5664,7 +5088,6 @@ POA_CORBA::InterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5672,7 +5095,6 @@ POA_CORBA::InterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5685,7 +5107,6 @@ POA_CORBA::InterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5693,7 +5114,6 @@ POA_CORBA::InterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5706,7 +5126,6 @@ POA_CORBA::InterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5714,7 +5133,6 @@ POA_CORBA::InterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5724,7 +5142,6 @@ POA_CORBA::InterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::InterfaceDef *> (servant);
@@ -5732,7 +5149,6 @@ POA_CORBA::InterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5742,7 +5158,6 @@ POA_CORBA::ExtInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5750,7 +5165,6 @@ POA_CORBA::ExtInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5763,7 +5177,6 @@ POA_CORBA::ExtInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5771,7 +5184,6 @@ POA_CORBA::ExtInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5784,7 +5196,6 @@ POA_CORBA::ExtInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5792,7 +5203,6 @@ POA_CORBA::ExtInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5805,7 +5215,6 @@ POA_CORBA::ExtInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5813,7 +5222,6 @@ POA_CORBA::ExtInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5826,7 +5234,6 @@ POA_CORBA::ExtInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5834,7 +5241,6 @@ POA_CORBA::ExtInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5847,7 +5253,6 @@ POA_CORBA::ExtInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5855,7 +5260,6 @@ POA_CORBA::ExtInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5868,7 +5272,6 @@ POA_CORBA::ExtInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5876,7 +5279,6 @@ POA_CORBA::ExtInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5889,7 +5291,6 @@ POA_CORBA::ExtInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5897,7 +5298,6 @@ POA_CORBA::ExtInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5910,7 +5310,6 @@ POA_CORBA::ExtInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5918,7 +5317,6 @@ POA_CORBA::ExtInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5931,7 +5329,6 @@ POA_CORBA::ExtInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5939,7 +5336,6 @@ POA_CORBA::ExtInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5952,7 +5348,6 @@ POA_CORBA::ExtInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5960,7 +5355,6 @@ POA_CORBA::ExtInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5973,7 +5367,6 @@ POA_CORBA::ExtInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -5981,7 +5374,6 @@ POA_CORBA::ExtInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5994,7 +5386,6 @@ POA_CORBA::ExtInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6002,7 +5393,6 @@ POA_CORBA::ExtInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6015,7 +5405,6 @@ POA_CORBA::ExtInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6023,7 +5412,6 @@ POA_CORBA::ExtInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6036,7 +5424,6 @@ POA_CORBA::ExtInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6044,7 +5431,6 @@ POA_CORBA::ExtInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6057,7 +5443,6 @@ POA_CORBA::ExtInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6065,7 +5450,6 @@ POA_CORBA::ExtInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6078,7 +5462,6 @@ POA_CORBA::ExtInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6086,7 +5469,6 @@ POA_CORBA::ExtInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6099,7 +5481,6 @@ POA_CORBA::ExtInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6107,7 +5488,6 @@ POA_CORBA::ExtInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6120,7 +5500,6 @@ POA_CORBA::ExtInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6128,7 +5507,6 @@ POA_CORBA::ExtInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6141,7 +5519,6 @@ POA_CORBA::ExtInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6149,7 +5526,6 @@ POA_CORBA::ExtInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6159,7 +5535,6 @@ POA_CORBA::ExtInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6167,7 +5542,6 @@ POA_CORBA::ExtInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6177,7 +5551,6 @@ POA_CORBA::ExtInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6185,7 +5558,6 @@ POA_CORBA::ExtInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6195,7 +5567,6 @@ POA_CORBA::ExtInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6203,7 +5574,6 @@ POA_CORBA::ExtInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6213,7 +5583,6 @@ POA_CORBA::ExtInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6221,7 +5590,6 @@ POA_CORBA::ExtInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6231,7 +5599,6 @@ POA_CORBA::ExtInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6239,7 +5606,6 @@ POA_CORBA::ExtInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6249,7 +5615,6 @@ POA_CORBA::ExtInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6257,7 +5622,6 @@ POA_CORBA::ExtInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6267,7 +5631,6 @@ POA_CORBA::ExtInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6275,7 +5638,6 @@ POA_CORBA::ExtInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6285,7 +5647,6 @@ POA_CORBA::ExtInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6293,7 +5654,6 @@ POA_CORBA::ExtInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6303,7 +5663,6 @@ POA_CORBA::ExtInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6311,7 +5670,6 @@ POA_CORBA::ExtInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6324,7 +5682,6 @@ POA_CORBA::ExtInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6332,7 +5689,6 @@ POA_CORBA::ExtInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6345,7 +5701,6 @@ POA_CORBA::ExtInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6353,7 +5708,6 @@ POA_CORBA::ExtInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6363,7 +5717,6 @@ POA_CORBA::ExtInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6371,7 +5724,6 @@ POA_CORBA::ExtInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6381,7 +5733,6 @@ POA_CORBA::ExtInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6389,7 +5740,6 @@ POA_CORBA::ExtInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6399,7 +5749,6 @@ POA_CORBA::ExtInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6407,7 +5756,6 @@ POA_CORBA::ExtInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6420,7 +5768,6 @@ POA_CORBA::ExtInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6428,7 +5775,6 @@ POA_CORBA::ExtInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6441,7 +5787,6 @@ POA_CORBA::ExtInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6449,7 +5794,6 @@ POA_CORBA::ExtInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6462,7 +5806,6 @@ POA_CORBA::ExtInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6470,7 +5813,6 @@ POA_CORBA::ExtInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6483,7 +5825,6 @@ POA_CORBA::ExtInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6491,7 +5832,6 @@ POA_CORBA::ExtInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6504,7 +5844,6 @@ POA_CORBA::ExtInterfaceDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6512,7 +5851,6 @@ POA_CORBA::ExtInterfaceDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6525,7 +5863,6 @@ POA_CORBA::ExtInterfaceDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
@@ -6533,7 +5870,6 @@ POA_CORBA::ExtInterfaceDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6543,7 +5879,6 @@ POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6551,7 +5886,6 @@ POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6564,7 +5898,6 @@ POA_CORBA::AbstractInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6572,7 +5905,6 @@ POA_CORBA::AbstractInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6585,7 +5917,6 @@ POA_CORBA::AbstractInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6593,7 +5924,6 @@ POA_CORBA::AbstractInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6606,7 +5936,6 @@ POA_CORBA::AbstractInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6614,7 +5943,6 @@ POA_CORBA::AbstractInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6627,7 +5955,6 @@ POA_CORBA::AbstractInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6635,7 +5962,6 @@ POA_CORBA::AbstractInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6648,7 +5974,6 @@ POA_CORBA::AbstractInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6656,7 +5981,6 @@ POA_CORBA::AbstractInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6669,7 +5993,6 @@ POA_CORBA::AbstractInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6677,7 +6000,6 @@ POA_CORBA::AbstractInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6690,7 +6012,6 @@ POA_CORBA::AbstractInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6698,7 +6019,6 @@ POA_CORBA::AbstractInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6711,7 +6031,6 @@ POA_CORBA::AbstractInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6719,7 +6038,6 @@ POA_CORBA::AbstractInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6732,7 +6050,6 @@ POA_CORBA::AbstractInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6740,7 +6057,6 @@ POA_CORBA::AbstractInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6753,7 +6069,6 @@ POA_CORBA::AbstractInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6761,7 +6076,6 @@ POA_CORBA::AbstractInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6774,7 +6088,6 @@ POA_CORBA::AbstractInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6782,7 +6095,6 @@ POA_CORBA::AbstractInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6795,7 +6107,6 @@ POA_CORBA::AbstractInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6803,7 +6114,6 @@ POA_CORBA::AbstractInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6816,7 +6126,6 @@ POA_CORBA::AbstractInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6824,7 +6133,6 @@ POA_CORBA::AbstractInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6837,7 +6145,6 @@ POA_CORBA::AbstractInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6845,7 +6152,6 @@ POA_CORBA::AbstractInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6858,7 +6164,6 @@ POA_CORBA::AbstractInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6866,7 +6171,6 @@ POA_CORBA::AbstractInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6879,7 +6183,6 @@ POA_CORBA::AbstractInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6887,7 +6190,6 @@ POA_CORBA::AbstractInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6900,7 +6202,6 @@ POA_CORBA::AbstractInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6908,7 +6209,6 @@ POA_CORBA::AbstractInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6921,7 +6221,6 @@ POA_CORBA::AbstractInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6929,7 +6228,6 @@ POA_CORBA::AbstractInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6942,7 +6240,6 @@ POA_CORBA::AbstractInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6950,7 +6247,6 @@ POA_CORBA::AbstractInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6960,7 +6256,6 @@ POA_CORBA::AbstractInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6968,7 +6263,6 @@ POA_CORBA::AbstractInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6978,7 +6272,6 @@ POA_CORBA::AbstractInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -6986,7 +6279,6 @@ POA_CORBA::AbstractInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6996,7 +6288,6 @@ POA_CORBA::AbstractInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7004,7 +6295,6 @@ POA_CORBA::AbstractInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7014,7 +6304,6 @@ POA_CORBA::AbstractInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7022,7 +6311,6 @@ POA_CORBA::AbstractInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7032,7 +6320,6 @@ POA_CORBA::AbstractInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7040,7 +6327,6 @@ POA_CORBA::AbstractInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7050,7 +6336,6 @@ POA_CORBA::AbstractInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7058,7 +6343,6 @@ POA_CORBA::AbstractInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7068,7 +6352,6 @@ POA_CORBA::AbstractInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7076,7 +6359,6 @@ POA_CORBA::AbstractInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7086,7 +6368,6 @@ POA_CORBA::AbstractInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7094,7 +6375,6 @@ POA_CORBA::AbstractInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7104,7 +6384,6 @@ POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7112,7 +6391,6 @@ POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7125,7 +6403,6 @@ POA_CORBA::AbstractInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7133,7 +6410,6 @@ POA_CORBA::AbstractInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7146,7 +6422,6 @@ POA_CORBA::AbstractInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7154,7 +6429,6 @@ POA_CORBA::AbstractInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7164,7 +6438,6 @@ POA_CORBA::AbstractInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7172,7 +6445,6 @@ POA_CORBA::AbstractInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7182,7 +6454,6 @@ POA_CORBA::AbstractInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7190,7 +6461,6 @@ POA_CORBA::AbstractInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7200,7 +6470,6 @@ POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7208,7 +6477,6 @@ POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7221,7 +6489,6 @@ POA_CORBA::AbstractInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7229,7 +6496,6 @@ POA_CORBA::AbstractInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7242,7 +6508,6 @@ POA_CORBA::AbstractInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7250,7 +6515,6 @@ POA_CORBA::AbstractInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7263,7 +6527,6 @@ POA_CORBA::AbstractInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7271,7 +6534,6 @@ POA_CORBA::AbstractInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7284,7 +6546,6 @@ POA_CORBA::AbstractInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
@@ -7292,7 +6553,6 @@ POA_CORBA::AbstractInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7302,7 +6562,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7310,7 +6569,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7323,7 +6581,6 @@ POA_CORBA::ExtAbstractInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7331,7 +6588,6 @@ POA_CORBA::ExtAbstractInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7344,7 +6600,6 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7352,7 +6607,6 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7365,7 +6619,6 @@ POA_CORBA::ExtAbstractInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7373,7 +6626,6 @@ POA_CORBA::ExtAbstractInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7386,7 +6638,6 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7394,7 +6645,6 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7407,7 +6657,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7415,7 +6664,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7428,7 +6676,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7436,7 +6683,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7449,7 +6695,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7457,7 +6702,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7470,7 +6714,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7478,7 +6721,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7491,7 +6733,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7499,7 +6740,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7512,7 +6752,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7520,7 +6759,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7533,7 +6771,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7541,7 +6778,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7554,7 +6790,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7562,7 +6797,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7575,7 +6809,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7583,7 +6816,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7596,7 +6828,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7604,7 +6835,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7617,7 +6847,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7625,7 +6854,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7638,7 +6866,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7646,7 +6873,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7659,7 +6885,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7667,7 +6892,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7680,7 +6904,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7688,7 +6911,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7701,7 +6923,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7709,7 +6930,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7719,7 +6939,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7727,7 +6946,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7737,7 +6955,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7745,7 +6962,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7755,7 +6971,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7763,7 +6978,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7773,7 +6987,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7781,7 +6994,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7791,7 +7003,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7799,7 +7010,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7809,7 +7019,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7817,7 +7026,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7827,7 +7035,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7835,7 +7042,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7845,7 +7051,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7853,7 +7058,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7863,7 +7067,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7871,7 +7074,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7884,7 +7086,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7892,7 +7093,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7905,7 +7105,6 @@ POA_CORBA::ExtAbstractInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7913,7 +7112,6 @@ POA_CORBA::ExtAbstractInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7923,7 +7121,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7931,7 +7128,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7941,7 +7137,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7949,7 +7144,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7959,7 +7153,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7967,7 +7160,6 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7980,7 +7172,6 @@ POA_CORBA::ExtAbstractInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -7988,7 +7179,6 @@ POA_CORBA::ExtAbstractInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8001,7 +7191,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8009,7 +7198,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8022,7 +7210,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8030,7 +7217,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8043,7 +7229,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8051,7 +7236,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8064,7 +7248,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8072,7 +7255,6 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8085,7 +7267,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
@@ -8093,7 +7274,6 @@ POA_CORBA::ExtAbstractInterfaceDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8103,7 +7283,6 @@ POA_CORBA::LocalInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8111,7 +7290,6 @@ POA_CORBA::LocalInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8124,7 +7302,6 @@ POA_CORBA::LocalInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8132,7 +7309,6 @@ POA_CORBA::LocalInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8145,7 +7321,6 @@ POA_CORBA::LocalInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8153,7 +7328,6 @@ POA_CORBA::LocalInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8166,7 +7340,6 @@ POA_CORBA::LocalInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8174,7 +7347,6 @@ POA_CORBA::LocalInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8187,7 +7359,6 @@ POA_CORBA::LocalInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8195,7 +7366,6 @@ POA_CORBA::LocalInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8208,7 +7378,6 @@ POA_CORBA::LocalInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8216,7 +7385,6 @@ POA_CORBA::LocalInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8229,7 +7397,6 @@ POA_CORBA::LocalInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8237,7 +7404,6 @@ POA_CORBA::LocalInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8250,7 +7416,6 @@ POA_CORBA::LocalInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8258,7 +7423,6 @@ POA_CORBA::LocalInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8271,7 +7435,6 @@ POA_CORBA::LocalInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8279,7 +7442,6 @@ POA_CORBA::LocalInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8292,7 +7454,6 @@ POA_CORBA::LocalInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8300,7 +7461,6 @@ POA_CORBA::LocalInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8313,7 +7473,6 @@ POA_CORBA::LocalInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8321,7 +7480,6 @@ POA_CORBA::LocalInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8334,7 +7492,6 @@ POA_CORBA::LocalInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8342,7 +7499,6 @@ POA_CORBA::LocalInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8355,7 +7511,6 @@ POA_CORBA::LocalInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8363,7 +7518,6 @@ POA_CORBA::LocalInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8376,7 +7530,6 @@ POA_CORBA::LocalInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8384,7 +7537,6 @@ POA_CORBA::LocalInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8397,7 +7549,6 @@ POA_CORBA::LocalInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8405,7 +7556,6 @@ POA_CORBA::LocalInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8418,7 +7568,6 @@ POA_CORBA::LocalInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8426,7 +7575,6 @@ POA_CORBA::LocalInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8439,7 +7587,6 @@ POA_CORBA::LocalInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8447,7 +7594,6 @@ POA_CORBA::LocalInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8460,7 +7606,6 @@ POA_CORBA::LocalInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8468,7 +7613,6 @@ POA_CORBA::LocalInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8481,7 +7625,6 @@ POA_CORBA::LocalInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8489,7 +7632,6 @@ POA_CORBA::LocalInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8502,7 +7644,6 @@ POA_CORBA::LocalInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8510,7 +7651,6 @@ POA_CORBA::LocalInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8520,7 +7660,6 @@ POA_CORBA::LocalInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8528,7 +7667,6 @@ POA_CORBA::LocalInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8538,7 +7676,6 @@ POA_CORBA::LocalInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8546,7 +7683,6 @@ POA_CORBA::LocalInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8556,7 +7692,6 @@ POA_CORBA::LocalInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8564,7 +7699,6 @@ POA_CORBA::LocalInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8574,7 +7708,6 @@ POA_CORBA::LocalInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8582,7 +7715,6 @@ POA_CORBA::LocalInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8592,7 +7724,6 @@ POA_CORBA::LocalInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8600,7 +7731,6 @@ POA_CORBA::LocalInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8610,7 +7740,6 @@ POA_CORBA::LocalInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8618,7 +7747,6 @@ POA_CORBA::LocalInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8628,7 +7756,6 @@ POA_CORBA::LocalInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8636,7 +7763,6 @@ POA_CORBA::LocalInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8646,7 +7772,6 @@ POA_CORBA::LocalInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8654,7 +7779,6 @@ POA_CORBA::LocalInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8664,7 +7788,6 @@ POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8672,7 +7795,6 @@ POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8685,7 +7807,6 @@ POA_CORBA::LocalInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8693,7 +7814,6 @@ POA_CORBA::LocalInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8706,7 +7826,6 @@ POA_CORBA::LocalInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8714,7 +7833,6 @@ POA_CORBA::LocalInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8724,7 +7842,6 @@ POA_CORBA::LocalInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8732,7 +7849,6 @@ POA_CORBA::LocalInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8742,7 +7858,6 @@ POA_CORBA::LocalInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8750,7 +7865,6 @@ POA_CORBA::LocalInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8760,7 +7874,6 @@ POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8768,7 +7881,6 @@ POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8781,7 +7893,6 @@ POA_CORBA::LocalInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8789,7 +7900,6 @@ POA_CORBA::LocalInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8802,7 +7912,6 @@ POA_CORBA::LocalInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8810,7 +7919,6 @@ POA_CORBA::LocalInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8823,7 +7931,6 @@ POA_CORBA::LocalInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8831,7 +7938,6 @@ POA_CORBA::LocalInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8844,7 +7950,6 @@ POA_CORBA::LocalInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
@@ -8852,7 +7957,6 @@ POA_CORBA::LocalInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8862,7 +7966,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8870,7 +7973,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8883,7 +7985,6 @@ POA_CORBA::ExtLocalInterfaceDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8891,7 +7992,6 @@ POA_CORBA::ExtLocalInterfaceDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8904,7 +8004,6 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8912,7 +8011,6 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8925,7 +8023,6 @@ POA_CORBA::ExtLocalInterfaceDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8933,7 +8030,6 @@ POA_CORBA::ExtLocalInterfaceDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8946,7 +8042,6 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8954,7 +8049,6 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8967,7 +8061,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8975,7 +8068,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8988,7 +8080,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -8996,7 +8087,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9009,7 +8099,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9017,7 +8106,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9030,7 +8118,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9038,7 +8125,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9051,7 +8137,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9059,7 +8144,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9072,7 +8156,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9080,7 +8163,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9093,7 +8175,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9101,7 +8182,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9114,7 +8194,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9122,7 +8201,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9135,7 +8213,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9143,7 +8220,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9156,7 +8232,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9164,7 +8239,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9177,7 +8251,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9185,7 +8258,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9198,7 +8270,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9206,7 +8277,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9219,7 +8289,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9227,7 +8296,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9240,7 +8308,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9248,7 +8315,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9261,7 +8327,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9269,7 +8334,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9279,7 +8343,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9287,7 +8350,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9297,7 +8359,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9305,7 +8366,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9315,7 +8375,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9323,7 +8382,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9333,7 +8391,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9341,7 +8398,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9351,7 +8407,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9359,7 +8414,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9369,7 +8423,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9377,7 +8430,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9387,7 +8439,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9395,7 +8446,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9405,7 +8455,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9413,7 +8462,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9423,7 +8471,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9431,7 +8478,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9444,7 +8490,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9452,7 +8497,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9465,7 +8509,6 @@ POA_CORBA::ExtLocalInterfaceDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9473,7 +8516,6 @@ POA_CORBA::ExtLocalInterfaceDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9483,7 +8525,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9491,7 +8532,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9501,7 +8541,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9509,7 +8548,6 @@ POA_CORBA::ExtLocalInterfaceDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9519,7 +8557,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9527,7 +8564,6 @@ POA_CORBA::ExtLocalInterfaceDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9540,7 +8576,6 @@ POA_CORBA::ExtLocalInterfaceDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9548,7 +8583,6 @@ POA_CORBA::ExtLocalInterfaceDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9561,7 +8595,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9569,7 +8602,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9582,7 +8614,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9590,7 +8621,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9603,7 +8633,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9611,7 +8640,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9624,7 +8652,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9632,7 +8659,6 @@ POA_CORBA::ExtLocalInterfaceDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9645,7 +8671,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
@@ -9653,7 +8678,6 @@ POA_CORBA::ExtLocalInterfaceDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
index e316d990dc1..f9dbb974fbf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
@@ -80,14 +80,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -97,7 +95,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -108,7 +105,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -120,7 +116,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -134,7 +129,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -147,7 +141,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -160,7 +153,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -175,7 +167,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -189,7 +180,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -204,7 +194,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -218,7 +207,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -232,7 +220,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -246,7 +233,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -266,7 +252,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -280,7 +265,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -294,7 +278,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -307,7 +290,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -321,7 +303,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -335,7 +316,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -355,7 +335,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -366,7 +345,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup_id (
         const char * search_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -377,7 +355,6 @@ namespace POA_CORBA
 
     ::CORBA::TypeCode_ptr get_canonical_typecode (
         ::CORBA::TypeCode_ptr tc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -388,7 +365,6 @@ namespace POA_CORBA
 
     ::CORBA::PrimitiveDef_ptr get_primitive (
         ::CORBA::PrimitiveKind kind
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -399,7 +375,6 @@ namespace POA_CORBA
 
     ::CORBA::StringDef_ptr create_string (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -410,7 +385,6 @@ namespace POA_CORBA
 
     ::CORBA::WstringDef_ptr create_wstring (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -422,7 +396,6 @@ namespace POA_CORBA
     ::CORBA::SequenceDef_ptr create_sequence (
         ::CORBA::ULong bound,
         ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -434,7 +407,6 @@ namespace POA_CORBA
     ::CORBA::ArrayDef_ptr create_array (
         ::CORBA::ULong length,
         ::CORBA::IDLType_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -446,7 +418,6 @@ namespace POA_CORBA
     ::CORBA::FixedDef_ptr create_fixed (
         ::CORBA::UShort digits,
         ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -499,14 +470,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -516,7 +485,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -527,7 +495,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -539,7 +506,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -553,7 +519,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -566,7 +531,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -579,7 +543,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -594,7 +557,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -608,7 +570,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -623,7 +584,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -637,7 +597,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -651,7 +610,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -665,7 +623,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -685,7 +642,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -699,7 +655,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -713,7 +668,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -726,7 +680,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -740,7 +693,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -754,7 +706,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -774,7 +725,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -784,7 +734,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -795,7 +744,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -805,7 +753,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -816,7 +763,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -826,7 +772,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -837,7 +782,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -847,7 +791,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -857,7 +800,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -867,7 +809,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -877,7 +818,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -890,7 +830,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -943,14 +882,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -960,7 +897,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -970,7 +906,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -981,7 +916,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -991,7 +925,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1002,7 +935,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1012,7 +944,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1023,7 +954,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1033,7 +963,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1043,7 +972,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1053,7 +981,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1063,7 +990,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1076,7 +1002,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1086,7 +1011,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1096,7 +1020,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1107,7 +1030,6 @@ namespace POA_CORBA
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1117,7 +1039,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Any * value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1128,7 +1049,6 @@ namespace POA_CORBA
 
     void value (
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1181,14 +1101,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1198,7 +1116,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1208,7 +1125,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1219,7 +1135,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1229,7 +1144,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1240,7 +1154,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1250,7 +1163,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1261,7 +1173,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1271,7 +1182,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1281,7 +1191,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1291,7 +1200,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1301,7 +1209,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1314,7 +1221,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1324,7 +1230,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1335,7 +1240,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1347,7 +1251,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1361,7 +1264,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1374,7 +1276,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1387,7 +1288,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1402,7 +1302,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1416,7 +1315,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1431,7 +1329,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1445,7 +1342,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1459,7 +1355,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1473,7 +1368,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1493,7 +1387,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1507,7 +1400,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1521,7 +1413,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1534,7 +1425,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1548,7 +1438,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1562,7 +1451,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1582,7 +1470,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1592,7 +1479,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::StructMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1603,7 +1489,6 @@ namespace POA_CORBA
 
     void members (
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1656,14 +1541,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1673,7 +1556,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1683,7 +1565,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1694,7 +1575,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1704,7 +1584,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1715,7 +1594,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1725,7 +1603,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1736,7 +1613,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1746,7 +1622,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1756,7 +1631,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1766,7 +1640,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1776,7 +1649,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1789,7 +1661,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1799,7 +1670,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1810,7 +1680,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1822,7 +1691,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1836,7 +1704,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1849,7 +1716,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1862,7 +1728,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1877,7 +1742,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1891,7 +1755,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1906,7 +1769,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1920,7 +1782,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1934,7 +1795,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1948,7 +1808,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1968,7 +1827,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1982,7 +1840,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1996,7 +1853,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2009,7 +1865,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2023,7 +1878,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2037,7 +1891,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2057,7 +1910,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2067,7 +1919,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr discriminator_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2077,7 +1928,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr discriminator_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2088,7 +1938,6 @@ namespace POA_CORBA
 
     void discriminator_type_def (
         ::CORBA::IDLType_ptr discriminator_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2098,7 +1947,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::UnionMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2109,7 +1957,6 @@ namespace POA_CORBA
 
     void members (
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2162,14 +2009,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2179,7 +2024,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2189,7 +2033,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2200,7 +2043,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2210,7 +2052,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2221,7 +2062,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2231,7 +2071,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2242,7 +2081,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2252,7 +2090,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2262,7 +2099,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2272,7 +2108,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2282,7 +2117,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2295,7 +2129,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2305,7 +2138,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2315,7 +2147,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::EnumMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2326,7 +2157,6 @@ namespace POA_CORBA
 
     void members (
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2379,14 +2209,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2396,7 +2224,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2406,7 +2233,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2417,7 +2243,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2427,7 +2252,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2438,7 +2262,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2448,7 +2271,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2459,7 +2281,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2469,7 +2290,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2479,7 +2299,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2489,7 +2308,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2499,7 +2317,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2512,7 +2329,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2522,7 +2338,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2532,7 +2347,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr original_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2543,7 +2357,6 @@ namespace POA_CORBA
 
     void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2596,14 +2409,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2613,7 +2424,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2623,7 +2433,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2634,7 +2443,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2644,7 +2452,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2655,7 +2462,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2665,7 +2471,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2676,7 +2481,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2686,7 +2490,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2696,7 +2499,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2706,7 +2508,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2716,7 +2517,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2729,7 +2529,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2739,7 +2538,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2792,14 +2590,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2809,7 +2605,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2819,7 +2614,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2829,7 +2623,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::PrimitiveKind kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2882,14 +2675,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2899,7 +2690,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2909,7 +2699,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2919,7 +2708,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2930,7 +2718,6 @@ namespace POA_CORBA
 
     void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -2983,14 +2770,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3000,7 +2785,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3010,7 +2794,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3020,7 +2803,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3031,7 +2813,6 @@ namespace POA_CORBA
 
     void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3084,14 +2865,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3101,7 +2880,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3111,7 +2889,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3121,7 +2898,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong bound (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3132,7 +2908,6 @@ namespace POA_CORBA
 
     void bound (
         ::CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3142,7 +2917,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr element_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3152,7 +2926,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr element_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3163,7 +2936,6 @@ namespace POA_CORBA
 
     void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3216,14 +2988,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3233,7 +3003,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3243,7 +3012,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3253,7 +3021,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ULong length (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3264,7 +3031,6 @@ namespace POA_CORBA
 
     void length (
         ::CORBA::ULong length
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3274,7 +3040,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr element_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3284,7 +3049,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr element_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3295,7 +3059,6 @@ namespace POA_CORBA
 
     void element_type_def (
         ::CORBA::IDLType_ptr element_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3348,14 +3111,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3365,7 +3126,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3375,7 +3135,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3386,7 +3145,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3396,7 +3154,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3407,7 +3164,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3417,7 +3173,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3428,7 +3183,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3438,7 +3192,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3448,7 +3201,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3458,7 +3210,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3468,7 +3219,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3481,7 +3231,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3492,7 +3241,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3504,7 +3252,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3518,7 +3265,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3531,7 +3277,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3544,7 +3289,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3559,7 +3303,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3573,7 +3316,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3588,7 +3330,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3602,7 +3343,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3616,7 +3356,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3630,7 +3369,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3650,7 +3388,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3664,7 +3401,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3678,7 +3414,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3691,7 +3426,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3705,7 +3439,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3719,7 +3452,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3739,7 +3471,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3749,7 +3480,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3759,7 +3489,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::StructMemberSeq * members (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3770,7 +3499,6 @@ namespace POA_CORBA
 
     void members (
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3823,14 +3551,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3840,7 +3566,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3850,7 +3575,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3861,7 +3585,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3871,7 +3594,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3882,7 +3604,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3892,7 +3613,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3903,7 +3623,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3913,7 +3632,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3923,7 +3641,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3933,7 +3650,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3943,7 +3659,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3956,7 +3671,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3966,7 +3680,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3976,7 +3689,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3987,7 +3699,6 @@ namespace POA_CORBA
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -3997,7 +3708,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::AttributeMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4008,7 +3718,6 @@ namespace POA_CORBA
 
     void mode (
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4061,14 +3770,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4078,7 +3785,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4088,7 +3794,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4099,7 +3804,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4109,7 +3813,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4120,7 +3823,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4130,7 +3832,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4141,7 +3842,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4151,7 +3851,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4161,7 +3860,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4171,7 +3869,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4181,7 +3878,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4194,7 +3890,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4204,7 +3899,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4214,7 +3908,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4225,7 +3918,6 @@ namespace POA_CORBA
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4235,7 +3927,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::AttributeMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4246,7 +3937,6 @@ namespace POA_CORBA
 
     void mode (
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4256,7 +3946,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExcDescriptionSeq * get_exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4267,7 +3956,6 @@ namespace POA_CORBA
 
     void get_exceptions (
         const ::CORBA::ExcDescriptionSeq & get_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4277,7 +3965,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExcDescriptionSeq * set_exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4288,7 +3975,6 @@ namespace POA_CORBA
 
     void set_exceptions (
         const ::CORBA::ExcDescriptionSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4298,7 +3984,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExtAttributeDescription * describe_attribute (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4351,14 +4036,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4368,7 +4051,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4378,7 +4060,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4389,7 +4070,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4399,7 +4079,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4410,7 +4089,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4420,7 +4098,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4431,7 +4108,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4441,7 +4117,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4451,7 +4126,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4461,7 +4135,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4471,7 +4144,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4484,7 +4156,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4494,7 +4165,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr result (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4504,7 +4174,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr result_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4515,7 +4184,6 @@ namespace POA_CORBA
 
     void result_def (
         ::CORBA::IDLType_ptr result_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4525,7 +4193,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ParDescriptionSeq * params (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4536,7 +4203,6 @@ namespace POA_CORBA
 
     void params (
         const ::CORBA::ParDescriptionSeq & params
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4546,7 +4212,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::OperationMode mode (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4557,7 +4222,6 @@ namespace POA_CORBA
 
     void mode (
         ::CORBA::OperationMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4567,7 +4231,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ContextIdSeq * contexts (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4578,7 +4241,6 @@ namespace POA_CORBA
 
     void contexts (
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4588,7 +4250,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExceptionDefSeq * exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4599,7 +4260,6 @@ namespace POA_CORBA
 
     void exceptions (
         const ::CORBA::ExceptionDefSeq & exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4652,14 +4312,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4669,7 +4327,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4680,7 +4337,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4692,7 +4348,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4706,7 +4361,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4719,7 +4373,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4732,7 +4385,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4747,7 +4399,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4761,7 +4412,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4776,7 +4426,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4790,7 +4439,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4804,7 +4452,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4818,7 +4465,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4838,7 +4484,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4852,7 +4497,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4866,7 +4510,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4879,7 +4522,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4893,7 +4535,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4907,7 +4548,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4927,7 +4567,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4937,7 +4576,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4948,7 +4586,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4958,7 +4595,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4969,7 +4605,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4979,7 +4614,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -4990,7 +4624,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5000,7 +4633,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5010,7 +4642,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5020,7 +4651,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5030,7 +4660,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5043,7 +4672,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5053,7 +4681,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5063,7 +4690,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5074,7 +4700,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5085,7 +4710,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5095,7 +4719,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5110,7 +4733,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5128,7 +4750,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5181,14 +4802,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5205,7 +4824,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5258,14 +4876,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5275,7 +4891,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5286,7 +4901,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5298,7 +4912,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5312,7 +4925,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5325,7 +4937,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5338,7 +4949,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5353,7 +4963,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5367,7 +4976,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5382,7 +4990,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5396,7 +5003,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5410,7 +5016,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5424,7 +5029,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5444,7 +5048,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5458,7 +5061,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5472,7 +5074,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5485,7 +5086,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5499,7 +5099,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5513,7 +5112,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5533,7 +5131,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5543,7 +5140,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5554,7 +5150,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5564,7 +5159,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5575,7 +5169,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5585,7 +5178,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5596,7 +5188,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5606,7 +5197,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5616,7 +5206,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5626,7 +5215,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5636,7 +5224,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5649,7 +5236,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5659,7 +5245,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5669,7 +5254,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5680,7 +5264,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5691,7 +5274,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5701,7 +5283,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5716,7 +5297,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5734,7 +5314,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5744,7 +5323,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5761,7 +5339,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5814,14 +5391,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5831,7 +5406,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5842,7 +5416,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5854,7 +5427,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5868,7 +5440,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5881,7 +5452,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5894,7 +5464,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5909,7 +5478,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5923,7 +5491,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5938,7 +5505,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5952,7 +5518,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5966,7 +5531,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -5980,7 +5544,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6000,7 +5563,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6014,7 +5576,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6028,7 +5589,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6041,7 +5601,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6055,7 +5614,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6069,7 +5627,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6089,7 +5646,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6099,7 +5655,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6110,7 +5665,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6120,7 +5674,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6131,7 +5684,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6141,7 +5693,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6152,7 +5703,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6162,7 +5712,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6172,7 +5721,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6182,7 +5730,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6192,7 +5739,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6205,7 +5751,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6215,7 +5760,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6225,7 +5769,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6236,7 +5779,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6247,7 +5789,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6257,7 +5798,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6272,7 +5812,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6290,7 +5829,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6343,14 +5881,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6360,7 +5896,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6371,7 +5906,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6383,7 +5917,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6397,7 +5930,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6410,7 +5942,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6423,7 +5954,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6438,7 +5968,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6452,7 +5981,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6467,7 +5995,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6481,7 +6008,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6495,7 +6021,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6509,7 +6034,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6529,7 +6053,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6543,7 +6066,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6557,7 +6079,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6570,7 +6091,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6584,7 +6104,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6598,7 +6117,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6618,7 +6136,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6628,7 +6145,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6639,7 +6155,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6649,7 +6164,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6660,7 +6174,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6670,7 +6183,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6681,7 +6193,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6691,7 +6202,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6701,7 +6211,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6711,7 +6220,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6721,7 +6229,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6734,7 +6241,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6744,7 +6250,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6754,7 +6259,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6765,7 +6269,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6776,7 +6279,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6786,7 +6288,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6801,7 +6302,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6819,7 +6319,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6829,7 +6328,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6846,7 +6344,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6899,14 +6396,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6916,7 +6411,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6927,7 +6421,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6939,7 +6432,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6953,7 +6445,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6966,7 +6457,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6979,7 +6469,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -6994,7 +6483,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7008,7 +6496,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7023,7 +6510,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7037,7 +6523,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7051,7 +6536,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7065,7 +6549,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7085,7 +6568,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7099,7 +6581,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7113,7 +6594,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7126,7 +6606,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7140,7 +6619,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7154,7 +6632,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7174,7 +6651,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7184,7 +6660,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7195,7 +6670,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7205,7 +6679,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7216,7 +6689,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7226,7 +6698,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7237,7 +6708,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7247,7 +6717,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7257,7 +6726,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7267,7 +6735,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7277,7 +6744,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7290,7 +6756,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7300,7 +6765,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7310,7 +6774,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7321,7 +6784,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7332,7 +6794,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7342,7 +6803,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7357,7 +6817,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7375,7 +6834,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7428,14 +6886,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7445,7 +6901,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7456,7 +6911,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7468,7 +6922,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7482,7 +6935,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7495,7 +6947,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7508,7 +6959,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7523,7 +6973,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7537,7 +6986,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7552,7 +7000,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7566,7 +7013,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7580,7 +7026,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7594,7 +7039,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7614,7 +7058,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7628,7 +7071,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7642,7 +7084,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7655,7 +7096,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7669,7 +7109,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7683,7 +7122,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7703,7 +7141,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7713,7 +7150,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7724,7 +7160,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7734,7 +7169,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7745,7 +7179,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7755,7 +7188,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7766,7 +7198,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7776,7 +7207,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7786,7 +7216,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7796,7 +7225,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7806,7 +7234,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7819,7 +7246,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7829,7 +7255,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7839,7 +7264,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * base_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7850,7 +7274,6 @@ namespace POA_CORBA
 
     void base_interfaces (
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7861,7 +7284,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * interface_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7871,7 +7293,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7886,7 +7307,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7904,7 +7324,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7914,7 +7333,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -7931,7 +7349,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
index dcc845194d3..3e42dc06527 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
@@ -83,7 +83,7 @@ POA_CORBA::Repository_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -95,7 +95,7 @@ POA_CORBA::Repository_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -113,55 +113,50 @@ POA_CORBA::Repository_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Repository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Repository_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->Repository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->Repository::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::Repository_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::Repository_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -169,18 +164,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::Repository_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -189,11 +182,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -202,7 +194,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -213,11 +204,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -225,7 +215,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -235,11 +224,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -247,7 +235,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -257,11 +244,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -271,7 +257,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -283,11 +268,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -296,7 +280,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -307,11 +290,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -321,7 +303,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -333,11 +314,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -346,7 +326,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -357,11 +336,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -370,7 +348,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -381,11 +358,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -394,7 +370,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -405,11 +380,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -424,7 +398,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -441,11 +414,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -454,7 +426,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -465,11 +436,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -478,7 +448,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -489,11 +458,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -501,7 +469,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -511,11 +478,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -524,7 +490,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -535,11 +500,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -548,7 +512,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -559,11 +522,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -578,7 +540,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -595,17 +556,15 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup_id  (
     const char * search_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -613,17 +572,15 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup_id (
     search_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::Repository_tie<T>::get_canonical_typecode  (
     ::CORBA::TypeCode_ptr tc
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -631,17 +588,15 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->get_canonical_typecode (
     tc
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::PrimitiveDef_ptr POA_CORBA::Repository_tie<T>::get_primitive  (
     ::CORBA::PrimitiveKind kind
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -649,17 +604,15 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->get_primitive (
     kind
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::StringDef_ptr POA_CORBA::Repository_tie<T>::create_string  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -667,17 +620,15 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->create_string (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::WstringDef_ptr POA_CORBA::Repository_tie<T>::create_wstring  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -685,18 +636,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->create_wstring (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::SequenceDef_ptr POA_CORBA::Repository_tie<T>::create_sequence  (
     ::CORBA::ULong bound,
     ::CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -705,18 +654,16 @@ template <class T> ACE_INLINE
   return this->ptr_->create_sequence (
     bound,
     element_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ArrayDef_ptr POA_CORBA::Repository_tie<T>::create_array  (
     ::CORBA::ULong length,
     ::CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -725,18 +672,16 @@ template <class T> ACE_INLINE
   return this->ptr_->create_array (
     length,
     element_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::FixedDef_ptr POA_CORBA::Repository_tie<T>::create_fixed  (
     ::CORBA::UShort digits,
     ::CORBA::Short scale
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -745,7 +690,6 @@ template <class T> ACE_INLINE
   return this->ptr_->create_fixed (
     digits,
     scale
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -802,7 +746,7 @@ POA_CORBA::ModuleDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -814,7 +758,7 @@ POA_CORBA::ModuleDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -832,55 +776,50 @@ POA_CORBA::ModuleDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ModuleDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ModuleDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ModuleDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ModuleDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ModuleDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ModuleDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -888,18 +827,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ModuleDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -908,11 +845,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -921,7 +857,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -932,11 +867,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -944,7 +878,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -954,11 +887,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -966,7 +898,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -976,11 +907,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -990,7 +920,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1002,11 +931,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1015,7 +943,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1026,11 +953,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1040,7 +966,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1052,11 +977,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1065,7 +989,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1076,11 +999,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1089,7 +1011,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1100,11 +1021,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1113,7 +1033,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1124,11 +1043,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1143,7 +1061,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1160,11 +1077,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1173,7 +1089,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1184,11 +1099,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1197,7 +1111,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1208,11 +1121,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1220,7 +1132,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1230,11 +1141,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1243,7 +1153,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1254,11 +1163,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1267,7 +1175,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1278,11 +1185,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1297,7 +1203,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1314,33 +1219,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1348,33 +1249,29 @@ void POA_CORBA::ModuleDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1382,33 +1279,29 @@ void POA_CORBA::ModuleDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ModuleDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1416,75 +1309,66 @@ void POA_CORBA::ModuleDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ModuleDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ModuleDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ModuleDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ModuleDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1492,7 +1376,6 @@ void POA_CORBA::ModuleDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1502,7 +1385,6 @@ void POA_CORBA::ModuleDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1559,7 +1441,7 @@ POA_CORBA::ConstantDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -1571,7 +1453,7 @@ POA_CORBA::ConstantDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -1589,71 +1471,64 @@ POA_CORBA::ConstantDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstantDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ConstantDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ConstantDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ConstantDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ConstantDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1661,33 +1536,29 @@ void POA_CORBA::ConstantDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1695,33 +1566,29 @@ void POA_CORBA::ConstantDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1729,75 +1596,66 @@ void POA_CORBA::ConstantDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ConstantDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ConstantDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ConstantDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ConstantDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1805,7 +1663,6 @@ void POA_CORBA::ConstantDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1815,49 +1672,43 @@ void POA_CORBA::ConstantDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ConstantDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ConstantDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1865,33 +1716,29 @@ void POA_CORBA::ConstantDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
     type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Any * POA_CORBA::ConstantDef_tie<T>::value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstantDef_tie<T>::value  (
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1899,7 +1746,6 @@ void POA_CORBA::ConstantDef_tie<T>::value  (
 {
   this->ptr_->value (
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1956,7 +1802,7 @@ POA_CORBA::StructDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -1968,7 +1814,7 @@ POA_CORBA::StructDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -1986,71 +1832,64 @@ POA_CORBA::StructDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::StructDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::StructDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->StructDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->StructDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::StructDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2058,33 +1897,29 @@ void POA_CORBA::StructDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2092,33 +1927,29 @@ void POA_CORBA::StructDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2126,75 +1957,66 @@ void POA_CORBA::StructDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::StructDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::StructDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::StructDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::StructDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2202,7 +2024,6 @@ void POA_CORBA::StructDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2212,33 +2033,29 @@ void POA_CORBA::StructDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::StructDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::StructDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2246,18 +2063,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::StructDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2266,11 +2081,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2279,7 +2093,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2290,11 +2103,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2302,7 +2114,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2312,11 +2123,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2324,7 +2134,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2334,11 +2143,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2348,7 +2156,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2360,11 +2167,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2373,7 +2179,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2384,11 +2189,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2398,7 +2202,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2410,11 +2213,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2423,7 +2225,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2434,11 +2235,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2447,7 +2247,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2458,11 +2257,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2471,7 +2269,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2482,11 +2279,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2501,7 +2297,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2518,11 +2313,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2531,7 +2325,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2542,11 +2335,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2555,7 +2347,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2566,11 +2357,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2578,7 +2368,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2588,11 +2377,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2601,7 +2389,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2612,11 +2399,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2625,7 +2411,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2636,11 +2421,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2655,7 +2439,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2672,33 +2455,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::StructMemberSeq * POA_CORBA::StructDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::StructDef_tie<T>::members  (
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2706,7 +2485,6 @@ void POA_CORBA::StructDef_tie<T>::members  (
 {
   this->ptr_->members (
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2763,7 +2541,7 @@ POA_CORBA::UnionDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -2775,7 +2553,7 @@ POA_CORBA::UnionDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -2793,71 +2571,64 @@ POA_CORBA::UnionDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::UnionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::UnionDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->UnionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->UnionDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::UnionDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2865,33 +2636,29 @@ void POA_CORBA::UnionDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2899,33 +2666,29 @@ void POA_CORBA::UnionDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2933,75 +2696,66 @@ void POA_CORBA::UnionDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::UnionDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::UnionDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::UnionDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::UnionDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3009,7 +2763,6 @@ void POA_CORBA::UnionDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3019,33 +2772,29 @@ void POA_CORBA::UnionDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::UnionDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3053,18 +2802,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::UnionDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3073,11 +2820,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3086,7 +2832,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3097,11 +2842,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3109,7 +2853,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3119,11 +2862,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3131,7 +2873,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3141,11 +2882,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3155,7 +2895,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3167,11 +2906,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3180,7 +2918,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3191,11 +2928,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3205,7 +2941,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3217,11 +2952,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3230,7 +2964,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3241,11 +2974,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3254,7 +2986,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3265,11 +2996,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3278,7 +3008,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3289,11 +3018,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3308,7 +3036,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3325,11 +3052,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3338,7 +3064,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3349,11 +3074,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3362,7 +3086,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3373,11 +3096,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3385,7 +3107,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3395,11 +3116,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3408,7 +3128,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3419,11 +3138,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3432,7 +3150,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3443,11 +3160,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3462,7 +3178,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3479,49 +3194,43 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
     ::CORBA::IDLType_ptr discriminator_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3529,33 +3238,29 @@ void POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
 {
   this->ptr_->discriminator_type_def (
     discriminator_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::UnionMemberSeq * POA_CORBA::UnionDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::UnionDef_tie<T>::members  (
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3563,7 +3268,6 @@ void POA_CORBA::UnionDef_tie<T>::members  (
 {
   this->ptr_->members (
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3620,7 +3324,7 @@ POA_CORBA::EnumDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -3632,7 +3336,7 @@ POA_CORBA::EnumDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -3650,71 +3354,64 @@ POA_CORBA::EnumDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::EnumDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::EnumDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->EnumDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->EnumDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::EnumDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3722,33 +3419,29 @@ void POA_CORBA::EnumDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3756,33 +3449,29 @@ void POA_CORBA::EnumDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3790,75 +3479,66 @@ void POA_CORBA::EnumDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::EnumDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::EnumDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::EnumDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::EnumDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3866,7 +3546,6 @@ void POA_CORBA::EnumDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3876,49 +3555,43 @@ void POA_CORBA::EnumDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::EnumDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::EnumMemberSeq * POA_CORBA::EnumDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::EnumDef_tie<T>::members  (
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3926,7 +3599,6 @@ void POA_CORBA::EnumDef_tie<T>::members  (
 {
   this->ptr_->members (
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3983,7 +3655,7 @@ POA_CORBA::AliasDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -3995,7 +3667,7 @@ POA_CORBA::AliasDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -4013,71 +3685,64 @@ POA_CORBA::AliasDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AliasDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AliasDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->AliasDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->AliasDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::AliasDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4085,33 +3750,29 @@ void POA_CORBA::AliasDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4119,33 +3780,29 @@ void POA_CORBA::AliasDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4153,75 +3810,66 @@ void POA_CORBA::AliasDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::AliasDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AliasDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::AliasDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::AliasDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -4229,7 +3877,6 @@ void POA_CORBA::AliasDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4239,49 +3886,43 @@ void POA_CORBA::AliasDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::AliasDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::AliasDef_tie<T>::original_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AliasDef_tie<T>::original_type_def  (
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4289,7 +3930,6 @@ void POA_CORBA::AliasDef_tie<T>::original_type_def  (
 {
   this->ptr_->original_type_def (
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4346,7 +3986,7 @@ POA_CORBA::NativeDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -4358,7 +3998,7 @@ POA_CORBA::NativeDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -4376,71 +4016,64 @@ POA_CORBA::NativeDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::NativeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::NativeDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->NativeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->NativeDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::NativeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4448,33 +4081,29 @@ void POA_CORBA::NativeDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4482,33 +4111,29 @@ void POA_CORBA::NativeDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::NativeDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4516,75 +4141,66 @@ void POA_CORBA::NativeDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::NativeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::NativeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::NativeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::NativeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -4592,7 +4208,6 @@ void POA_CORBA::NativeDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4602,23 +4217,20 @@ void POA_CORBA::NativeDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::NativeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4675,7 +4287,7 @@ POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -4687,7 +4299,7 @@ POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -4705,77 +4317,69 @@ POA_CORBA::PrimitiveDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::PrimitiveDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::PrimitiveDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->PrimitiveDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->PrimitiveDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::PrimitiveDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::PrimitiveDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::PrimitiveDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::PrimitiveKind POA_CORBA::PrimitiveDef_tie<T>::kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4832,7 +4436,7 @@ POA_CORBA::StringDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -4844,7 +4448,7 @@ POA_CORBA::StringDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -4862,87 +4466,78 @@ POA_CORBA::StringDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::StringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::StringDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->StringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->StringDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::StringDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::StringDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::StringDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::StringDef_tie<T>::bound  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::StringDef_tie<T>::bound  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4950,7 +4545,6 @@ void POA_CORBA::StringDef_tie<T>::bound  (
 {
   this->ptr_->bound (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5007,7 +4601,7 @@ POA_CORBA::WstringDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -5019,7 +4613,7 @@ POA_CORBA::WstringDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -5037,87 +4631,78 @@ POA_CORBA::WstringDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::WstringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::WstringDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->WstringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->WstringDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::WstringDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::WstringDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::WstringDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::WstringDef_tie<T>::bound  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::WstringDef_tie<T>::bound  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5125,7 +4710,6 @@ void POA_CORBA::WstringDef_tie<T>::bound  (
 {
   this->ptr_->bound (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5182,7 +4766,7 @@ POA_CORBA::SequenceDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -5194,7 +4778,7 @@ POA_CORBA::SequenceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -5212,87 +4796,78 @@ POA_CORBA::SequenceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::SequenceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::SequenceDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->SequenceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->SequenceDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::SequenceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::SequenceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::SequenceDef_tie<T>::bound  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::SequenceDef_tie<T>::bound  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5300,49 +4875,43 @@ void POA_CORBA::SequenceDef_tie<T>::bound  (
 {
   this->ptr_->bound (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::element_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::SequenceDef_tie<T>::element_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::SequenceDef_tie<T>::element_type_def  (
     ::CORBA::IDLType_ptr element_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5350,7 +4919,6 @@ void POA_CORBA::SequenceDef_tie<T>::element_type_def  (
 {
   this->ptr_->element_type_def (
     element_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5407,7 +4975,7 @@ POA_CORBA::ArrayDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -5419,7 +4987,7 @@ POA_CORBA::ArrayDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -5437,87 +5005,78 @@ POA_CORBA::ArrayDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ArrayDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ArrayDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ArrayDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ArrayDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ArrayDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ArrayDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ULong POA_CORBA::ArrayDef_tie<T>::length  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->length (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ArrayDef_tie<T>::length  (
     ::CORBA::ULong length
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5525,49 +5084,43 @@ void POA_CORBA::ArrayDef_tie<T>::length  (
 {
   this->ptr_->length (
     length
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::element_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ArrayDef_tie<T>::element_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ArrayDef_tie<T>::element_type_def  (
     ::CORBA::IDLType_ptr element_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5575,7 +5128,6 @@ void POA_CORBA::ArrayDef_tie<T>::element_type_def  (
 {
   this->ptr_->element_type_def (
     element_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5632,7 +5184,7 @@ POA_CORBA::ExceptionDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -5644,7 +5196,7 @@ POA_CORBA::ExceptionDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -5662,71 +5214,64 @@ POA_CORBA::ExceptionDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExceptionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExceptionDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ExceptionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ExceptionDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExceptionDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5734,33 +5279,29 @@ void POA_CORBA::ExceptionDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5768,33 +5309,29 @@ void POA_CORBA::ExceptionDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5802,75 +5339,66 @@ void POA_CORBA::ExceptionDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExceptionDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExceptionDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExceptionDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExceptionDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5878,7 +5406,6 @@ void POA_CORBA::ExceptionDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5888,17 +5415,15 @@ void POA_CORBA::ExceptionDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExceptionDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5906,18 +5431,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExceptionDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5926,11 +5449,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5939,7 +5461,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5950,11 +5471,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5962,7 +5482,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5972,11 +5491,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5984,7 +5502,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5994,11 +5511,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6008,7 +5524,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6020,11 +5535,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6033,7 +5547,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6044,11 +5557,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6058,7 +5570,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6070,11 +5581,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6083,7 +5593,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6094,11 +5603,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6107,7 +5615,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6118,11 +5625,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6131,7 +5637,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6142,11 +5647,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6161,7 +5665,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6178,11 +5681,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6191,7 +5693,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6202,11 +5703,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6215,7 +5715,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6226,11 +5725,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6238,7 +5736,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6248,11 +5745,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6261,7 +5757,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6272,11 +5767,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6285,7 +5779,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6296,11 +5789,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6315,7 +5807,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6332,49 +5823,43 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExceptionDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::StructMemberSeq * POA_CORBA::ExceptionDef_tie<T>::members  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExceptionDef_tie<T>::members  (
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6382,7 +5867,6 @@ void POA_CORBA::ExceptionDef_tie<T>::members  (
 {
   this->ptr_->members (
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6439,7 +5923,7 @@ POA_CORBA::AttributeDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -6451,7 +5935,7 @@ POA_CORBA::AttributeDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -6469,71 +5953,64 @@ POA_CORBA::AttributeDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AttributeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AttributeDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->AttributeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->AttributeDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::AttributeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6541,33 +6018,29 @@ void POA_CORBA::AttributeDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6575,33 +6048,29 @@ void POA_CORBA::AttributeDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6609,75 +6078,66 @@ void POA_CORBA::AttributeDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::AttributeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AttributeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::AttributeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::AttributeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6685,7 +6145,6 @@ void POA_CORBA::AttributeDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6695,49 +6154,43 @@ void POA_CORBA::AttributeDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::AttributeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::AttributeDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6745,33 +6198,29 @@ void POA_CORBA::AttributeDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
     type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::AttributeMode POA_CORBA::AttributeDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AttributeDef_tie<T>::mode  (
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6779,7 +6228,6 @@ void POA_CORBA::AttributeDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6836,7 +6284,7 @@ POA_CORBA::ExtAttributeDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -6848,7 +6296,7 @@ POA_CORBA::ExtAttributeDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean releas
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -6866,71 +6314,64 @@ POA_CORBA::ExtAttributeDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtAttributeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtAttributeDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ExtAttributeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ExtAttributeDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtAttributeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6938,33 +6379,29 @@ void POA_CORBA::ExtAttributeDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6972,33 +6409,29 @@ void POA_CORBA::ExtAttributeDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7006,75 +6439,66 @@ void POA_CORBA::ExtAttributeDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtAttributeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAttributeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtAttributeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtAttributeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -7082,7 +6506,6 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7092,49 +6515,43 @@ void POA_CORBA::ExtAttributeDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtAttributeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7142,33 +6559,29 @@ void POA_CORBA::ExtAttributeDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
     type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::AttributeMode POA_CORBA::ExtAttributeDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::mode  (
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7176,33 +6589,29 @@ void POA_CORBA::ExtAttributeDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->get_exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
     const ::CORBA::ExcDescriptionSeq & get_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7210,33 +6619,29 @@ void POA_CORBA::ExtAttributeDef_tie<T>::get_exceptions  (
 {
   this->ptr_->get_exceptions (
     get_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExcDescriptionSeq * POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->set_exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
     const ::CORBA::ExcDescriptionSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7244,23 +6649,20 @@ void POA_CORBA::ExtAttributeDef_tie<T>::set_exceptions  (
 {
   this->ptr_->set_exceptions (
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExtAttributeDescription * POA_CORBA::ExtAttributeDef_tie<T>::describe_attribute  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_attribute (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7317,7 +6719,7 @@ POA_CORBA::OperationDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -7329,7 +6731,7 @@ POA_CORBA::OperationDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -7347,71 +6749,64 @@ POA_CORBA::OperationDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::OperationDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::OperationDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->OperationDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->OperationDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::OperationDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7419,33 +6814,29 @@ void POA_CORBA::OperationDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7453,33 +6844,29 @@ void POA_CORBA::OperationDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7487,75 +6874,66 @@ void POA_CORBA::OperationDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::OperationDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::OperationDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::OperationDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::OperationDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -7563,7 +6941,6 @@ void POA_CORBA::OperationDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7573,49 +6950,43 @@ void POA_CORBA::OperationDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::OperationDef_tie<T>::result  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::OperationDef_tie<T>::result_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::result_def  (
     ::CORBA::IDLType_ptr result_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7623,33 +6994,29 @@ void POA_CORBA::OperationDef_tie<T>::result_def  (
 {
   this->ptr_->result_def (
     result_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ParDescriptionSeq * POA_CORBA::OperationDef_tie<T>::params  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::params  (
     const ::CORBA::ParDescriptionSeq & params
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7657,33 +7024,29 @@ void POA_CORBA::OperationDef_tie<T>::params  (
 {
   this->ptr_->params (
     params
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::OperationMode POA_CORBA::OperationDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::mode  (
     ::CORBA::OperationMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7691,33 +7054,29 @@ void POA_CORBA::OperationDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContextIdSeq * POA_CORBA::OperationDef_tie<T>::contexts  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::contexts  (
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7725,33 +7084,29 @@ void POA_CORBA::OperationDef_tie<T>::contexts  (
 {
   this->ptr_->contexts (
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExceptionDefSeq * POA_CORBA::OperationDef_tie<T>::exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::OperationDef_tie<T>::exceptions  (
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7759,7 +7114,6 @@ void POA_CORBA::OperationDef_tie<T>::exceptions  (
 {
   this->ptr_->exceptions (
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7816,7 +7170,7 @@ POA_CORBA::InterfaceDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -7828,7 +7182,7 @@ POA_CORBA::InterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -7846,55 +7200,50 @@ POA_CORBA::InterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::InterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::InterfaceDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->InterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->InterfaceDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::InterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::InterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7902,18 +7251,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::InterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7922,11 +7269,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -7935,7 +7281,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7946,11 +7291,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -7958,7 +7302,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7968,11 +7311,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -7980,7 +7322,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7990,11 +7331,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8004,7 +7344,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8016,11 +7355,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8029,7 +7367,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8040,11 +7377,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8054,7 +7390,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8066,11 +7401,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8079,7 +7413,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8090,11 +7423,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8103,7 +7435,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8114,11 +7445,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8127,7 +7457,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8138,11 +7467,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8157,7 +7485,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8174,11 +7501,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8187,7 +7513,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8198,11 +7523,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8211,7 +7535,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8222,11 +7545,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8234,7 +7556,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8244,11 +7565,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8257,7 +7577,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8268,11 +7587,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8281,7 +7599,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8292,11 +7609,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8311,7 +7627,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8328,33 +7643,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8362,33 +7673,29 @@ void POA_CORBA::InterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8396,33 +7703,29 @@ void POA_CORBA::InterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8430,75 +7733,66 @@ void POA_CORBA::InterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::InterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::InterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::InterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::InterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8506,7 +7800,6 @@ void POA_CORBA::InterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8516,49 +7809,43 @@ void POA_CORBA::InterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::InterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8566,17 +7853,15 @@ void POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::InterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8584,27 +7869,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::InterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8614,7 +7896,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8626,11 +7907,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8643,7 +7923,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8658,7 +7937,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8715,7 +7993,7 @@ POA_CORBA::InterfaceAttrExtension_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -8727,7 +8005,7 @@ POA_CORBA::InterfaceAttrExtension_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -8745,33 +8023,31 @@ POA_CORBA::InterfaceAttrExtension_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::InterfaceAttrExtension_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::InterfaceAttrExtension_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->InterfaceAttrExtension::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->InterfaceAttrExtension::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::InterfaceAttrExtension_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8783,7 +8059,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8797,7 +8072,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -8854,7 +8128,7 @@ POA_CORBA::ExtInterfaceDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -8866,7 +8140,7 @@ POA_CORBA::ExtInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean releas
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -8884,55 +8158,50 @@ POA_CORBA::ExtInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtInterfaceDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ExtInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ExtInterfaceDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8940,18 +8209,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExtInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8960,11 +8227,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8973,7 +8239,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8984,11 +8249,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8996,7 +8260,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9006,11 +8269,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9018,7 +8280,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9028,11 +8289,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9042,7 +8302,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9054,11 +8313,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9067,7 +8325,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9078,11 +8335,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9092,7 +8348,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9104,11 +8359,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9117,7 +8371,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9128,11 +8381,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9141,7 +8393,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9152,11 +8403,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9165,7 +8415,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9176,11 +8425,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9195,7 +8443,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9212,11 +8459,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9225,7 +8471,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9236,11 +8481,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9249,7 +8493,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9260,11 +8503,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9272,7 +8514,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9282,11 +8523,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9295,7 +8535,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9306,11 +8545,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9319,7 +8557,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9330,11 +8567,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9349,7 +8585,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9366,33 +8601,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9400,33 +8631,29 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9434,33 +8661,29 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9468,75 +8691,66 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9544,7 +8758,6 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9554,49 +8767,43 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9604,17 +8811,15 @@ void POA_CORBA::ExtInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9622,27 +8827,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9652,7 +8854,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9664,11 +8865,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9681,7 +8881,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9696,27 +8895,24 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtInterfaceDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9728,7 +8924,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9742,7 +8937,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -9799,7 +8993,7 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -9811,7 +9005,7 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean r
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -9829,55 +9023,50 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AbstractInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::AbstractInterfaceDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->AbstractInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->AbstractInterfaceDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::AbstractInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9885,18 +9074,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9905,11 +9092,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9918,7 +9104,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9929,11 +9114,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9941,7 +9125,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9951,11 +9134,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9963,7 +9145,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9973,11 +9154,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -9987,7 +9167,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9999,11 +9178,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10012,7 +9190,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10023,11 +9200,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10037,7 +9213,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10049,11 +9224,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10062,7 +9236,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10073,11 +9246,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10086,7 +9258,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10097,11 +9268,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10110,7 +9280,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10121,11 +9290,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10140,7 +9308,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10157,11 +9324,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10170,7 +9336,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10181,11 +9346,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10194,7 +9358,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10205,11 +9368,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10217,7 +9379,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10227,11 +9388,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10240,7 +9400,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10251,11 +9410,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10264,7 +9422,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10275,11 +9432,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10294,7 +9450,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10311,33 +9466,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10345,33 +9496,29 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10379,33 +9526,29 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10413,75 +9556,66 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::AbstractInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10489,7 +9623,6 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10499,49 +9632,43 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10549,17 +9676,15 @@ void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::AbstractInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10567,27 +9692,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::AbstractInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10597,7 +9719,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10609,11 +9730,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10626,7 +9746,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10641,7 +9760,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -10698,7 +9816,7 @@ POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -10710,7 +9828,7 @@ POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolea
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -10728,55 +9846,50 @@ POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtAbstractInterfaceDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ExtAbstractInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ExtAbstractInterfaceDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtAbstractInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10784,18 +9897,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10804,11 +9915,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10817,7 +9927,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10828,11 +9937,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10840,7 +9948,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10850,11 +9957,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10862,7 +9968,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10872,11 +9977,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10886,7 +9990,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10898,11 +10001,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10911,7 +10013,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10922,11 +10023,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10936,7 +10036,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10948,11 +10047,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10961,7 +10059,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10972,11 +10069,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -10985,7 +10081,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -10996,11 +10091,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11009,7 +10103,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11020,11 +10113,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11039,7 +10131,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11056,11 +10147,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11069,7 +10159,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11080,11 +10169,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11093,7 +10181,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11104,11 +10191,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11116,7 +10202,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11126,11 +10211,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11139,7 +10223,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11150,11 +10233,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11163,7 +10245,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11174,11 +10255,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11193,7 +10273,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11210,33 +10289,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11244,33 +10319,29 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11278,33 +10349,29 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11312,75 +10379,66 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11388,7 +10446,6 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11398,49 +10455,43 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtAbstractInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11448,17 +10499,15 @@ void POA_CORBA::ExtAbstractInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11466,27 +10515,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11496,7 +10542,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11508,11 +10553,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11525,7 +10569,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11540,27 +10583,24 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtAbstractInterfaceDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11572,7 +10612,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11586,7 +10625,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -11643,7 +10681,7 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -11655,7 +10693,7 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean rele
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -11673,55 +10711,50 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::LocalInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::LocalInterfaceDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->LocalInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->LocalInterfaceDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::LocalInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::LocalInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11729,18 +10762,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::LocalInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11749,11 +10780,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11762,7 +10792,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11773,11 +10802,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11785,7 +10813,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11795,11 +10822,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11807,7 +10833,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11817,11 +10842,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11831,7 +10855,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11843,11 +10866,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11856,7 +10878,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11867,11 +10888,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11881,7 +10901,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11893,11 +10912,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11906,7 +10924,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11917,11 +10934,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11930,7 +10946,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11941,11 +10956,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11954,7 +10968,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -11965,11 +10978,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -11984,7 +10996,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12001,11 +11012,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12014,7 +11024,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12025,11 +11034,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12038,7 +11046,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12049,11 +11056,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12061,7 +11067,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12071,11 +11076,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12084,7 +11088,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12095,11 +11098,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12108,7 +11110,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12119,11 +11120,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12138,7 +11138,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12155,33 +11154,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12189,33 +11184,29 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12223,33 +11214,29 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12257,75 +11244,66 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::LocalInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::LocalInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::LocalInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12333,7 +11311,6 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12343,49 +11320,43 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::LocalInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12393,17 +11364,15 @@ void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::LocalInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12411,27 +11380,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::LocalInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12441,7 +11407,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12453,11 +11418,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12470,7 +11434,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12485,7 +11448,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -12542,7 +11504,7 @@ POA_CORBA::ExtLocalInterfaceDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -12554,7 +11516,7 @@ POA_CORBA::ExtLocalInterfaceDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean r
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -12572,55 +11534,50 @@ POA_CORBA::ExtLocalInterfaceDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtLocalInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtLocalInterfaceDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ExtLocalInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ExtLocalInterfaceDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtLocalInterfaceDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12628,18 +11585,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12648,11 +11603,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12661,7 +11615,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12672,11 +11625,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12684,7 +11636,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12694,11 +11645,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12706,7 +11656,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12716,11 +11665,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12730,7 +11678,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12742,11 +11689,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12755,7 +11701,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12766,11 +11711,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12780,7 +11724,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12792,11 +11735,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12805,7 +11747,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12816,11 +11757,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12829,7 +11769,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12840,11 +11779,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12853,7 +11791,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12864,11 +11801,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12883,7 +11819,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12900,11 +11835,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12913,7 +11847,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12924,11 +11857,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12937,7 +11869,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12948,11 +11879,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12960,7 +11890,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12970,11 +11899,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -12983,7 +11911,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -12994,11 +11921,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -13007,7 +11933,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13018,11 +11943,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -13037,7 +11961,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13054,33 +11977,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13088,33 +12007,29 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13122,33 +12037,29 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13156,75 +12067,66 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtLocalInterfaceDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -13232,7 +12134,6 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13242,49 +12143,43 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtLocalInterfaceDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13292,17 +12187,15 @@ void POA_CORBA::ExtLocalInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13310,27 +12203,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -13340,7 +12230,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13352,11 +12241,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -13369,7 +12257,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13384,27 +12271,24 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ExtLocalInterfaceDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -13416,7 +12300,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -13430,7 +12313,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index 1e7fe4beb0c..2395fcd77f5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:603
 
 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_COMPONENTSS_CPP_
@@ -87,13 +87,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -105,13 +105,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -125,13 +125,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -145,13 +145,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -165,13 +165,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -183,13 +183,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ValueDefSeq>
     : public
@@ -201,13 +201,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InitializerSeq>
     : public
@@ -219,13 +219,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -237,13 +237,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -255,13 +255,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::OperationMode>
     : public
@@ -273,13 +273,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -291,13 +291,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ContextIdSeq>
     : public
@@ -309,13 +309,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::InterfaceDef>
     : public
@@ -329,13 +329,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
 #define _CORBA_VALUEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueDef>
     : public
@@ -349,13 +349,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::ComponentDef>
     : public
@@ -369,13 +369,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::HomeDef>
     : public
@@ -389,13 +389,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::EventDef>
     : public
@@ -409,13 +409,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::ProvidesDef>
     : public
@@ -429,13 +429,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::UsesDef>
     : public
@@ -449,13 +449,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::EmitsDef>
     : public
@@ -469,13 +469,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::PublishesDef>
     : public
@@ -489,13 +489,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::ConsumesDef>
     : public
@@ -509,13 +509,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::FactoryDef>
     : public
@@ -529,13 +529,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ComponentIR::FinderDef>
     : public
@@ -572,13 +572,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -590,13 +590,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Repository>
     : public
@@ -611,13 +611,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Container>
     : public
@@ -632,13 +632,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -653,13 +653,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -671,13 +671,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
@@ -689,13 +689,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
     : public
@@ -707,13 +707,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -725,13 +725,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -743,13 +743,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
@@ -761,13 +761,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -779,13 +779,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
     : public
@@ -797,13 +797,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -818,13 +818,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -839,13 +839,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ComponentDef>
     : public
@@ -860,13 +860,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::HomeDef>
     : public
@@ -881,13 +881,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EventDef>
     : public
@@ -902,13 +902,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ProvidesDef>
     : public
@@ -923,13 +923,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::UsesDef>
     : public
@@ -944,13 +944,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EmitsDef>
     : public
@@ -965,13 +965,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::PublishesDef>
     : public
@@ -986,13 +986,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ConsumesDef>
     : public
@@ -1007,13 +1007,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FactoryDef>
     : public
@@ -1028,13 +1028,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_)
 #define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FinderDef>
     : public
@@ -1207,14 +1207,14 @@ TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed short lookup[] =
     {
-       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10, 
-       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17, 
-        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32, 
-        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139, 
-        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53, 
-        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1, 
-        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63, 
+       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10,
+       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17,
+        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32,
+        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139,
+        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53,
+        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1,
+        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1263,9 +1263,9 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
 int
 CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1275,7 +1275,7 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::EventDef::EventDef (void)
@@ -1300,18 +1300,18 @@ POA_CORBA::ComponentIR::EventDef::~EventDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_EventDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -1325,68 +1325,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  
+
   _is_a_EventDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1397,17 +1394,16 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_EventDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -1421,59 +1417,56 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  
+
   _non_existent_EventDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1484,17 +1477,16 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_EventDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -1508,59 +1500,56 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  
+
   _repository_id_EventDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1571,61 +1560,59 @@ void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::EventDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_EventDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -1639,59 +1626,56 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EventDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
-  
+
   _get_component_EventDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1702,13 +1686,11 @@ void POA_CORBA::ComponentIR::EventDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -1759,39 +1741,36 @@ const char* POA_CORBA::ComponentIR::EventDef::_interface_repository_id (void) co
 void POA_CORBA::ComponentIR::EventDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::EventDef *
-POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EventDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::EventDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1916,10 +1895,10 @@ TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::lookup (const char *str, u
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,   7,  -1, -10,  -2,   8,   9, -50, 
-      -12,  -2, -48,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22, 
-       -1,  -1,  23,  24,  25,  26,  27,  28,  29,  -1,  30,  -1,  31,  32, 
-       33,  -1,  -1,  -1,  34, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,   7,  -1, -10,  -2,   8,   9, -50,
+      -12,  -2, -48,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22,
+       -1,  -1,  23,  24,  25,  26,  27,  28,  29,  -1,  30,  -1,  31,  32,
+       33,  -1,  -1,  -1,  34,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1968,9 +1947,9 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function ( ::CORBA::Object
 int
 CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1980,7 +1959,7 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::Container::Container (void)
@@ -2003,11 +1982,11 @@ POA_CORBA::ComponentIR::Container::~Container (void)
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_component_Container
       : public TAO::Upcall_Command
     {
@@ -2021,87 +2000,84 @@ POA_CORBA::ComponentIR::Container::~Container (void)
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         retval =
           this->servant_->create_component (
             arg_1
             , arg_2
             , arg_3
             , arg_4
-            , arg_5
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_5);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::Container::create_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2111,9 +2087,9 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
       &_tao_base_component,
       &_tao_supports_interfaces
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
 
@@ -2121,7 +2097,7 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2132,17 +2108,16 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_home_Container
       : public TAO::Upcall_Command
     {
@@ -2156,56 +2131,56 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::HomeDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::HomeDef> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_6 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
             this->operation_details_,
             this->args_,
             6);
-          
+
         TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_7 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
             this->operation_details_,
             this->args_,
             7);
-          
+
         retval =
           this->servant_->create_home (
             arg_1
@@ -2214,36 +2189,33 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
             , arg_4
             , arg_5
             , arg_6
-            , arg_7
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_7);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::Container::create_home_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -2252,7 +2224,7 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
   TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2264,9 +2236,9 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
       &_tao_supports_interfaces,
       &_tao_primary_key
     };
-  
+
   static size_t const nargs = 8;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
 
@@ -2274,7 +2246,7 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2285,17 +2257,16 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_event_Container
       : public TAO::Upcall_Command
     {
@@ -2309,74 +2280,74 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EventDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
             this->operation_details_,
             this->args_,
             6);
-          
+
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_7 =
           TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_,
             7);
-          
+
         TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq> (
             this->operation_details_,
             this->args_,
             8);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
             this->operation_details_,
             this->args_,
             9);
-          
+
         TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq> (
             this->operation_details_,
             this->args_,
             10);
-          
+
         retval =
           this->servant_->create_event (
             arg_1
@@ -2388,36 +2359,33 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
             , arg_7
             , arg_8
             , arg_9
-            , arg_10
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_10);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::Container::create_event_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -2429,7 +2397,7 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
   TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2444,9 +2412,9 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
       &_tao_supported_interfaces,
       &_tao_initializers
     };
-  
+
   static size_t const nargs = 11;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
 
@@ -2454,7 +2422,7 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2465,22 +2433,21 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_Container_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -2494,68 +2461,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::Container::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  
+
   _is_a_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2566,17 +2530,16 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_Container_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -2590,59 +2553,56 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::Container::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  
+
   _non_existent_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2653,17 +2613,16 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_Container_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -2677,59 +2636,56 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::Container::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  
+
   _repository_id_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2740,61 +2696,59 @@ void POA_CORBA::ComponentIR::Container::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::Container::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_Container_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -2808,59 +2762,56 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Container * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::Container::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Container * const impl =
     static_cast<POA_CORBA::ComponentIR::Container *> (servant);
-  
+
   _get_component_Container_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2871,13 +2822,11 @@ void POA_CORBA::ComponentIR::Container::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::Container::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -2912,39 +2861,36 @@ const char* POA_CORBA::ComponentIR::Container::_interface_repository_id (void) c
 void POA_CORBA::ComponentIR::Container::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::Container *
-POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::Container::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::Container STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3080,11 +3026,11 @@ TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, u
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1, -11,  -2, -13,  -2,   7,   8, -25,  -2,   9,  10, -67, 
-      -27,  -2, -68,  15,  -1,  16,  -1,  17,  18, -35,  -2,  19,  20,  21, 
-       22,  -1,  23,  24, -80,  -1, -77,  29,  30,  -1,  31,  32,  33,  34, 
-      -76,  37,  -1,  38,  39,  -1,  40,  -1,  41,  42,  43,  44,  -1,  -1, 
-       -1,  45, 
+       -1,  -1,  -1, -11,  -2, -13,  -2,   7,   8, -25,  -2,   9,  10, -67,
+      -27,  -2, -68,  15,  -1,  16,  -1,  17,  18, -35,  -2,  19,  20,  21,
+       22,  -1,  23,  24, -80,  -1, -77,  29,  30,  -1,  31,  32,  33,  34,
+      -76,  37,  -1,  38,  39,  -1,  40,  -1,  41,  42,  43,  44,  -1,  -1,
+       -1,  45,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3133,9 +3079,9 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function ( ::CORBA::Object
 int
 CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3145,7 +3091,7 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::ModuleDef::ModuleDef (void)
@@ -3169,18 +3115,18 @@ POA_CORBA::ComponentIR::ModuleDef::~ModuleDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_ModuleDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3194,68 +3140,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ModuleDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  
+
   _is_a_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3266,17 +3209,16 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_ModuleDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3290,59 +3232,56 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ModuleDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  
+
   _non_existent_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3353,17 +3292,16 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_ModuleDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3377,59 +3315,56 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ModuleDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  
+
   _repository_id_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3440,61 +3375,59 @@ void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_ModuleDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3508,59 +3441,56 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ModuleDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ModuleDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
-  
+
   _get_component_ModuleDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3571,13 +3501,11 @@ void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ModuleDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -3624,39 +3552,36 @@ const char* POA_CORBA::ComponentIR::ModuleDef::_interface_repository_id (void) c
 void POA_CORBA::ComponentIR::ModuleDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::ModuleDef *
-POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ModuleDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::ModuleDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3790,12 +3715,12 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12, -28, 
-       -2,  13,  14,  15,  16,  -1,  17,  18,  19,  20,  21,  22,  23,  24, 
-       25, -31,  -2,  26,  27, -97,  -1,  30, -84,  33,  34,  35,  36,  37, 
-       38,  39,  40,  41,  -1,  -1,  -1,  -1,  -1,  42,  43,  44,  -1,  -1, 
-       -1,  45,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  46, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12, -28,
+       -2,  13,  14,  15,  16,  -1,  17,  18,  19,  20,  21,  22,  23,  24,
+       25, -31,  -2,  26,  27, -97,  -1,  30, -84,  33,  34,  35,  36,  37,
+       38,  39,  40,  41,  -1,  -1,  -1,  -1,  -1,  42,  43,  44,  -1,  -1,
+       -1,  45,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  46,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3844,9 +3769,9 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function ( ::CORBA::Objec
 int
 CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3856,7 +3781,7 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecro
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::Repository::Repository (void)
@@ -3879,18 +3804,18 @@ POA_CORBA::ComponentIR::Repository::~Repository (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_Repository_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -3904,68 +3829,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Repository * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::Repository::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  
+
   _is_a_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3976,17 +3898,16 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_Repository_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4000,59 +3921,56 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Repository * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  
+
   _non_existent_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4063,17 +3981,16 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_Repository_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4087,59 +4004,56 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Repository * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  
+
   _repository_id_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4150,61 +4064,59 @@ void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::Repository::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_Repository_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4218,59 +4130,56 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::Repository * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::Repository::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::Repository * const impl =
     static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
-  
+
   _get_component_Repository_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4281,13 +4190,11 @@ void POA_CORBA::ComponentIR::Repository::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::Repository::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -4330,39 +4237,36 @@ const char* POA_CORBA::ComponentIR::Repository::_interface_repository_id (void)
 void POA_CORBA::ComponentIR::Repository::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::Repository *
-POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::Repository::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::Repository STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -4479,9 +4383,9 @@ TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-      -12,  -2, -19,  -2,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18, -53,  21,  -9,  -2,  22,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -12,  -2, -19,  -2,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18, -53,  21,  -9,  -2,  22,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4530,9 +4434,9 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function ( ::CORBA::Obje
 int
 CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -4542,7 +4446,7 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::ProvidesDef::ProvidesDef (void)
@@ -4565,11 +4469,11 @@ POA_CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_interface_type_ProvidesDef
       : public TAO::Upcall_Command
     {
@@ -4583,54 +4487,51 @@ POA_CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void)
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->interface_type (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->interface_type ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
 
@@ -4638,7 +4539,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4649,17 +4550,16 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_interface_type_ProvidesDef
       : public TAO::Upcall_Command
     {
@@ -4673,57 +4573,54 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->interface_type (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_interface_type
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
 
@@ -4731,7 +4628,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4742,22 +4639,21 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_ProvidesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4771,68 +4667,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  
+
   _is_a_ProvidesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4843,17 +4736,16 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_ProvidesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4867,59 +4759,56 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  
+
   _non_existent_ProvidesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4930,17 +4819,16 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_ProvidesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -4954,59 +4842,56 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  
+
   _repository_id_ProvidesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5017,61 +4902,59 @@ void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_ProvidesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -5085,59 +4968,56 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ProvidesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ProvidesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
-  
+
   _get_component_ProvidesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5148,13 +5028,11 @@ void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ProvidesDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -5189,39 +5067,36 @@ const char* POA_CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void)
 void POA_CORBA::ComponentIR::ProvidesDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::ProvidesDef *
-POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ProvidesDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::ProvidesDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5340,9 +5215,9 @@ TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 
   static const signed char lookup[] =
     {
-      -17,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  11,  -1,  45,  14, 
-       15,  16, -52,  19,  20, -53,  23, -12,  -2,  24,  -9,  -2,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25, 
+      -17,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  11,  -1,  45,  14,
+       15,  16, -52,  19,  20, -53,  23, -12,  -2,  24,  -9,  -2,  -6,  -2,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5391,9 +5266,9 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function ( ::CORBA::Object_p
 int
 CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -5403,7 +5278,7 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::UsesDef::UsesDef (void)
@@ -5426,11 +5301,11 @@ POA_CORBA::ComponentIR::UsesDef::~UsesDef (void)
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_interface_type_UsesDef
       : public TAO::Upcall_Command
     {
@@ -5444,54 +5319,51 @@ POA_CORBA::ComponentIR::UsesDef::~UsesDef (void)
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->interface_type (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->interface_type ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
 
@@ -5499,7 +5371,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5510,17 +5382,16 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_interface_type_UsesDef
       : public TAO::Upcall_Command
     {
@@ -5534,57 +5405,54 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->interface_type (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_interface_type
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
 
@@ -5592,7 +5460,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5603,17 +5471,16 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_is_multiple_UsesDef
       : public TAO::Upcall_Command
     {
@@ -5627,54 +5494,51 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->is_multiple (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->is_multiple ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
 
@@ -5682,7 +5546,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5693,17 +5557,16 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_is_multiple_UsesDef
       : public TAO::Upcall_Command
     {
@@ -5717,57 +5580,54 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->is_multiple (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_is_multiple
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
 
@@ -5775,7 +5635,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5786,22 +5646,21 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_UsesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -5815,68 +5674,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  
+
   _is_a_UsesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5887,17 +5743,16 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_UsesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -5911,59 +5766,56 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  
+
   _non_existent_UsesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5974,17 +5826,16 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_UsesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -5998,59 +5849,56 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  
+
   _repository_id_UsesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6061,61 +5909,59 @@ void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_UsesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -6129,59 +5975,56 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::UsesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::UsesDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::UsesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
-  
+
   _get_component_UsesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6192,13 +6035,11 @@ void POA_CORBA::ComponentIR::UsesDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::UsesDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -6233,39 +6074,36 @@ const char* POA_CORBA::ComponentIR::UsesDef::_interface_repository_id (void) con
 void POA_CORBA::ComponentIR::UsesDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::UsesDef *
-POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::UsesDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::UsesDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6383,9 +6221,9 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::lookup (const char *str
 
   static const signed char lookup[] =
     {
-      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6434,9 +6272,9 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function ( ::CORBA::Obj
 int
 CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -6446,7 +6284,7 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::EventPortDef::EventPortDef (void)
@@ -6469,11 +6307,11 @@ POA_CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_event_EventPortDef
       : public TAO::Upcall_Command
     {
@@ -6487,54 +6325,51 @@ POA_CORBA::ComponentIR::EventPortDef::~EventPortDef (void)
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EventDef> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->event (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->event ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
 
@@ -6542,7 +6377,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6553,17 +6388,16 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_event_EventPortDef
       : public TAO::Upcall_Command
     {
@@ -6577,57 +6411,54 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->event (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_event
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
 
@@ -6635,7 +6466,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6646,17 +6477,16 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class is_a_EventPortDef
       : public TAO::Upcall_Command
     {
@@ -6670,63 +6500,60 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_->is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_event_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_event_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
 
@@ -6734,7 +6561,7 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6745,22 +6572,21 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_EventPortDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -6774,68 +6600,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  
+
   _is_a_EventPortDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6846,17 +6669,16 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_EventPortDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -6870,59 +6692,56 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  
+
   _non_existent_EventPortDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6933,17 +6752,16 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_EventPortDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -6957,59 +6775,56 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  
+
   _repository_id_EventPortDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7020,61 +6835,59 @@ void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_EventPortDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7088,59 +6901,56 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EventPortDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EventPortDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
-  
+
   _get_component_EventPortDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7151,13 +6961,11 @@ void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7192,39 +7000,36 @@ const char* POA_CORBA::ComponentIR::EventPortDef::_interface_repository_id (void
 void POA_CORBA::ComponentIR::EventPortDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::EventPortDef *
-POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EventPortDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::EventPortDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -7342,9 +7147,9 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed char lookup[] =
     {
-      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7393,9 +7198,9 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function ( ::CORBA::Object_
 int
 CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -7405,7 +7210,7 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::EmitsDef::EmitsDef (void)
@@ -7427,18 +7232,18 @@ POA_CORBA::ComponentIR::EmitsDef::~EmitsDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_EmitsDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7452,68 +7257,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EmitsDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  
+
   _is_a_EmitsDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7524,17 +7326,16 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_EmitsDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7548,59 +7349,56 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EmitsDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  
+
   _non_existent_EmitsDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7611,17 +7409,16 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_EmitsDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7635,59 +7432,56 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EmitsDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  
+
   _repository_id_EmitsDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7698,61 +7492,59 @@ void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_EmitsDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -7766,59 +7558,56 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::EmitsDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::EmitsDef * const impl =
     static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
-  
+
   _get_component_EmitsDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7829,13 +7618,11 @@ void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7874,39 +7661,36 @@ const char* POA_CORBA::ComponentIR::EmitsDef::_interface_repository_id (void) co
 void POA_CORBA::ComponentIR::EmitsDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::EmitsDef *
-POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EmitsDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::EmitsDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8024,9 +7808,9 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str
 
   static const signed char lookup[] =
     {
-      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8075,9 +7859,9 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function ( ::CORBA::Obj
 int
 CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -8087,7 +7871,7 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::PublishesDef::PublishesDef (void)
@@ -8109,18 +7893,18 @@ POA_CORBA::ComponentIR::PublishesDef::~PublishesDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_PublishesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8134,68 +7918,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::PublishesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  
+
   _is_a_PublishesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8206,17 +7987,16 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_PublishesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8230,59 +8010,56 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::PublishesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  
+
   _non_existent_PublishesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8293,17 +8070,16 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_PublishesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8317,59 +8093,56 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::PublishesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  
+
   _repository_id_PublishesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8380,61 +8153,59 @@ void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_PublishesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8448,59 +8219,56 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::PublishesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::PublishesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
-  
+
   _get_component_PublishesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8511,13 +8279,11 @@ void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -8556,39 +8322,36 @@ const char* POA_CORBA::ComponentIR::PublishesDef::_interface_repository_id (void
 void POA_CORBA::ComponentIR::PublishesDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::PublishesDef *
-POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::PublishesDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::PublishesDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -8706,9 +8469,9 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14,
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8757,9 +8520,9 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function ( ::CORBA::Obje
 int
 CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -8769,7 +8532,7 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecr
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::ConsumesDef::ConsumesDef (void)
@@ -8791,18 +8554,18 @@ POA_CORBA::ComponentIR::ConsumesDef::~ConsumesDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_ConsumesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8816,68 +8579,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ConsumesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  
+
   _is_a_ConsumesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8888,17 +8648,16 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_ConsumesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8912,59 +8671,56 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ConsumesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  
+
   _non_existent_ConsumesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -8975,17 +8731,16 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_ConsumesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -8999,59 +8754,56 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ConsumesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  
+
   _repository_id_ConsumesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9062,61 +8814,59 @@ void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_ConsumesDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -9130,59 +8880,56 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ConsumesDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ConsumesDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
-  
+
   _get_component_ConsumesDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9193,13 +8940,11 @@ void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -9238,39 +8983,36 @@ const char* POA_CORBA::ComponentIR::ConsumesDef::_interface_repository_id (void)
 void POA_CORBA::ComponentIR::ConsumesDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::ConsumesDef *
-POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ConsumesDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::ConsumesDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -9421,13 +9163,13 @@ TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str
 
   static const signed char lookup[] =
     {
-        -1,   -1,   -1,   -1,    4,   -8,   -2,  -10,   -3,    5,   -1,    6,    7,  -97, 
-       -15,   -2,  -98,   13,  -21,   -2,   14,  -96,   17,   18,   -1,   19,   20,  -98, 
-       -23,   -2,  -91,   25,   26,   27,  -32,   -3,   28,   -1,  -40,   -2,   29,   30, 
-        -1,   31,  -99,   35,   36,   37,   38,   -1,   39,   -1, -103,   42,   -1,   43, 
-        -1,   44,   -1,   -1,   -1,   45,   -1,   -1,   -1,  -46,   -2,  -91,  -48,   -2, 
-       -91,  -52,   -2,   50,   51,  -93,   -1,   -1,   -1,   -1,   54,   -1,   -1,   55, 
-        -1,   -1,   -1,  -56,   -2,  -91, 
+        -1,   -1,   -1,   -1,    4,   -8,   -2,  -10,   -3,    5,   -1,    6,    7,  -97,
+       -15,   -2,  -98,   13,  -21,   -2,   14,  -96,   17,   18,   -1,   19,   20,  -98,
+       -23,   -2,  -91,   25,   26,   27,  -32,   -3,   28,   -1,  -40,   -2,   29,   30,
+        -1,   31,  -99,   35,   36,   37,   38,   -1,   39,   -1, -103,   42,   -1,   43,
+        -1,   44,   -1,   -1,   -1,   45,   -1,   -1,   -1,  -46,   -2,  -91,  -48,   -2,
+       -91,  -52,   -2,   50,   51,  -93,   -1,   -1,   -1,   -1,   54,   -1,   -1,   55,
+        -1,   -1,   -1,  -56,   -2,  -91,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9476,9 +9218,9 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function ( ::CORBA::Obj
 int
 CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -9488,7 +9230,7 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarec
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::ComponentDef::ComponentDef (void)
@@ -9516,11 +9258,11 @@ POA_CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_base_component_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -9534,54 +9276,51 @@ POA_CORBA::ComponentIR::ComponentDef::~ComponentDef (void)
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->base_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->base_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -9589,7 +9328,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9600,17 +9339,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_base_component_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -9624,57 +9362,54 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->base_component (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_base_component
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -9682,7 +9417,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9693,17 +9428,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_supported_interfaces_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -9717,54 +9451,51 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->supported_interfaces (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->supported_interfaces ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -9772,7 +9503,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9783,17 +9514,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_supported_interfaces_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -9807,57 +9537,54 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->supported_interfaces (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_supported_interfaces
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -9865,7 +9592,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -9876,17 +9603,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_provides_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -9900,79 +9626,76 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ProvidesDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         retval =
           this->servant_->create_provides (
             arg_1
             , arg_2
             , arg_3
-            , arg_4
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_4);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -9981,9 +9704,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
       &_tao_version,
       &_tao_interface_type
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -9991,7 +9714,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10002,17 +9725,16 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_uses_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10026,87 +9748,84 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::UsesDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         retval =
           this->servant_->create_uses (
             arg_1
             , arg_2
             , arg_3
             , arg_4
-            , arg_5
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_5);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -10116,9 +9835,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
       &_tao_interface_type,
       &_tao_is_multiple
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10126,7 +9845,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10137,17 +9856,16 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_emits_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10161,79 +9879,76 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EmitsDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         retval =
           this->servant_->create_emits (
             arg_1
             , arg_2
             , arg_3
-            , arg_4
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_4);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -10242,9 +9957,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
       &_tao_version,
       &_tao_event
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10252,7 +9967,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10263,17 +9978,16 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_publishes_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10287,79 +10001,76 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::PublishesDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         retval =
           this->servant_->create_publishes (
             arg_1
             , arg_2
             , arg_3
-            , arg_4
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_4);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -10368,9 +10079,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
       &_tao_version,
       &_tao_event
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10378,7 +10089,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10389,17 +10100,16 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_consumes_ComponentDef
       : public TAO::Upcall_Command
     {
@@ -10413,79 +10123,76 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ConsumesDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         retval =
           this->servant_->create_consumes (
             arg_1
             , arg_2
             , arg_3
-            , arg_4
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_4);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -10494,9 +10201,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
       &_tao_version,
       &_tao_event
     };
-  
+
   static size_t const nargs = 5;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
 
@@ -10504,7 +10211,7 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10515,22 +10222,21 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_ComponentDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -10544,68 +10250,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  
+
   _is_a_ComponentDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10616,17 +10319,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_ComponentDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -10640,59 +10342,56 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  
+
   _non_existent_ComponentDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10703,17 +10402,16 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_ComponentDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -10727,59 +10425,56 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  
+
   _repository_id_ComponentDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10790,61 +10485,59 @@ void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_ComponentDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -10858,59 +10551,56 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::ComponentDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::ComponentDef * const impl =
     static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
-  
+
   _get_component_ComponentDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -10921,13 +10611,11 @@ void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -10982,39 +10670,36 @@ const char* POA_CORBA::ComponentIR::ComponentDef::_interface_repository_id (void
 void POA_CORBA::ComponentIR::ComponentDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::ComponentDef *
-POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ComponentDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::ComponentDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -11145,7 +10830,7 @@ TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str,
       if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
         {
             {
-              const TAO_operation_db_entry   *resword; 
+              const TAO_operation_db_entry   *resword;
 
               switch (key)
                 {
@@ -11246,9 +10931,9 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function ( ::CORBA::Objec
 int
 CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -11258,7 +10943,7 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecro
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::FactoryDef::FactoryDef (void)
@@ -11280,18 +10965,18 @@ POA_CORBA::ComponentIR::FactoryDef::~FactoryDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_FactoryDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11305,68 +10990,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FactoryDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  
+
   _is_a_FactoryDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11377,17 +11059,16 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_FactoryDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11401,59 +11082,56 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FactoryDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  
+
   _non_existent_FactoryDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11464,17 +11142,16 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_FactoryDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11488,59 +11165,56 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FactoryDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  
+
   _repository_id_FactoryDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11551,61 +11225,59 @@ void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_FactoryDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -11619,59 +11291,56 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FactoryDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FactoryDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
-  
+
   _get_component_FactoryDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -11682,13 +11351,11 @@ void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::FactoryDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -11727,39 +11394,36 @@ const char* POA_CORBA::ComponentIR::FactoryDef::_interface_repository_id (void)
 void POA_CORBA::ComponentIR::FactoryDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::FactoryDef *
-POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::FactoryDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::FactoryDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -11890,7 +11554,7 @@ TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, u
       if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
         {
             {
-              const TAO_operation_db_entry   *resword; 
+              const TAO_operation_db_entry   *resword;
 
               switch (key)
                 {
@@ -11991,9 +11655,9 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function ( ::CORBA::Object
 int
 CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -12003,7 +11667,7 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::FinderDef::FinderDef (void)
@@ -12025,18 +11689,18 @@ POA_CORBA::ComponentIR::FinderDef::~FinderDef (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_FinderDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -12050,68 +11714,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FinderDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  
+
   _is_a_FinderDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12122,17 +11783,16 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_FinderDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -12146,59 +11806,56 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FinderDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  
+
   _non_existent_FinderDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12209,17 +11866,16 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_FinderDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -12233,59 +11889,56 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FinderDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  
+
   _repository_id_FinderDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12296,61 +11949,59 @@ void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_FinderDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -12364,59 +12015,56 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::FinderDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::FinderDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::FinderDef * const impl =
     static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
-  
+
   _get_component_FinderDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12427,13 +12075,11 @@ void POA_CORBA::ComponentIR::FinderDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::FinderDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -12472,39 +12118,36 @@ const char* POA_CORBA::ComponentIR::FinderDef::_interface_repository_id (void) c
 void POA_CORBA::ComponentIR::FinderDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::FinderDef *
-POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::FinderDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::FinderDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -12656,14 +12299,14 @@ TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 
   static const signed char lookup[] =
     {
-        -1,   -1,   -1,   -1,    4,    5,    6,   -7,   -3, -102,   10,   11,  -12,   -2, 
-      -102,   -1,   -1,   -1,   14,   15,   -1,   -1,  -16,   -2,  -18,   -2, -104, -103, 
-        20,   -1,  -21,   -2, -102,   23,   24,   25,   26,   27,   28,   -1,  -32,   -2, 
-        29,   -1,  -36,   -2,  -38,   -2,  -40,   -3,   30,  -43,   -2,   31,   -1, -115, 
-        34,   35, -114,   -1, -114, -113, -111,   45,   -1,   46,   47,   48,   -1,   49, 
-        50,   -1,   51,   -1,   -1,   -1,   -1,   52,   -1,  -53,   -2, -102,   -1,   -1, 
-        -1,   -1,   -1,   -1,   55,   -1,   -1,   -1,   56,   -1,   -1,   -1,   -1,   -1, 
-        57,   -1,   58, 
+        -1,   -1,   -1,   -1,    4,    5,    6,   -7,   -3, -102,   10,   11,  -12,   -2,
+      -102,   -1,   -1,   -1,   14,   15,   -1,   -1,  -16,   -2,  -18,   -2, -104, -103,
+        20,   -1,  -21,   -2, -102,   23,   24,   25,   26,   27,   28,   -1,  -32,   -2,
+        29,   -1,  -36,   -2,  -38,   -2,  -40,   -3,   30,  -43,   -2,   31,   -1, -115,
+        34,   35, -114,   -1, -114, -113, -111,   45,   -1,   46,   47,   48,   -1,   49,
+        50,   -1,   51,   -1,   -1,   -1,   -1,   52,   -1,  -53,   -2, -102,   -1,   -1,
+        -1,   -1,   -1,   -1,   55,   -1,   -1,   -1,   56,   -1,   -1,   -1,   -1,   -1,
+        57,   -1,   58,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12712,9 +12355,9 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function ( ::CORBA::Object_p
 int
 CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer =
     CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -12724,7 +12367,7 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ComponentIR::HomeDef::HomeDef (void)
@@ -12752,11 +12395,11 @@ POA_CORBA::ComponentIR::HomeDef::~HomeDef (void)
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_base_home_HomeDef
       : public TAO::Upcall_Command
     {
@@ -12770,54 +12413,51 @@ POA_CORBA::ComponentIR::HomeDef::~HomeDef (void)
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::HomeDef> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->base_home (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->base_home ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -12825,7 +12465,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12836,17 +12476,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_base_home_HomeDef
       : public TAO::Upcall_Command
     {
@@ -12860,57 +12499,54 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::HomeDef> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->base_home (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_base_home
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -12918,7 +12554,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -12929,17 +12565,16 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_supported_interfaces_HomeDef
       : public TAO::Upcall_Command
     {
@@ -12953,54 +12588,51 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->supported_interfaces (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->supported_interfaces ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13008,7 +12640,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13019,17 +12651,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_supported_interfaces_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13043,57 +12674,54 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->supported_interfaces (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_supported_interfaces
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13101,7 +12729,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13112,17 +12740,16 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_managed_component_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13136,54 +12763,51 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->managed_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->managed_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13191,7 +12815,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13202,17 +12826,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_managed_component_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13226,57 +12849,54 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->managed_component (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_managed_component
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13284,7 +12904,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13295,17 +12915,16 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_primary_key_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13319,54 +12938,51 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_->primary_key (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_->primary_key ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13374,7 +12990,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13385,17 +13001,16 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _set_primary_key_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13409,57 +13024,54 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         this->servant_->primary_key (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_primary_key
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13467,7 +13079,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13478,17 +13090,16 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_factory_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13502,87 +13113,84 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::FactoryDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         retval =
           this->servant_->create_factory (
             arg_1
             , arg_2
             , arg_3
             , arg_4
-            , arg_5
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_5);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -13592,9 +13200,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
       &_tao_params,
       &_tao_exceptions
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13602,7 +13210,7 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13613,17 +13221,16 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class create_finder_HomeDef
       : public TAO::Upcall_Command
     {
@@ -13637,87 +13244,84 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::FinderDef> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
             this->operation_details_,
             this->args_,
             2);
-          
+
         TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
           TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
             this->operation_details_,
             this->args_,
             3);
-          
+
         TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
             this->operation_details_,
             this->args_,
             4);
-          
+
         TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
           TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
             this->operation_details_,
             this->args_,
             5);
-          
+
         retval =
           this->servant_->create_finder (
             arg_1
             , arg_2
             , arg_3
             , arg_4
-            , arg_5
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            , arg_5);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -13727,9 +13331,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
       &_tao_params,
       &_tao_exceptions
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
 
@@ -13737,7 +13341,7 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13748,22 +13352,21 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _is_a_HomeDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -13777,68 +13380,65 @@ namespace POA_CORBA
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
           TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_,
             1);
-          
+
         retval =
           this->servant_-> _is_a (
-            arg_1
-            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+            arg_1);
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  
+
   _is_a_HomeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13849,17 +13449,16 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _non_existent_HomeDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -13873,59 +13472,56 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _non_existent (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _non_existent ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  
+
   _non_existent_HomeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -13936,17 +13532,16 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _repository_id_HomeDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -13960,59 +13555,56 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _repository_id (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _repository_id ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  
+
   _repository_id_HomeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14023,61 +13615,59 @@ void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/upcall_command_ss.cpp:127
-    
+
     class _get_component_HomeDef_Upcall_Command
       : public TAO::Upcall_Command
     {
@@ -14091,59 +13681,56 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
           , args_ (args)
       {
       }
-      
-      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+      virtual void execute (void)
       {
         TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
           TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
             this->operation_details_,
             this->args_);
-        
+
         retval =
-          this->servant_-> _get_component (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          this->servant_-> _get_component ();
       }
-    
+
     private:
       POA_CORBA::ComponentIR::HomeDef * const servant_;
       TAO_Operation_Details const * const operation_details_;
       TAO::Argument * const * const args_;
     };
   }
-  
+
 }
 
 
 void POA_CORBA::ComponentIR::HomeDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ComponentIR::HomeDef * const impl =
     static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
-  
+
   _get_component_HomeDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -14154,13 +13741,11 @@ void POA_CORBA::ComponentIR::HomeDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ComponentIR::HomeDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -14215,39 +13800,36 @@ const char* POA_CORBA::ComponentIR::HomeDef::_interface_repository_id (void) con
 void POA_CORBA::ComponentIR::HomeDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ComponentIR::HomeDef *
-POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::HomeDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ComponentIR::HomeDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
index 096de121f5f..a1ad147d576 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
@@ -85,53 +85,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::EventDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -141,7 +133,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -152,7 +143,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -163,7 +153,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -174,7 +163,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -185,7 +173,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -196,7 +183,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -207,7 +193,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -218,7 +203,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -229,7 +213,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -240,7 +223,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -251,7 +233,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -262,7 +243,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -273,7 +253,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -284,7 +263,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -295,7 +273,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -306,7 +283,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -317,7 +293,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -328,7 +303,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -339,7 +313,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -350,7 +323,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -358,7 +330,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -366,7 +337,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -374,7 +344,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -382,7 +351,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -390,7 +358,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -398,7 +365,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -406,7 +372,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -414,7 +379,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -422,7 +386,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -433,7 +396,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -444,7 +406,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -452,7 +413,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -460,7 +420,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -468,7 +427,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -476,7 +434,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -484,7 +441,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -492,7 +448,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -500,7 +455,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -508,7 +462,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -516,7 +469,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -524,7 +476,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -532,7 +483,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -540,7 +490,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -548,7 +497,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -556,7 +504,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -564,7 +511,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -575,7 +521,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -586,7 +531,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -597,7 +541,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -608,7 +551,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -619,7 +561,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -627,7 +568,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -635,7 +575,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -646,7 +585,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -657,7 +595,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -684,53 +621,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::Container *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -744,7 +673,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -754,7 +682,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -768,7 +695,6 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -778,7 +704,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -795,7 +720,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -805,7 +729,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -813,7 +736,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -824,7 +746,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -835,7 +756,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -846,7 +766,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -857,7 +776,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -868,7 +786,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -879,7 +796,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -890,7 +806,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -901,7 +816,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -912,7 +826,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -923,7 +836,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -934,7 +846,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -945,7 +856,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -956,7 +866,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -967,7 +876,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -978,7 +886,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -989,7 +896,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1000,7 +906,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1011,7 +916,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1022,7 +926,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -1050,53 +953,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::ModuleDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -1106,7 +1001,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1117,7 +1011,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1128,7 +1021,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1139,7 +1031,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1150,7 +1041,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1161,7 +1051,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1172,7 +1061,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1183,7 +1071,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1194,7 +1081,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1205,7 +1091,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1216,7 +1101,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1227,7 +1111,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1238,7 +1121,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1249,7 +1131,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1260,7 +1141,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1271,7 +1151,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1282,7 +1161,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1293,7 +1171,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1304,7 +1181,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1315,7 +1191,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1323,7 +1198,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1331,7 +1205,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1339,7 +1212,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1347,7 +1219,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1355,7 +1226,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1363,7 +1233,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1371,7 +1240,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1379,7 +1247,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1387,7 +1254,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1398,7 +1264,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1409,7 +1274,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1420,7 +1284,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1431,7 +1294,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1442,7 +1304,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -1470,53 +1331,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::Repository *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -1526,7 +1379,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1537,7 +1389,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1548,7 +1399,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1559,7 +1409,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1570,7 +1419,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1581,7 +1429,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1592,7 +1439,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1603,7 +1449,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1614,7 +1459,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1625,7 +1469,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1636,7 +1479,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1647,7 +1489,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1658,7 +1499,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1669,7 +1509,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1680,7 +1519,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1691,7 +1529,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1702,7 +1539,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1713,7 +1549,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1724,7 +1559,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1735,7 +1569,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1746,7 +1579,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1757,7 +1589,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1768,7 +1599,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1779,7 +1609,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1790,7 +1619,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1801,7 +1629,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1812,7 +1639,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1823,7 +1649,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1834,7 +1659,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1845,7 +1669,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1856,7 +1679,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -1883,53 +1705,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::ProvidesDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -1938,7 +1752,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::InterfaceDef_ptr interface_type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1948,7 +1761,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -1956,7 +1768,6 @@ namespace POA_CORBA
 
       virtual void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1966,7 +1777,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -1974,7 +1784,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -1985,7 +1794,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -1993,7 +1801,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2001,7 +1808,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2009,7 +1815,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2017,7 +1822,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2025,7 +1829,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2033,7 +1836,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2041,7 +1843,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2049,7 +1850,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2057,7 +1857,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2068,7 +1867,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2079,7 +1877,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -2106,53 +1903,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::UsesDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -2161,7 +1950,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::InterfaceDef_ptr interface_type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2171,7 +1959,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -2179,7 +1966,6 @@ namespace POA_CORBA
 
       virtual void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2189,14 +1975,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::Boolean is_multiple (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2206,7 +1990,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -2214,7 +1997,6 @@ namespace POA_CORBA
 
       virtual void is_multiple (
           ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2224,7 +2006,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -2232,7 +2013,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2243,7 +2023,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2251,7 +2030,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2259,7 +2037,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2267,7 +2044,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2275,7 +2051,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2283,7 +2058,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2291,7 +2065,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2299,7 +2072,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2307,7 +2079,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2315,7 +2086,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2326,7 +2096,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2337,7 +2106,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -2364,53 +2132,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::EventPortDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -2419,7 +2179,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2429,7 +2188,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -2437,7 +2195,6 @@ namespace POA_CORBA
 
       virtual void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2447,7 +2204,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -2455,7 +2211,6 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2465,7 +2220,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -2473,7 +2227,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2484,7 +2237,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2492,7 +2244,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2500,7 +2251,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2508,7 +2258,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2516,7 +2265,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2524,7 +2272,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2532,7 +2279,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2540,7 +2286,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2548,7 +2293,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2556,7 +2300,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2567,7 +2310,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2578,7 +2320,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -2605,53 +2346,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::EmitsDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -2661,7 +2394,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2672,7 +2404,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2680,7 +2411,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2688,7 +2418,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2696,7 +2425,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2704,7 +2432,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2712,7 +2439,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2720,7 +2446,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2728,7 +2453,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2736,7 +2460,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2744,7 +2467,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2755,7 +2477,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2766,7 +2487,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2774,7 +2494,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2782,7 +2501,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2793,7 +2511,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -2820,53 +2537,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::PublishesDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -2876,7 +2585,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2887,7 +2595,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2895,7 +2602,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2903,7 +2609,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2911,7 +2616,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2919,7 +2623,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2927,7 +2630,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2935,7 +2637,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2943,7 +2644,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2951,7 +2651,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2959,7 +2658,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2970,7 +2668,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -2981,7 +2678,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2989,7 +2685,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -2997,7 +2692,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3008,7 +2702,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -3035,53 +2728,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::ConsumesDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -3091,7 +2776,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3102,7 +2786,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3110,7 +2793,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3118,7 +2800,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3126,7 +2807,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3134,7 +2814,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3142,7 +2821,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3150,7 +2828,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3158,7 +2835,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3166,7 +2842,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3174,7 +2849,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3185,7 +2859,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3196,7 +2869,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3204,7 +2876,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3212,7 +2883,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3223,7 +2893,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -3250,53 +2919,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::ComponentDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -3305,7 +2966,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3315,7 +2975,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3323,7 +2982,6 @@ namespace POA_CORBA
 
       virtual void base_component (
           ::CORBA::ComponentIR::ComponentDef_ptr base_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3333,14 +2991,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3350,7 +3006,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3358,7 +3013,6 @@ namespace POA_CORBA
 
       virtual void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3368,7 +3022,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3379,7 +3032,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3389,7 +3041,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3401,7 +3052,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type,
           ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3411,7 +3061,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3422,7 +3071,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3432,7 +3080,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3443,7 +3090,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3453,7 +3099,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -3464,7 +3109,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3474,7 +3118,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -3482,7 +3125,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3493,7 +3135,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3504,7 +3145,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3515,7 +3155,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3526,7 +3165,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3537,7 +3175,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3548,7 +3185,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3559,7 +3195,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3570,7 +3205,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3581,7 +3215,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3592,7 +3225,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3603,7 +3235,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3614,7 +3245,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3625,7 +3255,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3636,7 +3265,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3647,7 +3275,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3658,7 +3285,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3669,7 +3295,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3680,7 +3305,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3691,7 +3315,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3699,7 +3322,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3707,7 +3329,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3715,7 +3336,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3723,7 +3343,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3731,7 +3350,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3739,7 +3357,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3747,7 +3364,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3755,7 +3371,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3763,7 +3378,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3774,7 +3388,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3785,7 +3398,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3793,7 +3405,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3801,7 +3412,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3809,7 +3419,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3820,7 +3429,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3831,7 +3439,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3842,7 +3449,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3853,7 +3459,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3864,7 +3469,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3875,7 +3479,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -3902,53 +3505,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::FactoryDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -3958,7 +3553,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -3969,7 +3563,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3977,7 +3570,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3985,7 +3577,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -3993,7 +3584,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4001,7 +3591,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4009,7 +3598,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4017,7 +3605,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4025,7 +3612,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4033,7 +3619,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4041,7 +3626,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4052,7 +3636,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4063,7 +3646,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4071,7 +3653,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4079,7 +3660,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4087,7 +3667,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4095,7 +3674,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4103,7 +3681,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4111,7 +3688,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4119,7 +3695,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4127,7 +3702,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4135,7 +3709,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4143,7 +3716,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4151,7 +3723,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -4178,53 +3749,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::FinderDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -4234,7 +3797,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4245,7 +3807,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4253,7 +3814,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4261,7 +3821,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4269,7 +3828,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4277,7 +3835,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4285,7 +3842,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4293,7 +3849,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4301,7 +3856,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4309,7 +3863,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4317,7 +3870,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4328,7 +3880,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4339,7 +3890,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4347,7 +3897,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4355,7 +3904,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4363,7 +3911,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4371,7 +3918,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4379,7 +3925,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4387,7 +3932,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4395,7 +3939,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4403,7 +3946,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4411,7 +3953,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4419,7 +3960,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4427,7 +3967,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
@@ -4454,53 +3993,45 @@ namespace POA_CORBA
 
       virtual ::CORBA::Boolean _is_a (
           const char* logical_type_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void _repository_id_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
-          ACE_ENV_ARG_DECL
         );
 
       ::CORBA::ComponentIR::HomeDef *_this (
 
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       virtual const char* _interface_repository_id (void) const;
@@ -4509,7 +4040,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ComponentIR::HomeDef_ptr base_home (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4519,7 +4049,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4527,7 +4056,6 @@ namespace POA_CORBA
 
       virtual void base_home (
           ::CORBA::ComponentIR::HomeDef_ptr base_home
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4537,14 +4065,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4554,7 +4080,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4562,7 +4087,6 @@ namespace POA_CORBA
 
       virtual void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4572,14 +4096,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4589,7 +4111,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4597,7 +4118,6 @@ namespace POA_CORBA
 
       virtual void managed_component (
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4607,14 +4127,12 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/operation_sh.cpp:45
 
       virtual ::CORBA::ValueDef_ptr primary_key (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4624,7 +4142,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4632,7 +4149,6 @@ namespace POA_CORBA
 
       virtual void primary_key (
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4642,7 +4158,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4654,7 +4169,6 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4664,7 +4178,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       // TAO_IDL - Generated from
@@ -4676,7 +4189,6 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4686,7 +4198,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL
         );
 
       static void
@@ -4694,7 +4205,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4705,7 +4215,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4716,7 +4225,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4727,7 +4235,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4738,7 +4245,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4749,7 +4255,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4760,7 +4265,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4771,7 +4275,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4782,7 +4285,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4793,7 +4295,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4804,7 +4305,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4815,7 +4315,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4826,7 +4325,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4837,7 +4335,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4848,7 +4345,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4859,7 +4355,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4870,7 +4365,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4881,7 +4375,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4892,7 +4385,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4903,7 +4395,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4911,7 +4402,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4919,7 +4409,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4927,7 +4416,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4935,7 +4423,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4943,7 +4430,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4951,7 +4437,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4959,7 +4444,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4967,7 +4451,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -4975,7 +4458,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4986,7 +4468,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -4997,7 +4478,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -5005,7 +4485,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -5013,7 +4492,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       static void
@@ -5021,7 +4499,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5032,7 +4509,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5043,7 +4519,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5054,7 +4529,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5065,7 +4539,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5076,7 +4549,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
@@ -5087,7 +4559,6 @@ namespace POA_CORBA
           TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
     };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
index 86e5fd82676..06f6e8026d7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
@@ -36,7 +36,6 @@ POA_CORBA::ComponentIR::EventDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -44,7 +43,6 @@ POA_CORBA::ComponentIR::EventDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -57,7 +55,6 @@ POA_CORBA::ComponentIR::EventDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -65,7 +62,6 @@ POA_CORBA::ComponentIR::EventDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -78,7 +74,6 @@ POA_CORBA::ComponentIR::EventDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -86,7 +81,6 @@ POA_CORBA::ComponentIR::EventDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -99,7 +93,6 @@ POA_CORBA::ComponentIR::EventDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -107,7 +100,6 @@ POA_CORBA::ComponentIR::EventDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -120,7 +112,6 @@ POA_CORBA::ComponentIR::EventDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -128,7 +119,6 @@ POA_CORBA::ComponentIR::EventDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -141,7 +131,6 @@ POA_CORBA::ComponentIR::EventDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -149,7 +138,6 @@ POA_CORBA::ComponentIR::EventDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -162,7 +150,6 @@ POA_CORBA::ComponentIR::EventDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -170,7 +157,6 @@ POA_CORBA::ComponentIR::EventDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -183,7 +169,6 @@ POA_CORBA::ComponentIR::EventDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -191,7 +176,6 @@ POA_CORBA::ComponentIR::EventDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -204,7 +188,6 @@ POA_CORBA::ComponentIR::EventDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -212,7 +195,6 @@ POA_CORBA::ComponentIR::EventDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -225,7 +207,6 @@ POA_CORBA::ComponentIR::EventDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -233,7 +214,6 @@ POA_CORBA::ComponentIR::EventDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -246,7 +226,6 @@ POA_CORBA::ComponentIR::EventDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -254,7 +233,6 @@ POA_CORBA::ComponentIR::EventDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -267,7 +245,6 @@ POA_CORBA::ComponentIR::EventDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -275,7 +252,6 @@ POA_CORBA::ComponentIR::EventDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -288,7 +264,6 @@ POA_CORBA::ComponentIR::EventDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -296,7 +271,6 @@ POA_CORBA::ComponentIR::EventDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -309,7 +283,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -317,7 +290,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -330,7 +302,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -338,7 +309,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -351,7 +321,6 @@ POA_CORBA::ComponentIR::EventDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -359,7 +328,6 @@ POA_CORBA::ComponentIR::EventDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -372,7 +340,6 @@ POA_CORBA::ComponentIR::EventDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -380,7 +347,6 @@ POA_CORBA::ComponentIR::EventDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -393,7 +359,6 @@ POA_CORBA::ComponentIR::EventDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -401,7 +366,6 @@ POA_CORBA::ComponentIR::EventDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -414,7 +378,6 @@ POA_CORBA::ComponentIR::EventDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -422,7 +385,6 @@ POA_CORBA::ComponentIR::EventDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -435,7 +397,6 @@ POA_CORBA::ComponentIR::EventDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -443,7 +404,6 @@ POA_CORBA::ComponentIR::EventDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -453,7 +413,6 @@ POA_CORBA::ComponentIR::EventDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -461,7 +420,6 @@ POA_CORBA::ComponentIR::EventDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -471,7 +429,6 @@ POA_CORBA::ComponentIR::EventDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -479,7 +436,6 @@ POA_CORBA::ComponentIR::EventDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -489,7 +445,6 @@ POA_CORBA::ComponentIR::EventDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -497,7 +452,6 @@ POA_CORBA::ComponentIR::EventDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -507,7 +461,6 @@ POA_CORBA::ComponentIR::EventDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -515,7 +468,6 @@ POA_CORBA::ComponentIR::EventDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -525,7 +477,6 @@ POA_CORBA::ComponentIR::EventDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -533,7 +484,6 @@ POA_CORBA::ComponentIR::EventDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -543,7 +493,6 @@ POA_CORBA::ComponentIR::EventDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -551,7 +500,6 @@ POA_CORBA::ComponentIR::EventDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -561,7 +509,6 @@ POA_CORBA::ComponentIR::EventDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -569,7 +516,6 @@ POA_CORBA::ComponentIR::EventDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -579,7 +525,6 @@ POA_CORBA::ComponentIR::EventDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -587,7 +532,6 @@ POA_CORBA::ComponentIR::EventDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -597,7 +541,6 @@ POA_CORBA::ComponentIR::EventDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -605,7 +548,6 @@ POA_CORBA::ComponentIR::EventDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -618,7 +560,6 @@ POA_CORBA::ComponentIR::EventDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -626,7 +567,6 @@ POA_CORBA::ComponentIR::EventDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -639,7 +579,6 @@ POA_CORBA::ComponentIR::EventDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -647,7 +586,6 @@ POA_CORBA::ComponentIR::EventDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -657,7 +595,6 @@ POA_CORBA::ComponentIR::EventDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -665,7 +602,6 @@ POA_CORBA::ComponentIR::EventDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -675,7 +611,6 @@ POA_CORBA::ComponentIR::EventDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -683,7 +618,6 @@ POA_CORBA::ComponentIR::EventDef::_get_supported_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -693,7 +627,6 @@ POA_CORBA::ComponentIR::EventDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -701,7 +634,6 @@ POA_CORBA::ComponentIR::EventDef::_set_supported_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -711,7 +643,6 @@ POA_CORBA::ComponentIR::EventDef::_get_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -719,7 +650,6 @@ POA_CORBA::ComponentIR::EventDef::_get_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -729,7 +659,6 @@ POA_CORBA::ComponentIR::EventDef::_set_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -737,7 +666,6 @@ POA_CORBA::ComponentIR::EventDef::_set_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -747,7 +675,6 @@ POA_CORBA::ComponentIR::EventDef::_get_base_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -755,7 +682,6 @@ POA_CORBA::ComponentIR::EventDef::_get_base_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -765,7 +691,6 @@ POA_CORBA::ComponentIR::EventDef::_set_base_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -773,7 +698,6 @@ POA_CORBA::ComponentIR::EventDef::_set_base_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -783,7 +707,6 @@ POA_CORBA::ComponentIR::EventDef::_get_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -791,7 +714,6 @@ POA_CORBA::ComponentIR::EventDef::_get_abstract_base_values_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -801,7 +723,6 @@ POA_CORBA::ComponentIR::EventDef::_set_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -809,7 +730,6 @@ POA_CORBA::ComponentIR::EventDef::_set_abstract_base_values_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -819,7 +739,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -827,7 +746,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_abstract_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -837,7 +755,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -845,7 +762,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_abstract_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -855,7 +771,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -863,7 +778,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_custom_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -873,7 +787,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -881,7 +794,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_custom_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -891,7 +803,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -899,7 +810,6 @@ POA_CORBA::ComponentIR::EventDef::_get_is_truncatable_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -909,7 +819,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -917,7 +826,6 @@ POA_CORBA::ComponentIR::EventDef::_set_is_truncatable_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -930,7 +838,6 @@ POA_CORBA::ComponentIR::EventDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -938,7 +845,6 @@ POA_CORBA::ComponentIR::EventDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -951,7 +857,6 @@ POA_CORBA::ComponentIR::EventDef::describe_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -959,7 +864,6 @@ POA_CORBA::ComponentIR::EventDef::describe_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -972,7 +876,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_member_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -980,7 +883,6 @@ POA_CORBA::ComponentIR::EventDef::create_value_member_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -993,7 +895,6 @@ POA_CORBA::ComponentIR::EventDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1001,7 +902,6 @@ POA_CORBA::ComponentIR::EventDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1014,7 +914,6 @@ POA_CORBA::ComponentIR::EventDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1022,7 +921,6 @@ POA_CORBA::ComponentIR::EventDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1032,7 +930,6 @@ POA_CORBA::ComponentIR::EventDef::_get_ext_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ExtValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1040,7 +937,6 @@ POA_CORBA::ComponentIR::EventDef::_get_ext_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1050,7 +946,6 @@ POA_CORBA::ComponentIR::EventDef::_set_ext_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ExtValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1058,7 +953,6 @@ POA_CORBA::ComponentIR::EventDef::_set_ext_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1071,7 +965,6 @@ POA_CORBA::ComponentIR::EventDef::describe_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ExtValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1079,7 +972,6 @@ POA_CORBA::ComponentIR::EventDef::describe_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1092,7 +984,6 @@ POA_CORBA::ComponentIR::EventDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ExtValueDef * const impl = static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
@@ -1100,7 +991,6 @@ POA_CORBA::ComponentIR::EventDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1110,7 +1000,6 @@ POA_CORBA::ComponentIR::Container::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1118,7 +1007,6 @@ POA_CORBA::ComponentIR::Container::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1131,7 +1019,6 @@ POA_CORBA::ComponentIR::Container::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1139,7 +1026,6 @@ POA_CORBA::ComponentIR::Container::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1152,7 +1038,6 @@ POA_CORBA::ComponentIR::Container::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1160,7 +1045,6 @@ POA_CORBA::ComponentIR::Container::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1173,7 +1057,6 @@ POA_CORBA::ComponentIR::Container::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1181,7 +1064,6 @@ POA_CORBA::ComponentIR::Container::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1194,7 +1076,6 @@ POA_CORBA::ComponentIR::Container::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1202,7 +1083,6 @@ POA_CORBA::ComponentIR::Container::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1215,7 +1095,6 @@ POA_CORBA::ComponentIR::Container::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1223,7 +1102,6 @@ POA_CORBA::ComponentIR::Container::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1236,7 +1114,6 @@ POA_CORBA::ComponentIR::Container::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1244,7 +1121,6 @@ POA_CORBA::ComponentIR::Container::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1257,7 +1133,6 @@ POA_CORBA::ComponentIR::Container::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1265,7 +1140,6 @@ POA_CORBA::ComponentIR::Container::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1278,7 +1152,6 @@ POA_CORBA::ComponentIR::Container::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1286,7 +1159,6 @@ POA_CORBA::ComponentIR::Container::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1299,7 +1171,6 @@ POA_CORBA::ComponentIR::Container::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1307,7 +1178,6 @@ POA_CORBA::ComponentIR::Container::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1320,7 +1190,6 @@ POA_CORBA::ComponentIR::Container::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1328,7 +1197,6 @@ POA_CORBA::ComponentIR::Container::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1341,7 +1209,6 @@ POA_CORBA::ComponentIR::Container::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1349,7 +1216,6 @@ POA_CORBA::ComponentIR::Container::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1362,7 +1228,6 @@ POA_CORBA::ComponentIR::Container::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1370,7 +1235,6 @@ POA_CORBA::ComponentIR::Container::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1383,7 +1247,6 @@ POA_CORBA::ComponentIR::Container::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1391,7 +1254,6 @@ POA_CORBA::ComponentIR::Container::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1404,7 +1266,6 @@ POA_CORBA::ComponentIR::Container::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1412,7 +1273,6 @@ POA_CORBA::ComponentIR::Container::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1425,7 +1285,6 @@ POA_CORBA::ComponentIR::Container::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1433,7 +1292,6 @@ POA_CORBA::ComponentIR::Container::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1446,7 +1304,6 @@ POA_CORBA::ComponentIR::Container::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1454,7 +1311,6 @@ POA_CORBA::ComponentIR::Container::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1467,7 +1323,6 @@ POA_CORBA::ComponentIR::Container::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1475,7 +1330,6 @@ POA_CORBA::ComponentIR::Container::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1488,7 +1342,6 @@ POA_CORBA::ComponentIR::Container::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1496,7 +1349,6 @@ POA_CORBA::ComponentIR::Container::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1509,7 +1361,6 @@ POA_CORBA::ComponentIR::Container::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Container *> (servant);
@@ -1517,7 +1368,6 @@ POA_CORBA::ComponentIR::Container::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1527,7 +1377,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1535,7 +1384,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1548,7 +1396,6 @@ POA_CORBA::ComponentIR::ModuleDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1556,7 +1403,6 @@ POA_CORBA::ComponentIR::ModuleDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1569,7 +1415,6 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1577,7 +1422,6 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1590,7 +1434,6 @@ POA_CORBA::ComponentIR::ModuleDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1598,7 +1441,6 @@ POA_CORBA::ComponentIR::ModuleDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1611,7 +1453,6 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1619,7 +1460,6 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1632,7 +1472,6 @@ POA_CORBA::ComponentIR::ModuleDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1640,7 +1479,6 @@ POA_CORBA::ComponentIR::ModuleDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1653,7 +1491,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1661,7 +1498,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1674,7 +1510,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1682,7 +1517,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1695,7 +1529,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1703,7 +1536,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1716,7 +1548,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1724,7 +1555,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1737,7 +1567,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1745,7 +1574,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1758,7 +1586,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1766,7 +1593,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1779,7 +1605,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1787,7 +1612,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1800,7 +1624,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1808,7 +1631,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1821,7 +1643,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1829,7 +1650,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1842,7 +1662,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1850,7 +1669,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1863,7 +1681,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1871,7 +1688,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1884,7 +1700,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1892,7 +1707,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1905,7 +1719,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1913,7 +1726,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1926,7 +1738,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1934,7 +1745,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1944,7 +1754,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1952,7 +1761,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1962,7 +1770,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1970,7 +1777,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1980,7 +1786,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -1988,7 +1793,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1998,7 +1802,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2006,7 +1809,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2016,7 +1818,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2024,7 +1825,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2034,7 +1834,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2042,7 +1841,6 @@ POA_CORBA::ComponentIR::ModuleDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2052,7 +1850,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2060,7 +1857,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2070,7 +1866,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2078,7 +1873,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2088,7 +1882,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2096,7 +1889,6 @@ POA_CORBA::ComponentIR::ModuleDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2109,7 +1901,6 @@ POA_CORBA::ComponentIR::ModuleDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2117,7 +1908,6 @@ POA_CORBA::ComponentIR::ModuleDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2130,7 +1920,6 @@ POA_CORBA::ComponentIR::ModuleDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2138,7 +1927,6 @@ POA_CORBA::ComponentIR::ModuleDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2151,7 +1939,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_component_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2159,7 +1946,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_component_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2172,7 +1958,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_home_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2180,7 +1965,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_home_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2193,7 +1977,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
@@ -2201,7 +1984,6 @@ POA_CORBA::ComponentIR::ModuleDef::create_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2211,7 +1993,6 @@ POA_CORBA::ComponentIR::Repository::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2219,7 +2000,6 @@ POA_CORBA::ComponentIR::Repository::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2232,7 +2012,6 @@ POA_CORBA::ComponentIR::Repository::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2240,7 +2019,6 @@ POA_CORBA::ComponentIR::Repository::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2253,7 +2031,6 @@ POA_CORBA::ComponentIR::Repository::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2261,7 +2038,6 @@ POA_CORBA::ComponentIR::Repository::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2274,7 +2050,6 @@ POA_CORBA::ComponentIR::Repository::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2282,7 +2057,6 @@ POA_CORBA::ComponentIR::Repository::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2295,7 +2069,6 @@ POA_CORBA::ComponentIR::Repository::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2303,7 +2076,6 @@ POA_CORBA::ComponentIR::Repository::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2316,7 +2088,6 @@ POA_CORBA::ComponentIR::Repository::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2324,7 +2095,6 @@ POA_CORBA::ComponentIR::Repository::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2337,7 +2107,6 @@ POA_CORBA::ComponentIR::Repository::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2345,7 +2114,6 @@ POA_CORBA::ComponentIR::Repository::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2358,7 +2126,6 @@ POA_CORBA::ComponentIR::Repository::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2366,7 +2133,6 @@ POA_CORBA::ComponentIR::Repository::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2379,7 +2145,6 @@ POA_CORBA::ComponentIR::Repository::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2387,7 +2152,6 @@ POA_CORBA::ComponentIR::Repository::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2400,7 +2164,6 @@ POA_CORBA::ComponentIR::Repository::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2408,7 +2171,6 @@ POA_CORBA::ComponentIR::Repository::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2421,7 +2183,6 @@ POA_CORBA::ComponentIR::Repository::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2429,7 +2190,6 @@ POA_CORBA::ComponentIR::Repository::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2442,7 +2202,6 @@ POA_CORBA::ComponentIR::Repository::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2450,7 +2209,6 @@ POA_CORBA::ComponentIR::Repository::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2463,7 +2221,6 @@ POA_CORBA::ComponentIR::Repository::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2471,7 +2228,6 @@ POA_CORBA::ComponentIR::Repository::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2484,7 +2240,6 @@ POA_CORBA::ComponentIR::Repository::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2492,7 +2247,6 @@ POA_CORBA::ComponentIR::Repository::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2505,7 +2259,6 @@ POA_CORBA::ComponentIR::Repository::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2513,7 +2266,6 @@ POA_CORBA::ComponentIR::Repository::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2526,7 +2278,6 @@ POA_CORBA::ComponentIR::Repository::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2534,7 +2285,6 @@ POA_CORBA::ComponentIR::Repository::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2547,7 +2297,6 @@ POA_CORBA::ComponentIR::Repository::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2555,7 +2304,6 @@ POA_CORBA::ComponentIR::Repository::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2568,7 +2316,6 @@ POA_CORBA::ComponentIR::Repository::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2576,7 +2323,6 @@ POA_CORBA::ComponentIR::Repository::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2589,7 +2335,6 @@ POA_CORBA::ComponentIR::Repository::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2597,7 +2342,6 @@ POA_CORBA::ComponentIR::Repository::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2610,7 +2354,6 @@ POA_CORBA::ComponentIR::Repository::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2618,7 +2361,6 @@ POA_CORBA::ComponentIR::Repository::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2631,7 +2373,6 @@ POA_CORBA::ComponentIR::Repository::lookup_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2639,7 +2380,6 @@ POA_CORBA::ComponentIR::Repository::lookup_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2652,7 +2392,6 @@ POA_CORBA::ComponentIR::Repository::get_canonical_typecode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2660,7 +2399,6 @@ POA_CORBA::ComponentIR::Repository::get_canonical_typecode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2673,7 +2411,6 @@ POA_CORBA::ComponentIR::Repository::get_primitive_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2681,7 +2418,6 @@ POA_CORBA::ComponentIR::Repository::get_primitive_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2694,7 +2430,6 @@ POA_CORBA::ComponentIR::Repository::create_string_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2702,7 +2437,6 @@ POA_CORBA::ComponentIR::Repository::create_string_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2715,7 +2449,6 @@ POA_CORBA::ComponentIR::Repository::create_wstring_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2723,7 +2456,6 @@ POA_CORBA::ComponentIR::Repository::create_wstring_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2736,7 +2468,6 @@ POA_CORBA::ComponentIR::Repository::create_sequence_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2744,7 +2475,6 @@ POA_CORBA::ComponentIR::Repository::create_sequence_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2757,7 +2487,6 @@ POA_CORBA::ComponentIR::Repository::create_array_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2765,7 +2494,6 @@ POA_CORBA::ComponentIR::Repository::create_array_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2778,7 +2506,6 @@ POA_CORBA::ComponentIR::Repository::create_fixed_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Repository * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2786,7 +2513,6 @@ POA_CORBA::ComponentIR::Repository::create_fixed_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2799,7 +2525,6 @@ POA_CORBA::ComponentIR::Repository::create_component_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2807,7 +2532,6 @@ POA_CORBA::ComponentIR::Repository::create_component_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2820,7 +2544,6 @@ POA_CORBA::ComponentIR::Repository::create_home_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2828,7 +2551,6 @@ POA_CORBA::ComponentIR::Repository::create_home_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2841,7 +2563,6 @@ POA_CORBA::ComponentIR::Repository::create_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::Container * const impl = static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
@@ -2849,7 +2570,6 @@ POA_CORBA::ComponentIR::Repository::create_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2859,7 +2579,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2867,7 +2586,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2880,7 +2598,6 @@ POA_CORBA::ComponentIR::ProvidesDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2888,7 +2605,6 @@ POA_CORBA::ComponentIR::ProvidesDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2898,7 +2614,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2906,7 +2621,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2916,7 +2630,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2924,7 +2637,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2934,7 +2646,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2942,7 +2653,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2952,7 +2662,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2960,7 +2669,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2970,7 +2678,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2978,7 +2685,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2988,7 +2694,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -2996,7 +2701,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3006,7 +2710,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3014,7 +2717,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3024,7 +2726,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3032,7 +2733,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3042,7 +2742,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3050,7 +2749,6 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3063,7 +2761,6 @@ POA_CORBA::ComponentIR::ProvidesDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3071,7 +2768,6 @@ POA_CORBA::ComponentIR::ProvidesDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3084,7 +2780,6 @@ POA_CORBA::ComponentIR::ProvidesDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
@@ -3092,7 +2787,6 @@ POA_CORBA::ComponentIR::ProvidesDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3102,7 +2796,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3110,7 +2803,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3123,7 +2815,6 @@ POA_CORBA::ComponentIR::UsesDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3131,7 +2822,6 @@ POA_CORBA::ComponentIR::UsesDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3141,7 +2831,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3149,7 +2838,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3159,7 +2847,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3167,7 +2854,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3177,7 +2863,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3185,7 +2870,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3195,7 +2879,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3203,7 +2886,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3213,7 +2895,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3221,7 +2902,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3231,7 +2911,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3239,7 +2918,6 @@ POA_CORBA::ComponentIR::UsesDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3249,7 +2927,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3257,7 +2934,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3267,7 +2943,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3275,7 +2950,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3285,7 +2959,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3293,7 +2966,6 @@ POA_CORBA::ComponentIR::UsesDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3306,7 +2978,6 @@ POA_CORBA::ComponentIR::UsesDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3314,7 +2985,6 @@ POA_CORBA::ComponentIR::UsesDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3327,7 +2997,6 @@ POA_CORBA::ComponentIR::UsesDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
@@ -3335,7 +3004,6 @@ POA_CORBA::ComponentIR::UsesDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3345,7 +3013,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3353,7 +3020,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3366,7 +3032,6 @@ POA_CORBA::ComponentIR::EventPortDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3374,7 +3039,6 @@ POA_CORBA::ComponentIR::EventPortDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3384,7 +3048,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3392,7 +3055,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3402,7 +3064,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3410,7 +3071,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3420,7 +3080,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3428,7 +3087,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3438,7 +3096,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3446,7 +3103,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3456,7 +3112,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3464,7 +3119,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3474,7 +3128,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3482,7 +3135,6 @@ POA_CORBA::ComponentIR::EventPortDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3492,7 +3144,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3500,7 +3151,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3510,7 +3160,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3518,7 +3167,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3528,7 +3176,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3536,7 +3183,6 @@ POA_CORBA::ComponentIR::EventPortDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3549,7 +3195,6 @@ POA_CORBA::ComponentIR::EventPortDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3557,7 +3202,6 @@ POA_CORBA::ComponentIR::EventPortDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3570,7 +3214,6 @@ POA_CORBA::ComponentIR::EventPortDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
@@ -3578,7 +3221,6 @@ POA_CORBA::ComponentIR::EventPortDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3588,7 +3230,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3596,7 +3237,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3609,7 +3249,6 @@ POA_CORBA::ComponentIR::EmitsDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3617,7 +3256,6 @@ POA_CORBA::ComponentIR::EmitsDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3627,7 +3265,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3635,7 +3272,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3645,7 +3281,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3653,7 +3288,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3663,7 +3297,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3671,7 +3304,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3681,7 +3313,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3689,7 +3320,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3699,7 +3329,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3707,7 +3336,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3717,7 +3345,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3725,7 +3352,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3735,7 +3361,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3743,7 +3368,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3753,7 +3377,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3761,7 +3384,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3771,7 +3393,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3779,7 +3400,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3792,7 +3412,6 @@ POA_CORBA::ComponentIR::EmitsDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3800,7 +3419,6 @@ POA_CORBA::ComponentIR::EmitsDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3813,7 +3431,6 @@ POA_CORBA::ComponentIR::EmitsDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3821,7 +3438,6 @@ POA_CORBA::ComponentIR::EmitsDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3831,7 +3447,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3839,7 +3454,6 @@ POA_CORBA::ComponentIR::EmitsDef::_get_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3849,7 +3463,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3857,7 +3470,6 @@ POA_CORBA::ComponentIR::EmitsDef::_set_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3870,7 +3482,6 @@ POA_CORBA::ComponentIR::EmitsDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
@@ -3878,7 +3489,6 @@ POA_CORBA::ComponentIR::EmitsDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3888,7 +3498,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3896,7 +3505,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3909,7 +3517,6 @@ POA_CORBA::ComponentIR::PublishesDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3917,7 +3524,6 @@ POA_CORBA::ComponentIR::PublishesDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3927,7 +3533,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3935,7 +3540,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3945,7 +3549,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3953,7 +3556,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3963,7 +3565,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3971,7 +3572,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3981,7 +3581,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -3989,7 +3588,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3999,7 +3597,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4007,7 +3604,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4017,7 +3613,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4025,7 +3620,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4035,7 +3629,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4043,7 +3636,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4053,7 +3645,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4061,7 +3652,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4071,7 +3661,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4079,7 +3668,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4092,7 +3680,6 @@ POA_CORBA::ComponentIR::PublishesDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4100,7 +3687,6 @@ POA_CORBA::ComponentIR::PublishesDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4113,7 +3699,6 @@ POA_CORBA::ComponentIR::PublishesDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4121,7 +3706,6 @@ POA_CORBA::ComponentIR::PublishesDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4131,7 +3715,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4139,7 +3722,6 @@ POA_CORBA::ComponentIR::PublishesDef::_get_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4149,7 +3731,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4157,7 +3738,6 @@ POA_CORBA::ComponentIR::PublishesDef::_set_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4170,7 +3750,6 @@ POA_CORBA::ComponentIR::PublishesDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
@@ -4178,7 +3757,6 @@ POA_CORBA::ComponentIR::PublishesDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4188,7 +3766,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4196,7 +3773,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4209,7 +3785,6 @@ POA_CORBA::ComponentIR::ConsumesDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4217,7 +3792,6 @@ POA_CORBA::ComponentIR::ConsumesDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4227,7 +3801,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4235,7 +3808,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4245,7 +3817,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4253,7 +3824,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4263,7 +3833,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4271,7 +3840,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4281,7 +3849,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4289,7 +3856,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4299,7 +3865,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4307,7 +3872,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4317,7 +3881,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4325,7 +3888,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4335,7 +3897,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4343,7 +3904,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4353,7 +3913,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4361,7 +3920,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4371,7 +3929,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4379,7 +3936,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4392,7 +3948,6 @@ POA_CORBA::ComponentIR::ConsumesDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4400,7 +3955,6 @@ POA_CORBA::ComponentIR::ConsumesDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4413,7 +3967,6 @@ POA_CORBA::ComponentIR::ConsumesDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4421,7 +3974,6 @@ POA_CORBA::ComponentIR::ConsumesDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4431,7 +3983,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4439,7 +3990,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4449,7 +3999,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_event_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4457,7 +4006,6 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_event_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4470,7 +4018,6 @@ POA_CORBA::ComponentIR::ConsumesDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ComponentIR::EventPortDef * const impl = static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
@@ -4478,7 +4025,6 @@ POA_CORBA::ComponentIR::ConsumesDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4488,7 +4034,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4496,7 +4041,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4509,7 +4053,6 @@ POA_CORBA::ComponentIR::ComponentDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4517,7 +4060,6 @@ POA_CORBA::ComponentIR::ComponentDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4530,7 +4072,6 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4538,7 +4079,6 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4551,7 +4091,6 @@ POA_CORBA::ComponentIR::ComponentDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4559,7 +4098,6 @@ POA_CORBA::ComponentIR::ComponentDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4572,7 +4110,6 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4580,7 +4117,6 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4593,7 +4129,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4601,7 +4136,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4614,7 +4148,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4622,7 +4155,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4635,7 +4167,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4643,7 +4174,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4656,7 +4186,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4664,7 +4193,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4677,7 +4205,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4685,7 +4212,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4698,7 +4224,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4706,7 +4231,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4719,7 +4243,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4727,7 +4250,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4740,7 +4262,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4748,7 +4269,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4761,7 +4281,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4769,7 +4288,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4782,7 +4300,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4790,7 +4307,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4803,7 +4319,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4811,7 +4326,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4824,7 +4338,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4832,7 +4345,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4845,7 +4357,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4853,7 +4364,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4866,7 +4376,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4874,7 +4383,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4887,7 +4395,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4895,7 +4402,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4905,7 +4411,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4913,7 +4418,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4923,7 +4427,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4931,7 +4434,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4941,7 +4443,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4949,7 +4450,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4959,7 +4459,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4967,7 +4466,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4977,7 +4475,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -4985,7 +4482,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4995,7 +4491,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5003,7 +4498,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5013,7 +4507,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5021,7 +4514,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5031,7 +4523,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5039,7 +4530,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5049,7 +4539,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5057,7 +4546,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5070,7 +4558,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5078,7 +4565,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5091,7 +4577,6 @@ POA_CORBA::ComponentIR::ComponentDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5099,7 +4584,6 @@ POA_CORBA::ComponentIR::ComponentDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5109,7 +4593,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5117,7 +4600,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5127,7 +4609,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5135,7 +4616,6 @@ POA_CORBA::ComponentIR::ComponentDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5145,7 +4625,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5153,7 +4632,6 @@ POA_CORBA::ComponentIR::ComponentDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5166,7 +4644,6 @@ POA_CORBA::ComponentIR::ComponentDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5174,7 +4651,6 @@ POA_CORBA::ComponentIR::ComponentDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5187,7 +4663,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5195,7 +4670,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5208,7 +4682,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5216,7 +4689,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5229,7 +4701,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5237,7 +4708,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5250,7 +4720,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5258,7 +4727,6 @@ POA_CORBA::ComponentIR::ComponentDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5271,7 +4739,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
@@ -5279,7 +4746,6 @@ POA_CORBA::ComponentIR::ComponentDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5289,7 +4755,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5297,7 +4762,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5310,7 +4774,6 @@ POA_CORBA::ComponentIR::FactoryDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5318,7 +4781,6 @@ POA_CORBA::ComponentIR::FactoryDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5328,7 +4790,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5336,7 +4797,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5346,7 +4806,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5354,7 +4813,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5364,7 +4822,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5372,7 +4829,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5382,7 +4838,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5390,7 +4845,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5400,7 +4854,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5408,7 +4861,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5418,7 +4870,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5426,7 +4877,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5436,7 +4886,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5444,7 +4893,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5454,7 +4902,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5462,7 +4909,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5472,7 +4918,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5480,7 +4925,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5493,7 +4937,6 @@ POA_CORBA::ComponentIR::FactoryDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5501,7 +4944,6 @@ POA_CORBA::ComponentIR::FactoryDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5514,7 +4956,6 @@ POA_CORBA::ComponentIR::FactoryDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5522,7 +4963,6 @@ POA_CORBA::ComponentIR::FactoryDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5532,7 +4972,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_result_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5540,7 +4979,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_result_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5550,7 +4988,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_result_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5558,7 +4995,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_result_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5568,7 +5004,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_result_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5576,7 +5011,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_result_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5586,7 +5020,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_params_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5594,7 +5027,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_params_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5604,7 +5036,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_params_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5612,7 +5043,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_params_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5622,7 +5052,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5630,7 +5059,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5640,7 +5068,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5648,7 +5075,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5658,7 +5084,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_contexts_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5666,7 +5091,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_contexts_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5676,7 +5100,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_contexts_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5684,7 +5107,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_contexts_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5694,7 +5116,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5702,7 +5123,6 @@ POA_CORBA::ComponentIR::FactoryDef::_get_exceptions_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5712,7 +5132,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
@@ -5720,7 +5139,6 @@ POA_CORBA::ComponentIR::FactoryDef::_set_exceptions_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5730,7 +5148,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5738,7 +5155,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5751,7 +5167,6 @@ POA_CORBA::ComponentIR::FinderDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5759,7 +5174,6 @@ POA_CORBA::ComponentIR::FinderDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5769,7 +5183,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5777,7 +5190,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5787,7 +5199,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5795,7 +5206,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5805,7 +5215,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5813,7 +5222,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5823,7 +5231,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5831,7 +5238,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5841,7 +5247,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5849,7 +5254,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5859,7 +5263,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5867,7 +5270,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5877,7 +5279,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5885,7 +5286,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5895,7 +5295,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5903,7 +5302,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5913,7 +5311,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5921,7 +5318,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5934,7 +5330,6 @@ POA_CORBA::ComponentIR::FinderDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5942,7 +5337,6 @@ POA_CORBA::ComponentIR::FinderDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5955,7 +5349,6 @@ POA_CORBA::ComponentIR::FinderDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5963,7 +5356,6 @@ POA_CORBA::ComponentIR::FinderDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5973,7 +5365,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_result_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5981,7 +5372,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_result_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5991,7 +5381,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_result_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -5999,7 +5388,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_result_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6009,7 +5397,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_result_def_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6017,7 +5404,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_result_def_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6027,7 +5413,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_params_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6035,7 +5420,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_params_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6045,7 +5429,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_params_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6053,7 +5436,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_params_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6063,7 +5445,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6071,7 +5452,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6081,7 +5461,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_mode_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6089,7 +5468,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_mode_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6099,7 +5477,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_contexts_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6107,7 +5484,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_contexts_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6117,7 +5493,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_contexts_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6125,7 +5500,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_contexts_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6135,7 +5509,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6143,7 +5516,6 @@ POA_CORBA::ComponentIR::FinderDef::_get_exceptions_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6153,7 +5525,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_exceptions_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::OperationDef * const impl = static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
@@ -6161,7 +5532,6 @@ POA_CORBA::ComponentIR::FinderDef::_set_exceptions_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6171,7 +5541,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6179,7 +5548,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6192,7 +5560,6 @@ POA_CORBA::ComponentIR::HomeDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6200,7 +5567,6 @@ POA_CORBA::ComponentIR::HomeDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6213,7 +5579,6 @@ POA_CORBA::ComponentIR::HomeDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6221,7 +5586,6 @@ POA_CORBA::ComponentIR::HomeDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6234,7 +5598,6 @@ POA_CORBA::ComponentIR::HomeDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6242,7 +5605,6 @@ POA_CORBA::ComponentIR::HomeDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6255,7 +5617,6 @@ POA_CORBA::ComponentIR::HomeDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6263,7 +5624,6 @@ POA_CORBA::ComponentIR::HomeDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6276,7 +5636,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6284,7 +5643,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6297,7 +5655,6 @@ POA_CORBA::ComponentIR::HomeDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6305,7 +5662,6 @@ POA_CORBA::ComponentIR::HomeDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6318,7 +5674,6 @@ POA_CORBA::ComponentIR::HomeDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6326,7 +5681,6 @@ POA_CORBA::ComponentIR::HomeDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6339,7 +5693,6 @@ POA_CORBA::ComponentIR::HomeDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6347,7 +5700,6 @@ POA_CORBA::ComponentIR::HomeDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6360,7 +5712,6 @@ POA_CORBA::ComponentIR::HomeDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6368,7 +5719,6 @@ POA_CORBA::ComponentIR::HomeDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6381,7 +5731,6 @@ POA_CORBA::ComponentIR::HomeDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6389,7 +5738,6 @@ POA_CORBA::ComponentIR::HomeDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6402,7 +5750,6 @@ POA_CORBA::ComponentIR::HomeDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6410,7 +5757,6 @@ POA_CORBA::ComponentIR::HomeDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6423,7 +5769,6 @@ POA_CORBA::ComponentIR::HomeDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6431,7 +5776,6 @@ POA_CORBA::ComponentIR::HomeDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6444,7 +5788,6 @@ POA_CORBA::ComponentIR::HomeDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6452,7 +5795,6 @@ POA_CORBA::ComponentIR::HomeDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6465,7 +5807,6 @@ POA_CORBA::ComponentIR::HomeDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6473,7 +5814,6 @@ POA_CORBA::ComponentIR::HomeDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6486,7 +5826,6 @@ POA_CORBA::ComponentIR::HomeDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6494,7 +5833,6 @@ POA_CORBA::ComponentIR::HomeDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6507,7 +5845,6 @@ POA_CORBA::ComponentIR::HomeDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6515,7 +5852,6 @@ POA_CORBA::ComponentIR::HomeDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6528,7 +5864,6 @@ POA_CORBA::ComponentIR::HomeDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6536,7 +5871,6 @@ POA_CORBA::ComponentIR::HomeDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6549,7 +5883,6 @@ POA_CORBA::ComponentIR::HomeDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6557,7 +5890,6 @@ POA_CORBA::ComponentIR::HomeDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6570,7 +5902,6 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6578,7 +5909,6 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6588,7 +5918,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6596,7 +5925,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6606,7 +5934,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6614,7 +5941,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6624,7 +5950,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6632,7 +5957,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6642,7 +5966,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6650,7 +5973,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6660,7 +5982,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6668,7 +5989,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6678,7 +5998,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6686,7 +6005,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6696,7 +6014,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6704,7 +6021,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6714,7 +6030,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6722,7 +6037,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6732,7 +6046,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6740,7 +6053,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6753,7 +6065,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6761,7 +6072,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6774,7 +6084,6 @@ POA_CORBA::ComponentIR::HomeDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6782,7 +6091,6 @@ POA_CORBA::ComponentIR::HomeDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6792,7 +6100,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6800,7 +6107,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6810,7 +6116,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6818,7 +6123,6 @@ POA_CORBA::ComponentIR::HomeDef::_get_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6828,7 +6132,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_base_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6836,7 +6139,6 @@ POA_CORBA::ComponentIR::HomeDef::_set_base_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6849,7 +6151,6 @@ POA_CORBA::ComponentIR::HomeDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6857,7 +6158,6 @@ POA_CORBA::ComponentIR::HomeDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6870,7 +6170,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6878,7 +6177,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6891,7 +6189,6 @@ POA_CORBA::ComponentIR::HomeDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6899,7 +6196,6 @@ POA_CORBA::ComponentIR::HomeDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6912,7 +6208,6 @@ POA_CORBA::ComponentIR::HomeDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceDef * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6920,7 +6215,6 @@ POA_CORBA::ComponentIR::HomeDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6933,7 +6227,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_ext_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6941,7 +6234,6 @@ POA_CORBA::ComponentIR::HomeDef::describe_ext_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6954,7 +6246,6 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::InterfaceAttrExtension * const impl = static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
@@ -6962,7 +6253,6 @@ POA_CORBA::ComponentIR::HomeDef::create_ext_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
index 0ab0e5470dc..cabe0a4db2b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
@@ -86,14 +86,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -103,7 +101,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -114,7 +111,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -126,7 +122,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -140,7 +135,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -153,7 +147,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -166,7 +159,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -181,7 +173,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -195,7 +186,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -210,7 +200,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -224,7 +213,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -238,7 +226,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -252,7 +239,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -272,7 +258,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -286,7 +271,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -300,7 +284,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -313,7 +296,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -327,7 +309,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -341,7 +322,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -361,7 +341,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -371,7 +350,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -382,7 +360,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -392,7 +369,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -403,7 +379,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -413,7 +388,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -424,7 +398,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -434,7 +407,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -444,7 +416,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -454,7 +425,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -464,7 +434,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -477,7 +446,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -487,7 +455,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -497,7 +464,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -508,7 +474,6 @@ namespace POA_CORBA
 
       void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -518,7 +483,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InitializerSeq * initializers (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -529,7 +493,6 @@ namespace POA_CORBA
 
       void initializers (
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -539,7 +502,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDef_ptr base_value (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -550,7 +512,6 @@ namespace POA_CORBA
 
       void base_value (
           ::CORBA::ValueDef_ptr base_value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -560,7 +521,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDefSeq * abstract_base_values (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -571,7 +531,6 @@ namespace POA_CORBA
 
       void abstract_base_values (
           const ::CORBA::ValueDefSeq & abstract_base_values
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -581,7 +540,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_abstract (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -592,7 +550,6 @@ namespace POA_CORBA
 
       void is_abstract (
           ::CORBA::Boolean is_abstract
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -602,7 +559,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_custom (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -613,7 +569,6 @@ namespace POA_CORBA
 
       void is_custom (
           ::CORBA::Boolean is_custom
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -623,7 +578,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_truncatable (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -634,7 +588,6 @@ namespace POA_CORBA
 
       void is_truncatable (
           ::CORBA::Boolean is_truncatable
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -645,7 +598,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -655,7 +607,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDef::FullValueDescription * describe_value (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -670,7 +621,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::Visibility access
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -685,7 +635,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::AttributeMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -703,7 +652,6 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions,
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -713,7 +661,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExtInitializerSeq * ext_initializers (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -724,7 +671,6 @@ namespace POA_CORBA
 
       void ext_initializers (
           const ::CORBA::ExtInitializerSeq & ext_initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -734,7 +680,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -751,7 +696,6 @@ namespace POA_CORBA
           ::CORBA::AttributeMode mode,
           const ::CORBA::ExceptionDefSeq & get_exceptions,
           const ::CORBA::ExceptionDefSeq & set_exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -804,14 +748,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -821,7 +763,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -832,7 +773,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -844,7 +784,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -858,7 +797,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -871,7 +809,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -884,7 +821,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -899,7 +835,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -913,7 +848,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -928,7 +862,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -942,7 +875,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -956,7 +888,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -970,7 +901,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -990,7 +920,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1004,7 +933,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1018,7 +946,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1031,7 +958,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1045,7 +971,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1059,7 +984,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1079,7 +1003,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1094,7 +1017,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1111,7 +1033,6 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1131,7 +1052,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1184,14 +1104,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1201,7 +1119,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1212,7 +1129,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1224,7 +1140,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1238,7 +1153,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1251,7 +1165,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1264,7 +1177,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1279,7 +1191,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1293,7 +1204,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1308,7 +1218,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1322,7 +1231,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1336,7 +1244,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1350,7 +1257,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1370,7 +1276,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1384,7 +1289,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1398,7 +1302,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1411,7 +1314,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1425,7 +1327,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1439,7 +1340,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1459,7 +1359,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1469,7 +1368,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1480,7 +1378,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1490,7 +1387,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1501,7 +1397,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1511,7 +1406,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1522,7 +1416,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1532,7 +1425,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1542,7 +1434,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1552,7 +1443,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1562,7 +1452,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1575,7 +1464,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1590,7 +1478,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1607,7 +1494,6 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1627,7 +1513,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1680,14 +1565,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1697,7 +1580,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1708,7 +1590,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1720,7 +1601,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1734,7 +1614,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1747,7 +1626,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1760,7 +1638,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1775,7 +1652,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1789,7 +1665,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1804,7 +1679,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1818,7 +1692,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1832,7 +1705,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1846,7 +1718,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1866,7 +1737,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1880,7 +1750,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1894,7 +1763,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1907,7 +1775,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1921,7 +1788,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1935,7 +1801,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1955,7 +1820,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1966,7 +1830,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup_id (
           const char * search_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1977,7 +1840,6 @@ namespace POA_CORBA
 
       ::CORBA::TypeCode_ptr get_canonical_typecode (
           ::CORBA::TypeCode_ptr tc
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1988,7 +1850,6 @@ namespace POA_CORBA
 
       ::CORBA::PrimitiveDef_ptr get_primitive (
           ::CORBA::PrimitiveKind kind
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -1999,7 +1860,6 @@ namespace POA_CORBA
 
       ::CORBA::StringDef_ptr create_string (
           ::CORBA::ULong bound
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2010,7 +1870,6 @@ namespace POA_CORBA
 
       ::CORBA::WstringDef_ptr create_wstring (
           ::CORBA::ULong bound
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2022,7 +1881,6 @@ namespace POA_CORBA
       ::CORBA::SequenceDef_ptr create_sequence (
           ::CORBA::ULong bound,
           ::CORBA::IDLType_ptr element_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2034,7 +1892,6 @@ namespace POA_CORBA
       ::CORBA::ArrayDef_ptr create_array (
           ::CORBA::ULong length,
           ::CORBA::IDLType_ptr element_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2046,7 +1903,6 @@ namespace POA_CORBA
       ::CORBA::FixedDef_ptr create_fixed (
           ::CORBA::UShort digits,
           ::CORBA::Short scale
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2061,7 +1917,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::ComponentIR::ComponentDef_ptr base_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2078,7 +1933,6 @@ namespace POA_CORBA
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
           const ::CORBA::InterfaceDefSeq & supports_interfaces,
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2098,7 +1952,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2151,14 +2004,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2168,7 +2019,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2178,7 +2028,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2189,7 +2038,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2199,7 +2047,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2210,7 +2057,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2220,7 +2066,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2231,7 +2076,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2241,7 +2085,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2251,7 +2094,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2261,7 +2103,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2271,7 +2112,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2284,7 +2124,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2294,7 +2133,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef_ptr interface_type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2305,7 +2143,6 @@ namespace POA_CORBA
 
       void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2358,14 +2195,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2375,7 +2210,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2385,7 +2219,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2396,7 +2229,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2406,7 +2238,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2417,7 +2248,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2427,7 +2257,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2438,7 +2267,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2448,7 +2276,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2458,7 +2285,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2468,7 +2294,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2478,7 +2303,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2491,7 +2315,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2501,7 +2324,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef_ptr interface_type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2512,7 +2334,6 @@ namespace POA_CORBA
 
       void interface_type (
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2522,7 +2343,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Boolean is_multiple (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2533,7 +2353,6 @@ namespace POA_CORBA
 
       void is_multiple (
           ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2586,14 +2405,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2603,7 +2420,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2613,7 +2429,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2624,7 +2439,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2634,7 +2448,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2645,7 +2458,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2655,7 +2467,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2666,7 +2477,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2676,7 +2486,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2686,7 +2495,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2696,7 +2504,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2706,7 +2513,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2719,7 +2525,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2729,7 +2534,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2740,7 +2544,6 @@ namespace POA_CORBA
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2751,7 +2554,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2804,14 +2606,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2821,7 +2621,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2831,7 +2630,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2842,7 +2640,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2852,7 +2649,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2863,7 +2659,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2873,7 +2668,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2884,7 +2678,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2894,7 +2687,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2904,7 +2696,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2914,7 +2705,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2924,7 +2714,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2937,7 +2726,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2947,7 +2735,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2958,7 +2745,6 @@ namespace POA_CORBA
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -2969,7 +2755,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3022,14 +2807,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3039,7 +2822,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3049,7 +2831,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3060,7 +2841,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3070,7 +2850,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3081,7 +2860,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3091,7 +2869,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3102,7 +2879,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3112,7 +2888,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3122,7 +2897,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3132,7 +2906,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3142,7 +2915,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3155,7 +2927,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3165,7 +2936,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3176,7 +2946,6 @@ namespace POA_CORBA
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3187,7 +2956,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3240,14 +3008,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3257,7 +3023,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3267,7 +3032,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3278,7 +3042,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3288,7 +3051,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3299,7 +3061,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3309,7 +3070,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3320,7 +3080,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3330,7 +3089,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3340,7 +3098,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3350,7 +3107,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3360,7 +3116,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3373,7 +3128,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3383,7 +3137,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::EventDef_ptr event (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3394,7 +3147,6 @@ namespace POA_CORBA
 
       void event (
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3405,7 +3157,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * event_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3458,14 +3209,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3475,7 +3224,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3486,7 +3234,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3498,7 +3245,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3512,7 +3258,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3525,7 +3270,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3538,7 +3282,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3553,7 +3296,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3567,7 +3309,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3582,7 +3323,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3596,7 +3336,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3610,7 +3349,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3624,7 +3362,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3644,7 +3381,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3658,7 +3394,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3672,7 +3407,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3685,7 +3419,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3699,7 +3432,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3713,7 +3445,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3733,7 +3464,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3743,7 +3473,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3754,7 +3483,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3764,7 +3492,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3775,7 +3502,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3785,7 +3511,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3796,7 +3521,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3806,7 +3530,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3816,7 +3539,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3826,7 +3548,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3836,7 +3557,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3849,7 +3569,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3859,7 +3578,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3869,7 +3587,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * base_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3880,7 +3597,6 @@ namespace POA_CORBA
 
       void base_interfaces (
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3891,7 +3607,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * interface_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3901,7 +3616,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3916,7 +3630,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::AttributeMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3934,7 +3647,6 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions,
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3944,7 +3656,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3961,7 +3672,6 @@ namespace POA_CORBA
           ::CORBA::AttributeMode mode,
           const ::CORBA::ExceptionDefSeq & get_exceptions,
           const ::CORBA::ExceptionDefSeq & set_exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3971,7 +3681,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::ComponentDef_ptr base_component (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3982,7 +3691,6 @@ namespace POA_CORBA
 
       void base_component (
           ::CORBA::ComponentIR::ComponentDef_ptr base_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -3992,7 +3700,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4003,7 +3710,6 @@ namespace POA_CORBA
 
       void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4017,7 +3723,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4032,7 +3737,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::InterfaceDef_ptr interface_type,
           ::CORBA::Boolean is_multiple
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4046,7 +3750,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4060,7 +3763,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4074,7 +3776,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::ComponentIR::EventDef_ptr event
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4127,14 +3828,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4144,7 +3843,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4154,7 +3852,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4165,7 +3862,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4175,7 +3871,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4186,7 +3881,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4196,7 +3890,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4207,7 +3900,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4217,7 +3909,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4227,7 +3918,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4237,7 +3927,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4247,7 +3936,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4260,7 +3948,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4270,7 +3957,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr result (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4280,7 +3966,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::IDLType_ptr result_def (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4291,7 +3976,6 @@ namespace POA_CORBA
 
       void result_def (
           ::CORBA::IDLType_ptr result_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4301,7 +3985,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ParDescriptionSeq * params (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4312,7 +3995,6 @@ namespace POA_CORBA
 
       void params (
           const ::CORBA::ParDescriptionSeq & params
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4322,7 +4004,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::OperationMode mode (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4333,7 +4014,6 @@ namespace POA_CORBA
 
       void mode (
           ::CORBA::OperationMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4343,7 +4023,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ContextIdSeq * contexts (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4354,7 +4033,6 @@ namespace POA_CORBA
 
       void contexts (
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4364,7 +4042,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExceptionDefSeq * exceptions (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4375,7 +4052,6 @@ namespace POA_CORBA
 
       void exceptions (
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4428,14 +4104,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4445,7 +4119,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4455,7 +4128,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4466,7 +4138,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4476,7 +4147,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4487,7 +4157,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4497,7 +4166,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4508,7 +4176,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4518,7 +4185,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4528,7 +4194,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4538,7 +4203,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4548,7 +4212,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4561,7 +4224,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4571,7 +4233,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr result (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4581,7 +4242,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::IDLType_ptr result_def (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4592,7 +4252,6 @@ namespace POA_CORBA
 
       void result_def (
           ::CORBA::IDLType_ptr result_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4602,7 +4261,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ParDescriptionSeq * params (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4613,7 +4271,6 @@ namespace POA_CORBA
 
       void params (
           const ::CORBA::ParDescriptionSeq & params
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4623,7 +4280,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::OperationMode mode (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4634,7 +4290,6 @@ namespace POA_CORBA
 
       void mode (
           ::CORBA::OperationMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4644,7 +4299,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ContextIdSeq * contexts (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4655,7 +4309,6 @@ namespace POA_CORBA
 
       void contexts (
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4665,7 +4318,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ExceptionDefSeq * exceptions (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4676,7 +4328,6 @@ namespace POA_CORBA
 
       void exceptions (
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4729,14 +4380,12 @@ namespace POA_CORBA
       void _is_owner ( ::CORBA::Boolean b);
       // overridden ServantBase operations
       PortableServer::POA_ptr _default_POA (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
 
       // TAO_IDL - Generated from
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::DefinitionKind def_kind (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4746,7 +4395,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       void destroy (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4757,7 +4405,6 @@ namespace POA_CORBA
 
       ::CORBA::Contained_ptr lookup (
           const char * search_name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4769,7 +4416,6 @@ namespace POA_CORBA
       ::CORBA::ContainedSeq * contents (
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4783,7 +4429,6 @@ namespace POA_CORBA
           ::CORBA::Long levels_to_search,
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4796,7 +4441,6 @@ namespace POA_CORBA
           ::CORBA::DefinitionKind limit_type,
           ::CORBA::Boolean exclude_inherited,
           ::CORBA::Long max_returned_objs
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4809,7 +4453,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4824,7 +4467,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           const ::CORBA::Any & value
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4838,7 +4480,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4853,7 +4494,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr discriminator_type,
           const ::CORBA::UnionMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4867,7 +4507,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::EnumMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4881,7 +4520,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4895,7 +4533,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4915,7 +4552,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::InitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4929,7 +4565,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           ::CORBA::IDLType_ptr original_type_def
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4943,7 +4578,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::StructMemberSeq & members
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4956,7 +4590,6 @@ namespace POA_CORBA
           const char * id,
           const char * name,
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4970,7 +4603,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -4984,7 +4616,6 @@ namespace POA_CORBA
           const char * name,
           const char * version,
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5004,7 +4635,6 @@ namespace POA_CORBA
           const ::CORBA::ValueDefSeq & abstract_base_values,
           const ::CORBA::InterfaceDefSeq & supported_interfaces,
           const ::CORBA::ExtInitializerSeq & initializers
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5014,7 +4644,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * id (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5025,7 +4654,6 @@ namespace POA_CORBA
 
       void id (
           const char * id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5035,7 +4663,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5046,7 +4673,6 @@ namespace POA_CORBA
 
       void name (
           const char * name
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5056,7 +4682,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * version (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5067,7 +4692,6 @@ namespace POA_CORBA
 
       void version (
           const char * version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5077,7 +4701,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Container_ptr defined_in (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5087,7 +4710,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       char * absolute_name (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5097,7 +4719,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Repository_ptr containing_repository (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5107,7 +4728,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::Contained::Description * describe (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5120,7 +4740,6 @@ namespace POA_CORBA
           ::CORBA::Container_ptr new_container,
           const char * new_name,
           const char * new_version
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5130,7 +4749,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::TypeCode_ptr type (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5140,7 +4758,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * base_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5151,7 +4768,6 @@ namespace POA_CORBA
 
       void base_interfaces (
           const ::CORBA::InterfaceDefSeq & base_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5162,7 +4778,6 @@ namespace POA_CORBA
 
       ::CORBA::Boolean is_a (
           const char * interface_id
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5172,7 +4787,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5187,7 +4801,6 @@ namespace POA_CORBA
           const char * version,
           ::CORBA::IDLType_ptr type,
           ::CORBA::AttributeMode mode
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5205,7 +4818,6 @@ namespace POA_CORBA
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions,
           const ::CORBA::ContextIdSeq & contexts
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5215,7 +4827,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5232,7 +4843,6 @@ namespace POA_CORBA
           ::CORBA::AttributeMode mode,
           const ::CORBA::ExceptionDefSeq & get_exceptions,
           const ::CORBA::ExceptionDefSeq & set_exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5242,7 +4852,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::HomeDef_ptr base_home (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5253,7 +4862,6 @@ namespace POA_CORBA
 
       void base_home (
           ::CORBA::ComponentIR::HomeDef_ptr base_home
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5263,7 +4871,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::InterfaceDefSeq * supported_interfaces (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5274,7 +4881,6 @@ namespace POA_CORBA
 
       void supported_interfaces (
           const ::CORBA::InterfaceDefSeq & supported_interfaces
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5284,7 +4890,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ComponentIR::ComponentDef_ptr managed_component (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5295,7 +4900,6 @@ namespace POA_CORBA
 
       void managed_component (
           ::CORBA::ComponentIR::ComponentDef_ptr managed_component
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5305,7 +4909,6 @@ namespace POA_CORBA
       // be\be_visitor_operation/tie_sh.cpp:60
 
       ::CORBA::ValueDef_ptr primary_key (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5316,7 +4919,6 @@ namespace POA_CORBA
 
       void primary_key (
           ::CORBA::ValueDef_ptr primary_key
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5331,7 +4933,6 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
@@ -5346,7 +4947,6 @@ namespace POA_CORBA
           const char * version,
           const ::CORBA::ParDescriptionSeq & params,
           const ::CORBA::ExceptionDefSeq & exceptions
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
         ACE_THROW_SPEC ((
           ::CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
index eae67ae179d..677f509e0a4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
@@ -83,7 +83,7 @@ POA_CORBA::ComponentIR::EventDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -95,7 +95,7 @@ POA_CORBA::ComponentIR::EventDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -113,55 +113,50 @@ POA_CORBA::ComponentIR::EventDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::EventDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EventDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->EventDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->EventDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -169,18 +164,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -189,11 +182,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -202,7 +194,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -213,11 +204,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -225,7 +215,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -235,11 +224,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -247,7 +235,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -257,11 +244,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -271,7 +257,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -283,11 +268,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -296,7 +280,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -307,11 +290,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -321,7 +303,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -333,11 +314,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -346,7 +326,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -357,11 +336,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -370,7 +348,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -381,11 +358,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -394,7 +370,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -405,11 +380,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -424,7 +398,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -441,11 +414,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -454,7 +426,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -465,11 +436,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -478,7 +448,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -489,11 +458,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -501,7 +469,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -511,11 +478,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -524,7 +490,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -535,11 +500,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -548,7 +512,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -559,11 +522,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -578,7 +540,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -595,33 +556,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -629,33 +586,29 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -663,33 +616,29 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -697,75 +646,66 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -773,7 +713,6 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -783,49 +722,43 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -833,33 +766,29 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -867,33 +796,29 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::initializers  (
 {
   this->ptr_->initializers (
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
     ::CORBA::ValueDef_ptr base_value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -901,33 +826,29 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::base_value  (
 {
   this->ptr_->base_value (
     base_value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDefSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->abstract_base_values (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
     const ::CORBA::ValueDefSeq & abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -935,33 +856,29 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::abstract_base_values  (
 {
   this->ptr_->abstract_base_values (
     abstract_base_values
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_abstract (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
     ::CORBA::Boolean is_abstract
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -969,33 +886,29 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_abstract  (
 {
   this->ptr_->is_abstract (
     is_abstract
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_custom (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
     ::CORBA::Boolean is_custom
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1003,33 +916,29 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_custom  (
 {
   this->ptr_->is_custom (
     is_custom
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_truncatable (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
     ::CORBA::Boolean is_truncatable
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1037,17 +946,15 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::is_truncatable  (
 {
   this->ptr_->is_truncatable (
     is_truncatable
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventDef_tie<T>::is_a  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1055,27 +962,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1085,7 +989,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::Visibility access
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1097,11 +1000,10 @@ template <class T> ACE_INLINE
     version,
     type,
     access
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1111,7 +1013,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1123,11 +1024,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1140,7 +1040,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1155,33 +1054,29 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExtInitializerSeq * POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->ext_initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
     const ::CORBA::ExtInitializerSeq & ext_initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1189,27 +1084,24 @@ void POA_CORBA::ComponentIR::EventDef_tie<T>::ext_initializers  (
 {
   this->ptr_->ext_initializers (
     ext_initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ComponentIR::EventDef_tie<T>::describe_ext_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1221,7 +1113,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1235,7 +1126,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1292,7 +1182,7 @@ POA_CORBA::ComponentIR::Container_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -1304,7 +1194,7 @@ POA_CORBA::ComponentIR::Container_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -1322,55 +1212,50 @@ POA_CORBA::ComponentIR::Container_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::Container_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::Container_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->Container::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->Container::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::Container_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::Container_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Container_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1378,18 +1263,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::Container_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1398,11 +1281,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1411,7 +1293,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1422,11 +1303,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1434,7 +1314,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1444,11 +1323,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1456,7 +1334,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1466,11 +1343,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1480,7 +1356,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1492,11 +1367,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1505,7 +1379,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1516,11 +1389,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1530,7 +1402,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1542,11 +1413,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1555,7 +1425,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1566,11 +1435,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1579,7 +1447,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1590,11 +1457,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1603,7 +1469,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1614,11 +1479,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1633,7 +1497,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1650,11 +1513,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1663,7 +1525,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1674,11 +1535,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1687,7 +1547,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1698,11 +1557,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1710,7 +1568,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1720,11 +1577,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1733,7 +1589,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1744,11 +1599,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1757,7 +1611,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1768,11 +1621,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1787,7 +1639,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1804,11 +1655,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1818,7 +1668,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::ComponentIR::ComponentDef_ptr base_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1830,11 +1679,10 @@ template <class T> ACE_INLINE
     version,
     base_component,
     supports_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1846,7 +1694,6 @@ template <class T> ACE_INLINE
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces,
     ::CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1860,11 +1707,10 @@ template <class T> ACE_INLINE
     managed_component,
     supports_interfaces,
     primary_key
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1879,7 +1725,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1896,7 +1741,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1953,7 +1797,7 @@ POA_CORBA::ComponentIR::ModuleDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -1965,7 +1809,7 @@ POA_CORBA::ComponentIR::ModuleDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -1983,55 +1827,50 @@ POA_CORBA::ComponentIR::ModuleDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ModuleDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ModuleDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ModuleDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ModuleDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ModuleDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2039,18 +1878,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::ModuleDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2059,11 +1896,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2072,7 +1908,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2083,11 +1918,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2095,7 +1929,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2105,11 +1938,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2117,7 +1949,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2127,11 +1958,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2141,7 +1971,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2153,11 +1982,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2166,7 +1994,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2177,11 +2004,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2191,7 +2017,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2203,11 +2028,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2216,7 +2040,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2227,11 +2050,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2240,7 +2062,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2251,11 +2072,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2264,7 +2084,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2275,11 +2094,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2294,7 +2112,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2311,11 +2128,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2324,7 +2140,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2335,11 +2150,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2348,7 +2162,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2359,11 +2172,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2371,7 +2183,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2381,11 +2192,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2394,7 +2204,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2405,11 +2214,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2418,7 +2226,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2429,11 +2236,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2448,7 +2254,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2465,33 +2270,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2499,33 +2300,29 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2533,33 +2330,29 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2567,75 +2360,66 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ModuleDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ModuleDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ModuleDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2643,7 +2427,6 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2653,11 +2436,10 @@ void POA_CORBA::ComponentIR::ModuleDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2667,7 +2449,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::ComponentIR::ComponentDef_ptr base_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2679,11 +2460,10 @@ template <class T> ACE_INLINE
     version,
     base_component,
     supports_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2695,7 +2475,6 @@ template <class T> ACE_INLINE
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces,
     ::CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2709,11 +2488,10 @@ template <class T> ACE_INLINE
     managed_component,
     supports_interfaces,
     primary_key
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2728,7 +2506,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2745,7 +2522,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2802,7 +2578,7 @@ POA_CORBA::ComponentIR::Repository_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -2814,7 +2590,7 @@ POA_CORBA::ComponentIR::Repository_tie<T>::_tied_object (T *obj, ::CORBA::Boolea
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -2832,55 +2608,50 @@ POA_CORBA::ComponentIR::Repository_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::Repository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::Repository_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->Repository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->Repository::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::Repository_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::Repository_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2888,18 +2659,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::Repository_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2908,11 +2677,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2921,7 +2689,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2932,11 +2699,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2944,7 +2710,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2954,11 +2719,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2966,7 +2730,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2976,11 +2739,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2990,7 +2752,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3002,11 +2763,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3015,7 +2775,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3026,11 +2785,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3040,7 +2798,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3052,11 +2809,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3065,7 +2821,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3076,11 +2831,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3089,7 +2843,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3100,11 +2853,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3113,7 +2865,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3124,11 +2875,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3143,7 +2893,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3160,11 +2909,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3173,7 +2921,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3184,11 +2931,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3197,7 +2943,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3208,11 +2953,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3220,7 +2964,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3230,11 +2973,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3243,7 +2985,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3254,11 +2995,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3267,7 +3007,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3278,11 +3017,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3297,7 +3035,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3314,17 +3051,15 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::Repository_tie<T>::lookup_id  (
     const char * search_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3332,17 +3067,15 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup_id (
     search_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_canonical_typecode  (
     ::CORBA::TypeCode_ptr tc
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3350,17 +3083,15 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->get_canonical_typecode (
     tc
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::PrimitiveDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::get_primitive  (
     ::CORBA::PrimitiveKind kind
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3368,17 +3099,15 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->get_primitive (
     kind
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::StringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_string  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3386,17 +3115,15 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->create_string (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::WstringDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_wstring  (
     ::CORBA::ULong bound
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3404,18 +3131,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->create_wstring (
     bound
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::SequenceDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_sequence  (
     ::CORBA::ULong bound,
     ::CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3424,18 +3149,16 @@ template <class T> ACE_INLINE
   return this->ptr_->create_sequence (
     bound,
     element_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ArrayDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_array  (
     ::CORBA::ULong length,
     ::CORBA::IDLType_ptr element_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3444,18 +3167,16 @@ template <class T> ACE_INLINE
   return this->ptr_->create_array (
     length,
     element_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::FixedDef_ptr POA_CORBA::ComponentIR::Repository_tie<T>::create_fixed  (
     ::CORBA::UShort digits,
     ::CORBA::Short scale
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3464,11 +3185,10 @@ template <class T> ACE_INLINE
   return this->ptr_->create_fixed (
     digits,
     scale
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3478,7 +3198,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::ComponentIR::ComponentDef_ptr base_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3490,11 +3209,10 @@ template <class T> ACE_INLINE
     version,
     base_component,
     supports_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3506,7 +3224,6 @@ template <class T> ACE_INLINE
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component,
     const ::CORBA::InterfaceDefSeq & supports_interfaces,
     ::CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3520,11 +3237,10 @@ template <class T> ACE_INLINE
     managed_component,
     supports_interfaces,
     primary_key
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3539,7 +3255,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3556,7 +3271,6 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3613,7 +3327,7 @@ POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -3625,7 +3339,7 @@ POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_tied_object (T *obj, ::CORBA::Boole
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -3643,71 +3357,64 @@ POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ProvidesDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ProvidesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ProvidesDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ProvidesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3715,33 +3422,29 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3749,33 +3452,29 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3783,75 +3482,66 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ProvidesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3859,7 +3549,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3869,33 +3558,29 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
     ::CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3903,7 +3588,6 @@ void POA_CORBA::ComponentIR::ProvidesDef_tie<T>::interface_type  (
 {
   this->ptr_->interface_type (
     interface_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3960,7 +3644,7 @@ POA_CORBA::ComponentIR::UsesDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -3972,7 +3656,7 @@ POA_CORBA::ComponentIR::UsesDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean r
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -3990,71 +3674,64 @@ POA_CORBA::ComponentIR::UsesDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::UsesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::UsesDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->UsesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->UsesDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::UsesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4062,33 +3739,29 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4096,33 +3769,29 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4130,75 +3799,66 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::UsesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::UsesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -4206,7 +3866,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4216,33 +3875,29 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef_ptr POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
     ::CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4250,33 +3905,29 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::interface_type  (
 {
   this->ptr_->interface_type (
     interface_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_multiple (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
     ::CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4284,7 +3935,6 @@ void POA_CORBA::ComponentIR::UsesDef_tie<T>::is_multiple  (
 {
   this->ptr_->is_multiple (
     is_multiple
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4341,7 +3991,7 @@ POA_CORBA::ComponentIR::EventPortDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -4353,7 +4003,7 @@ POA_CORBA::ComponentIR::EventPortDef_tie<T>::_tied_object (T *obj, ::CORBA::Bool
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -4371,71 +4021,64 @@ POA_CORBA::ComponentIR::EventPortDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::EventPortDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EventPortDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->EventPortDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->EventPortDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EventPortDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4443,33 +4086,29 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4477,33 +4116,29 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4511,75 +4146,66 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EventPortDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EventPortDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -4587,7 +4213,6 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4597,33 +4222,29 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4631,17 +4252,15 @@ void POA_CORBA::ComponentIR::EventPortDef_tie<T>::event  (
 {
   this->ptr_->event (
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef_tie<T>::is_a  (
     const char * event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4649,7 +4268,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     event_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4706,7 +4324,7 @@ POA_CORBA::ComponentIR::EmitsDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -4718,7 +4336,7 @@ POA_CORBA::ComponentIR::EmitsDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -4736,71 +4354,64 @@ POA_CORBA::ComponentIR::EmitsDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::EmitsDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::EmitsDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->EmitsDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->EmitsDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::EmitsDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4808,33 +4419,29 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4842,33 +4449,29 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4876,75 +4479,66 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::EmitsDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::EmitsDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -4952,7 +4546,6 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4962,33 +4555,29 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -4996,17 +4585,15 @@ void POA_CORBA::ComponentIR::EmitsDef_tie<T>::event  (
 {
   this->ptr_->event (
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef_tie<T>::is_a  (
     const char * event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5014,7 +4601,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     event_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5071,7 +4657,7 @@ POA_CORBA::ComponentIR::PublishesDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -5083,7 +4669,7 @@ POA_CORBA::ComponentIR::PublishesDef_tie<T>::_tied_object (T *obj, ::CORBA::Bool
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -5101,71 +4687,64 @@ POA_CORBA::ComponentIR::PublishesDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::PublishesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::PublishesDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->PublishesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->PublishesDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::PublishesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5173,33 +4752,29 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5207,33 +4782,29 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5241,75 +4812,66 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::PublishesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::PublishesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5317,7 +4879,6 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5327,33 +4888,29 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5361,17 +4918,15 @@ void POA_CORBA::ComponentIR::PublishesDef_tie<T>::event  (
 {
   this->ptr_->event (
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef_tie<T>::is_a  (
     const char * event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5379,7 +4934,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     event_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5436,7 +4990,7 @@ POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -5448,7 +5002,7 @@ POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_tied_object (T *obj, ::CORBA::Boole
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -5466,71 +5020,64 @@ POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ConsumesDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ConsumesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ConsumesDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ConsumesDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5538,33 +5085,29 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5572,33 +5115,29 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5606,75 +5145,66 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ConsumesDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5682,7 +5212,6 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5692,33 +5221,29 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::EventDef_ptr POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5726,17 +5251,15 @@ void POA_CORBA::ComponentIR::ConsumesDef_tie<T>::event  (
 {
   this->ptr_->event (
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef_tie<T>::is_a  (
     const char * event_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5744,7 +5267,6 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     event_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5801,7 +5323,7 @@ POA_CORBA::ComponentIR::ComponentDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -5813,7 +5335,7 @@ POA_CORBA::ComponentIR::ComponentDef_tie<T>::_tied_object (T *obj, ::CORBA::Bool
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -5831,55 +5353,50 @@ POA_CORBA::ComponentIR::ComponentDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::ComponentDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::ComponentDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ComponentDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ComponentDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::ComponentDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5887,18 +5404,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5907,11 +5422,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5920,7 +5434,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5931,11 +5444,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5943,7 +5455,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5953,11 +5464,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5965,7 +5475,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -5975,11 +5484,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -5989,7 +5497,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6001,11 +5508,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6014,7 +5520,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6025,11 +5530,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6039,7 +5543,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6051,11 +5554,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6064,7 +5566,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6075,11 +5576,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6088,7 +5588,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6099,11 +5598,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6112,7 +5610,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6123,11 +5620,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6142,7 +5638,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6159,11 +5654,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6172,7 +5666,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6183,11 +5676,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6196,7 +5688,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6207,11 +5698,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6219,7 +5709,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6229,11 +5718,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6242,7 +5730,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6253,11 +5740,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6266,7 +5752,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6277,11 +5762,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6296,7 +5780,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6313,33 +5796,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6347,33 +5826,29 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6381,33 +5856,29 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6415,75 +5886,66 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::ComponentDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6491,7 +5953,6 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6501,49 +5962,43 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6551,17 +6006,15 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6569,27 +6022,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6599,7 +6049,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6611,11 +6060,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6628,7 +6076,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6643,27 +6090,24 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::ComponentDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6675,7 +6119,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6689,33 +6132,29 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_component (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
     ::CORBA::ComponentIR::ComponentDef_ptr base_component
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6723,33 +6162,29 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::base_component  (
 {
   this->ptr_->base_component (
     base_component
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6757,11 +6192,10 @@ void POA_CORBA::ComponentIR::ComponentDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6770,7 +6204,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6781,11 +6214,10 @@ template <class T> ACE_INLINE
     name,
     version,
     interface_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6795,7 +6227,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::InterfaceDef_ptr interface_type,
     ::CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6807,11 +6238,10 @@ template <class T> ACE_INLINE
     version,
     interface_type,
     is_multiple
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6820,7 +6250,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6831,11 +6260,10 @@ template <class T> ACE_INLINE
     name,
     version,
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6844,7 +6272,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6855,11 +6282,10 @@ template <class T> ACE_INLINE
     name,
     version,
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -6868,7 +6294,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::ComponentIR::EventDef_ptr event
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -6879,7 +6304,6 @@ template <class T> ACE_INLINE
     name,
     version,
     event
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6936,7 +6360,7 @@ POA_CORBA::ComponentIR::FactoryDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -6948,7 +6372,7 @@ POA_CORBA::ComponentIR::FactoryDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolea
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -6966,71 +6390,64 @@ POA_CORBA::ComponentIR::FactoryDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::FactoryDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::FactoryDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->FactoryDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->FactoryDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::FactoryDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7038,33 +6455,29 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7072,33 +6485,29 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7106,75 +6515,66 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FactoryDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::FactoryDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -7182,7 +6582,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7192,49 +6591,43 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
     ::CORBA::IDLType_ptr result_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7242,33 +6635,29 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::result_def  (
 {
   this->ptr_->result_def (
     result_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
     const ::CORBA::ParDescriptionSeq & params
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7276,33 +6665,29 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::params  (
 {
   this->ptr_->params (
     params
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::OperationMode POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
     ::CORBA::OperationMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7310,33 +6695,29 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7344,33 +6725,29 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::contexts  (
 {
   this->ptr_->contexts (
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7378,7 +6755,6 @@ void POA_CORBA::ComponentIR::FactoryDef_tie<T>::exceptions  (
 {
   this->ptr_->exceptions (
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7435,7 +6811,7 @@ POA_CORBA::ComponentIR::FinderDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -7447,7 +6823,7 @@ POA_CORBA::ComponentIR::FinderDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -7465,71 +6841,64 @@ POA_CORBA::ComponentIR::FinderDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::FinderDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::FinderDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->FinderDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->FinderDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::FinderDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7537,33 +6906,29 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7571,33 +6936,29 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7605,75 +6966,66 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::FinderDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::FinderDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -7681,7 +7033,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7691,49 +7042,43 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
     ::CORBA::IDLType_ptr result_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7741,33 +7086,29 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::result_def  (
 {
   this->ptr_->result_def (
     result_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ParDescriptionSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
     const ::CORBA::ParDescriptionSeq & params
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7775,33 +7116,29 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::params  (
 {
   this->ptr_->params (
     params
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::OperationMode POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
     ::CORBA::OperationMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7809,33 +7146,29 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::mode  (
 {
   this->ptr_->mode (
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContextIdSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7843,33 +7176,29 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::contexts  (
 {
   this->ptr_->contexts (
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExceptionDefSeq * POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -7877,7 +7206,6 @@ void POA_CORBA::ComponentIR::FinderDef_tie<T>::exceptions  (
 {
   this->ptr_->exceptions (
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7934,7 +7262,7 @@ POA_CORBA::ComponentIR::HomeDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -7946,7 +7274,7 @@ POA_CORBA::ComponentIR::HomeDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean r
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -7964,55 +7292,50 @@ POA_CORBA::ComponentIR::HomeDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ComponentIR::HomeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ComponentIR::HomeDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->HomeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->HomeDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ComponentIR::HomeDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8020,18 +7343,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8040,11 +7361,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8053,7 +7373,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8064,11 +7383,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8076,7 +7394,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8086,11 +7403,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8098,7 +7414,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8108,11 +7423,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8122,7 +7436,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8134,11 +7447,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8147,7 +7459,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8158,11 +7469,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8172,7 +7482,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8184,11 +7493,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8197,7 +7505,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8208,11 +7515,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8221,7 +7527,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8232,11 +7537,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8245,7 +7549,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8256,11 +7559,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8275,7 +7577,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8292,11 +7593,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8305,7 +7605,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8316,11 +7615,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8329,7 +7627,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8340,11 +7637,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8352,7 +7648,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8362,11 +7657,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8375,7 +7669,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8386,11 +7679,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8399,7 +7691,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8410,11 +7701,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8429,7 +7719,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8446,33 +7735,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8480,33 +7765,29 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8514,33 +7795,29 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8548,75 +7825,66 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ComponentIR::HomeDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8624,7 +7892,6 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8634,49 +7901,43 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8684,17 +7945,15 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ComponentIR::HomeDef_tie<T>::is_a  (
     const char * interface_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8702,27 +7961,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     interface_id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8732,7 +7988,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8744,11 +7999,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8761,7 +8015,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8776,27 +8029,24 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * POA_CORBA::ComponentIR::HomeDef_tie<T>::describe_ext_interface  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8808,7 +8058,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8822,33 +8071,29 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::HomeDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_home (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
     ::CORBA::ComponentIR::HomeDef_ptr base_home
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8856,33 +8101,29 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::base_home  (
 {
   this->ptr_->base_home (
     base_home
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8890,33 +8131,29 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ComponentIR::ComponentDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->managed_component (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8924,33 +8161,29 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::managed_component  (
 {
   this->ptr_->managed_component (
     managed_component
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->primary_key (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
     ::CORBA::ValueDef_ptr primary_key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8958,11 +8191,10 @@ void POA_CORBA::ComponentIR::HomeDef_tie<T>::primary_key  (
 {
   this->ptr_->primary_key (
     primary_key
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8972,7 +8204,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -8984,11 +8215,10 @@ template <class T> ACE_INLINE
     version,
     params,
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -8998,7 +8228,6 @@ template <class T> ACE_INLINE
     const char * version,
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -9010,7 +8239,6 @@ template <class T> ACE_INLINE
     version,
     params,
     exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index f41363829d3..8cf4f9103dd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:603
 
 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_EXTENDEDS_CPP_
@@ -87,13 +87,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::DefinitionKind>
     : public
@@ -105,13 +105,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
 #define _CORBA_REPOSITORY__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Repository>
     : public
@@ -125,13 +125,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
 #define _CORBA_CONTAINER__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Container>
     : public
@@ -145,13 +145,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
 #define _CORBA_IDLTYPE__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::IDLType>
     : public
@@ -165,13 +165,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -183,13 +183,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ValueDefSeq>
     : public
@@ -201,13 +201,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::InitializerSeq>
     : public
@@ -219,13 +219,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -237,13 +237,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -255,13 +255,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_)
 #define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::AttributeMode>
     : public
@@ -273,13 +273,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::AttributeDef>
     : public
@@ -293,13 +293,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -313,13 +313,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::OperationMode>
     : public
@@ -331,13 +331,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -349,13 +349,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ContextIdSeq>
     : public
@@ -367,13 +367,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_)
 #define _CORBA_OPERATIONDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::OperationDef>
     : public
@@ -387,13 +387,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEMEMBERDEF__SARG_TRAITS_)
 #define _CORBA_VALUEMEMBERDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueMemberDef>
     : public
@@ -407,13 +407,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
 #define _CORBA_VALUEDEF__SARG_TRAITS_
-  
+
   template<>
   class  SArg_Traits<CORBA::ValueDef>
     : public
@@ -427,13 +427,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
@@ -445,13 +445,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_)
 #define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_
-  
+
   template<>
   class SArg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
@@ -486,13 +486,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
@@ -504,13 +504,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
 #define _CORBA_REPOSITORY__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Repository>
     : public
@@ -525,13 +525,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
 #define _CORBA_CONTAINER__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Container>
     : public
@@ -546,13 +546,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
 #define _CORBA_IDLTYPE__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -567,13 +567,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
@@ -585,13 +585,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
@@ -603,13 +603,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
     : public
@@ -621,13 +621,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
@@ -639,13 +639,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
@@ -657,13 +657,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::AttributeMode>
     : public
@@ -675,13 +675,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
     : public
@@ -696,13 +696,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
 #define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -717,13 +717,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:817
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
@@ -735,13 +735,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
@@ -753,13 +753,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:611
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
     : public
@@ -771,13 +771,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
 #define _CORBA_OPERATIONDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::OperationDef>
     : public
@@ -792,13 +792,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_)
 #define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueMemberDef>
     : public
@@ -813,13 +813,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:140
 
 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
 #define _CORBA_VALUEDEF__ARG_TRAITS_
-  
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -834,13 +834,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
@@ -852,13 +852,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:859
 
 #if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_)
 #define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_
-  
+
   template<>
   class Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
@@ -980,8 +980,8 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-       -1,  -8,  -3, -11,  -2,   5,  -1,   6,  -1,   7, -27, -26,  -1,  13, 
-       14,  15,  -1,  -1,  16, 
+       -1,  -8,  -3, -11,  -2,   5,  -1,   6,  -1,   7, -27, -26,  -1,  13,
+       14,  15,  -1,  -1,  16,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1030,9 +1030,9 @@ CORBA__TAO_FixedDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_FixedDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1042,7 +1042,7 @@ CORBA__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::FixedDef::FixedDef (void)
@@ -1063,11 +1063,11 @@ POA_CORBA::FixedDef::~FixedDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_digits_FixedDef
     : public TAO::Upcall_Command
   {
@@ -1081,20 +1081,18 @@ POA_CORBA::FixedDef::~FixedDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::UShort>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::UShort> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->digits (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->digits ();
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1103,30 +1101,29 @@ POA_CORBA::FixedDef::~FixedDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::FixedDef::_get_digits_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::UShort>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
 
@@ -1134,7 +1131,7 @@ void POA_CORBA::FixedDef::_get_digits_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1145,15 +1142,14 @@ void POA_CORBA::FixedDef::_get_digits_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_digits_FixedDef
     : public TAO::Upcall_Command
   {
@@ -1167,21 +1163,19 @@ void POA_CORBA::FixedDef::_get_digits_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::UShort>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::UShort> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->digits (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1190,32 +1184,31 @@ void POA_CORBA::FixedDef::_get_digits_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::FixedDef::_set_digits_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_digits
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
 
@@ -1223,7 +1216,7 @@ void POA_CORBA::FixedDef::_set_digits_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1234,15 +1227,14 @@ void POA_CORBA::FixedDef::_set_digits_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_scale_FixedDef
     : public TAO::Upcall_Command
   {
@@ -1256,20 +1248,18 @@ void POA_CORBA::FixedDef::_set_digits_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Short>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Short> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->scale (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->scale ();
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1278,30 +1268,29 @@ void POA_CORBA::FixedDef::_set_digits_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::FixedDef::_get_scale_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Short>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
 
@@ -1309,7 +1298,7 @@ void POA_CORBA::FixedDef::_get_scale_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1320,15 +1309,14 @@ void POA_CORBA::FixedDef::_get_scale_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_scale_FixedDef
     : public TAO::Upcall_Command
   {
@@ -1342,21 +1330,19 @@ void POA_CORBA::FixedDef::_get_scale_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Short>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Short> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->scale (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1365,32 +1351,31 @@ void POA_CORBA::FixedDef::_get_scale_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::FixedDef::_set_scale_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Short>::in_arg_val _tao_scale;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_scale
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
 
@@ -1398,7 +1383,7 @@ void POA_CORBA::FixedDef::_set_scale_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1409,20 +1394,19 @@ void POA_CORBA::FixedDef::_set_scale_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_FixedDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1436,27 +1420,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1466,36 +1448,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::FixedDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  
+
   _is_a_FixedDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1506,15 +1487,14 @@ void POA_CORBA::FixedDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_FixedDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1528,20 +1508,18 @@ void POA_CORBA::FixedDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1551,34 +1529,33 @@ void POA_CORBA::FixedDef::_is_a_skel (
 
 
 void POA_CORBA::FixedDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  
+
   _non_existent_FixedDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1589,15 +1566,14 @@ void POA_CORBA::FixedDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_FixedDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1611,20 +1587,18 @@ void POA_CORBA::FixedDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1634,34 +1608,33 @@ void POA_CORBA::FixedDef::_non_existent_skel (
 
 
 void POA_CORBA::FixedDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  
+
   _repository_id_FixedDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1672,59 +1645,57 @@ void POA_CORBA::FixedDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::FixedDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_FixedDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1738,20 +1709,18 @@ void POA_CORBA::FixedDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::FixedDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -1761,34 +1730,33 @@ void POA_CORBA::FixedDef::_interface_skel (
 
 
 void POA_CORBA::FixedDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::FixedDef * const impl =
     static_cast<POA_CORBA::FixedDef *> (servant);
-  
+
   _get_component_FixedDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1799,13 +1767,11 @@ void POA_CORBA::FixedDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::FixedDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -1840,39 +1806,36 @@ const char* POA_CORBA::FixedDef::_interface_repository_id (void) const
 void POA_CORBA::FixedDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::FixedDef *
-POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::FixedDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::FixedDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1992,9 +1955,9 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
 
   static const signed char lookup[] =
     {
-      -13,  -2, -15,  -2,   4,   5,  -1,  53,   8,  48,  12, -47, -46,  17, 
-       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2, 
-      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26, 
+      -13,  -2, -15,  -2,   4,   5,  -1,  53,   8,  48,  12, -47, -46,  17,
+       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2,
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2043,9 +2006,9 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -2055,7 +2018,7 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ValueMemberDef::ValueMemberDef (void)
@@ -2076,11 +2039,11 @@ POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2094,20 +2057,18 @@ POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::TypeCode>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::TypeCode> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->type ();
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2116,30 +2077,29 @@ POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueMemberDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::TypeCode>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2147,7 +2107,7 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2158,15 +2118,14 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_type_def_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2180,20 +2139,18 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->type_def ();
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2202,30 +2159,29 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueMemberDef::_get_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2233,7 +2189,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2244,15 +2200,14 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_type_def_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2266,21 +2221,19 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2289,32 +2242,31 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueMemberDef::_set_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2322,7 +2274,7 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2333,15 +2285,14 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_access_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2355,20 +2306,18 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Visibility>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Visibility> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->access (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->access ();
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2377,30 +2326,29 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueMemberDef::_get_access_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Visibility>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2408,7 +2356,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2419,15 +2367,14 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_access_ValueMemberDef
     : public TAO::Upcall_Command
   {
@@ -2441,21 +2388,19 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Visibility> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->access (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2464,32 +2409,31 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueMemberDef::_set_access_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_access
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
 
@@ -2497,7 +2441,7 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2508,20 +2452,19 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ValueMemberDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2535,27 +2478,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2565,36 +2506,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ValueMemberDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  
+
   _is_a_ValueMemberDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2605,15 +2545,14 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ValueMemberDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2627,20 +2566,18 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2650,34 +2587,33 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
 
 
 void POA_CORBA::ValueMemberDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  
+
   _non_existent_ValueMemberDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2688,15 +2624,14 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ValueMemberDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2710,20 +2645,18 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2733,34 +2666,33 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
 
 
 void POA_CORBA::ValueMemberDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  
+
   _repository_id_ValueMemberDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2771,59 +2703,57 @@ void POA_CORBA::ValueMemberDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ValueMemberDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ValueMemberDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2837,20 +2767,18 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ValueMemberDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -2860,34 +2788,33 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
 
 
 void POA_CORBA::ValueMemberDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueMemberDef * const impl =
     static_cast<POA_CORBA::ValueMemberDef *> (servant);
-  
+
   _get_component_ValueMemberDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2898,13 +2825,11 @@ void POA_CORBA::ValueMemberDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ValueMemberDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -2939,39 +2864,36 @@ const char* POA_CORBA::ValueMemberDef::_interface_repository_id (void) const
 void POA_CORBA::ValueMemberDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ValueMemberDef *
-POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueMemberDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ValueMemberDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -3124,14 +3046,14 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed short lookup[] =
     {
-        -8,   -2,  -11,   -2,    4,    5,    6,   -1,  -14,   -2,    7,   -1, -116,   10, 
-      -116,   13, -112,   -1,  -20,   -2,  -22,   -2,  -27,   -4,  -34,   -3,   16,   17, 
-        18,   -1,   19, -117, -116,   -1,   24,   -1,   25,   -1,   26,   -1, -122,   31, 
-        32,   -1,   33,  -39,   -2,  -41,   -2, -129,   37,   38,   -1,  -44,   -2, -114, 
-        -1, -114,   43, -110,   -1,   -1,   -1,   46,   47,  -49,   -2,   48, -107,  -51, 
-        -3, -106,   54,   -1,   -1,   -1,   -1,   55,   -1,   -1,   56,   -1,   57,   -1, 
-        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-        58,   -1,   -1,   -1,   -1,   -1,   59, 
+        -8,   -2,  -11,   -2,    4,    5,    6,   -1,  -14,   -2,    7,   -1, -116,   10,
+      -116,   13, -112,   -1,  -20,   -2,  -22,   -2,  -27,   -4,  -34,   -3,   16,   17,
+        18,   -1,   19, -117, -116,   -1,   24,   -1,   25,   -1,   26,   -1, -122,   31,
+        32,   -1,   33,  -39,   -2,  -41,   -2, -129,   37,   38,   -1,  -44,   -2, -114,
+        -1, -114,   43, -110,   -1,   -1,   -1,   46,   47,  -49,   -2,   48, -107,  -51,
+        -3, -106,   54,   -1,   -1,   -1,   -1,   55,   -1,   -1,   56,   -1,   57,   -1,
+        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+        58,   -1,   -1,   -1,   -1,   -1,   59,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3180,9 +3102,9 @@ CORBA__TAO_ValueDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ValueDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -3192,7 +3114,7 @@ CORBA__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ValueDef::ValueDef (void)
@@ -3215,11 +3137,11 @@ POA_CORBA::ValueDef::~ValueDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_supported_interfaces_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3233,20 +3155,18 @@ POA_CORBA::ValueDef::~ValueDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->supported_interfaces (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->supported_interfaces ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3255,30 +3175,29 @@ POA_CORBA::ValueDef::~ValueDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3286,7 +3205,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3297,15 +3216,14 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_supported_interfaces_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3319,21 +3237,19 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->supported_interfaces (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3342,32 +3258,31 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_supported_interfaces
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3375,7 +3290,7 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3386,15 +3301,14 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_initializers_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3408,20 +3322,18 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::InitializerSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->initializers (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->initializers ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3430,30 +3342,29 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_get_initializers_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3461,7 +3372,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3472,15 +3383,14 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_initializers_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3494,21 +3404,19 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::InitializerSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->initializers (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3517,32 +3425,31 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_set_initializers_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_initializers
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3550,7 +3457,7 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3561,15 +3468,14 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_base_value_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3583,20 +3489,18 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->base_value (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->base_value ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3605,30 +3509,29 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_get_base_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3636,7 +3539,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3647,15 +3550,14 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_base_value_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3669,21 +3571,19 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->base_value (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3692,32 +3592,31 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_set_base_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_base_value
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3725,7 +3624,7 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3736,15 +3635,14 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_abstract_base_values_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3758,20 +3656,18 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDefSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->abstract_base_values (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->abstract_base_values ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3780,30 +3676,29 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3811,7 +3706,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3822,15 +3717,14 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_abstract_base_values_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3844,21 +3738,19 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->abstract_base_values (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3867,32 +3759,31 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_abstract_base_values
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3900,7 +3791,7 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3911,15 +3802,14 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_is_abstract_ValueDef
     : public TAO::Upcall_Command
   {
@@ -3933,20 +3823,18 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->is_abstract (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->is_abstract ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -3955,30 +3843,29 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_get_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -3986,7 +3873,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -3997,15 +3884,14 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_is_abstract_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4019,21 +3905,19 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->is_abstract (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4042,32 +3926,31 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_set_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_is_abstract
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4075,7 +3958,7 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4086,15 +3969,14 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_is_custom_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4108,20 +3990,18 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->is_custom (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->is_custom ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4130,30 +4010,29 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_get_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4161,7 +4040,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4172,15 +4051,14 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_is_custom_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4194,21 +4072,19 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->is_custom (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4217,32 +4093,31 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_set_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_is_custom
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4250,7 +4125,7 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4261,15 +4136,14 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_is_truncatable_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4283,20 +4157,18 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->is_truncatable (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->is_truncatable ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4305,30 +4177,29 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_get_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4336,7 +4207,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4347,15 +4218,14 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_is_truncatable_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4369,21 +4239,19 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->is_truncatable (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4392,32 +4260,31 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::_set_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_is_truncatable
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4425,7 +4292,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4436,15 +4303,14 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class is_a_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4458,27 +4324,25 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_->is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4487,32 +4351,31 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4520,7 +4383,7 @@ void POA_CORBA::ValueDef::is_a_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4531,15 +4394,14 @@ void POA_CORBA::ValueDef::is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_value_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4553,20 +4415,18 @@ void POA_CORBA::ValueDef::is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef::FullValueDescription> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->describe_value (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->describe_value ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4575,30 +4435,29 @@ void POA_CORBA::ValueDef::is_a_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::describe_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4606,7 +4465,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4617,15 +4476,14 @@ void POA_CORBA::ValueDef::describe_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_value_member_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4639,55 +4497,53 @@ void POA_CORBA::ValueDef::describe_value_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ValueMemberDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Visibility> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_value_member (
           arg_1
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_5);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4696,28 +4552,27 @@ void POA_CORBA::ValueDef::describe_value_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::create_value_member_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4727,9 +4582,9 @@ void POA_CORBA::ValueDef::create_value_member_skel (
       &_tao_type,
       &_tao_access
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4737,7 +4592,7 @@ void POA_CORBA::ValueDef::create_value_member_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4748,15 +4603,14 @@ void POA_CORBA::ValueDef::create_value_member_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_attribute_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4770,55 +4624,53 @@ void POA_CORBA::ValueDef::create_value_member_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       retval =
         this->servant_->create_attribute (
           arg_1
           , arg_2
           , arg_3
           , arg_4
-          , arg_5
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_5);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4827,28 +4679,27 @@ void POA_CORBA::ValueDef::create_value_member_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -4858,9 +4709,9 @@ void POA_CORBA::ValueDef::create_attribute_skel (
       &_tao_type,
       &_tao_mode
     };
-  
+
   static size_t const nargs = 6;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -4868,7 +4719,7 @@ void POA_CORBA::ValueDef::create_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -4879,15 +4730,14 @@ void POA_CORBA::ValueDef::create_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_operation_ValueDef
     : public TAO::Upcall_Command
   {
@@ -4901,62 +4751,62 @@ void POA_CORBA::ValueDef::create_attribute_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::OperationDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_8 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq> (
           this->operation_details_,
           this->args_,
           8);
-        
+
       retval =
         this->servant_->create_operation (
           arg_1
@@ -4966,11 +4816,9 @@ void POA_CORBA::ValueDef::create_attribute_skel (
           , arg_5
           , arg_6
           , arg_7
-          , arg_8
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_8);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -4979,21 +4827,20 @@ void POA_CORBA::ValueDef::create_attribute_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::OperationDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -5003,7 +4850,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
   TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
   TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -5016,9 +4863,9 @@ void POA_CORBA::ValueDef::create_operation_skel (
       &_tao_exceptions,
       &_tao_contexts
     };
-  
+
   static size_t const nargs = 9;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
 
@@ -5026,7 +4873,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5037,20 +4884,19 @@ void POA_CORBA::ValueDef::create_operation_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5064,27 +4910,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5094,36 +4938,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ValueDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  
+
   _is_a_ValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5134,15 +4977,14 @@ void POA_CORBA::ValueDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5156,20 +4998,18 @@ void POA_CORBA::ValueDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5179,34 +5019,33 @@ void POA_CORBA::ValueDef::_is_a_skel (
 
 
 void POA_CORBA::ValueDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  
+
   _non_existent_ValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5217,15 +5056,14 @@ void POA_CORBA::ValueDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5239,20 +5077,18 @@ void POA_CORBA::ValueDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5262,34 +5098,33 @@ void POA_CORBA::ValueDef::_non_existent_skel (
 
 
 void POA_CORBA::ValueDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  
+
   _repository_id_ValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5300,59 +5135,57 @@ void POA_CORBA::ValueDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ValueDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -5366,20 +5199,18 @@ void POA_CORBA::ValueDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5389,34 +5220,33 @@ void POA_CORBA::ValueDef::_interface_skel (
 
 
 void POA_CORBA::ValueDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueDef * const impl =
     static_cast<POA_CORBA::ValueDef *> (servant);
-  
+
   _get_component_ValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5427,13 +5257,11 @@ void POA_CORBA::ValueDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ValueDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -5476,39 +5304,36 @@ const char* POA_CORBA::ValueDef::_interface_repository_id (void) const
 void POA_CORBA::ValueDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ValueDef *
-POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ValueDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -5665,14 +5490,14 @@ TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed short lookup[] =
     {
-       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10, 
-       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17, 
-        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32, 
-        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139, 
-        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53, 
-        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1, 
-        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63, 
+       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10,
+       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17,
+        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32,
+        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139,
+        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53,
+        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1,
+        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5721,9 +5546,9 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -5733,7 +5558,7 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ExtValueDef::ExtValueDef (void)
@@ -5757,11 +5582,11 @@ POA_CORBA::ExtValueDef::~ExtValueDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_ext_initializers_ExtValueDef
     : public TAO::Upcall_Command
   {
@@ -5775,20 +5600,18 @@ POA_CORBA::ExtValueDef::~ExtValueDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtInitializerSeq> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->ext_initializers (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->ext_initializers ();
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5797,30 +5620,29 @@ POA_CORBA::ExtValueDef::~ExtValueDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
 
@@ -5828,7 +5650,7 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5839,15 +5661,14 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_ext_initializers_ExtValueDef
     : public TAO::Upcall_Command
   {
@@ -5861,21 +5682,19 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->ext_initializers (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5884,32 +5703,31 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_ext_initializers
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
 
@@ -5917,7 +5735,7 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -5928,15 +5746,14 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class describe_ext_value_ExtValueDef
     : public TAO::Upcall_Command
   {
@@ -5950,20 +5767,18 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtValueDef::ExtFullValueDescription> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->describe_ext_value (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->describe_ext_value ();
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -5972,30 +5787,29 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExtValueDef::describe_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
 
@@ -6003,7 +5817,7 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6014,15 +5828,14 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class create_ext_attribute_ExtValueDef
     : public TAO::Upcall_Command
   {
@@ -6036,56 +5849,56 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDef> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Identifier> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec> (
           this->operation_details_,
           this->args_,
           3);
-        
+
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           4);
-        
+
       TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
         TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode> (
           this->operation_details_,
           this->args_,
           5);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
           this->operation_details_,
           this->args_,
           6);
-        
+
       TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq> (
           this->operation_details_,
           this->args_,
           7);
-        
+
       retval =
         this->servant_->create_ext_attribute (
           arg_1
@@ -6094,11 +5907,9 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
           , arg_4
           , arg_5
           , arg_6
-          , arg_7
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          , arg_7);
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6107,21 +5918,20 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
@@ -6130,7 +5940,7 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
   TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
   TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -6142,9 +5952,9 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
       &_tao_get_exceptions,
       &_tao_set_exceptions
     };
-  
+
   static size_t const nargs = 8;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
 
@@ -6152,7 +5962,7 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6163,20 +5973,19 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ExtValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6190,27 +5999,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6220,36 +6027,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ExtValueDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  
+
   _is_a_ExtValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6260,15 +6066,14 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ExtValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6282,20 +6087,18 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6305,34 +6108,33 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
 
 
 void POA_CORBA::ExtValueDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  
+
   _non_existent_ExtValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6343,15 +6145,14 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ExtValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6365,20 +6166,18 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6388,34 +6187,33 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
 
 
 void POA_CORBA::ExtValueDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  
+
   _repository_id_ExtValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6426,59 +6224,57 @@ void POA_CORBA::ExtValueDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ExtValueDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ExtValueDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -6492,20 +6288,18 @@ void POA_CORBA::ExtValueDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ExtValueDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6515,34 +6309,33 @@ void POA_CORBA::ExtValueDef::_interface_skel (
 
 
 void POA_CORBA::ExtValueDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ExtValueDef * const impl =
     static_cast<POA_CORBA::ExtValueDef *> (servant);
-  
+
   _get_component_ExtValueDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6553,13 +6346,11 @@ void POA_CORBA::ExtValueDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ExtValueDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -6606,39 +6397,36 @@ const char* POA_CORBA::ExtValueDef::_interface_repository_id (void) const
 void POA_CORBA::ExtValueDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ExtValueDef *
-POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtValueDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ExtValueDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -6756,9 +6544,9 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed char lookup[] =
     {
-      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
-       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15,
+       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6807,9 +6595,9 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 int
 CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -6819,7 +6607,7 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
       reinterpret_cast<size_t> (CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer)
     );
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ValueBoxDef::ValueBoxDef (void)
@@ -6842,11 +6630,11 @@ POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
 {
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_original_type_def_ValueBoxDef
     : public TAO::Upcall_Command
   {
@@ -6860,20 +6648,18 @@ POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_->original_type_def (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_->original_type_def ();
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6882,30 +6668,29 @@ POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
 
@@ -6913,7 +6698,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -6924,15 +6709,14 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _set_original_type_def_ValueBoxDef
     : public TAO::Upcall_Command
   {
@@ -6946,21 +6730,19 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::IDLType> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       this->servant_->original_type_def (
-        arg_1
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -6969,32 +6751,31 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:190
 
 void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_original_type_def
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
 
@@ -7002,7 +6783,7 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7013,20 +6794,19 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ValueBoxDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7040,27 +6820,25 @@ namespace POA_CORBA
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_,
           1);
-        
+
       retval =
         this->servant_-> _is_a (
-          arg_1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          arg_1);
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7070,36 +6848,35 @@ namespace POA_CORBA
 
 
 void POA_CORBA::ValueBoxDef::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  
+
   _is_a_ValueBoxDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7110,15 +6887,14 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ValueBoxDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7132,20 +6908,18 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _non_existent ();
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7155,34 +6929,33 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
 
 
 void POA_CORBA::ValueBoxDef::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  
+
   _non_existent_ValueBoxDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7193,15 +6966,14 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _repository_id_ValueBoxDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7215,20 +6987,18 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _repository_id (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _repository_id ();
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7238,34 +7008,33 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
 
 
 void POA_CORBA::ValueBoxDef::_repository_id_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  
+
   _repository_id_ValueBoxDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7276,59 +7045,57 @@ void POA_CORBA::ValueBoxDef::_repository_id_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:513
 
 void POA_CORBA::ValueBoxDef::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
-      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
-                                        ::CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (
+        ::CORBA::OMGVMCID | 1,
+        ::CORBA::COMPLETED_NO);
     }
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  ::CORBA::InterfaceDef_ptr _tao_retval = 
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  ::CORBA::InterfaceDef_ptr _tao_retval =
+    impl->_get_interface ();
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == false)
     {
-      ACE_THROW ( ::CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ValueBoxDef_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -7342,20 +7109,18 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
         , args_ (args)
     {
     }
-    
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
           this->operation_details_,
           this->args_);
-      
+
       retval =
-        this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->servant_-> _get_component ();
     }
-  
+
   private:
     POA_CORBA::ValueBoxDef * const servant_;
     TAO_Operation_Details const * const operation_details_;
@@ -7365,34 +7130,33 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
 
 
 void POA_CORBA::ValueBoxDef::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
 #if TAO_HAS_INTERCEPTORS == 1
   static ::CORBA::TypeCode_ptr const * const exceptions = 0;
   static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ValueBoxDef * const impl =
     static_cast<POA_CORBA::ValueBoxDef *> (servant);
-  
+
   _get_component_ValueBoxDef_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -7403,13 +7167,11 @@ void POA_CORBA::ValueBoxDef::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 ::CORBA::Boolean POA_CORBA::ValueBoxDef::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return
@@ -7452,39 +7214,36 @@ const char* POA_CORBA::ValueBoxDef::_interface_repository_id (void) const
 void POA_CORBA::ValueBoxDef::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
+                                     this);
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:851
 
 CORBA::ValueBoxDef *
-POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueBoxDef::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
+  TAO_Stub *stub = this->_create_stub ();
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   ::CORBA::Boolean const _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ValueBoxDef STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
index 3cb3af272e8..0178b28a129 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
@@ -80,53 +80,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::FixedDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -135,7 +127,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::UShort digits (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -145,7 +136,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -153,7 +143,6 @@ namespace POA_CORBA
 
     virtual void digits (
         ::CORBA::UShort digits
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -163,14 +152,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Short scale (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -180,7 +167,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -188,7 +174,6 @@ namespace POA_CORBA
 
     virtual void scale (
         ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -198,7 +183,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -206,7 +190,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -217,7 +200,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -225,7 +207,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -252,53 +233,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ValueMemberDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -307,7 +280,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -317,14 +289,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -334,7 +304,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -342,7 +311,6 @@ namespace POA_CORBA
 
     virtual void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -352,14 +320,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Visibility access (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -369,7 +335,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -377,7 +342,6 @@ namespace POA_CORBA
 
     virtual void access (
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -387,7 +351,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -395,7 +358,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -406,7 +368,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -414,7 +375,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -422,7 +382,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -430,7 +389,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -438,7 +396,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -446,7 +403,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -454,7 +410,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -462,7 +417,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -470,7 +424,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -478,7 +431,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -489,7 +441,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -500,7 +451,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -529,53 +479,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ValueDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -584,7 +526,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceDefSeq * supported_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -594,7 +535,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -602,7 +542,6 @@ namespace POA_CORBA
 
     virtual void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -612,14 +551,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InitializerSeq * initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -629,7 +566,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -637,7 +573,6 @@ namespace POA_CORBA
 
     virtual void initializers (
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -647,14 +582,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueDef_ptr base_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -664,7 +597,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -672,7 +604,6 @@ namespace POA_CORBA
 
     virtual void base_value (
         ::CORBA::ValueDef_ptr base_value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -682,14 +613,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueDefSeq * abstract_base_values (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -699,7 +628,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -707,7 +635,6 @@ namespace POA_CORBA
 
     virtual void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -717,14 +644,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Boolean is_abstract (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -734,7 +659,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -742,7 +666,6 @@ namespace POA_CORBA
 
     virtual void is_abstract (
         ::CORBA::Boolean is_abstract
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -752,14 +675,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Boolean is_custom (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -769,7 +690,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -777,7 +697,6 @@ namespace POA_CORBA
 
     virtual void is_custom (
         ::CORBA::Boolean is_custom
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -787,14 +706,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Boolean is_truncatable (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -804,7 +721,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -812,7 +728,6 @@ namespace POA_CORBA
 
     virtual void is_truncatable (
         ::CORBA::Boolean is_truncatable
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -822,7 +737,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -830,7 +744,6 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean is_a (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -840,14 +753,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueDef::FullValueDescription * describe_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -857,7 +768,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -869,7 +779,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -879,7 +788,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -891,7 +799,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -901,7 +808,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -916,7 +822,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -926,7 +831,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -934,7 +838,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -945,7 +848,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -956,7 +858,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -967,7 +868,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -978,7 +878,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -989,7 +888,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1000,7 +898,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1011,7 +908,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1022,7 +918,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1033,7 +928,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1044,7 +938,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1055,7 +948,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1066,7 +958,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1077,7 +968,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1088,7 +978,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1099,7 +988,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1110,7 +998,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1121,7 +1008,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1132,7 +1018,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1143,7 +1028,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1151,7 +1035,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1159,7 +1042,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1167,7 +1049,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1175,7 +1056,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1183,7 +1063,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1191,7 +1070,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1199,7 +1077,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1207,7 +1084,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1215,7 +1091,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1226,7 +1101,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1237,7 +1111,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1245,7 +1118,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1272,53 +1144,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ExtValueDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1327,7 +1191,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExtInitializerSeq * ext_initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1337,7 +1200,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1345,7 +1207,6 @@ namespace POA_CORBA
 
     virtual void ext_initializers (
         const ::CORBA::ExtInitializerSeq & ext_initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1355,14 +1216,12 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1372,7 +1231,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1386,7 +1244,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1396,7 +1253,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -1404,7 +1260,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1415,7 +1270,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1426,7 +1280,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1437,7 +1290,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1448,7 +1300,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1459,7 +1310,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1470,7 +1320,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1481,7 +1330,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1492,7 +1340,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1503,7 +1350,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1514,7 +1360,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1525,7 +1370,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1536,7 +1380,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1547,7 +1390,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1558,7 +1400,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1569,7 +1410,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1580,7 +1420,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1591,7 +1430,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1602,7 +1440,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1613,7 +1450,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1621,7 +1457,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1629,7 +1464,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1637,7 +1471,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1645,7 +1478,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1653,7 +1485,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1661,7 +1492,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1669,7 +1499,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1677,7 +1506,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1685,7 +1513,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1696,7 +1523,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1707,7 +1533,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1715,7 +1540,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1723,7 +1547,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1731,7 +1554,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1739,7 +1561,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1747,7 +1568,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1755,7 +1575,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1763,7 +1582,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1771,7 +1589,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1779,7 +1596,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1787,7 +1603,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1795,7 +1610,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1803,7 +1617,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1811,7 +1624,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1819,7 +1631,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -1827,7 +1638,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1838,7 +1648,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1849,7 +1658,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1860,7 +1668,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1871,7 +1678,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -1882,7 +1688,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
@@ -1909,53 +1714,45 @@ namespace POA_CORBA
 
     virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void _repository_id_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::ValueBoxDef *_this (
 
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1964,7 +1761,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::IDLType_ptr original_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1974,7 +1770,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
@@ -1982,7 +1777,6 @@ namespace POA_CORBA
 
     virtual void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1992,7 +1786,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
 
     static void
@@ -2000,7 +1793,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2011,7 +1803,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2019,7 +1810,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2027,7 +1817,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2035,7 +1824,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2043,7 +1831,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2051,7 +1838,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2059,7 +1845,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2067,7 +1852,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2075,7 +1859,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2083,7 +1866,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2094,7 +1876,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
@@ -2105,7 +1886,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static void
@@ -2113,7 +1893,6 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
index 78a4a8dcb9d..578f0d31ed3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
@@ -36,7 +36,6 @@ POA_CORBA::FixedDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::FixedDef *> (servant);
@@ -44,7 +43,6 @@ POA_CORBA::FixedDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -57,7 +55,6 @@ POA_CORBA::FixedDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::FixedDef *> (servant);
@@ -65,7 +62,6 @@ POA_CORBA::FixedDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -75,7 +71,6 @@ POA_CORBA::FixedDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::FixedDef *> (servant);
@@ -83,7 +78,6 @@ POA_CORBA::FixedDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -93,7 +87,6 @@ POA_CORBA::ValueMemberDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -101,7 +94,6 @@ POA_CORBA::ValueMemberDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -114,7 +106,6 @@ POA_CORBA::ValueMemberDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -122,7 +113,6 @@ POA_CORBA::ValueMemberDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -132,7 +122,6 @@ POA_CORBA::ValueMemberDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -140,7 +129,6 @@ POA_CORBA::ValueMemberDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -150,7 +138,6 @@ POA_CORBA::ValueMemberDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -158,7 +145,6 @@ POA_CORBA::ValueMemberDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -168,7 +154,6 @@ POA_CORBA::ValueMemberDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -176,7 +161,6 @@ POA_CORBA::ValueMemberDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -186,7 +170,6 @@ POA_CORBA::ValueMemberDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -194,7 +177,6 @@ POA_CORBA::ValueMemberDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -204,7 +186,6 @@ POA_CORBA::ValueMemberDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -212,7 +193,6 @@ POA_CORBA::ValueMemberDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -222,7 +202,6 @@ POA_CORBA::ValueMemberDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -230,7 +209,6 @@ POA_CORBA::ValueMemberDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -240,7 +218,6 @@ POA_CORBA::ValueMemberDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -248,7 +225,6 @@ POA_CORBA::ValueMemberDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -258,7 +234,6 @@ POA_CORBA::ValueMemberDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -266,7 +241,6 @@ POA_CORBA::ValueMemberDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -276,7 +250,6 @@ POA_CORBA::ValueMemberDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -284,7 +257,6 @@ POA_CORBA::ValueMemberDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -297,7 +269,6 @@ POA_CORBA::ValueMemberDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -305,7 +276,6 @@ POA_CORBA::ValueMemberDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -318,7 +288,6 @@ POA_CORBA::ValueMemberDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueMemberDef *> (servant);
@@ -326,7 +295,6 @@ POA_CORBA::ValueMemberDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -336,7 +304,6 @@ POA_CORBA::ValueDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -344,7 +311,6 @@ POA_CORBA::ValueDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -357,7 +323,6 @@ POA_CORBA::ValueDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -365,7 +330,6 @@ POA_CORBA::ValueDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -378,7 +342,6 @@ POA_CORBA::ValueDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -386,7 +349,6 @@ POA_CORBA::ValueDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -399,7 +361,6 @@ POA_CORBA::ValueDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -407,7 +368,6 @@ POA_CORBA::ValueDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -420,7 +380,6 @@ POA_CORBA::ValueDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -428,7 +387,6 @@ POA_CORBA::ValueDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -441,7 +399,6 @@ POA_CORBA::ValueDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -449,7 +406,6 @@ POA_CORBA::ValueDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -462,7 +418,6 @@ POA_CORBA::ValueDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -470,7 +425,6 @@ POA_CORBA::ValueDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -483,7 +437,6 @@ POA_CORBA::ValueDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -491,7 +444,6 @@ POA_CORBA::ValueDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -504,7 +456,6 @@ POA_CORBA::ValueDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -512,7 +463,6 @@ POA_CORBA::ValueDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -525,7 +475,6 @@ POA_CORBA::ValueDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -533,7 +482,6 @@ POA_CORBA::ValueDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -546,7 +494,6 @@ POA_CORBA::ValueDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -554,7 +501,6 @@ POA_CORBA::ValueDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -567,7 +513,6 @@ POA_CORBA::ValueDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -575,7 +520,6 @@ POA_CORBA::ValueDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -588,7 +532,6 @@ POA_CORBA::ValueDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -596,7 +539,6 @@ POA_CORBA::ValueDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -609,7 +551,6 @@ POA_CORBA::ValueDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -617,7 +558,6 @@ POA_CORBA::ValueDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -630,7 +570,6 @@ POA_CORBA::ValueDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -638,7 +577,6 @@ POA_CORBA::ValueDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -651,7 +589,6 @@ POA_CORBA::ValueDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -659,7 +596,6 @@ POA_CORBA::ValueDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -672,7 +608,6 @@ POA_CORBA::ValueDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -680,7 +615,6 @@ POA_CORBA::ValueDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -693,7 +627,6 @@ POA_CORBA::ValueDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -701,7 +634,6 @@ POA_CORBA::ValueDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -714,7 +646,6 @@ POA_CORBA::ValueDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -722,7 +653,6 @@ POA_CORBA::ValueDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -735,7 +665,6 @@ POA_CORBA::ValueDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -743,7 +672,6 @@ POA_CORBA::ValueDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -753,7 +681,6 @@ POA_CORBA::ValueDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -761,7 +688,6 @@ POA_CORBA::ValueDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -771,7 +697,6 @@ POA_CORBA::ValueDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -779,7 +704,6 @@ POA_CORBA::ValueDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -789,7 +713,6 @@ POA_CORBA::ValueDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -797,7 +720,6 @@ POA_CORBA::ValueDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -807,7 +729,6 @@ POA_CORBA::ValueDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -815,7 +736,6 @@ POA_CORBA::ValueDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -825,7 +745,6 @@ POA_CORBA::ValueDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -833,7 +752,6 @@ POA_CORBA::ValueDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -843,7 +761,6 @@ POA_CORBA::ValueDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -851,7 +768,6 @@ POA_CORBA::ValueDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -861,7 +777,6 @@ POA_CORBA::ValueDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -869,7 +784,6 @@ POA_CORBA::ValueDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -879,7 +793,6 @@ POA_CORBA::ValueDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -887,7 +800,6 @@ POA_CORBA::ValueDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -897,7 +809,6 @@ POA_CORBA::ValueDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -905,7 +816,6 @@ POA_CORBA::ValueDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -918,7 +828,6 @@ POA_CORBA::ValueDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -926,7 +835,6 @@ POA_CORBA::ValueDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -939,7 +847,6 @@ POA_CORBA::ValueDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -947,7 +854,6 @@ POA_CORBA::ValueDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -957,7 +863,6 @@ POA_CORBA::ValueDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ValueDef *> (servant);
@@ -965,7 +870,6 @@ POA_CORBA::ValueDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -975,7 +879,6 @@ POA_CORBA::ExtValueDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -983,7 +886,6 @@ POA_CORBA::ExtValueDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -996,7 +898,6 @@ POA_CORBA::ExtValueDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1004,7 +905,6 @@ POA_CORBA::ExtValueDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1017,7 +917,6 @@ POA_CORBA::ExtValueDef::lookup_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1025,7 +924,6 @@ POA_CORBA::ExtValueDef::lookup_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1038,7 +936,6 @@ POA_CORBA::ExtValueDef::contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1046,7 +943,6 @@ POA_CORBA::ExtValueDef::contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1059,7 +955,6 @@ POA_CORBA::ExtValueDef::lookup_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1067,7 +962,6 @@ POA_CORBA::ExtValueDef::lookup_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1080,7 +974,6 @@ POA_CORBA::ExtValueDef::describe_contents_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1088,7 +981,6 @@ POA_CORBA::ExtValueDef::describe_contents_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1101,7 +993,6 @@ POA_CORBA::ExtValueDef::create_module_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1109,7 +1000,6 @@ POA_CORBA::ExtValueDef::create_module_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1122,7 +1012,6 @@ POA_CORBA::ExtValueDef::create_constant_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1130,7 +1019,6 @@ POA_CORBA::ExtValueDef::create_constant_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1143,7 +1031,6 @@ POA_CORBA::ExtValueDef::create_struct_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1151,7 +1038,6 @@ POA_CORBA::ExtValueDef::create_struct_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1164,7 +1050,6 @@ POA_CORBA::ExtValueDef::create_union_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1172,7 +1057,6 @@ POA_CORBA::ExtValueDef::create_union_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1185,7 +1069,6 @@ POA_CORBA::ExtValueDef::create_enum_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1193,7 +1076,6 @@ POA_CORBA::ExtValueDef::create_enum_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1206,7 +1088,6 @@ POA_CORBA::ExtValueDef::create_alias_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1214,7 +1095,6 @@ POA_CORBA::ExtValueDef::create_alias_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1227,7 +1107,6 @@ POA_CORBA::ExtValueDef::create_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1235,7 +1114,6 @@ POA_CORBA::ExtValueDef::create_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1248,7 +1126,6 @@ POA_CORBA::ExtValueDef::create_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1256,7 +1133,6 @@ POA_CORBA::ExtValueDef::create_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1269,7 +1145,6 @@ POA_CORBA::ExtValueDef::create_value_box_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1277,7 +1152,6 @@ POA_CORBA::ExtValueDef::create_value_box_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1290,7 +1164,6 @@ POA_CORBA::ExtValueDef::create_exception_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1298,7 +1171,6 @@ POA_CORBA::ExtValueDef::create_exception_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1311,7 +1183,6 @@ POA_CORBA::ExtValueDef::create_native_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1319,7 +1190,6 @@ POA_CORBA::ExtValueDef::create_native_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1332,7 +1202,6 @@ POA_CORBA::ExtValueDef::create_abstract_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1340,7 +1209,6 @@ POA_CORBA::ExtValueDef::create_abstract_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1353,7 +1221,6 @@ POA_CORBA::ExtValueDef::create_local_interface_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1361,7 +1228,6 @@ POA_CORBA::ExtValueDef::create_local_interface_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1374,7 +1240,6 @@ POA_CORBA::ExtValueDef::create_ext_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Container * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1382,7 +1247,6 @@ POA_CORBA::ExtValueDef::create_ext_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1392,7 +1256,6 @@ POA_CORBA::ExtValueDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1400,7 +1263,6 @@ POA_CORBA::ExtValueDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1410,7 +1272,6 @@ POA_CORBA::ExtValueDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1418,7 +1279,6 @@ POA_CORBA::ExtValueDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1428,7 +1288,6 @@ POA_CORBA::ExtValueDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1436,7 +1295,6 @@ POA_CORBA::ExtValueDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1446,7 +1304,6 @@ POA_CORBA::ExtValueDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1454,7 +1311,6 @@ POA_CORBA::ExtValueDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1464,7 +1320,6 @@ POA_CORBA::ExtValueDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1472,7 +1327,6 @@ POA_CORBA::ExtValueDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1482,7 +1336,6 @@ POA_CORBA::ExtValueDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1490,7 +1343,6 @@ POA_CORBA::ExtValueDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1500,7 +1352,6 @@ POA_CORBA::ExtValueDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1508,7 +1359,6 @@ POA_CORBA::ExtValueDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1518,7 +1368,6 @@ POA_CORBA::ExtValueDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1526,7 +1375,6 @@ POA_CORBA::ExtValueDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1536,7 +1384,6 @@ POA_CORBA::ExtValueDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1544,7 +1391,6 @@ POA_CORBA::ExtValueDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1557,7 +1403,6 @@ POA_CORBA::ExtValueDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1565,7 +1410,6 @@ POA_CORBA::ExtValueDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1578,7 +1422,6 @@ POA_CORBA::ExtValueDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1586,7 +1429,6 @@ POA_CORBA::ExtValueDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1596,7 +1438,6 @@ POA_CORBA::ExtValueDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1604,7 +1445,6 @@ POA_CORBA::ExtValueDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1614,7 +1454,6 @@ POA_CORBA::ExtValueDef::_get_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1622,7 +1461,6 @@ POA_CORBA::ExtValueDef::_get_supported_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1632,7 +1470,6 @@ POA_CORBA::ExtValueDef::_set_supported_interfaces_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1640,7 +1477,6 @@ POA_CORBA::ExtValueDef::_set_supported_interfaces_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1650,7 +1486,6 @@ POA_CORBA::ExtValueDef::_get_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1658,7 +1493,6 @@ POA_CORBA::ExtValueDef::_get_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1668,7 +1502,6 @@ POA_CORBA::ExtValueDef::_set_initializers_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1676,7 +1509,6 @@ POA_CORBA::ExtValueDef::_set_initializers_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1686,7 +1518,6 @@ POA_CORBA::ExtValueDef::_get_base_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1694,7 +1525,6 @@ POA_CORBA::ExtValueDef::_get_base_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1704,7 +1534,6 @@ POA_CORBA::ExtValueDef::_set_base_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1712,7 +1541,6 @@ POA_CORBA::ExtValueDef::_set_base_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1722,7 +1550,6 @@ POA_CORBA::ExtValueDef::_get_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1730,7 +1557,6 @@ POA_CORBA::ExtValueDef::_get_abstract_base_values_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1740,7 +1566,6 @@ POA_CORBA::ExtValueDef::_set_abstract_base_values_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1748,7 +1573,6 @@ POA_CORBA::ExtValueDef::_set_abstract_base_values_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1758,7 +1582,6 @@ POA_CORBA::ExtValueDef::_get_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1766,7 +1589,6 @@ POA_CORBA::ExtValueDef::_get_is_abstract_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1776,7 +1598,6 @@ POA_CORBA::ExtValueDef::_set_is_abstract_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1784,7 +1605,6 @@ POA_CORBA::ExtValueDef::_set_is_abstract_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1794,7 +1614,6 @@ POA_CORBA::ExtValueDef::_get_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1802,7 +1621,6 @@ POA_CORBA::ExtValueDef::_get_is_custom_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1812,7 +1630,6 @@ POA_CORBA::ExtValueDef::_set_is_custom_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1820,7 +1637,6 @@ POA_CORBA::ExtValueDef::_set_is_custom_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1830,7 +1646,6 @@ POA_CORBA::ExtValueDef::_get_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1838,7 +1653,6 @@ POA_CORBA::ExtValueDef::_get_is_truncatable_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1848,7 +1662,6 @@ POA_CORBA::ExtValueDef::_set_is_truncatable_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1856,7 +1669,6 @@ POA_CORBA::ExtValueDef::_set_is_truncatable_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1869,7 +1681,6 @@ POA_CORBA::ExtValueDef::is_a_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1877,7 +1688,6 @@ POA_CORBA::ExtValueDef::is_a_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1890,7 +1700,6 @@ POA_CORBA::ExtValueDef::describe_value_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1898,7 +1707,6 @@ POA_CORBA::ExtValueDef::describe_value_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1911,7 +1719,6 @@ POA_CORBA::ExtValueDef::create_value_member_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1919,7 +1726,6 @@ POA_CORBA::ExtValueDef::create_value_member_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1932,7 +1738,6 @@ POA_CORBA::ExtValueDef::create_attribute_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1940,7 +1745,6 @@ POA_CORBA::ExtValueDef::create_attribute_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1953,7 +1757,6 @@ POA_CORBA::ExtValueDef::create_operation_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::ValueDef * const impl = static_cast<POA_CORBA::ExtValueDef *> (servant);
@@ -1961,7 +1764,6 @@ POA_CORBA::ExtValueDef::create_operation_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1971,7 +1773,6 @@ POA_CORBA::ValueBoxDef::_get_def_kind_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -1979,7 +1780,6 @@ POA_CORBA::ValueBoxDef::_get_def_kind_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1992,7 +1792,6 @@ POA_CORBA::ValueBoxDef::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IRObject * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2000,7 +1799,6 @@ POA_CORBA::ValueBoxDef::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2010,7 +1808,6 @@ POA_CORBA::ValueBoxDef::_get_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2018,7 +1815,6 @@ POA_CORBA::ValueBoxDef::_get_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2028,7 +1824,6 @@ POA_CORBA::ValueBoxDef::_set_id_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2036,7 +1831,6 @@ POA_CORBA::ValueBoxDef::_set_id_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2046,7 +1840,6 @@ POA_CORBA::ValueBoxDef::_get_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2054,7 +1847,6 @@ POA_CORBA::ValueBoxDef::_get_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2064,7 +1856,6 @@ POA_CORBA::ValueBoxDef::_set_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2072,7 +1863,6 @@ POA_CORBA::ValueBoxDef::_set_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2082,7 +1872,6 @@ POA_CORBA::ValueBoxDef::_get_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2090,7 +1879,6 @@ POA_CORBA::ValueBoxDef::_get_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2100,7 +1888,6 @@ POA_CORBA::ValueBoxDef::_set_version_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2108,7 +1895,6 @@ POA_CORBA::ValueBoxDef::_set_version_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2118,7 +1904,6 @@ POA_CORBA::ValueBoxDef::_get_defined_in_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2126,7 +1911,6 @@ POA_CORBA::ValueBoxDef::_get_defined_in_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2136,7 +1920,6 @@ POA_CORBA::ValueBoxDef::_get_absolute_name_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2144,7 +1927,6 @@ POA_CORBA::ValueBoxDef::_get_absolute_name_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2154,7 +1936,6 @@ POA_CORBA::ValueBoxDef::_get_containing_repository_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2162,7 +1943,6 @@ POA_CORBA::ValueBoxDef::_get_containing_repository_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2175,7 +1955,6 @@ POA_CORBA::ValueBoxDef::describe_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2183,7 +1962,6 @@ POA_CORBA::ValueBoxDef::describe_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2196,7 +1974,6 @@ POA_CORBA::ValueBoxDef::move_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::Contained * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2204,7 +1981,6 @@ POA_CORBA::ValueBoxDef::move_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2214,7 +1990,6 @@ POA_CORBA::ValueBoxDef::_get_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA::IDLType * const impl = static_cast<POA_CORBA::ValueBoxDef *> (servant);
@@ -2222,7 +1997,6 @@ POA_CORBA::ValueBoxDef::_get_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
index a66c2726183..0878ffef071 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
@@ -80,14 +80,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -97,7 +95,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -107,7 +104,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -117,7 +113,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::UShort digits (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -128,7 +123,6 @@ namespace POA_CORBA
 
     void digits (
         ::CORBA::UShort digits
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -138,7 +132,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Short scale (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -149,7 +142,6 @@ namespace POA_CORBA
 
     void scale (
         ::CORBA::Short scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -202,14 +194,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -219,7 +209,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -229,7 +218,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -240,7 +228,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -250,7 +237,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -261,7 +247,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -271,7 +256,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -282,7 +266,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -292,7 +275,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -302,7 +284,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -312,7 +293,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -322,7 +302,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -335,7 +314,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -345,7 +323,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -355,7 +332,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -366,7 +342,6 @@ namespace POA_CORBA
 
     void type_def (
         ::CORBA::IDLType_ptr type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -376,7 +351,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Visibility access (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -387,7 +361,6 @@ namespace POA_CORBA
 
     void access (
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -440,14 +413,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -457,7 +428,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -468,7 +438,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -480,7 +449,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -494,7 +462,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -507,7 +474,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -520,7 +486,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -535,7 +500,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -549,7 +513,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -564,7 +527,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -578,7 +540,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -592,7 +553,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -606,7 +566,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -626,7 +585,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -640,7 +598,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -654,7 +611,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -667,7 +623,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -681,7 +636,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -695,7 +649,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -715,7 +668,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -725,7 +677,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -736,7 +687,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -746,7 +696,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -757,7 +706,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -767,7 +715,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -778,7 +725,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -788,7 +734,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -798,7 +743,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -808,7 +752,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -818,7 +761,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -831,7 +773,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -841,7 +782,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -851,7 +791,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * supported_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -862,7 +801,6 @@ namespace POA_CORBA
 
     void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -872,7 +810,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InitializerSeq * initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -883,7 +820,6 @@ namespace POA_CORBA
 
     void initializers (
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -893,7 +829,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef_ptr base_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -904,7 +839,6 @@ namespace POA_CORBA
 
     void base_value (
         ::CORBA::ValueDef_ptr base_value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -914,7 +848,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDefSeq * abstract_base_values (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -925,7 +858,6 @@ namespace POA_CORBA
 
     void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -935,7 +867,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_abstract (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -946,7 +877,6 @@ namespace POA_CORBA
 
     void is_abstract (
         ::CORBA::Boolean is_abstract
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -956,7 +886,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_custom (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -967,7 +896,6 @@ namespace POA_CORBA
 
     void is_custom (
         ::CORBA::Boolean is_custom
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -977,7 +905,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_truncatable (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -988,7 +915,6 @@ namespace POA_CORBA
 
     void is_truncatable (
         ::CORBA::Boolean is_truncatable
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -999,7 +925,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1009,7 +934,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef::FullValueDescription * describe_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1024,7 +948,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1039,7 +962,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1057,7 +979,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1110,14 +1031,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1127,7 +1046,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1138,7 +1056,6 @@ namespace POA_CORBA
 
     ::CORBA::Contained_ptr lookup (
         const char * search_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1150,7 +1067,6 @@ namespace POA_CORBA
     ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1164,7 +1080,6 @@ namespace POA_CORBA
         ::CORBA::Long levels_to_search,
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1177,7 +1092,6 @@ namespace POA_CORBA
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
         ::CORBA::Long max_returned_objs
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1190,7 +1104,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1205,7 +1118,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1219,7 +1131,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1234,7 +1145,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr discriminator_type,
         const ::CORBA::UnionMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1248,7 +1158,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::EnumMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1262,7 +1171,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1276,7 +1184,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1296,7 +1203,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1310,7 +1216,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1324,7 +1229,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::StructMemberSeq & members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1337,7 +1241,6 @@ namespace POA_CORBA
         const char * id,
         const char * name,
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1351,7 +1254,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1365,7 +1267,6 @@ namespace POA_CORBA
         const char * name,
         const char * version,
         const ::CORBA::InterfaceDefSeq & base_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1385,7 +1286,6 @@ namespace POA_CORBA
         const ::CORBA::ValueDefSeq & abstract_base_values,
         const ::CORBA::InterfaceDefSeq & supported_interfaces,
         const ::CORBA::ExtInitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1395,7 +1295,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1406,7 +1305,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1416,7 +1314,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1427,7 +1324,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1437,7 +1333,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1448,7 +1343,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1458,7 +1352,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1468,7 +1361,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1478,7 +1370,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1488,7 +1379,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1501,7 +1391,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1511,7 +1400,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1521,7 +1409,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InterfaceDefSeq * supported_interfaces (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1532,7 +1419,6 @@ namespace POA_CORBA
 
     void supported_interfaces (
         const ::CORBA::InterfaceDefSeq & supported_interfaces
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1542,7 +1428,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::InitializerSeq * initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1553,7 +1438,6 @@ namespace POA_CORBA
 
     void initializers (
         const ::CORBA::InitializerSeq & initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1563,7 +1447,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef_ptr base_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1574,7 +1457,6 @@ namespace POA_CORBA
 
     void base_value (
         ::CORBA::ValueDef_ptr base_value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1584,7 +1466,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDefSeq * abstract_base_values (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1595,7 +1476,6 @@ namespace POA_CORBA
 
     void abstract_base_values (
         const ::CORBA::ValueDefSeq & abstract_base_values
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1605,7 +1485,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_abstract (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1616,7 +1495,6 @@ namespace POA_CORBA
 
     void is_abstract (
         ::CORBA::Boolean is_abstract
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1626,7 +1504,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_custom (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1637,7 +1514,6 @@ namespace POA_CORBA
 
     void is_custom (
         ::CORBA::Boolean is_custom
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1647,7 +1523,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Boolean is_truncatable (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1658,7 +1533,6 @@ namespace POA_CORBA
 
     void is_truncatable (
         ::CORBA::Boolean is_truncatable
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1669,7 +1543,6 @@ namespace POA_CORBA
 
     ::CORBA::Boolean is_a (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1679,7 +1552,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ValueDef::FullValueDescription * describe_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1694,7 +1566,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::Visibility access
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1709,7 +1580,6 @@ namespace POA_CORBA
         const char * version,
         ::CORBA::IDLType_ptr type,
         ::CORBA::AttributeMode mode
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1727,7 +1597,6 @@ namespace POA_CORBA
         const ::CORBA::ParDescriptionSeq & params,
         const ::CORBA::ExceptionDefSeq & exceptions,
         const ::CORBA::ContextIdSeq & contexts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1737,7 +1606,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExtInitializerSeq * ext_initializers (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1748,7 +1616,6 @@ namespace POA_CORBA
 
     void ext_initializers (
         const ::CORBA::ExtInitializerSeq & ext_initializers
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1758,7 +1625,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1775,7 +1641,6 @@ namespace POA_CORBA
         ::CORBA::AttributeMode mode,
         const ::CORBA::ExceptionDefSeq & get_exceptions,
         const ::CORBA::ExceptionDefSeq & set_exceptions
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1828,14 +1693,12 @@ namespace POA_CORBA
     void _is_owner ( ::CORBA::Boolean b);
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::DefinitionKind def_kind (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1845,7 +1708,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1855,7 +1717,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1866,7 +1727,6 @@ namespace POA_CORBA
 
     void id (
         const char * id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1876,7 +1736,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1887,7 +1746,6 @@ namespace POA_CORBA
 
     void name (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1897,7 +1755,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * version (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1908,7 +1765,6 @@ namespace POA_CORBA
 
     void version (
         const char * version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1918,7 +1774,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Container_ptr defined_in (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1928,7 +1783,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     char * absolute_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1938,7 +1792,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Repository_ptr containing_repository (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1948,7 +1801,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Contained::Description * describe (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1961,7 +1813,6 @@ namespace POA_CORBA
         ::CORBA::Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1971,7 +1822,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::TypeCode_ptr type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1981,7 +1831,6 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::IDLType_ptr original_type_def (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -1992,7 +1841,6 @@ namespace POA_CORBA
 
     void original_type_def (
         ::CORBA::IDLType_ptr original_type_def
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
index d50df786b6b..d8aa507ca47 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
@@ -83,7 +83,7 @@ POA_CORBA::FixedDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -95,7 +95,7 @@ POA_CORBA::FixedDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -113,87 +113,78 @@ POA_CORBA::FixedDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::FixedDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::FixedDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->FixedDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->FixedDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::FixedDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::FixedDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::FixedDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::UShort POA_CORBA::FixedDef_tie<T>::digits  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->digits (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::FixedDef_tie<T>::digits  (
     ::CORBA::UShort digits
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -201,33 +192,29 @@ void POA_CORBA::FixedDef_tie<T>::digits  (
 {
   this->ptr_->digits (
     digits
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Short POA_CORBA::FixedDef_tie<T>::scale  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->scale (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::FixedDef_tie<T>::scale  (
     ::CORBA::Short scale
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -235,7 +222,6 @@ void POA_CORBA::FixedDef_tie<T>::scale  (
 {
   this->ptr_->scale (
     scale
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -292,7 +278,7 @@ POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -304,7 +290,7 @@ POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -322,71 +308,64 @@ POA_CORBA::ValueMemberDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueMemberDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueMemberDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ValueMemberDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ValueMemberDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ValueMemberDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -394,33 +373,29 @@ void POA_CORBA::ValueMemberDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -428,33 +403,29 @@ void POA_CORBA::ValueMemberDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -462,75 +433,66 @@ void POA_CORBA::ValueMemberDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ValueMemberDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ValueMemberDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ValueMemberDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -538,7 +500,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -548,49 +509,43 @@ void POA_CORBA::ValueMemberDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ValueMemberDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ValueMemberDef_tie<T>::type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::type_def  (
     ::CORBA::IDLType_ptr type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -598,33 +553,29 @@ void POA_CORBA::ValueMemberDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
     type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Visibility POA_CORBA::ValueMemberDef_tie<T>::access  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->access (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueMemberDef_tie<T>::access  (
     ::CORBA::Visibility access
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -632,7 +583,6 @@ void POA_CORBA::ValueMemberDef_tie<T>::access  (
 {
   this->ptr_->access (
     access
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -689,7 +639,7 @@ POA_CORBA::ValueDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -701,7 +651,7 @@ POA_CORBA::ValueDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -719,55 +669,50 @@ POA_CORBA::ValueDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ValueDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ValueDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ValueDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ValueDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -775,18 +720,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ValueDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -795,11 +738,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -808,7 +750,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -819,11 +760,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -831,7 +771,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -841,11 +780,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -853,7 +791,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -863,11 +800,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -877,7 +813,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -889,11 +824,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -902,7 +836,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -913,11 +846,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -927,7 +859,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -939,11 +870,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -952,7 +882,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -963,11 +892,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -976,7 +904,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -987,11 +914,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1000,7 +926,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1011,11 +936,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1030,7 +954,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1047,11 +970,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1060,7 +982,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1071,11 +992,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1084,7 +1004,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1095,11 +1014,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1107,7 +1025,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1117,11 +1034,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1130,7 +1046,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1141,11 +1056,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1154,7 +1068,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1165,11 +1078,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1184,7 +1096,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1201,33 +1112,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1235,33 +1142,29 @@ void POA_CORBA::ValueDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1269,33 +1172,29 @@ void POA_CORBA::ValueDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1303,75 +1202,66 @@ void POA_CORBA::ValueDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ValueDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ValueDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ValueDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1379,7 +1269,6 @@ void POA_CORBA::ValueDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1389,49 +1278,43 @@ void POA_CORBA::ValueDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ValueDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1439,33 +1322,29 @@ void POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InitializerSeq * POA_CORBA::ValueDef_tie<T>::initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::initializers  (
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1473,33 +1352,29 @@ void POA_CORBA::ValueDef_tie<T>::initializers  (
 {
   this->ptr_->initializers (
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ValueDef_tie<T>::base_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::base_value  (
     ::CORBA::ValueDef_ptr base_value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1507,33 +1382,29 @@ void POA_CORBA::ValueDef_tie<T>::base_value  (
 {
   this->ptr_->base_value (
     base_value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDefSeq * POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->abstract_base_values (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
     const ::CORBA::ValueDefSeq & abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1541,33 +1412,29 @@ void POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
 {
   this->ptr_->abstract_base_values (
     abstract_base_values
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_abstract  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_abstract (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::is_abstract  (
     ::CORBA::Boolean is_abstract
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1575,33 +1442,29 @@ void POA_CORBA::ValueDef_tie<T>::is_abstract  (
 {
   this->ptr_->is_abstract (
     is_abstract
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_custom  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_custom (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::is_custom  (
     ::CORBA::Boolean is_custom
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1609,33 +1472,29 @@ void POA_CORBA::ValueDef_tie<T>::is_custom  (
 {
   this->ptr_->is_custom (
     is_custom
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_truncatable  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_truncatable (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueDef_tie<T>::is_truncatable  (
     ::CORBA::Boolean is_truncatable
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1643,17 +1502,15 @@ void POA_CORBA::ValueDef_tie<T>::is_truncatable  (
 {
   this->ptr_->is_truncatable (
     is_truncatable
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_a  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1661,27 +1518,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ValueDef_tie<T>::describe_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1691,7 +1545,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::Visibility access
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1703,11 +1556,10 @@ template <class T> ACE_INLINE
     version,
     type,
     access
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1717,7 +1569,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1729,11 +1580,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1746,7 +1596,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1761,7 +1610,6 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1818,7 +1666,7 @@ POA_CORBA::ExtValueDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -1830,7 +1678,7 @@ POA_CORBA::ExtValueDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -1848,55 +1696,50 @@ POA_CORBA::ExtValueDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExtValueDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ExtValueDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ExtValueDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ExtValueDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ExtValueDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained_ptr POA_CORBA::ExtValueDef_tie<T>::lookup  (
     const char * search_name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1904,18 +1747,16 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->lookup (
     search_name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ContainedSeq * POA_CORBA::ExtValueDef_tie<T>::contents  (
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1924,11 +1765,10 @@ template <class T> ACE_INLINE
   return this->ptr_->contents (
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1937,7 +1777,6 @@ template <class T> ACE_INLINE
     ::CORBA::Long levels_to_search,
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1948,11 +1787,10 @@ template <class T> ACE_INLINE
     levels_to_search,
     limit_type,
     exclude_inherited
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1960,7 +1798,6 @@ template <class T> ACE_INLINE
     ::CORBA::DefinitionKind limit_type,
     ::CORBA::Boolean exclude_inherited,
     ::CORBA::Long max_returned_objs
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1970,11 +1807,10 @@ template <class T> ACE_INLINE
     limit_type,
     exclude_inherited,
     max_returned_objs
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -1982,7 +1818,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -1992,11 +1827,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2006,7 +1840,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     const ::CORBA::Any & value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2018,11 +1851,10 @@ template <class T> ACE_INLINE
     version,
     type,
     value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2031,7 +1863,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2042,11 +1873,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2056,7 +1886,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr discriminator_type,
     const ::CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2068,11 +1897,10 @@ template <class T> ACE_INLINE
     version,
     discriminator_type,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2081,7 +1909,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2092,11 +1919,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2105,7 +1931,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2116,11 +1941,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2129,7 +1953,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2140,11 +1963,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2159,7 +1981,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2176,11 +1997,10 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2189,7 +2009,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2200,11 +2019,10 @@ template <class T> ACE_INLINE
     name,
     version,
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2213,7 +2031,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2224,11 +2041,10 @@ template <class T> ACE_INLINE
     name,
     version,
     members
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2236,7 +2052,6 @@ template <class T> ACE_INLINE
     const char * id,
     const char * name,
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2246,11 +2061,10 @@ template <class T> ACE_INLINE
     id,
     name,
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2259,7 +2073,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::AbstractInterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2270,11 +2083,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2283,7 +2095,6 @@ template <class T> ACE_INLINE
     const char * name,
     const char * version,
     const ::CORBA::InterfaceDefSeq & base_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2294,11 +2105,10 @@ template <class T> ACE_INLINE
     name,
     version,
     base_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2313,7 +2123,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ValueDefSeq & abstract_base_values,
     const ::CORBA::InterfaceDefSeq & supported_interfaces,
     const ::CORBA::ExtInitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2330,33 +2139,29 @@ template <class T> ACE_INLINE
     abstract_base_values,
     supported_interfaces,
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2364,33 +2169,29 @@ void POA_CORBA::ExtValueDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2398,33 +2199,29 @@ void POA_CORBA::ExtValueDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2432,75 +2229,66 @@ void POA_CORBA::ExtValueDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ExtValueDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ExtValueDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ExtValueDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ExtValueDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2508,7 +2296,6 @@ void POA_CORBA::ExtValueDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2518,49 +2305,43 @@ void POA_CORBA::ExtValueDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ExtValueDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InterfaceDefSeq * POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
     const ::CORBA::InterfaceDefSeq & supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2568,33 +2349,29 @@ void POA_CORBA::ExtValueDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
     supported_interfaces
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::InitializerSeq * POA_CORBA::ExtValueDef_tie<T>::initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::initializers  (
     const ::CORBA::InitializerSeq & initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2602,33 +2379,29 @@ void POA_CORBA::ExtValueDef_tie<T>::initializers  (
 {
   this->ptr_->initializers (
     initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef_ptr POA_CORBA::ExtValueDef_tie<T>::base_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->base_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::base_value  (
     ::CORBA::ValueDef_ptr base_value
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2636,33 +2409,29 @@ void POA_CORBA::ExtValueDef_tie<T>::base_value  (
 {
   this->ptr_->base_value (
     base_value
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDefSeq * POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->abstract_base_values (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
     const ::CORBA::ValueDefSeq & abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2670,33 +2439,29 @@ void POA_CORBA::ExtValueDef_tie<T>::abstract_base_values  (
 {
   this->ptr_->abstract_base_values (
     abstract_base_values
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_abstract (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
     ::CORBA::Boolean is_abstract
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2704,33 +2469,29 @@ void POA_CORBA::ExtValueDef_tie<T>::is_abstract  (
 {
   this->ptr_->is_abstract (
     is_abstract
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_custom  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_custom (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::is_custom  (
     ::CORBA::Boolean is_custom
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2738,33 +2499,29 @@ void POA_CORBA::ExtValueDef_tie<T>::is_custom  (
 {
   this->ptr_->is_custom (
     is_custom
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->is_truncatable (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
     ::CORBA::Boolean is_truncatable
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2772,17 +2529,15 @@ void POA_CORBA::ExtValueDef_tie<T>::is_truncatable  (
 {
   this->ptr_->is_truncatable (
     is_truncatable
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Boolean POA_CORBA::ExtValueDef_tie<T>::is_a  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2790,27 +2545,24 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->is_a (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ValueDef::FullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2820,7 +2572,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::Visibility access
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2832,11 +2583,10 @@ template <class T> ACE_INLINE
     version,
     type,
     access
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2846,7 +2596,6 @@ template <class T> ACE_INLINE
     const char * version,
     ::CORBA::IDLType_ptr type,
     ::CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2858,11 +2607,10 @@ template <class T> ACE_INLINE
     version,
     type,
     mode
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2875,7 +2623,6 @@ template <class T> ACE_INLINE
     const ::CORBA::ParDescriptionSeq & params,
     const ::CORBA::ExceptionDefSeq & exceptions,
     const ::CORBA::ContextIdSeq & contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2890,33 +2637,29 @@ template <class T> ACE_INLINE
     params,
     exceptions,
     contexts
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExtInitializerSeq * POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->ext_initializers (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
     const ::CORBA::ExtInitializerSeq & ext_initializers
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2924,27 +2667,24 @@ void POA_CORBA::ExtValueDef_tie<T>::ext_initializers  (
 {
   this->ptr_->ext_initializers (
     ext_initializers
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::ExtValueDef::ExtFullValueDescription * POA_CORBA::ExtValueDef_tie<T>::describe_ext_value  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe_ext_value (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -2956,7 +2696,6 @@ template <class T> ACE_INLINE
     ::CORBA::AttributeMode mode,
     const ::CORBA::ExceptionDefSeq & get_exceptions,
     const ::CORBA::ExceptionDefSeq & set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -2970,7 +2709,6 @@ template <class T> ACE_INLINE
     mode,
     get_exceptions,
     set_exceptions
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3027,7 +2765,7 @@ POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -3039,7 +2777,7 @@ POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T *obj, ::CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -3057,71 +2795,64 @@ POA_CORBA::ValueBoxDef_tie<T>::_is_owner ( ::CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueBoxDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ValueBoxDef_tie<T>::_default_POA (void)
 {
   if (! ::CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ValueBoxDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ValueBoxDef::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::DefinitionKind POA_CORBA::ValueBoxDef_tie<T>::def_kind  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::id  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::id  (
     const char * id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3129,33 +2860,29 @@ void POA_CORBA::ValueBoxDef_tie<T>::id  (
 {
   this->ptr_->id (
     id
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::name  (
     const char * name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3163,33 +2890,29 @@ void POA_CORBA::ValueBoxDef_tie<T>::name  (
 {
   this->ptr_->name (
     name
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::version  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::version  (
     const char * version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3197,75 +2920,66 @@ void POA_CORBA::ValueBoxDef_tie<T>::version  (
 {
   this->ptr_->version (
     version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Container_ptr POA_CORBA::ValueBoxDef_tie<T>::defined_in  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Repository_ptr POA_CORBA::ValueBoxDef_tie<T>::containing_repository  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::Contained::Description * POA_CORBA::ValueBoxDef_tie<T>::describe  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
@@ -3273,7 +2987,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::move  (
     ::CORBA::Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3283,49 +2996,43 @@ void POA_CORBA::ValueBoxDef_tie<T>::move  (
     new_container,
     new_name,
     new_version
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::TypeCode_ptr POA_CORBA::ValueBoxDef_tie<T>::type  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 ::CORBA::IDLType_ptr POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:101
 
 template <class T> ACE_INLINE
 void POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
     ::CORBA::IDLType_ptr original_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -3333,7 +3040,6 @@ void POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
 {
   this->ptr_->original_type_def (
     original_type_def
-    ACE_ENV_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index fd81da7b806..24a6876cd38 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -34,8 +34,7 @@ int
 TAO_IFR_Service_Loader::init (int argc,
                               ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line (argc,
@@ -45,24 +44,19 @@ TAO_IFR_Service_Loader::init (int argc,
       CORBA::ORB_var orb =
         CORBA::ORB_init (command_line.get_argc (),
                          command_line.get_ASCII_argv (),
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // This function call initializes the IFR_Service Service
       CORBA::Object_var object =
         this->create_object (orb.in (),
                              command_line.get_argc (),
-                             command_line.get_TCHAR_argv ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             command_line.get_TCHAR_argv ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ Should we log this???
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -76,8 +70,7 @@ TAO_IFR_Service_Loader::fini (void)
 CORBA::Object_ptr
 TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb,
                                        int argc,
-                                       ACE_TCHAR *argv[]
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       ACE_TCHAR *argv[])
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initializes the IFR_Service Service. Returns -1
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
index 4ed289fb58b..9f5547c0e37 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -51,8 +51,7 @@ public:
   // ORB and the command line parameters.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[]
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 879525de273..ab1f5745bc8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -61,17 +61,14 @@ TAO_IFR_Server::init_with_orb (int argc,
                                CORBA::ORB_ptr orb,
                                int use_multicast_server)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Duplicate the ORB.
       this->orb_ = CORBA::ORB::_duplicate (orb);
 
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -83,9 +80,7 @@ TAO_IFR_Server::init_with_orb (int argc,
           );
         }
       this->root_poa_ =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       int retval = OPTIONS::instance ()->parse_args (argc,
                                                     argv);
@@ -95,24 +90,21 @@ TAO_IFR_Server::init_with_orb (int argc,
           return retval;
         }
 
-      retval = this->create_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = this->create_poa ();
 
       if (retval != 0)
         {
           return retval;
         }
 
-      retval = this->open_config (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = this->open_config ();
 
       if (retval != 0)
         {
           return retval;
         }
 
-      retval = this->create_repository (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = this->create_repository ();
 
       if (retval != 0)
         {
@@ -123,8 +115,7 @@ TAO_IFR_Server::init_with_orb (int argc,
           || OPTIONS::instance()->support_multicast_discovery ())
         {
           retval =
-            this->init_multicast_server (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->init_multicast_server ();
 
           if (retval != 0)
             {
@@ -132,102 +123,80 @@ TAO_IFR_Server::init_with_orb (int argc,
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "IFR_Service::init");
+      ex._tao_print_exception ("IFR_Service::init");
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
 TAO_IFR_Server::fini (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->root_poa_->destroy (1,
-                                1
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_IFR_Server::fini");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_IFR_Server::fini");
+      throw;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
-TAO_IFR_Server::create_poa (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IFR_Server::create_poa (void)
 {
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   CORBA::PolicyList policies (5);
   policies.length (5);
 
   // ID Assignment Policy.
   policies[0] =
-    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Lifespan Policy.
   policies[1] =
-    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
   // Request Processing Policy.
   policies[2] =
     this->root_poa_->create_request_processing_policy (
         PortableServer::USE_DEFAULT_SERVANT
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (-1);
 
   // Servant Retention Policy.
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
         PortableServer::NON_RETAIN
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (-1);
 
   // Id Uniqueness Policy.
   policies[4] =
     this->root_poa_->create_id_uniqueness_policy (
         PortableServer::MULTIPLE_ID
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (-1);
 
   this->repo_poa_ =
     this->root_poa_->create_POA ("repoPOA",
                                  poa_manager.in (),
-                                 policies
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                 policies);
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]->destroy ();
 
   return 0;
 }
 
 int
-TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IFR_Server::open_config (void)
 {
   if (OPTIONS::instance ()->using_registry ())
     {
@@ -241,7 +210,6 @@ TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
       ACE_NEW_THROW_EX (this->config_,
                         ACE_Configuration_Win32Registry (root),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (-1);
 #endif /* ACE_WIN32 */
 
       return 0;
@@ -252,7 +220,6 @@ TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
       ACE_NEW_THROW_EX (heap,
                         ACE_Configuration_Heap,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (-1);
 
       if (OPTIONS::instance ()->persistent ())
         {
@@ -284,7 +251,7 @@ TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IFR_Server::create_repository (void)
 {
   TAO_ComponentRepository_i *impl = 0;
   ACE_NEW_THROW_EX (
@@ -296,7 +263,6 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
         ),
       CORBA::NO_MEMORY ()
     );
-  ACE_CHECK_RETURN (-1);
 
   auto_ptr<TAO_ComponentRepository_i> safety (impl);
   TAO_IFR_Service_Utils::repo_ = impl;
@@ -313,14 +279,11 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
         ),
       CORBA::NO_MEMORY ()
     );
-  ACE_CHECK_RETURN (-1);
 
   PortableServer::ServantBase_var tie_safety (impl_tie);
   safety.release ();
 
-  this->repo_poa_->set_servant (impl_tie
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->repo_poa_->set_servant (impl_tie);
 
   PortableServer::ObjectId_var oid =
     PortableServer::string_to_ObjectId ("");
@@ -329,20 +292,14 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_poa_->create_reference_with_id (
         oid.in (),
         "IDL:omg.org/CORBA/ComponentIR/ComponentRepository:1.0"
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Repository_ptr repo_ref =
-    CORBA::Repository::_narrow (obj.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::Repository::_narrow (obj.in ());
 
   // Initialize the repository.
   int status = impl->repo_init (repo_ref,
-                                this->repo_poa_
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                this->repo_poa_);
 
   if (status != 0)
     {
@@ -351,20 +308,14 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
 
   // Save and output the IOR string.
   this->ifr_ior_ =
-    this->orb_->object_to_string (repo_ref
-                                  ACE_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (repo_ref);
 
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var table_object =
-    this->orb_->resolve_initial_references ("IORTable"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("IORTable");
 
   IORTable::Table_var adapter =
-    IORTable::Table::_narrow (table_object.in ()
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    IORTable::Table::_narrow (table_object.in ());
 
   if (CORBA::is_nil (adapter.in ()))
     {
@@ -373,16 +324,12 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
   else
     {
       adapter->bind ("InterfaceRepository",
-                     this->ifr_ior_.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                     this->ifr_ior_.in ());
     }
 
   // Add the repository to the ORB's table of initialized object references.
   this->orb_->register_initial_reference ("InterfaceRepository",
-                                          repo_ref
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+                                          repo_ref);
 
   FILE *output_file_ =
     ACE_OS::fopen (OPTIONS::instance()->ior_output_file (),
@@ -399,7 +346,7 @@ TAO_IFR_Server::create_repository (ACE_ENV_SINGLE_ARG_DECL)
 
 // Install ior multicast handler.
 int
-TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IFR_Server::init_multicast_server (void)
 {
 #if defined (ACE_HAS_IP_MULTICAST)
   // Get reactor instance from TAO.
@@ -437,7 +384,6 @@ TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (this->ior_multicast_,
                     TAO_IOR_Multicast (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (-1);
 
   if (mde.length () != 0)
     {
@@ -518,7 +464,6 @@ void
 TAO_IFR_Service_Utils::valid_container (
     CORBA::DefinitionKind container_kind,
     CORBA::DefinitionKind contained_kind
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -580,8 +525,7 @@ TAO_IFR_Service_Utils::valid_container (
 
   if (error_flag == 1)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO);
     }
 }
 
@@ -592,25 +536,20 @@ TAO_IFR_Service_Utils::pre_exist (
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo,
     CORBA::DefinitionKind kind
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Service_Utils::id_exists (id,
-                                    repo
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    repo);
 
   TAO_IFR_Service_Utils::name_exists (checker,
                                       key,
                                       repo,
-                                      kind
-                                      ACE_ENV_ARG_PARAMETER);
+                                      kind);
 }
 
 void
 TAO_IFR_Service_Utils::id_exists (const char *id,
-                                  TAO_Repository_i *repo
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_Repository_i *repo)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The repo id must not already exist.
@@ -620,8 +559,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id,
                                          holder)
        == 0)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 }
 
@@ -631,7 +569,6 @@ TAO_IFR_Service_Utils::name_exists (
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo,
     CORBA::DefinitionKind kind
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -671,8 +608,9 @@ TAO_IFR_Service_Utils::name_exists (
 
           if ((*checker) (member_name.fast_rep ()) != 0)
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 3,
+                CORBA::COMPLETED_NO);
             }
         }
     }
@@ -707,8 +645,9 @@ TAO_IFR_Service_Utils::name_exists (
 
           if ((*checker) (defn_name.fast_rep ()) != 0)
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 3,
+                CORBA::COMPLETED_NO);
             }
         }
     }
@@ -719,9 +658,7 @@ TAO_IFR_Service_Utils::name_exists (
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "attrs",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               key);
     }
 
   if (kind == CORBA::dk_Interface)
@@ -729,9 +666,7 @@ TAO_IFR_Service_Utils::name_exists (
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "ops",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               key);
     }
 
   if (kind == CORBA::dk_Component)
@@ -739,37 +674,27 @@ TAO_IFR_Service_Utils::name_exists (
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "provides",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               key);
 
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "uses",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               key);
 
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "emits",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               key);
 
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "publishes",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               key);
 
       TAO_IFR_Service_Utils::check_subsection (checker,
                                                "consumes",
                                                repo->config (),
-                                               key
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               key);
     }
 }
 
@@ -779,7 +704,6 @@ TAO_IFR_Service_Utils::check_subsection (
     const char *sub_section,
     ACE_Configuration *config,
     ACE_Configuration_Section_Key &key
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -817,8 +741,7 @@ TAO_IFR_Service_Utils::check_subsection (
 
       if ((*checker) (entry_name.fast_rep ()) != 0)
         {
-          ACE_THROW (CORBA::BAD_PARAM (3,
-                                       CORBA::COMPLETED_NO));
+          throw CORBA::BAD_PARAM (3, CORBA::COMPLETED_NO);
           return;
         }
     }
@@ -832,19 +755,16 @@ TAO_IFR_Service_Utils::valid_creation (
     name_clash_checker checker,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo
-    ACE_ENV_ARG_DECL
   )
 {
   TAO_IFR_Service_Utils::valid_container (container_kind,
-                                          contained_kind
-                                          ACE_ENV_ARG_PARAMETER);
+                                          contained_kind);
 
   TAO_IFR_Service_Utils::pre_exist (id,
                                     checker,
                                     key,
                                     repo,
-                                    container_kind
-                                    ACE_ENV_ARG_PARAMETER);
+                                    container_kind);
 }
 
 ACE_TString
@@ -859,7 +779,6 @@ TAO_IFR_Service_Utils::create_common (
     TAO_IFR_Service_Utils::name_clash_checker checker,
     const char *version,
     const char *sub_section_name
-    ACE_ENV_ARG_DECL
   )
 {
   ACE_TString path;
@@ -871,9 +790,7 @@ TAO_IFR_Service_Utils::create_common (
                                          id,
                                          checker,
                                          container_key,
-                                         repo
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (path);
+                                         repo);
 
   ACE_Configuration *config = repo->config ();
 
@@ -1021,7 +938,6 @@ CORBA::TypeCode_ptr
 TAO_IFR_Service_Utils::gen_valuetype_tc_r (
       ACE_Configuration_Section_Key &key,
       TAO_Repository_i *repo
-      ACE_ENV_ARG_DECL
     )
 {
   ACE_TString name;
@@ -1086,26 +1002,21 @@ TAO_IFR_Service_Utils::gen_valuetype_tc_r (
                                     0);
       base_tc =
         TAO_IFR_Service_Utils::gen_valuetype_tc_r (base_key,
-                                                   repo
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+                                                   repo);
     }
 
   CORBA::ValueMemberSeq vm_seq;
   vm_seq.length (0);
   TAO_IFR_Service_Utils::fill_valuemember_seq (vm_seq,
                                                key,
-                                               repo
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+                                               repo);
 
   return
     repo->tc_factory ()->create_value_tc (id.c_str (),
                                           name.c_str (),
                                           tm,
                                           base_tc.in (),
-                                          vm_seq
-                                          ACE_ENV_ARG_PARAMETER);
+                                          vm_seq);
 }
 
 void
@@ -1113,7 +1024,6 @@ TAO_IFR_Service_Utils::fill_valuemember_seq (
     CORBA::ValueMemberSeq &vm_seq,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo
-    ACE_ENV_ARG_DECL
   )
 {
   ACE_Configuration_Section_Key members_key;
@@ -1168,8 +1078,7 @@ TAO_IFR_Service_Utils::fill_valuemember_seq (
       TAO_IDLType_i *impl =
         TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                 repo);
-      vm_seq[i].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      vm_seq[i].type = impl->type_i ();
 
       repo->config ()->get_integer_value (member_key,
                                           "access",
@@ -1287,23 +1196,20 @@ TAO_IFR_Service_Utils::path_to_container (ACE_TString &path,
 
 CORBA::Object_ptr
 TAO_IFR_Service_Utils::path_to_ir_object (ACE_TString &path,
-                                          TAO_Repository_i *repo
-                                          ACE_ENV_ARG_DECL)
+                                          TAO_Repository_i *repo)
 {
   CORBA::DefinitionKind def_kind =
     TAO_IFR_Service_Utils::path_to_def_kind (path, repo);
 
   return TAO_IFR_Service_Utils::create_objref (def_kind,
                                                path.c_str (),
-                                               repo
-                                               ACE_ENV_ARG_PARAMETER);
+                                               repo);
 }
 
 CORBA::Object_ptr
 TAO_IFR_Service_Utils::create_objref (CORBA::DefinitionKind def_kind,
                                       const char *obj_id,
-                                      TAO_Repository_i *repo
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_Repository_i *repo)
 {
   ACE_TString repo_id ("IDL:omg.org/");
 
@@ -1421,8 +1327,7 @@ TAO_IFR_Service_Utils::create_objref (CORBA::DefinitionKind def_kind,
   PortableServer::POA_ptr poa = repo->select_poa (def_kind);
 
   return poa->create_reference_with_id (oid.in (),
-                                        repo_id.c_str ()
-                                        ACE_ENV_ARG_PARAMETER);
+                                        repo_id.c_str ());
 }
 
 char *
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index 2b91098a1ee..50fd7309417 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -65,17 +65,17 @@ public:
 protected:
 
   /// Two persistent POAs, one using a servant locator.
-  int create_poa (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int create_poa (void);
 
   /// Open an ACE_Configuration of the appropriate type.
-  int open_config (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int open_config (void);
 
   /// Create and initialize the repository.
-  int create_repository (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int create_repository (void);
 
   /// Enable the Interface Repository to answer multicast requests
   /// for its IOR.
-  int init_multicast_server (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int init_multicast_server (void);
 
   /// Reference to our ORB.
   CORBA::ORB_var orb_;
@@ -114,8 +114,7 @@ public:
 
   /// Checks for illegal member type in given container type.
   static void valid_container (CORBA::DefinitionKind container_kind,
-                               CORBA::DefinitionKind contained_kind
-                               ACE_ENV_ARG_DECL)
+                               CORBA::DefinitionKind contained_kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Wrapper for id_exists() and name_exists().
@@ -123,21 +122,18 @@ public:
                          name_clash_checker checker,
                          ACE_Configuration_Section_Key &key,
                          TAO_Repository_i *repo,
-                         CORBA::DefinitionKind kind
-                         ACE_ENV_ARG_DECL);
+                         CORBA::DefinitionKind kind);
 
   /// Checks for a global repository id clash.
   static void id_exists (const char *id,
-                         TAO_Repository_i *repo
-                         ACE_ENV_ARG_DECL)
+                         TAO_Repository_i *repo)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Checks for a local name clash.
   static void name_exists (name_clash_checker checker,
                            ACE_Configuration_Section_Key &key,
                            TAO_Repository_i *repo,
-                           CORBA::DefinitionKind kind
-                           ACE_ENV_ARG_DECL)
+                           CORBA::DefinitionKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used by interfaces and components to check for name clashes
@@ -145,8 +141,7 @@ public:
   static void check_subsection (name_clash_checker checker,
                                 const char *sub_section,
                                 ACE_Configuration *config,
-                                ACE_Configuration_Section_Key &key
-                                ACE_ENV_ARG_DECL)
+                                ACE_Configuration_Section_Key &key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Top-level method which calls all the above error-checking methods.
@@ -155,8 +150,7 @@ public:
                               const char *id,
                               name_clash_checker checker,
                               ACE_Configuration_Section_Key &key,
-                              TAO_Repository_i *repo
-                              ACE_ENV_ARG_DECL);
+                              TAO_Repository_i *repo);
 
   /// Code common to the creation of an entry for any non-anonymous type.
   static ACE_TString create_common (
@@ -170,7 +164,6 @@ public:
       name_clash_checker checker,
       const char *version,
       const char *sub_section_name
-      ACE_ENV_ARG_DECL
     );
 
   /// Common to Container::create_value() and ValueDef::supported_interfaces(),
@@ -191,14 +184,12 @@ public:
   static CORBA::TypeCode_ptr gen_valuetype_tc_r (
       ACE_Configuration_Section_Key &,
       TAO_Repository_i *
-      ACE_ENV_ARG_DECL
     );
 
   /// Called from the above function.
   static void fill_valuemember_seq (CORBA::ValueMemberSeq &,
                                     ACE_Configuration_Section_Key &,
-                                    TAO_Repository_i *
-                                    ACE_ENV_ARG_DECL);
+                                    TAO_Repository_i *);
 
   /// Converison from IR Object reference to key location path.
   static char *reference_to_path (CORBA::IRObject_ptr obj);
@@ -227,14 +218,12 @@ public:
 
   /// Conversion from key location path to IR Object reference.
   static CORBA::Object_ptr path_to_ir_object (ACE_TString &path,
-                                              TAO_Repository_i *repo
-                                              ACE_ENV_ARG_DECL);
+                                              TAO_Repository_i *repo);
 
   /// Can be called from the above method or directly from a derived class.
   static CORBA::Object_ptr create_objref (CORBA::DefinitionKind def_kind,
                                           const char *obj_id,
-                                          TAO_Repository_i *repo
-                                          ACE_ENV_ARG_DECL);
+                                          TAO_Repository_i *repo);
 
   /// Copy and octet sequence to a string..
   static char *oid_to_string (PortableServer::ObjectId &oid);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index 848677edd13..041e85dfa0c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -15,8 +15,7 @@ template<typename T>
 void
 TAO_IFR_Generic_Utils<T>::destroy_special (const char *section_name,
                                            TAO_Repository_i *repo,
-                                           ACE_Configuration_Section_Key &key
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_Configuration_Section_Key &key)
 {
   ACE_Configuration_Section_Key sub_key;
   int status =
@@ -49,8 +48,7 @@ TAO_IFR_Generic_Utils<T>::destroy_special (const char *section_name,
                                      special_key);
       T impl (repo);
       impl.section_key (special_key);
-      impl.destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      impl.destroy_i ();
     }
 }
 
@@ -138,17 +136,14 @@ TAO_IFR_Desc_Utils<T_desc,T_impl>::fill_desc_begin (
     T_desc &desc,
     TAO_Repository_i *repo,
     ACE_Configuration_Section_Key &key
-    ACE_ENV_ARG_DECL
   )
 {
   T_impl impl (repo);
   impl.section_key (key);
 
-  desc.name = impl.name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.name = impl.name_i ();
 
-  desc.id = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.id = impl.id_i ();
 
   ACE_TString holder;
   repo->config ()->get_string_value (key,
@@ -156,8 +151,7 @@ TAO_IFR_Desc_Utils<T_desc,T_impl>::fill_desc_begin (
                                      holder);
   desc.defined_in = holder.fast_rep ();
 
-  desc.version = impl.version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.version = impl.version_i ();
 }
 
 template<typename T_strseq>
@@ -304,8 +298,7 @@ TAO_Port_Utils<T>::create_entry (const char *id,
                                  CORBA::Boolean is_multiple,
                                  TAO_Repository_i *repo,
                                  CORBA::DefinitionKind port_kind,
-                                 ACE_Configuration_Section_Key &key
-                                 ACE_ENV_ARG_DECL)
+                                 ACE_Configuration_Section_Key &key)
 {
   TAO_Container_i::tmp_name_holder (name);
   ACE_Configuration_Section_Key new_key;
@@ -319,9 +312,7 @@ TAO_Port_Utils<T>::create_entry (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          sub_section
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (T::_nil ());
+                                          sub_section);
 
   const char *tmp =
     TAO_IFR_Service_Utils::reference_to_path (port_base_type);
@@ -349,12 +340,9 @@ TAO_Port_Utils<T>::create_entry (const char *id,
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                              repo
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (T::_nil ());
+                                              repo);
 
-  return T::_narrow (obj.in ()
-                     ACE_ENV_ARG_PARAMETER);
+  return T::_narrow (obj.in ());
 }
 
 #if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
index 056582e494a..bf7479bc9bd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
@@ -41,8 +41,7 @@ class TAO_IFR_Generic_Utils
 public:
   static void destroy_special (const char *section_name,
                                TAO_Repository_i *repo,
-                               ACE_Configuration_Section_Key &key
-                               ACE_ENV_ARG_DECL);
+                               ACE_Configuration_Section_Key &key);
 
   static void set_initializers (const T &initializers,
                                 ACE_Configuration *config,
@@ -57,8 +56,7 @@ class TAO_IFR_Desc_Utils
 public:
   static void fill_desc_begin (T_desc &desc,
                                TAO_Repository_i *repo,
-                               ACE_Configuration_Section_Key &key
-                               ACE_ENV_ARG_DECL);
+                               ACE_Configuration_Section_Key &key);
 };
 
 template<typename T_strseq>
@@ -102,8 +100,7 @@ public:
                           CORBA::Boolean is_multiple,
                           TAO_Repository_i *repo,
                           CORBA::DefinitionKind port_kind,
-                          ACE_Configuration_Section_Key &key
-                          ACE_ENV_ARG_DECL);
+                          ACE_Configuration_Section_Key &key);
 
   static void set_is_multiple (CORBA::Boolean is_multiple,
                                ACE_Configuration *config,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
index e48f4668015..d01bb3dd710 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_macro.h
@@ -22,7 +22,6 @@
                                 TAO_GUARD_FAILURE, \
                                 0), \
                               CORBA::COMPLETED_NO)); \
-  ACE_CHECK
 
 #define TAO_IFR_WRITE_GUARD_RETURN(RETURN) \
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, \
@@ -33,7 +32,6 @@
                                 TAO_GUARD_FAILURE, \
                                 0), \
                               CORBA::COMPLETED_NO)); \
-  ACE_CHECK_RETURN (RETURN)
 
 #define TAO_IFR_READ_GUARD_RETURN(RETURN) \
   ACE_READ_GUARD_THROW_EX (ACE_Lock, \
@@ -44,7 +42,6 @@
                                TAO_GUARD_FAILURE, \
                                0), \
                              CORBA::COMPLETED_NO)); \
-  ACE_CHECK_RETURN (RETURN)
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index 9846d186808..b2691b27c00 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -29,7 +29,6 @@ TAO_IRObject_i::~TAO_IRObject_i (void)
 
 CORBA::DefinitionKind
 TAO_IRObject_i::def_kind (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -44,7 +43,7 @@ TAO_IRObject_i::section_key (ACE_Configuration_Section_Key &key)
 }
 
 void
-TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IRObject_i::update_key (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::POA_Current_Impl *pc_impl =
@@ -82,7 +81,7 @@ TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
   if (status != 0)
     {
       // If we're here, destroy() has been called on us.
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw CORBA::OBJECT_NOT_EXIST ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
index a6bbdc4adfa..fa19fb2d349 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -58,18 +58,15 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual - the unlocked version called by the destroy() wrapper.
@@ -78,7 +75,7 @@ public:
   // Plug in the section key.
 
 protected:
-  void update_key (ACE_ENV_SINGLE_ARG_DECL)
+  void update_key (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set our key from the object ID via POACurrent.
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
index 943a6082e1f..c5497345cfe 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -33,21 +33,18 @@ TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i (void)
 
 CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
 TAO_InterfaceAttrExtension_i::describe_ext_interface (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_ext_interface_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_ext_interface_i ();
 }
 
 CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
 TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -139,9 +136,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
       TAO_OperationDef_i op (this->repo_);
       op.section_key (key);
 
-      op.make_description (fifd->operations[i]
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      op.make_description (fifd->operations[i]);
     }
 
   // Restore our original section key.
@@ -199,9 +194,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
       TAO_ExtAttributeDef_i attr (this->repo_);
       attr.section_key (key);
 
-      attr.fill_description (fifd->attributes[i]
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      attr.fill_description (fifd->attributes[i]);
     }
 
   // Restore our original section key.
@@ -210,8 +203,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
   this->section_key (key_holder);
 
   CORBA::InterfaceDefSeq_var bases =
-    iface.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    iface.base_interfaces_i ();
 
   CORBA::ULong length = bases->length ();
   CORBA::RepositoryIdSeq repo_ids (length);
@@ -237,8 +229,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i (
 
   fifd->base_interfaces = repo_ids;
 
-  fifd->type = iface.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  fifd->type = iface.type_i ();
 
   return retval._retn ();
 }
@@ -252,14 +243,12 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute (
     CORBA::AttributeMode mode,
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ExtAttributeDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+  this->update_key ();
 
   return this->create_ext_attribute_i (id,
                                        name,
@@ -267,8 +256,7 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute (
                                        type,
                                        mode,
                                        get_exceptions,
-                                       set_exceptions
-                                       ACE_ENV_ARG_PARAMETER);
+                                       set_exceptions);
 }
 
 CORBA::ExtAttributeDef_ptr
@@ -280,7 +268,6 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
     CORBA::AttributeMode mode,
     const CORBA::ExceptionDefSeq &get_exceptions,
     const CORBA::ExceptionDefSeq &set_exceptions
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -298,9 +285,7 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "attrs"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+                                          "attrs");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -328,14 +313,10 @@ TAO_InterfaceAttrExtension_i::create_ext_attribute_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Attribute,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+                                          this->repo_);
 
   CORBA::ExtAttributeDef_var retval =
-    CORBA::ExtAttributeDef::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ExtAttributeDef::_nil ());
+    CORBA::ExtAttributeDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
index f330fe3dec6..152cabbc59a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h
@@ -53,13 +53,11 @@ public:
   virtual
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
   describe_ext_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *
   describe_ext_interface_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -71,7 +69,6 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -83,7 +80,6 @@ public:
       CORBA::AttributeMode mode,
       const CORBA::ExceptionDefSeq &get_exceptions,
       const CORBA::ExceptionDefSeq &set_exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index 9fd69d6cb63..90e3018c72d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -31,31 +31,29 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_InterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_InterfaceDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Interface;
 }
 
 void
-TAO_InterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  this->TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->TAO_Container_i::destroy_i ();
 
   // These will get rid of the repo ids, which Contained_i::destroy()'s
   // call to remove_section (recursive = 1) will not get, and also
@@ -65,49 +63,41 @@ TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
       "attrs",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
   TAO_IFR_Generic_Utils<TAO_OperationDef_i>::destroy_special (
       "ops",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
   // Destroy ourself.
-  this->TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->TAO_Contained_i::destroy_i ();
 }
 
 CORBA::Contained::Description *
-TAO_InterfaceDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
                     CORBA::Contained::Description,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  retval->kind = this->def_kind ();
 
   CORBA::InterfaceDescription ifd;
   ACE_TString holder;
@@ -131,8 +121,7 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::ULong i = 0;
   CORBA::InterfaceDefSeq_var bases =
-    this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->base_interfaces_i ();
 
   CORBA::ULong length = bases->length ();
   CORBA::RepositoryIdSeq repo_ids (length);
@@ -153,8 +142,7 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
       TAO_InterfaceDef_i impl (this->repo_);
       impl.section_key (base_key);
 
-      repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      repo_ids[i] = impl.id_i ();
     }
 
   ifd.base_interfaces = repo_ids;
@@ -163,19 +151,18 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_InterfaceDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_InterfaceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -191,24 +178,22 @@ TAO_InterfaceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
   return this->repo_->tc_factory ()->create_interface_tc (
                                          id.c_str (),
                                          name.c_str ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
 CORBA::InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->base_interfaces_i ();
 }
 
 CORBA::InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -223,7 +208,6 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (seq,
                     CORBA::InterfaceDefSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   seq->length (size);
   CORBA::InterfaceDefSeq_var retval = seq;
@@ -238,41 +222,32 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
 
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                                  this->repo_
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                  this->repo_);
 
-      retval[i] = CORBA::InterfaceDef::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[i] = CORBA::InterfaceDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
 }
 
 void
-TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces
-                                     ACE_ENV_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces (const CORBA::InterfaceDefSeq &base_interfaces)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->base_interfaces_i (base_interfaces
-                           ACE_ENV_ARG_PARAMETER);
+  this->base_interfaces_i (base_interfaces);
 }
 
 void
-TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interfaces
-                                       ACE_ENV_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interfaces)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If we are an abstract interface, all our base interfaces must be
   // abstract as well.
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::DefinitionKind def_kind = this->def_kind ();
 
   if (def_kind == CORBA::dk_AbstractInterface)
     {
@@ -280,13 +255,13 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
 
       for (CORBA::ULong i = 0; i < length; ++i)
         {
-          def_kind = base_interfaces[i]->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          def_kind = base_interfaces[i]->def_kind ();
 
           if (def_kind != CORBA::dk_AbstractInterface)
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 11,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 11,
+                CORBA::COMPLETED_NO);
             }
         }
     }
@@ -321,17 +296,14 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
       TAO_InterfaceDef_i impl (this->repo_);
       impl.section_key (base_key);
 
-      name = impl.name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      name = impl.name_i ();
 
       // None of these names can clash with any we may already have.
       TAO_Container_i::tmp_name_holder_ = name.in ();
       TAO_IFR_Service_Utils::name_exists (&TAO_Container_i::same_as_tmp_name,
                                           this->section_key_,
                                           this->repo_,
-                                          this->def_kind ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          this->def_kind ());
 
       char *stringified = TAO_IFR_Service_Utils::int_to_string (i);
       this->repo_->config ()->set_string_value (inherited_key,
@@ -341,22 +313,18 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
 }
 
 CORBA::Boolean
-TAO_InterfaceDef_i::is_a (const char *interface_id
-                          ACE_ENV_ARG_DECL)
+TAO_InterfaceDef_i::is_a (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_a_i (interface_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (interface_id);
 }
 
 CORBA::Boolean
-TAO_InterfaceDef_i::is_a_i (const char *interface_id
-                            ACE_ENV_ARG_DECL)
+TAO_InterfaceDef_i::is_a_i (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
@@ -377,8 +345,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
 
   // Is it one of our ancestors' types?
   CORBA::InterfaceDefSeq_var bases =
-    this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->base_interfaces_i ();
 
   CORBA::ULong length = bases->length ();
 
@@ -398,9 +365,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
       TAO_InterfaceDef_i impl (this->repo_);
       impl.section_key (base_key);
 
-      CORBA::Boolean success = impl.is_a_i (interface_id
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CORBA::Boolean success = impl.is_a_i (interface_id);
 
       if (success == 1)
         {
@@ -412,19 +377,18 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
 }
 
 CORBA::InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe_interface (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_interface_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_interface_i ();
 }
 
 CORBA::InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe_interface_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InterfaceDef::FullInterfaceDescription *fifd = 0;
@@ -512,9 +476,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
       TAO_OperationDef_i op (this->repo_);
       op.section_key (key);
 
-      op.make_description (fifd->operations[i]
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      op.make_description (fifd->operations[i]);
     }
 
   // Restore our original section key.
@@ -572,9 +534,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
       TAO_AttributeDef_i attr (this->repo_);
       attr.section_key (key);
 
-      attr.make_description (fifd->attributes[i]
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      attr.make_description (fifd->attributes[i]);
     }
 
   // Restore our original section key.
@@ -583,8 +543,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
   this->section_key (key_holder);
 
   CORBA::InterfaceDefSeq_var bases =
-    this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->base_interfaces_i ();
 
   CORBA::ULong length = bases->length ();
 
@@ -608,14 +567,12 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
       TAO_InterfaceDef_i impl (this->repo_);
       impl.section_key (base_key);
 
-      repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      repo_ids[i] = impl.id_i ();
     }
 
   fifd->base_interfaces = repo_ids;
 
-  fifd->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  fifd->type = this->type_i ();
 
   return retval._retn ();
 }
@@ -627,21 +584,18 @@ TAO_InterfaceDef_i::create_attribute (
     const char *version,
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+  this->update_key ();
 
   return this->create_attribute_i (id,
                                    name,
                                    version,
                                    type,
-                                   mode
-                                   ACE_ENV_ARG_PARAMETER);
+                                   mode);
 }
 
 CORBA::AttributeDef_ptr
@@ -651,16 +605,13 @@ TAO_InterfaceDef_i::create_attribute_i (
     const char *version,
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // This will throw an exception if a name clash is found.
   // create_common() will check for all other errors.
   this->check_inherited (name,
-                         CORBA::dk_Attribute
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+                         CORBA::dk_Attribute);
 
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -676,9 +627,7 @@ TAO_InterfaceDef_i::create_attribute_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "attrs"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+                                          "attrs");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -696,14 +645,10 @@ TAO_InterfaceDef_i::create_attribute_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Attribute,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+                                          this->repo_);
 
   CORBA::AttributeDef_var retval =
-    CORBA::AttributeDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+    CORBA::AttributeDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -716,14 +661,12 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                       CORBA::OperationMode mode,
                                       const CORBA::ParDescriptionSeq &params,
                                       const CORBA::ExceptionDefSeq &exceptions,
-                                      const CORBA::ContextIdSeq &contexts
-                                      ACE_ENV_ARG_DECL)
+                                      const CORBA::ContextIdSeq &contexts)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+  this->update_key ();
 
   return this->create_operation_i (id,
                                    name,
@@ -732,8 +675,7 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                    mode,
                                    params,
                                    exceptions,
-                                   contexts
-                                   ACE_ENV_ARG_PARAMETER);
+                                   contexts);
 }
 
 CORBA::OperationDef_ptr
@@ -744,16 +686,13 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                         CORBA::OperationMode mode,
                                         const CORBA::ParDescriptionSeq &params,
                                         const CORBA::ExceptionDefSeq &exceptions,
-                                        const CORBA::ContextIdSeq &contexts
-                                        ACE_ENV_ARG_DECL)
+                                        const CORBA::ContextIdSeq &contexts)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // This will throw an exception if a name clash is found.
   // create_common() will check for all other errors.
   this->check_inherited (name,
-                         CORBA::dk_Operation
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+                         CORBA::dk_Operation);
 
   TAO_Container_i::tmp_name_holder_ = name;
   ACE_Configuration_Section_Key new_key;
@@ -769,9 +708,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "ops"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+                                          "ops");
 
   // Get the TypeCode for the return type.
   ACE_TString result_path (TAO_IFR_Service_Utils::reference_to_path (result));
@@ -780,11 +717,9 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                             this->repo_);
 
   CORBA::TypeCode_var rettype =
-    result_impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+    result_impl->type_i ();
 
-  CORBA::TCKind kind = rettype->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+  CORBA::TCKind kind = rettype->kind ();
 
   // Oneway operations cannot have a non-void return type.
   if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
@@ -913,14 +848,10 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Operation,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+                                          this->repo_);
 
   CORBA::OperationDef_var retval =
-    CORBA::OperationDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+    CORBA::OperationDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -931,7 +862,6 @@ TAO_InterfaceDef_i::interface_contents (
     ACE_Unbounded_Queue<ACE_TString> &path_queue,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1045,9 +975,7 @@ TAO_InterfaceDef_i::interface_contents (
               base_iface.interface_contents (kind_queue,
                                              path_queue,
                                              limit_type,
-                                             exclude_inherited
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                                             exclude_inherited);
             }
         }
     }
@@ -1056,21 +984,18 @@ TAO_InterfaceDef_i::interface_contents (
 int
 TAO_InterfaceDef_i::name_clash (const char *name)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_Container_i::tmp_name_holder_ = name;
       TAO_IFR_Service_Utils::name_exists (&TAO_Container_i::same_as_tmp_name,
                                           TAO_IFR_Service_Utils::tmp_key_,
                                           TAO_IFR_Service_Utils::repo_,
-                                          CORBA::dk_Interface
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          CORBA::dk_Interface);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1244,8 +1169,7 @@ TAO_InterfaceDef_i::inherited_operations (
 
 void
 TAO_InterfaceDef_i::check_inherited (const char *name,
-                                     CORBA::DefinitionKind kind
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::DefinitionKind kind)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -1276,8 +1200,7 @@ TAO_InterfaceDef_i::check_inherited (const char *name,
 
       if (inherited_name == name)
         {
-          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 5,
-                                       CORBA::COMPLETED_NO));
+          throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO);
         }
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
index 4d010fa0d48..e913e3bfed5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
@@ -56,86 +56,71 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::InterfaceDefSeq *base_interfaces (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDefSeq *base_interfaces_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_interfaces (
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_interfaces_i (
       const CORBA::InterfaceDefSeq &base_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::InterfaceDef::FullInterfaceDescription *describe_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDef::FullInterfaceDescription *describe_interface_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -145,7 +130,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -155,7 +139,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -168,7 +151,6 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -181,7 +163,6 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -190,7 +171,6 @@ public:
       ACE_Unbounded_Queue<ACE_TString> &path_queue,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gathers the attributes and operations of all the ancestors.
@@ -220,8 +200,7 @@ private:
   // the base interfaces.
 
   void check_inherited (const char *name,
-                        CORBA::DefinitionKind kind
-                        ACE_ENV_ARG_DECL)
+                        CORBA::DefinitionKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // When creating a new attribute, check for a clash with an inherited
   // attribute name.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
index dab11360086..6fe1c37dbc9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/LocalInterfaceDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService, 
-           LocalInterfaceDef_i, 
+ACE_RCSID (IFRService,
+           LocalInterfaceDef_i,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -25,29 +25,25 @@ TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_LocalInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LocalInterfaceDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_LocalInterface;
 }
 
 CORBA::Boolean
-TAO_LocalInterfaceDef_i::is_a (const char *interface_id
-                               ACE_ENV_ARG_DECL)
+TAO_LocalInterfaceDef_i::is_a (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_a_i (interface_id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (interface_id);
 }
 
 CORBA::Boolean
-TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id
-                                 ACE_ENV_ARG_DECL)
+TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/LocalBase:1.0") == 0)
@@ -55,8 +51,7 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id
       return 1;
     }
 
-  return this->TAO_InterfaceDef_i::is_a_i (interface_id
-                                           ACE_ENV_ARG_PARAMETER);
+  return this->TAO_InterfaceDef_i::is_a_i (interface_id);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
index 92bfd1be945..1943789c717 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
@@ -51,20 +51,17 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
index 731d9aaf511..8a264a124af 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -27,71 +27,63 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ModuleDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ModuleDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Module;
 }
 
 void
-TAO_ModuleDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_ModuleDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Container_i::destroy_i ();
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Contained_i::destroy_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ModuleDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::describe (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::describe_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
                     CORBA::Contained::Description,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  retval->kind = this->def_kind ();
 
   CORBA::ModuleDescription md;
 
-  md.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  md.name = this->name_i ();
 
-  md.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  md.id = this->id_i ();
 
   ACE_TString container_id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -100,8 +92,7 @@ TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 
   md.defined_in = container_id.c_str ();
 
-  md.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  md.version = this->version_i ();
 
   retval->value <<= md;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
index 8c178c7cf50..fd63eee2482 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
@@ -54,32 +54,27 @@ public:
   virtual ~TAO_ModuleDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
index e207ffe8823..65d533bf3c9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -26,26 +26,25 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_NativeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_NativeDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Native;
 }
 
 CORBA::TypeCode_ptr
-TAO_NativeDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NativeDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NativeDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -59,8 +58,7 @@ TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             name);
 
   return this->repo_->tc_factory ()->create_native_tc (id.c_str (),
-                                                       name.c_str ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       name.c_str ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
index d6960a185e9..65776722912 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
@@ -51,20 +51,17 @@ public:
   virtual ~TAO_NativeDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index ee94729fa59..cac495880e3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -29,64 +29,57 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_OperationDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Operation;
 }
 
 CORBA::Contained::Description *
-TAO_OperationDef_i::describe (ACE_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::describe ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_OperationDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::describe_i ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
                     CORBA::Contained::Description,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  retval->kind = this->def_kind ();
 
   CORBA::OperationDescription od;
-  this->make_description (od
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->make_description (od);
 
   retval->value <<= od;
-  ACE_CHECK_RETURN (0);
 
   return retval._retn ();
 }
 
 CORBA::TypeCode_ptr
-TAO_OperationDef_i::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->result_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_OperationDef_i::result_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
@@ -99,23 +92,22 @@ TAO_OperationDef_i::result_i (ACE_ENV_SINGLE_ARG_DECL)
     TAO_IFR_Service_Utils::path_to_idltype (result_path,
                                             this->repo_);
 
-  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_OperationDef_i::result_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result_def (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  this->update_key ();
 
-  return this->result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->result_def_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result_def_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
@@ -125,31 +117,24 @@ TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (result_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def
-                                ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::result_def (CORBA::IDLType_ptr result_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->result_def_i (result_def
-                      ACE_ENV_ARG_PARAMETER);
+  this->result_def_i (result_def);
 }
 
 void
-TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *result_path =
@@ -161,19 +146,18 @@ TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def
 }
 
 CORBA::ParDescriptionSeq *
-TAO_OperationDef_i::params (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::params (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->params_i ();
 }
 
 CORBA::ParDescriptionSeq *
-TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::params_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong i = 0;
@@ -217,7 +201,6 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (pd_seq,
                     CORBA::ParDescriptionSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   pd_seq->length (size);
 
@@ -256,40 +239,31 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
         TAO_IFR_Service_Utils::path_to_idltype (type_path,
                                                 this->repo_);
 
-      retval[i].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[i].type = impl->type_i ();
 
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::path_to_ir_object (type_path,
-                                                  this->repo_
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                  this->repo_);
 
-      retval[i].type_def = CORBA::IDLType::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[i].type_def = CORBA::IDLType::_narrow (obj.in ());
     }
 
   return retval._retn ();
 }
 
 void
-TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq &params
-                            ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::params (const CORBA::ParDescriptionSeq &params)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->params_i (params
-                  ACE_ENV_ARG_PARAMETER);
+  this->params_i (params);
 }
 
 void
-TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params
-                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -340,19 +314,18 @@ TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params
 }
 
 CORBA::OperationMode
-TAO_OperationDef_i::mode (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::mode (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OP_NORMAL);
+  this->update_key ();
 
-  return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->mode_i ();
 }
 
 CORBA::OperationMode
-TAO_OperationDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::mode_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int mode;
@@ -364,22 +337,18 @@ TAO_OperationDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_OperationDef_i::mode (CORBA::OperationMode mode
-                          ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::mode (CORBA::OperationMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->mode_i (mode
-                ACE_ENV_ARG_PARAMETER);
+  this->mode_i (mode);
 }
 
 void
-TAO_OperationDef_i::mode_i (CORBA::OperationMode mode
-                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::mode_i (CORBA::OperationMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -388,19 +357,18 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode
 }
 
 CORBA::ContextIdSeq *
-TAO_OperationDef_i::contexts (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::contexts (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->contexts_i ();
 }
 
 CORBA::ContextIdSeq *
-TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::contexts_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key contexts_key;
@@ -441,7 +409,6 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (ci_seq,
                     CORBA::ContextIdSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   ci_seq->length (size);
 
@@ -457,22 +424,18 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts
-                              ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::contexts (const CORBA::ContextIdSeq &contexts)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->contexts_i (contexts
-                    ACE_ENV_ARG_PARAMETER);
+  this->contexts_i (contexts);
 }
 
 void
-TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -500,19 +463,18 @@ TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts
 }
 
 CORBA::ExceptionDefSeq *
-TAO_OperationDef_i::exceptions (ACE_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::exceptions ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->exceptions_i ();
 }
 
 CORBA::ExceptionDefSeq *
-TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::exceptions_i ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key excepts_key;
@@ -551,7 +513,6 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
   ACE_NEW_THROW_EX (ed_seq,
                     CORBA::ExceptionDefSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   ed_seq->length (size);
 
@@ -570,35 +531,27 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
       CORBA::Object_var obj =
         TAO_IFR_Service_Utils::create_objref (CORBA::dk_Exception,
                                               path.c_str (),
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                              this->repo_);
 
-      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[i] = CORBA::ExceptionDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
 }
 
 void
-TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions
-                                ACE_ENV_ARG_DECL)
+TAO_OperationDef_i::exceptions (const CORBA::ExceptionDefSeq &exceptions)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->exceptions_i (exceptions
-                      ACE_ENV_ARG_PARAMETER);
+  this->exceptions_i (exceptions);
 }
 
 void
-TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -613,15 +566,12 @@ TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions
 
 void
 TAO_OperationDef_i::make_description (
-    CORBA::OperationDescription &od
-    ACE_ENV_ARG_DECL)
+    CORBA::OperationDescription &od)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  od.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  od.name = this->name_i ();
 
-  od.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  od.id = this->id_i ();
 
   ACE_TString container_id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -630,24 +580,19 @@ TAO_OperationDef_i::make_description (
 
   od.defined_in = container_id.c_str ();
 
-  od.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  od.version = this->version_i ();
 
-  od.result = this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  od.result = this->result_i ();
 
-  od.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  od.mode = this->mode_i ();
 
   CORBA::ContextIdSeq_var cid_seq =
-    this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->contexts_i ();
 
   od.contexts = cid_seq.in ();
 
   CORBA::ParDescriptionSeq_var pd_seq =
-    this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->params_i ();
 
   od.parameters = pd_seq.in ();
 
@@ -730,8 +675,7 @@ TAO_OperationDef_i::make_description (
           TAO_ExceptionDef_i impl (this->repo_);
           impl.section_key (type_key);
 
-          od.exceptions[i].type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          od.exceptions[i].type = impl.type_i ();
         }
     }
   else
@@ -741,10 +685,10 @@ TAO_OperationDef_i::make_description (
 }
 
 CORBA::TypeCode_ptr
-TAO_OperationDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::type_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->result_i ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
index f11a2850319..c8b9bbf4a30 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -51,127 +51,101 @@ public:
   virtual ~TAO_OperationDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr result (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr result ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr result_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr result_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr result_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr result_def ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr result_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr result_def_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void result_def (
-      CORBA::IDLType_ptr result_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr result_def)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result_def_i (
-      CORBA::IDLType_ptr result_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr result_def)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ParDescriptionSeq *params (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ParDescriptionSeq *params ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ParDescriptionSeq *params_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ParDescriptionSeq *params_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void params (
-      const CORBA::ParDescriptionSeq &params
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ParDescriptionSeq &params)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void params_i (
-      const CORBA::ParDescriptionSeq &params
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ParDescriptionSeq &params)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::OperationMode mode (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::OperationMode mode ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::OperationMode mode_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OperationMode mode_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
-      CORBA::OperationMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::OperationMode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
-      CORBA::OperationMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::OperationMode mode)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ContextIdSeq *contexts (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ContextIdSeq *contexts ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ContextIdSeq *contexts_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ContextIdSeq *contexts_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void contexts (
-      const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ContextIdSeq &contexts)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void contexts_i (
-      const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ContextIdSeq &contexts)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ExceptionDefSeq *exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ExceptionDefSeq *exceptions ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ExceptionDefSeq *exceptions_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ExceptionDefSeq *exceptions_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void exceptions (
-      const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void exceptions_i (
-      const CORBA::ExceptionDefSeq &exceptions
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::ExceptionDefSeq &exceptions)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Common code for containers to call in
   // making descriptions.
 
-  void make_description (CORBA::OperationDescription &desc
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void make_description (CORBA::OperationDescription &desc)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr type_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr type_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index f9789c4282b..2443d8c68f9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -3,8 +3,8 @@
 #include "orbsvcs/IFRService/Repository_i.h"
 #include "orbsvcs/IFRService/PrimitiveDef_i.h"
 
-ACE_RCSID (IFRService, 
-           PrimitiveDef_i, 
+ACE_RCSID (IFRService,
+           PrimitiveDef_i,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -22,41 +22,39 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PrimitiveDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Primitive;
 }
 
 void
-TAO_PrimitiveDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+  throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 CORBA::TypeCode_ptr
-TAO_PrimitiveDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
@@ -116,19 +114,18 @@ TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::PrimitiveKind
-TAO_PrimitiveDef_i::kind (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrimitiveDef_i::kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::pk_null);
+  this->update_key ();
 
-  return this->kind_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->kind_i ();
 }
 
 CORBA::PrimitiveKind
-TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::kind_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
index 05103c5c7ed..8214d91f77c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
@@ -50,43 +50,36 @@ public:
   virtual ~TAO_PrimitiveDef_i (void);
   // Destructor.
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a primitive kind - raises BAD_INV_ORDER.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Must implement this here because it's pure virtual in the
   // base class.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PrimitiveKind kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PrimitiveKind kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PrimitiveKind kind_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PrimitiveKind kind_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index f9bf6490763..b4340673544 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -27,26 +27,25 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ProvidesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ProvidesDef_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Provides;
 }
 
 CORBA::Contained::Description *
-TAO_ProvidesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProvidesDef_i::describe (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProvidesDef_i::describe_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::ProvidesDescription pd;
@@ -55,9 +54,7 @@ TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                                              pd,
                                              this->repo_,
                                              this->section_key_
-                                             ACE_ENV_ARG_PARAMETER
                                            );
-  ACE_CHECK_RETURN (0);
 
   ACE_TString base_type_id;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -76,19 +73,18 @@ TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::InterfaceDef_ptr
-TAO_ProvidesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProvidesDef_i::interface_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+  this->update_key ();
 
-  return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->interface_type_i ();
 }
 
 CORBA::InterfaceDef_ptr
-TAO_ProvidesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProvidesDef_i::interface_type_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
@@ -100,34 +96,27 @@ TAO_ProvidesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+                                              this->repo_);
 
-  return CORBA::InterfaceDef::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+  return CORBA::InterfaceDef::_narrow (obj.in ());
 }
 
 void
 TAO_ProvidesDef_i::interface_type (
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->interface_type_i (interface_type
-                          ACE_ENV_ARG_PARAMETER);
+  this->interface_type_i (interface_type);
 }
 
 void
 TAO_ProvidesDef_i::interface_type_i (
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
index e07923a3fee..26e284cb89a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
@@ -50,42 +50,35 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::InterfaceDef_ptr interface_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDef_ptr interface_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void interface_type (
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void interface_type_i (
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
index 1a06feb5687..0ca5b1f2c99 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -4,8 +4,8 @@
 #include "orbsvcs/IFRService/PublishesDef_i.h"
 #include "orbsvcs/IFRService/Repository_i.h"
 
-ACE_RCSID (IFRService, 
-           PublishesDef_i, 
+ACE_RCSID (IFRService,
+           PublishesDef_i,
            "$Id$")
 
 TAO_PublishesDef_i::TAO_PublishesDef_i (
@@ -22,7 +22,7 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PublishesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PublishesDef_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Publishes;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
index 613bc9010e1..ca8407fb2c4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h
@@ -52,7 +52,6 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 028f07f18cc..734634884f7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -39,34 +39,30 @@ TAO_Repository_i::~TAO_Repository_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_Repository_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Repository_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Repository;
 }
 
 void
-TAO_Repository_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Repository_i::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+  throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 CORBA::Contained_ptr
-TAO_Repository_i::lookup_id (const char *search_id
-                             ACE_ENV_ARG_DECL)
+TAO_Repository_i::lookup_id (const char *search_id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::Contained::_nil ());
 
-  return this->lookup_id_i (search_id
-                            ACE_ENV_ARG_PARAMETER);
+  return this->lookup_id_i (search_id);
 }
 
 CORBA::Contained_ptr
-TAO_Repository_i::lookup_id_i (const char *search_id
-                               ACE_ENV_ARG_DECL)
+TAO_Repository_i::lookup_id_i (const char *search_id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0
@@ -100,32 +96,25 @@ TAO_Repository_i::lookup_id_i (const char *search_id
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (def_kind,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Contained::_nil ());
+                                          this->repo_);
 
-  return CORBA::Contained::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::Contained::_narrow (obj.in ());
 }
 
 CORBA::TypeCode_ptr
-TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc
-                                          ACE_ENV_ARG_DECL)
+TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->get_canonical_typecode_i (tc
-                                         ACE_ENV_ARG_PARAMETER);
+  return this->get_canonical_typecode_i (tc);
 }
 
 CORBA::TypeCode_ptr
-TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
-                                            ACE_ENV_ARG_DECL)
+TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::TCKind kind = tc->kind ();
 
   switch (kind)
   {
@@ -136,37 +125,27 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
       ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
     case CORBA::tk_array:
     {
-      CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      CORBA::ULong length = tc->length ();
 
-      CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      CORBA::TypeCode_var ctype = tc->content_type ();
 
       CORBA::TypeCode_var canon_ctype =
-        this->get_canonical_typecode_i (ctype.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+        this->get_canonical_typecode_i (ctype.in ());
 
       return this->tc_factory ()->create_array_tc (length,
-                                                   canon_ctype.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   canon_ctype.in ());
     }
     case CORBA::tk_sequence:
     {
-      CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      CORBA::ULong length = tc->length ();
 
-      CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      CORBA::TypeCode_var ctype = tc->content_type ();
 
       CORBA::TypeCode_var canon_ctype =
-        this->get_canonical_typecode_i (ctype.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+        this->get_canonical_typecode_i (ctype.in ());
 
       return this->tc_factory ()->create_sequence_tc (length,
-                                                      canon_ctype.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      canon_ctype.in ());
     }
     case CORBA::tk_alias:
     case CORBA::tk_objref:
@@ -181,8 +160,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
     case CORBA::tk_component:
     case CORBA::tk_home:
     {
-      CORBA::String_var id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      CORBA::String_var id = tc->id ();
 
       ACE_TString path;
       int status =
@@ -208,7 +186,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
         {
           TAO_ExceptionDef_i impl (this->repo_);
           impl.section_key (key);
-          return impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+          return impl.type_i ();
         }
       else
         {
@@ -216,15 +194,14 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
             TAO_IFR_Service_Utils::path_to_idltype (path,
                                                     this);
           impl->section_key (key);
-          return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+          return impl->type_i ();
         }
     }
   }
 }
 
 CORBA::PrimitiveDef_ptr
-TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
-                                 ACE_ENV_ARG_DECL)
+TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString obj_id ("pkinds\\");
@@ -234,28 +211,22 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Primitive,
                                           obj_id.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::PrimitiveDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::PrimitiveDef::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+  return CORBA::PrimitiveDef::_narrow (obj.in ());
 }
 
 CORBA::StringDef_ptr
-TAO_Repository_i::create_string (CORBA::ULong bound
-                                 ACE_ENV_ARG_DECL)
+TAO_Repository_i::create_string (CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::StringDef::_nil ());
 
-  return this->create_string_i (bound
-                                ACE_ENV_ARG_PARAMETER);
+  return this->create_string_i (bound);
 }
 
 CORBA::StringDef_ptr
-TAO_Repository_i::create_string_i (CORBA::ULong bound
-                                   ACE_ENV_ARG_DECL)
+TAO_Repository_i::create_string_i (CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -294,28 +265,22 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_String,
                                           obj_id.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::StringDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::StringDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::StringDef::_narrow (obj.in ());
 }
 
 CORBA::WstringDef_ptr
-TAO_Repository_i::create_wstring (CORBA::ULong bound
-                                  ACE_ENV_ARG_DECL)
+TAO_Repository_i::create_wstring (CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::WstringDef::_nil ());
 
-  return this->create_wstring_i (bound
-                                 ACE_ENV_ARG_PARAMETER);
+  return this->create_wstring_i (bound);
 }
 
 CORBA::WstringDef_ptr
-TAO_Repository_i::create_wstring_i (CORBA::ULong bound
-                                    ACE_ENV_ARG_DECL)
+TAO_Repository_i::create_wstring_i (CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -354,31 +319,25 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Wstring,
                                                obj_id.c_str (),
-                                               this->repo_
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::WstringDef::_nil ());
+                                               this->repo_);
 
-  return CORBA::WstringDef::_narrow (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+  return CORBA::WstringDef::_narrow (obj.in ());
 }
 
 CORBA::SequenceDef_ptr
 TAO_Repository_i::create_sequence (CORBA::ULong bound,
-                                   CORBA::IDLType_ptr element_type
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::IDLType_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::SequenceDef::_nil ());
 
   return this->create_sequence_i (bound,
-                                  element_type
-                                  ACE_ENV_ARG_PARAMETER);
+                                  element_type);
 }
 
 CORBA::SequenceDef_ptr
 TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
-                                     CORBA::IDLType_ptr element_type
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::IDLType_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -428,31 +387,25 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Sequence,
                                           obj_id.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::SequenceDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::SequenceDef::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+  return CORBA::SequenceDef::_narrow (obj.in ());
 }
 
 CORBA::ArrayDef_ptr
 TAO_Repository_i::create_array (CORBA::ULong length,
-                                CORBA::IDLType_ptr element_type
-                                ACE_ENV_ARG_DECL)
+                                CORBA::IDLType_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ArrayDef::_nil ());
 
   return this->create_array_i (length,
-                               element_type
-                               ACE_ENV_ARG_PARAMETER);
+                               element_type);
 }
 
 CORBA::ArrayDef_ptr
 TAO_Repository_i::create_array_i (CORBA::ULong length,
-                                  CORBA::IDLType_ptr element_type
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::IDLType_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -502,31 +455,26 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Array,
                                           obj_id.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ArrayDef::_nil ());
+                                          this->repo_);
 
-  return CORBA::ArrayDef::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::ArrayDef::_narrow (obj.in ());
 }
 
 CORBA::FixedDef_ptr
 TAO_Repository_i::create_fixed (CORBA::UShort digits,
-                                CORBA::Short scale
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Short scale)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::FixedDef::_nil ());
 
   return this->create_fixed_i (digits,
-                               scale
-                               ACE_ENV_ARG_PARAMETER);
+                               scale);
 }
 
 CORBA::FixedDef_ptr
 TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */,
                                   CORBA::Short /* scale */
-                                  ACE_ENV_ARG_DECL)
+                                  )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::FixedDef::_nil ());
@@ -534,8 +482,7 @@ TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */,
 
 int
 TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
-                             PortableServer::POA_ptr repo_poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr repo_poa)
 {
   this->repo_objref_ = repo_ref;
   this->repo_poa_ = repo_poa;
@@ -553,20 +500,15 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
                         ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
                         CORBA::NO_MEMORY ());
     }
-  ACE_CHECK_RETURN (-1);
 
   // Resolve and narrow the TypeCodeFactory.
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("TypeCodeFactory"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("TypeCodeFactory");
 
   if (!CORBA::is_nil (object.in ()))
     {
       this->tc_factory_ =
-        CORBA::TypeCodeFactory::_narrow (object.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CORBA::TypeCodeFactory::_narrow (object.in ());
 
       if (CORBA::is_nil (this->tc_factory_.in ()))
         ACE_ERROR_RETURN ((
@@ -588,16 +530,12 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
 
   // Resolve and narrow the POACurrent object.
   object =
-    this->orb_->resolve_initial_references ("POACurrent"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("POACurrent");
 
   if (!CORBA::is_nil (object.in ()))
     {
       this->poa_current_ =
-        PortableServer::Current::_narrow (object.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        PortableServer::Current::_narrow (object.in ());
 
       if (CORBA::is_nil (this->poa_current_.in ()))
         ACE_ERROR_RETURN ((
@@ -622,8 +560,7 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref,
       return -1;
     }
 
-  int status = this->create_servants_and_poas (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->create_servants_and_poas ();
 
   if (status != 0)
     {
@@ -765,58 +702,46 @@ TAO_Repository_i::create_sections (void)
 }
 
 int
-TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Repository_i::create_servants_and_poas (void)
 {
   CORBA::PolicyList policies (5);
   policies.length (5);
 
   // ID Assignment Policy.
   policies[0] =
-    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Lifespan Policy.
   policies[1] =
-    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
   // Request Processing Policy.
   policies[2] =
     this->root_poa_->create_request_processing_policy (
         PortableServer::USE_DEFAULT_SERVANT
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (-1);
 
   // Servant Retention Policy.
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
         PortableServer::NON_RETAIN
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (-1);
 
   // Id Uniqueness Policy.
   policies[4] =
     this->root_poa_->create_id_uniqueness_policy (
         PortableServer::MULTIPLE_ID
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (-1);
 
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->the_POAManager ();
 
 #define GEN_IR_OBJECT(name) \
   this-> name ## _poa_ = \
     this->root_poa_->create_POA (#name "_poa", \
                                  poa_manager.in (), \
-                                 policies \
-                                 ACE_ENV_ARG_PARAMETER); \
-  ACE_CHECK_RETURN (-1); \
+                                 policies); \
+\
   TAO_ ## name ## _i * name ## _impl = 0; \
   ACE_NEW_RETURN (name ## _impl, \
                   TAO_ ## name ## _i (this), \
@@ -831,9 +756,7 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
   PortableServer::ServantBase_var name ## _safety ( \
       this-> name ## _servant_ \
     ); \
-  this-> name ## _poa_->set_servant (this-> name ## _servant_ \
-                                     ACE_ENV_ARG_PARAMETER); \
-  ACE_CHECK_RETURN (-1);
+  this-> name ## _poa_->set_servant (this-> name ## _servant_);
 
   CONCRETE_IR_OBJECT_TYPES
 
@@ -845,8 +768,7 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      policy->destroy ();
     }
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index 06cbfdc2360..87cf86d6f10 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -84,44 +84,37 @@ public:
   virtual ~TAO_Repository_i (void);
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Accessor for the readonly attribute.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a repository - raises BAD_INV_ORDER.
 
   virtual CORBA::Contained_ptr lookup_id (
       const char *search_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Contained_ptr lookup_id_i (
       const char *search_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA::TypeCode_ptr tc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr get_canonical_typecode_i (
       CORBA::TypeCode_ptr tc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // No locking necessary because the database is not
@@ -129,76 +122,65 @@ public:
 
   virtual CORBA::StringDef_ptr create_string (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::StringDef_ptr create_string_i (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::WstringDef_ptr create_wstring (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::WstringDef_ptr create_wstring_i (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   CORBA::SequenceDef_ptr create_sequence_i (
       CORBA::ULong bound,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   virtual CORBA::ArrayDef_ptr create_array (
       CORBA::ULong length,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ArrayDef_ptr create_array_i (
       CORBA::ULong length,
       CORBA::IDLType_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::FixedDef_ptr create_fixed_i (
       CORBA::UShort digits,
       CORBA::Short scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   int repo_init (CORBA::Repository_ptr repo_ref,
-                 PortableServer::POA_ptr repo_poa
-                 ACE_ENV_ARG_DECL);
+                 PortableServer::POA_ptr repo_poa);
   // Called at startup to get everything initialized.
 
-  virtual int create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int create_servants_and_poas (void);
   // We create a default servant servant for each IR Object
   // type and its corresponding POA.
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index 5f7465b47fe..1b96ebf5d1d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -27,31 +27,29 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_SequenceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::def_kind (void)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Sequence;
 }
 
 void
-TAO_SequenceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_SequenceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only if it is (w)string, fixed, array or sequence.
-  this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_element_type ();
 
   ACE_TString name;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -64,49 +62,44 @@ TAO_SequenceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var element_typecode =
-    this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+    this->element_type_i ();
 
-  CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::ULong bound = this->bound_i ();
 
   return this->repo_->tc_factory ()->create_sequence_tc (
                                          bound,
                                          element_typecode.in ()
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
 CORBA::ULong
-TAO_SequenceDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::bound (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->bound_i ();
 }
 
 CORBA::ULong
-TAO_SequenceDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::bound_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int bound = 0;
@@ -118,19 +111,16 @@ TAO_SequenceDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_SequenceDef_i::bound (CORBA::ULong bound
-                          ACE_ENV_ARG_DECL)
+TAO_SequenceDef_i::bound (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->bound_i (bound
-                 ACE_ENV_ARG_PARAMETER);
+  this->bound_i (bound);
 }
 
 void
-TAO_SequenceDef_i::bound_i (CORBA::ULong bound
-                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::bound_i (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -139,19 +129,18 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->element_type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -163,23 +152,22 @@ TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
     TAO_IFR_Service_Utils::path_to_idltype (element_path,
                                             this->repo_);
 
-  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_SequenceDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_def (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  this->update_key ();
 
-  return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->element_type_def_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_def_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -189,35 +177,27 @@ TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (element_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def
-                                     ACE_ENV_ARG_DECL)
+TAO_SequenceDef_i::element_type_def (CORBA::IDLType_ptr element_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->element_type_def_i (element_type_def
-                            ACE_ENV_ARG_PARAMETER);
+  this->element_type_def_i (element_type_def);
 }
 
 void
-TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
-                                       ACE_ENV_ARG_DECL)
+TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_element_type ();
 
   char *element_path =
     TAO_IFR_Service_Utils::reference_to_path (element_type_def);
@@ -228,8 +208,7 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
 }
 
 void
-TAO_SequenceDef_i::destroy_element_type (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy_element_type ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -256,8 +235,7 @@ TAO_SequenceDef_i::destroy_element_type (
         TAO_IFR_Service_Utils::path_to_idltype (element_path,
                                                 this->repo_);
 
-      impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      impl->destroy_i ();
 
       break;
     }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
index cbed0039d88..9189728fcce 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
@@ -50,92 +50,76 @@ public:
   virtual ~TAO_SequenceDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::ULong bound (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong bound ()
 
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ULong bound_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ULong bound_i ()
 
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr element_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr element_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr element_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr element_type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr element_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr element_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr element_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr element_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr element_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void element_type_def_i (
-      CORBA::IDLType_ptr element_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr element_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void destroy_element_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy_element_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys an anonymous non-primitive element type.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
index b8068cdb642..28fb4b79870 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -23,26 +23,25 @@ TAO_StringDef_i::~TAO_StringDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_StringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StringDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_String;
 }
 
 void
-TAO_StringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_StringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StringDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -56,44 +55,40 @@ TAO_StringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::TypeCode_ptr
-TAO_StringDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_StringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::ULong bound = this->bound_i ();
 
   return this->repo_->tc_factory ()->create_string_tc (
                                          bound
-                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
 CORBA::ULong
-TAO_StringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::bound (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->bound_i ();
 }
 
 CORBA::ULong
-TAO_StringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StringDef_i::bound_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
@@ -105,22 +100,18 @@ TAO_StringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_StringDef_i::bound (CORBA::ULong bound
-                        ACE_ENV_ARG_DECL)
+TAO_StringDef_i::bound (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->bound_i (bound
-                 ACE_ENV_ARG_PARAMETER);
+  this->bound_i (bound);
 }
 
 void
-TAO_StringDef_i::bound_i (CORBA::ULong bound
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_StringDef_i::bound_i (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
index 5f1e402b8ce..f6bb6c00a8a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
@@ -51,54 +51,45 @@ public:
   virtual ~TAO_StringDef_i (void);
   // Destructor.
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::ULong bound (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong bound ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ULong bound_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ULong bound_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index e4cef6229e6..3050169c3fa 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -29,51 +29,47 @@ TAO_StructDef_i::~TAO_StructDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_StructDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StructDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Struct;
 }
 
 void
-TAO_StructDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_StructDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Container_i::destroy_i ();
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Contained_i::destroy_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_StructDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -90,7 +86,7 @@ TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
 
   if (TAO_RecursiveDef_OuterScopes::SeenBefore( id ))
     return this->repo_->tc_factory ()->
-                 create_recursive_tc ( id.c_str () ACE_ENV_ARG_PARAMETER);
+                 create_recursive_tc ( id.c_str ());
 
   TAO_RecursiveDef_OuterScopes NowSeenThis( id );
 
@@ -105,29 +101,26 @@ TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "name",
                                             name);
 
-  CORBA::StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::StructMemberSeq_var members = this->members_i ();
 
   return this->repo_->tc_factory ()->create_struct_tc (id.c_str (),
                                                        name.c_str (),
-                                                       members.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                       members.in ());
 }
 
 CORBA::StructMemberSeq *
-TAO_StructDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::members (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->members_i ();
 }
 
 CORBA::StructMemberSeq *
-TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::members_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -196,7 +189,6 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (members,
                     CORBA::StructMemberSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   members->length (size);
 
@@ -220,13 +212,9 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 
       obj = TAO_IFR_Service_Utils::create_objref (kind,
                                                   path.c_str (),
-                                                  this->repo_
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                  this->repo_);
 
-      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ());
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
                                            path,
@@ -240,8 +228,7 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_RETURN ( CORBA::OBJECT_NOT_EXIST(), 0);
       }
 
-      retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[k].type = impl->type_i ();
 
       // If this struct contains a nested struct (of another type) at
       // some level, the above code will have changed the section key
@@ -253,27 +240,22 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_StructDef_i::members (const CORBA::StructMemberSeq &members
-                          ACE_ENV_ARG_DECL)
+TAO_StructDef_i::members (const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->members_i (members
-                   ACE_ENV_ARG_PARAMETER);
+  this->members_i (members);
 }
 
 void
-TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members
-                            ACE_ENV_ARG_DECL)
+TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Container_i::destroy_i ();
 
   CORBA::ULong count = members.length ();
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
index a679e5ff3dd..ede4b8371f8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
@@ -52,54 +52,45 @@ public:
   virtual ~TAO_StructDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::StructMemberSeq *members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::StructMemberSeq *members ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::StructMemberSeq *members_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::StructMemberSeq *members_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::StructMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::StructMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
index 3261a380750..bf8052c6d64 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -26,39 +26,34 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void)
 }
 
 CORBA::Contained::Description *
-TAO_TypedefDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_TypedefDef_i::describe (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_TypedefDef_i::describe_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Contained::Description *desc_ptr = 0;
   ACE_NEW_THROW_EX (desc_ptr,
                     CORBA::Contained::Description,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  retval->kind = this->def_kind ();
 
   CORBA::TypeDescription td;
 
-  ACE_CHECK_RETURN (0);
-  td.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  td.name = this->name_i ();
 
-  td.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  td.id = this->id_i ();
 
   ACE_TString container_id;
 
@@ -68,11 +63,9 @@ TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 
   td.defined_in = container_id.c_str ();
 
-  td.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  td.version = this->version_i ();
 
-  td.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  td.type = this->type_i ();
 
   retval->value <<= td;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
index 1d836a105d2..2bf952d08ca 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
@@ -53,14 +53,12 @@ public:
   virtual ~TAO_TypedefDef_i (void);
   // Destructor
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index efc0446c718..2d1de15f315 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -32,51 +32,47 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_UnionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UnionDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Union;
 }
 
 void
-TAO_UnionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_UnionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Container_i::destroy_i ();
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Contained_i::destroy_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -93,7 +89,7 @@ TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
 
   if (TAO_RecursiveDef_OuterScopes::SeenBefore( id ))
     return this->repo_->tc_factory ()->
-                 create_recursive_tc ( id.c_str () ACE_ENV_ARG_PARAMETER);
+                 create_recursive_tc ( id.c_str ());
 
   TAO_RecursiveDef_OuterScopes NowSeenThis( id );
 
@@ -108,33 +104,29 @@ TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "name",
                                             name);
 
-  CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::TypeCode_var tc = this->discriminator_type_i ();
 
-  CORBA::UnionMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::UnionMemberSeq_var members = this->members_i ();
 
   return this->repo_->tc_factory ()->create_union_tc (id.c_str (),
                                                       name.c_str (),
                                                       tc.in (),
-                                                      members.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      members.in ());
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::discriminator_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->discriminator_type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
@@ -150,23 +142,22 @@ TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL)
      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), CORBA::TypeCode::_nil () );
   }
 
-  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_UnionDef_i::discriminator_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type_def (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  this->update_key ();
 
-  return this->discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->discriminator_type_def_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type_def_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
@@ -176,34 +167,27 @@ TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (disc_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
 TAO_UnionDef_i::discriminator_type_def (
     CORBA::IDLType_ptr discriminator_type_def
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->discriminator_type_def_i (discriminator_type_def
-                                  ACE_ENV_ARG_PARAMETER);
+  this->discriminator_type_def_i (discriminator_type_def);
 }
 
 void
 TAO_UnionDef_i::discriminator_type_def_i (
     CORBA::IDLType_ptr discriminator_type_def
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -216,19 +200,18 @@ TAO_UnionDef_i::discriminator_type_def_i (
 }
 
 CORBA::UnionMemberSeq *
-TAO_UnionDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::members (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->members_i ();
 }
 
 CORBA::UnionMemberSeq *
-TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::members_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -279,7 +262,6 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (members,
                     CORBA::UnionMemberSeq (size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   members->length (size);
   CORBA::UnionMemberSeq_var retval = members;
@@ -303,22 +285,16 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
       retval[k].name = name.c_str ();
 
       this->fetch_label (next_key,
-                         retval[k]
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                         retval[k]);
 
       this->repo_->config ()->get_string_value (next_key,
                                                 "path",
                                                 path);
 
       obj = TAO_IFR_Service_Utils::path_to_ir_object (path,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                      this->repo_);
 
-      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[k].type_def = CORBA::IDLType::_narrow (obj.in ());
 
       impl = TAO_IFR_Service_Utils::path_to_idltype (path,
                                                      this->repo_);
@@ -327,8 +303,7 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST(), 0 );
       }
 
-      retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[k].type = impl->type_i ();
 
       // If this union contains a nested union (of another type) at
       // some level, the above code will have changed the section key
@@ -340,27 +315,22 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members
-                         ACE_ENV_ARG_DECL)
+TAO_UnionDef_i::members (const CORBA::UnionMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->members_i (members
-                   ACE_ENV_ARG_PARAMETER);
+  this->members_i (members);
 }
 
 void
-TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members
-                           ACE_ENV_ARG_DECL)
+TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Container_i::destroy_i ();
 
   ACE_TString section_name;
   ACE_Configuration_Section_Key refs_key;
@@ -400,15 +370,13 @@ TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members
                                                 member_path);
 
       this->store_label (member_key,
-                         members[i].label
-                         ACE_ENV_ARG_PARAMETER);
+                         members[i].label);
     }
 }
 
 void
 TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
-                             CORBA::UnionMember &member
-                             ACE_ENV_ARG_DECL)
+                             CORBA::UnionMember &member)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration::VALUETYPE vt;
@@ -429,11 +397,9 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
                                              value);
 
   CORBA::TypeCode_var tc =
-    this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->discriminator_type_i ();
 
-  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = tc->kind ();
 
   switch (kind)
   {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
index feace1c2ec5..b29dba18492 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
@@ -52,94 +52,78 @@ public:
   virtual ~TAO_UnionDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr discriminator_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr discriminator_type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr discriminator_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr discriminator_type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr discriminator_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr discriminator_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr discriminator_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr discriminator_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void discriminator_type_def (
-      CORBA::IDLType_ptr discriminator_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr discriminator_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void discriminator_type_def_i (
-      CORBA::IDLType_ptr discriminator_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr discriminator_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::UnionMemberSeq *members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::UnionMemberSeq *members ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::UnionMemberSeq *members_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::UnionMemberSeq *members_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::UnionMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CORBA::UnionMemberSeq &members)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void fetch_label (
       const ACE_Configuration_Section_Key member_key,
-      CORBA::UnionMember &member
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::UnionMember &member)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used by members() to get each member's label value.
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index 833a7fd0c6a..c9505d4e842 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -25,26 +25,25 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_UsesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UsesDef_i::def_kind (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Uses;
 }
 
 CORBA::Contained::Description *
-TAO_UsesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::describe (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::describe_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ComponentIR::UsesDescription ud;
@@ -53,17 +52,14 @@ TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                                          ud,
                                          this->repo_,
                                          this->section_key_
-                                         ACE_ENV_ARG_PARAMETER
                                        );
-  ACE_CHECK_RETURN (0);
 
   ACE_TString base_type_id;
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "base_type",
                                             base_type_id);
   ud.interface_type = base_type_id.fast_rep ();
-  ud.is_multiple = this->is_multiple_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ud.is_multiple = this->is_multiple_i ();
 
   CORBA::Contained::Description *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -76,19 +72,18 @@ TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::InterfaceDef_ptr
-TAO_UsesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::interface_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+  this->update_key ();
 
-  return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->interface_type_i ();
 }
 
 CORBA::InterfaceDef_ptr
-TAO_UsesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::interface_type_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
@@ -100,34 +95,27 @@ TAO_UsesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+                                              this->repo_);
 
-  return CORBA::InterfaceDef::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+  return CORBA::InterfaceDef::_narrow (obj.in ());
 }
 
 void
 TAO_UsesDef_i::interface_type (
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->interface_type_i (interface_type
-                          ACE_ENV_ARG_PARAMETER);
+  this->interface_type_i (interface_type);
 }
 
 void
 TAO_UsesDef_i::interface_type_i (
     CORBA::InterfaceDef_ptr interface_type
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -161,19 +149,18 @@ TAO_UsesDef_i::interface_type_i (
 }
 
 CORBA::Boolean
-TAO_UsesDef_i::is_multiple (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::is_multiple (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_multiple_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->is_multiple_i ();
 }
 
 CORBA::Boolean
-TAO_UsesDef_i::is_multiple_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UsesDef_i::is_multiple_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong val = 0;
@@ -186,23 +173,19 @@ TAO_UsesDef_i::is_multiple_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 TAO_UsesDef_i::is_multiple (
     CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->is_multiple_i (is_multiple
-                       ACE_ENV_ARG_PARAMETER);
+  this->is_multiple_i (is_multiple);
 }
 
 void
 TAO_UsesDef_i::is_multiple_i (
     CORBA::Boolean is_multiple
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
index c0daa00be10..7041e0200d1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
@@ -51,64 +51,53 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::InterfaceDef_ptr interface_type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void interface_type (
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void interface_type_i (
       CORBA::InterfaceDef_ptr interface_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDef_ptr interface_type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_multiple (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_multiple_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_multiple (
       CORBA::Boolean is_multiple
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_multiple_i (
       CORBA::Boolean is_multiple
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index c8a710dcc23..286aefa3e47 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -29,26 +29,25 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueBoxDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueBoxDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueBox;
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueBoxDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -70,29 +69,26 @@ TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     TAO_IFR_Service_Utils::path_to_idltype (boxed_type_path,
                                             this->repo_);
 
-  CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::TypeCode_var tc = impl->type_i ();
 
   return this->repo_->tc_factory ()->create_value_box_tc (id.c_str (),
                                                           name.c_str (),
-                                                          tc.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
+                                                          tc.in ());
 }
 
 CORBA::IDLType_ptr
-TAO_ValueBoxDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::original_type_def (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  this->update_key ();
 
-  return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->original_type_def_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::original_type_def_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString boxed_type_path;
@@ -102,31 +98,24 @@ TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (boxed_type_path,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def
-                                      ACE_ENV_ARG_DECL)
+TAO_ValueBoxDef_i::original_type_def (CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->original_type_def_i (original_type_def
-                             ACE_ENV_ARG_PARAMETER);
+  this->original_type_def_i (original_type_def);
 }
 
 void
-TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *boxed_type =
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
index 9fd68ca1cc8..ae7d26a8803 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
@@ -51,43 +51,36 @@ public:
   virtual ~TAO_ValueBoxDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
-  virtual CORBA::IDLType_ptr original_type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr original_type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr original_type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr original_type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr original_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void original_type_def_i (
-      CORBA::IDLType_ptr original_type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr original_type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index d4ff826a40b..98c762d0b23 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -29,30 +29,28 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Value;
 }
 
 void
-TAO_ValueDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->TAO_Container_i::destroy_i ();
 
   // These will get rid of the repo ids, which Contained_i::destroy()'s
   // call to remove_section (recursive = 1) will not get, and also
@@ -62,33 +60,28 @@ TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
       "attrs",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 
   TAO_IFR_Generic_Utils<TAO_OperationDef_i>::destroy_special (
       "ops",
       this->repo_,
       this->section_key_
-      ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK;
 }
 
 CORBA::Contained::Description *
-TAO_ValueDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ValueDescription *vd = 0;
@@ -97,9 +90,7 @@ TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                   0);
   CORBA::ValueDescription_var safe_vd = vd;
 
-  this->fill_value_description (safe_vd.inout ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->fill_value_description (safe_vd.inout ());
 
   CORBA::Contained::Description *cd = 0;
   ACE_NEW_RETURN (cd,
@@ -112,19 +103,18 @@ TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::type (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// Since valuetype type codes may encapsultate the type code of a
@@ -133,24 +123,22 @@ TAO_ValueDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
   /// avoid this problem, the recursion is moved to a static utility
   /// function.
   return TAO_IFR_Service_Utils::gen_valuetype_tc_r (this->section_key_,
-                                                    this->repo_
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    this->repo_);
 }
 
 CORBA::InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::supported_interfaces (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->supported_interfaces_i ();
 }
 
 CORBA::InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::supported_interfaces_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InterfaceDefSeq *seq = 0;
@@ -191,13 +179,9 @@ TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
                                                 holder.fast_rep (),
                                                 holder);
       obj = TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                      this->repo_);
 
-      retval[i] = CORBA::InterfaceDef::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[i] = CORBA::InterfaceDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
@@ -206,23 +190,19 @@ TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_ValueDef_i::supported_interfaces (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->supported_interfaces_i (supported_interfaces
-                                ACE_ENV_ARG_PARAMETER);
+  this->supported_interfaces_i (supported_interfaces);
 }
 
 void
 TAO_ValueDef_i::supported_interfaces_i (
     const CORBA::InterfaceDefSeq &supported_interfaces
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -274,8 +254,9 @@ TAO_ValueDef_i::supported_interfaces_i (
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 12,
-                                           CORBA::COMPLETED_NO));
+              throw CORBA::BAD_PARAM (
+                CORBA::OMGVMCID | 12,
+                CORBA::COMPLETED_NO);
               return;
             }
         }
@@ -283,9 +264,7 @@ TAO_ValueDef_i::supported_interfaces_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                           this->section_key_,
                                           this->repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          CORBA::dk_Value);
 
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
       supported_id = supported_interfaces[i]->_interface_repository_id ();
@@ -296,19 +275,18 @@ TAO_ValueDef_i::supported_interfaces_i (
 }
 
 CORBA::InitializerSeq *
-TAO_ValueDef_i::initializers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::initializers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->initializers_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->initializers_i ();
 }
 
 CORBA::InitializerSeq *
-TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::initializers_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::InitializerSeq *iseq = 0;
@@ -387,19 +365,14 @@ TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL)
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           retval[i].members[j].type =
-            impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            impl->type_i ();
 
           obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                                      this->repo_);
 
           retval[i].members[j].type_def =
-            CORBA::IDLType::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            CORBA::IDLType::_narrow (obj.in ());
         }
     }
 
@@ -407,22 +380,18 @@ TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers
-                              ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::initializers (const CORBA::InitializerSeq &initializers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->initializers_i (initializers
-                        ACE_ENV_ARG_PARAMETER);
+  this->initializers_i (initializers);
 }
 
 void
-TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -436,19 +405,18 @@ TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers
 }
 
 CORBA::ValueDef_ptr
-TAO_ValueDef_i::base_value (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::base_value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+  this->update_key ();
 
-  return this->base_value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->base_value_i ();
 }
 
 CORBA::ValueDef_ptr
-TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::base_value_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
@@ -467,31 +435,24 @@ TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+                                              this->repo_);
 
-  return CORBA::ValueDef::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+  return CORBA::ValueDef::_narrow (obj.in ());
 }
 
 void
-TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value
-                            ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::base_value (CORBA::ValueDef_ptr base_value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->base_value_i (base_value
-                      ACE_ENV_ARG_PARAMETER);
+  this->base_value_i (base_value);
 }
 
 void
-TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value
-                              ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (base_value))
@@ -516,9 +477,7 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value
   TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                       this->section_key_,
                                       this->repo_,
-                                      CORBA::dk_Value
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      CORBA::dk_Value);
 
   this->repo_->config ()->set_string_value (
                               this->section_key_,
@@ -528,19 +487,18 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value
 }
 
 CORBA::ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::abstract_base_values (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->abstract_base_values_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->abstract_base_values_i ();
 }
 
 CORBA::ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::abstract_base_values_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ValueDefSeq *vd_seq = 0;
@@ -581,13 +539,9 @@ TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL)
                                                 holder.fast_rep (),
                                                 holder);
       obj = TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                      this->repo_);
 
-      retval[i] = CORBA::ValueDef::_narrow (obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      retval[i] = CORBA::ValueDef::_narrow (obj.in ());
     }
 
   return retval._retn ();
@@ -596,23 +550,19 @@ TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_ValueDef_i::abstract_base_values (
     const CORBA::ValueDefSeq &abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->abstract_base_values_i (abstract_base_values
-                                ACE_ENV_ARG_PARAMETER);
+  this->abstract_base_values_i (abstract_base_values);
 }
 
 void
 TAO_ValueDef_i::abstract_base_values_i (
     const CORBA::ValueDefSeq &abstract_base_values
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -657,9 +607,7 @@ TAO_ValueDef_i::abstract_base_values_i (
       TAO_IFR_Service_Utils::name_exists (&TAO_ValueDef_i::name_clash,
                                           this->section_key_,
                                           this->repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          CORBA::dk_Value);
 
       base_id = abstract_base_values[i]->_interface_repository_id ();
       stringified = TAO_IFR_Service_Utils::int_to_string (i);
@@ -670,19 +618,18 @@ TAO_ValueDef_i::abstract_base_values_i (
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_abstract (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::is_abstract (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_abstract_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->is_abstract_i ();
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_abstract_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_abstract_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong is_it = 0;
@@ -693,22 +640,18 @@ TAO_ValueDef_i::is_abstract_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract
-                             ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->is_abstract (is_abstract
-                     ACE_ENV_ARG_PARAMETER);
+  this->is_abstract (is_abstract);
 }
 
 void
-TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract
-                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (
@@ -718,19 +661,18 @@ TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_custom (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::is_custom (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_custom_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->is_custom_i ();
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_custom_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_custom_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong is_it = 0;
@@ -741,22 +683,18 @@ TAO_ValueDef_i::is_custom_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom
-                           ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->is_custom_i (is_custom
-                     ACE_ENV_ARG_PARAMETER);
+  this->is_custom_i (is_custom);
 }
 
 void
-TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom
-                             ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (
@@ -766,19 +704,18 @@ TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_truncatable (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::is_truncatable (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_truncatable_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->is_truncatable_i ();
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_truncatable_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_truncatable_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong is_it = 0;
@@ -789,22 +726,18 @@ TAO_ValueDef_i::is_truncatable_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable
-                                ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->is_truncatable_i (is_truncatable
-                          ACE_ENV_ARG_PARAMETER);
+  this->is_truncatable_i (is_truncatable);
 }
 
 void
-TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (
@@ -814,22 +747,18 @@ TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_a (const char *id
-                      ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_a (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->is_a_i (id
-                       ACE_ENV_ARG_PARAMETER);
+  return this->is_a_i (id);
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_a_i (const char *id
-                        ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::is_a_i (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
@@ -893,9 +822,7 @@ TAO_ValueDef_i::is_a_i (const char *id
                                            0);
       TAO_ValueDef_i impl (this->repo_);
       impl.section_key (base_key);
-      success = impl.is_a_i (id
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      success = impl.is_a_i (id);
 
       if (success)
         {
@@ -907,19 +834,18 @@ TAO_ValueDef_i::is_a_i (const char *id
 }
 
 CORBA::ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe_value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_value_i ();
 }
 
 CORBA::ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe_value_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ValueDef::FullValueDescription *fv_desc = 0;
@@ -1010,16 +936,14 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->operations[i].result =
-            idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            idl_type->type_i ();
 
           this->repo_->config ()->get_integer_value (op_key,
                                                      "mode",
                                                      val);
           fv_desc->operations[i].mode = static_cast<CORBA::OperationMode> (val);
           CORBA::TCKind kind =
-            fv_desc->operations[i].result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            fv_desc->operations[i].result->kind ();
 
           if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY
               && kind != CORBA::tk_void)
@@ -1073,21 +997,16 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                             this->repo_);
                   fv_desc->operations[i].parameters[j].type =
-                    idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                    idl_type->type_i ();
 
                   obj =
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
                                                this->repo_
-                                               ACE_ENV_ARG_PARAMETER
                                              );
-                  ACE_CHECK_RETURN (0);
 
                   fv_desc->operations[i].parameters[j].type_def =
-                    CORBA::IDLType::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                    CORBA::IDLType::_narrow (obj.in ());
 
                   this->repo_->config ()->get_integer_value (param_key,
                                                              "mode",
@@ -1154,8 +1073,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
 
                   // Use the TAO_IDLType_i fetched above.
                   fv_desc->operations[i].exceptions[j].type =
-                    idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                    idl_type->type_i ();
                 }
             }
         }
@@ -1213,8 +1131,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->attributes[i].type =
-            idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            idl_type->type_i ();
 
           this->repo_->config ()->expand_path (this->repo_->root_key (),
                                                holder,
@@ -1284,19 +1201,14 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
             TAO_IFR_Service_Utils::path_to_idltype (holder,
                                                     this->repo_);
           fv_desc->members[i].type =
-            idl_type->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            idl_type->type_i ();
 
           obj =
             TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                                      this->repo_
-                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                                      this->repo_);
 
           fv_desc->members[i].type_def =
-            CORBA::IDLType::_narrow (obj.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            CORBA::IDLType::_narrow (obj.in ());
         }
     }
 
@@ -1363,14 +1275,10 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                   obj =
                     TAO_IFR_Service_Utils::path_to_ir_object (
                                                holder,
-                                               this->repo_
-                                               ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                                               this->repo_);
 
                   fv_desc->initializers[i].members[j].type_def =
-                    CORBA::IDLType::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (0);
+                    CORBA::IDLType::_narrow (obj.in ());
                 }
             }
         }
@@ -1398,8 +1306,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "base_value",
                                             holder);
   fv_desc->base_value = holder.fast_rep ();
-  fv_desc->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  fv_desc->type = this->type_i ();
 
   return retval._retn ();
 }
@@ -1409,21 +1316,18 @@ TAO_ValueDef_i::create_value_member (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA::IDLType_ptr type,
-                                     CORBA::Visibility access
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Visibility access)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::ValueMemberDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
+  this->update_key ();
 
   return this->create_value_member_i (id,
                                       name,
                                       version,
                                       type,
-                                      access
-                                      ACE_ENV_ARG_PARAMETER);
+                                      access);
 }
 
 CORBA::ValueMemberDef_ptr
@@ -1431,8 +1335,7 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
                                        const char *name,
                                        const char *version,
                                        CORBA::IDLType_ptr type,
-                                       CORBA::Visibility access
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::Visibility access)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Container_i::tmp_name_holder_ = name;
@@ -1449,9 +1352,7 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "members"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
+                                          "members");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -1469,14 +1370,10 @@ TAO_ValueDef_i::create_value_member_i (const char *id,
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_ValueMember,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
+                                          this->repo_);
 
   CORBA::ValueMemberDef_var retval =
-    CORBA::ValueMemberDef::_narrow (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
+    CORBA::ValueMemberDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -1488,21 +1385,18 @@ TAO_ValueDef_i::create_attribute (
     const char *version,
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::AttributeDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+  this->update_key ();
 
   return this->create_attribute_i (id,
                                    name,
                                    version,
                                    type,
-                                   mode
-                                   ACE_ENV_ARG_PARAMETER);
+                                   mode);
 }
 
 CORBA::AttributeDef_ptr
@@ -1512,7 +1406,6 @@ TAO_ValueDef_i::create_attribute_i (
     const char *version,
     CORBA::IDLType_ptr type,
     CORBA::AttributeMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1530,9 +1423,7 @@ TAO_ValueDef_i::create_attribute_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "attrs"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+                                          "attrs");
 
   // Store the path to the attribute's type definition.
   char *type_path = TAO_IFR_Service_Utils::reference_to_path (type);
@@ -1550,14 +1441,10 @@ TAO_ValueDef_i::create_attribute_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Attribute,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+                                          this->repo_);
 
   CORBA::AttributeDef_var retval =
-    CORBA::AttributeDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+    CORBA::AttributeDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -1572,14 +1459,12 @@ TAO_ValueDef_i::create_operation (
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions,
     const CORBA::ContextIdSeq &contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA::OperationDef::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+  this->update_key ();
 
   return this->create_operation_i (id,
                                    name,
@@ -1588,8 +1473,7 @@ TAO_ValueDef_i::create_operation (
                                    mode,
                                    params,
                                    exceptions,
-                                   contexts
-                                   ACE_ENV_ARG_PARAMETER);
+                                   contexts);
 }
 
 CORBA::OperationDef_ptr
@@ -1602,7 +1486,6 @@ TAO_ValueDef_i::create_operation_i (
     const CORBA::ParDescriptionSeq &params,
     const CORBA::ExceptionDefSeq &exceptions,
     const CORBA::ContextIdSeq &contexts
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1620,9 +1503,7 @@ TAO_ValueDef_i::create_operation_i (
                                           name,
                                           &TAO_Container_i::same_as_tmp_name,
                                           version,
-                                          "ops"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+                                          "ops");
 
   // Get the TypeCode for the return type.
   ACE_TString result_path (TAO_IFR_Service_Utils::reference_to_path (result));
@@ -1631,11 +1512,9 @@ TAO_ValueDef_i::create_operation_i (
                                             this->repo_);
 
   CORBA::TypeCode_var rettype =
-    result_impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+    result_impl->type_i ();
 
-  CORBA::TCKind kind = rettype->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+  CORBA::TCKind kind = rettype->kind ();
 
   // Oneway operations cannot have a non-void return type.
   if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
@@ -1769,14 +1648,10 @@ TAO_ValueDef_i::create_operation_i (
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::create_objref (CORBA::dk_Operation,
                                           path.c_str (),
-                                          this->repo_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+                                          this->repo_);
 
   CORBA::OperationDef_var retval =
-    CORBA::OperationDef::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+    CORBA::OperationDef::_narrow (obj.in ());
 
   return retval._retn ();
 }
@@ -1784,41 +1659,33 @@ TAO_ValueDef_i::create_operation_i (
 int
 TAO_ValueDef_i::name_clash (const char *name)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_Container_i::tmp_name_holder_ = name;
       TAO_IFR_Service_Utils::name_exists (&TAO_Container_i::same_as_tmp_name,
                                           TAO_IFR_Service_Utils::tmp_key_,
                                           TAO_IFR_Service_Utils::repo_,
-                                          CORBA::dk_Value
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          CORBA::dk_Value);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc
-                                        ACE_ENV_ARG_DECL)
+TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc)
 {
-  desc.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.name = this->name_i ();
 
-  desc.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.id = this->id_i ();
 
-  CORBA::ULong tmp = this->is_abstract_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULong tmp = this->is_abstract_i ();
   desc.is_abstract = static_cast<CORBA::Boolean> (tmp);
 
-  tmp = this->is_custom_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  tmp = this->is_custom_i ();
   desc.is_custom = static_cast<CORBA::Boolean> (tmp);
 
   ACE_TString holder;
@@ -1827,8 +1694,7 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc
                                             holder);
   desc.defined_in = holder.fast_rep ();
 
-  desc.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc.version = this->version_i ();
 
   TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>::fill_string_seq (
       "supported",
@@ -1844,8 +1710,7 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc
       desc.abstract_base_values
     );
 
-  tmp = this->is_truncatable_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  tmp = this->is_truncatable_i ();
   desc.is_truncatable = static_cast<CORBA::Boolean> (tmp);
 
   this->repo_->config ()->get_string_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
index 0d5dd9d7f9f..3d1f3fd3049 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
@@ -54,219 +54,180 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::InterfaceDefSeq *supported_interfaces (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InterfaceDefSeq *supported_interfaces_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
       const CORBA::InterfaceDefSeq & supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
       const CORBA::InterfaceDefSeq & supported_interfaces
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::InitializerSeq *initializers (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::InitializerSeq *initializers_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void initializers (
       const CORBA::InitializerSeq & initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void initializers_i (
       const CORBA::InitializerSeq & initializers
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ValueDef_ptr base_value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ValueDef_ptr base_value_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_value (
       CORBA::ValueDef_ptr base_value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_value_i (
       CORBA::ValueDef_ptr base_value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ValueDefSeq *abstract_base_values (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ValueDefSeq *abstract_base_values_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void abstract_base_values (
       const CORBA::ValueDefSeq & abstract_base_values
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void abstract_base_values_i (
       const CORBA::ValueDefSeq & abstract_base_values
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_abstract (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_abstract_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_abstract (
       CORBA::Boolean is_abstract
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_abstract_i (
       CORBA::Boolean is_abstract
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_custom (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_custom_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_custom (
       CORBA::Boolean is_custom
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_custom_i (
       CORBA::Boolean is_custom
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_truncatable (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_truncatable_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_truncatable (
       CORBA::Boolean is_truncatable
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_truncatable_i (
       CORBA::Boolean is_truncatable
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ValueDef::FullValueDescription *describe_value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ValueDef::FullValueDescription *describe_value_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -276,7 +237,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::Visibility access
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -286,7 +246,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::Visibility access
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -296,7 +255,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -306,7 +264,6 @@ public:
       const char *version,
       CORBA::IDLType_ptr type,
       CORBA::AttributeMode mode
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -319,7 +276,6 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -332,7 +288,6 @@ public:
       const CORBA::ParDescriptionSeq &params,
       const CORBA::ExceptionDefSeq &exceptions,
       const CORBA::ContextIdSeq &contexts
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -340,8 +295,7 @@ public:
   // Called from TAO_IFR_Service_Utils::name_exists() when we
   // are a base valuetype.
 
-  void fill_value_description (CORBA::ValueDescription &desc
-                               ACE_ENV_ARG_DECL);
+  void fill_value_description (CORBA::ValueDescription &desc);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index bb6b101ddd0..005edee0cd1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -28,26 +28,25 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueMemberDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueMemberDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueMember;
 }
 
 CORBA::Contained::Description *
-TAO_ValueMemberDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::describe (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i ();
 }
 
 CORBA::Contained::Description *
-TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::describe_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ValueMember vm;
@@ -56,12 +55,9 @@ TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                                                 vm,
                                                 this->repo_,
                                                 this->section_key_
-                                                ACE_ENV_ARG_PARAMETER
                                               );
-  ACE_CHECK_RETURN (0);
 
-  vm.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  vm.type = this->type_i ();
 
   ACE_TString holder;
   this->repo_->config ()->get_string_value (this->section_key_,
@@ -69,13 +65,9 @@ TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                              this->repo_);
 
-  vm.type_def = CORBA::IDLType::_narrow (obj.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  vm.type_def = CORBA::IDLType::_narrow (obj.in ());
 
   CORBA::ULong val = 0;
   this->repo_->config ()->get_integer_value  (this->section_key_,
@@ -94,19 +86,18 @@ TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueMemberDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueMemberDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
@@ -116,23 +107,22 @@ TAO_ValueMemberDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
   TAO_IDLType_i *impl =
     TAO_IFR_Service_Utils::path_to_idltype (holder,
                                             this->repo_);
-  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_ValueMemberDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type_def (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+  this->update_key ();
 
-  return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_def_i ();
 }
 
 CORBA::IDLType_ptr
-TAO_ValueMemberDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type_def_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString holder;
@@ -141,31 +131,24 @@ TAO_ValueMemberDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
                                             holder);
   CORBA::Object_var obj =
     TAO_IFR_Service_Utils::path_to_ir_object (holder,
-                                              this->repo_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+                                              this->repo_);
 
-  return CORBA::IDLType::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  return CORBA::IDLType::_narrow (obj.in ());
 }
 
 void
-TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def
-                                ACE_ENV_ARG_DECL)
+TAO_ValueMemberDef_i::type_def (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->type_def_i (type_def
-                    ACE_ENV_ARG_PARAMETER);
+  this->type_def_i (type_def);
 }
 
 void
-TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *path = TAO_IFR_Service_Utils::reference_to_path (type_def);
@@ -175,19 +158,18 @@ TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def
 }
 
 CORBA::Visibility
-TAO_ValueMemberDef_i::access (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::access (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->access_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->access_i ();
 }
 
 CORBA::Visibility
-TAO_ValueMemberDef_i::access_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueMemberDef_i::access_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong val = 0;
@@ -198,22 +180,18 @@ TAO_ValueMemberDef_i::access_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_ValueMemberDef_i::access (CORBA::Visibility access
-                              ACE_ENV_ARG_DECL)
+TAO_ValueMemberDef_i::access (CORBA::Visibility access)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->access_i (access
-                  ACE_ENV_ARG_PARAMETER);
+  this->access_i (access);
 }
 
 void
-TAO_ValueMemberDef_i::access_i (CORBA::Visibility access
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_ValueMemberDef_i::access_i (CORBA::Visibility access)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
index 1da19410d15..45137157c14 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
@@ -50,75 +50,62 @@ public:
   virtual ~TAO_ValueMemberDef_i (void);
   // Destructor
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual CORBA::Contained::Description *describe (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::Contained::Description *describe_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Contained::Description *describe_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::IDLType_ptr type_def (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::IDLType_ptr type_def ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::IDLType_ptr type_def_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::IDLType_ptr type_def_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
-      CORBA::IDLType_ptr type_def
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::IDLType_ptr type_def)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Visibility access (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Visibility access ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Visibility access_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Visibility access_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void access (
-      CORBA::Visibility access
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Visibility access)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void access_i (
-      CORBA::Visibility access
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Visibility access)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
index 252050a2855..0e40d0dd1ec 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -25,26 +25,25 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_WstringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::def_kind (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Wstring;
 }
 
 void
-TAO_WstringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i ();
 }
 
 void
-TAO_WstringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::destroy_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -58,42 +57,38 @@ TAO_WstringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::TypeCode_ptr
-TAO_WstringDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->update_key ();
 
-  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i ();
 }
 
 CORBA::TypeCode_ptr
-TAO_WstringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::type_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::ULong bound = this->bound_i ();
 
-  return this->repo_->tc_factory ()->create_wstring_tc (bound
-                                                        ACE_ENV_ARG_PARAMETER);
+  return this->repo_->tc_factory ()->create_wstring_tc (bound);
 }
 CORBA::ULong
-TAO_WstringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::bound (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->update_key ();
 
-  return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->bound_i ();
 }
 
 
 CORBA::ULong
-TAO_WstringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::bound_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
@@ -105,22 +100,18 @@ TAO_WstringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_WstringDef_i::bound (CORBA::ULong bound
-                         ACE_ENV_ARG_DECL)
+TAO_WstringDef_i::bound (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->update_key ();
 
-  this->bound_i (bound
-                 ACE_ENV_ARG_PARAMETER);
+  this->bound_i (bound);
 }
 
 void
-TAO_WstringDef_i::bound_i (CORBA::ULong bound
-                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::bound_i (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
index c1317c0a888..6e41ff96d89 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
@@ -51,54 +51,45 @@ public:
   virtual ~TAO_WstringDef_i (void);
   // Destructor.
 
-  virtual CORBA::DefinitionKind def_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::DefinitionKind def_kind ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
-  virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
-  virtual void destroy_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
-  virtual CORBA::TypeCode_ptr type_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::TypeCode_ptr type_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
-  virtual CORBA::ULong bound (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong bound ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::ULong bound_i (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::ULong bound_i ()
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::ULong bound)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index 5ea2a76ec77..f4b283bc00c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -60,7 +60,7 @@ TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void)
 }
 
 CosLoadBalancing::Location *
-TAO_LB_CPU_Load_Average_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Load_Average_Monitor::the_location (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
@@ -71,13 +71,12 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return location;
 }
 
 CosLoadBalancing::LoadList *
-TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Load_Average_Monitor::loads (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Float load = 0;
@@ -213,7 +212,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
 
 #if defined (linux) || defined (sun) || defined (__hpux) || defined(__NetBSD__) || defined (__APPLE__)
 
-  CosLoadBalancing::LoadList * tmp;
+  CosLoadBalancing::LoadList * tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     CosLoadBalancing::LoadList (1),
                     CORBA::NO_MEMORY (
@@ -221,7 +220,6 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CosLoadBalancing::LoadList_var load_list = tmp;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
index 12bb7c1df80..035a41a37dc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -63,8 +63,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Location * the_location ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the average CPU load at the location which this
@@ -74,8 +73,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::LoadList * loads ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index 48a8267e189..e1627c2b007 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -110,7 +110,7 @@ TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void)
 }
 
 CosLoadBalancing::Location *
-TAO_LB_CPU_Utilization_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Utilization_Monitor::the_location (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
@@ -121,13 +121,12 @@ TAO_LB_CPU_Utilization_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return location;
 }
 
 CosLoadBalancing::LoadList *
-TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_CPU_Utilization_Monitor::loads (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Float load = 0;
@@ -145,7 +144,6 @@ TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CosLoadBalancing::LoadList_var load_list = tmp;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index c369ce8e2c0..ea3431fa897 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -60,8 +60,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Location * the_location ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the average CPU load at the location which this
@@ -71,8 +70,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::LoadList * loads ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index abfe60c3f23..dbac81329a8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -25,8 +25,7 @@ TAO_LB_ClientComponent::fini (void)
 int
 TAO_LB_ClientComponent::register_orb_initializer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Register the LB_ClientComponent ORB initializer.
       PortableInterceptor::ORBInitializer_ptr tmp;
@@ -37,22 +36,17 @@ TAO_LB_ClientComponent::register_orb_initializer (void)
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unable to register LB_ClientComponent ORB "
-                           "initializer.");
+      ex._tao_print_exception (
+        "Unable to register LB_ClientComponent ORB ""initializer.");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index 10ef40d2a54..3fb67cb6dd4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -11,16 +11,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_LB_ClientORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr tmp;
@@ -31,13 +29,10 @@ TAO_LB_ClientORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor = tmp;
 
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
index 595c7198ea0..ae4b5b53b76 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
@@ -56,12 +56,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index 870a88577d2..f66ac874705 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -10,29 +10,26 @@ ACE_RCSID (LoadBalancing,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
-TAO_LB_ClientRequestInterceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ClientRequestInterceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_ClientRequestInterceptor");
 }
 
 void
-TAO_LB_ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ClientRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   /*
-  CORBA::Object_var t = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var t = ri->target ();
   */
 
   // A ServiceContext with an empty payload (i.e. zero length
@@ -72,31 +69,26 @@ TAO_LB_ClientRequestInterceptor::send_request (
 
   const CORBA::Boolean replace = 0;
   ri->add_request_service_context (service_context,
-                                   replace
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   replace);
 }
 
 void
 TAO_LB_ClientRequestInterceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -104,8 +96,7 @@ TAO_LB_ClientRequestInterceptor::receive_exception (
 
 void
 TAO_LB_ClientRequestInterceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index 124a845a989..900293f53f6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -68,37 +68,32 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 3e6d76a10aa..4c8ebd7067d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -99,8 +99,7 @@ TAO_LB_Component::register_orb_initializer (
   const CORBA::StringSeq & repository_ids,
   const char * location)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Register the LB_Component ORB initializer.
       PortableInterceptor::ORBInitializer_ptr tmp;
@@ -113,22 +112,17 @@ TAO_LB_Component::register_orb_initializer (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unable to register LB_Component ORB "
-                           "initializer.");
+      ex._tao_print_exception (
+        "Unable to register LB_Component ORB ""initializer.");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 3f555d17a5c..b426519dec2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -30,14 +30,14 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor (
 }
 
 char *
-TAO_LB_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_IORInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_IORInterceptor");
 }
 
 void
-TAO_LB_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_IORInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Force the LoadManager reference to be released since the ORB's
@@ -47,29 +47,24 @@ TAO_LB_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_LB_IORInterceptor::establish_components (
-    PortableInterceptor::IORInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::IORInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_IORInterceptor::components_established (
-    PortableInterceptor::IORInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::IORInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         0,
-                                        this->orb_id_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        this->orb_id_.in ());
 
   // Save a copy of the current ObjectReferenceFactory.
   PortableInterceptor::ObjectReferenceFactory_var old_orf =
-    info->current_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->current_factory ();
 
   PortableInterceptor::ObjectReferenceFactory * tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -84,45 +79,38 @@ TAO_LB_IORInterceptor::components_established (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ObjectReferenceFactory_var orf = tmp;
 
-  info->current_factory (orf.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->current_factory (orf.in ());
 }
 
 void
 TAO_LB_IORInterceptor::adapter_manager_state_changed (
     const char *,
-    PortableInterceptor::AdapterState state
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::AdapterState state)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (state == PortableInterceptor::ACTIVE)
     {
-      this->register_load_alert (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->register_load_alert ();
     }
 }
 
 void
 TAO_LB_IORInterceptor::adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
-    PortableInterceptor::AdapterState state
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::AdapterState state)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (state == PortableInterceptor::ACTIVE)
     {
-      this->register_load_alert (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->register_load_alert ();
     }
 }
 
 void
-TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_IORInterceptor::register_load_alert (void)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
@@ -131,13 +119,12 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
       return;
   }
 
-  ACE_TRY_EX (foo)
+  try
     {
       // By now, the RootPOA has been fully initialized, so it is safe
       // to activate the LoadAlert object.
       CosLoadBalancing::LoadAlert_var la =
-        this->load_alert_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (foo);
+        this->load_alert_._this ();
 
       {
         ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
@@ -146,44 +133,35 @@ TAO_LB_IORInterceptor::register_load_alert (ACE_ENV_SINGLE_ARG_DECL)
       }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "LoadAlert::_this()");
+        ex._tao_print_exception ("LoadAlert::_this()");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
       location[0].id = CORBA::string_dup (this->location_.in ());
 
       this->lm_->register_load_alert (location,
-                                      this->la_ref_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      this->la_ref_.in ());
     }
-  ACE_CATCH (CosLoadBalancing::LoadAlertAlreadyPresent, ex)
+  catch (const CosLoadBalancing::LoadAlertAlreadyPresent& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex,
-                             "LoadManager::register_load_alert");
+        ex._tao_print_exception ("LoadManager::register_load_alert");
 
-      ACE_TRY_THROW (CORBA::BAD_INV_ORDER ());
+      throw CORBA::BAD_INV_ORDER ();
     }
-  ACE_CATCH (CosLoadBalancing::LoadAlertNotAdded, ex)
+  catch (const CosLoadBalancing::LoadAlertNotAdded& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex,
-                             "LoadManager::register_load_alert");
+        ex._tao_print_exception ("LoadManager::register_load_alert");
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 6b93c951912..b3d2481831d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -71,38 +71,34 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((
         CORBA::SystemException
     ));
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -112,7 +108,7 @@ public:
 private:
 
   /// Create and register the LoadAlert object with the LoadManager.
-  void register_load_alert (ACE_ENV_SINGLE_ARG_DECL);
+  void register_load_alert (void);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 00c4fa6203d..1caafd25627 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -53,14 +53,14 @@ TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void)
 }
 
 char *
-TAO_LB_LeastLoaded::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LeastLoaded::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LeastLoaded");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LeastLoaded::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LeastLoaded::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
@@ -71,7 +71,6 @@ TAO_LB_LeastLoaded::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return props;
 }
@@ -79,31 +78,28 @@ TAO_LB_LeastLoaded::get_properties (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_LB_LeastLoaded::push_loads (
     const PortableGroup::Location & the_location,
-    const CosLoadBalancing::LoadList & loads
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & loads)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   CosLoadBalancing::Load load;  // Unused
 
   this->push_loads (the_location,
                     loads,
-                    load
-                    ACE_ENV_ARG_PARAMETER);
+                    load);
 }
 
 void
 TAO_LB_LeastLoaded::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads,
-    CosLoadBalancing::Load & load
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::Load & load)
 {
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // Only the first load is used by this load balancing strategy.
   const CosLoadBalancing::Load & new_load = loads[0];
@@ -118,7 +114,7 @@ TAO_LB_LeastLoaded::push_loads (
           CosLoadBalancing::Load & previous_load = entry->int_id_;
 
           if (previous_load.id != new_load.id)
-            ACE_THROW (CORBA::BAD_PARAM ());  // Somebody switched
+            throw CORBA::BAD_PARAM ();  // Somebody switched
                                               // LoadIds on us!
 
           previous_load.value =
@@ -141,7 +137,7 @@ TAO_LB_LeastLoaded::push_loads (
                             "ERROR: TAO_LB_LeastLoaded - "
                             "Unable to push loads\n"));
 
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
 
           load = eff_load;
@@ -156,8 +152,7 @@ TAO_LB_LeastLoaded::push_loads (
 
 CosLoadBalancing::LoadList *
 TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                               const PortableGroup::Location & the_location
-                               ACE_ENV_ARG_DECL)
+                               const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -165,15 +160,11 @@ TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
   CosLoadBalancing::LoadList_var loads =
-    load_manager->get_loads (the_location
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    load_manager->get_loads (the_location);
 
   this->push_loads (the_location,
                     loads.in (),
-                    loads[0]
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                    loads[0]);
 
   return loads._retn ();
 }
@@ -182,8 +173,7 @@ TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
 CORBA::Object_ptr
 TAO_LB_LeastLoaded::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -193,9 +183,7 @@ TAO_LB_LeastLoaded::next_member (
                       CORBA::Object::_nil ());
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -208,9 +196,7 @@ TAO_LB_LeastLoaded::next_member (
   CORBA::Boolean found_location =
     this->get_location (load_manager,
                         locations.in (),
-                        location
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                        location);
 
   if (found_location)
     {
@@ -219,8 +205,7 @@ TAO_LB_LeastLoaded::next_member (
 //                   location[0].id.in ()));
 
       return load_manager->get_member_ref (object_group,
-                                           location
-                                           ACE_ENV_ARG_PARAMETER);
+                                           location);
     }
   else
     {
@@ -236,28 +221,24 @@ TAO_LB_LeastLoaded::next_member (
 
       return TAO_LB_Random::_tao_next_member (object_group,
                                               load_manager,
-                                              locations.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              locations.in ());
     }
 }
 
 void
 TAO_LB_LeastLoaded::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
-    ACE_THROW (CORBA::TRANSIENT ());
+    throw CORBA::TRANSIENT ();
 
   const CORBA::ULong len = locations->length ();
 
@@ -265,7 +246,7 @@ TAO_LB_LeastLoaded::analyze_loads (
   // locations require load to be shed.
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
@@ -273,16 +254,12 @@ TAO_LB_LeastLoaded::analyze_loads (
           // LoadManager and push it to this Strategy's load
           // processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            load_manager->get_loads (loc);
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                            load);
 /*
            ACE_DEBUG ((LM_DEBUG,
                        "EFFECTIVE_LOAD == %f\n"
@@ -311,32 +288,26 @@ TAO_LB_LeastLoaded::analyze_loads (
                   // associated with the member at that location it
                   // should redirect client requests back to the
                   // LoadManager.
-                  load_manager->enable_alert (loc
-                                              ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  load_manager->enable_alert (loc);
                 }
               else
                 {
                   // The location is not overloaded.  Disable load
                   // shedding at given location.
-                  load_manager->disable_alert (loc
-                                               ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  load_manager->disable_alert (loc);
                 }
             }
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound&)
         {
           // No load available for the requested location.  Try the
           // next location.
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 PortableServer::POA_ptr
-TAO_LB_LeastLoaded::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LeastLoaded::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -345,8 +316,7 @@ CORBA::Boolean
 TAO_LB_LeastLoaded::get_location (
   CosLoadBalancing::LoadManager_ptr load_manager,
   const PortableGroup::Locations & locations,
-  PortableGroup::Location & location
-  ACE_ENV_ARG_DECL)
+  PortableGroup::Location & location)
 {
   CORBA::Float min_load = FLT_MAX;  // Start out with the largest
                                     // positive value.
@@ -361,25 +331,21 @@ TAO_LB_LeastLoaded::get_location (
   // of them.
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
           // Retrieve the load list for the location from the LoadManager
           // and push it to this Strategy's load processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            load_manager->get_loads (loc);
 
           found_load = 1;
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                            load);
 /*
            ACE_DEBUG ((LM_DEBUG,
                        "LOC = %u"
@@ -490,13 +456,11 @@ TAO_LB_LeastLoaded::get_location (
 
           // ACE_DEBUG ((LM_DEBUG, "NEW MIN_LOAD == %f\n", min_load));
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound&)
         {
           // No load available for the requested location.  Try the
           // next location.
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
 
 //   ACE_DEBUG ((LM_DEBUG,
@@ -525,8 +489,7 @@ TAO_LB_LeastLoaded::get_location (
 }
 
 void
-TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props)
 {
   CORBA::Float critical_threshold =
     TAO_LB::LL_DEFAULT_CRITICAL_THRESHOLD;
@@ -545,9 +508,7 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
                           "org.omg.CosLoadBalancing.Strategy.LeastLoaded.CriticalThreshold") == 0)
         {
           this->extract_float_property (property,
-                                        critical_threshold
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        critical_threshold);
 
           ct = &property;
         }
@@ -556,52 +517,42 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
                                "org.omg.CosLoadBalancing.Strategy.LeastLoaded.RejectThreshold") == 0)
         {
           this->extract_float_property (property,
-                                        reject_threshold
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        reject_threshold);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LeastLoaded.Tolerance") == 0)
         {
           this->extract_float_property (property,
-                                        tolerance
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        tolerance);
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LeastLoaded.Dampening") == 0)
         {
           this->extract_float_property (property,
-                                        dampening
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        dampening);
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LeastLoaded.PerBalanceLoad") == 0)
         {
           this->extract_float_property (property,
-                                        per_balance_load
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        per_balance_load);
         }
     }
 
   if (critical_threshold != 0 && reject_threshold != 0
       && critical_threshold <= reject_threshold)
-    ACE_THROW (PortableGroup::InvalidProperty (ct->nam, ct->val));
+    throw PortableGroup::InvalidProperty (ct->nam, ct->val);
 
   this->properties_ = props;
 
@@ -630,12 +581,10 @@ TAO_LB_LeastLoaded::init (const PortableGroup::Properties & props
 void
 TAO_LB_LeastLoaded::extract_float_property (
   const PortableGroup::Property & property,
-  CORBA::Float & value
-  ACE_ENV_ARG_DECL)
+  CORBA::Float & value)
 {
   if (!(property.val >>= value))
-    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                               property.val));
+    throw PortableGroup::InvalidProperty (property.nam, property.val);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index a7843028c66..73d3715b1a3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -87,49 +87,42 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// Initialize the LeastLoaded instance with the given properties.
-  void init (const PortableGroup::Properties & props
-             ACE_ENV_ARG_DECL);
+  void init (const PortableGroup::Properties & props);
 
 protected:
 
@@ -140,8 +133,7 @@ protected:
   /// locations.
   CORBA::Boolean get_location (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Locations & locations,
-                               PortableGroup::Location & location
-                               ACE_ENV_ARG_DECL);
+                               PortableGroup::Location & location);
 
   /// Return the effective load.
   CORBA::Float effective_load (CORBA::Float previous_load,
@@ -152,14 +144,12 @@ protected:
   void push_loads (
       const PortableGroup::Location & the_location,
       const CosLoadBalancing::LoadList & loads,
-      CosLoadBalancing::Load & effective_load
-      ACE_ENV_ARG_DECL);
+      CosLoadBalancing::Load & effective_load);
 
   /// Utility method to extract a CORBA::Float value from the given
   /// property.
   void extract_float_property (const PortableGroup::Property & property,
-                               CORBA::Float & value
-                               ACE_ENV_ARG_DECL);
+                               CORBA::Float & value);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index a57212dbce6..56b62f8a780 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -22,7 +22,7 @@ TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void)
 }
 
 void
-TAO_LB_LoadAlert::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert::enable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
@@ -31,7 +31,7 @@ TAO_LB_LoadAlert::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_LB_LoadAlert::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert::disable_alert (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index f5345ef7f07..d4f2ecb6ddc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -43,11 +43,11 @@ public:
 
   /// Forward requests back to the load manager via the object group
   /// reference.
-  virtual void enable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void enable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Stop forwarding requests, and begin accepting them again.
-  virtual void disable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
@@ -64,7 +64,7 @@ public:
    * reference counting.
    */
   virtual ~TAO_LB_LoadAlert (void);
-  
+
 private:
 
   /// Has this LoadAlert servant been alerted of a high load condition
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index ca2bf1b5116..1ce94dba907 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -14,15 +14,14 @@ TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void)
 }
 
 void
-TAO_LB_LoadAlert_Handler::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert_Handler::enable_alert (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_LoadAlert_Handler::enable_alert_excep (
-    ::Messaging::ExceptionHolder *
-    ACE_ENV_ARG_DECL_NOT_USED)
+    ::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -32,15 +31,14 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep (
 }
 
 void
-TAO_LB_LoadAlert_Handler::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAlert_Handler::disable_alert (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_LoadAlert_Handler::disable_alert_excep (
-    ::Messaging::ExceptionHolder *
-    ACE_ENV_ARG_DECL_NOT_USED)
+    ::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index d19518ce96d..7168d127bcd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -43,20 +43,18 @@ class TAO_LB_LoadAlert_Handler
 {
 public:
 
-  virtual void enable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void enable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void enable_alert_excep (
-      ::Messaging::ExceptionHolder *
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void disable_alert (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disable_alert (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disable_alert_excep (
-      ::Messaging::ExceptionHolder *
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index c6a0d0c3fa3..ca07c42fbc8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -51,14 +51,14 @@ TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void)
 }
 
 char *
-TAO_LB_LoadAverage::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAverage::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LoadAverage");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LoadAverage::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadAverage::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
@@ -69,7 +69,6 @@ TAO_LB_LoadAverage::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return props;
 }
@@ -77,31 +76,28 @@ TAO_LB_LoadAverage::get_properties (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_LB_LoadAverage::push_loads (
     const PortableGroup::Location & the_location,
-    const CosLoadBalancing::LoadList & loads
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & loads)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   CosLoadBalancing::Load load;  // Unused
 
   this->push_loads (the_location,
                     loads,
-                    load
-                    ACE_ENV_ARG_PARAMETER);
+                    load);
 }
 
 void
 TAO_LB_LoadAverage::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads,
-    CosLoadBalancing::Load & load
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::Load & load)
 {
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // Only the first load is used by this load balancing strategy.
   const CosLoadBalancing::Load & new_load = loads[0];
@@ -116,7 +112,7 @@ TAO_LB_LoadAverage::push_loads (
           CosLoadBalancing::Load & previous_load = entry->int_id_;
 
           if (previous_load.id != new_load.id)
-            ACE_THROW (CORBA::BAD_PARAM ());  // Somebody switched
+            throw CORBA::BAD_PARAM ();  // Somebody switched
                                               // LoadIds on us!
 
           previous_load.value =
@@ -139,7 +135,7 @@ TAO_LB_LoadAverage::push_loads (
                             "ERROR: TAO_LB_LoadAverage - "
                             "Unable to push loads\n"));
 
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
 
           load = eff_load;
@@ -154,8 +150,7 @@ TAO_LB_LoadAverage::push_loads (
 
 CosLoadBalancing::LoadList *
 TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                               const PortableGroup::Location & the_location
-                               ACE_ENV_ARG_DECL)
+                               const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -163,15 +158,11 @@ TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
   CosLoadBalancing::LoadList_var loads =
-    load_manager->get_loads (the_location
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    load_manager->get_loads (the_location);
 
   this->push_loads (the_location,
                     loads.in (),
-                    loads[0]
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                    loads[0]);
 
   return loads._retn ();
 }
@@ -180,8 +171,7 @@ TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
 CORBA::Object_ptr
 TAO_LB_LoadAverage::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -191,9 +181,7 @@ TAO_LB_LoadAverage::next_member (
                       CORBA::Object::_nil ());
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -204,27 +192,23 @@ TAO_LB_LoadAverage::next_member (
 
   return TAO_LB_Random::_tao_next_member (object_group,
                                           load_manager,
-                                          locations.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          locations.in ());
 }
 
 void
 TAO_LB_LoadAverage::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (load_manager))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
-    ACE_THROW (CORBA::TRANSIENT ());
+    throw CORBA::TRANSIENT ();
 
   const CORBA::ULong len = locations->length ();
 
@@ -238,7 +222,7 @@ TAO_LB_LoadAverage::analyze_loads (
   // the average load of all the locations
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
@@ -246,16 +230,12 @@ TAO_LB_LoadAverage::analyze_loads (
           // LoadManager and push it to this Strategy's load
           // processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            load_manager->get_loads (loc);
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                            load);
 
           // @@ Jai, please use the compound "+=" operator here.  It
           //    is more efficient in this case.
@@ -269,13 +249,11 @@ TAO_LB_LoadAverage::analyze_loads (
                        total_load.value));
           */
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound&)
         {
           // no location found
           //
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
   avg_load.value = total_load.value / len;
@@ -289,7 +267,7 @@ TAO_LB_LoadAverage::analyze_loads (
   // the location where the load has to be shed.
   for (CORBA::ULong j = 0; j < len; ++j)
     {
-      ACE_TRY_EX (SECOND)
+      try
         {
           const PortableGroup::Location & loc = locations[j];
 
@@ -303,9 +281,7 @@ TAO_LB_LoadAverage::analyze_loads (
 
           if (tmp[j].value <= avg_load.value)
             {
-              load_manager->disable_alert (loc
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (SECOND);
+              load_manager->disable_alert (loc);
             }
           else
             {
@@ -333,9 +309,7 @@ TAO_LB_LoadAverage::analyze_loads (
               // coding style.
               if (percent_diff <= TAO_LB::LA_DEFAULT_DIFF_AVERAGE_CUTOFF)
               {
-                load_manager->disable_alert (loc
-                                             ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK_EX (SECOND);
+                load_manager->disable_alert (loc);
               }
               else if ((percent_diff > TAO_LB::LA_DEFAULT_DIFF_AVERAGE_CUTOFF)
                        && (percent_diff < 1))
@@ -346,34 +320,29 @@ TAO_LB_LoadAverage::analyze_loads (
                             i));
 */
 
-                load_manager->enable_alert (loc
-                                            ACE_ENV_ARG_PARAMETER);
+                load_manager->enable_alert (loc);
 
-                ACE_TRY_CHECK_EX (SECOND);
               }
 
             }
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound&)
         {
           // no location found
           //
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
 }
 
 PortableServer::POA_ptr
-TAO_LB_LoadAverage::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadAverage::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+TAO_LB_LoadAverage::init (const PortableGroup::Properties & props)
 {
   CORBA::Float tolerance = TAO_LB::LA_DEFAULT_TOLERANCE;
   CORBA::Float dampening = TAO_LB::LA_DEFAULT_DAMPENING;
@@ -387,37 +356,29 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
                           "org.omg.CosLoadBalancing.Strategy.LoadAverage.Tolerance") == 0)
         {
           this->extract_float_property (property,
-                                        tolerance
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        tolerance);
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LoadAverage.Dampening") == 0)
         {
           this->extract_float_property (property,
-                                        dampening
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        dampening);
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LoadAverage.PerBalanceLoad") == 0)
         {
           this->extract_float_property (property,
-                                        per_balance_load
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        per_balance_load);
         }
     }
 
@@ -443,12 +404,10 @@ TAO_LB_LoadAverage::init (const PortableGroup::Properties & props
 void
 TAO_LB_LoadAverage::extract_float_property (
   const PortableGroup::Property & property,
-  CORBA::Float & value
-  ACE_ENV_ARG_DECL)
+  CORBA::Float & value)
 {
   if (!(property.val >>= value))
-    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                               property.val));
+    throw PortableGroup::InvalidProperty (property.nam, property.val);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index 4af286ee527..74e2b0d4c4c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -69,49 +69,42 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// Initialize the LoadAverage instance with the given properties.
-  void init (const PortableGroup::Properties & props
-             ACE_ENV_ARG_DECL);
+  void init (const PortableGroup::Properties & props);
 
 protected:
 
@@ -127,14 +120,12 @@ protected:
   void push_loads (
       const PortableGroup::Location & the_location,
       const CosLoadBalancing::LoadList & loads,
-      CosLoadBalancing::Load & effective_load
-      ACE_ENV_ARG_DECL);
+      CosLoadBalancing::Load & effective_load);
 
   /// Utility method to extract a CORBA::Float value from the given
   /// property.
   void extract_float_property (const PortableGroup::Property & property,
-                               CORBA::Float & value
-                               ACE_ENV_ARG_DECL);
+                               CORBA::Float & value);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 10b42090791..eff1af2f793 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -72,12 +72,11 @@ TAO_LB_LoadManager::~TAO_LB_LoadManager (void)
 void
 TAO_LB_LoadManager::push_loads (
     const PortableGroup::Location & the_location,
-    const CosLoadBalancing::LoadList & loads
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & loads)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -85,15 +84,13 @@ TAO_LB_LoadManager::push_loads (
                this->load_lock_);
 
     if (this->load_map_.rebind (the_location, loads) == -1)
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
   }
 
   // Analyze loads for object groups that have members residing at the
   // given location.
   PortableGroup::ObjectGroups_var groups =
-    this->object_group_manager_.groups_at_location (the_location
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->object_group_manager_.groups_at_location (the_location);
 
   const CORBA::ULong len = groups->length ();
 
@@ -102,12 +99,10 @@ TAO_LB_LoadManager::push_loads (
       PortableGroup::ObjectGroup_ptr object_group =
         groups[i];
 
-      ACE_TRY
+      try
         {
           PortableGroup::Properties_var properties =
-            this->get_properties (object_group
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->get_properties (object_group);
 
           PortableGroup::Value value;
           CosLoadBalancing::Strategy_ptr strategy;
@@ -124,23 +119,18 @@ TAO_LB_LoadManager::push_loads (
               && !CORBA::is_nil (strategy))
             {
               strategy->analyze_loads (object_group,
-                                       this->lm_ref_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       this->lm_ref_.in ());
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore all exceptions.
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 CosLoadBalancing::LoadList *
-TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location
-                               ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -152,7 +142,6 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CosLoadBalancing::LoadList_var loads = tmp;
 
@@ -168,8 +157,7 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location
 }
 
 void
-TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location
-                                  ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
@@ -216,18 +204,15 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location
         // synchronously.  In particular, the load alert can and
         // should be performed in parallel to other tasks, such as
         // member selection.
-        load_alert->sendc_enable_alert (this->load_alert_handler_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        load_alert->sendc_enable_alert (this->load_alert_handler_.in ());
       }
     }
   else
-    ACE_THROW (CosLoadBalancing::LoadAlertNotFound ());
+    throw CosLoadBalancing::LoadAlertNotFound ();
 }
 
 void
-TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location
-                                   ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
@@ -273,26 +258,23 @@ TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location
         // synchronously.  In particular, the load alert can and
         // should be performed in parallel to other tasks, such as
         // member selection.
-        load_alert->sendc_disable_alert (this->load_alert_handler_.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        load_alert->sendc_disable_alert (this->load_alert_handler_.in ());
       }
     }
   else
-    ACE_THROW (CosLoadBalancing::LoadAlertNotFound ());
+    throw CosLoadBalancing::LoadAlertNotFound ();
 }
 
 void
 TAO_LB_LoadManager::register_load_alert (
     const PortableGroup::Location & the_location,
-    CosLoadBalancing::LoadAlert_ptr load_alert
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadAlert_ptr load_alert)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LoadAlertAlreadyPresent,
                    CosLoadBalancing::LoadAlertNotAdded))
 {
   if (CORBA::is_nil (load_alert))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
@@ -303,19 +285,18 @@ TAO_LB_LoadManager::register_load_alert (
 
   if (result == 1)
     {
-      ACE_THROW (CosLoadBalancing::LoadAlertAlreadyPresent ());
+      throw CosLoadBalancing::LoadAlertAlreadyPresent ();
     }
   else if (result == -1)
     {
       // Problems dude!
-      ACE_THROW (CosLoadBalancing::LoadAlertNotAdded ());
+      throw CosLoadBalancing::LoadAlertNotAdded ();
     }
 }
 
 CosLoadBalancing::LoadAlert_ptr
 TAO_LB_LoadManager::get_load_alert (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LoadAlertNotFound))
 {
@@ -341,8 +322,7 @@ TAO_LB_LoadManager::get_load_alert (
 
 void
 TAO_LB_LoadManager::remove_load_alert (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LoadAlertNotFound))
 {
@@ -351,28 +331,25 @@ TAO_LB_LoadManager::remove_load_alert (
   // requests should be allowed through once again since there will be
   // no way to control the load shedding mechanism once the LoadAlert
   // object is no longer under the control of the LoadManager.
-  this->disable_alert (the_location
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disable_alert (the_location);
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
   if (this->load_alert_map_.unbind (the_location) != 0)
     {
-      ACE_THROW (CosLoadBalancing::LoadAlertNotFound ());
+      throw CosLoadBalancing::LoadAlertNotFound ();
     }
 }
 
 void
 TAO_LB_LoadManager::register_load_monitor (
     const PortableGroup::Location & the_location,
-    CosLoadBalancing::LoadMonitor_ptr load_monitor
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadMonitor_ptr load_monitor)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::MonitorAlreadyPresent))
 {
   if (CORBA::is_nil (load_monitor))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   const CosLoadBalancing::LoadMonitor_var the_monitor =
     CosLoadBalancing::LoadMonitor::_duplicate (load_monitor);
@@ -406,12 +383,12 @@ TAO_LB_LoadManager::register_load_monitor (
 
           (void) this->monitor_map_.unbind (the_location);
 
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
     }
   else if (result == 1)
     {
-      ACE_THROW (CosLoadBalancing::MonitorAlreadyPresent ());
+      throw CosLoadBalancing::MonitorAlreadyPresent ();
     }
   else if (result != 0)
     {
@@ -420,14 +397,13 @@ TAO_LB_LoadManager::register_load_monitor (
                     "TAO_LB_LoadManager::register_load_monitor: "
                     "Unable to register load monitor.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 }
 
 CosLoadBalancing::LoadMonitor_ptr
 TAO_LB_LoadManager::get_load_monitor (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -449,8 +425,7 @@ TAO_LB_LoadManager::get_load_monitor (
 
 void
 TAO_LB_LoadManager::remove_load_monitor (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -459,7 +434,7 @@ TAO_LB_LoadManager::remove_load_monitor (
              this->monitor_lock_);
 
   if (this->monitor_map_.unbind (the_location) != 0)
-    ACE_THROW (CosLoadBalancing::LocationNotFound ());
+    throw CosLoadBalancing::LocationNotFound ();
 
   // If no load monitors are registered with the load balancer than
   // shutdown the "pull monitoring."
@@ -473,7 +448,7 @@ TAO_LB_LoadManager::remove_load_monitor (
                         "TAO_LB_LoadManager::remove_load_monitor: "
                         "Unable to cancel timer.\n"));
 
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       this->timer_id_ = -1;
@@ -482,117 +457,95 @@ TAO_LB_LoadManager::remove_load_monitor (
 
 void
 TAO_LB_LoadManager::set_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_props (props);
-  this->preprocess_properties (new_props
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->preprocess_properties (new_props);
 
-  this->property_manager_.set_default_properties (new_props
-                                                  ACE_ENV_ARG_PARAMETER);
+  this->property_manager_.set_default_properties (new_props);
 }
 
 PortableGroup::Properties *
-TAO_LB_LoadManager::get_default_properties (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadManager::get_default_properties ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
-    this->property_manager_.get_default_properties (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->property_manager_.get_default_properties ();
 }
 
 void
 TAO_LB_LoadManager::remove_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
-  this->property_manager_.remove_default_properties (props
-                                                     ACE_ENV_ARG_PARAMETER);
+  this->property_manager_.remove_default_properties (props);
 }
 
 void
 TAO_LB_LoadManager::set_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_overrides (overrides);
-  this->preprocess_properties (new_overrides
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->preprocess_properties (new_overrides);
 
   this->property_manager_.set_type_properties (type_id,
-                                               new_overrides
-                                               ACE_ENV_ARG_PARAMETER);
+                                               new_overrides);
 }
 
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_type_properties (
-    const char *type_id
-    ACE_ENV_ARG_DECL)
+    const char *type_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
-    this->property_manager_.get_type_properties (type_id
-                                                 ACE_ENV_ARG_PARAMETER);
+    this->property_manager_.get_type_properties (type_id);
 }
 
 void
 TAO_LB_LoadManager::remove_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_type_properties (type_id,
-                                                  props
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                  props);
 }
 
 void
 TAO_LB_LoadManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_overrides (overrides);
-  this->preprocess_properties (new_overrides
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->preprocess_properties (new_overrides);
 
   this->property_manager_.set_properties_dynamically (object_group,
-                                                      new_overrides
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      new_overrides);
 }
 
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_properties (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   return
-    this->property_manager_.get_properties (object_group
-                                            ACE_ENV_ARG_PARAMETER);
+    this->property_manager_.get_properties (object_group);
 }
 
 PortableGroup::ObjectGroup_ptr
@@ -600,8 +553,7 @@ TAO_LB_LoadManager::create_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     const char * type_id,
-    const PortableGroup::Criteria & the_criteria
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Criteria & the_criteria)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -614,16 +566,14 @@ TAO_LB_LoadManager::create_member (
     this->object_group_manager_.create_member (object_group,
                                                the_location,
                                                type_id,
-                                               the_criteria
-                                               ACE_ENV_ARG_PARAMETER);
+                                               the_criteria);
 }
 
 PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
-    CORBA::Object_ptr member
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr member)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -632,97 +582,82 @@ TAO_LB_LoadManager::add_member (
   return
     this->object_group_manager_.add_member (object_group,
                                             the_location,
-                                            member
-                                            ACE_ENV_ARG_PARAMETER);
+                                            member);
 }
 
 PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.remove_member (object_group,
-                                               the_location
-                                               ACE_ENV_ARG_PARAMETER);
+                                               the_location);
 }
 
 PortableGroup::Locations *
 TAO_LB_LoadManager::locations_of_members (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   return
-    this->object_group_manager_.locations_of_members (object_group
-                                                      ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.locations_of_members (object_group);
 }
 
 PortableGroup::ObjectGroups *
 TAO_LB_LoadManager::groups_at_location (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
-    this->object_group_manager_.groups_at_location (the_location
-                                                    ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.groups_at_location (the_location);
 }
 
 PortableGroup::ObjectGroupId
 TAO_LB_LoadManager::get_object_group_id (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   return
-    this->object_group_manager_.get_object_group_id (object_group
-                                                     ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.get_object_group_id (object_group);
 }
 
 PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::get_object_group_ref (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   return
-    this->object_group_manager_.get_object_group_ref (object_group
-                                                      ACE_ENV_ARG_PARAMETER);
+    this->object_group_manager_.get_object_group_ref (object_group);
 }
 
 PortableGroup::ObjectGroup_ptr TAO_LB_LoadManager::get_object_group_ref_from_id (
-    PortableGroup::ObjectGroupId group_id
-  ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroupId group_id)
   ACE_THROW_SPEC((
     CORBA::SystemException,
     PortableGroup::ObjectGroupNotFound))
 {
   return this->object_group_manager_.get_object_group_ref_from_id (
-    group_id
-    ACE_ENV_ARG_PARAMETER);
+    group_id);
 }
 
 CORBA::Object_ptr
 TAO_LB_LoadManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.get_member_ref (object_group,
-                                                the_location
-                                                ACE_ENV_ARG_PARAMETER);
+                                                the_location);
 }
 
 CORBA::Object_ptr
@@ -730,8 +665,7 @@ TAO_LB_LoadManager::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out
-      factory_creation_id
-    ACE_ENV_ARG_DECL)
+      factory_creation_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -739,21 +673,16 @@ TAO_LB_LoadManager::create_object (
                    PortableGroup::InvalidProperty,
                    PortableGroup::CannotMeetCriteria))
 {
-//   this->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::Object::_nil ());
+//   this->init ();
 
 
   PortableGroup::Criteria new_criteria (the_criteria);
-  this->preprocess_properties (new_criteria
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->preprocess_properties (new_criteria);
 
   CORBA::Object_ptr obj =
     this->generic_factory_.create_object (type_id,
                                           new_criteria,
-                                          factory_creation_id
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                          factory_creation_id);
 
 
   return obj;
@@ -762,8 +691,7 @@ TAO_LB_LoadManager::create_object (
 #if 0
 void
 TAO_LB_LoadManager::process_criteria (
-  const PortableGroup::Criteria & the_criteria
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Criteria & the_criteria)
 {
   // List of invalid criteria.  If this list has a length greater than
   // zero, then the PortableGroup::InvalidCriteria exception will
@@ -799,33 +727,31 @@ TAO_LB_LoadManager::process_criteria (
 
       // Unknown property
       else
-        ACE_THROW (PortableGroup::InvalidProperty (the_criteria[i].nam,
-                                                   the_criteria[i].val));
+        throw PortableGroup::InvalidProperty (
+          the_criteria[i].nam,
+          the_criteria[i].val);
     }
 
   if (invalid_criteria.length () != 0)
-    ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
+    throw PortableGroup::InvalidCriteria (invalid_criteria);
 
   if (found_factory == 0)
-    ACE_THROW (PortableGroup::NoFactory ());
+    throw PortableGroup::NoFactory ();
 }
 #endif  /* 0 */
 
 void
 TAO_LB_LoadManager::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
-      factory_creation_id
-    ACE_ENV_ARG_DECL)
+      factory_creation_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
-  this->generic_factory_.delete_object (factory_creation_id
-                                        ACE_ENV_ARG_PARAMETER);
+  this->generic_factory_.delete_object (factory_creation_id);
 }
 
 CORBA::Object_ptr
-TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
-                                 ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid)
 {
   PortableGroup::ObjectGroup_var object_group =
     this->object_group_manager_.object_group (oid);
@@ -835,9 +761,7 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
                       CORBA::Object::_nil ());
 
   PortableGroup::Properties_var properties =
-    this->get_properties (object_group.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    this->get_properties (object_group.in ());
 
   // Prefer custom load balancing strategies over built-in ones.
   PortableGroup::Value value;
@@ -853,8 +777,7 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
        && !CORBA::is_nil (strategy))
     {
       return strategy->next_member (object_group.in (),
-                                    this->lm_ref_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
+                                    this->lm_ref_.in ());
     }
 
   ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
@@ -864,8 +787,7 @@ TAO_LB_LoadManager::next_member (const PortableServer::ObjectId & oid
 void
 TAO_LB_LoadManager::init (ACE_Reactor * reactor,
                           CORBA::ORB_ptr orb,
-                          PortableServer::POA_ptr root_poa
-                          ACE_ENV_ARG_DECL)
+                          PortableServer::POA_ptr root_poa)
 {
   ACE_ASSERT (!CORBA::is_nil (orb));
   ACE_ASSERT (!CORBA::is_nil (root_poa));
@@ -886,7 +808,6 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       PortableServer::ServantManager_var member_locator = tmp;
 
@@ -895,15 +816,11 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
       // for a ServantLocator.
       PortableServer::RequestProcessingPolicy_var request =
         root_poa->create_request_processing_policy (
-          PortableServer::USE_SERVANT_MANAGER
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          PortableServer::USE_SERVANT_MANAGER);
 
       PortableServer::ServantRetentionPolicy_var retention =
         root_poa->create_servant_retention_policy (
-          PortableServer::NON_RETAIN
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          PortableServer::NON_RETAIN);
 
       // Create the PolicyList containing the policies necessary for
       // the POA to support ServantLocators.
@@ -919,8 +836,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
       // Create the child POA with the above ServantManager policies.
       // The ServantManager will be the MemberLocator.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        root_poa->the_POAManager ();
 
       // The child POA's name will consist of a string that includes
       // the current time in milliseconds in hexidecimal format (only
@@ -943,28 +859,21 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
 
       this->poa_ = root_poa->create_POA (poa_name,
                                          poa_manager.in (),
-                                         policy_list
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                         policy_list);
 
-      request->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      request->destroy ();
 
-      retention->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      retention->destroy ();
 
       // Now set the MemberLocator as the child POA's Servant
       // Manager.
-      this->poa_->set_servant_manager (member_locator.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->poa_->set_servant_manager (member_locator.in ());
 
       this->object_group_manager_.poa (this->poa_.in ());
       this->generic_factory_.poa (this->poa_.in ());
 
       // Activate the child POA.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      poa_manager->activate ();
 
       this->reactor_ = reactor;
       this->root_poa_ = PortableServer::POA::_duplicate (root_poa);
@@ -972,13 +881,10 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
 
   if (CORBA::is_nil (this->lm_ref_.in ()))
     {
-      this->lm_ref_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->lm_ref_ = this->_this ();
 
       orb->register_initial_reference ("LoadManager",
-                                       this->lm_ref_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                       this->lm_ref_.in ());
     }
 
   if (CORBA::is_nil (this->load_alert_handler_.in ()))
@@ -991,13 +897,11 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       PortableServer::ServantBase_var safe_handler = handler;
 
       this->load_alert_handler_ =
-        handler->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        handler->_this ();
     }
 
   this->built_in_balancing_strategy_info_name_.length (1);
@@ -1014,8 +918,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
 }
 
 void
-TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
-                                           ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props)
 {
   // @@ This is slow.  Optimize this code.
 
@@ -1028,8 +931,7 @@ TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
           CosLoadBalancing::CustomStrategy_ptr strategy;
           if (!(property.val >>= strategy)
               || CORBA::is_nil (strategy))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (property.nam == this->built_in_balancing_strategy_info_name_)
@@ -1042,9 +944,7 @@ TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
               // to a "Strategy" property.
 
               CosLoadBalancing::Strategy_var strategy =
-                this->make_strategy (info
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                this->make_strategy (info);
 
               if (!CORBA::is_nil (strategy.in ()))
                 {
@@ -1053,25 +953,23 @@ TAO_LB_LoadManager::preprocess_properties (PortableGroup::Properties & props
                   property.val <<= strategy.in ();
                 }
               else
-                ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                           property.val));
+                throw PortableGroup::InvalidProperty (
+                  property.nam,
+                  property.val);
             }
           else
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->built_in_balancing_strategy_name_)
         {
           // It is illegal to set the Strategy property externally.
-          ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                     property.val));
+          throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
     }
 }
 
 CosLoadBalancing::Strategy_ptr
-TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
-                                   ACE_ENV_ARG_DECL)
+TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info)
 {
   /**
    * @todo We need a strategy factory.  This is just too messy.
@@ -1091,13 +989,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
             ACE_NEW_THROW_EX (rr_servant,
                               TAO_LB_RoundRobin (this->root_poa_.in ()),
                               CORBA::NO_MEMORY ());
-            ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
             PortableServer::ServantBase_var s = rr_servant;
 
             this->round_robin_ =
-              rr_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+              rr_servant->_this ();
           }
       }
 
@@ -1118,13 +1014,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
             ACE_NEW_THROW_EX (rnd_servant,
                               TAO_LB_Random (this->root_poa_.in ()),
                               CORBA::NO_MEMORY ());
-            ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
             PortableServer::ServantBase_var s = rnd_servant;
 
             this->random_ =
-              rnd_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+              rnd_servant->_this ();
           }
       }
 
@@ -1152,13 +1046,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
                 ACE_NEW_THROW_EX (ll_servant,
                                   TAO_LB_LeastLoaded (this->root_poa_.in ()),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
                 PortableServer::ServantBase_var s = ll_servant;
 
                 this->least_loaded_ =
-                  ll_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+                  ll_servant->_this ();
               }
           }
 
@@ -1171,15 +1063,12 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
           ACE_NEW_THROW_EX (ll_servant,
                             TAO_LB_LeastLoaded (this->root_poa_.in ()),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
           PortableServer::ServantBase_var s = ll_servant;
 
-          ll_servant->init (info->props
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+          ll_servant->init (info->props);
 
-          return ll_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          return ll_servant->_this ();
         }
     }
   else if (ACE_OS::strcmp (info->name.in (), "LoadMinimum") == 0)
@@ -1199,13 +1088,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
                 ACE_NEW_THROW_EX (lm_servant,
                                   TAO_LB_LoadMinimum (this->root_poa_.in ()),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
                 PortableServer::ServantBase_var s = lm_servant;
 
                 this->load_minimum_ =
-                  lm_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+                  lm_servant->_this ();
               }
           }
 
@@ -1218,15 +1105,12 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
           ACE_NEW_THROW_EX (lm_servant,
                             TAO_LB_LoadMinimum (this->root_poa_.in ()),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
           PortableServer::ServantBase_var s = lm_servant;
 
-          lm_servant->init (info->props
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+          lm_servant->init (info->props);
 
-          return lm_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          return lm_servant->_this ();
         }
     }
   else if (ACE_OS::strcmp (info->name.in (), "LoadAverage") == 0)
@@ -1246,13 +1130,11 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
                 ACE_NEW_THROW_EX (la_servant,
                                   TAO_LB_LoadAverage (this->root_poa_.in ()),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
                 PortableServer::ServantBase_var s = la_servant;
 
                 this->load_average_ =
-                  la_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+                  la_servant->_this ();
               }
           }
 
@@ -1265,15 +1147,12 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
           ACE_NEW_THROW_EX (la_servant,
                             TAO_LB_LoadAverage (this->root_poa_.in ()),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
 
           PortableServer::ServantBase_var s = la_servant;
 
-          la_servant->init (info->props
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosLoadBalancing::Strategy::_nil ());
+          la_servant->init (info->props);
 
-          return la_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          return la_servant->_this ();
         }
     }
   return CosLoadBalancing::Strategy::_nil ();
@@ -1285,7 +1164,7 @@ TAO_LB_LoadManager::make_strategy (CosLoadBalancing::StrategyInfo * info
 // }
 
 // void
-// TAO_LB_LoadManager::deactivate_strategy (ACE_ENV_ARG_DECL)
+// TAO_LB_LoadManager::deactivate_strategy ()
 // {
 //   PortableServer::ObjectId_var oid =
 //     this->poa_->reference_to_id (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index 42ce6c006c4..22cfeb1d3e3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -53,34 +53,29 @@ public:
 
   /// For the PUSH load monitoring style.
   virtual void push_loads (const PortableGroup::Location & the_location,
-                           const CosLoadBalancing::LoadList & loads
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the raw loads at the given location.
   virtual CosLoadBalancing::LoadList * get_loads (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   /// Inform member at given location of load alert condition.
-  virtual void enable_alert (const PortableGroup::Location & the_location
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void enable_alert (const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound));
 
   /// Inform member at given location that load alert condition has
   /// passed.
-  virtual void disable_alert (const PortableGroup::Location & the_location
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void disable_alert (const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound));
 
   /// Register a LoadAlert object for the member at the given
   /// location.
   virtual void register_load_alert (
       const PortableGroup::Location & the_location,
-      CosLoadBalancing::LoadAlert_ptr load_alert
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadAlert_ptr load_alert)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LoadAlertAlreadyPresent,
                      CosLoadBalancing::LoadAlertNotAdded));
@@ -88,38 +83,33 @@ public:
   /// Retrieve the LoadAlert object for the member at the given
   /// location.
   virtual CosLoadBalancing::LoadAlert_ptr get_load_alert (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LoadAlertNotFound));
 
   /// Remove (de-register) the LoadAlert object for the member at the
   /// given location.
-  virtual void remove_load_alert (const PortableGroup::Location & the_location
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void remove_load_alert (const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LoadAlertNotFound));
 
   /// Register a load monitor with the load balancer.
   virtual void register_load_monitor (
       const PortableGroup::Location & the_location,
-      CosLoadBalancing::LoadMonitor_ptr load_monitor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadMonitor_ptr load_monitor)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::MonitorAlreadyPresent));
 
   /// Return a reference to the load monitor at the given location.
   virtual CosLoadBalancing::LoadMonitor_ptr get_load_monitor (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   /// Remove a load monitor at the given location from the load
   /// balancer.
   virtual void remove_load_monitor (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
@@ -134,21 +124,18 @@ public:
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual PortableGroup::Properties * get_default_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual PortableGroup::Properties * get_default_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -157,8 +144,7 @@ public:
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & overrides
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & overrides)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -169,15 +155,13 @@ public:
    * addition to the default properties that were not overridden.
    */
   virtual PortableGroup::Properties * get_type_properties (
-      const char * type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const char * type_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -190,8 +174,7 @@ public:
    */
   virtual void set_properties_dynamically (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Properties & overrides
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & overrides)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::InvalidProperty,
@@ -205,8 +188,7 @@ public:
    * that weren't overridden.
    */
   virtual PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -226,8 +208,7 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
       const char * type_id,
-      const PortableGroup::Criteria & the_criteria
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Criteria & the_criteria)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberAlreadyPresent,
@@ -240,8 +221,7 @@ public:
   virtual PortableGroup::ObjectGroup_ptr add_member (
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
-      CORBA::Object_ptr member
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr member)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberAlreadyPresent,
@@ -256,43 +236,37 @@ public:
    */
   virtual PortableGroup::ObjectGroup_ptr remove_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::Locations * locations_of_members (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::ObjectGroups * groups_at_location (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
   virtual PortableGroup::ObjectGroupId get_object_group_id (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// TAO specific method
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
-      PortableGroup::ObjectGroupId group_id
-      ACE_ENV_ARG_DECL)
+      PortableGroup::ObjectGroupId group_id)
     ACE_THROW_SPEC((
        CORBA::SystemException,
        PortableGroup::ObjectGroupNotFound));
@@ -301,8 +275,7 @@ public:
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & loc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & loc)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
@@ -326,8 +299,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NoFactory,
                      PortableGroup::ObjectNotCreated,
@@ -343,8 +315,7 @@ public:
    */
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectNotFound));
 
@@ -357,8 +328,7 @@ public:
    * given ObjectId.  The object group's load balancing strategy
    * will be queried for that member.
    */
-  CORBA::Object_ptr next_member (const PortableServer::ObjectId & oid
-                                 ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr next_member (const PortableServer::ObjectId & oid);
 
 public:
 
@@ -367,8 +337,7 @@ public:
   /// (i.e. for the MemberLocator).
   void init (ACE_Reactor * reactor,
              CORBA::ORB_ptr orb,
-             PortableServer::POA_ptr root_poa
-             ACE_ENV_ARG_DECL);
+             PortableServer::POA_ptr root_poa);
 
 protected:
 
@@ -406,14 +375,12 @@ private:
    * Strategy properties, and verifying that CustomStrategy references
    * are not nil.
    */
-  void preprocess_properties (PortableGroup::Properties & props
-                              ACE_ENV_ARG_DECL);
+  void preprocess_properties (PortableGroup::Properties & props);
 
   /// Create a built-in load balancing strategy and return a reference
   /// to it.
   CosLoadBalancing::Strategy_ptr make_strategy (
-    CosLoadBalancing::StrategyInfo * info
-    ACE_ENV_ARG_DECL);
+    CosLoadBalancing::StrategyInfo * info);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index b271606a0fb..ed62d396b8b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -52,14 +52,14 @@ TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void)
 }
 
 char *
-TAO_LB_LoadMinimum::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadMinimum::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LoadMinimum");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadMinimum::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
@@ -70,7 +70,6 @@ TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return props;
 }
@@ -78,31 +77,28 @@ TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_LB_LoadMinimum::push_loads (
     const PortableGroup::Location & the_location,
-    const CosLoadBalancing::LoadList & loads
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & loads)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   CosLoadBalancing::Load load;  // Unused
 
   this->push_loads (the_location,
                     loads,
-                    load
-                    ACE_ENV_ARG_PARAMETER);
+                    load);
 }
 
 void
 TAO_LB_LoadMinimum::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads,
-    CosLoadBalancing::Load & load
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::Load & load)
 {
   if (loads.length () == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // Only the first load is used by this load balancing strategy.
   const CosLoadBalancing::Load & new_load = loads[0];
@@ -117,7 +113,7 @@ TAO_LB_LoadMinimum::push_loads (
           CosLoadBalancing::Load & previous_load = entry->int_id_;
 
           if (previous_load.id != new_load.id)
-            ACE_THROW (CORBA::BAD_PARAM ());  // Somebody switched
+            throw CORBA::BAD_PARAM ();  // Somebody switched
                                               // LoadIds on us!
 
           previous_load.value =
@@ -140,7 +136,7 @@ TAO_LB_LoadMinimum::push_loads (
                             "ERROR: TAO_LB_LoadMinimum - "
                             "Unable to push loads\n"));
 
-              ACE_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
 
           load = eff_load;
@@ -155,8 +151,7 @@ TAO_LB_LoadMinimum::push_loads (
 
 CosLoadBalancing::LoadList *
 TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                               const PortableGroup::Location & the_location
-                               ACE_ENV_ARG_DECL)
+                               const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
@@ -164,15 +159,11 @@ TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
   CosLoadBalancing::LoadList_var loads =
-    load_manager->get_loads (the_location
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    load_manager->get_loads (the_location);
 
   this->push_loads (the_location,
                     loads.in (),
-                    loads[0]
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                    loads[0]);
 
   return loads._retn ();
 }
@@ -181,8 +172,7 @@ TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
 CORBA::Object_ptr
 TAO_LB_LoadMinimum::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -192,9 +182,7 @@ TAO_LB_LoadMinimum::next_member (
                       CORBA::Object::_nil ());
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (),
@@ -207,9 +195,7 @@ TAO_LB_LoadMinimum::next_member (
   CORBA::Boolean found_location =
     this->get_location (load_manager,
                         locations.in (),
-                        location
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                        location);
 
   if (found_location)
     {
@@ -220,8 +206,7 @@ TAO_LB_LoadMinimum::next_member (
 */
 
       return load_manager->get_member_ref (object_group,
-                                           location
-                                           ACE_ENV_ARG_PARAMETER);
+                                           location);
     }
   else
     {
@@ -241,28 +226,24 @@ TAO_LB_LoadMinimum::next_member (
 
       return TAO_LB_Random::_tao_next_member (object_group,
                                               load_manager,
-                                              locations.in ()
-                                              ACE_ENV_ARG_PARAMETER);
+                                              locations.in ());
     }
 }
 
 void
 TAO_LB_LoadMinimum::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     if (CORBA::is_nil (load_manager))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    load_manager->locations_of_members (object_group);
 
   if (locations->length () == 0)
-    ACE_THROW (CORBA::TRANSIENT ());
+    throw CORBA::TRANSIENT ();
 
   const CORBA::ULong len = locations->length ();
 
@@ -278,7 +259,7 @@ TAO_LB_LoadMinimum::analyze_loads (
   // the average load of all the locations
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
@@ -286,16 +267,12 @@ TAO_LB_LoadMinimum::analyze_loads (
           // LoadManager and push it to this Strategy's load
           // processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            load_manager->get_loads (loc);
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                            load);
 
           total_load.value = total_load.value + load.value;
           tmp[i] = load;
@@ -312,13 +289,11 @@ TAO_LB_LoadMinimum::analyze_loads (
           */
 
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound&)
         {
           // no location found
           //
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
   avg_load.value = total_load.value / len;
@@ -334,7 +309,7 @@ TAO_LB_LoadMinimum::analyze_loads (
   // the location where the load has to be shed.
   for (CORBA::ULong j = 0; j < len; ++j)
     {
-      ACE_TRY_EX (SECOND)
+      try
         {
           const PortableGroup::Location & loc = locations[j];
 
@@ -348,9 +323,7 @@ TAO_LB_LoadMinimum::analyze_loads (
 
           if (tmp[j].value <= avg_load.value)
             {
-              load_manager->disable_alert (loc
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (SECOND);
+              load_manager->disable_alert (loc);
             }
           else
             {
@@ -376,9 +349,7 @@ TAO_LB_LoadMinimum::analyze_loads (
 
               if (percent_diff <= TAO_LB::LM_DEFAULT_DIFF_AVERAGE_CUTOFF)
               {
-                load_manager->disable_alert (loc
-                                             ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK_EX (SECOND);
+                load_manager->disable_alert (loc);
               }
               else if ((percent_diff > TAO_LB::LM_DEFAULT_DIFF_AVERAGE_CUTOFF)
                        && (percent_diff < 1))
@@ -388,25 +359,21 @@ TAO_LB_LoadMinimum::analyze_loads (
                             "%P --- ALERTING LOCATION %u\n",
                             i));
 */
-                load_manager->enable_alert (loc
-                                            ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK_EX (SECOND);
+                load_manager->enable_alert (loc);
               }
             }
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound&)
         {
           // no location found
           //
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
 }
 
 PortableServer::POA_ptr
-TAO_LB_LoadMinimum::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadMinimum::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -415,8 +382,7 @@ CORBA::Boolean
 TAO_LB_LoadMinimum::get_location (
   CosLoadBalancing::LoadManager_ptr load_manager,
   const PortableGroup::Locations & locations,
-  PortableGroup::Location & location
-  ACE_ENV_ARG_DECL)
+  PortableGroup::Location & location)
 {
   CORBA::Float min_load = FLT_MAX;  // Start out with the largest
                                     // positive value.
@@ -431,25 +397,21 @@ TAO_LB_LoadMinimum::get_location (
   // of them.
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_TRY
+      try
         {
           const PortableGroup::Location & loc = locations[i];
 
           // Retrieve the load list for the location from the LoadManager
           // and push it to this Strategy's load processor.
           CosLoadBalancing::LoadList_var current_loads =
-            load_manager->get_loads (loc
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            load_manager->get_loads (loc);
 
           found_load = 1;
 
           CosLoadBalancing::Load load;
           this->push_loads (loc,
                             current_loads.in (),
-                            load
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                            load);
 /*
           ACE_DEBUG ((LM_DEBUG,
                       "LOC == %u"
@@ -549,13 +511,11 @@ TAO_LB_LoadMinimum::get_location (
 
           // ACE_DEBUG ((LM_DEBUG, "NEW MIN_LOAD == %f\n", min_load));
         }
-      ACE_CATCH (CosLoadBalancing::LocationNotFound, ex)
+      catch (const CosLoadBalancing::LocationNotFound&)
         {
           // No load available for the requested location.  Try the
           // next location.
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
 
 //   ACE_DEBUG ((LM_DEBUG,
@@ -582,8 +542,7 @@ TAO_LB_LoadMinimum::get_location (
 }
 
 void
-TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props)
 {
   CORBA::Float tolerance = TAO_LB::LM_DEFAULT_TOLERANCE;
   CORBA::Float dampening = TAO_LB::LM_DEFAULT_DAMPENING;
@@ -597,37 +556,29 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
                           "org.omg.CosLoadBalancing.Strategy.LoadMinimum.Tolerance") == 0)
         {
           this->extract_float_property (property,
-                                        tolerance
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        tolerance);
 
           // Valid tolerance values are greater than or equal to one.
           if (tolerance < 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LoadMinimum.Dampening") == 0)
         {
           this->extract_float_property (property,
-                                        dampening
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        dampening);
 
           // Dampening range is [0,1).
           if (dampening < 0 || dampening >= 1)
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
 
       else if (ACE_OS::strcmp (property.nam[0].id.in (),
                                "org.omg.CosLoadBalancing.Strategy.LoadMinimum.PerBalanceLoad") == 0)
         {
           this->extract_float_property (property,
-                                        per_balance_load
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        per_balance_load);
         }
     }
 
@@ -653,12 +604,10 @@ TAO_LB_LoadMinimum::init (const PortableGroup::Properties & props
 void
 TAO_LB_LoadMinimum::extract_float_property (
   const PortableGroup::Property & property,
-  CORBA::Float & value
-  ACE_ENV_ARG_DECL)
+  CORBA::Float & value)
 {
   if (!(property.val >>= value))
-    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                               property.val));
+    throw PortableGroup::InvalidProperty (property.nam, property.val);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index c979845aa0c..b2785462279 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -88,49 +88,42 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// Initialize the LoadMinimum instance with the given properties.
-  void init (const PortableGroup::Properties & props
-             ACE_ENV_ARG_DECL);
+  void init (const PortableGroup::Properties & props);
 
 protected:
 
@@ -141,8 +134,7 @@ protected:
   /// locations.
   CORBA::Boolean get_location (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Locations & locations,
-                               PortableGroup::Location & location
-                               ACE_ENV_ARG_DECL);
+                               PortableGroup::Location & location);
 
   /// Return the effective load.
   CORBA::Float effective_load (CORBA::Float previous_load,
@@ -153,14 +145,12 @@ protected:
   void push_loads (
       const PortableGroup::Location & the_location,
       const CosLoadBalancing::LoadList & loads,
-      CosLoadBalancing::Load & effective_load
-      ACE_ENV_ARG_DECL);
+      CosLoadBalancing::Load & effective_load);
 
   /// Utility method to extract a CORBA::Float value from the given
   /// property.
   void extract_float_property (const PortableGroup::Property & property,
-                               CORBA::Float & value
-                               ACE_ENV_ARG_DECL);
+                               CORBA::Float & value);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index 31c4e10977e..b213c38e90e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -22,17 +22,14 @@ TAO_LB_MemberLocator::preinvoke (
     const PortableServer::ObjectId & oid,
     PortableServer::POA_ptr /* adapter */,
     const char * /* operation */,
-    PortableServer::ServantLocator::Cookie & /* the_cookie */
-    ACE_ENV_ARG_DECL)
+    PortableServer::ServantLocator::Cookie & /* the_cookie */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  ACE_TRY
+  try
     {
       CORBA::Object_var member =
-        this->load_manager_->next_member (oid
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->load_manager_->next_member (oid);
 
 //       ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
 //       ACE_DEBUG ((LM_DEBUG,
@@ -41,22 +38,18 @@ TAO_LB_MemberLocator::preinvoke (
       ACE_ASSERT (!CORBA::is_nil (member.in ()));
       // Throw a forward exception to force the client to redirect its
       // requests to the member chosen by the LoadBalancer.
-      ACE_TRY_THROW (PortableServer::ForwardRequest (member.in ()));
+      throw PortableServer::ForwardRequest (member.in ());
     }
-  ACE_CATCH (PortableGroup::ObjectGroupNotFound, ex)
+  catch (const PortableGroup::ObjectGroupNotFound& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex,
-                             "LoadManager::next_member()");
+        ex._tao_print_exception ("LoadManager::next_member()");
     }
-  ACE_CATCH (PortableGroup::MemberNotFound, ex)
+  catch (const PortableGroup::MemberNotFound& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex,
-                             "LoadManager::next_member()");
+        ex._tao_print_exception ("LoadManager::next_member()");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
 }
@@ -67,8 +60,7 @@ TAO_LB_MemberLocator::postinvoke (
     PortableServer::POA_ptr /* adapter */,
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie /* the_cookie */,
-    PortableServer::Servant /* the_servant */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableServer::Servant /* the_servant */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
index e376937f0a5..bc395ed36f0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
@@ -61,8 +61,7 @@ public:
       const PortableServer::ObjectId & oid,
       PortableServer::POA_ptr adapter,
       const char * operation,
-      PortableServer::ServantLocator::Cookie & the_cookie
-      ACE_ENV_ARG_DECL)
+      PortableServer::ServantLocator::Cookie & the_cookie)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -72,8 +71,7 @@ public:
       PortableServer::POA_ptr adapter,
       const char * operation,
       PortableServer::ServantLocator::Cookie the_cookie,
-      PortableServer::Servant the_servant
-      ACE_ENV_ARG_DECL)
+      PortableServer::Servant the_servant)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index e7e7eeb4443..f82e4f02eb7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -26,30 +26,23 @@ TAO_LB_ORBInitializer::TAO_LB_ORBInitializer (
 
 void
 TAO_LB_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
-    info->resolve_initial_references ("LoadManager"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    info->resolve_initial_references ("LoadManager");
 
   CosLoadBalancing::LoadManager_var lm =
-    CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
-  CORBA::String_var orbid = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var orbid = info->orb_id ();
 
   PortableInterceptor::IORInterceptor_ptr tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -64,13 +57,10 @@ TAO_LB_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::IORInterceptor_var ior_interceptor = tmp;
 
-  info->add_ior_interceptor (ior_interceptor.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_ior_interceptor (ior_interceptor.in ());
 
   // ----------------
 
@@ -82,13 +72,10 @@ TAO_LB_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var sr_interceptor = sri;
 
-  info->add_server_request_interceptor (sr_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (sr_interceptor.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
index 292e36558ab..83f93618333 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
@@ -68,12 +68,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index 8898f4ff5c3..d8a7e1a58dc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -56,25 +56,21 @@ TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void)
   // No need to call CORBA::remove_ref() on this->old_orf_.  It is a
   // "_var" object, meaning that will be done automatically.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (!CORBA::is_nil (this->lm_.in ()))
     {
       const CORBA::ULong len = this->fcids_.size ();
       for (CORBA::ULong i = 0; i < len; ++i)
         {
-          ACE_TRY
+          try
             {
               // Clean up all object groups we created.
-              this->lm_->delete_object (this->fcids_[i].in ()
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->lm_->delete_object (this->fcids_[i].in ());
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               // Ignore all exceptions.
             }
-          ACE_ENDTRY;
         }
     }
 
@@ -87,8 +83,7 @@ TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void)
 CORBA::Object_ptr
 TAO_LB_ObjectReferenceFactory::make_object (
     const char * repository_id,
-    const PortableInterceptor::ObjectId & id
-    ACE_ENV_ARG_DECL)
+    const PortableInterceptor::ObjectId & id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (repository_id == 0)
@@ -96,9 +91,7 @@ TAO_LB_ObjectReferenceFactory::make_object (
 
   CORBA::Object_var obj =
     this->old_orf_->make_object (repository_id,
-                                 id
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                 id);
 
   PortableGroup::ObjectGroup_var object_group;
 
@@ -107,9 +100,7 @@ TAO_LB_ObjectReferenceFactory::make_object (
   CORBA::Boolean const found_group =
     this->find_object_group (repository_id,
                              index,
-                             object_group.out ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                             object_group.out ());
 
   if (found_group)
     {
@@ -117,48 +108,41 @@ TAO_LB_ObjectReferenceFactory::make_object (
       // subsequent object reference creation calls.
       if (!this->registered_members_[index])
         {
-          ACE_TRY
+          try
             {
               object_group =
                 this->lm_->add_member (object_group.in (),
                                        this->location_,
-                                       obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       obj.in ());
             }
-          ACE_CATCH (PortableGroup::ObjectGroupNotFound, ex)
+          catch (const PortableGroup::ObjectGroupNotFound& ex)
             {
               if (TAO_debug_level > 0)
-                ACE_PRINT_EXCEPTION (ex,
-                                     "TAO_LB_ObjectReferenceFactory::"
-                                     "make_object");
+                ex._tao_print_exception (
+                  "TAO_LB_ObjectReferenceFactory::""make_object");
 
               ACE_THROW_RETURN (CORBA::BAD_PARAM (),
                                 CORBA::Object::_nil ());
             }
-          ACE_CATCH (PortableGroup::MemberAlreadyPresent, ex)
+          catch (const PortableGroup::MemberAlreadyPresent& ex)
             {
               if (TAO_debug_level > 0)
-                ACE_PRINT_EXCEPTION (ex,
-                                     "TAO_LB_ObjectReferenceFactory::"
-                                     "make_object");
+                ex._tao_print_exception (
+                  "TAO_LB_ObjectReferenceFactory::""make_object");
 
               ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
                                 CORBA::Object::_nil ());
 
             }
-          ACE_CATCH (PortableGroup::ObjectNotAdded, ex)
+          catch (const PortableGroup::ObjectNotAdded& ex)
             {
               if (TAO_debug_level > 0)
-                ACE_PRINT_EXCEPTION (ex,
-                                     "TAO_LB_ObjectReferenceFactory::"
-                                     "make_object");
+                ex._tao_print_exception (
+                  "TAO_LB_ObjectReferenceFactory::""make_object");
 
               ACE_THROW_RETURN (CORBA::UNKNOWN (),
                                 CORBA::Object::_nil ());
             }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
           this->registered_members_[index] = 1;
         }
@@ -176,8 +160,7 @@ CORBA::Boolean
 TAO_LB_ObjectReferenceFactory::find_object_group (
   const char * repository_id,
   CORBA::ULong & index,
-  PortableGroup::ObjectGroup_out object_group
-  ACE_ENV_ARG_DECL)
+  PortableGroup::ObjectGroup_out object_group)
 {
   if (!this->load_managed_object (repository_id, index))
     return false;
@@ -207,9 +190,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
           group =
             this->lm_->create_object (repository_id,
                                       criteria,
-                                      fcid.out ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                      fcid.out ());
 
           CORBA::ULong const len = this->fcids_.size ();
           this->fcids_.size (len + 1); // Incremental growth.  Yuck!
@@ -218,9 +199,7 @@ TAO_LB_ObjectReferenceFactory::find_object_group (
       else
         {
           group =
-            this->orb_->string_to_object (this->object_groups_[index]
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            this->orb_->string_to_object (this->object_groups_[index]);
         }
 
       if (this->table_.bind (repository_id, group) != 0)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index 81fddbe05bf..a5e119164e3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -70,8 +70,7 @@ class TAO_LB_ObjectReferenceFactory
   //@{
   virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableInterceptor::ObjectId & id)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -99,8 +98,7 @@ protected:
   /// RepositoryId.
   CORBA::Boolean find_object_group (const char * repository_id,
                                     CORBA::ULong & index,
-                                    PortableGroup::ObjectGroup_out object_group
-                                    ACE_ENV_ARG_DECL);
+                                    PortableGroup::ObjectGroup_out object_group);
 
   /// Determine if object with given RepositoryId is load managed.
   CORBA::Boolean load_managed_object (const char * repository_id,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
index 5e8cdf226ec..1b01771d3b1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -38,8 +38,7 @@ TAO_LB_Pull_Handler::handle_timeout (
   if (begin == end)
     return 0;       // No work to be done.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Iterate over all registered load monitors.
       //
@@ -54,13 +53,10 @@ TAO_LB_Pull_Handler::handle_timeout (
           // LoadManager prevents nil load monitor references from
           // being registered.
           CosLoadBalancing::LoadList_var load_list =
-            monitor->loads (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            monitor->loads ();
 
           this->load_manager_->push_loads (location,
-                                           load_list.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                           load_list.in ());
 
 //           ACE_DEBUG ((LM_DEBUG,
 //                       "LOCATION = %s\tLOAD = %f\n",
@@ -68,15 +64,13 @@ TAO_LB_Pull_Handler::handle_timeout (
 //                       load_list[0].value));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       // Catch the exception and ignore it.
 
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "(%P|%t) PullHandler::handle_timeout()\n");
+        ex._tao_print_exception ("(%P|%t) PullHandler::handle_timeout()\n");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index 56c39655f2d..ac8b15a1dcd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -28,14 +28,14 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa)
 }
 
 char *
-TAO_LB_Random::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_Random::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Random");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_Random::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_Random::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
@@ -46,7 +46,6 @@ TAO_LB_Random::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (props);
 
   return props;
 }
@@ -54,33 +53,29 @@ TAO_LB_Random::get_properties (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_LB_Random::push_loads (
     const PortableGroup::Location & /* the_location */,
-    const CosLoadBalancing::LoadList & /* loads */
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & /* loads */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::StrategyNotAdaptive))
 {
-  ACE_THROW (CosLoadBalancing::StrategyNotAdaptive ());
+  throw CosLoadBalancing::StrategyNotAdaptive ();
 }
 
 CosLoadBalancing::LoadList *
 TAO_LB_Random::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                          const PortableGroup::Location & the_location
-                          ACE_ENV_ARG_DECL)
+                          const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
-  return load_manager->get_loads (the_location
-                                  ACE_ENV_ARG_PARAMETER);
+  return load_manager->get_loads (the_location);
 }
 
 CORBA::Object_ptr
 TAO_LB_Random::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -89,27 +84,23 @@ TAO_LB_Random::next_member (
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::Object::_nil ());
 
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    load_manager->locations_of_members (object_group);
 
   return TAO_LB_Random::_tao_next_member (object_group,
                                           load_manager,
-                                          locations.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+                                          locations.in ());
 }
 
 void
 TAO_LB_Random::analyze_loads (
     PortableGroup::ObjectGroup_ptr /* object_group */,
-    CosLoadBalancing::LoadManager_ptr /* load_manager */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CosLoadBalancing::LoadManager_ptr /* load_manager */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 PortableServer::POA_ptr
-TAO_LB_Random::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_Random::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -118,8 +109,7 @@ CORBA::Object_ptr
 TAO_LB_Random::_tao_next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager,
-    const PortableGroup::Locations & locations
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Locations & locations)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -162,8 +152,7 @@ TAO_LB_Random::_tao_next_member (
 //               locations[i][0].id.in ()));
 
   return load_manager->get_member_ref (object_group,
-                                       locations[i]
-                                       ACE_ENV_ARG_PARAMETER);
+                                       locations[i]);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index af5bea2b038..a1ffe3ee89c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -50,45 +50,39 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::StrategyNotAdaptive));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// TAO-specific underlying implementation of this Random load
@@ -96,8 +90,7 @@ public:
   static CORBA::Object_ptr _tao_next_member (
       PortableGroup::ObjectGroup_ptr object_group,
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Locations & locations
-      ACE_ENV_ARG_DECL)
+      const PortableGroup::Locations & locations)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index ab865f8020e..09a69aaaf26 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -25,14 +25,14 @@ TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void)
 }
 
 char *
-TAO_LB_RoundRobin::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_RoundRobin::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("RoundRobin");
 }
 
 CosLoadBalancing::Properties *
-TAO_LB_RoundRobin::get_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LB_RoundRobin::get_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // There are no RoundRobin properties.  Return an empty property
@@ -46,7 +46,6 @@ TAO_LB_RoundRobin::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (props);
 
   return props;
 }
@@ -54,33 +53,29 @@ TAO_LB_RoundRobin::get_properties (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_LB_RoundRobin::push_loads (
     const PortableGroup::Location & /* the_location */,
-    const CosLoadBalancing::LoadList & /* loads */
-    ACE_ENV_ARG_DECL)
+    const CosLoadBalancing::LoadList & /* loads */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::StrategyNotAdaptive))
 {
-  ACE_THROW (CosLoadBalancing::StrategyNotAdaptive ());
+  throw CosLoadBalancing::StrategyNotAdaptive ();
 }
 
 CosLoadBalancing::LoadList *
 TAO_LB_RoundRobin::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
-                              const PortableGroup::Location & the_location
-                              ACE_ENV_ARG_DECL)
+                              const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
 
-  return load_manager->get_loads (the_location
-                                  ACE_ENV_ARG_PARAMETER);
+  return load_manager->get_loads (the_location);
 }
 
 CORBA::Object_ptr
 TAO_LB_RoundRobin::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    CosLoadBalancing::LoadManager_ptr load_manager
-    ACE_ENV_ARG_DECL)
+    CosLoadBalancing::LoadManager_ptr load_manager)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -89,9 +84,7 @@ TAO_LB_RoundRobin::next_member (
     ACE_THROW_RETURN (CORBA::BAD_PARAM (), CORBA::Object::_nil ());
 
   const PortableGroup::ObjectGroupId id =
-    load_manager->get_object_group_id (object_group
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    load_manager->get_object_group_id (object_group);
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     monitor,
@@ -104,9 +97,7 @@ TAO_LB_RoundRobin::next_member (
   //
   // There is a race condition here.  The
   PortableGroup::Locations_var locations =
-    load_manager->locations_of_members (object_group
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    load_manager->locations_of_members (object_group);
 
   const CORBA::ULong len = locations->length ();
 
@@ -126,9 +117,7 @@ TAO_LB_RoundRobin::next_member (
       // collocated.
       CORBA::Object_var member =
         load_manager->get_member_ref (object_group,
-                                      locations[i]
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                      locations[i]);
 
       // Increment index to point to next location.
       i++;
@@ -149,21 +138,19 @@ TAO_LB_RoundRobin::next_member (
     ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Object::_nil ());
 
   return load_manager->get_member_ref (object_group,
-                                       locations[index]
-                                       ACE_ENV_ARG_PARAMETER);
+                                       locations[index]);
 }
 
 void
 TAO_LB_RoundRobin::analyze_loads (
     PortableGroup::ObjectGroup_ptr /* object_group */,
-    CosLoadBalancing::LoadManager_ptr /* load_manager */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CosLoadBalancing::LoadManager_ptr /* load_manager */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 PortableServer::POA_ptr
-TAO_LB_RoundRobin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_RoundRobin::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index a96a1120223..aecac8a987b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -51,45 +51,39 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosLoadBalancing::Properties * get_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Properties * get_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosLoadBalancing::LoadList & loads)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::StrategyNotAdaptive));
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosLoadBalancing::LocationNotFound));
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CosLoadBalancing::LoadManager_ptr load_manager)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 10bb3303a39..4feb2474cac 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -23,29 +23,27 @@ TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void)
 }
 
 char *
-TAO_LB_ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ServerRequestInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor");
 }
 
 void
-TAO_LB_ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_ServerRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   if (this->load_alert_.alerted ())
     {
-      CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::String_var op = ri->operation ();
 
       if (ACE_OS::strcmp (op.in (), "_get_loads") == 0        // LoadMonitor
           || ACE_OS::strcmp (op.in (), "disable_alert") == 0  // LoadAlert
@@ -53,12 +51,10 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
         return;  // Do not redirect.
 
 #if 0
-      ACE_TRY
+      try
         {
           IOP::ServiceContext_var service_context =
-            ri->get_request_service_context (CosLoadBalancing::LOAD_MANAGED
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            ri->get_request_service_context (CosLoadBalancing::LOAD_MANAGED);
 
           /*
           // Use TAO-specific "compiled marshaling" instead of
@@ -71,25 +67,25 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
 
           CORBA::Boolean byte_order;
           if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-            ACE_TRY_THROW (CORBA::BAD_PARAM ());
+            throw CORBA::BAD_PARAM ();
 
           cdr.reset_byte_order (static_cast<int> (byte_order));
 
           CORBA::Object_var object_group;
           if (cdr >> object_group.out ())
-            ACE_TRY_THROW (PortableInterceptor::ForwardRequest (object_group.in (),
+            throw PortableInterceptor::ForwardRequest (object_group.in (,
                                                             0));
           else
-            ACE_TRY_THROW (CORBA::BAD_PARAM ());
+            throw CORBA::BAD_PARAM ();
           */
 
           // A ServiceContext of the given ServiceId exists.  This
           // means that the target is load balanced.  Force the client
           // to try another profile since this location is currently
           // overloaded.
-          ACE_TRY_THROW (CORBA::TRANSIENT ());
+          throw CORBA::TRANSIENT ();
         }
-      ACE_CATCH (CORBA::BAD_PARAM, ex)
+      catch (const CORBA::BAD_PARAM& ex)
         {
           // No CosLoadBalancing::LB_GROUP_REF ServiceContext.  This
           // probably means that the target object is not
@@ -106,25 +102,22 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
           // Make sure we get a CORBA::BAD_PARAM for the right
           // reason.
           if (ex.minor () != (CORBA::OMGVMCID | 26))
-            ACE_RE_THROW;
+            throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
 #else
       // Force the client to try another profile since this location
       // is currently overloaded.
       //
       // NOTE: This applies to both load balanced and non-load
       // balanced targets.
-      ACE_THROW (CORBA::TRANSIENT ());
+      throw CORBA::TRANSIENT ();
 #endif  /* 0 */
     }
 }
 
 void
 TAO_LB_ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -132,16 +125,14 @@ TAO_LB_ServerRequestInterceptor::receive_request (
 
 void
 TAO_LB_ServerRequestInterceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ServerRequestInterceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -158,8 +149,7 @@ TAO_LB_ServerRequestInterceptor::send_exception (
 
 void
 TAO_LB_ServerRequestInterceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -169,8 +159,7 @@ TAO_LB_ServerRequestInterceptor::send_other (
       // LoadAlert object that its member is overloaded, for example.
 
       const PortableInterceptor::ReplyStatus status =
-        ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->reply_status ();
 
       if (status == PortableInterceptor::LOCATION_FORWARD)
         ACE_DEBUG ((LM_INFO,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index a3a94008a27..5cd2591ffeb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -63,38 +63,33 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index b8704fe0988..e05a6f943da 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -17,33 +17,23 @@ TAO_BasicLogFactory_i::~TAO_BasicLogFactory_i (void)
 
 DsLogAdmin::BasicLogFactory_ptr
 TAO_BasicLogFactory_i::activate (CORBA::ORB_ptr orb,
-                                 PortableServer::POA_ptr poa
-                                 ACE_ENV_ARG_DECL)
+                                 PortableServer::POA_ptr poa)
 {
-  TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
+  TAO_LogMgr_i::init (orb, poa);
 
 
   PortableServer::ObjectId_var oid =
-    this->factory_poa_->activate_object (this
-					 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
+    this->factory_poa_->activate_object (this);
 
   CORBA::Object_var obj =
-    this->factory_poa_->id_to_reference (oid.in ()
-					 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
+    this->factory_poa_->id_to_reference (oid.in ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
+    DsLogAdmin::LogMgr::_narrow (obj.in ());
 
   DsLogAdmin::BasicLogFactory_var v_return =
-    DsLogAdmin::BasicLogFactory::_narrow (obj.in ()
-					  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
+    DsLogAdmin::BasicLogFactory::_narrow (obj.in ());
 
   return v_return._retn ();
 }
@@ -51,8 +41,7 @@ TAO_BasicLogFactory_i::activate (CORBA::ORB_ptr orb,
 DsLogAdmin::BasicLog_ptr
 TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
                                CORBA::ULongLong max_size,
-                               DsLogAdmin::LogId_out id_out
-                               ACE_ENV_ARG_DECL)
+                               DsLogAdmin::LogId_out id_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidLogFullAction
                    ))
@@ -60,19 +49,15 @@ TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
   this->create_i (full_action,
 		  max_size,
 		  0,
-		  id_out
-		  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
+		  id_out);
   DsLogAdmin::LogId id = id_out;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
+    this->create_log_object (id);
 #endif
 
   // narrow to BasicLog
@@ -85,8 +70,7 @@ TAO_BasicLogFactory_i::create (DsLogAdmin::LogFullActionType full_action,
 DsLogAdmin::BasicLog_ptr
 TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
                                        DsLogAdmin::LogFullActionType full_action,
-                                       CORBA::ULongLong max_size
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ULongLong max_size)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    DsLogAdmin::LogIdAlreadyExists,
@@ -96,18 +80,14 @@ TAO_BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
   this->create_with_id_i (id,
 			  full_action,
 			  max_size,
-			  0
-			  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
+			  0);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
+    this->create_log_object (id);
 #endif
 
   // narrow to BasicLog
@@ -124,8 +104,7 @@ TAO_BasicLogFactory_i::create_repositoryid ()
 }
 
 PortableServer::ServantBase*
-TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id
-					   ACE_ENV_ARG_DECL)
+TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 {
   TAO_BasicLog_i* basic_log_i;
 
@@ -136,10 +115,8 @@ TAO_BasicLogFactory_i::create_log_servant (DsLogAdmin::LogId id
                                     this->log_mgr_.in (),
                                     id),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
-  basic_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  basic_log_i->init ();
 
   return basic_log_i;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index f6cc8f4113a..b7341463161 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -61,16 +61,14 @@ public:
   /// Activate this servant with the ORB and POA passed in.
   DsLogAdmin::BasicLogFactory_ptr
     activate (CORBA::ORB_ptr orb,
-              PortableServer::POA_ptr poa
-              ACE_ENV_ARG_DECL);
+              PortableServer::POA_ptr poa);
 
   /// Allows clients to create new BasicLog objects.
   /// Raises DsLogAdmin::InvalidThreshold.
   DsLogAdmin::BasicLog_ptr
     create (DsLogAdmin::LogFullActionType full_action,
             CORBA::ULongLong max_size,
-            DsLogAdmin::LogId_out id
-            ACE_ENV_ARG_DECL)
+            DsLogAdmin::LogId_out id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidLogFullAction
                      ));
@@ -79,8 +77,7 @@ public:
   DsLogAdmin::BasicLog_ptr
     create_with_id (DsLogAdmin::LogId id,
                     DsLogAdmin::LogFullActionType full_action,
-                    CORBA::ULongLong max_size
-                    ACE_ENV_ARG_DECL)
+                    CORBA::ULongLong max_size)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      DsLogAdmin::LogIdAlreadyExists,
@@ -90,10 +87,9 @@ public:
 protected:
   virtual CORBA::RepositoryId
     create_repositoryid ();
-	
+
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL);
+    create_log_servant (DsLogAdmin::LogId id);
 
   /// Our object ref. after <active>ation.
   DsLogAdmin::LogMgr_var        log_mgr_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index fa4c1f0af22..8073177c807 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -25,69 +25,52 @@ TAO_BasicLog_i::~TAO_BasicLog_i (void)
 }
 
 DsLogAdmin::Log_ptr
-TAO_BasicLog_i::copy (DsLogAdmin::LogId &id
-                  ACE_ENV_ARG_DECL)
+TAO_BasicLog_i::copy (DsLogAdmin::LogId &id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::BasicLogFactory_var basicLogFactory =
-    DsLogAdmin::BasicLogFactory::_narrow (factory_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    DsLogAdmin::BasicLogFactory::_narrow (factory_.in ());
 
   DsLogAdmin::BasicLog_var log =
-    basicLogFactory->create (DsLogAdmin::halt, 0, id
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    basicLogFactory->create (DsLogAdmin::halt, 0, id);
 
 
   // Copy the attributes from the log.
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 
 }
 
 DsLogAdmin::Log_ptr
-TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::BasicLogFactory_var basicLogFactory =
-    DsLogAdmin::BasicLogFactory::_narrow (factory_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    DsLogAdmin::BasicLogFactory::_narrow (factory_.in ());
 
   DsLogAdmin::BasicLog_var log =
-    basicLogFactory->create_with_id (id, DsLogAdmin::halt, 0
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    basicLogFactory->create_with_id (id, DsLogAdmin::halt, 0);
 
   // Copy the attributes from the log.
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 
 }
 
 void
-TAO_BasicLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_BasicLog_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove ourselves from the list of logs.
-  this->logmgr_i_.remove (this->logid_
-			  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->logmgr_i_.remove (this->logid_);
 
   // Deregister with POA.
   PortableServer::ObjectId_var id =
-    this->poa_->servant_to_id (this
-			       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->servant_to_id (this);
 
-  this->poa_->deactivate_object (id.in ()
-				 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->deactivate_object (id.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index e1a51484192..59ce4c92c4e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -62,17 +62,15 @@ public:
                   DsLogAdmin::LogId id);
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id
-                                    ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id
-                                            ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy the log object and all contained records.
-  void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index 5e005ee70c6..feff0864efc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log)
 : log_ (log)
-{  
+{
 }
 
 TAO_Event_LogConsumer::~TAO_Event_LogConsumer (void)
@@ -27,7 +27,7 @@ TAO_Event_LogConsumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer
 }
 
 void
-TAO_Event_LogConsumer::push (const CORBA::Any& data ACE_ENV_ARG_DECL)
+TAO_Event_LogConsumer::push (const CORBA::Any& data)
 ACE_THROW_SPEC ((
                 CORBA::SystemException,
                 CosEventComm::Disconnected
@@ -63,38 +63,36 @@ ACE_THROW_SPEC ((
   //
   // I have submitted a defect report to the OMG for clarification.
   //    --jtc
-  ACE_TRY 
+  try
     {
       // log the RecordList.
-      this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->log_->write_recordlist (recList);
     }
-  ACE_CATCH (DsLogAdmin::LogFull, ex)
+  catch (const DsLogAdmin::LogFull& )
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
-  ACE_CATCH (DsLogAdmin::LogOffDuty, ex)
+  catch (const DsLogAdmin::LogOffDuty& )
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
-  ACE_CATCH (DsLogAdmin::LogLocked, ex)
+  catch (const DsLogAdmin::LogLocked& )
     {
-      ACE_THROW (CORBA::NO_PERMISSION ());
+      throw CORBA::NO_PERMISSION ();
     }
-  ACE_CATCH (DsLogAdmin::LogDisabled, ex)
+  catch (const DsLogAdmin::LogDisabled& )
     {
-      ACE_THROW (CORBA::TRANSIENT ());
+      throw CORBA::TRANSIENT ();
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_Event_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Event_LogConsumer::disconnect_push_consumer (void)
         ACE_THROW_SPEC ((
                 CORBA::SystemException
         ))
 {
-  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
index fac7eb9bbb9..abc9657d016 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -71,14 +71,14 @@ public:
 private:
 
   /// Disconnect from EventLog.
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((
             CORBA::SystemException
     ));
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
-  void push (const CORBA::Any& data ACE_ENV_ARG_DECL)
+  void push (const CORBA::Any& data)
     ACE_THROW_SPEC ((
             CORBA::SystemException,
             CosEventComm::Disconnected
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index 901af607cc1..f216c345308 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -14,31 +14,25 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void)
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::POA_var defPOA =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_default_POA ();
 
       TAO_CEC_EventChannel_Attributes attr (defPOA.in (), defPOA.in ());
 
       ACE_NEW_THROW_EX (impl,
                         TAO_CEC_EventChannel (attr),
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
 
-      impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      impl->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in "
-                           "EventLogFactory_i constructor.");
+      ex._tao_print_exception (
+        "Caught exception in "
+        "EventLogFactory_i constructor.");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 TAO_EventLogFactory_i::~TAO_EventLogFactory_i (void)
@@ -47,8 +41,7 @@ TAO_EventLogFactory_i::~TAO_EventLogFactory_i (void)
 }
 
 CosEventChannelAdmin::EventChannel_ptr
-TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */
-                             ACE_ENV_ARG_DECL)
+TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
 
@@ -57,65 +50,47 @@ TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */
   auto_ptr <TAO_CEC_EventChannel> ec (impl);
 
   PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (ec.get ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::EventChannel::_nil ());
+    this->poa_->activate_object (ec.get ());
 
   ec.release ();
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::EventChannel::_nil ());
+    this->poa_->id_to_reference (oid.in ());
 
   ec_return =
-    CosEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosEventChannelAdmin::EventChannel::_nil ());
+    CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
 
   return ec_return._retn ();
 }
 
 DsEventLogAdmin::EventLogFactory_ptr
 TAO_EventLogFactory_i::activate (CORBA::ORB_ptr orb,
-                                 PortableServer::POA_ptr poa
-                                 ACE_ENV_ARG_DECL)
+                                 PortableServer::POA_ptr poa)
 {
-  TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
+  TAO_LogMgr_i::init (orb, poa);
 
 
-  this->event_channel_ = init (this->poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
+  this->event_channel_ = init (this->poa_.in ());
 
   this->consumer_admin_ =
-    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
+    this->event_channel_->for_consumers ();
 
   ACE_NEW_THROW_EX (this->notifier_,
                     TAO_EventLogNotification(this->event_channel_.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
 
   PortableServer::ObjectId_var oid =
-    this->factory_poa_->activate_object (this
-					 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
+    this->factory_poa_->activate_object (this);
 
   CORBA::Object_var obj =
-    this->factory_poa_->id_to_reference (oid.in ()
-					 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
+    this->factory_poa_->id_to_reference (oid.in ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
+    DsLogAdmin::LogMgr::_narrow (obj.in ());
 
   DsEventLogAdmin::EventLogFactory_var v_return =
-    DsEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLogFactory::_nil ());
+    DsEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
   return v_return._retn ();
 }
@@ -125,8 +100,7 @@ TAO_EventLogFactory_i::create (
     DsLogAdmin::LogFullActionType full_action,
     CORBA::ULongLong max_size,
     const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
-    DsLogAdmin::LogId_out id_out
-    ACE_ENV_ARG_DECL)
+    DsLogAdmin::LogId_out id_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidLogFullAction,
                    DsLogAdmin::InvalidThreshold))
@@ -134,19 +108,15 @@ TAO_EventLogFactory_i::create (
   this->create_i (full_action,
 		  max_size,
 		  & thresholds,
-		  id_out
-		  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
+		  id_out);
   DsLogAdmin::LogId id = id_out;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
+    this->create_log_object (id);
 #endif
 
   // narrow to EventLog
@@ -154,8 +124,7 @@ TAO_EventLogFactory_i::create (
     DsEventLogAdmin::EventLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
+  notifier_->object_creation (id);
 
   return event_log._retn();
 }
@@ -165,8 +134,7 @@ TAO_EventLogFactory_i::create_with_id (
     DsLogAdmin::LogId id,
     DsLogAdmin::LogFullActionType full_action,
     CORBA::ULongLong max_size,
-    const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-    ACE_ENV_ARG_DECL)
+    const DsLogAdmin::CapacityAlarmThresholdList & thresholds)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogIdAlreadyExists,
                    DsLogAdmin::InvalidLogFullAction,
@@ -175,18 +143,14 @@ TAO_EventLogFactory_i::create_with_id (
   this->create_with_id_i (id,
 			  full_action,
 			  max_size,
-			  & thresholds
-			  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
+			  & thresholds);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
+    this->create_log_object (id);
 #endif
 
   // narrow to EventLog
@@ -194,8 +158,7 @@ TAO_EventLogFactory_i::create_with_id (
     DsEventLogAdmin::EventLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsEventLogAdmin::EventLog::_nil ());
+  notifier_->object_creation (id);
 
   return event_log._retn ();
 }
@@ -207,8 +170,7 @@ TAO_EventLogFactory_i::create_repositoryid ()
 }
 
 PortableServer::ServantBase*
-TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id
-					   ACE_ENV_ARG_DECL)
+TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 {
   TAO_EventLog_i* event_log_i;
 
@@ -222,32 +184,29 @@ TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id
                                     id
                                     ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
-  event_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  event_log_i->init ();
 
   //dhanvey
   //initialise the LogConsumer object
-  event_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  event_log_i->activate ();
 
   return event_log_i;
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_EventLogFactory_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLogFactory_i::obtain_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->obtain_push_supplier ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_EventLogFactory_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLogFactory_i::obtain_pull_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
-  return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->obtain_pull_supplier ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
index ea8e6e5c63f..3d4250a454d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -65,14 +65,12 @@ public:
   /// Initialise the EventChannel and obtain a
   /// pointer to it.
   CosEventChannelAdmin::EventChannel_ptr
-    init (PortableServer::POA_ptr poa
-              ACE_ENV_ARG_DECL);
+    init (PortableServer::POA_ptr poa);
 
   /// Activate this servant with the ORB and POA passed in.
   DsEventLogAdmin::EventLogFactory_ptr
     activate (CORBA::ORB_ptr orb,
-              PortableServer::POA_ptr poa
-              ACE_ENV_ARG_DECL);
+              PortableServer::POA_ptr poa);
 
   /// Used to create an EventLog.
   DsEventLogAdmin::EventLog_ptr create (
@@ -80,7 +78,6 @@ public:
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -94,7 +91,6 @@ public:
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -105,14 +101,12 @@ public:
 
   // = Implementation of the CosEventChannelAdmin::ConsumerAdmin methods.
   CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -121,10 +115,9 @@ public:
 protected:
   virtual CORBA::RepositoryId
     create_repositoryid ();
-	
+
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL);
+    create_log_servant (DsLogAdmin::LogId id);
 
   /// Our object ref. after <active>ation.
   DsLogAdmin::LogMgr_var log_mgr_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 130274497d7..1941a26221d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -21,16 +21,16 @@ TAO_EventLogNotification::~TAO_EventLogNotification (void)
 }
 
 void
-TAO_EventLogNotification::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLogNotification::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_->disconnect_push_consumer ();
 }
 
 void
 TAO_EventLogNotification::obtain_proxy_consumer()
-{  
-  CosEventChannelAdmin::SupplierAdmin_var supplier_admin = 
+{
+  CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
     event_channel_->for_suppliers ();
 
   consumer_ = supplier_admin->obtain_push_consumer ();
@@ -42,11 +42,10 @@ TAO_EventLogNotification::obtain_proxy_consumer()
 }
 
 void
-TAO_EventLogNotification::send_notification (const CORBA::Any& any 
-                                             ACE_ENV_ARG_DECL)
+TAO_EventLogNotification::send_notification (const CORBA::Any& any)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  consumer_->push (any ACE_ENV_ARG_PARAMETER);
+  consumer_->push (any);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index 88306c2eac7..c76eb44ca2c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -56,7 +56,7 @@ public:
   ~TAO_EventLogNotification (void);
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -67,7 +67,7 @@ protected:
   void obtain_proxy_consumer ();
 
   /// Send the event on the event channel.
-  virtual void send_notification (const CORBA::Any& any ACE_ENV_ARG_DECL)
+  virtual void send_notification (const CORBA::Any& any)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index 6c6853cf891..09c2e907049 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -20,10 +20,9 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb,
     poa_(PortableServer::POA::_duplicate(poa)),
     log_poa_(PortableServer::POA::_duplicate(log_poa))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Create an instance of the event channel.
-  TAO_CEC_EventChannel_Attributes attr (this->poa_.in(), 
+  TAO_CEC_EventChannel_Attributes attr (this->poa_.in(),
 					this->poa_.in());
 
   ACE_NEW_THROW_EX (this->event_channel_,
@@ -40,44 +39,34 @@ TAO_EventLog_i::~TAO_EventLog_i ()
 
 
 DsLogAdmin::Log_ptr
-TAO_EventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+TAO_EventLog_i::copy (DsLogAdmin::LogId &id)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the log.
   DsEventLogAdmin::EventLogFactory_var eventLogFactory =
-    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
 
   DsEventLogAdmin::EventLog_var log =
-    eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_, id);
 
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 
 }
 
 DsLogAdmin::Log_ptr
-TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the log supplying the log id.
   DsEventLogAdmin::EventLogFactory_var eventLogFactory =
-    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    DsEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
 
   DsEventLogAdmin::EventLog_var log =
-    eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_);
 
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 
@@ -85,55 +74,46 @@ ACE_THROW_SPEC ((CORBA::SystemException))
 
 
 void
-TAO_EventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLog_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Send event to indicate the log has been deleted.
-  notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  notifier_->object_deletion (logid_);
 
   // Remove ourselves from the list of logs.
-  this->logmgr_i_.remove (this->logid_
-			  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->logmgr_i_.remove (this->logid_);
 
   // Deregister with POA.
   PortableServer::ObjectId_var id =
-    this->log_poa_->servant_to_id (this
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->log_poa_->servant_to_id (this);
 
-  this->log_poa_->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->log_poa_->deactivate_object (id.in ());
 }
 
 void
-TAO_EventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLog_i::activate (void)
 {
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-  this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->for_consumers ();
 
   // Create the PushConsumer that will log the events.
   this->my_log_consumer_ = new TAO_Event_LogConsumer (this);
-  ACE_CHECK;
   this->my_log_consumer_->connect (consumer_admin.in ());
 }
 
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_EventLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLog_i::for_consumers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->for_consumers ();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_EventLog_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EventLog_i::for_suppliers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->for_suppliers ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index 545591ad31a..2a9d40090e1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -71,33 +71,31 @@ public:
                   DsLogAdmin::LogId id);
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id
-                                    ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id
-                                            ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy the log object and all contained records.
   void
-  destroy (ACE_ENV_SINGLE_ARG_DECL)
+  destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Activate the EventLog.
   void
-  activate (ACE_ENV_SINGLE_ARG_DECL);
+  activate (void);
 
   // = The CosEventChannelAdmin::EventChannel interface methods.
   CosEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+  for_consumers (void)
         ACE_THROW_SPEC ((
                 CORBA::SystemException
         ));
 
   CosEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  for_suppliers (void)
         ACE_THROW_SPEC ((
                 CORBA::SystemException
         ));
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
index 0cf09c84c7b..b907563ad65 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -36,8 +36,7 @@ TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i (void)
 
 DsLogAdmin::RecordList*
 TAO_Hash_Iterator_i::get (CORBA::ULong position,
-                          CORBA::ULong how_many
-                          ACE_ENV_ARG_DECL)
+                          CORBA::ULong how_many)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
@@ -45,7 +44,6 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   if (position < current_position_)
     {
@@ -58,9 +56,7 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
     }
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Log_Constraint_Interpreter interpreter (constraint_.in ());
 
   // Sequentially iterate over all the records and pick the ones that
   // meet the constraints.
@@ -70,7 +66,6 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
   ACE_NEW_THROW_EX (rec_list,
                     DsLogAdmin::RecordList (how_many),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
   rec_list->length (how_many);
 
   CORBA::ULong count = 0;
@@ -101,8 +96,7 @@ TAO_Hash_Iterator_i::get (CORBA::ULong position,
   if (count == 0 && this->iter_ == this->iter_end_)
     {
       // destroy this object..
-      this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (rec_list);
+      this->destroy ();
     }
 
   return rec_list;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
index 245eb9c98cd..8e95a97d085 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.h
@@ -61,8 +61,7 @@ public:
 
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
-                                       CORBA::ULong how_many
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ULong how_many)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam));
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index aa90c47cea0..1d0e8609fda 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -93,32 +93,31 @@ TAO_Hash_LogRecordStore::close (void)
 }
 
 CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_current_size (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::get_current_size (void)
 {
   return this->current_size_;
 }
 
 CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_n_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::get_n_records (void)
 {
   return this->num_records_;
 }
 
 CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_gauge (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::get_gauge (void)
 {
   return this->gauge_;
 }
 
 void
-TAO_Hash_LogRecordStore::reset_gauge (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::reset_gauge (void)
 {
   this->gauge_ = 0;
 }
 
 int
-TAO_Hash_LogRecordStore::log (const DsLogAdmin::LogRecord &const_rec
-            ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::log (const DsLogAdmin::LogRecord &const_rec)
 {
   // Get log record size...
   size_t record_size = log_record_size (const_rec);
@@ -163,16 +162,14 @@ TAO_Hash_LogRecordStore::log (const DsLogAdmin::LogRecord &const_rec
 
 int
 TAO_Hash_LogRecordStore::retrieve_i (DsLogAdmin::RecordId id,
-				     DsLogAdmin::LogRecord &rec
-				     ACE_ENV_ARG_DECL)
+				     DsLogAdmin::LogRecord &rec)
 {
   int retval = rec_map_.find (id, rec);
   return retval;
 }
 
 int
-TAO_Hash_LogRecordStore::update_i (DsLogAdmin::LogRecord &rec
-				   ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::update_i (DsLogAdmin::LogRecord &rec)
 {
   DsLogAdmin::LogRecord oldrec;
 
@@ -196,8 +193,7 @@ TAO_Hash_LogRecordStore::update_i (DsLogAdmin::LogRecord &rec
 }
 
 int
-TAO_Hash_LogRecordStore::remove_i (DsLogAdmin::RecordId id
-				   ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::remove_i (DsLogAdmin::RecordId id)
 {
   DsLogAdmin::LogRecord rec;
   if (rec_map_.unbind (id, rec) != 0)
@@ -212,8 +208,7 @@ TAO_Hash_LogRecordStore::remove_i (DsLogAdmin::RecordId id
 }
 
 void
-TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter
-				   ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter)
 {
   size_t size = log_record_size(iter->item ());
 
@@ -224,7 +219,7 @@ TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter
 }
 
 int
-TAO_Hash_LogRecordStore::purge_old_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::purge_old_records (void)
 {
   CORBA::ULongLong num_records_to_purge = this->num_records_ * 5U / 100U;
 
@@ -254,8 +249,7 @@ TAO_Hash_LogRecordStore::purge_old_records (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Hash_LogRecordStore::set_record_attribute (DsLogAdmin::RecordId id,
                 const DsLogAdmin::NVList
-                &attr_list
-                ACE_ENV_ARG_DECL)
+                &attr_list)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId,
                    DsLogAdmin::InvalidAttribute))
@@ -263,16 +257,16 @@ TAO_Hash_LogRecordStore::set_record_attribute (DsLogAdmin::RecordId id,
   // TODO: validate attributes here.
 
   DsLogAdmin::LogRecord rec;
-  if (this->retrieve_i (id, rec ACE_ENV_ARG_PARAMETER) == -1)
+  if (this->retrieve_i (id, rec) == -1)
     {
-      ACE_THROW (DsLogAdmin::InvalidRecordId ());
+      throw DsLogAdmin::InvalidRecordId ();
     }
 
   rec.attr_list = attr_list;
 
-  if (this->update_i (rec ACE_ENV_ARG_PARAMETER) == -1)
+  if (this->update_i (rec) == -1)
     {
-      ACE_THROW (CORBA::PERSIST_STORE ());
+      throw CORBA::PERSIST_STORE ();
     }
 }
 
@@ -281,21 +275,18 @@ TAO_Hash_LogRecordStore::set_records_attribute (
   const char *grammar,
   const char *constraint,
   const DsLogAdmin::NVList
-  &attr_list ACE_ENV_ARG_DECL)
+  &attr_list)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint,
                    DsLogAdmin::InvalidAttribute))
 {
-  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_grammar (grammar);
 
   // TODO: validate attributes here.
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Log_Constraint_Interpreter interpreter (constraint);
 
   // Create iterators
   LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -320,15 +311,13 @@ TAO_Hash_LogRecordStore::set_records_attribute (
 }
 
 DsLogAdmin::NVList*
-TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id
-                             ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId))
 {
   DsLogAdmin::LogRecord rec;
 
-  int retval = this->retrieve_i (id, rec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  int retval = this->retrieve_i (id, rec);
 
   if (retval == -1)
     {
@@ -340,14 +329,13 @@ TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id
   ACE_NEW_THROW_EX (nvlist,
                     DsLogAdmin::NVList (rec.attr_list),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return nvlist;
 }
 
 
 int
-TAO_Hash_LogRecordStore::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Hash_LogRecordStore::flush (void)
 {
   return 0;
 }
@@ -378,15 +366,12 @@ TAO_Hash_LogRecordStore::log_record_size (const DsLogAdmin::LogRecord &rec)
 DsLogAdmin::RecordList*
 TAO_Hash_LogRecordStore::query_i (const char *constraint,
                                   DsLogAdmin::Iterator_out &iter_out,
-                                  CORBA::ULong how_many
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::ULong how_many)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidConstraint))
 {
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Log_Constraint_Interpreter interpreter (constraint);
 
   // Sequentially iterate over all the records and pick the ones that
   // meet the constraints.
@@ -396,7 +381,6 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint,
   ACE_NEW_THROW_EX (rec_list,
                     DsLogAdmin::RecordList (how_many),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
   rec_list->length(how_many);
 
   // Create iterators
@@ -448,7 +432,6 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint,
                                              constraint,
                                              this->max_rec_list_len_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (rec_list);
 
       // Transfer ownership to the POA.
       PortableServer::ServantBase_var safe_iter_query = iter_query;
@@ -469,26 +452,22 @@ TAO_Hash_LogRecordStore::query_i (const char *constraint,
 DsLogAdmin::RecordList*
 TAO_Hash_LogRecordStore::query (const char *grammar,
                                 const char *constraint,
-                                DsLogAdmin::Iterator_out iter_out
-                                ACE_ENV_ARG_DECL)
+                                DsLogAdmin::Iterator_out iter_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_grammar (grammar);
 
   return this->query_i (constraint,
                         iter_out,
-                        this->max_rec_list_len_
-                        ACE_ENV_ARG_PARAMETER);
+                        this->max_rec_list_len_);
 }
 
 DsLogAdmin::RecordList*
 TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time,
                                    CORBA::Long how_many,
-                                   DsLogAdmin::Iterator_out iter_out
-                                   ACE_ENV_ARG_DECL)
+                                   DsLogAdmin::Iterator_out iter_out)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Decide between forward vs backward retrieval.
@@ -515,25 +494,20 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time,
 
   return this->query_i (constraint,
                         iter_out,
-                        how_many
-                        ACE_ENV_ARG_PARAMETER);
+                        how_many);
 }
 
 CORBA::ULong
 TAO_Hash_LogRecordStore::match (const char* grammar,
-				const char *constraint
-				ACE_ENV_ARG_DECL)
+				const char *constraint)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_grammar (grammar);
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Log_Constraint_Interpreter interpreter (constraint);
 
   // Create iterators
   LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -558,19 +532,15 @@ TAO_Hash_LogRecordStore::match (const char* grammar,
 
 CORBA::ULong
 TAO_Hash_LogRecordStore::delete_records (const char *grammar,
-					 const char *constraint
-                                         ACE_ENV_ARG_DECL)
+					 const char *constraint)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_grammar (grammar);
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Log_Constraint_Interpreter interpreter (constraint);
 
   // Create iterators
   LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -599,8 +569,7 @@ TAO_Hash_LogRecordStore::delete_records (const char *grammar,
 }
 
 CORBA::ULong
-TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
-                                               ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &ids)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong count (0);
@@ -617,7 +586,7 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i
 }
 
 CORBA::ULong
-TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::remove_old_records (void)
 {
   if (this->max_record_life_ == 0) {
     return 0;
@@ -637,9 +606,7 @@ TAO_Hash_LogRecordStore::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
   ACE_OS::sprintf (out, "time < %.0f", temp1);
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (out
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Log_Constraint_Interpreter interpreter (out);
 
   // Create iterators
   LOG_RECORD_STORE_ITER iter (rec_map_.begin ());
@@ -675,8 +642,7 @@ TAO_Hash_LogRecordStore::lock()
 
 
 void
-TAO_Hash_LogRecordStore::check_grammar (const char* grammar
-                                        ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::check_grammar (const char* grammar)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar))
 {
@@ -684,39 +650,36 @@ TAO_Hash_LogRecordStore::check_grammar (const char* grammar
   if (ACE_OS::strcmp (grammar, "TCL") != 0 &&
       ACE_OS::strcmp (grammar, "ETCL") != 0 &&
       ACE_OS::strcmp (grammar, "EXTENDED_TCL") != 0)
-    ACE_THROW (DsLogAdmin::InvalidGrammar ());
+    throw DsLogAdmin::InvalidGrammar ();
 }
 
 
 DsLogAdmin::AdministrativeState
-TAO_Hash_LogRecordStore::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_administrative_state (void) const
 {
   return this->admin_state_;
 }
 
 void
-TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeState state
-                                                   ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeState state)
 {
   this->admin_state_ = state;
 }
 
 
 DsLogAdmin::CapacityAlarmThresholdList*
-TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (void) const
 {
   DsLogAdmin::CapacityAlarmThresholdList* ret_val;
   ACE_NEW_THROW_EX (ret_val,
                     DsLogAdmin::CapacityAlarmThresholdList (this->thresholds_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return ret_val;
 }
 
 void
-TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds
-                                                        ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds)
 {
   this->thresholds_ = thresholds;
 }
@@ -724,105 +687,96 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci
 
 
 DsLogAdmin::ForwardingState
-TAO_Hash_LogRecordStore::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_forwarding_state (void) const
 {
   return this->forward_state_;
 }
 
 void
-TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state
-                                               ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state)
 {
   this->forward_state_ = state;
 }
 
 DsLogAdmin::TimeInterval
-TAO_Hash_LogRecordStore::get_interval (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_interval (void) const
 {
   return this->interval_;
 }
 
 void
-TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval
-                                       ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval)
 {
   this->interval_ = interval;
 }
 
 
 DsLogAdmin::LogFullActionType
-TAO_Hash_LogRecordStore::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_log_full_action (void) const
 {
   return this->log_full_action_;
 }
 
 void
-TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType action
-                                              ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType action)
 {
   this->log_full_action_ = action;
 }
 
 DsLogAdmin::QoSList *
-TAO_Hash_LogRecordStore::get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_log_qos (void) const
 {
   DsLogAdmin::QoSList* ret_val = 0;
   ACE_NEW_THROW_EX (ret_val,
                     DsLogAdmin::QoSList (this->log_qos_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return ret_val;
 }
 
 void
-TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos
-              ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos)
 {
   this->log_qos_ = qos;
 }
 
 CORBA::ULong
-TAO_Hash_LogRecordStore::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_max_record_life (void) const
 {
   return this->max_record_life_;
 }
 
 void
-TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life
-                                              ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life)
 {
   this->max_record_life_ = max_record_life;
 }
 
 CORBA::ULongLong
-TAO_Hash_LogRecordStore::get_max_size (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Hash_LogRecordStore::get_max_size (void) const
 {
   return this->max_size_;
 }
 
 void
-TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size
-                                       ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size)
 {
   this->max_size_ = size;
 }
 
 DsLogAdmin::WeekMask*
-TAO_Hash_LogRecordStore::get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogRecordStore::get_week_mask (void)
 {
   DsLogAdmin::WeekMask* ret_val = 0;
   ACE_NEW_THROW_EX (ret_val,
                     DsLogAdmin::WeekMask (this->weekmask_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return ret_val;
 }
 
 void
-TAO_Hash_LogRecordStore::set_week_mask (const DsLogAdmin::WeekMask &masks
-          ACE_ENV_ARG_DECL)
+TAO_Hash_LogRecordStore::set_week_mask (const DsLogAdmin::WeekMask &masks)
 {
   this->weekmask_ = masks;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
index d4518fd3825..23711349255 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
@@ -87,107 +87,98 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
 
   /// Gets the administrative state of the log
   virtual DsLogAdmin::AdministrativeState
-    get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const;
+    get_administrative_state (void) const;
 
   /// Sets the administrative state of the log
   virtual void
-    set_administrative_state (DsLogAdmin::AdministrativeState
-                              ACE_ENV_ARG_DECL);
+    set_administrative_state (DsLogAdmin::AdministrativeState);
 
   /// Get the capacity alarm thresholds
   virtual DsLogAdmin::CapacityAlarmThresholdList*
-    get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const;
+    get_capacity_alarm_thresholds (void) const;
 
   /// Set the capacity alarm thresholds
   virtual void
-    set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds
-                                   ACE_ENV_ARG_DECL);
+    set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds);
 
   /// Gets the forwarding state
   virtual DsLogAdmin::ForwardingState
-    get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const;
+    get_forwarding_state (void) const;
 
   /// Sets the forwarding state
   virtual void
-    set_forwarding_state (DsLogAdmin::ForwardingState state
-                          ACE_ENV_ARG_DECL);
+    set_forwarding_state (DsLogAdmin::ForwardingState state);
 
   /// Get the log duration
   virtual DsLogAdmin::TimeInterval
-    get_interval (ACE_ENV_SINGLE_ARG_DECL) const;
+    get_interval (void) const;
 
   /// Set the log duration.
   virtual void
-    set_interval (const DsLogAdmin::TimeInterval & interval
-                  ACE_ENV_ARG_DECL);
+    set_interval (const DsLogAdmin::TimeInterval & interval);
 
   /// Gets the log full action
   virtual DsLogAdmin::LogFullActionType
-    get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const;
+    get_log_full_action (void) const;
 
   /// Sets the log full action
   virtual void
-    set_log_full_action(DsLogAdmin::LogFullActionType action
-                        ACE_ENV_ARG_DECL);
+    set_log_full_action(DsLogAdmin::LogFullActionType action);
 
   /// Get the list of the QoS properties supported by the log.
   virtual DsLogAdmin::QoSList*
-    get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const;
+    get_log_qos (void) const;
 
   /// Set the list of the QoS properties supported by the log.
   virtual void
-    set_log_qos (const DsLogAdmin::QoSList& qos
-		 ACE_ENV_ARG_DECL);
+    set_log_qos (const DsLogAdmin::QoSList& qos);
 
   /// Gets the max record life
   virtual CORBA::ULong
-    get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const;
+    get_max_record_life (void) const;
 
   /// Sets the max record life
   virtual void
-    set_max_record_life (CORBA::ULong life
-                         ACE_ENV_ARG_DECL);
+    set_max_record_life (CORBA::ULong life);
 
   /// Get the current set value of the max size of the log data.
   virtual CORBA::ULongLong
-    get_max_size (ACE_ENV_SINGLE_ARG_DECL) const;
+    get_max_size (void) const;
 
   /// Set the max size of log data. size == 0, => infinite.
   virtual void
-    set_max_size (CORBA::ULongLong size
-                  ACE_ENV_ARG_DECL);
-  
+    set_max_size (CORBA::ULongLong size);
+
   /// Get the weekly scheduling parameters
   virtual DsLogAdmin::WeekMask*
-    get_week_mask (ACE_ENV_SINGLE_ARG_DECL);
-  
+    get_week_mask (void);
+
   /// Set the weekly scheduling parameters.
   virtual void
-    set_week_mask (const DsLogAdmin::WeekMask & masks
-		   ACE_ENV_ARG_DECL);
-  
+    set_week_mask (const DsLogAdmin::WeekMask & masks);
+
 
   // = LogRecordStore status methods
 
   /// Gets the current size of the log data.
   virtual CORBA::ULongLong
-    get_current_size (ACE_ENV_SINGLE_ARG_DECL);
+    get_current_size (void);
 
   /// Get the number of records in the log right now.
   virtual CORBA::ULongLong
-    get_n_records (ACE_ENV_SINGLE_ARG_DECL);
+    get_n_records (void);
 
 
   // = LogRecordStore gauge
- 
+
   /// Gets the current value of the "gauge" that measures the total
   /// size of the records written to the log.
   virtual CORBA::ULongLong
-    get_gauge(ACE_ENV_SINGLE_ARG_DECL);
+    get_gauge(void);
 
   /// Resets the "gauge" to 0
   virtual void
-    reset_gauge(ACE_ENV_SINGLE_ARG_DECL);
+    reset_gauge(void);
 
 
   // = Record logging, retrieval, update and removal methods.
@@ -195,17 +186,16 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   /// Insert rec into storage. Returns 0 on success -1 on failure and 1
   /// if the log is full.
   virtual int
-    log (const DsLogAdmin::LogRecord &rec ACE_ENV_ARG_DECL);
+    log (const DsLogAdmin::LogRecord &rec);
 
   /// Deletes "old" records from the store.
   virtual int
-    purge_old_records (ACE_ENV_SINGLE_ARG_DECL);
+    purge_old_records (void);
 
   /// Set single record attributes.
   virtual void
     set_record_attribute (DsLogAdmin::RecordId id,
-			  const DsLogAdmin::NVList & attr_list
-			  ACE_ENV_ARG_DECL)
+			  const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId,
                      DsLogAdmin::InvalidAttribute));
@@ -215,8 +205,7 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   virtual CORBA::ULong
     set_records_attribute (const char * grammar,
 			   const char * c,
-			   const DsLogAdmin::NVList & attr_list
-			   ACE_ENV_ARG_DECL)
+			   const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -225,23 +214,21 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   /// Get the attributes of the record with id <id>. Raises
   /// DsLogAdmin::InvalidRecordId
   virtual DsLogAdmin::NVList*
-    get_record_attribute (DsLogAdmin::RecordId id
-			  ACE_ENV_ARG_DECL)
+    get_record_attribute (DsLogAdmin::RecordId id)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     DsLogAdmin::InvalidRecordId));
 
   /// Ensure changes have been flushed to persistent media
   /// Returns 0 on success, -1 on failure.
   virtual int
-    flush (ACE_ENV_SINGLE_ARG_DECL);
+    flush (void);
 
   /// Returns all records in the log that match the given constraint
   /// <c>.
   virtual DsLogAdmin::RecordList*
     query (const char * grammar,
            const char * c,
-           DsLogAdmin::Iterator_out i
-           ACE_ENV_ARG_DECL)
+           DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -251,15 +238,13 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   virtual DsLogAdmin::RecordList*
     retrieve (DsLogAdmin::TimeT from_time,
               CORBA::Long how_many,
-              DsLogAdmin::Iterator_out i
-              ACE_ENV_ARG_DECL)
+              DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the number of records matching constraint <c>.
   virtual CORBA::ULong
     match (const char * grammar,
-           const char * c
-           ACE_ENV_ARG_DECL)
+           const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -267,21 +252,19 @@ class TAO_Log_Serv_Export TAO_Hash_LogRecordStore
   /// Delete records matching constraint <c>.
   virtual CORBA::ULong
     delete_records (const char * grammar,
-                    const char * c
-                    ACE_ENV_ARG_DECL)
+                    const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
 
   /// Delete records matching ids in <ids>
   virtual CORBA::ULong
-    delete_records_by_id (const DsLogAdmin::RecordIdList & ids
-                          ACE_ENV_ARG_DECL)
+    delete_records_by_id (const DsLogAdmin::RecordIdList & ids)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong
-    remove_old_records (ACE_ENV_SINGLE_ARG_DECL);
-  
+    remove_old_records (void);
+
   /// Read-Write Lock
   virtual ACE_SYNCH_RW_MUTEX& lock();
 
@@ -299,31 +282,26 @@ protected:
   /// Set rec to the pointer to the LogRecord with the given
   /// id. Returns 0 on success, -1 on failure.
   int retrieve_i (DsLogAdmin::RecordId id,
-		  DsLogAdmin::LogRecord &rec
-		  ACE_ENV_ARG_DECL);
+		  DsLogAdmin::LogRecord &rec);
 
   /// Update into storage. Returns 0 on success -1 on failure.
-  int update_i (DsLogAdmin::LogRecord &rec
-		ACE_ENV_ARG_DECL);
+  int update_i (DsLogAdmin::LogRecord &rec);
 
   /// Remove the record with id <id> from the LogRecordStore.
   /// Returns 0 on success, -1 on failure.
-  int remove_i (DsLogAdmin::RecordId id
-		ACE_ENV_ARG_DECL);
-	
+  int remove_i (DsLogAdmin::RecordId id);
+
   /// Remove the record from the LogRecordStore.
-  void remove_i (LOG_RECORD_STORE_ITER iter
-		 ACE_ENV_ARG_DECL);
+  void remove_i (LOG_RECORD_STORE_ITER iter);
 
   DsLogAdmin::RecordList* query_i (const char *constraint,
                                    DsLogAdmin::Iterator_out &iter_out,
-                                   CORBA::ULong how_many
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::ULong how_many)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidConstraint));
 
   /// Throws DsLogAdmin::InvalidGrammar if we don't support this grammar.
-  void check_grammar (const char* grammar ACE_ENV_ARG_DECL)
+  void check_grammar (const char* grammar)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar));
 
@@ -384,7 +362,7 @@ protected:
 
   /// The days of the week that the log should be operational
   DsLogAdmin::WeekMask			weekmask_;
-  
+
 
   ACE_Reactor*                          reactor_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
index 458cfca4155..a947a10e3d0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -22,7 +22,7 @@ TAO_Hash_LogStore::~TAO_Hash_LogStore()
 
 
 DsLogAdmin::LogList*
-TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogStore::list_logs (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -31,7 +31,6 @@ TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL)
                            guard,
                            lock_,
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   DsLogAdmin::LogList* list;
 
@@ -42,7 +41,6 @@ TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (list,
                     DsLogAdmin::LogList (len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   list->length (len);
 
@@ -56,15 +54,14 @@ TAO_Hash_LogStore::list_logs (ACE_ENV_SINGLE_ARG_DECL)
     {
       iter.next (hash_entry);
       iter.advance ();
-      (*list)[i] = logmgr_i_->create_log_reference (static_cast<DsLogAdmin::LogId> (hash_entry->ext_id_)
-						    ACE_ENV_ARG_PARAMETER);
+      (*list)[i] = logmgr_i_->create_log_reference (static_cast<DsLogAdmin::LogId> (hash_entry->ext_id_));
     }
 
   return list;
 }
 
 DsLogAdmin::LogIdList*
-TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_LogStore::list_logs_by_id (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -73,7 +70,6 @@ TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
                            guard,
                            lock_,
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   DsLogAdmin::LogIdList* list;
 
@@ -84,7 +80,6 @@ TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (list,
                     DsLogAdmin::LogIdList (len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   list->length (len);
 
@@ -106,8 +101,7 @@ TAO_Hash_LogStore::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
 
 
 DsLogAdmin::Log_ptr
-TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id
-                        ACE_ENV_ARG_DECL)
+TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -116,7 +110,6 @@ TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id
                            guard,
                            lock_,
                            CORBA::INTERNAL ());
-  ACE_CHECK (DsLogAdmin::Log::_nil ());
 
   if (hash_map_.find (id) != 0)
     {
@@ -124,41 +117,37 @@ TAO_Hash_LogStore::find_log (DsLogAdmin::LogId id
     }
   else
     {
-      return logmgr_i_->create_log_reference (id ACE_ENV_ARG_PARAMETER);
+      return logmgr_i_->create_log_reference (id);
     }
 }
 
 
 bool
-TAO_Hash_LogStore::exists (DsLogAdmin::LogId id
-			   ACE_ENV_ARG_DECL)
+TAO_Hash_LogStore::exists (DsLogAdmin::LogId id)
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            lock_,
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (false);
 
   return (this->hash_map_.find (id) == 0);
 }
 
 
 int
-TAO_Hash_LogStore::remove (DsLogAdmin::LogId id
-			   ACE_ENV_ARG_DECL)
+TAO_Hash_LogStore::remove (DsLogAdmin::LogId id)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                             guard,
                             lock_,
                             CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (-1);
 
   TAO_Hash_LogRecordStore* recordstore;
 
   int retval = this->hash_map_.unbind (id, recordstore);
-  if (retval == 0) 
+  if (retval == 0)
     {
-      delete recordstore; 
+      delete recordstore;
     }
 
   return retval;
@@ -169,14 +158,12 @@ void
 TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action,
                                       CORBA::ULongLong max_size,
                                       const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-                                      DsLogAdmin::LogId_out id_out
-                                      ACE_ENV_ARG_DECL)
+                                      DsLogAdmin::LogId_out id_out)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                             guard,
                             lock_,
                             CORBA::INTERNAL ());
-  ACE_CHECK;
 
   DsLogAdmin::LogId id;
 
@@ -193,13 +180,12 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action,
                                              thresholds
                                              ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
 
   if (this->hash_map_.bind (id, recordstore.get ()) != 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   recordstore.release ();
@@ -210,18 +196,16 @@ void
 TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
                                                DsLogAdmin::LogFullActionType full_action,
                                                CORBA::ULongLong max_size,
-                                               const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-                                               ACE_ENV_ARG_DECL)
+                                               const DsLogAdmin::CapacityAlarmThresholdList* thresholds)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                             guard,
                             lock_,
                             CORBA::INTERNAL ());
-  ACE_CHECK;
 
   if (this->hash_map_.find (id) == 0)
     {
-      ACE_THROW (DsLogAdmin::LogIdAlreadyExists ());
+      throw DsLogAdmin::LogIdAlreadyExists ();
     }
 
   TAO_Hash_LogRecordStore* impl = 0;
@@ -233,13 +217,12 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
                                              thresholds
                                              ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl);
 
   if (this->hash_map_.bind (id, recordstore.get ()) != 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   recordstore.release ();
@@ -247,14 +230,12 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id,
 
 
 TAO_LogRecordStore*
-TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id
-                                         ACE_ENV_ARG_DECL)
+TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id)
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            lock_,
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   TAO_Hash_LogRecordStore* recordstore = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
index 7c43c34a8a7..b33057fd5a1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.h
@@ -53,47 +53,44 @@ public:
 
   /// Lists all logs created by the log factory.
   virtual DsLogAdmin::LogList *
-    list_logs (ACE_ENV_SINGLE_ARG_DECL)
+    list_logs (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// Lists all log ids.
   virtual DsLogAdmin::LogIdList *
-    list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+    list_logs_by_id (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// Returns a reference to the log with the supplied id.
   virtual DsLogAdmin::Log_ptr
-    find_log (DsLogAdmin::LogId id
-              ACE_ENV_ARG_DECL)
+    find_log (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// Returns true if log exists, otherwise false
-  virtual bool exists (DsLogAdmin::LogId id ACE_ENV_ARG_DECL);
+  virtual bool exists (DsLogAdmin::LogId id);
 
   /// Remove the given entry from the hash table.
-  virtual int remove (DsLogAdmin::LogId id ACE_ENV_ARG_DECL);
+  virtual int remove (DsLogAdmin::LogId id);
 
   /// @brief Create log
   virtual void
     create (DsLogAdmin::LogFullActionType full_action,
             CORBA::ULongLong max_size,
             const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-            DsLogAdmin::LogId_out id_out
-            ACE_ENV_ARG_DECL);
+            DsLogAdmin::LogId_out id_out);
 
   /// @brief Create log
   virtual void
     create_with_id (DsLogAdmin::LogId id,
                     DsLogAdmin::LogFullActionType full_action,
                     CORBA::ULongLong max_size,
-                    const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-                    ACE_ENV_ARG_DECL);
+                    const DsLogAdmin::CapacityAlarmThresholdList* thresholds);
 
   /// @brief Get log record store
   ///
@@ -102,8 +99,7 @@ public:
   /// @param id log id
   ///
   virtual TAO_LogRecordStore*
-    get_log_record_store (DsLogAdmin::LogId id
-                          ACE_ENV_ARG_DECL);
+    get_log_record_store (DsLogAdmin::LogId id);
 
 private:
   ACE_SYNCH_RW_MUTEX	lock_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 139e85e262c..0fff26d0bbd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -16,9 +16,9 @@ TAO_Iterator_i::TAO_Iterator_i (PortableServer::POA_ptr poa,
   : poa_ (PortableServer::POA::_duplicate (poa)),
     reactor_ (reactor)
 {
-   if (this->timeout_ != ACE_Time_Value::zero) 
+   if (this->timeout_ != ACE_Time_Value::zero)
      {
-       this->timer_id_ = 
+       this->timer_id_ =
          this->reactor_->schedule_timer (this, 0, this->timeout_);
      }
 }
@@ -29,24 +29,21 @@ TAO_Iterator_i::~TAO_Iterator_i (void)
   // cancel timer
   if (this->timer_id_ != -1)
     {
-      this->reactor_->cancel_timer (this->timer_id_); 
+      this->reactor_->cancel_timer (this->timer_id_);
     }
 }
 
 
 void
-TAO_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Iterator_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->servant_to_id (this);
 
   // Goodbye cruel world...
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->deactivate_object (oid.in ());
   return;
 }
 
@@ -54,15 +51,13 @@ TAO_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 int
 TAO_Iterator_i::handle_timeout(const ACE_Time_Value&, const void*)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 84042063697..ec4dd4dd8d4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -43,7 +43,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief Iterator to get LogRecords for the log via a query.
  */
-class TAO_Log_Serv_Export TAO_Iterator_i 
+class TAO_Log_Serv_Export TAO_Iterator_i
   : public virtual POA_DsLogAdmin::Iterator,
     public ACE_Event_Handler
 {
@@ -59,13 +59,12 @@ public:
 
   /// Gets a list of LogRecords.
   virtual DsLogAdmin::RecordList* get (CORBA::ULong position,
-				       CORBA::ULong how_many
-				       ACE_ENV_ARG_DECL)
+				       CORBA::ULong how_many)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam))			= 0;
 
   /// This destroys the iterator.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -77,10 +76,10 @@ protected:
 
   /// Timeout
   static ACE_Time_Value timeout_;
-  
+
   /// Timer ID
   long timer_id_;
-  
+
   virtual int handle_timeout (const ACE_Time_Value&, const void *);
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
index a5f60cf3c05..388450253a2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -20,8 +20,7 @@ TAO_LogActivator::~TAO_LogActivator ()
 
 PortableServer::Servant
 TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid,
-			     PortableServer::POA_ptr
-			     ACE_ENV_ARG_DECL)
+			     PortableServer::POA_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableServer::ForwardRequest
 		   ))
@@ -30,11 +29,10 @@ TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid,
 
   DsLogAdmin::LogId id = ACE_OS::strtoul(poa_id.in (), 0, 0);
 
-  if (!logmgr_i_.exists(id ACE_ENV_ARG_PARAMETER))
+  if (!logmgr_i_.exists(id))
     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-  ACE_CHECK_RETURN(0);
 
-  return logmgr_i_.create_log_servant (id ACE_ENV_ARG_PARAMETER);
+  return logmgr_i_.create_log_servant (id);
 }
 
 
@@ -43,8 +41,7 @@ TAO_LogActivator::etherealize (const PortableServer::ObjectId&,
 			       PortableServer::POA_ptr,
 			       PortableServer::Servant servant,
 			       CORBA::Boolean,
-			       CORBA::Boolean remaining_activations
-			       ACE_ENV_ARG_DECL_NOT_USED)
+			       CORBA::Boolean remaining_activations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!remaining_activations)
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
index d39364a5661..35bcaca5f22 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
@@ -49,8 +49,7 @@ public:
   virtual ~TAO_LogActivator();
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId& oid,
-					     PortableServer::POA_ptr poa
-					     ACE_ENV_ARG_DECL)
+					     PortableServer::POA_ptr poa)
     ACE_THROW_SPEC ((
 		     CORBA::SystemException,
 		     PortableServer::ForwardRequest
@@ -60,8 +59,7 @@ public:
 			    PortableServer::POA_ptr poa,
 			    PortableServer::Servant servant,
 			    CORBA::Boolean cleanup_in_progress,
-			    CORBA::Boolean remaining_activations
-			    ACE_ENV_ARG_DECL)
+			    CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((
 		     CORBA::SystemException
 		     ));
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 199e5154fa8..182eb38d929 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -27,15 +27,13 @@ TAO_LogMgr_i::~TAO_LogMgr_i ()
 
 void
 TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
-		    PortableServer::POA_ptr poa
-		    ACE_ENV_ARG_DECL)
+		    PortableServer::POA_ptr poa)
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
   this->poa_ = PortableServer::POA::_duplicate (poa);
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->the_POAManager ();
 
   {
     TAO::Utils::PolicyList_Destroyer policies(1);
@@ -43,15 +41,11 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
     // Create Factory POA
     policies.length (1);
     policies[0] =
-      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-					  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
     this->factory_poa_ = this->poa_->create_POA ("factory_POA",
 						 poa_manager.in (),
-						 policies
-						 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+						 policies);
   }
 
 
@@ -61,33 +55,23 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
     // Create Log POA
     policies.length (2);
     policies[0] =
-      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-					  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
     policies[1] =
-      this->poa_->create_id_assignment_policy (PortableServer::USER_ID
-					       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
     policies.length(4);
     policies[2] =
-      this->poa_->create_servant_retention_policy (PortableServer::RETAIN
-						   ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->poa_->create_servant_retention_policy (PortableServer::RETAIN);
 
     policies[3] =
-      this->poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-						    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 #endif
 
     this->log_poa_ = this->factory_poa_->create_POA ("log_POA",
 						     poa_manager.in (),
-						     policies
-						     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+						     policies);
   }
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
@@ -97,9 +81,7 @@ TAO_LogMgr_i::init (CORBA::ORB_ptr orb,
 		    TAO_LogActivator (*this),
 		    CORBA::NO_MEMORY ());
 
-  this->log_poa_->set_servant_manager(servant_activator
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->log_poa_->set_servant_manager(servant_activator);
 #endif
 
   // Load Log Strategy
@@ -128,8 +110,7 @@ TAO_LogMgr_i::create_objectid (DsLogAdmin::LogId id)
 }
 
 DsLogAdmin::Log_ptr
-TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id
-				    ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id)
 {
   PortableServer::ObjectId_var oid =
     this->create_objectid (id);
@@ -138,28 +119,23 @@ TAO_LogMgr_i::create_log_reference (DsLogAdmin::LogId id
 
   CORBA::Object_var obj =
     this->log_poa_->create_reference_with_id (oid.in (),
-                intf.in ()
-					      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+                intf.in ());
 
   // Use _unchecked_narrow() because this may be called from a servant
   // activator's incarnate() method.  A plain _narrow() will result in
   // infinate recursion.
   DsLogAdmin::Log_var log =
-    DsLogAdmin::Log::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    DsLogAdmin::Log::_unchecked_narrow (obj.in ());
 
   return log._retn();
 }
 
 DsLogAdmin::Log_ptr
-TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id
-				 ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id)
 {
   PortableServer::ServantBase* servant = 0;
 
-  servant = create_log_servant (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  servant = create_log_servant (id);
 
   PortableServer::ServantBase_var safe_servant = servant;
   // Transfer ownership to the POA.
@@ -169,79 +145,72 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id
 
   // Register with the poa
   this->log_poa_->activate_object_with_id (oid.in (),
-					   servant
-					   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+					   servant);
 
-  return create_log_reference (id ACE_ENV_ARG_PARAMETER);
+  return create_log_reference (id);
 }
 
 DsLogAdmin::LogList*
-TAO_LogMgr_i::list_logs (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LogMgr_i::list_logs (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->logstore_->list_logs (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->logstore_->list_logs ();
 }
 
 
 DsLogAdmin::LogIdList*
-TAO_LogMgr_i::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_LogMgr_i::list_logs_by_id (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->logstore_->list_logs_by_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->logstore_->list_logs_by_id ();
 }
 
 
 DsLogAdmin::Log_ptr
-TAO_LogMgr_i::find_log (DsLogAdmin::LogId id
-                        ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::find_log (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->logstore_->find_log (id ACE_ENV_ARG_PARAMETER);
+  return this->logstore_->find_log (id);
 }
 
 
 TAO_LogRecordStore*
-TAO_LogMgr_i::get_log_record_store (DsLogAdmin::LogId id
-				    ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::get_log_record_store (DsLogAdmin::LogId id)
 {
-  return this->logstore_->get_log_record_store (id ACE_ENV_ARG_PARAMETER);
+  return this->logstore_->get_log_record_store (id);
 }
 
 
 bool
-TAO_LogMgr_i::exists (DsLogAdmin::LogId id
-		      ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::exists (DsLogAdmin::LogId id)
 {
-  return this->logstore_->exists (id ACE_ENV_ARG_PARAMETER);
+  return this->logstore_->exists (id);
 }
 
 
 int
-TAO_LogMgr_i::remove (DsLogAdmin::LogId id
-		      ACE_ENV_ARG_DECL)
+TAO_LogMgr_i::remove (DsLogAdmin::LogId id)
 {
-  return this->logstore_->remove (id ACE_ENV_ARG_PARAMETER);
+  return this->logstore_->remove (id);
 }
 
 void
 TAO_LogMgr_i::create_i (DsLogAdmin::LogFullActionType full_action,
 			CORBA::ULongLong max_size,
 			const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-			DsLogAdmin::LogId_out id_out
-			ACE_ENV_ARG_DECL)
+			DsLogAdmin::LogId_out id_out)
 {
   // Validate log_full_action before creating log
   if (full_action != DsLogAdmin::wrap && full_action != DsLogAdmin::halt)
-    ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
+    throw DsLogAdmin::InvalidLogFullAction ();
 
-  if (thresholds) 
+  if (thresholds)
     {
       // @@ JTC - validate thresholds here
     }
@@ -249,23 +218,20 @@ TAO_LogMgr_i::create_i (DsLogAdmin::LogFullActionType full_action,
   this->logstore_->create (full_action,
 			   max_size,
 			   thresholds,
-			   id_out
-			   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+			   id_out);
 }
 
 void
 TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id,
 				DsLogAdmin::LogFullActionType full_action,
 				CORBA::ULongLong max_size,
-				const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-				ACE_ENV_ARG_DECL)
+				const DsLogAdmin::CapacityAlarmThresholdList* thresholds)
 {
   // Validate log_full_action before creating log
   if (full_action != DsLogAdmin::wrap && full_action != DsLogAdmin::halt)
-    ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
+    throw DsLogAdmin::InvalidLogFullAction ();
 
-  if (thresholds) 
+  if (thresholds)
     {
       // @@ JTC - validate thresholds here
     }
@@ -273,9 +239,7 @@ TAO_LogMgr_i::create_with_id_i (DsLogAdmin::LogId id,
   this->logstore_->create_with_id (id,
 				   full_action,
 				   max_size,
-				   thresholds
-				   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+				   thresholds);
 }
 
 CORBA::ORB_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index a75417898c8..209d202ac55 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -52,33 +52,30 @@ public:
 
   /// Lists all log object references.
   DsLogAdmin::LogList *
-    list_logs (ACE_ENV_SINGLE_ARG_DECL)
+    list_logs (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// Lists all log ids.
   DsLogAdmin::LogIdList *
-    list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+    list_logs_by_id (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// Returns a reference to the log with the supplied id.
   DsLogAdmin::Log_ptr
-    find_log (DsLogAdmin::LogId id
-              ACE_ENV_ARG_DECL)
+    find_log (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// Returns true if log exists, otherwise false
-  bool exists (DsLogAdmin::LogId id
-               ACE_ENV_ARG_DECL);
-  
+  bool exists (DsLogAdmin::LogId id);
+
   /// Remove the given entry from the container.
-  int remove (DsLogAdmin::LogId id
-	      ACE_ENV_ARG_DECL);
+  int remove (DsLogAdmin::LogId id);
 
   /// @brief Create ObjectId
   ///
@@ -88,7 +85,7 @@ public:
   ///
   /// @return object id
   ///
-  virtual PortableServer::ObjectId* 
+  virtual PortableServer::ObjectId*
     create_objectid (DsLogAdmin::LogId id);
 
   /// @brief Create log reference
@@ -99,9 +96,8 @@ public:
   ///
   /// @return object reference
   ///
-  virtual DsLogAdmin::Log_ptr 
-    create_log_reference (DsLogAdmin::LogId id
-			  ACE_ENV_ARG_DECL);
+  virtual DsLogAdmin::Log_ptr
+    create_log_reference (DsLogAdmin::LogId id);
 
   /// @brief Create log object
   ///
@@ -111,9 +107,8 @@ public:
   ///
   /// @return object reference
   ///
-  virtual DsLogAdmin::Log_ptr 
-    create_log_object (DsLogAdmin::LogId id
-		       ACE_ENV_ARG_DECL);
+  virtual DsLogAdmin::Log_ptr
+    create_log_object (DsLogAdmin::LogId id);
 
   /// @brief Create log repository id
   ///
@@ -132,18 +127,16 @@ public:
   ///
   /// @return pointer to servant
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL)			= 0;
-  
-  /// @brief Get log record store 
+    create_log_servant (DsLogAdmin::LogId id)			= 0;
+
+  /// @brief Get log record store
   ///
   /// Get/Create a log record store for log channel @a id.
   ///
   /// @param id log id
   ///
   TAO_LogRecordStore*
-    get_log_record_store (DsLogAdmin::LogId id
-		          ACE_ENV_ARG_DECL);
+    get_log_record_store (DsLogAdmin::LogId id);
 
   CORBA::ORB_ptr orb();
 
@@ -156,30 +149,27 @@ protected:
   ///
   /// Creates factory and log channel POAs, and obtains the LogStore
   /// from a dynamically loaded Log_Persistence_Strategy (if one was
-  /// specified in the service config file, otherwise the default 
+  /// specified in the service config file, otherwise the default
   /// Hash_Persistence_Strategy is used.)
   ///
   /// @param orb ORB
   /// @param poa Parent POA
   ///
   void init (CORBA::ORB_ptr orb,
-	     PortableServer::POA_ptr poa
-	     ACE_ENV_ARG_DECL);
+	     PortableServer::POA_ptr poa);
 
   /// @brief Create log
   void create_i (DsLogAdmin::LogFullActionType full_action,
 		 CORBA::ULongLong max_size,
 		 const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-		 DsLogAdmin::LogId_out id_out
-		 ACE_ENV_ARG_DECL);
+		 DsLogAdmin::LogId_out id_out);
 
   /// @brief Create log
   void create_with_id_i (DsLogAdmin::LogId id,
 			 DsLogAdmin::LogFullActionType full_action,
 			 CORBA::ULongLong max_size,
-			 const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-			 ACE_ENV_ARG_DECL);
-  
+			 const DsLogAdmin::CapacityAlarmThresholdList* thresholds);
+
   /// ORB.
   CORBA::ORB_var                orb_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index e7f422dd36b..73b508c0c06 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -19,8 +19,7 @@ TAO_LogNotification::~TAO_LogNotification (void)
 }
 
 void
-TAO_LogNotification::object_creation (DsLogAdmin::LogId id
-                                      ACE_ENV_ARG_DECL)
+TAO_LogNotification::object_creation (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -38,14 +37,11 @@ TAO_LogNotification::object_creation (DsLogAdmin::LogId id
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_notification (any);
 }
 
 void
-TAO_LogNotification::object_deletion (DsLogAdmin::LogId id
-                                      ACE_ENV_ARG_DECL)
+TAO_LogNotification::object_deletion (DsLogAdmin::LogId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -62,15 +58,12 @@ TAO_LogNotification::object_deletion (DsLogAdmin::LogId id
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_notification (any);
 }
 
 void
 TAO_LogNotification::processing_error_alarm (CORBA::ULong error_num,
-                                             const char* error_string
-                                             ACE_ENV_ARG_DECL)
+                                             const char* error_string)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -81,9 +74,7 @@ TAO_LogNotification::processing_error_alarm (CORBA::ULong error_num,
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_notification (any);
 }
 
 void
@@ -91,8 +82,7 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log,
                                              DsLogAdmin::LogId id,
                                              DsLogNotification::AttributeType type,
                                              CORBA::Any oldValue,
-                                             CORBA::Any newValue
-                                             ACE_ENV_ARG_DECL)
+                                             CORBA::Any newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -114,9 +104,7 @@ TAO_LogNotification::attribute_value_change (DsLogAdmin::Log_ptr log,
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_notification (any);
 }
 
 void
@@ -124,8 +112,7 @@ TAO_LogNotification::capacity_alarm_threshold_value_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
     const DsLogAdmin::CapacityAlarmThresholdList& oldValue,
-    const DsLogAdmin::CapacityAlarmThresholdList& newValue
-    ACE_ENV_ARG_DECL)
+    const DsLogAdmin::CapacityAlarmThresholdList& newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -136,17 +123,14 @@ TAO_LogNotification::capacity_alarm_threshold_value_change (
                                 id,
                                 DsLogNotification::capacityAlarmThreshold,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                newV);
 }
 
 void
 TAO_LogNotification::log_full_action_value_change (DsLogAdmin::Log_ptr log,
                                                    DsLogAdmin::LogId id,
                                                    CORBA::ULong oldValue,
-                                                   CORBA::ULong newValue
-                                                   ACE_ENV_ARG_DECL)
+                                                   CORBA::ULong newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -157,17 +141,14 @@ TAO_LogNotification::log_full_action_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::logFullAction,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                newV);
 }
 
 void
 TAO_LogNotification::max_log_size_value_change (DsLogAdmin::Log_ptr log,
                                                 DsLogAdmin::LogId id,
                                                 CORBA::ULongLong oldValue,
-                                                CORBA::ULongLong newValue
-                                                ACE_ENV_ARG_DECL)
+                                                CORBA::ULongLong newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -178,17 +159,14 @@ TAO_LogNotification::max_log_size_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::maxLogSize,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                newV);
 }
 
 void
 TAO_LogNotification::start_time_value_change (DsLogAdmin::Log_ptr log,
                                               DsLogAdmin::LogId id,
                                               DsLogAdmin::TimeT oldValue,
-                                              DsLogAdmin::TimeT newValue
-                                              ACE_ENV_ARG_DECL)
+                                              DsLogAdmin::TimeT newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -199,17 +177,14 @@ TAO_LogNotification::start_time_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::startTime,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                newV);
 }
 
 void
 TAO_LogNotification::stop_time_value_change (DsLogAdmin::Log_ptr log,
                                              DsLogAdmin::LogId id,
                                              DsLogAdmin::TimeT oldValue,
-                                             DsLogAdmin::TimeT newValue
-                                             ACE_ENV_ARG_DECL)
+                                             DsLogAdmin::TimeT newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -220,17 +195,14 @@ TAO_LogNotification::stop_time_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::stopTime,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                newV);
 }
 
 void
 TAO_LogNotification::week_mask_value_change (DsLogAdmin::Log_ptr log,
                                              DsLogAdmin::LogId id,
                                              const DsLogAdmin::WeekMask& oldValue,
-                                             const DsLogAdmin::WeekMask& newValue
-                                             ACE_ENV_ARG_DECL)
+                                             const DsLogAdmin::WeekMask& newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -241,17 +213,14 @@ TAO_LogNotification::week_mask_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::weekMask,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                newV);
 }
 
 void
 TAO_LogNotification::max_record_life_value_change (DsLogAdmin::Log_ptr log,
                                                    DsLogAdmin::LogId id,
                                                    CORBA::ULong oldValue,
-                                                   CORBA::ULong newValue
-                                                   ACE_ENV_ARG_DECL)
+                                                   CORBA::ULong newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -262,9 +231,7 @@ TAO_LogNotification::max_record_life_value_change (DsLogAdmin::Log_ptr log,
                                 id,
                                 DsLogNotification::maxRecordLife,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                newV);
 }
 
 void
@@ -272,8 +239,7 @@ TAO_LogNotification::quality_of_service_value_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
     const DsLogAdmin::QoSList& oldValue,
-    const DsLogAdmin::QoSList& newValue
-    ACE_ENV_ARG_DECL)
+    const DsLogAdmin::QoSList& newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any oldV, newV;
@@ -284,17 +250,14 @@ TAO_LogNotification::quality_of_service_value_change (
                                 id,
                                 DsLogNotification::qualityOfService,
                                 oldV,
-                                newV
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                newV);
 }
 
 void
 TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log,
                                    DsLogAdmin::LogId id,
                                    DsLogNotification::StateType type,
-                                   CORBA::Any newValue
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::Any newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -315,17 +278,14 @@ TAO_LogNotification::state_change (DsLogAdmin::Log_ptr log,
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_notification (any);
 }
 
 void
 TAO_LogNotification::administrative_state_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
-    DsLogAdmin::AdministrativeState newValue
-    ACE_ENV_ARG_DECL)
+    DsLogAdmin::AdministrativeState newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any newV;
@@ -334,17 +294,14 @@ TAO_LogNotification::administrative_state_change (
   this->state_change (log,
                       id,
                       DsLogNotification::administrativeState,
-                      newV
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                      newV);
 }
 
 void
 TAO_LogNotification::operational_state_change (
     DsLogAdmin::Log_ptr log,
     DsLogAdmin::LogId id,
-    DsLogAdmin::OperationalState newValue
-    ACE_ENV_ARG_DECL)
+    DsLogAdmin::OperationalState newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any newV;
@@ -353,16 +310,13 @@ TAO_LogNotification::operational_state_change (
   this->state_change (log,
                       id,
                       DsLogNotification::operationalState,
-                      newV
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                      newV);
 }
 
 void
 TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log,
                                               DsLogAdmin::LogId id,
-                                              DsLogAdmin::ForwardingState newValue
-                                              ACE_ENV_ARG_DECL)
+                                              DsLogAdmin::ForwardingState newValue)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any newV;
@@ -371,9 +325,7 @@ TAO_LogNotification::forwarding_state_change (DsLogAdmin::Log_ptr log,
   this->state_change (log,
                       id,
                       DsLogNotification::forwardingState,
-                      newV
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                      newV);
 }
 
 void
@@ -382,8 +334,7 @@ TAO_LogNotification::threshold_alarm (
     DsLogAdmin::LogId id,
     DsLogAdmin::Threshold crossedValue,
     DsLogAdmin::Threshold observedValue,
-    DsLogNotification::PerceivedSeverityType severity
-    ACE_ENV_ARG_DECL)
+    DsLogNotification::PerceivedSeverityType severity)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any any;
@@ -403,14 +354,11 @@ TAO_LogNotification::threshold_alarm (
 
   any <<= event;
 
-  this->send_notification (any
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_notification (any);
 }
 
 void
-TAO_LogNotification::send_notification (const CORBA::Any & /* any */
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_LogNotification::send_notification (const CORBA::Any & /* any */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
index 32b68ecae1f..c16782d6fe9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
@@ -49,16 +49,15 @@ public:
   virtual ~TAO_LogNotification (void);
 
   /// Event generated when a new log is created.
-  void object_creation (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+  void object_creation (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Event generated when a new log is deleted.
-  void object_deletion (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+  void object_deletion (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Event generated.
-  void processing_error_alarm (CORBA::ULong error_num, const char* error_string
-                               ACE_ENV_ARG_DECL)
+  void processing_error_alarm (CORBA::ULong error_num, const char* error_string)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
@@ -66,100 +65,88 @@ public:
                         DsLogAdmin::LogId id,
                         DsLogNotification::AttributeType type,
                         CORBA::Any oldValue,
-                        CORBA::Any newValue ACE_ENV_ARG_DECL)
+                        CORBA::Any newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void capacity_alarm_threshold_value_change (DsLogAdmin::Log_ptr log,
                         DsLogAdmin::LogId id,
                         const DsLogAdmin::CapacityAlarmThresholdList& oldValue,
-                        const DsLogAdmin::CapacityAlarmThresholdList& newValue
-                        ACE_ENV_ARG_DECL)
+                        const DsLogAdmin::CapacityAlarmThresholdList& newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void log_full_action_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               CORBA::ULong oldValue,
-                              CORBA::ULong newValue
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ULong newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void max_log_size_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               CORBA::ULongLong oldValue,
-                              CORBA::ULongLong newValue
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ULongLong newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void start_time_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               DsLogAdmin::TimeT oldValue,
-                              DsLogAdmin::TimeT newValue
-                              ACE_ENV_ARG_DECL)
+                              DsLogAdmin::TimeT newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void stop_time_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               DsLogAdmin::TimeT oldValue,
-                              DsLogAdmin::TimeT newValue
-                              ACE_ENV_ARG_DECL)
+                              DsLogAdmin::TimeT newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void week_mask_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               const DsLogAdmin::WeekMask& oldValue,
-                              const DsLogAdmin::WeekMask& newValue
-                              ACE_ENV_ARG_DECL)
+                              const DsLogAdmin::WeekMask& newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void max_record_life_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               CORBA::ULong oldValue,
-                              CORBA::ULong newValue
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ULong newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// AttributeValueChange event generation method.
   void quality_of_service_value_change (DsLogAdmin::Log_ptr log,
                               DsLogAdmin::LogId id,
                               const DsLogAdmin::QoSList& oldValue,
-                              const DsLogAdmin::QoSList& newValue
-                              ACE_ENV_ARG_DECL)
+                              const DsLogAdmin::QoSList& newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
   void state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
                     DsLogNotification::StateType type,
-                    CORBA::Any newValue
-                    ACE_ENV_ARG_DECL)
+                    CORBA::Any newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
   void administrative_state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
-                    DsLogAdmin::AdministrativeState newValue
-                    ACE_ENV_ARG_DECL)
+                    DsLogAdmin::AdministrativeState newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
   void operational_state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
-                    DsLogAdmin::OperationalState newValue
-                    ACE_ENV_ARG_DECL)
+                    DsLogAdmin::OperationalState newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
   void forwarding_state_change (DsLogAdmin::Log_ptr log,
                     DsLogAdmin::LogId id,
-                    DsLogAdmin::ForwardingState newValue
-                    ACE_ENV_ARG_DECL)
+                    DsLogAdmin::ForwardingState newValue)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// StateChange event generation method.
@@ -167,14 +154,12 @@ public:
                     DsLogAdmin::LogId id,
                     DsLogAdmin::Threshold crossedValue,
                     DsLogAdmin::Threshold observedValue,
-                    DsLogNotification::PerceivedSeverityType severity
-                    ACE_ENV_ARG_DECL)
+                    DsLogNotification::PerceivedSeverityType severity)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Method overriden by by event-aware logging services to cause
   /// a notification event to be sent.
-  virtual void send_notification (const CORBA::Any &
-                                  ACE_ENV_ARG_DECL)
+  virtual void send_notification (const CORBA::Any &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 4e630b0ea46..785c965d4e6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -50,130 +50,120 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   /// Close the record store.
   virtual int close (void)					= 0;
 
-  
+
   // = Log Parameters
 
   /// Gets the administrative state of the log
   virtual DsLogAdmin::AdministrativeState
-    get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) const	= 0;
+    get_administrative_state (void) const = 0;
 
   /// Sets the administrative state of the log
   virtual void
-    set_administrative_state (DsLogAdmin::AdministrativeState state
-			      ACE_ENV_ARG_DECL)			= 0;
+    set_administrative_state (DsLogAdmin::AdministrativeState state)			= 0;
 
   /// Get the capacity alarm thresholds
   virtual DsLogAdmin::CapacityAlarmThresholdList*
-    get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+    get_capacity_alarm_thresholds (void) const = 0;
 
   /// Set the capacity alarm thresholds
   virtual void
-    set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds
-				   ACE_ENV_ARG_DECL)		= 0;
+    set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList& thresholds)		= 0;
 
   /// Gets the forwarding state
   virtual DsLogAdmin::ForwardingState
-    get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL) const	= 0;
-  
+    get_forwarding_state (void) const = 0;
+
   /// Sets the forwarding state
   virtual void
-    set_forwarding_state (DsLogAdmin::ForwardingState state
-			  ACE_ENV_ARG_DECL)			= 0;
+    set_forwarding_state (DsLogAdmin::ForwardingState state)			= 0;
 
   /// Get the log duration
   virtual DsLogAdmin::TimeInterval
-    get_interval (ACE_ENV_SINGLE_ARG_DECL) const		= 0;
-  
+    get_interval (void) const   = 0;
+
   /// Set the log duration.
   virtual void
-    set_interval (const DsLogAdmin::TimeInterval& interval
-		  ACE_ENV_ARG_DECL)				= 0;
-  
+    set_interval (const DsLogAdmin::TimeInterval& interval)				= 0;
+
   /// Get the log full action
   virtual DsLogAdmin::LogFullActionType
-    get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const		= 0;
-  
+    get_log_full_action (void) const    = 0;
+
   /// Set the log full action
   virtual void
-    set_log_full_action(DsLogAdmin::LogFullActionType action
-			ACE_ENV_ARG_DECL)			= 0;
+    set_log_full_action(DsLogAdmin::LogFullActionType action)			= 0;
 
   /// Get the list of the QoS properties supported by the log.
   virtual DsLogAdmin::QoSList*
-    get_log_qos (ACE_ENV_SINGLE_ARG_DECL) const			= 0;
+    get_log_qos (void) const      = 0;
 
   /// Set the list of the QoS properties supported by the log.
   virtual void
-    set_log_qos (const DsLogAdmin::QoSList& qos
-		 ACE_ENV_ARG_DECL)				= 0;
+    set_log_qos (const DsLogAdmin::QoSList& qos)				= 0;
 
   /// Gets the max record life
   virtual CORBA::ULong
-    get_max_record_life (ACE_ENV_SINGLE_ARG_DECL) const		= 0;
+    get_max_record_life (void) const    = 0;
 
   /// Sets the max record life
   virtual void
-    set_max_record_life (CORBA::ULong life
-			 ACE_ENV_ARG_DECL)			= 0;
+    set_max_record_life (CORBA::ULong life)			= 0;
 
   /// Get the current set value of the max size of the log data.
   virtual CORBA::ULongLong
-    get_max_size (ACE_ENV_SINGLE_ARG_DECL) const		= 0;
+    get_max_size (void) const   = 0;
 
   /// Set the max size of log data. size == 0, => infinite.
   virtual void
-    set_max_size (CORBA::ULongLong size
-		  ACE_ENV_ARG_DECL)				= 0;
+    set_max_size (CORBA::ULongLong size)				= 0;
 
   /// Get the weekly scheduling parameters
   virtual DsLogAdmin::WeekMask*
-    get_week_mask (ACE_ENV_SINGLE_ARG_DECL)			= 0;
-  
+    get_week_mask (void)      = 0;
+
   /// Set the weekly scheduling parameters.
   virtual void
-    set_week_mask (const DsLogAdmin::WeekMask& masks
-		  ACE_ENV_ARG_DECL)				= 0;
+    set_week_mask (const DsLogAdmin::WeekMask& masks)				= 0;
+
 
-  
   // = LogRecordStore status methods
 
   /// Gets the current size of the log data.
   virtual CORBA::ULongLong
-    get_current_size (ACE_ENV_SINGLE_ARG_DECL)			= 0;
+    get_current_size (void)     = 0;
 
   /// Get the number of records in the log right now.
   virtual CORBA::ULongLong
-    get_n_records (ACE_ENV_SINGLE_ARG_DECL)			= 0;
+    get_n_records (void)      = 0;
 
 
   // = LogRecordStore gauge
- 
+
   /// Gets the current value of the "gauge" that measures the total
   /// size of the records written to the log.
   virtual CORBA::ULongLong
-    get_gauge(ACE_ENV_SINGLE_ARG_DECL)                          = 0;
+    get_gauge(void)                          = 0;
 
   /// Resets the "gauge" to 0
   virtual void
-    reset_gauge(ACE_ENV_SINGLE_ARG_DECL)                        = 0;
+    reset_gauge(void)                        = 0;
 
 
   // = Record logging, retrieval, update and removal methods.
 
-  /// Insert rec into storage. 
+  /// Insert rec into storage.
   /// Returns 0 on success -1 on failure and 1 if the log is full.
   virtual int
-    log (const DsLogAdmin::LogRecord &rec ACE_ENV_ARG_DECL)	= 0;
+    log (const DsLogAdmin::LogRecord &rec)	= 0;
 
   /// Deletes "old" records from the store.
   virtual int
-    purge_old_records (ACE_ENV_SINGLE_ARG_DECL)			= 0;
+    purge_old_records (void)      = 0;
 
   /// Set single record attributes.
   virtual void
     set_record_attribute (DsLogAdmin::RecordId id,
-                          const DsLogAdmin::NVList & attr_list
-                          ACE_ENV_ARG_DECL)
+                          const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId,
                      DsLogAdmin::InvalidAttribute))		= 0;
@@ -183,8 +173,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   virtual CORBA::ULong
     set_records_attribute (const char * grammar,
                            const char * c,
-                           const DsLogAdmin::NVList & attr_list
-                           ACE_ENV_ARG_DECL)
+                           const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -193,15 +182,14 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   /// Get the attributes of the record with id <id>. Raises
   /// DsLogAdmin::InvalidRecordId
   virtual DsLogAdmin::NVList*
-    get_record_attribute (DsLogAdmin::RecordId id
-                          ACE_ENV_ARG_DECL)
+    get_record_attribute (DsLogAdmin::RecordId id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId))		= 0;
 
   /// Ensure changes have been flushed to persistent media
   /// Returns 0 on success, -1 on failure
   virtual int
-    flush (ACE_ENV_SINGLE_ARG_DECL)				= 0;
+    flush (void)        = 0;
 
 
   /// Returns all records in the log that match the given constraint
@@ -209,8 +197,7 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   virtual DsLogAdmin::RecordList*
     query (const char * grammar,
 	   const char * c,
-	   DsLogAdmin::Iterator_out i
-	   ACE_ENV_ARG_DECL)
+	   DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))		= 0;
@@ -220,15 +207,13 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   virtual DsLogAdmin::RecordList*
     retrieve (DsLogAdmin::TimeT from_time,
 	      CORBA::Long how_many,
-	      DsLogAdmin::Iterator_out i
-	      ACE_ENV_ARG_DECL)
+	      DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException))			= 0;
 
   /// Returns the number of records matching constraint <c>.
   virtual CORBA::ULong
     match (const char * grammar,
-	   const char * c
-	   ACE_ENV_ARG_DECL)
+	   const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))		= 0;
@@ -236,30 +221,28 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
   /// Delete records matching constraint <c>.
   virtual CORBA::ULong
     delete_records (const char * grammar,
-		    const char * c
-		    ACE_ENV_ARG_DECL)
+		    const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint)) 		= 0;
 
   /// Delete records matching ids in <ids>
   virtual CORBA::ULong
-    delete_records_by_id (const DsLogAdmin::RecordIdList & ids
-			  ACE_ENV_ARG_DECL)
+    delete_records_by_id (const DsLogAdmin::RecordIdList & ids)
     ACE_THROW_SPEC ((CORBA::SystemException))			= 0;
 
 
   virtual CORBA::ULong
-    remove_old_records (ACE_ENV_SINGLE_ARG_DECL)		= 0;
+    remove_old_records (void)   = 0;
 
   /// Read-Write Lock
   virtual ACE_SYNCH_RW_MUTEX& lock()				= 0;
-    
+
 protected:
   /// Constructor.
   TAO_LogRecordStore (void);
 
-  
+
 private:
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
index 78773abffb9..8fe2fddceb5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
@@ -37,64 +37,58 @@ public:
 
   /// Lists all logs created by the log factory.
   virtual DsLogAdmin::LogList *
-    list_logs (ACE_ENV_SINGLE_ARG_DECL)
+    list_logs (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ))					= 0;
 
   /// Lists all log ids.
   virtual DsLogAdmin::LogIdList *
-    list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
+    list_logs_by_id (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ))					= 0;
 
   /// Returns a reference to the log with the supplied id.
   virtual DsLogAdmin::Log_ptr
-    find_log (DsLogAdmin::LogId id
-              ACE_ENV_ARG_DECL)
+    find_log (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ))					= 0;
 
   /// Returns true if log exists, otherwise false
-  virtual bool 
-    exists (DsLogAdmin::LogId id
-	    ACE_ENV_ARG_DECL)				= 0;
+  virtual bool
+    exists (DsLogAdmin::LogId id)				= 0;
 
   /// Remove the given entry from the hash table.
-  virtual int 
-    remove (DsLogAdmin::LogId id
-	    ACE_ENV_ARG_DECL)				= 0;
+  virtual int
+    remove (DsLogAdmin::LogId id)				= 0;
 
   /// @brief Create log
   virtual void
     create (DsLogAdmin::LogFullActionType full_action,
 	    CORBA::ULongLong max_size,
 	    const DsLogAdmin::CapacityAlarmThresholdList* thresholds,
-	    DsLogAdmin::LogId_out id_out
-	    ACE_ENV_ARG_DECL)				= 0;
+	    DsLogAdmin::LogId_out id_out)				= 0;
 
   /// @brief Create log
-  virtual void 
+  virtual void
     create_with_id (DsLogAdmin::LogId id,
 		    DsLogAdmin::LogFullActionType full_action,
 		    CORBA::ULongLong max_size,
-		    const DsLogAdmin::CapacityAlarmThresholdList* thresholds
-		    ACE_ENV_ARG_DECL)			= 0;
+		    const DsLogAdmin::CapacityAlarmThresholdList* thresholds)			= 0;
 
-  /// @brief Get log record store 
+  /// @brief Get log record store
   ///
   /// Get/Create a log record store for log channel @a id.
   ///
   /// @param id log id
   ///
   virtual TAO_LogRecordStore*
-    get_log_record_store (DsLogAdmin::LogId id
-		          ACE_ENV_ARG_DECL)		= 0;
+    get_log_record_store (DsLogAdmin::LogId id)		= 0;
 
 protected:
-  // Constructor 
+  // Constructor
   TAO_LogStore() {}
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
index d153bbe2714..361a2b53ef4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
@@ -50,16 +50,14 @@ int
 TAO_Log_Compaction_Handler::handle_timeout (const ACE_Time_Value&,
                                             const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->log_->remove_old_records(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->log_->remove_old_records();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
-  
+
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index e741de09004..b8b51624edf 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
     const char *constraints
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
                    CORBA::NO_MEMORY))
@@ -21,13 +20,12 @@ TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter (
       ACE_NEW_THROW_EX (this->root_,
                         TAO_ETCL_Literal_Constraint ((CORBA::Boolean) 1),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
-  {  
+  {
       // root_ is set in this base class call.
       if (TAO_ETCL_Interpreter::build_tree (constraints) != 0)
-          ACE_THROW (DsLogAdmin::InvalidConstraint ());
+          throw DsLogAdmin::InvalidConstraint ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index 18f754d8c79..709310343f9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -6,12 +6,12 @@
  *
  *  $Id$
  *
- *  
+ *
  *
  *
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
  *  @author D A Hanvey <d.hanvey@qub.ac.uk>
- *  
+ *
  */
 //=============================================================================
 
@@ -45,14 +45,13 @@ public:
 
   // = Initialization and termination methods.
 
-  /** 
+  /**
    * This constructor builds an expression tree representing the
    * constraint specified in <constraints>, and throws an Illegal
    * Constraint exception if the constraint given has syntax errors or
    * semantic errors, such as mismatched types.
    */
-  TAO_Log_Constraint_Interpreter (const char* constraints
-                   ACE_ENV_ARG_DECL)
+  TAO_Log_Constraint_Interpreter (const char* constraints)
     ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
                      CORBA::NO_MEMORY));
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 6c8b55d4d88..14722221752 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -133,8 +133,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
     TAO_ETCL_Union_Pos *union_pos
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (union_pos->union_value ()->accept (this) == 0)
         {
@@ -142,9 +141,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
           this->queue_.dequeue_head (disc_val);
 
           TAO_DynUnion_i dyn_union;
-          dyn_union.init (this->current_member_.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          dyn_union.init (this->current_member_.in ());
 
           CORBA::TypeCode_var tc = this->current_member_->type ();
 
@@ -156,12 +153,9 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
               {
                 CORBA::Any disc_any;
                 CORBA::TypeCode_var disc_tc =
-                  tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                  tc->discriminator_type ();
                 CORBA::TCKind disc_kind =
-                  TAO_DynAnyFactory::unalias (disc_tc.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                  TAO_DynAnyFactory::unalias (disc_tc.in ());
 
                 switch (disc_kind)
                 {
@@ -211,20 +205,14 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
                 DynamicAny::DynAny_var dyn_any =
                   TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any &> (
                     disc_tc.in (),
-                    disc_any
-                    ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                    disc_any);
 
-                dyn_union.set_discriminator (dyn_any.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                dyn_union.set_discriminator (dyn_any.in ());
                 DynamicAny::DynAny_var u_member =
-                  dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                  dyn_union.member ();
 
                 this->current_member_ =
-                  u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                  u_member->to_any ();
 
                 break;
               }
@@ -232,17 +220,14 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
               {
                 const char *name = (const char *) disc_val;
                 CORBA::ULong count =
-                  tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                  tc->member_count ();
 
                 const char *member_name = 0;
                 CORBA::ULong i = 0;
 
                 for (i = 0; i < count; ++i)
                   {
-                    member_name = tc->member_name (i
-                                                   ACE_ENV_ARG_PARAMETER);
-                    ACE_TRY_CHECK;
+                    member_name = tc->member_name (i);
 
                     if (ACE_OS::strcmp (name, member_name) == 0)
                       {
@@ -253,9 +238,7 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
                 // If there's no match, member_label will throw
                 // CORBA::TypeCode::Bounds and the catch block will
                 // return -1;
-                this->current_member_ = tc->member_label (i
-                                                          ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                this->current_member_ = tc->member_label (i);
 
                 break;
               }
@@ -287,26 +270,21 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
           return -1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 }
 
 int
 TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If we are here (from visit_component) the Any containing the
       // component as found in property_lookup_ will be in current_member_.
       CORBA::TypeCode_var tc = this->current_member_->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
       DynamicAny::DynAny_var member;
       CORBA::Boolean success = 0;
@@ -317,13 +295,9 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
         case CORBA::tk_enum:
           {
             TAO_DynEnum_i dyn_enum;
-            dyn_enum.init (this->current_member_.in ()
-                           ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            dyn_enum.init (this->current_member_.in ());
 
-            success = dyn_enum.seek (slot
-                                     ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            success = dyn_enum.seek (slot);
 
             if (success == 0)
               {
@@ -331,29 +305,23 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
               }
 
             member =
-              dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              dyn_enum.current_component ();
 
             break;
           }
         case CORBA::tk_struct:
           {
             TAO_DynStruct_i dyn_struct;
-            dyn_struct.init (this->current_member_.in ()
-                             ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            dyn_struct.init (this->current_member_.in ());
 
-            success = dyn_struct.seek (slot
-                                       ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            success = dyn_struct.seek (slot);
 
             if (success == 0)
               {
                 return -1;
               }
 
-            member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            member = dyn_struct.current_component ();
 
             break;
           }
@@ -364,8 +332,7 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
           return -1;
       }
 
-      CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Any_var value = member->to_any ();
 
       TAO_ETCL_Constraint *comp = pos->component ();
 
@@ -381,12 +348,10 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
           return comp->accept (this);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 }
 
 int
@@ -436,15 +401,12 @@ TAO_Log_Constraint_Visitor::visit_component_array (
     TAO_ETCL_Component_Array *array
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // If we are here (from visit_component) the Any containing the
       // component as found in property_lookup_ will be in current_member_.
       CORBA::TypeCode_var tc = this->current_member_->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
       DynamicAny::DynAny_var member;
       CORBA::Boolean success = 0;
@@ -455,34 +417,25 @@ TAO_Log_Constraint_Visitor::visit_component_array (
         case CORBA::tk_array:
           {
             TAO_DynEnum_i dyn_array;
-            dyn_array.init (this->current_member_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            dyn_array.init (this->current_member_.in ());
 
-            success = dyn_array.seek (slot
-                                      ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            success = dyn_array.seek (slot);
 
             if (success == 0)
               {
                 return -1;
               }
 
-            member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            member = dyn_array.current_component ();
 
             break;
           }
         case CORBA::tk_sequence:
           {
             TAO_DynStruct_i dyn_sequence;
-            dyn_sequence.init (this->current_member_.in ()
-                               ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            dyn_sequence.init (this->current_member_.in ());
 
-            success = dyn_sequence.seek (slot
-                                         ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            success = dyn_sequence.seek (slot);
 
             if (success == 0)
               {
@@ -490,8 +443,7 @@ TAO_Log_Constraint_Visitor::visit_component_array (
               }
 
             member =
-              dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              dyn_sequence.current_component ();
 
             break;
           }
@@ -501,8 +453,7 @@ TAO_Log_Constraint_Visitor::visit_component_array (
           return -1;
       }
 
-      CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Any_var value = member->to_any ();
 
       TAO_ETCL_Constraint *comp = array->component ();
 
@@ -518,19 +469,16 @@ TAO_Log_Constraint_Visitor::visit_component_array (
           return comp->accept (this);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 }
 
 int
 TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::TypeCode_var tc = this->current_member_->type ();
 
@@ -541,8 +489,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
             // If the TCKind is not a sequence or an array, the
             // call to length() will raise an exception, and the
             // catch block will return -1;
-            CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            CORBA::ULong length = tc->length ();
 
             TAO_ETCL_Literal_Constraint lit (length);
             this->queue_.enqueue_head (lit);
@@ -554,16 +501,12 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
             // call to init() will raise an exception, and the
             // catch block will return -1;
             TAO_DynUnion_i dyn_union;
-            dyn_union.init (this->current_member_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            dyn_union.init (this->current_member_.in ());
 
             DynamicAny::DynAny_var disc =
-              dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              dyn_union.get_discriminator ();
 
-            CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            CORBA::Any_var disc_any = disc->to_any ();
 
             TAO_ETCL_Literal_Constraint lit (disc_any.ptr ());
             this->queue_.enqueue_head (lit);
@@ -571,8 +514,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
           }
         case TAO_ETCL_TYPE_ID:
           {
-            const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            const char *name = tc->name ();
 
             TAO_ETCL_Literal_Constraint lit (name);
             this->queue_.enqueue_head (lit);
@@ -580,8 +522,7 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
           }
         case TAO_ETCL_REPOS_ID:
           {
-            const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            const char *id = tc->id ();
 
             TAO_ETCL_Literal_Constraint lit (id);
             this->queue_.enqueue_head (lit);
@@ -591,12 +532,10 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
           return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 }
 
 int
@@ -662,15 +601,13 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
       return -1;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::TypeCode_var tc = this->current_member_->type ();
 
       // If the current member is not a union, this call will
       // throw BadKind and the catch block will return -1.
-      CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Long default_index = tc->default_index ();
 
       // No default index.
       if (default_index == -1)
@@ -687,12 +624,10 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
       TAO_ETCL_Literal_Constraint default_index_value (default_index);
       return (disc == default_index_value);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 }
 
 int
@@ -1011,20 +946,15 @@ TAO_Log_Constraint_Visitor::visit_in (
               const CORBA::Any *component = (const CORBA::Any *) bag;
               CORBA::TCKind kind = CORBA::tk_null;
 
-              ACE_DECLARE_NEW_CORBA_ENV;
-              ACE_TRY
+              try
                 {
                   CORBA::TypeCode_var tc = component->type ();
-                  kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  kind = TAO_DynAnyFactory::unalias (tc.in ());
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception&)
                 {
                   return return_value;
                 }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (return_value);
 
               CORBA::Boolean result = 0;
 
@@ -1081,13 +1011,10 @@ TAO_Log_Constraint_Visitor::sequence_does_contain (
     TAO_ETCL_Literal_Constraint &item
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::TypeCode_var type = any->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ());
 
       // The literal and the array elements must be
       // of the same simple type.
@@ -1100,13 +1027,10 @@ TAO_Log_Constraint_Visitor::sequence_does_contain (
         }
 
       TAO_DynSequence_i dyn_seq;
-      dyn_seq.init (*any
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dyn_seq.init (*any);
 
       DynamicAny::AnySeq_var any_seq =
-        dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dyn_seq.get_elements ();
 
       CORBA::ULong length = any_seq->length ();
 
@@ -1120,12 +1044,10 @@ TAO_Log_Constraint_Visitor::sequence_does_contain (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return 0;
 }
@@ -1136,13 +1058,10 @@ TAO_Log_Constraint_Visitor::array_does_contain (
     TAO_ETCL_Literal_Constraint &item
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::TypeCode_var type = any->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ());
 
       // The literal and the array elements must be
       // of the same simple type.
@@ -1155,13 +1074,10 @@ TAO_Log_Constraint_Visitor::array_does_contain (
         }
 
       TAO_DynArray_i dyn_array;
-      dyn_array.init (*any
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dyn_array.init (*any);
 
       DynamicAny::AnySeq_var any_seq =
-        dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dyn_array.get_elements ();
 
       CORBA::ULong length = any_seq->length ();
 
@@ -1175,12 +1091,10 @@ TAO_Log_Constraint_Visitor::array_does_contain (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return 0;
 }
@@ -1191,17 +1105,13 @@ TAO_Log_Constraint_Visitor::struct_does_contain (
     TAO_ETCL_Literal_Constraint &item
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_DynStruct_i dyn_struct;
-      dyn_struct.init (*any
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dyn_struct.init (*any);
 
       DynamicAny::NameValuePairSeq_var members =
-        dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dyn_struct.get_members ();
 
       CORBA::ULong length = members->length ();
       CORBA::TypeCode_var tc;
@@ -1210,9 +1120,7 @@ TAO_Log_Constraint_Visitor::struct_does_contain (
       for (CORBA::ULong i = 0; i < length; ++i)
         {
           tc = members[i].value.type ();
-          kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          kind = TAO_DynAnyFactory::unalias (tc.in ());
 
           // The literal and the struct member must be
           // of the same simple type.
@@ -1232,12 +1140,10 @@ TAO_Log_Constraint_Visitor::struct_does_contain (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return 0;
 }
@@ -1248,25 +1154,18 @@ TAO_Log_Constraint_Visitor::union_does_contain (
     TAO_ETCL_Literal_Constraint &item
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_DynUnion_i dyn_union;
-      dyn_union.init (*any
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dyn_union.init (*any);
 
       DynamicAny::DynAny_var cc =
-        dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dyn_union.current_component ();
 
-      CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Any_var member = cc->to_any ();
 
       CORBA::TypeCode_var tc = member->type ();
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
       // The literal and the union member must be
       // of the same simple type.
@@ -1282,12 +1181,10 @@ TAO_Log_Constraint_Visitor::union_does_contain (
 
       return (item == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 }
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
index 122d35c486c..bd4affd95c1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
@@ -43,16 +43,14 @@ TAO_Log_Flush_Handler::cancel ()
 int
 TAO_Log_Flush_Handler::handle_timeout (const ACE_Time_Value&, const void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      log_->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      log_->flush ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
-  
+
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 4cbbd3b86b2..605ca774d7c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -43,34 +43,29 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb,
 }
 
 void
-TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::init (void)
 {
   this->log_ =
-    logmgr_i_.create_log_reference (this->logid_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    logmgr_i_.create_log_reference (this->logid_);
 
   this->recordstore_ =
-    logmgr_i_.get_log_record_store (this->logid_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    logmgr_i_.get_log_record_store (this->logid_);
 
   if (this->recordstore_->open () ==-1)
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   // fetch the capacity alarm thresholds from the log record store
   DsLogAdmin::CapacityAlarmThresholdList_var thresholds =
-    this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_capacity_alarm_thresholds ();
 
   // initialize the internal representation
   this->thresholds_ = thresholds.in ();
-  this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->reset_capacity_alarm_threshold ();
 
 
   // fetch the log QoS from the log record store
   DsLogAdmin::QoSList_var qos =
-    this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_log_qos ();
 
   // initialize the internal representation.
   this->reset_log_qos (qos.in ());
@@ -78,18 +73,15 @@ TAO_Log_i::init (ACE_ENV_SINGLE_ARG_DECL)
 
   // fetch the week mask from the log record store
   DsLogAdmin::WeekMask_var week_mask =
-    this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_week_mask ();
 
   // initialize the internal representation
-  this->reset_week_mask (week_mask.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->reset_week_mask (week_mask.in ());
 
 
   // fetch the maximum record life from the log record store
   CORBA::ULong max_record_life =
-    this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_max_record_life ();
 
   // if set, activate the compaction handler
   if (max_record_life != 0)
@@ -105,28 +97,27 @@ TAO_Log_i::~TAO_Log_i (void)
 }
 
 DsLogAdmin::LogMgr_ptr
-TAO_Log_i::my_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Log_i::my_factory (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return DsLogAdmin::LogMgr::_duplicate (this->factory_.in ());
 }
 
 DsLogAdmin::LogId
-TAO_Log_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Log_i::id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return logid_;
 }
 
 DsLogAdmin::QoSList*
-TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_log_qos (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   // @@ The current revision of the specification (formal/03-07-01)
   // states that get_log_qos() returns a list of the QoS properties
@@ -136,12 +127,11 @@ TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
   // have submitted a defect report to the OMG for clarification.
   //    --jtc
 
-  return this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->recordstore_->get_log_qos ();
 }
 
 void
-TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
-                        ACE_ENV_ARG_DECL)
+TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::UnsupportedQoS))
 {
@@ -149,7 +139,6 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // @@ The current revision of the specification (formal/03-07-01)
   // does not clearly define the semantics to follow when the QoSList
@@ -164,8 +153,7 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
   validate_log_qos (qos);
 
   DsLogAdmin::QoSList_var old_qos =
-    this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_log_qos ();
 
   // @@ The current revision of the specification (formal/03-07-01) is
   // unclear whether an AttributeValueChange event should be sent if a
@@ -178,8 +166,7 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
   if (qos == old_qos.in ())
     return;
 
-  this->recordstore_->set_log_qos (qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->recordstore_->set_log_qos (qos);
 
   reset_log_qos (qos);
 
@@ -188,40 +175,34 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
       notifier_->quality_of_service_value_change (this->log_.in (),
                                                   this->logid_,
                                                   old_qos.in (),
-                                                  qos
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                  qos);
     }
 }
 
 CORBA::ULong
-TAO_Log_i::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_max_record_life (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   return
-    this->recordstore_->get_max_record_life(ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_max_record_life();
 }
 
 void
-TAO_Log_i::set_max_record_life (CORBA::ULong life
-                                ACE_ENV_ARG_DECL)
+TAO_Log_i::set_max_record_life (CORBA::ULong life)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
   CORBA::ULong old_life =
-    this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_max_record_life ();
 
   // @@ The current revision of the specification (formal/03-07-01) is
   // unclear whether an AttributeValueChange event should be sent if a
@@ -234,8 +215,7 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
   if (life == old_life)
     return;
 
-  this->recordstore_->set_max_record_life (life ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->recordstore_->set_max_record_life (life);
 
   if (life != 0)
     this->log_compaction_handler_.schedule();
@@ -247,28 +227,24 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
       notifier_->max_record_life_value_change (this->log_.in (),
                                                this->logid_,
                                                old_life,
-                                               life
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               life);
   }
 }
 
 CORBA::ULongLong
-TAO_Log_i::get_max_size (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_max_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return recordstore_->get_max_size ();
 }
 
 void
-TAO_Log_i::set_max_size (CORBA::ULongLong size
-                         ACE_ENV_ARG_DECL)
+TAO_Log_i::set_max_size (CORBA::ULongLong size)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
@@ -276,11 +252,9 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
   CORBA::ULongLong old_size =
-    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_max_size ();
 
   // @@ The current revision of the specification (formal/03-07-01) is
   // unclear whether an AttributeValueChange event should be sent if a
@@ -297,24 +271,20 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
   if (size != 0)
     {
       CORBA::ULongLong current_size =
-	this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+  this->recordstore_->get_current_size ();
 
       if (size < current_size)
-	ACE_THROW (DsLogAdmin::InvalidParam ());
+	throw DsLogAdmin::InvalidParam ();
     }
 
-  this->recordstore_->set_max_size (size ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->recordstore_->set_max_size (size);
 
   if (notifier_)
     {
       notifier_->max_log_size_value_change (this->log_.in (),
 					    this->logid_,
 					    old_size,
-					    size
-					    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+					    size);
     }
 
   // @@ The current revision of the specification (formal/03-07-01)
@@ -332,52 +302,47 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
   // clarified when/if the OMG charters a RTF for the log service.
   //    --jtc
   //
-  this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->reset_capacity_alarm_threshold ();
 }
 
 CORBA::ULongLong
-TAO_Log_i::get_current_size (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_current_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->recordstore_->get_current_size ();
 }
 
 CORBA::ULongLong
-TAO_Log_i::get_n_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_n_records (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->recordstore_->get_n_records (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->recordstore_->get_n_records ();
 }
 
 DsLogAdmin::LogFullActionType
-TAO_Log_i::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_log_full_action (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->recordstore_->get_log_full_action(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->recordstore_->get_log_full_action();
 }
 
 void
-TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
-                                ACE_ENV_ARG_DECL)
+TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   DsLogAdmin::InvalidLogFullAction))
 {
@@ -385,14 +350,12 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
   if (action != DsLogAdmin::wrap && action != DsLogAdmin::halt)
-    ACE_THROW (DsLogAdmin::InvalidLogFullAction ());
+    throw DsLogAdmin::InvalidLogFullAction ();
 
   DsLogAdmin::LogFullActionType old_action =
-    this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_log_full_action ();
 
   // @@ The current revision of the specification (formal/03-07-01) is
   // unclear whether an AttributeValueChange event should be sent if a
@@ -405,17 +368,14 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
   if (action == old_action)
     return;
 
-  this->recordstore_->set_log_full_action (action ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->recordstore_->set_log_full_action (action);
 
   if (notifier_)
     {
       notifier_->log_full_action_value_change (this->log_.in (),
                                                this->logid_,
                                                old_action,
-                                               action
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               action);
    }
 
   // @@ The current revision of the specification (formal/03-07-01)
@@ -433,37 +393,32 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
   // clarified when/if the OMG charters a RTF for the log service.
   //    --jtc
   //
-  this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->reset_capacity_alarm_threshold ();
 }
 
 DsLogAdmin::AdministrativeState
-TAO_Log_i::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_administrative_state (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->recordstore_->get_administrative_state ();
 }
 
 void
-TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
-                                     ACE_ENV_ARG_DECL)
+TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
   DsLogAdmin::AdministrativeState old_state =
-    this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_administrative_state ();
 
   // @@ The current revision of the specification (formal/03-07-01) is
   // unclear whether an AttributeValueChange event should be sent if a
@@ -476,47 +431,40 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
   if (state == old_state)
     return;
 
-  this->recordstore_->set_administrative_state (state ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->recordstore_->set_administrative_state (state);
 
   if (notifier_)
     {
       notifier_->administrative_state_change (this->log_.in (),
                                               this->logid_,
-                                              state
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              state);
   }
 }
 
 DsLogAdmin::ForwardingState
-TAO_Log_i::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_forwarding_state (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   return
-    this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->recordstore_->get_forwarding_state ();
 }
 
 void
-TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
-                                 ACE_ENV_ARG_DECL)
+TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
   DsLogAdmin::ForwardingState old_state =
-    this->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_forwarding_state ();
 
   // @@ The current revision of the specification (formal/03-07-01) is
   // unclear whether an AttributeValueChange event should be sent if a
@@ -529,21 +477,18 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
   if (state == old_state)
     return;
 
-  this->recordstore_->set_forwarding_state (state ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->recordstore_->set_forwarding_state (state);
 
   if (notifier_)
     {
       notifier_->forwarding_state_change (this->log_.in (),
                                           this->logid_,
-                                          state
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          state);
     }
 }
 
 DsLogAdmin::OperationalState
-TAO_Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Log_i::get_operational_state (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No locks are necessary, since op_state_ is set in ::init() and
@@ -552,21 +497,19 @@ TAO_Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 DsLogAdmin::TimeInterval
-TAO_Log_i::get_interval (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_interval (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->recordstore_->get_interval ();
 }
 
 void
-TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
-                         ACE_ENV_ARG_DECL)
+TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidTime,
                    DsLogAdmin::InvalidTimeInterval))
@@ -575,18 +518,16 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // validate interval
   if (interval.start != 0)
     {
       if (interval.start >= interval.stop)
-        ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
+        throw DsLogAdmin::InvalidTimeInterval ();
     }
 
   DsLogAdmin::TimeInterval old_interval =
-    this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_interval ();
 
   // @@ The current revision of the specification (formal/03-07-01) is
   // unclear whether an AttributeValueChange event should be sent if a
@@ -599,8 +540,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
   if (interval == old_interval)
     return;
 
-  this->recordstore_->set_interval (interval ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->recordstore_->set_interval (interval);
 
   if (notifier_)
     {
@@ -609,9 +549,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
           notifier_->start_time_value_change (this->log_.in (),
                                               this->logid_,
                                               old_interval.start,
-                                              interval.start
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                              interval.start);
         }
 
       if (interval.stop != old_interval.stop)
@@ -619,28 +557,25 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
           notifier_->stop_time_value_change (this->log_.in (),
                                              this->logid_,
                                              old_interval.stop,
-                                             interval.stop
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                             interval.stop);
         }
     }
 }
 
 DsLogAdmin::AvailabilityStatus
-TAO_Log_i::get_availability_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_availability_status (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->get_availability_status_i ();
 }
 
 DsLogAdmin::AvailabilityStatus
-TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_availability_status_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The log is considered "on duty" if all the following are true:
@@ -650,12 +585,10 @@ TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
   //   * current time falls within one (or more) of the log
   //     scheduling times.
 
-  const CORBA::Boolean s = this->scheduled (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (this->avail_status_);
+  const CORBA::Boolean s = this->scheduled ();
 
   DsLogAdmin::AdministrativeState admin_state =
-    this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (this->avail_status_);
+    this->recordstore_->get_administrative_state ();
 
   if (this->op_state_ == DsLogAdmin::enabled
       && admin_state == DsLogAdmin::unlocked
@@ -671,23 +604,21 @@ TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 DsLogAdmin::CapacityAlarmThresholdList*
-TAO_Log_i::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_capacity_alarm_thresholds (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->recordstore_->get_capacity_alarm_thresholds ();
 }
 
 void
 TAO_Log_i::set_capacity_alarm_thresholds (const
                                           DsLogAdmin::CapacityAlarmThresholdList
-                                          &threshs
-                                          ACE_ENV_ARG_DECL)
+                                          &threshs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidThreshold))
 {
@@ -695,19 +626,15 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
   const CORBA::Boolean validated =
-    TAO_Log_i::validate_capacity_alarm_thresholds (threshs
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_Log_i::validate_capacity_alarm_thresholds (threshs);
 
   if (!validated)
-    ACE_THROW (DsLogAdmin::InvalidThreshold ());
+    throw DsLogAdmin::InvalidThreshold ();
 
   DsLogAdmin::CapacityAlarmThresholdList_var old_threshs =
-    this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_capacity_alarm_thresholds ();
 
   // @@ The current revision of the specification (formal/03-07-01) is
   // unclear whether an AttributeValueChange event should be sent if a
@@ -720,18 +647,14 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
   if (threshs == old_threshs.in ())
       return;
 
-  this->recordstore_->set_capacity_alarm_thresholds (threshs
-						     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->recordstore_->set_capacity_alarm_thresholds (threshs);
 
   if (notifier_)
     {
       notifier_->capacity_alarm_threshold_value_change (this->log_.in (),
                                                         this->logid_,
                                                         old_threshs.in (),
-                                                        threshs
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                        threshs);
     }
 
   // @@ The current revision of the specification (formal/03-07-01)
@@ -750,26 +673,23 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
   //    --jtc
   //
   this->thresholds_ = threshs;
-  this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->reset_capacity_alarm_threshold ();
 }
 
 DsLogAdmin::WeekMask*
-TAO_Log_i::get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::get_week_mask (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->recordstore_->get_week_mask ();
 }
 
 void
-TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
-                          ACE_ENV_ARG_DECL)
+TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidTime,
                    DsLogAdmin::InvalidTimeInterval,
@@ -779,14 +699,11 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
-  validate_week_mask (masks ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  validate_week_mask (masks);
 
   DsLogAdmin::WeekMask_var old_masks =
-    this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_week_mask ();
 
   // @@ The current revision of the specification (formal/03-07-01) is
   // unclear whether an AttributeValueChange event should be sent if a
@@ -799,28 +716,23 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
   if (masks == old_masks.in ())
     return;
 
-  this->recordstore_->set_week_mask (masks ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->recordstore_->set_week_mask (masks);
 
-  this->reset_week_mask (masks ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->reset_week_mask (masks);
 
   if (notifier_)
     {
       notifier_->week_mask_value_change (this->log_.in (),
                                          this->logid_,
                                          old_masks.in (),
-                                         masks
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                         masks);
     }
 }
 
 DsLogAdmin::RecordList*
 TAO_Log_i::query (const char *grammar,
                   const char *constraint,
-                  DsLogAdmin::Iterator_out iter_out
-                  ACE_ENV_ARG_DECL)
+                  DsLogAdmin::Iterator_out iter_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
@@ -829,37 +741,31 @@ TAO_Log_i::query (const char *grammar,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   return this->recordstore_->query (grammar,
 				    constraint,
-				    iter_out
-				    ACE_ENV_ARG_PARAMETER);
+				    iter_out);
 }
 
 DsLogAdmin::RecordList*
 TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time,
                      CORBA::Long how_many,
-                     DsLogAdmin::Iterator_out iter_out
-                     ACE_ENV_ARG_DECL)
+                     DsLogAdmin::Iterator_out iter_out)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   return this->recordstore_->retrieve (from_time,
 				       how_many,
-				       iter_out
-				       ACE_ENV_ARG_PARAMETER);
+				       iter_out);
 }
 
 CORBA::ULong
 TAO_Log_i::match (const char* grammar,
-                  const char *constraint
-                  ACE_ENV_ARG_DECL)
+                  const char *constraint)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
@@ -868,21 +774,17 @@ TAO_Log_i::match (const char* grammar,
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   const CORBA::ULong count =
     this->recordstore_->match (grammar,
-			       constraint
-			       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+			       constraint);
 
   return count;
 }
 
 CORBA::ULong
 TAO_Log_i::delete_records (const char *grammar,
-                           const char *constraint
-                           ACE_ENV_ARG_DECL)
+                           const char *constraint)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))
@@ -891,25 +793,20 @@ TAO_Log_i::delete_records (const char *grammar,
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   const CORBA::ULong count =
     this->recordstore_->delete_records (grammar,
-					constraint
-					ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+					constraint);
 
-  if (count > 0) 
+  if (count > 0)
     {
       if (avail_status_.log_full)
 	{
 	  const CORBA::ULongLong current_size =
-	    this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_CHECK_RETURN (0);
+      this->recordstore_->get_current_size ();
 
 	  const CORBA::ULongLong max_size =
-	    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_CHECK_RETURN (0);
+      this->recordstore_->get_max_size ();
 
 	  if (current_size < max_size)
 	    {
@@ -917,39 +814,33 @@ TAO_Log_i::delete_records (const char *grammar,
 	    }
 	}
 
-      this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->reset_capacity_alarm_threshold ();
     }
-  
+
   return count;
 }
 
 CORBA::ULong
-TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
-                                 ACE_ENV_ARG_DECL)
+TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   const CORBA::ULong count =
-    this->recordstore_->delete_records_by_id (ids ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->recordstore_->delete_records_by_id (ids);
 
   if (count > 0)
     {
       if (avail_status_.log_full)
 	{
 	  const CORBA::ULongLong current_size =
-	    this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_CHECK_RETURN (0);
+      this->recordstore_->get_current_size ();
 
 	  const CORBA::ULongLong max_size =
-	    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_CHECK_RETURN (0);
+      this->recordstore_->get_max_size ();
 
 	  if (current_size < max_size)
 	    {
@@ -957,16 +848,14 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids
 	    }
 	}
 
-      this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->reset_capacity_alarm_threshold ();
     }
 
   return count;
 }
 
 void
-TAO_Log_i::write_records (const DsLogAdmin::Anys &records
-                          ACE_ENV_ARG_DECL)
+TAO_Log_i::write_records (const DsLogAdmin::Anys &records)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogFull,
                    DsLogAdmin::LogOffDuty,
@@ -982,13 +871,11 @@ TAO_Log_i::write_records (const DsLogAdmin::Anys &records
       reclist [i].info = records[i];
     }
 
-  this->write_recordlist (reclist ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->write_recordlist (reclist);
 }
 
 void
-TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
-                             ACE_ENV_ARG_DECL)
+TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogFull,
                    DsLogAdmin::LogOffDuty,
@@ -999,15 +886,12 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
   DsLogAdmin::LogFullActionType log_full_action =
-    this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_log_full_action ();
 
   DsLogAdmin::AdministrativeState admin_state =
-    this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_administrative_state ();
 
   // @@ The current revision of the specification (formal/03-07-01)
   // does not explicitly specify the preference of exceptions to be
@@ -1019,20 +903,19 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
   // specific LogLocked and LogDisabled exceptions will be thrown.
 
   DsLogAdmin::AvailabilityStatus avail_stat =
-    this->get_availability_status_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_availability_status_i ();
 
   if (admin_state == DsLogAdmin::locked)
     {
-      ACE_THROW (DsLogAdmin::LogLocked ());
+      throw DsLogAdmin::LogLocked ();
     }
   else if (this->op_state_ == DsLogAdmin::disabled)
     {
-      ACE_THROW (DsLogAdmin::LogDisabled ());
+      throw DsLogAdmin::LogDisabled ();
     }
   else if (avail_stat.off_duty == 1)
     {
-      ACE_THROW (DsLogAdmin::LogOffDuty ());
+      throw DsLogAdmin::LogOffDuty ();
     }
 
   CORBA::Short num_written (0);
@@ -1040,9 +923,8 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
   for (CORBA::ULong i = 0; i < reclist.length (); i++)
     {
       // retval == 1 => log store reached max size.
-      
-      int retval = this->recordstore_->log (reclist[i] ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+
+      int retval = this->recordstore_->log (reclist[i]);
 
       if (retval == 1)
 	{
@@ -1051,15 +933,15 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
 	  if (log_full_action == DsLogAdmin::halt)
 	    {
 	      avail_status_.log_full = 1;
-	      ACE_THROW (DsLogAdmin::LogFull (num_written));
+	      throw DsLogAdmin::LogFull (num_written);
 	    }
 
 	  // the policy is to wrap. for this we need to delete a few
 	  // records. let the record store decide how many.
 
-	  if (this->recordstore_->purge_old_records (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
-	    ACE_THROW (CORBA::PERSIST_STORE ());
-	
+    if (this->recordstore_->purge_old_records () == -1)
+	    throw CORBA::PERSIST_STORE ();
+
 	  // Now, we want to attempt to write the same record again
 	  // so decrement the index to balance the inc. in the for loop.
 	  --i;
@@ -1067,21 +949,19 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
       else if (retval == 0)
 	{
 	  num_written++;
-	    
-	  this->check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_CHECK;
+
+    this->check_capacity_alarm_threshold ();
 	}
       else
 	{
-	  ACE_THROW (CORBA::PERSIST_STORE ());
+	  throw CORBA::PERSIST_STORE ();
 	}
     } // for
 }
 
 void
 TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id,
-                                 const DsLogAdmin::NVList &attr_list
-                                 ACE_ENV_ARG_DECL)
+                                 const DsLogAdmin::NVList &attr_list)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId,
                    DsLogAdmin::InvalidAttribute))
@@ -1090,17 +970,15 @@ TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id,
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK;
 
-  this->recordstore_->set_record_attribute (id, attr_list
-					    ACE_ENV_ARG_PARAMETER);
+  this->recordstore_->set_record_attribute (id, attr_list);
 }
 
 CORBA::ULong
 TAO_Log_i::set_records_attribute (const char *grammar,
                                   const char *constraint,
                                   const DsLogAdmin::NVList
-                                  &attr_list ACE_ENV_ARG_DECL)
+                                  &attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -1110,17 +988,14 @@ TAO_Log_i::set_records_attribute (const char *grammar,
 			    guard,
 			    this->recordstore_->lock (),
 			    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   return this->recordstore_->set_records_attribute (grammar,
 						    constraint,
-						    attr_list
-						    ACE_ENV_ARG_PARAMETER);
+						    attr_list);
 }
 
 DsLogAdmin::NVList*
-TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id
-                             ACE_ENV_ARG_DECL)
+TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId))
 {
@@ -1128,29 +1003,26 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id
                            guard,
                            this->recordstore_->lock (),
                            CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-  
 
-  return this->recordstore_->get_record_attribute (id
-						   ACE_ENV_ARG_PARAMETER);
+
+  return this->recordstore_->get_record_attribute (id);
 }
 
 void
-TAO_Log_i::flush (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::flush (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS))
 {
   /// XXX locks?
-  this->recordstore_->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->recordstore_->flush ();
 }
 
 CORBA::Boolean
-TAO_Log_i::scheduled (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::scheduled (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::TimeInterval interval =
-    this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->recordstore_->get_interval ();
 
   TimeBase::TimeT current_time;
   ACE_Time_Value now = ACE_OS::gettimeofday ();
@@ -1198,102 +1070,71 @@ TAO_Log_i::scheduled (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log
-                            ACE_ENV_ARG_DECL)
+TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const DsLogAdmin::LogFullActionType log_full_action =
-    this->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_log_full_action ();
 
-  log->set_log_full_action (log_full_action
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  log->set_log_full_action (log_full_action);
 
   const CORBA::ULongLong max_size =
-    this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_max_size ();
 
-  log->set_max_size (max_size
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  log->set_max_size (max_size);
 
   DsLogAdmin::QoSList_var log_qos =
-    this->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_log_qos ();
 
-  log->set_log_qos (log_qos.in ()
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  log->set_log_qos (log_qos.in ());
 
   const CORBA::ULong max_record_life =
-    this->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_max_record_life ();
 
-  log->set_max_record_life (max_record_life
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  log->set_max_record_life (max_record_life);
 
   const DsLogAdmin::AdministrativeState adminstrative_state =
-    this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_administrative_state ();
 
-  log->set_administrative_state (adminstrative_state
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  log->set_administrative_state (adminstrative_state);
 
   const DsLogAdmin::ForwardingState forwarding_state =
-    this->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_forwarding_state ();
 
-  log->set_forwarding_state (forwarding_state
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  log->set_forwarding_state (forwarding_state);
 
   const DsLogAdmin::TimeInterval interval =
-    this->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_interval ();
 
-  log->set_interval (interval
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  log->set_interval (interval);
 
   DsLogAdmin::CapacityAlarmThresholdList_var capacity_list =
-    this->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_capacity_alarm_thresholds ();
 
-  log->set_capacity_alarm_thresholds (capacity_list.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  log->set_capacity_alarm_thresholds (capacity_list.in ());
 
   DsLogAdmin::WeekMask_var week_mask =
-    this->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_week_mask ();
 
-  log->set_week_mask (week_mask.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  log->set_week_mask (week_mask.in ());
 }
 
 void
-TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::remove_old_records (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CORBA::ULong count =
-    this->recordstore_->remove_old_records (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->remove_old_records ();
 
   if (count > 0)
     {
       if (avail_status_.log_full)
 	{
 	  const CORBA::ULongLong current_size =
-	    this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_CHECK;
+      this->recordstore_->get_current_size ();
 
 	  const CORBA::ULongLong max_size =
-	    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_CHECK;
+      this->recordstore_->get_max_size ();
 
 	  if (current_size < max_size)
 	    {
@@ -1301,31 +1142,27 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
 	    }
 	}
 
-      this->reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->reset_capacity_alarm_threshold ();
     }
 }
 
 void
-TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::check_capacity_alarm_threshold (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CORBA::ULongLong max_size =
-    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_max_size ();
 
   if (max_size != 0 && this->thresholds_.length () > 0)
     {
       const DsLogAdmin::LogFullActionType log_full_action =
-	this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
+  this->recordstore_->get_log_full_action ();
+
       CORBA::ULongLong current_size =
 	((log_full_action == DsLogAdmin::wrap)
-	 ? this->recordstore_->get_gauge (ACE_ENV_SINGLE_ARG_PARAMETER)
-	 : this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK;
-      
+   ? this->recordstore_->get_gauge ()
+   : this->recordstore_->get_current_size ());
+
       const CORBA::UShort percent =
         static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U) /
 				     (double) ACE_UINT64_DBLCAST_ADAPTER (max_size)));
@@ -1345,9 +1182,7 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
                 logid_,
                 this->thresholds_[this->current_threshold_],
                 percent,
-                severity
-                ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                severity);
             }
           else
             {
@@ -1374,24 +1209,21 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Log_i::reset_capacity_alarm_threshold (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CORBA::ULongLong max_size =
-    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->recordstore_->get_max_size ();
 
   if (max_size != 0 && this->thresholds_.length() > 0)
     {
       const DsLogAdmin::LogFullActionType log_full_action =
-	this->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+  this->recordstore_->get_log_full_action ();
 
       if (log_full_action == DsLogAdmin::halt)
 	{
 	  const CORBA::ULongLong current_size =
-	    this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-	  ACE_CHECK;
+      this->recordstore_->get_current_size ();
 
 	  const CORBA::UShort percent =
 	    static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) /
@@ -1408,8 +1240,7 @@ TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_Log_i::validate_capacity_alarm_thresholds (
-    const DsLogAdmin::CapacityAlarmThresholdList & threshs
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const DsLogAdmin::CapacityAlarmThresholdList & threshs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < threshs.length (); i++)
@@ -1431,8 +1262,7 @@ TAO_Log_i::validate_capacity_alarm_thresholds (
 }
 
 void
-TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos
-			  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos)
 {
   // @@ The current revision of the specification (formal/03-07-01)
   // does not clearly define the semantics to follow when the QoSList
@@ -1440,12 +1270,12 @@ TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos
   // I have submitted a defect report to the OMG for clarification.
   //
   // In the mean time, the last property found in the QoSList takes
-  // presidence. 
+  // presidence.
   //    --jtc
 
   DsLogAdmin::QoSType qostype = DsLogAdmin::QoSNone;
 
-  for (CORBA::ULong i = 0; i < qos.length (); ++i) 
+  for (CORBA::ULong i = 0; i < qos.length (); ++i)
     {
       qostype = qos[i];
     }
@@ -1459,8 +1289,7 @@ TAO_Log_i::reset_log_qos (const DsLogAdmin::QoSList& qos
 }
 
 void
-TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos 
-			     ACE_ENV_ARG_DECL)
+TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos)
   ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS))
 {
   DsLogAdmin::QoSList denied;
@@ -1483,13 +1312,12 @@ TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos
   // exception.
   if (denied.length() != 0)
     {
-      ACE_THROW (DsLogAdmin::UnsupportedQoS (denied));
+      throw DsLogAdmin::UnsupportedQoS (denied);
     }
 }
 
 void
-TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks 
-			    ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks)
 {
   CORBA::ULong count = 0;
   weekly_intervals_.length (100);
@@ -1529,8 +1357,7 @@ TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks
 }
 
 void
-TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks
-			       ACE_ENV_ARG_DECL)
+TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks)
   ACE_THROW_SPEC ((DsLogAdmin::InvalidTime,
 		   DsLogAdmin::InvalidTimeInterval,
 		   DsLogAdmin::InvalidMask))
@@ -1545,7 +1372,7 @@ TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks
                            DsLogAdmin::Friday +
                            DsLogAdmin::Saturday)
           )
-        ACE_THROW (DsLogAdmin::InvalidMask ());
+        throw DsLogAdmin::InvalidMask ();
 
       for (CORBA::ULong j = 0; j < masks[i].intervals.length (); ++j)
         {
@@ -1553,17 +1380,17 @@ TAO_Log_i::validate_week_mask (const DsLogAdmin::WeekMask& masks
               masks[i].intervals[j].start.minute > 59 ||
               masks[i].intervals[j].stop.hour > 23 ||
               masks[i].intervals[j].stop.minute > 59)
-            ACE_THROW (DsLogAdmin::InvalidTime ());
+            throw DsLogAdmin::InvalidTime ();
 
           if (masks[i].intervals[j].stop.hour <
               masks[i].intervals[j].start.hour)
-            ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
+            throw DsLogAdmin::InvalidTimeInterval ();
 
           if (masks[i].intervals[j].stop.hour ==
               masks[i].intervals[j].start.hour &&
               masks[i].intervals[j].stop.minute <=
               masks[i].intervals[j].start.minute)
-            ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
+            throw DsLogAdmin::InvalidTimeInterval ();
         }
     }
 }
@@ -1580,9 +1407,9 @@ operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs,
       return false;
     }
 
-  for (CORBA::ULong i = 0; i < length; ++i) 
+  for (CORBA::ULong i = 0; i < length; ++i)
     {
-      if (rhs[i] != lhs[i]) 
+      if (rhs[i] != lhs[i])
 	{
 	  return false;
 	}
@@ -1733,10 +1560,10 @@ operator==(const DsLogAdmin::WeekMask& rhs,
     {
       return false;
     }
- 
+
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      if (rhs[i] != lhs[i]) 
+      if (rhs[i] != lhs[i])
         {
           return false;
         }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 38d0ffa0e54..60caca26dfc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -62,7 +62,7 @@ public:
   ~TAO_Log_i ();
 
   /// Initlialize the Log.
-  void init (ACE_ENV_SINGLE_ARG_DECL);
+  void init (void);
 
   /**
    * @name DsLogAdmin::Log Methods
@@ -71,78 +71,73 @@ public:
    */
   //@{
   /// Return the factory of the log.
-  DsLogAdmin::LogMgr_ptr my_factory (ACE_ENV_SINGLE_ARG_DECL)
+  DsLogAdmin::LogMgr_ptr my_factory (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the id of the log.
-  DsLogAdmin::LogId id (ACE_ENV_SINGLE_ARG_DECL)
+  DsLogAdmin::LogId id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the list of the QoS properties supported by the log.
   DsLogAdmin::QoSList*
-  get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
+  get_log_qos (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the list of the QoS properties supported by the log.
-  void set_log_qos (const DsLogAdmin::QoSList & qos
-                ACE_ENV_ARG_DECL)
+  void set_log_qos (const DsLogAdmin::QoSList & qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS));
 
   /// Get the record life in seconds (0 infinite).
   CORBA::ULong
-  get_max_record_life (ACE_ENV_SINGLE_ARG_DECL)
+  get_max_record_life (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the record life in seconds (0 infinite).
   void
-  set_max_record_life (CORBA::ULong life
-                       ACE_ENV_ARG_DECL)
+  set_max_record_life (CORBA::ULong life)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the maximum size in octets.
   CORBA::ULongLong
-  get_max_size (ACE_ENV_SINGLE_ARG_DECL)
+  get_max_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the maximum size in octets.
   void
-  set_max_size (CORBA::ULongLong size
-                ACE_ENV_ARG_DECL)
+  set_max_size (CORBA::ULongLong size)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam));
 
   /// Get the current size of the log in octets.
   CORBA::ULongLong
-  get_current_size (ACE_ENV_SINGLE_ARG_DECL)
+  get_current_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the number of records in the log.
   CORBA::ULongLong
-  get_n_records (ACE_ENV_SINGLE_ARG_DECL)
+  get_n_records (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the action to be taken when the log reaches its maximum size.
   DsLogAdmin::LogFullActionType
-  get_log_full_action (ACE_ENV_SINGLE_ARG_DECL)
+  get_log_full_action (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the action to be taken when the log reaches its maximum size.
   void
-  set_log_full_action (DsLogAdmin::LogFullActionType action
-                       ACE_ENV_ARG_DECL)
+  set_log_full_action (DsLogAdmin::LogFullActionType action)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     DsLogAdmin::InvalidLogFullAction));
 
   /// Get the administrative state of the log.
   DsLogAdmin::AdministrativeState
-  get_administrative_state (ACE_ENV_SINGLE_ARG_DECL)
+  get_administrative_state (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the administrative state of the log.
   void
-  set_administrative_state (DsLogAdmin::AdministrativeState state
-                            ACE_ENV_ARG_DECL)
+  set_administrative_state (DsLogAdmin::AdministrativeState state)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the forwarding state of the log.
@@ -150,42 +145,40 @@ public:
   /// @@@ Of course!  get_forwarding_state() is virtual in the base
   ///     class dictated by the IDL!  -Ossama
   virtual DsLogAdmin::ForwardingState
-  get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL)
+  get_forwarding_state (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the forwarding state of the log.
   /// @@ Note: is it ok to make this method virtual?
   void
-    set_forwarding_state (DsLogAdmin::ForwardingState state
-                          ACE_ENV_ARG_DECL)
+    set_forwarding_state (DsLogAdmin::ForwardingState state)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the operational state of the log.
   DsLogAdmin::OperationalState
-  get_operational_state (ACE_ENV_SINGLE_ARG_DECL)
+  get_operational_state (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the log duration
   DsLogAdmin::TimeInterval
-  get_interval (ACE_ENV_SINGLE_ARG_DECL)
+  get_interval (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the log duration.
   void
-  set_interval (const DsLogAdmin::TimeInterval & interval
-                ACE_ENV_ARG_DECL)
+  set_interval (const DsLogAdmin::TimeInterval & interval)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval));
 
   /// Get the availability status
   DsLogAdmin::AvailabilityStatus
-  get_availability_status (ACE_ENV_SINGLE_ARG_DECL)
+  get_availability_status (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the capacity alarm threshold
   DsLogAdmin::CapacityAlarmThresholdList*
-    get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL)
+    get_capacity_alarm_thresholds (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -198,20 +191,18 @@ public:
    */
   void
   set_capacity_alarm_thresholds
-  (const DsLogAdmin::CapacityAlarmThresholdList & threshs
-   ACE_ENV_ARG_DECL)
+  (const DsLogAdmin::CapacityAlarmThresholdList & threshs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidThreshold));
 
   /// Get the weekly scheduling parameters
   DsLogAdmin::WeekMask*
-  get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
+  get_week_mask (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the weekly scheduling parameters.
   void
-  set_week_mask (const DsLogAdmin::WeekMask & masks
-                 ACE_ENV_ARG_DECL)
+  set_week_mask (const DsLogAdmin::WeekMask & masks)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval,
@@ -222,8 +213,7 @@ public:
   DsLogAdmin::RecordList*
   query (const char * grammar,
          const char * c,
-         DsLogAdmin::Iterator_out i
-         ACE_ENV_ARG_DECL)
+         DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -233,15 +223,13 @@ public:
   DsLogAdmin::RecordList*
   retrieve (DsLogAdmin::TimeT from_time,
             CORBA::Long how_many,
-            DsLogAdmin::Iterator_out i
-            ACE_ENV_ARG_DECL)
+            DsLogAdmin::Iterator_out i)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the number of records matching constraint <c>.
   CORBA::ULong
   match (const char * grammar,
-         const char * c
-         ACE_ENV_ARG_DECL)
+         const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -249,23 +237,20 @@ public:
   /// Delete records matching constraint <c>.
   CORBA::ULong
   delete_records (const char * grammar,
-                  const char * c
-                  ACE_ENV_ARG_DECL)
+                  const char * c)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
 
   /// Delete records matching ids in <ids>
   CORBA::ULong
-  delete_records_by_id (const DsLogAdmin::RecordIdList & ids
-                        ACE_ENV_ARG_DECL)
+  delete_records_by_id (const DsLogAdmin::RecordIdList & ids)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// Write records to the log storage.
   void
-  write_records (const DsLogAdmin::Anys & records
-                 ACE_ENV_ARG_DECL)
+  write_records (const DsLogAdmin::Anys & records)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogOffDuty,
@@ -275,8 +260,7 @@ public:
   /// Write a list of record ids to storage. Raises DsLogAdmin::LogFull
   /// and DsLogAdmin::LogLocked
   void
-  write_recordlist (const DsLogAdmin::RecordList & list
-                    ACE_ENV_ARG_DECL)
+  write_recordlist (const DsLogAdmin::RecordList & list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogOffDuty,
@@ -286,8 +270,7 @@ public:
   /// Set single record attributes.
   void
   set_record_attribute (DsLogAdmin::RecordId id,
-                        const DsLogAdmin::NVList & attr_list
-                        ACE_ENV_ARG_DECL)
+                        const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId,
                      DsLogAdmin::InvalidAttribute));
@@ -297,8 +280,7 @@ public:
   CORBA::ULong
   set_records_attribute (const char * grammar,
                          const char * c,
-                         const DsLogAdmin::NVList & attr_list
-                         ACE_ENV_ARG_DECL)
+                         const DsLogAdmin::NVList & attr_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -307,61 +289,56 @@ public:
   /// Get the attributes of the record with id <id>. Raises
   /// DsLogAdmin::InvalidRecordId
   DsLogAdmin::NVList*
-  get_record_attribute (DsLogAdmin::RecordId id
-                        ACE_ENV_ARG_DECL)
+  get_record_attribute (DsLogAdmin::RecordId id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId));
 
   /// Causes all pending events to be written to storage. Raises
   /// DsLogAdmin::UnsupportedQos
   void
-  flush (ACE_ENV_SINGLE_ARG_DECL)
+  flush (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS));
   //@}
 
   /// Remove records that have exceeded max_record_life_.
-  void remove_old_records (ACE_ENV_SINGLE_ARG_DECL)
+  void remove_old_records (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
   /// Get the availability status
   /// @note must be called with locks held
   DsLogAdmin::AvailabilityStatus
-  get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
+  get_availability_status_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Tells if the Log is scheduled to run now.
   /// @note must be called with locks held
-  CORBA::Boolean scheduled (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Boolean scheduled (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Copy the attributes of the log being passed.
-  void copy_attributes (DsLogAdmin::Log_ptr log
-                        ACE_ENV_ARG_DECL)
+  void copy_attributes (DsLogAdmin::Log_ptr log)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Check if threshold reached.
-  void check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
+  void check_capacity_alarm_threshold (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Reset capacity alarm threshold.
-  void reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
+  void reset_capacity_alarm_threshold (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Check that valid threshold values have been given.
   static CORBA::Boolean validate_capacity_alarm_thresholds (
-    const DsLogAdmin::CapacityAlarmThresholdList & threshs
-   ACE_ENV_ARG_DECL)
+    const DsLogAdmin::CapacityAlarmThresholdList & threshs)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Reset Log QoS
-  void reset_log_qos (const DsLogAdmin::QoSList& qos
-		      ACE_ENV_ARG_DECL);
+  void reset_log_qos (const DsLogAdmin::QoSList& qos);
 
   /// Validate log QoS
-  void validate_log_qos (const DsLogAdmin::QoSList& qos
-			 ACE_ENV_ARG_DECL)
+  void validate_log_qos (const DsLogAdmin::QoSList& qos)
     ACE_THROW_SPEC ((DsLogAdmin::UnsupportedQoS));
 
   /// Reset Week Mask
@@ -370,16 +347,14 @@ protected:
   /// week mask list when the log service starts, and to reinitialize
   /// them when they are changed.
   ///
-  void reset_week_mask (const DsLogAdmin::WeekMask& masks
-			ACE_ENV_ARG_DECL);
+  void reset_week_mask (const DsLogAdmin::WeekMask& masks);
 
   /// Validate Week Mask
   ///
   /// Used to check whether week mask is valid.  If not, throws an
   /// InvalidTime, InvalidTimeInterval, or InvalidMask exception.
   ///
-  void validate_week_mask (const DsLogAdmin::WeekMask& masks
-			   ACE_ENV_ARG_DECL)
+  void validate_week_mask (const DsLogAdmin::WeekMask& masks)
     ACE_THROW_SPEC ((DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval,
                      DsLogAdmin::InvalidMask));
@@ -394,7 +369,7 @@ protected:
   /// The log's factory's object reference
   DsLogAdmin::LogMgr_var factory_;
 
-  /// The log's id 
+  /// The log's id
   DsLogAdmin::LogId logid_;
 
   /// The log's operational state
@@ -438,7 +413,7 @@ protected:
   static const ACE_Time_Value	log_flush_interval_;
 };
 
-bool TAO_Log_Serv_Export 
+bool TAO_Log_Serv_Export
 operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs,
            const DsLogAdmin::CapacityAlarmThresholdList& lhs);
 
@@ -489,11 +464,11 @@ operator!=(const DsLogAdmin::TimeInterval& rhs,
 bool TAO_Log_Serv_Export
 operator==(const DsLogAdmin::WeekMaskItem& rhs,
            const DsLogAdmin::WeekMaskItem& lhs);
-	
+
 bool TAO_Log_Serv_Export
 operator!=(const DsLogAdmin::WeekMaskItem& rhs,
            const DsLogAdmin::WeekMaskItem& lhs);
-	
+
 bool TAO_Log_Serv_Export
 operator==(const DsLogAdmin::WeekMask& rhs,
            const DsLogAdmin::WeekMask& lhs);
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 97f1a9803f1..226586b688b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -19,47 +19,39 @@ TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer (void)
 
 void
 TAO_Notify_LogConsumer::connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::PushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, proxy_supplier_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::ProxyPushSupplier::
-    _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    _narrow (proxysupplier.in ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_any_push_consumer (objref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_supplier_->connect_any_push_consumer (objref.in ());
 
 }
 
 void
-TAO_Notify_LogConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_LogConsumer::disconnect (void)
 {
   this->proxy_supplier_->
-    disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    disconnect_push_supplier();
 }
 
 void
 TAO_Notify_LogConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq & /*removed*/)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -70,8 +62,7 @@ TAO_Notify_LogConsumer::offer_change
 
 void
 TAO_Notify_LogConsumer::push
-   (const CORBA::Any& event
-    ACE_ENV_ARG_DECL)
+   (const CORBA::Any& event)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -107,34 +98,32 @@ TAO_Notify_LogConsumer::push
   //
   // I have submitted a defect report to the OMG for clarification.
   //    --jtc
-  ACE_TRY 
+  try
     {
       // log the RecordList.
-      this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->log_->write_recordlist (recList);
     }
-  ACE_CATCH (DsLogAdmin::LogFull, ex)
+  catch (const DsLogAdmin::LogFull& )
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
-  ACE_CATCH (DsLogAdmin::LogOffDuty, ex)
+  catch (const DsLogAdmin::LogOffDuty& )
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
-  ACE_CATCH (DsLogAdmin::LogLocked, ex)
+  catch (const DsLogAdmin::LogLocked& )
     {
-      ACE_THROW (CORBA::NO_PERMISSION ());
+      throw CORBA::NO_PERMISSION ();
     }
-  ACE_CATCH (DsLogAdmin::LogDisabled, ex)
+  catch (const DsLogAdmin::LogDisabled& )
     {
-      ACE_THROW (CORBA::TRANSIENT ());
+      throw CORBA::TRANSIENT ();
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_Notify_LogConsumer::disconnect_push_consumer
-   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
index c464e91f8d4..2739da295fb 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -59,10 +59,10 @@ public:
   TAO_Notify_LogConsumer (TAO_NotifyLog_i *log);
 
   /// Connect to NotifyLog.
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   /// Disconnect from NotifyLog.
-  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect (void);
 
 protected:
   /// Destructor.
@@ -72,7 +72,6 @@ protected:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -82,7 +81,6 @@ protected:
   // = PushSupplier methods
   virtual void push (
       const CORBA::Any & event
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -90,7 +88,6 @@ protected:
      ));
 
   virtual void disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
       )
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 32af058cd1c..102221bc7da 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -16,7 +16,6 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void)
 TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf)
 : notify_factory_ (ecf)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   CosNotifyChannelAdmin::ChannelID id;
   CosNotifyChannelAdmin::AdminID adminID = 0;
@@ -26,8 +25,7 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChan
   this->event_channel_ =
           this->notify_factory_->create_channel (initial_qos,
                                                  initial_admin,
-                                                 id
-                      ACE_ENV_ARG_PARAMETER);
+                                                 id);
 
   this->consumer_admin_ = this->event_channel_->new_for_consumers(CosNotifyChannelAdmin::OR_OP, adminID);
 
@@ -39,8 +37,7 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChan
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->subscription_change (added, removed);
 
     ACE_NEW_THROW_EX (this->notifier_,
                   TAO_NotifyLogNotification(this->event_channel_.in ()),
@@ -54,33 +51,23 @@ TAO_NotifyLogFactory_i::~TAO_NotifyLogFactory_i()
 
 DsNotifyLogAdmin::NotifyLogFactory_ptr
 TAO_NotifyLogFactory_i::activate (CORBA::ORB_ptr orb,
-                                  PortableServer::POA_ptr poa
-                                  ACE_ENV_ARG_DECL)
+                                  PortableServer::POA_ptr poa)
 {
-  TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
+  TAO_LogMgr_i::init (orb, poa);
 
 
   PortableServer::ObjectId_var oid =
-    this->factory_poa_->activate_object (this
-					 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
+    this->factory_poa_->activate_object (this);
 
   CORBA::Object_var obj =
-    this->factory_poa_->id_to_reference (oid.in ()
-					 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
+    this->factory_poa_->id_to_reference (oid.in ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
+    DsLogAdmin::LogMgr::_narrow (obj.in ());
 
   DsNotifyLogAdmin::NotifyLogFactory_var v_return =
-    DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLogFactory::_nil ());
+    DsNotifyLogAdmin::NotifyLogFactory::_narrow (obj.in ());
 
   return v_return._retn ();
 }
@@ -93,7 +80,6 @@ TAO_NotifyLogFactory_i::create (
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin,
         DsLogAdmin::LogId_out id_out
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -109,19 +95,15 @@ TAO_NotifyLogFactory_i::create (
   this->create_i (full_action,
 		  max_size,
 		  & thresholds,
-		  id_out
-		  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
+		  id_out);
   DsLogAdmin::LogId id = id_out;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
+    this->create_log_object (id);
 #endif
 
   // narrow to NotifyLog
@@ -129,8 +111,7 @@ TAO_NotifyLogFactory_i::create (
     DsNotifyLogAdmin::NotifyLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
+  notifier_->object_creation (id);
 
   return notify_log._retn ();
 }
@@ -143,7 +124,6 @@ TAO_NotifyLogFactory_i::create_with_id (
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -160,18 +140,14 @@ TAO_NotifyLogFactory_i::create_with_id (
   this->create_with_id_i (id,
 			  full_action,
 			  max_size,
-			  & thresholds
-			  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
+			  & thresholds);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
+    this->create_log_object (id);
 #endif
 
   // narrow to NotifyLog
@@ -179,8 +155,7 @@ TAO_NotifyLogFactory_i::create_with_id (
     DsNotifyLogAdmin::NotifyLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsNotifyLogAdmin::NotifyLog::_nil ());
+  notifier_->object_creation (id);
 
   return notify_log._retn();
 }
@@ -192,8 +167,7 @@ TAO_NotifyLogFactory_i::create_repositoryid ()
 }
 
 PortableServer::ServantBase*
-TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id
-					    ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 {
   TAO_NotifyLog_i* notify_log_i;
 
@@ -207,29 +181,26 @@ TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id
                                      id
                                      ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
-  notify_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  notify_log_i->init ();
 
   //initialise the LogConsumer object
-  notify_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  notify_log_i->activate ();
 
   return notify_log_i;
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_NotifyLogFactory_i::MyID (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::MyID (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->MyID (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->MyID ();
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_NotifyLogFactory_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::MyChannel (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -238,130 +209,128 @@ TAO_NotifyLogFactory_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_NotifyLogFactory_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::MyOperator (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->MyOperator ();
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_NotifyLogFactory_i::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::priority_filter (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->priority_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->priority_filter ();
 }
 
 void
-TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filter ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filter)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  consumer_admin_->priority_filter(filter ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->priority_filter(filter);
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_NotifyLogFactory_i::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::lifetime_filter (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->lifetime_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->lifetime_filter ();
 }
 
 void
-TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filter ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filter)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  consumer_admin_->lifetime_filter (filter ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->lifetime_filter (filter);
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NotifyLogFactory_i::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::pull_suppliers (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->pull_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->pull_suppliers ();
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_NotifyLogFactory_i::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::push_suppliers (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->push_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->push_suppliers ();
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_NotifyLogFactory_i::get_proxy_supplier (
-  CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ProxyID proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::ProxyNotFound,
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->get_proxy_supplier (proxy_id ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->get_proxy_supplier (proxy_id);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_NotifyLogFactory_i::obtain_notification_pull_supplier (
   CosNotifyChannelAdmin::ClientType ctype,
-  CosNotifyChannelAdmin::ProxyID& proxy_id ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ProxyID& proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminLimitExceeded,
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->obtain_notification_pull_supplier (ctype, proxy_id ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->obtain_notification_pull_supplier (ctype, proxy_id);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_NotifyLogFactory_i::obtain_notification_push_supplier (
   CosNotifyChannelAdmin::ClientType ctype,
-  CosNotifyChannelAdmin::ProxyID& proxy_id ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ProxyID& proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminLimitExceeded,
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->obtain_notification_push_supplier (ctype, proxy_id ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->obtain_notification_push_supplier (ctype, proxy_id);
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_NotifyLogFactory_i::obtain_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  return consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->obtain_push_supplier ();
 }
 
 
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_NotifyLogFactory_i::obtain_pull_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 
 {
-  return consumer_admin_->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->obtain_pull_supplier ();
 }
 
 void
-TAO_NotifyLogFactory_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_NotifyLogFactory_i::destroy (void)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ))
@@ -372,91 +341,89 @@ TAO_NotifyLogFactory_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 //CosNotifyComm::NotifySubscribe
 void
 TAO_NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq& added,
-                          const CosNotification::EventTypeSeq& removed
-                          ACE_ENV_ARG_DECL)
+                          const CosNotification::EventTypeSeq& removed)
     ACE_THROW_SPEC ((
       CosNotifyComm::InvalidEventType,
       CORBA::SystemException
     ))
 {
-  consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->subscription_change (added, removed);
 }
 
 CosNotification::QoSProperties*
-TAO_NotifyLogFactory_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::get_qos (void)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ))
 {
-  return consumer_admin_->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->get_qos ();
 }
 
 void
-TAO_NotifyLogFactory_i::set_qos (const CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::set_qos (const CosNotification::QoSProperties& qos)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ))
 {
-  consumer_admin_->set_qos (qos ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->set_qos (qos);
 }
 
 void
 TAO_NotifyLogFactory_i::validate_qos (const CosNotification::QoSProperties& required_qos,
-                   CosNotification::NamedPropertyRangeSeq_out available_qos
-                   ACE_ENV_ARG_DECL)
+                   CosNotification::NamedPropertyRangeSeq_out available_qos)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ))
 {
-  consumer_admin_->validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->validate_qos (required_qos, available_qos);
 }
 
 CosNotifyFilter::FilterID
-TAO_NotifyLogFactory_i::add_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::add_filter (CosNotifyFilter::Filter_ptr filter)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ))
 {
-  return consumer_admin_->add_filter (filter ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->add_filter (filter);
 }
 
 void
-TAO_NotifyLogFactory_i::remove_filter (CosNotifyFilter::FilterID id ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::remove_filter (CosNotifyFilter::FilterID id)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ))
 {
-  consumer_admin_->remove_filter (id ACE_ENV_ARG_PARAMETER);
+  consumer_admin_->remove_filter (id);
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id ACE_ENV_ARG_DECL)
+TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id)
     ACE_THROW_SPEC ((
       CosNotifyFilter::FilterNotFound,
       CORBA::SystemException
     ))
 {
-  return consumer_admin_->get_filter (id ACE_ENV_ARG_PARAMETER);
+  return consumer_admin_->get_filter (id);
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_NotifyLogFactory_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::get_all_filters (void)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ))
 {
-  return consumer_admin_->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_admin_->get_all_filters ();
 }
 
 void
-TAO_NotifyLogFactory_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLogFactory_i::remove_all_filters (void)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ))
 {
-  consumer_admin_->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  consumer_admin_->remove_all_filters ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index bbe8127c077..89ba2e56282 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -62,8 +62,7 @@ public:
   /// Activate this servant with the ORB and POA passed in.
   DsNotifyLogAdmin::NotifyLogFactory_ptr
     activate (CORBA::ORB_ptr orb,
-              PortableServer::POA_ptr poa
-              ACE_ENV_ARG_DECL);
+              PortableServer::POA_ptr poa);
 
   /// Used to create an NotifyLog.
   DsNotifyLogAdmin::NotifyLog_ptr create (
@@ -73,7 +72,6 @@ public:
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin,
         DsLogAdmin::LogId_out id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -91,7 +89,6 @@ public:
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         const CosNotification::QoSProperties & initial_qos,
         const CosNotification::AdminProperties & initial_admin
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -104,50 +101,50 @@ public:
 
 
   // = Methods from CosNotifyChannelAdmin::ConsumerAdmin.
-  CosNotifyChannelAdmin::AdminID MyID (ACE_ENV_SINGLE_ARG_DECL)
+  CosNotifyChannelAdmin::AdminID MyID (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  CosNotifyChannelAdmin::EventChannel_ptr MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+  CosNotifyChannelAdmin::EventChannel_ptr MyChannel (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (ACE_ENV_SINGLE_ARG_DECL)
+  CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  CosNotifyFilter::MappingFilter_ptr priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+  CosNotifyFilter::MappingFilter_ptr priority_filter (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  void priority_filter (CosNotifyFilter::MappingFilter_ptr ACE_ENV_ARG_DECL)
+  void priority_filter (CosNotifyFilter::MappingFilter_ptr)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  CosNotifyFilter::MappingFilter_ptr lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+  CosNotifyFilter::MappingFilter_ptr lifetime_filter (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  void lifetime_filter (CosNotifyFilter::MappingFilter_ptr ACE_ENV_ARG_DECL)
+  void lifetime_filter (CosNotifyFilter::MappingFilter_ptr)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  CosNotifyChannelAdmin::ProxyIDSeq* pull_suppliers (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  CosNotifyChannelAdmin::ProxyIDSeq* push_suppliers (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
-    CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::ProxyID proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::ProxyNotFound,
       CORBA::SystemException
@@ -155,7 +152,7 @@ public:
 
   CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID& proxy_id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::ProxyID& proxy_id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminLimitExceeded,
       CORBA::SystemException
@@ -163,77 +160,73 @@ public:
 
   CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::ProxyID& id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminLimitExceeded,
       CORBA::SystemException
     ));
 
   CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-          ACE_ENV_SINGLE_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
   CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
-          ACE_ENV_SINGLE_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy (void)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
   /// CosNotifyComm::NotifySubscribe.
   void subscription_change (const CosNotification::EventTypeSeq& added,
-                            const CosNotification::EventTypeSeq& removed
-                            ACE_ENV_ARG_DECL)
+                            const CosNotification::EventTypeSeq& removed)
     ACE_THROW_SPEC ((
       CosNotifyComm::InvalidEventType,
       CORBA::SystemException
     ));
 
   /// CosNotification::QoSAdmin.
-  CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL)
+  CosNotification::QoSProperties* get_qos (void)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-  void set_qos (const CosNotification::QoSProperties& ACE_ENV_ARG_DECL)
+  void set_qos (const CosNotification::QoSProperties&)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ));
   void validate_qos (const CosNotification::QoSProperties&,
-                     CosNotification::NamedPropertyRangeSeq_out
-                     ACE_ENV_ARG_DECL)
+                     CosNotification::NamedPropertyRangeSeq_out)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ));
 
   /// CosNotifyFilter::FilterAdmin.
-  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr ACE_ENV_ARG_DECL)
+  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-  void remove_filter (CosNotifyFilter::FilterID ACE_ENV_ARG_DECL)
+  void remove_filter (CosNotifyFilter::FilterID)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-  CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID ACE_ENV_ARG_DECL)
+  CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID)
     ACE_THROW_SPEC ((
       CosNotifyFilter::FilterNotFound,
       CORBA::SystemException
     ));
-  CosNotifyFilter::FilterIDSeq* get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+  CosNotifyFilter::FilterIDSeq* get_all_filters (void)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
-  void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+  void remove_all_filters (void)
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
@@ -241,10 +234,9 @@ public:
 protected:
   virtual CORBA::RepositoryId
     create_repositoryid ();
-	
+
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL);
+    create_log_servant (DsLogAdmin::LogId id);
 
   /// Our object ref. after <active>ation.
   DsLogAdmin::LogMgr_var log_mgr_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index 1a3762a4d51..e3f5117bedf 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -15,35 +15,29 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification (
   : TAO_LogNotification (),
     event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  
+
   CosNotifyComm::PushSupplier_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
   ACE_ASSERT (!CORBA::is_nil (objref.in ()));
 
   CosNotifyChannelAdmin::AdminID adminID;
-  CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = 
+  CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
     this->event_channel_->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, adminID);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin.in ()));
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, proxy_consumer_id_);
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in ());
 
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_any_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->connect_any_push_supplier (objref.in ());
 }
 
 TAO_NotifyLogNotification::~TAO_NotifyLogNotification (void)
@@ -56,15 +50,14 @@ TAO_NotifyLogNotification::send_notification (const CORBA::Any& any)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
-{ 
+{
   this->proxy_consumer_->push (any);
 }
 
 void
 TAO_NotifyLogNotification::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
-    const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq & /*removed */)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -75,14 +68,14 @@ TAO_NotifyLogNotification::subscription_change
 
 void
 TAO_NotifyLogNotification::disconnect_push_supplier
-   (ACE_ENV_SINGLE_ARG_DECL)
+   (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_consumer_->disconnect_push_consumer();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
index 00e86066473..5d39f68220a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -68,7 +68,6 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -77,7 +76,6 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index db13c800447..22c4f8e7d8f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -22,7 +22,6 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb,
     notify_factory_ (CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf)),
     poa_ (PortableServer::POA::_duplicate (poa))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   CosNotifyChannelAdmin::ChannelID channel_id;
 
@@ -35,8 +34,7 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb,
   this->event_channel_ =
           this->notify_factory_->create_channel (initial_qos,
                                                  initial_admin,
-                                                 channel_id
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 channel_id);
 }
 
 TAO_NotifyLog_i::~TAO_NotifyLog_i ()
@@ -45,83 +43,68 @@ TAO_NotifyLog_i::~TAO_NotifyLog_i ()
 }
 
 DsLogAdmin::Log_ptr
-TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
-    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ());
 
-  CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  CosNotification::QoSProperties* qos = get_qos ();
 
-  CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  CosNotification::AdminProperties* admin = get_admin ();
 
   DsNotifyLogAdmin::NotifyLog_var log =
     notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
                                static_cast<const CosNotification::AdminProperties> (*admin), id);
 
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 }
 
 DsLogAdmin::Log_ptr
-TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   DsNotifyLogAdmin::NotifyLogFactory_var notifyLogFactory =
-    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    DsNotifyLogAdmin::NotifyLogFactory::_narrow (factory_.in ());
 
-  CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  CosNotification::QoSProperties* qos = get_qos ();
 
-  CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  CosNotification::AdminProperties* admin = get_admin ();
 
   DsNotifyLogAdmin::NotifyLog_var log =
     notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties> (*qos),
                                static_cast<const CosNotification::AdminProperties> (*admin));
 
-  this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  this->copy_attributes (log.in ());
 
   return log._retn ();
 }
 
 
 void
-TAO_NotifyLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  notifier_->object_deletion (logid_);
 
   // Remove ourselves from the list of logs.
-  this->logmgr_i_.remove (this->logid_
-			  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->logmgr_i_.remove (this->logid_);
 
   // Deregister with POA.
   PortableServer::ObjectId_var id =
-    this->poa_->servant_to_id (this
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->servant_to_id (this);
 
-  this->poa_->deactivate_object (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->deactivate_object (id.in ());
 }
 
 void
-TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::activate (void)
 {
 
   CosNotifyChannelAdmin::AdminID adminid = 0;
@@ -129,19 +112,16 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
     CosNotifyChannelAdmin::OR_OP;
 
   this->consumer_admin_ =
-    this->event_channel_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->new_for_consumers (ifgop, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   CosNotifyFilter::FilterFactory_var ffact =
-    this->event_channel_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->default_filter_factory ();
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var ca_filter =
-    ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ffact->create_filter (TCL_GRAMMAR);
 
   ACE_ASSERT (!CORBA::is_nil (ca_filter.in ()));
 
@@ -151,11 +131,9 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER);
 
-  ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ca_filter->add_constraints (constraint_list);
 
-  consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_admin_->add_filter (ca_filter.in ());
 
   // Setup the CA to receive all type of events
   CosNotification::EventTypeSeq added(1);
@@ -166,19 +144,18 @@ TAO_NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->subscription_change (added, removed);
 
   ACE_NEW_THROW_EX (this->my_log_consumer_,
                     TAO_Notify_LogConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  this->my_log_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
+  this->my_log_consumer_->connect (this->consumer_admin_.in ());
 }
 
 //IDL to C++
 CosNotifyFilter::Filter_ptr
-TAO_NotifyLog_i::get_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_filter (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -188,19 +165,18 @@ TAO_NotifyLog_i::get_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */
-                             ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 
   //TODO: need to add impl
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_NotifyLog_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::MyFactory (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -210,111 +186,111 @@ TAO_NotifyLog_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NotifyLog_i::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::default_consumer_admin (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->default_consumer_admin ();
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NotifyLog_i::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::default_supplier_admin (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->default_supplier_admin ();
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_NotifyLog_i::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::default_filter_factory (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->default_filter_factory ();
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_NotifyLog_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID& id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->new_for_consumers (op,id ACE_ENV_ARG_PARAMETER);
+  return this->event_channel_->new_for_consumers (op,id);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_NotifyLog_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID& id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->new_for_suppliers (op,id ACE_ENV_ARG_PARAMETER);
+  return this->event_channel_->new_for_suppliers (op,id);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_NotifyLog_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_consumeradmin (id ACE_ENV_ARG_PARAMETER);
+  return this->event_channel_->get_consumeradmin (id);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_supplieradmin (id ACE_ENV_ARG_PARAMETER);
+  return this->event_channel_->get_supplieradmin (id);
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_NotifyLog_i::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_all_consumeradmins (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_all_consumeradmins (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->get_all_consumeradmins ();
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_NotifyLog_i::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_all_supplieradmins (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_all_supplieradmins (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->get_all_supplieradmins ();
 }
 
 CosNotification::AdminProperties*
-TAO_NotifyLog_i::get_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_admin (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->get_admin ();
 }
 
 void
-TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedAdmin,
       CORBA::SystemException
     ))
 {
-  this->event_channel_->set_admin (admin ACE_ENV_ARG_PARAMETER);
+  this->event_channel_->set_admin (admin);
 }
 
 CosNotification::QoSProperties*
-TAO_NotifyLog_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::get_qos (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -324,48 +300,45 @@ TAO_NotifyLog_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& /* qos */
-                          ACE_ENV_ARG_DECL)
+TAO_NotifyLog_i::set_qos (const CosNotification::QoSProperties& /* qos */)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
   //TODO: need to add later
 }
 
 void
 TAO_NotifyLog_i::validate_qos (
     const CosNotification::QoSProperties& /* required_qos */,
-    CosNotification::NamedPropertyRangeSeq_out /* available_qos */
-    ACE_ENV_ARG_DECL)
+    CosNotification::NamedPropertyRangeSeq_out /* available_qos */)
   ACE_THROW_SPEC ((CosNotification::UnsupportedQoS,
                    CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 
   //TODO: need to add later
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_NotifyLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NotifyLog_i::for_consumers (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->for_consumers();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
 TAO_NotifyLog_i::for_suppliers (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->for_suppliers();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 81218cf3962..08e111ff2c9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -70,128 +70,128 @@ public:
   ~TAO_NotifyLog_i ();
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   /// Destroy the log object and all contained records.
   void
-  destroy (ACE_ENV_SINGLE_ARG_DECL)
+  destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Activate the NotifyLog.
   void
-  activate (ACE_ENV_SINGLE_ARG_DECL);
+  activate (void);
 
   // = Methods from CosNotifyChannelAdmin::EventChannel.
   CosNotifyFilter::Filter_ptr
-  get_filter (ACE_ENV_SINGLE_ARG_DECL)
+  get_filter (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  void set_filter (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL)
+  void set_filter (CosNotifyFilter::Filter_ptr filter)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::EventChannelFactory_ptr
-  MyFactory (ACE_ENV_SINGLE_ARG_DECL)
+  MyFactory (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
-  default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+  default_consumer_admin (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
-  default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+  default_supplier_admin (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyFilter::FilterFactory_ptr
-  default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+  default_filter_factory (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
   new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID& id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
   new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID& id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID& id)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
-  get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+  get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
-  get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+  get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
       CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::AdminIDSeq*
-  get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
+  get_all_consumeradmins (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::AdminIDSeq*
-  get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
+  get_all_supplieradmins (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosNotification::AdminProperties*
-  get_admin (ACE_ENV_SINGLE_ARG_DECL)
+  get_admin (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  void set_admin (const CosNotification::AdminProperties& admin ACE_ENV_ARG_DECL)
+  void set_admin (const CosNotification::AdminProperties& admin)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedAdmin,
       CORBA::SystemException
     ));
 
   CosNotification::QoSProperties*
-  get_qos (ACE_ENV_SINGLE_ARG_DECL)
+  get_qos (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  void set_qos (const CosNotification::QoSProperties& ACE_ENV_ARG_DECL)
+  void set_qos (const CosNotification::QoSProperties&)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ));
 
   void validate_qos (const CosNotification::QoSProperties&,
-    CosNotification::NamedPropertyRangeSeq_out ACE_ENV_ARG_DECL)
+    CosNotification::NamedPropertyRangeSeq_out)
     ACE_THROW_SPEC ((
       CosNotification::UnsupportedQoS,
       CORBA::SystemException
@@ -199,13 +199,13 @@ public:
 
   // = Methods from DsEventLogAdmin::EventLog.
   CosEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+  for_consumers (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   CosEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  for_suppliers (void)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index 08a2cfd036e..9bc54b2d479 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -42,7 +42,7 @@ TAO_Rtec_LogConsumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer
 }
 
 void
-TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL)
+TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // create a record list...
@@ -51,18 +51,16 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DE
 
   recList [0].info <<= events;
 
-  this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
+  this->log_->write_recordlist (recList);
 
-  ACE_CHECK;
 
 }
 
 void
-TAO_Rtec_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Rtec_LogConsumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->supplier_proxy_->disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
index 05fdb9d65f4..86f0976f833 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -69,12 +69,12 @@ public:
 
 private:
   /// Disconnect from EventLog.
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method will call TAO_Log_i::log() to write
   /// the event to the Log.
-  void push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL)
+  void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// ProxyPushSupplier used to connect to RTEventLog.
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index bffeb96ecf4..69f700e5210 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -34,16 +34,13 @@ TAO_RTEventLogFactory_i::~TAO_RTEventLogFactory_i()
 
 int
 TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
-                               PortableServer::POA_ptr poa
-                               ACE_ENV_ARG_DECL)
+                               PortableServer::POA_ptr poa)
 {
-  TAO_LogMgr_i::init (orb, poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TAO_LogMgr_i::init (orb, poa);
 
 
   PortableServer::POA_var defPOA =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->_default_POA ();
 
   TAO_EC_Event_Channel_Attributes attr (defPOA.in (), defPOA.in ());
 
@@ -51,27 +48,22 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
   ACE_NEW_THROW_EX (impl,
                     TAO_EC_Event_Channel (attr),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (-1);
 
   auto_ptr <TAO_EC_Event_Channel> ec (impl);
 
-  impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  impl->activate ();
 
-  PortableServer::ObjectId_var oidec = poa_->activate_object (ec.get ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  PortableServer::ObjectId_var oidec = poa_->activate_object (ec.get ());
 
   ec.release ();
 
   CORBA::Object_var objec =
-    poa_->id_to_reference (oidec.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa_->id_to_reference (oidec.in ());
 
   this->event_channel_ = RtecEventChannelAdmin::EventChannel::_narrow (objec.in ());
 
 
-  this->consumer_admin_ = this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_admin_ = this->event_channel_->for_consumers();
 
   ACE_NEW_THROW_EX (this->notifier_,
                     TAO_RTEventLogNotification(this->event_channel_.in ()),
@@ -80,30 +72,22 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb,
 }
 
 RTEventLogAdmin::EventLogFactory_ptr
-TAO_RTEventLogFactory_i::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLogFactory_i::activate (void)
 {
   RTEventLogAdmin::EventLogFactory_var v_return;
 
   PortableServer::ObjectId_var oid =
-    this->factory_poa_->activate_object (this
-					 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (v_return._retn ());
+    this->factory_poa_->activate_object (this);
 
   CORBA::Object_var obj =
-    this->factory_poa_->id_to_reference (oid.in ()
-					 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (v_return._retn ());
+    this->factory_poa_->id_to_reference (oid.in ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (v_return._retn ());
+    DsLogAdmin::LogMgr::_narrow (obj.in ());
 
   v_return =
-    RTEventLogAdmin::EventLogFactory::_narrow (obj.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLogFactory::_nil ());
+    RTEventLogAdmin::EventLogFactory::_narrow (obj.in ());
 
   return v_return._retn ();
 }
@@ -114,7 +98,6 @@ TAO_RTEventLogFactory_i::create (
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id_out
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -125,19 +108,15 @@ TAO_RTEventLogFactory_i::create (
   this->create_i (full_action,
 		  max_size,
 		  & thresholds,
-		  id_out
-		  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
+		  id_out);
   DsLogAdmin::LogId id = id_out;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
+    this->create_log_object (id);
 #endif
 
   // narrow to EventLog
@@ -145,8 +124,7 @@ TAO_RTEventLogFactory_i::create (
     RTEventLogAdmin::EventLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
+  notifier_->object_creation (id);
 
   return event_log._retn();
 }
@@ -157,7 +135,6 @@ TAO_RTEventLogFactory_i::create_with_id (
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -169,18 +146,14 @@ TAO_RTEventLogFactory_i::create_with_id (
   this->create_with_id_i (id,
 			  full_action,
 			  max_size,
-			  & thresholds
-			  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
+			  & thresholds);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   DsLogAdmin::Log_var log =
-    this->create_log_reference (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
+    this->create_log_reference (id);
 #else
   DsLogAdmin::Log_var log =
-    this->create_log_object (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
+    this->create_log_object (id);
 #endif
 
   // narrow to EventLog
@@ -188,8 +161,7 @@ TAO_RTEventLogFactory_i::create_with_id (
     RTEventLogAdmin::EventLog::_narrow (log.in ());
 
   // @@ JTC - squelch exception?
-  notifier_->object_creation (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RTEventLogAdmin::EventLog::_nil ());
+  notifier_->object_creation (id);
 
   return event_log._retn ();
 }
@@ -201,8 +173,7 @@ TAO_RTEventLogFactory_i::create_repositoryid ()
 }
 
 PortableServer::ServantBase*
-TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id
-					     ACE_ENV_ARG_DECL)
+TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id)
 {
   TAO_RTEventLog_i* event_log_i;
 
@@ -216,21 +187,17 @@ TAO_RTEventLogFactory_i::create_log_servant (DsLogAdmin::LogId id
                                       id
                                       ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
-  event_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  event_log_i->init ();
 
   //initialise the LogConsumer object
-  event_log_i->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  event_log_i->activate ();
 
   return event_log_i;
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_RTEventLogFactory_i::obtain_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index d416bd028ec..4b2d5889cb2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -63,12 +63,11 @@ public:
   /// pointer to it.
   int
   init (CORBA::ORB_ptr orb,
-        PortableServer::POA_ptr poa
-        ACE_ENV_ARG_DECL);
+        PortableServer::POA_ptr poa);
 
   /// Activate this servant
   RTEventLogAdmin::EventLogFactory_ptr
-  activate (ACE_ENV_SINGLE_ARG_DECL);
+  activate (void);
 
   /// Used to create a RTEventLog.
   RTEventLogAdmin::EventLog_ptr create (
@@ -76,7 +75,6 @@ public:
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds,
         DsLogAdmin::LogId_out id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -90,7 +88,6 @@ public:
         DsLogAdmin::LogFullActionType full_action,
         CORBA::ULongLong max_size,
         const DsLogAdmin::CapacityAlarmThresholdList & thresholds
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -101,7 +98,6 @@ public:
 
    // = Implementation of the RtecEventChannelAdmin::ConsumerAdmin methods.
   RtecEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -110,10 +106,9 @@ public:
 protected:
   virtual CORBA::RepositoryId
     create_repositoryid ();
-	
+
   virtual PortableServer::ServantBase*
-    create_log_servant (DsLogAdmin::LogId id
-			ACE_ENV_ARG_DECL);
+    create_log_servant (DsLogAdmin::LogId id);
 
   /// Our object ref. after <active>ation.
   DsLogAdmin::LogMgr_var log_mgr_;
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index d3ceeb987e8..ad1a4b1fafa 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -29,9 +29,8 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification (
   : TAO_LogNotification (),
     event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  obtainProxyConsumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+  obtainProxyConsumer ();
 }
 
 TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void)
@@ -40,14 +39,14 @@ TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void)
 }
 
 void
-TAO_RTEventLogNotification::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RTEventLogNotification::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No-Op.
 }
 
 void
-TAO_RTEventLogNotification::obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLogNotification::obtainProxyConsumer (void)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     event_channel_->for_suppliers();
@@ -55,7 +54,7 @@ TAO_RTEventLogNotification::obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL)
   consumer_ = supplier_admin->obtain_push_consumer();
 
   RtecEventComm::PushSupplier_var supplier =
-  this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->_this ();
 
   // Simple publication, but usually the helper classes in
   // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
index 785efe87c79..a2530fe0783 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -58,7 +58,7 @@ public:
   ~TAO_RTEventLogNotification (void);
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -66,7 +66,7 @@ protected:
 
   /// Used to connect this PushSupplier to the EventChannel
   /// that will log these events.
-  void obtainProxyConsumer (ACE_ENV_SINGLE_ARG_DECL);
+  void obtainProxyConsumer (void);
 
   // Send the event on the event channel.
   virtual void send_notification (const CORBA::Any& any)
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 3aacac1ff86..3cd28485e62 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -31,7 +31,6 @@ TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb,
     poa_ (PortableServer::POA::_duplicate (poa)),
     log_poa_ (PortableServer::POA::_duplicate (log_poa))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   TAO_EC_Event_Channel_Attributes attr (poa_.in(), poa_.in());
 
@@ -49,118 +48,100 @@ TAO_RTEventLog_i::~TAO_RTEventLog_i ()
 
 
 DsLogAdmin::Log_ptr
-TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+TAO_RTEventLog_i::copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTEventLogAdmin::EventLogFactory_var eventLogFactory =
-    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
 
   RTEventLogAdmin::EventLog_var log =
     eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_,
-                             id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+                             id);
 
-  copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  copy_attributes (log.in ());
 
   return log._retn ();
 }
 
 DsLogAdmin::Log_ptr
-TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException))
 {
   RTEventLogAdmin::EventLogFactory_var eventLogFactory =
-    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+    RTEventLogAdmin::EventLogFactory::_narrow (factory_.in ());
 
   RTEventLogAdmin::EventLog_var log =
     eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0,
-                                     thresholds_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+                                     thresholds_);
 
-  copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
+  copy_attributes (log.in ());
 
   return log._retn ();
 }
 
 void
-TAO_RTEventLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLog_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  notifier_->object_deletion (logid_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  notifier_->object_deletion (logid_);
 
   // Remove ourselves from the list of logs.
-  this->logmgr_i_.remove (this->logid_
-			  ACE_ENV_ARG_PARAMETER); 
-  ACE_CHECK;
+  this->logmgr_i_.remove (this->logid_);
 
   // Deregister with POA.
   PortableServer::ObjectId_var id =
-    this->log_poa_->servant_to_id (this
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->log_poa_->servant_to_id (this);
 
-  this->log_poa_->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->log_poa_->deactivate_object (id.in ());
 }
 
 void
-TAO_RTEventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLog_i::activate (void)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->for_consumers ();
 
   this->my_log_consumer_ = new TAO_Rtec_LogConsumer (this);
   this->my_log_consumer_->connect (consumer_admin.in ());
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_RTEventLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTEventLog_i::for_consumers (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->for_consumers();
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 TAO_RTEventLog_i::for_suppliers (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return this->event_channel_->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_channel_->for_suppliers();
 }
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_RTEventLog_i::append_observer (
-       RtecEventChannelAdmin::Observer_ptr observer
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_ptr observer)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->observer_strategy_->append_observer (observer
-                                                    ACE_ENV_ARG_PARAMETER);
+  return this->observer_strategy_->append_observer (observer);
 }
 
 void
 TAO_RTEventLog_i::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle
-       ACE_ENV_ARG_DECL)
+       RtecEventChannelAdmin::Observer_Handle handle)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->observer_strategy_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
+  this->observer_strategy_->remove_observer (handle);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index 6dc0b4975b3..01f965c729a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -72,41 +72,39 @@ public:
   ~TAO_RTEventLog_i ();
 
   /// Duplicate the log.
-  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId &id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Duplicate the log specifying an id.
-  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
+  virtual DsLogAdmin::Log_ptr copy_with_id (DsLogAdmin::LogId id)
     ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException));
 
   /// Destroy the log object and all contained records.
   void
-  destroy (ACE_ENV_SINGLE_ARG_DECL)
+  destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Activate the RTEventLog.
   void
-  activate (ACE_ENV_SINGLE_ARG_DECL);
+  activate (void);
 
   // = The RtecEventChannelAdmin::EventChannel interface methods.
   RtecEventChannelAdmin::ConsumerAdmin_ptr
-  for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+  for_consumers (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RtecEventChannelAdmin::SupplierAdmin_ptr
-  for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  for_suppliers (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr
-                       ACE_ENV_ARG_DECL)
+      append_observer (RtecEventChannelAdmin::Observer_ptr)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void
-      remove_observer (RtecEventChannelAdmin::Observer_Handle
-                       ACE_ENV_ARG_DECL)
+      remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
index 71f0e444678..fa88db9070a 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
@@ -214,8 +214,7 @@ TAO_Metrics_Logger::svc (void)
 // Sends a banner to be written to the log file and to the visualization browser.
 
 void
-TAO_Metrics_Logger::send_banner (const char *banner
-                                 ACE_ENV_ARG_DECL)
+TAO_Metrics_Logger::send_banner (const char *banner)
   throw (CORBA::SystemException)
 {
   // Package up the data and put it on the task queue.
@@ -278,8 +277,7 @@ TAO_Metrics_Logger::process_banner (const char *banner)
 
 void
 TAO_Metrics_Logger::log_aggregate_QoS (const Metrics::QoSParameter_Set & qos_params,
-                                       Metrics::Time interval
-                                       ACE_ENV_ARG_DECL)
+                                       Metrics::Time interval)
   throw (CORBA::SystemException)
 {
 // This is a temporary patch to eliminate this data from the log.  It was
@@ -400,19 +398,18 @@ TAO_Metrics_Logger::process_aggregate_QoS (const Metrics::QoSParameter_Set & qos
       // Push an event to the visualization browser.
       CORBA::Any any;
 
-      ACE_TRY_NEW_ENV
+      try
         {
           any.replace (Metrics::_tc_QoSData, &qos_data_, 0, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
 #if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Metrics_Logger::process_aggregate_QoS");
+          ex._tao_print_exception (
+            "TAO_Metrics_Logger::process_aggregate_QoS");
 #endif
           return;
         }
-      ACE_ENDTRY;
 
       this->dove_supplier_.notify (any);
     }
@@ -434,21 +431,17 @@ TAO_Metrics_Logger::process_aggregate_QoS (const Metrics::QoSParameter_Set & qos
 
 void
 TAO_Metrics_Logger::set_identities (const Metrics::ProbeIdentity_Set &
-                                      probe_identities
-                                    ACE_ENV_ARG_DECL)
+                                      probe_identities)
   throw (CORBA::SystemException)
 {
   for (u_long i = 0; i < probe_identities.length (); ++i)
     {
-      this->set_identity (probe_identities [i]
-                          ACE_ENV_ARG_DECL);
-      ACE_CHECK;
+      this->set_identity (probe_identities [i]);
     }
 }
 
 void
-TAO_Metrics_Logger::set_identity (const Metrics::ProbeIdentity_t & probe_identity
-                                  ACE_ENV_ARG_DECL)
+TAO_Metrics_Logger::set_identity (const Metrics::ProbeIdentity_t & probe_identity)
   throw (CORBA::SystemException)
 {
   // Look up the existing name that is bound, creating one if there is
@@ -460,7 +453,6 @@ TAO_Metrics_Logger::set_identity (const Metrics::ProbeIdentity_t & probe_identit
       ACE_NEW_THROW_EX (name,
                         CORBA::String_var (probe_identity.probe_name),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       // What is this used for?  BRM
       auto_ptr<CORBA::String_var> name_ptr (name);
@@ -503,8 +495,7 @@ TAO_Metrics_Logger::set_identity (const Metrics::ProbeIdentity_t & probe_identit
 void
 TAO_Metrics_Logger::log_timeprobe_data (const Metrics::TimeprobeParameter_Set &
                                         timeprobe_params,
-                                        Metrics::Time interval
-                                        ACE_ENV_ARG_DECL)
+                                        Metrics::Time interval)
   throw (CORBA::SystemException)
 {
   // Package up the data and put it on the task queue.
@@ -836,19 +827,18 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se
             static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (queue_time))
             / static_cast<CORBA::Double> (ACE_UINT64_DBLCAST_ADAPTER (interval));
 
-          ACE_TRY_NEW_ENV
+          try
             {
               any.replace (Metrics::_tc_UtilData, &util_data_, 0, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
 #if defined (METRICS_LOGGER_ERROR_OUTPUT_ENABLED)
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Metrics_Logger::process_aggregate_QoS");
+              ex._tao_print_exception (
+                "TAO_Metrics_Logger::process_aggregate_QoS");
 #endif
               return;
             }
-          ACE_ENDTRY;
 
           this->dove_supplier_.notify (any);
         }
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
index f836ca5faf3..5d24ea4a7c9 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
@@ -122,8 +122,7 @@ public:
   virtual int svc (void);
   // Active object loop for processing logged data.
 
-  void send_banner (const char *banner
-                   ACE_ENV_ARG_DECL)
+  void send_banner (const char *banner)
     throw (CORBA::SystemException);
   // Sends a banner to be written to the log file and to the visualization browser.
 
@@ -131,8 +130,7 @@ public:
   // Writes banner to the log file and/or to the visualization browser.
 
   void log_aggregate_QoS (const Metrics::QoSParameter_Set & qos_params,
-                          Metrics::Time interval
-                          ACE_ENV_ARG_DECL)
+                          Metrics::Time interval)
     throw (CORBA::SystemException);
   // Reports the aggregate QoS information for all operations
   // to the passed QoS logger.
@@ -142,21 +140,18 @@ public:
   // Processes the aggregate QoS information for all operations
   // to the passed QoS logger.
 
-  void set_identities (const Metrics::ProbeIdentity_Set & probe_identities
-                       ACE_ENV_ARG_DECL)
+  void set_identities (const Metrics::ProbeIdentity_Set & probe_identities)
     throw (CORBA::SystemException);
   // Binds the names of various timeprobes to their identifiers so
   // that ids alone can be used (for efficiency) in passing data.
 
-  void set_identity (const Metrics::ProbeIdentity_t & probe_identity
-                     ACE_ENV_ARG_DECL)
+  void set_identity (const Metrics::ProbeIdentity_t & probe_identity)
     throw (CORBA::SystemException);
   // Binds the names of various timeprobes to their identifiers so
   // that ids alone can be used (for efficiency) in passing data.
 
   void log_timeprobe_data (const Metrics::TimeprobeParameter_Set & timeprobe_params,
-                           Metrics::Time interval
-                           ACE_ENV_ARG_DECL)
+                           Metrics::Time interval)
     throw (CORBA::SystemException);
   // Reports timeprobe data collected since last run.
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
index da8e9fcce41..b7bdbb44e29 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
@@ -70,7 +70,6 @@ public:
 
   virtual void
   report_made_deadline (RtecScheduler::handle_t handle
-                        ACE_ENV_ARG_DECL
                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_0));
@@ -78,7 +77,6 @@ public:
 
   virtual void
   report_missed_deadline (RtecScheduler::handle_t handle
-                          ACE_ENV_ARG_DECL
                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_1));
@@ -87,7 +85,6 @@ public:
   virtual void
   get_aggregate_QoS (RtecScheduler::handle_t handle,
                      Metrics::QoSParameter_t_out qos
-                     ACE_ENV_ARG_DECL
                      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_2,
@@ -96,8 +93,7 @@ public:
 
   virtual void get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set
-      ACE_ENV_ARG_DECL)
+      Metrics::QoSParameter_Set_out qos_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
                      Metrics::INTERNAL_5));
@@ -105,8 +101,7 @@ public:
   // passed set.
 
   virtual void
-  reset_statistics (RtecScheduler::handle_t handle
-                    ACE_ENV_ARG_DECL)
+  reset_statistics (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_7,
                      Metrics::INTERNAL_8));
@@ -171,23 +166,20 @@ public:
   // Destructor.
 
   virtual void
-  report_made_deadline (RtecScheduler::handle_t handle
-                        ACE_ENV_ARG_DECL)
+  report_made_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_0));
   // Reports a successful upcall.
 
   virtual void
-  report_missed_deadline (RtecScheduler::handle_t handle
-                          ACE_ENV_ARG_DECL)
+  report_missed_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_1));
   // Reports an unsuccessful upcall.
 
   virtual void
   get_aggregate_QoS (RtecScheduler::handle_t handle,
-                     Metrics::QoSParameter_t_out qos
-                     ACE_ENV_ARG_DECL)
+                     Metrics::QoSParameter_t_out qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_2,
                      Metrics::INTERNAL_3));
@@ -195,8 +187,7 @@ public:
 
   virtual void get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set
-      ACE_ENV_ARG_DECL)
+      Metrics::QoSParameter_Set_out qos_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
                      Metrics::INTERNAL_5));
@@ -205,16 +196,14 @@ public:
 
   virtual void report_aggregate_QoS (
       Metrics::QoSLogger_ptr logger,
-      Metrics::Time interval
-      ACE_ENV_ARG_DECL)
+      Metrics::Time interval)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::NIL_LOGGER,
                      Metrics::INTERNAL_6));
   // Report the aggregate QoS statistics to the logger.
 
   virtual void
-  reset_statistics (RtecScheduler::handle_t handle
-                    ACE_ENV_ARG_DECL)
+  reset_statistics (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_7,
                      Metrics::INTERNAL_8));
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
index 9b028ba293b..2dedbc81e8f 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
@@ -39,8 +39,7 @@ TAO_Metrics_UpcallMonitor::~TAO_Metrics_UpcallMonitor ()
 
 ACE_INLINE void
 TAO_Metrics_UpcallMonitor::
-report_made_deadline (RtecScheduler::handle_t handle
-                      ACE_ENV_ARG_DECL)
+report_made_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_0))
 {
@@ -51,7 +50,7 @@ report_made_deadline (RtecScheduler::handle_t handle
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Failed trybind for handle %u in made map\n", handle));
-      ACE_THROW (Metrics::INTERNAL_0 ());
+      throw Metrics::INTERNAL_0 ();
     }
 
   ++entry->int_id_;
@@ -61,8 +60,7 @@ report_made_deadline (RtecScheduler::handle_t handle
 
 ACE_INLINE void
 TAO_Metrics_UpcallMonitor::
-report_missed_deadline (RtecScheduler::handle_t handle
-                        ACE_ENV_ARG_DECL)
+report_missed_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_1))
 {
@@ -73,7 +71,7 @@ report_missed_deadline (RtecScheduler::handle_t handle
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Failed trybind for handle %u in missed map\n", handle));
-      ACE_THROW (Metrics::INTERNAL_1 ());
+      throw Metrics::INTERNAL_1 ();
     }
 
   ++entry->int_id_;
@@ -84,8 +82,7 @@ report_missed_deadline (RtecScheduler::handle_t handle
 
 ACE_INLINE void
 TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
-                                              Metrics::QoSParameter_t_out qos
-                                              ACE_ENV_ARG_DECL)
+                                              Metrics::QoSParameter_t_out qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_2,
                      Metrics::INTERNAL_3))
@@ -99,14 +96,14 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
     {
       ACE_DEBUG ((LM_DEBUG, "TAO_Metrics_UpcallMonitor::get_aggregate_QoS: "
                   "Failed trybind for handle %u in made map\n", handle));
-      ACE_THROW (Metrics::INTERNAL_2 ());
+      throw Metrics::INTERNAL_2 ();
     }
 
   if (missed_map_.trybind (handle, missed_count, missed_entry) < 0)
     {
       ACE_DEBUG ((LM_DEBUG, "TAO_Metrics_UpcallMonitor::get_aggregate_QoS: "
                   "Failed trybind for handle %u in missed map\n", handle));
-      ACE_THROW (Metrics::INTERNAL_3 ());
+      throw Metrics::INTERNAL_3 ();
     }
 
   ACE_NEW_THROW_EX (qos,
@@ -127,8 +124,7 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
 ACE_INLINE void
 TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set
-      ACE_ENV_ARG_DECL)
+      Metrics::QoSParameter_Set_out qos_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
                      Metrics::INTERNAL_5))
@@ -157,7 +153,7 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set (
                       "TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set: "
                       "Failed trybind for handle_set [%d] = %u in made map\n",
                       i, handle_set [i]));
-          ACE_THROW (Metrics::INTERNAL_4 ());
+          throw Metrics::INTERNAL_4 ();
         }
 
       if (missed_map_.trybind (handle_set [i], missed_count, missed_entry) < 0)
@@ -166,7 +162,7 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set (
                       "TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set: "
                       "Failed trybind for handle_set[%d]=%u in missed map\n",
                       i, handle_set [i]));
-          ACE_THROW (Metrics::INTERNAL_5 ());
+          throw Metrics::INTERNAL_5 ();
         }
 
       qos_set [i].handle = handle_set [i];
@@ -182,8 +178,7 @@ TAO_Metrics_UpcallMonitor::get_aggregate_QoS_set (
 // Resets the aggregate QoS information for the given operation.
 
 ACE_INLINE void
-TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle
-                                             ACE_ENV_ARG_DECL)
+TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_7,
                      Metrics::INTERNAL_8))
@@ -192,12 +187,12 @@ TAO_Metrics_UpcallMonitor::reset_statistics (RtecScheduler::handle_t handle
 
   if (made_map_.rebind (handle, count) < 0)
     {
-      ACE_THROW (Metrics::INTERNAL_7 ());
+      throw Metrics::INTERNAL_7 ();
     }
 
   if (missed_map_.rebind (handle, count) < 0)
     {
-      ACE_THROW (Metrics::INTERNAL_8 ());
+      throw Metrics::INTERNAL_8 ();
     }
 }
 
@@ -242,26 +237,22 @@ TAO_Metrics_ReportingUpcallMonitor::~TAO_Metrics_ReportingUpcallMonitor ()
 
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::
-report_made_deadline (RtecScheduler::handle_t handle
-                      ACE_ENV_ARG_DECL)
+report_made_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_0))
 {
-  monitor_.report_made_deadline (handle
-                                 ACE_ENV_ARG_DECL);
+  monitor_.report_made_deadline (handle);
 }
 
 // Reports an unsuccessful upcall.
 
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::
-report_missed_deadline (RtecScheduler::handle_t handle
-                        ACE_ENV_ARG_DECL)
+report_missed_deadline (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_1))
 {
-  monitor_.report_missed_deadline (handle
-                                   ACE_ENV_ARG_DECL);
+  monitor_.report_missed_deadline (handle);
 }
 
 
@@ -269,15 +260,13 @@ report_missed_deadline (RtecScheduler::handle_t handle
 
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t handle,
-                                              Metrics::QoSParameter_t_out qos
-                                              ACE_ENV_ARG_DECL)
+                                              Metrics::QoSParameter_t_out qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_2,
                      Metrics::INTERNAL_3))
 {
   monitor_.get_aggregate_QoS (handle,
-                              qos
-                              ACE_ENV_ARG_DECL);
+                              qos);
 }
 
 
@@ -287,15 +276,13 @@ TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS (RtecScheduler::handle_t h
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS_set (
       const Metrics::Handle_Set_t & handle_set,
-      Metrics::QoSParameter_Set_out qos_set
-      ACE_ENV_ARG_DECL)
+      Metrics::QoSParameter_Set_out qos_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_4,
                      Metrics::INTERNAL_5))
 {
   monitor_.get_aggregate_QoS_set (handle_set,
-                                  qos_set
-                                  ACE_ENV_ARG_DECL);
+                                  qos_set);
 }
 
 
@@ -303,14 +290,12 @@ TAO_Metrics_ReportingUpcallMonitor::get_aggregate_QoS_set (
 // Resets the aggregate QoS information for the given operation.
 
 ACE_INLINE void
-TAO_Metrics_ReportingUpcallMonitor::reset_statistics (RtecScheduler::handle_t handle
-                                                      ACE_ENV_ARG_DECL)
+TAO_Metrics_ReportingUpcallMonitor::reset_statistics (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::INTERNAL_7,
                      Metrics::INTERNAL_8))
 {
-  monitor_.reset_statistics (handle
-                             ACE_ENV_ARG_DECL);
+  monitor_.reset_statistics (handle);
 }
 
 
@@ -319,15 +304,14 @@ TAO_Metrics_ReportingUpcallMonitor::reset_statistics (RtecScheduler::handle_t ha
 ACE_INLINE void
 TAO_Metrics_ReportingUpcallMonitor::report_aggregate_QoS (
       Metrics::QoSLogger_ptr logger,
-      Metrics::Time interval
-      ACE_ENV_ARG_DECL)
+      Metrics::Time interval)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Metrics::NIL_LOGGER,
                      Metrics::INTERNAL_6))
 {
   if (CORBA::is_nil (logger))
     {
-      ACE_THROW (Metrics::NIL_LOGGER ());
+      throw Metrics::NIL_LOGGER ();
     }
 
   Metrics::QoSParameter_Set qos_set;
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
index 08b866de338..d9fcdb2975d 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
@@ -152,7 +152,6 @@ push (const RtecEventComm::EventSet & data,
 
       // Push to the actual consumer.
       consumer_.push (data, ACE_TRY_ENV);
-      ACE_CHECK;
 
       // Record the end of the upcall in the cache, and report whether
       // the deadline was made or missed to the monitor.
@@ -170,12 +169,10 @@ push (const RtecEventComm::EventSet & data,
           if (result == 0)
           {
               monitor_.report_made_deadline (this->handle_, ACE_TRY_ENV);
-              ACE_CHECK;
           }
           else if (result == 1)
           {
               monitor_.report_missed_deadline (this->handle_, ACE_TRY_ENV);
-              ACE_CHECK;
           }
 # if defined (METRICS_MONITOR_ERROR_OUTPUT_ENABLED)
           else
@@ -203,7 +200,6 @@ push (const RtecEventComm::EventSet & data,
          // the cache and the missed deadline to the monitor.
          cache_.report_upcall_cancellation (this->handle_);
          monitor_.report_missed_deadline (this->handle_, ACE_TRY_ENV);
-         ACE_CHECK;
       }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
index af64c20b061..1fe21850a99 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
@@ -58,21 +58,18 @@ TAO_Metrics_Utils::set_mission_state (int i, Metrics::QoSLogger_ptr logger)
   ACE_OS::memset (banner, 0, TAO_Metrics_Utils::METRICS_BUFSIZE);
   ACE_OS::sprintf (banner, "\n\n*** Mission State %d ***\n\n", i);
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      logger->send_banner (banner
-                           ACE_ENV_ARG_DECL);
-      ACE_TRY_CHECK;
+      logger->send_banner (banner);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
 #if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Metrics_LocalCache::set_mission_state:"
-                           " logger call failed\n");
+      ex._tao_print_exception (
+        "TAO_Metrics_LocalCache::set_mission_state:"
+        " logger call failed\n");
 #endif
     }
-  ACE_ENDTRY;
 }
 
 // Sets the logger reference.
@@ -84,11 +81,10 @@ TAO_Metrics_Utils::get_logger (const char * logger_ior_str,
   Metrics::QoSLogger_var logger;
   if (logger_ior_str && orb)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           CORBA::Object_var obj =
             orb->string_to_object (logger_ior_str);
-          ACE_TRY_CHECK;
 
           if (CORBA::is_nil (obj.in ()))
             {
@@ -104,7 +100,6 @@ TAO_Metrics_Utils::get_logger (const char * logger_ior_str,
           else
             {
               logger = Metrics::QoSLogger::_narrow (obj.in ());
-              ACE_TRY_CHECK;
 
               if (CORBA::is_nil (logger.in ()))
                 {
@@ -118,15 +113,14 @@ TAO_Metrics_Utils::get_logger (const char * logger_ior_str,
                 }
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
 #if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_Metrics_LocalCache::set_logger exception");
+          ex._tao_print_exception (
+            "TAO_Metrics_LocalCache::set_logger exception");
 #endif
           return logger;
         }
-      ACE_ENDTRY;
     }
 #if defined (METRICS_UTILS_ERROR_OUTPUT_ENABLED)
   else
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index bee9ae0c932..deacbd41cf5 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -29,26 +29,23 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (
 template <class ITERATOR, class TABLE_ENTRY>
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   delete hash_iter_;
 
   // Since we are going away, decrement the reference count on the
   // Naming Context we were iterating over.
-  context_->interface ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+  context_->interface ()->_remove_ref ();
 }
 
 // Return the Default POA of this Servant
 template <class ITERATOR, class TABLE_ENTRY> PortableServer::POA_ptr
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA ()
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
-    CosNaming::Binding_out b
-    ACE_ENV_ARG_DECL)
+    CosNaming::Binding_out b)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNaming::Binding *binding;
@@ -58,7 +55,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
   ACE_NEW_THROW_EX (binding,
                     CosNaming::Binding,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   b = binding;
 
@@ -66,7 +62,6 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   // Check to make sure this object is still valid.
   if (this->destroyed_)
@@ -76,8 +71,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
   // self-destruct.
   if (context_->destroyed ())
     {
-      destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      destroy ();
 
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
     }
@@ -106,8 +100,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
     CORBA::ULong how_many,
-    CosNaming::BindingList_out bl
-    ACE_ENV_ARG_DECL)
+    CosNaming::BindingList_out bl)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We perform an allocation before obtaining the lock so that an out
@@ -115,13 +108,11 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
   ACE_NEW_THROW_EX (bl,
                     CosNaming::BindingList (0),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
   // Obtain the lock.
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   // Check to make sure this object is still valid.
   if (this->destroyed_)
@@ -131,8 +122,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
   // self-destruct.
   if (context_->destroyed ())
     {
-      destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      destroy ();
 
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
     }
@@ -173,30 +163,25 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (
 }
 
 template <class ITERATOR, class TABLE_ENTRY> void
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check to make sure this object is still valid.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Mark the object invalid.
   this->destroyed_ = 1;
 
   PortableServer::ObjectId_var id =
-    poa_->servant_to_id (this
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa_->servant_to_id (this);
 
-  poa_->deactivate_object (id.in ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_->deactivate_object (id.in ());
 }
 
 template <class ITERATOR, class TABLE_ENTRY> int
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 6bed837d729..d5ad7132c66 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -67,14 +67,13 @@ public:
   ~TAO_Bindings_Iterator (void);
 
   /// Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
   // = Idl methods.
 
   /// This operation passes back the next unseen binding.  True is
   /// returned if a binding is passed back, and false is returned otherwise.
-  CORBA::Boolean next_one (CosNaming::Binding_out b
-                           ACE_ENV_ARG_DECL)
+  CORBA::Boolean next_one (CosNaming::Binding_out b)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -83,12 +82,11 @@ public:
    * returned if no bindings were passed back.
    */
   CORBA::Boolean next_n (CORBA::ULong how_many,
-                         CosNaming::BindingList_out bl
-                         ACE_ENV_ARG_DECL)
+                         CosNaming::BindingList_out bl)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This operation destroys the iterator.
-  void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Helper method.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 3cb59bd6da9..9e558e7b8fd 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -60,8 +60,7 @@ TAO_Hash_Naming_Context::_default_POA (void)
 }
 
 CosNaming::NamingContext_ptr
-TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
-                                      ACE_ENV_ARG_DECL)
+TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name)
 {
   // Naming context we will return.
   CosNaming::NamingContext_var result =
@@ -74,19 +73,15 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
   CosNaming::Name comp_name (name.maximum (),
                              name_len - 1,
                              const_cast<CosNaming::NameComponent*> (name.get_buffer ()));
-  ACE_TRY
+  try
     {
       // Resolve the name.
-      CORBA::Object_var context = resolve (comp_name
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var context = resolve (comp_name);
 
       // Try narrowing object reference to the NamingContext type.
-      result = CosNaming::NamingContext::_narrow (context.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = CosNaming::NamingContext::_narrow (context.in ());
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (CosNaming::NamingContext::NotFound& ex)
     {
       // Add the last component of the name, which was stripped before
       // the call to resolve.
@@ -94,10 +89,8 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
       ex.rest_of_name.length (rest_len);
       ex.rest_of_name[rest_len - 1] = name[name_len - 1];
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -117,25 +110,23 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
 
 void
 TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
-                               CORBA::Object_ptr obj
-                               ACE_ENV_ARG_DECL)
+                               CORBA::Object_ptr obj)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding on
@@ -143,23 +134,22 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        this->get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->bind (simple_name, obj ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          context->bind (simple_name, obj);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT&)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -170,35 +160,33 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
                                         obj,
                                         CosNaming::nobject);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        throw CosNaming::NamingContext::AlreadyBound();
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
 }
 
 void
 TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
-                                 CORBA::Object_ptr obj
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::Object_ptr obj)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
@@ -206,23 +194,22 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->rebind (simple_name, obj ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          context->rebind (simple_name, obj);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT&)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   else
     // If we received a simple name, we need to rebind it in this
@@ -234,40 +221,38 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
                                            CosNaming::nobject);
       // Check for error conditions.
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_object,
-                    n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_object,
+          n);
     }
 }
 
 void
 TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
-                                       CosNaming::NamingContext_ptr nc
-                                       ACE_ENV_ARG_DECL)
+                                       CosNaming::NamingContext_ptr nc)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Do not allow binding of nil context reference.
   if (CORBA::is_nil (nc))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding on
@@ -275,23 +260,22 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->bind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          context->bind_context (simple_name, nc);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT&)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -302,35 +286,33 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
                                         nc,
                                         CosNaming::ncontext);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        throw CosNaming::NamingContext::AlreadyBound();
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
 }
 
 void
 TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                         CosNaming::NamingContext_ptr nc
-                                         ACE_ENV_ARG_DECL)
+                                         CosNaming::NamingContext_ptr nc)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
@@ -338,23 +320,22 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->rebind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          context->rebind_context (simple_name, nc);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT&)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   else
     // If we received a simple name, we need to rebind it in this
@@ -366,22 +347,20 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
                                            CosNaming::ncontext);
       // Check for error conditions.
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_context,
-                    n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_context,
+          n);
     }
 }
 
 CORBA::Object_ptr
-TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
-                                  ACE_ENV_ARG_DECL)
+TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -424,9 +403,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
       if (type == CosNaming::ncontext)
         {
           // Narrow to NamingContext.
-          context = CosNaming::NamingContext::_narrow (result.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
+          context = CosNaming::NamingContext::_narrow (result.in ());
         }
       else
         // The first name component wasn't bound to a NamingContext.
@@ -457,20 +434,19 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
              + 1);
 
           // If there are any exceptions, they will propagate up.
-          ACE_TRY
+          try
             {
               CORBA::Object_ptr resolved_ref;
-              resolved_ref = context->resolve (rest_of_name
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              resolved_ref = context->resolve (rest_of_name);
               return resolved_ref;
             }
-          ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+          catch (const CORBA::TIMEOUT&)
             {
-              ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                             (context.in (), rest_of_name));
+              throw CosNaming::NamingContext::CannotProceed(
+                context.in (
+                  ),
+                rest_of_name);
             }
-          ACE_ENDTRY;
         }
     }
   // If the name we had to resolve was simple, we just need to return
@@ -479,25 +455,23 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
 }
 
 void
-TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
-                                 ACE_ENV_ARG_DECL)
+TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Get the length of the name.
   CORBA::ULong name_len = n.length ();
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // If we received compound name, resolve it to get the context in
   // which the unbinding should take place, then perform the unbinding
@@ -505,43 +479,40 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      ACE_TRY
+      try
         {
-          context->unbind (simple_name ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          context->unbind (simple_name);
         }
-      ACE_CATCH (CORBA::TIMEOUT, timeoutEx)
+      catch (const CORBA::TIMEOUT&)
         {
-          ACE_TRY_THROW (CosNaming::NamingContext::CannotProceed
-                         (context.in (), simple_name));
+          throw CosNaming::NamingContext::CannotProceed(
+            context.in (
+              ),
+            simple_name);
         }
-      ACE_ENDTRY;
     }
   // If we received a simple name, we need to unbind it in this
   // context.
   else
     if (this->context_->unbind (n[0].id,
                                 n[0].kind) == -1)
-      ACE_THROW (CosNaming::NamingContext::NotFound
-                 (CosNaming::NamingContext::missing_node,
-                  n));
+      throw CosNaming::NamingContext::NotFound(
+        CosNaming::NamingContext::missing_node,
+        n);
 }
 
 CosNaming::NamingContext_ptr
-TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
-                                           ACE_ENV_ARG_DECL)
+TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -563,13 +534,12 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      return context->bind_new_context (simple_name ACE_ENV_ARG_PARAMETER);
+      return context->bind_new_context (simple_name);
     }
 
   // If we received a simple name, we need to bind it in this context.
@@ -579,58 +549,49 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
     CosNaming::NamingContext::_nil ();
 
   // Create new context.
-  result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  result = new_context ();
 
   // Bind the new context to the name.
-  ACE_TRY
+  try
     {
       bind_context (n,
-                    result.in ()
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    result.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // If the bind() operation fails we must destroy the recently
       // created context, should any exceptions be raised by the
       // destroy() operation we want to ignore them.
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY_EX(DESTROY)
+        try
           {
-            result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX(DESTROY);
+            result->destroy ();
           }
-        ACE_CATCHANY
+        catch (const CORBA::Exception&)
           {
           }
-        ACE_ENDTRY;
       }
       // Re-raise the exception in bind_context()
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
   return result._retn ();
 }
 
 void
-TAO_Hash_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Hash_Naming_Context::destroy (void)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   if (this->context_->current_size () != 0)
-    ACE_THROW (CosNaming::NamingContext::NotEmpty());
+    throw CosNaming::NamingContext::NotEmpty();
 
   // Destroy is a no-op on a root context.
   if (root ())
@@ -650,11 +611,8 @@ TAO_Hash_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId (poa_id_.fast_rep ());
 
-      ACE_CHECK;
 
-      poa->deactivate_object (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa->deactivate_object (id.in ());
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index 21fb9d571f3..c9090d987f8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -152,8 +152,7 @@ public:
    * participate in name resolution later.
    */
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj
-                     ACE_ENV_ARG_DECL);
+                     CORBA::Object_ptr obj);
 
   /**
    * This is similar to <bind> operation above, except for when the
@@ -162,8 +161,7 @@ public:
    * new one.
    */
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL);
+                       CORBA::Object_ptr obj);
 
   /**
    * This is the version of <bind> specifically for binding naming
@@ -171,8 +169,7 @@ public:
    * compound names are passed to be resolved.
    */
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc
-                             ACE_ENV_ARG_DECL);
+                             CosNaming::NamingContext_ptr nc);
 
   /**
    * This is a version of <rebind> specifically for naming contexts,
@@ -180,8 +177,7 @@ public:
    * names are passed.
    */
    virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc
-                               ACE_ENV_ARG_DECL);
+                               CosNaming::NamingContext_ptr nc);
 
   /**
    * Return object reference that is bound to the name.  Compound name
@@ -190,16 +186,14 @@ public:
    * does not return the type of the object.  Clients are responsible
    * for "narrowing" the object to the appropriate type.
    */
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n);
 
   /**
    * Remove the name binding from the context.  When compound names
    * are used, unbind is defined as follows: ctx->unbind (<c1; c2;
    * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
    */
-  virtual void unbind (const CosNaming::Name &n
-                       ACE_ENV_ARG_DECL);
+  virtual void unbind (const CosNaming::Name &n);
 
   /**
    * This operation creates a new context and binds it to the name
@@ -207,8 +201,7 @@ public:
    * implemented by the same server as the context in which it was
    * bound (the name argument excluding the last component).
    */
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n
-                                                         ACE_ENV_ARG_DECL);
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n);
 
   /**
    * Delete the naming context.  The user should take care to <unbind> any
@@ -218,7 +211,7 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void destroy (void);
 
   /// Returns the Default POA of this Servant object
   virtual PortableServer::POA_ptr _default_POA (void);
@@ -233,8 +226,7 @@ protected:
    * component that doesn't need to be resolved), and returns a
    * pointer to the target context.
    */
-  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name
-                                            ACE_ENV_ARG_DECL);
+  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name);
 
   /**
    * Pointer to the data structure used to store this Naming Context's
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
index ac7c42f87d0..1ebd2d7e6ef 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -27,29 +27,23 @@ int
 TAO_Naming_Client::init (CORBA::ORB_ptr orb,
                          ACE_Time_Value *timeout)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", timeout ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService", timeout);
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the NameService.\n"),
                           -1);
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Client::init");
+      ex._tao_print_exception ("TAO_Naming_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index 809c1795a42..001c4d51bc5 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -31,118 +31,110 @@ TAO_Naming_Context::~TAO_Naming_Context (void)
 }
 
 PortableServer::POA_ptr
-TAO_Naming_Context::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
+TAO_Naming_Context::_default_POA (/*env*/)
 {
   return impl_->_default_POA ();
 }
 
 void
 TAO_Naming_Context::bind (const CosNaming::Name &n,
-                          CORBA::Object_ptr obj
-                          ACE_ENV_ARG_DECL)
+                          CORBA::Object_ptr obj)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
                      CosNaming::NamingContext::CannotProceed,
                      CosNaming::NamingContext::InvalidName,
                      CosNaming::NamingContext::AlreadyBound))
 {
-  impl_->bind (n, obj ACE_ENV_ARG_PARAMETER);
+  impl_->bind (n, obj);
 }
 
 void
 TAO_Naming_Context::rebind (const CosNaming::Name &n,
-                            CORBA::Object_ptr obj
-                            ACE_ENV_ARG_DECL)
+                            CORBA::Object_ptr obj)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->rebind (n, obj ACE_ENV_ARG_PARAMETER);
+  impl_->rebind (n, obj);
 }
 
 void
 TAO_Naming_Context::bind_context (const CosNaming::Name &n,
-                                  CosNaming::NamingContext_ptr nc
-                                  ACE_ENV_ARG_DECL)
+                                  CosNaming::NamingContext_ptr nc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName,
                        CosNaming::NamingContext::AlreadyBound))
 {
-  impl_->bind_context (n, nc ACE_ENV_ARG_PARAMETER);
+  impl_->bind_context (n, nc);
 }
 
 void
 TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                    CosNaming::NamingContext_ptr nc
-                                    ACE_ENV_ARG_DECL)
+                                    CosNaming::NamingContext_ptr nc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->rebind_context (n, nc ACE_ENV_ARG_PARAMETER);
+  impl_->rebind_context (n, nc);
 }
 
 CORBA::Object_ptr
-TAO_Naming_Context::resolve (const CosNaming::Name &n
-                             ACE_ENV_ARG_DECL)
+TAO_Naming_Context::resolve (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  return impl_->resolve (n ACE_ENV_ARG_PARAMETER);
+  return impl_->resolve (n);
 }
 
 void
-TAO_Naming_Context::unbind (const CosNaming::Name &n
-                            ACE_ENV_ARG_DECL)
+TAO_Naming_Context::unbind (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->unbind (n ACE_ENV_ARG_PARAMETER);
+  impl_->unbind (n);
 }
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Context::new_context (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return impl_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl_->new_context ();
 }
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Context::bind_new_context (const CosNaming::Name &n
-                                      ACE_ENV_ARG_DECL)
+TAO_Naming_Context::bind_new_context (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::AlreadyBound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  return impl_->bind_new_context (n ACE_ENV_ARG_PARAMETER);
+  return impl_->bind_new_context (n);
 }
 
 void
-TAO_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Context::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotEmpty))
 {
-  impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  impl_->destroy ();
 }
 
 void
 TAO_Naming_Context::list (CORBA::ULong how_many,
                           CosNaming::BindingList_out bl,
-                          CosNaming::BindingIterator_out bi
-                          ACE_ENV_ARG_DECL)
+                          CosNaming::BindingIterator_out bi)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  impl_->list (how_many, bl, bi ACE_ENV_ARG_PARAMETER);
+  impl_->list (how_many, bl, bi);
 }
 
 void
@@ -177,8 +169,7 @@ to_string_helper_assign (char * &k, const char * &src)
 }
 
 char *
-TAO_Naming_Context::to_string (const CosNaming::Name &n
-                               ACE_ENV_ARG_DECL)
+TAO_Naming_Context::to_string (const CosNaming::Name &n)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::InvalidName))
 {
@@ -292,8 +283,7 @@ to_name_helper (char *dest, const char*& src, Hint hint)
 }
 
 CosNaming::Name *
-TAO_Naming_Context::to_name (const char *sn
-                             ACE_ENV_ARG_DECL)
+TAO_Naming_Context::to_name (const char *sn)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::InvalidName))
 {
@@ -411,8 +401,7 @@ TAO_Naming_Context::to_url_is_alnum_or_punctuation (char c)
 size_t
 TAO_Naming_Context::to_url_validate_and_compute_size (
     const char *addr,
-    const char *sn
-    ACE_ENV_ARG_DECL)
+    const char *sn)
 {
   size_t addr_len = ACE_OS::strlen (addr);
 
@@ -442,17 +431,14 @@ TAO_Naming_Context::to_url_validate_and_compute_size (
 
 char *
 TAO_Naming_Context::to_url (const char * addr,
-                            const char * sn
-                            ACE_ENV_ARG_DECL)
+                            const char * sn)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContextExt::InvalidAddress,
                    CosNaming::NamingContext::InvalidName))
 {
   /// Compute how many characters will be required for the URL
   size_t no_char =
-    TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn);
 
 
   // The 'corbaname:' tag is to be prepended at the starting of the
@@ -513,8 +499,7 @@ TAO_Naming_Context::to_url (const char * addr,
 }
 
 CORBA::Object_ptr
-TAO_Naming_Context::resolve_str (const char * n
-                                 ACE_ENV_ARG_DECL)
+TAO_Naming_Context::resolve_str (const char * n)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::NotFound,
                    CosNaming::NamingContext::CannotProceed,
@@ -525,11 +510,10 @@ TAO_Naming_Context::resolve_str (const char * n
   // argument instead of a Name.
 
   // Get the unstrigified name.
-  CosNaming::Name_var name = this->to_name (n ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  CosNaming::Name_var name = this->to_name (n);
 
   // Pass this unstringified name to resolve and return an Object_ptr
-  return this->resolve (name.in () ACE_ENV_ARG_PARAMETER);
+  return this->resolve (name.in ());
 }
 
 TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index 54140eb5e57..586c06bea3b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -67,8 +67,7 @@ public:
    * participate in name resolution later.
    */
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     CORBA::Object_ptr obj)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
                      CosNaming::NamingContext::CannotProceed,
@@ -82,8 +81,7 @@ public:
    * new one.
    */
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                       CORBA::Object_ptr obj)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -95,8 +93,7 @@ public:
    * compound names are passed to be resolved.
    */
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             CosNaming::NamingContext_ptr nc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -109,8 +106,7 @@ public:
    * names are passed.
    */
   virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               CosNaming::NamingContext_ptr nc)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -123,8 +119,7 @@ public:
    * does not return the type of the object.  Clients are responsible
    * for "narrowing" the object to the appropriate type.
    */
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -135,8 +130,7 @@ public:
    * are used, unbind is defined as follows: ctx->unbind (<c1; c2;
    * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
    */
-  virtual void unbind (const CosNaming::Name &n
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void unbind (const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -148,8 +142,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosNaming::NamingContext_ptr new_context ()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -159,8 +152,7 @@ public:
    * bound (the name argument excluding the last component).
    */
   virtual CosNaming::NamingContext_ptr bind_new_context (
-      const CosNaming::Name &n
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const CosNaming::Name &n)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::AlreadyBound,
@@ -175,7 +167,7 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotEmpty));
 
@@ -187,8 +179,7 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out bl,
-                     CosNaming::BindingIterator_out bi
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     CosNaming::BindingIterator_out bi)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -197,8 +188,7 @@ public:
    * is invalid i.e. if the number of characters in the name is zero,
    * an InvalidName exception is to be raised.
    */
-  virtual char * to_string (const CosNaming::Name &n
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * to_string (const CosNaming::Name &n)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
 
@@ -207,8 +197,7 @@ public:
    * escape character '\' and destringifies the stringified name and returns
    * it.
    */
-  virtual CosNaming::Name * to_name (const char *sn
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CosNaming::Name * to_name (const char *sn)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
 
@@ -219,9 +208,7 @@ public:
    * iiopname://1.1@myhost.555xyz.com:9999/a/b/c
    */
   virtual char * to_url ( const char * addr,
-                          const char * sn
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-                          )
+                          const char * sn)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNaming::NamingContextExt::InvalidAddress,
@@ -232,9 +219,7 @@ public:
    * Similar to <resolve> as in the CosNaming::NamingContext interface.
    * It accepts a strigified name as an argument instead of a Name.
    */
-  virtual CORBA::Object_ptr resolve_str (const char * n
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-                                         )
+  virtual CORBA::Object_ptr resolve_str (const char * n)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
@@ -243,7 +228,7 @@ public:
                      ));
 
   /// Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
 
@@ -287,8 +272,7 @@ private:
   /// Validate the to_url() method input, and compute the size of the
   /// returned URL address.
   static size_t to_url_validate_and_compute_size (const char *add,
-                                                  const char *sn
-                                                  ACE_ENV_ARG_DECL);
+                                                  const char *sn);
 
 protected:
 
@@ -325,8 +309,7 @@ public:
    * participate in name resolution later.
    */
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj
-                     ACE_ENV_ARG_DECL) = 0;
+                     CORBA::Object_ptr obj) = 0;
 
   /**
    * This is similar to <bind> operation above, except for when the
@@ -335,8 +318,7 @@ public:
    * new one.
    */
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL) = 0;
+                       CORBA::Object_ptr obj) = 0;
 
   /**
    * This is the version of <bind> specifically for binding naming
@@ -344,8 +326,7 @@ public:
    * compound names are passed to be resolved.
    */
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc
-                             ACE_ENV_ARG_DECL) = 0;
+                             CosNaming::NamingContext_ptr nc) = 0;
 
   /**
    * This is a version of <rebind> specifically for naming contexts,
@@ -353,8 +334,7 @@ public:
    * names are passed.
    */
   virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc
-                               ACE_ENV_ARG_DECL) = 0;
+                               CosNaming::NamingContext_ptr nc) = 0;
 
   /**
    * Return object reference that is bound to the name.  Compound name
@@ -363,23 +343,21 @@ public:
    * does not return the type of the object.  Clients are responsible
    * for "narrowing" the object to the appropriate type.
    */
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     ACE_ENV_ARG_DECL) = 0;
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n) = 0;
 
   /**
    * Remove the name binding from the context.  When compound names
    * are used, unbind is defined as follows: ctx->unbind (<c1; c2;
    * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
    */
-  virtual void unbind (const CosNaming::Name &n
-                       ACE_ENV_ARG_DECL) = 0;
+  virtual void unbind (const CosNaming::Name &n) = 0;
 
   /**
    * This operation returns a new naming context implemented by the
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual CosNaming::NamingContext_ptr new_context (void) = 0;
 
   /**
    * This operation creates a new context and binds it to the name
@@ -387,8 +365,7 @@ public:
    * implemented by the same server as the context in which it was
    * bound (the name argument excluding the last component).
    */
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n
-                                                         ACE_ENV_ARG_DECL) = 0;
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n) = 0;
 
   /**
    * Delete the naming context.  The user should take care to <unbind> any
@@ -398,7 +375,7 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void destroy (void) = 0;
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -408,8 +385,7 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi
-                     ACE_ENV_ARG_DECL) = 0;
+                     CosNaming::BindingIterator_out &bi) = 0;
 
   /// Returns the Default POA of this Servant object
   virtual PortableServer::POA_ptr _default_POA (void) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 6426cb81819..27bc4e91147 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -35,8 +35,7 @@ TAO_Naming_Loader::~TAO_Naming_Loader (void)
 int
 TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
@@ -45,24 +44,19 @@ TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (command_line.get_argc(),
                          command_line.get_ASCII_argv(),
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // This function call initializes the Naming Service
       CORBA::Object_var object =
         this->create_object (orb.in (),
                              command_line.get_argc(),
-                             command_line.get_TCHAR_argv ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             command_line.get_TCHAR_argv ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ Should we log this???
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -76,17 +70,14 @@ TAO_Naming_Loader::fini (void)
 CORBA::Object_ptr
 TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
                                   int argc,
-                                  ACE_TCHAR *argv[]
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  ACE_TCHAR *argv[])
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  int result;
-
   // Initializes the Naming Service. Returns -1
   // on an error.
-  result = this->naming_server_.init_with_orb (argc,
-                                               argv,
-                                               orb);
+  int result = this->naming_server_.init_with_orb (argc,
+                                                   argv,
+                                                   orb);
   if (result == -1)
     return CORBA::Object::_nil ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index 9f9543ce3f9..967fdc302fc 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -50,8 +50,7 @@ public:
   /// ORB and the command line parameters.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv[]
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv[])
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 3c20b3b646f..1d6ceb7f7eb 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -111,15 +111,12 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
 {
   if (resolve_for_existing_naming_service)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           // Try to find an existing Naming Service.
           CORBA::Object_var naming_obj =
             orb->resolve_initial_references ("NameService",
-                                             timeout
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                             timeout);
 
           if (!CORBA::is_nil (naming_obj.in ()))
             {
@@ -131,24 +128,18 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
                             "\nNameService found!\n"));
 
               this->naming_context_ =
-                CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CosNaming::NamingContext::_narrow (naming_obj.in ());
 
               this->naming_service_ior_ =
-                orb->object_to_string (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->object_to_string (naming_obj.in ());
 
               return 0;
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init");
+          ex._tao_print_exception ("TAO_Naming_Server::init");
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
     }
 
   if (TAO_debug_level > 0)
@@ -278,16 +269,14 @@ TAO_Naming_Server::init_with_orb (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Duplicate the ORB
       this->orb_ = CORBA::ORB::_duplicate (orb);
 
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -305,17 +294,13 @@ TAO_Naming_Server::init_with_orb (int argc,
         return result;
 
       // Get the POA object.
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       // Get the POA_Manager.
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       int numPolicies = 2;
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -334,30 +319,22 @@ TAO_Naming_Server::init_with_orb (int argc,
 
       // Id Assignment policy
       policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan policy
       policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
       if (this->use_servant_activator_)
         {
           // Request Processing Policy
           policies[2] =
-            this->root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
           // Servant Retention Policy
           policies[3] =
-            this->root_poa_->create_servant_retention_policy (PortableServer::RETAIN
-                                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->root_poa_->create_servant_retention_policy (PortableServer::RETAIN);
         }
 #endif /* TAO_HAS_MINIMUM_POA */
 
@@ -365,11 +342,9 @@ TAO_Naming_Server::init_with_orb (int argc,
       // the object key each time it invokes the server.
       this->ns_poa_ = this->root_poa_->create_POA ("NameService",
                                                    poa_manager.in (),
-                                                   policies
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   policies);
       // Warning!  If create_POA fails, then the policies won't be
       // destroyed and there will be hell to pay in memory leaks!
-      ACE_TRY_CHECK;
 
       // Creation of the new POAs over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0;
@@ -377,8 +352,7 @@ TAO_Naming_Server::init_with_orb (int argc,
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       result = this->init (orb,
@@ -395,13 +369,12 @@ TAO_Naming_Server::init_with_orb (int argc,
       if (result == -1)
         return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init_with_orb");
+      ex._tao_print_exception (
+        "TAO_Naming_Server::init_with_orb");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (this->ior_file_name_ != 0)
     {
@@ -448,8 +421,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                                     int round_trip_timeout,
                                     int use_round_trip_timeout)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (use_storable_context)
         {
@@ -498,9 +470,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                                                        0,
                                                        persFactory.get(),
                                                        persistence_location,
-                                                       use_redundancy_
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                       use_redundancy_);
 
           if (this->use_servant_activator_)
             persFactory.release();
@@ -537,9 +507,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
           this->naming_context_ =
             TAO_Transient_Naming_Context::make_new_context (poa,
                                                             TAO_ROOT_NAMING_CONTEXT,
-                                                            context_size
-                                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                            context_size);
 
         }
 
@@ -547,23 +515,17 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
       // mechanism.  Primarily useful for dynamically loaded Name
       // Services.
       orb->register_initial_reference ("NameService",
-                                       this->naming_context_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       this->naming_context_.in ());
 
       // Set the ior of the root Naming Context.
       this->naming_service_ior_=
-        orb->object_to_string (this->naming_context_.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (this->naming_context_.in ());
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
@@ -571,11 +533,8 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
       else
         {
           CORBA::String_var ior =
-            orb->object_to_string (this->naming_context_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          adapter->bind ("NameService", ior.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->object_to_string (this->naming_context_.in ());
+          adapter->bind ("NameService", ior.in ());
         }
 
 #if defined (ACE_HAS_IP_MULTICAST)
@@ -664,35 +623,29 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
         polList.length (1);
         polList[0] = orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                                          anyObjectVal);
-        ACE_TRY_CHECK;
 
         // set a timeout on the orb
         //
         CORBA::Object_var orbPolicyManagerObj =
-          orb->resolve_initial_references ("ORBPolicyManager"
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->resolve_initial_references ("ORBPolicyManager");
 
         CORBA::PolicyManager_var orbPolicyManager =
           CORBA::PolicyManager::_narrow (orbPolicyManagerObj.in ());
-        ACE_TRY_CHECK;
         orbPolicyManager->set_policy_overrides (polList, CORBA::SET_OVERRIDE);
 
         polList[0]->destroy ();
-        ACE_TRY_CHECK;
         polList[0] = CORBA::Policy::_nil ();
       }
 #else
   ACE_UNUSED_ARG (use_round_trip_timeout);
 #endif /* TAO_HAS_CORBA_MESSAGING */
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init_new_naming");
+      ex._tao_print_exception (
+        "TAO_Naming_Server::init_new_naming");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -702,35 +655,29 @@ TAO_Naming_Server::fini (void)
 {
   // Destroy the child POA ns_poa that is created when initializing
   // the Naming Service
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->ns_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->ns_poa_->destroy (1, 1);
 
 
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
         }
       else
         {
-          adapter->unbind ("NameService" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          adapter->unbind ("NameService");
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore
     }
-  ACE_ENDTRY;
 
 
   if (this->ior_multicast_ != 0)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 97c2407a6bb..e7244a6b396 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -141,15 +141,12 @@ TAO_Persistent_Context_Index::init (size_t context_size)
     // CASE 1:there are no Naming Contexts registered.  We need to create
     // one.
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
       this->root_context_ =
         TAO_Persistent_Naming_Context::make_new_context (poa_.in (),
                                                          TAO_ROOT_NAMING_CONTEXT,
                                                          context_size,
-                                                         this
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                                         this);
     }
 
   else
@@ -214,17 +211,13 @@ TAO_Persistent_Context_Index::recreate_all (void)
       PortableServer::ServantBase_var s = context;
 
       // Register with the POA.
-      ACE_DECLARE_NEW_CORBA_ENV;
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           context
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                           context);
 
-      CosNaming::NamingContext_var result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      CosNaming::NamingContext_var result = context->_this ();
 
       // If this is the root Naming Context, take a note of it.
       if (context_impl->root ())
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 80b4a7f4aa7..1daca1ca553 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -73,9 +73,7 @@ TAO_Persistent_Bindings_Map::find (const char *id,
     return -1;
   else
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      obj = orb_->string_to_object (entry.ref_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      obj = orb_->string_to_object (entry.ref_);
       type = entry.type_;
 
       return 0;
@@ -164,9 +162,7 @@ TAO_Persistent_Bindings_Map::shared_bind (const char * id,
                                           int rebind)
 {
   // Obtain a stringified ior of <obj> (i.e., the representation we can store).
-  ACE_DECLARE_NEW_CORBA_ENV;
-  CORBA::String_var ref = orb_->object_to_string (obj ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var ref = orb_->object_to_string (obj);
 
   // Calculate and allocate the memory we need to store this name to
   // object binding.
@@ -323,8 +319,7 @@ CosNaming::NamingContext_ptr
 TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                  const char *poa_id,
                                                  size_t context_size,
-                                                 TAO_Persistent_Context_Index * ind
-                                                 ACE_ENV_ARG_DECL)
+                                                 TAO_Persistent_Context_Index * ind)
 {
   // Store the stub we will return here.
   CosNaming::NamingContext_var result;
@@ -337,7 +332,6 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                    poa_id,
                                                    ind),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
 
   // Put <context_impl> into the auto pointer temporarily, in case next
   // allocation fails.
@@ -362,7 +356,6 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
   ACE_NEW_THROW_EX (context,
                     TAO_Naming_Context (context_impl),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
 
   // Let <implementation> know about it's <interface>.
   context_impl->interface (context);
@@ -377,12 +370,9 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
     PortableServer::string_to_ObjectId (poa_id);
 
   poa->activate_object_with_id (id.in (),
-                                context
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (result._retn ());
+                                context);
 
-  result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  result = context->_this ();
 
   // Everything went smoothly, without errors - we don't need any cleanup.
   context_impl->set_cleanup_level (0);
@@ -391,13 +381,12 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
 }
 
 CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Persistent_Naming_Context::new_context (void)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -416,9 +405,7 @@ TAO_Persistent_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
     make_new_context (this->poa_.in (),
                       poa_id,
                       this->persistent_context_->total_size (),
-                      this->index_
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+                      this->index_);
 
   return result._retn ();
 }
@@ -426,8 +413,7 @@ TAO_Persistent_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
                                      CosNaming::BindingList_out &bl,
-                                     CosNaming::BindingIterator_out &bi
-                                     ACE_ENV_ARG_DECL)
+                                     CosNaming::BindingIterator_out &bi)
 {
   // Allocate nil out parameters in case we won't be able to complete
   // the operation.
@@ -435,19 +421,17 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
   ACE_NEW_THROW_EX (bl,
                     CosNaming::BindingList (0),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   // Obtain a lock before we proceed with the operation.
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Dynamically allocate hash map iterator.
   HASH_MAP::ITERATOR *hash_iter = 0;
@@ -455,7 +439,6 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
                     HASH_MAP::ITERATOR
                     (*persistent_context_->map ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   // Store <hash_iter temporarily in auto pointer, in case we'll have
   // some failures and throw an exception.
@@ -492,7 +475,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
       hash_iter->advance ();
 
       if (ITER_SERVANT::populate_binding (hash_entry, bl[i]) == 0)
-          ACE_THROW (CORBA::NO_MEMORY());
+          throw CORBA::NO_MEMORY();
     }
 
   // Now we are done with the BindingsList, and we can follow up on
@@ -507,7 +490,6 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
       ACE_NEW_THROW_EX (bind_iter,
                         ITER_SERVANT (this, hash_iter, this->poa_.in (), this->lock_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       // Release <hash_iter> from auto pointer, and start using the
       // reference counting to control our servant.
@@ -516,8 +498,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
 
       // Increment reference count on this Naming Context, so it doesn't get
       // deleted before the BindingIterator servant gets deleted.
-      interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      interface_->_add_ref ();
 
       // Register with the POA.
       char poa_id[BUFSIZ];
@@ -529,12 +510,9 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
         PortableServer::string_to_ObjectId (poa_id);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                           bind_iter);
 
-      bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      bi = bind_iter->_this ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index 4ad3b2e61c0..8659c497466 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -204,8 +204,7 @@ public:
   static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa,
                                                         const char *poa_id,
                                                         size_t context_size,
-                                                        TAO_Persistent_Context_Index *ind
-                                                        ACE_ENV_ARG_DECL);
+                                                        TAO_Persistent_Context_Index *ind);
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
@@ -214,7 +213,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL);
+  virtual CosNaming::NamingContext_ptr new_context (void);
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -224,8 +223,7 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi
-                     ACE_ENV_ARG_DECL);
+                     CosNaming::BindingIterator_out &bi);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index cdcfa73cb3d..94a9fa71c74 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -181,9 +181,7 @@ TAO_Storable_Bindings_Map::find (const char *id,
     }
   else
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      obj = orb_->string_to_object (entry.ref_.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      obj = orb_->string_to_object (entry.ref_.in());
       type = entry.type_;
 
       return 0;
@@ -352,8 +350,7 @@ void TAO_Storable_Naming_Context::Write(TAO_Storable_Base& wrtr)
 
 // Helper function to load a new context into the binding_map
 int
-TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck
-                                      ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck)
 {
   ACE_TRACE("load_map");
   // assume file already open for reading
@@ -423,8 +420,7 @@ TAO_Storable_Naming_Context::load_map(File_Open_Lock_and_Check *flck
 TAO_Storable_Naming_Context::
 File_Open_Lock_and_Check::File_Open_Lock_and_Check(
                                  TAO_Storable_Naming_Context * context,
-                                 const char * mode
-                                 ACE_ENV_ARG_DECL)
+                                 const char * mode)
 :closed_(1),
  context_(context)
 {
@@ -447,7 +443,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
   if( rwflags_ <= 0 )
   {
     errno = EINVAL;
-    ACE_THROW(CORBA::PERSIST_STORE());
+    throw CORBA::PERSIST_STORE();
   }
 
   // build the file name
@@ -462,7 +458,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
     if (fl_->open() != 0)
       {
         delete fl_;
-        ACE_THROW(CORBA::PERSIST_STORE());
+        throw CORBA::PERSIST_STORE();
       }
 
     // acquire a lock on it
@@ -470,7 +466,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
       {
          fl_->close();
          delete fl_;
-         ACE_THROW(CORBA::INTERNAL());
+         throw CORBA::INTERNAL();
       }
 
     // now that the file is successfully opened and locked it must be
@@ -487,8 +483,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
          // Throw our map away
          delete context->storable_context_;
          // and build a new one from disk
-         context->load_map(this ACE_ENV_ARG_PARAMETER);
-         ACE_CHECK;
+         context->load_map(this);
        }
     }
   }
@@ -497,7 +492,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
     if (fl_->open() != 0)
       {
         delete fl_;
-        ACE_THROW(CORBA::PERSIST_STORE());
+        throw CORBA::PERSIST_STORE();
       }
 
     // now that the file is successfully opened
@@ -507,8 +502,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
     if(!context->storable_context_)
     {
       // Load the map from disk
-      context->load_map(this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      context->load_map(this);
     }
   }
   else
@@ -613,8 +607,7 @@ TAO_Storable_Naming_Context::make_new_context (
                               size_t context_size,
                               TAO_Naming_Service_Persistence_Factory *factory,
                               const ACE_TCHAR *persistence_directory,
-                              TAO_Storable_Naming_Context **new_context
-                              ACE_ENV_ARG_DECL)
+                              TAO_Storable_Naming_Context **new_context)
 {
   ACE_TRACE("make_new_context");
   // Store the stub we will return here.
@@ -631,7 +624,6 @@ TAO_Storable_Naming_Context::make_new_context (
                                                  persistence_directory,
                                                  context_size),
                                                  CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
 
   // Put <context_impl> into the auto pointer temporarily, in case next
   // allocation fails.
@@ -641,7 +633,6 @@ TAO_Storable_Naming_Context::make_new_context (
   ACE_NEW_THROW_EX (context,
                     TAO_Naming_Context (context_impl),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
 
   // Let <implementation> know about it's <interface>.
   context_impl->interface (context);
@@ -660,24 +651,19 @@ TAO_Storable_Naming_Context::make_new_context (
   // thrown which is transmitted as a CORBA::UNKNOWN on the wire. To rectify
   // this problem, we explicitly throw the correct INS exception in
   // this situation.
-  ACE_TRY
+  try
     {
       poa->activate_object_with_id (id.in (),
-                                    context
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    context);
     }
-  ACE_CATCH (PortableServer::POA::ObjectAlreadyActive, ex)
+  catch (const PortableServer::POA::ObjectAlreadyActive&)
     {
       ACE_THROW_RETURN (CosNaming::NamingContext::AlreadyBound(),
                         CosNaming::NamingContext::_nil ());
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (result._retn ());
 
-  result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  result = context->_this ();
 
   // return the address of the new context object so that caller can finish
   *new_context = context_impl;
@@ -686,20 +672,17 @@ TAO_Storable_Naming_Context::make_new_context (
 }
 
 CosNaming::NamingContext_ptr
-TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Storable_Naming_Context::new_context (void)
 {
   ACE_TRACE("new_context");
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   {
     // Open the backing file
-    File_Open_Lock_and_Check flck(this, "r"
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+    File_Open_Lock_and_Check flck(this, "r");
 
     // Check to make sure this object didn't have <destroy> method
     // invoked on it.
@@ -760,19 +743,15 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
                       this->storable_context_->total_size (),
                       this->factory_,
                       ACE_TEXT_CHAR_TO_TCHAR (this->persistence_directory_.c_str ()),
-                      &new_context
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+                      &new_context);
 
   // Since this is a new context, make an empty map in it
   ACE_NEW_THROW_EX (new_context->storable_context_,
                     TAO_Storable_Bindings_Map (hash_table_size_,orb_.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
   new_context->context_ = new_context->storable_context_;
 
-  File_Open_Lock_and_Check flck(new_context, "wc" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  File_Open_Lock_and_Check flck(new_context, "wc");
   new_context->Write(flck.peer());
 
   return result._retn ();
@@ -780,8 +759,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
-                                     CORBA::Object_ptr obj
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Object_ptr obj)
 {
   ACE_TRACE("rebind");
   // Get the length of the name.
@@ -789,23 +767,20 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
@@ -816,14 +791,12 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->rebind (simple_name, obj ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      context->rebind (simple_name, obj);
     }
   // If we received a simple name, we need to rebind it in this
   // context.
@@ -836,11 +809,12 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
 
       // Check for error conditions.
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_object, n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_object,
+          n);
 
       this->Write(flck.peer());
     }
@@ -848,8 +822,7 @@ TAO_Storable_Naming_Context::rebind (const CosNaming::Name& n,
 
 void
 TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
-                                           CosNaming::NamingContext_ptr nc
-                                           ACE_ENV_ARG_DECL)
+                                           CosNaming::NamingContext_ptr nc)
 {
   ACE_TRACE("TAO_Storable_Naming_Context::bind_context");
   // Get the length of the name.
@@ -857,27 +830,24 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // Do not allow binding of nil context reference.
   if (CORBA::is_nil (nc))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding
@@ -888,14 +858,12 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->bind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      context->bind_context (simple_name, nc);
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -906,11 +874,11 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
                                          nc,
                                          CosNaming::ncontext);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        throw CosNaming::NamingContext::AlreadyBound();
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       this->Write(flck.peer());
     }
@@ -918,8 +886,7 @@ TAO_Storable_Naming_Context::bind_context (const CosNaming::Name &n,
 
 void
 TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                         CosNaming::NamingContext_ptr nc
-                                         ACE_ENV_ARG_DECL)
+                                         CosNaming::NamingContext_ptr nc)
 {
   ACE_TRACE("rebind_context");
   // Get the length of the name.
@@ -927,23 +894,20 @@ TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
@@ -954,14 +918,12 @@ TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->rebind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      context->rebind_context (simple_name, nc);
     }
   // If we received a simple name, we need to rebind it in this
   // context.
@@ -973,18 +935,18 @@ TAO_Storable_Naming_Context::rebind_context (const CosNaming::Name &n,
                                            CosNaming::ncontext);
       // Check for error conditions.
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       else if (result == -2)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                   (CosNaming::NamingContext::not_context, n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::not_context,
+          n);
 
       this->Write(flck.peer());
     }
 }
 
 CORBA::Object_ptr
-TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
-                                      ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n)
 {
   ACE_TRACE("resolve");
   // Get the length of the name.
@@ -998,12 +960,9 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, "r"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  File_Open_Lock_and_Check flck(this, "r");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -1040,9 +999,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
       if (type == CosNaming::ncontext)
         {
           // Narrow to NamingContext.
-          context = CosNaming::NamingContext::_narrow (result.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (result._retn ());
+          context = CosNaming::NamingContext::_narrow (result.in ());
         }
       else
         // The first name component wasn't bound to a NamingContext.
@@ -1071,8 +1028,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
              const_cast<CosNaming::NameComponent*> (n.get_buffer ()) + 1);
 
           // If there are any exceptions, they will propagate up.
-          return context->resolve (rest_of_name
-                                   ACE_ENV_ARG_PARAMETER);
+          return context->resolve (rest_of_name);
         }
     }
   // If the name we had to resolve was simple, we just need to return
@@ -1081,8 +1037,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n
 }
 
 void
-TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
-                                 ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n)
 {
   ACE_TRACE("unbind");
   // Get the length of the name.
@@ -1090,23 +1045,20 @@ TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the unbinding should take place, then perform the unbinding
@@ -1117,14 +1069,12 @@ TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->unbind (simple_name ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      context->unbind (simple_name);
     }
   // If we received a simple name, we need to unbind it in this
   // context.
@@ -1132,16 +1082,16 @@ TAO_Storable_Naming_Context::unbind (const CosNaming::Name& n
     {
       if (this->context_->unbind (n[0].id,
                                   n[0].kind) == -1)
-        ACE_THROW (CosNaming::NamingContext::NotFound
-                    (CosNaming::NamingContext::missing_node, n));
+        throw CosNaming::NamingContext::NotFound(
+          CosNaming::NamingContext::missing_node,
+          n);
 
       this->Write(flck.peer());
     }
 }
 
 CosNaming::NamingContext_ptr
-TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
-                                               ACE_ENV_ARG_DECL)
+TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n)
 {
   ACE_TRACE("bind_new_context");
   // Get the length of the name.
@@ -1156,7 +1106,6 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -1165,9 +1114,7 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
                       CosNaming::NamingContext::_nil ());
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -1184,14 +1131,12 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      return context->bind_new_context (simple_name ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+      return context->bind_new_context (simple_name);
     }
   // If we received a simple name, we need to bind it in this context.
 
@@ -1203,62 +1148,51 @@ TAO_Storable_Naming_Context::bind_new_context (const CosNaming::Name& n
     CosNaming::NamingContext::_nil ();
 
   // Create new context.
-  result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  result = new_context ();
 
   // Bind the new context to the name.
-  ACE_TRY
+  try
     {
       bind_context (n,
-                    result.in ()
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    result.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY_EX(DESTROY)
+        try
           {
-            result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX(DESTROY);
+            result->destroy ();
           }
-        ACE_CATCHANY
+        catch (const CORBA::Exception&)
           {
             // Do nothing?
           }
-        ACE_ENDTRY;
       }
       // Re-raise the exception in bind_context()
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
   return result._retn ();
 }
 
 void
-TAO_Storable_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Storable_Naming_Context::destroy (void)
 {
   ACE_TRACE("destroy");
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, "rw"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  File_Open_Lock_and_Check flck(this, "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   if (this->context_->current_size () != 0)
-    ACE_THROW (CosNaming::NamingContext::NotEmpty());
+    throw CosNaming::NamingContext::NotEmpty();
 
   // Destroy is a no-op on a root context.
   if (root ())
@@ -1278,11 +1212,8 @@ TAO_Storable_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId (poa_id_.fast_rep ());
 
-      ACE_CHECK;
 
-      poa->deactivate_object (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa->deactivate_object (id.in ());
 
       this->Write(flck.peer());
     }
@@ -1291,8 +1222,7 @@ TAO_Storable_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
-                               CORBA::Object_ptr obj
-                               ACE_ENV_ARG_DECL)
+                               CORBA::Object_ptr obj)
 {
   ACE_TRACE("TAO_Storable_Naming_Context::bind");
   // Get the length of the name.
@@ -1300,23 +1230,20 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
 
   // Check for invalid name.
   if (name_len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    throw CosNaming::NamingContext::InvalidName();
 
   // we didn't need a lock to check the input arg, but now we do
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding
@@ -1327,14 +1254,12 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
       flck.release();
 
       CosNaming::NamingContext_var context =
-        get_context (n ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        get_context (n);
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->bind (simple_name, obj ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      context->bind (simple_name, obj);
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -1345,11 +1270,11 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
                                          obj,
                                          CosNaming::nobject);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        throw CosNaming::NamingContext::AlreadyBound();
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       this->Write(flck.peer());
     }
@@ -1359,8 +1284,7 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n,
 void
 TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
                                    CosNaming::BindingList_out &bl,
-                                   CosNaming::BindingIterator_out &bi
-                                   ACE_ENV_ARG_DECL)
+                                   CosNaming::BindingIterator_out &bi)
 {
   ACE_TRACE("list");
   // Allocate nil out parameters in case we won't be able to complete
@@ -1369,24 +1293,20 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
   ACE_NEW_THROW_EX (bl,
                     CosNaming::BindingList (0),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   // Obtain a lock before we proceed with the operation.
   ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Open the backing file
-  File_Open_Lock_and_Check flck(this, "r"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  File_Open_Lock_and_Check flck(this, "r");
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // We have the map in memory, let the disk go
   flck.release();
@@ -1396,7 +1316,6 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
   ACE_NEW_THROW_EX (hash_iter,
                     HASH_MAP::ITERATOR (storable_context_->map ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   // Store <hash_iter temporarily in auto pointer, in case we'll have
   // some failures and throw an exception.
@@ -1437,7 +1356,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
       hash_iter->advance ();
 
       if (ITER_SERVANT::populate_binding (hash_entry, bl[i]) == 0)
-          ACE_THROW (CORBA::NO_MEMORY());
+          throw CORBA::NO_MEMORY();
     }
 
   // Now we are done with the BindingsList, and we can follow up on
@@ -1450,7 +1369,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
     {
       //  ***  This is a problem.  Is there an exception we can throw? ***
       ACE_UNUSED_ARG (bind_iter);
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      throw CORBA::NO_IMPLEMENT ();
 
 #if 0
       // Create a BindingIterator for return.
@@ -1458,7 +1377,6 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
                         ITER_SERVANT (this, hash_iter,
                                       this->poa_.in (), this->lock_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       // Release <hash_iter> from auto pointer, and start using
       // reference counting to control our servant.
@@ -1467,8 +1385,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
 
       // Increment reference count on this Naming Context, so it doesn't get
       // deleted before the BindingIterator servant gets deleted.
-      interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      interface_->_add_ref ();
 
       // Register with the POA.
       char poa_id[BUFSIZ];
@@ -1480,12 +1397,9 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
         PortableServer::string_to_ObjectId (poa_id);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                           bind_iter);
 
-      bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      bi = bind_iter->_this ();
 #endif  /* 0 */
     }
 }
@@ -1504,8 +1418,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
                                int reentering,
                                TAO_Naming_Service_Persistence_Factory *factory,
                                const ACE_TCHAR *persistence_directory,
-                               int use_redundancy
-                               ACE_ENV_ARG_DECL)
+                               int use_redundancy)
 {
   ACE_TRACE("recreate_all");
 
@@ -1526,9 +1439,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
                       context_size,
                       factory,
                       persistence_directory,
-                      &new_context
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+                      &new_context);
 
   // Now does this already exist on disk?
   ACE_TString file_name(persistence_directory);
@@ -1538,8 +1449,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
   if (fl->exists())
   {
     // Load the map from disk
-    File_Open_Lock_and_Check flck(new_context, "r" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+    File_Open_Lock_and_Check flck(new_context, "r");
   }
   else
   {
@@ -1547,10 +1457,8 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
     ACE_NEW_THROW_EX (new_context->storable_context_,
                       TAO_Storable_Bindings_Map (context_size,orb),
                       CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
     new_context->context_ = new_context->storable_context_;
-    File_Open_Lock_and_Check flck(new_context, "wc" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+    File_Open_Lock_and_Check flck(new_context, "wc");
     new_context->Write(flck.peer());
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index 87f8bb203a2..3f9179fcd8f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -252,8 +252,7 @@ public:
                                size_t context_size,
                                TAO_Naming_Service_Persistence_Factory *factory,
                                const ACE_TCHAR *persistence_directory,
-                               TAO_Storable_Naming_Context **new_context
-                               ACE_ENV_ARG_DECL);
+                               TAO_Storable_Naming_Context **new_context);
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
@@ -265,8 +264,7 @@ public:
                               int reentering,
                               TAO_Naming_Service_Persistence_Factory *factory,
                               const ACE_TCHAR *persistence_directory,
-                              int use_redundancy
-                              ACE_ENV_ARG_DECL);
+                              int use_redundancy);
 
 
   /**
@@ -274,7 +272,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL);
+  virtual CosNaming::NamingContext_ptr new_context (void);
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -284,13 +282,11 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi
-                     ACE_ENV_ARG_DECL);
+                     CosNaming::BindingIterator_out &bi);
 
 
   virtual void rebind (const CosNaming::Name& n,
-                       CORBA::Object_ptr obj
-                       ACE_ENV_ARG_DECL);
+                       CORBA::Object_ptr obj);
 
   /**
    * Create a binding for name <n> and object <obj> in the naming
@@ -302,8 +298,7 @@ public:
    * participate in name resolution later.
    */
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj
-                     ACE_ENV_ARG_DECL);
+                     CORBA::Object_ptr obj);
 
 
   /**
@@ -312,8 +307,7 @@ public:
    * compound names are passed to be resolved.
    */
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc
-                             ACE_ENV_ARG_DECL);
+                             CosNaming::NamingContext_ptr nc);
 
   /**
    * This is a version of <rebind> specifically for naming contexts,
@@ -321,8 +315,7 @@ public:
    * names are passed.
    */
    virtual void rebind_context (const CosNaming::Name &n,
-                                CosNaming::NamingContext_ptr nc
-                                ACE_ENV_ARG_DECL);
+                                CosNaming::NamingContext_ptr nc);
 
   /**
    * Return object reference that is bound to the name.  Compound name
@@ -331,16 +324,14 @@ public:
    * does not return the type of the object.  Clients are responsible
    * for "narrowing" the object to the appropriate type.
    */
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n);
 
   /**
    * Remove the name binding from the context.  When compound names
    * are used, unbind is defined as follows: ctx->unbind (<c1; c2;
    * cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
    */
-  virtual void unbind (const CosNaming::Name &n
-                       ACE_ENV_ARG_DECL);
+  virtual void unbind (const CosNaming::Name &n);
 
   /**
    * This operation creates a new context and binds it to the name
@@ -349,8 +340,7 @@ public:
    * bound (the name argument excluding the last component).
    */
   virtual CosNaming::NamingContext_ptr bind_new_context (
-                                const CosNaming::Name &n
-                                ACE_ENV_ARG_DECL);
+                                const CosNaming::Name &n);
 
   /**
    * Delete the naming context.  The user should take care to <unbind> any
@@ -360,7 +350,7 @@ public:
    * NOTE: after <destroy> is invoked on a Naming Context, all
    * BindingIterators associated with that Naming Context are also destroyed.
    */
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void destroy (void);
 
 protected:
 
@@ -419,7 +409,6 @@ protected:
  * <pre>
  * How to use this class:
  *   File_Open_Lock_and_Check flck(this, name_len > 1 ? "r" : "rw");
-     ACE_CHECK;
  * </pre>
  */
 class File_Open_Lock_and_Check
@@ -428,8 +417,7 @@ public:
 
   /// Constructor - we always need the object which we guard.
   File_Open_Lock_and_Check(TAO_Storable_Naming_Context * context,
-                                const char * mode 
-                                ACE_ENV_ARG_DECL);
+                                const char * mode);
 
   /// Destructor
   ~File_Open_Lock_and_Check(void);
@@ -462,7 +450,7 @@ private:
 
   friend class File_Open_Lock_and_Check;
 
-  int load_map(File_Open_Lock_and_Check *flck ACE_ENV_ARG_DECL);
+  int load_map(File_Open_Lock_and_Check *flck);
 
   void Write(TAO_Storable_Base& wrtr);
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index cef31e28bff..53afd9176ab 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -42,8 +42,7 @@ TAO_Storable_Naming_Context_Activator::~TAO_Storable_Naming_Context_Activator ()
 PortableServer::Servant
 TAO_Storable_Naming_Context_Activator::incarnate (
     const PortableServer::ObjectId &oid,
-    PortableServer::POA_ptr poa
-    ACE_ENV_ARG_DECL)
+    PortableServer::POA_ptr poa)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -83,7 +82,6 @@ TAO_Storable_Naming_Context_Activator::incarnate (
                                                  persistence_directory_,
                                                  context_size_),
                                                  CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   // Put <context_impl> into the auto pointer temporarily, in case next
   // allocation fails.
@@ -93,7 +91,6 @@ TAO_Storable_Naming_Context_Activator::incarnate (
   ACE_NEW_THROW_EX (context,
                     TAO_Naming_Context (context_impl),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   // Let <implementation> know about it's <interface>.
   context_impl->interface (context);
@@ -111,8 +108,7 @@ TAO_Storable_Naming_Context_Activator::etherealize (
     PortableServer::POA_ptr /*adapter*/,
     PortableServer::Servant servant,
     CORBA::Boolean /*cleanup_in_progress*/,
-    CORBA::Boolean remaining_activations
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CORBA::Boolean remaining_activations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!remaining_activations) {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
index 9583e094808..3a7034bbbf2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -59,8 +59,7 @@ public:
    * and the servant implementing this reference does not yet exist.
    */
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                             PortableServer::POA_ptr poa
-                                             ACE_ENV_ARG_DECL)
+                                             PortableServer::POA_ptr poa)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -71,8 +70,7 @@ public:
                             PortableServer::POA_ptr adapter,
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
-                            CORBA::Boolean remaining_activations
-                            ACE_ENV_ARG_DECL)
+                            CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 06eb43a44b5..e4433dec433 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -144,8 +144,7 @@ TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context (void)
 CosNaming::NamingContext_ptr
 TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                 const char *poa_id,
-                                                size_t context_size
-                                                ACE_ENV_ARG_DECL)
+                                                size_t context_size)
 {
   // Store the stub we will return here.
   CosNaming::NamingContext_var result;
@@ -158,7 +157,6 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                   poa_id,
                                                   context_size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
 
   // Put <context_impl> into the auto pointer temporarily, in case next
   // allocation fails.
@@ -168,7 +166,6 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
   ACE_NEW_THROW_EX (context,
                     TAO_Naming_Context (context_impl),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
 
   // Let <implementation> know about it's <interface>.
   context_impl->interface (context);
@@ -183,24 +180,20 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
     PortableServer::string_to_ObjectId (poa_id);
 
   poa->activate_object_with_id (id.in (),
-                                context
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (result._retn ());
+                                context);
 
-  result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  result = context->_this ();
 
   return result._retn ();
 }
 
 CosNaming::NamingContext_ptr
-TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Transient_Naming_Context::new_context (void)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
@@ -219,9 +212,7 @@ TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
   CosNaming::NamingContext_var result =
     make_new_context (this->poa_.in (),
                       poa_id,
-                      this->transient_context_->total_size ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+                      this->transient_context_->total_size ());
 
   return result._retn ();
 }
@@ -229,8 +220,7 @@ TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
                                     CosNaming::BindingList_out &bl,
-                                    CosNaming::BindingIterator_out &bi
-                                    ACE_ENV_ARG_DECL)
+                                    CosNaming::BindingIterator_out &bi)
 {
   // Allocate nil out parameters in case we won't be able to complete
   // the operation.
@@ -238,26 +228,23 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
   ACE_NEW_THROW_EX (bl,
                     CosNaming::BindingList (0),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   // Obtain a lock before we proceed with the operation.
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check to make sure this object didn't have <destroy> method
   // invoked on it.
   if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 
   // Dynamically allocate iterator for traversing the underlying hash map.
   HASH_MAP::ITERATOR *hash_iter = 0;
   ACE_NEW_THROW_EX (hash_iter,
                     HASH_MAP::ITERATOR (transient_context_->map ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   // Store <hash_iter temporarily in auto pointer, in case we'll have
   // some failures and throw an exception.
@@ -295,7 +282,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
       hash_iter->advance ();
 
       if (ITER_SERVANT::populate_binding (hash_entry, bl[i]) == 0)
-          ACE_THROW (CORBA::NO_MEMORY());
+          throw CORBA::NO_MEMORY();
     }
 
   // Now we are done with the BindingsList, and we can follow up on
@@ -310,7 +297,6 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
       ACE_NEW_THROW_EX (bind_iter,
                         ITER_SERVANT (this, hash_iter, this->poa_.in (), this->lock_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       // Release <hash_iter> from auto pointer, and start using
       // reference counting to control our servant.
@@ -319,8 +305,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
 
       // Increment reference count on this Naming Context, so it doesn't get
       // deleted before the BindingIterator servant gets deleted.
-      interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      interface_->_add_ref ();
 
       // Register with the POA.
       char poa_id[BUFSIZ];
@@ -332,12 +317,9 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
         PortableServer::string_to_ObjectId (poa_id);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                           bind_iter);
 
-      bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      bi = bind_iter->_this ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index 2c3de8a61f3..4cae61f9209 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -159,8 +159,7 @@ public:
    */
   static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa,
                                                         const char *poa_id,
-                                                        size_t context_size
-                                                        ACE_ENV_ARG_DECL);
+                                                        size_t context_size);
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
@@ -169,7 +168,7 @@ public:
    * same naming server in which the operation was invoked.  The
    * context is not bound.
    */
-  virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL);
+  virtual CosNaming::NamingContext_ptr new_context (void);
 
   /**
    * Returns at most the requested number of bindings <how_many> in
@@ -179,8 +178,7 @@ public:
    */
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi
-                     ACE_ENV_ARG_DECL);
+                     CosNaming::BindingIterator_out &bi);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 48a0a7d9de0..d523ab94b65 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -47,7 +47,7 @@ TAO_Notify_Admin::~TAO_Notify_Admin ()
 }
 
 void
-TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent)
 {
   ACE_ASSERT (this->ec_.get() == 0);
 
@@ -55,33 +55,29 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_DECL)
   ACE_ASSERT (this->ec_.get() != 0);
 
   // this-> on the following line confuses VC6
-  initialize (parent ACE_ENV_ARG_PARAMETER);
+  initialize (parent);
 
   TAO_Notify_Proxy_Container* proxy_container = 0;
   ACE_NEW_THROW_EX (proxy_container,
                     TAO_Notify_Proxy_Container (),
                     CORBA::INTERNAL ());
-  ACE_CHECK;
   this->proxy_container_.reset (proxy_container);
 
-  this->proxy_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_container().init ();
 
 }
 
 void
-TAO_Notify_Admin::remove (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::remove (TAO_Notify_Proxy* proxy)
 {
-  this->proxy_container().remove (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_container().remove (proxy);
 }
 
 void
-TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Adopt the Admin's subscription.
   TAO_Notify_EventTypeSeq added (this->subscribed_types_), removed;
@@ -92,27 +88,25 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC
 }
 
 int
-TAO_Notify_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Admin::shutdown (void)
 {
-  int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  int sd_ret = TAO_Notify_Object::shutdown ();
   if (sd_ret == 1)
     return 1;
 
-  this->proxy_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  this->proxy_container().shutdown ();
 
   return 0;
 }
 
 void
-TAO_Notify_Admin::insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::insert (TAO_Notify_Proxy* proxy)
 {
-  this->proxy_container().insert (proxy ACE_ENV_ARG_PARAMETER);
+  this->proxy_container().insert (proxy);
 }
 
 void
-TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->children_changed_;
   this->children_changed_ = false;
@@ -126,28 +120,22 @@ TAO_Notify_Admin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG
       const char* type = this->get_admin_type_name();
 
       bool want_all_children =
-        saver.begin_object(this->id(), type, attrs, changed
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        saver.begin_object(this->id(), type, attrs, changed);
 
       if (want_all_children || this->filter_admin_.is_changed ())
         {
-          this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->filter_admin_.save_persistent(saver);
         }
       if (want_all_children || this->subscribed_types_.is_changed ())
         {
-          this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->subscribed_types_.save_persistent(saver);
         }
 
       TAO_Notify::Save_Persist_Worker<TAO_Notify_Proxy>
         wrk(saver, want_all_children);
-      this->proxy_container().collection()->for_each(&wrk
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->proxy_container().collection()->for_each(&wrk);
 
-      saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER);
+      saver.end_object(this->id(), type);
     }
 }
 
@@ -182,8 +170,7 @@ TAO_Notify_Admin::load_attrs(const TAO_Notify::NVPList& attrs)
 TAO_Notify::Topology_Object*
 TAO_Notify_Admin::load_child (const ACE_CString &type,
                               CORBA::Long id,
-                              const TAO_Notify::NVPList& attrs
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              const TAO_Notify::NVPList& attrs)
 {
   ACE_UNUSED_ARG (attrs);
   TAO_Notify::Topology_Object* result = this;
@@ -212,11 +199,10 @@ TAO_Notify_Admin::load_child (const ACE_CString &type,
 }
 
 void
-TAO_Notify_Admin::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Admin::reconnect (void)
 {
   TAO_Notify::Reconnect_Worker<TAO_Notify_Proxy> wrk;
-  this->proxy_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_container().collection()->for_each(&wrk);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index a7a9487c8c4..dc5774daf09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -51,13 +51,13 @@ public:
   virtual ~TAO_Notify_Admin ();
 
   /// Init
-  void init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL);
+  void init (TAO_Notify::Topology_Parent * parent);
 
   /// Insert the proxy in the <proxy_container_>.
-  void insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL);
+  void insert (TAO_Notify_Proxy* proxy);
 
   /// Remove type from container_
-  void remove (TAO_Notify_Proxy *proxy ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_Proxy *proxy);
 
   /// Access Admin FilterAdmin.
   TAO_Notify_FilterAdmin& filter_admin (void);
@@ -71,17 +71,16 @@ public:
   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator (void);
 
   /// Obtain the Admin's subscribed types.
-  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types
-                         ACE_ENV_ARG_DECL);
+  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types);
 
   TAO_Notify_EventChannel * event_channel () const;
   /// Shutdown
-  virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int shutdown (void);
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
-    CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
-  virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+    CORBA::Long id, const TAO_Notify::NVPList& attrs);
+  virtual void reconnect (void);
 
   void set_default (bool is_default);
   bool is_default () const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
index 2c47a4225ef..ee6d772f2bd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -40,55 +40,55 @@ TAO_Notify_AnyEvent_No_Copy::convert (CosNotification::StructuredEvent& notifica
 }
 
 CORBA::Boolean
-TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter) const
 {
   if (DEBUG_LEVEL > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_AnyEvent::do_match ()\n"));
 
-  return filter->match(*this->event_ ACE_ENV_ARG_PARAMETER);
+  return filter->match(*this->event_);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const
 {
   if (DEBUG_LEVEL > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_AnyEvent::push \n"));
 
-  consumer->push (*this->event_ ACE_ENV_ARG_PARAMETER);
+  consumer->push (*this->event_);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const
 {
   CosNotification::StructuredEvent notification;
 
   TAO_Notify_Event::translate (*this->event_, notification);
 
-  forwarder->forward_structured (notification ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured (notification);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const
 {
   CosNotification::StructuredEvent notification;
 
   TAO_Notify_Event::translate (*this->event_, notification);
 
-  forwarder->forward_structured_no_filtering (notification ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured_no_filtering (notification);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const
 {
-  forwarder->forward_any (*this->event_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_any (*this->event_);
 }
 
 void
-TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const
 {
-  forwarder->forward_any_no_filtering (*this->event_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_any_no_filtering (*this->event_);
 }
 
 void
@@ -113,13 +113,12 @@ TAO_Notify_AnyEvent_No_Copy::unmarshal (TAO_InputCDR & cdr)
 }
 
 TAO_Notify_Event *
-TAO_Notify_AnyEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Notify_AnyEvent_No_Copy::copy (void) const
 {
   TAO_Notify_Event * new_event;
   ACE_NEW_THROW_EX (new_event,
                     TAO_Notify_AnyEvent (*this->event_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
   return new_event;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index 49c5604065f..863f1bbbcfc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -49,25 +49,25 @@ public:
   /// Get the event type.
   virtual const TAO_Notify_EventType& type (void) const;
 
-  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
+  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter) const;
 
   /// Convert to CosNotification::Structured type
   virtual void convert (CosNotification::StructuredEvent& notification) const;
 
   /// Push event to consumer
-  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const;
+  virtual void push (TAO_Notify_Consumer* consumer) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const;
 
   /// marshal this event into a CDR buffer (for persistence)
   virtual void marshal (TAO_OutputCDR & cdr) const;
@@ -80,7 +80,7 @@ public:
 
 protected:
   /// returns a copy of this event allocated from the heap
-  virtual TAO_Notify_Event * copy (ACE_ENV_SINGLE_ARG_DECL) const;
+  virtual TAO_Notify_Event * copy (void) const;
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
index bcaef713001..75a8fc7f028 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -29,7 +29,7 @@ TAO_Notify_CosEC_ProxyPushConsumer::release (void)
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -38,22 +38,22 @@ TAO_Notify_CosEC_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1
       && this->admin_properties().queue_full ())
-    ACE_THROW (CORBA::IMP_LIMIT ());
+    throw CORBA::IMP_LIMIT ();
 
   if (this->is_connected () == 0)
     {
-      ACE_THROW (CosEventComm::Disconnected ());
+      throw CosEventComm::Disconnected ();
     }
 
   TAO_Notify_AnyEvent_No_Copy event (any);
 
   TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -65,20 +65,19 @@ TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSup
                     TAO_Notify_PushSupplier (this),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->init (push_supplier);
 
-  this->connect (supplier ACE_ENV_ARG_PARAMETER);
+  this->connect (supplier);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_CosEC_ProxyPushConsumer::Ptr guard( this );
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy ();
 }
 
 const char *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index 4690fc1fcdd..e577ce6264e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -54,19 +54,19 @@ public:
 protected:
   ///= CosNotifyChannelAdmin::ProxyPushConsumer methods
 
-  virtual void push (const CORBA::Any & data ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any & data)
     ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
                    ));
 
-  virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+  virtual void connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected
                      ));
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
index 694b6c378b5..8ac351b2ebd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -26,8 +26,7 @@ TAO_Notify_CosEC_ProxyPushSupplier::release (void)
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
-                                                       ACE_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -40,20 +39,19 @@ TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushCon
                     TAO_Notify_PushConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->init (push_consumer);
 
-  this->connect (consumer ACE_ENV_ARG_PARAMETER);
+  this->connect (consumer);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_CosEC_ProxyPushSupplier::Ptr guard( this );
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy ();
 }
 
 const char *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index 0858c51475e..da3bad8b1d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -58,7 +58,6 @@ public:
   // = Interface methods
   virtual void connect_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -67,7 +66,6 @@ public:
   ));
 
   virtual void disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index 2ae0cda9608..08045f4d155 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -28,7 +28,7 @@ TAO_Notify_ProxyPushConsumer::release (void)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_ProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ProxyPushConsumer::MyType (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -37,7 +37,7 @@ TAO_Notify_ProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -46,19 +46,19 @@ TAO_Notify_ProxyPushConsumer::push (const CORBA::Any& any ACE_ENV_ARG_DECL)
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1
       && this->admin_properties().queue_full ())
-    ACE_THROW (CORBA::IMP_LIMIT ());
+    throw CORBA::IMP_LIMIT ();
 
   if (this->is_connected () == 0)
     {
-      ACE_THROW (CosEventComm::Disconnected ());
+      throw CosEventComm::Disconnected ();
     }
 
   TAO_Notify_AnyEvent_No_Copy event (any);
-  this->push_i (&event ACE_ENV_ARG_PARAMETER);
+  this->push_i (&event);
 }
 
 void
-TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -70,23 +70,20 @@ TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSuppl
                     TAO_Notify_PushSupplier (this),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->init (push_supplier);
 
-  this->connect (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connect (supplier);
+  this->self_change ();
 }
 
-void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_ProxyPushConsumer::Ptr guard( this );
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy ();
+  this->self_change ();
 }
 
 const char *
@@ -103,31 +100,25 @@ TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs)
   if (attrs.load("PeerIOR", ior))
     {
       CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
-          ACE_TRY_CHECK;
           CosNotifyComm::PushSupplier_var ps = CosNotifyComm::PushSupplier::_nil();
           if ( ior.length() > 0 )
             {
               CORBA::Object_var obj =
-                orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-              ps = CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->string_to_object(ior.c_str());
+              ps = CosNotifyComm::PushSupplier::_unchecked_narrow(obj.in());
             }
           // minor hack: suppress generating subscription updates during reload.
           bool save_updates = this->updates_off_;
           this->updates_off_ = true;
-          this->connect_any_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->connect_any_push_supplier(ps.in());
           this->updates_off_ = save_updates;
         }
-      ACE_CATCHALL
+      catch (...)
         {
           ACE_ASSERT(0);
         }
-      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index 5d7bb8b4b8e..b4361e2b400 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -51,7 +51,7 @@ public:
   virtual ~TAO_Notify_ProxyPushConsumer ();
 
 
-//  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+//  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual const char * get_proxy_type_name (void) const;
 
   virtual void load_attrs (const TAO_Notify::NVPList& attrs);
@@ -59,24 +59,24 @@ public:
 protected:
   ///= CosNotifyChannelAdmin::ProxyPushConsumer methods
 
-  virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void push (const CORBA::Any & data ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any & data)
     ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
                    ));
 
-  virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+  virtual void connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected
                      ));
 
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
index d478b3253cc..93774bb543a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -26,8 +26,7 @@ TAO_Notify_ProxyPushSupplier::release (void)
 }
 
 void
-TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
-                                                     ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -40,28 +39,25 @@ TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsu
                     TAO_Notify_PushConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->init (push_consumer);
 
-  this->connect (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connect (consumer);
+  this->self_change ();
 }
 
 void
-TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_ProxyPushSupplier::Ptr guard( this );
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy ();
+  this->self_change ();
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_ProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ProxyPushSupplier::MyType (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -83,27 +79,22 @@ TAO_Notify_ProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs)
   if (attrs.load("PeerIOR", ior))
     {
       CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           CosNotifyComm::PushConsumer_var pc =
             CosNotifyComm::PushConsumer::_nil();
           if (ior.length() > 0)
             {
               CORBA::Object_var obj =
-                orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-              pc = CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->string_to_object(ior.c_str());
+              pc = CosNotifyComm::PushConsumer::_unchecked_narrow(obj.in());
             }
-          this->connect_any_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->connect_any_push_consumer(pc.in());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // if we can't reconnect, tough...
         }
-      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index e9450202c1c..415db2a8d6d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -60,14 +60,13 @@ public:
   virtual void load_attrs (const TAO_Notify::NVPList& attrs);
 
   // = Interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual void connect_any_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -76,7 +75,6 @@ public:
   ));
 
   virtual void disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index 920eb001c33..615c364ffef 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -25,8 +25,7 @@ TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer ()
 }
 
 void
-TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
-                               ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer)
 {
   // Initialize only once
   ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
@@ -34,18 +33,17 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
   // push_consumer not optional
   if (CORBA::is_nil (push_consumer))
   {
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
-  ACE_TRY
+  try
   {
     if (!TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb ())
       {
         this->push_consumer_ = CosEventComm::PushConsumer::_duplicate (push_consumer);
 
         this->publish_ =
-          CosNotifyComm::NotifyPublish::_narrow (push_consumer ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          CosNotifyComm::NotifyPublish::_narrow (push_consumer);
       }
     else
       {
@@ -57,10 +55,9 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
           TAO_Notify_PROPERTIES::instance()->dispatching_orb()->string_to_object(temp.in());
 
         CosEventComm::PushConsumer_var new_cos_comm_pc =
-          CosEventComm::PushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          CosEventComm::PushConsumer::_unchecked_narrow(obj.in());
 
-        this->push_consumer_ = 
+        this->push_consumer_ =
           CosEventComm::PushConsumer::_duplicate (new_cos_comm_pc.in());
 
         //
@@ -72,10 +69,8 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
         // this->publish_ is in TAO_NS_Consumer::dispatch_updates_i (the superclass).
         // If any other use is made of this data member, then the code to validate
         // the actual type of the target object must be refactored.
-        this->publish_ = 
-          CosNotifyComm::NotifyPublish::_unchecked_narrow (obj.in()
-                                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->publish_ =
+          CosNotifyComm::NotifyPublish::_unchecked_narrow (obj.in());
 
 
         //--cj verify dispatching ORB
@@ -87,16 +82,15 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer
         //--cj end
       }
   }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Got a TRANSIENT in NS_PushConsumer::init");
+      ex._tao_print_exception ("Got a TRANSIENT in NS_PushConsumer::init");
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_PushConsumer %@\n", this));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // _narrow failed which probably means the interface is CosEventComm type.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -107,7 +101,7 @@ TAO_Notify_PushConsumer::release (void)
 }
 
 void
-TAO_Notify_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push (const CORBA::Any& payload)
 {
   //--cj verify dispatching ORB
   if (TAO_debug_level >= 10) {
@@ -116,22 +110,22 @@ TAO_Notify_PushConsumer::push (const CORBA::Any& payload ACE_ENV_ARG_DECL)
   }
   //--cj end
 
-  this->push_consumer_->push (payload ACE_ENV_ARG_PARAMETER);
+  this->push_consumer_->push (payload);
 }
 
 void
-TAO_Notify_PushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::push (const CosNotification::StructuredEvent& event)
 {
   CORBA::Any any;
 
   TAO_Notify_Event::translate (event, any);
 
-  this->push_consumer_->push (any ACE_ENV_ARG_PARAMETER);
+  this->push_consumer_->push (any);
 }
 
 /// Push a batch of events to this consumer.
 void
-TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event)
 {
   ACE_ASSERT(false);
   ACE_UNUSED_ARG (event);
@@ -143,30 +137,25 @@ TAO_Notify_PushConsumer::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in());
       result = static_cast<const char*> (ior.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       result.fast_clear();
     }
-  ACE_ENDTRY;
   return result;
 }
 
 void
-TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL)
+TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer)
 {
   TAO_Notify_PushConsumer* tmp =
     dynamic_cast<TAO_Notify_PushConsumer*> (old_consumer);
   ACE_ASSERT(tmp != 0);
-  this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init(tmp->push_consumer_.in());
   this->schedule_timer(false);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index b6d8a5827e2..cb396ac1b13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -40,19 +40,19 @@ public:
   virtual ~TAO_Notify_PushConsumer ();
 
   /// Init
-  void init (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
+  void init (CosEventComm::PushConsumer_ptr push_consumer);
 
   /// Push <event> to this consumer.
-//  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
+//  virtual void push_i (const TAO_Notify_Event* event);
 
   /// Push <event> to this consumer.
-  virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
+  virtual void push (const CORBA::Any& event);
 
   /// Push <event> to this consumer.
-  virtual void push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::StructuredEvent& event);
 
   /// Push a batch of events to this consumer.
-  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::EventBatch& event);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
@@ -60,8 +60,7 @@ public:
   /// on reconnect we need to move events from the old consumer
   /// to the new one
   virtual void reconnect_from_consumer (
-    TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL);
+    TAO_Notify_Consumer* old_consumer);
 
 protected:
   /// The Consumer
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
index e60246795e2..fce47748b90 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -17,22 +17,20 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier ()
 }
 
 void
-TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier)
 {
   // TODO: verify single init call
   // push_supplier is optional
   this->push_supplier_ = CosEventComm::PushSupplier::_duplicate (push_supplier);
 
-  ACE_TRY
+  try
     {
-      this->subscribe_ = CosNotifyComm::NotifySubscribe::_narrow (push_supplier ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->subscribe_ = CosNotifyComm::NotifySubscribe::_narrow (push_supplier);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // _narrow failed which probably means the interface is CosEventComm type.
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -47,18 +45,15 @@ TAO_Notify_PushSupplier::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index 47b7c94d0a7..cc58272b6d1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -43,7 +43,7 @@ public:
   virtual ~TAO_Notify_PushSupplier ();
 
   /// Init
-  void init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
+  void init (CosEventComm::PushSupplier_ptr push_supplier);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
index bab9d61ecf0..60d125850f9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -48,60 +48,49 @@ class TAO_Notify_Proxy_Builder_T
 public:
   PROXY_PTR
   build (PARENT *parent, CosNotifyChannelAdmin::ProxyID_out proxy_id
-         , const CosNotification::QoSProperties & initial_qos ACE_ENV_ARG_DECL)
+         , const CosNotification::QoSProperties & initial_qos)
   {
     PROXY_VAR proxy_ret;
 
     TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
     PROXY_IMPL* proxy = 0;
-    factory->create (proxy ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (proxy_ret._retn ());
+    factory->create (proxy);
 
     PortableServer::ServantBase_var servant (proxy);
 
-    proxy->init (parent ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (proxy_ret._retn ());
+    proxy->init (parent);
 
-    proxy->set_qos (initial_qos ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (proxy_ret._retn ());
+    proxy->set_qos (initial_qos);
 
-    CORBA::Object_var obj = proxy->activate (proxy ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (proxy_ret._retn ());
+    CORBA::Object_var obj = proxy->activate (proxy);
 
     proxy_id = proxy->id ();
 
-    proxy_ret = PROXY::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (proxy_ret._retn ());
+    proxy_ret = PROXY::_narrow (obj.in());
 
     // insert proxy in admin container.
-    parent->insert (proxy ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (PROXY::_nil ());
+    parent->insert (proxy);
 
     return proxy_ret._retn ();
   }
 
   PROXY_IMPL*
-  build (PARENT *parent, const CosNotifyChannelAdmin::ProxyID proxy_id
-         ACE_ENV_ARG_DECL)
+  build (PARENT *parent, const CosNotifyChannelAdmin::ProxyID proxy_id)
   {
     TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
     PROXY_IMPL* proxy = 0;
-    factory->create (proxy ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    factory->create (proxy);
 
     PortableServer::ServantBase_var servant (proxy);
 
-    proxy->init (parent ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    proxy->init (parent);
 
-    proxy->activate (proxy, proxy_id ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    proxy->activate (proxy, proxy_id);
 
     // insert proxy in admin container.
-    parent->insert (proxy ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    parent->insert (proxy);
 
     return proxy;
   }
@@ -177,7 +166,7 @@ TAO_Notify_Builder::~TAO_Notify_Builder ()
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_Builder::build_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Builder::build_filter_factory (void)
 {
   TAO_Notify_FilterFactory* ff = ACE_Dynamic_Service<TAO_Notify_FilterFactory>::instance ("TAO_Notify_FilterFactory");
 
@@ -186,16 +175,15 @@ TAO_Notify_Builder::build_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
       ACE_NEW_THROW_EX (ff,
                         TAO_Notify_ETCL_FilterFactory (),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
     }
 
   PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
-  return ff->create (default_poa ACE_ENV_ARG_PARAMETER);
+  return ff->create (default_poa);
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_Builder::build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_event_channel_factory (PortableServer::POA_ptr poa)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var ecf_ret;
 
@@ -203,13 +191,10 @@ TAO_Notify_Builder::build_event_channel_factory (PortableServer::POA_ptr poa ACE
 
   // Create ECF
   TAO_Notify_EventChannelFactory* ecf = 0;
-  factory->create (ecf ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ecf_ret._retn ());
+  factory->create (ecf);
 
-  ecf->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ecf_ret._retn ());
-  ecf_ret = ecf->activate_self (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ecf_ret._retn ());
+  ecf->init (poa);
+  ecf_ret = ecf->activate_self ();
 
   return (ecf_ret._retn ());
 }
@@ -219,31 +204,26 @@ TAO_Notify_Builder::build_event_channel (
   TAO_Notify_EventChannelFactory* ecf,
   const CosNotification::QoSProperties & initial_qos,
   const CosNotification::AdminProperties & initial_admin,
-  CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ChannelID_out id)
 {
   CosNotifyChannelAdmin::EventChannel_var ec_ret;
 
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   TAO_Notify_EventChannel* ec = 0;
-  factory->create (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec_ret._retn ());
+  factory->create (ec);
 
-  ec->init (ecf, initial_qos, initial_admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec_ret._retn ());
+  ec->init (ecf, initial_qos, initial_admin);
 
   // insert ec in ec container.
-  ecf->ec_container().insert (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec_ret._retn ());
+  ecf->ec_container().insert (ec);
 
-  CORBA::Object_var obj = ec->activate (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec_ret._retn ());
+  CORBA::Object_var obj = ec->activate (ec);
 
   // Populate the ID to return.
   id = ec->id ();
 
-  ec_ret = CosNotifyChannelAdmin::EventChannel::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ec_ret._retn ());
+  ec_ret = CosNotifyChannelAdmin::EventChannel::_narrow (obj.in());
 
   return ec_ret._retn ();
 }
@@ -251,23 +231,19 @@ TAO_Notify_Builder::build_event_channel (
 TAO_Notify_EventChannel *
 TAO_Notify_Builder::build_event_channel (
   TAO_Notify_EventChannelFactory* ecf,
-  const CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL)
+  const CosNotifyChannelAdmin::ChannelID id)
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   TAO_Notify_EventChannel* ec = 0;
-  factory->create (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  factory->create (ec);
 
-  ec->init (ecf ACE_ENV_ARG_PARAMETER); //, initial_qos, initial_admin
-  ACE_CHECK_RETURN (0);
+  ec->init (ecf); //, initial_qos, initial_admin
 
   // insert ec in ec container.
-  ecf->ec_container().insert (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ecf->ec_container().insert (ec);
 
-  ec->activate (ec, id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ec->activate (ec, id);
 
   return ec;
 }
@@ -276,32 +252,27 @@ CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_Notify_Builder::build_consumer_admin (
     TAO_Notify_EventChannel* ec,
     CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::AdminID_out id)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var ca_ret;
 
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   TAO_Notify_ConsumerAdmin* ca = 0;
-  factory->create (ca ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ca_ret._retn ());
+  factory->create (ca);
 
-  ca->init (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ca_ret._retn ());
+  ca->init (ec);
 
   ca->filter_operator (op);
 
-  CORBA::Object_var obj = ca->activate (ca ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ca_ret._retn ());
+  CORBA::Object_var obj = ca->activate (ca);
 
   id = ca->id ();
 
-  ca_ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ca_ret._retn ());
+  ca_ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in());
 
   // insert admin in CA container.
-  ec->ca_container_->insert (ca ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ca_ret._retn ());
+  ec->ca_container_->insert (ca);
 
   return ca_ret._retn ();
 }
@@ -309,53 +280,43 @@ TAO_Notify_Builder::build_consumer_admin (
 TAO_Notify_ConsumerAdmin *
 TAO_Notify_Builder::build_consumer_admin (
   TAO_Notify_EventChannel* ec,
-  const CosNotifyChannelAdmin::ChannelID id
-  ACE_ENV_ARG_DECL)
+  const CosNotifyChannelAdmin::ChannelID id)
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
   TAO_Notify_ConsumerAdmin * ca = 0;
-  factory->create (ca ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  factory->create (ca);
 
-  ca->init (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ca->init (ec);
 
-  CORBA::Object_var obj = ca->activate (ca, id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Object_var obj = ca->activate (ca, id);
 
   // insert admin in CA container.
-  ec->ca_container_->insert (ca ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ec->ca_container_->insert (ca);
   return ca;
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var sa_ret;
 
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   TAO_Notify_SupplierAdmin* sa = 0;
-  factory->create (sa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (sa_ret._retn ());
+  factory->create (sa);
 
-  sa->init (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (sa_ret._retn ());
+  sa->init (ec);
 
   sa->filter_operator (op);
 
-  CORBA::Object_var obj = sa->activate (sa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (sa_ret._retn ());
+  CORBA::Object_var obj = sa->activate (sa);
 
   id = sa->id ();
 
-  sa_ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (sa_ret._retn ());
+  sa_ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in());
 
   // insert admin in SA container.
-  ec->sa_container().insert (sa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (sa_ret._retn ());
+  ec->sa_container().insert (sa);
 
   return sa_ret._retn ();
 }
@@ -363,23 +324,18 @@ TAO_Notify_Builder::build_supplier_admin (TAO_Notify_EventChannel* ec, CosNotify
 TAO_Notify_SupplierAdmin *
 TAO_Notify_Builder::build_supplier_admin (
   TAO_Notify_EventChannel* ec,
-  const CosNotifyChannelAdmin::ChannelID id
-  ACE_ENV_ARG_DECL)
+  const CosNotifyChannelAdmin::ChannelID id)
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
   TAO_Notify_SupplierAdmin * sa = 0;
-  factory->create (sa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  factory->create (sa);
 
-  sa->init (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  sa->init (ec);
 
-  CORBA::Object_var obj = sa->activate (sa, id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Object_var obj = sa->activate (sa, id);
 
   // insert admin in CA container.
-  ec->sa_container().insert (sa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ec->sa_container().insert (sa);
 
   return sa;
 }
@@ -388,29 +344,28 @@ CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
                             , CosNotifyChannelAdmin::ClientType ctype
                             , CosNotifyChannelAdmin::ProxyID_out proxy_id
-                            , const CosNotification::QoSProperties & initial_qos
-                            ACE_ENV_ARG_DECL)
+                            , const CosNotification::QoSProperties & initial_qos)
 {
   switch (ctype)
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
         TAO_Notify_ProxyPushConsumer_Builder pb;
-        return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (sa, proxy_id, initial_qos);
       }
     break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
         TAO_Notify_StructuredProxyPushConsumer_Builder pb;
-        return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (sa, proxy_id, initial_qos);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
      {
        TAO_Notify_SequenceProxyPushConsumer_Builder pb;
-       return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+       return pb.build (sa, proxy_id, initial_qos);
      }
       break;
 
@@ -424,29 +379,28 @@ CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
                             , CosNotifyChannelAdmin::ClientType ctype
                             , CosNotifyChannelAdmin::ProxyID_out proxy_id
-                            , const CosNotification::QoSProperties & initial_qos
-                            ACE_ENV_ARG_DECL)
+                            , const CosNotification::QoSProperties & initial_qos)
 {
   switch (ctype)
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
         TAO_Notify_ProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id, initial_qos);
       }
       break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
         TAO_Notify_StructuredProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id, initial_qos);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
       {
         TAO_Notify_SequenceProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id, initial_qos);
       }
       break;
 
@@ -459,29 +413,28 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
 TAO_Notify_ProxyConsumer *
 TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
                             , CosNotifyChannelAdmin::ClientType ctype
-                            , const CosNotifyChannelAdmin::ProxyID proxy_id
-                            ACE_ENV_ARG_DECL)
+                            , const CosNotifyChannelAdmin::ProxyID proxy_id)
 {
   switch (ctype)
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
         TAO_Notify_ProxyPushConsumer_Builder pb;
-        return pb.build (sa, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (sa, proxy_id);
       }
     break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
         TAO_Notify_StructuredProxyPushConsumer_Builder pb;
-        return pb.build (sa, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (sa, proxy_id);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
      {
        TAO_Notify_SequenceProxyPushConsumer_Builder pb;
-       return pb.build (sa, proxy_id ACE_ENV_ARG_PARAMETER);
+       return pb.build (sa, proxy_id);
      }
       break;
 
@@ -494,29 +447,28 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_SupplierAdmin* sa
 TAO_Notify_ProxySupplier *
 TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
                             , CosNotifyChannelAdmin::ClientType ctype
-                            , const CosNotifyChannelAdmin::ProxyID proxy_id
-                            ACE_ENV_ARG_DECL)
+                            , const CosNotifyChannelAdmin::ProxyID proxy_id)
 {
   switch (ctype)
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
         TAO_Notify_ProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id);
       }
       break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
         TAO_Notify_StructuredProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id);
       }
     break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
       {
         TAO_Notify_SequenceProxyPushSupplier_Builder pb;
-        return pb.build (ca, proxy_id ACE_ENV_ARG_PARAMETER);
+        return pb.build (ca, proxy_id);
       }
       break;
 
@@ -527,7 +479,7 @@ TAO_Notify_Builder::build_proxy(TAO_Notify_ConsumerAdmin* ca
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_Notify_Builder::build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_proxy (TAO_Notify_ConsumerAdmin* ca)
 {
   CosNotifyChannelAdmin::ProxyID proxy_id;
 
@@ -535,11 +487,11 @@ TAO_Notify_Builder::build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL)
 
   CosNotification::QoSProperties initial_qos;
 
-  return pb.build (ca, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+  return pb.build (ca, proxy_id, initial_qos);
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_Notify_Builder::build_proxy (TAO_Notify_SupplierAdmin* sa ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::build_proxy (TAO_Notify_SupplierAdmin* sa)
 {
   CosNotifyChannelAdmin::ProxyID proxy_id;
 
@@ -547,46 +499,42 @@ TAO_Notify_Builder::build_proxy (TAO_Notify_SupplierAdmin* sa ACE_ENV_ARG_DECL)
 
   CosNotification::QoSProperties initial_qos;
 
-  return pb.build (sa, proxy_id, initial_qos ACE_ENV_ARG_PARAMETER);
+  return pb.build (sa, proxy_id, initial_qos);
 }
 
 void
-TAO_Notify_Builder::apply_reactive_concurrency (TAO_Notify_Object& object ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::apply_reactive_concurrency (TAO_Notify_Object& object)
 {
   TAO_Notify_Reactive_Task* worker_task;
 
   ACE_NEW_THROW_EX (worker_task,
                     TAO_Notify_Reactive_Task (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   object.set_worker_task (worker_task);
 
-  worker_task->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  worker_task->init ();
 }
 
 void
-TAO_Notify_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params)
 {
   TAO_Notify_ThreadPool_Task* worker_task;
 
   ACE_NEW_THROW_EX (worker_task,
                     TAO_Notify_ThreadPool_Task (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   object.set_worker_task (worker_task);
 
-  worker_task->init (tp_params, object.admin_properties_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  worker_task->init (tp_params, object.admin_properties_);
 }
 
 void
-TAO_Notify_Builder::apply_lane_concurrency (TAO_Notify_Object& /*object*/, const NotifyExt::ThreadPoolLanesParams& /*tpl_params*/ ACE_ENV_ARG_DECL)
+TAO_Notify_Builder::apply_lane_concurrency (TAO_Notify_Object& /*object*/, const NotifyExt::ThreadPoolLanesParams& /*tpl_params*/)
 {
   // No lane support
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index 7ed2c219c65..42d695e2658 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -56,11 +56,10 @@ public:
 
   /// Build EventChannel Factory.
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr
-  build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
+  build_event_channel_factory (PortableServer::POA_ptr poa);
 
   /// Build the Filter Factory.
   virtual CosNotifyFilter::FilterFactory_ptr build_filter_factory (
-      ACE_ENV_SINGLE_ARG_DECL
     );
 
   /// Build EventChannel.
@@ -68,22 +67,19 @@ public:
   build_event_channel (TAO_Notify_EventChannelFactory* ecf
                        , const CosNotification::QoSProperties & initial_qos
                        , const CosNotification::AdminProperties & initial_admin
-                       , CosNotifyChannelAdmin::ChannelID_out id
-                       ACE_ENV_ARG_DECL);
+                       , CosNotifyChannelAdmin::ChannelID_out id);
 
 
   virtual TAO_Notify_EventChannel *
   build_event_channel (TAO_Notify_EventChannelFactory* ecf
-                       , const CosNotifyChannelAdmin::ChannelID id
-                       ACE_ENV_ARG_DECL);
+                       , const CosNotifyChannelAdmin::ChannelID id);
 
 
   /// Build ConsumerAdmin
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr
   build_consumer_admin (TAO_Notify_EventChannel* ec
                         , CosNotifyChannelAdmin::InterFilterGroupOperator op
-                        , CosNotifyChannelAdmin::AdminID_out id
-                        ACE_ENV_ARG_DECL);
+                        , CosNotifyChannelAdmin::AdminID_out id);
 
   /// Build ConsumerAdmin during topology restore
   /// TODO: this returns a reference to the actual type
@@ -92,14 +88,13 @@ public:
   virtual TAO_Notify_ConsumerAdmin *
   build_consumer_admin (TAO_Notify_EventChannel* ec
                         , const CosNotifyChannelAdmin::AdminID id //CORBA::Long id          // note: an in parameter!
-                        ACE_ENV_ARG_DECL);
+                        );
 
   /// Build SupplierAdmin
   virtual CosNotifyChannelAdmin::SupplierAdmin_ptr
   build_supplier_admin (TAO_Notify_EventChannel * ec
                         , CosNotifyChannelAdmin::InterFilterGroupOperator op
-                        , CosNotifyChannelAdmin::AdminID_out id
-                        ACE_ENV_ARG_DECL);
+                        , CosNotifyChannelAdmin::AdminID_out id);
 
   /// Build ConsumerAdmin during topology restore
   /// TODO: this returns a reference to the actual type
@@ -108,63 +103,57 @@ public:
   virtual TAO_Notify_SupplierAdmin *
   build_supplier_admin (TAO_Notify_EventChannel * ec
                         , const CosNotifyChannelAdmin::AdminID id //CORBA::Long id          // note: an in parameter!
-                        ACE_ENV_ARG_DECL);
+                        );
 
   /// Build ProxyConsumer
   virtual CosNotifyChannelAdmin::ProxyConsumer_ptr
   build_proxy (TAO_Notify_SupplierAdmin* sa
                , CosNotifyChannelAdmin::ClientType ctype
                , CosNotifyChannelAdmin::ProxyID_out proxy_id
-               , const CosNotification::QoSProperties & initial_qos
-               ACE_ENV_ARG_DECL);
+               , const CosNotification::QoSProperties & initial_qos);
 
   /// Reload ProxyConsumer
   virtual TAO_Notify_ProxyConsumer *
   build_proxy (TAO_Notify_SupplierAdmin* sa
                , CosNotifyChannelAdmin::ClientType ctype
-               , const CosNotifyChannelAdmin::ProxyID proxy_id
-               ACE_ENV_ARG_DECL);
+               , const CosNotifyChannelAdmin::ProxyID proxy_id);
 
   /// Build ProxySupplier.
   virtual CosNotifyChannelAdmin::ProxySupplier_ptr
   build_proxy (TAO_Notify_ConsumerAdmin* ca
                , CosNotifyChannelAdmin::ClientType ctype
                , CosNotifyChannelAdmin::ProxyID_out proxy_id
-               , const CosNotification::QoSProperties & initial_qos
-               ACE_ENV_ARG_DECL);
+               , const CosNotification::QoSProperties & initial_qos);
 
   /// Reload ProxySupplier.
   virtual TAO_Notify_ProxySupplier *
   build_proxy (TAO_Notify_ConsumerAdmin* ca
                , CosNotifyChannelAdmin::ClientType ctype
-               , const CosNotifyChannelAdmin::ProxyID proxy_id
-               ACE_ENV_ARG_DECL);
+               , const CosNotifyChannelAdmin::ProxyID proxy_id);
 
   /// Build CosEC style ProxySupplier.
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-  build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL);
+  build_proxy (TAO_Notify_ConsumerAdmin* ca);
 
   /// Build CosEC style ProxyConsumer.
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-  build_proxy (TAO_Notify_SupplierAdmin* sa ACE_ENV_ARG_DECL);
+  build_proxy (TAO_Notify_SupplierAdmin* sa);
 
   /// Apply Reactive concurrency.
   virtual void apply_reactive_concurrency (
-      TAO_Notify_Object& object ACE_ENV_ARG_DECL
+      TAO_Notify_Object& object
     );
 
   /// Apply Thread Pools.
   virtual void apply_thread_pool_concurrency (
       TAO_Notify_Object& object,
       const NotifyExt::ThreadPoolParams& tp_params
-      ACE_ENV_ARG_DECL
     );
 
   /// Apply Thread Pools with Lanes.
   virtual void apply_lane_concurrency (
       TAO_Notify_Object& object,
       const NotifyExt::ThreadPoolLanesParams& tpl_params
-      ACE_ENV_ARG_DECL
     );
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 96a7d9ef8a7..b036e0d6b6e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -66,27 +66,24 @@ TAO_Notify_Consumer::qos_changed (const TAO_Notify_QoSProperties& qos_properties
 }
 
 void
-TAO_Notify_Consumer::resume (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Consumer::resume (void)
 {
   this->is_suspended_ = 0;
 
-  this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->dispatch_pending ();
 }
 
 void
 TAO_Notify_Consumer::enqueue_request (
-  TAO_Notify_Method_Request_Event * request
-  ACE_ENV_ARG_DECL)
+  TAO_Notify_Method_Request_Event * request)
 {
   TAO_Notify_Event::Ptr event (
-    request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+    request->event ()->queueable_copy ());
 
   TAO_Notify_Method_Request_Event_Queueable * queue_entry;
   ACE_NEW_THROW_EX (queue_entry,
     TAO_Notify_Method_Request_Event_Queueable (*request, event),
     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   if (DEBUG_LEVEL  > 3) ACE_DEBUG ( (LM_DEBUG,
     ACE_TEXT ("Consumer %d: enqueue_request (%d) @%@.\n"),
@@ -99,7 +96,7 @@ TAO_Notify_Consumer::enqueue_request (
 }
 
 bool
-TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL)
+TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * request)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *this->proxy_lock (), false);
   if (! this->pending_events().is_empty ())
@@ -111,14 +108,12 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req
                     request->sequence ()
                     ));
       TAO_Notify_Event::Ptr event (
-        request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK_RETURN (false);
+        request->event ()->queueable_copy ());
       TAO_Notify_Method_Request_Event_Queueable * queue_entry;
       ACE_NEW_THROW_EX (queue_entry,
                         TAO_Notify_Method_Request_Event_Queueable (*request,
                                                                    event),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (false);
       this->pending_events().enqueue_tail (queue_entry);
       this->schedule_timer (false);
       return true;
@@ -132,14 +127,12 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req
                     request->sequence ()
                     ));
       TAO_Notify_Event::Ptr event (
-        request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK_RETURN (false);
+        request->event ()->queueable_copy ());
       TAO_Notify_Method_Request_Event_Queueable * queue_entry;
       ACE_NEW_THROW_EX (queue_entry,
                         TAO_Notify_Method_Request_Event_Queueable (*request,
                                                                    event),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (false);
       this->pending_events().enqueue_tail (queue_entry);
       this->schedule_timer (false);
       return true;
@@ -148,14 +141,12 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req
 }
 
 void
-TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
-                              ACE_ENV_ARG_DECL)
+TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request)
 {
   // Increment reference counts (safely) to prevent this object and its proxy
   // from being deleted while the push is in progress.
   TAO_Notify_Proxy::Ptr proxy_guard (this->proxy ());
-  bool queued = enqueue_if_necessary (request ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  bool queued = enqueue_if_necessary (request);
   if (!queued)
     {
       DispatchStatus status = this->dispatch_request (request);
@@ -174,8 +165,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
                           ACE_TEXT ("to failed dispatch.\n"),
                           static_cast<int> (this->proxy ()->id ()),
                           request->sequence ()));
-            this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+            this->enqueue_request (request);
             this->schedule_timer (true);
             break;
           }
@@ -201,18 +191,15 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
                           request->sequence ()
                           ));
             request->complete ();
-            ACE_DECLARE_NEW_ENV;
-            ACE_TRY
+            try
               {
-                this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                this->proxy_supplier ()->destroy ();
               }
-            ACE_CATCHANY
+            catch (const CORBA::Exception&)
               {
                 // todo is there something meaningful we can do here?
                 ;
               }
-            ACE_ENDTRY;
             break;
           }
         }
@@ -223,11 +210,9 @@ TAO_Notify_Consumer::DispatchStatus
 TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request)
 {
   DispatchStatus result = DISPATCH_SUCCESS;
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
-      request->event ()->push (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      request->event ()->push (this);
       if (DEBUG_LEVEL  > 8)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("Consumer %d dispatched single event %d.\n"),
@@ -235,7 +220,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
                     request->sequence ()
                     ));
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
       if (DEBUG_LEVEL  > 0)
         {
@@ -248,7 +233,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
         }
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -288,7 +273,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
             } break;
         }
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -299,7 +284,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, ex)
+  catch (const CORBA::COMM_FAILURE& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -310,7 +295,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
       if (DEBUG_LEVEL  > 0)
         {
@@ -323,7 +308,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
         }
       result = DISPATCH_DISCARD;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ( (LM_ERROR,
                    ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push "
@@ -333,7 +318,6 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
                    ));
       result = DISPATCH_DISCARD;
     }
-  ACE_ENDTRY;
 
   // for persistent events that haven't timed out
   // convert "FAIL" & "DISCARD" to "RETRY"
@@ -360,13 +344,11 @@ TAO_Notify_Consumer::DispatchStatus
 TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
 {
   DispatchStatus result = DISPATCH_SUCCESS;
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
-      this->push (batch ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->push (batch);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -377,7 +359,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -417,7 +399,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
             } break;
         }
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -428,7 +410,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, ex)
+  catch (const CORBA::COMM_FAILURE& ex)
     {
       if (DEBUG_LEVEL  > 0)
         ACE_DEBUG ((LM_ERROR,
@@ -439,7 +421,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
                     ));
       result = DISPATCH_FAIL;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
       if (DEBUG_LEVEL  > 0)
         {
@@ -452,7 +434,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
         }
       result = DISPATCH_DISCARD;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) TAO_Notify_Consumer "
@@ -462,12 +444,11 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
                   ));
       result = DISPATCH_DISCARD;
     }
-  ACE_ENDTRY;
   return result;
 }
 
 void
-TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Consumer::dispatch_pending (void)
 {
   if (DEBUG_LEVEL  > 5)
     ACE_DEBUG ((LM_DEBUG,
@@ -560,17 +541,14 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T
                 ace_mon.acquire ();
               }
             ace_mon.release ();
-            ACE_DECLARE_NEW_ENV;
-            ACE_TRY
+            try
               {
-                this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                this->proxy_supplier ()->destroy ();
               }
-            ACE_CATCHANY
+            catch (const CORBA::Exception&)
               {
                 // todo is there something reasonable to do here?
               }
-            ACE_ENDTRY;
             ace_mon.acquire ();
             result = true;
             break;
@@ -656,22 +634,19 @@ TAO_Notify_Consumer::handle_timeout (const ACE_Time_Value&, const void*)
 {
   TAO_Notify_Consumer::Ptr grd (this);
   this->timer_id_ = -1;  // This must come first, because dispatch_pending may try to resched
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
-      this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->dispatch_pending ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-TAO_Notify_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Consumer::shutdown (void)
 {
   if (this->timer_.isSet ())
     {
@@ -681,18 +656,16 @@ TAO_Notify_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed
-                                         ACE_ENV_ARG_DECL)
+TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed)
 {
   if (this->have_not_yet_verified_publish_)
     {
       this->have_not_yet_verified_publish_ = false; // no need to check again
-      if (! this->publish_->_is_a ("IDL:omg.org/CosNotifyComm/NotifyPublish:1.0"
-                                   ACE_ENV_ARG_PARAMETER))
+      if (! this->publish_->_is_a ("IDL:omg.org/CosNotifyComm/NotifyPublish:1.0"))
         this->publish_ = CosNotifyComm::NotifyPublish::_nil();
     }
   if (! CORBA::is_nil (this->publish_.in ()))
-    this->publish_->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
+    this->publish_->offer_change (added, removed);
 }
 
 TAO_SYNCH_MUTEX*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 89058b6492e..19eabddd0b8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -68,40 +68,39 @@ public:
   virtual TAO_Notify_Proxy* proxy (void);
 
   /// Dispatch Event to consumer
-  void deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL);
+  void deliver (TAO_Notify_Method_Request_Event * request);
 
   /// Push <event> to this consumer.
-  virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL) = 0;
+  virtual void push (const CORBA::Any& event) = 0;
 
   /// Push <event> to this consumer.
-  virtual void push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL) = 0;
+  virtual void push (const CosNotification::StructuredEvent& event) = 0;
 
   /// Push a batch of events to this consumer.
-  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL) = 0;
+  virtual void push (const CosNotification::EventBatch& event) = 0;
 
   /// Dispatch the batch of events to the attached consumer
   DispatchStatus dispatch_batch (const CosNotification::EventBatch& batch);
 
   /// Dispatch the pending events
-  void dispatch_pending (ACE_ENV_SINGLE_ARG_DECL);
+  void dispatch_pending (void);
 
   /// Is the connection suspended?
   CORBA::Boolean is_suspended (void);
 
   /// Suspend Connection
-  void suspend (ACE_ENV_SINGLE_ARG_DECL);
+  void suspend (void);
 
   /// Resume Connection
-  void resume (ACE_ENV_SINGLE_ARG_DECL);
+  void resume (void);
 
   /// Shutdown the consumer
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
   /// on reconnect we need to move events from the old consumer
   /// to the new one
   virtual void reconnect_from_consumer (
-    TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL) = 0;
+    TAO_Notify_Consumer* old_consumer) = 0;
 
   /// Override, Peer::qos_changed
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
@@ -125,19 +124,17 @@ protected:
     Request_Queue & requests,
     ACE_Guard <TAO_SYNCH_MUTEX> & ace_mon);
 
-  void enqueue_request(TAO_Notify_Method_Request_Event * request ACE_ENV_ARG_DECL);
+  void enqueue_request(TAO_Notify_Method_Request_Event * request);
 
   /// Add request to a queue if necessary.
   /// Overridden by sequence consumer to "always" put incoming events into the queue.
   /// @returns true the request has been enqueued; false the request should be handled now.
   virtual bool enqueue_if_necessary(
-    TAO_Notify_Method_Request_Event * request
-    ACE_ENV_ARG_DECL);
+    TAO_Notify_Method_Request_Event * request);
 
   // Dispatch updates
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
-                                   const CosNotification::EventTypeSeq& removed
-                                   ACE_ENV_ARG_DECL);
+                                   const CosNotification::EventTypeSeq& removed);
 
   /// Get the shared Proxy Lock
   TAO_SYNCH_MUTEX* proxy_lock (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
index c1dcd33bbe7..bc0be7f45e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
@@ -19,7 +19,7 @@ TAO_Notify_Consumer::is_suspended (void)
 }
 
 ACE_INLINE void
-TAO_Notify_Consumer::suspend (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Consumer::suspend (void)
 {
   this->is_suspended_ = 1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 7b10e3bd40b..495aa338b2a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -55,26 +55,24 @@ TAO_Notify_ConsumerAdmin::~TAO_Notify_ConsumerAdmin ()
 }
 
 void
-TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec)
 {
-  TAO_Notify_Admin::init (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Notify_Admin::init (ec);
 
   const CosNotification::QoSProperties &default_ca_qos =
     TAO_Notify_PROPERTIES::instance ()->default_consumer_admin_qos_properties ();
 
-  this->set_qos (default_ca_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_qos (default_ca_qos);
 }
 
 void
-TAO_Notify_ConsumerAdmin::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_ConsumerAdmin::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
@@ -87,24 +85,22 @@ TAO_Notify_ConsumerAdmin::release (void)
 }
 
 void
-TAO_Notify_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::destroy (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  int result = this->shutdown ();
   if ( result == 1)
     return;
 
-  this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_->remove (this);
 }
 
 
 TAO_Notify::Topology_Object*
 TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
-  CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  CORBA::Long id, const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify::Topology_Object* result = this;
   if (type == "proxy_push_supplier")
@@ -113,8 +109,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs);
   }
   else if (type == "structured_proxy_push_supplier")
   {
@@ -122,8 +117,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs);
   }
   else if (type == "sequence_proxy_push_supplier")
   {
@@ -131,8 +125,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs);
   }
 #if 0
   else if (type == "ec_proxy_push_supplier")
@@ -141,14 +134,12 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, attrs ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = this->load_proxy(id, attrs);
   }
 #endif
   else
   {
-    result = TAO_Notify_Admin::load_child (type, id, attrs ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = TAO_Notify_Admin::load_child (type, id, attrs);
   }
   return result;
 }
@@ -157,15 +148,13 @@ TAO_Notify::Topology_Object*
 TAO_Notify_ConsumerAdmin::load_proxy (
   CORBA::Long id,
   CosNotifyChannelAdmin::ClientType ctype,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
   TAO_Notify_ProxySupplier * proxy =
     bld->build_proxy (this
                , ctype
-               , id
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+               , id);
   ACE_ASSERT(proxy != 0);
   proxy->load_attrs (attrs);
   return proxy;
@@ -174,7 +163,6 @@ TAO_Notify_ConsumerAdmin::load_proxy (
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
                                                          CosNotifyChannelAdmin::ProxyID_out proxy_id
-                                                         ACE_ENV_ARG_DECL
                                                          )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -187,11 +175,8 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdm
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
-                                                                , initial_qos
-                                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
+                                                                , initial_qos);
+  this->self_change ();
   return proxy._retn ();
 }
 
@@ -199,7 +184,6 @@ CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                                                   CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                                                   const CosNotification::QoSProperties & initial_qos
-                                                                  ACE_ENV_ARG_DECL
                                                                   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
@@ -211,30 +195,25 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
-                                                                , initial_qos
-                                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
+                                                                , initial_qos);
+  this->self_change ();
   return proxy._retn ();
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_Notify_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::obtain_push_supplier (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosEventChannelAdmin::ProxyPushSupplier_var proxy =
-    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this);
+  this->self_change ();
   return proxy._retn ();
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_Notify_ConsumerAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::MyID (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -243,16 +222,16 @@ TAO_Notify_ConsumerAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_ConsumerAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::MyChannel (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->ec_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ec_->_this ();
 }
 
 ::CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_ConsumerAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ConsumerAdmin::MyOperator (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -261,18 +240,18 @@ TAO_Notify_ConsumerAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::push_suppliers (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_Proxy_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->proxy_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->proxy_container());
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::ProxyNotFound
@@ -280,32 +259,31 @@ TAO_Notify_ConsumerAdmin::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID pro
 {
   TAO_Notify_ProxySupplier_Find_Worker find_worker;
 
-  return find_worker.resolve (proxy_id, this->proxy_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (proxy_id, this->proxy_container());
 }
 
-void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & qos)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos);
 }
 
 
 CosNotification::QoSProperties*
-TAO_Notify_ConsumerAdmin::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_qos (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Notify_Object::get_qos ();
 }
 
 void
 TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq & added,
                                            const CosNotification::EventTypeSeq & removed
-                                           ACE_ENV_ARG_DECL
                                            )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -318,75 +296,70 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
-    ACE_CHECK;
 
     this->subscribed_types_.add_and_remove (seq_added, seq_removed);
 
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
-    this->proxy_container().collection()->for_each (&worker ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->proxy_container().collection()->for_each (&worker);
   }
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->self_change ();
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosNotifyFilter::FilterID fid =
-    this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (fid);
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (fid);
+    this->filter_admin_.add_filter (new_filter);
+  this->self_change ();
   return fid;
 }
 
 void
-TAO_Notify_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::remove_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER);
+  this->filter_admin_.remove_filter (filter);
 }
 
 ::CosNotifyFilter::Filter_ptr
-TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
+  return this->filter_admin_.get_filter (filter);
 }
 
 ::CosNotifyFilter::FilterIDSeq*
-TAO_Notify_ConsumerAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::get_all_filters (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->filter_admin_.get_all_filters ();
 }
 
 void
-TAO_Notify_ConsumerAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::remove_all_filters (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_admin_.remove_all_filters ();
 }
 
 /************ UNIMPLMENTED METHODS *************************/
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::priority_filter (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -395,17 +368,17 @@ TAO_Notify_ConsumerAdmin::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::lifetime_filter (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -415,16 +388,16 @@ TAO_Notify_ConsumerAdmin::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 ::CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::pull_suppliers (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -434,8 +407,7 @@ TAO_Notify_ConsumerAdmin::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
 TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/,
-                                                         CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/
-                                                         ACE_ENV_ARG_DECL)
+                                                         CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminLimitExceeded
@@ -448,18 +420,17 @@ TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdm
 void
 TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                     CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
-                                    ACE_ENV_ARG_DECL
                                     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_Notify_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin::obtain_pull_supplier (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -470,16 +441,14 @@ TAO_Notify_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
 TAO_Notify_ProxySupplier *
 TAO_Notify_ConsumerAdmin::find_proxy_supplier (
     TAO_Notify::IdVec & id_path,
-    size_t position
-    ACE_ENV_ARG_DECL)
+    size_t position)
 {
   TAO_Notify_ProxySupplier * result = 0;
   size_t path_size = id_path.size ();
   if (position < path_size)
   {
     TAO_Notify_ProxySupplier_Find_Worker find_worker;
-    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container());
     result = dynamic_cast <TAO_Notify_ProxySupplier *> (proxy);
   }
   return result;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index a17453cfc07..41f573aef56 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -51,11 +51,11 @@ public:
   virtual ~TAO_Notify_ConsumerAdmin ();
 
   /// Init
-  void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_EventChannel *ec);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
 
   virtual const char * get_admin_type_name () const;
@@ -63,27 +63,23 @@ public:
   virtual TAO_Notify::Topology_Object* load_child (
     const ACE_CString &type,
     CORBA::Long id,
-    const TAO_Notify::NVPList& attrs
-    ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
   TAO_Notify_ProxySupplier * find_proxy_supplier (
       TAO_Notify::IdVec & id_path,
-      size_t position
-      ACE_ENV_ARG_DECL);
+      size_t position);
 
 protected:
   TAO_Notify::Topology_Object *load_proxy (
     CORBA::Long id,
     CosNotifyChannelAdmin::ClientType ctype,
-    const TAO_Notify::NVPList& attrs
-    ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
   /// = NotifyExt::ConsumerAdmin methods
   virtual CosNotifyChannelAdmin::ProxySupplier_ptr
   obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                               CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                               const CosNotification::QoSProperties & initial_qos
-                                              ACE_ENV_ARG_DECL
                                               )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
@@ -92,58 +88,56 @@ protected:
                      ));
 
   /// = CosNotifyChannelAdmin::ConsumerAdmin methods
-  virtual CosNotifyChannelAdmin::AdminID MyID (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::AdminID MyID (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
 
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (
 
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter ACE_ENV_ARG_DECL)
+  virtual void priority_filter (CosNotifyFilter::MappingFilter_ptr priority_filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter
-                                ACE_ENV_ARG_DECL)
+  virtual void lifetime_filter (CosNotifyFilter::MappingFilter_ptr lifetime_filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id
-                                                                         ACE_ENV_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::ProxyNotFound
@@ -151,8 +145,7 @@ protected:
 
   virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr
   obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType ctype,
-                                     CosNotifyChannelAdmin::ProxyID_out proxy_id
-                                     ACE_ENV_ARG_DECL)
+                                     CosNotifyChannelAdmin::ProxyID_out proxy_id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::AdminLimitExceeded
@@ -160,79 +153,75 @@ protected:
 
   virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr
   obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype,
-                                     CosNotifyChannelAdmin::ProxyID_out proxy_id
-                                     ACE_ENV_ARG_DECL)
+                                     CosNotifyChannelAdmin::ProxyID_out proxy_id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::AdminLimitExceeded
                      ));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotification::QoSProperties * get_qos (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotification::QoSProperties * get_qos (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void set_qos (const CosNotification::QoSProperties & qos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_qos (const CosNotification::QoSProperties & qos)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedQoS
                      ));
 
   virtual void validate_qos (const CosNotification::QoSProperties & required_qos,
-                             CosNotification::NamedPropertyRangeSeq_out available_qos
-                             ACE_ENV_ARG_DECL)
+                             CosNotification::NamedPropertyRangeSeq_out available_qos)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedQoS
                      ));
 
   virtual void subscription_change (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL)
+                                    const CosNotification::EventTypeSeq & removed)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyComm::InvalidEventType
                      ));
 
-  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+  virtual void remove_filter (CosNotifyFilter::FilterID filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyFilter::FilterNotFound
                      ));
 
-  virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+  virtual ::CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyFilter::FilterNotFound
                      ));
 
-  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void remove_all_filters (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index 3656e3dca86..696af99cf6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -31,33 +31,33 @@ TAO_Notify_Container_T<TYPE>::~TAO_Notify_Container_T ()
 }
 
 template <class TYPE> void
-TAO_Notify_Container_T<TYPE>::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::shutdown (void)
 {
   TAO_ESF_Shutdown_Proxy<TYPE> shutdown_worker;
 
-  this->collection_->for_each (&shutdown_worker ACE_ENV_ARG_PARAMETER);
+  this->collection_->for_each (&shutdown_worker);
 }
 
 template<class TYPE> void
-TAO_Notify_Container_T<TYPE>::insert (TYPE* type ACE_ENV_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::insert (TYPE* type)
 {
-  this->collection_->connected (type ACE_ENV_ARG_PARAMETER);
+  this->collection_->connected (type);
 }
 
 template<class TYPE> void
-TAO_Notify_Container_T<TYPE>::remove (TYPE* type ACE_ENV_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::remove (TYPE* type)
 {
-  this->collection_->disconnected (type ACE_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (type);
 }
 
 template<class TYPE> void
-TAO_Notify_Container_T<TYPE>::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Container_T<TYPE>::init (void)
 {
   // get the factory
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
   // Init variables
-  factory->create (this->collection_ ACE_ENV_ARG_PARAMETER);
+  factory->create (this->collection_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
index 9c06930d1b2..d120afcdf5e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -44,16 +44,16 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T
   virtual ~TAO_Notify_Container_T ();
 
   /// Init this object.
-  void init (ACE_ENV_SINGLE_ARG_DECL);
+  void init (void);
 
   /// Insert object to this container.
-  virtual void insert (TYPE* type ACE_ENV_ARG_DECL);
+  virtual void insert (TYPE* type);
 
   /// Remove type from container_
-  virtual void remove (TYPE* type ACE_ENV_ARG_DECL);
+  virtual void remove (TYPE* type);
 
   /// Shutdown
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
   /// Collection
   COLLECTION* collection (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
index ccf274aecbf..bec2898f951 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template<class TYPE> ACE_INLINE ACE_TYPENAME TAO_Notify_Container_T<TYPE>::COLLECTION*
+template<class TYPE> ACE_INLINE typename TAO_Notify_Container_T<TYPE>::COLLECTION*
 TAO_Notify_Container_T<TYPE>:: collection (void)
 {
   return this->collection_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index 3e095e32f73..c8555faceea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -218,7 +218,7 @@ TAO_CosNotify_Service::fini (void)
 }
 
 void
-TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb)
 {
   ACE_DEBUG ((LM_DEBUG, "Loading the Cos Notification Service...\n"));
 
@@ -233,42 +233,38 @@ TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
           char *argv0 = 0;
           char **argv = &argv0;  // ansi requires argv be null terminated.
           CORBA::ORB_var dispatcher = CORBA::ORB_init (argc, argv,
-                                                       "default_dispatcher" ACE_ENV_ARG_PARAMETER);
-          //ACE_CHECK_RETURN (-1);
+                                                       "default_dispatcher");
 
           TAO_Notify_PROPERTIES::instance()->dispatching_orb(dispatcher.in());
         }
 
-      this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb() ACE_ENV_ARG_PARAMETER);
+      this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb());
 
     }
   else
     {
-      this->init_i (orb ACE_ENV_ARG_PARAMETER);
+      this->init_i (orb);
     }
 }
 
 void
-TAO_CosNotify_Service::init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb)
 {
-  this->init_i2 (orb, dispatching_orb ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_i2 (orb, dispatching_orb);
 }
 
 void
-TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb)
 {
   // Obtain the Root POA
   CORBA::Object_var object  =
-    orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (object.in ()))
     ACE_ERROR ((LM_ERROR,
                 " (%P|%t) Unable to resolve the RootPOA.\n"));
 
-  PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ());
 
   // Set the properties
   TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
@@ -277,30 +273,26 @@ TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   properties->default_poa (default_poa.in ());
 
   // Init the factory
-  this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+  this->factory_.reset (this->create_factory ());
   ACE_ASSERT( this->factory_.get() != 0 );
   TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get());
 
-  this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+  this->builder_.reset (this->create_builder ());
   ACE_ASSERT( this->builder_.get() != 0 );
   TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get());
 }
 
 void
-TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb)
 {
   // Obtain the Root POA
   CORBA::Object_var object  =
-    orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (object.in ()))
     ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve the RootPOA.\n"));
 
-  PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var default_poa = PortableServer::POA::_narrow (object.in ());
 
   // Set the properties
   TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
@@ -312,19 +304,17 @@ TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_o
   properties->default_poa (default_poa.in ());
 
   // Init the factory and builder
-  this->factory_.reset (this->create_factory (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+  this->factory_.reset (this->create_factory ());
   ACE_ASSERT( this->factory_.get() != 0 );
   TAO_Notify_PROPERTIES::instance()->factory (this->factory_.get());
 
-  this->builder_.reset (this->create_builder (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+  this->builder_.reset (this->create_builder ());
   ACE_ASSERT( this->builder_.get() != 0 );
   TAO_Notify_PROPERTIES::instance()->builder (this->builder_.get());
 }
 
 TAO_Notify_Factory*
-TAO_CosNotify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosNotify_Service::create_factory (void)
 {
   TAO_Notify_Factory* factory = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory");
   if (factory == 0)
@@ -332,31 +322,29 @@ TAO_CosNotify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
        ACE_NEW_THROW_EX (factory,
                          TAO_Notify_Default_Factory (),
                          CORBA::NO_MEMORY ());
-       ACE_CHECK_RETURN (0);
     }
   return factory;
 }
 
 TAO_Notify_Builder*
-TAO_CosNotify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosNotify_Service::create_builder (void)
 {
   TAO_Notify_Builder* builder = 0;
   ACE_NEW_THROW_EX (builder,
                     TAO_Notify_Builder (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return builder;
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_CosNotify_Service::create (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::create (PortableServer::POA_ptr poa)
 {
-  return this->builder().build_event_channel_factory (poa ACE_ENV_ARG_PARAMETER);
+  return this->builder().build_event_channel_factory (poa);
 }
 
 void
-TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/)
 {
   // NOP.
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index c3e2e8ebd47..109af701092 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -47,32 +47,32 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Init the service from driver
-  virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  virtual void init_service (CORBA::ORB_ptr orb);
 
   virtual int fini (void);
 
   /// separate dispatching orb Init
-  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL);
+  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb);
 
   /// Create the Channel Factory.
-  virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL);
+  virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA);
 
   /// Called by the factory when it is destroyed.
-  virtual void remove (TAO_Notify_EventChannelFactory* ecf ACE_ENV_ARG_DECL);
+  virtual void remove (TAO_Notify_EventChannelFactory* ecf);
 
 protected:
   /// Init the data members
-  virtual void init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  virtual void init_i (CORBA::ORB_ptr orb);
   /// Init the data members separate dispatching orb
-  virtual void init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL);
+  virtual void init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb);
 
 private:
 
   /// Create the Factory for Notify objects.
-  virtual TAO_Notify_Factory* create_factory (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Factory* create_factory (void);
 
   /// Create the Builder for Notify objects.
-  virtual TAO_Notify_Builder* create_builder (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Builder* create_builder (void);
 
   /// Set thread options on <qos>.
   void set_threads (CosNotification::QoSProperties &qos, int threads);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index 990da34bdbc..74f6e767a34 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -32,11 +32,11 @@ template <class PROXY>
 class COW_Collection_Default_Factory
 {
 public:
-  typedef ACE_TYPENAME TAO_ESF_Proxy_List<PROXY>::Iterator PROXY_ITER;
+  typedef typename TAO_ESF_Proxy_List<PROXY>::Iterator PROXY_ITER;
   typedef TAO_ESF_Copy_On_Write<PROXY, TAO_ESF_Proxy_List<PROXY>,PROXY_ITER, ACE_SYNCH> COLLECTION;
   typedef TAO_ESF_Proxy_Collection<PROXY> BASE_COLLECTION;
 
-  void create (BASE_COLLECTION* &collection ACE_ENV_ARG_DECL)
+  void create (BASE_COLLECTION* &collection)
   {
     ACE_NEW_THROW_EX (collection,
                       COLLECTION (),
@@ -53,49 +53,49 @@ TAO_Notify_Default_Factory::~TAO_Notify_Default_Factory ()
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ProxySupplier_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxySupplier_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_ProxySupplier> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ProxyConsumer_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxyConsumer_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_ProxyConsumer> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_EventChannel> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_ConsumerAdmin> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_SupplierAdmin> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_Proxy_Collection* &collection ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_Proxy_Collection* &collection)
 {
   COW_Collection_Default_Factory<TAO_Notify_Proxy> f;
-  f.create (collection ACE_ENV_ARG_PARAMETER);
+  f.create (collection);
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_EventChannelFactory*& factory ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_EventChannelFactory*& factory)
 {
   ACE_NEW_THROW_EX (factory,
                     TAO_Notify_EventChannelFactory (),
@@ -103,7 +103,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_EventChannelFactory*& factory ACE
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel*& channel)
 {
   ACE_NEW_THROW_EX (channel,
                     TAO_Notify_EventChannel (),
@@ -112,7 +112,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_EventChannel*& channel ACE_ENV_AR
 
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin*& admin)
 {
   ACE_NEW_THROW_EX (admin,
                     TAO_Notify_SupplierAdmin (),
@@ -120,7 +120,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin*& admin)
 {
   ACE_NEW_THROW_EX (admin,
                     TAO_Notify_ConsumerAdmin (),
@@ -128,7 +128,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushConsumer*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_StructuredProxyPushConsumer (),
@@ -136,7 +136,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushConsumer*& pro
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_StructuredProxyPushSupplier (),
@@ -144,7 +144,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& pro
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushConsumer*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_ProxyPushConsumer (),
@@ -152,7 +152,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_ProxyPushSupplier (),
@@ -160,7 +160,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_CosEC_ProxyPushConsumer (),
@@ -168,7 +168,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy A
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_CosEC_ProxyPushSupplier (),
@@ -176,7 +176,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy A
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushConsumer*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_SequenceProxyPushConsumer (),
@@ -184,7 +184,7 @@ TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushConsumer*& proxy
 }
 
 void
-TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Default_Factory::create (TAO_Notify_SequenceProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_SequenceProxyPushSupplier (),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
index 106d7cb265d..48ca8ef08c2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -39,58 +39,58 @@ public:
   virtual ~TAO_Notify_Default_Factory ();
 
   /// Create ProxySupplier Collection
-  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection);
 
   /// Create ProxyConsumer Collection
-  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection);
 
   /// Create EventChannel Collection
-  virtual void create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel_Collection*& collection);
 
   /// Create ConsumerAdmin Collection
-  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection);
 
   /// Create SupplierAdmin Collection
-  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection);
 
   /// Create Proxy Collection
-  virtual void create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_Proxy_Collection*& collection);
 
   /// Create EventChannelDefault_Factory
-  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory);
 
   /// Create EventChannel
-  virtual void create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel*& channel);
 
   /// Create SupplierAdmin
-  virtual void create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin*& admin);
 
   /// Create ConsumerAdmin
-  virtual void create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin*& admin);
 
   /// Create ProxyPushConsumer
-  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy);
 
   /// Create ProxyPushSupplier
-  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy);
 
   /// Create CosEC_ProxyPushConsumer
-  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy);
 
   /// Create CosEC_ProxyPushSupplier
-  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy);
 
   /// Create StructuredProxyPushConsumer
-  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy);
 
   /// Create StructuredProxyPushSupplier
-  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy);
 
   /// Create SequenceProxyPushConsumer
-  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy);
 
   /// Create SequenceProxyPushSupplier
-  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
index a40986b1a0c..8df40fe1a13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
@@ -87,9 +87,9 @@ Delivery_Request::should_retry () const
 void
 Delivery_Request::dispatch (
   TAO_Notify_ProxySupplier * proxy_supplier,
-  bool filter ACE_ENV_ARG_DECL)
+  bool filter)
 {
-  this->routing_slip_->dispatch (proxy_supplier, filter ACE_ENV_ARG_PARAMETER);
+  this->routing_slip_->dispatch (proxy_supplier, filter);
 }
 
 const Routing_Slip_Ptr &
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
index 744bca7d733..f99f2084823 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
@@ -101,7 +101,7 @@ public:
   bool should_retry () const;
 
   /// expose routing slip method
-  void dispatch (TAO_Notify_ProxySupplier * proxy_supplier, bool filter ACE_ENV_ARG_DECL);
+  void dispatch (TAO_Notify_ProxySupplier * proxy_supplier, bool filter);
 
   // Meaningless, but needed by ACE_Vector on some platforms (gcc2.x LynxOS)
   bool operator == (const Delivery_Request & rhs) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index ca9765dc57e..c275969d0bd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -19,26 +19,24 @@ TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (void)
 
 TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->remove_all_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->remove_all_constraints ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       if (TAO_debug_level)
         ACE_DEBUG ((LM_DEBUG, "Error in Filter dtor\n"));
 
       // @@ eat exception.
     }
-  ACE_ENDTRY;
 
   if (TAO_debug_level > 1)
       ACE_DEBUG ((LM_DEBUG, "Filter Destroyed\n"));
 }
 
 char*
-TAO_Notify_ETCL_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ETCL_Filter::constraint_grammar (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -48,7 +46,6 @@ TAO_Notify_ETCL_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq
-                                       ACE_ENV_ARG_DECL
                                        )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -68,15 +65,14 @@ TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfo
         constraint_info_seq[index].constraint_expression;
 
       notify_constr_expr->interpreter.
-        build_tree (expr.constraint_expr.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        build_tree (expr.constraint_expr.in ());
 
       notify_constr_expr->constr_expr = expr;
 
       CosNotifyFilter::ConstraintID cnstr_id = ++constraint_expr_ids_;
 
       if (this->constraint_expr_list_.bind (cnstr_id, notify_constr_expr) == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       if (TAO_debug_level > 1)
         ACE_DEBUG ((LM_DEBUG, "Added constraint to filter %x\n", this, expr.constraint_expr.in ()));
@@ -87,7 +83,6 @@ TAO_Notify_ETCL_Filter::add_constraints_i (const CosNotifyFilter::ConstraintInfo
 
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -96,7 +91,6 @@ TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::ULong constraint_length = constraint_list.length ();
 
@@ -109,7 +103,6 @@ TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq
   ACE_NEW_THROW_EX (infoseq_ptr,
                     CosNotifyFilter::ConstraintInfoSeq (constraint_length),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CosNotifyFilter::ConstraintInfoSeq_var infoseq (infoseq_ptr);
   infoseq->length (constraint_length);
@@ -129,8 +122,7 @@ TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq
         }
     }
 
-  this->add_constraints_i (infoseq.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->add_constraints_i (infoseq.in ());
 
   return infoseq._retn ();
 }
@@ -138,7 +130,6 @@ TAO_Notify_ETCL_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq
 void
 TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   ACE_ENV_ARG_DECL
                                    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -148,7 +139,6 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // First check if all the ids are valid.
   u_int index;
@@ -157,7 +147,7 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
     {
       if (this->constraint_expr_list_.find (del_list [index]) == -1)
         {
-          ACE_THROW (CosNotifyFilter::ConstraintNotFound (del_list [index]));
+          throw CosNotifyFilter::ConstraintNotFound (del_list [index]);
         }
     }
 
@@ -165,7 +155,8 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
     {
       if (this->constraint_expr_list_.find (modify_list [index].constraint_id) == -1)
         {
-          ACE_THROW (CosNotifyFilter::ConstraintNotFound (modify_list [index].constraint_id));
+          throw CosNotifyFilter::ConstraintNotFound (
+            modify_list [index].constraint_id);
         }
     }
 
@@ -186,13 +177,11 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
 
   // Now add the new entries.
   // Keep a list of ids generated in this session.
-  ACE_TRY
+  try
     {
-      this->add_constraints_i (modify_list
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->add_constraints_i (modify_list);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Restore,
       for (index = 0; index < modify_list.length (); ++index)
@@ -200,13 +189,11 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
           CosNotifyFilter::ConstraintID cnstr_id = ++this->constraint_expr_ids_;
 
           if (constraint_expr_list_.bind (cnstr_id, constr_saved[index]) == -1)
-            ACE_THROW (CORBA::NO_RESOURCES ());
+            throw CORBA::NO_RESOURCES ();
         }
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   // Now go around deleting...
   // for the del_list.
@@ -227,21 +214,18 @@ TAO_Notify_ETCL_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDS
 
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::ConstraintNotFound))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   // Create the list that goes out.
   CosNotifyFilter::ConstraintInfoSeq *infoseq_ptr;
   ACE_NEW_THROW_EX (infoseq_ptr,
                     CosNotifyFilter::ConstraintInfoSeq (id_list.length ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CosNotifyFilter::ConstraintInfoSeq_var infoseq (infoseq_ptr);
 
@@ -265,12 +249,11 @@ TAO_Notify_ETCL_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq
 }
 
 CosNotifyFilter::ConstraintInfoSeq *
-TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::get_all_constraints (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::ULong current_size = static_cast<CORBA::ULong> (this->constraint_expr_list_.current_size ());
 
@@ -279,7 +262,6 @@ TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (infoseq_ptr,
                     CosNotifyFilter::ConstraintInfoSeq (current_size),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CosNotifyFilter::ConstraintInfoSeq_var infoseq (infoseq_ptr);
 
@@ -307,18 +289,17 @@ TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_ETCL_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::remove_all_constraints (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
-  this->remove_all_constraints_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->remove_all_constraints_i ();
 }
 
 void
-TAO_Notify_ETCL_Filter::remove_all_constraints_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_ETCL_Filter::remove_all_constraints_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_);
@@ -339,15 +320,13 @@ TAO_Notify_ETCL_Filter::remove_all_constraints_i (ACE_ENV_SINGLE_ARG_DECL_NOT_US
 }
 
 void
-TAO_Notify_ETCL_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
-  this->remove_all_constraints_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->remove_all_constraints_i ();
 
   PortableServer::POA_var my_POA = _default_POA ();
 
@@ -357,8 +336,7 @@ TAO_Notify_ETCL_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */
-                           ACE_ENV_ARG_DECL)
+TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
 {
@@ -368,14 +346,12 @@ TAO_Notify_ETCL_Filter::match (const CORBA::Any & /*filterable_data */
 
 CORBA::Boolean
 TAO_Notify_ETCL_Filter::match_structured (const CosNotification::StructuredEvent & filterable_data
-                                 ACE_ENV_ARG_DECL
                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   // We want to return true if at least one constraint matches.
   CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_);
@@ -406,7 +382,6 @@ TAO_Notify_ETCL_Filter::match_structured (const CosNotification::StructuredEvent
 CORBA::Boolean
 TAO_Notify_ETCL_Filter::match_typed (
                             const CosNotification::PropertySeq & /* filterable_data */
-                            ACE_ENV_ARG_DECL
                             )
   ACE_THROW_SPEC (( CORBA::SystemException,
                     CosNotifyFilter::UnsupportedFilterableData))
@@ -418,7 +393,6 @@ TAO_Notify_ETCL_Filter::match_typed (
 CosNotifyFilter::CallbackID
 TAO_Notify_ETCL_Filter::attach_callback (
                                 CosNotifyComm::NotifySubscribe_ptr /* callback */
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -429,16 +403,15 @@ TAO_Notify_ETCL_Filter::attach_callback (
 void
 TAO_Notify_ETCL_Filter::detach_callback (
                                 CosNotifyFilter::CallbackID /* callback */
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::CallbackNotFound))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::CallbackIDSeq *
-TAO_Notify_ETCL_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ETCL_Filter::get_callbacks (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 758c3ea4e38..bbc47b4ec6f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -50,12 +50,12 @@ public:
   virtual ~TAO_Notify_ETCL_Filter ();
 
 protected:
-  virtual char * constraint_grammar (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * constraint_grammar (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::InvalidConstraint
@@ -63,7 +63,6 @@ protected:
 
   virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   ACE_ENV_ARG_DECL
                                    )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -71,69 +70,69 @@ protected:
                      CosNotifyFilter::ConstraintNotFound
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::ConstraintNotFound
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void remove_all_constraints (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual CORBA::Boolean match (const CORBA::Any & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match (const CORBA::Any & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void detach_callback (CosNotifyFilter::CallbackID callback ACE_ENV_ARG_DECL)
+  virtual void detach_callback (CosNotifyFilter::CallbackID callback)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::CallbackNotFound
                      ));
 
-  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
 private:
-  void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq ACE_ENV_ARG_DECL)
+  void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::InvalidConstraint
                      ));
 
-  void remove_all_constraints_i (ACE_ENV_SINGLE_ARG_DECL)
+  void remove_all_constraints_i (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
index 25d53cd5370..9c69dbad1d6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -17,17 +17,17 @@ TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory ()
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL)
+TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_var& filter_poa)
 {
   this->filter_poa_ = filter_poa; // save the filter poa.
 
   PortableServer::ServantBase_var servant_var (this);
 
-  return _this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return _this ();
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV_ARG_DECL)
+TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::InvalidGrammar
@@ -50,23 +50,17 @@ TAO_Notify_ETCL_FilterFactory::create_filter (const char *constraint_grammar ACE
   PortableServer::ServantBase_var filter_var (filter);
 
   PortableServer::ObjectId_var oid =
-    this->filter_poa_->activate_object (filter
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
+    this->filter_poa_->activate_object (filter);
 
   CORBA::Object_var obj =
-    this->filter_poa_->id_to_reference (oid.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
+    this->filter_poa_->id_to_reference (oid.in ());
 
-  return CosNotifyFilter::Filter::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return CosNotifyFilter::Filter::_narrow (obj.in ());
 }
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
                                                   const CORBA::Any & /*default_value*/
-                                                  ACE_ENV_ARG_DECL
                                                   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 615f010c0cd..68da8ccda35 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -52,14 +52,12 @@ public:
 
   virtual CosNotifyFilter::FilterFactory_ptr create (
       PortableServer::POA_var& filter_poa
-      ACE_ENV_ARG_DECL
     );
 
   ///= CosNotifyFilter::FilterFactory methods
 
   virtual CosNotifyFilter::Filter_ptr create_filter (
       const char * constraint_grammar
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -69,7 +67,6 @@ public:
   virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter (
       const char * constraint_grammar,
       const CORBA::Any & default_value
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index 1b44711ce46..c2b62399db4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -67,28 +67,28 @@ public:
   virtual const TAO_Notify_EventType& type (void) const = 0;
 
   /// Returns true if the filter matches.
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const = 0;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter) const = 0;
 
   /// Convert to CosNotification::Structured type
   virtual void convert (CosNotification::StructuredEvent& notification) const = 0;
 
   /// Push event to consumer
-  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const = 0;
+  virtual void push (TAO_Notify_Consumer* consumer) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
+  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
+  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
+  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const = 0;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const = 0;
+  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const = 0;
 
   /// Return a pointer to a copy of this event on the heap
-  TAO_Notify_Event* queueable_copy (ACE_ENV_SINGLE_ARG_DECL) const;
+  TAO_Notify_Event* queueable_copy (void) const;
 
   /// marshal this event into a CDR buffer (for persistence)
   virtual void marshal (TAO_OutputCDR& cdr) const = 0;
@@ -120,7 +120,7 @@ protected:
 
 private:
   /// Return a pointer to a copy of this event on the heap
-  virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+  virtual TAO_Notify_Event* copy (void) const = 0;
 
   virtual void release (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.inl b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
index 36bdd57e0f5..d8635cf5bc9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
@@ -24,7 +24,7 @@ TAO_Notify_Event::reliable (void) const
 
 ACE_INLINE
 TAO_Notify_Event*
-TAO_Notify_Event::queueable_copy (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Notify_Event::queueable_copy (void) const
 {
   if ( is_on_heap_ )
   {
@@ -32,8 +32,7 @@ TAO_Notify_Event::queueable_copy (ACE_ENV_SINGLE_ARG_DECL) const
   }
   else if (this->clone_.get() == 0)
   {
-    TAO_Notify_Event* copied = this->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    TAO_Notify_Event* copied = this->copy ();
     copied->is_on_heap_ = true;
     this->clone_.reset( copied );
   }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index a55f5e44f6c..8cbe6377a3f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -57,13 +57,12 @@ TAO_Notify_EventChannel::~TAO_Notify_EventChannel ()
 void
 TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
                            , const CosNotification::QoSProperties & initial_qos
-                           , const CosNotification::AdminProperties & initial_admin
-                           ACE_ENV_ARG_DECL)
+                           , const CosNotification::AdminProperties & initial_admin)
 {
   ACE_ASSERT (this->ca_container_.get() == 0);
 
   // this-> on the following line confuses VC6
-  initialize (ecf ACE_ENV_ARG_PARAMETER);
+  initialize (ecf);
 
   this->ecf_.reset (ecf);
 
@@ -72,29 +71,24 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
   ACE_NEW_THROW_EX (ca_container,
                     TAO_Notify_ConsumerAdmin_Container (),
                     CORBA::INTERNAL ());
-  ACE_CHECK;
   this->ca_container_.reset (ca_container);
 
-  this->ca_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ca_container().init ();
 
   // Init ca_container_
   TAO_Notify_SupplierAdmin_Container* sa_container = 0;
   ACE_NEW_THROW_EX (sa_container,
                     TAO_Notify_SupplierAdmin_Container (),
                     CORBA::INTERNAL ());
-  ACE_CHECK;
   this->sa_container_.reset (sa_container);
 
-  this->sa_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->sa_container().init ();
 
   // Set the admin properties.
   TAO_Notify_AdminProperties* admin_properties = 0;
   ACE_NEW_THROW_EX (admin_properties,
                     TAO_Notify_AdminProperties (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
   this->set_admin_properties (admin_properties);
 
   // create the event manager. @@ use factory
@@ -102,23 +96,18 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
   ACE_NEW_THROW_EX (event_manager,
                     TAO_Notify_Event_Manager (),
                     CORBA::INTERNAL ());
-  ACE_CHECK;
   this->set_event_manager (event_manager);
 
-  this->event_manager().init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_manager().init ();
 
   const CosNotification::QoSProperties &default_ec_qos =
     TAO_Notify_PROPERTIES::instance ()->default_event_channel_qos_properties ();
 
-  this->set_qos (default_ec_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_qos (default_ec_qos);
 
-  this->set_qos (initial_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_qos (initial_qos);
 
-  this->set_admin (initial_admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_admin (initial_admin);
 
   // Note originally default admins were allocated here, bt this caused problems
   // attempting to save the topology changes before the Event Channel was completely
@@ -128,11 +117,11 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
 
 
 void
-TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent)
 {
   ACE_ASSERT (this->ecf_.get() == 0);
   // this-> on the following line confuses VC6
-  initialize (parent ACE_ENV_ARG_PARAMETER);
+  initialize (parent);
 
   this->ecf_.reset (dynamic_cast <TAO_Notify_EventChannelFactory*>(parent));
   ACE_ASSERT (this->ecf_.get() !=0);
@@ -142,29 +131,24 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_D
   ACE_NEW_THROW_EX (ca_container,
                     TAO_Notify_ConsumerAdmin_Container (),
                     CORBA::INTERNAL ());
-  ACE_CHECK;
   this->ca_container_.reset (ca_container);
 
-  this->ca_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ca_container().init ();
 
   TAO_Notify_SupplierAdmin_Container* sa_container = 0;
   // Init ca_container_
   ACE_NEW_THROW_EX (sa_container,
                     TAO_Notify_SupplierAdmin_Container (),
                     CORBA::INTERNAL ());
-  ACE_CHECK;
   this->sa_container_.reset (sa_container);
 
-  this->sa_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->sa_container().init ();
 
   // Set the admin properties.
   TAO_Notify_AdminProperties* admin_properties = 0;
   ACE_NEW_THROW_EX (admin_properties,
                     TAO_Notify_AdminProperties (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
   this->set_admin_properties (admin_properties);
 
   // create the event manager. @@ use factory
@@ -172,29 +156,26 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent ACE_ENV_ARG_D
   ACE_NEW_THROW_EX (event_manager,
                     TAO_Notify_Event_Manager (),
                     CORBA::INTERNAL ());
-  ACE_CHECK;
   this->set_event_manager (event_manager);
 
-  this->event_manager().init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_manager().init ();
 
   const CosNotification::QoSProperties &default_ec_qos =
     TAO_Notify_PROPERTIES::instance ()->default_event_channel_qos_properties ();
 
-  this->set_qos (default_ec_qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_qos (default_ec_qos);
 
 }
 
 
 void
-TAO_Notify_EventChannel::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_EventChannel::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
@@ -207,19 +188,16 @@ TAO_Notify_EventChannel::release (void)
 }
 
 int
-TAO_Notify_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::shutdown (void)
 {
-  int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  int sd_ret = TAO_Notify_Object::shutdown ();
 
   if (sd_ret == 1)
     return 1;
 
-  this->ca_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  this->ca_container().shutdown ();
 
-  this->sa_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  this->sa_container().shutdown ();
 
   this->event_manager().shutdown ();
 
@@ -227,67 +205,65 @@ TAO_Notify_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::destroy (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_EventChannel::Ptr guard( this );
 
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  int result = this->shutdown ();
   if ( result == 1)
     return;
 
-  this->ecf_->remove (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ecf_->remove (this);
 
   this->sa_container_.reset( 0 );
   this->ca_container_.reset( 0 );
 }
 
 void
-TAO_Notify_EventChannel::remove (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::remove (TAO_Notify_ConsumerAdmin* consumer_admin)
 {
-  this->ca_container().remove (consumer_admin ACE_ENV_ARG_PARAMETER);
+  this->ca_container().remove (consumer_admin);
 }
 
 void
-TAO_Notify_EventChannel::remove (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::remove (TAO_Notify_SupplierAdmin* supplier_admin)
 {
-  this->sa_container().remove (supplier_admin ACE_ENV_ARG_PARAMETER);
+  this->sa_container().remove (supplier_admin);
 }
 
 void
-TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos);
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_EventChannel::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_qos (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Notify_Object::get_qos ();
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannel::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::MyFactory (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->ecf_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ecf_->_this ();
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::default_consumer_admin (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -298,14 +274,11 @@ TAO_Notify_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
       if (CORBA::is_nil (default_consumer_admin_.in ()))
         {
           CosNotifyChannelAdmin::AdminID id;
-          this->default_consumer_admin_ = this->new_for_consumers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil());
+          this->default_consumer_admin_ = this->new_for_consumers (CosNotifyChannelAdmin::OR_OP, id);
           // Wish there was a better way to do this!
           PortableServer::ServantBase * admin_servant =
             this->poa()->reference_to_servant (
-              this->default_consumer_admin_.in ()
-              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil());
+              this->default_consumer_admin_.in ());
           TAO_Notify_Admin * pAdmin = dynamic_cast <TAO_Notify_Admin *> (admin_servant);
           ACE_ASSERT (pAdmin != 0); // if this assert triggers, we have mixed implementations?
           if (pAdmin != 0)
@@ -318,7 +291,7 @@ TAO_Notify_EventChannel::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::default_supplier_admin (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -329,13 +302,10 @@ TAO_Notify_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
       if (CORBA::is_nil (default_supplier_admin_.in ()))
         {
           CosNotifyChannelAdmin::AdminID id;
-          this->default_supplier_admin_ = this->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, id ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil());
+          this->default_supplier_admin_ = this->new_for_suppliers (CosNotifyChannelAdmin::OR_OP, id);
           PortableServer::ServantBase * admin_servant =
             this->poa()->poa()->reference_to_servant (
-              this->default_supplier_admin_.in ()
-              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+              this->default_supplier_admin_.in ());
           TAO_Notify_Admin * pAdmin = dynamic_cast <TAO_Notify_Admin *> (admin_servant);
           ACE_ASSERT (pAdmin != 0); // if this assert triggers, we have mixed implementations?
           if (pAdmin != 0)
@@ -347,17 +317,17 @@ TAO_Notify_EventChannel::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (this->default_supplier_admin_.in ());
 }
 
-::CosNotifyFilter::FilterFactory_ptr TAO_Notify_EventChannel::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+::CosNotifyFilter::FilterFactory_ptr TAO_Notify_EventChannel::default_filter_factory (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->ecf_->get_default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ecf_->get_default_filter_factory ();
 }
 
 ::CosNotifyChannelAdmin::ConsumerAdmin_ptr
 TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-                                        CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL
+                                        CosNotifyChannelAdmin::AdminID_out id
                                         )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -365,32 +335,27 @@ TAO_Notify_EventChannel::new_for_consumers (CosNotifyChannelAdmin::InterFilterGr
 
 {
   ::CosNotifyChannelAdmin::ConsumerAdmin_var ca =
-    TAO_Notify_PROPERTIES::instance()->builder()->build_consumer_admin (this, op, id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ca._retn ());
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ca._retn ());
+    TAO_Notify_PROPERTIES::instance()->builder()->build_consumer_admin (this, op, id);
+  this->self_change ();
   return ca._retn ();
 }
 
 ::CosNotifyChannelAdmin::SupplierAdmin_ptr
 TAO_Notify_EventChannel::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
                                         CosNotifyChannelAdmin::AdminID_out id
-                                        ACE_ENV_ARG_DECL
                                         )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ::CosNotifyChannelAdmin::SupplierAdmin_var sa =
-    TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (sa._retn ());
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (sa._retn ());
+    TAO_Notify_PROPERTIES::instance()->builder()->build_supplier_admin (this, op, id);
+  this->self_change ();
   return sa._retn ();
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminNotFound
@@ -398,11 +363,11 @@ TAO_Notify_EventChannel::get_consumeradmin (CosNotifyChannelAdmin::AdminID id AC
 {
   TAO_Notify_ConsumerAdmin_Find_Worker find_worker;
 
-  return find_worker.resolve (id, this->ca_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (id, this->ca_container());
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminNotFound
@@ -410,33 +375,33 @@ TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id AC
 {
   TAO_Notify_SupplierAdmin_Find_Worker find_worker;
 
-  return find_worker.resolve (id, this->sa_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (id, this->sa_container());
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_all_consumeradmins (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_ConsumerAdmin_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->ca_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->ca_container());
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_all_supplieradmins (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_SupplierAdmin_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->sa_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->sa_container());
 }
 
 void
-TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & admin)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedAdmin
@@ -446,7 +411,7 @@ TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & adm
 }
 
 CosNotification::AdminProperties*
-TAO_Notify_EventChannel::get_admin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::get_admin (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -463,38 +428,37 @@ TAO_Notify_EventChannel::get_admin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::for_consumers (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->default_consumer_admin(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->default_consumer_admin();
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::for_suppliers (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->default_supplier_admin ();
 }
 
 void
 TAO_Notify_EventChannel::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
                                    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
-                                   ACE_ENV_ARG_DECL
                                    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->self_changed_;
   this->self_changed_ = false;
@@ -506,19 +470,16 @@ TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver ACE_
     this->save_attrs(attrs);
 
     bool want_all_children = saver.begin_object(
-      this->id(), "channel", attrs, changed ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->id(), "channel", attrs, changed);
 
     TAO_Notify::Save_Persist_Worker<TAO_Notify_ConsumerAdmin> ca_wrk(saver, want_all_children);
 
-    this->ca_container().collection()->for_each(&ca_wrk ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->ca_container().collection()->for_each(&ca_wrk);
 
     TAO_Notify::Save_Persist_Worker<TAO_Notify_SupplierAdmin> sa_wrk(saver, want_all_children);
-    this->sa_container().collection()->for_each(&sa_wrk ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->sa_container().collection()->for_each(&sa_wrk);
 
-    saver.end_object(this->id(), "channel" ACE_ENV_ARG_PARAMETER);
+    saver.end_object(this->id(), "channel");
   }
 }
 
@@ -556,8 +517,7 @@ TAO_Notify_EventChannel::load_attrs(const TAO_Notify::NVPList& attrs)
 TAO_Notify::Topology_Object *
 TAO_Notify_EventChannel::load_child (const ACE_CString &type,
                                                   CORBA::Long id,
-                                                  const TAO_Notify::NVPList& attrs
-                                                  ACE_ENV_ARG_DECL)
+                                                  const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify::Topology_Object* result = this;
   if (type == "consumer_admin")
@@ -571,18 +531,14 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type,
     TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
     TAO_Notify_ConsumerAdmin * ca = bld->build_consumer_admin (
       this,
-      id
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      id);
     ca->load_attrs (attrs);
     if (ca->is_default ())
       {
-        CORBA::Object_var caob = this->poa()->servant_to_reference (ca ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+        CORBA::Object_var caob = this->poa()->servant_to_reference (ca);
         this->default_consumer_admin_ =
           CosNotifyChannelAdmin::ConsumerAdmin::_narrow (
-          caob.in () ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+          caob.in ());
       }
     result = ca;
   }
@@ -596,60 +552,50 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type,
 
     TAO_Notify_SupplierAdmin * sa = bld->build_supplier_admin (
       this,
-      id
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      id);
     sa->load_attrs (attrs);
     if (sa->is_default ())
       {
-        CORBA::Object_var saob = this->poa()->servant_to_reference (sa ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+        CORBA::Object_var saob = this->poa()->servant_to_reference (sa);
         this->default_supplier_admin_ =
           CosNotifyChannelAdmin::SupplierAdmin::_narrow (
-          saob.in () ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN(0);
+          saob.in ());
       }
     result = sa;
   }
   return result;
 }
 TAO_Notify_ProxyConsumer *
-TAO_Notify_EventChannel::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position)
 {
   TAO_Notify_ProxyConsumer * result = 0;
   size_t path_size = id_path.size ();
   if (position < path_size)
   {
     TAO_Notify_SupplierAdmin_Find_Worker find_worker;
-    TAO_Notify_SupplierAdmin * admin = find_worker.find (id_path[position], this->sa_container() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    TAO_Notify_SupplierAdmin * admin = find_worker.find (id_path[position], this->sa_container());
     ++position;
     if (admin != 0)
     {
-      result = admin->find_proxy_consumer (id_path, position
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+      result = admin->find_proxy_consumer (id_path, position);
     }
   }
   return result;
 }
 
 TAO_Notify_ProxySupplier *
-TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position)
 {
   TAO_Notify_ProxySupplier * result = 0;
   size_t path_size = id_path.size ();
   if (position < path_size)
   {
     TAO_Notify_ConsumerAdmin_Find_Worker find_worker;
-    TAO_Notify_ConsumerAdmin * admin = find_worker.find (id_path[position], this->ca_container() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    TAO_Notify_ConsumerAdmin * admin = find_worker.find (id_path[position], this->ca_container());
     ++position;
     if (admin != 0)
     {
-      result = admin->find_proxy_supplier (id_path, position
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+      result = admin->find_proxy_supplier (id_path, position);
     }
   }
   return result;
@@ -657,15 +603,13 @@ TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_
 
 
 void
-TAO_Notify_EventChannel::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel::reconnect (void)
 {
   TAO_Notify::Reconnect_Worker<TAO_Notify_ConsumerAdmin> ca_wrk;
-  this->ca_container().collection()->for_each(&ca_wrk ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ca_container().collection()->for_each(&ca_wrk);
 
   TAO_Notify::Reconnect_Worker<TAO_Notify_SupplierAdmin> sa_wrk;
-  this->sa_container().collection()->for_each(&sa_wrk ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->sa_container().collection()->for_each(&sa_wrk);
 }
 
 TAO_Notify_EventChannel::TAO_Notify_ConsumerAdmin_Container&
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index 2fe1c13ff05..f9abd36b7b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -65,39 +65,36 @@ public:
   /// Init
   void init (TAO_Notify_EventChannelFactory* ecf
              , const CosNotification::QoSProperties & initial_qos
-             , const CosNotification::AdminProperties & initial_admin
-             ACE_ENV_ARG_DECL);
+             , const CosNotification::AdminProperties & initial_admin);
 
   /// Init (for reload)
-  void init (TAO_Notify::Topology_Parent * parent
-             ACE_ENV_ARG_DECL);
+  void init (TAO_Notify::Topology_Parent * parent);
 
   /// Remove ConsumerAdmin from its container.
-  void remove (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_ConsumerAdmin* consumer_admin);
 
   /// Remove SupplierAdmin from its container.
-  void remove (TAO_Notify_SupplierAdmin* supplier_admin ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_SupplierAdmin* supplier_admin);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
   // TAO_Notify::Topology_Parent
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
                                                    CORBA::Long id,
-                                                   const TAO_Notify::NVPList& attrs
-                                                   ACE_ENV_ARG_DECL);
-  virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+                                                   const TAO_Notify::NVPList& attrs);
+  virtual void reconnect (void);
 
   virtual TAO_Notify_Object::ID get_id () const {return id();}
 
-  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
-  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
+  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position);
+  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position);
 
   /// Shutdown
-  virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int shutdown (void);
   virtual void load_attrs(const TAO_Notify::NVPList& attrs);
 
 private:
@@ -120,111 +117,105 @@ private:
 
   /// =CosNotifyChannelAdmin::EventChannel methods
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (
 
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL
+  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (
 
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotifyFilter::FilterFactory_ptr default_filter_factory (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-                                                                        CosNotifyChannelAdmin::AdminID_out id
-                                                                        ACE_ENV_ARG_DECL)
+                                                                        CosNotifyChannelAdmin::AdminID_out id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op,
-                                                                        CosNotifyChannelAdmin::AdminID_out id
-                                                                        ACE_ENV_ARG_DECL)
+                                                                        CosNotifyChannelAdmin::AdminID_out id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (CosNotifyChannelAdmin::AdminID id
-                                                                        ACE_ENV_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::AdminNotFound
                      ));
 
-  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (CosNotifyChannelAdmin::AdminID id
-                                                                        ACE_ENV_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (CosNotifyChannelAdmin::AdminID id)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyChannelAdmin::AdminNotFound
                      ));
 
-  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosNotification::QoSProperties * get_qos (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotification::QoSProperties * get_qos (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void set_qos (const CosNotification::QoSProperties & qos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_qos (const CosNotification::QoSProperties & qos)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedQoS
                      ));
 
   virtual void validate_qos (const CosNotification::QoSProperties & required_qos,
-                             CosNotification::NamedPropertyRangeSeq_out available_qos
-                             ACE_ENV_ARG_DECL)
+                             CosNotification::NamedPropertyRangeSeq_out available_qos)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedQoS
                      ));
 
-  virtual ::CosNotification::AdminProperties * get_admin (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotification::AdminProperties * get_admin (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL)
+  virtual void set_admin (const CosNotification::AdminProperties & admin)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotification::UnsupportedAdmin
                      ));
 
-  virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 2cf855c3009..26812db99ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -60,13 +60,12 @@ TAO_Notify_EventChannelFactory::~TAO_Notify_EventChannelFactory ()
 }
 
 void
-TAO_Notify_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::destroy (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  int result = this->shutdown ();
   if ( result == 1)
     return;
 
@@ -80,24 +79,21 @@ TAO_Notify_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa)
 {
   ACE_ASSERT (this->ec_container_.get() == 0);
 
   this->default_filter_factory_ =
-    TAO_Notify_PROPERTIES::instance()->builder()->build_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_Notify_PROPERTIES::instance()->builder()->build_filter_factory ();
 
   // Init ec_container_
   TAO_Notify_EventChannel_Container* ecc = 0;
   ACE_NEW_THROW_EX (ecc,
                     TAO_Notify_EventChannel_Container (),
                     CORBA::INTERNAL ());
-  ACE_CHECK;
   this->ec_container_.reset( ecc );
 
-  this->ec_container().init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_container().init ();
 
   TAO_Notify_POA_Helper* object_poa = 0;
 
@@ -105,12 +101,10 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE
   ACE_NEW_THROW_EX (object_poa,
                     TAO_Notify_POA_Helper (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa);
 
-  object_poa->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  object_poa->init (poa);
 
   this->adopt_poa (auto_object_poa.release ());
 
@@ -119,21 +113,19 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE
   this->topology_factory_ =
     ACE_Dynamic_Service <TAO_Notify::Topology_Factory>::instance ("Topology_Factory");
 
-  this->load_topology (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->load_topology ();
 
-  this->load_event_persistence (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->load_event_persistence ();
 }
 
 void
-TAO_Notify_EventChannelFactory::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_EventChannelFactory::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
@@ -146,30 +138,27 @@ TAO_Notify_EventChannelFactory::release (void)
 }
 
 void
-TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel)
 {
-  this->ec_container().remove (event_channel ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->ec_container().remove (event_channel);
+  this->self_change ();
 }
 
 int
-TAO_Notify_EventChannelFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::shutdown (void)
 {
-  int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  int sd_ret = TAO_Notify_Object::shutdown ();
 
   if (sd_ret == 1)
     return 1;
 
-  this->ec_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  this->ec_container().shutdown ();
 
   return 0;
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::get_default_filter_factory (void)
 {
   return CosNotifyFilter::FilterFactory::_duplicate (this->default_filter_factory_.in ());
 }
@@ -177,7 +166,7 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_D
 ::CosNotifyChannelAdmin::EventChannel_ptr TAO_Notify_EventChannelFactory::create_channel (
     const CosNotification::QoSProperties & initial_qos,
     const CosNotification::AdminProperties & initial_admin,
-    CosNotifyChannelAdmin::ChannelID_out id ACE_ENV_ARG_DECL
+    CosNotifyChannelAdmin::ChannelID_out id
   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -189,27 +178,24 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_D
     TAO_Notify_PROPERTIES::instance()->builder()->build_event_channel (this
                                                                         , initial_qos
                                                                         , initial_admin
-                                                                        , id
-                                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil());
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil());
+                                                                        , id);
+  this->self_change ();
   return ec._retn ();
 }
 
 CosNotifyChannelAdmin::ChannelIDSeq*
-TAO_Notify_EventChannelFactory::get_all_channels (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::get_all_channels (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   TAO_Notify_EventChannel_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->ec_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->ec_container());
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::ChannelID id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::ChannelNotFound
@@ -217,7 +203,7 @@ TAO_Notify_EventChannelFactory::get_event_channel (CosNotifyChannelAdmin::Channe
 {
   TAO_Notify_EventChannel_Find_Worker find_worker;
 
-  return find_worker.resolve (id, this->ec_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (id, this->ec_container());
 }
 
 void
@@ -233,7 +219,7 @@ TAO_Notify_EventChannelFactory::set_topology_factory(TAO_Notify::Topology_Factor
 }
 
 void
-TAO_Notify_EventChannelFactory::load_topology (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::load_topology (void)
 {
   this->loading_topology_ = true;
   if (this->topology_factory_ != 0)
@@ -242,8 +228,7 @@ TAO_Notify_EventChannelFactory::load_topology (ACE_ENV_SINGLE_ARG_DECL)
     auto_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader());
     if (tl.get () != 0)
     {
-      tl->load (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      tl->load (this);
     }
   }
   else
@@ -260,7 +245,7 @@ TAO_Notify_EventChannelFactory::is_persistent () const
 }
 
 void
-TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->self_changed_;
   this->self_changed_ = false;
@@ -269,27 +254,24 @@ TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& sav
   TAO_Notify::NVPList attrs; // ECF has no attributes
 
   bool want_all_children =
-    saver.begin_object(0, "channel_factory", attrs, changed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    saver.begin_object(0, "channel_factory", attrs, changed);
 
   // for each deleted child
   //  delete_child  // if the child has persistence.
 
   TAO_Notify::Save_Persist_Worker<TAO_Notify_EventChannel> wrk(saver, want_all_children);
 
-  this->ec_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_container().collection()->for_each(&wrk);
 
   if (want_all_children || this->reconnect_registry_.is_changed ())
   {
-    this->reconnect_registry_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->reconnect_registry_.save_persistent(saver);
   }
-  saver.end_object(0, "channel_factory" ACE_ENV_ARG_PARAMETER);
+  saver.end_object(0, "channel_factory");
 }
 
 void
-TAO_Notify_EventChannelFactory::load_event_persistence (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::load_event_persistence (void)
 {
   TAO_Notify::Event_Persistence_Strategy * strategy =
     ACE_Dynamic_Service <TAO_Notify::Event_Persistence_Strategy>::instance ("Event_Persistence");
@@ -326,14 +308,13 @@ TAO_Notify_EventChannelFactory::load_event_persistence (ACE_ENV_SINGLE_ARG_DECL)
       ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) Notify Service: Configuration error.  Event Persistence requires Topology Persistence.\n")
         ));
-      ACE_THROW (CORBA::PERSIST_STORE());
-      ACE_CHECK;
+      throw CORBA::PERSIST_STORE();
     }
   }
 }
 
 bool
-TAO_Notify_EventChannelFactory::change_to_parent (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::change_to_parent (void)
 {
   bool saving = false;
   if (! this->loading_topology_)
@@ -348,16 +329,13 @@ TAO_Notify_EventChannelFactory::change_to_parent (ACE_ENV_SINGLE_ARG_DECL)
       // just return.  Caller will signal change again if necessary.
       short seq = this->topology_save_seq_;
       ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->topology_save_lock_, CORBA::INTERNAL ());
-      ACE_CHECK_RETURN(false);
       if (seq == this->topology_save_seq_)
       {
         auto_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver());
         if (saver.get() != 0)
         {
-          this->save_persistent(*saver ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN(false);
-          saver->close (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (false);
+          this->save_persistent(*saver);
+          saver->close ();
         }
         this->topology_save_seq_ += 1;
       }
@@ -370,8 +348,7 @@ TAO_Notify::Topology_Object*
 TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type,
                                         CORBA::Long id,
                                         const TAO_Notify::
-                                        NVPList& attrs
-                                        ACE_ENV_ARG_DECL)
+                                        NVPList& attrs)
 {
   // ignore anything but our valid children (ie channel)
   TAO_Notify::Topology_Object * result = this;
@@ -385,9 +362,7 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type,
     TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
     TAO_Notify_EventChannel * ec = bld->build_event_channel(
         this ,
-        id
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+        id);
 
     ec->load_attrs (attrs);
 
@@ -401,69 +376,61 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type,
 }
 
 void
-TAO_Notify_EventChannelFactory::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::reconnect (void)
 {
   // Reconnect all children first
   TAO_Notify::Reconnect_Worker<TAO_Notify_EventChannel> wrk;
 
-  this->ec_container().collection()->for_each(&wrk ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_container().collection()->for_each(&wrk);
 
   // Then send reconnection announcement to registered clients
   ACE_ASSERT (!CORBA::is_nil (this->channel_factory_.in ()));
-  this->reconnect_registry_.send_reconnect (this->channel_factory_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->reconnect_registry_.send_reconnect (this->channel_factory_.in ());
 
   // reactivate events in-progress
   Routing_Slip_Set::CONST_ITERATOR iter (this->routing_slip_restart_set_);
   TAO_Notify::Routing_Slip_Ptr * routing_slip;
   for (iter.first(); iter.next(routing_slip); iter.advance())
   {
-    (*routing_slip)->reconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    (*routing_slip)->reconnect();
   }
   this->routing_slip_restart_set_.reset ();
 }
 
 NotifyExt::ReconnectionRegistry::ReconnectionID
 TAO_Notify_EventChannelFactory::register_callback (
-    NotifyExt::ReconnectionCallback_ptr reconnection
-    ACE_ENV_ARG_DECL)
+    NotifyExt::ReconnectionCallback_ptr reconnection)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->reconnect_registry_.register_callback (
-    reconnection
-    ACE_ENV_ARG_PARAMETER);
+    reconnection);
 }
 
 void
 TAO_Notify_EventChannelFactory::unregister_callback (
-    NotifyExt::ReconnectionRegistry::ReconnectionID id
-    ACE_ENV_ARG_DECL)
+    NotifyExt::ReconnectionRegistry::ReconnectionID id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->reconnect_registry_.unregister_callback (
-    id
-    ACE_ENV_ARG_PARAMETER);
+    id);
 }
 
 CORBA::Boolean
-TAO_Notify_EventChannelFactory::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_EventChannelFactory::is_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Boolean (1);
 }
 
 void
-TAO_Notify_EventChannelFactory::save_topology (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::save_topology (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->self_change ();
 }
 
 TAO_Notify_ProxyConsumer *
-TAO_Notify_EventChannelFactory::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position)
 {
   TAO_Notify_ProxyConsumer * result = 0;
   size_t path_size = id_path.size ();
@@ -478,21 +445,18 @@ TAO_Notify_EventChannelFactory::find_proxy_consumer (TAO_Notify::IdVec & id_path
   {
     TAO_Notify_EventChannel_Find_Worker find_worker;
 
-    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container());
     ++position;
     if (ec != 0)
     {
-      result = ec->find_proxy_consumer (id_path, position
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+      result = ec->find_proxy_consumer (id_path, position);
     }
   }
   return result;
 }
 
 TAO_Notify_ProxySupplier *
-TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position)
 {
   TAO_Notify_ProxySupplier * result = 0;
   size_t path_size = id_path.size ();
@@ -506,44 +470,36 @@ TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path
   if (position < path_size)
   {
     TAO_Notify_EventChannel_Find_Worker find_worker;
-    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    TAO_Notify_EventChannel * ec = find_worker.find (id_path[position], this->ec_container());
     ++position;
     if (ec != 0)
     {
-      result = ec->find_proxy_supplier (id_path, position
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+      result = ec->find_proxy_supplier (id_path, position);
     }
   }
   return result;
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannelFactory::activate_self (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory::activate_self (void)
 {
-  CORBA::Object_var obj = this->activate (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
+  CORBA::Object_var obj = this->activate (this);
   this->channel_factory_
-    = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
-  CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
+    = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in());
+  CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in());
 
-  ACE_TRY_NEW_ENV
+  try
   {
     if (DEBUG_LEVEL > 9)
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_EventChannelFactory::activate_self") ));
     }
-    this->reconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->reconnect ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     // ignore for now
   }
-  ACE_ENDTRY;
   return this->channel_factory_._retn();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index be559fae20a..4f87d5f8e18 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -59,21 +59,20 @@ public:
   TAO_Notify_EventChannelFactory (void);
 
   /// Init the factory
-  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr poa);
 
   /// Destructor
   virtual ~TAO_Notify_EventChannelFactory ();
 
   /// = ServantBase  Methods
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
   /// Remove <channel> from the <ec_container_>
-  void remove (TAO_Notify_EventChannel* channel ACE_ENV_ARG_DECL);
+  void remove (TAO_Notify_EventChannel* channel);
 
   /// Accesor for the default filter factory shared by all EC's.
   virtual CosNotifyFilter::FilterFactory_ptr get_default_filter_factory (
-      ACE_ENV_SINGLE_ARG_DECL
     );
 
 
@@ -84,7 +83,7 @@ public:
   /// Use the registered Topology_Factory to create a loader, and
   /// load the topology. If no Topology_Factory is registered
   /// then nothing will be loaded.
-  void load_topology (ACE_ENV_SINGLE_ARG_DECL);
+  void load_topology (void);
 
   /// Use the passed in saver factory to generate topology saver objects.
   /// Does not take ownership.
@@ -94,26 +93,25 @@ public:
 
   virtual bool is_persistent () const;
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
-  virtual bool change_to_parent (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
+  virtual bool change_to_parent (void);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type,
                                                    CORBA::Long id,
-                                                   const TAO_Notify::NVPList& attrs
-                                                   ACE_ENV_ARG_DECL);
-  CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+                                                   const TAO_Notify::NVPList& attrs);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr activate_self (void);
+  virtual void reconnect (void);
 
   /// handle change notifications
-  bool handle_change (ACE_ENV_SINGLE_ARG_DECL);
+  bool handle_change (void);
 
-  void load_event_persistence (ACE_ENV_SINGLE_ARG_DECL);
+  void load_event_persistence (void);
 
-  virtual void save_topology (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void save_topology (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
-  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
-  TAO_Notify_Object * follow_id_path (TAO_Notify::IdVec & id_path, size_t position  ACE_ENV_ARG_DECL);
+  TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position);
+  TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position);
+  TAO_Notify_Object * follow_id_path (TAO_Notify::IdVec & id_path, size_t position);
   virtual TAO_Notify_Object::ID get_id () const;
 
 
@@ -125,26 +123,24 @@ public:
   CosNotifyFilter::FilterFactory_var default_filter_factory_;
 
   /// = NotifyExt methods
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// shutdown
-  virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int shutdown (void);
 
   virtual
   NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
-      NotifyExt::ReconnectionCallback_ptr reconnection
-      ACE_ENV_ARG_DECL)
+      NotifyExt::ReconnectionCallback_ptr reconnection)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void unregister_callback (
-      NotifyExt::ReconnectionRegistry::ReconnectionID id
-      ACE_ENV_ARG_DECL)
+      NotifyExt::ReconnectionRegistry::ReconnectionID id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean is_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// = CosNotifyChannelAdmin Methods
@@ -153,20 +149,17 @@ public:
       const CosNotification::QoSProperties & initial_qos,
       const CosNotification::AdminProperties & initial_admin,
       CosNotifyChannelAdmin::ChannelID_out id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotification::UnsupportedQoS,
                      CosNotification::UnsupportedAdmin));
 
   virtual ::CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
       CosNotifyChannelAdmin::ChannelID id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::ChannelNotFound));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
index e86593e9583..b4306279eb0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -163,18 +163,16 @@ bool TAO_Notify_EventType::init(const TAO_Notify::NVPList& attrs)
   // TAO_Notify::Topology_Object
 
 void
-TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   TAO_Notify::NVPList attrs;
   bool changed = true;
 
   attrs.push_back(TAO_Notify::NVP("Domain", this->event_type_.domain_name.in()));
   attrs.push_back(TAO_Notify::NVP("Type", this->event_type_.type_name.in()));
-  saver.begin_object(0, "subscription", attrs, changed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  saver.begin_object(0, "subscription", attrs, changed);
 
-  saver.end_object(0, "subscription" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  saver.end_object(0, "subscription");
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index d6ba4bd1033..500b1dfaeb5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -79,7 +79,7 @@ public:
 
   // TAO_Notify::Topology_Object
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
 
 protected:
   /// Init this object.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index bd9d489dd63..a318fcdd198 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -261,7 +261,7 @@ TAO_Notify_EventTypeSeq::dump (void) const
 
   // TAO_Notify::Topology_Object
 void
-TAO_Notify_EventTypeSeq::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_EventTypeSeq::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->self_changed_;
   this->self_changed_ = false;
@@ -273,26 +273,23 @@ TAO_Notify_EventTypeSeq::save_persistent (TAO_Notify::Topology_Saver& saver ACE_
 
   if (this->size() != 0)
   {
-    saver.begin_object(0, "subscriptions", attrs, changed ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    saver.begin_object(0, "subscriptions", attrs, changed);
     for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      event_type->save_persistent(saver ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      event_type->save_persistent(saver);
     }
 // todo:
 //    for all deleted children
 //    {
 //      saver.delete_child(child_type, child_id);
 //    }
-    saver.end_object(0, "subscriptions" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    saver.end_object(0, "subscriptions");
   }
 }
 
 TAO_Notify::Topology_Object*
 TAO_Notify_EventTypeSeq::load_child (const ACE_CString &type, CORBA::Long id,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL_NOT_USED)
+  const TAO_Notify::NVPList& attrs)
 {
   ACE_UNUSED_ARG (id);
   TAO_Notify::Topology_Object *result = this;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index cf66b603c04..b2b93b76d77 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -73,9 +73,9 @@ public:
 
   // TAO_Notify::Topology_Object
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id,
-    const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index 35264373bd4..dd5bd4600a6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -32,7 +32,7 @@ public:
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TAO_Notify_ProxyConsumer* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_ProxyConsumer* proxy);
 
   const TAO_Notify_EventTypeSeq& added_;
   const TAO_Notify_EventTypeSeq& removed_;
@@ -53,7 +53,7 @@ public:
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TAO_Notify_ProxySupplier* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_ProxySupplier* proxy);
 
   const TAO_Notify_EventTypeSeq& added_;
   const TAO_Notify_EventTypeSeq& removed_;
@@ -80,7 +80,7 @@ void TAO_Notify_Event_Manager::release()
 }
 
 void
-TAO_Notify_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Manager::init (void)
 {
   ACE_ASSERT (this->consumer_map_.get() == 0);
 
@@ -88,21 +88,17 @@ TAO_Notify_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (consumer_map,
                     TAO_Notify_Consumer_Map (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
   this->consumer_map_.reset( consumer_map );
 
-  this->consumer_map().init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_map().init ();
 
   TAO_Notify_Supplier_Map* supplier_map = 0;
   ACE_NEW_THROW_EX (supplier_map,
                     TAO_Notify_Supplier_Map (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
   this->supplier_map_.reset( supplier_map );
 
-  this->supplier_map_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_map_->init ();
 }
 
 void
@@ -111,67 +107,60 @@ TAO_Notify_Event_Manager::shutdown (void)
 }
 
 void
-TAO_Notify_Event_Manager::connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::connect (TAO_Notify_ProxySupplier* proxy_supplier)
 {
-  this->consumer_map().connect (proxy_supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_map().connect (proxy_supplier);
 
   // Inform about offered types.
   TAO_Notify_EventTypeSeq removed;
-  proxy_supplier->types_changed (this->offered_types (), removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_supplier->types_changed (this->offered_types (), removed);
 }
 
 void
-TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxySupplier* proxy_supplier)
 {
-  this->consumer_map().disconnect (proxy_supplier ACE_ENV_ARG_PARAMETER);
+  this->consumer_map().disconnect (proxy_supplier);
 }
 
 void
-TAO_Notify_Event_Manager::connect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::connect (TAO_Notify_ProxyConsumer* proxy_consumer)
 {
-  this->supplier_map().connect (proxy_consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_map().connect (proxy_consumer);
   // Inform about subscription types.
   TAO_Notify_EventTypeSeq removed;
-  proxy_consumer->types_changed (this->subscription_types (), removed ACE_ENV_ARG_PARAMETER);
+  proxy_consumer->types_changed (this->subscription_types (), removed);
 }
 
 void
-TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::disconnect (TAO_Notify_ProxyConsumer* proxy_consumer)
 {
-  this->supplier_map().disconnect (proxy_consumer ACE_ENV_ARG_PARAMETER);
+  this->supplier_map().disconnect (proxy_consumer);
 }
 
 void
-TAO_Notify_Event_Manager::offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed)
 {
   TAO_Notify_EventTypeSeq new_added, last_removed;
 
-  this->publish (proxy_consumer, added, new_added ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->publish (proxy_consumer, added, new_added);
 
-  this->un_publish (proxy_consumer, removed, last_removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->un_publish (proxy_consumer, removed, last_removed);
 
   TAO_Notify_Consumer_Map::ENTRY::COLLECTION* updates_collection = this->consumer_map().updates_collection ();
 
   TAO_Notify_ProxySupplier_Update_Worker worker (new_added, last_removed);
 
   if (updates_collection != 0)
-    updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
+    updates_collection->for_each (&worker);
 }
 
 void
-TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed)
 {
   TAO_Notify_EventTypeSeq new_added, last_removed;
 
-  this->subscribe (proxy_supplier, added, new_added ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->un_subscribe (proxy_supplier, removed, last_removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->subscribe (proxy_supplier, added, new_added);
+  this->un_subscribe (proxy_supplier, removed, last_removed);
 
   TAO_Notify_Supplier_Map::ENTRY::COLLECTION* updates_collection = this->supplier_map().updates_collection ();
 
@@ -179,13 +168,12 @@ TAO_Notify_Event_Manager::subscription_change (TAO_Notify_ProxySupplier* proxy_s
 
   if (updates_collection != 0)
     {
-      updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      updates_collection->for_each (&worker);
     }
 }
 
 void
-TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq)
 {
   TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
@@ -193,8 +181,7 @@ TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, c
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      int result = this->consumer_map().insert (proxy_supplier, *event_type ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      int result = this->consumer_map().insert (proxy_supplier, *event_type);
 
       if (result == 1)
         new_seq.insert (*event_type);
@@ -202,7 +189,7 @@ TAO_Notify_Event_Manager::subscribe (TAO_Notify_ProxySupplier* proxy_supplier, c
 }
 
 void
-TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq)
 {
   TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
@@ -210,8 +197,7 @@ TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      int result = this->consumer_map().remove (proxy_supplier, *event_type ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      int result = this->consumer_map().remove (proxy_supplier, *event_type);
 
       if (result == 1)
         last_seq.insert (*event_type);
@@ -219,7 +205,7 @@ TAO_Notify_Event_Manager::un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier
 }
 
 void
-TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq)
 {
   TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
@@ -227,8 +213,7 @@ TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, con
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      int result = supplier_map().insert (proxy_consumer, *event_type ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      int result = supplier_map().insert (proxy_consumer, *event_type);
 
       if (result == 1)
         new_seq.insert (*event_type);
@@ -236,7 +221,7 @@ TAO_Notify_Event_Manager::publish (TAO_Notify_ProxyConsumer* proxy_consumer, con
 }
 
 void
-TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq)
 {
   TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (seq);
 
@@ -244,8 +229,7 @@ TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer,
 
   for (iter.first (); iter.next (event_type) != 0; iter.advance ())
     {
-      int result = supplier_map().remove (proxy_consumer, *event_type ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      int result = supplier_map().remove (proxy_consumer, *event_type);
 
       if (result == 1)
         last_seq.insert (*event_type);
@@ -286,9 +270,9 @@ TAO_Notify_ProxyConsumer_Update_Worker::TAO_Notify_ProxyConsumer_Update_Worker (
 }
 
 void
-TAO_Notify_ProxyConsumer_Update_Worker::work (TAO_Notify_ProxyConsumer* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer_Update_Worker::work (TAO_Notify_ProxyConsumer* proxy)
 {
-  proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER);
+  proxy->types_changed (added_, removed_);
 }
 
 /*****************************************************************************/
@@ -299,9 +283,9 @@ TAO_Notify_ProxySupplier_Update_Worker::TAO_Notify_ProxySupplier_Update_Worker (
 }
 
 void
-TAO_Notify_ProxySupplier_Update_Worker::work (TAO_Notify_ProxySupplier* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_Update_Worker::work (TAO_Notify_ProxySupplier* proxy)
 {
-  proxy->types_changed (added_, removed_ ACE_ENV_ARG_PARAMETER);
+  proxy->types_changed (added_, removed_);
 }
 
 /*****************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index ee897512072..38c577cdfd8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -68,32 +68,32 @@ public:
   void release();
 
   /// Init
-  void init (ACE_ENV_SINGLE_ARG_DECL);
+  void init (void);
 
   /// Init
   void shutdown (void);
 
   /// Connect ProxySupplier
-  void connect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  void connect (TAO_Notify_ProxySupplier* proxy_supplier);
 
   /// Disconnect ProxySupplier
-  void disconnect (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  void disconnect (TAO_Notify_ProxySupplier* proxy_supplier);
 
   /// Connect ProxyConsumer
-  void connect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
+  void connect (TAO_Notify_ProxyConsumer* proxy_consumer);
 
   /// Disconnect ProxyConsumer
-  void disconnect (TAO_Notify_ProxyConsumer* proxy_consumer ACE_ENV_ARG_DECL);
+  void disconnect (TAO_Notify_ProxyConsumer* proxy_consumer);
 
   /// Map accessors.
   TAO_Notify_Consumer_Map& consumer_map (void);
   TAO_Notify_Supplier_Map& supplier_map (void);
 
   /// Offer change received on <proxy_consumer>.
-  void offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void offer_change (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
 
   /// Subscription change received on <proxy_supplier>.
-  void subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void subscription_change (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed);
 
   /// What are the types being offered.
   const TAO_Notify_EventTypeSeq& offered_types (void) const;
@@ -103,16 +103,16 @@ public:
 
 protected:
   /// Subscribe <proxy_supplier> to the event type sequence list <seq>.
-  void subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
+  void subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq);
 
   /// Unsubscribe <proxy_supplier> to the event type sequence list <seq>.
-  void un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
+  void un_subscribe (TAO_Notify_ProxySupplier* proxy_supplier, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq);
 
   /// Subscribe <proxy_consumer> to the event type sequence list <seq>.
-  void publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq ACE_ENV_ARG_DECL);
+  void publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& new_seq);
 
   /// Subscribe <proxy_consumer> to the event type sequence list <seq>.
-  void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL);
+  void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq);
 
 private:
   // Disallow copying and assignment; we don't need them
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index 5488c3ad420..d270d180db0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -9,8 +9,8 @@
 #include "orbsvcs/Notify/Event_Map_Entry_T.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Notify, 
-           TAO_Notify_Event_Map_Entry_T, 
+ACE_RCSID (Notify,
+           TAO_Notify_Event_Map_Entry_T,
            "$Id$")
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
@@ -32,24 +32,24 @@ TAO_Notify_Event_Map_Entry_T<PROXY>::~TAO_Notify_Event_Map_Entry_T ()
 }
 
 template <class PROXY> void
-TAO_Notify_Event_Map_Entry_T<PROXY>::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Map_Entry_T<PROXY>::init (void)
 {
   TAO_Notify_Factory* factory = TAO_Notify_PROPERTIES::instance ()->factory ();
 
-  factory->create (collection_ ACE_ENV_ARG_PARAMETER);
+  factory->create (collection_);
 }
 
 template <class PROXY> void
-TAO_Notify_Event_Map_Entry_T<PROXY>::connected (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_Entry_T<PROXY>::connected (PROXY* proxy)
 {
-  this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_->connected (proxy);
   ++count_;
 }
 
 template <class PROXY> void
-TAO_Notify_Event_Map_Entry_T<PROXY>::disconnected (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_Entry_T<PROXY>::disconnected (PROXY* proxy)
 {
-  this->collection_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (proxy);
   --count_;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
index e362f9a7efb..08667996ee9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
@@ -50,13 +50,13 @@ public:
   ~TAO_Notify_Event_Map_Entry_T (void);
 
   /// Init - Allocates collection
-  void init (ACE_ENV_SINGLE_ARG_DECL);
+  void init (void);
 
   /// Connect
-  void connected (PROXY* proxy ACE_ENV_ARG_DECL);
+  void connected (PROXY* proxy);
 
   /// Disconnect
-  void disconnected (PROXY* proxy ACE_ENV_ARG_DECL);
+  void disconnected (PROXY* proxy);
 
   /// Collection accessor
   COLLECTION* collection (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
index 89da0eaed96..d80a33201e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
@@ -4,7 +4,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <class PROXY> ACE_INLINE ACE_TYPENAME
+template <class PROXY> ACE_INLINE typename
 TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
 TAO_Notify_Event_Map_Entry_T<PROXY>::collection (void) {
   return collection_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 121d1f51fd0..455f6b089a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -28,36 +28,33 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::~TAO_Notify_Event_Map_T ()
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::init (void)
 {
-  this->broadcast_entry_.init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->broadcast_entry_.init ();
 
-  this->updates_entry_.init (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->updates_entry_.init ();
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::connect (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::connect (PROXY* proxy)
 {
-  this->updates_entry_.connected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->updates_entry_.connected (proxy);
 
   ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
   ++this->proxy_count_;
 }
 
 template <class PROXY, class ACE_LOCK> void
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::disconnect (PROXY* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::disconnect (PROXY* proxy)
 {
-  this->updates_entry_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->updates_entry_.disconnected (proxy);
 
   ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
   --this->proxy_count_;
 }
 
 template <class PROXY, class ACE_LOCK> int
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_EventType& event_type)
 {
   ENTRY* entry;
 
@@ -81,13 +78,10 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_
     ACE_NEW_THROW_EX (entry,
                       ENTRY (),
                       CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (-1);
 
-    entry->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    entry->init ();
 
-    entry->connected (proxy ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    entry->connected (proxy);
 
     ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -101,15 +95,14 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::insert (PROXY* proxy, const TAO_Notify_
   }
   else // Add to existing entry or the broadcast entry.
     {
-      entry->connected (proxy ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      entry->connected (proxy);
     }
 
   return 0;
 }
 
 template <class PROXY, class ACE_LOCK> int
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_EventType& event_type)
 {
   ENTRY* entry = 0;
 
@@ -117,8 +110,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_
     {
       entry = &this->broadcast_entry_;
 
-      entry->disconnected (proxy ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      entry->disconnected (proxy);
     }
   else
     {
@@ -132,8 +124,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_
 
       if (result == 0)
         {
-          entry->disconnected (proxy ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          entry->disconnected (proxy);
 
           if (entry->count () == 0)
             {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index 011cb6530da..d92dfde09fc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
@@ -48,33 +48,33 @@ public:
   ~TAO_Notify_Event_Map_T ();
 
   /// Init
-  void init (ACE_ENV_SINGLE_ARG_DECL);
+  void init (void);
 
   /// Connect a PROXY
-  void connect (PROXY* proxy ACE_ENV_ARG_DECL);
+  void connect (PROXY* proxy);
 
   /// Disconnect a PROXY
-  void disconnect (PROXY* proxy ACE_ENV_ARG_DECL);
+  void disconnect (PROXY* proxy);
 
   /// Associate PROXY and event_type.
   /// Returns 1 if <event_type> is being seem for the 1st time otherwise returns 0.
   /// Returns -1 on error.
-  int insert (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL);
+  int insert (PROXY* proxy, const TAO_Notify_EventType& event_type);
 
   /// Remove association of PROXY and event_type.
   /// Returns 1 if <event_type> is being seem for the last time otherwise returns 0.
   /// Returns -1 on error.
-  int remove (PROXY* proxy, const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL);
+  int remove (PROXY* proxy, const TAO_Notify_EventType& event_type);
 
   /// Find the collection mapped to the <event_type>
   /// The usage_count on the entry returned is incremented.
-  ENTRY* find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL);
+  ENTRY* find (const TAO_Notify_EventType& event_type);
 
   /// Find the default broadcast list.
-  ACE_TYPENAME ENTRY::COLLECTION* broadcast_collection (void);
+  typename ENTRY::COLLECTION* broadcast_collection (void);
 
   /// Find the update list. This is all the PROXYS connected to this Map.
-  ACE_TYPENAME ENTRY::COLLECTION* updates_collection (void);
+  typename ENTRY::COLLECTION* updates_collection (void);
 
   /// Release the usage count on this entry.
   void release (ENTRY* entry);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
index 2b485893049..7f4a466173f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class PROXY, class ACE_LOCK> ACE_INLINE  TAO_Notify_Event_Map_Entry_T<PROXY>*
-TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event_type ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event_type)
 {
   TAO_Notify_Event_Map_Entry_T<PROXY>* entry;
 
@@ -29,13 +29,13 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::release (ENTRY* entry)
     delete entry;
 }
 
-template <class PROXY, class ACE_LOCK>  ACE_INLINE  ACE_TYPENAME TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
+template <class PROXY, class ACE_LOCK>  ACE_INLINE  typename TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
 TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::broadcast_collection (void)
 {
   return this->broadcast_entry_.collection ();
 }
 
-template <class PROXY, class ACE_LOCK>  ACE_INLINE  ACE_TYPENAME TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
+template <class PROXY, class ACE_LOCK>  ACE_INLINE  typename TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION*
 TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::updates_collection (void)
 {
   return this->updates_entry_.collection ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
index 22fc4dcf653..1ddb6f908c6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
@@ -75,58 +75,58 @@ class /*TAO_Notify_Serv_Export*/ TAO_Notify_Factory : public ACE_Service_Object
 {
 public:
   /// Create ProxySupplier Collection
-  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection) = 0;
 
   /// Create ProxyConsumer Collection
-  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection) = 0;
 
   /// Create EventChannel Collection
-  virtual void create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_EventChannel_Collection*& collection) = 0;
 
   /// Create ConsumerAdmin Collection
-  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection) = 0;
 
   /// Create SupplierAdmin Collection
-  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection) = 0;
 
   /// Create Proxy Collection
-  virtual void create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_Proxy_Collection*& collection) = 0;
 
   /// Create EventChannelFactory
-  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory) = 0;
 
   /// Create EventChannel
-  virtual void create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_EventChannel*& channel) = 0;
 
   /// Create SupplierAdmin
-  virtual void create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SupplierAdmin*& admin) = 0;
 
   /// Create ConsumerAdmin
-  virtual void create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ConsumerAdmin*& admin) = 0;
 
   /// Create ProxyPushConsumer
-  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy) = 0;
 
   /// Create ProxyPushSupplier
-  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy) = 0;
 
   /// Create CosEC_ProxyPushConsumer
-  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy) = 0;
 
   /// Create CosEC_ProxyPushSupplier
-  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy) = 0;
 
   /// Create StructuredProxyPushConsumer
-  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy) = 0;
 
   /// Create StructuredProxyPushSupplier
-  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy) = 0;
 
   /// Create SequenceProxyPushConsumer
-  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy) = 0;
 
   /// Create SequenceProxyPushSupplier
-  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL) = 0;
+  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
index 81b86902a36..618e08e0955 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -25,7 +25,7 @@ TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin (void)
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (new_filter))
@@ -33,7 +33,6 @@ TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_E
 
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   CosNotifyFilter::FilterID new_id = this->filter_ids_.id ();
 
@@ -48,7 +47,7 @@ TAO_Notify_FilterAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_E
 }
 
 void
-TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -56,14 +55,13 @@ TAO_Notify_FilterAdmin::remove_filter (CosNotifyFilter::FilterID filter_id ACE_E
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   if (this->filter_list_.unbind (filter_id) == -1)
-    ACE_THROW (CosNotifyFilter::FilterNotFound ());
+    throw CosNotifyFilter::FilterNotFound ();
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -71,7 +69,6 @@ TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
 
   CosNotifyFilter::Filter_var filter_var;
 
@@ -84,14 +81,13 @@ TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_Notify_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_FilterAdmin::get_all_filters (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   // Figure out the length of the list.
   size_t len = this->filter_list_.current_size ();
@@ -102,7 +98,6 @@ TAO_Notify_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (list_ptr,
                     CosNotifyFilter::FilterIDSeq,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CosNotifyFilter::FilterIDSeq_var list (list_ptr);
 
@@ -122,18 +117,17 @@ TAO_Notify_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_FilterAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_FilterAdmin::remove_all_filters (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   this->filter_list_.unbind_all ();
 }
 
 void
-TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   if (this->filter_list_.current_size() == 0)
     return;
@@ -141,8 +135,7 @@ TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_E
   bool changed = true;
 
   TAO_Notify::NVPList attrs;
-  bool want_children = saver.begin_object(0, "filter_admin", attrs, changed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  bool want_children = saver.begin_object(0, "filter_admin", attrs, changed);
   if (want_children)
   {
     FILTER_LIST::ITERATOR iter (this->filter_list_);
@@ -156,22 +149,19 @@ TAO_Notify_FilterAdmin::save_persistent (TAO_Notify::Topology_Saver& saver ACE_E
     {
       TAO_Notify::NVPList fattrs;
       CORBA::Long id = entry->ext_id_;
-      CORBA::String_var ior = orb->object_to_string(entry->int_id_.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::String_var ior = orb->object_to_string(entry->int_id_.in());
       fattrs.push_back(TAO_Notify::NVP("IOR", ior.in()));
-      saver.begin_object(id, "filter", fattrs, changed ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      saver.end_object(id, "filter" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      saver.begin_object(id, "filter", fattrs, changed);
+      saver.end_object(id, "filter");
     }
   }
 
-  saver.end_object(0, "filter_admin" ACE_ENV_ARG_PARAMETER);
+  saver.end_object(0, "filter_admin");
 }
 
 TAO_Notify::Topology_Object*
 TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  const TAO_Notify::NVPList& attrs)
 {
   if (type == "filter")
   {
@@ -181,10 +171,8 @@ TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id,
     ACE_CString ior;
     attrs.load("IOR", ior);
 
-    CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
-    CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+    CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_unchecked_narrow(obj.in());
     if (! CORBA::is_nil(filter.in()))
     {
       this->filter_ids_.set_last_used(id);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index dfa0d7eb7af..d332011a4f4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -46,7 +46,7 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 
   // = match operation on all the filters
   /// See if any of the filters match.
-  CORBA::Boolean match (const TAO_Notify_Event::Ptr &event ACE_ENV_ARG_DECL)
+  CORBA::Boolean match (const TAO_Notify_Event::Ptr &event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
@@ -54,33 +54,33 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 
   // = match operation on all the filters
   /// See if any of the filters match.
-  CORBA::Boolean match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
+  CORBA::Boolean match (const TAO_Notify_Event* event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::FilterID add_filter (CosNotifyFilter::Filter_ptr new_filter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+  virtual void remove_filter (CosNotifyFilter::FilterID filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::FilterNotFound
                      ));
 
-  virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::Filter_ptr get_filter (CosNotifyFilter::FilterID filter)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::FilterNotFound
                      ));
 
-  virtual CosNotifyFilter::FilterIDSeq * get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyFilter::FilterIDSeq * get_all_filters (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void remove_all_filters (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -88,9 +88,9 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
 
   // TAO_Notify::Topology_Object
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id,
-    const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
  private:
   typedef ACE_Hash_Map_Manager <CosNotifyFilter::FilterID, CosNotifyFilter::Filter_var, ACE_SYNCH_NULL_MUTEX> FILTER_LIST;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
index 3b30256fbb4..7fd08855554 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Boolean
-TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData
@@ -13,7 +13,6 @@ TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   // If no filter is active, match is successfull.
   if (this->filter_list_.current_size () == 0)
@@ -26,8 +25,7 @@ TAO_Notify_FilterAdmin::match (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 
   for (; iter.next (entry); iter.advance ())
     {
-      ret_val = event->do_match (entry->int_id_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      ret_val = event->do_match (entry->int_id_.in ());
 
       if (ret_val == 1)
         return 1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
index a806f8d9437..bc8e6a4e164 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
@@ -38,8 +38,7 @@ public:
   /// Factory method to create a FilterFactory reference
   /// The Factory is activated in the default POA. The filters created are activated in the <filter_poa>.
   virtual CosNotifyFilter::FilterFactory_ptr create (
-      PortableServer::POA_var& filter_poa 
-      ACE_ENV_ARG_DECL) = 0;
+      PortableServer::POA_var& filter_poa) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
index de2822ae61b..b487a8f01d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.cpp
@@ -18,30 +18,27 @@ TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::TAO_Notify_Fin
 }
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> TYPE*
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::find (const TAO_Notify_Object::ID id, CONTAINER& container)
 {
   this->id_ = id;
 
-  container.collection ()->for_each (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  container.collection ()->for_each (this);
 
   return this->result_;
 }
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> INTERFACE_PTR
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::resolve (const TAO_Notify_Object::ID id, CONTAINER& container)
 {
-  this->find (id, container ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (INTERFACE::_nil ());
+  this->find (id, container);
 
   if (this->result_ == 0)
     ACE_THROW_RETURN (EXCEPTION ()
                       , INTERFACE::_nil ());
 
-  CORBA::Object_var object = this->result_->ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (INTERFACE::_nil ());
+  CORBA::Object_var object = this->result_->ref ();
 
-  return INTERFACE::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  return INTERFACE::_narrow (object.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
index c9c09eca0fa..858dc0ad848 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -43,14 +43,14 @@ public:
   TAO_Notify_Find_Worker_T (void);
 
   /// Find the Type.
-  TYPE* find (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
+  TYPE* find (const TAO_Notify_Object::ID id, CONTAINER& container);
 
   /// Find and resolve to the Interface.
-  INTERFACE_PTR resolve (const TAO_Notify_Object::ID id, CONTAINER& container ACE_ENV_ARG_DECL);
+  INTERFACE_PTR resolve (const TAO_Notify_Object::ID id, CONTAINER& container);
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TYPE* object ACE_ENV_ARG_DECL);
+  void work (TYPE* object);
 
   /// The id we're looking for.
   TAO_Notify_Object::ID id_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
index 2b9af82e37a..802f0c5e6e5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TYPE, class INTERFACE, class INTERFACE_PTR, class EXCEPTION> ACE_INLINE void
-TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Find_Worker_T<TYPE,INTERFACE,INTERFACE_PTR,EXCEPTION>::work (TYPE* type)
 {
   if (type->id () == this->id_)
     this->result_ = type;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
index e9dc45dbb07..d9463ed423c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -15,7 +15,7 @@ TAO_Notify_Method_Request::~TAO_Notify_Method_Request (void)
 }
 
 TAO_Notify_Method_Request_Queueable *
-TAO_Notify_Method_Request_Queueable::copy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Method_Request_Queueable::copy (void)
 {
   return this;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
index 271c2d721b4..e0de13c6408 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -42,8 +42,8 @@ public:
   virtual ~TAO_Notify_Method_Request (void);
 
   /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
-  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual int execute (void) = 0;
+  virtual TAO_Notify_Method_Request_Queueable* copy (void) = 0;
 };
 
 /***********************************************************************/
@@ -64,7 +64,7 @@ public:
   TAO_Notify_Method_Request_Queueable();
   TAO_Notify_Method_Request_Queueable(const TAO_Notify_Event * event);
 
-  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request_Queueable* copy (void);
   void init (const TAO_Notify_Event * event);
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index af503aa3077..1838c5b6dbf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -66,7 +66,7 @@ TAO_Notify_Method_Request_Dispatch::~TAO_Notify_Method_Request_Dispatch ()
 #endif
 }
 
-int TAO_Notify_Method_Request_Dispatch::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+int TAO_Notify_Method_Request_Dispatch::execute_i (void)
 {
   if (this->proxy_supplier_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
@@ -76,9 +76,7 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (ACE_ENV_SINGLE_ARG_DECL)
       TAO_Notify_Admin& parent = this->proxy_supplier_->consumer_admin ();
       CORBA::Boolean val =  this->proxy_supplier_->check_filters (this->event_,
                                                                   parent.filter_admin (),
-                                                                  parent.filter_operator ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                                                  parent.filter_operator ());
 
       if (TAO_debug_level > 1)
         ACE_DEBUG ((LM_DEBUG, "Proxysupplier %x filter eval result = %d",&this->proxy_supplier_ , val));
@@ -88,24 +86,22 @@ int TAO_Notify_Method_Request_Dispatch::execute_i (ACE_ENV_SINGLE_ARG_DECL)
         return 0;
     }
 
-  ACE_TRY
+  try
     {
       TAO_Notify_Consumer* consumer = this->proxy_supplier_->consumer ();
 
       if (consumer != 0)
         {
-          consumer->deliver (this ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer->deliver (this);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        ACE_TEXT ("TAO_Notify_Method_Request_Dispatch::: error sending event.\n ")
-        );
+        ex._tao_print_exception (
+          ACE_TEXT (
+            "TAO_Notify_Method_Request_Dispatch::: error sending event.\n "));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -115,8 +111,7 @@ TAO_Notify_Method_Request_Dispatch_Queueable *
 TAO_Notify_Method_Request_Dispatch::unmarshal (
     TAO_Notify::Delivery_Request_Ptr & delivery_request,
     TAO_Notify_EventChannelFactory &ecf,
-    TAO_InputCDR & cdr
-    ACE_ENV_ARG_DECL)
+    TAO_InputCDR & cdr)
 {
   bool ok = true;
   TAO_Notify_Method_Request_Dispatch_Queueable * result = 0;
@@ -144,8 +139,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal (
     if (ok)
     {
       TAO_Notify_ProxySupplier* proxy_supplier = ecf.find_proxy_supplier (id_path,
-        0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+        0);
       if (proxy_supplier != 0)
       {
         if (DEBUG_LEVEL > 6) ACE_DEBUG ((LM_DEBUG,
@@ -157,7 +151,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal (
       }
       else
       {
-        TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (id_path, 0 ACE_ENV_ARG_PARAMETER); //@@todo
+        TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (id_path, 0); //@@todo
         if (proxy_consumer == 0)
         {
           ACE_ERROR ((LM_ERROR,
@@ -236,9 +230,9 @@ TAO_Notify_Method_Request_Dispatch_Queueable::~TAO_Notify_Method_Request_Dispatc
 }
 
 int
-TAO_Notify_Method_Request_Dispatch_Queueable::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_Queueable::execute (void)
 {
-  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->execute_i ();
 }
 
 /*********************************************************************************************************/
@@ -279,19 +273,18 @@ TAO_Notify_Method_Request_Dispatch_No_Copy:: ~TAO_Notify_Method_Request_Dispatch
 }
 
 int
-TAO_Notify_Method_Request_Dispatch_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_No_Copy::execute (void)
 {
-  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->execute_i ();
 }
 
 TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Dispatch_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Dispatch_No_Copy::copy (void)
 {
   TAO_Notify_Method_Request_Queueable* request;
 
   TAO_Notify_Event::Ptr event_var (
-    this->event_->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER) );
-  ACE_CHECK_RETURN (0);
+    this->event_->queueable_copy () );
 
   ACE_NEW_THROW_EX (request,
                     TAO_Notify_Method_Request_Dispatch_Queueable (*this, event_var, this->proxy_supplier_.get(), this->filtering_),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
index fed8d063cfa..484fdaba219 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -72,13 +72,12 @@ public:
   static TAO_Notify_Method_Request_Dispatch_Queueable * unmarshal (
     TAO_Notify::Delivery_Request_Ptr & delivery_request,
     TAO_Notify_EventChannelFactory &ecf,
-    TAO_InputCDR & cdr
-    ACE_ENV_ARG_DECL);
+    TAO_InputCDR & cdr);
 
 
 protected:
   /// Execute the dispatch operation.
-  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  int execute_i (void);
 
 protected:
   /// The Proxy
@@ -120,7 +119,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Dispatch_Queueable ();
 
   /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int execute (void);
 
 private:
   TAO_Notify_Event::Ptr event_var_;
@@ -156,10 +155,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Dispatch_No_Copy ();
 
   /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int execute (void);
 
   /// Create a copy of this method request
-  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request_Queueable* copy (void);
 };
 
 /*****************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
index 53ab33da14c..29dacfce71b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -87,7 +87,7 @@ TAO_Notify_Method_Request_Event_Queueable::~TAO_Notify_Method_Request_Event_Queu
 }
 
 int
-TAO_Notify_Method_Request_Event_Queueable::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Method_Request_Event_Queueable::execute (void)
 {
   ACE_ASSERT (false);
   return -1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
index 4acb97f10d9..cab979791b7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -93,7 +93,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Event_Queueable ();
 
   /// satisfy the pure virtual method.  Should never be called.
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int execute (void);
 private:
   TAO_Notify_Event::Ptr event_var_;
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index bee058ab534..fd447d57433 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -37,23 +37,20 @@ TAO_Notify_Method_Request_Lookup::~TAO_Notify_Method_Request_Lookup ()
 
 void
 TAO_Notify_Method_Request_Lookup::work (
-  TAO_Notify_ProxySupplier* proxy_supplier
-  ACE_ENV_ARG_DECL)
+  TAO_Notify_ProxySupplier* proxy_supplier)
 {
   if (delivery_request_.get () == 0)
   {
     TAO_Notify_Method_Request_Dispatch_No_Copy request (*this, proxy_supplier, true);
-    proxy_supplier->deliver (request ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    proxy_supplier->deliver (request);
   }
   else
   {
-    delivery_request_->dispatch (proxy_supplier, true ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    delivery_request_->dispatch (proxy_supplier, true);
   }
 }
 
-int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+int TAO_Notify_Method_Request_Lookup::execute_i (void)
 {
   if (this->proxy_consumer_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
@@ -62,9 +59,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Boolean val =  this->proxy_consumer_->check_filters (this->event_,
                                                              parent.filter_admin (),
-                                                             parent.filter_operator ()
-                                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                             parent.filter_operator ());
 
   if (TAO_debug_level > 1)
     ACE_DEBUG ((LM_DEBUG, "Proxyconsumer %x filter eval result = %d",&this->proxy_consumer_ , val));
@@ -76,8 +71,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
   // The map of subscriptions.
   TAO_Notify_Consumer_Map& map = this->proxy_consumer_->event_manager ().consumer_map ();
 
-  TAO_Notify_Consumer_Map::ENTRY* entry = map.find (this->event_->type () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Notify_Consumer_Map::ENTRY* entry = map.find (this->event_->type ());
 
   TAO_Notify_ProxySupplier_Collection* consumers = 0;
 
@@ -87,8 +81,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 
     if (consumers != 0)
       {
-        consumers->for_each (this ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+        consumers->for_each (this);
       }
 
     map.release (entry);
@@ -99,8 +92,7 @@ int TAO_Notify_Method_Request_Lookup::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 
   if (consumers != 0)
     {
-      consumers->for_each (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      consumers->for_each (this);
     }
   this->complete ();
   return 0;
@@ -111,8 +103,7 @@ TAO_Notify_Method_Request_Lookup_Queueable *
 TAO_Notify_Method_Request_Lookup::unmarshal (
   TAO_Notify::Delivery_Request_Ptr & delivery_request,
   TAO_Notify_EventChannelFactory &ecf,
-  TAO_InputCDR & cdr
-  ACE_ENV_ARG_DECL)
+  TAO_InputCDR & cdr)
 {
   bool ok = true;
   TAO_Notify_Method_Request_Lookup_Queueable * result = 0;
@@ -137,8 +128,7 @@ TAO_Notify_Method_Request_Lookup::unmarshal (
     {
       TAO_Notify_ProxyConsumer * proxy_consumer = ecf.find_proxy_consumer (
         id_path,
-        0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+        0);
       if (proxy_consumer != 0)
       {
         ACE_NEW_NORETURN (result,
@@ -191,9 +181,9 @@ TAO_Notify_Method_Request_Lookup_Queueable::~TAO_Notify_Method_Request_Lookup_Qu
 }
 
 int
-TAO_Notify_Method_Request_Lookup_Queueable::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_Queueable::execute (void)
 {
-  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->execute_i ();
 }
 
 /******************************************************************************************************/
@@ -210,18 +200,17 @@ TAO_Notify_Method_Request_Lookup_No_Copy::~TAO_Notify_Method_Request_Lookup_No_C
 }
 
 int
-TAO_Notify_Method_Request_Lookup_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_No_Copy::execute (void)
 {
-  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->execute_i ();
 }
 
 TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Lookup_No_Copy::copy (void)
 {
   TAO_Notify_Method_Request_Queueable* request;
 
-  TAO_Notify_Event::Ptr event(this->event_->queueable_copy(ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK_RETURN (0);
+  TAO_Notify_Event::Ptr event(this->event_->queueable_copy());
 
   ACE_NEW_THROW_EX (request,
                     TAO_Notify_Method_Request_Lookup_Queueable (event, this->proxy_consumer_),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index d54bb62833e..72f431b9a2e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -53,18 +53,17 @@ public:
   static TAO_Notify_Method_Request_Lookup_Queueable * unmarshal (
     TAO_Notify::Delivery_Request_Ptr & delivery_request,
     TAO_Notify_EventChannelFactory &ecf,
-    TAO_InputCDR & cdr
-    ACE_ENV_ARG_DECL);
+    TAO_InputCDR & cdr);
 
 protected:
   /// Constuctor
   TAO_Notify_Method_Request_Lookup (const TAO_Notify_Event * event, TAO_Notify_ProxyConsumer * proxy);
 
   /// Execute the dispatch operation.
-  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  int execute_i (void);
 
   ///= TAO_ESF_Worker method
-  virtual void work (TAO_Notify_ProxySupplier* proxy_supplier ACE_ENV_ARG_DECL);
+  virtual void work (TAO_Notify_ProxySupplier* proxy_supplier);
 
 protected:
 
@@ -99,7 +98,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Lookup_Queueable ();
 
   /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int execute (void);
 
 private:
   TAO_Notify_Event::Ptr event_var_;
@@ -128,10 +127,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Lookup_No_Copy ();
 
   /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int execute (void);
 
   /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request_Queueable* copy (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
index 74ca99ef829..2720a530fc1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -23,7 +23,7 @@ TAO_Notify_Method_Request_Shutdown::copy (void)
 }
 
 int
-TAO_Notify_Method_Request_Shutdown::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Method_Request_Shutdown::execute (void)
 {
   // Shut down the scheduler by deactivating the activation queue's
   // underlying message queue - should pop all worker threads off their
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
index af38f816524..c8199b63b30 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -45,7 +45,7 @@ public:
   TAO_Notify_Method_Request_Queueable* copy (void);
 
   /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int execute (void);
 
 private:
   // Task to shutdown
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
index 18ac5fa1841..61215e49d58 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -20,9 +20,9 @@ TAO_Notify_Method_Request_Updates::~TAO_Notify_Method_Request_Updates ()
 }
 
 int
-TAO_Notify_Method_Request_Updates::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates::execute (void)
 {
-  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->execute_i ();
 }
 
 /*****************************************************************************/
@@ -38,22 +38,21 @@ TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No
 }
 
 TAO_Notify_Method_Request_Queueable*
-TAO_Notify_Method_Request_Updates_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates_No_Copy::copy (void)
 {
   TAO_Notify_Method_Request_Queueable* request = 0;
 
   ACE_NEW_THROW_EX (request,
                     TAO_Notify_Method_Request_Updates (this->added_, this->removed_, this->proxy_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (request);
 
   return request;
 }
 
 int
-TAO_Notify_Method_Request_Updates_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates_No_Copy::execute (void)
 {
-  return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->execute_i ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
index b9410188772..93604f4c4d6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -49,7 +49,7 @@ public:
   virtual ~TAO_Notify_Method_Request_Updates ();
 
   /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int execute (void);
 };
 
 /*****************************************************************************/
@@ -78,10 +78,10 @@ public:
   virtual ~TAO_Notify_Method_Request_Updates_No_Copy ();
 
   /// Create a copy of this object.
-  virtual TAO_Notify_Method_Request_Queueable* copy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Method_Request_Queueable* copy (void);
 
   /// Execute the Request
-  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int execute (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
index 53b6c1d7b30..933412db268 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -41,15 +41,15 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Updates_T
 {
 public:
   /// Constuctor
-  TAO_Notify_Method_Request_Updates_T (SEQ_PARAM added, 
-                                       SEQ_PARAM removed, 
+  TAO_Notify_Method_Request_Updates_T (SEQ_PARAM added,
+                                       SEQ_PARAM removed,
                                        PROXY_PARAM proxy);
 
   /// Destructor
   virtual ~TAO_Notify_Method_Request_Updates_T ();
 
   /// Execute the Request
-  int execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  int execute_i (void);
 
 protected:
   /// Update Added
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
index 657b6dd0929..1bd9f4641ea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -8,27 +8,26 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> ACE_INLINE int
-TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (void)
 {
   if (this->proxy_->has_shutdown ())
     return 0; // If we were shutdown while waiting in the queue, return with no action.
 
-  ACE_TRY
+  try
     {
       TAO_Notify_Peer* peer = this->proxy_->peer();
 
       if (peer != 0)
         {
-          peer->dispatch_updates (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          peer->dispatch_updates (this->added_, this->removed_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Notify_Method_Request_Updates::execute error sending updates\n ");
+        ex._tao_print_exception (
+          "TAO_Notify_Method_Request_Updates::execute error sending updates\n ");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 5d6f3e11e21..12ca5cabb5a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -19,7 +19,6 @@ TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void)
 void
 TAO_Notify_Constraint_Interpreter::build_tree (
     const char *constraints
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
                    CORBA::NO_MEMORY))
@@ -30,13 +29,12 @@ TAO_Notify_Constraint_Interpreter::build_tree (
       ACE_NEW_THROW_EX (this->root_,
                         TAO_ETCL_Literal_Constraint ((CORBA::Boolean) 1),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
     {
       // root_ is set in this base class call.
       if (TAO_ETCL_Interpreter::build_tree (constraints) != 0)
-          ACE_THROW (CosNotifyFilter::InvalidConstraint ());
+          throw CosNotifyFilter::InvalidConstraint ();
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index acb7c8b9d86..3d2414adbf5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -49,8 +49,7 @@ public:
    * Constraint exception if the constraint given has syntax errors or
    * semantic errors, such as mismatched types.
    */
-  void build_tree (const char* constraints
-                   ACE_ENV_ARG_DECL)
+  void build_tree (const char* constraints)
     ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
                      CORBA::NO_MEMORY));
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 49f4aa6814e..f95a0b5fd2a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -196,8 +196,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
   TAO_ETCL_Union_Pos *union_pos
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     if (union_pos->union_value ()->accept (this) == 0)
     {
@@ -205,9 +204,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
       this->queue_.dequeue_head (disc_val);
 
       TAO_DynUnion_i dyn_union;
-      dyn_union.init (this->current_value_.in ()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dyn_union.init (this->current_value_.in ());
 
       CORBA::TypeCode_var tc = this->current_value_->type ();
 
@@ -219,12 +216,9 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
         {
           CORBA::Any disc_any;
           CORBA::TypeCode_var disc_tc =
-            tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            tc->discriminator_type ();
           CORBA::TCKind disc_kind =
-            TAO_DynAnyFactory::unalias (disc_tc.in ()
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_DynAnyFactory::unalias (disc_tc.in ());
 
           switch (disc_kind)
           {
@@ -272,18 +266,12 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
           DynamicAny::DynAny_var dyn_any =
             TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any &> (
               disc_tc.in (),
-              disc_any
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          dyn_union.set_discriminator (dyn_any.in ()
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              disc_any);
+          dyn_union.set_discriminator (dyn_any.in ());
           DynamicAny::DynAny_var u_member =
-            dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            dyn_union.member ();
           this->current_value_ =
-            u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            u_member->to_any ();
 
           break;
         }
@@ -291,17 +279,14 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
         {
           const char *name = (const char *) disc_val;
           CORBA::ULong count =
-            tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            tc->member_count ();
 
           const char *member_name = 0;
           CORBA::ULong i = 0;
 
           for (i = 0; i < count; ++i)
           {
-            member_name = tc->member_name (i
-              ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            member_name = tc->member_name (i);
 
             if (ACE_OS::strcmp (name, member_name) == 0)
               break;
@@ -310,9 +295,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
           // If there's no match, member_label will throw
           // CORBA::TypeCode::Bounds and the catch block will
           // return -1;
-          this->current_value_ = tc->member_label (i
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->current_value_ = tc->member_label (i);
 
           break;
         }
@@ -340,11 +323,10 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
     else
       return -1;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -352,15 +334,12 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
   TAO_ETCL_Component_Pos *pos
   )
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     // If we are here (from visit_component) the Any containing the
     // component as found in filterable_data_ will be in current_value_.
     CORBA::TypeCode_var tc = this->current_value_->type ();
-    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
     DynamicAny::DynAny_var member;
     CORBA::Boolean success = 0;
@@ -371,39 +350,29 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
     case CORBA::tk_enum:
       {
         TAO_DynEnum_i dyn_enum;
-        dyn_enum.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        dyn_enum.init (this->current_value_.in ());
 
-        success = dyn_enum.seek (slot
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        success = dyn_enum.seek (slot);
 
         if (success == 0)
           return -1;
 
         member =
-          dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          dyn_enum.current_component ();
 
         break;
       }
     case CORBA::tk_struct:
       {
         TAO_DynStruct_i dyn_struct;
-        dyn_struct.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        dyn_struct.init (this->current_value_.in ());
 
-        success = dyn_struct.seek (slot
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        success = dyn_struct.seek (slot);
 
         if (success == 0)
           return -1;
 
-        member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        member = dyn_struct.current_component ();
 
         break;
       }
@@ -415,8 +384,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
       return -1;
     }
 
-    CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::Any_var value = member->to_any ();
 
     TAO_ETCL_Constraint *comp = pos->component ();
 
@@ -432,11 +400,10 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
       return comp->accept (this);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -498,16 +465,13 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc (
 int
 TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *array)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     // If we are here (from visit_component) the Any containing the
     // component as found in filterable_data_ will be in
     // current_value_.
     CORBA::TypeCode_var tc = this->current_value_->type ();
-    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
     DynamicAny::DynAny_var member;
     CORBA::Boolean success = 0;
@@ -518,39 +482,29 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
     case CORBA::tk_array:
       {
         TAO_DynEnum_i dyn_array;
-        dyn_array.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        dyn_array.init (this->current_value_.in ());
 
-        success = dyn_array.seek (slot
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        success = dyn_array.seek (slot);
 
         if (success == 0)
           return -1;
 
-        member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        member = dyn_array.current_component ();
 
         break;
       }
     case CORBA::tk_sequence:
       {
         TAO_DynStruct_i dyn_sequence;
-        dyn_sequence.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        dyn_sequence.init (this->current_value_.in ());
 
-        success = dyn_sequence.seek (slot
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        success = dyn_sequence.seek (slot);
 
         if (success == 0)
           return -1;
 
         member =
-          dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          dyn_sequence.current_component ();
 
         break;
       }
@@ -560,8 +514,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
       return -1;
     }
 
-    CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::Any_var value = member->to_any ();
 
     TAO_ETCL_Constraint *comp = array->component ();
 
@@ -577,25 +530,21 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array *
       return comp->accept (this);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
 TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::TypeCode_var tc = this->current_value_->type ();
-    tc = TAO_DynAnyFactory::strip_alias (tc.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    tc = TAO_DynAnyFactory::strip_alias (tc.in ());
 
-      CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::TCKind kind = tc->kind ();
 
     switch (special->type ())
     {
@@ -608,21 +557,17 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
         case CORBA::tk_sequence:
           {
             TAO_DynSequence_i dyn_seq;
-            dyn_seq.init (current_value_.in()
-              ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            dyn_seq.init (current_value_.in());
 
             DynamicAny::AnySeq_var any_seq =
-              dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              dyn_seq.get_elements ();
 
             length = any_seq->length ();
           }
           break;
         case CORBA::tk_array:
           {
-            length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            length = tc->length ();
           }
           break;
         default:
@@ -638,16 +583,12 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
         // If the TCKind is not a union, the call to init() will
         // raise an exception, and the catch block will return -1;
         TAO_DynUnion_i dyn_union;
-        dyn_union.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        dyn_union.init (this->current_value_.in ());
 
         DynamicAny::DynAny_var disc =
-          dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          dyn_union.get_discriminator ();
 
-        CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::Any_var disc_any = disc->to_any ();
 
         TAO_ETCL_Literal_Constraint lit (disc_any.ptr ());
         this->queue_.enqueue_head (lit);
@@ -655,8 +596,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
       }
     case TAO_ETCL_TYPE_ID:
       {
-        const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        const char *name = tc->name ();
 
         TAO_ETCL_Literal_Constraint lit (name);
         this->queue_.enqueue_head (lit);
@@ -664,8 +604,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
       }
     case TAO_ETCL_REPOS_ID:
       {
-        const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        const char *id = tc->id ();
 
         TAO_ETCL_Literal_Constraint lit (id);
         this->queue_.enqueue_head (lit);
@@ -675,11 +614,10 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
       return -1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -800,15 +738,13 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
   if (comp->accept (this) != 0)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::TypeCode_var tc = this->current_value_->type ();
 
     // If the current member is not a union, this call will throw
     // BadKind and the catch block will return -1.
-    CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::Long default_index = tc->default_index ();
 
     // No default index.
     if (default_index == -1)
@@ -825,11 +761,10 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
     TAO_ETCL_Literal_Constraint default_index_value (default_index);
     return (disc == default_index_value);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     return -1;
   }
-  ACE_ENDTRY;
 }
 
 int
@@ -1155,19 +1090,15 @@ TAO_Notify_Constraint_Visitor::visit_in (TAO_ETCL_Binary_Expr *binary)
         const CORBA::Any *component = (const CORBA::Any *) bag;
         CORBA::TCKind kind = CORBA::tk_null;
 
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY
+        try
         {
           CORBA::TypeCode_var tc = component->type ();
-          kind = TAO_DynAnyFactory::unalias (tc.in ()
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          kind = TAO_DynAnyFactory::unalias (tc.in ());
         }
-        ACE_CATCHANY
+        catch (const CORBA::Exception&)
         {
           return return_value;
         }
-        ACE_ENDTRY;
 
         CORBA::Boolean result = 0;
 
@@ -1220,19 +1151,15 @@ CORBA::Boolean
 TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
                                                       TAO_ETCL_Literal_Constraint &item)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::TypeCode_var type = any->type ();
     CORBA::TypeCode_var base_type =
-      TAO_DynAnyFactory::strip_alias (type.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      TAO_DynAnyFactory::strip_alias (type.in ());
     CORBA::TypeCode_var content_type =
-      base_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      base_type->content_type ();
     CORBA::TCKind kind =
-      TAO_DynAnyFactory::unalias (content_type.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      TAO_DynAnyFactory::unalias (content_type.in());
 
     // The literal and the array elements must be
     // of the same simple type.
@@ -1243,13 +1170,10 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
       return 0;
 
     TAO_DynSequence_i dyn_seq;
-    dyn_seq.init (*any
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    dyn_seq.init (*any);
 
     DynamicAny::AnySeq_var any_seq =
-      dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      dyn_seq.get_elements ();
 
     CORBA::ULong length = any_seq->length ();
 
@@ -1261,11 +1185,10 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (const CORBA::Any *any,
         return 1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     return 0;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1274,13 +1197,10 @@ CORBA::Boolean
 TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
                                                    TAO_ETCL_Literal_Constraint &item)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::TypeCode_var type = any->type ();
-    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ());
 
     // The literal and the array elements must be
     // of the same simple type.
@@ -1291,13 +1211,10 @@ TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
       return 0;
 
     TAO_DynArray_i dyn_array;
-    dyn_array.init (*any
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    dyn_array.init (*any);
 
     DynamicAny::AnySeq_var any_seq =
-      dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      dyn_array.get_elements ();
 
     CORBA::ULong length = any_seq->length ();
 
@@ -1309,11 +1226,10 @@ TAO_Notify_Constraint_Visitor::array_does_contain (const CORBA::Any *any,
         return 1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     return 0;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1322,17 +1238,13 @@ CORBA::Boolean
 TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
                                                     TAO_ETCL_Literal_Constraint &item)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     TAO_DynStruct_i dyn_struct;
-    dyn_struct.init (*any
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    dyn_struct.init (*any);
 
     DynamicAny::NameValuePairSeq_var members =
-      dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      dyn_struct.get_members ();
 
     CORBA::ULong length = members->length ();
     CORBA::TypeCode_var tc;
@@ -1341,9 +1253,7 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
     for (CORBA::ULong i = 0; i < length; ++i)
     {
       tc = members[i].value.type ();
-      kind = TAO_DynAnyFactory::unalias (tc.in ()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      kind = TAO_DynAnyFactory::unalias (tc.in ());
 
       // The literal and the struct member must be
       // of the same simple type.
@@ -1359,11 +1269,10 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (const CORBA::Any *any,
         return 1;
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     return 0;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1372,25 +1281,18 @@ CORBA::Boolean
 TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any,
                                                    TAO_ETCL_Literal_Constraint &item)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     TAO_DynUnion_i dyn_union;
-    dyn_union.init (*any
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    dyn_union.init (*any);
 
     DynamicAny::DynAny_var cc =
-      dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      dyn_union.current_component ();
 
-    CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::Any_var member = cc->to_any ();
 
     CORBA::TypeCode_var tc = member->type ();
-    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
     // The literal and the union member must be
     // of the same simple type.
@@ -1404,11 +1306,10 @@ TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any,
 
     return (item == element);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     return 0;
   }
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 2bc881f15a7..c0476c1ee98 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -10,7 +10,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
 
@@ -29,11 +29,9 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC
 
   CORBA::ORB_ptr orb = poa->orb_core ().orb () ;
 
-  notify_service->init_service (orb ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (notify_factory._retn ());
+  notify_service->init_service (orb);
 
-  notify_factory = notify_service->create (default_POA ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (notify_factory._retn ());
+  notify_factory = notify_service->create (default_POA);
 
   return notify_factory._retn ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index 60ccb0b068d..85405ba3100 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -35,7 +35,7 @@ class TAO_Notify_Serv_Export TAO_Notify_EventChannelFactory_i
 public:
   /// Create a factory servant and activates it with the default POA.
   /// Also creates a resource factory and assigns it this default_POA.
-  static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL);
+  static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
index a00a6c374b8..44de916a2d8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -68,45 +68,42 @@ TAO_Notify_Object::set_event_manager( TAO_Notify_Event_Manager* event_manager )
 }
 
 CORBA::Object_ptr
-TAO_Notify_Object::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_Object::activate (PortableServer::Servant servant)
 {
-  return this->poa_->activate (servant, this->id_ ACE_ENV_ARG_PARAMETER);
+  return this->poa_->activate (servant, this->id_);
 }
 
 /// Activate with existing id
 CORBA::Object_ptr
 TAO_Notify_Object::activate (
     PortableServer::Servant servant,
-    CORBA::Long id
-    ACE_ENV_ARG_DECL)
+    CORBA::Long id)
 {
   this->id_ = id;
-  return this->poa_->activate_with_id (servant, this->id_ ACE_ENV_ARG_PARAMETER);
+  return this->poa_->activate_with_id (servant, this->id_);
 }
 
 
 void
-TAO_Notify_Object::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::deactivate (void)
 {
-  ACE_TRY
+  try
   {
-    this->poa_->deactivate (this->id_ ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->poa_->deactivate (this->id_);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     // Do not propagate any exceptions
     if (TAO_debug_level > 2)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t)\n");
+      ex._tao_print_exception ("(%P|%t)\n");
       ACE_DEBUG ((LM_DEBUG, "Could not deactivate object %d\n", this->id_));
     }
   }
-  ACE_ENDTRY;
 }
 
 int
-TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::shutdown (void)
 {
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
@@ -117,8 +114,7 @@ TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     this->shutdown_ = 1;
   }
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  this->deactivate ();
 
   this->shutdown_worker_task ();
 
@@ -126,9 +122,9 @@ TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO_Notify_Object::ref (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::ref (void)
 {
-  return this->poa_->id_to_reference (this->id_ ACE_ENV_ARG_PARAMETER);
+  return this->poa_->id_to_reference (this->id_);
 }
 
 void
@@ -151,7 +147,7 @@ TAO_Notify_Object::destroy_proxy_poa (void)
 {
   if (this->proxy_poa_ != 0)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       if ( this->proxy_poa_ == this->object_poa_ ) this->object_poa_ = 0;
       if ( this->proxy_poa_ == this->poa_ ) this->poa_ = 0;
@@ -160,18 +156,15 @@ TAO_Notify_Object::destroy_proxy_poa (void)
       {
         this->own_proxy_poa_ = false;
         ACE_Auto_Ptr< TAO_Notify_POA_Helper > app( object_poa_ );
-        this->proxy_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->proxy_poa_->destroy ();
       }
       this->proxy_poa_ = 0;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 2)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Proxy shutdown error (%P|%t)\n");
+        ex._tao_print_exception ("Proxy shutdown error (%P|%t)\n");
     }
-    ACE_ENDTRY;
   }
 }
 
@@ -180,7 +173,7 @@ TAO_Notify_Object::destroy_object_poa (void)
 {
   if (this->object_poa_ != 0)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       if ( this->object_poa_ == this->proxy_poa_ ) this->proxy_poa_ = 0;
       if ( this->object_poa_ == this->poa_ ) this->poa_ = 0;
@@ -189,18 +182,15 @@ TAO_Notify_Object::destroy_object_poa (void)
       {
         this->own_object_poa_ = false;
         ACE_Auto_Ptr< TAO_Notify_POA_Helper > aop( object_poa_ );
-        this->object_poa_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->object_poa_->destroy ();
       }
       this->object_poa_ = 0;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 2)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Proxy shutdown error (%P|%t)\n");
+        ex._tao_print_exception ("Proxy shutdown error (%P|%t)\n");
     }
-    ACE_ENDTRY;
   }
 }
 
@@ -252,34 +242,31 @@ TAO_Notify_Object::set_poa (TAO_Notify_POA_Helper* poa)
 }
 
 void
-TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos)
 {
   CosNotification::PropertyErrorSeq err_seq;
 
   TAO_Notify_QoSProperties new_qos_properties;
 
   if (new_qos_properties.init (qos, err_seq) == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   // Apply the appropriate concurrency QoS
   if (new_qos_properties.thread_pool ().is_valid ())
   {
     if (new_qos_properties.thread_pool ().value ().static_threads == 0)
       {
-        TAO_Notify_PROPERTIES::instance()->builder()->apply_reactive_concurrency (*this ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        TAO_Notify_PROPERTIES::instance()->builder()->apply_reactive_concurrency (*this);
       }
     else
       {
         TAO_Notify_PROPERTIES::instance()->builder()->
-        apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value ());
       }
   }
   else if (new_qos_properties.thread_pool_lane ().is_valid ())
     TAO_Notify_PROPERTIES::instance()->builder()->
-    apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    apply_lane_concurrency (*this, new_qos_properties.thread_pool_lane ().value ());
 
   // Update the Thread Task's QoS properties..
   this->worker_task_->update_qos_properties (new_qos_properties);
@@ -289,14 +276,14 @@ TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_A
 
   // Init the the overall QoS on this object.
   if (new_qos_properties.copy (this->qos_properties_) == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   if (err_seq.length () > 0) // Unsupported Property
-    ACE_THROW (CosNotification::UnsupportedQoS (err_seq));
+    throw CosNotification::UnsupportedQoS (err_seq);
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Object::get_qos (void)
 {
   CosNotification::QoSProperties_var properties;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 7b9cb510b6c..7c610f67385 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -60,30 +60,29 @@ public:
   ID id (void) const;
 
   /// Activate
-  virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr activate (PortableServer::Servant servant);
 
   /// Activate with existing id
   virtual CORBA::Object_ptr activate (
       PortableServer::Servant servant,
-      CORBA::Long id
-      ACE_ENV_ARG_DECL);
+      CORBA::Long id);
 
   /// Deactivate
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (void);
 
   /// Have we been shutdown. returns 1 if shutdown.
   int has_shutdown (void);
 
-  void execute_task (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
+  void execute_task (TAO_Notify_Method_Request& method_request);
 
   /// Get CORBA Ref.
-  CORBA::Object_ptr ref (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr ref (void);
 
   /// Set the QoS Properties.
-  virtual void set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL);
+  virtual void set_qos (const CosNotification::QoSProperties & qos);
 
   /// Get the QoS Properties.
-  CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL);
+  CosNotification::QoSProperties* get_qos (void);
 
   bool find_qos_property_value (
     const char * name,
@@ -96,7 +95,7 @@ public:
   TAO_Notify_Event_Manager& event_manager (void);
 
   /// shutdown. Returns 1 ifif the shutdown was already run once before.
-  virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int shutdown (void);
 
   /// Load our attributes. Each derived type should call the superclass
   /// load first before loading its own attributes.
@@ -117,7 +116,7 @@ protected:
 
   /// Changes the primary poa to the current proxy poa
   void set_primary_as_proxy_poa();
- 
+
   /// Accessor for the proxy_poa_
   TAO_Notify_POA_Helper* proxy_poa (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
index fcc77e8b4d8..baa6c13de0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
@@ -11,12 +11,12 @@ TAO_Notify_Object::id (void) const
 }
 
 ACE_INLINE void
-TAO_Notify_Object::execute_task (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_Object::execute_task (TAO_Notify_Method_Request& method_request)
 {
   TAO_Notify_Worker_Task::Ptr task( this->worker_task_ );
   if ( task.isSet() )
   {
-    task->execute( method_request ACE_ENV_ARG_PARAMETER );
+    task->execute( method_request );
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 8d781c1929e..8fec9e96b0a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -37,60 +37,50 @@ TAO_Notify_POA_Helper::get_unique_id (void)
 }
 
 void
-TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name)
 {
   CORBA::PolicyList policy_list (2);
 
-  this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_policy (parent_poa, policy_list);
 
-  this->create_i (parent_poa, poa_name, policy_list ACE_ENV_ARG_PARAMETER);
+  this->create_i (parent_poa, poa_name, policy_list);
 }
 
 void
-TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::init (PortableServer::POA_ptr parent_poa)
 {
   ACE_CString child_poa_name = this->get_unique_id ();
 
-  this->init (parent_poa, child_poa_name.c_str () ACE_ENV_ARG_PARAMETER);
+  this->init (parent_poa, child_poa_name.c_str ());
 }
 
 void
-TAO_Notify_POA_Helper::set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::set_policy (PortableServer::POA_ptr parent_poa, CORBA::PolicyList &policy_list)
 {
   policy_list.length (2);
 
   policy_list[0] =
-    parent_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    parent_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID);
 
   policy_list[1] =
-    parent_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    parent_poa->create_id_assignment_policy (PortableServer::USER_ID);
 }
 
 
 void
-TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char* poa_name, CORBA::PolicyList &policy_list)
 {
   PortableServer::POAManager_var manager =
-    parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    parent_poa->the_POAManager ();
 
   // Create the child POA.
   this->poa_ = parent_poa->create_POA (poa_name,
                                        manager.in (),
-                                       policy_list
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                       policy_list);
 
   if (DEBUG_LEVEL > 0)
     {
-      CORBA::String_var the_name = this->poa_->the_name (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::String_var the_name = this->poa_->the_name ();
       ACE_DEBUG ((LM_DEBUG, "Created POA : %s\n", the_name.in ()));
     }
 
@@ -104,7 +94,7 @@ TAO_Notify_POA_Helper::create_i (PortableServer::POA_ptr parent_poa, const char*
 }
 
 PortableServer::ObjectId *
-TAO_Notify_POA_Helper::long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::long_to_ObjectId (CORBA::Long id) const
 {
   // Modified code from string_to_ObjectId ..
   //
@@ -134,101 +124,86 @@ TAO_Notify_POA_Helper::long_to_ObjectId (CORBA::Long id ACE_ENV_ARG_DECL) const
 }
 
 CORBA::Object_ptr
-TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& id ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& id)
 {
   // Generate a new ID.
   id = this->id_factory_.id ();
 
   if (DEBUG_LEVEL > 0)
     {
-      CORBA::String_var the_name = this->poa_->the_name (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CORBA::String_var the_name = this->poa_->the_name ();
 
       ACE_DEBUG ((LM_DEBUG, "Activating object with id = %d in  POA : %s\n", id, the_name.in ()));
     }
 
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
-    this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    this->long_to_ObjectId (id);
 
   poa_->activate_object_with_id (oid.in (),
-                                 servant
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                 servant);
 
-  return poa_->id_to_reference (oid.in ()
-                                ACE_ENV_ARG_PARAMETER);
+  return poa_->id_to_reference (oid.in ());
 }
 
 CORBA::Object_ptr
-TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL)
+TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA::Long id)
 {
   if (DEBUG_LEVEL > 0)
     {
-      CORBA::String_var the_name = this->poa_->the_name (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CORBA::String_var the_name = this->poa_->the_name ();
       ACE_DEBUG ((LM_DEBUG, "Activating object with existing id = %d in  POA : %s\n", id, the_name.in ()));
     }
   this->id_factory_.set_last_used (id);
 
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
-    this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    this->long_to_ObjectId (id);
 
   poa_->activate_object_with_id (oid.in (),
-                                 servant
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                 servant);
 
-  return poa_->id_to_reference (oid.in ()
-                                ACE_ENV_ARG_PARAMETER);
+  return poa_->id_to_reference (oid.in ());
 }
 
 void
-TAO_Notify_POA_Helper::deactivate (CORBA::Long id ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::deactivate (CORBA::Long id) const
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
-    this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->long_to_ObjectId (id);
 
-  poa_->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
+  poa_->deactivate_object (oid.in ());
 }
 
 CORBA::Object_ptr
-TAO_Notify_POA_Helper::id_to_reference (CORBA::Long id ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::id_to_reference (CORBA::Long id) const
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
-    this->long_to_ObjectId (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    this->long_to_ObjectId (id);
 
-  return poa_->id_to_reference (oid.in ()
-                                ACE_ENV_ARG_PARAMETER);
+  return poa_->id_to_reference (oid.in ());
 }
 
 PortableServer::ServantBase *
-TAO_Notify_POA_Helper::reference_to_servant (CORBA::Object_ptr ptr ACE_ENV_ARG_DECL) const
+TAO_Notify_POA_Helper::reference_to_servant (CORBA::Object_ptr ptr) const
 {
-  return poa_->reference_to_servant (ptr ACE_ENV_ARG_PARAMETER);
+  return poa_->reference_to_servant (ptr);
 }
 
 CORBA::Object_ptr
 TAO_Notify_POA_Helper::servant_to_reference (
-    PortableServer::ServantBase * servant  ACE_ENV_ARG_DECL) const
+    PortableServer::ServantBase * servant) const
 {
-  return poa_->servant_to_reference (servant ACE_ENV_ARG_PARAMETER);
+  return poa_->servant_to_reference (servant);
 }
 
 
 void
-TAO_Notify_POA_Helper::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_POA_Helper::destroy (void)
 {
-  poa_->destroy (1,0 ACE_ENV_ARG_PARAMETER);
+  poa_->destroy (1,0);
  // The <wait_for_completion> flag = 0
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
index 57b4208324e..6e361587dbd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -41,11 +41,10 @@ public:
 
   /// Create a new PortableServer::POA.
   void init (PortableServer::POA_ptr parent_poa,
-             const char* poa_name
-             ACE_ENV_ARG_DECL);
+             const char* poa_name);
 
   /// Create a new PortableServer::POA. The name is chosen at random.
-  void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa);
 
   /// Destructor
   virtual ~TAO_Notify_POA_Helper ();
@@ -54,47 +53,41 @@ public:
   PortableServer::POA_ptr poa (void);
 
   /// Destroy underlying POA.
-  void destroy (ACE_ENV_SINGLE_ARG_DECL);
+  void destroy (void);
 
   /// Activate Object, the POA will assign an ID and return its value.
   CORBA::Object_ptr activate (PortableServer::Servant servant,
-                              CORBA::Long& id
-                              ACE_ENV_ARG_DECL);
+                              CORBA::Long& id);
 
   /// Activate Object, using existing ID
-  CORBA::Object_ptr activate_with_id (PortableServer::Servant servant, CORBA::Long id ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr activate_with_id (PortableServer::Servant servant, CORBA::Long id);
 
   /// Deactivate Object with ID
-  void deactivate (CORBA::Long id
-                   ACE_ENV_ARG_DECL) const;
+  void deactivate (CORBA::Long id) const;
 
   /// Convert ID to reference.
-  CORBA::Object_ptr id_to_reference (CORBA::Long id
-                                     ACE_ENV_ARG_DECL) const;
+  CORBA::Object_ptr id_to_reference (CORBA::Long id) const;
 
   /// Convert reference to pointer to servant
-  PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr
-                                                      ACE_ENV_ARG_DECL) const;
+  PortableServer::ServantBase * reference_to_servant (CORBA::Object_ptr ptr) const;
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant  ACE_ENV_ARG_DECL) const;
+  CORBA::Object_ptr servant_to_reference (PortableServer::ServantBase * servant) const;
 
 protected:
   /// Set default POA policies.
   virtual void set_policy (PortableServer::POA_ptr parent_poa,
-                           CORBA::PolicyList &policy_list
-                           ACE_ENV_ARG_DECL);
+                           CORBA::PolicyList &policy_list);
 
   /// Apply the polices and create child POA.
   void create_i (PortableServer::POA_ptr parent_poa,
                  const char* poa_name,
-                 CORBA::PolicyList &policy_list ACE_ENV_ARG_DECL);
+                 CORBA::PolicyList &policy_list);
 
   /// Generate a unique id for each POA created.
   ACE_CString get_unique_id (void);
 
   /// Convert id to ObjectID
-  PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id
-                                              ACE_ENV_ARG_DECL) const;
+  PortableServer::ObjectId* long_to_ObjectId (CORBA::Long id) const;
 
 protected:
   /// POA
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
index 6caa4aa6552..93b5e957cbf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -25,26 +25,25 @@ TAO_Notify_Peer::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties*/
 }
 
 void
-TAO_Notify_Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Peer::shutdown (void)
 {
   // NOP.
 }
 
 void
-TAO_Notify_Peer::handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Peer::handle_dispatch_exception (void)
 {
   // Sever all association when a remote client misbehaves. Other strategies like reties are possible but not implemented.
-  this->proxy ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy ()->destroy ();
 }
 
 void
-TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const TAO_Notify_EventTypeSeq & removed ACE_ENV_ARG_DECL)
+TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const TAO_Notify_EventTypeSeq & removed)
 {
   TAO_Notify_EventTypeSeq subscribed_types ;
-  this->proxy ()->subscribed_types (subscribed_types ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy ()->subscribed_types (subscribed_types);
 
-  ACE_TRY
+  try
     {
       CosNotification::EventTypeSeq cos_added;
       CosNotification::EventTypeSeq cos_removed;
@@ -84,30 +83,26 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const
           // Protect this object from being destroyed in this scope.
           TAO_Notify_Proxy::Ptr proxy_guard(this->proxy ());
 
-          this->dispatch_updates_i (cos_added, cos_removed ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->dispatch_updates_i (cos_added, cos_removed);
         }
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_exist)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
-      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->handle_dispatch_exception ();
     }
-  ACE_CATCH (CORBA::NO_IMPLEMENT, no_impl)
+  catch (const CORBA::NO_IMPLEMENT&)
     {
       // The peer does not implement the offer/subscription_change method
       // Do nothing. Later, perhaps set a flag that helps us decide if we should dispatch_updates_i.
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException&)
     {
-      this->handle_dispatch_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->handle_dispatch_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Do nothing
     }
-  ACE_ENDTRY;
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index 142ef4484cf..f683993f6fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -49,21 +49,20 @@ public:
   CORBA::ULong _decr_refcnt (void);
 
   /// Shutdown the peer.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (void);
 
   /// Access Proxy.
   virtual TAO_Notify_Proxy* proxy (void) = 0;
 
   // Dispatch updates
   virtual void dispatch_updates (const TAO_Notify_EventTypeSeq & added,
-                                 const TAO_Notify_EventTypeSeq & removed
-                                 ACE_ENV_ARG_DECL);
+                                 const TAO_Notify_EventTypeSeq & removed);
 
   /// QoS changed notification from the Peer.
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
 
   /// Handle dispatch exceptions.
-  void handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL);
+  void handle_dispatch_exception (void);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const = 0;
@@ -71,8 +70,7 @@ public:
 protected:
   /// Implementation of Peer specific dispatch_updates
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
-                                   const CosNotification::EventTypeSeq& removed
-                                   ACE_ENV_ARG_DECL) = 0;
+                                   const CosNotification::EventTypeSeq& removed) = 0;
 
 private:
   /// Release
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index cf63ccb0be1..4d94655a12e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -14,6 +14,8 @@ ACE_RCSID (Notify,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+static TAO_Notify_Properties* properties = 0;
+
 TAO_Notify_Properties::TAO_Notify_Properties (void)
   : factory_ (0)
   , builder_ (0)
@@ -43,10 +45,21 @@ TAO_Notify_Properties::~TAO_Notify_Properties ()
 TAO_Notify_Properties *
 TAO_Notify_Properties::instance (void)
 {
-  // Hide the template instantiation to prevent multiple instances
-  // from being created.
+  if (properties == 0)
+    {
+      // Hide the template instantiation to prevent multiple instances
+      // from being created.
+      properties = TAO_Singleton<TAO_Notify_Properties,
+                                 TAO_SYNCH_MUTEX>::instance ();
+    }
 
-  return
-    TAO_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>::instance ();
+  return properties;
 }
+
+void
+TAO_Notify_Properties::instance (TAO_Notify_Properties* props)
+{
+  properties = props;
+}
+
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 98e38df5705..2a33e0d4a2d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -49,6 +49,9 @@ public:
   /// Return a singleton instance of this class.
   static TAO_Notify_Properties * instance (void);
 
+  /// Set the singleton instance for this class.
+  static void instance (TAO_Notify_Properties* properties);
+
   // = Property Accessors
   TAO_Notify_Factory* factory (void);
   void factory (TAO_Notify_Factory* factory);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
index a088943d05b..02632dce402 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -28,43 +28,41 @@ TAO_Notify_Proxy::~TAO_Notify_Proxy ()
 }
 
 CORBA::Object_ptr
-TAO_Notify_Proxy::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::activate (PortableServer::Servant servant)
 {
   // Set the POA that we use to return our <ref>
   this->set_primary_as_proxy_poa();
-  return TAO_Notify_Object::activate (servant ACE_ENV_ARG_PARAMETER);
+  return TAO_Notify_Object::activate (servant);
 }
 
 CORBA::Object_ptr
 TAO_Notify_Proxy::activate (PortableServer::Servant servant,
-                            CORBA::Long id
-                            ACE_ENV_ARG_DECL)
+                            CORBA::Long id)
 {
   // Set the POA that we use to return our <ref>
   this->set_primary_as_proxy_poa();
-  return TAO_Notify_Object::activate (servant, id ACE_ENV_ARG_PARAMETER);
+  return TAO_Notify_Object::activate (servant, id);
 }
 
 void
-TAO_Notify_Proxy::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy::deactivate (void)
 {
   ACE_ASSERT (this->proxy_poa() != 0 );
-  this->proxy_poa()->deactivate (this->id() ACE_ENV_ARG_PARAMETER);
+  this->proxy_poa()->deactivate (this->id());
 }
 
 void
-TAO_Notify_Proxy::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // copy
   subscribed_types = this->subscribed_types_;
 }
 
 void
-TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO_Notify_EventTypeSeq& removed)
 {
   // return if the updates for this proxy are turned off or
   // if all the updates in the channel are switched off.
@@ -75,18 +73,16 @@ TAO_Notify_Proxy::types_changed (const TAO_Notify_EventTypeSeq& added, const TAO
 
   if (TAO_Notify_PROPERTIES::instance()->asynch_updates () == 1) // if we should send the updates synchronously.
     {
-      this->execute_task (request ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->execute_task (request);
     }
   else // execute in the current thread context.
     {
-      request.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      request.execute ();
     }
 }
 
 CosNotification::EventTypeSeq*
-TAO_Notify_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_Notify_EventTypeSeq& types ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, const TAO_Notify_EventTypeSeq& types)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -98,7 +94,6 @@ TAO_Notify_Proxy::obtain_types (CosNotifyChannelAdmin::ObtainInfoMode mode, cons
                     CORBA::NO_MEMORY ());
 
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (event_type_seq._retn ());
 
   if (mode == CosNotifyChannelAdmin::ALL_NOW_UPDATES_OFF ||
       mode == CosNotifyChannelAdmin::ALL_NOW_UPDATES_ON)
@@ -130,7 +125,7 @@ TAO_Notify_Proxy::qos_changed (const TAO_Notify_QoSProperties& qos_properties)
 }
 
 void
-TAO_Notify_Proxy::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy::save_persistent (TAO_Notify::Topology_Saver& saver)
 {
   bool changed = this->children_changed_;
   this->children_changed_ = false;
@@ -142,24 +137,21 @@ TAO_Notify_Proxy::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG
     this->save_attrs(attrs);
 
     const char * type_name = this->get_proxy_type_name ();
-    bool want_all_children = saver.begin_object(this->id(), type_name, attrs, changed ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    bool want_all_children = saver.begin_object(this->id(), type_name, attrs, changed);
 
     if (want_all_children || this->filter_admin_.is_changed ())
     {
-      this->filter_admin_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->filter_admin_.save_persistent(saver);
     }
 
     if (want_all_children || this->subscribed_types_.is_changed ())
     {
-      this->subscribed_types_.save_persistent(saver ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->subscribed_types_.save_persistent(saver);
     }
 
     // todo: handle removed children
 
-    saver.end_object(this->id(), type_name ACE_ENV_ARG_PARAMETER);
+    saver.end_object(this->id(), type_name);
   }
 }
 
@@ -176,7 +168,7 @@ TAO_Notify_Proxy::save_attrs (TAO_Notify::NVPList& attrs)
 
 TAO_Notify::Topology_Object*
 TAO_Notify_Proxy::load_child (const ACE_CString &type, CORBA::Long id,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  const TAO_Notify::NVPList& attrs)
 {
   ACE_UNUSED_ARG (id);
   ACE_UNUSED_ARG (attrs);
@@ -187,7 +179,6 @@ TAO_Notify_Proxy::load_child (const ACE_CString &type, CORBA::Long id,
     // in the constructor. we have to clear it out first.
     this->subscribed_types_.reset();
     result = &this->subscribed_types_;
-    ACE_CHECK_RETURN(0);
   }
   else if (type == "filter_admin")
   {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
index d6931ece562..357c9868ced 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -52,40 +52,35 @@ public:
   virtual ~TAO_Notify_Proxy ();
 
   /// Activate
-  virtual CORBA::Object_ptr activate (PortableServer::Servant servant
-                                      ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr activate (PortableServer::Servant servant);
 
   /// Activate with a given ID
   virtual CORBA::Object_ptr activate (
       PortableServer::Servant servant,
-      CORBA::Long id
-      ACE_ENV_ARG_DECL);
+      CORBA::Long id);
 
   /// Deactivate
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (void);
 
   /// Obtain the Proxy's subscribed types.
-  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types
-                         ACE_ENV_ARG_DECL);
+  void subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types);
 
   /// Check if this event passes the admin and proxy filters.
   CORBA::Boolean check_filters (
       const TAO_Notify_Event* event,
       TAO_Notify_FilterAdmin& parent_filter_admin,
       CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
-      ACE_ENV_ARG_DECL
     );
 
   /// Inform this proxy that the following types are being advertised.
   void types_changed (const TAO_Notify_EventTypeSeq& added,
-                      const TAO_Notify_EventTypeSeq& removed
-                      ACE_ENV_ARG_DECL);
+                      const TAO_Notify_EventTypeSeq& removed);
 
   /// Have updates been turned off.
   CORBA::Boolean updates_off (void);
 
   /// Destroy this object.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void destroy (void) = 0;
 
   /// Access our Peer.
   virtual TAO_Notify_Peer* peer (void) = 0;
@@ -94,14 +89,12 @@ public:
   virtual CosNotification::EventTypeSeq* obtain_types (
       CosNotifyChannelAdmin::ObtainInfoMode mode,
       const TAO_Notify_EventTypeSeq& types
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Notification of subscriptions/offers set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL) = 0;
+                                    const CosNotification::EventTypeSeq & removed) = 0;
 
 
   /// Override, TAO_Notify_Object::qos_changed
@@ -109,12 +102,12 @@ public:
 
   // TAO_Notify::Topology_Object
 
-  virtual void save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV_ARG_DECL);
+  virtual void save_persistent (TAO_Notify::Topology_Saver& saver);
   virtual void save_attrs(TAO_Notify::NVPList& attrs);
   virtual const char * get_proxy_type_name (void) const = 0;
 
   virtual TAO_Notify::Topology_Object* load_child (const ACE_CString &type, CORBA::Long id,
-    const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
index 6eff985b31e..0f92ffdcb35 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -13,25 +13,21 @@ TAO_Notify_Proxy::updates_off (void)
 ACE_INLINE CORBA::Boolean
 TAO_Notify_Proxy::check_filters (const TAO_Notify_Event* event
                              , TAO_Notify_FilterAdmin& parent_filter_admin
-                             , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator
-                             ACE_ENV_ARG_DECL)
+                             , CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator)
 {
   // check if it passes the parent filter.
   CORBA::Boolean parent_val =
-    parent_filter_admin.match (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    parent_filter_admin.match (event);
 
   CORBA::Boolean val = 0;
 
   if (filter_operator == CosNotifyChannelAdmin::AND_OP)
     {
-      val = parent_val && this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      val = parent_val && this->filter_admin_.match (event);
     }
   else
     {
-      val = parent_val || this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      val = parent_val || this->filter_admin_.match (event);
     }
 
   return val;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index af5fffb4b78..614157337c1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -45,12 +45,11 @@ TAO_Notify_ProxyConsumer::peer (void)
 }
 
 void
-TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent)
 {
   ACE_ASSERT( this->supplier_admin_.get() == 0 );
 
-  TAO_Notify_Proxy::initialize (topology_parent ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Notify_Proxy::initialize (topology_parent);
 
   this->supplier_admin_.reset (dynamic_cast<TAO_Notify_SupplierAdmin *>(topology_parent));
   ACE_ASSERT (this->supplier_admin_.get() != 0);
@@ -61,13 +60,12 @@ TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent* topology_parent ACE
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                          CORBA::INTERNAL ());
-    this->TAO_Notify_Object::set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->TAO_Notify_Object::set_qos (default_ps_qos);
   }
 }
 
 void
-TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -81,25 +79,24 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
 
   if (max_suppliers != 0 && supplier_count >= max_suppliers.value ())
   {
-    ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of suppliers connected.
+    throw CORBA::IMP_LIMIT (
+      ); // we've reached the limit of suppliers connected.
   }
 
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
-    ACE_CHECK;
 
     // if supplier is set and reconnect not allowed we get out.
     if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false)
       {
-        ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+        throw CosEventChannelAdmin::AlreadyConnected ();
       }
 
     // Adopt the supplier
     this->supplier_ = auto_supplier;
 
-    this->supplier_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types.
-    ACE_CHECK;
+    this->supplier_admin_->subscribed_types (this->subscribed_types_); // get the parents subscribed types.
   }
 
   // Inform QoS values.
@@ -108,36 +105,30 @@ TAO_Notify_ProxyConsumer::connect (TAO_Notify_Supplier *supplier ACE_ENV_ARG_DEC
 
   TAO_Notify_EventTypeSeq removed;
 
-  this->event_manager().offer_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_manager().offer_change (this, this->subscribed_types_, removed);
 
-  this->event_manager().connect (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_manager().connect (this);
 
   // Increment the global supplier count
   ++supplier_count;
 }
 void
-TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::push_i (TAO_Notify_Event * event)
 {
   if (this->supports_reliable_events ())
     {
-      TAO_Notify_Event::Ptr pevent(event->queueable_copy(ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK;
+      TAO_Notify_Event::Ptr pevent(event->queueable_copy());
       TAO_Notify::Routing_Slip_Ptr routing_slip =
-        TAO_Notify::Routing_Slip::create (pevent ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        TAO_Notify::Routing_Slip::create (pevent);
       if (DEBUG_LEVEL > 0)
         ACE_DEBUG((LM_DEBUG, ACE_TEXT ("ProxyConsumer routing event.\n")));
-      routing_slip->route (this, true ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      routing_slip->route (this, true);
       routing_slip->wait_persist ();
     }
   else
     {
       TAO_Notify_Method_Request_Lookup_No_Copy request (event, this);
-      this->execute_task (request ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->execute_task (request);
     }
 }
 
@@ -158,49 +149,42 @@ TAO_Notify_ProxyConsumer::supports_reliable_events () const
 }
 
 void
-TAO_Notify_ProxyConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer::disconnect (void)
 {
   TAO_Notify_EventTypeSeq added;
 
-  event_manager().offer_change (this, added, this->subscribed_types_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  event_manager().offer_change (this, added, this->subscribed_types_);
 
-  this->event_manager().disconnect (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_manager().disconnect (this);
 
   // Decrement the global supplier count
   this->admin_properties().suppliers ()--;
 }
 
 int
-TAO_Notify_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer::shutdown (void)
 {
-  if (this->TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  if (this->TAO_Notify_Object::shutdown () == 1)
     return 1;
 
-  ACE_CHECK_RETURN (1);
 
-  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  this->disconnect ();
 
   if (this->supplier_.get() != 0)
   {
-    this->supplier_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (1);
+    this->supplier_->shutdown ();
   }
   return 0;
 }
 
 void
-TAO_Notify_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer::destroy (void)
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  int result = this->shutdown ();
   if ( result == 1)
     return;
 
-  this->supplier_admin_->remove (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->remove (this);
 
   // Do not reset this->supplier_.
   // It is not safe to delete the non-refcounted supplier here.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 17890c772f2..7e2f2e4564f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -48,23 +48,23 @@ public:
   virtual ~TAO_Notify_ProxyConsumer ();
 
   /// init: overrides Topology_Object method
-  virtual void init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
+  virtual void init (TAO_Notify::Topology_Parent * topology_parent);
 
   /// Connect
-  void connect (TAO_Notify_Supplier* supplier ACE_ENV_ARG_DECL)
+  void connect (TAO_Notify_Supplier* supplier)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosEventChannelAdmin::AlreadyConnected
                      ));
 
   /// Disconnect
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Shutdown  (TAO_Notify_Container_T method)
-  virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int shutdown (void);
 
   /// Destroy this object.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void destroy (void);
 
 
   /// Return 1 if connected
@@ -78,7 +78,7 @@ protected:
   TAO_Notify_Supplier* supplier (void);
 
   /// Accept an event from the Supplier
-  void push_i (TAO_Notify_Event * event ACE_ENV_ARG_DECL);
+  void push_i (TAO_Notify_Event * event);
 
 private:
   /// Is this part of a reliable channel
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index a47122b58d5..bd274580332 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -22,30 +22,28 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer_T ()
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                                           const CosNotification::EventTypeSeq & removed
-                                                           ACE_ENV_ARG_DECL)
+                                                           const CosNotification::EventTypeSeq & removed)
 {
-  this->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
+  this->offer_change (added, removed);
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::MyAdmin (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosNotifyChannelAdmin::SupplierAdmin_var ret;
 
-  CORBA::Object_var object = this->supplier_admin().ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ret._retn ());
+  CORBA::Object_var object = this->supplier_admin().ref ();
 
-  ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  ret = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in ());
 
   return ret._retn ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -57,26 +55,22 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
-    ACE_CHECK;
 
     this->subscribed_types_.add_and_remove (seq_added, seq_removed);
   }
 
   this->event_manager().offer_change (this,
                                       seq_added,
-                                      seq_removed
-                                      ACE_ENV_ARG_PARAMETER);
+                                      seq_removed);
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
 TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::obtain_subscription_types (
-    CosNotifyChannelAdmin::ObtainInfoMode mode
-    ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::ObtainInfoMode mode)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
-    this->obtain_types (mode, this->event_manager().subscription_types ()
-                        ACE_ENV_ARG_PARAMETER);
+    this->obtain_types (mode, this->event_manager().subscription_types ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
index bcb0ada782b..0d38ba6b19b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -44,17 +44,15 @@ public:
 
   /// Notification of subscriptions set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL);
+                                    const CosNotification::EventTypeSeq & removed);
 
-  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual CosNotification::EventTypeSeq * obtain_subscription_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -63,7 +61,6 @@ public:
   virtual void offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 0b668445abe..f65d85abe56 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -29,12 +29,11 @@ TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier ()
 }
 
 void
-TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin)
 {
   ACE_ASSERT (consumer_admin != 0 && this->consumer_admin_.get() == 0);
 
-  TAO_Notify_Proxy::initialize (consumer_admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Notify_Proxy::initialize (consumer_admin);
 
   this->consumer_admin_.reset (consumer_admin);
 
@@ -44,8 +43,7 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                           CORBA::INTERNAL ());
-    this->TAO_Notify_Object::set_qos (default_ps_qos ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->TAO_Notify_Object::set_qos (default_ps_qos);
   }
 }
 
@@ -56,7 +54,7 @@ TAO_Notify_ProxySupplier:: peer (void)
 }
 
 void
-TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -70,25 +68,24 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
 
   if (max_consumers != 0 && consumer_count >= max_consumers.value ())
   {
-    ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of consumers connected.
+    throw CORBA::IMP_LIMIT (
+      ); // we've reached the limit of consumers connected.
   }
 
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
-    ACE_CHECK;
 
     // if consumer is set and reconnect not allowed we get out.
     if (this->is_connected () && TAO_Notify_PROPERTIES::instance()->allow_reconnect() == false)
       {
-          ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+          throw CosEventChannelAdmin::AlreadyConnected ();
       }
 
     // Adopt the consumer
     this->consumer_ = auto_consumer;
 
-    this->consumer_admin_->subscribed_types (this->subscribed_types_ ACE_ENV_ARG_PARAMETER); // get the parents subscribed types.
-    ACE_CHECK;
+    this->consumer_admin_->subscribed_types (this->subscribed_types_); // get the parents subscribed types.
   }
 
   // Inform QoS values.
@@ -97,68 +94,60 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer ACE_ENV_ARG_DEC
 
   TAO_Notify_EventTypeSeq removed;
 
-  this->event_manager().subscription_change (this, this->subscribed_types_, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_manager().subscription_change (this, this->subscribed_types_, removed);
 
-  this->event_manager().connect (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_manager().connect (this);
 
   // Increment the global consumer count
   ++consumer_count;
 }
 
 void
-TAO_Notify_ProxySupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier::disconnect (void)
 {
   TAO_Notify_EventTypeSeq added;
 
-  this->event_manager().subscription_change (this, added, this->subscribed_types_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_manager().subscription_change (this, added, this->subscribed_types_);
 
-  this->event_manager().disconnect (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_manager().disconnect (this);
 
   // Decrement the global consumer count
   this->admin_properties().consumers ()--;
 }
 
 int
-TAO_Notify_ProxySupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier::shutdown (void)
 {
-  if (this->TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
+  if (this->TAO_Notify_Object::shutdown () == 1)
     return 1;
 
-  ACE_CHECK_RETURN (1);
 
-  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  this->disconnect ();
 
   if (this->consumer_.get() != 0)
   {
-    this->consumer_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_->shutdown ();
   }
   return 0;
 }
 
 void
-TAO_Notify_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier::destroy (void)
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  int result = this->shutdown ();
   if ( result == 1)
     return;
 
-  this->consumer_admin_->remove (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->remove (this);
 
   // Do not reset this->consumer_.
   // It is not safe to delete the non-refcounted consumer here.
 }
 
 void
-TAO_Notify_ProxySupplier::deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request)
 {
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index 17ced483590..f038e2c2c66 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -47,25 +47,25 @@ public:
   virtual ~TAO_Notify_ProxySupplier ();
 
   /// Init
-  virtual void init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
+  virtual void init (TAO_Notify_ConsumerAdmin* consumer_admin);
 
   /// Connect
-  void connect (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL)
+  void connect (TAO_Notify_Consumer* consumer)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosEventChannelAdmin::AlreadyConnected
                      ));
   /// Disconnect
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Dispatch Event to consumer
-  virtual void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request ACE_ENV_ARG_DECL);
+  virtual void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request);
 
   /// Override TAO_Notify_Container_T::shutdown  method
-  virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  virtual int shutdown (void);
 
   /// Destroy this object.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void destroy (void);
 
   /// Override, TAO_Notify_Proxy::qos_changed to apply MaxEventssPerConsumer QoS.
   virtual void qos_changed (const TAO_Notify_QoSProperties& qos_properties);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index 622acba3277..6bc0926361b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -29,14 +29,13 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::~TAO_Notify_ProxySupplier_T ()
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                                           const CosNotification::EventTypeSeq & removed
-                                                           ACE_ENV_ARG_DECL)
+                                                           const CosNotification::EventTypeSeq & removed)
 {
-  this->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+  this->subscription_change (added, removed);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotification::StructuredEvent& notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -45,11 +44,11 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured (const CosNotificat
 
   TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 1);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const CosNotification::StructuredEvent& notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -58,11 +57,11 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_structured_no_filtering (const
 
   TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 0);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -71,11 +70,11 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any (const CORBA::Any & any AC
 
   TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 1);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA::Any& any)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ))
@@ -84,22 +83,21 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::forward_any_no_filtering (const CORBA:
 
   TAO_Notify_Method_Request_Dispatch_No_Copy request (&event, this, 0);
 
-  this->execute_task (request ACE_ENV_ARG_PARAMETER);
+  this->execute_task (request);
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->obtain_types (mode, this->event_manager().offered_types () ACE_ENV_ARG_PARAMETER);
+  return this->obtain_types (mode, this->event_manager().offered_types ());
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added,
-                                                           const CosNotification::EventTypeSeq & removed
-                                                           ACE_ENV_ARG_DECL)
+                                                           const CosNotification::EventTypeSeq & removed)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
 {
@@ -109,16 +107,15 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
-    ACE_CHECK;
 
     this->subscribed_types_.add_and_remove (seq_added, seq_removed);
   }
 
-  this->event_manager().subscription_change (this, seq_added, seq_removed ACE_ENV_ARG_PARAMETER);
+  this->event_manager().subscription_change (this, seq_added, seq_removed);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ConnectionAlreadyInactive,
@@ -129,20 +126,18 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
 
     if (this->is_connected () == 0)
-      ACE_THROW (CosNotifyChannelAdmin::NotConnected ());
+      throw CosNotifyChannelAdmin::NotConnected ();
 
     if (this->consumer()->is_suspended () == 1)
-      ACE_THROW (CosNotifyChannelAdmin::ConnectionAlreadyInactive ());
+      throw CosNotifyChannelAdmin::ConnectionAlreadyInactive ();
   }
 
-  this->consumer()->suspend (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer()->suspend ();
+  this->self_change ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ConnectionAlreadyActive,
@@ -153,27 +148,26 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::resume_connection (ACE_ENV_SINGLE_ARG_
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ());
 
     if (this->is_connected () == 0)
-      ACE_THROW (CosNotifyChannelAdmin::NotConnected ());
+      throw CosNotifyChannelAdmin::NotConnected ();
 
     if (this->consumer()->is_suspended () == 0)
-      ACE_THROW (CosNotifyChannelAdmin::ConnectionAlreadyActive ());
+      throw CosNotifyChannelAdmin::ConnectionAlreadyActive ();
   }
 
-  this->consumer()->resume (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer()->resume ();
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var ret;
 
-  CORBA::Object_var object = this->consumer_admin().ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ret._retn ());
+  CORBA::Object_var object = this->consumer_admin().ref ();
 
-  ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+  ret = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in ());
 
   return ret._retn ();
 }
@@ -181,45 +175,41 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
 /***************************** UNIMPLEMENTED METHODS***************************************/
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
                     CosNotifyFilter::MappingFilter::_nil ());
-
-  return CosNotifyFilter::MappingFilter::_nil ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
                     CosNotifyFilter::MappingFilter::_nil ());
-
-  return CosNotifyFilter::MappingFilter::_nil ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index f31cba76ee9..75b800ede14 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -41,30 +41,29 @@ public:
 
   /// Notification of subscriptions set at the admin.
   virtual void admin_types_changed (const CosNotification::EventTypeSeq & added,
-                                    const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL);
+                                    const CosNotification::EventTypeSeq & removed);
 
   ///= POA_Notify_Internal methods
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_structured (const CosNotification::StructuredEvent & event ACE_ENV_ARG_DECL)
+  virtual void forward_structured (const CosNotification::StructuredEvent & event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_structured_no_filtering (const CosNotification::StructuredEvent & event ACE_ENV_ARG_DECL)
+  virtual void forward_structured_no_filtering (const CosNotification::StructuredEvent & event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_any (const CORBA::Any & event ACE_ENV_ARG_DECL)
+  virtual void forward_any (const CORBA::Any & event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// POA_Notify_Internal::Event_Forwarder method
-  virtual void forward_any_no_filtering (const CORBA::Any & event ACE_ENV_ARG_DECL)
+  virtual void forward_any_no_filtering (const CORBA::Any & event)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -74,14 +73,12 @@ protected:
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void suspend_connection (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -90,7 +87,6 @@ protected:
   ));
 
   virtual void resume_connection (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -99,7 +95,6 @@ protected:
   ));
 
   virtual CosNotifyFilter::MappingFilter_ptr priority_filter (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -107,14 +102,12 @@ protected:
 
   virtual void priority_filter (
     CosNotifyFilter::MappingFilter_ptr priority_filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -122,7 +115,6 @@ protected:
 
   virtual void lifetime_filter (
     CosNotifyFilter::MappingFilter_ptr lifetime_filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -130,7 +122,6 @@ protected:
 
   virtual CosNotification::EventTypeSeq * obtain_offered_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -139,7 +130,6 @@ protected:
   virtual void subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
index 518db5e5c02..009a4a9b70a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -26,42 +26,41 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::servant (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> CosNotification::QoSProperties*
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_qos (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Notify_Object::get_qos ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
@@ -70,45 +69,40 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
 
-  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos);
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy_T<SERVANT_TYPE>::validate_qos (
                                             const CosNotification::QoSProperties & /*required_qos*/,
                                             CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
-    ACE_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterID
-TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   CosNotifyFilter::FilterID fid =
-    this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(fid);
+    this->filter_admin_.add_filter (new_filter);
+  this->self_change ();
   return fid;
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_filter (
     CosNotifyFilter::FilterID filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -118,11 +112,11 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_filter (
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
 
-  this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER);
+  this->filter_admin_.remove_filter (filter);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::Filter_ptr
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -130,26 +124,24 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter A
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
 
-  return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
+  return this->filter_admin_.get_filter (filter);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq*
-TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::get_all_filters (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
-  return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->filter_admin_.get_all_filters ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -157,7 +149,7 @@ TAO_Notify_Proxy_T<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
 
-  this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_admin_.remove_all_filters ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
index 2cdc149f502..7e24ca1b8ff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -48,13 +48,12 @@ public:
   virtual PortableServer::Servant servant (void);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
   virtual void validate_event_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -62,7 +61,6 @@ public:
   ));
 
  virtual CosNotification::QoSProperties * get_qos (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -70,7 +68,6 @@ public:
 
   virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -80,7 +77,6 @@ public:
   virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -89,7 +85,6 @@ public:
 
   virtual CosNotifyFilter::FilterID add_filter (
     CosNotifyFilter::Filter_ptr new_filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -97,7 +92,6 @@ public:
 
   virtual void remove_filter (
     CosNotifyFilter::FilterID filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -106,7 +100,6 @@ public:
 
   virtual CosNotifyFilter::Filter_ptr get_filter (
     CosNotifyFilter::FilterID filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -114,14 +107,12 @@ public:
   ));
 
   virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void remove_all_filters (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index 98b297f069a..8fe73daef1c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -26,7 +26,7 @@ TAO_Notify_RT_Builder::~TAO_Notify_RT_Builder ()
 
 void
 TAO_Notify_RT_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object
-                                                       , const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+                                                       , const NotifyExt::ThreadPoolParams& tp_params)
 {
   TAO_Notify_RT_POA_Helper* proxy_poa = 0;
 
@@ -34,14 +34,12 @@ TAO_Notify_RT_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object
   ACE_NEW_THROW_EX (proxy_poa,
                     TAO_Notify_RT_POA_Helper (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_proxy_poa (proxy_poa);
 
   PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
-  proxy_poa->init (default_poa.in (), tp_params ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_poa->init (default_poa.in (), tp_params);
 
   // Give ownership of proxy_poa
   object.set_proxy_poa (auto_proxy_poa.release ());
@@ -49,7 +47,7 @@ TAO_Notify_RT_Builder::apply_thread_pool_concurrency (TAO_Notify_Object& object
 
 void
 TAO_Notify_RT_Builder::apply_lane_concurrency (TAO_Notify_Object& object
-                                                , const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
+                                                , const NotifyExt::ThreadPoolLanesParams& tpl_params)
 {
   TAO_Notify_RT_POA_Helper* proxy_poa = 0;
 
@@ -57,14 +55,12 @@ TAO_Notify_RT_Builder::apply_lane_concurrency (TAO_Notify_Object& object
   ACE_NEW_THROW_EX (proxy_poa,
                     TAO_Notify_RT_POA_Helper (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_proxy_poa (proxy_poa);
 
   PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa ();
 
-  proxy_poa->init (default_poa.in (), tpl_params ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_poa->init (default_poa.in (), tpl_params);
 
   // Give ownership of proxy_poa
   object.set_proxy_poa (auto_proxy_poa.release ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
index 6e0b2bba087..24ed28e86a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -38,10 +38,10 @@ public:
   virtual ~TAO_Notify_RT_Builder ();
 
   /// Apply Thread Pools.
-  virtual void apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
+  virtual void apply_thread_pool_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params);
 
   /// Apply Thread Pools with Lanes.
-  virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
+  virtual void apply_lane_concurrency (TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
index af5484fed61..5e712190c46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -17,7 +17,7 @@ TAO_Notify_RT_Factory::~TAO_Notify_RT_Factory ()
 }
 
 void
-TAO_Notify_RT_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy)
 {
   ACE_NEW_THROW_EX (proxy,
                     TAO_Notify_RT_StructuredProxyPushSupplier (),
@@ -25,105 +25,105 @@ TAO_Notify_RT_Factory::create (TAO_Notify_StructuredProxyPushSupplier*& proxy AC
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxySupplier_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyConsumer_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_Proxy_Collection*& collection)
 {
-  TAO_Notify_Default_Factory::create (collection ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (collection);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannelFactory*& channel_factory)
 {
-  TAO_Notify_Default_Factory::create (channel_factory ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (channel_factory);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_EventChannel*& channel)
 {
-  TAO_Notify_Default_Factory::create (channel ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (channel);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SupplierAdmin*& admin)
 {
-  TAO_Notify_Default_Factory::create (admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (admin);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ConsumerAdmin*& admin)
 {
-  TAO_Notify_Default_Factory::create (admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (admin);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushConsumer*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_ProxyPushSupplier*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_StructuredProxyPushConsumer*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushConsumer*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 void
-TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL)
+TAO_Notify_RT_Factory:: create (TAO_Notify_SequenceProxyPushSupplier*& proxy)
 {
-  TAO_Notify_Default_Factory::create (proxy ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Default_Factory::create (proxy);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
index 38bf46c4662..2f89e49d159 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
@@ -38,58 +38,58 @@ public:
   virtual ~TAO_Notify_RT_Factory ();
 
   /// Create ProxySupplier Collection
-  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxySupplier_Collection*& collection);
 
   /// Create ProxyConsumer Collection
-  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyConsumer_Collection*& collection);
 
   /// Create EventChannel Collection
-  virtual void create (TAO_Notify_EventChannel_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel_Collection*& collection);
 
   /// Create ConsumerAdmin Collection
-  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin_Collection*& collection);
 
   /// Create SupplierAdmin Collection
-  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin_Collection*& collection);
 
   /// Create Proxy Collection
-  virtual void create (TAO_Notify_Proxy_Collection*& collection ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_Proxy_Collection*& collection);
 
   /// Create EventChannelDefault_Factory
-  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannelFactory*& channel_factory);
 
   /// Create EventChannel
-  virtual void create (TAO_Notify_EventChannel*& channel ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_EventChannel*& channel);
 
   /// Create SupplierAdmin
-  virtual void create (TAO_Notify_SupplierAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SupplierAdmin*& admin);
 
   /// Create ConsumerAdmin
-  virtual void create (TAO_Notify_ConsumerAdmin*& admin ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ConsumerAdmin*& admin);
 
   /// Create ProxyPushConsumer
-  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushConsumer*& proxy);
 
   /// Create ProxyPushSupplier
-  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_ProxyPushSupplier*& proxy);
 
   /// Create CosEC_ProxyPushConsumer
-  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushConsumer*& proxy);
 
   /// Create CosEC_ProxyPushSupplier
-  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_CosEC_ProxyPushSupplier*& proxy);
 
   /// Create StructuredProxyPushConsumer
-  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushConsumer*& proxy);
 
   /// Create StructuredProxyPushSupplier
-  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_StructuredProxyPushSupplier*& proxy);
 
   /// Create SequenceProxyPushConsumer
-  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushConsumer*& proxy);
 
   /// Create SequenceProxyPushSupplier
-  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy ACE_ENV_ARG_DECL);
+  virtual void create (TAO_Notify_SequenceProxyPushSupplier*& proxy);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
index f9e4ce24128..55b8f625fb4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -21,44 +21,34 @@ TAO_RT_Notify_Service::~TAO_RT_Notify_Service ()
 }
 
 void
-TAO_RT_Notify_Service::init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_RT_Notify_Service::init_service (CORBA::ORB_ptr orb)
 {
   ACE_DEBUG ((LM_DEBUG, "Loading the Real-Time Notification Service...\n"));
 
-  this->init_i (orb ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_i (orb);
 }
 
 void
-TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb)
 {
   //Init the base class.
-  TAO_CosNotify_Service::init_i (orb ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_CosNotify_Service::init_i (orb);
 
   TAO_Notify_RT_Properties* properties = TAO_Notify_RT_PROPERTIES::instance();
 
   // Resolve RTORB
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RTORB"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("RTORB");
 
   RTCORBA::RTORB_var rt_orb =
-    RTCORBA::RTORB::_narrow (object.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::RTORB::_narrow (object.in ());
 
   // Resolve RTCurrent
   object =
-    orb->resolve_initial_references ("RTCurrent"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("RTCurrent");
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::Current::_narrow (object.in ());
 
  /// Set the properties
   properties->rt_orb (rt_orb.in ());
@@ -66,7 +56,7 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 TAO_Notify_Factory*
-TAO_RT_Notify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Notify_Service::create_factory (void)
 {
   TAO_Notify_Factory* factory =
     ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory");
@@ -76,19 +66,17 @@ TAO_RT_Notify_Service::create_factory (ACE_ENV_SINGLE_ARG_DECL)
       ACE_NEW_THROW_EX (factory,
                         TAO_Notify_RT_Factory (),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN(0);
     }
   return factory;
 }
 
 TAO_Notify_Builder*
-TAO_RT_Notify_Service::create_builder (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Notify_Service::create_builder (void)
 {
   TAO_Notify_Builder* builder = 0;
   ACE_NEW_THROW_EX (builder,
                     TAO_Notify_RT_Builder (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN(0);
 
   return builder;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
index 6383e95fc34..c07d87818c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -40,17 +40,17 @@ public:
   ~TAO_RT_Notify_Service ();
 
   /// Init the service.
-  virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  virtual void init_service (CORBA::ORB_ptr orb);
 
 protected:
   /// Init the data members
-  virtual void init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  virtual void init_i (CORBA::ORB_ptr orb);
 
   /// Create the Factory for RT Notify objects.
-  virtual TAO_Notify_Factory* create_factory (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Factory* create_factory (void);
 
   /// Creates the Builder for RT Notify objects.
-  virtual TAO_Notify_Builder* create_builder (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Builder* create_builder (void);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index 81859ded60f..6b63aba2149 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -18,21 +18,20 @@ TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper ()
 }
 
 void
-TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params)
 {
   ACE_CString child_poa_name = this->get_unique_id ();
 
-  this->init (parent_poa, child_poa_name.c_str (), tp_params ACE_ENV_ARG_PARAMETER);
+  this->init (parent_poa, child_poa_name.c_str (), tp_params);
 }
 
 void
 TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name
-                                 , const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL)
+                                 , const NotifyExt::ThreadPoolParams& tp_params)
 {
   CORBA::PolicyList policy_list (4);
 
-  this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_policy (parent_poa, policy_list);
 
   RTCORBA::RTORB_var rt_orb = TAO_Notify_RT_PROPERTIES::instance ()->rt_orb ();
 
@@ -47,9 +46,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
   policy_list.length (3);
   policy_list[2] =
     rt_orb->create_priority_model_policy (priority_model,
-                                          tp_params.server_priority
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          tp_params.server_priority);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Creating threadpool: static threads = %d, def. prio = %d\n"
@@ -63,35 +60,30 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
                                tp_params.default_priority,
                                tp_params.allow_request_buffering,
                                tp_params.max_buffered_requests,
-                               tp_params.max_request_buffer_size
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               tp_params.max_request_buffer_size);
 
   policy_list.length (4);
   policy_list[3] =
-    rt_orb->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rt_orb->create_threadpool_policy (threadpool_id);
 
-  this->create_i (parent_poa, poa_name, policy_list ACE_ENV_ARG_PARAMETER);
+  this->create_i (parent_poa, poa_name, policy_list);
 }
 
 void
-TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params)
 {
   ACE_CString child_poa_name = this->get_unique_id ();
 
-  this->init (parent_poa, child_poa_name.c_str (), tpl_params ACE_ENV_ARG_PARAMETER);
+  this->init (parent_poa, child_poa_name.c_str (), tpl_params);
 }
 
 void
 TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char* poa_name
-                                 , const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL)
+                                 , const NotifyExt::ThreadPoolLanesParams& tpl_params)
 {
   CORBA::PolicyList policy_list (4);
 
-  this->set_policy (parent_poa, policy_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_policy (parent_poa, policy_list);
 
   RTCORBA::RTORB_var rt_orb = TAO_Notify_RT_PROPERTIES::instance ()->rt_orb ();
 
@@ -102,9 +94,7 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
   policy_list.length (3);
   policy_list[2] =
     rt_orb->create_priority_model_policy (priority_model,
-                                          tpl_params.server_priority
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          tpl_params.server_priority);
 
   // Populate RTCORBA Lanes.
   RTCORBA::ThreadpoolLanes lanes (tpl_params.lanes.length ());
@@ -130,21 +120,17 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa, const char*
                                           tpl_params.allow_borrowing,
                                           tpl_params.allow_request_buffering,
                                           tpl_params.max_buffered_requests,
-                                          tpl_params.max_request_buffer_size
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          tpl_params.max_request_buffer_size);
 
   policy_list.length (4);
   policy_list[3] =
-    rt_orb->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rt_orb->create_threadpool_policy (threadpool_id);
 
-  this->create_i (parent_poa, poa_name, policy_list ACE_ENV_ARG_PARAMETER);
+  this->create_i (parent_poa, poa_name, policy_list);
 }
 
 void
-TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa)
 {
   CORBA::PolicyList policy_list (1);
 
@@ -154,13 +140,11 @@ TAO_Notify_RT_POA_Helper::init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_D
 
   policy_list[0] =
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          0);
 
   ACE_CString child_poa_name = this->get_unique_id ();
 
-  this->create_i (parent_poa, child_poa_name.c_str (), policy_list ACE_ENV_ARG_PARAMETER);
+  this->create_i (parent_poa, child_poa_name.c_str (), policy_list);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index d272420ef98..aad3f8534a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -37,24 +37,24 @@ public:
 
   /// Create a new PortableServer::POA.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread pool policy is applied to the new POA.
-  void init (PortableServer::POA_ptr parent_poa, const char* poa_name, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa, const char* poa_name, const NotifyExt::ThreadPoolParams& tp_params);
 
   /// Create a new PortableServer::POA. The name is chosen at random.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread pool policy is applied to the new POA.
-  void init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolParams& tp_params);
 
   /// Create a new PortableServer::POA.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread lane policy is applied to the new POA.
   void init (PortableServer::POA_ptr parent_poa, const char* poa_name,
-             const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
+             const NotifyExt::ThreadPoolLanesParams& tpl_params);
 
   /// Create a new PortableServer::POA. The name is chosen at random.
   /// The UNIQUE_ID, USER_ID , CLIENT_PROPAGATED and thread lane policy is applied to the new POA.
-  void init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa, const NotifyExt::ThreadPoolLanesParams& tpl_params);
 
   /// Create a new PortableServer::POA. The name is chosen at random.
   /// The CLIENT_PROPAGATED policy is applied to the new POA.
-  void init (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr parent_poa);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
index be6bdd90518..519d55d2b0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -22,7 +22,7 @@ TAO_Notify_Reactive_Task::~TAO_Notify_Reactive_Task ()
 }
 
 void
-TAO_Notify_Reactive_Task::init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Reactive_Task::init (void)
 {
   ACE_ASSERT (this->timer_.get() == 0);
 
@@ -45,9 +45,9 @@ TAO_Notify_Reactive_Task::shutdown (void)
 }
 
 void
-TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request& method_request)
 {
-  method_request.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+  method_request.execute ();
 }
 
 TAO_Notify_Timer*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
index b7a602cd67c..df91c7ce28d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -43,13 +43,13 @@ public:
   virtual ~TAO_Notify_Reactive_Task ();
 
   /// Init the reactive task.
-  void init (ACE_ENV_SINGLE_ARG_DECL);
+  void init (void);
 
   /// Shutdown task
   virtual void shutdown (void);
 
   /// Exec the request.
-  virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
+  virtual void execute (TAO_Notify_Method_Request& method_request);
 
   /// The object used by clients to register timers. This method returns a Reactor based Timer.
   virtual TAO_Notify_Timer* timer (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
index 4c5857f45c8..b5fa036f8d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
@@ -28,11 +28,10 @@ namespace TAO_Notify
 
   template<class TOPOOBJ>
   void
-  Reconnect_Worker<TOPOOBJ>::work (TOPOOBJ* o ACE_ENV_ARG_DECL)
+  Reconnect_Worker<TOPOOBJ>::work (TOPOOBJ* o)
   {
     ACE_ASSERT(o != 0);
-    o->reconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    o->reconnect ();
   }
 } // namespace TAO_Notify
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
index a4c71244ec2..d7c2407fce8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
@@ -35,7 +35,7 @@ namespace TAO_Notify
     Reconnect_Worker();
 
     // override virtual ESF_Worker method
-    virtual void work (TOPOOBJ* o ACE_ENV_ARG_DECL);
+    virtual void work (TOPOOBJ* o);
   };
 } // namespace TAO_Notify
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
index 8eba0d841ef..b6b936da109 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -44,8 +44,7 @@ namespace TAO_Notify
 
   NotifyExt::ReconnectionRegistry::ReconnectionID
   Reconnection_Registry::register_callback (
-    NotifyExt::ReconnectionCallback_ptr callback
-    ACE_ENV_ARG_DECL)
+    NotifyExt::ReconnectionCallback_ptr callback)
   {
     //@@todo DO WE NEED THREAD SAFENESS?
     NotifyExt::ReconnectionRegistry::ReconnectionID next_id = ++highest_id_;
@@ -60,22 +59,19 @@ namespace TAO_Notify
     TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
     CORBA::ORB_var orb = properties->orb ();
 
-    CORBA::String_var cior = orb->object_to_string (callback ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    CORBA::String_var cior = orb->object_to_string (callback);
     ACE_CString ior(cior.in ());
     if ( 0 != reconnection_registry_.bind (next_id, ior))
     {
       //todo throw something;
     }
-    this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    this->self_change ();
 
     return next_id;
   }
 
   void
-  Reconnection_Registry::unregister_callback (NotifyExt::ReconnectionRegistry::ReconnectionID id
-    ACE_ENV_ARG_DECL)
+  Reconnection_Registry::unregister_callback (NotifyExt::ReconnectionRegistry::ReconnectionID id)
   {
     if (DEBUG_LEVEL > 0)
     {
@@ -88,12 +84,11 @@ namespace TAO_Notify
     {
       //@@todo  throw something
     }
-    this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    this->self_change ();
   }
 
   CORBA::Boolean
-  Reconnection_Registry::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Reconnection_Registry::is_alive (void)
   {
     return CORBA::Boolean(1);
   }
@@ -102,7 +97,7 @@ namespace TAO_Notify
   // During topology save
 
   void
-  Reconnection_Registry::save_persistent (Topology_Saver& saver ACE_ENV_ARG_DECL)
+  Reconnection_Registry::save_persistent (Topology_Saver& saver)
   {
     bool change = this->self_changed_;
     this->self_changed_ = false;
@@ -110,8 +105,7 @@ namespace TAO_Notify
 
     NVPList attrs;
     //@@todo: bool want_all_children =
-      saver.begin_object (0, REGISTRY_TYPE, attrs, change ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      saver.begin_object (0, REGISTRY_TYPE, attrs, change);
 
     Reconnection_Registry_Type::ENTRY *entry;
     for (Reconnection_Registry_Type::ITERATOR iter (this->reconnection_registry_);
@@ -128,17 +122,15 @@ namespace TAO_Notify
       }
       cattrs.push_back(NVP(RECONNECT_ID, entry->ext_id_));
       cattrs.push_back(NVP(RECONNECT_IOR, entry->int_id_));
-      saver.begin_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE, cattrs, true ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      saver.end_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      saver.begin_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE, cattrs, true);
+      saver.end_object (entry->ext_id_, REGISTRY_CALLBACK_TYPE);
     }
 // todo:
 //    for all deleted children
 //    {
 //      saver.delete_child(child_type, child_id);
 //    }
-    saver.end_object (0, REGISTRY_TYPE ACE_ENV_ARG_PARAMETER);
+    saver.end_object (0, REGISTRY_TYPE);
   }
 
   ///////////////////////////////////////
@@ -147,8 +139,7 @@ namespace TAO_Notify
   Topology_Object*
   Reconnection_Registry::load_child (const ACE_CString & type,
         CORBA::Long,
-        const NVPList& attrs
-        ACE_ENV_ARG_DECL_NOT_USED)
+        const NVPList& attrs)
   {
     if (type == REGISTRY_CALLBACK_TYPE)
     {
@@ -184,8 +175,7 @@ namespace TAO_Notify
   }
 
   void
-  Reconnection_Registry::send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-    ACE_ENV_ARG_DECL_NOT_USED)
+  Reconnection_Registry::send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
   {
     TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
     CORBA::ORB_var orb = properties->orb ();
@@ -196,8 +186,7 @@ namespace TAO_Notify
       iter.next (entry);
       iter.advance ())
     {
-      ACE_DECLARE_NEW_ENV;
-      ACE_TRY
+      try
       {
         if (DEBUG_LEVEL > 0)
         {
@@ -207,14 +196,12 @@ namespace TAO_Notify
             ));
         }
         ACE_CString & ior = entry->int_id_;
-        CORBA::Object_var obj = orb->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::Object_var obj = orb->string_to_object (ior.c_str ());
         NotifyExt::ReconnectionCallback_var callback =
           NotifyExt::ReconnectionCallback::_narrow (obj.in ());
         if (!CORBA::is_nil (callback.in ()))
         {
-          callback->reconnect (dest_factory ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          callback->reconnect (dest_factory);
         }
         else
         {
@@ -227,7 +214,7 @@ namespace TAO_Notify
           bad_ids.push_back (entry->ext_id_);
         }
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
       {
         ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT ("(%P|%t) Reconnection Registry: Exception sending reconnection to client -- discarding registry entry\n")
@@ -236,7 +223,6 @@ namespace TAO_Notify
         bad_ids.push_back (entry->ext_id_);
         //@@todo : we might want to check for retryable exceptions, but for now...
       }
-      ACE_ENDTRY;
     }
     size_t bad_count = bad_ids.size ();
     for (size_t nbad = 0; nbad < bad_count; ++nbad)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index 0c84190d5a9..78d10a5733e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
@@ -62,29 +62,25 @@ namespace TAO_Notify
 
     /// add a new callback to the registry
     ::NotifyExt::ReconnectionRegistry::ReconnectionID register_callback (
-      ::NotifyExt::ReconnectionCallback_ptr callback
-      ACE_ENV_ARG_DECL);
+      ::NotifyExt::ReconnectionCallback_ptr callback);
 
     ///
-    void unregister_callback (::NotifyExt::ReconnectionRegistry::ReconnectionID id
-      ACE_ENV_ARG_DECL);
+    void unregister_callback (::NotifyExt::ReconnectionRegistry::ReconnectionID id);
 
-    CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL);
+    CORBA::Boolean is_alive (void);
 
     //////////////////////
     // During topology save
-    virtual void save_persistent (Topology_Saver& saver ACE_ENV_ARG_DECL);
+    virtual void save_persistent (Topology_Saver& saver);
 
     ///////////////////////////////////////
     // During reload of persistent topology
 
     virtual Topology_Object* load_child (const ACE_CString & type,
       CORBA::Long id,
-      const NVPList& attrs
-      ACE_ENV_ARG_DECL);
+      const NVPList& attrs);
 
-    void send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-      ACE_ENV_ARG_DECL);
+    void send_reconnect (CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory);
 
   private:
     void release (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index eb101ef2105..69b2b67ca70 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -53,11 +53,10 @@ size_t Routing_Slip::count_enter_deleting_ = 0;
 size_t Routing_Slip::count_enter_terminal_ = 0;
 
 Routing_Slip_Ptr
-Routing_Slip::create (const TAO_Notify_Event::Ptr& event ACE_ENV_ARG_DECL)
+Routing_Slip::create (const TAO_Notify_Event::Ptr& event)
 {
   Routing_Slip * prs;
   ACE_NEW_THROW_EX (prs, Routing_Slip (event), CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Routing_Slip_Ptr());
   Routing_Slip_Ptr result(prs);
   result->this_ptr_ = result; // let the pointers touch so they use the same ref count
 
@@ -112,8 +111,7 @@ Routing_Slip::create (
   Routing_Slip_Ptr result;
   ACE_Message_Block * event_mb = 0;
   ACE_Message_Block * rs_mb = 0;
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
       if (rspm->reload (event_mb, rs_mb))
       {
@@ -121,8 +119,7 @@ Routing_Slip::create (
         TAO_Notify_Event::Ptr event (TAO_Notify_Event::unmarshal (cdr_event));
         if (event.isSet())
         {
-          result = create (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          result = create (event);
           TAO_InputCDR cdr_rs (rs_mb);
           if ( result->unmarshal (ecf, cdr_rs))
           {
@@ -144,13 +141,12 @@ Routing_Slip::create (
         }
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) Routing_Slip::create: Exception reloading event.\n")
         ));
     }
-  ACE_ENDTRY;
   delete event_mb;
   delete rs_mb;
 
@@ -229,7 +225,7 @@ Routing_Slip::wait_persist ()
 }
 
 void
-Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel ACE_ENV_ARG_DECL)
+Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel)
 {
   ACE_ASSERT(pc != 0);
 
@@ -275,7 +271,7 @@ Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel ACE_ENV
     }
   }
   guard.release ();
-  pc->execute_task (method ACE_ENV_ARG_PARAMETER);
+  pc->execute_task (method);
 }
 #if 0 // forward
 void
@@ -331,8 +327,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter)
 void
 Routing_Slip::dispatch (
   TAO_Notify_ProxySupplier* ps,
-  bool filter
-  ACE_ENV_ARG_DECL)
+  bool filter)
 {
   // cannot be the first action
   ACE_ASSERT (this->state_ != rssCREATING);
@@ -364,8 +359,7 @@ Routing_Slip::dispatch (
                     this->sequence_,
                     static_cast<int> (request_id),
                     ps->id()));
-      ps->execute_task (method ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ps->execute_task (method);
     }
   else
     {
@@ -845,8 +839,7 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
     ACE_CDR::Octet code = 0;
     while (cdr.read_octet(code))
     {
-      ACE_DECLARE_NEW_ENV;
-      ACE_TRY
+      try
       {
         if (code == TAO_Notify_Method_Request_Dispatch::persistence_code)
         {
@@ -855,15 +848,12 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
             prequest,
             Delivery_Request(this_ptr_, this->delivery_requests_.size ()),
             CORBA::NO_MEMORY ());
-          ACE_TRY_CHECK;
           Delivery_Request_Ptr request(prequest);
           TAO_Notify_Method_Request_Dispatch_Queueable * method =
             TAO_Notify_Method_Request_Dispatch::unmarshal (
               request,
               ecf,
-              cdr
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              cdr);
           if (method != 0)
           {
             this->delivery_requests_.push_back (request);
@@ -877,9 +867,7 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
               TAO_Notify_Method_Request_Lookup::unmarshal (
                 request,
                 ecf,
-                cdr
-                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK
+                cdr);
           if (method != 0)
           {
             this->delivery_requests_.push_back (request);
@@ -887,19 +875,18 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
           }
         }
       }
-      ACE_CATCHANY;
+      catch (const CORBA::Exception&)
       {
         // @@todo should we log this?
         // just ignore failures
       }
-      ACE_ENDTRY;
     }
   }
   return this->delivery_requests_.size () > 0;
 }
 
 void
-Routing_Slip::reconnect (ACE_ENV_SINGLE_ARG_DECL)
+Routing_Slip::reconnect (void)
 {
   Routing_Slip_Guard guard (this->internals_);
   enter_state_saved (guard);
@@ -908,8 +895,7 @@ Routing_Slip::reconnect (ACE_ENV_SINGLE_ARG_DECL)
   size_t count = this->delivery_methods_.size ();
   for (size_t nmethod = 0; nmethod < count; ++nmethod)
   {
-    this->delivery_methods_[nmethod]->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    this->delivery_methods_[nmethod]->execute ();
   }
   this->delivery_methods_.clear ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index 5670dfc1d05..da894894c01 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -68,8 +68,7 @@ class TAO_Notify_Serv_Export Routing_Slip : public Persistent_Callback
   typedef ACE_Guard< TAO_SYNCH_MUTEX > Routing_Slip_Guard;
 public:
   /// "Factory" method for normal use.
-  static Routing_Slip_Ptr create (const TAO_Notify_Event::Ptr& event
-    ACE_ENV_ARG_DECL);
+  static Routing_Slip_Ptr create (const TAO_Notify_Event::Ptr& event);
 
   /// "Factory" method for use during reload from persistent storage.
   static Routing_Slip_Ptr create (
@@ -78,7 +77,7 @@ public:
 
   void set_rspm (Routing_Slip_Persistence_Manager * rspm);
 
-  void reconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void reconnect (void);
 
   /// destructor (should be private but that inspires compiler wars)
   virtual ~Routing_Slip ();
@@ -89,12 +88,12 @@ public:
   /// Route this event to destinations
   /// must be the Action request after
   /// the routing slip is created.
-  void route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel ACE_ENV_ARG_DECL);
+  void route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel);
 
   /// \brief Schedule delivery to a consumer via a proxy supplier
   /// \param proxy_supplier the proxy supplier that will deliver the event
   /// \param filter should consumer-based filtering be applied?
-  void dispatch (TAO_Notify_ProxySupplier * proxy_supplier, bool filter ACE_ENV_ARG_DECL);
+  void dispatch (TAO_Notify_ProxySupplier * proxy_supplier, bool filter);
 
 
   /////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
index 1be68b66c33..941d3ae1872 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
@@ -31,13 +31,12 @@ namespace TAO_Notify
 
   template<class TOPOOBJ>
   void
-  Save_Persist_Worker<TOPOOBJ>::work (TOPOOBJ* o ACE_ENV_ARG_DECL)
+  Save_Persist_Worker<TOPOOBJ>::work (TOPOOBJ* o)
   {
     ACE_ASSERT(o != 0);
     if (this->want_all_children_ || o->is_changed ())
     {
-      o->save_persistent (saver_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      o->save_persistent (saver_);
     }
   }
 } // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
index a9d425891f0..4218b4b627a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
@@ -40,7 +40,7 @@ namespace TAO_Notify
     Save_Persist_Worker(Topology_Saver& saver, bool want_all_children);
 
     // override virtual ESF_Worker method
-    virtual void work (TOPOOBJ* o ACE_ENV_ARG_DECL);
+    virtual void work (TOPOOBJ* o);
 
   private:
     Topology_Saver& saver_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
index a1a29b3eb35..5419484f854 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp
@@ -16,8 +16,8 @@ TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T (void)
 {
 }
 
-template<class TYPE> ACE_TYPENAME TAO_Notify_Seq_Worker_T<TYPE>::SEQ*
-TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL)
+template<class TYPE> typename TAO_Notify_Seq_Worker_T<TYPE>::SEQ*
+TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container)
 {
   SEQ* tmp;
   ACE_NEW_THROW_EX (tmp, //this->seq_,
@@ -26,8 +26,7 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container ACE_ENV_ARG_DECL)
 
   this->seq_ = tmp;
 
-  container.collection ()->for_each (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  container.collection ()->for_each (this);
 
   return this->seq_._retn ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index 5e89210356e..265481e5a8f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -44,11 +44,11 @@ public:
   TAO_Notify_Seq_Worker_T (void);
 
   /// create a SEQ
-  SEQ* create (CONTAINER& container ACE_ENV_ARG_DECL);
+  SEQ* create (CONTAINER& container);
 
 protected:
   ///= TAO_ESF_Worker method
-  void work (TYPE* object ACE_ENV_ARG_DECL);
+  void work (TYPE* object);
 
   /// The result
   SEQ_VAR seq_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
index 43dc3487646..a3e0ab45685 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class TYPE> ACE_INLINE void
-TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Seq_Worker_T<TYPE>::work (TYPE* type)
 {
   this->seq_->length (this->seq_->length () + 1);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
index a7c5adb49c3..c1bed4b9a60 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -29,7 +29,7 @@ TAO_Notify_SequenceProxyPushConsumer::release (void)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_SequenceProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SequenceProxyPushConsumer::MyType (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -38,7 +38,7 @@ TAO_Notify_SequenceProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -50,16 +50,14 @@ TAO_Notify_SequenceProxyPushConsumer::connect_sequence_push_supplier (CosNotifyC
                     TAO_Notify_SequencePushSupplier (this),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->init (push_supplier);
 
-  this->connect (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connect (supplier);
+  this->self_change ();
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotification::EventBatch& event_batch ACE_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotification::EventBatch& event_batch)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -67,11 +65,11 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat
 {
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1 && this->admin_properties().queue_full ())
-    ACE_THROW (CORBA::IMP_LIMIT ());
+    throw CORBA::IMP_LIMIT ();
 
   if (this->is_connected () == 0)
     {
-      ACE_THROW (CosEventComm::Disconnected ());
+      throw CosEventComm::Disconnected ();
     }
 
   for (CORBA::ULong i = 0; i < event_batch.length (); ++i)
@@ -79,21 +77,19 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat
       const CosNotification::StructuredEvent& notification = event_batch[i];
 
       TAO_Notify_StructuredEvent_No_Copy event (notification);
-      this->push_i (&event ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->push_i (&event);
     }
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_SequenceProxyPushConsumer::Ptr guard( this );
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy ();
+  this->self_change ();
 }
 
 const char *
@@ -110,29 +106,24 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att
   if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       CosNotifyComm::SequencePushSupplier_var ps = CosNotifyComm::SequencePushSupplier::_nil();
       if ( ior.length() > 0 )
       {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        ps = CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+        ps = CosNotifyComm::SequencePushSupplier::_unchecked_narrow(obj.in());
       }
       // minor hack: suppress generating subscription updates during reload.
       bool save_updates = this->updates_off_;
       this->updates_off_ = true;
-      this->connect_sequence_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_sequence_push_supplier(ps.in());
       this->updates_off_ = save_updates;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
       ACE_ASSERT(0);
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index 4db216993cb..373a3389297 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -60,13 +60,12 @@ protected:
   ///= Protected Methods
 
   //= interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual void connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier
-                                               ACE_ENV_ARG_DECL
                                                )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -74,14 +73,13 @@ protected:
                      ));
 
   virtual void push_structured_events (const CosNotification::EventBatch & notifications
-                                      ACE_ENV_ARG_DECL
                                       )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosEventComm::Disconnected
                      ));
 
-  virtual void disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_sequence_push_consumer (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
index be2f9f74299..0a258fecdf5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -26,7 +26,7 @@ TAO_Notify_SequenceProxyPushSupplier::release (void)
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -39,29 +39,26 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC
                     TAO_Notify_SequencePushConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->init (push_consumer);
 
-  this->connect (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connect (consumer);
+  this->self_change ();
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 
 {
   TAO_Notify_SequenceProxyPushSupplier::Ptr guard( this );
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy ();
+  this->self_change ();
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_SequenceProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SequenceProxyPushSupplier::MyType (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -83,25 +80,20 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att
   if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       CosNotifyComm::SequencePushConsumer_var pc = CosNotifyComm::SequencePushConsumer::_nil();
       if (ior.length() > 0)
       {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+        pc = CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in());
       }
-      this->connect_sequence_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_sequence_push_consumer(pc.in());
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
       // if we can't reconnect, tough
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index 6603d5613e9..3b5e76b8cde 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -62,14 +62,13 @@ public:
   virtual void load_attrs (const TAO_Notify::NVPList& attrs);
 
   /// = Servant methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual void connect_sequence_push_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -78,7 +77,6 @@ public:
   ));
 
   virtual void disconnect_sequence_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
index 222e4a5172d..557fb18ccdb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -34,14 +34,14 @@ TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer ()
 }
 
 void
-TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer)
 {
   // Initialize only once
   ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
 
   if (CORBA::is_nil (push_consumer))
   {
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   if (!TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb ())
@@ -58,11 +58,10 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p
       CORBA::Object_var obj =
         TAO_Notify_PROPERTIES::instance()->dispatching_orb()->string_to_object(temp.in());
 
-      ACE_TRY
+      try
         {
-          CosNotifyComm::SequencePushConsumer_var new_push_consumer =  
+          CosNotifyComm::SequencePushConsumer_var new_push_consumer =
             CosNotifyComm::SequencePushConsumer::_unchecked_narrow(obj.in());
-          ACE_TRY_CHECK;
 
           this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (new_push_consumer.in());
           this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (new_push_consumer.in());
@@ -76,16 +75,16 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p
             }
           //--cj end
         }
-      ACE_CATCH (CORBA::TRANSIENT, ex)
+      catch (const CORBA::TRANSIENT& ex)
         {
-          ACE_PRINT_EXCEPTION (ex, "Got a TRANSIENT in NS_SequencePushConsumer::init");
+          ex._tao_print_exception (
+            "Got a TRANSIENT in NS_SequencePushConsumer::init");
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_SequencePushConsumer %@\n", this));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // _narrow failed
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -209,18 +208,15 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
           }
         }
         ace_mon.release();
-        ACE_DECLARE_NEW_ENV;
-        ACE_TRY
+        try
         {
-          this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->proxy_supplier ()->destroy ();
         }
-        ACE_CATCHANY
+        catch (const CORBA::Exception&)
         {
           // todo is there something meaningful we can do here?
           ;
         }
-        ACE_ENDTRY;
         ace_mon.acquire();
         break;
       }
@@ -263,20 +259,17 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
 
 bool
 TAO_Notify_SequencePushConsumer::enqueue_if_necessary (
-  TAO_Notify_Method_Request_Event * request
-  ACE_ENV_ARG_DECL)
+  TAO_Notify_Method_Request_Event * request)
 {
   if (DEBUG_LEVEL > 0)
     ACE_DEBUG ( (LM_DEBUG, "SequencePushConsumer enqueing event.\n"));
-  this->enqueue_request (request ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->enqueue_request (request);
 
   size_t mbs = static_cast<size_t>(this->max_batch_size_.value());
 
   if (this->pending_events().size() >= mbs || this->pacing_.is_valid () == 0)
   {
-    this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (false);
+    this->dispatch_pending ();
   }
   else
   {
@@ -287,20 +280,20 @@ TAO_Notify_SequencePushConsumer::enqueue_if_necessary (
 
 
 void
-TAO_Notify_SequencePushConsumer::push (const CORBA::Any& /*event*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushConsumer::push (const CORBA::Any& /*event*/)
 {
   //NOP
 }
 
 void
-TAO_Notify_SequencePushConsumer::push (const CosNotification::StructuredEvent& /*notification*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushConsumer::push (const CosNotification::StructuredEvent& /*notification*/)
 {
   //NOP
 }
 
 
 void
-TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_batch ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_batch)
 {
   //--cj verify dispatching ORB
   if (TAO_debug_level >= 10) {
@@ -309,8 +302,7 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_
   }
   //--cj end
 
-  this->push_consumer_->push_structured_events (event_batch ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->push_consumer_->push_structured_events (event_batch);
 }
 
 ACE_CString
@@ -318,29 +310,24 @@ TAO_Notify_SequencePushConsumer::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance ()->orb ();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::String_var ior = orb->object_to_string (this->push_consumer_.in ());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
 void
-TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
-                                                          ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer)
 {
   TAO_Notify_SequencePushConsumer* tmp = dynamic_cast<TAO_Notify_SequencePushConsumer *> (old_consumer);
   ACE_ASSERT(tmp != 0);
-  this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init(tmp->push_consumer_.in());
   this->schedule_timer(false);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index ac5661e674f..362cd39b425 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -48,13 +48,12 @@ public:
   virtual ~TAO_Notify_SequencePushConsumer ();
 
   /// Init the Consumer
-  void init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
+  void init (CosNotifyComm::SequencePushConsumer_ptr push_consumer);
 
   /// Add request to a queue if necessary.
   /// for Sequence it's always necessary.
   virtual bool enqueue_if_necessary(
-    TAO_Notify_Method_Request_Event * request
-    ACE_ENV_ARG_DECL);
+    TAO_Notify_Method_Request_Event * request);
 
   virtual bool dispatch_from_queue (
     Request_Queue & requests,
@@ -62,21 +61,20 @@ public:
 
 
   /// Push <event> to this consumer.
-  virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
+  virtual void push (const CORBA::Any& event);
 
   // Push event.
-  virtual void push (const CosNotification::StructuredEvent & event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::StructuredEvent & event);
 
   /// Push a batch of events to this consumer.
-  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::EventBatch& event);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
 
   /// on reconnect we need to move events from the old consumer
   /// to the new one
-  virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL);
+  virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
index df010388763..b4101eb48cf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -18,7 +18,7 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier ()
 }
 
 void
-TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier)
 {
   // TODO: verify single init call
   // push_supplier is optional
@@ -38,18 +38,15 @@ TAO_Notify_SequencePushSupplier::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index 2b2af2efc08..2db6e078ec3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -42,7 +42,7 @@ public:
   virtual ~TAO_Notify_SequencePushSupplier ();
 
   /// Init
-  void init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
+  void init (CosNotifyComm::SequencePushSupplier_ptr push_supplier);
 
   /// TAO_Notify_Destroy_Callback methods
   virtual void release (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index 2876d6b16d9..8219b3adc88 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -62,14 +62,14 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]) = 0;
 
   /// Init the service.
-  virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) = 0;
+  virtual void init_service (CORBA::ORB_ptr orb) = 0;
 
   /// Init the service with separate dispatching orb.
-  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb ACE_ENV_ARG_DECL) = 0;
+  virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb) = 0;
 
   /// Create the Channel Factory.
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (
-      PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL
+      PortableServer::POA_ptr default_POA
     ) = 0;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index c4df69993b1..68c829d0191 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -19,63 +19,59 @@ TAO_Notify_RT_StructuredProxyPushSupplier::~TAO_Notify_RT_StructuredProxyPushSup
 }
 
 CORBA::Object_ptr
-TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant)
 {
-  CORBA::Object_var object = TAO_Notify_Proxy::activate (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  CORBA::Object_var object = TAO_Notify_Proxy::activate (servant);
 
   // Obtain our ref.
-  CORBA::Object_var obj = this->ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  CORBA::Object_var obj = this->ref ();
 
-  this->event_forwarder_ = Event_Forwarder::StructuredProxyPushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+  this->event_forwarder_ = Event_Forwarder::StructuredProxyPushSupplier::_narrow (obj.in ());
 
   return object._retn ();
 }
 
 CORBA::Object_ptr
 TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant ,
-                                                     CORBA::Long ACE_ENV_ARG_DECL_NOT_USED)
+                                                     CORBA::Long)
 {
    return CORBA::Object::_nil ();
 }
 
 void
-TAO_Notify_RT_StructuredProxyPushSupplier::deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request)
 {
-  ACE_TRY
+  try
     {
-      request.event()->push (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      request.event()->push (this->event_forwarder_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 2)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
+          ex._tao_print_exception (
+            "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
         }
 
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_Event* event)
 {
-  ACE_TRY
+  try
     {
-      event->push_no_filtering (this->event_forwarder_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event->push_no_filtering (this->event_forwarder_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 2)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
+          ex._tao_print_exception (
+            "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
         }
 
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index 995a4ceeb31..2b743fa4cf7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -40,17 +40,17 @@ public:
   ~TAO_Notify_RT_StructuredProxyPushSupplier ();
 
   /// Activate this object and obtain the Event_Forwarder interface.
-  virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr activate (PortableServer::Servant servant);
 
   /// Dummy method to prevent hidden TAO_Notify_Proxy::activate warning.
   virtual CORBA::Object_ptr activate (PortableServer::Servant servant,
-                                      CORBA::Long id ACE_ENV_ARG_DECL);
+                                      CORBA::Long id);
 
   /// Dispatch Event to consumer
-  void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request ACE_ENV_ARG_DECL);
+  void deliver (TAO_Notify_Method_Request_Dispatch_No_Copy & request);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (const TAO_Notify_Event* event);
 
 private:
   /// Our ref.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index 86d312d8f4e..d99bb2d71c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -57,24 +57,23 @@ TAO_Notify_StructuredEvent_No_Copy::unmarshal (TAO_InputCDR & cdr)
 }
 
 TAO_Notify_Event *
-TAO_Notify_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::copy (void) const
 {
   TAO_Notify_Event * new_event;
   ACE_NEW_THROW_EX (new_event,
                     TAO_Notify_StructuredEvent (*this->notification_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
   return new_event;
 }
 
 CORBA::Boolean
-TAO_Notify_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                 "TAO_Notify_StructuredEvent::do_match ()\n"));
 
-  return filter->match_structured (*this->notification_ ACE_ENV_ARG_PARAMETER);
+  return filter->match_structured (*this->notification_);
 }
 
 void
@@ -84,46 +83,46 @@ TAO_Notify_StructuredEvent_No_Copy::convert (CosNotification::StructuredEvent& n
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (TAO_Notify_Consumer* consumer) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                           "TAO_Notify_StructuredEvent::do_push ("
                           "CosNotifyComm::StructuredPushConsumer_ptr)\n"));
 
-  consumer->push (*this->notification_ ACE_ENV_ARG_PARAMETER);
+  consumer->push (*this->notification_);
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const
 {
-  forwarder->forward_structured (*this->notification_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured (*this->notification_);
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const
 {
-  forwarder->forward_structured_no_filtering (*this->notification_ ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_structured_no_filtering (*this->notification_);
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const
 {
   CORBA::Any any;
 
   TAO_Notify_Event::translate (*this->notification_, any);
 
-  forwarder->forward_any (any ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_any (any);
 }
 
 void
-TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const
 {
   CORBA::Any any;
 
   TAO_Notify_Event::translate (*this->notification_, any);
 
-  forwarder->forward_any_no_filtering (any ACE_ENV_ARG_PARAMETER);
+  forwarder->forward_any_no_filtering (any);
 }
 
 /*****************************************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index 5ed850afd93..ccacb524046 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -45,7 +45,7 @@ public:
   /// marshal this event into a CDR buffer (for persistence)
   virtual void marshal (TAO_OutputCDR & cdr) const;
 
-  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
+  CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter) const;
 
   /// Convert to CosNotification::Structured type
   virtual void convert (CosNotification::StructuredEvent& notification) const;
@@ -54,19 +54,19 @@ public:
   virtual const TAO_Notify_EventType& type (void) const;
 
   /// Push event to consumer
-  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const;
+  virtual void push (TAO_Notify_Consumer* consumer) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const;
 
   /// Push event to the Event_Forwarder interface
-  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
+  virtual void push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder) const;
 
   /// unmarshal this event from a CDR buffer (for persistence)
   /// \return the new event, or NULL if this is the wrong type of event.
@@ -74,7 +74,7 @@ public:
 
 protected:
   /// returns a copy of this event allocated on the heap
-  virtual TAO_Notify_Event * copy (ACE_ENV_SINGLE_ARG_DECL) const;
+  virtual TAO_Notify_Event * copy (void) const;
 
   /// Structured Event
   const CosNotification::StructuredEvent* notification_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index d79e907a741..df4b9ac9aca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -30,7 +30,7 @@ TAO_Notify_StructuredProxyPushConsumer::release (void)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredProxyPushConsumer::MyType (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -39,7 +39,7 @@ TAO_Notify_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -51,15 +51,13 @@ TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNot
                     TAO_Notify_StructuredPushSupplier (this),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->connect (supplier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  supplier->init (push_supplier);
+  this->connect (supplier);
+  this->self_change ();
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -68,27 +66,26 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica
   // Check if we should proceed at all.
   if (this->admin_properties().reject_new_events () == 1
       && this->admin_properties().queue_full ())
-    ACE_THROW (CORBA::IMP_LIMIT ());
+    throw CORBA::IMP_LIMIT ();
 
   if (this->is_connected () == 0)
     {
-      ACE_THROW (CosEventComm::Disconnected ());
+      throw CosEventComm::Disconnected ();
     }
 
   TAO_Notify_StructuredEvent_No_Copy event (notification);
-  this->push_i (&event ACE_ENV_ARG_PARAMETER);
+  this->push_i (&event);
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_StructuredProxyPushConsumer::Ptr guard( this );
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy ();
+  this->self_change ();
 }
 
 const char *
@@ -105,30 +102,24 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a
   if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
-      ACE_TRY_CHECK;
       CosNotifyComm::StructuredPushSupplier_var ps = CosNotifyComm::StructuredPushSupplier::_nil();
       if ( ior.length() > 0 )
       {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        ps = CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+        ps = CosNotifyComm::StructuredPushSupplier::_unchecked_narrow(obj.in());
       }
       // minor hack: suppress generating subscription updates during reload.
       bool save_updates = this->updates_off_;
       this->updates_off_ = true;
-      this->connect_structured_push_supplier(ps.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_structured_push_supplier(ps.in());
       this->updates_off_ = save_updates;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
       // if we can't reconnect to peer, tough...
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 82ec83de086..24c6a667cf1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -56,14 +56,13 @@ public:
 protected:
 
   // = interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual void connect_structured_push_supplier (
     CosNotifyComm::StructuredPushSupplier_ptr push_supplier
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -72,7 +71,6 @@ protected:
 
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -80,7 +78,6 @@ protected:
     ));
 
   virtual void disconnect_structured_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 10e753f3437..2f7147a5078 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -29,7 +29,7 @@ TAO_Notify_StructuredProxyPushSupplier::release (void)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_Notify_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredProxyPushSupplier::MyType (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -38,7 +38,7 @@ TAO_Notify_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -51,25 +51,22 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot
                     TAO_Notify_StructuredPushConsumer (this),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->init (push_consumer);
 
-  this->connect (consumer ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->connect (consumer);
+  this->self_change ();
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 
 {
   TAO_Notify_StructuredProxyPushSupplier::Ptr guard( this );
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy ();
+  this->self_change ();
 }
 
 const char *
@@ -86,25 +83,20 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a
   if (attrs.load("PeerIOR", ior))
   {
     CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
     {
       CosNotifyComm::StructuredPushConsumer_var pc = CosNotifyComm::StructuredPushConsumer::_nil();
       if (ior.length() > 0)
       {
-        CORBA::Object_var obj = orb->string_to_object(ior.c_str() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::Object_var obj = orb->string_to_object(ior.c_str());
+        pc = CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in());
       }
-      this->connect_structured_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_structured_push_consumer(pc.in());
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
       // if we can't connect... tough
     }
-    ACE_ENDTRY;
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index b3a3526dbe9..068e3e5a09e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -62,14 +62,13 @@ public:
 
   /// = Servant methods
   // = interface methods
-  virtual CosNotifyChannelAdmin::ProxyType MyType (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::ProxyType MyType (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual void connect_structured_push_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -78,7 +77,6 @@ public:
   ));
 
   virtual void disconnect_structured_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 7739b12b707..328150ec171 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -21,14 +21,14 @@ TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer ()
 }
 
 void
-TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer)
 {
   // Initialize only once
   ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
 
   if (CORBA::is_nil (push_consumer))
   {
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   if (!TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb ())
@@ -45,11 +45,10 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p
       CORBA::Object_var obj =
         TAO_Notify_PROPERTIES::instance()->dispatching_orb()->string_to_object(temp.in());
 
-      ACE_TRY
+      try
         {
-          CosNotifyComm::StructuredPushConsumer_var new_push_consumer =  
-            CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CosNotifyComm::StructuredPushConsumer_var new_push_consumer =
+            CosNotifyComm::StructuredPushConsumer::_unchecked_narrow(obj.in());
 
           this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (new_push_consumer.in());
           this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (new_push_consumer.in());
@@ -62,16 +61,16 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p
           }
           //--cj end
         }
-      ACE_CATCH (CORBA::TRANSIENT, ex)
+      catch (const CORBA::TRANSIENT& ex)
         {
-          ACE_PRINT_EXCEPTION (ex, "Got a TRANSIENT in NS_StructuredPushConsumer::init");
+          ex._tao_print_exception (
+            "Got a TRANSIENT in NS_StructuredPushConsumer::init");
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) got it for NS_StructuredPushConsumer %@\n", this));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // _narrow failed
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -83,17 +82,17 @@ TAO_Notify_StructuredPushConsumer::release (void)
 }
 
 void
-TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event)
 {
   CosNotification::StructuredEvent notification;
 
   TAO_Notify_Event::translate (event, notification);
 
-  this->push_consumer_->push_structured_event (notification ACE_ENV_ARG_PARAMETER);
+  this->push_consumer_->push_structured_event (notification);
 }
 
 void
-TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event)
 {
   //--cj verify dispatching ORB
   if (TAO_debug_level >= 10) {
@@ -102,13 +101,12 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent&
   }
   //--cj end
 
-  this->push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->push_consumer_->push_structured_event (event);
 }
 
 /// Push a batch of events to this consumer.
 void
-TAO_Notify_StructuredPushConsumer::push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushConsumer::push (const CosNotification::EventBatch& event)
 {
   ACE_ASSERT(false);
   ACE_UNUSED_ARG (event);
@@ -116,13 +114,11 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::EventBatch& even
 }
 
 void
-TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer)
 {
   TAO_Notify_StructuredPushConsumer* tmp = dynamic_cast<TAO_Notify_StructuredPushConsumer *> (old_consumer);
   ACE_ASSERT(tmp != 0);
-  this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init(tmp->push_consumer_.in());
   this->schedule_timer(false);
 }
 
@@ -131,18 +127,15 @@ TAO_Notify_StructuredPushConsumer::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index 9b9d603d383..057c2364763 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -39,22 +39,22 @@ public:
   TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy);
 
   /// Init the Consumer
-  void init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
+  void init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer);
 
   /// Destructor
   virtual ~TAO_Notify_StructuredPushConsumer ();
 
   /// Push <event> to this consumer.
-//  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
+//  virtual void push_i (const TAO_Notify_Event* event);
 
   /// Push <event> to this consumer.
-  virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
+  virtual void push (const CORBA::Any& event);
 
   /// Push <event> to this consumer.
-  virtual void push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::StructuredEvent& event);
 
   /// Push a batch of events to this consumer.
-  virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
+  virtual void push (const CosNotification::EventBatch& event);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
@@ -62,8 +62,7 @@ public:
   /// on reconnect we need to move events from the old consumer
   /// to the new one
   virtual void reconnect_from_consumer (
-    TAO_Notify_Consumer* old_consumer
-    ACE_ENV_ARG_DECL);
+    TAO_Notify_Consumer* old_consumer);
 
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 69e28687a34..7c98e79ef6e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -17,7 +17,7 @@ TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier ()
 }
 
 void
-TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier)
 {
   // TODO: verify single init call
   // push_supplier is optional
@@ -37,18 +37,15 @@ TAO_Notify_StructuredPushSupplier::get_ior (void) const
 {
   ACE_CString result;
   CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
-    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in());
     result = static_cast<const char*> (ior.in ());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     result.fast_clear();
   }
-  ACE_ENDTRY;
   return result;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index b123bdb35d7..5d8e5a74278 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -42,7 +42,7 @@ public:
   virtual ~TAO_Notify_StructuredPushSupplier ();
 
   /// Init
-  void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
+  void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier);
 
   /// Retrieve the ior of this peer
   virtual ACE_CString get_ior (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
index 70e0e846b04..1249bb447f7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
@@ -21,9 +21,9 @@ TAO_Notify_Subscription_Change_Worker::~TAO_Notify_Subscription_Change_Worker ()
 }
 
 void
-TAO_Notify_Subscription_Change_Worker::work (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL)
+TAO_Notify_Subscription_Change_Worker::work (TAO_Notify_Proxy* proxy)
 {
-  proxy->admin_types_changed (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
+  proxy->admin_types_changed (this->added_, this->removed_);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
index dc17f2a64b6..deea9ca7ce9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
@@ -41,7 +41,7 @@ public:
   virtual ~TAO_Notify_Subscription_Change_Worker ();
 
   ///= TAO_ESF_Worker method
-  void work (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL);
+  void work (TAO_Notify_Proxy* proxy);
 
 protected:
   const CosNotification::EventTypeSeq & added_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
index bf1d0eae7ee..d760d336730 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -31,11 +31,10 @@ TAO_Notify_Supplier::proxy (void)
 void
 TAO_Notify_Supplier::dispatch_updates_i (
   const CosNotification::EventTypeSeq& added,
-  const CosNotification::EventTypeSeq& removed
-  ACE_ENV_ARG_DECL)
+  const CosNotification::EventTypeSeq& removed)
 {
   if (!CORBA::is_nil (this->subscribe_.in ()))
-    this->subscribe_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+    this->subscribe_->subscription_change (added, removed);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
index f8032aae3d7..1f0c9d78fb8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
@@ -50,8 +50,7 @@ public:
 protected:
   /// Dispatch updates implementation.
   virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added,
-                                   const CosNotification::EventTypeSeq& removed
-                                   ACE_ENV_ARG_DECL);
+                                   const CosNotification::EventTypeSeq& removed);
 
   /// The proxy that we associate with.
   TAO_Notify_ProxyConsumer* proxy_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 71ff8590b4c..344c0294e64 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -49,25 +49,24 @@ TAO_Notify_SupplierAdmin::~TAO_Notify_SupplierAdmin ()
 }
 
 void
-TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec)
 {
-  TAO_Notify_Admin::init (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Notify_Admin::init (ec);
 
   const CosNotification::QoSProperties &default_sa_qos =
     TAO_Notify_PROPERTIES::instance ()->default_supplier_admin_qos_properties ();
 
-  this->set_qos (default_sa_qos ACE_ENV_ARG_PARAMETER);
+  this->set_qos (default_sa_qos);
 }
 
 void
-TAO_Notify_SupplierAdmin::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::_add_ref (void)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_SupplierAdmin::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::_remove_ref (void)
 {
   this->_decr_refcnt ();
 }
@@ -80,23 +79,21 @@ TAO_Notify_SupplierAdmin::release (void)
 }
 
 void
-TAO_Notify_SupplierAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::destroy (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  int result = this->shutdown ();
   if ( result == 1)
     return;
 
-  this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_->remove (this);
 }
 
 TAO_Notify::Topology_Object*
 TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
-  CORBA::Long id, const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  CORBA::Long id, const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify::Topology_Object* result = this;
   if (type == "proxy_push_consumer")
@@ -105,8 +102,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs);
   }
   else if (type == "structured_proxy_push_consumer")
   {
@@ -114,8 +110,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs);
   }
   else if (type == "sequence_proxy_push_consumer")
   {
@@ -123,13 +118,11 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type,
       ACE_TEXT ("(%P|%t) Admin reload proxy %d\n")
       , static_cast<int> (id)
       ));
-    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs);
   }
   else
   {
-    result = TAO_Notify_Admin::load_child (type, id, attrs ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    result = TAO_Notify_Admin::load_child (type, id, attrs);
   }
   return result;
 }
@@ -138,15 +131,13 @@ TAO_Notify::Topology_Object*
 TAO_Notify_SupplierAdmin::load_proxy (
   CORBA::Long id,
   CosNotifyChannelAdmin::ClientType ctype,
-  const TAO_Notify::NVPList& attrs ACE_ENV_ARG_DECL)
+  const TAO_Notify::NVPList& attrs)
 {
   TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder();
   TAO_Notify_ProxyConsumer * proxy =
     bld->build_proxy (this
                , ctype
-               , id
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+               , id);
   ACE_ASSERT(proxy != 0);
   proxy->load_attrs (attrs);
   return proxy;
@@ -154,28 +145,27 @@ TAO_Notify_SupplierAdmin::load_proxy (
 
 
 void
-TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  this->TAO_Notify_Object::set_qos (qos ACE_ENV_ARG_PARAMETER);
+  this->TAO_Notify_Object::set_qos (qos);
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_SupplierAdmin::get_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_qos (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->TAO_Notify_Object::get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Notify_Object::get_qos ();
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype
-                                                         , CosNotifyChannelAdmin::ProxyID_out proxy_id
-                                                         ACE_ENV_ARG_DECL)
+                                                         , CosNotifyChannelAdmin::ProxyID_out proxy_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminLimitExceeded
@@ -188,11 +178,8 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer (CosNotifyChannelAdm
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id
-                                                                , initial_qos
-                                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
+                                                                , initial_qos);
+  this->self_change ();
   return proxy._retn ();
 }
 
@@ -200,7 +187,6 @@ CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyChannelAdmin::ClientType ctype,
                                                                   CosNotifyChannelAdmin::ProxyID_out proxy_id,
                                                                   const CosNotification::QoSProperties & initial_qos
-                                                                  ACE_ENV_ARG_DECL
                                                                   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -212,31 +198,26 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC
     TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this
                                                                 , ctype
                                                                 , proxy_id,
-                                                                initial_qos
-                                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
+                                                                initial_qos);
+  this->self_change ();
   return proxy._retn ();
 }
 
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_Notify_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::obtain_push_consumer (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy =
-    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (proxy._retn ());
+    TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this);
+  this->self_change ();
   return proxy._retn ();
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_Notify_SupplierAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::MyID (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -245,16 +226,16 @@ TAO_Notify_SupplierAdmin::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_SupplierAdmin::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::MyChannel (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->ec_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ec_->_this ();
 }
 
 ::CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_SupplierAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_SupplierAdmin::MyOperator (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -263,18 +244,18 @@ TAO_Notify_SupplierAdmin::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin::push_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::push_consumers (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_Proxy_Seq_Worker seq_worker;
 
-  return seq_worker.create (this->proxy_container() ACE_ENV_ARG_PARAMETER);
+  return seq_worker.create (this->proxy_container());
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::ProxyNotFound
@@ -282,13 +263,12 @@ TAO_Notify_SupplierAdmin::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID pro
 {
   TAO_Notify_ProxyConsumer_Find_Worker find_worker;
 
-  return find_worker.resolve (proxy_id, this->proxy_container() ACE_ENV_ARG_PARAMETER);
+  return find_worker.resolve (proxy_id, this->proxy_container());
 }
 
 void
 TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & added,
                                     const CosNotification::EventTypeSeq & removed
-                                    ACE_ENV_ARG_DECL
                                     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -302,72 +282,69 @@ TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & ad
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                         CORBA::INTERNAL ());
-    ACE_CHECK;
 
     this->subscribed_types_.add_and_remove (seq_added, seq_removed);
 
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
-    this->proxy_container().collection ()->for_each (&worker ACE_ENV_ARG_PARAMETER);
+    this->proxy_container().collection ()->for_each (&worker);
   }
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::add_filter (CosNotifyFilter::Filter_ptr new_filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosNotifyFilter::FilterID fid =
-    this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (fid);
-  this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (fid);
+    this->filter_admin_.add_filter (new_filter);
+  this->self_change ();
   return fid;
 }
 
 void
-TAO_Notify_SupplierAdmin::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::remove_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER);
+  this->filter_admin_.remove_filter (filter);
 }
 
 ::CosNotifyFilter::Filter_ptr
-TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
+  return this->filter_admin_.get_filter (filter);
 }
 
 ::CosNotifyFilter::FilterIDSeq*
-TAO_Notify_SupplierAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::get_all_filters (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->filter_admin_.get_all_filters ();
 }
 
 void
-TAO_Notify_SupplierAdmin::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::remove_all_filters (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_admin_.remove_all_filters ();
 }
 
 /************** UNIMPLEMENTED METHODS ***************/
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_Notify_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::obtain_pull_consumer (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -376,7 +353,7 @@ TAO_Notify_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin::pull_consumers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin::pull_consumers (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -387,20 +364,18 @@ TAO_Notify_SupplierAdmin::pull_consumers (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_Notify_SupplierAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/,
-                                    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
-                                    ACE_ENV_ARG_DECL)
+                                    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotification::UnsupportedQoS
                    ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
 TAO_Notify_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/,
-                                                         CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/
-                                                         ACE_ENV_ARG_DECL)
+                                                         CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosNotifyChannelAdmin::AdminLimitExceeded
@@ -412,16 +387,14 @@ TAO_Notify_SupplierAdmin::obtain_notification_pull_consumer (CosNotifyChannelAdm
 TAO_Notify_ProxyConsumer *
 TAO_Notify_SupplierAdmin::find_proxy_consumer (
     TAO_Notify::IdVec & id_path,
-    size_t position
-    ACE_ENV_ARG_DECL)
+    size_t position)
 {
   TAO_Notify_ProxyConsumer * result = 0;
   size_t path_size = id_path.size ();
   if (position < path_size)
   {
     TAO_Notify_ProxyConsumer_Find_Worker find_worker;
-    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    TAO_Notify_Proxy * proxy = find_worker.find (id_path[position], this->proxy_container());
     result = dynamic_cast <TAO_Notify_ProxyConsumer *> (proxy);
   }
   return result;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index eeeaf0d40ab..e8495c124e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -51,11 +51,11 @@ public:
   virtual ~TAO_Notify_SupplierAdmin ();
 
   /// Init
-  void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL);
+  void init (TAO_Notify_EventChannel *ec);
 
   /// ServantBase refcount methods.
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (void);
+  virtual void _remove_ref (void);
 
 
   virtual const char * get_admin_type_name () const;
@@ -63,21 +63,18 @@ public:
   virtual TAO_Notify::Topology_Object* load_child (
     const ACE_CString &type,
     CORBA::Long id,
-    const TAO_Notify::NVPList& attrs
-    ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
   TAO_Notify_ProxyConsumer * find_proxy_consumer (
       TAO_Notify::IdVec & id_path,
-      size_t position
-      ACE_ENV_ARG_DECL);
+      size_t position);
 
 protected:
 
     TAO_Notify::Topology_Object *load_proxy (
     CORBA::Long id,
     CosNotifyChannelAdmin::ClientType ctype,
-    const TAO_Notify::NVPList& attrs
-    ACE_ENV_ARG_DECL);
+    const TAO_Notify::NVPList& attrs);
 
   /// = NotifyExt::SupplierAdmin methods
   CosNotifyChannelAdmin::ProxyConsumer_ptr
@@ -85,39 +82,33 @@ protected:
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id,
       const CosNotification::QoSProperties & initial_qos
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::AdminLimitExceeded,
                      CosNotification::UnsupportedQoS));
 
   /// = CosNotifyChannelAdmin::SupplierAdmin methods
-  virtual CosNotifyChannelAdmin::AdminID MyID (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::AdminID MyID (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
       CosNotifyChannelAdmin::ProxyID proxy_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::ProxyNotFound));
@@ -126,7 +117,6 @@ protected:
   obtain_notification_pull_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::AdminLimitExceeded));
@@ -135,71 +125,63 @@ protected:
   obtain_notification_push_consumer (
       CosNotifyChannelAdmin::ClientType ctype,
       CosNotifyChannelAdmin::ProxyID_out proxy_id
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyChannelAdmin::AdminLimitExceeded));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual ::CosNotification::QoSProperties* get_qos (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CosNotification::QoSProperties* get_qos (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_qos (const CosNotification::QoSProperties& qos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_qos (const CosNotification::QoSProperties& qos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotification::UnsupportedQoS));
 
   virtual void validate_qos (
       const CosNotification::QoSProperties & required_qos,
       CosNotification::NamedPropertyRangeSeq_out available_qos
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotification::UnsupportedQoS));
 
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
-                             const CosNotification::EventTypeSeq & removed
-                             ACE_ENV_ARG_DECL)
+                             const CosNotification::EventTypeSeq & removed)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      , CosNotifyComm::InvalidEventType
                      ));
 
   virtual CosNotifyFilter::FilterID add_filter (
-      CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL
+      CosNotifyFilter::Filter_ptr new_filter
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void remove_filter (
-      CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL
+      CosNotifyFilter::FilterID filter
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyFilter::FilterNotFound));
 
   virtual ::CosNotifyFilter::Filter_ptr get_filter (
       CosNotifyFilter::FilterID filter
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyFilter::FilterNotFound));
 
   virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void remove_all_filters (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index 01a7a51711f..df5b3989df0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -38,7 +38,7 @@ TAO_Notify_ThreadPool_Task::timer (void)
 
 void
 TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
-                                  const TAO_Notify_AdminProperties::Ptr& admin_properties  ACE_ENV_ARG_DECL)
+                                  const TAO_Notify_AdminProperties::Ptr& admin_properties)
 {
   ACE_ASSERT (this->timer_.get() == 0);
 
@@ -46,7 +46,6 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
   ACE_NEW_THROW_EX (timer,
     TAO_Notify_Timer_Queue (),
     CORBA::NO_MEMORY ());
-  ACE_CHECK;
   this->timer_.reset (timer);
 
 
@@ -55,7 +54,6 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
     TAO_Notify_Buffering_Strategy (*msg_queue (), admin_properties),
     CORBA::NO_MEMORY ());
   this->buffering_strategy_.reset (buffering_strategy);
-  ACE_CHECK;
 
   long flags = THR_NEW_LWP | THR_DETACHED;
   CORBA::ORB_var orb =
@@ -94,17 +92,16 @@ TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
         ACE_TEXT ("exiting!\n%a"),
         tp_params.default_priority));
     }
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
   }
 }
 
 void
-TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request)
 {
   if (!shutdown_)
   {
-    TAO_Notify_Method_Request_Queueable* request_copy = method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    TAO_Notify_Method_Request_Queueable* request_copy = method_request.copy ();
 
     if (this->buffering_strategy_->enqueue (request_copy) == -1)
     {
@@ -122,7 +119,7 @@ TAO_Notify_ThreadPool_Task::svc (void)
 
   while (!shutdown_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       ACE_Time_Value* dequeue_blocking_time = 0;
       ACE_Time_Value earliest_time;
@@ -138,8 +135,7 @@ TAO_Notify_ThreadPool_Task::svc (void)
 
       if (result > 0)
       {
-        method_request->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        method_request->execute ();
 
         ACE_Message_Block::release (method_request);
       }
@@ -153,12 +149,11 @@ TAO_Notify_ThreadPool_Task::svc (void)
           ACE_DEBUG ((LM_DEBUG, "ThreadPool_Task dequeue failed\n"));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      ex._tao_print_exception (
         "ThreadPool_Task (%P|%t) exception in method request\n");
     }
-    ACE_ENDTRY;
   } /* while */
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index ffff9d3a1a6..ff55d455179 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -58,10 +58,10 @@ public:
   virtual int close (u_long flags);
 
   /// Activate the threadpool
-  void init (const NotifyExt::ThreadPoolParams& tp_params, const TAO_Notify_AdminProperties::Ptr& admin_properties ACE_ENV_ARG_DECL);
+  void init (const NotifyExt::ThreadPoolParams& tp_params, const TAO_Notify_AdminProperties::Ptr& admin_properties);
 
   /// Queue the request
-  virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL);
+  virtual void execute (TAO_Notify_Method_Request& method_request);
 
   /// Shutdown task
   virtual void shutdown ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
index 27eeb6ad143..11736c14a7a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
@@ -13,7 +13,7 @@ TAO_Notify::Topology_Loader::~Topology_Loader ()
 }
 
 void
-TAO_Notify::Topology_Loader::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify::Topology_Loader::close (void)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
index 599afa07985..9adc45910c8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
@@ -60,7 +60,7 @@ public:
    * call the load_child method of the object passed in, then do the same
    * loading process on the returned object.
    */
-  virtual void load (Topology_Object *root ACE_ENV_ARG_DECL) = 0;
+  virtual void load (Topology_Object *root) = 0;
 
   /**
    * \brief Close the loader after loading is complete.
@@ -72,7 +72,7 @@ public:
    * vary based on the type of loader, so we can't include it in the
    * interface.
    */
-  virtual void close (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void close (void);
 };
 
 } // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index ac174723aa3..882d42ec693 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -22,7 +22,7 @@ namespace TAO_Notify
   }
 
   void
-  Topology_Savable::reconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  Topology_Savable::reconnect (void)
   {
   }
 
@@ -40,7 +40,7 @@ namespace TAO_Notify
   }
 
   void
-  Topology_Object::initialize (Topology_Parent* topology_parent ACE_ENV_ARG_DECL_NOT_USED)
+  Topology_Object::initialize (Topology_Parent* topology_parent)
   {
     ACE_ASSERT (topology_parent != 0 && this->topology_parent_ == 0);
     this->topology_parent_ = topology_parent;
@@ -57,8 +57,7 @@ namespace TAO_Notify
   Topology_Object *
   Topology_Object::load_child (const ACE_CString & /*type*/,
     CORBA::Long /* id */,
-    const NVPList& /* attrs */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const NVPList& /* attrs */)
   {
     return 0;
   }
@@ -79,22 +78,21 @@ namespace TAO_Notify
   }
 
   bool
-  Topology_Object::self_change (ACE_ENV_SINGLE_ARG_DECL)
+  Topology_Object::self_change (void)
   {
     this->self_changed_ = true;
-    return send_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return send_change ();
   }
 
   bool
-  Topology_Object::send_change (ACE_ENV_SINGLE_ARG_DECL)
+  Topology_Object::send_change (void)
   {
     bool saving = false;
     if (is_persistent ())
     {
       while (this->self_changed_ || this->children_changed_)
       {
-        saving = this->change_to_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
+        saving = this->change_to_parent ();
         if (!saving)
         {
           this->self_changed_ = false;
@@ -111,14 +109,13 @@ namespace TAO_Notify
   }
 
   bool
-  Topology_Object::change_to_parent (ACE_ENV_SINGLE_ARG_DECL)
+  Topology_Object::change_to_parent (void)
   {
     bool result = false;
     Topology_Parent * parent = this->topology_parent();
     if (parent != 0)
     {
-      result = parent->child_change(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      result = parent->child_change();
     }
     return result;
   }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 53e825c0939..5704f73a84e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -72,23 +72,21 @@ namespace TAO_Notify
     ///   if (is_persistent ())
     ///   {
     ///     bool want_all_children = saver.begin_object(
-    ///       this->id(), type, attrs, change ACE_ENV_ARG_PARAMETER);
-    ///     ACE_CHECK;
+    ///       this->id(), type, attrs, change);
     ///     for all children
     ///     {
     ///       if (want_all_children || child.is_changed())
     ///       {
-    ///         child.save_persistent(saver ACE_ENV_ARG_PARAMETER);
-    ///         ACE_CHECK;
+    ///         child.save_persistent(saver);
     ///       }
     ///     }
     ///     for all deleted children
     ///     {
     ///       saver.delete_child(child_type, child_id);
     ///     }
-    ///     saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER);
+    ///     saver.end_object(this->id(), type);
     ///   )
-    virtual void save_persistent (Topology_Saver& saver ACE_ENV_ARG_DECL) = 0;
+    virtual void save_persistent (Topology_Saver& saver) = 0;
 
     /// Re-establish connections that we had before a shutdown.
     ///
@@ -96,7 +94,7 @@ namespace TAO_Notify
     /// to any external objects with whom we were interacting.  We should
     /// call the reconnect() method on all of our children to give them
     /// the chance to do the same.
-    virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+    virtual void reconnect (void);
 
   };
 
@@ -118,7 +116,7 @@ namespace TAO_Notify
     virtual ~Topology_Object ();
 
     /// Init this object with data from <rhs>.
-    virtual void initialize (Topology_Parent* topology_parent ACE_ENV_ARG_DECL);
+    virtual void initialize (Topology_Parent* topology_parent);
 
     /// \brief Create a child of the appropriate type and return it.
     ///
@@ -127,8 +125,7 @@ namespace TAO_Notify
     /// its new ID.
     virtual Topology_Object* load_child (const ACE_CString & /*type*/,
       CORBA::Long /* id */,
-      const NVPList& /* attrs */
-      ACE_ENV_ARG_DECL_NOT_USED);
+      const NVPList& /* attrs */);
 
     /// \brief Find the id associated with topology object.
     ///
@@ -155,7 +152,7 @@ namespace TAO_Notify
     ///
     ///  see also Topology_Parent::child_change ()
     /// \return false if save will never happen
-    bool self_change (ACE_ENV_SINGLE_ARG_DECL);
+    bool self_change (void);
 
     /// \brief pointer to our topological parent
     ///
@@ -165,7 +162,7 @@ namespace TAO_Notify
     /// \brief Handle details of propagating change
     ///
     /// \return false if save will never happen
-    bool send_change (ACE_ENV_SINGLE_ARG_DECL);
+    bool send_change (void);
 
   private:
     /// \brief Send change to parent.
@@ -174,7 +171,7 @@ namespace TAO_Notify
     /// (top level of tree)
     /// private virtual because this should only be called from send_change()
     /// \return false if save will never happen
-    virtual bool change_to_parent (ACE_ENV_SINGLE_ARG_DECL);
+    virtual bool change_to_parent (void);
 
   protected:
     /// true if this object changed since last save_persistent
@@ -197,7 +194,7 @@ namespace TAO_Notify
     /// Called by a child that has changed.
     /// A child calls this method to report that it has changed.
     /// \return false if save will never happen
-    bool child_change (ACE_ENV_SINGLE_ARG_DECL);
+    bool child_change (void);
   };
 
 } // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
index 14363a16d6f..b3d7ef8c054 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
@@ -15,10 +15,10 @@ namespace TAO_Notify
 
   ACE_INLINE
   bool
-  Topology_Parent::child_change (ACE_ENV_SINGLE_ARG_DECL)
+  Topology_Parent::child_change (void)
   {
     this->children_changed_ = true;
-    return send_change (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return send_change ();
   }
 
 } // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
index 65c9aa9f681..77adc658cb0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
@@ -9,7 +9,7 @@ TAO_Notify::Topology_Saver::~Topology_Saver ()
 }
 
 void
-TAO_Notify::Topology_Saver::close (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify::Topology_Saver::close (void)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
index 91648109b7a..2ccc88017aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
@@ -64,8 +64,7 @@ namespace TAO_Notify
     virtual bool begin_object (CORBA::Long id,
       const ACE_CString &type,
       const NVPList& attrs,
-      bool changed
-      ACE_ENV_ARG_DECL) = 0;
+      bool changed) = 0;
 
     /** \brief Report deleted children to the saver.
     *
@@ -78,8 +77,7 @@ namespace TAO_Notify
     */
     virtual void delete_child (
       CORBA::Long id,
-      const ACE_CString & type
-      ACE_ENV_ARG_DECL_NOT_USED)
+      const ACE_CString & type)
     {
       ACE_UNUSED_ARG (id);
       ACE_UNUSED_ARG (type);
@@ -91,8 +89,7 @@ namespace TAO_Notify
     * and commit it to the persistent store.
     */
     virtual void end_object (CORBA::Long id,
-      const ACE_CString &type
-      ACE_ENV_ARG_DECL) = 0;
+      const ACE_CString &type) = 0;
 
     /**
      * \brief Close the saver.
@@ -103,7 +100,7 @@ namespace TAO_Notify
      * vary based on the type of saver, so we can't include it in the
      * interface.
      */
-    virtual void close (ACE_ENV_SINGLE_ARG_DECL);
+    virtual void close (void);
   };
 } // namespace TAO_Notify
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
index b1e529c56bd..577248919b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -51,7 +51,7 @@ public:
 
   ///= Public method to be implemented by subclasses.
   /// Exec the request.
-  virtual void execute (TAO_Notify_Method_Request& method_request ACE_ENV_ARG_DECL) = 0;
+  virtual void execute (TAO_Notify_Method_Request& method_request) = 0;
 
   /// Shutdown task
   virtual void shutdown (void) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 7dd33e5deb6..336b06d11da 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -124,7 +124,7 @@ namespace TAO_Notify
 
   //virtual
   void
-  XML_Loader::load (Topology_Object *root ACE_ENV_ARG_DECL)
+  XML_Loader::load (Topology_Object *root)
   {
     ACE_ASSERT (root != 0);
     this->live_ = true;
@@ -157,14 +157,14 @@ namespace TAO_Notify
         // The only way to find out what it is, it to let it print itself, so...
         ACE_ERROR ((LM_ERROR, "Unable to load \"%s\".\n", this->file_name_.c_str ()));
         ex.print ();
-        ACE_THROW(CORBA::INTERNAL());
+        throw CORBA::INTERNAL();
       }
       ACEXML_ENDTRY;
     }
     else
     {
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("Unable to open the XML input file: %s.\n"), file_name_.c_str()));
-      ACE_THROW(CORBA::INTERNAL());
+      throw CORBA::INTERNAL();
     }
   }
 
@@ -183,8 +183,7 @@ namespace TAO_Notify
       Topology_Object* cur = 0;
       if (object_stack_.top (cur) == 0)
       {
-        ACE_DECLARE_NEW_ENV;
-        ACE_TRY
+        try
         {
           NVPList attrs;
           CORBA::Long id = makeNVPList (attrs, xml_attrs);
@@ -196,16 +195,14 @@ namespace TAO_Notify
 
           ACE_CString cname (name);
           Topology_Object* next = cur->load_child (
-            cname, id, attrs ACE_ENV_ARG_PARAMETER);
+            cname, id, attrs);
           ACE_ASSERT(next != 0);
-          ACE_TRY_CHECK;
           object_stack_.push (next);
         }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
         {
-          ACEXML_THROW (ACEXML_SAXException (ACE_ANY_EXCEPTION._info ().c_str ()));
+          ACEXML_THROW (ACEXML_SAXException (ex._info ().c_str ()));
         }
-        ACE_ENDTRY;
       }
     }
   }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index 7069179d9bd..b90799d8f20 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -49,7 +49,7 @@ public:
   ///////////////////////////////////
   // Override Topology_Loader methods
   // see Topology_Loader.h for documentation
-  virtual void load (Topology_Object *root ACE_ENV_ARG_DECL);
+  virtual void load (Topology_Object *root);
 
 
   /////////////////////////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index f6f0864b46f..44639fd2c98 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -41,12 +41,11 @@ namespace TAO_Notify
   }
 
   void
-  XML_Saver::close (ACE_ENV_SINGLE_ARG_DECL)
+  XML_Saver::close (void)
   {
     if (this->close_out_ && this->output_ != 0)
     {
-      this->end_object(0, "notification_service" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->end_object(0, "notification_service");
 
       ACE_OS::fclose(this->output_);
       this->output_ = 0;
@@ -114,8 +113,7 @@ namespace TAO_Notify
 
       ACE_OS::fprintf (out, "<?xml version=\"1.0\"?>\n");
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
       {
         bool changed = true;
         NVPList attrs;
@@ -139,17 +137,16 @@ namespace TAO_Notify
         {
           attrs.push_back(NVP("timestamp", nowusstr));
         }
-        this->begin_object(0, "notification_service", attrs, changed ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->begin_object(0, "notification_service", attrs, changed);
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-          ACE_TEXT ("(%P|%t) XML_Saver Unknown exception\n"));
+        ex._tao_print_exception (
+          ACE_TEXT (
+            "(%P|%t) XML_Saver Unknown exception\n"));
         delete this->output_;
         this->output_ = 0;
       }
-      ACE_ENDTRY;
     }
     return this->output_ != 0;
   }
@@ -157,8 +154,7 @@ namespace TAO_Notify
   bool XML_Saver::begin_object(CORBA::Long id,
     const ACE_CString& type,
     const NVPList& attrs,
-    bool /* changed */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    bool /* changed */)
   {
     ACE_ASSERT(this->output_ != 0);
 
@@ -186,8 +182,7 @@ namespace TAO_Notify
   }
 
   void XML_Saver::end_object (CORBA::Long /* id */,
-                              const ACE_CString& type
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              const ACE_CString& type)
   {
     ACE_ASSERT(this->output_ != 0);
     FILE *out = this->output_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
index f7c9afb87e1..418d974d86a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
@@ -50,14 +50,12 @@ public:
   virtual bool begin_object (CORBA::Long id,
     const ACE_CString& type,
     const NVPList& attrs,
-    bool changed
-    ACE_ENV_ARG_DECL);
+    bool changed);
 
   virtual void end_object (CORBA::Long id,
-    const ACE_CString& type
-    ACE_ENV_ARG_DECL);
+    const ACE_CString& type);
 
-  virtual void close (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void close (void);
 
 private:
   void backup_file_name (char * file_path, int nfile);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 721359a0343..2705c6ae78e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -19,8 +19,7 @@ ACE_RCSID (PortableGroup,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 PortableServer::ObjectId *
-TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
-                                  ACE_ENV_ARG_DECL)
+TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableGroup::NotAGroupObject
@@ -32,26 +31,20 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
 
   // Create a temporary object reference and then get the
   // ObjectId out of it.
-  CORBA::Object_var obj_ref = this->create_reference (repository_id
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Object_var obj_ref = this->create_reference (repository_id);
 
   PortableServer::ObjectId_var obj_id =
-    this->reference_to_id (obj_ref.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->reference_to_id (obj_ref.in ());
 
   // Associate the object reference with the group reference.
   this->associate_group_with_ref (the_ref,
-                                  obj_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                  obj_ref.in ());
 
   return obj_id._retn ();
 }
 
 PortableGroup::IDs *
-TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref
-                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableGroup::NotAGroupObject
@@ -64,8 +57,7 @@ TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref
 
 void
 TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref,
-                                      const PortableServer::ObjectId & oid
-                                      ACE_ENV_ARG_DECL)
+                                      const PortableServer::ObjectId & oid)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableGroup::NotAGroupObject
@@ -74,21 +66,16 @@ TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref,
   // Create a reference for the specified ObjectId, since
   // it is much easier to extract the object key from the
   // reference.
-  CORBA::Object_var obj_ref = this->id_to_reference (oid
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var obj_ref = this->id_to_reference (oid);
 
   // Associate the object reference with the group reference.
   this->associate_group_with_ref (ref,
-                                  obj_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  obj_ref.in ());
 }
 
 void
 TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref,
-                                         const PortableServer::ObjectId & oid
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         const PortableServer::ObjectId & oid)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableGroup::NotAGroupObject
@@ -106,8 +93,7 @@ TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name,
                   ACE_Lock &lock,
                   TAO_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
+                  TAO_Object_Adapter *object_adapter)
   : TAO_Regular_POA (name,
                      poa_manager,
                      policies,
@@ -115,8 +101,7 @@ TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name,
                      lock,
                      thread_lock,
                      orb_core,
-                     object_adapter
-                     ACE_ENV_ARG_PARAMETER)
+                     object_adapter)
 {
 }
 
@@ -132,8 +117,7 @@ TAO_GOA::new_POA (const String &name,
                   ACE_Lock &lock,
                   TAO_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
+                  TAO_Object_Adapter *object_adapter)
 {
   TAO_GOA *poa = 0;
 
@@ -145,10 +129,8 @@ TAO_GOA::new_POA (const String &name,
                              lock,
                              thread_lock,
                              orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
+                             object_adapter),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return poa;
 }
@@ -157,97 +139,76 @@ TAO_GOA::new_POA (const String &name,
 PortableServer::POA_ptr
 TAO_GOA::create_POA (const char *adapter_name,
                         PortableServer::POAManager_ptr poa_manager,
-                        const CORBA::PolicyList &policies
-                        ACE_ENV_ARG_DECL)
+                        const CORBA::PolicyList &policies)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
 {
   PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name,
                                                            poa_manager,
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (poa);
+                                                           policies);
   return poa;
 }
 
 PortableServer::POA_ptr
 TAO_GOA::find_POA (const char *adapter_name,
-                      CORBA::Boolean activate_it
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Boolean activate_it)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
   PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
-                                                         activate_it
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (poa);
+                                                         activate_it);
   return poa;
 }
 
 void
 TAO_GOA::destroy (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion
-                     ACE_ENV_ARG_DECL)
+                     CORBA::Boolean wait_for_completion)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_Regular_POA::destroy (etherealize_objects,
-                          wait_for_completion
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          wait_for_completion);
 }
 
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ThreadPolicy_ptr
-TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                                  ACE_ENV_ARG_DECL)
+TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ThreadPolicy_ptr policy =
-    this->TAO_Regular_POA::create_thread_policy (value
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+    this->TAO_Regular_POA::create_thread_policy (value);
   return policy;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 PortableServer::LifespanPolicy_ptr
-TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                    ACE_ENV_ARG_DECL)
+TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::LifespanPolicy_ptr policy =
-    this->TAO_Regular_POA::create_lifespan_policy (value
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+    this->TAO_Regular_POA::create_lifespan_policy (value);
   return policy;
 }
 
 PortableServer::IdUniquenessPolicy_ptr
-TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                         ACE_ENV_ARG_DECL)
+TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdUniquenessPolicy_ptr policy =
-    this->TAO_Regular_POA::create_id_uniqueness_policy (value
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+    this->TAO_Regular_POA::create_id_uniqueness_policy (value);
   return policy;
 }
 
 
 PortableServer::IdAssignmentPolicy_ptr
-TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                         ACE_ENV_ARG_DECL)
+TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdAssignmentPolicy_ptr policy =
-    this->TAO_Regular_POA::create_id_assignment_policy (value
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+    this->TAO_Regular_POA::create_id_assignment_policy (value);
   return policy;
 }
 
@@ -255,39 +216,30 @@ TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ImplicitActivationPolicy_ptr
-TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                               ACE_ENV_ARG_DECL)
+TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ImplicitActivationPolicy_ptr policy =
-    this->TAO_Regular_POA::create_implicit_activation_policy (value
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+    this->TAO_Regular_POA::create_implicit_activation_policy (value);
   return policy;
 }
 
 PortableServer::ServantRetentionPolicy_ptr
-TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                             ACE_ENV_ARG_DECL)
+TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ServantRetentionPolicy_ptr policy =
-    this->TAO_Regular_POA::create_servant_retention_policy (value
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+    this->TAO_Regular_POA::create_servant_retention_policy (value);
   return policy;
 }
 
 
 PortableServer::RequestProcessingPolicy_ptr
-TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                              ACE_ENV_ARG_DECL)
+TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::RequestProcessingPolicy_ptr policy =
-    this->TAO_Regular_POA::create_request_processing_policy (value
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+    this->TAO_Regular_POA::create_request_processing_policy (value);
   return policy;
 }
 
@@ -295,42 +247,38 @@ TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPoli
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 char *
-TAO_GOA::the_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char * name =
-    this->TAO_Regular_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (name);
+    this->TAO_Regular_POA::the_name ();
   return name;
 }
 
 PortableServer::POA_ptr
-TAO_GOA::the_parent (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_parent (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_ptr parent =
-    this->TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (parent);
+    this->TAO_Regular_POA::the_parent ();
   return parent;
 }
 
 PortableServer::POAList *
-TAO_GOA::the_children (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_children (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList *children =
-    this->TAO_Regular_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (children);
+    this->TAO_Regular_POA::the_children ();
   return children;
 }
 
 PortableServer::POAManager_ptr
-TAO_GOA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_POAManager (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAManager_ptr poa_manager =
-    this->TAO_Regular_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (poa_manager);
+    this->TAO_Regular_POA::the_POAManager ();
   return poa_manager;
 }
 
@@ -338,231 +286,186 @@ TAO_GOA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::AdapterActivator_ptr
-TAO_GOA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::the_activator (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::AdapterActivator_ptr activator =
-    this->TAO_Regular_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (activator);
+    this->TAO_Regular_POA::the_activator ();
   return activator;
 }
 
 void
-TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                           ACE_ENV_ARG_DECL)
+TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->TAO_Regular_POA::the_activator (adapter_activator
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->TAO_Regular_POA::the_activator (adapter_activator);
 }
 
 PortableServer::ServantManager_ptr
-TAO_GOA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::get_servant_manager (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ServantManager_ptr servant_manager =
-    this->TAO_Regular_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant_manager);
+    this->TAO_Regular_POA::get_servant_manager ();
   return servant_manager;
 }
 
 void
-TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                 ACE_ENV_ARG_DECL)
+TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_Regular_POA::set_servant_manager (imgr
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->TAO_Regular_POA::set_servant_manager (imgr);
 }
 
 PortableServer::Servant
-TAO_GOA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::get_servant (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::NoServant,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_Regular_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant);
+    this->TAO_Regular_POA::get_servant ();
   return servant;
 }
 
 void
-TAO_GOA::set_servant (PortableServer::Servant servant
-                         ACE_ENV_ARG_DECL)
+TAO_GOA::set_servant (PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_Regular_POA::set_servant (servant
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->TAO_Regular_POA::set_servant (servant);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 PortableServer::ObjectId *
-TAO_GOA::activate_object (PortableServer::Servant p_servant
-                             ACE_ENV_ARG_DECL)
+TAO_GOA::activate_object (PortableServer::Servant p_servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::activate_object (p_servant
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (object_id);
+    this->TAO_Regular_POA::activate_object (p_servant);
   return object_id;
 }
 
 void
 TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                     PortableServer::Servant p_servant
-                                     ACE_ENV_ARG_DECL)
+                                     PortableServer::Servant p_servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   this->TAO_Regular_POA::activate_object_with_id (id,
-                                          p_servant
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          p_servant);
 }
 
 void
-TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid
-                               ACE_ENV_ARG_DECL)
+TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_Regular_POA::deactivate_object (oid
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->TAO_Regular_POA::deactivate_object (oid);
 }
 
 CORBA::Object_ptr
-TAO_GOA::create_reference (const char *intf
-                              ACE_ENV_ARG_DECL)
+TAO_GOA::create_reference (const char *intf)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::create_reference (intf
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
+    this->TAO_Regular_POA::create_reference (intf);
   return obj;
 }
 
 CORBA::Object_ptr
 TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid,
-                                   const char *intf
-                                   ACE_ENV_ARG_DECL)
+                                   const char *intf)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::create_reference_with_id (oid,
-                                             intf
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
+                                             intf);
   return obj;
 }
 
 PortableServer::ObjectId *
-TAO_GOA::servant_to_id (PortableServer::Servant p_servant
-                           ACE_ENV_ARG_DECL)
+TAO_GOA::servant_to_id (PortableServer::Servant p_servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::servant_to_id (p_servant
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (object_id);
+    this->TAO_Regular_POA::servant_to_id (p_servant);
   return object_id;
 }
 
 CORBA::Object_ptr
-TAO_GOA::servant_to_reference (PortableServer::Servant p_servant
-                                  ACE_ENV_ARG_DECL)
+TAO_GOA::servant_to_reference (PortableServer::Servant p_servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::servant_to_reference (p_servant
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
+    this->TAO_Regular_POA::servant_to_reference (p_servant);
   return obj;
 }
 
 
 PortableServer::Servant
-TAO_GOA::reference_to_servant (CORBA::Object_ptr reference
-                                  ACE_ENV_ARG_DECL)
+TAO_GOA::reference_to_servant (CORBA::Object_ptr reference)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_Regular_POA::reference_to_servant (reference
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant);
+    this->TAO_Regular_POA::reference_to_servant (reference);
   return servant;
 }
 
 PortableServer::ObjectId *
-TAO_GOA::reference_to_id (CORBA::Object_ptr reference
-                             ACE_ENV_ARG_DECL)
+TAO_GOA::reference_to_id (CORBA::Object_ptr reference)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_Regular_POA::reference_to_id (reference
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (object_id);
+    this->TAO_Regular_POA::reference_to_id (reference);
   return object_id;
 }
 
 PortableServer::Servant
-TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid
-                           ACE_ENV_ARG_DECL)
+TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_Regular_POA::id_to_servant (oid
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant);
+    this->TAO_Regular_POA::id_to_servant (oid);
   return servant;
 }
 
 CORBA::Object_ptr
-TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid
-                             ACE_ENV_ARG_DECL)
+TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_Regular_POA::id_to_reference (oid
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
+    this->TAO_Regular_POA::id_to_reference (oid);
   return obj;
 }
 
 CORBA::OctetSeq *
-TAO_GOA::id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_GOA::id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Regular_POA::id ();
 }
 
 int
@@ -625,8 +528,7 @@ TAO_GOA::find_group_component_in_profile (const TAO_Profile* profile,
 int
 TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref,
                                  TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
-                                 TAO_ORB_Core &orb_core
-                                 ACE_ENV_ARG_DECL)
+                                 TAO_ORB_Core &orb_core)
 {
   const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles ();
   const TAO_Profile* profile;
@@ -641,9 +543,7 @@ TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref,
       if (profile->supports_multicast ())
         {
           acceptor_registry.open (profile,
-                                  orb_core
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                  orb_core);
           ++num;
         }
 
@@ -657,8 +557,7 @@ TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref,
 void
 TAO_GOA::associate_group_with_ref (
       CORBA::Object_ptr group_ref,
-      CORBA::Object_ptr obj_ref
-      ACE_ENV_ARG_DECL)
+      CORBA::Object_ptr obj_ref)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NotAGroupObject))
 {
@@ -671,7 +570,6 @@ TAO_GOA::associate_group_with_ref (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableGroup::TagGroupTaggedComponent_var group_id = tmp_group_id;
 
@@ -679,7 +577,7 @@ TAO_GOA::associate_group_with_ref (
     {
       // Group component wasn't found.  The group reference
       // that was passed in must be bogus.
-      ACE_THROW (PortableGroup::NotAGroupObject ());
+      throw PortableGroup::NotAGroupObject ();
     }
 
   PortableGroup_Request_Dispatcher *rd =
@@ -690,19 +588,15 @@ TAO_GOA::associate_group_with_ref (
   // specified group reference.
   this->create_group_acceptors (group_ref,
                                 rd->acceptor_registry_,
-                                this->orb_core_
-                                ACE_ENV_ARG_PARAMETER);
+                                this->orb_core_);
 
-  ACE_CHECK;
 
 
   // Add a mapping from GroupId to Object key in the PortableGroup
   const TAO::ObjectKey &key =
     obj_ref->_stubobj ()->profile_in_use ()->object_key ();
   rd->group_map_.add_groupid_objectkey_pair (group_id._retn (),
-                                             key
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                             key);
 
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
index d5bbdeb04dd..42a20bdbd8f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -55,7 +55,6 @@ public:
   //@{
   virtual PortableServer::ObjectId * create_id_for_reference (
       CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -65,7 +64,6 @@ public:
 
   virtual PortableGroup::IDs * reference_to_ids (
       CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -75,7 +73,6 @@ public:
   virtual void associate_reference_with_id (
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -85,7 +82,6 @@ public:
   virtual void disassociate_reference_with_id (
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -96,169 +92,145 @@ public:
   // Standard POA interface methods
   PortableServer::POA_ptr create_POA (const char *adapter_name,
                                       PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      const CORBA::PolicyList &policies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    CORBA::Boolean activate_it)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 
   void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                CORBA::Boolean wait_for_completion)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
-                                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  char * the_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POA_ptr the_parent (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAList *the_children (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAManager_ptr the_POAManager (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::AdapterActivator_ptr the_activator (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ServantManager_ptr get_servant_manager (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void set_servant_manager (PortableServer::ServantManager_ptr imgr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant get_servant (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void set_servant (PortableServer::Servant servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
-  void deactivate_object (const PortableServer::ObjectId &oid
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void deactivate_object (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr create_reference (const char *intf
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr create_reference (const char *intf)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              const char *intf)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OctetSeq *id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // End standard POA interface methods.
@@ -270,8 +242,7 @@ public:
            ACE_Lock &lock,
            TAO_SYNCH_MUTEX &thread_lock,
            TAO_ORB_Core &orb_core,
-           TAO_Object_Adapter *object_adapter
-           ACE_ENV_ARG_DECL);
+           TAO_Object_Adapter *object_adapter);
 
   virtual ~TAO_GOA (void);
 
@@ -288,8 +259,7 @@ protected:
                             ACE_Lock &lock,
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
-                            TAO_Object_Adapter *object_adapter
-                            ACE_ENV_ARG_DECL);
+                            TAO_Object_Adapter *object_adapter);
 
   int find_group_component (const CORBA::Object_ptr the_ref,
                             PortableGroup::TagGroupTaggedComponent &group);
@@ -303,15 +273,13 @@ protected:
       CORBA::Object_ptr the_ref,
       TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
       TAO_ORB_Core &orb_core
-      ACE_ENV_ARG_DECL
     );
 
   /// Helper function to associate group references with
   /// object references.
   void associate_group_with_ref (
         CORBA::Object_ptr group_ref,
-        CORBA::Object_ptr obj_ref
-        ACE_ENV_ARG_DECL)
+        CORBA::Object_ptr obj_ref)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::NotAGroupObject));
 };
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
index fe3650caa71..3ed2d1869a0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp
@@ -26,8 +26,7 @@ TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator (void)
 
 void
 TAO_PG_Default_Property_Validator::validate_property (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -44,22 +43,21 @@ TAO_PG_Default_Property_Validator::validate_property (
           if (!(property.val >>= membership)
               || (membership != PortableGroup::MEMB_APP_CTRL
                   && membership != PortableGroup::MEMB_INF_CTRL))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
         }
       else if (property.nam == this->factories_)
         {
           const PortableGroup::FactoriesValue * factories;
           if (!(property.val >>= factories))
-            ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                       property.val));
+            throw PortableGroup::InvalidProperty (property.nam, property.val);
           else
             {
               const CORBA::ULong flen = factories->length ();
 
               if (flen == 0)
-                ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                           property.val));
+                throw PortableGroup::InvalidProperty (
+                  property.nam,
+                  property.val);
 
               for (CORBA::ULong j = 0; j < flen; ++j)
                 {
@@ -68,8 +66,9 @@ TAO_PG_Default_Property_Validator::validate_property (
 
                   if (CORBA::is_nil (factory_info.the_factory.in ())
                       || factory_info.the_location.length () == 0)
-                    ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                               property.val));
+                    throw PortableGroup::InvalidProperty (
+                      property.nam,
+                      property.val);
                 }
             }
         }
@@ -78,8 +77,7 @@ TAO_PG_Default_Property_Validator::validate_property (
 
 void
 TAO_PG_Default_Property_Validator::validate_criteria (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidCriteria,
                    PortableGroup::CannotMeetCriteria))
@@ -144,7 +142,7 @@ TAO_PG_Default_Property_Validator::validate_criteria (
       // deallocations should occur.
       invalid_criteria.length (p);
 
-      ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
+      throw PortableGroup::InvalidCriteria (invalid_criteria);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index 9f9ced075d9..15cf9257f0f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -46,8 +46,7 @@ public:
   /// Validate the given properties.  Throw an exception when the
   /// first invalid property is encountered.  The remaining properties
   /// will not be validated.
-  virtual void validate_property (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+  virtual void validate_property (const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -55,8 +54,7 @@ public:
   /// Validate the given properties/criteria.  All criteria
   /// will be validated regardless of whether or not an invalid
   /// property was encountered.
-  virtual void validate_criteria (const PortableGroup::Properties & criteria
-                          ACE_ENV_ARG_DECL)
+  virtual void validate_criteria (const PortableGroup::Properties & criteria)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidCriteria,
                      PortableGroup::CannotMeetCriteria));
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 330d3984006..eaba8c3012d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -112,12 +112,12 @@ const char * TAO::PG_FactoryRegistry::identity () const
   return this->identity_.c_str();
 }
 
-void TAO::PG_FactoryRegistry::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void TAO::PG_FactoryRegistry::_remove_ref (void)
 {
   this->quit_state_ = GONE;
 }
 
-int TAO::PG_FactoryRegistry::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::PG_FactoryRegistry::idle (int & result)
 {
   result = 0;
   int quit = 0;
@@ -136,7 +136,7 @@ int TAO::PG_FactoryRegistry::idle (int & result ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 
-int TAO::PG_FactoryRegistry::fini (ACE_ENV_SINGLE_ARG_DECL)
+int TAO::PG_FactoryRegistry::fini (void)
 {
   if (this->ior_output_file_ != 0)
   {
@@ -145,15 +145,14 @@ int TAO::PG_FactoryRegistry::fini (ACE_ENV_SINGLE_ARG_DECL)
   }
   if (this->ns_name_ != 0)
   {
-    this->naming_context_->unbind (this_name_
-                            ACE_ENV_ARG_PARAMETER);
+    this->naming_context_->unbind (this_name_);
     this->ns_name_ = 0;
   }
   return 0;
 }
 
 
-void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
 {
   ACE_ASSERT (CORBA::is_nil (this->orb_.in ()));
   ACE_ASSERT (CORBA::is_nil (this->poa_.in ()));
@@ -163,24 +162,18 @@ void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr
   ACE_ASSERT ( ! CORBA::is_nil (this->poa_.in ()));
 
   // Register with the POA.
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as a corba object
   this->this_obj_ =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->id_to_reference (object_id_.in ());
 
   // and create a ior string
-  this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ior_ = this->orb_->object_to_string (this->this_obj_.in ());
 
 }
 
-int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
-                                   ACE_ENV_ARG_DECL)
+int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
 
@@ -188,9 +181,7 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -199,10 +190,8 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
-  ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->poa_.in()))
   {
@@ -212,27 +201,20 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
   }
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  poa_manager->activate ();
 
   // Register with the POA.
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as a corba object
   this->this_obj_ =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    this->poa_->id_to_reference (object_id_.in ());
 
 
   // and create a ior string
-  this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->ior_ = this->orb_->object_to_string (this->this_obj_.in ());
 
 
   if (this->ior_output_file_ != 0)
@@ -249,8 +231,7 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
     this->identity_ += this->ns_name_;
 
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(-1);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ())){
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -259,15 +240,13 @@ int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb
     }
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(-1);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
 
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
 
     this->naming_context_->rebind (this->this_name_, this->this_obj_.in()  //CORBA::Object::_duplicate(this_obj)
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(-1);
+                            );
   }
 
   return result;
@@ -305,7 +284,6 @@ void TAO::PG_FactoryRegistry::register_factory (
     const char * role,
     const char * type_id,
     const PortableGroup::FactoryInfo & factory_info
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -328,7 +306,6 @@ void TAO::PG_FactoryRegistry::register_factory (
       ACE_NEW_THROW_EX (role_info,
                         RoleInfo(5),
                         CORBA::NO_MEMORY());
-      ACE_CHECK;
 
       ACE_AUTO_PTR_RESET (safe_entry, role_info, RoleInfo);
       role_info->type_id_ = type_id;
@@ -337,7 +314,7 @@ void TAO::PG_FactoryRegistry::register_factory (
     {
       if (role_info->type_id_ != type_id)
         {
-          ACE_THROW ( PortableGroup::TypeConflict() );
+          throw PortableGroup::TypeConflict();
         }
     }
 
@@ -353,7 +330,7 @@ void TAO::PG_FactoryRegistry::register_factory (
                       this->identity_.c_str(),
                       static_cast<const char *> (info.the_location[0].id),
           role));
-      ACE_THROW (PortableGroup::MemberAlreadyPresent() );
+      throw PortableGroup::MemberAlreadyPresent();
     }
   }
 
@@ -379,7 +356,6 @@ void TAO::PG_FactoryRegistry::register_factory (
 void TAO::PG_FactoryRegistry::unregister_factory (
     const char * role,
     const PortableGroup::Location & location
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound))
 {
@@ -445,7 +421,7 @@ void TAO::PG_FactoryRegistry::unregister_factory (
       this->identity_.c_str(),
       role
       ));
-    ACE_THROW ( PortableGroup::MemberNotFound() );
+    throw PortableGroup::MemberNotFound();
   }
 
   //////////////////////
@@ -459,8 +435,7 @@ void TAO::PG_FactoryRegistry::unregister_factory (
       ));
     if (quit_on_idle_)
     {
-        this->poa_->deactivate_object (this->object_id_.in ()
-               ACE_ENV_ARG_PARAMETER);
+        this->poa_->deactivate_object (this->object_id_.in ());
         quit_state_ = DEACTIVATED;
     }
   }
@@ -470,7 +445,6 @@ void TAO::PG_FactoryRegistry::unregister_factory (
 
 void TAO::PG_FactoryRegistry::unregister_factory_by_role (
     const char * role
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -507,8 +481,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role (
       ));
     if (quit_on_idle_)
     {
-        this->poa_->deactivate_object (this->object_id_.in ()
-               ACE_ENV_ARG_PARAMETER);
+        this->poa_->deactivate_object (this->object_id_.in ());
         quit_state_ = DEACTIVATED;
     }
   }
@@ -518,7 +491,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_role (
 
 void TAO::PG_FactoryRegistry::unregister_factory_by_location (
     const PortableGroup::Location & location
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -622,8 +594,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
       ));
     if (quit_on_idle_)
     {
-        this->poa_->deactivate_object (this->object_id_.in ()
-               ACE_ENV_ARG_PARAMETER);
+        this->poa_->deactivate_object (this->object_id_.in ());
         quit_state_ = DEACTIVATED;
     }
   }
@@ -634,7 +605,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
 ::PortableGroup::FactoryInfos * TAO::PG_FactoryRegistry::list_factories_by_role (
     const char * role,
     CORBA::String_out type_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -645,7 +615,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
   ACE_NEW_THROW_EX (result, ::PortableGroup::FactoryInfos(),
     CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO));
 
-  ACE_CHECK_RETURN (0);
 
   RoleInfo * role_info = 0;
   if (this->registry_.find(role, role_info) == 0)
@@ -667,7 +636,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
 
 ::PortableGroup::FactoryInfos * TAO::PG_FactoryRegistry::list_factories_by_location (
     const PortableGroup::Location & location
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -676,7 +644,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
   ACE_NEW_THROW_EX (result, ::PortableGroup::FactoryInfos(this->registry_.current_size()),
     CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO));
 
-   ACE_CHECK_RETURN (0);
 
   size_t result_length = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index b16268b5f66..dbc93df64f7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -88,25 +88,25 @@ namespace TAO
      * @param orbManager our ORB -- we keep var to it.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int init (CORBA::ORB_ptr orb  ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /**
      * alternative init using designated poa
      */
-    void init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
+    void init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
     /**
      * Prepare to exit.
      * @return zero for success; nonzero is process return code for failure.
      */
-    int fini (ACE_ENV_SINGLE_ARG_DECL);
+    int fini (void);
 
     /**
      * Processing to happen when the ORB's event loop is idle.
      * @param result is a place to return status to be returned by the process
      * @returns 0 to continue.  1 to quit.
      */
-    int idle(int & result ACE_ENV_ARG_DECL);
+    int idle(int & result);
 
     /**
      * Identify this object.
@@ -122,7 +122,7 @@ namespace TAO
 
     ////////////////////////////////
     // override servant base methods
-    virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+    virtual void _remove_ref (void);
 
     //////////////////
     // CORBA interface
@@ -132,7 +132,6 @@ namespace TAO
         const char * role,
         const char * type_id,
         const PortableGroup::FactoryInfo & factory_info
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -142,33 +141,28 @@ namespace TAO
     virtual void unregister_factory (
         const char * role,
         const PortableGroup::Location & location
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException, PortableGroup::MemberNotFound));
 
     virtual void unregister_factory_by_role (
         const char * role
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     virtual void unregister_factory_by_location (
       const PortableGroup::Location & location
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::PortableGroup::FactoryInfos * list_factories_by_role (
         const char * role,
         CORBA::String_out type_id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual ::PortableGroup::FactoryInfos * list_factories_by_location (
       const PortableGroup::Location & location
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 0461276bea1..b14d68eff4d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -31,7 +31,6 @@ TAO_PG_GenericFactory::TAO_PG_GenericFactory (
 
 TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   TAO_PG_Factory_Map::iterator end = this->factory_map_.end ();
   for (TAO_PG_Factory_Map::iterator i = this->factory_map_.begin ();
@@ -40,18 +39,15 @@ TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void)
     {
       TAO_PG_Factory_Set & factory_set = (*i).int_id_;
 
-      ACE_TRY
+      try
         {
           this->delete_object_i (factory_set,
-                                 1 /* Ignore exceptions */
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                 1 /* Ignore exceptions */);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore all exceptions.
         }
-      ACE_ENDTRY;
     }
 
   (void) this->factory_map_.close ();
@@ -61,8 +57,7 @@ CORBA::Object_ptr
 TAO_PG_GenericFactory::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL)
+    PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -71,9 +66,7 @@ TAO_PG_GenericFactory::create_object (
                    PortableGroup::CannotMeetCriteria))
 {
   PortableGroup::Properties_var properties =
-    this->property_manager_.get_type_properties (type_id
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    this->property_manager_.get_type_properties (type_id);
 
   PortableGroup::MembershipStyleValue membership_style =
     TAO_PG_MEMBERSHIP_STYLE;
@@ -91,9 +84,7 @@ TAO_PG_GenericFactory::create_object (
                           membership_style,
                           factory_infos,
                           initial_number_members,
-                          minimum_number_members
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                          minimum_number_members);
 
   CORBA::ULong fcid = 0;
 
@@ -136,15 +127,13 @@ TAO_PG_GenericFactory::create_object (
     this->object_group_manager_.create_object_group (fcid,
                                                      oid.in (),
                                                      type_id,
-                                                     the_criteria
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                                     the_criteria);
 
   TAO_PG_Factory_Set factory_set;
 
   const CORBA::ULong factory_infos_count = factory_infos.length ();
 
-  ACE_TRY
+  try
     {
       if (factory_infos_count > 0
           && membership_style == PortableGroup::MEMB_INF_CTRL)
@@ -153,12 +142,10 @@ TAO_PG_GenericFactory::create_object (
                                        type_id,
                                        factory_infos,
                                        initial_number_members,
-                                       factory_set
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       factory_set);
 
           if (this->factory_map_.bind (fcid, factory_set) != 0)
-            ACE_TRY_THROW (PortableGroup::ObjectNotCreated ());
+            throw PortableGroup::ObjectNotCreated ();
 
         }
 
@@ -171,27 +158,20 @@ TAO_PG_GenericFactory::create_object (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       factory_creation_id = tmp;
 
       *tmp <<= fcid;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       this->delete_object_i (factory_set,
-                             1 /* Ignore exceptions */
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             1 /* Ignore exceptions */);
 
-      this->object_group_manager_.destroy_object_group (oid.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->object_group_manager_.destroy_object_group (oid.in ());
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
@@ -210,8 +190,7 @@ TAO_PG_GenericFactory::create_object (
 void
 TAO_PG_GenericFactory::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
-      factory_creation_id
-    ACE_ENV_ARG_DECL)
+      factory_creation_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
@@ -232,16 +211,14 @@ TAO_PG_GenericFactory::delete_object (
           TAO_PG_Factory_Set & factory_set = entry->int_id_;
 
           this->delete_object_i (factory_set,
-                                 0  /* Do not ignore exceptions */
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                 0  /* Do not ignore exceptions */);
 
           if (this->factory_map_.unbind (fcid) != 0)
-            ACE_THROW (CORBA::INTERNAL ());
+            throw CORBA::INTERNAL ();
         }
     }
   else
-    ACE_THROW (PortableGroup::ObjectNotFound ());  // @@
+    throw PortableGroup::ObjectNotFound ();  // @@
                                                    //    CORBA::BAD_PARAM
                                                    //    instead?
 
@@ -252,15 +229,12 @@ TAO_PG_GenericFactory::delete_object (
 
   // Destroy the object group entry.
   this->object_group_manager_.destroy_object_group (
-    oid.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    oid.in ());
 }
 
 void
 TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
-                                        CORBA::Boolean ignore_exceptions
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Boolean ignore_exceptions)
 {
   const size_t len = factory_set.size ();
 
@@ -279,13 +253,11 @@ TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
       const PortableGroup::GenericFactory::FactoryCreationId & member_fcid =
         factory_node.factory_creation_id.in ();
 
-      ACE_TRY
+      try
         {
-          factory->delete_object (member_fcid
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          factory->delete_object (member_fcid);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Exceptions are generally only ignored when this
           // GenericFactory (not the one being invoked above) is
@@ -294,10 +266,8 @@ TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
           // members have been destroyed, and minimize the number of
           // object group members that have not been destroyed.
           if (!ignore_exceptions)
-            ACE_RE_THROW;
+            throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
 
       // Since GenericFactory::delete_object() can throw an exception,
       // decrease the size of the factory array incrementally since
@@ -311,8 +281,7 @@ TAO_PG_GenericFactory::delete_object_i (TAO_PG_Factory_Set & factory_set,
 void
 TAO_PG_GenericFactory::delete_member (
   CORBA::ULong group_id,
-  const PortableGroup::Location & location
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Location & location)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
@@ -341,9 +310,7 @@ TAO_PG_GenericFactory::delete_member (
 
           if (info.the_location == location)
             {
-              info.the_factory->delete_object (node.factory_creation_id.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              info.the_factory->delete_object (node.factory_creation_id.in ());
 
               // The member has been successfully deleted.  Reduce the
               // size of the factory_set accordingly.
@@ -384,8 +351,7 @@ TAO_PG_GenericFactory::populate_object_group (
   const char * type_id,
   const PortableGroup::FactoryInfos & factory_infos,
   PortableGroup::InitialNumberMembersValue initial_number_members,
-  TAO_PG_Factory_Set & factory_set
-  ACE_ENV_ARG_DECL)
+  TAO_PG_Factory_Set & factory_set)
 {
   CORBA::ULong factory_infos_count = factory_infos.length ();
   factory_set.size (factory_infos_count);
@@ -404,8 +370,9 @@ TAO_PG_GenericFactory::populate_object_group (
           if (CORBA::is_nil (factory))
             {
               // @@ instead InvalidProperty?
-              ACE_THROW (PortableGroup::NoFactory (factory_info.the_location,
-                                                   type_id));
+              throw PortableGroup::NoFactory (
+                factory_info.the_location,
+                type_id);
             }
 
           // Do not allow the PortableGroup::MemberAlreadyPresent
@@ -416,9 +383,7 @@ TAO_PG_GenericFactory::populate_object_group (
             this->create_member (object_group,
                                  factory_info,
                                  type_id,
-                                 propagate_member_already_present
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                 propagate_member_already_present);
         }
 
       factory_node.factory_info = factory_info;  // Memberwise copy
@@ -467,14 +432,11 @@ TAO_PG_GenericFactory::process_criteria (
   PortableGroup::MembershipStyleValue & membership_style,
   PortableGroup::FactoriesValue & factory_infos,
   PortableGroup::InitialNumberMembersValue & initial_number_members,
-  PortableGroup::MinimumNumberMembersValue & minimum_number_members
-  ACE_ENV_ARG_DECL)
+  PortableGroup::MinimumNumberMembersValue & minimum_number_members)
 {
   // Get type-specific properties.
   PortableGroup::Properties_var props =
-    this->property_manager_.get_type_properties (type_id
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->property_manager_.get_type_properties (type_id);
 
   // Merge the given criteria with the type-specific criteria.
   TAO_PG::override_properties (criteria, props.inout ());
@@ -503,7 +465,7 @@ TAO_PG_GenericFactory::process_criteria (
     {
       // This only occurs if extraction of the actual value from the
       // Any fails.
-      ACE_THROW (PortableGroup::InvalidProperty (name, value));
+      throw PortableGroup::InvalidProperty (name, value);
     }
 
   // Factories
@@ -514,7 +476,7 @@ TAO_PG_GenericFactory::process_criteria (
     {
       // This only occurs if extraction of the actual value from the
       // Any fails.
-      ACE_THROW (PortableGroup::InvalidProperty (name, value1));
+      throw PortableGroup::InvalidProperty (name, value1);
     }
 
   const CORBA::ULong factory_infos_count =
@@ -528,7 +490,7 @@ TAO_PG_GenericFactory::process_criteria (
     {
       // This only occurs if extraction of the actual value from the
       // Any fails.
-      ACE_THROW (PortableGroup::InvalidProperty (name, value2));
+      throw PortableGroup::InvalidProperty (name, value2);
     }
 
   if (membership_style == PortableGroup::MEMB_INF_CTRL)
@@ -552,7 +514,7 @@ TAO_PG_GenericFactory::process_criteria (
     {
       // This only occurs if extraction of the actual value from the
       // Any fails.
-      ACE_THROW (PortableGroup::InvalidProperty (name, value3));
+      throw PortableGroup::InvalidProperty (name, value3);
     }
 
   // If the minimum number of members is less than the initial number
@@ -585,7 +547,7 @@ TAO_PG_GenericFactory::process_criteria (
       // deallocations should occur.
       unmet_criteria.length (uc);
 
-      ACE_THROW (PortableGroup::CannotMeetCriteria (unmet_criteria));
+      throw PortableGroup::CannotMeetCriteria (unmet_criteria);
     }
 }
 
@@ -593,8 +555,7 @@ void
 TAO_PG_GenericFactory::check_minimum_number_members (
   PortableGroup::ObjectGroup_ptr object_group,
   CORBA::ULong group_id,
-  const char * type_id
-  ACE_ENV_ARG_DECL)
+  const char * type_id)
 {
   // Check if we've dropped below the MinimumNumberMembers threshold.
   // If so, attempt to create enough new members to fill the gap.
@@ -609,9 +570,7 @@ TAO_PG_GenericFactory::check_minimum_number_members (
   TAO_PG_Factory_Set & factory_set = entry->int_id_;
 
   PortableGroup::Properties_var props =
-    this->property_manager_.get_properties (object_group
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->property_manager_.get_properties (object_group);
 
   PortableGroup::Name name (1);
   name.length (1);
@@ -630,13 +589,11 @@ TAO_PG_GenericFactory::check_minimum_number_members (
         {
           // This only occurs if extraction of the actual value from
           // the Any fails.  It shouldn't fail at this point.
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       const CORBA::ULong count =
-        this->object_group_manager_.member_count (object_group
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->object_group_manager_.member_count (object_group);
 
       if (count >= static_cast<CORBA::ULong> (minimum_number_members))
         return;
@@ -663,7 +620,7 @@ TAO_PG_GenericFactory::check_minimum_number_members (
           if (tmp_fcid != nil_fcid)
             continue;
 
-          ACE_TRY
+          try
             {
               const CORBA::Boolean propagate_member_already_present = 1;
 
@@ -671,9 +628,7 @@ TAO_PG_GenericFactory::check_minimum_number_members (
                 this->create_member (object_group,
                                      node.factory_info,
                                      type_id,
-                                     propagate_member_already_present
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                     propagate_member_already_present);
 
               ++creation_count;
 
@@ -682,12 +637,10 @@ TAO_PG_GenericFactory::check_minimum_number_members (
               if (gap == creation_count)
                 return;
             }
-          ACE_CATCH (PortableGroup::MemberAlreadyPresent, ex)
+          catch (const PortableGroup::MemberAlreadyPresent&)
             {
               // Ignore this exception and continue.
             }
-          ACE_ENDTRY;
-          ACE_CHECK;
         }
 
       // @todo If we get this far, and the MinimumNumberMembers
@@ -701,8 +654,7 @@ TAO_PG_GenericFactory::create_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::FactoryInfo & factory_info,
     const char * type_id,
-    const CORBA::Boolean propagate_member_already_present
-    ACE_ENV_ARG_DECL)
+    const CORBA::Boolean propagate_member_already_present)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -716,11 +668,9 @@ TAO_PG_GenericFactory::create_member (
   CORBA::Object_var member =
     factory_info.the_factory->create_object (type_id,
                                              factory_info.the_criteria,
-                                             fcid.out ()
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                             fcid.out ());
 
-  ACE_TRY
+  try
     {
       // @@ Should an "_is_a()" be performed here?  While it
       //    appears to be the right thing to do, it can be
@@ -731,21 +681,16 @@ TAO_PG_GenericFactory::create_member (
       // created if the type_id parameter does not match the
       // type of object the GenericFactory creates.
       CORBA::Boolean right_type_id =
-        member->_is_a (type_id
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        member->_is_a (type_id);
 
       // @todo Strategize this -- e.g. strict type checking.
       if (!right_type_id)
         {
           // An Object of incorrect type was created.  Delete
           // it, and throw a NoFactory exception.
-          factory_info.the_factory->delete_object (fcid.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          factory_info.the_factory->delete_object (fcid.in ());
 
-          ACE_TRY_THROW (PortableGroup::NoFactory (factory_info.the_location,
-                                                   type_id));
+          throw PortableGroup::NoFactory (factory_info.the_location, type_id);
         }
 
       this->object_group_manager_._tao_add_member (
@@ -753,26 +698,20 @@ TAO_PG_GenericFactory::create_member (
         factory_info.the_location,
         member.in (),
         type_id,
-        propagate_member_already_present
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        propagate_member_already_present);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // If the member reference is not nil, then the factory
       // was successfully invoked.  Since an exception was
       // thrown, clean up the up created member.
       if (!CORBA::is_nil (member.in ()))
         {
-          factory_info.the_factory->delete_object (fcid.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          factory_info.the_factory->delete_object (fcid.in ());
         }
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return fcid._retn ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 96b725c941a..9d01a0cfc25 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -74,8 +74,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NoFactory,
                      PortableGroup::ObjectNotCreated,
@@ -91,8 +90,7 @@ public:
    */
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectNotFound));
 
@@ -110,8 +108,7 @@ public:
    * factories.
    */
   void delete_object_i (TAO_PG_Factory_Set & factory_set,
-                        CORBA::Boolean ignore_exceptions
-                        ACE_ENV_ARG_DECL);
+                        CORBA::Boolean ignore_exceptions);
 
   /// If the member corresponding to the given group ID and location
   /// was created by the infrastructure, call delete_object() on the
@@ -121,8 +118,7 @@ public:
    * when ObjectGroupManager::remove_member() is explicitly called.
    */
   void delete_member (CORBA::ULong group_id,
-                      const PortableGroup::Location & location
-                      ACE_ENV_ARG_DECL);
+                      const PortableGroup::Location & location);
 
   /// Verify that the MinimumNumberMembers criterion is satisfied.
   /**
@@ -135,8 +131,7 @@ public:
   void check_minimum_number_members (
     PortableGroup::ObjectGroup_ptr object_group,
     CORBA::ULong group_id,
-    const char * type_id
-    ACE_ENV_ARG_DECL);
+    const char * type_id);
 
   /// Create a new object group member using the supplied FactoryInfo
   /// and RepositoryId and add it to the given object group.
@@ -147,8 +142,7 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::FactoryInfo & factory_info,
       const char * type_id,
-      const CORBA::Boolean propagate_member_already_present
-      ACE_ENV_ARG_DECL)
+      const CORBA::Boolean propagate_member_already_present)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NoFactory,
                      PortableGroup::ObjectNotCreated,
@@ -167,8 +161,7 @@ private:
          const char * type_id,
          const PortableGroup::FactoryInfos &factory_infos,
          PortableGroup::InitialNumberMembersValue initial_number_members,
-         TAO_PG_Factory_Set & factory_set
-         ACE_ENV_ARG_DECL);
+         TAO_PG_Factory_Set & factory_set);
 
   /// Get a new ObjectId to be used when creating a new ObjectGroup.
   /**
@@ -197,8 +190,7 @@ private:
     PortableGroup::MembershipStyleValue & membership_style,
     PortableGroup::FactoriesValue & factory_infos,
     PortableGroup::InitialNumberMembersValue & initial_number_members,
-    PortableGroup::MinimumNumberMembersValue & minimum_number_members
-    ACE_ENV_ARG_DECL);
+    PortableGroup::MinimumNumberMembersValue & minimum_number_members);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 3c84812d454..2b6abd2903b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -49,8 +49,7 @@ TAO::PG_Group_Factory::~PG_Group_Factory (void)
 void TAO::PG_Group_Factory::init (
   CORBA::ORB_ptr orb,
   PortableServer::POA_ptr poa,
-  PortableGroup::FactoryRegistry_ptr factory_registry
-  ACE_ENV_ARG_DECL)
+  PortableGroup::FactoryRegistry_ptr factory_registry)
 {
   ACE_ASSERT (CORBA::is_nil (this->orb_.in ()));
   ACE_ASSERT (CORBA::is_nil (this->poa_.in ()));
@@ -65,16 +64,14 @@ void TAO::PG_Group_Factory::init (
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->factory_registry_.in ()));
 
-  this->manipulator_.init (orb, poa ACE_ENV_ARG_PARAMETER);
-//  ACE_CHECK;
+  this->manipulator_.init (orb, poa);
 }
 
 
 TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
-    TAO::PG_Property_Set * typeid_properties
-    ACE_ENV_ARG_DECL)
+    TAO::PG_Property_Set * typeid_properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -90,9 +87,7 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
     this->manipulator_.create_object_group (
       type_id,
       this->domain_id_,
-      group_id
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+      group_id);
 
   // pick up the object group information as assigned by
   // ObjectGroupManager
@@ -127,26 +122,24 @@ TAO::PG_Object_Group * TAO::PG_Group_Factory::create_group (
   return objectGroup;
 }
 
-void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
   if (! destroy_group (object_group))
   {
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
   }
 }
 
 
-void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroupId group_id
-    ACE_ENV_ARG_DECL)
+void TAO::PG_Group_Factory::delete_group (PortableGroup::ObjectGroupId group_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotFound))
 {
   if (! destroy_group (group_id))
   {
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
   }
 }
 
@@ -199,8 +192,7 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroup_ptr object_
 
 PortableGroup::ObjectGroups *
 TAO::PG_Group_Factory::groups_at_location (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   size_t upper_limit = this->group_map_.current_size ();
@@ -209,7 +201,6 @@ TAO::PG_Group_Factory::groups_at_location (
     result,
     PortableGroup::ObjectGroups (upper_limit),
     CORBA::NO_MEMORY());
-  ACE_CHECK_RETURN (0);
 
   result->length(upper_limit);
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index b9bd1309492..a42ba34d67a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -80,15 +80,13 @@ namespace TAO
     void init (
       CORBA::ORB_ptr orb,
       PortableServer::POA_ptr poa,
-      PortableGroup::FactoryRegistry_ptr factory_registry
-      ACE_ENV_ARG_DECL);
+      PortableGroup::FactoryRegistry_ptr factory_registry);
 
 
     TAO::PG_Object_Group * create_group (
         const char * type_id,
         const PortableGroup::Criteria & the_criteria,
-        TAO::PG_Property_Set * typeid_properties
-        ACE_ENV_ARG_DECL)
+        TAO::PG_Property_Set * typeid_properties)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::NoFactory,
                        PortableGroup::ObjectNotCreated,
@@ -97,21 +95,18 @@ namespace TAO
                        PortableGroup::CannotMeetCriteria));
 
 
-    void delete_group (PortableGroup::ObjectGroup_ptr object_group
-        ACE_ENV_ARG_DECL)
+    void delete_group (PortableGroup::ObjectGroup_ptr object_group)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::ObjectNotFound));
 
 
-    void delete_group (PortableGroup::ObjectGroupId group_id
-        ACE_ENV_ARG_DECL)
+    void delete_group (PortableGroup::ObjectGroupId group_id)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::ObjectNotFound));
 
     PortableGroup::ObjectGroups *
     groups_at_location (
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ( (CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
index dc93a9e2e2c..43f192ddb25 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -28,25 +28,20 @@ TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void)
 {
   if (!this->released_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           this->generic_factory_.delete_object_i (this->factory_set_,
                                                   1  // Ignore exceptions
-                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                  );
 
           // This should never throw an exception if this Guard is
           // used properly.
-          this->group_manager_.destroy_object_group (this->oid_
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->group_manager_.destroy_object_group (this->oid_);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ignore all exceptions.
         }
-      ACE_ENDTRY;
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
index 5251b3d7931..4fd9fac28f1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -9,8 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_PG_Null_Property_Validator::validate_property (
-    const PortableGroup::Properties &
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const PortableGroup::Properties &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -19,8 +18,7 @@ TAO_PG_Null_Property_Validator::validate_property (
 
 void
 TAO_PG_Null_Property_Validator::validate_criteria (
-    const PortableGroup::Properties &
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const PortableGroup::Properties &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidCriteria,
                    PortableGroup::CannotMeetCriteria))
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
index 41047a90c99..b9f6dc18f15 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
@@ -41,8 +41,7 @@ public:
    * This particular implementation performs no validation
    * whatsoever.
    */
-  void validate_property (const PortableGroup::Properties & props
-                          ACE_ENV_ARG_DECL)
+  void validate_property (const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -52,8 +51,7 @@ public:
    * This particular implementation performs no validation
    * whatsoever.
    */
-  void validate_criteria (const PortableGroup::Properties & criteria
-                          ACE_ENV_ARG_DECL)
+  void validate_criteria (const PortableGroup::Properties & criteria)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidCriteria,
                      PortableGroup::CannotMeetCriteria));
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 7b78ef895bc..ff196d2d32c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -51,8 +51,7 @@ TAO_PG_ObjectGroupManager::create_member (
     PortableGroup::ObjectGroup_ptr /* object_group */,
     const PortableGroup::Location & /* the_location */,
     const char * /* type_id */,
-    const PortableGroup::Criteria & /* the_criteria */
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Criteria & /* the_criteria */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -69,8 +68,7 @@ PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
-    CORBA::Object_ptr member
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr member)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -92,8 +90,7 @@ TAO_PG_ObjectGroupManager::add_member (
   return this->add_member_i (object_group,
                              the_location,
                              member,
-                             check_type_id
-                             ACE_ENV_ARG_PARAMETER);
+                             check_type_id);
 
 }
 
@@ -104,8 +101,7 @@ TAO_PG_ObjectGroupManager::_tao_add_member (
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member,
     const char * type_id,
-    const CORBA::Boolean propagate_member_already_present
-    ACE_ENV_ARG_DECL)
+    const CORBA::Boolean propagate_member_already_present)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::MemberAlreadyPresent,
                    PortableGroup::NoFactory))
@@ -121,7 +117,7 @@ TAO_PG_ObjectGroupManager::_tao_add_member (
 
   PortableGroup::ObjectGroup_var new_group;
 
-  ACE_TRY
+  try
     {
       // TypeId already checked by GenericFactory.
       const CORBA::Boolean check_type_id = 0;
@@ -129,28 +125,23 @@ TAO_PG_ObjectGroupManager::_tao_add_member (
       new_group = this->add_member_i (object_group,
                                       the_location,
                                       member,
-                                      check_type_id
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      check_type_id);
     }
-  ACE_CATCH (PortableGroup::ObjectGroupNotFound, ex)
+  catch (const PortableGroup::ObjectGroupNotFound&)
     {
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::MemberAlreadyPresent, ex)
+  catch (const PortableGroup::MemberAlreadyPresent&)
     {
       if (propagate_member_already_present)
-        ACE_RE_THROW;
+        throw;
       else
-        ACE_TRY_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::ObjectNotAdded, ex)
+  catch (const PortableGroup::ObjectNotAdded&)
     {
-      ACE_TRY_THROW (PortableGroup::NoFactory (the_location,
-                                               type_id));
+      throw PortableGroup::NoFactory (the_location, type_id);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
 
   return new_group._retn ();
 }
@@ -160,26 +151,21 @@ TAO_PG_ObjectGroupManager::add_member_i (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member,
-    const CORBA::Boolean check_type_id
-    ACE_ENV_ARG_DECL)
+    const CORBA::Boolean check_type_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
                    PortableGroup::ObjectNotAdded))
 {
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+    this->get_group_entry (object_group);
 
   if (check_type_id)
     {
       CORBA::Boolean right_type_id =
         this->valid_type_id (object_group,
                              group_entry,
-                             member
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+                             member);
 
       if (!right_type_id)
         {
@@ -209,7 +195,6 @@ TAO_PG_ObjectGroupManager::add_member_i (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_PG_ObjectGroup_Array> safe_groups (groups);
 
@@ -242,8 +227,7 @@ TAO_PG_ObjectGroupManager::add_member_i (
 PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -251,9 +235,7 @@ TAO_PG_ObjectGroupManager::remove_member (
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+    this->get_group_entry (object_group);
 
   TAO_PG_ObjectGroup_Array * groups = 0;
   if (this->location_map_.find (the_location, groups) != 0)
@@ -296,9 +278,7 @@ TAO_PG_ObjectGroupManager::remove_member (
           if (this->generic_factory_)
             {
               this->generic_factory_->delete_member (group_entry->group_id,
-                                                     the_location
-                                                     ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+                                                     the_location);
             }
 
           if (member_infos.remove (info) == 0)
@@ -308,9 +288,7 @@ TAO_PG_ObjectGroupManager::remove_member (
                   this->generic_factory_->check_minimum_number_members (
                     object_group,
                     group_entry->group_id,
-                    group_entry->type_id.in ()
-                    ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+                    group_entry->type_id.in ());
                 }
 
               return PortableGroup::ObjectGroup::_duplicate (object_group);
@@ -326,17 +304,14 @@ TAO_PG_ObjectGroupManager::remove_member (
 
 PortableGroup::Locations *
 TAO_PG_ObjectGroupManager::locations_of_members (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_group_entry (object_group);
 
   PortableGroup::Locations *temp = 0;
   ACE_NEW_THROW_EX (temp,
@@ -346,7 +321,6 @@ TAO_PG_ObjectGroupManager::locations_of_members (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   PortableGroup::Locations_var locations = temp;
 
@@ -367,15 +341,13 @@ TAO_PG_ObjectGroupManager::locations_of_members (
 
 PortableGroup::ObjectGroups *
 TAO_PG_ObjectGroupManager::groups_at_location (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableGroup::ObjectGroups * ogs;
   ACE_NEW_THROW_EX (ogs,
                     PortableGroup::ObjectGroups,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   PortableGroup::ObjectGroups_var object_groups = ogs;
 
@@ -401,8 +373,7 @@ TAO_PG_ObjectGroupManager::groups_at_location (
 
 PortableGroup::ObjectGroupId
 TAO_PG_ObjectGroupManager::get_object_group_id (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -412,9 +383,7 @@ TAO_PG_ObjectGroupManager::get_object_group_id (
                     0);
 
   TAO_PG_ObjectGroup_Map_Entry * entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_group_entry (object_group);
 
   if (entry == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -426,8 +395,7 @@ TAO_PG_ObjectGroupManager::get_object_group_id (
 
 PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::get_object_group_ref (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -440,9 +408,7 @@ TAO_PG_ObjectGroupManager::get_object_group_ref (
                       PortableGroup::ObjectGroup::_nil ());
 
 
-    entry = this->get_group_entry (object_group
-                                   ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+    entry = this->get_group_entry (object_group);
   }
 
   if (entry == 0)
@@ -456,8 +422,7 @@ TAO_PG_ObjectGroupManager::get_object_group_ref (
 CORBA::Object_ptr
 TAO_PG_ObjectGroupManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
-    const PortableGroup::Location & loc
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & loc)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberNotFound))
@@ -468,9 +433,7 @@ TAO_PG_ObjectGroupManager::get_member_ref (
                     CORBA::Object::_nil ());
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+    this->get_group_entry (object_group);
 
   // This method assumes that it is faster to check for non-existence
   // of an object group (and hence the member) at a given location,
@@ -504,7 +467,6 @@ TAO_PG_ObjectGroupManager::get_member_ref (
 PortableGroup::ObjectGroup_ptr
 TAO_PG_ObjectGroupManager::get_object_group_ref_from_id (
         PortableGroup::ObjectGroupId group_id
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -546,8 +508,7 @@ TAO_PG_ObjectGroupManager::create_object_group (
   CORBA::ULong group_id,
   const PortableServer::ObjectId &oid,
   const char * type_id,
-  const PortableGroup::Criteria & the_criteria
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Criteria & the_criteria)
 {
   if (CORBA::is_nil (this->poa_.in ()))
     ACE_THROW_RETURN (CORBA::INTERNAL (), CORBA::Object::_nil ());
@@ -556,9 +517,7 @@ TAO_PG_ObjectGroupManager::create_object_group (
   // RepositoryId of the object being created.
   CORBA::Object_var object_group =
     this->poa_->create_reference_with_id (oid,
-                                          type_id
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                          type_id);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   ACE_NEW_THROW_EX (group_entry,
@@ -568,7 +527,6 @@ TAO_PG_ObjectGroupManager::create_object_group (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   auto_ptr<TAO_PG_ObjectGroup_Map_Entry> safe_group_entry (group_entry);
 
@@ -603,22 +561,20 @@ TAO_PG_ObjectGroupManager::create_object_group (
 
 void
 TAO_PG_ObjectGroupManager::destroy_object_group (
-  const PortableServer::ObjectId & oid
-  ACE_ENV_ARG_DECL)
+  const PortableServer::ObjectId & oid)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   if (this->object_group_map_.unbind (oid, group_entry) != 0)
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
 
   delete group_entry;
 }
 
 char *
 TAO_PG_ObjectGroupManager::type_id (
-  PortableGroup::ObjectGroup_ptr object_group
-  ACE_ENV_ARG_DECL)
+  PortableGroup::ObjectGroup_ptr object_group)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -626,9 +582,7 @@ TAO_PG_ObjectGroupManager::type_id (
                     0);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (object_group
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_group_entry (object_group);
 
   return CORBA::string_dup (group_entry->type_id.in ());
 }
@@ -651,8 +605,7 @@ TAO_PG_ObjectGroupManager::object_group (const PortableServer::ObjectId & oid)
 
 CORBA::ULong
 TAO_PG_ObjectGroupManager::member_count (
-    PortableGroup::ObjectGroup_ptr group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -662,9 +615,7 @@ TAO_PG_ObjectGroupManager::member_count (
 //                     0);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry =
-    this->get_group_entry (group
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_group_entry (group);
 
   return static_cast<CORBA::ULong> (group_entry->member_infos.size ());
 }
@@ -678,8 +629,7 @@ TAO_PG_ObjectGroupManager::poa (PortableServer::POA_ptr p)
 
 PortableGroup::Properties *
 TAO_PG_ObjectGroupManager::get_properties (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -691,7 +641,6 @@ TAO_PG_ObjectGroupManager::get_properties (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   PortableGroup::Properties_var safe_properties = properties;
 
@@ -702,9 +651,7 @@ TAO_PG_ObjectGroupManager::get_properties (
                       0);
 
     TAO_PG_ObjectGroup_Map_Entry * group_entry =
-      this->get_group_entry (object_group
-                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->get_group_entry (object_group);
 
     *properties = group_entry->properties;
   }
@@ -714,8 +661,7 @@ TAO_PG_ObjectGroupManager::get_properties (
 
 TAO_PG_ObjectGroup_Map_Entry *
 TAO_PG_ObjectGroupManager::get_group_entry (
-    CORBA::Object_ptr object_group
-    ACE_ENV_ARG_DECL)
+    CORBA::Object_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -723,28 +669,24 @@ TAO_PG_ObjectGroupManager::get_group_entry (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   PortableServer::ObjectId_var oid;
-  ACE_TRY
+  try
     {
-      oid = this->poa_->reference_to_id (object_group
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      oid = this->poa_->reference_to_id (object_group);
     }
-  ACE_CATCH (PortableServer::POA::WrongAdapter, ex)
+  catch (const PortableServer::POA::WrongAdapter& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex, "TAO_PG (%P|%t) Unexpected exception\n");
+        ex._tao_print_exception ("TAO_PG (%P|%t) Unexpected exception\n");
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableServer::POA::WrongPolicy, ex)
+  catch (const PortableServer::POA::WrongPolicy& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ex, "TAO_PG (%P|%t) Unexpected exception\n");
+        ex._tao_print_exception ("TAO_PG (%P|%t) Unexpected exception\n");
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   TAO_PG_ObjectGroup_Map_Entry * group_entry = 0;
   if (this->object_group_map_.find (oid.in (), group_entry) != 0)
@@ -810,8 +752,7 @@ CORBA::Boolean
 TAO_PG_ObjectGroupManager::valid_type_id (
   PortableGroup::ObjectGroup_ptr object_group,
   TAO_PG_ObjectGroup_Map_Entry * group_entry,
-  CORBA::Object_ptr member
-  ACE_ENV_ARG_DECL)
+  CORBA::Object_ptr member)
 {
   // @todo Strategize this -- e.g. strict type checking.
 
@@ -847,16 +788,12 @@ TAO_PG_ObjectGroupManager::valid_type_id (
     // type_id parameter does not match the type of object the
     // GenericFactory creates.
     right_type_id =
-      member->_is_a (type_id.in ()
-                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (right_type_id);
+      member->_is_a (type_id.in ());
   }
 
   // Make sure the group entry still exists.  It may have been
   // destroyed by another thread.
-  group_entry = this->get_group_entry (object_group
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (right_type_id);
+  group_entry = this->get_group_entry (object_group);
 
   return right_type_id;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index b78cc4028f3..2b0505f50cc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -68,8 +68,7 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
       const char * type_id,
-      const PortableGroup::Criteria & the_criteria
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Criteria & the_criteria)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberAlreadyPresent,
@@ -82,8 +81,7 @@ public:
   virtual PortableGroup::ObjectGroup_ptr add_member (
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
-      CORBA::Object_ptr member
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Object_ptr member)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberAlreadyPresent,
@@ -98,37 +96,32 @@ public:
    */
   virtual PortableGroup::ObjectGroup_ptr remove_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::Locations * locations_of_members (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::ObjectGroups * groups_at_location (
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & the_location)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroupId get_object_group_id (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -136,8 +129,7 @@ public:
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & loc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Location & loc)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::MemberNotFound));
@@ -147,7 +139,6 @@ public:
    */
    virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
         PortableGroup::ObjectGroupId group_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -168,8 +159,7 @@ public:
       const PortableGroup::Location & the_location,
       CORBA::Object_ptr member,
       const char * type_id,
-      const CORBA::Boolean propagate_member_already_present
-      ACE_ENV_ARG_DECL)
+      const CORBA::Boolean propagate_member_already_present)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::MemberAlreadyPresent,
                      PortableGroup::NoFactory));
@@ -184,28 +174,24 @@ public:
     CORBA::ULong group_id,
     const PortableServer::ObjectId &oid,
     const char * type_id,
-    const PortableGroup::Criteria & the_criteria
-    ACE_ENV_ARG_DECL);
+    const PortableGroup::Criteria & the_criteria);
 
   /// Destroy the object group corresponding to the given ObjectId.
   /**
    * @note This method is used mainly by the
    *       GenericFactory::delete_object() method.
    */
-  void destroy_object_group (const PortableServer::ObjectId & oid
-                             ACE_ENV_ARG_DECL);
+  void destroy_object_group (const PortableServer::ObjectId & oid);
 
   /// Return the properties set when the object group was created, and
   /// the dynamic properties that may have overridden them.
   PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
   /// Return the type_id for the given object group.
-  char * type_id (PortableGroup::ObjectGroup_ptr object_group
-                  ACE_ENV_ARG_DECL);
+  char * type_id (PortableGroup::ObjectGroup_ptr object_group);
 
   /// Return the object group associated with the given ObjectId.
   /**
@@ -216,8 +202,7 @@ public:
     const PortableServer::ObjectId & oid);
 
   /// Return the number of members in the given object group.
-  CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group
-                             ACE_ENV_ARG_DECL)
+  CORBA::ULong member_count (PortableGroup::ObjectGroup_ptr group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -243,8 +228,7 @@ protected:
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member,
-    const CORBA::Boolean check_type_id
-    ACE_ENV_ARG_DECL)
+    const CORBA::Boolean check_type_id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::MemberAlreadyPresent,
@@ -253,8 +237,7 @@ protected:
   /// Obtain the ObjectGroup hash map entry corresponding to the given
   /// ObjectGroup reference.
   TAO_PG_ObjectGroup_Map_Entry * get_group_entry (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -282,8 +265,7 @@ protected:
   CORBA::Boolean valid_type_id (
     PortableGroup::ObjectGroup_ptr object_group,
     TAO_PG_ObjectGroup_Map_Entry * group_entry,
-    CORBA::Object_ptr member
-    ACE_ENV_ARG_DECL);
+    CORBA::Object_ptr member);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 09d492e76a0..75649198581 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -150,8 +150,7 @@ TAO::PG_Object_Group::get_primary_location (void) const
 
 
 PortableGroup::ObjectGroup_ptr
-TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member
-                                          ACE_ENV_ARG_DECL)
+TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member)
 {
   // assume internals is locked
 
@@ -175,9 +174,7 @@ TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member
       // create_object.
       cleaned =
         this->manipulator_.remove_profiles (cleaned.in (),
-                                            this->reference_.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil());
+                                            this->reference_.in ());
       this->empty_ = 0;
     }
 
@@ -189,15 +186,13 @@ TAO::PG_Object_Group::add_member_to_iogr (CORBA::Object_ptr member
 
   // Now merge the list into one new IOGR
   result =
-    this->manipulator_.merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil ());
+    this->manipulator_.merge_iors (iors);
   return result._retn ();
 }
 
 void
 TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
-                                  CORBA::Object_ptr member
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Object_ptr member)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectNotAdded))
 
@@ -212,20 +207,14 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
   // to replicas.
 
   CORBA::String_var member_ior_string =
-    orb_->object_to_string (member
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb_->object_to_string (member);
 
   PortableGroup::ObjectGroup_var new_reference =
-    add_member_to_iogr (member
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    add_member_to_iogr (member);
 
   // Convert new member back to a (non group) ior.
   CORBA::Object_var member_ior =
-    this->orb_->string_to_object (member_ior_string.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->string_to_object (member_ior_string.in ());
 
   MemberInfo * info = 0;
   ACE_NEW_THROW_EX (info,
@@ -236,19 +225,18 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
   if (this->members_.bind (the_location, info) != 0)
     {
       // @@ Dale why this is a NO MEMORY exception?
-      ACE_THROW(CORBA::NO_MEMORY());
+      throw CORBA::NO_MEMORY();
     }
 
   this->reference_ = new_reference; // note var-to-var assignment does
                                     // a duplicate
   if (this->increment_version ())
     {
-      this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->distribute_iogr ();
     }
   else
     {
-      ACE_THROW (PortableGroup::ObjectNotAdded ());
+      throw PortableGroup::ObjectNotAdded ();
     }
 
   if (TAO_debug_level > 6)
@@ -261,8 +249,7 @@ TAO::PG_Object_Group::add_member (const PortableGroup::Location & the_location,
 int
 TAO::PG_Object_Group::set_primary_member (
     TAO_IOP::TAO_IOR_Property * prop,
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::MemberNotFound))
 {
@@ -288,9 +275,7 @@ TAO::PG_Object_Group::set_primary_member (
       int set_ok =
         this->manipulator_.set_primary (prop,
                                         this->reference_.in (),
-                                        info->member_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                        info->member_.in ());
       if (!set_ok)
         {
           if (TAO_debug_level > 3)
@@ -306,8 +291,7 @@ TAO::PG_Object_Group::set_primary_member (
 
       if (result && this->increment_version ())
         {
-          this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->distribute_iogr ();
         }
       else
         {
@@ -341,8 +325,7 @@ TAO::PG_Object_Group::set_primary_member (
 
 void
 TAO::PG_Object_Group::remove_member (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::MemberNotFound))
 {
@@ -354,9 +337,7 @@ TAO::PG_Object_Group::remove_member (
         {
           this->reference_ =
             this->manipulator_.remove_profiles (this->reference_.in (),
-                                                info->member_.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                                info->member_.in ());
         }
       else
         {
@@ -372,8 +353,7 @@ TAO::PG_Object_Group::remove_member (
 
       if (this->increment_version ())
         {
-          this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->distribute_iogr ();
         }
 
     }
@@ -386,7 +366,7 @@ TAO::PG_Object_Group::remove_member (
                       "remove_member throwing MemberNotFound.\n"
                       ));
         }
-      ACE_THROW (PortableGroup::MemberNotFound() );
+      throw PortableGroup::MemberNotFound();
     }
 }
 
@@ -403,15 +383,14 @@ TAO::PG_Object_Group::get_object_group_id (void) const
 
 void
 TAO::PG_Object_Group::set_properties_dynamically (
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
-  this->properties_.decode (overrides ACE_ENV_ARG_PARAMETER);
+  this->properties_.decode (overrides);
 
   //@@ int todo_override_rather_than_replace?
 }
@@ -467,13 +446,11 @@ TAO::PG_Object_Group::increment_version (void)
 //////////////////
 // Internal method
 void
-TAO::PG_Object_Group::distribute_iogr (ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Object_Group::distribute_iogr (void)
 {
   // assume internals is locked
   CORBA::String_var iogr =
-    this->orb_->object_to_string (this->reference_.in()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->object_to_string (this->reference_.in());
 
 //  size_t n_rep = 0; // for dump_ior below
   for (MemberMap_Iterator it = this->members_.begin();
@@ -492,7 +469,7 @@ TAO::PG_Object_Group::distribute_iogr (ACE_ENV_SINGLE_ARG_DECL)
         PortableGroup::TAO_UpdateObjectGroup::_narrow ( info->member_.in ());
       if (!CORBA::is_nil (uog.in ()))
         {
-          ACE_TRY_NEW_ENV
+          try
             {
               if (TAO_debug_level > 3)
                 {
@@ -505,20 +482,17 @@ TAO::PG_Object_Group::distribute_iogr (ACE_ENV_SINGLE_ARG_DECL)
                               ));
                 }
               //        dump_ior ("group", "iogr", this->tagged_component_.object_group_ref_version, iogr);
-              //        CORBA::String_var replica_ior = this->orb_->object_to_string(uog.in() ACE_ENV_ARG_PARAMETER);
+              //        CORBA::String_var replica_ior = this->orb_->object_to_string(uog.in());
               //        dump_ior (info->location_[0].id, "ior", (this->tagged_component_.object_group_ref_version * 100) + n_rep++, replica_ior);
               uog->tao_update_object_group (iogr.in (),
                                             this->tagged_component_.object_group_ref_version,
-                                            info->is_primary_
-                                            ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                            info->is_primary_);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               // we expect an exception
               // tao_update_object_group is not a real method
             }
-          ACE_ENDTRY;
         }
       else
         {
@@ -532,7 +506,7 @@ TAO::PG_Object_Group::distribute_iogr (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableGroup::Locations *
-TAO::PG_Object_Group::locations_of_members (ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Object_Group::locations_of_members (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
@@ -548,7 +522,6 @@ TAO::PG_Object_Group::locations_of_members (ACE_ENV_SINGLE_ARG_DECL)
     result,
     PortableGroup::Locations (count),
     CORBA::NO_MEMORY() );
-  ACE_CHECK_RETURN (0);
 
   result->length (count);
 
@@ -566,8 +539,7 @@ TAO::PG_Object_Group::locations_of_members (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Object_ptr
 TAO::PG_Object_Group::get_member_reference (
-    const PortableGroup::Location & the_location
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Location & the_location)
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     PortableGroup::MemberNotFound))
@@ -636,8 +608,7 @@ void
 TAO::PG_Object_Group::create_member (
     const PortableGroup::Location & the_location,
     const char * type_id,
-    const PortableGroup::Criteria & the_criteria
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Criteria & the_criteria)
   ACE_THROW_SPEC ( (CORBA::SystemException,
     PortableGroup::MemberAlreadyPresent,
     PortableGroup::NoFactory,
@@ -656,9 +627,7 @@ TAO::PG_Object_Group::create_member (
       PortableGroup::FactoryInfos_var factories =
         this->factory_registry_->list_factories_by_role (
           role_.c_str(),
-          factory_type.out ()
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          factory_type.out ());
 
       // @@ what if factory_type != type_id != this->type_id_
 
@@ -680,27 +649,19 @@ TAO::PG_Object_Group::create_member (
                 factory_info.the_factory->create_object (
                   type_id,
                   the_criteria,
-                  fcid. out()
-                  ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                  fcid. out());
 
               // convert the new member to a stringified IOR to avoid
               // contamination with group info
               CORBA::String_var member_ior_string =
-                orb_->object_to_string (member.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                orb_->object_to_string (member.in ());
 
               PortableGroup::ObjectGroup_var new_reference =
-                this->add_member_to_iogr (member.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                this->add_member_to_iogr (member.in ());
 
               // Convert new member back to a (non group) ior.
               CORBA::Object_var member_ior =
-                this->orb_->string_to_object (member_ior_string.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                this->orb_->string_to_object (member_ior_string.in ());
 
               MemberInfo * info = 0;
               ACE_NEW_THROW_EX (info, MemberInfo(
@@ -709,11 +670,10 @@ TAO::PG_Object_Group::create_member (
                                                  factory_info.the_factory,
                                                  fcid.in ()),
                                 CORBA::NO_MEMORY());
-              ACE_CHECK;
 
               if (this->members_.bind (the_location, info) != 0)
                 {
-                  ACE_THROW(CORBA::NO_MEMORY());
+                  throw CORBA::NO_MEMORY();
                 }
 
               this->reference_ = new_reference; // note var-to-var
@@ -721,25 +681,24 @@ TAO::PG_Object_Group::create_member (
                                                 // duplicate
               if (this->increment_version ())
                 {
-                  this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_CHECK;
+                  this->distribute_iogr ();
                 }
               created = 1;
             }
         }
       if (! created)
         {
-          ACE_THROW (PortableGroup::NoFactory ());
+          throw PortableGroup::NoFactory ();
         }
     }
   else
     {
-      ACE_THROW (PortableGroup::MemberAlreadyPresent ());
+      throw PortableGroup::MemberAlreadyPresent ();
     }
 }
 
 void
-TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
+TAO::PG_Object_Group::create_members (size_t count)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory))
 {
@@ -750,9 +709,7 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
   PortableGroup::FactoryInfos_var factories =
   this->factory_registry_->list_factories_by_role (
         role_.c_str(),
-        factory_type.out ()
-        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+        factory_type.out ());
 
   CORBA::ULong factory_count = factories->length ();
   if (factory_count > 0)
@@ -769,34 +726,26 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
               ///////////////////////////////////////////
               // If a factory refuses to create a replica
               // it's not fatal.
-              ACE_TRY_NEW_ENV
+              try
                 {
                   PortableGroup::GenericFactory::FactoryCreationId_var fcid;
                   CORBA::Object_var member =
                     factory_info.the_factory->create_object (
                       this->type_id_.in (),
                       factory_info.the_criteria,
-                      fcid. out()
-                      ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                      fcid. out());
 
                   // convert the new member to a stringified IOR to avoid
                   // contamination with group info
                   CORBA::String_var member_ior_string =
-                    orb_->object_to_string (member.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    orb_->object_to_string (member.in ());
 
                   PortableGroup::ObjectGroup_var new_reference =
-                    this->add_member_to_iogr (member.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    this->add_member_to_iogr (member.in ());
 
                   // Convert new member back to a (non group) ior.
                   CORBA::Object_var member_ior =
-                    this->orb_->string_to_object (member_ior_string.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    this->orb_->string_to_object (member_ior_string.in ());
 
                   MemberInfo * info = 0;
                   ACE_NEW_THROW_EX (info, MemberInfo(
@@ -805,17 +754,16 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
                                                      factory_info.the_factory,
                                                      fcid.in ()),
                                     CORBA::NO_MEMORY());
-                  ACE_TRY_CHECK;
 
                   if (this->members_.bind (factory_location, info) != 0)
                     {
-                      ACE_TRY_THROW(CORBA::NO_MEMORY());
+                      throw CORBA::NO_MEMORY();
                     }
                   this->reference_ =
                     new_reference; // note var-to-var assignment does
                                    // a duplicate
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception&)
                 {
                   // log, but otherwise ignore the errorf
                   if (TAO_debug_level > 0)
@@ -829,24 +777,22 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL)
                                   ));
                     }
                 }
-              ACE_ENDTRY;
             }
         }
 
       if (this->increment_version ())
         {
-          this->distribute_iogr (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->distribute_iogr ();
         }
     }
   else
     {
-      ACE_THROW (PortableGroup::NoFactory());
+      throw PortableGroup::NoFactory();
     }
 }
 
 void
-TAO::PG_Object_Group::initial_populate (ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Object_Group::initial_populate (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
@@ -857,15 +803,13 @@ TAO::PG_Object_Group::initial_populate (ACE_ENV_SINGLE_ARG_DECL)
 
       if (this->members_.current_size () < initial_number_members)
         {
-          this->create_members (initial_number_members
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->create_members (initial_number_members);
         }
     }
 }
 
 void
-TAO::PG_Object_Group::minimum_populate (ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Object_Group::minimum_populate (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
@@ -875,7 +819,7 @@ TAO::PG_Object_Group::minimum_populate (ACE_ENV_SINGLE_ARG_DECL)
         this->get_minimum_number_members ();
       if (members_.current_size () < minimum_number_members)
         {
-          this->create_members (minimum_number_members ACE_ENV_ARG_PARAMETER);
+          this->create_members (minimum_number_members);
         }
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index aaf4628cda3..18c687e2012 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -176,8 +176,7 @@ namespace TAO
      * @@TODO DOC
      */
     void set_properties_dynamically (
-        const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & overrides)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableGroup::InvalidProperty,
                        PortableGroup::UnsupportedProperty));
@@ -200,8 +199,7 @@ namespace TAO
      */
     void add_member (
         const PortableGroup::Location & the_location,
-        CORBA::Object_ptr member
-        ACE_ENV_ARG_DECL)
+        CORBA::Object_ptr member)
       ACE_THROW_SPEC ( (CORBA::SystemException,
                        PortableGroup::ObjectNotAdded));
 
@@ -214,8 +212,7 @@ namespace TAO
      */
     int set_primary_member (
       TAO_IOP::TAO_IOR_Property * prop,
-      const PortableGroup::Location & the_location
-      ACE_ENV_ARG_DECL)
+      const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableGroup::MemberNotFound
@@ -225,8 +222,7 @@ namespace TAO
      * @@TODO DOC
      */
     void remove_member (
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ( (CORBA::SystemException,
                        PortableGroup::MemberNotFound));
 
@@ -237,8 +233,7 @@ namespace TAO
     void create_member (
         const PortableGroup::Location & the_location,
         const char * type_id,
-        const PortableGroup::Criteria & the_criteria
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Criteria & the_criteria)
       ACE_THROW_SPEC ( (CORBA::SystemException,
         PortableGroup::MemberAlreadyPresent,
         PortableGroup::NoFactory,
@@ -249,15 +244,14 @@ namespace TAO
     /**
      * @@TODO DOC
      */
-    PortableGroup::Locations * locations_of_members (ACE_ENV_SINGLE_ARG_DECL)
+    PortableGroup::Locations * locations_of_members (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
      * @@TODO DOC
      */
     CORBA::Object_ptr get_member_reference (
-        const PortableGroup::Location & the_location
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Location & the_location)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableGroup::MemberNotFound));
@@ -266,12 +260,12 @@ namespace TAO
     /**
      * @@TODO DOC
      */
-    void initial_populate (ACE_ENV_SINGLE_ARG_DECL);
+    void initial_populate (void);
 
     /**
      * @@TODO DOC
      */
-    void minimum_populate (ACE_ENV_SINGLE_ARG_DECL);
+    void minimum_populate (void);
 
 
     /**
@@ -285,12 +279,12 @@ namespace TAO
 
     int increment_version ();
 
-    void distribute_iogr (ACE_ENV_SINGLE_ARG_DECL);
+    void distribute_iogr (void);
 
-    PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member ACE_ENV_ARG_DECL);
+    PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member);
 
 
-    void create_members (size_t count ACE_ENV_ARG_DECL)
+    void create_members (size_t count)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableGroup::NoFactory
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index 2fb57ae571a..6436536b524 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -63,8 +63,7 @@ PortableGroup::ObjectGroup_ptr
 TAO::PG_Object_Group_Manipulator::create_object_group (
   const char * type_id,
   const char * domain_id,
-  PortableGroup::ObjectGroupId & group_id
-  ACE_ENV_ARG_DECL)
+  PortableGroup::ObjectGroupId & group_id)
 {
    allocate_ogid(group_id);
    PortableServer::ObjectId_var oid = convert_ogid_to_oid (group_id);
@@ -72,9 +71,7 @@ TAO::PG_Object_Group_Manipulator::create_object_group (
   // Create a reference for the ObjectGroup
   CORBA::Object_var object_group =
     this->poa_->create_reference_with_id (oid.in(),
-                                          type_id
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                          type_id);
 
   PortableGroup::TagGroupTaggedComponent tag_component;
 
@@ -87,15 +84,13 @@ TAO::PG_Object_Group_Manipulator::create_object_group (
   // Set the property
   TAO::PG_Utils::set_tagged_component (object_group,
                                        tag_component);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object_group._retn ();
 }
 
 void
 TAO::PG_Object_Group_Manipulator::init (CORBA::ORB_ptr orb,
-                                        PortableServer::POA_ptr poa
-                                        ACE_ENV_ARG_DECL)
+                                        PortableServer::POA_ptr poa)
 {
   ACE_ASSERT (CORBA::is_nil (this->orb_.in ()) && !CORBA::is_nil (orb));
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -105,43 +100,37 @@ TAO::PG_Object_Group_Manipulator::init (CORBA::ORB_ptr orb,
 
   // Get an object reference for the ORBs IORManipulation object!
   CORBA::Object_var IORM = this->orb_->resolve_initial_references (
-    TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_OBJID_IORMANIPULATION, 0);
 
   this->iorm_ = TAO_IOP::TAO_IOR_Manipulation::_narrow (
-    IORM.in () ACE_ENV_ARG_PARAMETER);
-//  ACE_CHECK;
+    IORM.in ());
 }
 
 int TAO::PG_Object_Group_Manipulator::set_primary (
       TAO_IOP::TAO_IOR_Property * prop,
       PortableGroup::ObjectGroup_ptr group,
-      CORBA::Object_ptr new_primary
-      ACE_ENV_ARG_DECL) const
+      CORBA::Object_ptr new_primary) const
 {
-  int sts = this->iorm_->is_primary_set (prop, group ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  int sts = this->iorm_->is_primary_set (prop, group);
   if (sts)
   {
-    (void)this->iorm_->remove_primary_tag (prop, group ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    (void)this->iorm_->remove_primary_tag (prop, group);
   }
   /////note: iorm takes it's parameters in the "wrong" order for this call
-  return this->iorm_->set_primary (prop, new_primary, group ACE_ENV_ARG_PARAMETER);
+  return this->iorm_->set_primary (prop, new_primary, group);
 }
 
 PortableGroup::ObjectGroup_ptr TAO::PG_Object_Group_Manipulator::merge_iors(
-  TAO_IOP::TAO_IOR_Manipulation::IORList & list ACE_ENV_ARG_DECL) const
+  TAO_IOP::TAO_IOR_Manipulation::IORList & list) const
 {
-  return this->iorm_->merge_iors (list ACE_ENV_ARG_PARAMETER);
+  return this->iorm_->merge_iors (list);
 }
 
 PortableGroup::ObjectGroup_ptr TAO::PG_Object_Group_Manipulator::remove_profiles(
       PortableGroup::ObjectGroup_ptr group,
-      PortableGroup::ObjectGroup_ptr profile
-      ACE_ENV_ARG_DECL) const
+      PortableGroup::ObjectGroup_ptr profile) const
 {
-  return this->iorm_->remove_profiles(group, profile ACE_ENV_ARG_PARAMETER);
+  return this->iorm_->remove_profiles(group, profile);
 }
 
 void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
index 4397cbfe8e0..91c37045d1f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
@@ -53,8 +53,7 @@ namespace TAO
      * Initializes the group creator.
      */
     void init (CORBA::ORB_ptr orb,
-               PortableServer::POA_ptr poa
-               ACE_ENV_ARG_DECL);
+               PortableServer::POA_ptr poa);
 
     /**
      * Create an empty object group.
@@ -62,23 +61,19 @@ namespace TAO
     PortableGroup::ObjectGroup_ptr create_object_group (
       const char * type_id,
       const char * domain_id,
-      PortableGroup::ObjectGroupId & group_id
-      ACE_ENV_ARG_DECL);
+      PortableGroup::ObjectGroupId & group_id);
 
     PortableGroup::ObjectGroup_ptr remove_profiles (
       PortableGroup::ObjectGroup_ptr group,
-      PortableGroup::ObjectGroup_ptr profile
-      ACE_ENV_ARG_DECL) const;
+      PortableGroup::ObjectGroup_ptr profile) const;
 
     PortableGroup::ObjectGroup_ptr merge_iors (
-      TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-      ACE_ENV_ARG_DECL) const;
+      TAO_IOP::TAO_IOR_Manipulation::IORList & iors) const;
 
     int set_primary (
       TAO_IOP::TAO_IOR_Property * prop,
       PortableGroup::ObjectGroup_ptr reference,
-      CORBA::Object_ptr new_primary
-      ACE_ENV_ARG_DECL) const;
+      CORBA::Object_ptr new_primary) const;
 
   void dump_membership (const char * label,
                         PortableGroup::ObjectGroup_ptr member) const;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
index cc8d023d899..71c22906cae 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -26,23 +26,20 @@ TAO::PG_Properties_Support::~PG_Properties_Support ()
 }
 
 void TAO::PG_Properties_Support::set_default_property (const char * name,
-      const PortableGroup::Value & value
-      ACE_ENV_ARG_DECL)
+      const PortableGroup::Value & value)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->default_properties_.set_property(name, value ACE_ENV_ARG_PARAMETER);
+  this->default_properties_.set_property(name, value);
 }
 
-void TAO::PG_Properties_Support::set_default_properties (const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+void TAO::PG_Properties_Support::set_default_properties (const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->default_properties_.decode (props ACE_ENV_ARG_PARAMETER);
+  this->default_properties_.decode (props);
 }
 
 PortableGroup::Properties *
-TAO::PG_Properties_Support::get_default_properties (
-      ACE_ENV_SINGLE_ARG_DECL)
+TAO::PG_Properties_Support::get_default_properties ()
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     PortableGroup::InvalidProperty,
@@ -50,14 +47,12 @@ TAO::PG_Properties_Support::get_default_properties (
 {
   PortableGroup::Properties_var result;
   ACE_NEW_THROW_EX ( result, PortableGroup::Properties(), CORBA::NO_MEMORY());
-  ACE_CHECK_RETURN (0);
   this->default_properties_.export_properties (*result);
   return result._retn ();
 }
 
 void TAO::PG_Properties_Support::remove_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->default_properties_.remove (props);
@@ -66,8 +61,7 @@ void TAO::PG_Properties_Support::remove_default_properties (
 void
 TAO::PG_Properties_Support::set_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -84,13 +78,12 @@ TAO::PG_Properties_Support::set_type_properties (
     this->properties_map_.bind (type_id, typeid_properties);
   }
   typeid_properties->clear ();
-  typeid_properties->decode (overrides ACE_ENV_ARG_PARAMETER);
+  typeid_properties->decode (overrides);
 }
 
 PortableGroup::Properties *
 TAO::PG_Properties_Support::get_type_properties (
-    const char *type_id
-    ACE_ENV_ARG_DECL)
+    const char *type_id)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   PortableGroup::Properties_var result;
@@ -109,8 +102,7 @@ TAO::PG_Properties_Support::get_type_properties (
 void
 TAO::PG_Properties_Support::remove_type_properties (
     const char *type_id,
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   // NOTE: do not actually delete the properties for this type.
@@ -130,8 +122,7 @@ TAO::PG_Properties_Support::remove_type_properties (
 
 TAO::PG_Property_Set *
 TAO::PG_Properties_Support::find_typeid_properties (
-    const char *type_id
-    ACE_ENV_ARG_DECL)
+    const char *type_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->internals_, 0);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
index 50e2f504ffd..f3e6729c6f8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -73,8 +73,7 @@ namespace TAO
      * @value an Any containing the value.
      */
     void set_default_property (const char * name,
-          const PortableGroup::Value & value
-          ACE_ENV_ARG_DECL)
+          const PortableGroup::Value & value)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -85,8 +84,7 @@ namespace TAO
      *
      * @param props the set of properties to update the defaults.
      */
-    void set_default_properties (const PortableGroup::Properties & props
-         ACE_ENV_ARG_DECL)
+    void set_default_properties (const PortableGroup::Properties & props)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -98,7 +96,7 @@ namespace TAO
      * resource leaks.
      * @returns a newly allocated PortableGroup::Properties.
      */
-    PortableGroup::Properties * get_default_properties (ACE_ENV_SINGLE_ARG_DECL)
+    PortableGroup::Properties * get_default_properties (void)
       ACE_THROW_SPEC ( (CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty));
@@ -113,8 +111,7 @@ namespace TAO
      * @param props a set of propertys to be removed by name.
      */
     void remove_default_properties (
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -131,8 +128,7 @@ namespace TAO
      */
     void set_type_properties (
         const char *type_id,
-        const PortableGroup::Properties & overrides
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & overrides)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableGroup::InvalidProperty,
@@ -156,8 +152,7 @@ namespace TAO
      * @returns a newly allocated PortableGroup::Properties that must be released by the caller.
      */
     PortableGroup::Properties * get_type_properties (
-        const char *type_id
-        ACE_ENV_ARG_DECL)
+        const char *type_id)
       ACE_THROW_SPEC ( (CORBA::SystemException));
 
     /**
@@ -174,8 +169,7 @@ namespace TAO
      * @returns a pointer to a Property_Set owned by this Properties_Support object.
      */
     TAO::PG_Property_Set *  find_typeid_properties (
-        const char *type_id
-        ACE_ENV_ARG_DECL)
+        const char *type_id)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -189,8 +183,7 @@ namespace TAO
      */
     void remove_type_properties (
         const char *type_id,
-        const PortableGroup::Properties & props
-        ACE_ENV_ARG_DECL)
+        const PortableGroup::Properties & props)
       ACE_THROW_SPEC ( (CORBA::SystemException));
 
     ///////////////
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index f6d9fb2a13c..0ced0341ca0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -27,8 +27,7 @@ TAO_PG_PropertyManager::TAO_PG_PropertyManager (
 
 void
 TAO_PG_PropertyManager::set_default_properties (
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -46,13 +45,10 @@ TAO_PG_PropertyManager::set_default_properties (
       PortableGroup::Property property = props[i];
 
       if (property.nam == factories)
-        ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                   property.val));
+        throw PortableGroup::InvalidProperty (property.nam, property.val);
     }
 
-  this->property_validator_.validate_property (props
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->property_validator_.validate_property (props);
 
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
@@ -61,8 +57,7 @@ TAO_PG_PropertyManager::set_default_properties (
 
 
 PortableGroup::Properties *
-TAO_PG_PropertyManager::get_default_properties (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_PG_PropertyManager::get_default_properties ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
@@ -75,7 +70,6 @@ TAO_PG_PropertyManager::get_default_properties (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return props;
 }
@@ -83,8 +77,7 @@ TAO_PG_PropertyManager::get_default_properties (
 
 void
 TAO_PG_PropertyManager::remove_default_properties (
-    const PortableGroup::Properties &props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties &props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -95,24 +88,19 @@ TAO_PG_PropertyManager::remove_default_properties (
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
 
   this->remove_properties (props,
-                           this->default_properties_
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           this->default_properties_);
 }
 
 
 void
 TAO_PG_PropertyManager::set_type_properties (
     const char * type_id,
-    const PortableGroup::Properties & overrides
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & overrides)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
 {
-  this->property_validator_.validate_property (overrides
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->property_validator_.validate_property (overrides);
 
   CORBA::ULong num_overrides = overrides.length ();
 
@@ -123,7 +111,7 @@ TAO_PG_PropertyManager::set_type_properties (
 
   Type_Prop_Table::ENTRY * entry = 0;
   if (this->type_properties_.find (type_id, entry) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Properties & props = entry->int_id_;
   props = overrides;
@@ -132,8 +120,7 @@ TAO_PG_PropertyManager::set_type_properties (
 
 PortableGroup::Properties *
 TAO_PG_PropertyManager::get_type_properties (
-    const char * type_id
-    ACE_ENV_ARG_DECL)
+    const char * type_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0);
@@ -159,7 +146,6 @@ TAO_PG_PropertyManager::get_type_properties (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   PortableGroup::Properties_var properties = tmp_properties;
 
@@ -181,8 +167,7 @@ TAO_PG_PropertyManager::get_type_properties (
 void
 TAO_PG_PropertyManager::remove_type_properties (
     const char * type_id,
-    const PortableGroup::Properties & props
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & props)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -194,22 +179,19 @@ TAO_PG_PropertyManager::remove_type_properties (
 
   Type_Prop_Table::ENTRY * entry = 0;
   if (this->type_properties_.find (type_id, entry) != 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   PortableGroup::Properties & type_properties = entry->int_id_;
 
   this->remove_properties (props,
-                           type_properties
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           type_properties);
 }
 
 
 void
 TAO_PG_PropertyManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr /* object_group */,
-    const PortableGroup::Properties & /* overrides */
-    ACE_ENV_ARG_DECL)
+    const PortableGroup::Properties & /* overrides */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound,
                    PortableGroup::InvalidProperty,
@@ -230,25 +212,21 @@ TAO_PG_PropertyManager::set_properties_dynamically (
       PortableGroup::Property property = props[i];
 
       if (property.nam == factories)
-        ACE_THROW (PortableGroup::InvalidProperty (property.nam,
-                                                   property.val));
+        throw PortableGroup::InvalidProperty (property.nam, property.val);
     }
 
-  this->property_validator_.validate_property (overrides
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->property_validator_.validate_property (overrides);
 
   // @todo Set the properties in the object group map entry.
 #endif  /* 0 */
 
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 
 PortableGroup::Properties *
 TAO_PG_PropertyManager::get_properties (
-    PortableGroup::ObjectGroup_ptr object_group
-    ACE_ENV_ARG_DECL)
+    PortableGroup::ObjectGroup_ptr object_group)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::ObjectGroupNotFound))
 {
@@ -258,18 +236,14 @@ TAO_PG_PropertyManager::get_properties (
 
   // @@ Race condition here!
   PortableGroup::Properties_var dynamic_properties =
-    this->object_group_manager_.get_properties (object_group
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->object_group_manager_.get_properties (object_group);
 
   CORBA::ULong dyn_props_len = dynamic_properties->length ();
   if (dyn_props_len > properties_len)
     properties_len = dyn_props_len;
 
   CORBA::String_var type_id =
-    this->object_group_manager_.type_id (object_group
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->object_group_manager_.type_id (object_group);
 
   CORBA::ULong type_props_len = 0;
   PortableGroup::Properties * type_properties = 0;
@@ -295,7 +269,6 @@ TAO_PG_PropertyManager::get_properties (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   PortableGroup::Properties_var properties = tmp_properties;
 
@@ -322,8 +295,7 @@ TAO_PG_PropertyManager::get_properties (
 void
 TAO_PG_PropertyManager::remove_properties (
     const PortableGroup::Properties & to_be_removed,
-    PortableGroup::Properties &properties
-    ACE_ENV_ARG_DECL)
+    PortableGroup::Properties &properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::InvalidProperty,
                    PortableGroup::UnsupportedProperty))
@@ -355,8 +327,7 @@ TAO_PG_PropertyManager::remove_properties (
       // The property to be removed doesn't exist in the current list
       // of default properties.
       if (n == old_n)
-        ACE_THROW (PortableGroup::InvalidProperty (remove.nam,
-                                                   remove.val));
+        throw PortableGroup::InvalidProperty (remove.nam, remove.val);
     }
 
   // All properties were successfully removed, and the remaining ones
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 5d6c40fa063..21b5837e4c7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -65,21 +65,18 @@ public:
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual PortableGroup::Properties * get_default_properties (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual PortableGroup::Properties * get_default_properties ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -88,8 +85,7 @@ public:
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & overrides
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & overrides)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -100,15 +96,13 @@ public:
    * addition to the default properties that were not overridden.
    */
   virtual PortableGroup::Properties * get_type_properties (
-      const char * type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const char * type_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & props
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & props)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
@@ -121,8 +115,7 @@ public:
    */
   virtual void set_properties_dynamically (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Properties & overrides
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const PortableGroup::Properties & overrides)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound,
                      PortableGroup::InvalidProperty,
@@ -136,8 +129,7 @@ public:
    * that weren't overridden.
    */
   virtual PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableGroup::ObjectGroup_ptr object_group)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectGroupNotFound));
 
@@ -156,8 +148,7 @@ private:
   /// Remove properties "to_be_removed" from the given list of
   /// properties.
   void remove_properties (const PortableGroup::Properties & to_be_removed,
-                          PortableGroup::Properties &properties
-                          ACE_ENV_ARG_DECL)
+                          PortableGroup::Properties &properties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::InvalidProperty,
                      PortableGroup::UnsupportedProperty));
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
index e63ff905d9d..90d594d80d5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -27,22 +27,20 @@ TAO::PG_Property_Set::PG_Property_Set()
 }
 
 TAO::PG_Property_Set::PG_Property_Set (
-  const PortableGroup::Properties & property_set
-    ACE_ENV_ARG_DECL)
+  const PortableGroup::Properties & property_set)
   ACE_THROW_SPEC ((CORBA::SystemException))
   : defaults_ (0)
 {
-  this->decode (property_set ACE_ENV_ARG_PARAMETER);
+  this->decode (property_set);
 }
 
 TAO::PG_Property_Set::PG_Property_Set (
     const PortableGroup::Properties & property_set,
-    PG_Property_Set * defaults
-    ACE_ENV_ARG_DECL)
+    PG_Property_Set * defaults)
   ACE_THROW_SPEC ((CORBA::SystemException))
   : defaults_ (defaults)
 {
-  this->decode (property_set ACE_ENV_ARG_PARAMETER);
+  this->decode (property_set);
 }
 
 
@@ -58,8 +56,7 @@ TAO::PG_Property_Set::~PG_Property_Set ()
 }
 
 void
-TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
-                              ACE_ENV_ARG_DECL)
+TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
@@ -74,9 +71,7 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
     const CosNaming::NameComponent & nc = nsName[0];
 
     this->set_property (static_cast<const char *> (nc.id),
-                        property.val
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                        property.val);
 
 #if 0
     ACE_CString name = static_cast<const char *> (nc.id);
@@ -85,7 +80,6 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
     ACE_NEW_THROW_EX (value_copy,
                       PortableGroup::Value (property.val),
                       CORBA::NO_MEMORY ());
-    ACE_CHECK;
 
     const PortableGroup::Value * replaced_value = 0;
     if (0 == this->values_.rebind (name, value_copy, replaced_value))
@@ -104,7 +98,7 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set
           ));
       }
       // @@ should throw something here
-      ACE_THROW (CORBA::NO_MEMORY ());
+      throw CORBA::NO_MEMORY ();
     }
 #endif
   }
@@ -150,15 +144,13 @@ void TAO::PG_Property_Set::remove (const PortableGroup::Properties & property_se
 
 void TAO::PG_Property_Set::set_property (
   const char * name,
-  const PortableGroup::Value & value
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Value & value)
 {
   ACE_CString key (name);
   PortableGroup::Value * value_copy;
   ACE_NEW_THROW_EX (
     value_copy, PortableGroup::Value (value),
     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   const PortableGroup::Value * replaced_value = 0;
   if (0 == this->values_.rebind (name, value_copy, replaced_value))
@@ -177,7 +169,7 @@ void TAO::PG_Property_Set::set_property (
         ));
     }
     // @@ should throw something here
-    ACE_THROW (CORBA::NO_MEMORY ());
+    throw CORBA::NO_MEMORY ();
   }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 44aae869da7..50a5515baac 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -70,8 +70,7 @@ namespace TAO
      * constructor
      * @param property_set the properties to be decoded
      */
-    PG_Property_Set (const PortableGroup::Properties & property_set
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    PG_Property_Set (const PortableGroup::Properties & property_set)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -80,8 +79,7 @@ namespace TAO
      * @param defaults a propert set decoder that supplies default values.
      */
     PG_Property_Set (const PortableGroup::Properties & property_set,
-                     PG_Property_Set * defaults
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     PG_Property_Set * defaults)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -112,7 +110,7 @@ namespace TAO
      * Duplicate values replace previous values.
      * @param property_set the properties to be decoded
      */
-    void decode (const PortableGroup::Properties & property_set ACE_ENV_ARG_DECL)
+    void decode (const PortableGroup::Properties & property_set)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /**
@@ -129,8 +127,7 @@ namespace TAO
      */
     void set_property (
       const char * name,
-      const PortableGroup::Value & value
-      ACE_ENV_ARG_DECL);
+      const PortableGroup::Value & value);
 
 
     /**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
index 4b3504795e2..1eb65a2faf7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -20,8 +20,7 @@ TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                             ACE_Lock &lock,
                                             TAO_SYNCH_MUTEX &thread_lock,
                                             TAO_ORB_Core &orb_core,
-                                            TAO_Object_Adapter *object_adapter
-                                            ACE_ENV_ARG_DECL)
+                                            TAO_Object_Adapter *object_adapter)
 {
   TAO_Root_POA *poa = 0;
 
@@ -33,10 +32,8 @@ TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                              lock,
                              thread_lock,
                              orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
+                             object_adapter),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return poa;
 }
@@ -46,8 +43,7 @@ TAO_PG_Servant_Dispatcher::pre_invoke_remote_request (
   TAO_Root_POA &,
   CORBA::Short,
   TAO_ServerRequest &,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-  ACE_ENV_ARG_DECL_NOT_USED)
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
 }
 
@@ -55,8 +51,7 @@ void
 TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request (
   TAO_Root_POA &,
   CORBA::Short,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-  ACE_ENV_ARG_DECL_NOT_USED)
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
index a5718c240cc..9d7f33e9ce6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
@@ -42,14 +42,12 @@ public:
   void pre_invoke_remote_request (TAO_Root_POA &poa,
                                   CORBA::Short servant_priority,
                                   TAO_ServerRequest &req,
-                                  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                  ACE_ENV_ARG_DECL);
+                                  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
 
   /// Pre_invoke collocated request.
   void pre_invoke_collocated_request (TAO_Root_POA &poa,
                                       CORBA::Short servant_priority,
-                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                      ACE_ENV_ARG_DECL);
+                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
 
   /// Post_invoke request.
   void post_invoke (TAO_Root_POA &poa,
@@ -62,8 +60,7 @@ public:
                                  ACE_Lock &lock,
                                  TAO_SYNCH_MUTEX &thread_lock,
                                  TAO_ORB_Core &orb_core,
-                                 TAO_Object_Adapter *object_adapter
-                                 ACE_ENV_ARG_DECL);
+                                 TAO_Object_Adapter *object_adapter);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index a22594ca04b..ce55617b726 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -37,8 +37,7 @@ TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry (void)
 
 void
 TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile,
-                                           TAO_ORB_Core &orb_core
-                                           ACE_ENV_ARG_DECL)
+                                           TAO_ORB_Core &orb_core)
 {
   Entry *entry;
 
@@ -68,9 +67,7 @@ TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile,
             {
               this->open_i (profile,
                             orb_core,
-                            factory
-                            ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                            factory);
 
               // found = 1;  // A usable protocol was found.
             }
@@ -85,8 +82,7 @@ TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile,
 void
 TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
                                              TAO_ORB_Core &orb_core,
-                                             TAO_ProtocolFactorySetItor &factory
-                                             ACE_ENV_ARG_DECL)
+                                             TAO_ProtocolFactorySetItor &factory)
 {
   TAO_Acceptor *acceptor = (*factory)->factory ()->make_acceptor ();
 
@@ -119,11 +115,11 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
                         buffer,
                         ""));
 
-          ACE_THROW (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO));
+          throw CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       // Add acceptor to list.
@@ -144,11 +140,11 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
                         buffer,
                         ""));
 
-          ACE_THROW (CORBA::BAD_PARAM (
-              CORBA::SystemException::_tao_minor_code (
-                TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-                EINVAL),
-              CORBA::COMPLETED_NO));
+          throw CORBA::BAD_PARAM (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
     }
   else
@@ -159,11 +155,11 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
                     ACE_TEXT ("unable to create acceptor ")
                     ));
 
-      ACE_THROW (CORBA::BAD_PARAM (
-          CORBA::SystemException::_tao_minor_code (
-            TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
-            EINVAL),
-          CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
index 1ecc90efa4d..c95ca388c73 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -77,8 +77,7 @@ public:
 
   /// Open an acceptor based on a tagged profile.
   void open (const TAO_Profile* profile,
-             TAO_ORB_Core &orb_core
-             ACE_ENV_ARG_DECL);
+             TAO_ORB_Core &orb_core);
 
   /// Close all open acceptors.
   int close_all (void);
@@ -91,8 +90,7 @@ protected:
   /// Helper function to open a group acceptor.
   void open_i (const TAO_Profile* profile,
                TAO_ORB_Core &orb_core,
-               TAO_ProtocolFactorySetItor &factory
-               ACE_ENV_ARG_DECL);
+               TAO_ProtocolFactorySetItor &factory);
 
   /// Find an acceptor by using a profile.
   int find (const TAO_Profile* profile,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 2878d3db9a6..7fe66e8294b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -24,7 +24,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
 {
   ACE_TRACE ("TAO_PortableGroup_Loader::init");
   // Register the ORB initializer.
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -38,20 +38,16 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
       orb_initializer = temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught while initializing the PortableGroup:");
+      ex._tao_print_exception (
+        "Unexpected exception caught while initializing the PortableGroup:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index 870c6b75e59..9ac5f584dd0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -20,15 +20,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_PortableGroup_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
-  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info);
 
   if (CORBA::is_nil (tao_info.in ()))
     {
@@ -39,7 +36,7 @@ TAO_PortableGroup_ORBInitializer::pre_init (
                     "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
                     "(%P|%t)   \"TAO_ORBInitInfo_ptr.\"\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Set a new request dispatcher in the ORB.
@@ -51,7 +48,6 @@ TAO_PortableGroup_ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   tao_info->orb_core ()->request_dispatcher (rd);
 
@@ -62,8 +58,7 @@ TAO_PortableGroup_ORBInitializer::pre_init (
 
 void
 TAO_PortableGroup_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
index 56f730edd59..0729f32766c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
@@ -40,12 +40,10 @@ class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer :
   public virtual TAO_Local_RefCounted_Object
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index ae3fbe2d941..35ca472f796 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -20,8 +20,7 @@ PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void)
 void
 PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
                                             TAO_ServerRequest &request,
-                                            CORBA::Object_out forward_to
-                                            ACE_ENV_ARG_DECL)
+                                            CORBA::Object_out forward_to)
 {
   // Check if the request contains a tagged profile
   if (request.profile ().discriminator () == GIOP::ProfileAddr)
@@ -40,9 +39,7 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
           this->group_map_.dispatch (&group,
                                      orb_core,
                                      request,
-                                     forward_to
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                     forward_to);
 
           return;
         }
@@ -53,9 +50,7 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
   // Dispatch based on object key.
   orb_core->adapter_registry ()->dispatch (request.object_key (),
                                            request,
-                                           forward_to
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                           forward_to);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
index fb6ae13e934..ea140f7a4a1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
@@ -50,8 +50,7 @@ public:
    */
   virtual void dispatch (TAO_ORB_Core *orb_core,
                          TAO_ServerRequest &request,
-                         CORBA::Object_out forward_to
-                         ACE_ENV_ARG_DECL);
+                         CORBA::Object_out forward_to);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 73745a4460b..edc4b8d93b4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -45,7 +45,6 @@ void
 TAO_Portable_Group_Map::add_groupid_objectkey_pair (
     PortableGroup::TagGroupTaggedComponent *group_id,
     const TAO::ObjectKey &key
-    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -65,7 +64,6 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (
                                                                                TAO::VMCID,
                                                                                ENOMEM),
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   // Fill out the entry.
   new_entry->key = key;
@@ -91,7 +89,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (
       if (result != 0)
         {
           delete new_entry;
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       // Transfer ownership of group_id to the map.
@@ -101,8 +99,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (
 
 void
 TAO_Portable_Group_Map::remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* /*group_id*/,
-                                                       const TAO::ObjectKey &/*key*/
-                                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                                       const TAO::ObjectKey &/*key*/)
 {
 
 }
@@ -112,8 +109,7 @@ void
 TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_id,
                                   TAO_ORB_Core *orb_core,
                                   TAO_ServerRequest &request,
-                                  CORBA::Object_out forward_to
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Object_out forward_to)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
@@ -138,9 +134,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_
         {
           orb_core->adapter_registry ()->dispatch (entry->key,
                                                    request,
-                                                   forward_to
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                                   forward_to);
 
           // Reset the read pointer in the message block.
           msgblk->rd_ptr (read_ptr);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index c6c69ae9e11..d4c8ecd01b6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -95,22 +95,19 @@ public:
   /// Add a GroupId->ObjectKey mapping to the map.
   /// This function takes ownership of the memory pointed to be group_id
   void add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id,
-                                   const TAO::ObjectKey &key
-                                   ACE_ENV_ARG_DECL);
+                                   const TAO::ObjectKey &key);
 
 
   /// Remove a GroupId->ObjectKey mapping from the map.
   void remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* group_id,
-                                      const TAO::ObjectKey &key
-                                      ACE_ENV_ARG_DECL);
+                                      const TAO::ObjectKey &key);
 
   /// Dispatch a request to all of the ObjectIds that belong to
   /// the specified group.
   void dispatch (PortableGroup::TagGroupTaggedComponent* group_id,
                                     TAO_ORB_Core *orb_core,
                                     TAO_ServerRequest &request,
-                                    CORBA::Object_out forward_to
-                                    ACE_ENV_ARG_DECL);
+                                    CORBA::Object_out forward_to);
 
   /// Id hash map.
   typedef ACE_Hash_Map_Manager_Ex<
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 30f909e93e4..82f5174c71d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -154,7 +154,7 @@ TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_UIPMC_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UIPMC_Connector::make_profile (void)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -169,7 +169,6 @@ TAO_UIPMC_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index 43357053bd2..f7648dd917d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -70,7 +70,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile * make_profile (void);
 
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index d242aef76a1..31ce6b54f00 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -73,8 +73,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4],
 /*
 
 TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string,
-                                      TAO_ORB_Core *orb_core
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_ORB_Core *orb_core)
   : TAO_Profile (TAO_TAG_UIPMC_PROFILE,
                  orb_core,
                  TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
@@ -83,8 +82,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string,
     tagged_profile_ ()
 {
   this->add_group_component ();
-  this->parse_string (string ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->parse_string (string);
   addressing_mode_ = default_addressing_mode_;
 }
 
@@ -191,16 +189,13 @@ TAO_UIPMC_Profile::decode_profile (TAO_InputCDR& cdr)
 }
 
 void
-TAO_UIPMC_Profile::parse_string (const char *string
-                                 ACE_ENV_ARG_DECL)
+TAO_UIPMC_Profile::parse_string (const char *string)
 {
-  this->parse_string_i (string
-                        ACE_ENV_ARG_PARAMETER);
+  this->parse_string_i (string);
 }
 
 void
-TAO_UIPMC_Profile::parse_string_i (const char *string
-                                   ACE_ENV_ARG_DECL)
+TAO_UIPMC_Profile::parse_string_i (const char *string)
 {
   // Remove the "N.n@" version prefix, if it exists, and verify the
   // version is one that we accept.
@@ -214,11 +209,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       if (string[0] != '1' ||
           string[2] != '0')
         {
-          ACE_THROW (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF (
+            CORBA::SystemException::_tao_minor_code (
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       string += 4;
@@ -248,11 +243,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       if (major != TAO_DEF_MIOP_MAJOR ||
           minor >  TAO_DEF_MIOP_MINOR)
         {
-          ACE_THROW (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF (
+            CORBA::SystemException::_tao_minor_code (
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       // Skip over "N.n-"
@@ -261,11 +256,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
   else
     {
       // The group component version is mandatory.
-      ACE_THROW (CORBA::INV_OBJREF (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        EINVAL),
-                      CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   // Parse the group_domain_id.
@@ -281,11 +276,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
     {
       // The group_domain_id is mandatory, so throw an
       // exception if it isn't found.
-      ACE_THROW (CORBA::INV_OBJREF (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        EINVAL),
-                      CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   // Save the group_domain_id.
@@ -314,11 +309,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       if (end_pos == ACE_CString::npos)
         {
           // The Group ID is mandatory, so throw an exception.
-          ACE_THROW (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF (
+            CORBA::SystemException::_tao_minor_code (
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
     }
 
@@ -341,11 +336,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
         {
           // The group version was expected but not found,
           // so throw an exception.
-          ACE_THROW (CORBA::INV_OBJREF (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            EINVAL),
-                          CORBA::COMPLETED_NO));
+          throw CORBA::INV_OBJREF (
+            CORBA::SystemException::_tao_minor_code (
+              TAO::VMCID,
+              EINVAL),
+            CORBA::COMPLETED_NO);
         }
 
       ACE_CString str_group_ref_ver = ace_str.substring (pos, end_pos - pos);
@@ -363,11 +358,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
     {
       // The multicast address is mandatory, so throw an exception,
       // since it wasn't found.
-      ACE_THROW (CORBA::INV_OBJREF (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        EINVAL),
-                      CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   ACE_CString mcast_addr = ace_str.substring (pos, end_pos - pos);
@@ -380,11 +375,11 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
     {
       // The multicast port is mandatory, so throw an exception,
       // since it wasn't found.
-      ACE_THROW (CORBA::INV_OBJREF (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        EINVAL),
-                      CORBA::COMPLETED_NO));
+      throw CORBA::INV_OBJREF (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 
   CORBA::UShort mcast_port =
@@ -416,8 +411,7 @@ TAO_UIPMC_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_UIPMC_Profile::hash (CORBA::ULong max
-                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_UIPMC_Profile::hash (CORBA::ULong max)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = this->endpoint_.hash ();
@@ -447,7 +441,7 @@ TAO_UIPMC_Profile::endpoint_count (void) const
 }
 
 char *
-TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UIPMC_Profile::to_string (void)
 {
   // @@ Frank: Update to pull out GroupID information...
 
@@ -663,8 +657,7 @@ TAO_UIPMC_Profile::update_cached_group_component (void)
 void
 TAO_UIPMC_Profile::request_target_specifier (
                       TAO_Target_Specification &target_spec,
-                      TAO_Target_Specification::TAO_Target_Address required_type
-                      ACE_ENV_ARG_DECL)
+                      TAO_Target_Specification::TAO_Target_Address required_type)
 {
   // Fill out the target specifier based on the required type.
   switch (required_type)
@@ -682,7 +675,7 @@ TAO_UIPMC_Profile::request_target_specifier (
     case TAO_Target_Specification::Reference_Addr:
     default:
       // Unsupported or unknown required type.  Throw an exception.
-      ACE_THROW (CORBA::MARSHAL ());
+      throw CORBA::MARSHAL ();
     }
 }
 
@@ -694,8 +687,7 @@ TAO_UIPMC_Profile::supports_multicast (void) const
 }
 
 void
-TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr_mode
-                                    ACE_ENV_ARG_DECL)
+TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr_mode)
 {
   // ** See race condition note about addressing mode in Profile.h **
   switch (addr_mode)
@@ -709,11 +701,11 @@ TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr_mode
       // There is no object key, so it is not supported.
 
     default:
-      ACE_THROW (CORBA::BAD_PARAM (
-             CORBA::SystemException::_tao_minor_code (
-               TAO::VMCID,
-               EINVAL),
-             CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (
+        CORBA::SystemException::_tao_minor_code (
+          TAO::VMCID,
+          EINVAL),
+        CORBA::COMPLETED_NO);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index a6f8846eeb5..3642aa0c600 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -74,34 +74,29 @@ public:
 
   /// Create object using a string ior.
   TAO_UIPMC_Profile (const char *string,
-                     TAO_ORB_Core *orb_core
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     TAO_ORB_Core *orb_core);
 
   /// Destructor is to be called only through <_decr_refcnt>.
   ~TAO_UIPMC_Profile (void);
 
   /// Template methods. Please see tao/Profile.h for documentation.
-  
+
   /// N.B. We have to override the TAO_Profile default decode because
   /// in UIPMC there is no object key marshalled and we do not implement
   /// a useable ::decode_endpoints
   virtual int decode (TAO_InputCDR& cdr);
-  virtual void parse_string (const char *string
-                             ACE_ENV_ARG_DECL);
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void parse_string (const char *string);
+  virtual char * to_string (void);
   virtual int encode_endpoints (void);
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::ULong hash (CORBA::ULong max);
   virtual IOP::TaggedProfile &create_tagged_profile (void);
   virtual void request_target_specifier (
                       TAO_Target_Specification &target_spec,
-                      TAO_Target_Specification::TAO_Target_Address r
-                      ACE_ENV_ARG_DECL);
+                      TAO_Target_Specification::TAO_Target_Address r);
   virtual int supports_multicast (void) const;
-  virtual void addressing_mode (CORBA::Short addr_mode
-                                ACE_ENV_ARG_DECL);
+  virtual void addressing_mode (CORBA::Short addr_mode);
   static int extract_group_component (const IOP::TaggedProfile &profile,
                                       PortableGroup::TagGroupTaggedComponent &group);
 
@@ -115,8 +110,7 @@ protected:
   /// Template methods, please see documentation in tao/Profile.h
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual int decode_endpoints (void);
-  virtual void parse_string_i (const char *
-                               ACE_ENV_ARG_DECL);
+  virtual void parse_string_i (const char *);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
   virtual void update_cached_group_component (void);
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 817d0726b4b..9ec7c80a093 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -102,7 +102,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
 // things.
 
 CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_propertyset (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySetFactory::create_propertyset (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySet.
@@ -113,7 +113,7 @@ TAO_PropertySetFactory::create_propertyset (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::ULong cur_len = this->propertyset_products_.length ();
   this->propertyset_products_.length (cur_len + 1);
   this->propertyset_products_[cur_len] = new_set;
-  return new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return new_set->_this ();
 }
 
 // Allows a client to create a new TAO_PropertySet with specific
@@ -121,22 +121,19 @@ TAO_PropertySetFactory::create_propertyset (ACE_ENV_SINGLE_ARG_DECL)
 
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                                        const CosPropertyService::Properties &allowed_properties
-                                                        ACE_ENV_ARG_DECL)
+                                                        const CosPropertyService::Properties &allowed_properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::ConstraintNotSupported))
 {
   TAO_PropertySet *new_set = 0;
   CosPropertyService::PropertySet_ptr propset_ptr = 0;
 
-  ACE_TRY
+  try
     {
       // New a TAO_PropertySet using these constraints.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (allowed_property_types,
-                                       allowed_properties
-                                       ACE_ENV_ARG_PARAMETER), 0);
-      ACE_TRY_CHECK;
+                                       allowed_properties), 0);
 
       // Successful, store this in the products sequence.
       CORBA::ULong products_len = this->propertyset_products_.length ();
@@ -144,27 +141,24 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
       this->propertyset_products_[products_len] = new_set;
 
       // All done.
-      propset_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propset_ptr = new_set->_this ();
     }
-  ACE_CATCH (CORBA::UserException, ex)
+  catch (const CORBA::UserException& )
     {
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_TRY_THROW (CosPropertyService::ConstraintNotSupported());
+      throw CosPropertyService::ConstraintNotSupported();
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& )
     {
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return propset_ptr;
 }
@@ -173,21 +167,18 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
 // constraints. "All the properties will have *fixed-normal* modes".
 
 CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties
-                                                    ACE_ENV_ARG_DECL)
+TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
   TAO_PropertySet *new_set = 0;
   CosPropertyService::PropertySet_ptr propset_ptr = 0;
 
-  ACE_TRY
+  try
     {
       // New a TAO_PropertySet.
       ACE_NEW_RETURN (new_set,
-                      TAO_PropertySet (initial_properties
-                                       ACE_ENV_ARG_PARAMETER), 0);
-      ACE_TRY_CHECK;
+                      TAO_PropertySet (initial_properties), 0);
 
       // Successful, store this in the products sequence.
       CORBA::ULong products_len = this->propertyset_products_.length ();
@@ -195,27 +186,24 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
       this->propertyset_products_[products_len] = new_set;
 
       // All done.
-      propset_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propset_ptr = new_set->_this ();
     }
-  ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
+  catch (const CosPropertyService::MultipleExceptions& )
     {
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& )
     {
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return propset_ptr;
 }
@@ -243,7 +231,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
 // delete all these New'ed things.
 
 CosPropertyService::PropertySetDef_ptr
-TAO_PropertySetDefFactory::create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySetDefFactory::create_propertysetdef (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySetDef.
@@ -256,30 +244,26 @@ TAO_PropertySetDefFactory::create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL)
   this->propertysetdef_products_[cur_len] = new_set;
 
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr =
-    new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    new_set->_this ();
 
   return propsetdef_ptr;
 }
 
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                                              const CosPropertyService::PropertyDefs &allowed_property_defs
-                                                              ACE_ENV_ARG_DECL)
+                                                              const CosPropertyService::PropertyDefs &allowed_property_defs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::ConstraintNotSupported))
 {
   TAO_PropertySetDef *new_set = 0;
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
 
-  ACE_TRY
+  try
     {
       // New a TAO_PropertySetDef using these constraints.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySetDef (allowed_property_types,
-                                          allowed_property_defs
-                                          ACE_ENV_ARG_PARAMETER), 0);
-      ACE_TRY_CHECK;
+                                          allowed_property_defs), 0);
 
       // Successful, store this in the products sequence.
       CORBA::ULong products_len = this->propertysetdef_products_.length ();
@@ -287,27 +271,24 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
       this->propertysetdef_products_[products_len] = new_set;
 
       // All done. Return the pointer.
-      propsetdef_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propsetdef_ptr = new_set->_this ();
     }
-  ACE_CATCH (CORBA::UserException, ex)
+  catch (const CORBA::UserException& )
     {
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_TRY_THROW (CosPropertyService::ConstraintNotSupported());
+      throw CosPropertyService::ConstraintNotSupported();
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& )
     {
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return propsetdef_ptr;
 }
@@ -316,21 +297,18 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
 // initital constraints.
 
 CosPropertyService::PropertySetDef_ptr
-TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs
-                                                          ACE_ENV_ARG_DECL)
+TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
   TAO_PropertySetDef *new_set = 0;
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
 
-  ACE_TRY
+  try
     {
       // New a TAO_PropertySet using these lengths.
       ACE_NEW_RETURN (new_set,
-                      TAO_PropertySetDef (initial_property_defs
-                                          ACE_ENV_ARG_PARAMETER), 0);
-      ACE_TRY_CHECK;
+                      TAO_PropertySetDef (initial_property_defs), 0);
 
       // Successful, store this in the products sequence.
       CORBA::ULong products_len = this->propertysetdef_products_.length ();
@@ -338,27 +316,24 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
       this->propertysetdef_products_[products_len] = new_set;
 
       // All done.
-      propsetdef_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propsetdef_ptr = new_set->_this ();
     }
-  ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
+  catch (const CosPropertyService::MultipleExceptions& )
     {
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& )
     {
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return propsetdef_ptr;
 }
@@ -378,8 +353,7 @@ TAO_PropertySet::TAO_PropertySet (void)
 
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                                      const CosPropertyService::Properties allowed_properties
-                                      ACE_ENV_ARG_DECL)
+                                      const CosPropertyService::Properties allowed_properties)
   : allowed_property_types_ (allowed_property_types),
     allowed_property_names_ (allowed_properties.length ())
 {
@@ -394,27 +368,22 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
       allowed_properties[ni].property_name;
 
   // Define the allowed properties in the hash table.
-  ACE_TRY
+  try
     {
-      this->define_properties (allowed_properties
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->define_properties (allowed_properties);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_PropertySet-Constructor");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_PropertySet-Constructor");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // TAO_PropertySetDef's constructor needs this, for initializing the
 // allowed properties' sequence withe just the maximum length.
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                                      const CORBA::ULong number_of_allowed_properties
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      const CORBA::ULong number_of_allowed_properties)
   : allowed_property_types_ (allowed_property_types),
     allowed_property_names_ (number_of_allowed_properties)
 {
@@ -424,24 +393,19 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
 // properies with *normal* modes.
 
 
-TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties
-                                  ACE_ENV_ARG_DECL)
+TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties)
 {
   // Define all the initial properties in the Property Set. All take
   // *normal* modes.
-  ACE_TRY
+  try
     {
-      this->define_properties (initial_properties
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->define_properties (initial_properties);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_PropertySet-Constructor");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_PropertySet-Constructor");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Destructor. All sequences will be deleted.
@@ -460,8 +424,7 @@ TAO_PropertySet::~TAO_PropertySet (void)
 
 void
 TAO_PropertySet::define_property (const char *property_name,
-                                  const CORBA::Any &property_value
-                                  ACE_ENV_ARG_DECL)
+                                  const CORBA::Any &property_value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::ConflictingProperty,
@@ -471,17 +434,17 @@ TAO_PropertySet::define_property (const char *property_name,
 {
   // Check the name's validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    throw CosPropertyService::InvalidPropertyName();
 
   CORBA::TypeCode_var arg_tc = property_value.type ();
 
   // Is this type allowed?
   if (is_type_allowed (arg_tc.in ()) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedTypeCode());
+    throw CosPropertyService::UnsupportedTypeCode();
 
   // Is this property allowed?
   if (is_property_allowed (property_name) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedProperty());
+    throw CosPropertyService::UnsupportedProperty();
 
   // Try to bind the property. Use normal mode.
   CosProperty_Hash_Key hash_key (property_name);
@@ -506,25 +469,23 @@ TAO_PropertySet::define_property (const char *property_name,
 
       // Is the pointer valid?
       if (entry_ptr == 0)
-        ACE_THROW (CORBA::UNKNOWN ());
+        throw CORBA::UNKNOWN ();
 
       mapped_tc = entry_ptr->int_id_.pvalue_.type ();
 
       {
         CORBA::Boolean const equal_tc =
-          mapped_tc.in ()->equal (arg_tc.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          mapped_tc.in ()->equal (arg_tc.in ());
 
         // If type is not the same, raise exception.
         if (!equal_tc)
-          ACE_THROW (CosPropertyService::ConflictingProperty());
+          throw CosPropertyService::ConflictingProperty();
       }
 
       // If mode is read only, raise exception.
       if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
           (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-        ACE_THROW (CosPropertyService::ReadOnlyProperty());
+        throw CosPropertyService::ReadOnlyProperty();
 
       // Use the mode that is already there.
       hash_value.pmode_ = entry_ptr->int_id_.pmode_;
@@ -535,12 +496,12 @@ TAO_PropertySet::define_property (const char *property_name,
         {
           ACE_DEBUG ((LM_DEBUG,
                       "TAO_PropertySet::Define Property failed\n"));
-          ACE_THROW (CORBA::UNKNOWN ());
+          throw CORBA::UNKNOWN ();
         }
       break;
     default:
       // Error. ret is -1.
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
   return;
@@ -551,7 +512,6 @@ TAO_PropertySet::define_property (const char *property_name,
 CORBA::Boolean
 TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // If the sequence is empty, no constraints.
   if (this->allowed_property_types_.length () == 0)
@@ -563,23 +523,18 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
        ti < this->allowed_property_types_.length ();
        ti++)
     {
-      ACE_TRY
+      try
         {
-          ret_val = this->allowed_property_types_[ti]->equal (type
-                                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ret_val = this->allowed_property_types_[ti]->equal (type);
 
           if (ret_val == 1)
             return 1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_PropertySet::is_type_allowed failed");
+          ex._tao_print_exception ("TAO_PropertySet::is_type_allowed failed");
           return ret_val;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
 
   // Type not found.
@@ -614,8 +569,7 @@ TAO_PropertySet::is_property_allowed (const char* property_name)
 
 
 void
-TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties
-                                    ACE_ENV_ARG_DECL)
+TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -627,15 +581,13 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
 
   for (CORBA::ULong pi = 0; pi < sequence_length; pi++)
     {
-      ACE_TRY
+      try
         {
           // Define this property.
           this->define_property (nproperties [pi].property_name.in (),
-                                 nproperties [pi].property_value
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                 nproperties [pi].property_value);
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      catch (const CosPropertyService::InvalidPropertyName& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -644,7 +596,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
           multi_ex.exceptions[len].failing_property_name =
             nproperties[pi].property_name;
         }
-      ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
+      catch (const CosPropertyService::ConflictingProperty& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -653,7 +605,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
           multi_ex.exceptions[len].failing_property_name =
             nproperties[pi].property_name;
         }
-      ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
+      catch (const CosPropertyService::ReadOnlyProperty& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -662,7 +614,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
           multi_ex.exceptions[len].failing_property_name =
             nproperties[pi].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
+      catch (const CosPropertyService::UnsupportedTypeCode& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -671,7 +623,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
           multi_ex.exceptions[len].failing_property_name =
             nproperties[pi].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
+      catch (const CosPropertyService::UnsupportedProperty& )
          {
            CORBA::ULong len = multi_ex.exceptions.length ();
            multi_ex.exceptions.length (len + 1);
@@ -680,17 +632,15 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
            multi_ex.exceptions[len].failing_property_name =
              nproperties[pi].property_name;
          }
-       ACE_CATCH (CORBA::SystemException, sysex)
+       catch (const CORBA::SystemException& )
          {
-           ACE_RE_THROW;
+           throw;
          }
-       ACE_ENDTRY;
-       ACE_CHECK;
     }
 
   // Raise the multi exception if needed.
   if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+    throw CosPropertyService::MultipleExceptions (multi_ex);
 }
 
 // Returns the current number of properties associated with this
@@ -698,7 +648,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
 
 
 CORBA::ULong
-TAO_PropertySet::get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PropertySet::get_number_of_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return static_cast<CORBA::ULong> (this->hash_table_.current_size ());
@@ -713,8 +663,7 @@ TAO_PropertySet::get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
                                              CosPropertyService::PropertyNames_out property_names,
-                                             CosPropertyService::PropertyNamesIterator_out rest
-                                             ACE_ENV_ARG_DECL)
+                                             CosPropertyService::PropertyNamesIterator_out rest)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocating storage is a must.
@@ -722,8 +671,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
            CosPropertyService::PropertyNames);
 
   CORBA::ULong num_of_properties =
-    this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_number_of_properties ();
 
   if (num_of_properties == 0)
     // Nothing to do.
@@ -780,14 +728,12 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
 
       // Get the Interface ptr.
       CosPropertyService::PropertyNamesIterator_ptr iterator_ptr =
-        names_iterator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        names_iterator->_this ();
 
       // POA stuff todo here, since we have <destroy> method in the
       // <NamesIterator> interface.
       // Give ownership of this servant to the POA.
-      names_iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      names_iterator->_remove_ref ();
 
       // Init the out parameter.
       rest = iterator_ptr;
@@ -798,8 +744,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
 
 
 CORBA::Any *
-TAO_PropertySet::get_property_value (const char *property_name
-                                     ACE_ENV_ARG_DECL)
+TAO_PropertySet::get_property_value (const char *property_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName))
@@ -835,8 +780,7 @@ TAO_PropertySet::get_property_value (const char *property_name
 
 CORBA::Boolean
 TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names,
-                                 CosPropertyService::Properties_out nproperties
-                                 ACE_ENV_ARG_DECL)
+                                 CosPropertyService::Properties_out nproperties)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -859,9 +803,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
 
   for (CORBA::ULong i = 0; i < n; i++)
     {
-      any_ptr = get_property_value (property_names [i]
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      any_ptr = get_property_value (property_names [i]);
 
       if (any_ptr != 0)
         {
@@ -892,8 +834,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
 void
 TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
                                      CosPropertyService::Properties_out nproperties,
-                                     CosPropertyService::PropertiesIterator_out rest
-                                     ACE_ENV_ARG_DECL)
+                                     CosPropertyService::PropertiesIterator_out rest)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -902,8 +843,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
   // Validate the length.
   CORBA::ULong num_of_properties =
-          this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+          this->get_number_of_properties ();
 
   if (num_of_properties == 0)
     return;
@@ -969,14 +909,12 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
       // Get the interface ptr.
       CosPropertyService::PropertiesIterator_ptr iterator_ptr =
-        iterator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        iterator->_this ();
 
       // POA stuff todo here, since we have <destroy> method in the
       // <NamesIterator> interface.
       // Give ownership of this servant to the POA.
-      iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      iterator->_remove_ref ();
 
       // Init the out parameter.
       rest = iterator_ptr;
@@ -987,8 +925,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
 
 void
-TAO_PropertySet::delete_property (const char *property_name
-                                  ACE_ENV_ARG_DECL)
+TAO_PropertySet::delete_property (const char *property_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName,
@@ -996,7 +933,7 @@ TAO_PropertySet::delete_property (const char *property_name
 {
   // Check the name's validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    throw CosPropertyService::InvalidPropertyName();
 
   // Get the entry from the Hash Table.
 
@@ -1005,17 +942,17 @@ TAO_PropertySet::delete_property (const char *property_name
 
   if (this->hash_table_.find (hash_key,
                               entry_ptr) == -1)
-    ACE_THROW (CosPropertyService::PropertyNotFound());
+    throw CosPropertyService::PropertyNotFound();
 
   // If property is fixed, then raise exception.
   if ((entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_normal)
       || (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-    ACE_THROW (CosPropertyService::FixedProperty());
+    throw CosPropertyService::FixedProperty();
 
   // Unbind this property.
   if (this->hash_table_.unbind (entry_ptr) != 0)
     {
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
   return;
@@ -1027,8 +964,7 @@ TAO_PropertySet::delete_property (const char *property_name
 
 
 void
-TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names
-                                    ACE_ENV_ARG_DECL)
+TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1042,14 +978,12 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
 
   for (CORBA::ULong pi = 0; pi < sequence_length; pi++)
     {
-      ACE_TRY
+      try
         {
           // Delete this property.
-          this->delete_property (property_names[pi]
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->delete_property (property_names[pi]);
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      catch (const CosPropertyService::InvalidPropertyName& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex->exceptions.length ();
@@ -1059,7 +993,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
           multi_ex->exceptions[len].failing_property_name =
             property_names[pi];
         }
-      ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
+      catch (const CosPropertyService::PropertyNotFound& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex->exceptions.length ();
@@ -1069,7 +1003,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
           multi_ex->exceptions[len].failing_property_name =
             property_names[pi];
         }
-      ACE_CATCH (CosPropertyService::FixedProperty, ex)
+      catch (const CosPropertyService::FixedProperty& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex->exceptions.length ();
@@ -1079,18 +1013,16 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
           multi_ex->exceptions[len].failing_property_name =
             property_names[pi];
         }
-      ACE_CATCH (CORBA::SystemException, sysex)
+      catch (const CORBA::SystemException& )
         {
           // We cant afford to get this. Throw this.
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
   // Raise the multiple exceptions if there are any.
   if (multi_ex->exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (*multi_ex));
+    throw CosPropertyService::MultipleExceptions (*multi_ex);
 }
 
 // Delete all the properties in the current ProperySet : Delete the
@@ -1098,7 +1030,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
 
 
 CORBA::Boolean
-TAO_PropertySet::delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet::delete_all_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get all the property names in a names' sequence.
@@ -1110,23 +1042,18 @@ TAO_PropertySet::delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
   CosPropertyService::PropertyNamesIterator_out iter_out (iter_ptr);
   CosPropertyService::PropertyNamesIterator_var iter;
 
-  CORBA::ULong size = this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong size = this->get_number_of_properties ();
 
   this->get_all_property_names (size,
                                 names_out,
-                                iter_out
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                iter_out);
 
   // Get the out values on to the var varibles.
   names = names_out.ptr ();
   iter = iter_out.ptr ();
 
   // Delete all these properties.
-  this->delete_properties (names.in ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->delete_properties (names.in ());
 
   // All properties deleted.
   return 1;
@@ -1136,8 +1063,7 @@ TAO_PropertySet::delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
 
 
 CORBA::Boolean
-TAO_PropertySet::is_property_defined (const char *property_name
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertySet::is_property_defined (const char *property_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName))
 {
@@ -1167,11 +1093,9 @@ TAO_PropertySetDef::TAO_PropertySetDef (void)
 // Constructor that the factory uses.
 
 TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
-                                        const CosPropertyService::PropertyDefs allowed_property_defs
-                                        ACE_ENV_ARG_DECL)
+                                        const CosPropertyService::PropertyDefs allowed_property_defs)
   : TAO_PropertySet(allowed_property_types,
-                    allowed_property_defs.length ()
-                    ACE_ENV_ARG_PARAMETER)
+                    allowed_property_defs.length ())
 {
   // Set the length of the allowed property names.
   this->allowed_property_names_.length (allowed_property_defs.length ());
@@ -1182,28 +1106,21 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes
       allowed_property_defs[ni].property_name;
 
   // Define the allowed properties in the hash table.
-  ACE_TRY
+  try
     {
-      this->define_properties_with_modes (allowed_property_defs
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->define_properties_with_modes (allowed_property_defs);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Constructor that the factory uses.
 
-TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs
-                                        ACE_ENV_ARG_DECL)
+TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs)
 {
-  this->define_properties_with_modes (initial_property_defs
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->define_properties_with_modes (initial_property_defs);
 }
 
 // Destructor.
@@ -1214,8 +1131,7 @@ TAO_PropertySetDef::~TAO_PropertySetDef (void)
 
 // Return the sequence that is there in side.
 void
-TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types
-                                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Copy contents of the sequence.
@@ -1224,8 +1140,7 @@ TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyType
 }
 
 void
-TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We have all the names, get the values and the modes from the Hash
@@ -1248,8 +1163,7 @@ TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out
 void
 TAO_PropertySetDef::define_property_with_mode (const char *property_name,
                                                const CORBA::Any &property_value,
-                                               CosPropertyService::PropertyModeType property_mode
-                                               ACE_ENV_ARG_DECL)
+                                               CosPropertyService::PropertyModeType property_mode)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::ConflictingProperty,
@@ -1260,19 +1174,19 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 {
   // Check the names validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    throw CosPropertyService::InvalidPropertyName();
 
   // Is this type allowed?
   if (is_type_allowed (property_value.type ()) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedTypeCode());
+    throw CosPropertyService::UnsupportedTypeCode();
 
   // Is this property allowed?
   if (is_property_allowed (property_name) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedProperty());
+    throw CosPropertyService::UnsupportedProperty();
 
   // Is this a valid mode.
   if (property_mode == CosPropertyService::undefined)
-    ACE_THROW (CosPropertyService::UnsupportedMode());
+    throw CosPropertyService::UnsupportedMode();
 
   // Try to bind the Property.
   CosProperty_Hash_Key hash_key (property_name);
@@ -1295,23 +1209,23 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 
       // Is the pointer valid.
       if (entry_ptr == 0)
-        ACE_THROW (CORBA::UNKNOWN ());
+        throw CORBA::UNKNOWN ();
 
       // If type is not the same, raise exception.
       if (entry_ptr->int_id_.pvalue_.type () != property_value.type ())
-        ACE_THROW (CosPropertyService::ConflictingProperty());
+        throw CosPropertyService::ConflictingProperty();
 
       // If mode is read only, raise exception.
       if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
           (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-        ACE_THROW (CosPropertyService::ReadOnlyProperty());
+        throw CosPropertyService::ReadOnlyProperty();
 
       // If current mode is fixed_normal, but the new mode is not
       // fixed, reject it.
       if ((entry_ptr->int_id_.pmode_ ==
            CosPropertyService::fixed_normal) &&
           (property_mode < CosPropertyService::fixed_normal))
-        ACE_THROW (CosPropertyService::UnsupportedMode());
+        throw CosPropertyService::UnsupportedMode();
 
       // Everything is fine. Overwrite the value.
       if (this->hash_table_.rebind (hash_key,
@@ -1321,7 +1235,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
         }
     default:
       // Error. ret is -1 or rebind returned other than 1.
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
   return;
@@ -1330,8 +1244,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 // Define one by one. If any excceptions raised, build
 // MultipleExceptions sequence and raise that.
 void
-TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs
-                                                  ACE_ENV_ARG_DECL)
+TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1344,16 +1257,14 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
   // Try defining the propdefs one by one.
   for (CORBA::ULong i = 0; i < sequence_length; i++)
     {
-      ACE_TRY
+      try
         {
           // Define the property.
           this->define_property_with_mode (property_defs[i].property_name,
                                            property_defs[i].property_value,
-                                           property_defs[i].property_mode
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                           property_defs[i].property_mode);
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      catch (const CosPropertyService::InvalidPropertyName& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1362,7 +1273,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
+      catch (const CosPropertyService::ConflictingProperty& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1371,7 +1282,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
+      catch (const CosPropertyService::ReadOnlyProperty& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1380,7 +1291,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
+      catch (const CosPropertyService::UnsupportedTypeCode& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1389,7 +1300,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
+      catch (const CosPropertyService::UnsupportedProperty& )
          {
            CORBA::ULong len = multi_ex.exceptions.length ();
            multi_ex.exceptions.length (len + 1);
@@ -1398,7 +1309,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
            multi_ex.exceptions[len].failing_property_name =
              property_defs[i].property_name;
          }
-      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
+      catch (const CosPropertyService::UnsupportedMode& )
         {
           CORBA::ULong len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -1407,24 +1318,21 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CORBA::SystemException, sysex)
+      catch (const CORBA::SystemException& )
         {
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
   // Raise the multi exception if needed.
   if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+    throw CosPropertyService::MultipleExceptions (multi_ex);
 }
 
 // Get the mode of a property. Raises InvalidpropertyName,
 // PropertyNotFound exceptions.
 CosPropertyService::PropertyModeType
-TAO_PropertySetDef::get_property_mode (const char *property_name
-                                       ACE_ENV_ARG_DECL)
+TAO_PropertySetDef::get_property_mode (const char *property_name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName))
@@ -1461,8 +1369,7 @@ TAO_PropertySetDef::get_property_mode (const char *property_name
 // Nil or no, before doing something with it.
 CORBA::Boolean
 TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                        CosPropertyService::PropertyModes_out property_modes
-                                        ACE_ENV_ARG_DECL)
+                                        CosPropertyService::PropertyModes_out property_modes)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1486,18 +1393,16 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
   CosPropertyService::PropertyModeType mode;
   for (CORBA::ULong i = 0; i < sequence_length; i++)
     {
-      ACE_TRY
+      try
         {
           // Invoke get_property_mode for this name.
-          mode = this->get_property_mode (property_names[i]
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          mode = this->get_property_mode (property_names[i]);
 
           // Store the mode in the out sequence.
           property_modes[i].property_name = property_names[i];
           property_modes[i].property_mode = mode;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Return value becomes false.
           ret = 1;
@@ -1507,8 +1412,6 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
           property_modes[i].property_name = property_names[i];
           property_modes[i].property_mode = CosPropertyService::undefined;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
 
   return ret;
@@ -1521,8 +1424,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
 // "Fixed-Readonly" to anything is *not* possible.
 void
 TAO_PropertySetDef::set_property_mode (const char *property_name,
-                                       CosPropertyService::PropertyModeType property_mode
-                                       ACE_ENV_ARG_DECL)
+                                       CosPropertyService::PropertyModeType property_mode)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::PropertyNotFound,
@@ -1530,11 +1432,11 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
 {
   // Check the names validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    throw CosPropertyService::InvalidPropertyName();
 
   // Trying to set to undefined mode is not allowed.
   if (property_mode == CosPropertyService::undefined)
-    ACE_THROW (CosPropertyService::UnsupportedMode());
+    throw CosPropertyService::UnsupportedMode();
 
   // Find the property from the Hash Table.
   CosProperty_Hash_Key hash_key (property_name);
@@ -1564,13 +1466,13 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
           if (this->hash_table_.rebind (hash_key,
                                         hash_value) != 1)
             // Return values 0 and -1 are not possible.
-            ACE_THROW (CORBA::UNKNOWN ());
+            throw CORBA::UNKNOWN ();
           break;
 
         case CosPropertyService::read_only:
           // Read_only to fixed read only alone is possible.
           if (property_mode != CosPropertyService::fixed_readonly)
-            ACE_THROW (CosPropertyService::UnsupportedMode());
+            throw CosPropertyService::UnsupportedMode();
           else
             {
               // Change the mode and update hash table.
@@ -1578,14 +1480,14 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
               if (this->hash_table_.rebind (hash_key,
                                             hash_value) != 1)
                 // Return values 0 and -1 are not possible.
-                ACE_THROW (CORBA::UNKNOWN ());
+                throw CORBA::UNKNOWN ();
             }
           break;
 
         case CosPropertyService::fixed_normal:
           // Fixed_normal to fixed_readonly alone is possible.
           if (property_mode != CosPropertyService::fixed_readonly)
-            ACE_THROW (CosPropertyService::UnsupportedMode());
+            throw CosPropertyService::UnsupportedMode();
           else
             {
               // Change the mode and update the hash table.
@@ -1593,19 +1495,19 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
               if (this->hash_table_.rebind (hash_key,
                                             hash_value) != 1)
                 // Return values 0 and -1 are not possible.
-                ACE_THROW (CORBA::UNKNOWN ());
+                throw CORBA::UNKNOWN ();
             }
           break;
 
         default:
           // Fixed_readonly to any mode is not possible.
-          ACE_THROW (CosPropertyService::UnsupportedMode());
+          throw CosPropertyService::UnsupportedMode();
         }
       break;
     case -1:
     default:
       // Error or property not found in the Hash Table.
-      ACE_THROW (CosPropertyService::PropertyNotFound());
+      throw CosPropertyService::PropertyNotFound();
     }
 }
 
@@ -1615,8 +1517,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
 // sequence and return.
 
 void
-TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes
-                                        ACE_ENV_ARG_DECL)
+TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1629,14 +1530,12 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
   // Set  modes one by one.
   for (CORBA::ULong i = 0; i < sequence_length; i++)
     {
-      ACE_TRY
+      try
         {
           this->set_property_mode (property_modes[i].property_name,
-                                   property_modes[i].property_mode
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                   property_modes[i].property_mode);
         }
-      ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
+      catch (const CosPropertyService::PropertyNotFound& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex.exceptions.length ();
@@ -1646,7 +1545,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
           multi_ex.exceptions[len].failing_property_name =
             property_modes[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      catch (const CosPropertyService::InvalidPropertyName& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex.exceptions.length ();
@@ -1656,7 +1555,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
           multi_ex.exceptions[len].failing_property_name =
             property_modes[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
+      catch (const CosPropertyService::UnsupportedMode& )
         {
           // Put this exception in the multiple exception.
           CORBA::ULong len = multi_ex.exceptions.length ();
@@ -1666,17 +1565,15 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
           multi_ex.exceptions[len].failing_property_name =
             property_modes[i].property_name;
         }
-      ACE_CATCH (CORBA::SystemException, systex)
+      catch (const CORBA::SystemException& )
         {
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
   // Raise the multi_ex, if needed.
   if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+    throw CosPropertyService::MultipleExceptions (multi_ex);
 }
 
 //======================================================================
@@ -1698,7 +1595,7 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
 // one exists.
 
 void
-TAO_PropertyNamesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PropertyNamesIterator::reset (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iterator_ = this->iterator_.map ().begin ();
@@ -1710,8 +1607,7 @@ TAO_PropertyNamesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // iterator.
 
 CORBA::Boolean
-TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
@@ -1729,8 +1625,7 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name
 
 CORBA::Boolean
 TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
-                                   CosPropertyService::PropertyNames_out property_names
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   CosPropertyService::PropertyNames_out property_names)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1763,23 +1658,18 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
 }
 
 void
-TAO_PropertyNamesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertyNamesIterator::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
   // on this servant are complete.
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::ObjectId_var id = poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 //======================================================================
@@ -1794,15 +1684,14 @@ TAO_PropertiesIterator::~TAO_PropertiesIterator (void)
 }
 
 void
-TAO_PropertiesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PropertiesIterator::reset (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iterator_ = this->iterator_.map ().begin ();
 }
 
 CORBA::Boolean
-TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
@@ -1824,8 +1713,7 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty
 
 CORBA::Boolean
 TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
-                                CosPropertyService::Properties_out nproperties
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                CosPropertyService::Properties_out nproperties)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1866,23 +1754,18 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
 }
 
 void
-TAO_PropertiesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertiesIterator::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
   // on this servant are complete.
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::ObjectId_var id = poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index d887745dec3..92f370c9cf8 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -127,23 +127,21 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySet_ptr
-  create_propertyset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  create_propertyset (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a  new TAO_PropertySet object. "The property set returned
   // will *not* have any initial properties."
 
   virtual CosPropertyService::PropertySet_ptr
   create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                  const CosPropertyService::Properties &allowed_properties
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  const CosPropertyService::Properties &allowed_properties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
     // Allows a client to create a new TAO_PropertySet with specific
     // constraints. "All the properties will have *fixed-normal* modes".
 
   virtual CosPropertyService::PropertySet_ptr
-  create_initial_propertyset (const CosPropertyService::Properties &initial_properties
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  create_initial_propertyset (const CosPropertyService::Properties &initial_properties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySet with specific
@@ -180,22 +178,20 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  create_propertysetdef (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new TAO_PropertySetDef object.
 
   virtual CosPropertyService::PropertySetDef_ptr
   create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                     const CosPropertyService::PropertyDefs &allowed_property_defs
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     const CosPropertyService::PropertyDefs &allowed_property_defs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
   // Allows a client to create a new TAO_PropertySetDef with specific
   // constraints.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySetDef with specific
@@ -227,25 +223,21 @@ public:
   // Default constructor.
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                   const CosPropertyService::Properties allowed_properties
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                   const CosPropertyService::Properties allowed_properties);
   // Init values that the PropertySetFactory will want to specify.
 
-  TAO_PropertySet (const CosPropertyService::Properties initial_properties
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  TAO_PropertySet (const CosPropertyService::Properties initial_properties);
   // PropertySetFactory needs this constructor.
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                   const CORBA::ULong number_of_allowed_propertydefs
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                   const CORBA::ULong number_of_allowed_propertydefs);
   // PropertySetDef's construction needs this.
 
   virtual ~TAO_PropertySet (void);
   // Destructor function.
 
   virtual void define_property (const char *property_name,
-                                const CORBA::Any &property_value
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                const CORBA::Any &property_value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -256,67 +248,59 @@ public:
   // Store the property in the hash after checking for validity of the
   // property name, duplicate name, type code over writing etc.
 
-  virtual void define_properties (const CosPropertyService::Properties &nproperties
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void define_properties (const CosPropertyService::Properties &nproperties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Define a sequence of properties at a time.
 
-  virtual CORBA::ULong get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong get_number_of_properties (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the number of properties that are currently defined in the
   // PropertySet.
 
   virtual void get_all_property_names (CORBA::ULong how_many,
                                        CosPropertyService::PropertyNames_out property_names,
-                                       CosPropertyService::PropertyNamesIterator_out rest
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       CosPropertyService::PropertyNamesIterator_out rest)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the names of all the properties that are currently defined in
   // the property set.
 
-  virtual CORBA::Any *get_property_value (const char *property_name
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Any *get_property_value (const char *property_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
   // Get the value of the property, given the name.
 
   virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
-                                         CosPropertyService::Properties_out nproperties
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         CosPropertyService::Properties_out nproperties)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get all names and their property values.
 
   virtual void get_all_properties (CORBA::ULong how_many,
                                    CosPropertyService::Properties_out nproperties,
-                                   CosPropertyService::PropertiesIterator_out rest
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   CosPropertyService::PropertiesIterator_out rest)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns all of the property names currently defined in the
   // PropertySet. If the PropertySet contains more than how_many
   // property names, then the remaining property names are put into the PropertyNamesIterator.
 
-  virtual void delete_property (const char *property_name
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void delete_property (const char *property_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::FixedProperty));
   // Delete a property given a name.
 
-  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Delete all the these properties from this property set.
 
-  virtual CORBA::Boolean delete_all_properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean delete_all_properties (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Delete everything from this property set.
 
-  virtual CORBA::Boolean is_property_defined (const char *property_name
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean is_property_defined (const char *property_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName));
   // Tell whether this property is defined or no. Forget about the
@@ -385,19 +369,16 @@ public:
   // Constructor.
 
   TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
-                      const CosPropertyService::PropertyDefs allowed_property
-                      ACE_ENV_ARG_DECL);
+                      const CosPropertyService::PropertyDefs allowed_property);
   // The factory uses this constructor.
 
-  TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs
-                      ACE_ENV_ARG_DECL);
+  TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs);
   // This is also for the factory.
 
   virtual ~TAO_PropertySetDef (void);
   // Destructor.
 
-  virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Indicates which types of properties are supported by this
   // PropertySet. If the output sequence is empty, then there is no
@@ -405,8 +386,7 @@ public:
   // field of a Property in this PropertySet, unless the
   // get_allowed_properties output sequence is not empty.
 
-  virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Indicates which properties are supported by this PropertySet. If
@@ -416,8 +396,7 @@ public:
 
   virtual void define_property_with_mode (const char *property_name,
                                           const CORBA::Any &property_value,
-                                          CosPropertyService::PropertyModeType property_mode
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          CosPropertyService::PropertyModeType property_mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -433,15 +412,13 @@ public:
   // PropertySet. If type or mode is violated, ConflictingProperty
   // exception is thrown.
 
-  virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // This operation will modify or add each of the properties in the
   // Properties parameter to the PropertySet.
 
-  virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name
-                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
@@ -449,8 +426,7 @@ public:
   // PropertyNotFound exceptions.
 
   virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                             CosPropertyService::PropertyModes_out property_modes
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             CosPropertyService::PropertyModes_out property_modes)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Batch operation for getting the property. Invoke
   // get_property_mode for each name.  Return value False indicates
@@ -461,8 +437,7 @@ public:
   // doing something with it.
 
   virtual void set_property_mode (const char *property_name,
-                                  CosPropertyService::PropertyModeType property_mode
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  CosPropertyService::PropertyModeType property_mode)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::PropertyNotFound,
@@ -478,8 +453,7 @@ public:
   // all illegal set_mode attempts, UnsupportedMode exception is
   // raised.
 
-  virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Batch operation for setting the property. Raises
@@ -509,13 +483,12 @@ public:
   virtual ~TAO_PropertyNamesIterator (void);
   // Destructor.
 
-  virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void reset (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The reset operation resets the position in an iterator to the
   // first property name, if one exists.
 
-  virtual CORBA::Boolean next_one (CORBA::String_out property_name
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean next_one (CORBA::String_out property_name)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -523,8 +496,7 @@ public:
 
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::PropertyNames_out property_names
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 CosPropertyService::PropertyNames_out property_names)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
@@ -532,7 +504,7 @@ public:
   // with at most the how_many number of names. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys the iterator.
 private:
@@ -572,12 +544,11 @@ public:
   virtual ~TAO_PropertiesIterator (void);
   // Destructor.
 
-  virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void reset (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Resets the position in an iterator to the first property, if one exists.
 
-  virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -585,8 +556,7 @@ public:
   // iterator.
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::Properties_out nproperties
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 CosPropertyService::Properties_out nproperties)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
@@ -594,7 +564,7 @@ public:
   // at most the how_many number of properties. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys the iterator.
 
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
index d13cfe93576..b99b792b5dd 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
@@ -31,7 +31,7 @@ namespace TAO
       char *node_name,
       char *file)
   {
-    ACE_TRY_NEW_ENV
+    try
       {
         /// Read the resources and ceilings from the config file
         /// and put them into the activity_map_
@@ -54,7 +54,6 @@ namespace TAO
             ACE_NEW_THROW_EX (this->client_interceptor_,
                               RTCosScheduling_ClientScheduler_Interceptor(orb),
                               CORBA::NO_MEMORY());
-          ACE_CHECK;
 
           TAO_ORB_Core *orb_core = orb->orb_core();
 
@@ -93,41 +92,30 @@ namespace TAO
          /// another POA then register it now
          if (unregistered)
            {
-             orb_core->add_interceptor(this->client_interceptor_
-                                       ACE_ENV_ARG_PARAMETER);
+             orb_core->add_interceptor(this->client_interceptor_);
            }
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
          /// Now resolve a reference to the Real Time ORB
          CORBA::Object_var rt_obj =
-           orb->resolve_initial_references("RTORB"
-                                           ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK;
+           orb->resolve_initial_references("RTORB");
 
          // Get a reference to the real time orb
          RTCORBA::RTORB_var rt_orb =
-           RTCORBA::RTORB::_narrow (rt_obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK;
+           RTCORBA::RTORB::_narrow (rt_obj.in ());
 
          /// resolve a reference to RT Current
          rt_obj =
-           orb->resolve_initial_references ("RTCurrent"
-                                            ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK;
+           orb->resolve_initial_references ("RTCurrent");
 
          this->current_ =
-           RTCORBA::Current::_narrow (rt_obj.in () ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK
+           RTCORBA::Current::_narrow (rt_obj.in ());
 
          /// Resolve a reference to the Linear Priority Mapping Manager
          rt_obj =
-           orb->resolve_initial_references("PriorityMappingManager"
-                                           ACE_ENV_ARG_PARAMETER);
+           orb->resolve_initial_references("PriorityMappingManager");
          RTCORBA::PriorityMappingManager_var mapping_manager =
-           RTCORBA::PriorityMappingManager::_narrow(rt_obj.in()
-                                                    ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK;
+           RTCORBA::PriorityMappingManager::_narrow(rt_obj.in());
 
          /// Create the Linear Priority Mapping Manager
          ACE_NEW_THROW_EX(this->pm_,
@@ -137,15 +125,13 @@ namespace TAO
          // WHERE the parameter is one of SCHED_OTHER, SCHED_FIFO, or SCHED_RR
 
          mapping_manager->mapping(this->pm_);
-         ACE_TRY_CHECK;
        }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
         ACE_ERROR((LM_ERROR, "Could not configure the orb"));
         ACE_OS::exit(1);
     }
- ACE_ENDTRY;
 }
 
 
@@ -160,8 +146,7 @@ RTCosScheduling_ClientScheduler_i::~RTCosScheduling_ClientScheduler_i (void)
 
 
 void  RTCosScheduling_ClientScheduler_i::schedule_activity (
-  const char * activity_name
-  ACE_ENV_ARG_DECL)
+  const char * activity_name)
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     RTCosScheduling::UnknownName))
@@ -176,14 +161,12 @@ void  RTCosScheduling_ClientScheduler_i::schedule_activity (
   /// appropriate priority.
   if (result != -1)
     {
-      this->current_->the_priority(priority
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->current_->the_priority(priority);
     }
   /// If the activity was not found, throw an UnknownName exception.
   else
     {
-      ACE_THROW (RTCosScheduling::UnknownName());
+      throw RTCosScheduling::UnknownName();
     }
 }
 
@@ -314,18 +297,15 @@ RTCosScheduling_ClientScheduler_i::tasks(
 
 RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Interceptor() : name_("RTCosScheduling_Client_Interceptor")
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       /// resolve a reference to RT Current
       int argc = 0;
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             0,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
+                                            0);
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RTCurrent"
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTCurrent");
       if (CORBA::is_nil(obj.in()))
         {
           ACE_OS::exit(1);
@@ -333,13 +313,11 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
       else
         {
           this->current_ =
-             RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+             RTCORBA::Current::_narrow (obj.in ());
         }
-      ACE_CHECK;
 
       obj =
-        orb->resolve_initial_references("CodecFactory"
-                                        ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("CodecFactory");
 
       IOP::CodecFactory_var codec_factory;
       if (CORBA::is_nil(obj.in()))
@@ -361,26 +339,23 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
 
       this->codec_ = codec_factory->create_codec(encoding);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          "There was an error constructing the "
-                          "ClientScheduler Interceptor\n");
+      ex._tao_print_exception (
+        "There was an error constructing the "
+        "ClientScheduler Interceptor\n");
     }
-  ACE_ENDTRY;
 }
 
 
 RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Interceptor(
   const CORBA::ORB_var orb)  : name_("RTCosScheduling_Client_Interceptor")
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       /// resolve a reference to RT Current
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RTCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        orb->resolve_initial_references ("RTCurrent");
       if (CORBA::is_nil(obj.in()))
         {
           ACE_OS::exit(1);
@@ -388,13 +363,11 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
       else
         {
           this->current_ =
-             RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+             RTCORBA::Current::_narrow (obj.in ());
         }
-      ACE_TRY_CHECK;
 
       obj =
-        orb->resolve_initial_references("CodecFactory"
-                                        ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("CodecFactory");
 
       // set up the codec factory to create the codec necessary to
       // encode the octet stream for the service context
@@ -418,46 +391,39 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int
 
       // Create the codec
       this->codec_ = codec_factory->create_codec(encoding);
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          "Error in creating Client Interceptor\n");
+      ex._tao_print_exception ("Error in creating Client Interceptor\n");
     }
-  ACE_ENDTRY;
 }
 
 char *
-RTCosScheduling_ClientScheduler_Interceptor::name (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RTCosScheduling_ClientScheduler_Interceptor::name ()
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 return CORBA::string_dup(this->name_);
 }
 
 void
-RTCosScheduling_ClientScheduler_Interceptor::destroy (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RTCosScheduling_ClientScheduler_Interceptor::destroy ()
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  ACE_TRY
+  try
     {
 
       // Get the Corba priority that the activity is currently running at
       CORBA::Any the_priority_as_any;
       the_priority_as_any <<=
         this->current_->the_priority();
-      ACE_TRY_CHECK;
 
       // Set up a service context to hold the priority
       IOP::ServiceContext sc;
@@ -467,42 +433,35 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request (
       // (that is how service contexts send data)
       sc.context_data =
         reinterpret_cast<CORBA::OctetSeq &> (*this->codec_->encode (the_priority_as_any));
-      ACE_TRY_CHECK;
 
       // add the service context
       ri->add_request_service_context(sc, 0);
-      ACE_TRY_CHECK;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ERROR - in Client interceptor\n");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("ERROR - in Client interceptor\n");
+      throw CORBA::INTERNAL ();
     }
-   ACE_ENDTRY;
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::send_poll (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::receive_reply (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::receive_exception (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -510,8 +469,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 RTCosScheduling_ClientScheduler_Interceptor::receive_other (
-  PortableInterceptor::ClientRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
index 69ac688e910..8c01a8eb91c 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
@@ -85,37 +85,32 @@ public:
   //@{
   /// Return the name of this ClientRequestInterceptor.
   //
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
@@ -174,8 +169,7 @@ class TAO_RTCosScheduling_Export RTCosScheduling_ClientScheduler_i :
      *        the desired priority
      */
     virtual void schedule_activity (
-        const char *activity_name
-        ACE_ENV_ARG_DECL_NOT_USED)
+        const char *activity_name)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         RTCosScheduling::UnknownName));
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
index b7fa81697e3..9398bba6049 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
@@ -28,7 +28,7 @@ CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array,
   const int size,
   ACE_SYNCH_MUTEX *mutex)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
           /*
        *  The pointers to the beginnings of the lists must be globally visible,
@@ -55,7 +55,6 @@ CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array,
                            ACE_SYNCH_CONDITION(*mutex),
                            CORBA::NO_MEMORY());
         }
-      ACE_TRY_CHECK;
       lock_array[size - 1].next(0); /// terminate the free list
 
 
@@ -64,16 +63,14 @@ CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array,
       this->granted_ = &lock_array[1];
       this->pending_ = &lock_array[2];
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG((LM_ERROR,
                  "Error in %s: Line %d - Could not generate a Locklist in shared memory\n",
                  __FILE__,
                  __LINE__));
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          "Exception: CosSchedulingLockList()");
+      ex._tao_print_exception ("Exception: CosSchedulingLockList()");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -255,7 +252,7 @@ PCP_Manager::PCP_Manager(CosSchedulingLockList *locks,
 void
 PCP_Manager::lock(const int priority_ceiling, const int priority)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       /// we do not want the thread to be pre-empted inside
@@ -265,7 +262,6 @@ PCP_Manager::lock(const int priority_ceiling, const int priority)
       //  at RTCORBA::maxPriority
       this->current_->the_priority(RTCORBA::maxPriority);
       this->mutex_->acquire();
-      ACE_TRY_CHECK;
 
       /// create a structure to store my own lock request
       CosSchedulingLockNode MyLock;
@@ -322,35 +318,30 @@ PCP_Manager::lock(const int priority_ceiling, const int priority)
                   ACE_ERROR((LM_ERROR,
                              "Error in deferring lock\n"));
                 }
-              ACE_TRY_CHECK;
             }
         }
 
       /// remove mutex on the lock list
       this->mutex_->release();
-      ACE_TRY_CHECK;
 
       /// at this point we have the right to set the OS priority
       /// Do so at the priority ceiline.
       this->current_->the_priority(priority_ceiling);
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG((LM_ERROR,
                  "Error in %s: Line %d - Could lock resource\n"
                  __FILE__,
                  __LINE__));
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          "Exception: PCP_Manager::lock");
+      ex._tao_print_exception ("Exception: PCP_Manager::lock");
     }
-  ACE_ENDTRY;
 }
 
 void PCP_Manager::release_lock()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       /// To prevent pre-emption in the critical section,
       /// which could lead to unbounded blocking
@@ -358,7 +349,6 @@ void PCP_Manager::release_lock()
 
       /// set up the mutex
       this->mutex_->acquire();
-      ACE_TRY_CHECK;
 
       /// remove the lock node from the list of locks
       CosSchedulingLockNode L;
@@ -367,7 +357,6 @@ void PCP_Manager::release_lock()
 
       /// Done with the list, release the mutex
       this->mutex_->release();
-      ACE_TRY_CHECK;
 
       /// Let the highest priority lock signal the condition variable
       CosSchedulingLockNode *waiter = this->locks_->highest_priority();
@@ -375,27 +364,24 @@ void PCP_Manager::release_lock()
         {
           waiter->condition_->signal();
         }
-      ACE_TRY_CHECK;
 
       /// We do not need to restore priority because we have already set this
       // thread to wait at RTCORBA::maxPriority at the start of this method
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG((LM_ERROR,
                  "Error in %s: Line %d - Could not release lock\n"
                  __FILE__,
                  __LINE__));
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          "Exception: PCP_Manager::release_lock");
+      ex._tao_print_exception ("Exception: PCP_Manager::release_lock");
     }
-  ACE_ENDTRY;
 }
 
 
 PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 #if !defined (ACE_LACKS_MMAP)
       char temp_file[MAXPATHLEN + 1];
@@ -411,7 +397,6 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
                      __LINE__));
           ACE_OS::exit(1);
         }
-      ACE_TRY_CHECK;
 
       /// Add the filename to the end
       ACE_OS_String::strcat (temp_file, shared_file);
@@ -433,7 +418,6 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
         ACE_ERROR ((LM_ERROR,
                     "(%P|%t) %p\n",
                     this->shm_key_));
-        ACE_TRY_CHECK;
 
 #else /* !ACE_LACKS_MMAP */
         ACE_DEBUG((LM_ERROR,
@@ -464,7 +448,6 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
           ACE_OS::exit(1);
         }
 
-      ACE_CHECK;
 
       /// Make the shared memory a place for a lock list
       this->lock_array_ = static_cast<CosSchedulingLockNode *> (this->mem_.malloc(CosSchedulingLockList_space));
@@ -489,20 +472,17 @@ PCP_Manager_Factory::PCP_Manager_Factory(const char *shared_file)
                              &this->mutex_),
                            CORBA::NO_MEMORY()
                           );
-          ACE_TRY_CHECK;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR((LM_ERROR,
                  "Error in %s: Line %d - Error in creating "
                  "PCP_Manager_Factory to create new PCP_Managers\n"
                  __FILE__,
                  __LINE__));
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                         "PCP_Manager_Factory::PCP_Manager_Factory\n");
+      ex._tao_print_exception ("PCP_Manager_Factory::PCP_Manager_Factory\n");
     }
-  ACE_ENDTRY;
 }
 
 PCP_Manager_Factory::~PCP_Manager_Factory()
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
index cb28c37c73c..5943a7f0e8a 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
@@ -61,7 +61,7 @@ RTCosScheduling_ServerScheduler_i::~RTCosScheduling_ServerScheduler_i (void)
 int
 RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
      // Get an object reference to orb from the orb core
@@ -76,7 +76,6 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
           &this->object_name_map_,
           &this->resource_map_),
           CORBA::NO_MEMORY());
-      ACE_TRY_CHECK;
 
       /// First, get a list of all interceptors currently registered
       TAO::ServerRequestInterceptor_List::TYPE &interceptors =
@@ -104,15 +103,13 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
 
       if (unregistered)
         {
-          orb_core->add_interceptor(server_interceptor
-                                    ACE_ENV_ARG_PARAMETER);
+          orb_core->add_interceptor(server_interceptor);
         }
 #endif /*  TAO_HAS_INTERCEPTORS */
 
       /// Resolve a reference to the Linear Priority Mapping Manager
      CORBA::Object_var rt_obj =
-        orb->resolve_initial_references("PriorityMappingManager"
-                                        ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("PriorityMappingManager");
       if (CORBA::is_nil(rt_obj.in()))
         {
           ACE_DEBUG((LM_DEBUG,
@@ -121,9 +118,7 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
           return 0;
         }
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow(rt_obj.in()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityMappingManager::_narrow(rt_obj.in());
 
       /// Create the Linear Priority Mapping Manager
       ACE_NEW_THROW_EX(this->pm_,
@@ -132,15 +127,13 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
                       CORBA::NO_MEMORY());
 
       mapping_manager->mapping(this->pm_);
-      ACE_TRY_CHECK;
 
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
         ACE_ERROR((LM_ERROR, "Could not configure the orb"));
         ACE_OS::exit(1);
     }
- ACE_ENDTRY;
  return 1;
 }
 
@@ -149,13 +142,12 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
     PortableServer::POA_ptr parent,
     const char * adapter_name,
     PortableServer::POAManager_ptr a_POAManager,
-    const CORBA::PolicyList & policies
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const CORBA::PolicyList & policies)
   ACE_THROW_SPEC (( CORBA::SystemException
     , PortableServer::POA::AdapterAlreadyExists
     , PortableServer::POA::InvalidPolicy))
 {
-  ACE_TRY_NEW_ENV
+  try
     {
         // We should hopefully be using more than one thread
 #if defined (ACE_HAS_THREADS)
@@ -177,9 +169,7 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
 
       /// Now resolve a reference to the Real Time ORB
       CORBA::Object_var rt_obj =
-        orb->resolve_initial_references("RTORB"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RTORB");
       if (CORBA::is_nil(rt_obj.in()))
         {
           ACE_DEBUG((LM_DEBUG,
@@ -190,9 +180,7 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
 
       /// Get the reference to the RT ORB
       RTCORBA::RTORB_var rt_orb =
-         RTCORBA::RTORB::_narrow (rt_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         RTCORBA::RTORB::_narrow (rt_obj.in ());
 
       if (CORBA::is_nil(rt_orb.in ()))
         {
@@ -212,9 +200,7 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
       poa_policy_list[policies.length()] =
         rt_orb->create_priority_model_policy (
           RTCORBA::SERVER_DECLARED,
-          RTCORBA::maxPriority
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          RTCORBA::maxPriority);
 
       // Set up the threadpool
 #if defined (ACE_HAS_THREADS)
@@ -247,14 +233,10 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
                                           default_thread_priority,
                                           allow_request_buffering,
                                           max_buffered_requests,
-                                          max_request_buffer_size
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          max_request_buffer_size);
 
       poa_policy_list[policies.length()+1] =
-        rt_orb->create_threadpool_policy (threadpool
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool);
 #endif /* ACE_HAS_THREADS */
 
 
@@ -262,32 +244,27 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
       PortableServer::POA_var poa =
         parent->create_POA (adapter_name,
                             a_POAManager,
-                            poa_policy_list
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            poa_policy_list);
 
       RTPortableServer::POA_var rt_poa =
-        RTPortableServer::POA::_narrow(poa.in()
-                                       ACE_ENV_ARG_PARAMETER);
+        RTPortableServer::POA::_narrow(poa.in());
 
       /// return the reference to the RT POA
       return rt_poa.in();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                "ERROR: Could not create a Scheduling Service POA\n");
+      ex._tao_print_exception (
+        "ERROR: Could not create a Scheduling Service POA\n");
       return parent;
     }
-  ACE_ENDTRY;
   return parent;
 }
 
 void
 RTCosScheduling_ServerScheduler_i::schedule_object (
     CORBA::Object_ptr obj,
-    const char * name
-    ACE_ENV_ARG_DECL)
+    const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException
     , RTCosScheduling::UnknownName))
 {
@@ -297,12 +274,11 @@ RTCosScheduling_ServerScheduler_i::schedule_object (
   /// is no valid ceiling for it, throw an UnknownName exception
   if (this->resource_map_.find(name) == -1)
     {
-      ACE_THROW (RTCosScheduling::UnknownName());
+      throw RTCosScheduling::UnknownName();
     }
   else
     {
      this->object_name_map_.rebind(obj, name);
-     ACE_CHECK;
     }
 }
 
@@ -319,21 +295,18 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
   object_name_map_(ObjectMap),
   resource_map_(resourceMap)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create a new Priority Ceiling protocol manager factory
       ACE_NEW_THROW_EX(this->PCP_factory_,
                        PCP_Manager_Factory(shared_file),
                        CORBA::NO_MEMORY());
-      ACE_CHECK;
 
 
       /// Now resolve a reference to the Real Time ORB
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references("RTORB"
-                                       ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references("RTORB");
       RTCORBA::RTORB_var rt_orb;
-      ACE_TRY_CHECK;
       if (CORBA::is_nil(obj.in ()))
         {
           ACE_DEBUG((LM_DEBUG,
@@ -343,15 +316,12 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
         }
       else
         {
-          rt_orb =RTCORBA::RTORB::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+          rt_orb =RTCORBA::RTORB::_narrow (obj.in ());
         }
 
       // Now get a reference to the RTCurrent
       // for the PCP manager to control
-      obj = this->orb_->resolve_initial_references ("RTCurrent"
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = this->orb_->resolve_initial_references ("RTCurrent");
       if (CORBA::is_nil(obj.in()))
         {
           ACE_DEBUG((LM_DEBUG,
@@ -362,16 +332,13 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
       else
         {
           this->current_ =
-            RTCORBA::Current::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+            RTCORBA::Current::_narrow (obj.in ());
         }
 
       // Now get a reference to the codec factory to create a codec that will
       // decode the client priority sent in the service context
       obj =
-        this->orb_->resolve_initial_references ("CodecFactory"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("CodecFactory");
 
       if (CORBA::is_nil(obj.in()))
         {
@@ -384,7 +351,6 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
         {
           this->codec_factory_ = IOP::CodecFactory::_narrow(obj.in());
         }
-      ACE_TRY_CHECK;
 
 
       // Set up the codec
@@ -395,12 +361,11 @@ RTCosScheduling_ServerScheduler_Interceptor::RTCosScheduling_ServerScheduler_Int
 
       this->codec_ = this->codec_factory_->create_codec(encoding);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          "Error in installing the interceptor for the ServerScheduler\n");
+      ex._tao_print_exception (
+        "Error in installing the interceptor for the ServerScheduler\n");
     }
-  ACE_ENDTRY;
 }
 
 
@@ -414,13 +379,12 @@ RTCosScheduling_ServerScheduler_Interceptor::~RTCosScheduling_ServerScheduler_In
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::receive_request(
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC((
   CORBA::SystemException,
   PortableInterceptor::ForwardRequest))
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       ACE_CString name = "";
@@ -429,15 +393,12 @@ ACE_THROW_SPEC((
       // Now get a reference to the POA, this is used to get a reference
       // to the target object
       PortableInterceptor::AdapterName *adapter_seq = ri->adapter_name();
-      ACE_TRY_CHECK;
       PortableServer::POA_var poa;
       const char *adapter_name =
         (*adapter_seq)[adapter_seq->length() - 1];
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
       if (CORBA::is_nil(obj.in()))
         {
           ACE_DEBUG((LM_DEBUG,
@@ -456,18 +417,16 @@ ACE_THROW_SPEC((
               return;
             }
           poa = root_poa->find_POA(adapter_name, 0);
-          ACE_TRY_CHECK;
         }
 
       // decode the Client priority sent in the service context
       IOP::ServiceId id = IOP::RTCorbaPriority;
       IOP::ServiceContext_var sc;
-      ACE_TRY_EX(svc_req)
+      try
         {
           sc = ri->get_request_service_context(id);
-          ACE_TRY_CHECK_EX(svc_req);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           // The RTCorbaPriority was not sent, do not use real time
           // Here we cannot let the server continue to run at
@@ -476,22 +435,18 @@ ACE_THROW_SPEC((
           this->current_->the_priority(RTCORBA::minPriority);
           return;
         }
-      ACE_ENDTRY;
 
       CORBA::OctetSeq ocSeq = CORBA::OctetSeq(
         sc->context_data.length(),
         sc->context_data.length(),
         sc->context_data.get_buffer(),
         0);
-      ACE_TRY_CHECK;
 
       CORBA::Any the_priority_as_any;
       the_priority_as_any = *this->codec_->decode(ocSeq);
-      ACE_TRY_CHECK;
 
       RTCORBA::Priority the_client_priority;
       the_priority_as_any >>= the_client_priority;
-      ACE_TRY_CHECK;
 
       // get the object from the object ID that is passed
       CORBA::OctetSeq_var oseq = ri->object_id();
@@ -499,10 +454,8 @@ ACE_THROW_SPEC((
                                    oseq -> length(),
                                    oseq -> get_buffer(),
                                     0);
-      ACE_TRY_CHECK;
 
       CORBA::Object_var target_object = poa->id_to_reference(oid);
-      ACE_TRY_CHECK;
 
       // Check to make sure we have the object as scheduled by the
       // ServerScheduler
@@ -552,7 +505,6 @@ ACE_THROW_SPEC((
                        PCP_Manager(
                          PCP_factory_->New_PCP_Manager(this->current_)),
                        CORBA::NO_MEMORY());
-      ACE_TRY_CHECK;
 
       // Get the lock on the resource, using MPCP
 
@@ -563,21 +515,17 @@ ACE_THROW_SPEC((
       this->invocation_map_.bind(
         p->threadID(),
         p);
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          "Unknown exception in the receive request\n");
+      ex._tao_print_exception ("Unknown exception in the receive request\n");
       ACE_OS::exit(1);
     }
-  ACE_ENDTRY;
 }
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::send_reply(
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC((
     CORBA::SystemException
   ))
@@ -601,22 +549,21 @@ RTCosScheduling_ServerScheduler_Interceptor::finish_execution()
 }
 
 char*
-RTCosScheduling_ServerScheduler_Interceptor::name(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RTCosScheduling_ServerScheduler_Interceptor::name(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   return CORBA::string_dup(this->name_);
 }
 
 void
-RTCosScheduling_ServerScheduler_Interceptor::destroy(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RTCosScheduling_ServerScheduler_Interceptor::destroy(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::receive_request_service_contexts(
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC((
     CORBA::SystemException,
     PortableInterceptor::ForwardRequest))
@@ -626,8 +573,7 @@ RTCosScheduling_ServerScheduler_Interceptor::receive_request_service_contexts(
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::send_exception(
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC((CORBA::SystemException,
     PortableInterceptor::ForwardRequest))
 {
@@ -637,8 +583,7 @@ RTCosScheduling_ServerScheduler_Interceptor::send_exception(
 
 void
 RTCosScheduling_ServerScheduler_Interceptor::send_other(
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC((
     CORBA::SystemException,
     PortableInterceptor::ForwardRequest))
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index 4f2500b8602..3a54fb5d814 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -122,42 +122,37 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
 
     virtual ~RTCosScheduling_ServerScheduler_Interceptor();
 
-    virtual char* name(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char* name(void)
     ACE_THROW_SPEC((
       CORBA::SystemException));
 
-    virtual void destroy( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual void destroy()
      ACE_THROW_SPEC((CORBA::SystemException));
 
     virtual void receive_request(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest));
 
     virtual void receive_request_service_contexts(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest));
 
     virtual void send_reply(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((CORBA::SystemException));
 
     virtual void send_exception(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest));
 
     virtual void send_other(
-        PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest));
@@ -232,8 +227,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
         PortableServer::POA_ptr parent,
         const char * adapter_name,
         PortableServer::POAManager_ptr a_POAManager,
-        const CORBA::PolicyList & policies
-        ACE_ENV_ARG_DECL)
+        const CORBA::PolicyList & policies)
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , PortableServer::POA::AdapterAlreadyExists
@@ -248,8 +242,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
      * @param name name to associate with the CORBA object reference
      */
     virtual void schedule_object (CORBA::Object_ptr obj,
-        const char * name
-        ACE_ENV_ARG_DECL)
+        const char * name)
       ACE_THROW_SPEC (( CORBA::SystemException
         , RTCosScheduling::UnknownName));
 
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index d582988c508..f46920825d3 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -29,8 +29,7 @@ ACE_Runtime_Scheduler (int config_count,
 // it's not present.
 
 RtecScheduler::handle_t
-ACE_Runtime_Scheduler::create (const char *entry_point
-                               ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Runtime_Scheduler::create (const char *entry_point)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
@@ -48,19 +47,17 @@ ACE_Runtime_Scheduler::create (const char *entry_point
 // value if it's not present.
 
 RtecScheduler::handle_t
-ACE_Runtime_Scheduler::lookup (const char * entry_point
-                               ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::lookup (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return create (entry_point ACE_ENV_ARG_PARAMETER);
+  return create (entry_point);
 }
 
 
 // Return a pointer to the RT_Info corresponding to the passed handle.
 
 RtecScheduler::RT_Info *
-ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle
-                            ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -76,7 +73,6 @@ ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle
   ACE_NEW_THROW_EX (info,
                     RtecScheduler::RT_Info,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
 
   info->entry_point = rt_info_[handle - 1].entry_point;
@@ -110,8 +106,7 @@ ACE_Runtime_Scheduler::set (::RtecScheduler::handle_t handle,
                             ::RtecScheduler::Importance_t importance,
                             ::RtecScheduler::Quantum_t quantum,
                             ::RtecScheduler::Threads_t threads,
-                            ::RtecScheduler::Info_Type_t info_type
-                            ACE_ENV_ARG_DECL)
+                            ::RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -121,7 +116,7 @@ ACE_Runtime_Scheduler::set (::RtecScheduler::handle_t handle,
     {
       ACE_DEBUG ((LM_DEBUG, "Unknown task: no entry for handle %d\n",
                   handle));
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK());
+      throw RtecScheduler::UNKNOWN_TASK();
       // NOTREACHED
     }
   if (rt_info_[handle - 1].worst_case_execution_time != time
@@ -150,20 +145,18 @@ ACE_Runtime_Scheduler::reset (RtecScheduler::handle_t handle,
                               RtecScheduler::Importance_t importance,
                               RtecScheduler::Quantum_t quantum,
                               RtecScheduler::Threads_t threads,
-                              RtecScheduler::Info_Type_t info_type
-                              ACE_ENV_ARG_DECL)
+                              RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   // Just go ahead and call the set method
   this->set (handle, criticality, time, typical_time, cached_time,
-             period, importance, quantum, threads, info_type ACE_ENV_ARG_PARAMETER );
+             period, importance, quantum, threads, info_type );
 }
 
 
 void
-ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos
-                                ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -186,9 +179,7 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos
                  info.importance,
                  info.quantum,
                  info.threads,
-                 info.info_type
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                 info.info_type);
 #else
       // Call the internal set method.
       this->set (infos[i].handle,
@@ -200,16 +191,13 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos
                  infos[i].importance,
                  infos[i].quantum,
                  infos[i].threads,
-                 infos[i].info_type
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                 infos[i].info_type);
 #endif
     }
 }
 
 void
-ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos
-                                    ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -232,9 +220,7 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos
                  info.importance,
                  info.quantum,
                  info.threads,
-                 info.info_type
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                 info.info_type);
 #else
       // Call the internal set method.
       this->set (infos[i].handle,
@@ -246,24 +232,21 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos
                  infos[i].importance,
                  infos[i].quantum,
                  infos[i].threads,
-                 infos[i].info_type
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                 infos[i].info_type);
 #endif
     }
 }
 
 
 void
-ACE_Runtime_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set& infos
-                                  ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
   // Just call the set sequence method
-  this->set_seq (infos ACE_ENV_ARG_PARAMETER);
+  this->set_seq (infos);
 }
 
 
@@ -274,14 +257,13 @@ void
 ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
                                  RtecScheduler::OS_Priority& o_priority,
                                  RtecScheduler::Preemption_Subpriority_t& subpriority,
-                                 RtecScheduler::Preemption_Priority_t& p_priority
-                                 ACE_ENV_ARG_DECL)
+                                 RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
     // NOTREACHED
 
   o_priority = rt_info_[handle - 1].priority;
@@ -297,23 +279,20 @@ void
 ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
                                              RtecScheduler::OS_Priority& priority,
                                              RtecScheduler::Preemption_Subpriority_t& subpriority,
-                                             RtecScheduler::Preemption_Priority_t& p_priority
-                                             ACE_ENV_ARG_DECL)
+                                             RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
-  RtecScheduler::handle_t handle = lookup (entry_point ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  RtecScheduler::handle_t handle = lookup (entry_point);
 
   if (handle < -1)
-    // The exception was thrown or is in ACE_ENV_SINGLE_ARG_PARAMETER already.
+    // The exception was thrown or is in already.
     return;
   this->priority (handle,
                   priority,
                   subpriority,
-                  p_priority
-                  ACE_ENV_ARG_PARAMETER);
+                  p_priority);
 }
 
 
@@ -324,13 +303,12 @@ void
 ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                        RtecScheduler::handle_t /* dependency */,
                                        CORBA::Long /* number_of_calls */,
-                                       RtecScheduler::Dependency_Type_t /* dependency_type */
-                                       ACE_ENV_ARG_DECL)
+                                       RtecScheduler::Dependency_Type_t /* dependency_type */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
     // NOTREACHED
 
 #if 0
@@ -358,13 +336,12 @@ void
 ACE_Runtime_Scheduler::remove_dependency (RtecScheduler::handle_t handle,
                                           RtecScheduler::handle_t /* dependency */,
                                           CORBA::Long /* number_of_calls */,
-                                          RtecScheduler::Dependency_Type_t /* dependency_type */
-                                          ACE_ENV_ARG_DECL)
+                                          RtecScheduler::Dependency_Type_t /* dependency_type */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
 }
 
 
@@ -376,13 +353,12 @@ ACE_Runtime_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t hand
                                                     RtecScheduler::handle_t /* dependency */,
                                                     CORBA::Long /* number_of_calls */,
                                                     RtecScheduler::Dependency_Type_t /* dependency_type */,
-                                                    RtecScheduler::Dependency_Enabled_Type_t /* enabled */
-                                                    ACE_ENV_ARG_DECL)
+                                                    RtecScheduler::Dependency_Enabled_Type_t /* enabled */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
 }
 
 
@@ -391,18 +367,16 @@ ACE_Runtime_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t hand
 
 void
 ACE_Runtime_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                                 RtecScheduler::RT_Info_Enabled_Type_t /* enabled */
-                                                 ACE_ENV_ARG_DECL)
+                                                 RtecScheduler::RT_Info_Enabled_Type_t /* enabled */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+    throw RtecScheduler::UNKNOWN_TASK ();
 }
 
 
-void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                                ACE_ENV_ARG_DECL)
+void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
@@ -410,12 +384,11 @@ void ACE_Runtime_Scheduler::set_dependency_enable_state_seq (const RtecScheduler
 {
   ACE_UNUSED_ARG (dependencies);
 
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Runtime_Scheduler::set_rt_info_enable_state_seq (
-                 const RtecScheduler::RT_Info_Enable_State_Pair_Set &
-                 ACE_ENV_ARG_DECL_NOT_USED)
+                 const RtecScheduler::RT_Info_Enable_State_Pair_Set &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
@@ -433,8 +406,7 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
                                            RtecScheduler::RT_Info_Set_out /* infos */,
                                            RtecScheduler::Dependency_Set_out /*dependencies */,
                                            RtecScheduler::Config_Info_Set_out /* configs */,
-                                           RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -451,8 +423,7 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
 void
 ACE_Runtime_Scheduler::recompute_scheduling (CORBA::Long minimum_priority,
                                              CORBA::Long maximum_priority,
-                                             RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+                                             RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
@@ -475,8 +446,7 @@ ACE_Runtime_Scheduler::recompute_scheduling (CORBA::Long minimum_priority,
 // of the last schedule re-computation).
 
 void
-ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -492,8 +462,7 @@ ACE_Runtime_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
 // of the last schedule re-computation).
 
 void
-ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -509,8 +478,7 @@ ACE_Runtime_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out dep
 // number, types, and priority levels for the dispatching lanes.
 
 void
-ACE_Runtime_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Runtime_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL))
@@ -527,8 +495,7 @@ ACE_Runtime_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out c
 void
 ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                RtecScheduler::OS_Priority& priority,
-                                               RtecScheduler::Dispatching_Type_t & d_type
-                                               ACE_ENV_ARG_DECL)
+                                               RtecScheduler::Dispatching_Type_t & d_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
@@ -537,13 +504,13 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
   if (config_count_ <= 0
       || config_info_ [p_priority].preemption_priority != p_priority)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
       ACE_NOTREACHED (return);
     }
   // throw an exception if an invalid priority was passed
   else if (p_priority < 0 || p_priority >= config_count_)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_PRIORITY_LEVEL());
+      throw RtecScheduler::UNKNOWN_PRIORITY_LEVEL();
       ACE_NOTREACHED (return);
     }
   else
@@ -561,7 +528,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
 // to the number returned, inclusive.
 
 RtecScheduler::Preemption_Priority_t
-ACE_Runtime_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+ACE_Runtime_Scheduler::last_scheduled_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
@@ -575,20 +542,19 @@ ACE_Runtime_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-ACE_Runtime_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out /*configs */
-                  ACE_ENV_ARG_DECL)
+ACE_Runtime_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out /*configs */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   RtecScheduler::NOT_SCHEDULED))
 {
   // throw an exception if a valid schedule has not been loaded
   if (this->config_count_ <= 0)
-    ACE_THROW (RtecScheduler::NOT_SCHEDULED());
+    throw RtecScheduler::NOT_SCHEDULED();
   //TODO: fill the Config_Info_Set with the runtime Config_Infos
   //for now, this function is unimplemented
   //
   // @@ If unimplemented we either return a CORBA::NO_IMPL exception
   // or a proprietary ACE_NOTSUP; -- Bala
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index f7afe874c75..0bb5f45c2d7 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -42,22 +42,19 @@ public:
                          ACE_Scheduler_Factory::POD_RT_Info rt_info[]);
   // Constructor. Initialize the data from the POD_RT_Info array.
 
-  virtual RtecScheduler::handle_t create (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t create (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME));
   // Create an RT_Info.  In the config run scheduler this actually constructs
   // a new RT_Info.  Here, we just return its handle, or an error value if
   // it's not present.
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t lookup (const char * entry_point)
     ACE_THROW_SPEC((CORBA::SystemException));
   // Lookup a handle for an RT_Info, and return its handle, or an error
   // value if it's not present.
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
-                                       ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Return a pointer to the RT_Info corresponding to the passed handle.
@@ -71,8 +68,7 @@ public:
                     ::RtecScheduler::Importance_t importance,
                     ::RtecScheduler::Quantum_t quantum,
                     ::RtecScheduler::Threads_t threads,
-                    ::RtecScheduler::Info_Type_t info_type
-                    ACE_ENV_ARG_DECL)
+                    ::RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Set characteristics of the RT_Info corresponding to the passed handle.
@@ -86,14 +82,12 @@ public:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       RtecScheduler::Threads_t threads,
-                      RtecScheduler::Info_Type_t info_type
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Reset characteristics of the RT_Info corresponding to the passed handle.
 
-  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -101,8 +95,7 @@ public:
   // Set characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are added in the case of existing and/or multiple definitions.
 
-  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos
-                        ACE_ENV_ARG_DECL)
+  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -110,8 +103,7 @@ public:
   // Replace characteristics of the RT_Infos corresponding to the
   // passed handles.
 
-  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos
-                          ACE_ENV_ARG_DECL)
+  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -122,8 +114,7 @@ public:
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -133,8 +124,7 @@ public:
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -144,8 +134,7 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the config run scheduler, this method registers a dependency between
@@ -154,8 +143,7 @@ public:
   virtual void remove_dependency (RtecScheduler::handle_t handle,
                                   RtecScheduler::handle_t dependency,
                                   CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type
-                                  ACE_ENV_ARG_DECL)
+                                  RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the reconfig scheduler, this method removes a dependency between
@@ -165,30 +153,26 @@ public:
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
                                             RtecScheduler::Dependency_Type_t dependency_type,
-                                            RtecScheduler::Dependency_Enabled_Type_t enabled
-                                            ACE_ENV_ARG_DECL)
+                                            RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the reconfig scheduler, this method (re)enabes a dependency between
   // two RT_Infos.  In the run time scheduler, this is a no-op.
 
   virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                         RtecScheduler::RT_Info_Enabled_Type_t enabled
-                                         ACE_ENV_ARG_DECL)
+                                         RtecScheduler::RT_Info_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the reconfig scheduler, enables or disables an RT_Info.
   // In the run time scheduler, this is a no-op.
 
-  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                                ACE_ENV_ARG_DECL)
+  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a sequence of dependencies.
 
-  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set
-                                             ACE_ENV_ARG_DECL)
+  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -199,8 +183,7 @@ public:
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Dependency_Set_out deps,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                   ACE_ENV_ARG_DECL)
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -211,8 +194,7 @@ public:
 
   virtual void recompute_scheduling (CORBA::Long minimum_priority,
                                      CORBA::Long maximum_priority,
-                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -222,24 +204,21 @@ public:
                      RtecScheduler::DUPLICATE_NAME));
   // Recomputes the scheduling priorities, etc.
 
-  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                                ACE_ENV_ARG_DECL)
+  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                                   ACE_ENV_ARG_DECL)
+  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                                    ACE_ENV_ARG_DECL)
+  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
@@ -248,14 +227,13 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type
-                                       ACE_ENV_ARG_DECL)
+                                       RtecScheduler::Dispatching_Type_t & d_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // Provides the thread priority and queue type for the given priority level.
 
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
   // Returns the last priority number assigned to an operation in the
@@ -263,8 +241,7 @@ public:
   // of scheduled priorities.  All scheduled priorities range from 0
   // to the number returned, inclusive.
 
-  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs
-				 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     RtecScheduler::NOT_SCHEDULED));
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index 4cf1fe799fb..e8ed218c0b5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -25,67 +25,63 @@ TAO::SSLIOP::ClientCredentials::~ClientCredentials (void)
 }
 
 SecurityLevel3::CredentialsType
-TAO::SSLIOP::ClientCredentials::creds_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::creds_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CT_ClientCredentials;
 }
 
 char *
-TAO::SSLIOP::ClientCredentials::context_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::context_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::Principal *
-TAO::SSLIOP::ClientCredentials::client_principal (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::client_principal (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::StatementList *
-TAO::SSLIOP::ClientCredentials::client_supporting_statements (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::client_supporting_statements ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::ResourceNameList *
-TAO::SSLIOP::ClientCredentials::client_restricted_resources (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::client_restricted_resources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::Principal *
-TAO::SSLIOP::ClientCredentials::target_principal (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::target_principal (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::StatementList *
-TAO::SSLIOP::ClientCredentials::target_supporting_statements (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::target_supporting_statements ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::ResourceNameList *
-TAO::SSLIOP::ClientCredentials::target_restricted_resources (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::target_restricted_resources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::OwnCredentials_ptr
-TAO::SSLIOP::ClientCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::parent_credentials (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentials_ptr creds =
@@ -96,14 +92,12 @@ TAO::SSLIOP::ClientCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
                       ::SSL_get_certificate (this->ssl_.in ()),
                       ::SSL_get_privatekey (this->ssl_.in ())),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (creds);
 
   return creds;
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::client_authentication (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::client_authentication ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the client presented no certificate (i.e. cert_.ptr() == 0),
@@ -116,25 +110,25 @@ TAO::SSLIOP::ClientCredentials::client_authentication (
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::target_authentication (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::target_authentication (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::confidentiality (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::ClientCredentials::confidentiality (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::integrity (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TAO's SSLIOP pluggable transport always provides integrity.  Note
-  // that if we 
+  // that if we
 
   return true;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
index ce621276918..fd688d2dc15 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -66,8 +66,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredentialsType creds_type (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsType creds_type ()
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -78,47 +77,40 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * context_id (ACE_ENV_SINGLE_ARG_DECL)
+      virtual char * context_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::Principal * client_principal (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::Principal * client_principal ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::StatementList * client_supporting_statements (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::StatementList * client_supporting_statements ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::ResourceNameList * client_restricted_resources (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ResourceNameList * client_restricted_resources ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::Principal * target_principal (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::Principal * target_principal ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::StatementList * target_supporting_statements (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::StatementList * target_supporting_statements ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::ResourceNameList * target_restricted_resources (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ResourceNameList * target_restricted_resources ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean client_authentication (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean client_authentication (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean target_authentication (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean target_authentication (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean confidentiality (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean confidentiality (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean integrity (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean integrity (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 8ddb0ade83d..7f1d35f2f07 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -101,31 +101,24 @@ TAO::SSLIOP::Connection_Handler::open (void *)
   int client =
     this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (client)
         {
           tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            protocol_properties);
         }
       else
         {
           tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            protocol_properties);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 0b99b5e4a03..fae6be7238d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -87,8 +87,7 @@ TAO::SSLIOP::Connector::close (void)
 TAO_Transport *
 TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
                                  TAO_Transport_Descriptor_Interface *desc,
-                                 ACE_Time_Value *timeout
-                                 ACE_ENV_ARG_DECL)
+                                 ACE_Time_Value *timeout)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
@@ -113,14 +112,10 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
   // Check if the user overrode the default establishment of trust
   // policy for the current object.
   CORBA::Policy_var policy =
-    resolver->stub ()->get_policy (::Security::SecEstablishTrustPolicy
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    resolver->stub ()->get_policy (::Security::SecEstablishTrustPolicy);
 
   SecurityLevel2::EstablishTrustPolicy_var trust_policy =
-    SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in ());
 
   // We use a pointer and temporary to make it obvious to determine
   // if no establishment of trust policy was set.  Specifically, if
@@ -129,8 +124,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
   ::Security::EstablishTrust trust = { 0 , 0 };
   if (!CORBA::is_nil (trust_policy.in ()))
     {
-      trust = trust_policy->trust (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      trust = trust_policy->trust ();
     }
 
   // Flag that states whether any form of establishment of trust
@@ -161,14 +155,10 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
 
   // Check if the user overrode the default Quality-of-Protection for
   // the current object.
-  policy = resolver->stub ()->get_policy (::Security::SecQOPPolicy
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  policy = resolver->stub ()->get_policy (::Security::SecQOPPolicy);
 
   SecurityLevel2::QOPPolicy_var qop_policy =
-    SecurityLevel2::QOPPolicy::_narrow (policy.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    SecurityLevel2::QOPPolicy::_narrow (policy.in ());
 
   // Temporary variable used to avoid overwriting the default value
   // set when the ORB was initialized.
@@ -176,8 +166,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
 
   if (!CORBA::is_nil (qop_policy.in ()))
     {
-      qop = qop_policy->qop (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      qop = qop_policy->qop ();
     }
 
   // If the SSL port is zero, then no SSLIOP tagged component was
@@ -204,8 +193,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
     {
       return this->iiop_connect (ssl_endpoint,
                                  resolver,
-                                 timeout
-                                 ACE_ENV_ARG_PARAMETER);
+                                 timeout);
     }
 
   return this->ssliop_connect (ssl_endpoint,
@@ -213,8 +201,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
                                trust,
                                resolver,
                                desc,
-                               timeout
-                               ACE_ENV_ARG_PARAMETER);
+                               timeout);
 }
 
 
@@ -237,7 +224,7 @@ TAO::SSLIOP::Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO::SSLIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Connector::make_profile (void)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -253,14 +240,13 @@ TAO::SSLIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
 
 
 TAO_Profile *
-TAO::SSLIOP::Connector::make_secure_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Connector::make_secure_profile (void)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -276,7 +262,6 @@ TAO::SSLIOP::Connector::make_secure_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
@@ -285,8 +270,7 @@ TAO::SSLIOP::Connector::make_secure_profile (ACE_ENV_SINGLE_ARG_DECL)
 
 TAO_Profile *
 TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint,
-                                       size_t &len
-                                       ACE_ENV_ARG_DECL)
+                                       size_t &len)
 {
    int ssl_only = 0;
    if (this->check_prefix (endpoint) == 0)
@@ -327,13 +311,11 @@ TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint,
    TAO_Profile *ptmp = 0;
    if (ssl_only)
      {
-       ptmp = this->make_secure_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
-       ACE_CHECK_RETURN (0);
+       ptmp = this->make_secure_profile ();
      }
    else
      {
-       ptmp = this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
-       ACE_CHECK_RETURN (0);
+       ptmp = this->make_profile ();
      }
 
    return ptmp;
@@ -371,8 +353,7 @@ TAO_Transport*
 TAO::SSLIOP::Connector::iiop_connect (
   TAO_SSLIOP_Endpoint *ssl_endpoint,
   TAO::Profile_Transport_Resolver *resolver,
-  ACE_Time_Value *timeout
-  ACE_ENV_ARG_DECL)
+  ACE_Time_Value *timeout)
 {
   const ::SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component ();
 
@@ -409,8 +390,7 @@ TAO::SSLIOP::Connector::iiop_connect (
     this->TAO::IIOP_SSL_Connector::connect (
       resolver,
       &iiop_desc,
-      timeout
-      ACE_ENV_ARG_PARAMETER);
+      timeout);
 }
 
 TAO_Transport *
@@ -420,8 +400,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
   const ::Security::EstablishTrust &trust,
   TAO::Profile_Transport_Resolver *resolver,
   TAO_Transport_Descriptor_Interface *desc,
-  ACE_Time_Value *max_wait_time
-  ACE_ENV_ARG_DECL)
+  ACE_Time_Value *max_wait_time)
 {
   const ::SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component ();
 
@@ -507,9 +486,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
         safe_handler (svc_handler);
       TAO::SSLIOP::OwnCredentials_var credentials =
         this->retrieve_credentials (resolver->stub (),
-                                    svc_handler->peer ().ssl ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                    svc_handler->peer ().ssl ());
 
       svc_handler = safe_handler.release ();
       ssl_endpoint->set_sec_attrs (qop, trust, credentials.in());
@@ -784,20 +761,15 @@ TAO::SSLIOP::Connector::ssliop_connect (
 
 TAO::SSLIOP::OwnCredentials *
 TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
-                                              SSL *ssl
-                                              ACE_ENV_ARG_DECL)
+                                              SSL *ssl)
 {
   // Check if the user overrode the default invocation credentials.
   CORBA::Policy_var policy =
-    stub->get_policy (::SecurityLevel3::ContextEstablishmentPolicyType
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
+    stub->get_policy (::SecurityLevel3::ContextEstablishmentPolicyType);
 
   SecurityLevel3::ContextEstablishmentPolicy_var creds_policy =
     SecurityLevel3::ContextEstablishmentPolicy::_narrow (
-      policy.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
+      policy.in ());
 
   TAO::SSLIOP::OwnCredentials_var ssliop_credentials;
 
@@ -806,8 +778,7 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
   if (!CORBA::is_nil (creds_policy.in ()))
     {
       SecurityLevel3::OwnCredentialsList_var creds_list =
-        creds_policy->creds_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
+        creds_policy->creds_list ();
 
       if (creds_list->length () > 0)
         {
@@ -816,9 +787,7 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
             creds_list[0u];
 
           ssliop_credentials =
-            TAO::SSLIOP::OwnCredentials::_narrow (credentials
-                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
+            TAO::SSLIOP::OwnCredentials::_narrow (credentials);
 
           if (!CORBA::is_nil (ssliop_credentials.in ()))
             {
@@ -854,7 +823,6 @@ TAO::SSLIOP::Connector::retrieve_credentials (TAO_Stub *stub,
                           ::SSL_get_certificate (ssl),
                           ::SSL_get_privatekey (ssl)),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (TAO::SSLIOP::OwnCredentials::_nil ());
     }
 
   return ssliop_credentials._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index 99578662196..0666438f85c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -69,14 +69,12 @@ namespace TAO
       virtual int close (void);
       virtual TAO_Transport *connect (TAO::Profile_Transport_Resolver *r,
                                       TAO_Transport_Descriptor_Interface *desc,
-                                      ACE_Time_Value *timeout
-                                      ACE_ENV_ARG_DECL);
+                                      ACE_Time_Value *timeout);
 
       virtual TAO_Profile *create_profile (TAO_InputCDR& cdr);
       virtual int check_prefix (const char *endpoint);
       virtual TAO_Profile * corbaloc_scan (const char *ior,
-                                           size_t &len
-                                           ACE_ENV_ARG_DECL);
+                                           size_t &len);
 
       //@}
 
@@ -90,12 +88,12 @@ namespace TAO
        * @see @c TAO_Connector
        */
       //@{
-      virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
+      virtual TAO_Profile * make_profile (void);
       virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
       //@}
 
       /// SSL-specific profile
-      TAO_Profile * make_secure_profile (ACE_ENV_SINGLE_ARG_DECL);
+      TAO_Profile * make_secure_profile (void);
 
       /// IIOP-specific connection establishment.
       /**
@@ -103,8 +101,7 @@ namespace TAO
        */
       TAO_Transport* iiop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint,
                                    TAO::Profile_Transport_Resolver *r,
-                                   ACE_Time_Value *timeout
-                                   ACE_ENV_ARG_DECL);
+                                   ACE_Time_Value *timeout);
 
       /// SSLIOP-specific connection establishment.
       TAO_Transport* ssliop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint,
@@ -112,15 +109,13 @@ namespace TAO
                                      const ::Security::EstablishTrust &trust,
                                      TAO::Profile_Transport_Resolver *r,
                                      TAO_Transport_Descriptor_Interface *desc,
-                                     ACE_Time_Value *timeout
-                                     ACE_ENV_ARG_DECL);
+                                     ACE_Time_Value *timeout);
 
       /// Retrieve SSLIOP credentials from the policy overrides list
       /// and set up the underlying SSL connection to use the X.509
       /// certificates stored within them.
       TAO::SSLIOP::OwnCredentials * retrieve_credentials (TAO_Stub *stub,
-                                                          SSL *ssl
-                                                          ACE_ENV_ARG_DECL);
+                                                          SSL *ssl);
 
     public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 9f8804ad604..8a0ef38e424 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -82,28 +82,28 @@ TAO::SSLIOP_Credentials::~SSLIOP_Credentials (void)
 }
 
 char *
-TAO::SSLIOP_Credentials::creds_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP_Credentials::creds_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->id_.in ());
 }
 
 SecurityLevel3::CredentialsUsage
-TAO::SSLIOP_Credentials::creds_usage (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP_Credentials::creds_usage (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CU_Indefinite;
 }
 
 TimeBase::UtcT
-TAO::SSLIOP_Credentials::expiry_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP_Credentials::expiry_time (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->expiry_time_;
 }
 
 SecurityLevel3::CredentialsState
-TAO::SSLIOP_Credentials::creds_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP_Credentials::creds_state (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const ::X509 *x = this->x509_.in ();
@@ -152,19 +152,17 @@ TAO::SSLIOP_Credentials::creds_state (ACE_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO::SSLIOP_Credentials::add_relinquished_listener (
-    SecurityLevel3::RelinquishedCredentialsListener_ptr /* listener */
-    ACE_ENV_ARG_DECL)
+    SecurityLevel3::RelinquishedCredentialsListener_ptr /* listener */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 void
-TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */
-                                                        ACE_ENV_ARG_DECL)
+TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 bool
@@ -175,17 +173,13 @@ TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs)
   // EVP_PKEY *ea = this->evp_.in ();
   // EVP_PKEY *eb = rhs.evp_.in ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   // No need for a full blown ACE_TRY/CATCH block.
 
   const SecurityLevel3::CredentialsType lct =
-    this->creds_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    this->creds_type ();
 
   const SecurityLevel3::CredentialsType rct =
-    const_cast<TAO::SSLIOP_Credentials &> (rhs).creds_type (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    const_cast<TAO::SSLIOP_Credentials &> (rhs).creds_type ();
 
   // Don't bother check the creds_id and expiry_time attributes.  They
   // are checked implicitly by the below X509_cmp() call.
@@ -211,8 +205,7 @@ TAO::SSLIOP_Credentials::hash (void) const
 }
 
 TAO::SSLIOP::Credentials_ptr
-TAO::SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO::SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj)
 {
   return  TAO::SSLIOP_Credentials::_duplicate (
               dynamic_cast<TAO::SSLIOP_Credentials *> (obj));
@@ -248,11 +241,9 @@ tao_TAO_SSLIOP_Credentials_nil (void)
 }
 
 TAO::SSLIOP::Credentials_ptr
-tao_TAO_SSLIOP_Credentials_narrow (CORBA::Object *p
-                                   ACE_ENV_ARG_DECL)
+tao_TAO_SSLIOP_Credentials_narrow (CORBA::Object *p)
 {
-  return TAO::SSLIOP_Credentials::_narrow (p
-                                           ACE_ENV_ARG_PARAMETER);
+  return TAO::SSLIOP_Credentials::_narrow (p);
 }
 
 CORBA::Object_ptr
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index 5fdf4f78e6c..c3b94c4bf6d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -74,31 +74,27 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * creds_id (ACE_ENV_SINGLE_ARG_DECL)
+      virtual char * creds_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual
-      SecurityLevel3::CredentialsType creds_type (ACE_ENV_SINGLE_ARG_DECL)
+      SecurityLevel3::CredentialsType creds_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
-      virtual SecurityLevel3::CredentialsUsage creds_usage (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsUsage creds_usage ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual TimeBase::UtcT expiry_time (ACE_ENV_SINGLE_ARG_DECL)
+      virtual TimeBase::UtcT expiry_time (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::CredentialsState creds_state (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsState creds_state ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual char * add_relinquished_listener (
-          SecurityLevel3::RelinquishedCredentialsListener_ptr listener
-          ACE_ENV_ARG_DECL)
+          SecurityLevel3::RelinquishedCredentialsListener_ptr listener)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void remove_relinquished_listener (const char * id
-                                                 ACE_ENV_ARG_DECL)
+      virtual void remove_relinquished_listener (const char * id)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -129,8 +125,7 @@ namespace TAO
       // The static operations.
       static SSLIOP::Credentials_ptr _duplicate (SSLIOP::Credentials_ptr obj);
 
-      static SSLIOP::Credentials_ptr _narrow (CORBA::Object_ptr obj
-                                              ACE_ENV_ARG_DECL);
+      static SSLIOP::Credentials_ptr _narrow (CORBA::Object_ptr obj);
 
       static SSLIOP::Credentials_ptr _nil (void)
       {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
index fcccd07cc67..3e866342315 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -90,31 +90,28 @@ TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer (void)
 }
 
 char *
-TAO::SSLIOP::CredentialsAcquirer::acquisition_method (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   return CORBA::string_dup ("SL3TLS");
 }
 
 SecurityLevel3::AcquisitionStatus
-TAO::SSLIOP::CredentialsAcquirer::current_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::current_status (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (SecurityLevel3::AQST_Failed);
+  this->check_validity ();
 
   return SecurityLevel3::AQST_Succeeded;  // @@ Really?
 }
 
 CORBA::ULong
-TAO::SSLIOP::CredentialsAcquirer::nth_iteration (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // SSL/TLS credentials is single-step process from the point-of-view
   // of the caller.
@@ -122,8 +119,7 @@ TAO::SSLIOP::CredentialsAcquirer::nth_iteration (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any *
-TAO::SSLIOP::CredentialsAcquirer::get_continuation_data (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::get_continuation_data ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // SSL/TLS credentials acquisition does generate continuation data.
@@ -132,8 +128,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_continuation_data (
 
 SecurityLevel3::AcquisitionStatus
 TAO::SSLIOP::CredentialsAcquirer::continue_acquisition (
-    const CORBA::Any & /* acquisition_arguments */
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any & /* acquisition_arguments */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // SSL/TLS credentials acquisition does generate continuation data.
@@ -142,12 +137,10 @@ TAO::SSLIOP::CredentialsAcquirer::continue_acquisition (
 }
 
 SecurityLevel3::OwnCredentials_ptr
-TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list
-                                                   ACE_ENV_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (SecurityLevel3::OwnCredentials::_nil ());
+  this->check_validity ();
 
   ::SSLIOP::AuthData *data;
 
@@ -183,29 +176,24 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list
   ACE_NEW_THROW_EX (creds,
                     TAO::SSLIOP::OwnCredentials (x509.in (), evp.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (SecurityLevel3::OwnCredentials::_nil ());
 
   SecurityLevel3::OwnCredentials_var credentials = creds;
 
   if (on_list)
     {
-      this->curator_->_tao_add_own_credentials (creds
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (SecurityLevel3::OwnCredentials::_nil ());
+      this->curator_->_tao_add_own_credentials (creds);
     }
 
-  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (SecurityLevel3::OwnCredentials::_nil ());
+  this->destroy ();
 
   return credentials._retn ();
 }
 
 void
-TAO::SSLIOP::CredentialsAcquirer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
@@ -221,14 +209,14 @@ TAO::SSLIOP::CredentialsAcquirer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO::SSLIOP::CredentialsAcquirer::check_validity (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::CredentialsAcquirer::check_validity (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
              this->lock_);
 
   if (this->destroyed_)
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw CORBA::BAD_INV_ORDER ();
 }
 
 ::X509 *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
index 734ca4d1884..910c4826c90 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -75,30 +75,27 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * acquisition_method (ACE_ENV_SINGLE_ARG_DECL)
+      virtual char * acquisition_method (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::AcquisitionStatus current_status (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::AcquisitionStatus current_status ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::ULong nth_iteration (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::ULong nth_iteration (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Any * get_continuation_data (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Any * get_continuation_data (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::AcquisitionStatus continue_acquisition (
-          const CORBA::Any & acquisition_arguments
-          ACE_ENV_ARG_DECL)
+          const CORBA::Any & acquisition_arguments)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::OwnCredentials_ptr get_credentials (
-          CORBA::Boolean on_list
-          ACE_ENV_ARG_DECL)
+          CORBA::Boolean on_list)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -115,7 +112,7 @@ namespace TAO
 
       /// Verify that this CredentialsAcquirer object is still valid,
       /// i.e. hasn't been destroyed.
-      void check_validity (ACE_ENV_SINGLE_ARG_DECL);
+      void check_validity (void);
 
       /// Create an OpenSSL X.509 certificate data structure.
       static ::X509 * make_X509 (const ::SSLIOP::File &certificate);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
index 06ac8c86977..98408532f38 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
@@ -14,15 +14,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 SecurityLevel3::CredentialsAcquirer_ptr
 TAO::SSLIOP::CredentialsAcquirerFactory::make (
   TAO::SL3::CredentialsCurator_ptr curator,
-  const CORBA::Any & acquisition_arguments
-  ACE_ENV_ARG_DECL)
+  const CORBA::Any & acquisition_arguments)
 {
   SecurityLevel3::CredentialsAcquirer_ptr ca;
   ACE_NEW_THROW_EX (ca,
                     TAO::SSLIOP::CredentialsAcquirer (curator,
                                                       acquisition_arguments),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (SecurityLevel3::CredentialsAcquirer::_nil ());
 
   return ca;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
index dcc44e36919..a663418b057 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
@@ -50,8 +50,7 @@ namespace TAO
       /// Create a TAO::SSLIOP::CredentialsAcquirerFactory.
       virtual SecurityLevel3::CredentialsAcquirer_ptr make (
         TAO::SL3::CredentialsCurator_ptr curator,
-        const CORBA::Any & acquisition_arguments
-        ACE_ENV_ARG_DECL);
+        const CORBA::Any & acquisition_arguments);
 
     };
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index 9d39c05ba21..4e6a1a8bab5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -24,8 +24,7 @@ TAO::SSLIOP::Current::~Current (void)
 }
 
 ::SSLIOP::ASN_1_Cert *
-TAO::SSLIOP::Current::get_peer_certificate (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Current::get_peer_certificate ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    SSLIOP::Current::NoContext))
 {
@@ -47,7 +46,6 @@ TAO::SSLIOP::Current::get_peer_certificate (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   ::SSLIOP::ASN_1_Cert_var certificate = c;
 
@@ -58,8 +56,7 @@ TAO::SSLIOP::Current::get_peer_certificate (
 }
 
 SSLIOP::SSL_Cert *
-TAO::SSLIOP::Current::get_peer_certificate_chain (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Current::get_peer_certificate_chain ()
   ACE_THROW_SPEC ((CORBA::SystemException,
                    SSLIOP::Current::NoContext))
 {
@@ -81,7 +78,6 @@ TAO::SSLIOP::Current::get_peer_certificate_chain (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   ::SSLIOP::SSL_Cert_var cert_chain = c;
 
@@ -92,7 +88,7 @@ TAO::SSLIOP::Current::get_peer_certificate_chain (
 }
 
 CORBA::Boolean
-TAO::SSLIOP::Current::no_context (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::Current::no_context (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (this->implementation () == 0 ? 1 : 0);
@@ -127,8 +123,7 @@ TAO::SSLIOP::Current::teardown (TAO::SSLIOP::Current_Impl *prev_impl,
 
 TAO::SSLIOP::Current_ptr
 TAO::SSLIOP::Current::_narrow (
-  CORBA::Object_ptr obj
-  ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Object_ptr obj)
 {
   return  TAO::SSLIOP::Current::_duplicate (
               dynamic_cast<TAO::SSLIOP::Current *> (obj));
@@ -178,10 +173,9 @@ tao_TAO_SSLIOP_Current_nil (
 TAO::SSLIOP::Current_ptr
 tao_TAO_SSLIOP_Current_narrow (
     CORBA::Object *p
-    ACE_ENV_ARG_DECL
   )
 {
-  return TAO::SSLIOP::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return TAO::SSLIOP::Current::_narrow (p);
 }
 
 CORBA::Object *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 02b68b6f60b..e290ca7abd5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -63,14 +63,13 @@ namespace TAO
       typedef Current_ptr _ptr_type;
       typedef Current_var _var_type;
       typedef Current_out _out_type;
-    
+
       /// Constructor.
       Current (TAO_ORB_Core *orb_core);
 
       /// Return the peer certificate associated with the current
       /// request.
-      virtual ::SSLIOP::ASN_1_Cert * get_peer_certificate (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual ::SSLIOP::ASN_1_Cert * get_peer_certificate ()
         ACE_THROW_SPEC ((CORBA::SystemException,
                          ::SSLIOP::Current::NoContext));
 
@@ -82,8 +81,7 @@ namespace TAO
        * certficate.  However, the certificate chain on the server
        * side does NOT contain the peer (client) certificate.
        */
-      virtual ::SSLIOP::SSL_Cert * get_peer_certificate_chain (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual ::SSLIOP::SSL_Cert * get_peer_certificate_chain ()
         ACE_THROW_SPEC ((CORBA::SystemException,
                          ::SSLIOP::Current::NoContext));
 
@@ -94,7 +92,7 @@ namespace TAO
        * @return @c true if the current execution context is not
        *         within a SSL session.
        */
-      virtual CORBA::Boolean no_context (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean no_context (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Set the TSS slot ID assigned to this object.
@@ -119,8 +117,7 @@ namespace TAO
       // The static operations.
       static Current_ptr _duplicate (Current_ptr obj);
 
-      static Current_ptr _narrow (CORBA::Object_ptr obj
-                                  ACE_ENV_ARG_DECL);
+      static Current_ptr _narrow (CORBA::Object_ptr obj);
 
       static Current_ptr _nil (void)
       {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index 27f173dfaac..c70172bf4b8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -26,8 +26,7 @@ TAO::SSLIOP::Current_Impl::~Current_Impl (void)
 }
 
 SecurityLevel3::ClientCredentials_ptr
-TAO::SSLIOP::Current_Impl::client_credentials (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Current_Impl::client_credentials ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SSLIOP::X509_var cert = ::SSL_get_peer_certificate (this->ssl_);
@@ -45,13 +44,12 @@ TAO::SSLIOP::Current_Impl::client_credentials (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (SecurityLevel3::ClientCredentials::_nil ());
 
   return creds;
 }
 
 CORBA::Boolean
-TAO::SSLIOP::Current_Impl::request_is_local (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::Current_Impl::request_is_local (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index 32bc8c7a283..030b28d7d6d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -54,14 +54,12 @@ namespace TAO
 
       /// Implementation of the SSLIOP-specific
       /// SecurityLevel3::client_credentials() method.
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Implementation of the SSLIOP-specific
       /// SecurityLevel3::request_is_local() method.
-      virtual CORBA::Boolean request_is_local (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean request_is_local ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Return the SSL peer certificate associated with the
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 49a369925e7..3b78d4199ed 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -528,8 +528,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
   CSIIOP::AssociationOptions csiv2_target_supports,
   CSIIOP::AssociationOptions csiv2_target_requires)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // @todo: This hard-coding should be fixed once SECIOP is
       // supported.
@@ -542,13 +541,10 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       // Register the SSLIOP ORB initializer.
       // PortableInterceptor::ORBInitializer_ptr tmp;
@@ -561,24 +557,18 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       //PortableInterceptor::ORBInitializer_var initializer = tmp;
       initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unable to register SSLIOP ORB "
-                           "initializer.");
+      ex._tao_print_exception (
+        "Unable to register SSLIOP ORB initializer.");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index 5e90c389e80..5ce2d53c82c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -31,16 +31,14 @@ TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor (
 }
 
 char *
-TAO::SSLIOP::Server_Invocation_Interceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::Server_Invocation_Interceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO::SSLIOP::Server_Invocation_Interceptor");
 }
 
 void
-TAO::SSLIOP::Server_Invocation_Interceptor::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::Server_Invocation_Interceptor::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -48,8 +46,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::destroy (
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
-                                              PortableInterceptor::ServerRequestInfo_ptr /*ri*/
-    ACE_ENV_ARG_DECL)
+                                              PortableInterceptor::ServerRequestInfo_ptr /*ri*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -63,26 +60,23 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
   //          accept or reject requests on a per-object basis
   //          instead on a per-endpoint basis.
   CORBA::Boolean const no_ssl =
-    this->ssliop_current_->no_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->ssliop_current_->no_context ();
 
   if (TAO_debug_level >= 3)
     ACE_DEBUG ((LM_DEBUG, "SSLIOP (%P|%t) Interceptor (context), ssl=%d\n", !(no_ssl)));
 
   if (no_ssl && this->qop_ != ::Security::SecQOPNoProtection)
-    ACE_THROW (CORBA::NO_PERMISSION ());
+    throw CORBA::NO_PERMISSION ();
 
 #if defined(DEBUG_PEER_CERTIFICATES)
-  ACE_TRY
+  try
     {
       // If the request was not made through an SSL connection, then
       // this method will throw the SSLIOP::Current::NoContext
       // exception.  Otherwise, it will return a DER encoded X509
       // certificate.
       ::SSLIOP::ASN_1_Cert_var cert =
-        this->ssliop_current_->get_peer_certificate (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->ssliop_current_->get_peer_certificate ();
 
       // @@ The following debugging code works but I don't think that
       //    we should include it since it dumps alot of information,
@@ -117,7 +111,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
             }
         }
     }
-  ACE_CATCH (::SSLIOP::Current::NoContext, exc)
+  catch (const ::SSLIOP::Current::NoContext& )
     {
       // The current upcall is not being performed through an SSL
       // connection.  If server is configured to disallow insecure
@@ -129,18 +123,15 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
       //          accept or reject requests on a per-object basis
       //          instead on a per-endpoint basis.
       if (this->qop_ != ::Security::SecQOPNoProtection)
-        ACE_THROW (CORBA::NO_PERMISSION ());
+        throw CORBA::NO_PERMISSION ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 #endif /* DEBUG_PEER_CERTIFICATES */
 }
 
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -148,16 +139,14 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request (
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -165,8 +154,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::send_exception (
 
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index 9ab7aaffad1..e382a2042a2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -66,38 +66,33 @@ namespace TAO
        * PortableInterceptor::ServerRequestInterceptor interface.
        */
       //@{
-      virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      virtual char * name (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual void receive_request_service_contexts (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableInterceptor::ForwardRequest));
 
       virtual void receive_request (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableInterceptor::ForwardRequest));
 
       virtual void send_reply (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual void send_exception (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableInterceptor::ForwardRequest));
 
       virtual void send_other (
-          PortableInterceptor::ServerRequestInfo_ptr ri
-          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+          PortableInterceptor::ServerRequestInfo_ptr ri)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableInterceptor::ForwardRequest));
       //@}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index 6f36fa774c5..102fbeb2246 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -38,17 +38,14 @@ TAO::SSLIOP::ORBInitializer::ORBInitializer (
 
 void
 TAO::SSLIOP::ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_ORBInitInfo::_narrow (info);
 
   if (CORBA::is_nil (tao_info.in ()))
-    ACE_THROW (CORBA::INV_OBJREF ());
+    throw CORBA::INV_OBJREF ();
 
   // SSLIOP doesn't use the ORB Core until a request invocation occurs
   // so there is no problem in retrieving the ORB Core pointer in this
@@ -68,21 +65,17 @@ TAO::SSLIOP::ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   SSLIOP::Current_var ssliop_current = current;
 
   // Register the SSLIOP::Current object reference with the ORB.
   info->register_initial_reference ("SSLIOPCurrent",
-                                    ssliop_current.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    ssliop_current.in ());
 }
 
 void
 TAO::SSLIOP::ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Note we do not store the SSLIOP::Current as a class member since
@@ -96,13 +89,10 @@ TAO::SSLIOP::ORBInitializer::post_init (
   // pre_init() method.
 
   CORBA::Object_var obj =
-    info->resolve_initial_references ("SSLIOPCurrent"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    info->resolve_initial_references ("SSLIOPCurrent");
 
   SSLIOP::Current_var ssliop_current =
-    SSLIOP::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    SSLIOP::Current::_narrow (obj.in ());
 
   if (!CORBA::is_nil (ssliop_current.in ()))
     {
@@ -112,13 +102,12 @@ TAO::SSLIOP::ORBInitializer::post_init (
       if (tao_current != 0)
         {
           const size_t slot =
-            this->get_tss_slot_id (info ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+            this->get_tss_slot_id (info);
 
           tao_current->tss_slot (slot);
         }
       else
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
     }
 
   // Create the SSLIOP secure invocation server request interceptor.
@@ -133,21 +122,17 @@ TAO::SSLIOP::ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var si_interceptor =
     si;
 
   // Register the SSLIOP secure invocation server request interceptor
   // with the ORB.
-  info->add_server_request_interceptor (si_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (si_interceptor.in ());
 
 //   TAO_ORBInitInfo_var tao_info =
 //     TAO_ORBInitInfo::_narrow (info
-//                               ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK;
+//);
 
 //   if (CORBA::is_nil (tao_info.in ()))
 //     ACE_THROW (CORBA::INV_OBJREF ());
@@ -166,48 +151,36 @@ TAO::SSLIOP::ORBInitializer::post_init (
 //                         TAO::VMCID,
 //                         ENOMEM),
 //                       CORBA::COMPLETED_NO));
-//   ACE_CHECK;
 
 //   PortableInterceptor::IORInterceptor_var ior_interceptor =
 //     ii;
 
 //   // Register the SSLIOP IORInterceptor.
 //   info->add_ior_interceptor (ior_interceptor.in ()
-//                              ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK;
+//);
 
   // Register the SSLIOP-specific vault with the
   // PrincipalAuthenticator.
-  obj = info->resolve_initial_references ("SecurityLevel3:SecurityManager"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  obj = info->resolve_initial_references ("SecurityLevel3:SecurityManager");
 
   SecurityLevel3::SecurityManager_var manager =
-    SecurityLevel3::SecurityManager::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    SecurityLevel3::SecurityManager::_narrow (obj.in ());
 
   SecurityLevel3::CredentialsCurator_var curator =
-    manager->credentials_curator (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    manager->credentials_curator ();
 
   TAO::SL3::CredentialsCurator_var tao_curator =
-    TAO::SL3::CredentialsCurator::_narrow (curator.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO::SL3::CredentialsCurator::_narrow (curator.in ());
 
   TAO::SSLIOP::CredentialsAcquirerFactory * factory;
   ACE_NEW_THROW_EX (factory,
                     TAO::SSLIOP::CredentialsAcquirerFactory,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   auto_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory;
 
   tao_curator->register_acquirer_factory ("SL3TLS",
-                                          factory
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          factory);
 
   (void) safe_factory.release ();  // CredentialsCurator now owns
                                    // CredentialsAcquirerFactory.
@@ -215,20 +188,15 @@ TAO::SSLIOP::ORBInitializer::post_init (
 
 size_t
 TAO::SSLIOP::ORBInitializer::get_tss_slot_id (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   // Obtain the Security Service TSS slot ID from the SecurityCurrent
   // object.
   CORBA::Object_var obj =
-    info->resolve_initial_references ("SecurityLevel3:SecurityCurrent"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    info->resolve_initial_references ("SecurityLevel3:SecurityCurrent");
 
   SecurityLevel3::SecurityCurrent_var current =
-    SecurityLevel3::SecurityCurrent::_narrow (obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    SecurityLevel3::SecurityCurrent::_narrow (obj.in ());
 
   TAO::SL3::SecurityCurrent * security_current =
     dynamic_cast<TAO::SL3::SecurityCurrent *> (current.in ());
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index 905b526d000..f589a6a8e18 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -60,19 +60,16 @@ namespace TAO
                       CSIIOP::AssociationOptions csiv2_target_supports,
                       CSIIOP::AssociationOptions csiv2_target_requires);
 
-      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     private:
 
       // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object.
-      size_t get_tss_slot_id (PortableInterceptor::ORBInitInfo_ptr info
-                              ACE_ENV_ARG_DECL);
+      size_t get_tss_slot_id (PortableInterceptor::ORBInitInfo_ptr info);
 
     private:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
index 7d90833fff5..20e20a6bc3c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -29,8 +29,7 @@ TAO::SSLIOP::OwnCredentials::_duplicate (TAO::SSLIOP::OwnCredentials_ptr obj)
 }
 
 TAO::SSLIOP::OwnCredentials_ptr
-TAO::SSLIOP::OwnCredentials::_narrow (CORBA::Object_ptr obj
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO::SSLIOP::OwnCredentials::_narrow (CORBA::Object_ptr obj)
 {
   return  TAO::SSLIOP::OwnCredentials::_duplicate (
               dynamic_cast<TAO::SSLIOP::OwnCredentials *> (obj));
@@ -44,14 +43,14 @@ TAO::SSLIOP::OwnCredentials::_nil (void)
 }
 
 SecurityLevel3::CredentialsType
-TAO::SSLIOP::OwnCredentials::creds_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::OwnCredentials::creds_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CT_OwnCredentials;
 }
 
 SecurityLevel3::CredsInitiator_ptr
-TAO::SSLIOP::OwnCredentials::creds_initiator (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::OwnCredentials::creds_initiator (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
@@ -59,7 +58,7 @@ TAO::SSLIOP::OwnCredentials::creds_initiator (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 SecurityLevel3::CredsAcceptor_ptr
-TAO::SSLIOP::OwnCredentials::creds_acceptor (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::OwnCredentials::creds_acceptor (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
@@ -67,8 +66,7 @@ TAO::SSLIOP::OwnCredentials::creds_acceptor (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO::SSLIOP::OwnCredentials::release_credentials (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::OwnCredentials::release_credentials ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->creds_state_ = SecurityLevel3::CS_PendingRelease;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
index 8376cda69dc..0ac90730636 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -57,14 +57,13 @@ namespace TAO
       typedef OwnCredentials_ptr _ptr_type;
       typedef OwnCredentials_var _var_type;
       typedef OwnCredentials_out _out_type;
-    
+
       /// Constructor
       OwnCredentials (::X509 *cert, ::EVP_PKEY *evp);
 
       static OwnCredentials_ptr _duplicate (OwnCredentials_ptr obj);
       static OwnCredentials_ptr _nil (void);
-      static OwnCredentials_ptr _narrow (CORBA::Object_ptr obj
-                                         ACE_ENV_ARG_DECL);
+      static OwnCredentials_ptr _narrow (CORBA::Object_ptr obj);
 
       /**
        * @name SecurityLevel3::TargetCredentials Methods
@@ -73,7 +72,7 @@ namespace TAO
        * interface.
        */
       //@{
-      SecurityLevel3::CredentialsType creds_type (ACE_ENV_SINGLE_ARG_DECL)
+      SecurityLevel3::CredentialsType creds_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -84,15 +83,13 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredsInitiator_ptr creds_initiator (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredsInitiator_ptr creds_initiator ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredsAcceptor_ptr creds_acceptor ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void release_credentials (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void release_credentials (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
index f9c084779cd..3920b4fa110 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -334,12 +334,9 @@ TAO_SSLIOP_Profile::decode_tagged_endpoints (void)
 }
 
 void
-TAO_SSLIOP_Profile::parse_string (const char * ior
-                                  ACE_ENV_ARG_DECL)
+TAO_SSLIOP_Profile::parse_string (const char * ior)
 {
-   TAO_IIOP_Profile::parse_string (ior
-                                   ACE_ENV_ARG_PARAMETER);
-   ACE_CHECK;
+   TAO_IIOP_Profile::parse_string (ior);
 
    this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
index 849914f148d..fef84fbd685 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -88,8 +88,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
        * Initialize this object using the given input string.
        * URL-style string contain only one endpoint.
        */
-      virtual void parse_string (const char * string
-                                 ACE_ENV_ARG_DECL);
+      virtual void parse_string (const char * string);
 
       /**
        * Add @a endp to this profile's list of endpoints (it is
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index a081a95c168..418b6d60600 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -15,67 +15,63 @@ TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert,
 
 
 SecurityLevel3::CredentialsType
-TAO::SSLIOP::TargetCredentials::creds_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::TargetCredentials::creds_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CT_TargetCredentials;
 }
 
 char *
-TAO::SSLIOP::TargetCredentials::context_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::context_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::Principal *
-TAO::SSLIOP::TargetCredentials::client_principal (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::client_principal (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::StatementList *
-TAO::SSLIOP::TargetCredentials::client_supporting_statements (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::client_supporting_statements ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::ResourceNameList *
-TAO::SSLIOP::TargetCredentials::client_restricted_resources (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::client_restricted_resources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::Principal *
-TAO::SSLIOP::TargetCredentials::target_principal (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_principal (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::StatementList *
-TAO::SSLIOP::TargetCredentials::target_supporting_statements (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_supporting_statements ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::ResourceNameList *
-TAO::SSLIOP::TargetCredentials::target_restricted_resources (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_restricted_resources ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 SecurityLevel3::OwnCredentials_ptr
-TAO::SSLIOP::TargetCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::parent_credentials (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
@@ -83,52 +79,52 @@ TAO::SSLIOP::TargetCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::client_authentication (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::client_authentication (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::target_authentication (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_authentication (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::confidentiality (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::confidentiality (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::integrity (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::target_embodied (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_embodied (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
-TAO::SSLIOP::TargetCredentials::target_endorsed (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::target_endorsed (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 void
-TAO::SSLIOP::TargetCredentials::release (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SSLIOP::TargetCredentials::release (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index 920db9d2e61..0127c1e8a77 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -53,8 +53,7 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredentialsType creds_type (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsType creds_type ()
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -65,56 +64,49 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual char * context_id (ACE_ENV_SINGLE_ARG_DECL)
+      virtual char * context_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::Principal * client_principal (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::Principal * client_principal ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::StatementList * client_supporting_statements (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::StatementList * client_supporting_statements ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::ResourceNameList * client_restricted_resources (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ResourceNameList * client_restricted_resources ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::Principal * target_principal (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::Principal * target_principal ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::StatementList * target_supporting_statements (
-         ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::StatementList * target_supporting_statements ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::ResourceNameList * target_restricted_resources (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ResourceNameList * target_restricted_resources ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentials_ptr parent_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean client_authentication (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean client_authentication (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean target_authentication (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean target_authentication (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean confidentiality (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean confidentiality (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean integrity (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean integrity (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean target_embodied (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean target_embodied (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean target_endorsed (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean target_endorsed (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void release (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void release (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index 385e58f64e2..48d87206164 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -19,8 +19,7 @@ TAO::SSLIOP::Current_ptr
 TAO::SSLIOP::Util::current (
   TAO_ORB_Core *orb_core)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Go straight to the object_ref_table in the ORB Core to avoid
       // the ORB::resolve_initial_references() mechanism's complaints
@@ -31,26 +30,21 @@ TAO::SSLIOP::Util::current (
           "SSLIOPCurrent");
 
       TAO::SSLIOP::Current_var tao_current =
-        TAO::SSLIOP::Current::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO::SSLIOP::Current::_narrow (obj.in ());
 
       if (CORBA::is_nil (tao_current.in ()))
-        ACE_TRY_THROW (CORBA::INV_OBJREF ());
+        throw CORBA::INV_OBJREF ();
 
       return tao_current._retn ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "Could not resolve "
-                             "\"SSLIOPCurrent\" object");
+        ex._tao_print_exception (
+          "Could not resolve \"SSLIOPCurrent\" object");
 
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index c8c56c6b5ac..0910e97a3df 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -30,8 +30,7 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
 }
 
 RtecScheduler::handle_t
-ACE_Config_Scheduler::create (const char * entry_point
-                              ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::create (const char * entry_point)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
@@ -82,8 +81,7 @@ ACE_Config_Scheduler::create (const char * entry_point
 }
 
 RtecScheduler::handle_t
-ACE_Config_Scheduler::lookup (const char * entry_point
-                              ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::lookup (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -104,8 +102,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point
 }
 
 RtecScheduler::RT_Info*
-ACE_Config_Scheduler::get (RtecScheduler::handle_t handle
-                           ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::get (RtecScheduler::handle_t handle)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -140,8 +137,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
                                 RtecScheduler::Importance_t importance,
                                 RtecScheduler::Quantum_t quantum,
                                 CORBA::Long threads,
-                                RtecScheduler::Info_Type_t info_type
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -172,8 +168,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
 void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
@@ -190,23 +185,20 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
 void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
                                                  RtecScheduler::OS_Priority& priority,
                                                  RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                                 RtecScheduler::Preemption_Priority_t& p_priority
-                                                 ACE_ENV_ARG_DECL)
+                                                 RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED))
 {
-  this->priority (lookup (entry_point ACE_ENV_ARG_PARAMETER),
-                  priority, p_subpriority, p_priority
-                  ACE_ENV_ARG_PARAMETER);
+  this->priority (lookup (entry_point),
+                  priority, p_subpriority, p_priority);
 }
 
 void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            RtecScheduler::handle_t dependency,
                                            CORBA::Long number_of_calls,
                                            RtecScheduler::Dependency_Type_t
-                                             dependency_type
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                             dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -243,8 +235,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
                                                RtecScheduler::RT_Info_Set_out infos,
                                                RtecScheduler::Dependency_Set_out dependencies,
                                                RtecScheduler::Config_Info_Set_out configs,
-                                               RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                               RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -453,8 +444,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 
 void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                    RtecScheduler::OS_Priority& priority,
-                                                   RtecScheduler::Dispatching_Type_t & d_type
-                                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                                   RtecScheduler::Dispatching_Type_t & d_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
@@ -472,7 +462,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
 
 
 RtecScheduler::Preemption_Priority_t
-ACE_Config_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::last_scheduled_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
@@ -493,8 +483,7 @@ ACE_Config_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   // All scheduled priorities range from 0 to the number returned, inclusive.
 
 void
-ACE_Config_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out configs
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::get_config_infos (RtecScheduler::Config_Info_Set_out configs)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::NOT_SCHEDULED))
@@ -515,18 +504,16 @@ void ACE_Config_Scheduler::reset (RtecScheduler::handle_t,
             RtecScheduler::Importance_t,
             RtecScheduler::Quantum_t,
             CORBA::Long,
-            RtecScheduler::Info_Type_t
-            ACE_ENV_ARG_DECL)
+            RtecScheduler::Info_Type_t)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UNKNOWN_TASK,
                    RtecScheduler::INTERNAL,
                    RtecScheduler::SYNCHRONIZATION_FAILURE))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&
-                      ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UNKNOWN_TASK,
                    RtecScheduler::INTERNAL,
@@ -534,11 +521,10 @@ void ACE_Config_Scheduler::set_seq (const RtecScheduler::RT_Info_Set&
 // Set characteristics of the RT_Infos corresponding to the passed handles.
 // Tuples are added in the case of existing and/or multiple definitions.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&
-                        ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UNKNOWN_TASK,
                    RtecScheduler::INTERNAL,
@@ -546,11 +532,10 @@ void ACE_Config_Scheduler::reset_seq (const RtecScheduler::RT_Info_Set&
 // Reset characteristics of the RT_Infos corresponding to the passed handles.
 // Tuples are replaced in the case of existing and/or multiple definitions.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set&
-                          ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UNKNOWN_TASK,
                    RtecScheduler::INTERNAL,
@@ -560,72 +545,66 @@ void ACE_Config_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set&
 // reset to their uninitialized values, i.e., the same they have
 // just after the create call.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::remove_dependency (RtecScheduler::handle_t,
                                 RtecScheduler::handle_t,
                                 CORBA::Long,
-                                RtecScheduler::Dependency_Type_t
-                                ACE_ENV_ARG_DECL)
+                                RtecScheduler::Dependency_Type_t)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method removes a dependency between two RT_Infos.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::set_dependency_enable_state (RtecScheduler::handle_t,
                                   RtecScheduler::handle_t,
                                   CORBA::Long,
                                   RtecScheduler::Dependency_Type_t,
-                                  RtecScheduler::Dependency_Enabled_Type_t
-                                  ACE_ENV_ARG_DECL)
+                                  RtecScheduler::Dependency_Enabled_Type_t)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method sets the enable state of a dependency between two RT_Infos.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set &
-                                      ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method sets the enable state of a sequence of dependencies.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::set_rt_info_enable_state (RtecScheduler::handle_t,
-                               RtecScheduler::RT_Info_Enabled_Type_t
-                                       ACE_ENV_ARG_DECL)
+                               RtecScheduler::RT_Info_Enabled_Type_t)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method enables or disables an RT_Info.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::set_rt_info_enable_state_seq (
-                  const RtecScheduler::RT_Info_Enable_State_Pair_Set &
-                  ACE_ENV_ARG_DECL)
+                  const RtecScheduler::RT_Info_Enable_State_Pair_Set &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::UNKNOWN_TASK))
 // This method enables or disables a sequence of RT_Infos.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void ACE_Config_Scheduler::recompute_scheduling (CORBA::Long,
                            CORBA::Long,
-                           RtecScheduler::Scheduling_Anomaly_Set_out
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::Scheduling_Anomaly_Set_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -635,40 +614,37 @@ void ACE_Config_Scheduler::recompute_scheduling (CORBA::Long,
                    RtecScheduler::DUPLICATE_NAME))
 // Recomputes the scheduling priorities, etc.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out
-                              ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::get_rt_info_set (RtecScheduler::RT_Info_Set_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::INTERNAL))
 // Returns the set of rt_infos, with their assigned priorities (as
 // of the last schedule re-computation).
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out
-                                 ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::get_dependency_set (RtecScheduler::Dependency_Set_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::INTERNAL))
 // Returns the set of rt_infos, with their assigned priorities (as
 // of the last schedule re-computation).
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
-void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out
-                                  ACE_ENV_ARG_DECL)
+void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RtecScheduler::SYNCHRONIZATION_FAILURE,
                    RtecScheduler::INTERNAL))
 // Returns the set of config_infos, describing the appropriate
 // number, types, and priority levels for the dispatching lanes.
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index d6b378d8f82..cc872ee8863 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -41,16 +41,13 @@ public:
   ACE_Config_Scheduler (void);
   virtual ~ACE_Config_Scheduler (void);
 
-  virtual RtecScheduler::handle_t create (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t create (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t lookup (const char * entry_point)
     ACE_THROW_SPEC((CORBA::SystemException));
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
-                                       ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void set (RtecScheduler::handle_t handle,
@@ -62,15 +59,13 @@ public:
                     RtecScheduler::Importance_t importance,
                     RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type
-                    ACE_ENV_ARG_DECL)
+                    RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -78,8 +73,7 @@ public:
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -87,8 +81,7 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
 
@@ -97,8 +90,7 @@ public:
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Dependency_Set_out dependencies,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                   ACE_ENV_ARG_DECL)
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -106,15 +98,14 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type
-                                       ACE_ENV_ARG_DECL)
+                                       RtecScheduler::Dispatching_Type_t & d_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // provide the thread priority and queue type for the given priority level
 
   virtual RtecScheduler::Preemption_Priority_t
-      last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+      last_scheduled_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
   // Returns the last priority number assigned to an operation in the
@@ -124,8 +115,7 @@ public:
   // All scheduled priorities range from 0 to the number returned,
   // inclusive.
 
-  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs
-				 ACE_ENV_ARG_DECL)
+  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     RtecScheduler::SYNCHRONIZATION_FAILURE,
 		     RtecScheduler::NOT_SCHEDULED));
@@ -140,16 +130,14 @@ public:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       CORBA::Long threads,
-                      RtecScheduler::Info_Type_t info_type
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Reset characteristics of the RT_Info corresponding to the passed handle.
 
-  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -157,8 +145,7 @@ public:
   // Set characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are added in the case of existing and/or multiple definitions.
 
-  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos
-                          ACE_ENV_ARG_DECL)
+  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -166,8 +153,7 @@ public:
   // Reset characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are replaced in the case of existing and/or multiple definitions.
 
-  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos
-                            ACE_ENV_ARG_DECL)
+  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -180,8 +166,7 @@ public:
   virtual void remove_dependency (RtecScheduler::handle_t handle,
                                   RtecScheduler::handle_t dependency,
                                   CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type
-                                  ACE_ENV_ARG_DECL)
+                                  RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -191,30 +176,26 @@ public:
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
                                             RtecScheduler::Dependency_Type_t dependency_type,
-                                            RtecScheduler::Dependency_Enabled_Type_t enabled
-                                            ACE_ENV_ARG_DECL)
+                                            RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a dependency between two RT_Infos.
 
-  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                                ACE_ENV_ARG_DECL)
+  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a sequence of dependencies.
 
   virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                         RtecScheduler::RT_Info_Enabled_Type_t enabled
-                                         ACE_ENV_ARG_DECL)
+                                         RtecScheduler::RT_Info_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method enables or disables an RT_Info.
 
-  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set
-                                             ACE_ENV_ARG_DECL)
+  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -222,8 +203,7 @@ public:
 
   virtual void recompute_scheduling (CORBA::Long minimum_priority,
                                      CORBA::Long maximum_priority,
-                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -233,24 +213,21 @@ public:
                      RtecScheduler::DUPLICATE_NAME));
   // Recomputes the scheduling priorities, etc.
 
-  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                                ACE_ENV_ARG_DECL)
+  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                                   ACE_ENV_ARG_DECL)
+  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                                    ACE_ENV_ARG_DECL)
+  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index cfc7cfd332a..10339b99215 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -243,8 +243,8 @@ postfix_action (TAO_Reconfig_Scheduler_Entry & /* rse */)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 TAO_RSE_DFS_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 TAO_RSE_DFS_Visitor
-  (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-   ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
+  (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+   typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
   : TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
       (dependency_map, rt_info_map),
     DFS_time_ (0)
@@ -330,8 +330,8 @@ postfix_action (TAO_Reconfig_Scheduler_Entry &rse)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 TAO_RSE_SCC_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 TAO_RSE_SCC_Visitor
-  (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-   ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
+  (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+   typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
   : TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>
       (dependency_map, rt_info_map),
     DFS_time_ (0),
@@ -481,8 +481,8 @@ postfix_action (TAO_Reconfig_Scheduler_Entry &rse)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 TAO_RSE_Reverse_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 TAO_RSE_Reverse_Propagation_Visitor
-  (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-   ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
+  (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+   typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
   : TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK> (dependency_map, rt_info_map)
 {
 }
@@ -547,8 +547,8 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 TAO_RSE_Forward_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 TAO_RSE_Forward_Propagation_Visitor
-  (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-   ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
+  (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+   typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
   : TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK> (dependency_map, rt_info_map),
     unresolved_locals_ (0),
     unresolved_remotes_ (0),
@@ -1034,8 +1034,8 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::noncritical_utilization_th
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 TAO_RSE_Criticality_Propagation_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 TAO_RSE_Criticality_Propagation_Visitor
-  (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-   ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
+  (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+   typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map)
   : TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK> (dependency_map, rt_info_map)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index b66b0f389bd..c6867cff861 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -122,8 +122,8 @@ class TAO_RSE_DFS_Visitor :
 public:
 
   TAO_RSE_DFS_Visitor
-    (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-     ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
+    (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+     typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
   // Constructor.
 
 protected:
@@ -169,8 +169,8 @@ class TAO_RSE_SCC_Visitor :
 public:
 
   TAO_RSE_SCC_Visitor
-    (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-     ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
+    (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+     typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
   // Constructor.
 
   int number_of_cycles (void);
@@ -246,8 +246,8 @@ class TAO_RSE_Reverse_Propagation_Visitor :
 public:
 
   TAO_RSE_Reverse_Propagation_Visitor
-    (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-     ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
+    (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+     typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
   // Constructor.
 
 protected:
@@ -277,8 +277,8 @@ class TAO_RSE_Forward_Propagation_Visitor :
 public:
 
   TAO_RSE_Forward_Propagation_Visitor
-    (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-     ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
+    (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+     typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
   // Constructor.
 
   int unresolved_locals (void);
@@ -461,8 +461,8 @@ class TAO_RSE_Criticality_Propagation_Visitor :
 public:
 
   TAO_RSE_Criticality_Propagation_Visitor
-    (ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
-     ACE_TYPENAME TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
+    (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map,
+     typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map);
   // Constructor.
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 3453a401eda..fead117c9f7 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -112,21 +112,19 @@ TAO_Reconfig_Scheduler (int config_count,
   // The init method can throw an exception, which must be caught
   // *inside* the constructor to be portable between compilers that
   // differ in whether they support native C++ exceptions.
-  ACE_TRY_NEW_ENV
+  try
     {
       this->init (config_count, config_infos,
                   rt_info_count, rt_infos,
                   dependency_count, dependency_infos,
-                  stability_flags ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                  stability_flags);
     }
-  ACE_CATCH (CORBA::SystemException, corba_sysex)
+  catch (const CORBA::SystemException& )
     {
        ACE_ERROR ((LM_ERROR, "TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, "
                              "ACE_LOCK>::TAO_Reconfig_Scheduler "
                              "system exception: cannot init scheduler.\n"));
     }
-  ACE_ENDTRY;
 }
 
 
@@ -141,18 +139,16 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
               " TAO_Reconfig_Scheduler dtor.\n"));
 #endif /* SCHEDULER_LOGGING */
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->close ();
     }
-  ACE_CATCH (CORBA::SystemException, corba_sysex)
+  catch (const CORBA::SystemException& )
     {
       ACE_ERROR ((LM_ERROR, "TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, "
                             "ACE_LOCK>::~TAO_Reconfig_Scheduler "
                             "exception: cannot close scheduler.\n"));
     }
-  ACE_ENDTRY;
 
   // Delete the entry and tuple pointer arrays.
   delete [] entry_ptr_array_;
@@ -170,8 +166,7 @@ init (int config_count,
       ACE_Scheduler_Factory::POD_RT_Info rt_info[],
       int dependency_count,
       ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-      u_long stability_flags
-      ACE_ENV_ARG_DECL)
+      u_long stability_flags)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::UNKNOWN_TASK,
@@ -185,15 +180,13 @@ init (int config_count,
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (-1);
 
   int result = 0;
   int i = 0;
 
 /* WSOA merge - commented out
   // Clear out the previous entries, if any.
-  this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->close ();
 */
 
   // Re-map the RT_Info and dependency handle values if necessary.
@@ -225,7 +218,6 @@ init (int config_count,
       ACE_NEW_THROW_EX (new_config_info,
                         RtecScheduler::Config_Info,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (-1);
 
       // Make sure the new config info is cleaned up if we exit abruptly.
       ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info, RtecScheduler::Config_Info);
@@ -273,9 +265,7 @@ init (int config_count,
   for (int num_rt_infos = 0; num_rt_infos < rt_info_count; ++num_rt_infos)
     {
       new_rt_info = create_i (rt_info [num_rt_infos].entry_point,
-                              rt_info [num_rt_infos].handle, 1
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                              rt_info [num_rt_infos].handle, 1);
 
       if (new_rt_info == 0)
         {
@@ -295,9 +285,7 @@ init (int config_count,
              RtecScheduler::Importance_t (rt_info [num_rt_infos].importance),
              rt_info [num_rt_infos].quantum,
              rt_info [num_rt_infos].threads,
-             RtecScheduler::Info_Type_t (rt_info [num_rt_infos].info_type)
-             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+             RtecScheduler::Info_Type_t (rt_info [num_rt_infos].info_type));
 
       // Fill in the scheduler managed portions.
       new_rt_info->priority =
@@ -315,9 +303,7 @@ init (int config_count,
                             dependency_info [dependency_count_].info_depended_on,
                             dependency_info [dependency_count_].number_of_calls,
                             dependency_info [dependency_count_].dependency_type,
-                            dependency_info [dependency_count_].enabled
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                            dependency_info [dependency_count_].enabled);
 
           ++this->dependency_count_;
         }
@@ -333,7 +319,7 @@ init (int config_count,
 
 // Closes the scheduler, releasing all current resources.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK,
@@ -346,7 +332,6 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Unbind and delete each RT_Info in the map: this also cleans up
   // all the entries and tuples associated with each RT_Info.
@@ -367,12 +352,12 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE
             }
           else
             {
-              ACE_THROW (RtecScheduler::INTERNAL ());
+              throw RtecScheduler::INTERNAL ();
             }
          }
       else
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
     }
 
@@ -388,7 +373,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -403,7 +388,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -417,7 +402,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -453,8 +438,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-create (const char *entry_point
-        ACE_ENV_ARG_DECL)
+create (const char *entry_point)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME,
                       RtecScheduler::INTERNAL,
@@ -467,11 +451,9 @@ create (const char *entry_point
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (0);
 
   RtecScheduler::handle_t handle = next_handle_;
-  create_i (entry_point, handle, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (handle);
+  create_i (entry_point, handle, 0);
 
   // Set affected stability flags.
   this->stability_flags_ |=
@@ -487,8 +469,7 @@ create (const char *entry_point
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-lookup (const char * entry_point
-        ACE_ENV_ARG_DECL)
+lookup (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -500,11 +481,9 @@ lookup (const char * entry_point
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (0);
 
   RtecScheduler::handle_t handle;
-  handle = this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (handle);
+  handle = this->lookup_i (entry_point);
 
   return handle;
 }
@@ -515,8 +494,7 @@ lookup (const char * entry_point
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::RT_Info *
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get (RtecScheduler::handle_t handle
-     ACE_ENV_ARG_DECL)
+get (RtecScheduler::handle_t handle)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -528,7 +506,6 @@ get (RtecScheduler::handle_t handle
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (0);
 
   // Find the RT_Info in the hash map.
   TAO_RT_Info_Ex *rt_info = 0;
@@ -542,7 +519,6 @@ get (RtecScheduler::handle_t handle
   ACE_NEW_THROW_EX (new_info,
                     RtecScheduler::RT_Info,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   *new_info = *rt_info;
 
@@ -564,8 +540,7 @@ set (::RtecScheduler::handle_t handle,
      ::RtecScheduler::Importance_t importance,
      ::RtecScheduler::Quantum_t quantum,
      ::RtecScheduler::Threads_t threads,
-     ::RtecScheduler::Info_Type_t info_type
-     ACE_ENV_ARG_DECL)
+     ::RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -578,18 +553,17 @@ set (::RtecScheduler::handle_t handle,
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Look up the RT_Info by its handle, throw an exception if it's not there.
   TAO_RT_Info_Ex *rt_info_ptr = 0;
   if (rt_info_map_.find (handle, rt_info_ptr) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   if (rt_info_ptr == 0)
     {
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
     }
 
   // Enable the RT_Info if it was disabled.  Does not modify NON_VOLATILE ops.
@@ -601,8 +575,7 @@ set (::RtecScheduler::handle_t handle,
   // Call the internal set method.
   this->set_i (rt_info_ptr, criticality, time, typical_time,
                cached_time, period, importance, quantum,
-               threads, info_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+               threads, info_type);
 
 
   // Update stability flags.  For now, just mark everything as unstable.
@@ -627,8 +600,7 @@ reset (RtecScheduler::handle_t handle,
        RtecScheduler::Importance_t importance,
        RtecScheduler::Quantum_t quantum,
        CORBA::Long threads,
-       RtecScheduler::Info_Type_t info_type
-       ACE_ENV_ARG_DECL)
+       RtecScheduler::Info_Type_t info_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -641,23 +613,22 @@ reset (RtecScheduler::handle_t handle,
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Look up the RT_Info by its handle, throw an exception if it's not there.
   TAO_RT_Info_Ex *rt_info_ptr = 0;
   if (rt_info_map_.find (handle, rt_info_ptr) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
   if (rt_info_ptr == 0)
     {
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
     }
 
   // Enable the RT_Info if it was disabled.  Does not modify NON_VOLATILE ops.
   if (rt_info_ptr->enabled_state () == RtecScheduler::RT_INFO_NON_VOLATILE)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
   else
     {
@@ -669,14 +640,12 @@ reset (RtecScheduler::handle_t handle,
     }
 
   // Refresh the internal tuple pointer array.
-  this->refresh_tuple_ptr_array_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->refresh_tuple_ptr_array_i ();
 
   // Then call the internal set method.
   this->set_i (rt_info_ptr, criticality, time, typical_time,
                cached_time, period, importance, quantum,
-               threads, info_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+               threads, info_type);
 
 
   // Update stability flags.  For now, just mark everything as unstable.
@@ -694,8 +663,7 @@ reset (RtecScheduler::handle_t handle,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-set_seq (const RtecScheduler::RT_Info_Set& infos
-         ACE_ENV_ARG_DECL)
+set_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -708,7 +676,6 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   for (u_int i = 0; i < infos.length (); ++i)
     {
@@ -716,12 +683,12 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
       TAO_RT_Info_Ex *rt_info_ptr = 0;
       if (rt_info_map_.find (infos[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
 
       if (rt_info_ptr == 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       // Enable the RT_Info if it was disabled.  Does not modify NON_VOLATILE ops.
@@ -745,9 +712,7 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
                    info.importance,
                    info.quantum,
                    info.threads,
-                   info.info_type
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                   info.info_type);
 #else
       this->set_i (rt_info_ptr,
                    infos[i].criticality,
@@ -758,8 +723,7 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
                    infos[i].importance,
                    infos[i].quantum,
                    infos[i].threads,
-                   infos[i].info_type
-                   ACE_ENV_ARG_PARAMETER);
+                   infos[i].info_type);
 #endif
     }
 
@@ -777,8 +741,7 @@ set_seq (const RtecScheduler::RT_Info_Set& infos
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-reset_seq (const RtecScheduler::RT_Info_Set& infos
-           ACE_ENV_ARG_DECL)
+reset_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -791,7 +754,6 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   TAO_RT_Info_Ex *rt_info_ptr = 0;
   u_int i;
@@ -801,13 +763,13 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
       // Look up the RT_Info by its handle, throw an exception if it's not there.
       if (rt_info_map_.find (infos[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
 
       // Enable the RT_Info.  Does not modify NON_VOLATILE ops.
       if (rt_info_ptr->enabled_state () == RtecScheduler::RT_INFO_NON_VOLATILE)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
       else
         {
@@ -820,20 +782,19 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
     }
 
   // Refresh the internal tuple pointer array.
-  this->refresh_tuple_ptr_array_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->refresh_tuple_ptr_array_i ();
 
   for (i = 0; i < infos.length (); ++i)
     {
       // Look up the RT_Info by its handle, throw an exception if it's not there.
       if (rt_info_map_.find (infos[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
 
       if (rt_info_ptr == 0)
     {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
 #if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) && defined (NDEBUG)
@@ -852,9 +813,7 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
                    info.importance,
                    info.quantum,
                    info.threads,
-                   info.info_type
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                   info.info_type);
 #else
       // Call the internal set method.
       this->set_i (rt_info_ptr,
@@ -866,9 +825,7 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
                    infos[i].importance,
                    infos[i].quantum,
                    infos[i].threads,
-                   infos[i].info_type
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                   infos[i].info_type);
 #endif
     }
 
@@ -885,8 +842,7 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-replace_seq (const RtecScheduler::RT_Info_Set& infos
-             ACE_ENV_ARG_DECL)
+replace_seq (const RtecScheduler::RT_Info_Set& infos)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -899,11 +855,10 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   TAO_RT_Info_Ex *rt_info_ptr = 0;
 
-  for (ACE_TYPENAME RT_INFO_MAP::iterator info_iter (this->rt_info_map_);
+  for (typename RT_INFO_MAP::iterator info_iter (this->rt_info_map_);
        info_iter.done () == 0;
        ++info_iter)
     {
@@ -911,7 +866,7 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
       rt_info_ptr = (*info_iter).int_id_;
       if (! rt_info_ptr)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       switch (rt_info_ptr->enabled_state ())
@@ -945,12 +900,12 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
       // Look up the RT_Info by its handle, throw an exception if it's not there.
       if (rt_info_map_.find (infos[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
     }
 
       if (rt_info_ptr == 0)
     {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       // Enable the RT_Info if it was disabled.  Does not modify NON_VOLATILE ops.
@@ -975,9 +930,7 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
                    info.importance,
                    info.quantum,
                    info.threads,
-                   info.info_type
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                   info.info_type);
 #else
       // Call the internal set method.
       this->set_i (rt_info_ptr,
@@ -989,9 +942,7 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos
                    infos[i].importance,
                    infos[i].quantum,
                    infos[i].threads,
-                   infos[i].info_type
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                   infos[i].info_type);
 #endif
     }
 
@@ -1015,8 +966,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 priority (RtecScheduler::handle_t handle,
           RtecScheduler::OS_Priority& o_priority,
           RtecScheduler::Preemption_Subpriority_t& subpriority,
-          RtecScheduler::Preemption_Priority_t& p_priority
-          ACE_ENV_ARG_DECL)
+          RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1024,13 +974,12 @@ priority (RtecScheduler::handle_t handle,
 {
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Check stability flags.
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
       && this->enforce_schedule_stability_)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
     }
 
   // CDG - TBD - address priority "generations" i.e., after an
@@ -1040,7 +989,7 @@ priority (RtecScheduler::handle_t handle,
   TAO_RT_Info_Ex *rt_info = 0;
   if (rt_info_map_.find (handle, rt_info) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   o_priority = rt_info->priority;
@@ -1058,8 +1007,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 entry_point_priority (const char * entry_point,
                       RtecScheduler::OS_Priority& priority,
                       RtecScheduler::Preemption_Subpriority_t& subpriority,
-                      RtecScheduler::Preemption_Priority_t& p_priority
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1072,18 +1020,14 @@ entry_point_priority (const char * entry_point,
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   RtecScheduler::handle_t handle =
-    this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->lookup_i (entry_point);
 
   this->priority_i (handle,
                   priority,
                   subpriority,
-                  p_priority
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                  p_priority);
 }
 
 
@@ -1095,8 +1039,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
                 RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                 CORBA::Long number_of_calls,
-                RtecScheduler::Dependency_Type_t dependency_type
-                ACE_ENV_ARG_DECL)
+                RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::UNKNOWN_TASK))
@@ -1108,12 +1051,10 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Delegate to the internal method.
   add_dependency_i (handle, dependency, number_of_calls, dependency_type,
-                    RtecBase::DEPENDENCY_ENABLED ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                    RtecBase::DEPENDENCY_ENABLED);
 
   // Since the call graph topology has changed, set *all*
   // stability flags before incrementing the dependency count.
@@ -1130,8 +1071,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 remove_dependency (RtecScheduler::handle_t handle,
                    RtecScheduler::handle_t dependency,
                    CORBA::Long number_of_calls,
-                   RtecScheduler::Dependency_Type_t dependency_type
-                   ACE_ENV_ARG_DECL)
+                   RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::UNKNOWN_TASK))
@@ -1143,12 +1083,10 @@ remove_dependency (RtecScheduler::handle_t handle,
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Delegate to the internal method.
   remove_dependency_i (handle, dependency, number_of_calls,
-                       dependency_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                       dependency_type);
 
   // Since the call graph topology has changed, set *all*
   // stability flags before incrementing the dependency count.
@@ -1165,8 +1103,7 @@ set_dependency_enable_state (RtecScheduler::handle_t handle,
                              RtecScheduler::handle_t dependency,
                              CORBA::Long number_of_calls,
                              RtecScheduler::Dependency_Type_t dependency_type,
-                             RtecScheduler::Dependency_Enabled_Type_t enabled
-                             ACE_ENV_ARG_DECL)
+                             RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::UNKNOWN_TASK))
@@ -1178,12 +1115,10 @@ set_dependency_enable_state (RtecScheduler::handle_t handle,
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Delegate to the internal method.
   set_dependency_enable_state_i (handle, dependency, number_of_calls,
-                                 dependency_type, enabled ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 dependency_type, enabled);
 }
 
 
@@ -1192,8 +1127,7 @@ set_dependency_enable_state (RtecScheduler::handle_t handle,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                 ACE_ENV_ARG_DECL)
+set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK))
@@ -1205,7 +1139,6 @@ set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependenc
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Delegate to the internal method for each dependency in the sequence.
   for (u_int i = 0; i < dependencies.length (); ++i)
@@ -1214,9 +1147,7 @@ set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependenc
                                      dependencies[i].rt_info_depended_on,
                                      dependencies[i].number_of_calls,
                                      dependencies[i].dependency_type,
-                                     dependencies[i].enabled
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     dependencies[i].enabled);
     }
 }
 
@@ -1227,8 +1158,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                          RtecScheduler::RT_Info_Enabled_Type_t enabled
-                          ACE_ENV_ARG_DECL)
+                          RtecScheduler::RT_Info_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -1241,18 +1171,17 @@ set_rt_info_enable_state (RtecScheduler::handle_t handle,
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Look up the RT_Info by its handle, throw an exception if it's not there.
   TAO_RT_Info_Ex *rt_info_ptr = 0;
   if (rt_info_map_.find (handle, rt_info_ptr) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   if (rt_info_ptr == 0)
     {
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
     }
 
   // Enable the RT_Info.
@@ -1265,8 +1194,7 @@ set_rt_info_enable_state (RtecScheduler::handle_t handle,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set
-                              ACE_ENV_ARG_DECL)
+set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -1279,7 +1207,6 @@ set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   for (u_int i = 0; i < pair_set.length (); ++i)
     {
@@ -1287,12 +1214,12 @@ set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set
       TAO_RT_Info_Ex *rt_info_ptr = 0;
       if (rt_info_map_.find (pair_set[i].handle, rt_info_ptr) != 0)
         {
-          ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+          throw RtecScheduler::UNKNOWN_TASK ();
         }
 
       if (rt_info_ptr == 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       // Enable the RT_Info.
@@ -1314,8 +1241,7 @@ compute_scheduling (CORBA::Long minimum_priority,
                     RtecScheduler::RT_Info_Set_out infos,
                     RtecScheduler::Dependency_Set_out dependencies,
                     RtecScheduler::Config_Info_Set_out configs,
-                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                    ACE_ENV_ARG_DECL)
+                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1326,17 +1252,13 @@ compute_scheduling (CORBA::Long minimum_priority,
 {
   // Delegates to recompute_scheduling and the respective accessors.
   this->recompute_scheduling (minimum_priority, maximum_priority,
-                              anomalies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              anomalies);
 
-  this->get_rt_info_set (infos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->get_rt_info_set (infos);
 
-  this->get_dependency_set (dependencies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->get_dependency_set (dependencies);
 
-  this->get_config_info_set (configs ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->get_config_info_set (configs);
 
 #if defined (SCHEDULER_DUMP)
   ACE_DEBUG ((LM_TRACE, "Schedule prepared.\n"));
@@ -1356,8 +1278,7 @@ void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 recompute_scheduling (CORBA::Long /* minimum_priority */,
                       CORBA::Long /* maximum_priority */,
-                      RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1373,7 +1294,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // @@ TO DO - use these to establish the bounds of priority assignment.
   //      minimum_priority
@@ -1387,7 +1307,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
       ACE_NEW_THROW_EX (anomalies,
          RtecScheduler::Scheduling_Anomaly_Set (0),
          CORBA::NO_MEMORY ());
-      ACE_CHECK;
       return;
     }
 
@@ -1406,8 +1325,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
 
       // Traverse criticality dependency graph, assigning a
       // topological ordering and identifying threads.
-      crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      crit_dfs_traverse_i ();
 
 #if defined (SCHEDULER_LOGGING)
       ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1416,8 +1334,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
 #endif
 
       // Propagate criticalities.
-      propagate_criticalities_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      propagate_criticalities_i ();
 
 #if defined (SCHEDULER_LOGGING)
       ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1432,8 +1349,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
 #endif
 
       // Traverse dependency graph, assigning a topological ordering and identifying threads.
-      dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      dfs_traverse_i ();
 
 #if defined (SCHEDULER_LOGGING)
       ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1443,8 +1359,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
 
       // Sort an array of RT_info handles in topological order, check
       // for loops using the strongly connected components algorithm.
-      detect_cycles_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      detect_cycles_i ();
 
 #if defined (SCHEDULER_LOGGING)
       ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1453,8 +1368,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
 #endif
 
       // Perform admission control for task delineator rate tuples.
-      perform_admission_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      perform_admission_i ();
 
 #if defined (SCHEDULER_LOGGING)
       ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1463,8 +1377,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
 #endif
 
       // Propagate effective execution time and period, set total frame size.
-      propagate_characteristics_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      propagate_characteristics_i ();
 
 #if defined (SCHEDULER_LOGGING)
       ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1479,8 +1392,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
       // Sort operations by urgency, then assign priorities and
       // subpriorities in one pass.  Sets last scheduled priority and
       // last feasible priority.
-      assign_priorities_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      assign_priorities_i ();
 
 #if defined (SCHEDULER_LOGGING)
       ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_,
@@ -1497,7 +1409,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
       ACE_NEW_THROW_EX (anomalies,
                         RtecScheduler::Scheduling_Anomaly_Set (0),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
 
   ACE_DEBUG ((LM_DEBUG,
@@ -1526,8 +1437,7 @@ recompute_scheduling (CORBA::Long /* minimum_priority */,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                 ACE_ENV_ARG_DECL)
+get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL))
@@ -1539,12 +1449,11 @@ get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
       ACE_NEW_THROW_EX (infos,
                         RtecScheduler::RT_Info_Set (this->rt_info_count_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
 
   infos->length (this->rt_info_count_);
   TAO_RT_Info_Ex* rt_info = 0;
-  for (ACE_TYPENAME RT_INFO_MAP::iterator info_iter (this->rt_info_map_);
+  for (typename RT_INFO_MAP::iterator info_iter (this->rt_info_map_);
        info_iter.done () == 0;
        ++info_iter)
     {
@@ -1563,8 +1472,7 @@ get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                    ACE_ENV_ARG_DECL_NOT_USED)
+get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL))
@@ -1578,7 +1486,7 @@ get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
   dependencies->length (this->dependency_count_);
   RtecScheduler::Dependency_Set *dependency_set = 0;
   int i = 0;
-  for (ACE_TYPENAME DEPENDENCY_SET_MAP::iterator
+  for (typename DEPENDENCY_SET_MAP::iterator
          dependency_iter (this->called_dependency_set_map_);
        dependency_iter.done () == 0 && i < this->dependency_count_;
        ++dependency_iter)
@@ -1608,8 +1516,7 @@ get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                     ACE_ENV_ARG_DECL)
+get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL))
@@ -1622,12 +1529,11 @@ get_config_info_set (RtecScheduler::Config_Info_Set_out configs
                         RtecScheduler::Config_Info_Set(this->
                                                          config_info_count_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
 
   configs->length (this->config_info_count_);
   RtecScheduler::Config_Info* config_info = 0;
-  for (ACE_TYPENAME CONFIG_INFO_MAP::iterator config_iter (this->config_info_map_);
+  for (typename CONFIG_INFO_MAP::iterator config_iter (this->config_info_map_);
        config_iter.done () == 0;
        ++config_iter)
     {
@@ -1647,8 +1553,7 @@ void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                         RtecScheduler::OS_Priority& t_priority,
-                        RtecScheduler::Dispatching_Type_t & d_type
-                        ACE_ENV_ARG_DECL)
+                        RtecScheduler::Dispatching_Type_t & d_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -1661,19 +1566,18 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Check stability flags
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
       && this->enforce_schedule_stability_)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
     }
 
   RtecScheduler::Config_Info *config_info = 0;
   if (config_info_map_.find (p_priority, config_info) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_PRIORITY_LEVEL());
+      throw RtecScheduler::UNKNOWN_PRIORITY_LEVEL();
     }
 
   t_priority = config_info->thread_priority;
@@ -1689,7 +1593,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::Preemption_Priority_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+last_scheduled_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::NOT_SCHEDULED))
@@ -1701,7 +1605,6 @@ last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK_RETURN (0);
 
   // Check schedule stability flags.
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
@@ -1719,21 +1622,19 @@ last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get_config_infos (RtecScheduler::Config_Info_Set_out configs
-		  ACE_ENV_ARG_DECL)
+get_config_infos (RtecScheduler::Config_Info_Set_out configs)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   RtecScheduler::SYNCHRONIZATION_FAILURE,
 		   RtecScheduler::NOT_SCHEDULED))
 {
   ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->mutex_,
                       RtecScheduler::SYNCHRONIZATION_FAILURE ());
-  ACE_CHECK;
 
   // Check schedule stability flags.
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
       && this->enforce_schedule_stability_)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
     }
 
   // return the set of Config_Infos
@@ -1743,11 +1644,10 @@ get_config_infos (RtecScheduler::Config_Info_Set_out configs
 			RtecScheduler::Config_Info_Set(this->
 						       config_info_count_),
 			CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   configs->length (this->config_info_count_);
   RtecScheduler::Config_Info* config_info = 0;
-  for (ACE_TYPENAME CONFIG_INFO_MAP::iterator config_iter (this->config_info_map_);
+  for (typename CONFIG_INFO_MAP::iterator config_iter (this->config_info_map_);
        config_iter.done () == 0;
        ++config_iter)
     {
@@ -1768,8 +1668,7 @@ TAO_RT_Info_Ex *
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 create_i (const char *entry_point,
           RtecScheduler::handle_t handle,
-          int ignore_duplicates
-          ACE_ENV_ARG_DECL)
+          int ignore_duplicates)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL))
@@ -1795,7 +1694,6 @@ create_i (const char *entry_point,
   ACE_NEW_THROW_EX (new_rt_info,
                     TAO_RT_Info_Ex,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   // Make sure the new scheduling entry is cleaned up if we exit abruptly.
   auto_ptr<TAO_RT_Info_Ex> new_rt_info_ptr (new_rt_info);
@@ -1851,15 +1749,13 @@ create_i (const char *entry_point,
   ACE_NEW_THROW_EX (new_sched_entry,
                     TAO_Reconfig_Scheduler_Entry (*new_rt_info),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   // Make sure the new scheduling entry is cleaned up if we exit abruptly.
   auto_ptr<TAO_Reconfig_Scheduler_Entry> new_sched_entry_ptr (new_sched_entry);
 
   // Maintain the size of the entry pointer array.
   maintain_scheduling_array (entry_ptr_array_, entry_ptr_array_size_,
-                             handle ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                             handle);
 
 
   // Store the new entry in the scheduling entry pointer array.
@@ -1902,8 +1798,7 @@ set_i (TAO_RT_Info_Ex *rt_info,
        RtecScheduler::Importance_t importance,
        RtecScheduler::Quantum_t quantum,
        CORBA::Long threads,
-       RtecScheduler::Info_Type_t info_type
-       ACE_ENV_ARG_DECL)
+       RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL))
 {
@@ -1917,7 +1812,7 @@ set_i (TAO_RT_Info_Ex *rt_info,
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT("Conjunction Nodes are not supported currently.")));
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
     }
 
 
@@ -1941,13 +1836,13 @@ set_i (TAO_RT_Info_Ex *rt_info,
 //      ACE_DEBUG((LM_DEBUG, "Updating or inserting tuple for RT_Info: %d, entry_ptr: %x\n", rt_info->handle, rse_ptr));
       if (rse_ptr == 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
 
       int result = rse_ptr->update_tuple (*rt_info);
       if (result < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
       else if (result == 0)  // We did not find an existing tuple.
         {
@@ -1956,7 +1851,6 @@ set_i (TAO_RT_Info_Ex *rt_info,
           ACE_NEW_THROW_EX (tuple_ptr,
                             TAO_RT_Info_Tuple (*rt_info),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
 
 
           // Make sure the new tuple is cleaned up if we exit abruptly.
@@ -1970,15 +1864,13 @@ set_i (TAO_RT_Info_Ex *rt_info,
           result = rse_ptr->insert_tuple (*tuple_ptr);
           if (result < 0)
             {
-              ACE_THROW (RtecScheduler::INTERNAL ());
+              throw RtecScheduler::INTERNAL ();
             }
 
           // Maintain the size of the entry pointer array.
           maintain_scheduling_array (tuple_ptr_array_,
                                      tuple_ptr_array_size_,
-                                     rt_info_tuple_count_
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                     rt_info_tuple_count_);
 
           // Store the new tuple in the tuple pointer array.
           tuple_ptr_array_ [this->rt_info_tuple_count_] = tuple_ptr;
@@ -1999,8 +1891,7 @@ set_i (TAO_RT_Info_Ex *rt_info,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-lookup_i (const char * entry_point
-          ACE_ENV_ARG_DECL)
+lookup_i (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -2027,8 +1918,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 priority_i (RtecScheduler::handle_t handle,
             RtecScheduler::OS_Priority& o_priority,
             RtecScheduler::Preemption_Subpriority_t& subpriority,
-            RtecScheduler::Preemption_Priority_t& p_priority
-            ACE_ENV_ARG_DECL)
+            RtecScheduler::Preemption_Priority_t& p_priority)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
@@ -2037,13 +1927,13 @@ priority_i (RtecScheduler::handle_t handle,
   if ((this->stability_flags_ & SCHED_PRIORITY_NOT_STABLE)
       && this->enforce_schedule_stability_)
     {
-      ACE_THROW (RtecScheduler::NOT_SCHEDULED ());
+      throw RtecScheduler::NOT_SCHEDULED ();
     }
 
   TAO_RT_Info_Ex *rt_info = 0;
   if (rt_info_map_.find (handle, rt_info) != 0)
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 
   o_priority = rt_info->priority;
@@ -2060,8 +1950,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                   RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type,
-                  RtecScheduler::Dependency_Enabled_Type_t enabled
-                  ACE_ENV_ARG_DECL)
+                  RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK))
@@ -2090,9 +1979,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         calling_dependency_set_map_,   // calling map
                         number_of_calls,
                         dependency_type,
-                        enabled
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                        enabled);
 
       // Add the called dependency map entry
       map_dependency_i (dependency,                    // called handle
@@ -2100,9 +1987,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         called_dependency_set_map_,    // called map
                         number_of_calls,
                         dependency_type,
-                        enabled
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                        enabled);
 
       break;
 
@@ -2116,9 +2001,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         calling_dependency_set_map_,   // calling map
                         number_of_calls,
                         dependency_type,
-                        enabled
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                        enabled);
 
       // Add the called dependency map entry
       map_dependency_i (handle,                        // called handle
@@ -2126,15 +2009,13 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         called_dependency_set_map_,    // called map
                         number_of_calls,
                         dependency_type,
-                        enabled
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                        enabled);
       break;
 
     default:
 
       // There should not be any other kinds of dependencies.
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
   }
 
  // Add the criticality dependency map entry.
@@ -2154,9 +2035,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                    crit_dependency_set_map_,// crit dependency map
                    number_of_calls,
                    dependency_type,
-                   enabled
-                   ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+                   enabled);
 
 }
 
@@ -2168,8 +2047,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
                      RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                      CORBA::Long number_of_calls,
-                     RtecScheduler::Dependency_Type_t dependency_type
-                     ACE_ENV_ARG_DECL)
+                     RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -2198,18 +2076,14 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe
                           dependency,                    // called handle
                           calling_dependency_set_map_,   // calling map
                           number_of_calls,
-                          dependency_type
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                          dependency_type);
 
       // Remove the called dependency map entry
       unmap_dependency_i (dependency,                    // called handle
                           handle,                        // calling handle
                           called_dependency_set_map_,    // called map
                           number_of_calls,
-                          dependency_type
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                          dependency_type);
       break;
 
     // In a one-way call, the called operation depends on the
@@ -2221,24 +2095,20 @@ remove_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depe
                           handle,                        // called handle
                           calling_dependency_set_map_,   // calling map
                           number_of_calls,
-                          dependency_type
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                          dependency_type);
 
       // Remove the called dependency map entry
       unmap_dependency_i (handle,                        // called handle
                           dependency,                    // calling handle
                           called_dependency_set_map_,    // called map
                           number_of_calls,
-                          dependency_type
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                          dependency_type);
       break;
 
     default:
 
       // There should not be any other kinds of dependencies.
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
   }
 }
 
@@ -2252,8 +2122,7 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
-                               RtecScheduler::Dependency_Enabled_Type_t enabled
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -2283,9 +2152,7 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                      calling_dependency_set_map_,   // calling map
                                      number_of_calls,
                                      dependency_type,
-                                     enabled
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     enabled);
 
       // Update the called dependency map entry
       map_dependency_enable_state_i (dependency,                    // called handle
@@ -2293,9 +2160,7 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                      called_dependency_set_map_,    // called map
                                      number_of_calls,
                                      dependency_type,
-                                     enabled
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     enabled);
       break;
 
     // In a one-way call, the called operation depends on the
@@ -2308,9 +2173,7 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                      calling_dependency_set_map_,   // calling map
                                      number_of_calls,
                                      dependency_type,
-                                     enabled
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     enabled);
 
       // Update the called dependency map entry
       map_dependency_enable_state_i (handle,                        // called handle
@@ -2318,15 +2181,13 @@ set_dependency_enable_state_i (RtecScheduler::handle_t handle,
                                      called_dependency_set_map_,    // called map
                                      number_of_calls,
                                      dependency_type,
-                                     enabled
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     enabled);
       break;
 
     default:
 
       // There should not be any other kinds of dependencies.
-      ACE_THROW (RtecScheduler::INTERNAL ());
+      throw RtecScheduler::INTERNAL ();
   }
 }
 
@@ -2336,11 +2197,10 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 map_dependency_i (RtecScheduler::handle_t key,
                   RtecScheduler::handle_t handle,
-                  ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
+                  typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type,
-                  RtecScheduler::Dependency_Enabled_Type_t enabled
-                  ACE_ENV_ARG_DECL)
+                  RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK))
@@ -2359,12 +2219,11 @@ map_dependency_i (RtecScheduler::handle_t key,
       ACE_NEW_THROW_EX (dependency_set,
                         RtecScheduler::Dependency_Set,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       if (dependency_map.bind (key, dependency_set) != 0)
         {
           delete dependency_set;
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2386,10 +2245,9 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 unmap_dependency_i (RtecScheduler::handle_t key,
                     RtecScheduler::handle_t handle,
-                    ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
+                    typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                     CORBA::Long number_of_calls,
-                    RtecScheduler::Dependency_Type_t dependency_type
-                    ACE_ENV_ARG_DECL)
+                    RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK))
@@ -2432,17 +2290,17 @@ unmap_dependency_i (RtecScheduler::handle_t key,
 
           if (!found)
             {
-              ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+              throw RtecScheduler::UNKNOWN_TASK ();
             }
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
   else
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 }
 
@@ -2454,12 +2312,11 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 map_dependency_enable_state_i (RtecScheduler::handle_t key,
                                RtecScheduler::handle_t handle,
-                               ACE_TYPENAME
+                               typename
                                  TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
-                               RtecScheduler::Dependency_Enabled_Type_t enabled
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK))
@@ -2494,17 +2351,17 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
 
           if (!found)
             {
-              ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+              throw RtecScheduler::UNKNOWN_TASK ();
             }
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
   else
     {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK ());
+      throw RtecScheduler::UNKNOWN_TASK ();
     }
 }
 
@@ -2515,7 +2372,7 @@ map_dependency_enable_state_i (RtecScheduler::handle_t key,
 // has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
+dfs_traverse_i (void)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
@@ -2532,7 +2389,7 @@ dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (reset_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2544,7 +2401,7 @@ dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (dfs_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 }
@@ -2555,7 +2412,7 @@ dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
 // checks for loops, marks unresolved remote dependencies.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
+detect_cycles_i (void)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::CYCLIC_DEPENDENCIES))
@@ -2585,14 +2442,14 @@ detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
 
       if (scc_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
   // Check whether any cycles were detected.
   if (scc_visitor.number_of_cycles () > 0)
     {
-      ACE_THROW (RtecScheduler::CYCLIC_DEPENDENCIES ());
+      throw RtecScheduler::CYCLIC_DEPENDENCIES ();
     }
 }
 
@@ -2602,7 +2459,7 @@ detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
+perform_admission_i (void)
      ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       CORBA::SystemException,
                       RtecScheduler::INTERNAL))
@@ -2624,7 +2481,7 @@ perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (prop_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2651,7 +2508,7 @@ perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (admit_visitor.visit (* (tuple_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2665,7 +2522,7 @@ perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
+crit_dfs_traverse_i (void)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
@@ -2682,7 +2539,7 @@ crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (reset_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
@@ -2694,14 +2551,14 @@ crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (dfs_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 }
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL)
+propagate_criticalities_i (void)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
@@ -2730,14 +2587,14 @@ propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (crit_prop_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
   for (i = this->rt_info_count_-1; i>=0; --i)
     {
       if (crit_prop_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 }
@@ -2745,7 +2602,7 @@ propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL)
 // Propagates periods, sets total frame size.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL)
+propagate_characteristics_i (void)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
@@ -2766,20 +2623,20 @@ propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (prop_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
   // Check whether any unresolved local dependencies were detected.
   if (prop_visitor.unresolved_locals () > 0)
     {
-      ACE_THROW (RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES ());
+      throw RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES ();
     }
 
   // Check whether any thread specification errors were detected.
   if (prop_visitor.thread_specification_errors () > 0)
     {
-      ACE_THROW (RtecScheduler::THREAD_SPECIFICATION ());
+      throw RtecScheduler::THREAD_SPECIFICATION ();
     }
 }
 
@@ -2788,7 +2645,7 @@ propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL)
 // Sets last scheduled priority.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
+assign_priorities_i (void)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::DUPLICATE_NAME))
@@ -2851,7 +2708,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
         }
       else
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
   this->config_info_count_ = 0;
@@ -2879,7 +2736,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
       if (result < 0)
         {
           // Something bad happened with the internal data structures.
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
       else if (result == 1)
         {
@@ -2887,7 +2744,6 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
           ACE_NEW_THROW_EX (new_config_info,
                             RtecScheduler::Config_Info,
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
 
           // Make sure the new config info is cleaned up if we exit abruptly.
           ACE_AUTO_PTR_RESET (new_config_info_ptr, new_config_info, RtecScheduler::Config_Info);
@@ -2897,7 +2753,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
           if  (RECONFIG_SCHED_STRATEGY::assign_config (*new_config_info,
                                                        *(entry_ptr_array_ [i])) < 0)
             {
-              ACE_THROW (RtecScheduler::INTERNAL ());
+              throw RtecScheduler::INTERNAL ();
             }
 
           if (new_config_info->preemption_priority >
@@ -2913,11 +2769,11 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
             {
               case -1:
                 // Something bad but unknown occurred while trying to bind in map.
-                ACE_THROW (RtecScheduler::INTERNAL ());
+                throw RtecScheduler::INTERNAL ();
 
               case 1:
                 // Tried to bind an operation that was already in the map.
-                ACE_THROW (RtecScheduler::DUPLICATE_NAME ());
+                throw RtecScheduler::DUPLICATE_NAME ();
 
               default:
                 ++this->config_info_count_;
@@ -2936,7 +2792,7 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-refresh_tuple_ptr_array_i (ACE_ENV_SINGLE_ARG_DECL)
+refresh_tuple_ptr_array_i (void)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
@@ -2956,7 +2812,7 @@ refresh_tuple_ptr_array_i (ACE_ENV_SINGLE_ARG_DECL)
       if (entry_ptr_array_ [i]->register_tuples (this->tuple_ptr_array_,
                                                  this->rt_info_tuple_count_) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 }
@@ -2973,7 +2829,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::sched_strategy ()
 // Accesses map for O(1) lookup of Config_Infos by priority level.
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::CONFIG_INFO_MAP &
+typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::CONFIG_INFO_MAP &
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::config_info_map ()
 {
   return this->config_info_map_;
@@ -2993,7 +2849,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::config_info_count ()
 // Accesses map for O(1) lookup of RT_Infos by handle.
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP &
+typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP &
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::rt_info_map ()
 {
   return this->rt_info_map_;
@@ -3020,7 +2876,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::rt_info_tuple_count (
 // Accesses tree for O(log n) lookup of RT_Infos by name.
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_TREE &
+typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_TREE &
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::rt_info_tree ()
 {
   return this->rt_info_tree_;
@@ -3031,7 +2887,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::rt_info_tree ()
 // set by the caller operation's handle.
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &
+typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::calling_dependency_set_map ()
 {
   return this->calling_dependency_set_map_;
@@ -3042,7 +2898,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::calling_dependency_se
 // set by the called operation's handle.
 
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &
+typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::called_dependency_set_map ()
 {
   return this->called_dependency_set_map_;
@@ -3120,8 +2976,7 @@ critical_utilization_threshold (const CORBA::Double &d)
 template <class ARRAY_ELEMENT_TYPE> void
 maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
                            long & current_ptr_array_size,
-                           RtecScheduler::handle_t handle
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (current_ptr_array_size <= handle)
@@ -3168,7 +3023,7 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-compute_utilization_i (ACE_ENV_SINGLE_ARG_DECL)
+compute_utilization_i (void)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
@@ -3177,7 +3032,7 @@ compute_utilization_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       if (util_visitor.visit (* (entry_ptr_array_ [i])) < 0)
         {
-          ACE_THROW (RtecScheduler::INTERNAL ());
+          throw RtecScheduler::INTERNAL ();
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index ec7f53542bb..4c914f8fe37 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -107,8 +107,7 @@ public:
             ACE_Scheduler_Factory::POD_RT_Info rt_info[],
             int dependency_count,
             ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-            u_long stability_flags
-            ACE_ENV_ARG_DECL)
+            u_long stability_flags)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::UNKNOWN_TASK,
@@ -116,15 +115,14 @@ public:
                      RtecScheduler::INTERNAL));
   // Initializes the scheduler with the passed information.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL)
+  void close (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Closes the scheduler, releasing all current resources.
 
-  virtual RtecScheduler::handle_t create (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t create (const char * entry_point)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL,
@@ -134,16 +132,14 @@ public:
   // RT_Info is returned.  If the RT_Info already exists, an exception
   // is thrown.
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point
-                                          ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t lookup (const char * entry_point)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UNKNOWN_TASK,
                     RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Lookup a handle for an RT_Info, and return its handle, or an error
   // value if it's not present.
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
-                                       ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
@@ -158,8 +154,7 @@ public:
                     ::RtecScheduler::Importance_t importance,
                     ::RtecScheduler::Quantum_t quantum,
                     ::RtecScheduler::Threads_t threads,
-                    ::RtecScheduler::Info_Type_t info_type
-                    ACE_ENV_ARG_DECL)
+                    ::RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -175,16 +170,14 @@ public:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       CORBA::Long threads,
-                      RtecScheduler::Info_Type_t info_type
-                      ACE_ENV_ARG_DECL)
+                      RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Reset characteristics of the RT_Info corresponding to the passed handle.
 
-  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos
-                        ACE_ENV_ARG_DECL)
+  virtual void set_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -192,8 +185,7 @@ public:
   // Set characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are added in the case of existing and/or multiple definitions.
 
-  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos
-                          ACE_ENV_ARG_DECL)
+  virtual void reset_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -201,8 +193,7 @@ public:
   // Reset characteristics of the RT_Infos corresponding to the passed handles.
   // Tuples are replaced in the case of existing and/or multiple definitions.
 
-  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos
-                            ACE_ENV_ARG_DECL)
+  virtual void replace_seq (const RtecScheduler::RT_Info_Set& infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -215,8 +206,7 @@ public:
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -227,8 +217,7 @@ public:
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -239,8 +228,7 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type
-                               ACE_ENV_ARG_DECL)
+                               RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -249,8 +237,7 @@ public:
   virtual void remove_dependency (RtecScheduler::handle_t handle,
                                   RtecScheduler::handle_t dependency,
                                   CORBA::Long number_of_calls,
-                                  RtecScheduler::Dependency_Type_t dependency_type
-                                  ACE_ENV_ARG_DECL)
+                                  RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -260,31 +247,27 @@ public:
                                             RtecScheduler::handle_t dependency,
                                             CORBA::Long number_of_calls,
                                             RtecScheduler::Dependency_Type_t dependency_type,
-                                            RtecScheduler::Dependency_Enabled_Type_t enabled
-                                            ACE_ENV_ARG_DECL)
+                                            RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a dependency between two RT_Infos.
 
-  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies
-                                                ACE_ENV_ARG_DECL)
+  virtual void set_dependency_enable_state_seq (const RtecScheduler::Dependency_Set & dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
   // This method sets the enable state of a sequence of dependencies.
 
   virtual void set_rt_info_enable_state (RtecScheduler::handle_t handle,
-                                         RtecScheduler::RT_Info_Enabled_Type_t enabled
-                                         ACE_ENV_ARG_DECL)
+                                         RtecScheduler::RT_Info_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK));
   // This method enables or disables an RT_Info.
 
-  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set
-                                             ACE_ENV_ARG_DECL)
+  virtual void set_rt_info_enable_state_seq (const RtecScheduler::RT_Info_Enable_State_Pair_Set & pair_set)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -296,8 +279,7 @@ public:
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Dependency_Set_out dependencies,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                   ACE_ENV_ARG_DECL)
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -312,8 +294,7 @@ public:
 
   virtual void recompute_scheduling (CORBA::Long minimum_priority,
                                      CORBA::Long maximum_priority,
-                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                     ACE_ENV_ARG_DECL)
+                                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -323,24 +304,21 @@ public:
                      RtecScheduler::DUPLICATE_NAME));
   // Recomputes the scheduling priorities, etc.
 
-  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos
-                                ACE_ENV_ARG_DECL)
+  virtual void get_rt_info_set (RtecScheduler::RT_Info_Set_out infos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies
-                                   ACE_ENV_ARG_DECL)
+  virtual void get_dependency_set (RtecScheduler::Dependency_Set_out dependencies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
   // Returns the set of rt_infos, with their assigned priorities (as
   // of the last schedule re-computation).
 
-  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs
-                                    ACE_ENV_ARG_DECL)
+  virtual void get_config_info_set (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::INTERNAL));
@@ -350,15 +328,14 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type
-                                       ACE_ENV_ARG_DECL)
+                                       RtecScheduler::Dispatching_Type_t & d_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::NOT_SCHEDULED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // Provides the thread priority and queue type for the given priority level.
 
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::NOT_SCHEDULED));
@@ -367,8 +344,7 @@ public:
   // of scheduled priorities.  All scheduled priorities range from 0
   // to the number returned, inclusive.
 
-  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs
-				 ACE_ENV_ARG_DECL)
+  virtual void get_config_infos (RtecScheduler::Config_Info_Set_out configs)
     ACE_THROW_SPEC ((CORBA::SystemException,
 		     RtecScheduler::SYNCHRONIZATION_FAILURE,
 		     RtecScheduler::NOT_SCHEDULED));
@@ -465,8 +441,7 @@ protected:
 
   TAO_RT_Info_Ex * create_i (const char * entry_point,
                              RtecScheduler::handle_t handle,
-                             int ignore_duplicates
-                             ACE_ENV_ARG_DECL)
+                             int ignore_duplicates)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL));
@@ -485,14 +460,12 @@ protected:
                       RtecScheduler::Importance_t importance,
                       RtecScheduler::Quantum_t quantum,
                       CORBA::Long threads,
-              RtecScheduler::Info_Type_t info_type
-              ACE_ENV_ARG_DECL)
+              RtecScheduler::Info_Type_t info_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Internal method to set characteristics of the passed RT_Info.
 
-  virtual RtecScheduler::handle_t lookup_i (const char * entry_point
-                                            ACE_ENV_ARG_DECL)
+  virtual RtecScheduler::handle_t lookup_i (const char * entry_point)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UNKNOWN_TASK));
   // Internal method to look up a handle for an RT_Info, and return
@@ -501,8 +474,7 @@ protected:
   virtual void priority_i (RtecScheduler::handle_t handle,
                            RtecScheduler::OS_Priority& o_priority,
                            RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                           RtecScheduler::Preemption_Priority_t& p_priority
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::Preemption_Priority_t& p_priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -513,8 +485,7 @@ protected:
                                  RtecScheduler::handle_t dependency,
                                  CORBA::Long number_of_calls,
                          RtecScheduler::Dependency_Type_t dependency_type,
-                         RtecScheduler::Dependency_Enabled_Type_t enabled
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK));
@@ -525,8 +496,7 @@ protected:
   virtual void remove_dependency_i (RtecScheduler::handle_t handle,
                                     RtecScheduler::handle_t dependency,
                                     CORBA::Long number_of_calls,
-                                    RtecScheduler::Dependency_Type_t dependency_type
-                                    ACE_ENV_ARG_DECL)
+                                    RtecScheduler::Dependency_Type_t dependency_type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -539,8 +509,7 @@ protected:
                                               RtecScheduler::handle_t dependency,
                                               CORBA::Long number_of_calls,
                                               RtecScheduler::Dependency_Type_t dependency_type,
-                                              RtecScheduler::Dependency_Enabled_Type_t enabled
-                                              ACE_ENV_ARG_DECL)
+                                              RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::INTERNAL,
@@ -553,11 +522,10 @@ protected:
   virtual void map_dependency_i
                  (RtecScheduler::handle_t key,
                   RtecScheduler::handle_t handle,
-                         ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
+                         typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                   CORBA::Long number_of_calls,
                          RtecScheduler::Dependency_Type_t dependency_type,
-                         RtecScheduler::Dependency_Enabled_Type_t enabled
-                         ACE_ENV_ARG_DECL)
+                         RtecScheduler::Dependency_Enabled_Type_t enabled)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK));
@@ -565,10 +533,9 @@ protected:
 
   void unmap_dependency_i (RtecScheduler::handle_t key,
                            RtecScheduler::handle_t handle,
-                           ACE_TYPENAME TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
+                           typename TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                            CORBA::Long number_of_calls,
-                           RtecScheduler::Dependency_Type_t dependency_type
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::Dependency_Type_t dependency_type)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK));
@@ -576,31 +543,30 @@ protected:
 
   void map_dependency_enable_state_i (RtecScheduler::handle_t key,
                                       RtecScheduler::handle_t handle,
-                                      ACE_TYPENAME
+                                      typename
                                         TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP &dependency_map,
                                       CORBA::Long number_of_calls,
                                       RtecScheduler::Dependency_Type_t dependency_type,
-                                      RtecScheduler::Dependency_Enabled_Type_t enabled
-                                      ACE_ENV_ARG_DECL)
+                                      RtecScheduler::Dependency_Enabled_Type_t enabled)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK));
   // This method updates the enable state of a dependency in a dependency set map.
 
-  virtual void dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void dfs_traverse_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Traverses dependency graph, assigning a topological ordering.
   // Resets DFS map entries, do DFS traversal, constructs DFS map.
 
-  virtual void detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void detect_cycles_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::CYCLIC_DEPENDENCIES));
   // Sorts an array of RT_info handles in topological order, then
   // checks for loops, marks unresolved remote dependencies.
 
-  void perform_admission_i (ACE_ENV_SINGLE_ARG_DECL)
+  void perform_admission_i (void)
     ACE_THROW_SPEC ((RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      CORBA::SystemException,
                      RtecScheduler::INTERNAL));
@@ -608,7 +574,7 @@ protected:
   // rate tuples.
 
 
-  void crit_dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
+  void crit_dfs_traverse_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Traverses criticality dependency graph, assigning a topological
@@ -616,20 +582,20 @@ protected:
   // DFS map.
 
 
-  void propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL)
+  void propagate_criticalities_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Propagates criticalities.
 
 
-  void propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL)
+  void propagate_characteristics_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
                       RtecScheduler::THREAD_SPECIFICATION));
   // Propagates effective execution time and period, sets total frame size.
 
-  virtual void assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void assign_priorities_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::DUPLICATE_NAME));
@@ -637,13 +603,13 @@ protected:
   // priorities and subpriorities in one pass.  (Re)computes utilization
   // and sets last scheduled priority and last feasible priority.
 
-  void refresh_tuple_ptr_array_i (ACE_ENV_SINGLE_ARG_DECL)
+  void refresh_tuple_ptr_array_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Refreshes the array of tuple pointers, corrects the count.
 
 /* WSOA merge - commented out
-  virtual void compute_utilization_i (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void compute_utilization_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Compute utilization, set last feasible priority.
@@ -755,8 +721,7 @@ protected:
 template <class ARRAY_ELEMENT_TYPE> void
 maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array,
                            long & current_ptr_array_size,
-                           RtecScheduler::handle_t handle
-                           ACE_ENV_ARG_DECL)
+                           RtecScheduler::handle_t handle)
     ACE_THROW_SPEC ((CORBA::SystemException));
 // Helper function: makes sure there is room in the scheduling pointer
 // arrays.  This function expands the array eagerly, to minimize time
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index f8fd77a1709..90d8a330272 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -160,22 +160,19 @@ static_server (void)
                        ACE_Null_Mutex>::instance ()) == 0)
         return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      server_ = ace_scheduler_factory_data->scheduler_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_ = ace_scheduler_factory_data->scheduler_._this ();
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("ACE_Scheduler_Factory - configured static server\n")));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT("ACE_Scheduler_Factory::config_runtime - ")
-                           ACE_TEXT("cannot allocate server\n"));
+      ex._tao_print_exception (
+        ACE_TEXT("ACE_Scheduler_Factory::config_runtime - ")
+        ACE_TEXT("cannot allocate server\n"));
     }
-  ACE_ENDTRY;
 
   return server_;
 }
@@ -196,30 +193,24 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming,
     // config runs.
     return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup (name);
       CORBA::Object_var objref =
-        naming->resolve (schedule_name
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming->resolve (schedule_name);
 
       server_ =
-        RtecScheduler::Scheduler::_narrow(objref.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecScheduler::Scheduler::_narrow(objref.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       server_ = 0;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT("ACE_Scheduler_Factory::use_config - ")
-                           ACE_TEXT(" exception while resolving server\n"));
+      ex._tao_print_exception (
+        ACE_TEXT("ACE_Scheduler_Factory::use_config - ")
+        ACE_TEXT(" exception while resolving server\n"));
     }
-  ACE_ENDTRY;
 
   status_ = ACE_Scheduler_Factory::CONFIG;
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index 20216f4a905..a943d276918 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -23,15 +23,14 @@ TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy (void)
 }
 
 CORBA::PolicyType
-TAO::Security::EstablishTrustPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::EstablishTrustPolicy::policy_type ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Security::SecEstablishTrustPolicy;
 }
 
 CORBA::Policy_ptr
-TAO::Security::EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::Security::EstablishTrustPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::EstablishTrustPolicy *policy = 0;
@@ -42,19 +41,18 @@ TAO::Security::EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return policy;
 }
 
 void
-TAO::Security::EstablishTrustPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::EstablishTrustPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 ::Security::EstablishTrust
-TAO::Security::EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::EstablishTrustPolicy::trust (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->trust_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index b7910c316d9..fc9fa6fd086 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -64,19 +64,19 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
       /// Return the "establish trust" value associated with this
       /// policy.
-      virtual ::Security::EstablishTrust trust (ACE_ENV_SINGLE_ARG_DECL)
+      virtual ::Security::EstablishTrust trust (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index 9175ac608b0..cf08adc0434 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -22,14 +22,14 @@ TAO::Security::QOPPolicy::~QOPPolicy (void)
 }
 
 CORBA::PolicyType
-TAO::Security::QOPPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::QOPPolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ::Security::SecQOPPolicy;
 }
 
 CORBA::Policy_ptr
-TAO::Security::QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::Security::QOPPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::QOPPolicy * policy = 0;
@@ -40,19 +40,18 @@ TAO::Security::QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return policy;
 }
 
 void
-TAO::Security::QOPPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::QOPPolicy::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::QOP
-TAO::Security::QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::Security::QOPPolicy::qop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->qop_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index ff8b99e2309..2eb71919ffb 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -61,19 +61,19 @@ namespace TAO
        * @name CORBA::Policy Methods
        */
       //@{
-      virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
       /// Return the Quality-of-Protection value associated with this
       /// policy.
-      virtual ::Security::QOP qop (ACE_ENV_SINGLE_ARG_DECL)
+      virtual ::Security::QOP qop (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index 22b8d7ad961..c3322d69bb3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -30,15 +30,14 @@ TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy (void)
 }
 
 SecurityLevel3::CredsDirective
-TAO::SL3::ContextEstablishmentPolicy::creds_directive (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::creds_directive ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->creds_directive_;
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ContextEstablishmentPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ContextEstablishmentPolicy::creds_list (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
@@ -46,53 +45,47 @@ TAO::SL3::ContextEstablishmentPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (creds,
                     SecurityLevel3::OwnCredentialsList (this->creds_list_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (creds);
 
   return creds;
 }
 
 SecurityLevel3::FeatureDirective
-TAO::SL3::ContextEstablishmentPolicy::use_client_auth (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::use_client_auth ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_client_auth_;
 }
 
 SecurityLevel3::FeatureDirective
-TAO::SL3::ContextEstablishmentPolicy::use_target_auth (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::use_target_auth ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_target_auth_;
 }
 
 SecurityLevel3::FeatureDirective
-TAO::SL3::ContextEstablishmentPolicy::use_confidentiality (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::use_confidentiality ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_confidentiality_;
 }
 
 SecurityLevel3::FeatureDirective
-TAO::SL3::ContextEstablishmentPolicy::use_integrity (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::use_integrity ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->use_integrity_;
 }
 
 CORBA::PolicyType
-TAO::SL3::ContextEstablishmentPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::policy_type ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::ContextEstablishmentPolicyType;
 }
 
 CORBA::Policy_ptr
-TAO::SL3::ContextEstablishmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ContextEstablishmentPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Policy_ptr p = CORBA::Policy::_nil ();
@@ -105,14 +98,12 @@ TAO::SL3::ContextEstablishmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                       this->use_confidentiality_,
                       this->use_integrity_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (p);
 
   return p;
 }
 
 void
-TAO::SL3::ContextEstablishmentPolicy::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ContextEstablishmentPolicy::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->creds_directive_     = SecurityLevel3::CD_Default;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index 266c1dd31f6..bd664701111 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -65,37 +65,31 @@ namespace TAO
        * SecurityLevel3::ContextEstablishmentPolicy interface.
        */
       //@{
-      virtual SecurityLevel3::CredsDirective creds_directive (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredsDirective creds_directive ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::OwnCredentialsList * creds_list (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentialsList * creds_list ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::FeatureDirective use_client_auth (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::FeatureDirective use_client_auth ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::FeatureDirective use_target_auth (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::FeatureDirective use_target_auth ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::FeatureDirective use_confidentiality (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::FeatureDirective use_confidentiality ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::FeatureDirective use_integrity (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::FeatureDirective use_integrity ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
index 6320a50b252..1e05626032f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
@@ -52,8 +52,7 @@ namespace TAO
       /// Create a TAO::SL3::CredentialsAcquirerFactory.
       virtual SecurityLevel3::CredentialsAcquirer_ptr make (
         TAO::SL3::CredentialsCurator_ptr curator,
-        const CORBA::Any & acquisition_arguments
-        ACE_ENV_ARG_DECL) = 0;
+        const CORBA::Any & acquisition_arguments) = 0;
 
     };
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 6555f46469c..612b818c930 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -62,8 +62,7 @@ TAO::SL3::CredentialsCurator::_duplicate (TAO::SL3::CredentialsCurator_ptr obj)
 }
 
 TAO::SL3::CredentialsCurator_ptr
-TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj)
 {
   return TAO::SL3::CredentialsCurator::_duplicate (
              dynamic_cast<TAO::SL3::CredentialsCurator *> (obj));
@@ -76,7 +75,7 @@ TAO::SL3::CredentialsCurator::_nil (void)
 }
 
 SecurityLevel3::AcquisitionMethodList *
-TAO::SL3::CredentialsCurator::supported_methods (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::CredentialsCurator::supported_methods (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::AcquisitionMethodList * list;
@@ -108,8 +107,7 @@ TAO::SL3::CredentialsCurator::supported_methods (ACE_ENV_SINGLE_ARG_DECL)
 SecurityLevel3::CredentialsAcquirer_ptr
 TAO::SL3::CredentialsCurator::acquire_credentials (
     const char * acquisition_method,
-    const CORBA::Any & acquisition_arguments
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any & acquisition_arguments)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SL3::CredentialsAcquirerFactory * factory;
@@ -118,8 +116,7 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
                                       factory) == 0)
     {
       return factory->make (this,
-                            acquisition_arguments
-                            ACE_ENV_ARG_PARAMETER);
+                            acquisition_arguments);
     }
 
   ACE_THROW_RETURN (CORBA::BAD_PARAM (),
@@ -128,14 +125,13 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::CredentialsCurator::default_creds_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::CredentialsCurator::default_creds_list (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentialsList * list;
   ACE_NEW_THROW_EX (list,
                     SecurityLevel3::OwnCredentialsList,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   SecurityLevel3::OwnCredentialsList_var creds_list = list;
 
@@ -161,7 +157,7 @@ TAO::SL3::CredentialsCurator::default_creds_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 SecurityLevel3::CredentialsIdList *
-TAO::SL3::CredentialsCurator::default_creds_ids (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::CredentialsCurator::default_creds_ids (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::CredentialsIdList * list;
@@ -192,8 +188,7 @@ TAO::SL3::CredentialsCurator::default_creds_ids (ACE_ENV_SINGLE_ARG_DECL)
 
 SecurityLevel3::OwnCredentials_ptr
 TAO::SL3::CredentialsCurator::get_own_credentials (
-    const char * credentials_id
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const char * credentials_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Credentials_Table::ENTRY * entry;
@@ -214,8 +209,7 @@ TAO::SL3::CredentialsCurator::get_own_credentials (
 
 void
 TAO::SL3::CredentialsCurator::release_own_credentials (
-    const char * credentials_id
-    ACE_ENV_ARG_DECL_NOT_USED)
+    const char * credentials_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Credentials_Table::ENTRY * entry;
@@ -234,11 +228,10 @@ TAO::SL3::CredentialsCurator::release_own_credentials (
 void
 TAO::SL3::CredentialsCurator:: register_acquirer_factory (
   const char * acquisition_method,
-  TAO::SL3::CredentialsAcquirerFactory * factory
-  ACE_ENV_ARG_DECL)
+  TAO::SL3::CredentialsAcquirerFactory * factory)
 {
   if (acquisition_method == 0 || factory == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   CORBA::String_var method = CORBA::string_dup (acquisition_method);
 
@@ -248,9 +241,9 @@ TAO::SL3::CredentialsCurator:: register_acquirer_factory (
     this->acquirer_factories_.bind (method.in (), factory);
 
   if (result == 1)  // Entry already exists in table.
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw CORBA::BAD_INV_ORDER ();
   else if (result == -1)  // Failure.
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
 
   // CredentialsCurator now owns the acquisition method id.
@@ -261,12 +254,10 @@ TAO::SL3::CredentialsCurator:: register_acquirer_factory (
 
 void
 TAO::SL3::CredentialsCurator::_tao_add_own_credentials (
-  SecurityLevel3::OwnCredentials_ptr credentials
-  ACE_ENV_ARG_DECL)
+  SecurityLevel3::OwnCredentials_ptr credentials)
 {
   CORBA::String_var credentials_id =
-    credentials->creds_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    credentials->creds_id ();
 
   SecurityLevel3::OwnCredentials_var creds =
     SecurityLevel3::OwnCredentials::_duplicate (credentials);
@@ -274,7 +265,7 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials (
   if (this->credentials_table_.bind (credentials_id.in (),
                                      creds) != 0)
     {
-      ACE_THROW (CORBA::NO_RESOURCES ());
+      throw CORBA::NO_RESOURCES ();
     }
 
  // CredentialsCurator nows owns the id.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
index 85edccb3963..db6523f2948 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -87,8 +87,7 @@ namespace TAO
 
       static CredentialsCurator_ptr _duplicate (CredentialsCurator_ptr obj);
       static CredentialsCurator_ptr _nil (void);
-      static CredentialsCurator_ptr _narrow (CORBA::Object_ptr obj
-                                             ACE_ENV_ARG_DECL);
+      static CredentialsCurator_ptr _narrow (CORBA::Object_ptr obj);
 
       /**
        * @name SecurityLevel3::CredentialsCurator Methods
@@ -97,31 +96,25 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::AcquisitionMethodList * supported_methods (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::AcquisitionMethodList * supported_methods ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::CredentialsAcquirer_ptr acquire_credentials (
           const char * acquisition_method,
-          const CORBA::Any & acquisition_arguments
-          ACE_ENV_ARG_DECL)
+          const CORBA::Any & acquisition_arguments)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::OwnCredentialsList * default_creds_list (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentialsList * default_creds_list ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual SecurityLevel3::CredentialsIdList * default_creds_ids (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsIdList * default_creds_ids ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::OwnCredentials_ptr get_own_credentials (
-          const char * credentials_id
-          ACE_ENV_ARG_DECL)
+          const char * credentials_id)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void release_own_credentials (const char * credentials_id
-                                            ACE_ENV_ARG_DECL)
+      virtual void release_own_credentials (const char * credentials_id)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
@@ -132,14 +125,12 @@ namespace TAO
        */
       void register_acquirer_factory (
         const char * acquisition_method,
-        TAO::SL3::CredentialsAcquirerFactory * factory
-        ACE_ENV_ARG_DECL);
+        TAO::SL3::CredentialsAcquirerFactory * factory);
 
       /// TAO-specific means of adding credentials to this
       /// CredentialsCurator's "own credentials" list.
       void _tao_add_own_credentials (
-        SecurityLevel3::OwnCredentials_ptr credentials
-        ACE_ENV_ARG_DECL);
+        SecurityLevel3::OwnCredentials_ptr credentials);
 
     protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index 69cac1d1ae1..96f517b894a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -21,7 +21,7 @@ TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy (void)
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ObjectCredentialsPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ObjectCredentialsPolicy::creds_list (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
@@ -29,34 +29,31 @@ TAO::SL3::ObjectCredentialsPolicy::creds_list (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (creds,
                     SecurityLevel3::OwnCredentialsList (this->creds_list_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (creds);
 
   return creds;
 }
 
 CORBA::PolicyType
-TAO::SL3::ObjectCredentialsPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ObjectCredentialsPolicy::policy_type ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::ObjectCredentialsPolicyType;
 }
 
 CORBA::Policy_ptr
-TAO::SL3::ObjectCredentialsPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::ObjectCredentialsPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Policy_ptr p = CORBA::Policy::_nil ();
   ACE_NEW_THROW_EX (p,
                     TAO::SL3::ObjectCredentialsPolicy (this->creds_list_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (p);
 
   return p;
 }
 
 void
-TAO::SL3::ObjectCredentialsPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::ObjectCredentialsPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->creds_list_.length (0);
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index c4479d9aa8e..03741cd8e89 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -65,17 +65,16 @@ namespace TAO
        * SecurityLevel3::ObjectCredentialsPolicy interface.
        */
       //@{
-      virtual SecurityLevel3::OwnCredentialsList * creds_list (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::OwnCredentialsList * creds_list ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index 959a93e4885..ecc4c6b6513 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -14,8 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
 TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
-                                        const CORBA::Any & value
-                                        ACE_ENV_ARG_DECL)
+                                        const CORBA::Any & value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -37,7 +36,6 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
                           arg->use_confidentiality,
                           arg->use_integrity),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (policy);
     }
   else if (type == SecurityLevel3::ObjectCredentialsPolicyType)
     {
@@ -49,7 +47,6 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
       ACE_NEW_THROW_EX (policy,
                         TAO::SL3::ObjectCredentialsPolicy (*creds),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (policy);
     }
   else
     {
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
index 9c3a36b0913..e770e7d697b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
@@ -61,8 +61,7 @@ namespace TAO
 
         /// Construct a Test::Policy object as a test.
         virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                                 const CORBA::Any & value
-                                                 ACE_ENV_ARG_DECL)
+                                                 const CORBA::Any & value)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            CORBA::PolicyError));
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index db6609f803b..04ada737774 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -27,7 +27,7 @@ TAO::SL3::SecurityCurrent::~SecurityCurrent (void)
 }
 
 SecurityLevel3::ClientCredentials_ptr
-TAO::SL3::SecurityCurrent::client_credentials (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::SecurityCurrent::client_credentials (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
@@ -39,11 +39,11 @@ TAO::SL3::SecurityCurrent::client_credentials (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
                       SecurityLevel3::ClientCredentials::_nil ());
 
-  return impl->client_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->client_credentials ();
 }
 
 CORBA::Boolean
-TAO::SL3::SecurityCurrent::request_is_local (ACE_ENV_SINGLE_ARG_DECL)
+TAO::SL3::SecurityCurrent::request_is_local (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
@@ -54,7 +54,7 @@ TAO::SL3::SecurityCurrent::request_is_local (ACE_ENV_SINGLE_ARG_DECL)
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), false);
 
-  return impl->request_is_local (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->request_is_local ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index b592530c19e..ee33fdb8452 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -69,11 +69,10 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual CORBA::Boolean request_is_local (ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean request_is_local (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index 59501c69339..ab07794ba60 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -60,13 +60,11 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
       /// Is the current request local?
-      virtual CORBA::Boolean request_is_local (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Boolean request_is_local ()
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index 1cf548a4f2e..033908152ec 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -23,8 +23,7 @@ TAO::SL3::SecurityManager::~SecurityManager (void)
 }
 
 SecurityLevel3::CredentialsCurator_ptr
-TAO::SL3::SecurityManager::credentials_curator (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SL3::SecurityManager::credentials_curator ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -33,8 +32,7 @@ TAO::SL3::SecurityManager::credentials_curator (
 }
 
 SecurityLevel3::TargetCredentials_ptr
-TAO::SL3::SecurityManager::get_target_credentials (CORBA::Object_ptr /* the_object */
-                                                   ACE_ENV_ARG_DECL)
+TAO::SL3::SecurityManager::get_target_credentials (CORBA::Object_ptr /* the_object */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
@@ -48,8 +46,7 @@ TAO::SL3::SecurityManager::create_context_estab_policy (
     SecurityLevel3::FeatureDirective use_client_auth,
     SecurityLevel3::FeatureDirective use_target_auth,
     SecurityLevel3::FeatureDirective use_confidentiality,
-    SecurityLevel3::FeatureDirective use_integrity
-    ACE_ENV_ARG_DECL)
+    SecurityLevel3::FeatureDirective use_integrity)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::ContextEstablishmentPolicy_ptr policy;
@@ -61,22 +58,19 @@ TAO::SL3::SecurityManager::create_context_estab_policy (
                                                           use_confidentiality,
                                                           use_integrity),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (policy);
 
   return policy;
 }
 
 SecurityLevel3::ObjectCredentialsPolicy_ptr
 TAO::SL3::SecurityManager::create_object_creds_policy (
-    const SecurityLevel3::OwnCredentialsList & creds_list
-    ACE_ENV_ARG_DECL)
+    const SecurityLevel3::OwnCredentialsList & creds_list)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel3::ObjectCredentialsPolicy_ptr policy;
   ACE_NEW_THROW_EX (policy,
                     TAO::SL3::ObjectCredentialsPolicy (creds_list),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (policy);
 
   return policy;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
index 3f1ac2054ae..716345d94ed 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -60,13 +60,11 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::TargetCredentials_ptr get_target_credentials (
-          CORBA::Object_ptr the_object
-          ACE_ENV_ARG_DECL)
+          CORBA::Object_ptr the_object)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::ContextEstablishmentPolicy_ptr
@@ -76,14 +74,12 @@ namespace TAO
           SecurityLevel3::FeatureDirective use_client_auth,
           SecurityLevel3::FeatureDirective use_target_auth,
           SecurityLevel3::FeatureDirective use_confidentiality,
-          SecurityLevel3::FeatureDirective use_integrity
-          ACE_ENV_ARG_DECL)
+          SecurityLevel3::FeatureDirective use_integrity)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual SecurityLevel3::ObjectCredentialsPolicy_ptr
       create_object_creds_policy (
-          const SecurityLevel3::OwnCredentialsList & cred_list
-          ACE_ENV_ARG_DECL)
+          const SecurityLevel3::OwnCredentialsList & cred_list)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 0470c54ab17..657f66b3dec 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -27,8 +27,7 @@ TAO_Security_Current::~TAO_Security_Current (void)
 
 Security::AttributeList *
 TAO_Security_Current::get_attributes (
-    const Security::AttributeTypeList &attributes
-    ACE_ENV_ARG_DECL)
+    const Security::AttributeTypeList &attributes)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::Current_Impl *impl = this->implementation ();
@@ -39,12 +38,11 @@ TAO_Security_Current::get_attributes (
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->get_attributes (attributes ACE_ENV_ARG_PARAMETER);
+  return impl->get_attributes (attributes);
 }
 
 SecurityLevel2::ReceivedCredentials_ptr
-TAO_Security_Current::received_credentials (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_Security_Current::received_credentials ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Security::Current_Impl *impl = this->implementation ();
@@ -55,7 +53,7 @@ TAO_Security_Current::received_credentials (
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->received_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->received_credentials ();
 }
 
 int
@@ -63,16 +61,13 @@ TAO_Security_Current::init (void)
 {
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int argc = 0;
       char **argv = 0;
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            this->orb_id_.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            this->orb_id_.in ());
 
       this->orb_core_ = orb.in ()->orb_core ();
 
@@ -80,16 +75,13 @@ TAO_Security_Current::init (void)
       // occupying.
       (void) this->orb_id_.out ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 1)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "Could not initialize SecurityCurrent:");
+        ex._tao_print_exception ("Could not initialize SecurityCurrent:");
 
       result = -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return result;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index 118689ca9d4..eeed650d20b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -63,8 +63,7 @@ public:
   /// Return the security attributes corresponding to the types in the
   /// given attribute type list associated with the current request.
   virtual Security::AttributeList * get_attributes (
-      const Security::AttributeTypeList & attributes
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      const Security::AttributeTypeList & attributes)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -77,8 +76,7 @@ public:
   //@{
   /// Return the Credentials received from the client associate with
   /// the current request.
-  virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ()
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index f92e121fddf..a0cfbaccbee 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -61,8 +61,7 @@ namespace TAO
       /// the given attribute type list associated with the current
       /// request.
       virtual ::Security::AttributeList * get_attributes (
-          const ::Security::AttributeTypeList & attributes
-          ACE_ENV_ARG_DECL)
+          const ::Security::AttributeTypeList & attributes)
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
       //@}
 
@@ -75,8 +74,7 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-          ACE_ENV_SINGLE_ARG_DECL)
+      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ()
         ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
       //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index 396f2116aa0..e7830c498cc 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -22,16 +22,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::Security::ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // allocate_tss_slot_id() TAO extension.
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_ORBInitInfo::_narrow (info);
 
   if (CORBA::is_nil (tao_info.in ()))
     {
@@ -42,17 +39,15 @@ TAO::Security::ORBInitializer::pre_init (
                     "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
                     "(%P|%t)   \"TAO_ORBInitInfo_ptr.\"\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
 //   // Reserve a TSS slot in the ORB core internal TSS resources for the
 //   // thread-specific portion of Security::Current.
 //   size_t old_tss_slot = tao_info->allocate_tss_slot_id (0
-//                                                         ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK;
+//);
 
-//   CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-//   ACE_CHECK;
+//   CORBA::String_var orb_id = info->orb_id ();
 
 //   // Create the SecurityLevel2::Current object.
 //   SecurityLevel2::Current_ptr current = SecurityLevel2::Current::_nil ();
@@ -63,7 +58,6 @@ TAO::Security::ORBInitializer::pre_init (
 //                         TAO::VMCID,
 //                         ENOMEM),
 //                       CORBA::COMPLETED_NO));
-//   ACE_CHECK;
 
 //   SecurityLevel2::Current_var security_current = current;
 
@@ -71,15 +65,12 @@ TAO::Security::ORBInitializer::pre_init (
 //   // ORB.
 //   info->register_initial_reference ("SecurityCurrent",
 //                                     security_current.in ()
-//                                     ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK;
+//);
 
   // Reserve a TSS slot in the ORB core internal TSS resources for the
   // thread-specific portion of SecurityLevel3::SecurityCurrent
   // object.
-  size_t tss_slot = tao_info->allocate_tss_slot_id (0
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  size_t tss_slot = tao_info->allocate_tss_slot_id (0);
 
 
   // Create the SecurityLevel3::Current object.
@@ -92,16 +83,13 @@ TAO::Security::ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   SecurityLevel3::SecurityCurrent_var security_current3 = current3;
 
   // Register the SecurityLevel2::Current object reference with the
   // ORB.
   info->register_initial_reference ("SecurityLevel3:SecurityCurrent",
-                                    security_current3.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    security_current3.in ());
 
   // Create the SecurityLevel3::CredentialsCurator object.
   SecurityLevel3::CredentialsCurator_ptr curator;
@@ -112,16 +100,13 @@ TAO::Security::ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   SecurityLevel3::CredentialsCurator_var credentials_curator = curator;
 
   // Register the SecurityLevel3::CredentialsCurator object reference
   // with the ORB.
   info->register_initial_reference ("SecurityLevel3:CredentialsCurator",
-                                    credentials_curator.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    credentials_curator.in ());
 
   // Create the SecurityLevel3::SecurityManager object.
   SecurityLevel3::SecurityManager_ptr manager3;
@@ -132,33 +117,26 @@ TAO::Security::ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   SecurityLevel3::SecurityManager_var security_manager3 = manager3;
 
   // Register the SecurityLevel3::SecurityManager object reference
   // with the ORB.
   info->register_initial_reference ("SecurityLevel3:SecurityManager",
-                                    security_manager3.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    security_manager3.in ());
 }
 
 void
 TAO::Security::ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_policy_factories (info);
 }
 
 void
 TAO::Security::ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   // Register the security policy factories.
 
@@ -172,7 +150,6 @@ TAO::Security::ORBInitializer::register_policy_factories (
                               TAO::VMCID,
                               ENOMEM),
                             CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       this->policy_factory_ = policy_factory;
     }
@@ -185,53 +162,37 @@ TAO::Security::ORBInitializer::register_policy_factories (
 
   type = ::Security::SecQOPPolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecMechanismsPolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecInvocationCredentialsPolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecFeaturePolicy;   // Deprecated
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecDelegationDirectivePolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 this->policy_factory_.in ());
 
   type = ::Security::SecEstablishTrustPolicy;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 this->policy_factory_.in ());
 
 
   type = SecurityLevel3::ContextEstablishmentPolicyType;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 this->policy_factory_.in ());
 
 
   type = SecurityLevel3::ObjectCredentialsPolicyType;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 this->policy_factory_.in ());
 
 
   // ----------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
index c6a17685f4d..758b02e6227 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
@@ -69,20 +69,17 @@ namespace TAO
        * interface.
        */
       //@{
-      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
     private:
 
       /// Register Security policy factories.
-      void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                      ACE_ENV_ARG_DECL);
+      void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
     private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 96f0ddbb787..cb91d9c18ec 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -22,8 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO::Security::PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -53,7 +52,6 @@ TAO::Security::PolicyFactory::create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return qop_policy;
     }
@@ -80,7 +78,6 @@ TAO::Security::PolicyFactory::create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return trust_policy;
     }
@@ -113,7 +110,6 @@ TAO::Security::PolicyFactory::create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }
@@ -140,7 +136,6 @@ TAO::Security::PolicyFactory::create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
index 4596caadcb3..9d460b2998b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
@@ -53,8 +53,7 @@ namespace TAO
     public:
 
       virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                               const CORBA::Any & value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                               const CORBA::Any & value)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          CORBA::PolicyError));
     };
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 55708a8dc13..9df87c4087f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -20,7 +20,7 @@ TAO_TIO::~TAO_TIO (void)
 // This is the get method for the attribute time interval.
 
 TimeBase::IntervalT
-TAO_TIO::time_interval (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TIO::time_interval (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_time_interval;
@@ -34,13 +34,12 @@ TAO_TIO::time_interval (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CosTime::OverlapType
 TAO_TIO::spans (CosTime::UTO_ptr uto,
-                CosTime::TIO_out overlap
-                ACE_ENV_ARG_DECL)
+                CosTime::TIO_out overlap)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
-  ACE_TRY
+  try
     {
       TimeBase::TimeT lb1 =
         this->time_interval ().lower_bound;
@@ -48,20 +47,16 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
       TimeBase::TimeT up1 =
         this->time_interval ().upper_bound;
 
-      TimeBase::TimeT tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TimeBase::TimeT tmp1 = uto->time ();
 
-      TimeBase::TimeT tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TimeBase::TimeT tmp2 = uto->inaccuracy ();
 
       TimeBase::TimeT lb2 = tmp1 - tmp2;
 
 
-      tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      tmp1 = uto->time ();
 
-      tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      tmp2 = uto->inaccuracy ();
 
       TimeBase::TimeT up2 = tmp1 + tmp2;
 
@@ -70,8 +65,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
           ACE_NEW_RETURN (tio,
                           TAO_TIO (lb1, up1),
                           CosTime::OTNoOverlap);
-          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio->_this ();
 
           return CosTime::OTOverlap;
         }
@@ -82,7 +76,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           CosTime::OTNoOverlap);
 
           overlap = tio->_this ();
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
           return CosTime::OTContained;
         }
@@ -92,8 +85,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           TAO_TIO (lb2, up2),
                           CosTime::OTNoOverlap);
 
-          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio->_this ();
 
           return CosTime::OTContained;
         }
@@ -105,8 +97,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                               TAO_TIO (0, 0),
                               CosTime::OTNoOverlap);
 
-              overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+              overlap = tio->_this ();
 
               return CosTime::OTNoOverlap;
             }
@@ -115,8 +106,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
               ACE_NEW_RETURN (tio,
                               TAO_TIO (lb2, up1),
                               CosTime::OTNoOverlap);
-              overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+              overlap = tio->_this ();
 
               return CosTime::OTOverlap;
             }
@@ -128,8 +118,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           TAO_TIO (0, 0),
                           CosTime::OTNoOverlap);
 
-          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio->_this ();
 
           return CosTime::OTNoOverlap;
         }
@@ -139,16 +128,13 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           TAO_TIO (lb1, up2),
                           CosTime::OTNoOverlap);
 
-          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio->_this ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      ex._tao_print_exception ("Exception:");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
   return CosTime::OTNoOverlap;
 }
@@ -161,8 +147,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
 
 CosTime::OverlapType
 TAO_TIO::overlaps (CosTime::TIO_ptr tio,
-                   CosTime::TIO_out overlap
-                   ACE_ENV_ARG_DECL)
+                   CosTime::TIO_out overlap)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio_i = 0;
@@ -185,10 +170,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                         TAO_TIO (lb1, up1),
                         CORBA::NO_MEMORY ());
 
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+      overlap = tio_i->_this ();
 
       return CosTime::OTOverlap;
     }
@@ -197,10 +180,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
       ACE_NEW_THROW_EX (tio_i,
                         TAO_TIO (lb1, up1),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+      overlap = tio_i->_this ();
 
       return CosTime::OTContained;
     }
@@ -209,10 +190,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
       ACE_NEW_THROW_EX (tio_i,
                         TAO_TIO (lb2, up2),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+      overlap = tio_i->_this ();
 
       return CosTime::OTContained;
     }
@@ -223,9 +202,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
           ACE_NEW_THROW_EX (tio_i,
                             TAO_TIO (0, 0),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
-          overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio_i->_this ();
 
           return CosTime::OTNoOverlap;
         }
@@ -234,10 +211,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
           ACE_NEW_THROW_EX (tio_i,
                             TAO_TIO (lb2, up1),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-          overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio_i->_this ();
 
           return CosTime::OTOverlap;
         }
@@ -247,10 +222,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
       ACE_NEW_THROW_EX (tio_i,
                         TAO_TIO (0, 0),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+      overlap = tio_i->_this ();
 
       return CosTime::OTNoOverlap;
     }
@@ -259,7 +232,6 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
       ACE_NEW_THROW_EX (tio_i,
                         TAO_TIO (lb1, up2),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
       overlap = tio_i->_this ();
     }
 
@@ -267,7 +239,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 }
 
 CosTime::UTO_ptr
-TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_TIO::time (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -280,9 +252,8 @@ TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL)
                              0),
                     CORBA::NO_MEMORY ());
 
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
-  return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return uto->_this ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index ff4f0e8ab36..fb67c5abc65 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -46,8 +46,7 @@ public:
   ~TAO_TIO (void);
 
   /// This is the get method for the attribute time interval.
-  virtual TimeBase::IntervalT  time_interval (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual TimeBase::IntervalT  time_interval ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -59,8 +58,7 @@ public:
    * intervals.
    */
   virtual CosTime::OverlapType spans (CosTime::UTO_ptr time,
-                                      CosTime::TIO_out overlap
-                                      ACE_ENV_ARG_DECL)
+                                      CosTime::TIO_out overlap)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -71,8 +69,7 @@ public:
    * out parameter contains the gap between the two intervals.
    */
   virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval,
-                                         CosTime::TIO_out overlap
-                                         ACE_ENV_ARG_DECL)
+                                         CosTime::TIO_out overlap)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -80,7 +77,7 @@ public:
    * time interval in the TIO and time value is the midpoint of the
    * interval.
    */
-  virtual CosTime::UTO_ptr time (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr time (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 710c8fad7ee..d4db0eb7c17 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -40,7 +40,7 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void)
 // in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::universal_time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Clerk::universal_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -51,10 +51,9 @@ TAO_Time_Service_Clerk::universal_time (ACE_ENV_SINGLE_ARG_DECL)
                              this->inaccuracy (),
                              this->time_displacement_factor ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
   // Return the global time as a UTO.
 
-  return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return uto->_this ();
 }
 
 // This method returns the global time in a UTO only if the time can
@@ -62,7 +61,7 @@ TAO_Time_Service_Clerk::universal_time (ACE_ENV_SINGLE_ARG_DECL)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Clerk::secure_universal_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -75,8 +74,7 @@ TAO_Time_Service_Clerk::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
                                             TimeBase::InaccuracyT inaccuracy,
-                                            TimeBase::TdfT tdf
-                                            ACE_ENV_ARG_DECL)
+                                            TimeBase::TdfT tdf)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -86,16 +84,14 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
                              inaccuracy,
                              tdf),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
-  return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return uto->_this ();
 }
 
 // This creates a new UTO given a time in the UtcT form.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc
-                                      ACE_ENV_ARG_DECL)
+TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -112,16 +108,14 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc
                              inaccuracy,
                              utc.tdf),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
-  return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return uto->_this ();
 }
 
 // This creates a new TIO with the given parameters.
 
 CosTime::TIO_ptr
 TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
-                                      TimeBase::TimeT upper
-                                      ACE_ENV_ARG_DECL)
+                                      TimeBase::TimeT upper)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
@@ -130,8 +124,7 @@ TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
                     TAO_TIO (lower,
                              upper),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::TIO::_nil ());
-  return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return tio->_this ();
 }
 
 CORBA::ULongLong
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index ef8d5a9a3dd..b9938706055 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -60,7 +60,7 @@ public:
 
   /// This operation returns the global time and an estimate of
   /// inaccuracy in a UTO.
-  virtual CosTime::UTO_ptr universal_time (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr universal_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
 
@@ -70,26 +70,23 @@ public:
    * operation is not implemented and throws a CORBA::NO_IMPLEMENT
    * exception, if called.
    */
-  virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr secure_universal_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
 
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf
-                                               ACE_ENV_ARG_DECL)
+                                               TimeBase::TdfT tdf)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This creates a new UTO given a time in the UtcT form.
-  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc
-                                         ACE_ENV_ARG_DECL)
+  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This creates a new TIO with the given parameters.
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper
-                                         ACE_ENV_ARG_DECL)
+                                         TimeBase::TimeT upper)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the globally synchronized time.
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 6fc4cf2b98e..78b5861e658 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -27,7 +27,7 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void)
 // inaccuracy in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Server::universal_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -43,13 +43,12 @@ TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL)
                              0),
                     CORBA::NO_MEMORY ());
 
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "Returning a UTO\n"));
 
-  return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return uto->_this ();
 }
 
 // This method returns the current time in a UTO only if the time can
@@ -57,7 +56,7 @@ TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Server::secure_universal_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -70,8 +69,7 @@ TAO_Time_Service_Server::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
 CosTime::UTO_ptr
 TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
                                              TimeBase::InaccuracyT inaccuracy,
-                                             TimeBase::TdfT tdf
-                                             ACE_ENV_ARG_DECL)
+                                             TimeBase::TdfT tdf)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -81,16 +79,14 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
                              inaccuracy,
                              tdf),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
-  return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return uto->_this ();
 }
 
 // This creates a new UTO given a time in the UtcT form.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc
-                                       ACE_ENV_ARG_DECL)
+TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -100,17 +96,15 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc
                              utc.inacclo + utc.inacchi,
                              utc.tdf),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
-  return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return uto->_this ();
 }
 
 // This creates a new TIO with the given parameters.
 
 CosTime::TIO_ptr
 TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
-                                       TimeBase::TimeT upper
-                                       ACE_ENV_ARG_DECL)
+                                       TimeBase::TimeT upper)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
@@ -119,9 +113,8 @@ TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
                     TAO_TIO (lower,
                              upper),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::TIO::_nil ());
 
-  return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return tio->_this ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index c87d563935a..1bc33a07e4f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -48,7 +48,7 @@ public:
 
   /// This operation returns the current system time and an estimate of
   /// inaccuracy in a UTO.
-  virtual CosTime::UTO_ptr universal_time (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr universal_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
 
@@ -57,26 +57,23 @@ public:
    * can be guaranteed to have been obtained securely. Currently this operation
    * is not implemented and throws a CORBA::NO_IMPLEMENT exception, if called.
    */
-  virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr secure_universal_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
 
   /// This creates a new UTO based on the given parameters.
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf
-                                               ACE_ENV_ARG_DECL)
+                                               TimeBase::TdfT tdf)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This creates a new UTO given a time in the UtcT form.
-  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc
-                                         ACE_ENV_ARG_DECL)
+  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This creates a new TIO with the given parameters.
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper
-                                         ACE_ENV_ARG_DECL)
+                                         TimeBase::TimeT upper)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index c9ea818a549..0d4f0eaefe0 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -47,7 +47,7 @@ TAO_UTO::~TAO_UTO (void)
 // Get Method for the readonly attribute time.
 
 TimeBase::TimeT
-TAO_UTO::time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::time (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.time;
@@ -56,7 +56,7 @@ TAO_UTO::time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Get method for the readonly attribute inaccuracy.
 
 TimeBase::InaccuracyT
-TAO_UTO::inaccuracy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::inaccuracy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Construct the Inaccuracy from the
@@ -71,7 +71,7 @@ TAO_UTO::inaccuracy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Get method for the readonly attribute tdf.
 
 TimeBase::TdfT
-TAO_UTO::tdf (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::tdf (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.tdf;
@@ -80,7 +80,7 @@ TAO_UTO::tdf (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Get method for the readonly attribute utc_time.
 
 TimeBase::UtcT
-TAO_UTO::utc_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::utc_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_;
@@ -90,7 +90,7 @@ TAO_UTO::utc_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // the Base Time, UTC and Distributed Time Sync. Algos. [3].
 
 CosTime::UTO_ptr
-TAO_UTO::absolute_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::absolute_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTime::UTO::_nil ();
@@ -101,20 +101,16 @@ TAO_UTO::absolute_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CosTime::TimeComparison
 TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
-                       CosTime::UTO_ptr uto
-                       ACE_ENV_ARG_DECL)
+                       CosTime::UTO_ptr uto)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TimeBase::TimeT uto_time = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosTime::TCIndeterminate);
+  TimeBase::TimeT uto_time = uto->time ();
 
   TimeBase::InaccuracyT this_inaccuracy =
-    this->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosTime::TCIndeterminate);
+    this->inaccuracy ();
 
   TimeBase::InaccuracyT uto_inaccuracy =
-    uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosTime::TCIndeterminate);
+    uto->inaccuracy ();
 
   if (comparison_type == CosTime::MidC)
     {
@@ -164,16 +160,14 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
 // is meaningless if the base times of UTOs are different.
 
 CosTime::TIO_ptr
-TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
-                           ACE_ENV_ARG_DECL)
+TAO_UTO::time_to_interval (CosTime::UTO_ptr uto)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
-  ACE_TRY
+  try
     {
-      TimeBase::TimeT uto_time = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TimeBase::TimeT uto_time = uto->time ();
 
       if (this->time () > uto_time)
         {
@@ -182,7 +176,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
                                      this->time ()),
                             CORBA::NO_MEMORY ());
 
-          ACE_TRY_CHECK;
         }
       else
         {
@@ -191,34 +184,30 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
                                      uto_time),
                             CORBA::NO_MEMORY ());
 
-          ACE_TRY_CHECK;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      ex._tao_print_exception ("Exception:");
       return CosTime::TIO::_nil ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTime::TIO::_nil ());
 
-  return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return tio->_this ();
 }
 
 // Returns a TIO object representing the error interval around the
 // time value in the UTO.
 
 CosTime::TIO_ptr
-TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UTO::interval (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
-  ACE_TRY
+  try
     {
       TimeBase::TimeT this_inaccuracy =
-          this->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          this->inaccuracy ();
 
       TimeBase::TimeT lower =
         this->time () - this_inaccuracy;
@@ -230,17 +219,14 @@ TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL)
                         TAO_TIO (lower,
                                  upper),
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      ex._tao_print_exception ("Exception:");
       return CosTime::TIO::_nil ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTime::TIO::_nil ());
 
-  return tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return tio->_this ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index b4e72e090da..daa20dfffb2 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -54,21 +54,20 @@ public:
   ~TAO_UTO (void);
 
   /// For the readonly attribute <time>.
-  virtual TimeBase::TimeT time (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual TimeBase::TimeT time ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// For the readonly attribute <inaccuracy>.
-  virtual TimeBase::InaccuracyT  inaccuracy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::InaccuracyT  inaccuracy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// For the readonly attribute <tdf>, which is the "time displacement
   /// factor".
-  virtual TimeBase::TdfT tdf (ACE_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::TdfT tdf (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// For the readonly attribute <utc_time>.
-  virtual TimeBase::UtcT utc_time (ACE_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::UtcT utc_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -76,14 +75,13 @@ public:
    * ?? Find out more about the Base Time, UTC and
    *    Distributed Time Sync. Algos. [3
    */
-  CosTime::UTO_ptr absolute_time (ACE_ENV_SINGLE_ARG_DECL)
+  CosTime::UTO_ptr absolute_time (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Compares the time contained in the object with the time in the
   /// supplied uto according to the supplied comparison type.
   CosTime::TimeComparison compare_time (CosTime::ComparisonType comparison_type,
-                                        CosTime::UTO_ptr uto
-                                        ACE_ENV_ARG_DECL)
+                                        CosTime::UTO_ptr uto)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -93,13 +91,12 @@ public:
    * two UTOs. Inaccuracies are ignored.  Note the result of this
    * operation is meaningless if the base times of UTOs are different.
    */
-  CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr
-                                     ACE_ENV_ARG_DECL)
+  CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns a TIO object representing the error interval around the
   /// time value in the UTO.
-  CosTime::TIO_ptr interval (ACE_ENV_SINGLE_ARG_DECL)
+  CosTime::TIO_ptr interval (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 47923f8dba3..af7d98e3e3f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -46,8 +46,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 
   CORBA::ULongLong highest_time  = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       IORS::TYPE* value;
       for (IORS::ITERATOR server_iterator (this->clerk_->server_);
@@ -56,8 +55,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
         {
           // This is a remote call.
           CosTime::UTO_var UTO_server =
-            (*value)->universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            (*value)->universal_time ();
 
 #if defined (ACE_LACKS_LONGLONG_T)
 
@@ -89,8 +87,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 #endif
 
           CORBA::ULongLong curr_server_time =
-            UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            UTO_server->time ();
 
           sum += curr_server_time;
 
@@ -139,16 +136,13 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
         static_cast<ACE_UINT32> (10000000) +
         static_cast<CORBA::ULongLong> (timeofday.usec () * 10);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "Exception in handle_timeout()\n");
+        ex._tao_print_exception ("Exception in handle_timeout()\n");
 
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 90b01c53853..b3bf71083c7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -14,7 +14,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
     const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
     const char* constraints
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                    CORBA::NO_MEMORY))
@@ -30,22 +29,20 @@ TAO_Constraint_Interpreter::TAO_Constraint_Interpreter (
       ACE_NEW_THROW_EX (this->root_,
                         TAO_Literal_Constraint ((CORBA::Boolean) 1),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
     {
       if (this->build_tree (constraints) != 0)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        throw CosTrading::IllegalConstraint (constraints);
 
       if (type_checker.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        throw CosTrading::IllegalConstraint (constraints);
     }
 }
 
 TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
-                           const char* constraints
-                           ACE_ENV_ARG_DECL)
+                           const char* constraints)
   ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                    CORBA::NO_MEMORY))
 {
@@ -54,15 +51,14 @@ TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
       ACE_NEW_THROW_EX (this->root_,
                         TAO_Literal_Constraint ((CORBA::Boolean) 1),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
     {
       if (this->build_tree (constraints) != 0)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        throw CosTrading::IllegalConstraint (constraints);
 
       if (validator.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::IllegalConstraint (constraints));
+        throw CosTrading::IllegalConstraint (constraints);
     }
 }
 
@@ -86,7 +82,6 @@ TAO_Constraint_Interpreter::evaluate (TAO_Constraint_Evaluator& evaluator)
 TAO_Preference_Interpreter::TAO_Preference_Interpreter (
     const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
     const char* preference
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                    CORBA::NO_MEMORY))
@@ -99,22 +94,20 @@ TAO_Preference_Interpreter::TAO_Preference_Interpreter (
       ACE_NEW_THROW_EX (this->root_,
                         TAO_Noop_Constraint (TAO_FIRST),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
     {
       if (this->build_tree (preference) != 0)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        throw CosTrading::Lookup::IllegalPreference (preference);
 
       if (type_checker.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        throw CosTrading::Lookup::IllegalPreference (preference);
     }
 }
 
 TAO_Preference_Interpreter::
 TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
-                           const char* preference
-                           ACE_ENV_ARG_DECL)
+                           const char* preference)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                    CORBA::NO_MEMORY))
     : TAO_Interpreter ()
@@ -124,15 +117,14 @@ TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
       ACE_NEW_THROW_EX (this->root_,
                         TAO_Noop_Constraint (TAO_FIRST),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
     {
       if (this->build_tree (preference) != 0)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        throw CosTrading::Lookup::IllegalPreference (preference);
 
       if (validator.validate (this->root_) == -1)
-        ACE_THROW (CosTrading::Lookup::IllegalPreference (preference));
+        throw CosTrading::Lookup::IllegalPreference (preference);
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 586f82080e4..32e46a62abf 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -48,8 +48,7 @@ class TAO_Trading_Serv_Export TAO_Constraint_Interpreter : public TAO_Interprete
 public:
   // = Initialization and termination methods.
   TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                              const char* constraints
-                              ACE_ENV_ARG_DECL)
+                              const char* constraints)
     ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                      CORBA::NO_MEMORY));
 
@@ -60,8 +59,7 @@ public:
    * semantic errors, such as mismatched types.
    */
   TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
-                              const char* constraints
-                              ACE_ENV_ARG_DECL)
+                              const char* constraints)
     ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                      CORBA::NO_MEMORY));
 
@@ -95,8 +93,7 @@ class TAO_Trading_Serv_Export TAO_Preference_Interpreter : public TAO_Interprete
 public:
   // = Initialization and termination methods.
   TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                              const char* preference
-                              ACE_ENV_ARG_DECL)
+                              const char* preference)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                      CORBA::NO_MEMORY));
 
@@ -106,8 +103,7 @@ public:
 	* doesn't conform to the BNF grammar for preferences.
 	*/
   TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
-                              const char* preference
-                              ACE_ENV_ARG_DECL)
+                              const char* preference)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                      CORBA::NO_MEMORY));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 5507d9ed689..5fadff5549f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -306,23 +306,20 @@ TAO_Literal_Constraint (const TAO_Literal_Constraint& lit)
 TAO_Literal_Constraint::
 TAO_Literal_Constraint (CORBA::Any* any)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   CORBA::Any& any_ref = *any;
   CORBA::TypeCode_var type = any_ref.type ();
   // @@ No where to throw exception back.
   CORBA::TCKind corba_type = CORBA::tk_null;
-  ACE_TRY
+  try
     {
-      corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      corba_type = type->kind ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // @@ Seth: Don't know what else to do.  Make sure we can tell
       // when this constructor fails.
       return;
     }
-  ACE_ENDTRY;
 
   this->type_ = TAO_Literal_Constraint::comparable_type (type.in ());
   switch (this->type_)
@@ -501,19 +498,16 @@ TAO_Expression_Type
 TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
 {
   // Convert a CORBA::TCKind into a TAO_Literal_Type
-  ACE_DECLARE_NEW_CORBA_ENV;
   TAO_Expression_Type return_value = TAO_UNKNOWN;
   CORBA::TCKind kind = CORBA::tk_null;
-  ACE_TRY
+  try
     {
-      kind = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      kind = type->kind ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return return_value;
     }
-  ACE_ENDTRY;
   // Since this is a "top level try block, no need to check again.
 
   switch (kind)
@@ -544,18 +538,16 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
     case CORBA::tk_alias:
       {
         CORBA::TCKind kind = CORBA::tk_void;
-        ACE_TRY_EX (label2)
+        try
           {
-            CORBA::TypeCode_var typecode = type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX (label2);
-            kind = typecode->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX (label2);;
+            CORBA::TypeCode_var typecode = type->content_type ();
+            kind = typecode->kind ();
+            ;
           }
-        ACE_CATCHANY
+        catch (const CORBA::Exception&)
           {
             return return_value;
           }
-        ACE_ENDTRY;
         // Since this is a "top level try block, no need to check again.
 
         if (kind == CORBA::tk_sequence)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 621aef465e1..f2f8eab4d95 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -517,22 +517,18 @@ sequence_does_contain (CORBA::Any* sequence,
   // wrapper uses the [] operator to locate the target element in the
   // sequence.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   CORBA::Boolean return_value = 0;
   CORBA::TypeCode_var type = sequence->type ();
   CORBA::TCKind sequence_type = CORBA::tk_void;
-  ACE_TRY
+  try
     {
       sequence_type =
-        TAO_Sequence_Extracter_Base::sequence_type (type.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO_Sequence_Extracter_Base::sequence_type (type.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return return_value;
     }
-  ACE_ENDTRY;
-  //  ACE_CHECK_RETURN (return_value);
 
   if (sequence_type == CORBA::tk_void)
     return return_value;
@@ -614,16 +610,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Short element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::Short value = dyn_any.get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Short value = dyn_any.get_short ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -633,16 +627,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::UShort element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::UShort value = dyn_any.get_ushort (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::UShort value = dyn_any.get_ushort ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -652,16 +644,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Long element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::Long value = dyn_any.get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Long value = dyn_any.get_long ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -671,16 +661,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::ULong element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ULong value = dyn_any.get_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong value = dyn_any.get_ulong ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -690,16 +678,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::LongLong element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::LongLong value = dyn_any.get_longlong (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::LongLong value = dyn_any.get_longlong ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -709,16 +695,14 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::ULongLong element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ULongLong value = dyn_any.get_ulonglong (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULongLong value = dyn_any.get_ulonglong ();
       return_value = (value == element);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return return_value;
 }
 
@@ -728,13 +712,12 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Float element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::Float value = dyn_any.get_float (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Float value = dyn_any.get_float ();
       return_value = (value == element);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
   return return_value;
 }
 
@@ -744,13 +727,12 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Double element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::Double value = dyn_any.get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Double value = dyn_any.get_short ();
       return_value = (value == element);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
   return return_value;
 }
 
@@ -760,13 +742,12 @@ operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Boolean element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-    CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short ();
       return_value = (value == element);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
   return return_value;
 }
 
@@ -776,13 +757,12 @@ operator () (TAO_DynSequence_i& dyn_any,
              const char* element) const
 {
   int return_value = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
-      const char* value = dyn_any.get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      const char* value = dyn_any.get_string ();
       return_value = (ACE_OS::strcmp (value, element) == 0);
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
   return return_value;
 }
 
@@ -1062,20 +1042,17 @@ visit_in (TAO_Binary_Constraint* binary_in)
 
   if (right_type == TAO_SEQUENCE)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
       CORBA::Boolean types_match = 0;
       CORBA::TCKind seq_type = CORBA::tk_void;
-      ACE_TRY
+      try
         {
           seq_type =
-            TAO_Sequence_Extracter_Base::sequence_type (prop_type ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_Sequence_Extracter_Base::sequence_type (prop_type);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           return return_value;
         }
-      ACE_ENDTRY;
 
       if (seq_type != CORBA::tk_void)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 993d47ad0e0..7f3b9c5190d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -8,14 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::TCKind
 TAO_Sequence_Extracter_Base::
-sequence_type (CORBA::TypeCode* type_code
-               ACE_ENV_ARG_DECL)
+sequence_type (CORBA::TypeCode* type_code)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Seth, why do you use a comma to separate the two statements?
   CORBA::TCKind return_value = CORBA::tk_void,
-  type_kind = type_code->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (return_value);
+  type_kind = type_code->kind ();
 
   if (type_kind == CORBA::tk_alias
       || type_kind == CORBA::tk_sequence)
@@ -24,28 +22,23 @@ sequence_type (CORBA::TypeCode* type_code
 
       for (;;)
         {
-          CORBA::TCKind base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (return_value);
+          CORBA::TCKind base_kind = base->kind ();
 
           if (base_kind == CORBA::tk_alias)
             {
-              base = base->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK_RETURN (return_value);
+              base = base->content_type ();
             }
           else
             break;
         }
 
-      CORBA::TCKind base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (return_value);
+      CORBA::TCKind base_kind = base->kind ();
 
       if (base_kind == CORBA::tk_sequence)
         {
-          base = base->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (return_value);
+          base = base->content_type ();
 
-          base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (return_value);
+          base_kind = base->kind ();
           return_value = base_kind;
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index b258b921ef1..fe86953e15f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -86,8 +86,7 @@ class TAO_Sequence_Extracter_Base
 {
 public:
 
-  static CORBA::TCKind sequence_type (CORBA::TypeCode* code
-                                      ACE_ENV_ARG_DECL)
+  static CORBA::TCKind sequence_type (CORBA::TypeCode* code)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the sequence element type for the sequence whose typecode
   // is <code>.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
index 5474d4fb694..6e7c39acff6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -16,33 +16,27 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
   TAO_Element_Equal<OPERAND_TYPE> functor;
   TAO_DynSequence_i dyn_seq;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      dyn_seq.init (sequence ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      dyn_seq.init (sequence);
 
       CORBA::ULong length =
-        dyn_seq.get_length ( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
-	  
-      dyn_seq.rewind( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+        dyn_seq.get_length ( );
+
+      dyn_seq.rewind( );
 
       for (CORBA::ULong i = 0 ; i < length && ! return_value; i++)
         {
           if (functor (dyn_seq, element))
             return_value = 1;
-		
-          dyn_seq.next( ACE_ENV_SINGLE_ARG_PARAMETER );
-          ACE_TRY_CHECK;
+
+          dyn_seq.next( );
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
 
   return return_value;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index 9401c5366c0..54e0f361dea 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -19,7 +19,7 @@ TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database (void)
 {
   ACE_WRITE_GUARD (LOCK_TYPE, ace_mon, this->db_lock_);
 
-  for (ACE_TYPENAME Offer_Database::iterator type_iter (this->offer_db_);
+  for (typename Offer_Database::iterator type_iter (this->offer_db_);
        ! type_iter.done ();
        type_iter++)
     {
@@ -51,7 +51,7 @@ TAO_Offer_Database<LOCK_TYPE>::
 insert_offer (const char* type, CosTrading::Offer* offer)
 {
   CosTrading::OfferId return_value = 0;
-  ACE_TYPENAME Offer_Database::ENTRY* database_entry = 0;
+  typename Offer_Database::ENTRY* database_entry = 0;
   CORBA::String_var service_type (type);
 
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
@@ -101,7 +101,7 @@ remove_offer (const char* type, CORBA::ULong id)
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, -1);
 
   int return_value = -1;
-  ACE_TYPENAME Offer_Database::ENTRY* db_entry = 0;
+  typename Offer_Database::ENTRY* db_entry = 0;
   CORBA::String_var service_type (type);
 
   if (this->offer_db_.find (service_type, db_entry) == 0)
@@ -150,8 +150,7 @@ remove_offer (const char* type, CORBA::ULong id)
 
 template <class LOCK_TYPE> int
 TAO_Offer_Database<LOCK_TYPE>::
-remove_offer (const CosTrading::OfferId offer_id
-              ACE_ENV_ARG_DECL)
+remove_offer (const CosTrading::OfferId offer_id)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
@@ -160,9 +159,7 @@ remove_offer (const CosTrading::OfferId offer_id
 
   this->parse_offer_id (offer_id,
                         stype,
-                        index
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        index);
 
   if (this->remove_offer (stype,
                           index) == -1)
@@ -175,15 +172,13 @@ remove_offer (const CosTrading::OfferId offer_id
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
-              char*& type_name
-              ACE_ENV_ARG_DECL)
+              char*& type_name)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
-  this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (offer);
+  this->parse_offer_id (offer_id, type_name, index);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
     ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
@@ -194,8 +189,7 @@ lookup_offer (const CosTrading::OfferId offer_id,
 
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
-lookup_offer (const CosTrading::OfferId offer_id
-              ACE_ENV_ARG_DECL)
+lookup_offer (const CosTrading::OfferId offer_id)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
@@ -203,8 +197,7 @@ lookup_offer (const CosTrading::OfferId offer_id
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
 
-  this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (offer);
+  this->parse_offer_id (offer_id, type_name, index);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
     ACE_THROW_RETURN (CosTrading::UnknownOfferId (offer_id), offer);
@@ -219,7 +212,7 @@ lookup_offer (const char* type, CORBA::ULong id)
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
 
   CosTrading::Offer* return_value = 0;
-  ACE_TYPENAME Offer_Database::ENTRY* db_entry = 0;
+  typename Offer_Database::ENTRY* db_entry = 0;
   CORBA::String_var service_type (type);
 
   if (this->offer_db_.find (service_type, db_entry) == 0)
@@ -248,7 +241,7 @@ TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids (void)
                   0);
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
 
-  for (ACE_TYPENAME Offer_Database::iterator type_iter (this->offer_db_);
+  for (typename Offer_Database::iterator type_iter (this->offer_db_);
        ! type_iter.done ();
        type_iter++)
     {
@@ -276,8 +269,7 @@ template <class LOCK_TYPE> void
 TAO_Offer_Database<LOCK_TYPE>::
 parse_offer_id (const CosTrading::OfferId offer_id,
                 char*&service_type,
-                CORBA::ULong& id
-                ACE_ENV_ARG_DECL)
+                CORBA::ULong& id)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId))
 {
   // Get service type: it is everything from 17th character to the end.
@@ -293,7 +285,7 @@ parse_offer_id (const CosTrading::OfferId offer_id,
   *start_of_type = temp;
 
   if (! TAO_Trader_Base::is_valid_identifier_name (service_type))
-    ACE_THROW (CosTrading::IllegalOfferId (offer_id));
+    throw CosTrading::IllegalOfferId (offer_id);
 }
 
 template <class LOCK_TYPE> CosTrading::OfferId
@@ -330,7 +322,7 @@ TAO_Service_Offer_Iterator (const char* type,
   if (this->stm_.db_lock_.acquire_read () == -1)
     return;
 
-  ACE_TYPENAME TAO_Offer_Database<LOCK_TYPE>::Offer_Map_Entry* entry = 0;
+  typename TAO_Offer_Database<LOCK_TYPE>::Offer_Map_Entry* entry = 0;
   if (this->stm_.offer_db_.find (service_type, entry) == -1)
     return;
   else
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 3087ea49d94..5a8f5d56395 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -66,15 +66,13 @@ public:
   CosTrading::OfferId insert_offer (const char* type,
                                     CosTrading::Offer* offer);
 
-  int remove_offer (const CosTrading::OfferId offer_id
-                    ACE_ENV_ARG_DECL)
+  int remove_offer (const CosTrading::OfferId offer_id)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
   /// Lookup an offer whose offer_id is <offer_id>, and return
   /// it. Otherwise, throw the appropriate exception.
-  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id
-                                   ACE_ENV_ARG_DECL)
+  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
@@ -84,8 +82,7 @@ public:
    * pointer to a location in offer_id, so DON'T DELETE IT.
    */
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-                                   char*& type_name
-                                   ACE_ENV_ARG_DECL)
+                                   char*& type_name)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
@@ -138,8 +135,7 @@ private:
   /// and id that were used to generate the offer id.
   static void parse_offer_id (const CosTrading::OfferId offer_id,
                               char* &service_type,
-                              CORBA::ULong& id
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ULong& id)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId));
 
   // = Disallow these operations.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index da8ad797031..074414e3eda 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -16,21 +16,18 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void)
 }
 
 void
-TAO_Offer_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Iterator::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 TAO_Query_Only_Offer_Iterator::
@@ -52,7 +49,7 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id,
 }
 
 CORBA::ULong
-TAO_Query_Only_Offer_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Query_Only_Offer_Iterator::max_left (void)
   ACE_THROW_SPEC((CORBA::SystemException,
                  CosTrading::UnknownMaxLeft))
 {
@@ -61,8 +58,7 @@ TAO_Query_Only_Offer_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Boolean
 TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
-                                       CosTrading::OfferSeq_out offers
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                       CosTrading::OfferSeq_out offers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   offers = new CosTrading::OfferSeq;
@@ -94,19 +90,17 @@ TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void)
       CosTrading::OfferIterator* offer_iter = 0;
       this->iters_.dequeue_head (offer_iter);
 
-      ACE_TRY_NEW_ENV
+      try
         {
-          offer_iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          offer_iter->destroy ();
 
           CORBA::release (offer_iter);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Don't let the exceptions propagate since we're in a
           // destructor!
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -120,8 +114,7 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter)
 
 CORBA::Boolean
 TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
-                                       CosTrading::OfferSeq_out offers
-                                       ACE_ENV_ARG_DECL)
+                                       CosTrading::OfferSeq_out offers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong offers_left = n;
@@ -131,7 +124,6 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
   ACE_NEW_THROW_EX (offers,
                     CosTrading::OfferSeq,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (return_value);
 
   while (offers_left > 0 && ! this->iters_.is_empty ())
     {
@@ -146,15 +138,12 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
       // Retrieve the set of offers.
       any_left =
         iter->next_n (offers_left,
-                      CosTrading::OfferSeq_out (out_offers.out ())
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (return_value);
+                      CosTrading::OfferSeq_out (out_offers.out ()));
 
       // If we've exhausted this iterator, destroy it.
       if (any_left == 0)
         {
-          iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (return_value);
+          iter->destroy ();
           CORBA::release (iter);
         }
       else
@@ -177,7 +166,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
 }
 
 void
-TAO_Offer_Iterator_Collection::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Iterator_Collection::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy all iterators in the collection.
@@ -188,26 +177,22 @@ TAO_Offer_Iterator_Collection::destroy (ACE_ENV_SINGLE_ARG_DECL)
       CosTrading::OfferIterator** iter = 0;
 
       iters_iter.next (iter);
-      (*iter)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      (*iter)->destroy ();
     }
 
   // Remove self from POA
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 CORBA::ULong
-TAO_Offer_Iterator_Collection::max_left (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Iterator_Collection::max_left (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::UnknownMaxLeft))
 {
@@ -235,7 +220,7 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void)
 }
 
 CORBA::ULong
-TAO_Offer_Id_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Offer_Id_Iterator::max_left (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
@@ -243,28 +228,23 @@ TAO_Offer_Id_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Offer_Id_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Id_Iterator::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 CORBA::Boolean
 TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
-                               CosTrading::OfferIdSeq_out _ids
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               CosTrading::OfferIdSeq_out _ids)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Calculate the number of Ids to be returned in this.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 247664b6f77..a9508b81998 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -59,7 +59,7 @@ public:
    * destroyed.
    * END SPEC
    */
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add an offer to the collection of offers the iterator will
@@ -67,7 +67,7 @@ public:
   virtual void add_offer (CosTrading::OfferId offer_id,
                           const CosTrading::Offer* offer) = 0;
 
-  virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong max_left (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft)) = 0;
 
@@ -94,8 +94,7 @@ public:
    * END SPEC
    */
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers
-                                 ACE_ENV_ARG_DECL)
+                                 CosTrading::OfferSeq_out offers)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
  protected:
 
@@ -133,12 +132,11 @@ public:
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers
-                                 ACE_ENV_ARG_DECL)
+                                 CosTrading::OfferSeq_out offers)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the number of items left in the iterator.
-  virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong max_left (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
 
@@ -187,16 +185,15 @@ public:
 
   /// Retrieve n offers from the set of iterators.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers
-                                 ACE_ENV_ARG_DECL)
+                                 CosTrading::OfferSeq_out offers)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy the collection of iterators.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Determine how many offers are left in the collection.
-  virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong max_left (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::UnknownMaxLeft));
 
@@ -248,7 +245,7 @@ class TAO_Offer_Id_Iterator :
    * identifiers (e.g., if the iterator determines its set of offer
    * identifiers through lazy evaluation).
    */
-  virtual CORBA::ULong max_left(ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong max_left(void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
 
@@ -257,7 +254,7 @@ class TAO_Offer_Id_Iterator :
    * operations can be invoked on an iterator after it has been
    * destroyed.
    */
-  virtual void destroy(ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy(void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -273,8 +270,7 @@ class TAO_Offer_Id_Iterator :
    * further offer identifiers to be extracted.
    */
   virtual CORBA::Boolean next_n(CORBA::ULong _n,
-                                CosTrading::OfferIdSeq_out _ids
-                                ACE_ENV_ARG_DECL)
+                                CosTrading::OfferIdSeq_out _ids)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Insert a <new_id> into the contents of the iterator.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index f8ad8bd3a6f..1deb800e3a0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -39,7 +39,7 @@ add_offer (CosTrading::OfferId id,
 
 template <class MAP_LOCK_TYPE> CORBA::ULong
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+max_left (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
@@ -49,8 +49,7 @@ max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 template <class MAP_LOCK_TYPE> CORBA::Boolean
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 next_n (CORBA::ULong n,
-        CosTrading::OfferSeq_out offers
-        ACE_ENV_ARG_DECL)
+        CosTrading::OfferSeq_out offers)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong ret_offers = 0;
@@ -62,7 +61,6 @@ next_n (CORBA::ULong n,
   ACE_NEW_THROW_EX (offers,
                     CosTrading::OfferSeq,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   offers->length (max_possible_offers_in_sequence);
 
@@ -78,8 +76,7 @@ next_n (CORBA::ULong n,
       this->offer_ids_.dequeue_head (id);
 
       CosTrading::OfferId_var offerid_var (id);
-      CosTrading::Offer* offer = this->db_.lookup_offer (id ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CosTrading::Offer* offer = this->db_.lookup_offer (id);
 
       if (offer != 0)
         this->pfilter_.filter_offer (offer,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 8aa992e9add..f988790a61f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -55,8 +55,7 @@ public:
   /// Deposit at maximum n offers into the return sequence and return 1,
   /// or return 0 if the iterator is done and no offers are returned.
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 CosTrading::OfferSeq_out offers)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -65,7 +64,7 @@ public:
    * the trader will have all the offers it has now when the time
    * to return them comes.
    */
-  virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_left (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::UnknownMaxLeft));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 106cc5e3045..1c83064566d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -45,7 +45,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
 }
 
 CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-TAO_Service_Type_Repository::incarnation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Service_Type_Repository::incarnation (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
@@ -70,8 +70,7 @@ TAO_Service_Type_Repository::
 add_type (const char *name,
           const char *if_name,
           const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-          const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-          ACE_ENV_ARG_DECL)
+          const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -93,7 +92,6 @@ add_type (const char *name,
   ACE_UNUSED_ARG (inc_num);
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (inc_num);
 
   // Make sure Type name is valid.
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
@@ -108,23 +106,18 @@ add_type (const char *name,
 
   // Make sure all property names are valid and appear only once.
   this->validate_properties (prop_map,
-                             props
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (this->incarnation_);
+                             props);
 
   // Check that all super_types exist, and none are duplicated.
   this->validate_supertypes (super_map,
-                             super_types
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (this->incarnation_);
+                             super_types);
 
   // NOTE: I don't really know a way to do this without an Interface
   // Repository, since the Interface Repository IDs don't contain
   // information about supertypes.
   //
   // make sure interface name is legal.
-  //  this->validate_interface (if_name, super_types ACE_ENV_ARG_PARAMETER);
-  //  ACE_CHECK_RETURN (this->incarnation);
+  //  this->validate_interface (if_name, super_types);
   //
   // Instead, we do this:
   //
@@ -136,9 +129,7 @@ add_type (const char *name,
   // type are compatible.  We can use prop_map and super_types_map for
   // the job.
   this->validate_inheritance (prop_map,
-                              super_types
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (this->incarnation_);
+                              super_types);
 
   // We can now use prop_map to construct a sequence of all properties
   // the this type.
@@ -163,29 +154,27 @@ add_type (const char *name,
 }
 
 void
-TAO_Service_Type_Repository::remove_type (const char *name
-                                          ACE_ENV_ARG_DECL)
+TAO_Service_Type_Repository::remove_type (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::HasSubTypes))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW (CosTrading::IllegalServiceType (name));
+    throw CosTrading::IllegalServiceType (name);
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
-  ACE_CHECK;
 
   // Check if the type exists.
   Service_Type_Map::ENTRY* type_entry = 0; ;
   if (this->type_map_.find (name,
                             type_entry) == -1)
-    ACE_THROW (CosTrading::UnknownServiceType (name));
+    throw CosTrading::UnknownServiceType (name);
 
   // Check if it has any subtypes.
   Type_Info *type_info = type_entry->int_id_;
   if (type_info->has_subtypes_)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::HasSubTypes (name, ""));
+    throw CosTradingRepos::ServiceTypeRepository::HasSubTypes (name, "");
 
   // Remove the type from the map.
   this->type_map_.unbind (type_entry);
@@ -194,12 +183,10 @@ TAO_Service_Type_Repository::remove_type (const char *name
 
 CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
 TAO_Service_Type_Repository::
-list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types
-            ACE_ENV_ARG_DECL)
+list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
   CORBA::ULong length = static_cast<CORBA::ULong> (this->type_map_.current_size ());
@@ -240,8 +227,7 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes
 
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
-describe_type (const char * name
-               ACE_ENV_ARG_DECL)
+describe_type (const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -256,7 +242,6 @@ describe_type (const char * name
      ace_mon,
      *this->lock_,
      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   // Make sure the type exists.
   CORBA::String_var type_name (name);
@@ -290,8 +275,7 @@ describe_type (const char * name
 
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
-fully_describe_type (const char *name
-                     ACE_ENV_ARG_DECL)
+fully_describe_type (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -301,7 +285,6 @@ fully_describe_type (const char *name
                       0);
 
   ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   // Make sure the type exists.
   CORBA::String_var type_name (name);
@@ -336,15 +319,14 @@ fully_describe_type (const char *name
 
 void
 TAO_Service_Type_Repository::
-mask_type (const char *name
-           ACE_ENV_ARG_DECL)
+mask_type (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::AlreadyMasked))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW (CosTrading::IllegalServiceType (name));
+    throw CosTrading::IllegalServiceType (name);
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
@@ -353,29 +335,28 @@ mask_type (const char *name
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) != -1)
-    ACE_THROW (CosTrading::UnknownServiceType (name));
+    throw CosTrading::UnknownServiceType (name);
 
   // Make sure the type is unmasked.
   CORBA::Boolean &mask =
     type_entry->int_id_->type_struct_.masked;
 
   if (mask == 1)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name));
+    throw CosTradingRepos::ServiceTypeRepository::AlreadyMasked (name);
   else
     mask = 1;
 }
 
 void
 TAO_Service_Type_Repository::
-unmask_type (const char *name
-             ACE_ENV_ARG_DECL)
+unmask_type (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
                   CosTradingRepos::ServiceTypeRepository::NotMasked))
 {
   if (TAO_Trader_Base::is_valid_identifier_name (name) == 0)
-    ACE_THROW (CosTrading::IllegalServiceType (name));
+    throw CosTrading::IllegalServiceType (name);
 
   ACE_WRITE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
 
@@ -384,13 +365,13 @@ unmask_type (const char *name
   Service_Type_Map::ENTRY *type_entry = 0;
   if (this->type_map_.find (type_name,
                             type_entry) != -1)
-    ACE_THROW (CosTrading::UnknownServiceType (name));
+    throw CosTrading::UnknownServiceType (name);
 
   // Make sure the type is masked.
   CORBA::Boolean &mask = type_entry->int_id_->type_struct_.masked;
 
   if (mask == 0)
-    ACE_THROW (CosTradingRepos::ServiceTypeRepository::NotMasked (name));
+    throw CosTradingRepos::ServiceTypeRepository::NotMasked (name);
   else
     mask = 0;
 }
@@ -501,8 +482,7 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ
 void
 TAO_Service_Type_Repository::
 validate_properties (Prop_Map &prop_map,
-                     const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props
-                     ACE_ENV_ARG_DECL)
+                     const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
 {
@@ -512,7 +492,7 @@ validate_properties (Prop_Map &prop_map,
     {
       const char *n = props[i].name;
       if (TAO_Trader_Base::is_valid_property_name (n) == 0)
-        ACE_THROW (CosTrading::IllegalPropertyName (n));
+        throw CosTrading::IllegalPropertyName (n);
       else
         {
           CORBA::String_var prop_name (n);
@@ -521,7 +501,7 @@ validate_properties (Prop_Map &prop_map,
 
           if (prop_map.bind (prop_name,
                              prop_val) == 1)
-            ACE_THROW (CosTrading::DuplicatePropertyName (n));
+            throw CosTrading::DuplicatePropertyName (n);
         }
     }
 }
@@ -529,8 +509,7 @@ validate_properties (Prop_Map &prop_map,
 void
 TAO_Service_Type_Repository::
 validate_supertypes (Service_Type_Map &super_map,
-                     const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                     ACE_ENV_ARG_DECL)
+                     const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
   ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
@@ -543,7 +522,7 @@ validate_supertypes (Service_Type_Map &super_map,
         super_types[i];
 
       if (TAO_Trader_Base::is_valid_identifier_name (type) == 0)
-        ACE_THROW (CosTrading::IllegalServiceType (type));
+        throw CosTrading::IllegalServiceType (type);
       else
         {
           CORBA::String_var hash_type (type);
@@ -551,12 +530,13 @@ validate_supertypes (Service_Type_Map &super_map,
 
           if (this->type_map_.find (hash_type,
                                     type_entry) == -1)
-            ACE_THROW (CosTrading::UnknownServiceType (type));
+            throw CosTrading::UnknownServiceType (type);
           else
             {
               if (super_map.bind (hash_type,
                                   type_entry->int_id_) == 1)
-                ACE_THROW (CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName (type));
+                throw CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName (
+                  type);
             }
         }
     }
@@ -565,8 +545,7 @@ validate_supertypes (Service_Type_Map &super_map,
 void
 TAO_Service_Type_Repository::
 validate_inheritance (Prop_Map &prop_map,
-                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                      ACE_ENV_ARG_DECL)
+                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
   ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition))
 {
   CORBA::ULong num_super_types = super_types.length ();
@@ -611,31 +590,27 @@ validate_inheritance (Prop_Map &prop_map,
 
               CORBA::TypeCode_ptr prop_type = property_in_map.value_type.in ();
               int compare = 0;
-              ACE_TRY
+              try
                 {
                   compare =
-                    super_props[j].value_type->equal (prop_type
-                                                      ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    super_props[j].value_type->equal (prop_type);
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception&)
                 {
-                ACE_TRY_THROW (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition
-                               (super_props[j].name,
-                                super_props[j],
-                                property_in_map.name,
-                                property_in_map));
+                throw CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition(
+                  super_props[j].name,
+                  super_props[j],
+                  property_in_map.name,
+                  property_in_map);
                 }
-              ACE_ENDTRY;
-              ACE_CHECK;
 
               if (compare == 0
                   || super_props[j].mode > property_in_map.mode)
-                ACE_THROW (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition
-                           (super_props[j].name,
-                            super_props[j],
-                            property_in_map.name,
-                            property_in_map));
+                throw CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition(
+                  super_props[j].name,
+                  super_props[j],
+                  property_in_map.name,
+                  property_in_map);
             }
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 4f5b959b216..e2f1ff9de94 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -43,7 +43,7 @@ public:
   ~TAO_Service_Type_Repository (void);
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-    incarnation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    incarnation (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -59,8 +59,7 @@ public:
   add_type (const char *name,
             const char *if_name,
             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-            ACE_ENV_ARG_DECL_NOT_USED)
+            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -116,16 +115,14 @@ public:
    * "name" has a service type which has been derived from it, then
    * the HasSubTypes exception is raised.  END SPEC
    */
-  virtual void remove_type (const char  *name
-                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void remove_type (const char  *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::HasSubTypes));
 
   virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
-  list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types
-              ACE_ENV_ARG_DECL_NOT_USED)
+  list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
@@ -149,8 +146,7 @@ public:
    * END SPEC
    */
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  describe_type (const char *name
-                 ACE_ENV_ARG_DECL_NOT_USED)
+  describe_type (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -169,8 +165,7 @@ public:
    * END SPEC
    */
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  fully_describe_type (const char *name
-                       ACE_ENV_ARG_DECL_NOT_USED)
+  fully_describe_type (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -189,8 +184,7 @@ public:
    * exception is raised.
    * END SPEC
    */
-  virtual void mask_type (const char *name
-                          ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void mask_type (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -208,8 +202,7 @@ public:
    * exception is raised.
    * END SPEC
    */
-  virtual void unmask_type (const char  *name
-                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void unmask_type (const char  *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -268,15 +261,13 @@ private:
   /// Confirm that the properties in props have valid names, and aren't
   /// duplicated. Cram those properties into the prop_map.
   void validate_properties (Prop_Map &prop_map,
-                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
 
   /// Confirm that the each super type exists, and cram them into super_map.
   void validate_supertypes (Service_Type_Map &super_map,
-                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
     ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
@@ -284,13 +275,12 @@ private:
   /// Ensure that properties of a super_type aren't having their types
   /// or retstrictions redefined.
   void validate_inheritance (Prop_Map &prop_map,
-                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types)
     ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
 
   //  void validate_interface (const char *if_name,
   //                       Service_Type_Map &super_map,
-  //                       ACE_ENV_SINGLE_ARG_DECL)
+  //)
   //    ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch));
   // Ensure that the interface type derives from its superclasses'.
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 14d035ee0e5..7610561a7c2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -247,11 +247,10 @@ type_repos (CosTrading::TypeRepository_ptr new_value)
   // @@ Seth, There is no way to propagate the exception out.
   ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   this->type_repos_ = new_value;
   // @@ What can we do even if we catch this?
   this->service_type_repos_ =
-    CosTradingRepos::ServiceTypeRepository::_narrow (new_value ACE_ENV_ARG_PARAMETER);
+    CosTradingRepos::ServiceTypeRepository::_narrow (new_value);
 }
 
 CosTradingRepos::ServiceTypeRepository_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index 818934b10bb..f7876eab178 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -31,21 +31,17 @@ visit_property (TAO_Property_Constraint* literal)
 
   if (this->props_.find (prop_name, prop_index) == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
       CORBA::Any *value = 0;
       // Retrieve the value of the property from the Property_Evaluator
-      ACE_TRY
+      try
         {
-          value = this->prop_eval_.property_value (prop_index ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          value = this->prop_eval_.property_value (prop_index);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           return -1;
         }
-      ACE_ENDTRY;
-      //      ACE_CHECK_RETURN (-1);
 
       if (value != 0)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 393d73a2e83..35324eab393 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -47,8 +47,7 @@ query (const char *type,
        CORBA::ULong how_many,
        CosTrading::OfferSeq_out returned_offers,
        CosTrading::OfferIterator_out returned_offer_iterator,
-       CosTrading::PolicyNameSeq_out returned_limits_applied
-       ACE_ENV_ARG_DECL)
+       CosTrading::PolicyNameSeq_out returned_limits_applied)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -62,14 +61,12 @@ query (const char *type,
                    CosTrading::DuplicatePolicyName))
 {
   // Instantiate a class to help interpret query policies.
-  TAO_Policies policies (this->trader_, in_policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Policies policies (this->trader_, in_policies);
 
   // If a federated query returns to us, ignore it to prevent
   // redundant results and infinite loops.
   CosTrading::Admin::OctetSeq* request_id = 0;
-  int check = this->seen_request_id (policies, request_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  int check = this->seen_request_id (policies, request_id);
 
   if (check)
     {
@@ -86,8 +83,7 @@ query (const char *type,
   // If the importer has specified a starting trader, foward the
   // query.
   CosTrading::TraderName* trader_name =
-    policies.starting_trader (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    policies.starting_trader ();
 
   if (! CORBA::is_nil (link_if) && trader_name != 0)
     {
@@ -103,9 +99,7 @@ query (const char *type,
                            how_many,
                            returned_offers,
                            returned_offer_iterator,
-                           returned_limits_applied
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                           returned_limits_applied);
       return;
     }
 
@@ -115,8 +109,7 @@ query (const char *type,
   CosTradingRepos::ServiceTypeRepository_ptr rep =
     support_attrs.service_type_repos ();
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rep->fully_describe_type (type);
 
   // @@ Should throw a NO_MEMORY exception here...
   ACE_NEW (returned_offers,
@@ -135,18 +128,12 @@ query (const char *type,
   // meets those constraints.  TAO_Preference_Interpreter -- parses
   // the preference string and orders offers according to those
   // constraints.
-  TAO_Offer_Filter offer_filter (policies
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Offer_Filter offer_filter (policies);
   TAO_Trader_Constraint_Validator validator (type_struct.in ());
   TAO_Constraint_Interpreter constr_inter (validator,
-                                           constraint
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                           constraint);
   TAO_Preference_Interpreter pref_inter (validator,
-                                         preferences
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         preferences);
 
   // Try to find the map of offers of desired service type.
   offer_filter.configure_type (type_struct.ptr ());
@@ -156,8 +143,7 @@ query (const char *type,
                          pref_inter,
                          offer_filter);
 
-  CORBA::Boolean result = policies.exact_type_match (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Boolean result = policies.exact_type_match ();
 
   if (!result)
     {
@@ -173,9 +159,7 @@ query (const char *type,
                                  rep,
                                  constr_inter,
                                  pref_inter,
-                                 offer_filter
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 offer_filter);
     }
 
   // Take note of the limits applied in this query.
@@ -189,9 +173,7 @@ query (const char *type,
                             policies,
                             pref_inter,
                             *returned_offers.ptr (),
-                            returned_offer_iterator
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            returned_offer_iterator);
 
   // The following steps are only appropriate for a linked trader.
   if (! CORBA::is_nil (link_if))
@@ -202,9 +184,7 @@ query (const char *type,
       CORBA::Boolean should_follow =
         this->retrieve_links (policies,
                               offers_returned,
-                              CosTrading::LinkNameSeq_out (links.out ())
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                              CosTrading::LinkNameSeq_out (links.out ()));
 
       if (should_follow && links->length () != 0)
         {
@@ -220,9 +200,7 @@ query (const char *type,
                                  how_many,
                                  *returned_offers.ptr (),
                                  returned_offer_iterator.ptr (),
-                                 *returned_limits_applied.ptr ()
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                 *returned_limits_applied.ptr ());
         }
     }
 }
@@ -248,7 +226,7 @@ lookup_one_type (const char* type,
   // HP compiler, which seriously requires the typename keyword
   // here. I apologize if this ifdef offends some ACE users'
   // sensibilities --- it certainly offends mine.
-  ACE_TYPENAME TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
+  typename TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
     offer_iter (type, offer_database);
 #endif
 
@@ -288,8 +266,7 @@ lookup_all_subtypes (const char* type,
                      CosTradingRepos::ServiceTypeRepository_ptr rep,
                      TAO_Constraint_Interpreter& constr_inter,
                      TAO_Preference_Interpreter& pref_inter,
-                     TAO_Offer_Filter& offer_filter
-                     ACE_ENV_ARG_DECL)
+                     TAO_Offer_Filter& offer_filter)
 {
   // BEGIN SPEC
   // The trader may return a service offer of a subtype of the "type"
@@ -310,8 +287,7 @@ lookup_all_subtypes (const char* type,
   // types with lower incarnation numbers.
   sst.incarnation (inc_num);
 
-  all_types = rep->list_types (sst ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  all_types = rep->list_types (sst);
 
   // Scan all types inserted after the super types. If the transitive
   // closure of a type's super type relation includes the super type
@@ -323,9 +299,7 @@ lookup_all_subtypes (const char* type,
        i++)
     {
       // Obtain a description of the prospective type.
-      type_struct = rep->fully_describe_type (all_types[i]
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      type_struct = rep->fully_describe_type (all_types[i]);
 
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq&
         super_types = type_struct->super_types;
@@ -358,8 +332,7 @@ fill_receptacles (const char* /* type */,
                   TAO_Policies& policies,
                   TAO_Preference_Interpreter& pref_inter,
                   CosTrading::OfferSeq& offers,
-                  CosTrading::OfferIterator_ptr& offer_itr
-                  ACE_ENV_ARG_DECL)
+                  CosTrading::OfferIterator_ptr& offer_itr)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::DuplicatePropertyName))
 {
@@ -374,14 +347,12 @@ fill_receptacles (const char* /* type */,
   // "offer_itr" will be nil.
   // END SPEC
 
-  TAO_Property_Filter prop_filter (desired_props ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Property_Filter prop_filter (desired_props);
 
   // RETURNING: Calculate how many offers go into the sequence
   //  Calculate how many go into the iterator
 
-  CORBA::ULong return_card = policies.return_card (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong return_card = policies.return_card ();
 
   CORBA::ULong i = 0;
   CORBA::ULong size = static_cast<CORBA::ULong> (pref_inter.num_offers ());
@@ -425,11 +396,9 @@ fill_receptacles (const char* /* type */,
         this->create_offer_iterator (prop_filter);
 
       // Register it with the POA.
-      offer_itr = oi->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (total_offers - offers_in_iterator);
+      offer_itr = oi->_this ();
 
-      oi->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (total_offers - offers_in_iterator);
+      oi->_remove_ref ();
 
       // Add to the iterator
       for (i = 0; i < offers_in_iterator; i++)
@@ -495,14 +464,12 @@ CORBA::Boolean
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 retrieve_links (TAO_Policies& policies,
                 CORBA::ULong offers_returned,
-                CosTrading::LinkNameSeq_out links
-                ACE_ENV_ARG_DECL)
+                CosTrading::LinkNameSeq_out links)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean should_follow = 0;
-  CosTrading::FollowOption follow_rule = policies.link_follow_rule (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (should_follow);
+  CosTrading::FollowOption follow_rule = policies.link_follow_rule ();
 
   // Determine whether or not a federated query is warranted. A query
   // is waranted if the follow_rule governing this query is 'always'
@@ -510,8 +477,7 @@ retrieve_links (TAO_Policies& policies,
   if ((follow_rule == CosTrading::always ||
        (follow_rule == CosTrading::if_no_local && offers_returned == 0)))
     {
-      CORBA::ULong hc = policies.hop_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CORBA::ULong hc = policies.hop_count ();
 
       if (hc > 0)
         should_follow = 1;
@@ -524,8 +490,7 @@ retrieve_links (TAO_Policies& policies,
       CosTrading::Link_ptr link_if =
         this->trader_.trading_components ().link_if ();
 
-      links = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      links = link_if->list_links ();
 
       // Determine which of the links registered with the Link
       // interface are suitable to follow.
@@ -536,13 +501,11 @@ retrieve_links (TAO_Policies& policies,
         {
           // Grab the link information.
           CosTrading::Link::LinkInfo_var
-            link_info (link_if->describe_link (links[i] ACE_ENV_ARG_PARAMETER));
-          ACE_CHECK_RETURN (should_follow);
+            link_info (link_if->describe_link (links[i]));
 
           // Compute the link follow rule.
           CosTrading::FollowOption link_rule =
-            policies.link_follow_rule (link_info.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (should_follow);
+            policies.link_follow_rule (link_info.in ());
 
           // Determine if the link follow rule applies.
           if (link_rule == CosTrading::always
@@ -577,8 +540,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
                  CORBA::ULong how_many,
                  CosTrading::OfferSeq& offers,
                  CosTrading::OfferIterator_ptr& offer_iter,
-                 CosTrading::PolicyNameSeq& limits
-                 ACE_ENV_ARG_DECL)
+                 CosTrading::PolicyNameSeq& limits)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -615,8 +577,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
   offer_iter_collection->add_offer_iterator (offer_iter);
 
   CosTrading::PolicySeq policies_to_pass;
-  policies.copy_to_pass (policies_to_pass, request_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.copy_to_pass (policies_to_pass, request_id);
 
   for (int i = links.length () - 1; i >= 0; i--)
     {
@@ -624,18 +585,15 @@ federated_query (const CosTrading::LinkNameSeq& links,
       CosTrading::OfferIterator *out_offer_iter = 0;
       CosTrading::PolicyNameSeq *out_limits = 0;
 
-      ACE_TRY
+      try
         {
           // Obtain information about the link we're traversing.
           CosTrading::Link::LinkInfo_var link_info =
-            link_interface->describe_link (links[i] ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            link_interface->describe_link (links[i]);
 
           // Set the link follow policy for the query over the link.
           policies.copy_in_follow_option (policies_to_pass,
-                                          link_info.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                          link_info.in ());
 
           CosTrading::Lookup_var remote_lookup =
             CosTrading::Lookup::_duplicate (link_info->target.in ());
@@ -649,9 +607,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
                                 how_many - offers.length (),
                                 CosTrading::OfferSeq_out (out_offers),
                                 CosTrading::OfferIterator_out (out_offer_iter),
-                                CosTrading::PolicyNameSeq_out (out_limits)
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                CosTrading::PolicyNameSeq_out (out_limits));
 
           CORBA::ULong j = 0;
           CosTrading::OfferSeq_var out_offers_var (out_offers);
@@ -679,23 +635,19 @@ federated_query (const CosTrading::LinkNameSeq& links,
           for (j = 0; j < source_length; j++)
             offers[j + target_length] = out_offers_var[j];
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Ah, well, this query failed, move on to the next one.
         }
-      ACE_ENDTRY;
-      //      ACE_CHECK;
     }
 
   // Sort the sequence in preference order.
   this->order_merged_sequence (pref_inter, offers);
 
   // Return the collection of offer iterators.
-  offer_iter = offer_iter_collection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  offer_iter = offer_iter_collection->_this ();
 
-  offer_iter_collection->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  offer_iter_collection->_remove_ref ();
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -747,8 +699,7 @@ forward_query (const char* next_hop,
                CORBA::ULong how_many,
                CosTrading::OfferSeq_out offers,
                CosTrading::OfferIterator_out offer_itr,
-               CosTrading::PolicyNameSeq_out limits_applied
-               ACE_ENV_ARG_DECL)
+               CosTrading::PolicyNameSeq_out limits_applied)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -765,21 +716,18 @@ forward_query (const char* next_hop,
   CosTrading::Link_ptr link_interface
     = this->trader_.trading_components ().link_if ();
 
-  ACE_TRY
+  try
     {
       CosTrading::Link::LinkInfo_var link_info =
-        link_interface->describe_link (next_hop ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        link_interface->describe_link (next_hop);
 
       CosTrading::Lookup_var remote_lookup =
         CosTrading::Lookup::_duplicate (link_info->target.in ());
 
-      CORBA::Object_var us = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var us = this->_this ();
 
       CORBA::Boolean self_loop =
-        remote_lookup->_is_equivalent (us.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        remote_lookup->_is_equivalent (us.in ());
 
       if (! self_loop)
         {
@@ -792,9 +740,7 @@ forward_query (const char* next_hop,
                                 how_many,
                                 offers,
                                 offer_itr,
-                                limits_applied
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                limits_applied);
         }
       else
         {
@@ -806,42 +752,35 @@ forward_query (const char* next_hop,
                        how_many,
                        offers,
                        offer_itr,
-                       limits_applied
-                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                       limits_applied);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       CosTrading::Policy policy;
       policy.name = TAO_Policies::POLICY_NAMES[TAO_Policies::STARTING_TRADER];
       policy.value <<= next_hop;
-      ACE_TRY_THROW (CosTrading::Lookup::InvalidPolicyValue (policy));
+      throw CosTrading::Lookup::InvalidPolicyValue (policy);
     }
-  ACE_ENDTRY;
-  //  ACE_CHECK;
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 seen_request_id (TAO_Policies& policies,
-                 CosTrading::Admin::OctetSeq*& seq
-                 ACE_ENV_ARG_DECL)
+                 CosTrading::Admin::OctetSeq*& seq)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean return_value = 0;
 
-  seq = policies.request_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  seq = policies.request_id ();
 
   if (seq == 0)
     {
       CosTrading::Admin_ptr admin_if =
         this->trader_.trading_components ().admin_if ();
-      seq = admin_if->request_id_stem (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (1);
+      seq = admin_if->request_id_stem ();
     }
   else
     {
@@ -850,7 +789,6 @@ seen_request_id (TAO_Policies& policies,
       ACE_NEW_THROW_EX (seq,
                         CosTrading::Admin::OctetSeq (*seq),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (1);
     }
 
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 1);
@@ -902,8 +840,7 @@ CosTrading::OfferId
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 _cxx_export (CORBA::Object_ptr reference,
              const char *type,
-             const CosTrading::PropertySeq &properties
-             ACE_ENV_ARG_DECL)
+             const CosTrading::PropertySeq &properties)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::InvalidObjectRef,
                   CosTrading::IllegalServiceType,
@@ -931,8 +868,7 @@ _cxx_export (CORBA::Object_ptr reference,
   // Yank our friend, the type struct, and confirm that the given
   // properties match the type definition.
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    rep->fully_describe_type (type);
 
   // Oops the type is masked, we shouldn't let exporters know the type
   // exists.
@@ -941,20 +877,17 @@ _cxx_export (CORBA::Object_ptr reference,
 
   // TAO-specific way to determine if an object is derived from or is
   // an interface type.
-  int check = (! reference->_is_a (type_struct->if_name ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK_RETURN (0);
+  int check = (! reference->_is_a (type_struct->if_name));
   if (check)
     ACE_THROW_RETURN (CosTrading::Register::
                       InterfaceTypeMismatch (type, reference), 0);
 
   // Validate that the properties defined for this offer are correct
   // to their types and strength.
-  this->validate_properties (type, type_struct.ptr (), properties ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->validate_properties (type, type_struct.ptr (), properties);
 
   // CORBA::ULong plength = properties.length ();
   ACE_NEW_THROW_EX (offer, CosTrading::Offer, CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   // No copying, no memory leaks. Violates the "in" parameter semantics
   // when this object is colocated with the client, however.
@@ -979,8 +912,7 @@ _cxx_export (CORBA::Object_ptr reference,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-withdraw (const char *id
-          ACE_ENV_ARG_DECL)
+withdraw (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -988,14 +920,13 @@ withdraw (const char *id
 {
   // Get service type map.
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
-  offer_database.remove_offer ((CosTrading::OfferId) id ACE_ENV_ARG_PARAMETER);
+  offer_database.remove_offer ((CosTrading::OfferId) id);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register::OfferInfo *
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-describe (const char *id
-          ACE_ENV_ARG_DECL)
+describe (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1007,12 +938,10 @@ describe (const char *id
 
   // Perform a lookup to find the offer.
   CosTrading::Offer* offer =
-    offer_database.lookup_offer ((CosTrading::OfferId) id, type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    offer_database.lookup_offer ((CosTrading::OfferId) id, type);
 
   CosTrading::Register::OfferInfo *offer_info = 0;
   ACE_NEW_THROW_EX (offer_info, CosTrading::Register::OfferInfo, CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   offer_info->reference = CORBA::Object::_duplicate (offer->reference.in ());
   offer_info->type = CORBA::string_dup (type);
@@ -1030,8 +959,7 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify (const char *id,
         const CosTrading::PropertyNameSeq& del_list,
-        const CosTrading::PropertySeq& modify_list
-        ACE_ENV_ARG_DECL)
+        const CosTrading::PropertySeq& modify_list)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented,
                   CosTrading::IllegalOfferId,
@@ -1047,11 +975,10 @@ modify (const char *id,
 {
   // Throw an exception if the trader is not configured
   // to support properties modification.
-  int check =  (! this->supports_modifiable_properties (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK;
+  int check =  (! this->supports_modifiable_properties ());
 
   if (check)
-    ACE_THROW (CosTrading::NotImplemented ());
+    throw CosTrading::NotImplemented ();
 
   char* type = 0;
   TAO_Support_Attributes_i& support_attrs =
@@ -1061,23 +988,19 @@ modify (const char *id,
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
 
   CosTrading::Offer* offer = offer_database.
-    lookup_offer (const_cast<CosTrading::OfferId> (id), type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    lookup_offer (const_cast<CosTrading::OfferId> (id), type);
 
   if (offer != 0)
     {
       // Yank our friend, the type struct.
       CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-        rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rep->fully_describe_type (type);
       TAO_Offer_Modifier offer_mod (type, type_struct.in (), offer);
 
       // Delete, add, and change properties of the offer.
-      offer_mod.delete_properties (del_list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      offer_mod.delete_properties (del_list);
 
-      offer_mod.merge_properties (modify_list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      offer_mod.merge_properties (modify_list);
 
       // Alter our reference to the offer. We do this last, since the
       // spec says: modify either suceeds completely or fails
@@ -1090,8 +1013,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_using_constraint (const char *type,
-                           const char *constr
-                           ACE_ENV_ARG_DECL)
+                           const char *constr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -1108,8 +1030,7 @@ withdraw_using_constraint (const char *type,
 
   // Retrieve the type struct
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rep->fully_describe_type (type);
 
   // Try to find the map of offers of desired service type.
   // @@ Again, should be Offer_Database::offer_iterator
@@ -1122,13 +1043,12 @@ withdraw_using_constraint (const char *type,
     // the HP compiler, which seriously requires the typename keyword
     // here. I apologize if this ifdef offends some ACE users'
     // sensibilities --- it certainly offends mine.
-    ACE_TYPENAME TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
+    typename TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
       offer_iter (type, offer_database);
 #endif /* _MSC_VER */
 
     TAO_Trader_Constraint_Validator validator (type_struct.in ());
-    TAO_Constraint_Interpreter constr_inter (validator, constr ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    TAO_Constraint_Interpreter constr_inter (validator, constr);
 
     while (offer_iter.has_more_offers ())
       {
@@ -1150,20 +1070,18 @@ withdraw_using_constraint (const char *type,
           char* offer_id = 0;
 
           ids.dequeue_head (offer_id);
-          offer_database.remove_offer (offer_id ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          offer_database.remove_offer (offer_id);
           CORBA::string_free (offer_id);
         }
     }
   else
-    ACE_THROW (CosTrading::Register::NoMatchingOffers (constr));
+    throw CosTrading::Register::NoMatchingOffers (constr);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register_ptr
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-resolve (const CosTrading::TraderName &name
-         ACE_ENV_ARG_DECL)
+resolve (const CosTrading::TraderName &name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::IllegalTraderName,
                   CosTrading::Register::UnknownTraderName,
@@ -1185,22 +1103,18 @@ resolve (const CosTrading::TraderName &name
   CosTrading::Link::LinkInfo_var link_info;
   CosTrading::Register_var remote_reg;
 
-  ACE_TRY
+  try
     {
       // Ensure that the link to the next trader exists.
-      link_info = link_if->describe_link (name[0] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      link_info = link_if->describe_link (name[0]);
 
       remote_reg =
-        CosTrading::Register::_narrow (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosTrading::Register::_narrow (link_info->target_reg.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
-      ACE_TRY_THROW (CosTrading::Register::UnknownTraderName (name));
+      throw CosTrading::Register::UnknownTraderName (name);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTrading::Register::_nil ());
 
   // Ensure that the register pointer isn't nil.
   if (! CORBA::is_nil (remote_reg.in ()))
@@ -1216,8 +1130,7 @@ resolve (const CosTrading::TraderName &name
       for (int i = trader_name.length () - 1; i >= 0; i--)
         trader_name[i] = name[i + 1];
 
-      return_value = remote_reg->resolve (trader_name ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosTrading::Register::_nil ());
+      return_value = remote_reg->resolve (trader_name);
     }
 
   return return_value;
@@ -1228,8 +1141,7 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 validate_properties (const char* type,
                      const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
-                     const CosTrading::PropertySeq& properties
-                     ACE_ENV_ARG_DECL)
+                     const CosTrading::PropertySeq& properties)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::PropertyTypeMismatch,
                   CosTrading::ReadonlyDynamicProperty,
@@ -1239,8 +1151,7 @@ validate_properties (const char* type,
   CORBA::ULong length = properties.length ();
   const CosTradingRepos::ServiceTypeRepository::PropStructSeq&
     prop_types = type_struct->props;
-  TAO_Property_Evaluator_By_Name prop_eval (properties ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Property_Evaluator_By_Name prop_eval (properties);
 
   // Perform property validation
   length = prop_types.length ();
@@ -1259,25 +1170,23 @@ validate_properties (const char* type,
           // Offer cannot have a missing mandatory property.
           if (prop_types[i].mode ==
               CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY)
-            ACE_THROW (CosTrading::MissingMandatoryProperty (type, prop_name));
+            throw CosTrading::MissingMandatoryProperty (type, prop_name);
         }
       else
         {
           int check =
-            (! prop_type->equal (prop_struct.value_type.in ()
-                                 ACE_ENV_ARG_PARAMETER));
-          ACE_CHECK;
+            (! prop_type->equal (prop_struct.value_type.in ()));
           if (check)
             {
               // Offer cannot redefine the type of an property.
               const CosTrading::Property* prop =
                 prop_eval.get_property (prop_name);
-              ACE_THROW (CosTrading::PropertyTypeMismatch (type, *prop));
+              throw CosTrading::PropertyTypeMismatch (type, *prop);
             }
           else if (prop_struct.mode ==
                    CosTradingRepos::ServiceTypeRepository::PROP_READONLY &&
                    prop_eval.is_dynamic_property (prop_name))
-            ACE_THROW (CosTrading::ReadonlyDynamicProperty (type, prop_name));
+            throw CosTrading::ReadonlyDynamicProperty (type, prop_name);
         }
     }
 }
@@ -1347,7 +1256,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void)
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq *
-TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0);
@@ -1370,7 +1279,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_search_card (CORBA::ULong value
-                     ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1384,7 +1293,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_search_card (CORBA::ULong value
-                     ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1398,7 +1307,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_match_card (CORBA::ULong value
-                    ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1412,7 +1321,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_match_card (CORBA::ULong value
-                    ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1426,7 +1335,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_return_card (CORBA::ULong value
-                     ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1440,7 +1349,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_return_card (CORBA::ULong value
-                     ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1454,7 +1363,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_list (CORBA::ULong value
-              ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1468,7 +1377,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_modifiable_properties (CORBA::Boolean value
-                                    ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1482,7 +1391,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_dynamic_properties (CORBA::Boolean value
-                                 ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1496,7 +1405,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_proxy_offers (CORBA::Boolean value
-                           ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1510,7 +1419,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_hop_count (CORBA::ULong value
-                   ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1524,7 +1433,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_hop_count (CORBA::ULong value
-                   ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1538,7 +1447,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_follow_policy (CosTrading::FollowOption policy
-                       ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1552,7 +1461,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_follow_policy (CosTrading::FollowOption policy
-                       ACE_ENV_ARG_DECL_NOT_USED )
+ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1565,8 +1474,7 @@ set_max_follow_policy (CosTrading::FollowOption policy
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_max_link_follow_policy (CosTrading::FollowOption policy
-                            ACE_ENV_ARG_DECL_NOT_USED)
+set_max_link_follow_policy (CosTrading::FollowOption policy)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1579,8 +1487,7 @@ set_max_link_follow_policy (CosTrading::FollowOption policy
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::TypeRepository_ptr
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_type_repos (CosTrading::TypeRepository_ptr repository
-                ACE_ENV_ARG_DECL_NOT_USED)
+set_type_repos (CosTrading::TypeRepository_ptr repository)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::TypeRepository_ptr return_value =
@@ -1593,8 +1500,7 @@ set_type_repos (CosTrading::TypeRepository_ptr repository
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq*
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_request_id_stem (const CosTrading::Admin::OctetSeq& stem
-                       ACE_ENV_ARG_DECL_NOT_USED)
+set_request_id_stem (const CosTrading::Admin::OctetSeq& stem)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_,
@@ -1608,13 +1514,12 @@ void
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_offers (CORBA::ULong how_many,
              CosTrading::OfferIdSeq_out ids,
-             CosTrading::OfferIdIterator_out id_itr
-             ACE_ENV_ARG_DECL)
+             CosTrading::OfferIdIterator_out id_itr)
   ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented))
 {
   // This method only applies when the register interface is implemented
   if (CORBA::is_nil (this->trader_.trading_components().register_if()))
-    ACE_THROW (CosTrading::NotImplemented());
+    throw CosTrading::NotImplemented();
 
   TAO_Offer_Database<MAP_LOCK_TYPE>& type_map = this->trader_.offer_database ();
   TAO_Offer_Id_Iterator* offer_id_iter = type_map.retrieve_all_offer_ids ();
@@ -1622,15 +1527,12 @@ list_offers (CORBA::ULong how_many,
   id_itr = CosTrading::OfferIdIterator::_nil ();
   if (how_many > 0)
     {
-      int check = offer_id_iter->next_n (how_many, ids ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      int check = offer_id_iter->next_n (how_many, ids);
 
       if (check == 1)
         {
-          id_itr = offer_id_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-          offer_id_iter->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          id_itr = offer_id_iter->_this ();
+          offer_id_iter->_remove_ref ();
         }
       else
         delete offer_id_iter;
@@ -1644,12 +1546,11 @@ void
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
               CosTrading::OfferIdSeq_out,
-              CosTrading::OfferIdIterator_out
-              ACE_ENV_ARG_DECL)
+              CosTrading::OfferIdIterator_out)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented))
 {
-  ACE_THROW (CosTrading::NotImplemented ());
+  throw CosTrading::NotImplemented ();
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -1672,8 +1573,7 @@ TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
 add_link (const char *name,
           CosTrading::Lookup_ptr target,
           CosTrading::FollowOption def_pass_on_follow_rule,
-          CosTrading::FollowOption limiting_follow_rule
-          ACE_ENV_ARG_DECL)
+          CosTrading::FollowOption limiting_follow_rule)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::DuplicateLinkName,
@@ -1683,31 +1583,32 @@ add_link (const char *name,
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
-    ACE_THROW (CosTrading::Link::IllegalLinkName (name));
+    throw CosTrading::Link::IllegalLinkName (name);
 
   // Ensure this isn't a duplicate link name.
   CORBA::String_var link_name (name);
   if (this->links_.find (link_name) == 0)
-    ACE_THROW (CosTrading::Link::DuplicateLinkName (name));
+    throw CosTrading::Link::DuplicateLinkName (name);
 
   // Ensure the lookup_ptr isn't nil.
   if (CORBA::is_nil (target))
-    ACE_THROW (CosTrading::InvalidLookupRef (target));
+    throw CosTrading::InvalidLookupRef (target);
 
   // Ensure that the default link behavior isn't stronger than the
   // limiting link behavior.
   if (def_pass_on_follow_rule > limiting_follow_rule)
-    ACE_THROW (CosTrading::Link::DefaultFollowTooPermissive
-               (def_pass_on_follow_rule, limiting_follow_rule));
+    throw CosTrading::Link::DefaultFollowTooPermissive(
+      def_pass_on_follow_rule,
+      limiting_follow_rule);
 
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
   CosTrading::FollowOption follow_policy =
-    this->max_link_follow_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->max_link_follow_policy ();
   if (limiting_follow_rule < follow_policy)
-    ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
-               (limiting_follow_rule, follow_policy));
+    throw CosTrading::Link::LimitingFollowTooPermissive(
+      limiting_follow_rule,
+      follow_policy);
 
   // Create a link info structure for this link of the federation.
   CosTrading::Link::LinkInfo link_info;
@@ -1716,7 +1617,6 @@ add_link (const char *name,
 
   link_info.def_pass_on_follow_rule = def_pass_on_follow_rule;
   link_info.limiting_follow_rule = limiting_follow_rule;
-  ACE_CHECK;
 
   // Insert this link into the collection of links.
   this->links_.bind (link_name, link_info);
@@ -1725,20 +1625,19 @@ add_link (const char *name,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-remove_link (const char *name
-             ACE_ENV_ARG_DECL)
+remove_link (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::UnknownLinkName))
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
-    ACE_THROW (CosTrading::Link::IllegalLinkName (name));
+    throw CosTrading::Link::IllegalLinkName (name);
 
   // Ensure this isn't a duplicate link name.
   CORBA::String_var link_name (name);
   if (this->links_.find (link_name) == -1)
-    ACE_THROW (CosTrading::Link::UnknownLinkName (name));
+    throw CosTrading::Link::UnknownLinkName (name);
 
   // Erase the link state from the map.
   this->links_.unbind (link_name);
@@ -1746,8 +1645,7 @@ remove_link (const char *name
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Link::LinkInfo *
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
-                                               ACE_ENV_ARG_DECL)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName))
@@ -1757,7 +1655,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
     ACE_THROW_RETURN (CosTrading::Link::IllegalLinkName (name), 0);
 
   // Ensure this isn't a duplicate link name.
-  ACE_TYPENAME Links::ENTRY* link_entry = 0;
+  typename Links::ENTRY* link_entry = 0;
   CORBA::String_var link_name (name);
   if (this->links_.find (link_name, link_entry) == -1)
     ACE_THROW_RETURN (CosTrading::Link::UnknownLinkName (name),
@@ -1770,7 +1668,6 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
   ACE_NEW_THROW_EX (new_link_info,
                     CosTrading::Link::LinkInfo,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   new_link_info->def_pass_on_follow_rule = old_link_info.def_pass_on_follow_rule;
   new_link_info->limiting_follow_rule = old_link_info.limiting_follow_rule;
@@ -1781,8 +1678,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
   // This avoids the nested upcall that would occur were we to invoke
   // this method in the add_link method.
 
-  new_link_info->target_reg = old_link_info.target->register_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (new_link_info);
+  new_link_info->target_reg = old_link_info.target->register_if ();
 
   // return the link information for this link name.
   return new_link_info;
@@ -1790,7 +1686,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::LinkNameSeq*
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate space for the link names.
@@ -1800,7 +1696,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (ACE_ENV_SINGLE_ARG_DECL_NO
     CosTrading::LinkNameSeq::allocbuf (static_cast<CORBA::ULong> (size));
 
   // Copy the link names into the buffer.
-  for (ACE_TYPENAME Links::iterator links_iter (this->links_);
+  for (typename Links::iterator links_iter (this->links_);
        ! links_iter.done ();
        links_iter++)
     link_seq[i++] = CORBA::string_dup ((*links_iter).ext_id_.in ());
@@ -1814,8 +1710,7 @@ void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify_link (const char *name,
              CosTrading::FollowOption def_pass_on_follow_rule,
-             CosTrading::FollowOption limiting_follow_rule
-             ACE_ENV_ARG_DECL)
+             CosTrading::FollowOption limiting_follow_rule)
   ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName,
                    CosTrading::Link::DefaultFollowTooPermissive,
@@ -1823,29 +1718,30 @@ modify_link (const char *name,
 {
   // Ensure the link name is valid.
   if (! TAO_Trader_Base::is_valid_link_name (name))
-    ACE_THROW (CosTrading::Link::IllegalLinkName (name));
+    throw CosTrading::Link::IllegalLinkName (name);
 
   // Ensure this isn't a duplicate link name.
-  ACE_TYPENAME Links::ENTRY* link_entry = 0;
+  typename Links::ENTRY* link_entry = 0;
   CORBA::String_var link_name (name);
   if (this->links_.find (link_name, link_entry) == -1)
-    ACE_THROW (CosTrading::Link::UnknownLinkName (name));
+    throw CosTrading::Link::UnknownLinkName (name);
 
   // Ensure that the default link behavior isn't stronger than the
   // limiting link behavior.
   if (def_pass_on_follow_rule > limiting_follow_rule)
-    ACE_THROW (CosTrading::Link::DefaultFollowTooPermissive
-               (def_pass_on_follow_rule, limiting_follow_rule));
+    throw CosTrading::Link::DefaultFollowTooPermissive(
+      def_pass_on_follow_rule,
+      limiting_follow_rule);
 
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
   CosTrading::FollowOption follow_policy =
-    this->max_link_follow_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->max_link_follow_policy ();
 
   if (limiting_follow_rule < follow_policy)
-    ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
-               (limiting_follow_rule, follow_policy));
+    throw CosTrading::Link::LimitingFollowTooPermissive(
+      limiting_follow_rule,
+      follow_policy);
 
   // Adjust the link settings
   CosTrading::Link::LinkInfo& link_info = link_entry->int_id_;
@@ -1875,8 +1771,7 @@ export_proxy (CosTrading::Lookup_ptr,
               const CosTrading::PropertySeq&,
               CORBA::Boolean,
               const char *,
-              const CosTrading::PolicySeq&
-              ACE_ENV_ARG_DECL)
+              const CosTrading::PolicySeq&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
@@ -1897,21 +1792,19 @@ export_proxy (CosTrading::Lookup_ptr,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-withdraw_proxy (const char *
-                ACE_ENV_ARG_DECL)
+withdraw_proxy (const char *)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
                   CosTrading::Proxy::NotProxyOfferId))
 {
-  ACE_THROW (CORBA::UNKNOWN ());
+  throw CORBA::UNKNOWN ();
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Proxy::ProxyInfo *
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-describe_proxy (const char *
-                ACE_ENV_ARG_DECL)
+describe_proxy (const char *)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1927,12 +1820,11 @@ void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
               CosTrading::OfferIdSeq*&,
-              CosTrading::OfferIdIterator_ptr&
-              ACE_ENV_ARG_DECL)
+              CosTrading::OfferIdIterator_ptr&)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
-  ACE_THROW (CORBA::UNKNOWN ());
+  throw CORBA::UNKNOWN ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 2b1db71d3bc..2c3f0f61288 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -73,8 +73,7 @@ public:
            CORBA::ULong how_many,
            CosTrading::OfferSeq_out offers,
            CosTrading::OfferIterator_out offer_itr,
-           CosTrading::PolicyNameSeq_out limits_applied
-           ACE_ENV_ARG_DECL)
+           CosTrading::PolicyNameSeq_out limits_applied)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
@@ -180,8 +179,7 @@ private:
                             CosTradingRepos::ServiceTypeRepository_ptr rep,
                             TAO_Constraint_Interpreter& constr_inter,
                             TAO_Preference_Interpreter& pref_inter,
-                            TAO_Offer_Filter& offer_filter
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                            TAO_Offer_Filter& offer_filter);
 
   /// Check if offers of a type fit the constraints and order them
   /// according to the preferences submitted.
@@ -204,8 +202,7 @@ private:
                         TAO_Policies& policies,
                         TAO_Preference_Interpreter& pref_inter,
                         CosTrading::OfferSeq& offers,
-                        CosTrading::OfferIterator_ptr& offer_itr
-                        ACE_ENV_ARG_DECL)
+                        CosTrading::OfferIterator_ptr& offer_itr)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                     CosTrading::DuplicatePropertyName));
 
@@ -220,8 +217,7 @@ private:
                       CORBA::ULong how_many,
                       CosTrading::OfferSeq_out offers,
                       CosTrading::OfferIterator_out offer_itr,
-                      CosTrading::PolicyNameSeq_out limits_applied
-                      ACE_ENV_ARG_DECL)
+                      CosTrading::PolicyNameSeq_out limits_applied)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -242,8 +238,7 @@ private:
    */
   CORBA::Boolean retrieve_links (TAO_Policies& policies,
                                  CORBA::ULong offer_returned,
-                                 CosTrading::LinkNameSeq_out links
-                                 ACE_ENV_ARG_DECL)
+                                 CosTrading::LinkNameSeq_out links)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -263,8 +258,7 @@ private:
                         CORBA::ULong how_many,
                         CosTrading::OfferSeq& offers,
                         CosTrading::OfferIterator_ptr& offer_itr,
-                        CosTrading::PolicyNameSeq& limits_applied
-                        ACE_ENV_ARG_DECL)
+                        CosTrading::PolicyNameSeq& limits_applied)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -282,8 +276,7 @@ private:
                               CosTrading::OfferSeq& offers);
 
   CORBA::Boolean seen_request_id (TAO_Policies& policies,
-                                  CosTrading::Admin::OctetSeq*& seq
-                                  ACE_ENV_ARG_DECL)
+                                  CosTrading::Admin::OctetSeq*& seq)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -323,8 +316,7 @@ public:
 
   virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference,
                                            const char *type,
-                                           const CosTrading::PropertySeq& properties
-                                           ACE_ENV_ARG_DECL)
+                                           const CosTrading::PropertySeq& properties)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Register::InvalidObjectRef,
                     CosTrading::IllegalServiceType,
@@ -390,7 +382,7 @@ public:
   // parameter, the DuplicatePropertyName exception is raised.
   // END SPEC
 
-  virtual void withdraw (const char *id ACE_ENV_ARG_DECL)
+  virtual void withdraw (const char *id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -410,8 +402,7 @@ public:
   // END SPEC
 
   virtual CosTrading::Register::OfferInfo*
-    describe (const char * id
-              ACE_ENV_ARG_DECL)
+    describe (const char * id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -433,8 +424,7 @@ public:
 
   virtual void modify (const char * id,
                        const CosTrading::PropertyNameSeq& del_list,
-                       const CosTrading::PropertySeq& modify_list
-                       ACE_ENV_ARG_DECL)
+                       const CosTrading::PropertySeq& modify_list)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
@@ -502,8 +492,7 @@ public:
   // END SPEC
 
   virtual void withdraw_using_constraint (const char *type,
-                                          const char *constr
-                                          ACE_ENV_ARG_DECL)
+                                          const char *constr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -534,8 +523,7 @@ public:
   // END SPEC
 
   virtual CosTrading::Register_ptr
-    resolve (const CosTrading::TraderName &name
-             ACE_ENV_ARG_DECL)
+    resolve (const CosTrading::TraderName &name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::IllegalTraderName,
                      CosTrading::Register::UnknownTraderName,
@@ -568,8 +556,7 @@ public:
 
   void validate_properties (const char* type,
                             const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
-                            const CosTrading::PropertySeq& properties
-                            ACE_ENV_ARG_DECL)
+                            const CosTrading::PropertySeq& properties)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::PropertyTypeMismatch,
                      CosTrading::ReadonlyDynamicProperty,
@@ -623,92 +610,74 @@ public:
 
   /// Search card is the cardinality of the offers searched for
   /// constraint compliance.
-  virtual CORBA::ULong set_def_search_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_def_search_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_search_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_search_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// Match card is the cardinality of offers found compliant with the
   /// constraints.
-  virtual CORBA::ULong set_def_match_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_def_match_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_match_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_match_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return card is the cardinality of the offers returned from
   /// Lookup.
-  virtual CORBA::ULong set_def_return_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_def_return_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_return_card (CORBA::ULong value
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_return_card (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Types of offers available for consideration. Ween out those
   /// offers with modifiable properties
-  virtual CORBA::ULong set_max_list (CORBA::ULong value
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_list (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
-    set_supports_modifiable_properties (CORBA::Boolean value
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+    set_supports_modifiable_properties (CORBA::Boolean value)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
-    set_supports_dynamic_properties (CORBA::Boolean value
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+    set_supports_dynamic_properties (CORBA::Boolean value)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
-    set_supports_proxy_offers (CORBA::Boolean value
-                               ACE_ENV_ARG_DECL_NOT_USED)
+    set_supports_proxy_offers (CORBA::Boolean value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Link Interface parameters
 
-  virtual CORBA::ULong set_def_hop_count (CORBA::ULong value
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_def_hop_count (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_hop_count (CORBA::ULong value
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong set_max_hop_count (CORBA::ULong value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::FollowOption
-    set_def_follow_policy (CosTrading::FollowOption policy
-                           ACE_ENV_ARG_DECL_NOT_USED)
+    set_def_follow_policy (CosTrading::FollowOption policy)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
-    set_max_follow_policy (CosTrading::FollowOption policy
-                           ACE_ENV_ARG_DECL_NOT_USED)
+    set_max_follow_policy (CosTrading::FollowOption policy)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
-    set_max_link_follow_policy (CosTrading::FollowOption policy
-                                ACE_ENV_ARG_DECL_NOT_USED)
+    set_max_link_follow_policy (CosTrading::FollowOption policy)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Set Type Repository
 
   virtual CosTrading::TypeRepository_ptr
-    set_type_repos (CosTrading::TypeRepository_ptr repository
-                    ACE_ENV_ARG_DECL_NOT_USED)
+    set_type_repos (CosTrading::TypeRepository_ptr repository)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
-    request_id_stem (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    request_id_stem (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
-    set_request_id_stem (const CosTrading::Admin::OctetSeq& stem
-                         ACE_ENV_ARG_DECL_NOT_USED)
+    set_request_id_stem (const CosTrading::Admin::OctetSeq& stem)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void list_offers (CORBA::ULong how_many,
                             CosTrading::OfferIdSeq_out ids,
-                            CosTrading::OfferIdIterator_out id_itr
-                            ACE_ENV_ARG_DECL)
+                            CosTrading::OfferIdIterator_out id_itr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
@@ -733,8 +702,7 @@ public:
 
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq_out,
-                             CosTrading::OfferIdIterator_out
-                             ACE_ENV_ARG_DECL)
+                             CosTrading::OfferIdIterator_out)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
@@ -780,8 +748,7 @@ public:
   virtual void add_link (const char *name,
                          CosTrading::Lookup_ptr target,
                          CosTrading::FollowOption def_pass_on_follow_rule,
-                         CosTrading::FollowOption limiting_follow_rule
-                         ACE_ENV_ARG_DECL)
+                         CosTrading::FollowOption limiting_follow_rule)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::DuplicateLinkName,
@@ -825,8 +792,7 @@ public:
   // creation of the link.
   // END SPEC
 
-  virtual void remove_link (const char *name
-                            ACE_ENV_ARG_DECL)
+  virtual void remove_link (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
@@ -842,8 +808,7 @@ public:
   // not in the trader.
   // END SPEC
 
-  virtual CosTrading::Link::LinkInfo* describe_link (const char *name
-                                                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual CosTrading::Link::LinkInfo* describe_link (const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
@@ -871,7 +836,7 @@ public:
   // state.
   // END SPEC
 
-  virtual CosTrading::LinkNameSeq* list_links (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::LinkNameSeq* list_links (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
@@ -883,8 +848,7 @@ public:
 
   virtual void modify_link (const char *name,
                             CosTrading::FollowOption def_pass_on_follow_rule,
-                            CosTrading::FollowOption limiting_follow_rule
-                            ACE_ENV_ARG_DECL)
+                            CosTrading::FollowOption limiting_follow_rule)
     ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName,
                     CosTrading::Link::DefaultFollowTooPermissive,
@@ -957,8 +921,7 @@ public:
                   const CosTrading::PropertySeq &,
                   CORBA::Boolean if_match_all,
                   const char *,
-                  const CosTrading::PolicySeq &
-                  ACE_ENV_ARG_DECL)
+                  const CosTrading::PolicySeq &)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
@@ -971,16 +934,14 @@ public:
                     CosTrading::DuplicatePropertyName,
                     CosTrading::DuplicatePolicyName));
 
-  virtual void withdraw_proxy (const char *
-                               ACE_ENV_ARG_DECL)
+  virtual void withdraw_proxy (const char *)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
                     CosTrading::Proxy::NotProxyOfferId));
 
   virtual CosTrading::Proxy::ProxyInfo *
-  describe_proxy (const char *
-                  ACE_ENV_ARG_DECL)
+  describe_proxy (const char *)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
@@ -990,8 +951,7 @@ public:
 
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq *&,
-                             CosTrading::OfferIdIterator_ptr &
-                             ACE_ENV_ARG_DECL)
+                             CosTrading::OfferIdIterator_ptr &)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::NotImplemented));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 74c5a327976..8a7f07c85e6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -12,7 +12,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
 TAO_Trader (TAO_Trader_Base::Trader_Components components)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // @@ Seth, we need a way to propagate the exception out.  This will
   // not work on platforms using environment variable.
@@ -26,10 +25,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (lookup,
                (TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().lookup_if (lookup->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK;
-      lookup->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->trading_components ().lookup_if (lookup->_this ());
+      lookup->_remove_ref ();
 
       this->ifs_[LOOKUP_IF] = lookup;
     }
@@ -40,10 +37,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (reg,
                (TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().register_if (reg->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK;
-      reg->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->trading_components ().register_if (reg->_this ());
+      reg->_remove_ref ();
 
       this->ifs_[REGISTER_IF] = reg;
     }
@@ -54,10 +49,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (admin,
                (TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().admin_if (admin->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK;
-      admin->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->trading_components ().admin_if (admin->_this ());
+      admin->_remove_ref ();
 
       this->ifs_[ADMIN_IF] = admin;
     }
@@ -68,10 +61,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (proxy,
                (TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().proxy_if (proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK;
-      proxy->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->trading_components ().proxy_if (proxy->_this ());
+      proxy->_remove_ref ();
 
       this->ifs_[PROXY_IF] = proxy;
     }
@@ -82,10 +73,8 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (link,
                (TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().link_if (link->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK;
-      link->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->trading_components ().link_if (link->_this ());
+      link->_remove_ref ();
 
       this->ifs_[LINK_IF] = link;
     }
@@ -96,31 +85,26 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
 {
   // Remove Trading Components from POA
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   for (int i = LOOKUP_IF; i <= LINK_IF; i++)
     {
       if (this->ifs_[i] != 0)
         {
-          ACE_TRY
+          try
             {
               PortableServer::POA_var poa =
-                this->ifs_[i]->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                this->ifs_[i]->_default_POA ();
 
               PortableServer::ObjectId_var id =
-                poa->servant_to_id (this->ifs_[i] ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                poa->servant_to_id (this->ifs_[i]);
 
-              poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              poa->deactivate_object (id.in ());
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               // Don't let exceptions propagate out of this call since
               // it's the destructor!
             }
-          ACE_ENDTRY;
         }
     }
 }
@@ -146,35 +130,35 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps)
 }
 
 template <class IF> CosTrading::Lookup_ptr
-TAO_Trader_Components<IF>::lookup_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::lookup_if (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
 }
 
 template <class IF> CosTrading::Register_ptr
-TAO_Trader_Components<IF>::register_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::register_if (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Register::_duplicate (this->comps_.register_if ());
 }
 
 template <class IF> CosTrading::Admin_ptr
-TAO_Trader_Components<IF>::admin_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::admin_if (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
 }
 
 template <class IF> CosTrading::Proxy_ptr
-TAO_Trader_Components<IF>::proxy_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::proxy_if (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
 }
 
 template <class IF> CosTrading::Link_ptr
-TAO_Trader_Components<IF>::link_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::link_if (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Link::_duplicate (this->comps_.link_if ());
@@ -187,28 +171,28 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Support_Attributes<IF>::supports_modifiable_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_modifiable_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Support_Attributes<IF>::supports_dynamic_properties (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_dynamic_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_proxy_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Support_Attributes<IF>::supports_proxy_offers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_proxy_offers ();
 }
 
 template <class IF> CosTrading::TypeRepository_ptr
-TAO_Support_Attributes<IF>::type_repos (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+TAO_Support_Attributes<IF>::type_repos ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ());
@@ -222,77 +206,77 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_search_card (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_search_card (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_match_card (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_match_card (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_return_card (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_return_card (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_list (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_list ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_hop_count (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_hop_count ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_hop_count (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_hop_count ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::def_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_follow_policy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_follow_policy ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::max_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_follow_policy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_follow_policy ();
@@ -306,7 +290,7 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Link_Attributes<IF>::max_link_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Link_Attributes<IF>::max_link_follow_policy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_link_follow_policy ();
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index cf892279bcc..825725ee266 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -115,27 +115,27 @@ public:
   // = CosTrading::TraderComponents methods.
   /// Returns an object reference to the Lookup interface of the trader.
   /// Returns nil if the trader does not support Lookup interface.
-  virtual CosTrading::Lookup_ptr lookup_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Lookup_ptr lookup_if (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns object reference for the Register interface of the trader.
   /// Returns nil if the trader does not support Register interface.
-  virtual CosTrading::Register_ptr register_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Register_ptr register_if (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns object reference for the Link interface of the trader.
   /// Returns nil if the trader does not support Link interface.
-  virtual CosTrading::Link_ptr link_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Link_ptr link_if (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns object reference to the Proxy interface of the trader.
   /// Returns nil if the trader does not support Proxy interface.
-  virtual CosTrading::Proxy_ptr proxy_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Proxy_ptr proxy_if (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns object reference for the Admin interface of the trader.
   /// Returns nil if the trader does not support Admin interface.
-  virtual CosTrading::Admin_ptr admin_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Admin_ptr admin_if (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -152,16 +152,16 @@ public:
 
   // = CosTrading::SupportAttributes methods.
 
-  virtual CORBA::Boolean supports_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Boolean supports_modifiable_properties (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean supports_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Boolean supports_dynamic_properties (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean supports_proxy_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Boolean supports_proxy_offers (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosTrading::TypeRepository_ptr type_repos (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::TypeRepository_ptr type_repos (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -178,47 +178,47 @@ public:
 
   // = CosTrading::ImportAttributes methods.
 
-  virtual CORBA::ULong def_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong def_search_card (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_search_card (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Search cardinality determines the maximum number of offers searched
   // before not considering other offers.
 
-  virtual CORBA::ULong def_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong def_match_card (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_match_card (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Match cardinality determines the maximum number of offers
   // matched to the constraints before not considering other offers..
 
-  virtual CORBA::ULong def_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong def_return_card (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_return_card (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return cardinality determines the maximum number of offers marked
   // to return before not considering other offers.
 
 
-  virtual CORBA::ULong max_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_list (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong def_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong def_hop_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_hop_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosTrading::FollowOption def_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::FollowOption def_follow_policy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosTrading::FollowOption max_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::FollowOption max_follow_policy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -235,7 +235,7 @@ public:
   TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs);
 
   // = CosTrading::LinkAttributes methods
-  virtual CosTrading::FollowOption max_link_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::FollowOption max_link_follow_policy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 4de7d0c8638..4c51123734e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -240,10 +240,7 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
       CORBA::TypeCode_var type = value.type ();
 
       // @@ Seth, this will not work on platforms using environment variable.
-      ACE_DECLARE_NEW_CORBA_ENV;
-      CORBA::Boolean equal = type->equal (CosTradingDynamic::_tc_DynamicProp
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      CORBA::Boolean equal = type->equal (CosTradingDynamic::_tc_DynamicProp);
 
       if (equal)
         return_value = 1;
@@ -253,8 +250,7 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
 }
 
 CORBA::Any*
-TAO_Property_Evaluator::property_value (int index
-                                        ACE_ENV_ARG_DECL)
+TAO_Property_Evaluator::property_value (int index)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* prop_val = 0;
@@ -293,22 +289,19 @@ TAO_Property_Evaluator::property_value (int index
           CORBA::TypeCode* type = dp_struct->returned_type.in ();
           CORBA::Any& info = dp_struct->extra_info;
 
-          ACE_TRY
+          try
             {
               // Retrieve the value of the dynamic property.
-              prop_val = dp_eval->evalDP(name, type, info ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              prop_val = dp_eval->evalDP(name, type, info);
 
               if (this->dp_cache_ != 0)
                 this->dp_cache_[index] = prop_val;
             }
-          ACE_CATCH (CORBA::SystemException, excp)
+          catch (const CORBA::SystemException&)
             {
-              ACE_TRY_THROW
+              throw
                 (CosTradingDynamic::DPEvalFailure (name, type, info));
             }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN (prop_val);
         }
     }
 
@@ -340,7 +333,7 @@ TAO_Property_Evaluator::property_type (int index)
 
 TAO_Property_Evaluator_By_Name::
 TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
-                                ACE_ENV_ARG_DECL,
+,
                                 CORBA::Boolean supports_dp)
   ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                    CosTrading::IllegalPropertyName))
@@ -353,11 +346,11 @@ TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
       const CosTrading::Property& prop = this->props_[i];
 
       if (! TAO_Trader_Base::is_valid_property_name (prop.name))
-        ACE_THROW (CosTrading::IllegalPropertyName (prop.name));
+        throw CosTrading::IllegalPropertyName (prop.name);
 
       CORBA::String_var prop_name = prop.name.in ();
       if (this->table_.bind (prop_name, i))
-        ACE_THROW (CosTrading::DuplicatePropertyName (prop.name));
+        throw CosTrading::DuplicatePropertyName (prop.name);
     }
 }
 
@@ -392,8 +385,7 @@ is_dynamic_property(const char* property_name)
 }
 
 CORBA::Any*
-TAO_Property_Evaluator_By_Name::property_value (const char* property_name
-                                                ACE_ENV_ARG_DECL)
+TAO_Property_Evaluator_By_Name::property_value (const char* property_name)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   int index = 0;
@@ -405,9 +397,7 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name
   if (this->table_.find (prop_name, index) == 0)
     {
       prop_value =
-        this->TAO_Property_Evaluator::property_value (index
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->TAO_Property_Evaluator::property_value (index);
     }
 
   return prop_value;
@@ -462,13 +452,10 @@ construct_dynamic_prop (const char* name,
   if (this->prop_.in () == CosTradingDynamic::DynamicPropEval::_nil ())
     {
       // Seth, we need a way to either propagate exceptions out.
-      ACE_DECLARE_NEW_CORBA_ENV;
 
-      this->prop_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->prop_ = this->_this ();
 
-      this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->_remove_ref ();
     }
 
   dp_struct->eval_if =
@@ -487,18 +474,12 @@ TAO_Dynamic_Property::destroy (void)
   if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ())
     {
       // @@ Seth, we need a way to propagate exceptions out.
-      ACE_DECLARE_NEW_CORBA_ENV;
-      PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      PortableServer::POA_var poa = this->_default_POA ();
 
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        poa->servant_to_id (this);
 
-      poa->deactivate_object (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa->deactivate_object (id.in ());
     }
 }
 
@@ -518,8 +499,7 @@ const char* TAO_Policies::POLICY_NAMES[] =
 };
 
 TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
-                            const CosTrading::PolicySeq& policies
-                            ACE_ENV_ARG_DECL)
+                            const CosTrading::PolicySeq& policies)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                   CosTrading::DuplicatePolicyName))
   : trader_ (trader)
@@ -534,7 +514,7 @@ TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
       int index = -1;
 
       if (length < ACE_OS::strlen (POLICY_NAMES[HOP_COUNT]))
-        ACE_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
+        throw CosTrading::Lookup::IllegalPolicyName (pol_name);
 
       switch (pol_name[0])
         {
@@ -574,9 +554,9 @@ TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
       // Match the name of the policy, and insert its value into the
       // vector.
       if (index == -1 || ACE_OS::strcmp (POLICY_NAMES[index], pol_name) != 0)
-        ACE_THROW (CosTrading::Lookup::IllegalPolicyName (pol_name));
+        throw CosTrading::Lookup::IllegalPolicyName (pol_name);
       else if (this->policies_[index] != 0)
-        ACE_THROW (CosTrading::DuplicatePolicyName (pol_name));
+        throw CosTrading::DuplicatePolicyName (pol_name);
       else
         this->policies_[index] = (CosTrading::Policy *) &(policies[j]);
     }
@@ -587,8 +567,7 @@ TAO_Policies::~TAO_Policies (void)
 }
 
 CORBA::ULong
-TAO_Policies::ulong_prop (POLICY_TYPE pol
-                          ACE_ENV_ARG_DECL) const
+TAO_Policies::ulong_prop (POLICY_TYPE pol) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::ULong return_value = 0, max_value = 0;
@@ -626,8 +605,7 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol
       const CosTrading::PolicyValue& value = policy->value;
       CORBA::TypeCode_var type = value.type ();
 
-      CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (return_value);
+      CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong);
 
       if (!equal_ulong)
         ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -643,29 +621,28 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol
 }
 
 CORBA::ULong
-TAO_Policies::search_card (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::search_card (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (SEARCH_CARD ACE_ENV_ARG_PARAMETER);
+  return this->ulong_prop (SEARCH_CARD);
 }
 
 CORBA::ULong
-TAO_Policies::match_card (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::match_card (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (MATCH_CARD ACE_ENV_ARG_PARAMETER);
+  return this->ulong_prop (MATCH_CARD);
 }
 
 CORBA::ULong
-TAO_Policies::return_card (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::return_card (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (RETURN_CARD ACE_ENV_ARG_PARAMETER);
+  return this->ulong_prop (RETURN_CARD);
 }
 
 CORBA::Boolean
-TAO_Policies::boolean_prop (POLICY_TYPE pol
-                            ACE_ENV_ARG_DECL) const
+TAO_Policies::boolean_prop (POLICY_TYPE pol) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean def_value = 1,
@@ -698,8 +675,7 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_boolean =
-        type->equal (CORBA::_tc_boolean ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (return_value);
+        type->equal (CORBA::_tc_boolean);
 
       if (!equal_boolean)
         ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -719,36 +695,36 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol
 
 
 CORBA::Boolean
-TAO_Policies::use_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::use_modifiable_properties (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES ACE_ENV_ARG_PARAMETER);
+  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES);
 }
 
 CORBA::Boolean
-TAO_Policies::use_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::use_dynamic_properties (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_DYNAMIC_PROPERTIES ACE_ENV_ARG_PARAMETER);
+  return this->boolean_prop (USE_DYNAMIC_PROPERTIES);
 }
 
 CORBA::Boolean
-TAO_Policies::use_proxy_offers (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::use_proxy_offers (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_PROXY_OFFERS ACE_ENV_ARG_PARAMETER);
+  return this->boolean_prop (USE_PROXY_OFFERS);
 }
 
 CORBA::Boolean
-TAO_Policies::exact_type_match (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::exact_type_match (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (EXACT_TYPE_MATCH ACE_ENV_ARG_PARAMETER);
+  return this->boolean_prop (EXACT_TYPE_MATCH);
 }
 
 
 CosTrading::TraderName*
-TAO_Policies::starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::starting_trader (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
@@ -761,12 +737,10 @@ TAO_Policies::starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_tradername =
-        type->equal (CosTrading::_tc_TraderName ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (trader_name);
+        type->equal (CosTrading::_tc_TraderName);
 
       CORBA::Boolean equal_linknameseq =
-        type->equal (CosTrading::_tc_LinkNameSeq ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (trader_name);
+        type->equal (CosTrading::_tc_LinkNameSeq);
 
       if (!equal_tradername ||
           !equal_linknameseq)
@@ -780,7 +754,7 @@ TAO_Policies::starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
 }
 
 CosTrading::FollowOption
-TAO_Policies::link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::link_follow_rule (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::FollowOption return_value =
@@ -797,8 +771,7 @@ TAO_Policies::link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const
 
       // Extract the link follow rule
       CORBA::Boolean type_equal =
-        type->equal (CosTrading::_tc_FollowOption ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (return_value);
+        type->equal (CosTrading::_tc_FollowOption);
 
       if (!type_equal)
         ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -814,8 +787,7 @@ TAO_Policies::link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const
 }
 
 CosTrading::FollowOption
-TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
-                                ACE_ENV_ARG_DECL) const
+TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue,
                    CosTrading::Link::IllegalLinkName,
@@ -829,8 +801,7 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
 
   // If not defined defaults to trader.def_link_follow_rule
   CosTrading::FollowOption query_link_follow_rule =
-    this->link_follow_rule (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (return_value);
+    this->link_follow_rule ();
 
   return_value = (query_link_follow_rule < trader_max_follow_policy)
     ? query_link_follow_rule : trader_max_follow_policy;
@@ -841,14 +812,14 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
 }
 
 CORBA::ULong
-TAO_Policies::hop_count (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::hop_count (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (HOP_COUNT ACE_ENV_ARG_PARAMETER);
+  return this->ulong_prop (HOP_COUNT);
 }
 
 CosTrading::Admin::OctetSeq*
-TAO_Policies::request_id (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::request_id (void) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::Admin::OctetSeq* request_id = 0;
@@ -860,8 +831,7 @@ TAO_Policies::request_id (ACE_ENV_SINGLE_ARG_DECL) const
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_octetseq =
-        type->equal (CosTrading::Admin::_tc_OctetSeq ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (request_id);
+        type->equal (CosTrading::Admin::_tc_OctetSeq);
 
       if (!equal_octetseq)
         ACE_THROW_RETURN (CosTrading::Lookup::PolicyTypeMismatch (*policy),
@@ -876,8 +846,7 @@ TAO_Policies::request_id (ACE_ENV_SINGLE_ARG_DECL) const
 void
 TAO_Policies::
 copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
-                       const CosTrading::Link::LinkInfo& link_info
-                       ACE_ENV_ARG_DECL) const
+                       const CosTrading::Link::LinkInfo& link_info) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
@@ -888,8 +857,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
   if (this->policies_[LINK_FOLLOW_RULE] != 0)
     {
       CosTrading::FollowOption query_link_follow_rule =
-        this->link_follow_rule (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->link_follow_rule ();
 
       follow_option = (CosTrading::FollowOption)
         (link_info.limiting_follow_rule < trader_max_follow_policy
@@ -926,8 +894,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
 void
 TAO_Policies::
 copy_to_pass (CosTrading::PolicySeq& policy_seq,
-              const CosTrading::Admin::OctetSeq& request_id
-              ACE_ENV_ARG_DECL) const
+              const CosTrading::Admin::OctetSeq& request_id) const
 {
   CORBA::ULong counter = 0;
   CosTrading::Policy* policy_buffer =
@@ -958,8 +925,7 @@ copy_to_pass (CosTrading::PolicySeq& policy_seq,
       // We always require a hop count.
       if (i == HOP_COUNT)
         {
-          CORBA::ULong count = this->hop_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          CORBA::ULong count = this->hop_count ();
 
           new_policy.name = POLICY_NAMES[HOP_COUNT];
           new_policy.value <<= count - 1;
@@ -1104,8 +1070,7 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void)
 
 void
 TAO_Offer_Modifier::
-delete_properties (const CosTrading::PropertyNameSeq& deletes
-                   ACE_ENV_ARG_DECL)
+delete_properties (const CosTrading::PropertyNameSeq& deletes)
   ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                   CosTrading::Register::MandatoryProperty,
                   CosTrading::IllegalPropertyName,
@@ -1120,16 +1085,16 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes
     {
       const char* dname = static_cast<const char*> (deletes[i]);
       if (! TAO_Trader_Base::is_valid_property_name (dname))
-        ACE_THROW (CosTrading::IllegalPropertyName (dname));
+        throw CosTrading::IllegalPropertyName (dname);
       else
         {
           CORBA::String_var prop_name (dname);
           if (this->mandatory_.find (prop_name) == 0)
-            ACE_THROW (CosTrading::Register::MandatoryProperty (this->type_, dname));
+            throw CosTrading::Register::MandatoryProperty (this->type_, dname);
           else if (delete_me.insert (prop_name) == 1)
-            ACE_THROW (CosTrading::DuplicatePropertyName (dname));
+            throw CosTrading::DuplicatePropertyName (dname);
           else if (this->props_.find (prop_name) == -1)
-            ACE_THROW (CosTrading::Register::UnknownPropertyName (dname));
+            throw CosTrading::Register::UnknownPropertyName (dname);
         }
     }
 
@@ -1144,8 +1109,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes
 
 void
 TAO_Offer_Modifier::
-merge_properties (const CosTrading::PropertySeq& modifies
-                  ACE_ENV_ARG_DECL)
+merge_properties (const CosTrading::PropertySeq& modifies)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName,
                    CosTrading::PropertyTypeMismatch,
@@ -1169,9 +1133,11 @@ merge_properties (const CosTrading::PropertySeq& modifies
               // Can't assign a dynamic property to a property with
               // readonly mode, and can't reassign a readonly property.
               if (prop_eval.is_dynamic_property (i))
-                ACE_THROW (CosTrading::ReadonlyDynamicProperty (this->type_, mname));
+                throw CosTrading::ReadonlyDynamicProperty (this->type_, mname);
               else if (this->props_.find (prop_name) == 0)
-                ACE_THROW (CosTrading::Register::ReadonlyProperty (this->type_, mname));
+                throw CosTrading::Register::ReadonlyProperty (
+                  this->type_,
+                  mname);
             }
 
           // Validate the property type if the property is defined in
@@ -1191,18 +1157,17 @@ merge_properties (const CosTrading::PropertySeq& modifies
               // seemed "safest".
 
               CORBA::Boolean td_equal =
-                type_def->equal (prop_type.in () ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                type_def->equal (prop_type.in ());
 
               if (!td_equal)
-                ACE_THROW (CosTrading::PropertyTypeMismatch (mname, modifies[i]));
+                throw CosTrading::PropertyTypeMismatch (mname, modifies[i]);
             }
 
           if (modify_me.insert (prop_name) == 1)
-            ACE_THROW (CosTrading::DuplicatePropertyName (mname));
+            throw CosTrading::DuplicatePropertyName (mname);
         }
       else
-        ACE_THROW (CosTrading::IllegalPropertyName (mname));
+        throw CosTrading::IllegalPropertyName (mname);
     }
 }
 
@@ -1265,27 +1230,20 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
   //  CosTrading::PropertySeq::freebuf (prop_buf);
 }
 
-TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies
-                                    ACE_ENV_ARG_DECL)
+TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies)
 {
-  search_card_ = policies.search_card (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  search_card_ = policies.search_card ();
 
-  match_card_ = policies.match_card (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  match_card_ = policies.match_card ();
 
-  return_card_ = policies.return_card (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  return_card_ = policies.return_card ();
 
-  dp_ = policies.use_dynamic_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  dp_ = policies.use_dynamic_properties ();
 
-  mod_ = policies.use_modifiable_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  mod_ = policies.use_modifiable_properties ();
 
   CORBA::Boolean exact_type_match =
-    policies.exact_type_match (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    policies.exact_type_match ();
 
   if (exact_type_match == 1)
     {
@@ -1439,8 +1397,7 @@ TAO_Offer_Filter::limits_applied (void)
 }
 
 TAO_Property_Filter::
-TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
-                     ACE_ENV_ARG_DECL)
+TAO_Property_Filter (const SPECIFIED_PROPS& desired_props)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
   : policy_  (desired_props._d ())
@@ -1460,10 +1417,10 @@ TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
             {
               CORBA::String_var prop_name (pname);
               if (this->props_.insert (prop_name) == 1)
-                ACE_THROW (CosTrading::DuplicatePropertyName (pname));
+                throw CosTrading::DuplicatePropertyName (pname);
             }
           else
-            ACE_THROW (CosTrading::IllegalPropertyName (pname));
+            throw CosTrading::IllegalPropertyName (pname);
         }
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 70b5717dde7..ee75b52740c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -70,7 +70,7 @@ public:
 	* CosTradingDynamic::DPEvalFailure exception on failure. If the
 	* property index is undefined, the method returns a null pointer.
 	*/
-  CORBA::Any* property_value(int index ACE_ENV_ARG_DECL)
+  CORBA::Any* property_value(int index)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
 
@@ -128,7 +128,7 @@ class TAO_Trading_Serv_Export TAO_Property_Evaluator_By_Name : public TAO_Proper
 public:
 
   TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
-                                  ACE_ENV_ARG_DECL ,
+ ,
                                   CORBA::Boolean supports_dp = 1)
     ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                      CosTrading::IllegalPropertyName));
@@ -153,8 +153,7 @@ public:
 	* TAO_Property_Evaluator, except property_value first discovers the
 	* index through a string matching lookup.
 	*/
-  CORBA::Any* property_value(const char* property_name
-                             ACE_ENV_ARG_DECL)
+  CORBA::Any* property_value(const char* property_name)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   /**
@@ -195,8 +194,7 @@ public:
   /// Dynamic property evaluation call-back method.
   virtual CORBA::Any* evalDP(const char* name,
                              CORBA::TypeCode_ptr returned_type,
-                             const CORBA::Any& extra_info
-                             ACE_ENV_ARG_DECL)
+                             const CORBA::Any& extra_info)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTradingDynamic::DPEvalFailure)) = 0;
 
@@ -256,8 +254,7 @@ public:
   static const char * POLICY_NAMES[];
 
   TAO_Policies (TAO_Trader_Base& trader,
-                const CosTrading::PolicySeq& policies
-                ACE_ENV_ARG_DECL)
+                const CosTrading::PolicySeq& policies)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                      CosTrading::DuplicatePolicyName));
 
@@ -285,7 +282,7 @@ public:
 
   ~TAO_Policies (void);
 
-  CORBA::ULong search_card (ACE_ENV_SINGLE_ARG_DECL) const
+  CORBA::ULong search_card (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -297,7 +294,7 @@ public:
   // trader's def_search_card attribute is used.
   // END SPEC
 
-  CORBA::ULong match_card (ACE_ENV_SINGLE_ARG_DECL) const
+  CORBA::ULong match_card (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -309,7 +306,7 @@ public:
   // attribute is used.
   // END SPEC
 
-  CORBA::ULong return_card (ACE_ENV_SINGLE_ARG_DECL) const
+  CORBA::ULong return_card (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -323,7 +320,7 @@ public:
 
   // = Offer consideration policies
 
-  CORBA::Boolean use_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL) const
+  CORBA::Boolean use_modifiable_properties (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -336,7 +333,7 @@ public:
   // included.
   // END SPEC
 
-  CORBA::Boolean use_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL) const
+  CORBA::Boolean use_dynamic_properties (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -349,7 +346,7 @@ public:
   // included.
   // END SPEC
 
-  CORBA::Boolean use_proxy_offers (ACE_ENV_SINGLE_ARG_DECL) const
+  CORBA::Boolean use_proxy_offers (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -361,7 +358,7 @@ public:
   // specified, such offers will be included.
   // END SPEC
 
-  CORBA::Boolean exact_type_match (ACE_ENV_SINGLE_ARG_DECL) const
+  CORBA::Boolean exact_type_match (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -390,12 +387,12 @@ public:
    * "starting_trader" policy with the first component removed.
    * END SPEC
    */
-  CosTrading::TraderName* starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
+  CosTrading::TraderName* starting_trader (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue));
 
   /// Determine the link follow policy for this query overall.
-  CosTrading::FollowOption link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const
+  CosTrading::FollowOption link_follow_rule (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -415,14 +412,13 @@ public:
    * else min(trader.max_follow_policy, link.limiting_follow_rule,
    *          trader.def_follow_policy)
    */
-  CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info
-                                             ACE_ENV_ARG_DECL) const
+  CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue,
                      CosTrading::Link::IllegalLinkName,
                      CosTrading::Link::UnknownLinkName));
 
-  CORBA::ULong hop_count (ACE_ENV_SINGLE_ARG_DECL) const
+  CORBA::ULong hop_count (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -439,13 +435,12 @@ public:
 
   /// Return the request_id passed to the query method across a link to
   /// another trader.
-  CosTrading::Admin::OctetSeq* request_id (ACE_ENV_SINGLE_ARG_DECL) const
+  CosTrading::Admin::OctetSeq* request_id (void) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   /// Policies to forward to the next trader in a federated query.
   void copy_to_pass (CosTrading::PolicySeq& policy_seq,
-                     const CosTrading::Admin::OctetSeq& request_id
-                     ACE_ENV_ARG_DECL) const;
+                     const CosTrading::Admin::OctetSeq& request_id) const;
 
   /// Policies to forward to the next trader in a directed query.
   void copy_to_forward (CosTrading::PolicySeq& policy_seq,
@@ -462,21 +457,18 @@ public:
    *                  trader.max_follow_policy)
    */
   void copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
-                              const CosTrading::Link::LinkInfo& link_info
-                              ACE_ENV_ARG_DECL) const
+                              const CosTrading::Link::LinkInfo& link_info) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue));
 
 private:
 
   /// Reconclile a ULong property with its default.
-  CORBA::ULong ulong_prop (POLICY_TYPE pol
-                           ACE_ENV_ARG_DECL) const
+  CORBA::ULong ulong_prop (POLICY_TYPE pol) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   /// Reconcile a Boolean property with its debault.
-  CORBA::Boolean boolean_prop (POLICY_TYPE pol
-                               ACE_ENV_ARG_DECL) const
+  CORBA::Boolean boolean_prop (POLICY_TYPE pol) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   TAO_Policies (const TAO_Policies&);
@@ -592,8 +584,7 @@ public:
 
   /// Delete the properties whose names were given to the
   /// constructor. Ensure we don't delete mandatory properties.
-  void delete_properties (const CosTrading::PropertyNameSeq& deletes
-                          ACE_ENV_ARG_DECL)
+  void delete_properties (const CosTrading::PropertyNameSeq& deletes)
     ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                      CosTrading::Register::MandatoryProperty,
                      CosTrading::IllegalPropertyName,
@@ -605,8 +596,7 @@ public:
    * destination with the source's value. This class claims the memory
    * in the modifies sequence.
    */
-  void merge_properties (const CosTrading::PropertySeq& modifies
-                         ACE_ENV_ARG_DECL)
+  void merge_properties (const CosTrading::PropertySeq& modifies)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName,
                      CosTrading::PropertyTypeMismatch,
@@ -668,8 +658,7 @@ public:
 
   /// Glean from the TypeStruct and Policy setting the appropriate way
   /// to screen unsuitable offers from consideration.
-  TAO_Offer_Filter (TAO_Policies& policies
-                    ACE_ENV_ARG_DECL);
+  TAO_Offer_Filter (TAO_Policies& policies);
 
   /// Set the offer filter to screen for offers containing properties
   /// that aren't marked as readonly in this TypeStruct.
@@ -751,8 +740,7 @@ public:
   TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {}
 
   /// Verify that the specified properties are correct.
-  TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
-                       ACE_ENV_ARG_DECL)
+  TAO_Property_Filter (const SPECIFIED_PROPS& desired_props)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index a4f3bfd4e5d..2f38753092c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -80,40 +80,35 @@ TAO_Trading_Loader::~TAO_Trading_Loader (void)
 int
 TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Copy command line parameter.
       ACE_Argv_Type_Converter command_line(argc, argv);
 
       // Initialize the ORB Manager
       this->orb_manager_.init (command_line.get_argc(),
-                               command_line.get_ASCII_argv()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               command_line.get_ASCII_argv());
 
       CORBA::ORB_var orb =
         this->orb_manager_.orb ();
 
       // Initializes and sets up the Trading Service
       CORBA::Object_var object =
-        this->create_object (orb.in (), command_line.get_argc(), command_line.get_TCHAR_argv() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->create_object (orb.in (), command_line.get_argc(), command_line.get_TCHAR_argv());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       //    @@ Should we log this???
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 TAO_Trading_Loader::fini (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->trader_.get () != 0)
         {
@@ -123,8 +118,7 @@ TAO_Trading_Loader::fini (void)
             trd_comp.link_if ();
 
           CosTrading::LinkNameSeq_var link_name_seq =
-            our_link->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            our_link->list_links ();
 
           ACE_DEBUG ((LM_DEBUG,
                       "*** Unlinking from federated traders.\n"));
@@ -139,16 +133,12 @@ TAO_Trading_Loader::fini (void)
               ACE_DEBUG ((LM_DEBUG,
                           "*** Describing the next link.\n"));
               CosTrading::Link::LinkInfo_var link_info =
-                our_link->describe_link (link_name_seq[i]
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                our_link->describe_link (link_name_seq[i]);
 
               ACE_DEBUG ((LM_DEBUG,
                           "*** Removing link to %s.\n",
                           static_cast<const char *> (link_name_seq[i])));
-              our_link->remove_link (link_name_seq[i]
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              our_link->remove_link (link_name_seq[i]);
 
               CosTrading::Lookup_ptr remote_lookup;
               remote_lookup =
@@ -157,42 +147,35 @@ TAO_Trading_Loader::fini (void)
               ACE_DEBUG ((LM_DEBUG,
                           "*** Retrieving its link interface.\n"));
               CosTrading::Link_var remote_link =
-                remote_lookup->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                remote_lookup->link_if ();
 
               ACE_DEBUG ((LM_DEBUG,
                           "*** Removing its link to us.\n"));
 
               if (this->bootstrapper_)
                 {
-                  remote_link->remove_link ("Bootstrap"
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  remote_link->remove_link ("Bootstrap");
                 }
               else
                 {
-                  remote_link->remove_link (this->name_.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  remote_link->remove_link (this->name_.in ());
                 }
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Trading Service shutting down");
+      ex._tao_print_exception ("Trading Service shutting down");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 int
-TAO_Trading_Loader::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Trading_Loader::run (void)
 {
   int return_value =
-    this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_manager_.run ();
 
   return return_value;
 }
@@ -200,16 +183,14 @@ TAO_Trading_Loader::run (ACE_ENV_SINGLE_ARG_DECL)
 CORBA::Object_ptr
 TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
                                    int argc,
-                                   ACE_TCHAR *argv[]
-                                   ACE_ENV_ARG_DECL)
+                                   ACE_TCHAR *argv[])
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the ORB
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr);
 
   // Activating the poa manager
-  this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->orb_manager_.activate_poa_manager ();
 
   // Create a Trader Object and set its Service Type Repository.
   auto_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv));
@@ -222,8 +203,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
   TAO_Trading_Components_i &trd_comp =
     this->trader_->trading_components ();
 
-  sup_attr.type_repos (this->type_repos_._this (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  sup_attr.type_repos (this->type_repos_._this ());
 
   // The Spec says: return a reference to the Lookup interface from
   // the resolve_initial_references method.
@@ -231,9 +211,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
     trd_comp.lookup_if ();
 
   this->ior_ =
-    orb->object_to_string (lookup
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    orb->object_to_string (lookup);
 
   // Parse the args
   if (this->parse_args (argc, argv) == -1)
@@ -249,22 +227,19 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
     }
 
   CORBA::Object_var table_object =
-    orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    orb->resolve_initial_references ("IORTable");
 
   IORTable::Table_var adapter =
-    IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    IORTable::Table::_narrow (table_object.in ());
 
   if (CORBA::is_nil (adapter.in ()))
     {
       ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
-    } 
+    }
   else
     {
       adapter->bind ("TradingService",
-                     this->ior_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                     this->ior_.in ());
     }
 
   if (this->federate_)
@@ -274,8 +249,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
       // @@ Could do other things. For example, every timeout
       // period try to federate again, but let's not hardcode that
       // policy.
-      int rc = this->bootstrap_to_federation (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      int rc = this->bootstrap_to_federation ();
 
       if (rc == -1)
         this->init_multicast_server ();
@@ -287,7 +261,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
 }
 
 int
-TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Trading_Loader::bootstrap_to_federation (void)
 {
   // If all traders follow this strategy, it creates a complete graph
   // of all known traders on a multicast network.
@@ -297,8 +271,7 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               "*** Bootstrapping to another Trading Service.\n"));
   CORBA::Object_var trading_obj =
-    orb->resolve_initial_references ("TradingService" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->resolve_initial_references ("TradingService");
 
   if (CORBA::is_nil (trading_obj.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -309,15 +282,12 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               "*** Narrowing the lookup interface.\n"));
   CosTrading::Lookup_var lookup_if =
-    CosTrading::Lookup::_narrow (trading_obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CosTrading::Lookup::_narrow (trading_obj.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Obtaining the link interface.\n"));
   CosTrading::Link_var link_if =
-    lookup_if->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    lookup_if->link_if ();
 
   TAO_Trading_Components_i &trd_comp =
     this->trader_->trading_components ();
@@ -331,24 +301,19 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
   link_if->add_link (this->name_.in (),
                      our_lookup,
                      CosTrading::always,
-                     CosTrading::always
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                     CosTrading::always);
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Linking self to found trader.\n"));
   our_link->add_link ("Bootstrap",
                       lookup_if.in (),
                       CosTrading::always,
-                      CosTrading::always
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                      CosTrading::always);
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Retrieving list of known linked traders.\n"));
   CosTrading::LinkNameSeq_var link_name_seq =
-    link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    link_if->list_links ();
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Linking self to all linked traders.\n"));
@@ -364,9 +329,7 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
                       "*** Getting info for link %s.\n",
                       static_cast<const char *> (link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i]
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            link_if->describe_link (link_name_seq[i]);
 
           CosTrading::Lookup_ptr remote_lookup;
           remote_lookup = link_info->target.in ();
@@ -374,26 +337,21 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
           ACE_DEBUG ((LM_DEBUG,
                       "*** Retrieving its link interface.\n"));
           CosTrading::Link_var remote_link =
-            remote_lookup->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            remote_lookup->link_if ();
 
           ACE_DEBUG ((LM_DEBUG,
                       "*** Creating a link to me from it.\n"));
           remote_link->add_link (this->name_.in (),
                                  our_lookup,
                                  CosTrading::always,
-                                 CosTrading::always
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                 CosTrading::always);
 
           ACE_DEBUG ((LM_DEBUG,
                       "*** Creating a link to it from me.\n"));
           our_link->add_link (link_name_seq[i],
                               remote_lookup,
                               CosTrading::always,
-                              CosTrading::always
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                              CosTrading::always);
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index 3b344cd9333..a12b8e2a3f3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -49,13 +49,12 @@ public:
   // Called by the Service Configurator framework to remove the
   // Event Service. Defined in <ace/Service_Config.h>
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the Trading Service
 
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                    int argc,
-                                   ACE_TCHAR *argv[]
-                                   ACE_ENV_ARG_DECL)
+                                   ACE_TCHAR *argv[])
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function call initializes the Trading Service given a reference to the
   // ORB and the command line parameters.
@@ -66,7 +65,7 @@ protected:
   // Enable the Trading Service to answer multicast requests for its
   // IOR.
 
-  int bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL);
+  int bootstrap_to_federation (void);
   // Bootstrap to another trader, and attach to its trader network.
 
   int parse_args (int &argc, ACE_TCHAR *argv []);
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index a7d70ac5c85..5903d6e7ec4 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -17,16 +17,14 @@ ORBInitializer::ORBInitializer (void)
 
 void
 ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor;
@@ -37,14 +35,11 @@ ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor =
     reject_interceptor;
 
-  info->add_server_request_interceptor (safe_reject_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (safe_reject_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
index b288bb12c48..5a190fb2006 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h
@@ -58,12 +58,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
index 004cd30266a..4d770e79ef2 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.cpp
@@ -17,8 +17,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
-                        Test::number  cl_number
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        Test::number  cl_number)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (cl_number % 2 == 0)
@@ -40,8 +39,8 @@ Roundtrip::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
index 6cd4e89a956..70aec84ecc9 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
@@ -23,11 +23,10 @@ public:
 
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
-		                       Test::number cl_number
-                                       ACE_ENV_ARG_DECL)
+		                       Test::number cl_number)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index b68487ba367..160cf111f80 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -73,7 +73,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-        
+
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -94,22 +94,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -122,8 +119,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start, number);
         }
 
       ACE_Sample_History history (niterations);
@@ -147,9 +143,7 @@ main (int argc, char *argv[])
 	  }
 	  */
 
-          (void) roundtrip->test_method (start, number
-					 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start, number);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -179,16 +173,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index ed3756bffbe..13242530af3 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -72,18 +72,13 @@ parse_args (int argc, char *argv[])
 CORBA::Object_ptr
 join_object_group (CORBA::ORB_ptr orb,
                    CosLoadBalancing::LoadManager_ptr lm,
-                   const PortableGroup::Location & location
-                   ACE_ENV_ARG_PARAMETER)
+                   const PortableGroup::Location & location)
 {
   CORBA::Object_var ns_object =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (ns_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    CosNaming::NamingContext::_narrow (ns_object.in ());
 
   CosNaming::Name name (1);
   name.length (1);
@@ -93,13 +88,11 @@ join_object_group (CORBA::ORB_ptr orb,
 
   CORBA::Object_var group;
 
-  ACE_TRY
+  try
     {
-      group = nc->resolve (name
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      group = nc->resolve (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& )
     {
       // Object group not created.  Create one.
       const char repository_id[] = "IDL:Test/Roundtrip:1.0";
@@ -121,16 +114,12 @@ join_object_group (CORBA::ORB_ptr orb,
 
       group = lm->create_object (repository_id,
                                  criteria,
-                                 fcid.out ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 fcid.out ());
 
-      ACE_TRY_EX (foo)
+      try
         {
           nc->bind (name,
-                    group.in ()
-                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+                    group.in ());
 
           PortableGroup::Properties props (1);
           props.length (1);
@@ -192,45 +181,31 @@ join_object_group (CORBA::ORB_ptr orb,
 
           props[0].val <<= strategy_info;
 
-          lm->set_default_properties (props
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          lm->set_default_properties (props);
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
           // Somebody beat us to creating the object group.  Clean up
           // the one we created.
-          lm->delete_object (fcid.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          lm->delete_object (fcid.in ());
 
-          group = nc->resolve (name
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          group = nc->resolve (name);
         }
-      ACE_ENDTRY;
-      ACE_TRY_CHECK;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   Roundtrip * roundtrip_impl;
   ACE_NEW_THROW_EX (roundtrip_impl,
                     Roundtrip (orb),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var owner_transfer (roundtrip_impl);
 
   Test::Roundtrip_var roundtrip =
-    roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    roundtrip_impl->_this ();
 
   group = lm->add_member (group.in (),
                           location,
-                          roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                          roundtrip.in ());
 
   return group._retn ();
 }
@@ -238,7 +213,7 @@ join_object_group (CORBA::ORB_ptr orb,
 int
 main (int argc, char *argv[])
 {
-        
+
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -261,9 +236,9 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-    
 
-  ACE_TRY_NEW_ENV
+
+  try
     {
       ORBInitializer *initializer = 0;
       ACE_NEW_RETURN (initializer,
@@ -272,19 +247,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -292,62 +262,47 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::Object_var lm_object =
-        orb->resolve_initial_references ("LoadManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var load_manager =
-        CosLoadBalancing::LoadManager::_narrow (lm_object.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosLoadBalancing::LoadManager::_narrow (lm_object.in ());
 
       TAO_LB_CPU_Utilization_Monitor * monitor_servant;
       ACE_NEW_THROW_EX (monitor_servant,
                         TAO_LB_CPU_Utilization_Monitor,
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
 
       PortableServer::ServantBase_var safe_monitor_servant (monitor_servant);
 
       CosLoadBalancing::LoadMonitor_var load_monitor =
-        monitor_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        monitor_servant->_this ();
 
       PortableGroup::Location_var location =
-        load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        load_monitor->the_location ();
 
       CORBA::Object_var roundtrip =
         ::join_object_group (orb.in (),
                              load_manager.in (),
-                             location.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             location.in ());
 
       TAO_LB_LoadAlert & alert_servant = initializer->load_alert ();
 
       CosLoadBalancing::LoadAlert_var load_alert =
-        alert_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        alert_servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -360,32 +315,24 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       load_manager->register_load_monitor (location.in (),
-                                           load_monitor.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           load_monitor.in ());
 
       load_manager->register_load_alert (location.in (),
-                                         load_alert.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         load_alert.in ());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index 6ebd0450558..ec190f3298c 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -18,16 +18,14 @@ ORBInitializer::ORBInitializer (void)
 
 void
 ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (this->interceptor_,
@@ -37,14 +35,11 @@ ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var sr_interceptor =
     this->interceptor_;
 
-  info->add_server_request_interceptor (sr_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (sr_interceptor.in ());
 
   PortableInterceptor::ServerRequestInterceptor_ptr reject_interceptor;
   ACE_NEW_THROW_EX (reject_interceptor,
@@ -54,14 +49,11 @@ ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var safe_reject_interceptor =
     reject_interceptor;
 
-  info->add_server_request_interceptor (safe_reject_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (safe_reject_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
index 77132d3adc8..83734927f65 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
@@ -58,12 +58,10 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index 1a640f3cbf7..a9ea95abd62 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -30,7 +30,7 @@ RPS_Monitor::~RPS_Monitor (void)
 }
 
 CosLoadBalancing::Location *
-RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
+RPS_Monitor::the_location (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
@@ -41,13 +41,12 @@ RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return location;
 }
 
 CosLoadBalancing::LoadList *
-RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
+RPS_Monitor::loads (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const ACE_Time_Value current_time = ACE_OS::gettimeofday ();
@@ -72,7 +71,6 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CosLoadBalancing::LoadList_var load_list = tmp;
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
index 765656037b8..821e3964021 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
@@ -49,8 +49,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::Location * the_location ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the average CPU load at the location which this
@@ -60,8 +59,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CosLoadBalancing::LoadList * loads ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
index 9a6a6ccd10e..4c8cf73a5c2 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp
@@ -17,8 +17,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
-                        Test::number  cl_number 
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        Test::number  cl_number)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -34,8 +33,8 @@ Roundtrip::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
index 6cd4e89a956..70aec84ecc9 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
@@ -23,11 +23,10 @@ public:
 
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
-		                       Test::number cl_number
-                                       ACE_ENV_ARG_DECL)
+		                       Test::number cl_number)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
index bba0ca52470..b7d2ca0b5f9 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp
@@ -14,22 +14,21 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void)
 }
 
 char *
-ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -38,8 +37,7 @@ ServerRequestInterceptor::receive_request_service_contexts (
 
 void
 ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -47,16 +45,14 @@ ServerRequestInterceptor::receive_request (
 
 void
 ServerRequestInterceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr /* ri */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -64,8 +60,7 @@ ServerRequestInterceptor::send_exception (
 
 void
 ServerRequestInterceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
index 1e85d70efd2..556a67570bf 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -60,38 +60,33 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index 94221caa7bd..b362a753c85 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -94,22 +94,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -121,8 +118,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, number ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start, number);
         }
 
       ACE_Sample_History history (niterations);
@@ -146,9 +142,7 @@ main (int argc, char *argv[])
 	  }
 	  */
 
-          (void) roundtrip->test_method (start, number
-					 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start, number);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -178,16 +172,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index f6ce3d00373..dc7076250bf 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -75,18 +75,13 @@ parse_args (int argc, char *argv[])
 CORBA::Object_ptr
 join_object_group (CORBA::ORB_ptr orb,
                    CosLoadBalancing::LoadManager_ptr lm,
-                   const PortableGroup::Location & location
-                   ACE_ENV_ARG_DECL)
+                   const PortableGroup::Location & location)
 {
   CORBA::Object_var ns_object =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    orb->resolve_initial_references ("NameService");
 
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (ns_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    CosNaming::NamingContext::_narrow (ns_object.in ());
 
   CosNaming::Name name (1);
   name.length (1);
@@ -96,13 +91,11 @@ join_object_group (CORBA::ORB_ptr orb,
 
   CORBA::Object_var group;
 
-  ACE_TRY
+  try
     {
-      group = nc->resolve (name
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      group = nc->resolve (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& )
     {
       // Object group not created.  Create one.
       const char repository_id[] = "IDL:Test/Roundtrip:1.0";
@@ -124,16 +117,12 @@ join_object_group (CORBA::ORB_ptr orb,
 
       group = lm->create_object (repository_id,
                                  criteria,
-                                 fcid.out ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 fcid.out ());
 
-      ACE_TRY_EX (foo)
+      try
         {
           nc->bind (name,
-                    group.in ()
-                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+                    group.in ());
 
           PortableGroup::Properties props (1);
           props.length (1);
@@ -195,45 +184,31 @@ join_object_group (CORBA::ORB_ptr orb,
 
           props[0].val <<= strategy_info;
 
-          lm->set_default_properties (props
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          lm->set_default_properties (props);
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      catch (const CosNaming::NamingContext::AlreadyBound& )
         {
           // Somebody beat us to creating the object group.  Clean up
           // the one we created.
-          lm->delete_object (fcid.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          lm->delete_object (fcid.in ());
 
-          group = nc->resolve (name
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (foo);
+          group = nc->resolve (name);
         }
-      ACE_ENDTRY;
-      ACE_TRY_CHECK;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   Roundtrip * roundtrip_impl;
   ACE_NEW_THROW_EX (roundtrip_impl,
                     Roundtrip (orb),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var owner_transfer (roundtrip_impl);
 
   Test::Roundtrip_var roundtrip =
-    roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    roundtrip_impl->_this ();
 
   group = lm->add_member (group.in (),
                           location,
-                          roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                          roundtrip.in ());
 
   return group._retn ();
 }
@@ -263,7 +238,7 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ORBInitializer *initializer = 0;
       ACE_NEW_RETURN (initializer,
@@ -272,19 +247,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -292,63 +262,48 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::Object_var lm_object =
-        orb->resolve_initial_references ("LoadManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var load_manager =
-        CosLoadBalancing::LoadManager::_narrow (lm_object.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosLoadBalancing::LoadManager::_narrow (lm_object.in ());
 
       RPS_Monitor * monitor_servant;
       ACE_NEW_THROW_EX (monitor_servant,
                         RPS_Monitor (initializer->interceptor ()),
                         CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
 
       PortableServer::ServantBase_var safe_monitor_servant (monitor_servant);
 
       CosLoadBalancing::LoadMonitor_var load_monitor =
-        monitor_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        monitor_servant->_this ();
 
       PortableGroup::Location_var location =
-        load_monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        load_monitor->the_location ();
 
       CORBA::Object_var roundtrip =
         ::join_object_group (orb.in (),
                              load_manager.in (),
-                             location.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             location.in ());
 
       TAO_LB_LoadAlert & alert_servant = initializer->load_alert ();
 
       CosLoadBalancing::LoadAlert_var load_alert =
-        alert_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        alert_servant._this ();
 
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -361,32 +316,24 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       load_manager->register_load_monitor (location.in (),
-                                           load_monitor.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           load_monitor.in ());
 
       load_manager->register_load_alert (location.in (),
-                                         load_alert.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         load_alert.in ());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index 280e7ba2efa..0712a57e703 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -41,11 +41,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       Client_Options options (argc, argv);
       if (argc != 1)
@@ -70,21 +68,16 @@ int main (int argc, char *argv[])
                                      orb,
                                      rt_class,
                                      1 // options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     );
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       PortableServer::POA_var ec_poa (rtserver_setup.poa ());
 
@@ -102,27 +95,18 @@ int main (int argc, char *argv[])
       Servant_var<TAO_EC_Event_Channel> ec_impl (
               RTEC_Initializer::create (ec_poa.in (),
                                         ec_poa.in (),
-                                        rtserver_setup.rtcorba_setup ()
-                                        ACE_ENV_ARG_PARAMETER)
+                                        rtserver_setup.rtcorba_setup ())
               );
-      ACE_TRY_CHECK;
 
-      ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl->activate ();
 
       PortableServer::ObjectId_var ec_id =
-        ec_poa->activate_object (ec_impl.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_poa->activate_object (ec_impl.in ());
       CORBA::Object_var ec_object =
-        ec_poa->id_to_reference (ec_id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_poa->id_to_reference (ec_id.in ());
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ());
 
       EC_Destroyer ec_destroyer (ec.in ());
 
@@ -161,9 +145,7 @@ int main (int argc, char *argv[])
 
       if (!options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
 
@@ -186,14 +168,11 @@ int main (int argc, char *argv[])
           ec_poa.in (),
           ec_poa.in (),
           ec.in (),
-          &the_barrier
-          ACE_ENV_ARG_PARAMETER);
+          &the_barrier);
 
       if (options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
       Send_Task high_priority_task;
@@ -236,13 +215,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 8720b8bb599..8fc6824ff85 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -44,10 +44,8 @@ class Roundtrip_Peer : public Peer_Base
 public:
   Roundtrip_Peer (CORBA::ORB_ptr orb,
                   RTServer_Setup &rtserver_setup,
-                  RT_Class &rt_class
-                  ACE_ENV_ARG_DECL)
-    : Peer_Base (orb, rtserver_setup
-                 ACE_ENV_ARG_PARAMETER)
+                  RT_Class &rt_class)
+    : Peer_Base (orb, rtserver_setup)
     , rt_class_ (&rt_class)
   {
   }
@@ -57,8 +55,7 @@ public:
    */
   virtual Federated_Test::Experiment_Results *
       run_experiment (CORBA::Long experiment_id,
-                      CORBA::Long iterations
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Long iterations)
         ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -133,11 +130,9 @@ int main (int argc, char *argv[])
   TAO_EC_Default_Factory::init_svcs();
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -145,70 +140,52 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
       Servant_var<Roundtrip_Peer> peer_impl (
           new Roundtrip_Peer (orb,
                               rtserver_setup,
-                              rt_class
-                              ACE_ENV_ARG_PARAMETER)
+                              rt_class)
           );
-      ACE_TRY_CHECK;
 
       Federated_Test::Peer_var peer =
-        peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        peer_impl->_this ();
 
       ACE_DEBUG ((LM_DEBUG, "Finished peer configuration and activation\n"));
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Federated_Test::Control_var control =
-        Federated_Test::Control::_narrow (object.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Federated_Test::Control::_narrow (object.in ());
 
-      control->join (peer.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      control->join (peer.in ());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 Federated_Test::Experiment_Results *
 Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
-                                CORBA::Long iterations
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Long iterations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int thread_count = 1;
@@ -241,9 +218,7 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
           this->poa_.in (),
           this->poa_.in (),
           this->event_channel_.in (),
-          &the_barrier
-          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+          &the_barrier);
 #endif
 
   Client_Pair high_priority_group;
@@ -254,9 +229,7 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
                             gsf,
                             this->poa_.in (),
                             this->poa_.in ());
-  high_priority_group.connect (this->event_channel_.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  high_priority_group.connect (this->event_channel_.in ());
   Auto_Disconnect<Client_Pair> high_priority_disconnect (&high_priority_group);
 
   Send_Task high_priority_task;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
index 677cf6870f5..f6194ba73dd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
@@ -80,11 +80,9 @@ int main (int argc, char *argv[])
 {
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -92,22 +90,16 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       PortableServer::POA_var control_poa (rtserver_setup.poa ());
       Servant_var<Control> control_impl (
@@ -119,12 +111,10 @@ int main (int argc, char *argv[])
         );
 
       Federated_Test::Control_var control =
-        control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        control_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (control.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (control.in ());
 
       // Output the ior to the <ior_output_file>
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -136,21 +126,17 @@ int main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index d4ef62e9781..5e859b50e45 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -4,8 +4,8 @@
 #include "Roundtrip.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Baseline, 
-           Roundtrip, 
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Baseline,
+           Roundtrip,
            "$Id$")
 
 Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
@@ -16,13 +16,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Long workload_in_usecs
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        CORBA::Long workload_in_usecs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   CORBA::Long elapsed = 0;
-  
+
   while (elapsed < workload_in_usecs)
     {
       elapsed =
@@ -30,13 +29,13 @@ Roundtrip::test_method (Test::Timestamp send_time,
             (ACE_OS::gethrtime () - start) / this->gsf_
           );
     }
-    
+
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
index a4b01ce89b1..9a67072a43b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
@@ -18,11 +18,10 @@ public:
 
   // = The skeleton methods
   virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Long workload_in_usecs
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::Long workload_in_usecs)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index a3caafe3b54..22ba06395b5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -34,21 +34,18 @@ public:
   {
   }
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void run_test (void) = 0;
 
   virtual int svc (void)
   {
     this->barrier_->wait ();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
-        this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->run_test ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
       }
-    ACE_ENDTRY;
 
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) done...\n"));
     return 0;
@@ -76,25 +73,23 @@ public:
   {
   }
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void run_test (void)
   {
     for (int i = 0; i != this->iterations_; ++i)
       {
         ACE_Time_Value period (0, this->period_in_usecs_);
         ACE_OS::sleep (period);
 
-        ACE_TRY {
+        try{
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           (void) this->roundtrip_->test_method (start,
-                                                this->workload_
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                this->workload_);
           ACE_hrtime_t elapsed = ACE_OS::gethrtime () - start;
 
           this->sample_history.sample (elapsed);
 
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -128,7 +123,7 @@ public:
     this->stopped_ = 1;
   }
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void run_test (void)
   {
     for (;;)
       {
@@ -141,15 +136,13 @@ public:
             return;
         }
 
-        ACE_TRY {
+        try{
           CORBA::ULongLong dummy = 0;
           (void) this->roundtrip_->test_method (dummy,
-                                                this->workload_
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                this->workload_);
 
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -167,11 +160,9 @@ int main (int argc, char *argv[])
 {
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       Client_Options options (argc, argv);
       if (argc != 1)
@@ -195,25 +186,18 @@ int main (int argc, char *argv[])
       RTClient_Setup rtclient_setup (options.use_rt_corba,
                                      orb,
                                      rt_class,
-                                     options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     options.nthreads);
 
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
       CORBA::Object_var object =
-        orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (options.ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       CORBA::PolicyList_var inconsistent_policies;
-      (void) roundtrip->_validate_connection (inconsistent_policies
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) roundtrip->_validate_connection (inconsistent_policies);
 
       int thread_count = 1 + options.nthreads;
       ACE_Barrier the_barrier (thread_count);
@@ -263,18 +247,15 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - all task(s) joined\n"));
 
-      roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      roundtrip->shutdown ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
index f82199ba24e..aaf0be0d9be 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
@@ -63,11 +63,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -75,40 +73,29 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       PortableServer::POA_var the_poa (rtserver_setup.poa ());
 
       Servant_var<Roundtrip> roundtrip (new Roundtrip (orb));
 
       PortableServer::ObjectId_var id =
-        the_poa->activate_object (roundtrip.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        the_poa->activate_object (roundtrip.in ());
 
       CORBA::Object_var object =
-        the_poa->id_to_reference (id.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        the_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (object.in ());
 
       // Output the ior to the <ior_output_file>
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -120,18 +107,15 @@ int main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index 134dc30f9b3..dda1ee587a1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -5,8 +5,8 @@
 #include "Implicit_Deactivator.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, 
-           Callback, 
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
+           Callback,
            "$Id$")
 
 Callback::Callback (int iterations,
@@ -23,8 +23,7 @@ Callback::sample_history (void)
 }
 
 void
-Callback::sample (Test::Timestamp the_timestamp
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Callback::sample (Test::Timestamp the_timestamp)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t elapsed = ACE_OS::gethrtime () - the_timestamp;
@@ -36,7 +35,7 @@ Callback::sample (Test::Timestamp the_timestamp
 }
 
 PortableServer::POA_ptr
-Callback::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Callback::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
index 520895f1cab..93f716e0b51 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h
@@ -36,11 +36,10 @@ public:
   //@{
   /** @name The RtecEventComm::PushCallback methods
    */
-  virtual void sample (Test::Timestamp the_timestamp
-                       ACE_ENV_ARG_DECL)
+  virtual void sample (Test::Timestamp the_timestamp)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index 5c7627717eb..30beb42f72b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -4,8 +4,8 @@
 #include "Session.h"
 #include "Implicit_Deactivator.h"
 
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, 
-           Session, 
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
+           Session,
            "$Id$")
 
 Session::Session (Test::Callback_ptr cb,
@@ -16,24 +16,21 @@ Session::Session (Test::Callback_ptr cb,
 }
 
 void
-Session::sample (Test::Timestamp the_timestamp
-                 ACE_ENV_ARG_DECL)
+Session::sample (Test::Timestamp the_timestamp)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->cb_->sample (the_timestamp
-                     ACE_ENV_ARG_PARAMETER);
+  this->cb_->sample (the_timestamp);
 }
 
 void
-Session::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Session::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
+  Implicit_Deactivator deactivator (this);
 }
 
 PortableServer::POA_ptr
-Session::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Session::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
index 65d8f4b6507..8786b3f89ca 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h
@@ -18,14 +18,13 @@ public:
            PortableServer::POA_ptr poa);
 
   // = The skeleton methods
-  virtual void sample (Test::Timestamp the_timestamp
-                       ACE_ENV_ARG_DECL)
+  virtual void sample (Test::Timestamp the_timestamp)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index 735a8d0ec84..eebb4855cc9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -5,8 +5,8 @@
 #include "Session.h"
 #include "Servant_var.h"
 
-ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback, 
-           Session_Factory, 
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
+           Session_Factory,
            "$Id$")
 
 Session_Factory::Session_Factory (CORBA::ORB_ptr orb,
@@ -17,25 +17,24 @@ Session_Factory::Session_Factory (CORBA::ORB_ptr orb,
 }
 
 Test::Session_ptr
-Session_Factory::create_new_session (Test::Callback_ptr cb
-                                     ACE_ENV_ARG_DECL)
+Session_Factory::create_new_session (Test::Callback_ptr cb)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<Session> session_impl (new Session (cb,
                                                   this->poa_.in ()));
 
-  return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return session_impl->_this ();
 }
 
 void
-Session_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Session_Factory::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 PortableServer::POA_ptr
-Session_Factory::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Session_Factory::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
index 875535d6b93..829afb63323 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h
@@ -18,14 +18,13 @@ public:
                    PortableServer::POA_ptr poa);
 
   // = The skeleton methods
-  virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb
-                                                ACE_ENV_ARG_DECL)
+  virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 420b6d15b95..9d0e2bcea31 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -40,21 +40,18 @@ public:
   {
   }
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void run_test (void) = 0;
 
   virtual int svc (void)
   {
     this->the_barrier_->wait ();
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
-        this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->run_test ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
       }
-    ACE_ENDTRY;
 
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) done...\n"));
     return 0;
@@ -81,18 +78,15 @@ public:
   {
   }
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void run_test (void)
   {
     Test::Callback_var cb =
-      callback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      callback->_this ();
 
     Implicit_Deactivator deactivator (callback);
 
     Test::Session_var session =
-      this->session_factory_->create_new_session (cb.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->session_factory_->create_new_session (cb.in ());
 
     ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ());
 
@@ -108,13 +102,11 @@ public:
         ACE_Time_Value period (0, this->period_in_usecs_);
         ACE_OS::sleep (period);
 
-        ACE_TRY {
+        try{
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          (void) session->sample (start
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+          (void) session->sample (start);
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -146,18 +138,15 @@ public:
     this->stopped_ = 1;
   }
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void run_test (void)
   {
     Test::Callback_var cb =
-      callback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      callback->_this ();
 
     Implicit_Deactivator deactivator (callback);
 
     Test::Session_var session =
-      this->session_factory_->create_new_session (cb.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->session_factory_->create_new_session (cb.in ());
 
     ACE_Utils::Auto_Functor<Test::Session,Shutdown<Test::Session> > auto_shutdown (session.in ());
 
@@ -172,14 +161,12 @@ public:
             return;
         }
 
-        ACE_TRY {
+        try{
           CORBA::ULongLong dummy = 0;
-          (void) session->sample (dummy
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) session->sample (dummy);
 
-        } ACE_CATCHANY {
-        } ACE_ENDTRY;
+        } catch (const CORBA::Exception&) {
+        }
       }
   }
 
@@ -198,11 +185,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       Client_Options options (argc, argv);
       if (argc != 1)
@@ -226,22 +211,16 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (options.use_rt_corba,
                                      orb,
                                      rt_class,
-                                     options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     options.nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       PortableServer::POA_var the_poa (rtserver_setup.poa ());
 
@@ -254,18 +233,13 @@ int main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
       CORBA::Object_var object =
-        orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (options.ior);
 
       Test::Session_Factory_var session_factory =
-        Test::Session_Factory::_narrow (object.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Session_Factory::_narrow (object.in ());
 
       CORBA::PolicyList_var inconsistent_policies;
-      (void) session_factory->_validate_connection (inconsistent_policies
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) session_factory->_validate_connection (inconsistent_policies);
 
       int thread_count = 1 + options.nthreads;
       ACE_Barrier the_barrier (thread_count);
@@ -318,18 +292,15 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - all task(s) joined\n"));
 
-      session_factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      session_factory->shutdown ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
index 59d0eb001d2..81143039133 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
@@ -66,11 +66,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -78,22 +76,16 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       PortableServer::POA_var the_poa (rtserver_setup.poa ());
 
@@ -111,12 +103,10 @@ int main (int argc, char *argv[])
           );
 
       CORBA::Object_var object =
-        session_factory->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        session_factory->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (object.in ());
 
       // Output the ior to the <ior_output_file>
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -128,18 +118,15 @@ int main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index 5e723b3cca5..bd774077776 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -35,11 +35,9 @@ int main (int argc, char *argv[])
 
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       Client_Options options (argc, argv);
       if (argc != 1)
@@ -64,21 +62,16 @@ int main (int argc, char *argv[])
                                      orb,
                                      rt_class,
                                      1 // options.nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     );
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       PortableServer::POA_var the_poa (rtserver_setup.poa ());
 
@@ -94,20 +87,15 @@ int main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
       CORBA::Object_var object =
-        orb->string_to_object (options.ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (options.ior);
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
 
       EC_Destroyer ec_destroyer (ec.in ());
 
       CORBA::PolicyList_var inconsistent_policies;
-      (void) ec->_validate_connection (inconsistent_policies
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) ec->_validate_connection (inconsistent_policies);
 
       ACE_DEBUG ((LM_DEBUG, "Found EC, validated connection\n"));
 
@@ -144,9 +132,7 @@ int main (int argc, char *argv[])
 
       if (!options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
 
@@ -169,14 +155,11 @@ int main (int argc, char *argv[])
           the_poa.in (),
           the_poa.in (),
           ec.in (),
-          &the_barrier
-          ACE_ENV_ARG_PARAMETER);
+          &the_barrier);
 
       if (options.high_priority_is_last)
         {
-          high_priority_group.connect (ec.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          high_priority_group.connect (ec.in ());
           high_priority_disconnect = &high_priority_group;
         }
       Send_Task high_priority_task;
@@ -219,13 +202,11 @@ int main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index 8c7d83af31a..86f6fc8fe95 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -70,11 +70,9 @@ int main (int argc, char *argv[])
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ORB_Holder orb (argc, argv, ""
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ORB_Holder orb (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -82,22 +80,16 @@ int main (int argc, char *argv[])
       RTServer_Setup rtserver_setup (use_rt_corba,
                                      orb,
                                      rt_class,
-                                     nthreads
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     nthreads);
 
       PortableServer::POA_var root_poa =
         RIR_Narrow<PortableServer::POA>::resolve (orb,
-                                                  "RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       PortableServer::POA_var ec_poa (rtserver_setup.poa ());
 
@@ -112,31 +104,21 @@ int main (int argc, char *argv[])
       Servant_var<TAO_EC_Event_Channel> ec_impl (
               RTEC_Initializer::create (ec_poa.in (),
                                         ec_poa.in (),
-                                        rtserver_setup.rtcorba_setup ()
-                                        ACE_ENV_ARG_PARAMETER)
+                                        rtserver_setup.rtcorba_setup ())
               );
-      ACE_TRY_CHECK;
 
-      ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl->activate ();
 
       PortableServer::ObjectId_var ec_id =
-        ec_poa->activate_object (ec_impl.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_poa->activate_object (ec_impl.in ());
       CORBA::Object_var ec_object =
-        ec_poa->id_to_reference (ec_id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_poa->id_to_reference (ec_id.in ());
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (ec.in ());
 
       // Output the ior to the <ior_output_file>
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -150,19 +132,16 @@ int main (int argc, char *argv[])
 
       do {
         ACE_Time_Value tv (1, 0);
-        orb->run (tv ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        orb->run (tv);
       } while (ec_impl->destroyed () == 0);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
index 3a09d5c68cf..c3b6ed4b9a2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
@@ -10,14 +10,11 @@
 template<class Client> ACE_INLINE void
 Disconnect<Client>::operator () (Client *client)
 {
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
-      client->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client->disconnect ();
     }
-  ACE_CATCHANY { };
-  ACE_ENDTRY;
+  catch (const CORBA::Exception&){ };
 }
 
 template<class Client> ACE_INLINE
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
index 7daaf4ae6b4..402c9187779 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
@@ -13,8 +13,8 @@
 #include "Client_Group.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           Client_Group, 
+ACE_RCSID (TAO_PERF_RTEC,
+           Client_Group,
            "$Id$")
 
 void
@@ -54,14 +54,12 @@ Client_Group::init (CORBA::Long experiment_id,
 }
 
 void
-Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL)
+Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
-  this->client_pair_.connect (ec ACE_ENV_ARG_PARAMETER);
+  this->client_pair_.connect (ec);
   Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_);
 
-  this->loopback_pair_.connect (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->loopback_pair_.connect (ec);
   Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_);
 
   loopback_pair_disconnect.release ();
@@ -69,7 +67,7 @@ Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 }
 
 void
-Client_Group::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Group::disconnect (void)
 {
   Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_);
   Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
index ef93ba153c1..0f50a4bbc5a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h
@@ -71,11 +71,10 @@ public:
              PortableServer::POA_ptr consumer_poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   //@{
   /** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
index 9f32c911ff2..d2c71bd2cb9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
@@ -13,8 +13,8 @@
 #include "Client_Pair.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           Client_Pair, 
+ACE_RCSID (TAO_PERF_RTEC,
+           Client_Pair,
            "$Id$")
 
 void
@@ -59,15 +59,12 @@ Client_Pair::init (CORBA::Long experiment_id,
 }
 
 void
-Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL)
+Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
-  this->supplier_->connect (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_->connect (ec);
   Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_);
 
-  this->consumer_->connect (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_->connect (ec);
   Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_);
 
   consumer_disconnect.release ();
@@ -75,7 +72,7 @@ Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 }
 
 void
-Client_Pair::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Pair::disconnect (void)
 {
   Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_);
   Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
index 8dc4e8b03b2..d88d5fbff53 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h
@@ -74,11 +74,10 @@ public:
              PortableServer::POA_ptr consumer_poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   //@{
   /** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 5fc7489897e..a89beb5367b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -11,8 +11,8 @@
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           Consumer, 
+ACE_RCSID (TAO_PERF_RTEC,
+           Consumer,
            "$Id$")
 
 Consumer::Consumer (CORBA::Long experiment_id,
@@ -31,12 +31,10 @@ Consumer::Consumer (CORBA::Long experiment_id,
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                   ACE_ENV_ARG_DECL)
+Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_consumers ();
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -44,13 +42,11 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      consumer_admin->obtain_push_supplier ();
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
   consumer_qos.is_gateway = 0;
@@ -66,13 +62,11 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
   h1.source = this->experiment_id_;
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
-                                                consumer_qos
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                consumer_qos);
 }
 
 void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -82,15 +76,12 @@ Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
     proxy = this->proxy_supplier_._retn ();
   }
 
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Implicit_Deactivator deactivator (this);
 
-  ACE_TRY {
-    proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  } ACE_CATCHANY {
-  } ACE_ENDTRY;
+  try{
+    proxy->disconnect_push_supplier ();
+  } catch (const CORBA::Exception&) {
+  }
 }
 
 ACE_Sample_History &
@@ -100,8 +91,7 @@ Consumer::sample_history (void)
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet &events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -125,7 +115,7 @@ Consumer::push (const RtecEventComm::EventSet &events
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -134,7 +124,7 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 PortableServer::POA_ptr
-Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index f9206fe4ba2..4718601a084 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
@@ -38,11 +38,10 @@ public:
             PortableServer::POA_ptr poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Access the history of samples
   ACE_Sample_History &sample_history (void);
@@ -50,12 +49,11 @@ public:
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index b35d809551c..89c0ed4b450 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -18,8 +18,8 @@
 #include "ace/Basic_Stats.h"
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID (TAO_RTEC_Perf, 
-           Control, 
+ACE_RCSID (TAO_RTEC_Perf,
+           Control,
            "$Id$")
 
 Control::Control (size_t peers_expected,
@@ -43,8 +43,7 @@ Control::~Control (void)
 }
 
 void
-Control::join (Federated_Test::Peer_ptr peer
-               ACE_ENV_ARG_DECL)
+Control::join (Federated_Test::Peer_ptr peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -84,9 +83,7 @@ Control::join (Federated_Test::Peer_ptr peer
         {
           if (i != j)
             {
-              this->peers_[j]->connect (this->peers_[i].in ()
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              this->peers_[j]->connect (this->peers_[i].in ());
             }
         }
     }
@@ -120,9 +117,7 @@ Control::join (Federated_Test::Peer_ptr peer
             {
               loopbacks[lcount] =
                 this->peers_[j]->setup_loopback (experiment_id,
-                                                 base_event_type
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                                                 base_event_type);
 
               ACE_AUTO_PTR_RESET (disconnects[lcount],
                                   new Loopback_Disconnect (
@@ -133,9 +128,7 @@ Control::join (Federated_Test::Peer_ptr peer
 
               loopbacks[lcount] =
                 this->peers_[j]->setup_loopback (experiment_id,
-                                                 base_event_type + 2
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                                                 base_event_type + 2);
 
               ACE_AUTO_PTR_RESET (disconnects[lcount],
                                   new Loopback_Disconnect (
@@ -148,9 +141,7 @@ Control::join (Federated_Test::Peer_ptr peer
 
       Federated_Test::Experiment_Results_var results =
         this->peers_[i]->run_experiment (experiment_id,
-                                         this->iterations_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                         this->iterations_);
 
       ACE_Sample_History history (results->length ());
       for (CORBA::ULong k = 0; k != results->length (); ++k)
@@ -172,7 +163,7 @@ Control::join (Federated_Test::Peer_ptr peer
 }
 
 PortableServer::POA_ptr
-Control::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Control::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
index 9b09d063fb0..e5bc4eb52df 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
@@ -38,11 +38,10 @@ public:
   //@{
   /** @name The Federated_Test::Control methods
    */
-  virtual void join (Federated_Test::Peer_ptr peer
-                     ACE_ENV_ARG_DECL)
+  virtual void join (Federated_Test::Peer_ptr peer)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
index 220c8c3957c..6657f5294fd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
@@ -12,8 +12,8 @@
 #include "EC_Destroyer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           EC_Destroyer, 
+ACE_RCSID (TAO_PERF_RTEC,
+           EC_Destroyer,
            "$Id$")
 
 EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
@@ -23,12 +23,10 @@ EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
 
 EC_Destroyer::~EC_Destroyer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  } ACE_CATCH (CORBA::Exception, ex) {
+  try{
+    this->ec_->destroy ();
+  } catch (const CORBA::Exception&) {
     // @@ TODO Log this event, check the Servant_var.cpp comments for
     // details.
-  } ACE_ENDTRY;
+  }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
index ded3aa19ae6..eede6b8f2fe 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
@@ -15,16 +15,13 @@
 #include "Implicit_Deactivator.inl"
 #endif /* __ACE_INLINE__ */
 
-Implicit_Deactivator::Implicit_Deactivator (PortableServer::Servant servant
-                                            ACE_ENV_ARG_DECL)
+Implicit_Deactivator::Implicit_Deactivator (PortableServer::Servant servant)
 {
   this->poa_ =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_default_POA ();
 
   this->id_ =
-    this->poa_->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->servant_to_id (servant);
 }
 
 Implicit_Deactivator::Implicit_Deactivator (Implicit_Deactivator &rhs)
@@ -50,16 +47,13 @@ Implicit_Deactivator::~Implicit_Deactivator ()
   if (this->id_.ptr () == 0)
     return;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    this->poa_->deactivate_object (this->id_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  } ACE_CATCHANY {
+  try{
+    this->poa_->deactivate_object (this->id_.in ());
+  } catch (const CORBA::Exception&) {
     // @@ TODO This event should be logged. Cannot throw because that
     //    would make it impossible to use this class effectively.
     //    Read Servant_var.cpp for more details.
-  } ACE_ENDTRY;
+  }
 }
 
 Implicit_Deactivator&
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
index d7140a3275c..90fcc23b08e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
@@ -23,8 +23,7 @@ public:
   /**
    * @param client The client
    */
-  explicit Implicit_Deactivator (PortableServer::Servant servant = 0
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  explicit Implicit_Deactivator (PortableServer::Servant servant = 0);
   Implicit_Deactivator (Implicit_Deactivator& rhs);
   Implicit_Deactivator& operator= (Implicit_Deactivator& rhs);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
index 41c08b2a882..3039480f1f8 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -18,23 +18,21 @@ Loopback::Loopback (CORBA::Long experiment_id,
                     CORBA::Long base_event_type,
                     PortableServer::POA_ptr supplier_poa,
                     PortableServer::POA_ptr consumer_poa,
-                    RtecEventChannelAdmin::EventChannel_ptr ec
-                    ACE_ENV_ARG_DECL)
+                    RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->loopback_pair_.init (experiment_id,
                              base_event_type,
                              supplier_poa,
                              consumer_poa);
 
-  this->loopback_pair_.connect (ec ACE_ENV_ARG_PARAMETER);
+  this->loopback_pair_.connect (ec);
 }
 
 void
-Loopback::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Loopback::disconnect (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_);
 
-  Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Implicit_Deactivator deactivator (this);
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
index 384c42cd3cb..5b21092466f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
@@ -30,13 +30,12 @@ public:
             CORBA::Long base_event_type,
             PortableServer::POA_ptr supplier_poa,
             PortableServer::POA_ptr consumer_poa,
-            RtecEventChannelAdmin::EventChannel_ptr ec
-            ACE_ENV_ARG_DECL);
+            RtecEventChannelAdmin::EventChannel_ptr ec);
 
   //@{
   /** @name The Federated_Test::Loopback methods
    */
-  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 2c3d1f8084e..14ca03140b0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -10,8 +10,8 @@
 #include "Implicit_Deactivator.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-ACE_RCSID (PERF_RTEC, 
-           Loopback_Consumer, 
+ACE_RCSID (PERF_RTEC,
+           Loopback_Consumer,
            "$Id$")
 
 Loopback_Consumer::
@@ -27,12 +27,10 @@ Loopback_Consumer (CORBA::Long experiment_id,
 }
 
 void
-Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_consumers ();
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -40,13 +38,11 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      consumer_admin->obtain_push_supplier ();
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
   consumer_qos.is_gateway = 0;
@@ -62,13 +58,11 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
   h1.type   = this->event_type_;
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
-                                                consumer_qos
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                consumer_qos);
 }
 
 void
-Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Loopback_Consumer::disconnect (void)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -78,29 +72,25 @@ Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
     proxy = this->proxy_supplier_._retn ();
   }
 
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Implicit_Deactivator deactivator (this);
 
-  ACE_TRY
+  try
     {
-      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_supplier ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
 }
 
 void
-Loopback_Consumer::push (const RtecEventComm::EventSet &events
-                              ACE_ENV_ARG_DECL)
+Loopback_Consumer::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n"));
-  this->supplier_->push (events ACE_ENV_ARG_PARAMETER);
+  this->supplier_->push (events);
 }
 
 void
-Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Consumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -109,7 +99,7 @@ Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 PortableServer::POA_ptr
-Loopback_Consumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Consumer::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index 4ff3203146c..00295b762b7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
@@ -35,21 +35,19 @@ public:
                      PortableServer::POA_ptr poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
index 5a0c80aed0c..cde25535480 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
@@ -13,8 +13,8 @@
 #include "Loopback_Pair.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           Loopback_Pair, 
+ACE_RCSID (TAO_PERF_RTEC,
+           Loopback_Pair,
            "$Id$")
 
 void
@@ -33,15 +33,12 @@ Loopback_Pair::init (CORBA::Long experiment_id,
 }
 
 void
-Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL)
+Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
-  this->loopback_supplier_->connect (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->loopback_supplier_->connect (ec);
   Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_);
 
-  this->loopback_consumer_->connect (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->loopback_consumer_->connect (ec);
   Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_);
 
   loopback_consumer_disconnect.release ();
@@ -49,7 +46,7 @@ Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 }
 
 void
-Loopback_Pair::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Pair::disconnect (void)
 {
   Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_);
   Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
index d70b8bfd9a4..cb59f6178ba 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h
@@ -53,11 +53,10 @@ public:
              PortableServer::POA_ptr consumer_poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   //@{
   /** @name Accessors
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index 1e516958c44..a1750d26f21 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -9,8 +9,8 @@
 #include "Loopback_Supplier.h"
 #include "Implicit_Deactivator.h"
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           Loopback_Supplier, 
+ACE_RCSID (TAO_PERF_RTEC,
+           Loopback_Supplier,
            "$Id$")
 
 Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id,
@@ -24,12 +24,10 @@ Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id,
 }
 
 void
-Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_suppliers ();
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -37,13 +35,11 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      supplier_admin->obtain_push_consumer ();
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
   supplier_qos.is_gateway = 0;
@@ -54,13 +50,11 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
   sh0.source = this->experiment_id_;
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
-                                                supplier_qos
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                supplier_qos);
 }
 
 void
-Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Loopback_Supplier::disconnect (void)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -70,20 +64,16 @@ Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
     proxy = this->proxy_consumer_._retn ();
   }
 
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Implicit_Deactivator deactivator (this);
 
-  ACE_TRY {
-    proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  } ACE_CATCHANY {
-  } ACE_ENDTRY;
+  try{
+    proxy->disconnect_push_consumer ();
+  } catch (const CORBA::Exception&) {
+  }
 }
 
 void
-Loopback_Supplier::push (const RtecEventComm::EventSet &source
-                         ACE_ENV_ARG_DECL)
+Loopback_Supplier::push (const RtecEventComm::EventSet &source)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Supplier pushing\n"));
@@ -114,11 +104,11 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source
       events[i].header.source = this->experiment_id_;
     }
 
-  proxy->push (events ACE_ENV_ARG_PARAMETER);
+  proxy->push (events);
 }
 
 void
-Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Supplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -127,7 +117,7 @@ Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 PortableServer::POA_ptr
-Loopback_Supplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Loopback_Supplier::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 24f2055cf04..6c58a9d55f7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
@@ -37,22 +37,20 @@ public:
                      PortableServer::POA_ptr poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
-  void push (const RtecEventComm::EventSet &events
-             ACE_ENV_ARG_DECL_NOT_USED)
+  void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
index 36154df9fcd..4ca093c4c0d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp
@@ -29,8 +29,7 @@ Low_Priority_Setup (int consumer_count,
                     PortableServer::POA_ptr supplier_poa,
                     PortableServer::POA_ptr consumer_poa,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    ACE_Barrier *barrier
-                    ACE_ENV_ARG_DECL)
+                    ACE_Barrier *barrier)
   : consumer_count_ (consumer_count)
   , clients_ (consumer_count ? new Client_Type[consumer_count] : 0)
   , disconnect_ (consumer_count ? new Client_Auto_Disconnect[consumer_count] : 0)
@@ -57,9 +56,7 @@ Low_Priority_Setup (int consumer_count,
                               gsf,
                               supplier_poa,
                               consumer_poa);
-      this->clients_[i].connect (ec
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->clients_[i].connect (ec);
       // Automatically disconnect the group if the connection was
       // successful
       this->disconnect_[i] = &this->clients_[i];
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
index e6f5315abd0..eed759944c3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
@@ -49,8 +49,7 @@ public:
                       PortableServer::POA_ptr supplier_poa,
                       PortableServer::POA_ptr consumer_poa,
                       RtecEventChannelAdmin::EventChannel_ptr ec,
-                      ACE_Barrier *barrier
-                      ACE_ENV_ARG_DECL);
+                      ACE_Barrier *barrier);
 
   /// Stop all running threads
   void stop_all_threads (void);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
index a2ee9263b1f..65c80374a6b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
@@ -12,26 +12,22 @@
 #include "ORB_Holder.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           ORB_Holder, 
+ACE_RCSID (TAO_PERF_RTEC,
+           ORB_Holder,
            "$Id$")
 
 ORB_Holder::ORB_Holder (int &argc, char *argv[],
-                        const char *orb_id
-                        ACE_ENV_ARG_DECL)
-  :  orb_ (CORBA::ORB_init (argc, argv, orb_id
-                            ACE_ENV_ARG_PARAMETER))
+                        const char *orb_id)
+  :  orb_ (CORBA::ORB_init (argc, argv, orb_id))
 {
 }
 
 ORB_Holder::~ORB_Holder (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  } ACE_CATCH (CORBA::Exception, ex) {
+  try{
+    this->orb_->destroy ();
+  } catch (const CORBA::Exception&) {
     // @@ TODO Log this event, check the Servant_var.cpp comments for
     // details.
-  } ACE_ENDTRY;
+  }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
index a600f780980..fd3fc10c0f4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h
@@ -27,8 +27,7 @@ class TAO_RTEC_Perf_Export ORB_Holder
 public:
   /// Constructor
   ORB_Holder (int &argc, char *argv[],
-              const char *orb_id = 0
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+              const char *orb_id = 0);
 
   /// Destructor
   /**
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
index 13fbb623600..daca08c071b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
@@ -11,13 +11,9 @@
 ACE_INLINE void
 ORB_Shutdown::operator () (CORBA::ORB_ptr orb)
 {
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
-      orb->shutdown (0
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (0);
     }
-  ACE_CATCHANY { };
-  ACE_ENDTRY;
+  catch (const CORBA::Exception&){ };
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
index 369d7f358fa..4723f9ae360 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
@@ -24,16 +24,13 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 int
 ORB_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
index 42bc3fb5676..d4e996064cd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
@@ -20,10 +20,8 @@ ORB_Task_Activator::~ORB_Task_Activator (void)
 {
   if (this->task_ == 0)
     return;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    (*this->task_)->shutdown (0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  } ACE_CATCHANY {
-  } ACE_ENDTRY;
+  try{
+    (*this->task_)->shutdown (0);
+  } catch (const CORBA::Exception&) {
+  }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 2b0a05a1eee..c4bb55f0347 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -23,35 +23,25 @@ ACE_RCSID (TAO_RTEC_Perf,
            "$Id$")
 
 Peer_Base::Peer_Base (CORBA::ORB_ptr orb,
-                      RTServer_Setup &rtserver_setup
-                      ACE_ENV_ARG_DECL)
+                      RTServer_Setup &rtserver_setup)
   : orb_ (CORBA::ORB::_duplicate (orb))
   , poa_ (rtserver_setup.poa ())
 {
   Servant_var<TAO_EC_Event_Channel> ec_impl (
       RTEC_Initializer::create (this->poa_.in (),
                                 this->poa_.in (),
-                                rtserver_setup.rtcorba_setup ()
-                                ACE_ENV_ARG_PARAMETER)
+                                rtserver_setup.rtcorba_setup ())
       );
-  ACE_CHECK;
 
-  ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec_impl->activate ();
 
   PortableServer::ObjectId_var ec_id =
-    this->poa_->activate_object (ec_impl.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->activate_object (ec_impl.in ());
   CORBA::Object_var ec_object =
-    this->poa_->id_to_reference (ec_id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->poa_->id_to_reference (ec_id.in ());
 
   this->event_channel_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ());
 }
 
 Peer_Base::~Peer_Base (void)
@@ -59,7 +49,7 @@ Peer_Base::~Peer_Base (void)
 }
 
 void
-Peer_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Peer_Base::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -68,53 +58,43 @@ Peer_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       RtecEventChannelAdmin::EventChannel::_nil ();
   }
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 CORBA::Object_ptr
-Peer_Base::channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Base::channel (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Object::_duplicate (this->event_channel_.in ());
 }
 
 void
-Peer_Base::connect (Federated_Test::Peer_ptr remote_peer
-                    ACE_ENV_ARG_DECL)
+Peer_Base::connect (Federated_Test::Peer_ptr remote_peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
   CORBA::Object_var remote_ec_object =
-    remote_peer->channel (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    remote_peer->channel ();
 
   RtecEventChannelAdmin::EventChannel_var remote_ec =
-    RtecEventChannelAdmin::EventChannel::_narrow (remote_ec_object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RtecEventChannelAdmin::EventChannel::_narrow (remote_ec_object.in ());
 
   Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP);
   gateway->init (remote_ec.in (),
-                 this->event_channel_.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                 this->event_channel_.in ());
 
   RtecEventChannelAdmin::Observer_var observer =
-    gateway->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    gateway->_this ();
 
   RtecEventChannelAdmin::Observer_Handle h =
-    this->event_channel_->append_observer (observer.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->append_observer (observer.in ());
 
   gateway->observer_handle (h);
 }
 
 Federated_Test::Loopback_ptr
 Peer_Base::setup_loopback (CORBA::Long experiment_id,
-                           CORBA::Long base_event_type
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Long base_event_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<Loopback> loopback (
@@ -122,15 +102,12 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id,
                     base_event_type,
                     this->poa_.in (),
                     this->poa_.in (),
-                    this->event_channel_.in ()
-                    ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK_RETURN (Federated_Test::Loopback::_nil ());
+                    this->event_channel_.in ()));
 
   Auto_Disconnect<Loopback> disconnect (loopback);
 
   Federated_Test::Loopback_var lb =
-    loopback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Federated_Test::Loopback::_nil ());
+    loopback->_this ();
 
   disconnect.release ();
 
@@ -138,7 +115,7 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id,
 }
 
 PortableServer::POA_ptr
-Peer_Base::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Base::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index 948ef5b20a1..caecbbfefa9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
@@ -32,8 +32,7 @@ class TAO_RTEC_Perf_Export Peer_Base
 public:
   /// Constructor
   Peer_Base (CORBA::ORB_ptr orb,
-             RTServer_Setup &rtserver_setup
-             ACE_ENV_ARG_DECL);
+             RTServer_Setup &rtserver_setup);
 
   /// Destructor
   virtual ~Peer_Base (void);
@@ -41,23 +40,21 @@ public:
   //@{
   /** @name The Federated_Test::Peer methods
    */
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Object_ptr
-      channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      channel (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void connect (Federated_Test::Peer_ptr remote_peer
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void connect (Federated_Test::Peer_ptr remote_peer)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Federated_Test::Loopback_ptr setup_loopback (CORBA::Long experiment_id,
-                                               CORBA::Long base_event_type
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                               CORBA::Long base_event_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index bbb980bde7b..a6c00e9751d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -14,25 +14,20 @@
 #include "PriorityBand_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           PriorityBand_Setup, 
+ACE_RCSID (TAO_PERF_RTEC,
+           PriorityBand_Setup,
            "$Id$")
 
 PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
-                                        const RTCORBA_Setup &rtcorba_setup
-                                        ACE_ENV_ARG_DECL)
+                                        const RTCORBA_Setup &rtcorba_setup)
 {
   CORBA::PolicyManager_var policy_manager =
     RIR_Narrow<CORBA::PolicyManager>::resolve (orb,
-                                               "ORBPolicyManager"
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               "ORBPolicyManager");
 
   RTCORBA::RTORB_var rtorb =
     RIR_Narrow<RTCORBA::RTORB>::resolve (orb,
-                                         "RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         "RTORB");
 
   const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes ();
 
@@ -46,16 +41,11 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
   CORBA::PolicyList policy_list (1); policy_list.length (1);
 
   policy_list[0] =
-    rtorb->create_priority_banded_connection_policy (priority_bands
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rtorb->create_priority_banded_connection_policy (priority_bands);
   policy_manager->set_policy_overrides (policy_list,
-                                        CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        CORBA::ADD_OVERRIDE);
 
-  policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policy_list[0]->destroy ();
 }
 
 PriorityBand_Setup::~PriorityBand_Setup (void)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
index 33cebd601cf..30b7b0dac84 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h
@@ -29,8 +29,7 @@ class TAO_RTEC_Perf_Export PriorityBand_Setup
 public:
   /// Constructor
   PriorityBand_Setup (CORBA::ORB_ptr orb,
-                      const RTCORBA_Setup &rtcorba_setup
-                      ACE_ENV_ARG_DECL);
+                      const RTCORBA_Setup &rtcorba_setup);
 
   /// Destructor
   /**
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
index ba719129de4..0fb7d2c70bf 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp
@@ -15,22 +15,18 @@
 
 #include "ace/Log_Msg.h"
 
-template<class Interface> ACE_TYPENAME RIR_Narrow<Interface>::Interface_ptr
+template<class Interface> typename RIR_Narrow<Interface>::Interface_ptr
 RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
-                                const char *object_id
-                                ACE_ENV_ARG_DECL)
+                                const char *object_id)
 {
   Interface_var interface;
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var object =
-        orb->resolve_initial_references (object_id
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references (object_id);
 
-      interface = Interface::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      interface = Interface::_narrow (object.in ());
 
       if (CORBA::is_nil (interface.in ()))
         {
@@ -39,10 +35,9 @@ RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb,
                       object_id));
           ACE_OS::exit (1);
         }
-    }ACE_CATCHANY{
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception \n");
+    } catch (const CORBA::Exception& ex) {
+      ex._tao_print_exception ("Caught an exception \n");
     }
-  ACE_ENDTRY;
   return interface._retn ();
 }
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h
index 3cb61f27724..2e22caccb82 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h
@@ -24,12 +24,11 @@ template<class Interface>
 class RIR_Narrow
 {
 public:
-  typedef ACE_TYPENAME Interface::_ptr_type Interface_ptr;
-  typedef ACE_TYPENAME Interface::_var_type Interface_var;
+  typedef typename Interface::_ptr_type Interface_ptr;
+  typedef typename Interface::_var_type Interface_var;
 
   static Interface_ptr resolve (CORBA::ORB_ptr orb,
-                                const char *object_id
-                                ACE_ENV_ARG_DECL);
+                                const char *object_id);
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
index b5c6d99ae37..6c49ea4b684 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
@@ -16,53 +16,40 @@
 #include "RTCORBA_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           RTCORBA_Setup, 
+ACE_RCSID (TAO_PERF_RTEC,
+           RTCORBA_Setup,
            "$Id$")
 
 RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
                               const RT_Class &rtclass,
-                              int nthreads
-                              ACE_ENV_ARG_DECL)
+                              int nthreads)
   :  lanes_ (3)
 {
   this->priority_mapping_manager_ =
     RIR_Narrow<RTCORBA::PriorityMappingManager>::resolve (orb,
-                                                          "PriorityMappingManager"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                          "PriorityMappingManager");
 
   this->priority_mapping_ =
     this->priority_mapping_manager_->mapping ();
 
   RTCORBA::Current_var current =
     RIR_Narrow<RTCORBA::Current>::resolve (orb,
-                                           "RTCurrent"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                           "RTCurrent");
 
   RTCORBA::Priority corba_prc_priority;
   this->priority_mapping_->to_CORBA (rtclass.priority_process (),
                                      corba_prc_priority);
 
-  current->the_priority (corba_prc_priority
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  current->the_priority (corba_prc_priority);
 
   this->lanes_.length (3);
 
   this->setup_lane (rtclass.priority_high (),
-                    this->lanes_[0]
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                    this->lanes_[0]);
   this->setup_lane (rtclass.priority_process (),
-                    this->lanes_[1]
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                    this->lanes_[1]);
   this->setup_lane (rtclass.priority_low (),
-                    this->lanes_[2]
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                    this->lanes_[2]);
   this->lanes_[2].static_threads = nthreads;
 
   this->process_priority_ = this->lanes_[1].lane_priority;
@@ -70,12 +57,11 @@ RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
 
 void
 RTCORBA_Setup::setup_lane (int priority,
-                           RTCORBA::ThreadpoolLane &lane
-			   ACE_ENV_ARG_DECL)
+                           RTCORBA::ThreadpoolLane &lane)
 {
   if (!this->priority_mapping_->to_CORBA (priority,
                                           lane.lane_priority))
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw CORBA::BAD_PARAM ();
 
   lane.static_threads  = 1;
   lane.dynamic_threads = 0;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h
index 96f7c487daf..b2d1744ea09 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h
@@ -32,8 +32,7 @@ public:
   /// Constructor
   RTCORBA_Setup (CORBA::ORB_ptr orb,
                  const RT_Class &rtclass,
-                 int nthreads
-                 ACE_ENV_ARG_DECL);
+                 int nthreads);
 
   /// Return the thread pool lanes appropriate for the benchamrks
   const RTCORBA::ThreadpoolLanes & lanes (void) const;
@@ -43,7 +42,7 @@ public:
 
 private:
   void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane
-		  ACE_ENV_ARG_DECL_WITH_DEFAULTS );
+ );
 
 private:
   RTCORBA::PriorityMappingManager_var priority_mapping_manager_;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
index 6e3d06125f6..a9bc97712f4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
@@ -16,40 +16,34 @@
 #include "RTClient_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           RTClient_Setup, 
+ACE_RCSID (TAO_PERF_RTEC,
+           RTClient_Setup,
            "$Id$")
 
 RTClient_Setup::RTClient_Setup (int use_rt_corba,
                                 CORBA::ORB_ptr orb,
                                 const RT_Class &rt_class,
-                                int nthreads
-                                ACE_ENV_ARG_DECL)
+                                int nthreads)
   : use_rt_corba_ (use_rt_corba)
-  , syncscope_setup_ (orb ACE_ENV_ARG_PARAMETER)
+  , syncscope_setup_ (orb)
 {
-  ACE_CHECK;
 
   if (use_rt_corba)
     {
       ACE_AUTO_PTR_RESET (this->rtcorba_setup_,
                           new RTCORBA_Setup (orb,
                                              rt_class,
-                                             nthreads
-                                             ACE_ENV_ARG_PARAMETER),
+                                             nthreads),
                           RTCORBA_Setup
                          );
-      ACE_CHECK;
 
 #if 0
       ACE_AUTO_PTR_RESET (this->priorityband_setup_,
                           new PriorityBand_Setup (orb,
-                                                  *this->rtcorba_setup_
-                                                  ACE_ENV_ARG_PARAMETER),
+                                                  *this->rtcorba_setup_),
                           PriorityBand_Setup
                          );
-      ACE_CHECK;
-        
+
 #endif /* 0 */
     }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
index 8bea1503961..8a979ba7641 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
@@ -34,8 +34,7 @@ public:
   RTClient_Setup (int use_rt_corba,
                   CORBA::ORB_ptr orb,
                   const RT_Class &rt_class,
-                  int nthreads
-                  ACE_ENV_ARG_DECL);
+                  int nthreads);
 
   /// Return non-zero if RTCORBA is enabled
   int use_rt_corba (void) const;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
index 408b52b3557..6b843e524bf 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
@@ -15,15 +15,14 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           RTEC_Initializer, 
+ACE_RCSID (TAO_PERF_RTEC,
+           RTEC_Initializer,
            "$Id$")
 
 TAO_EC_Event_Channel *
 RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa,
                           PortableServer::POA_ptr supplier_poa,
-                          RTCORBA_Setup * rtcorba_setup
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          RTCORBA_Setup * rtcorba_setup)
 {
   TAO_EC_Event_Channel_Attributes attr (consumer_poa,
                                         supplier_poa);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
index 64645bcbf18..e4cea937e39 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
@@ -37,8 +37,7 @@ public:
   /// Return a new event channel
   static TAO_EC_Event_Channel *create (PortableServer::POA_ptr consumer_poa,
                                        PortableServer::POA_ptr supplier_poa,
-                                       RTCORBA_Setup *rtcorba_setup
-                                       ACE_ENV_ARG_DECL);
+                                       RTCORBA_Setup *rtcorba_setup);
 };
 
 #endif /* TAO_PERF_RTEC_RTEC_INITIALIZER_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
index fdaaee06d30..985b07682cf 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
@@ -17,25 +17,20 @@
 #include "RTPOA_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           RTPOA_Setup, 
+ACE_RCSID (TAO_PERF_RTEC,
+           RTPOA_Setup,
            "$Id$")
 
 RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
-                          const RTCORBA_Setup &rtcorba_setup
-                          ACE_ENV_ARG_DECL)
+                          const RTCORBA_Setup &rtcorba_setup)
 {
   RTPortableServer::POA_var root_poa =
     RIR_Narrow<RTPortableServer::POA>::resolve (orb,
-                                                "RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                "RootPOA");
 
   RTCORBA::RTORB_var rtorb =
     RIR_Narrow<RTCORBA::RTORB>::resolve (orb,
-                                         "RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         "RTORB");
 
   const CORBA::ULong stacksize = 1024 * 1024; // 1 Mb
   const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes ();
@@ -50,51 +45,37 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
                                          allow_borrowing,
                                          allow_request_buffering,
                                          max_buffered_requests,
-                                         max_request_buffer_size
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         max_request_buffer_size);
 
   // @@ We need an 'auto_ptr for thread pools' here!
   CORBA::PolicyList policies (4); policies.length (4);
   policies[0] =
     rtorb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                         rtcorba_setup.process_priority ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         rtcorba_setup.process_priority ());
 
   policies[1] =
-    root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID);
 
   policies[2] =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
 #if 0
   policies.length (3);
 #else
   policies[3] =
-    rtorb->create_threadpool_policy (pool_id
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rtorb->create_threadpool_policy (pool_id);
 #endif /* 0 */
 
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->the_POAManager ();
 
   this->poa_ =
     root_poa->create_POA ("RTEC_Perf",
                           poa_manager.in (),
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          policies);
 
   for (CORBA::ULong i = 0; i != policies.length (); ++i)
     {
-      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      policies[i]->destroy ();
     }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
index dc3d19f0054..c69fd19dd0f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h
@@ -29,8 +29,7 @@ class TAO_RTEC_Perf_Export RTPOA_Setup
 public:
   /// Constructor
   RTPOA_Setup (CORBA::ORB_ptr orb,
-               const RTCORBA_Setup &rtcorba_setup
-               ACE_ENV_ARG_DECL);
+               const RTCORBA_Setup &rtcorba_setup);
 
   PortableServer::POA_ptr poa (void);
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
index 609f8f7b314..1ea7d0eee78 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
@@ -16,32 +16,27 @@
 #include "RTServer_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           RTServer_Setup, 
+ACE_RCSID (TAO_PERF_RTEC,
+           RTServer_Setup,
            "$Id$")
 
 RTServer_Setup::RTServer_Setup (int use_rt_corba,
                                 CORBA::ORB_ptr orb,
                                 const RT_Class &rt_class,
-                                int nthreads
-                                ACE_ENV_ARG_DECL)
+                                int nthreads)
   : RTClient_Setup (use_rt_corba,
                     orb,
                     rt_class,
-                    nthreads
-                    ACE_ENV_ARG_PARAMETER)
+                    nthreads)
 {
-  ACE_CHECK;
 
   if (use_rt_corba)
     {
       ACE_AUTO_PTR_RESET (this->rtpoa_setup_,
                           new RTPOA_Setup (orb,
-                                           *this->rtcorba_setup ()
-                                           ACE_ENV_ARG_PARAMETER),
+                                           *this->rtcorba_setup ()),
                           RTPOA_Setup
                          );
-      ACE_CHECK;
 
       this->poa_ =
         this->rtpoa_setup_->poa ();
@@ -50,8 +45,6 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba,
     {
       this->poa_ =
         RIR_Narrow<RTPortableServer::POA>::resolve (orb,
-                                                    "RootPOA"
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                    "RootPOA");
     }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
index eecc21ec6f8..2974d97d4eb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
@@ -30,8 +30,7 @@ public:
   RTServer_Setup (int use_rt_corba,
                   CORBA::ORB_ptr orb,
                   const RT_Class &rt_class,
-                  int nthreads
-                  ACE_ENV_ARG_DECL);
+                  int nthreads);
 
   /// Return the POA configured by the RTPOA_Setup
   PortableServer::POA_ptr poa (void);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index 125e75c85e7..ef58db60e53 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
@@ -87,7 +87,6 @@ Send_Task::svc (void)
   event[0].header.source = this->event_source_;
   event[0].header.ttl    = 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   for (int i = start_i; i != this->iterations_; ++i)
     {
       if ((i + 1) % 1000 == 0)
@@ -111,18 +110,15 @@ Send_Task::svc (void)
       ACE_hrtime_t creation = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      creation);
-      ACE_TRY
+      try
         {
           // push one event...
-          this->supplier_->push (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->supplier_->push (event);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught exception:");
+          ex._tao_print_exception ("Caught exception:");
         }
-      ACE_ENDTRY;
     }
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) - Thread finished\n"));
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp
index 7e154ad088b..9bdb1f6391f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp
@@ -22,11 +22,9 @@ Servant_var<SERVANT>::~Servant_var ()
   if (this->ptr_ == 0)
     return;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  } ACE_CATCHANY {
+  try{
+    this->ptr_->_remove_ref ();
+  } catch (const CORBA::Exception&) {
     // @@ TODO This event should be logged. Cannot throw because that
     //    would make it impossible to use this class effectively.
     //
@@ -52,7 +50,7 @@ Servant_var<SERVANT>::~Servant_var ()
     // particular implementation, and provides a light-weight,
     // high-performance solution for applications that want to avoid
     // logging.
-  } ACE_ENDTRY;
+  }
 }
 
 #endif /* TAO_PERF_RTEC_SERVANT_VAR_CPP */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
index aa5af0895cb..aeca36294bc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
@@ -9,12 +9,9 @@
 template<class Client> ACE_INLINE void
 Shutdown<Client>::operator () (Client *client)
 {
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
     {
-      client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client->shutdown ();
     }
-  ACE_CATCHANY { };
-  ACE_ENDTRY;
+  catch (const CORBA::Exception&){ };
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index 11c14e80232..014ad19a0cc 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -9,8 +9,8 @@
 #include "Supplier.h"
 #include "Implicit_Deactivator.h"
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           Supplier, 
+ACE_RCSID (TAO_PERF_RTEC,
+           Supplier,
            "$Id$")
 
 Supplier::Supplier (CORBA::Long experiment_id,
@@ -25,12 +25,10 @@ Supplier::Supplier (CORBA::Long experiment_id,
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                   ACE_ENV_ARG_DECL)
+Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_suppliers ();
 
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -38,13 +36,11 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      supplier_admin->obtain_push_consumer ();
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
   supplier_qos.is_gateway = 0;
@@ -58,13 +54,11 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
     }
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
-                                                supplier_qos
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                supplier_qos);
 }
 
 void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -74,21 +68,17 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
     proxy = this->proxy_consumer_._retn ();
   }
 
-  Implicit_Deactivator deactivator (this
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Implicit_Deactivator deactivator (this);
 
-  ACE_TRY
+  try
     {
-      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_consumer ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
 }
 
 void
-Supplier::push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+Supplier::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Supplier pushing (%d,%d)\n",
@@ -101,11 +91,11 @@ Supplier::push (const RtecEventComm::EventSet &events
     proxy = this->proxy_consumer_;
   }
 
-  proxy->push (events ACE_ENV_ARG_PARAMETER);
+  proxy->push (events);
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -114,7 +104,7 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 PortableServer::POA_ptr
-Supplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::_default_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index 4ae8d76a414..b164fd51e46 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
@@ -38,22 +38,20 @@ public:
             PortableServer::POA_ptr poa);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec);
 
   /// Disconnect from the event channel
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
-  void push (const RtecEventComm::EventSet &events
-             ACE_ENV_ARG_DECL_NOT_USED)
+  void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index b0f66d12d9e..7ef6f47af0b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -19,30 +19,23 @@ ACE_RCSID (TAO_PERF_RTEC,
            "$Id$")
 
 SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb,
-                                  Messaging::SyncScope value
-                                  ACE_ENV_ARG_DECL)
+                                  Messaging::SyncScope value)
 {
-  this->init (orb, value
-              ACE_ENV_ARG_PARAMETER);
+  this->init (orb, value);
 }
 
-SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb
-                                  ACE_ENV_ARG_DECL)
+SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb)
 {
-  this->init (orb, Messaging::SYNC_WITH_TARGET
-              ACE_ENV_ARG_PARAMETER);
+  this->init (orb, Messaging::SYNC_WITH_TARGET);
 }
 
 void
 SyncScope_Setup::init (CORBA::ORB_ptr orb,
-                       Messaging::SyncScope value
-                       ACE_ENV_ARG_DECL)
+                       Messaging::SyncScope value)
 {
   CORBA::PolicyManager_var policy_manager =
     RIR_Narrow<CORBA::PolicyManager>::resolve (orb,
-                                               "ORBPolicyManager"
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               "ORBPolicyManager");
 
   CORBA::PolicyList policy_list (1);
   policy_list.length (1);
@@ -54,16 +47,11 @@ SyncScope_Setup::init (CORBA::ORB_ptr orb,
   //    destroy() method on each policy...
   policy_list[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        sync_scope
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        sync_scope);
   policy_manager->set_policy_overrides (policy_list,
-                                        CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        CORBA::ADD_OVERRIDE);
 
-  policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policy_list[0]->destroy ();
 }
 
 SyncScope_Setup::~SyncScope_Setup (void)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
index 9de943cc419..8904acd140e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h
@@ -26,12 +26,10 @@ class TAO_RTEC_Perf_Export SyncScope_Setup
 {
 public:
   /// Constructor
-  SyncScope_Setup (CORBA::ORB_ptr orb
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  SyncScope_Setup (CORBA::ORB_ptr orb);
 
   SyncScope_Setup (CORBA::ORB_ptr orb,
-                   Messaging::SyncScope value
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                   Messaging::SyncScope value);
 
   /// Destructor
   /**
@@ -42,8 +40,7 @@ public:
 private:
   /// Implement the shared code between both constructors
   void init (CORBA::ORB_ptr orb,
-             Messaging::SyncScope value
-             ACE_ENV_ARG_DECL);
+             Messaging::SyncScope value);
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index baded47bc1f..be33b292aff 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -143,8 +143,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
 
 void
 Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
-                                       AVStreams::MMDevice_ptr sender
-                                       ACE_ENV_ARG_DECL)
+                                       AVStreams::MMDevice_ptr sender)
 {
   this->sender_name_ =
     sender_name;
@@ -157,16 +156,14 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
   CosNaming::Name name (1);
   name.length (1);
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_client_->bind_new_context (name);
 
       //
       // We reach here if there was no exception raised in
@@ -179,11 +176,9 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       // Try binding the receivers context under the sender context.
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sender_context_->bind_new_context (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       //
       // The sender context already exists, probably created by the
@@ -195,9 +190,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_client_->resolve (name);
 
       this->sender_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
@@ -207,31 +200,24 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup ("Receivers");
 
       object =
-        this->sender_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->sender_context_->resolve (name);
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
 
-      this->find_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->find_receivers ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   name [0].id =
     CORBA::string_dup (this->sender_name_.c_str ());
 
   // Register the sender object with the sender context.
   this->sender_context_->rebind (name,
-                                 sender
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 sender);
 }
 
 void
-Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::find_receivers (void)
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -240,14 +226,10 @@ Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
   // Get the list of receivers registered for this sender.
   this->receiver_context_->list (chunk,
                                  binding_list,
-                                 iterator
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 iterator);
 
   // Add the receivers found in the bindinglist to the <receivers>.
-  this->add_to_receivers (binding_list
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->add_to_receivers (binding_list);
 
   if (!CORBA::is_nil (iterator.in ()))
     {
@@ -257,20 +239,15 @@ Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
       while (more)
         {
           more = iterator->next_n (chunk,
-                                   binding_list
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                   binding_list);
 
-          this->add_to_receivers (binding_list
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->add_to_receivers (binding_list);
         }
     }
 }
 
 void
-Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
-                                      ACE_ENV_ARG_DECL)
+Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list)
 {
   for (CORBA::ULong i = 0;
        i < binding_list.length ();
@@ -288,8 +265,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
       // Resolve the reference of the receiver from the receiver
       // context.
       CORBA::Object_var obj =
-        this->receiver_context_->resolve (name
-                                          ACE_ENV_ARG_PARAMETER);
+        this->receiver_context_->resolve (name);
 
       AVStreams::MMDevice_var receiver_device =
         AVStreams::MMDevice::_narrow (obj.in ());
@@ -305,8 +281,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
 }
 
 void
-Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender
-					  ACE_ENV_ARG_DECL)
+Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender)
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -376,8 +351,7 @@ Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender
 
       // Register streamctrl.
       AVStreams::StreamCtrl_var streamctrl_object =
-        streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        streamctrl->_this ();
 
       // Bind the flowname and the corresponding stream controller to
       // the stream controller map
@@ -388,17 +362,14 @@ Connection_Manager::connect_to_receivers (AVStreams::MMDevice_ptr sender
       (void) streamctrl->bind_devs (sender,
                                     (*iterator).int_id_.in (),
                                     the_qos.inout (),
-                                    flow_spec
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    flow_spec);
     }
 }
 
 void
 Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
                                     const ACE_CString &receiver_name,
-                                    AVStreams::MMDevice_ptr receiver
-                                    ACE_ENV_ARG_DECL)
+                                    AVStreams::MMDevice_ptr receiver)
 {
   this->sender_name_ =
     sender_name;
@@ -414,16 +385,14 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   int sender_context_exists = 0;
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_client_->resolve (name);
 
       //
       // We reach here if there was no exception raised in <resolve>.
@@ -439,35 +408,27 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Find the receivers context under the sender's context
       object =
-        this->sender_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->sender_context_->resolve (name);
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       // Create the sender context
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_client_->bind_new_context (name);
 
       name [0].id =
         CORBA::string_dup ("Receivers");
 
       // Create the receivers context under the sender's context
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->sender_context_->bind_new_context (name);
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   //
   // At this point we either have resolved the receiver context or we
@@ -478,9 +439,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   // Register this receiver object under the receiver context.
   this->receiver_context_->rebind (name,
-                                   receiver
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   receiver);
 
   //
   // Check if the sender was registered.  Note that if we created the
@@ -488,32 +447,27 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
   //
   if (sender_context_exists)
     {
-      ACE_TRY_EX(SENDER_CONTEXT_EXISTS)
+      try
         {
           // Try binding the sender under the sender context
           name [0].id =
             CORBA::string_dup (this->sender_name_.c_str ());
 
           CORBA::Object_var object =
-            this->sender_context_->resolve (name
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
+            this->sender_context_->resolve (name);
 
           this->sender_ =
-            AVStreams::MMDevice::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
+            AVStreams::MMDevice::_narrow (object.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+      catch (const CosNaming::NamingContext::NotFound&)
         {
           // No problem if the sender was not there.
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 void
-Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_sender (void)
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -578,8 +532,7 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
 
   // Register streamctrl.
   AVStreams::StreamCtrl_var streamctrl_object =
-    streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    streamctrl->_this ();
 
   //
   // Since senders terminate the streams, we don't need the streamctrl
@@ -596,9 +549,7 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
     streamctrl->bind_devs (this->sender_.in (),
                            this->receiver_.in (),
                            the_qos.inout (),
-                           flow_spec
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           flow_spec);
 
   if (result == 0)
     ACE_ERROR ((LM_ERROR,
@@ -606,21 +557,16 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
 
   // Start the data sending.
   AVStreams::flowSpec start_spec;
-  streamctrl->start (start_spec
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  streamctrl->start (start_spec);
 }
 
 void
 Connection_Manager::add_streamctrl (const ACE_CString &flowname,
-                                    TAO_StreamEndPoint *endpoint
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_StreamEndPoint *endpoint)
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_var streamctrl_any =
-    endpoint->get_property_value ("Related_StreamCtrl"
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    endpoint->get_property_value ("Related_StreamCtrl");
 
   AVStreams::StreamCtrl_ptr streamctrl;
 
@@ -634,8 +580,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 }
 
 void
-Connection_Manager::destroy (const ACE_CString &flowname
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Connection_Manager::destroy (const ACE_CString &flowname)
 {
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index 8045519e6bc..c0e7641448b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -51,34 +51,29 @@ public:
   // Initialize this class.
 
   void bind_to_receivers (const ACE_CString &sender_name,
-                          AVStreams::MMDevice_ptr sender
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                          AVStreams::MMDevice_ptr sender);
   // Method that binds the sender to the Naming Service and retreives
   // the references of any registered receivers.
 
-  void connect_to_receivers (AVStreams::MMDevice_ptr sender
-			     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_receivers (AVStreams::MMDevice_ptr sender);
   // Connect to the receivers that we found.
 
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
-                       AVStreams::MMDevice_ptr receiver
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       AVStreams::MMDevice_ptr receiver);
   // Bind receiver to the sender.
 
-  void connect_to_sender (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_sender (void);
   // Connect to the sender that we found.
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void destroy (void);
   // Destroy all streams.
 
-  void destroy (const ACE_CString &flowname
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void destroy (const ACE_CString &flowname);
   // Destroy streams associated with <flowname>.
 
   void add_streamctrl (const ACE_CString &flowname,
-                       TAO_StreamEndPoint *endpoint
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       TAO_StreamEndPoint *endpoint);
   // Add new streamctrl.
 
   // Map of receivers.
@@ -93,7 +88,7 @@ public:
                                ACE_Null_Mutex>
           Protocol_Objects;
 
-  
+
 
   // Map of streamctrl.
   typedef ACE_Hash_Map_Manager<ACE_CString,
@@ -113,15 +108,14 @@ public:
   StreamCtrls &streamctrls (void);
 
   void load_ep_addr (const char* file_name);
-  
+
 protected:
 
 
 
-  void find_receivers (ACE_ENV_SINGLE_ARG_DECL);
+  void find_receivers (void);
 
-  void add_to_receivers (CosNaming::BindingList &binding_list
-                         ACE_ENV_ARG_DECL);
+  void add_to_receivers (CosNaming::BindingList &binding_list);
 
   TAO_Naming_Client naming_client_;
   // The Naming Service client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 34239319d22..c817675b6ff 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -143,8 +143,7 @@ Distributer::parse_args (int argc,
 
 int
 Distributer::init (int argc,
-                   char ** argv
-                   ACE_ENV_ARG_DECL)
+                   char ** argv)
 {
   // Initialize the connection class.
   int result =
@@ -183,8 +182,7 @@ Distributer::init (int argc,
     this->distributer_sender_mmdevice_;
 
   AVStreams::MMDevice_var distributer_sender_mmdevice =
-    this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->distributer_sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
                   TAO_MMDevice (&this->receiver_endpoint_strategy_),
@@ -192,30 +190,22 @@ Distributer::init (int argc,
 
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->distributer_receiver_mmdevice_->_this ();
 
   // Bind to receivers.
   this->connection_manager_.bind_to_receivers (this->distributer_name_,
-                                               distributer_sender_mmdevice.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                               distributer_sender_mmdevice.in ());
 
   // Connect to receivers
-  this->connection_manager_.connect_to_receivers (distributer_sender_mmdevice.in ()
-												ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->connection_manager_.connect_to_receivers (distributer_sender_mmdevice.in ());
 
   // Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->distributer_name_,
-                                            distributer_receiver_mmdevice.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                            distributer_receiver_mmdevice.in ());
 
   // Connect to sender.
-  this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->connection_manager_.connect_to_sender ();
 
   return 0;
 }
@@ -236,67 +226,51 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
 
       if (result != 0)
         return result;
 
       while (!DISTRIBUTER::instance ()->done ())
         {
-          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->perform_work ();
         }
 
       // Hack for now....
       ACE_OS::sleep (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"main");
+      ex._tao_print_exception ("main");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   DISTRIBUTER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 319f6287193..3430229f382 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -115,8 +115,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 437bf6d21b7..509cde31e47 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -64,19 +64,16 @@ Receiver_Callback::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::end_stream\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       done=1;
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -96,8 +93,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -124,19 +120,15 @@ Receiver::init (int,
     this->mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->mmdevice_->_this ();
 
   // Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->receiver_name_,
-                                            mmdevice.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                            mmdevice.in ());
 
   // Connect to the sender.
-  this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->connection_manager_.connect_to_sender ();
 
   return 0;
 }
@@ -187,40 +179,29 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       Receiver receiver;
       int result =
@@ -245,9 +226,7 @@ main (int argc,
 
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       argv);
 
       if (result != 0)
         return result;
@@ -255,21 +234,18 @@ main (int argc,
       ACE_Time_Value tv(0, 10000);
       while(!done)
       {
-         orb->run (tv ACE_ENV_ARG_PARAMETER);
-         ACE_TRY_CHECK;
+         orb->run (tv);
       }
 
       // Hack for now....
       ACE_OS::sleep (1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index 8d9638f4d2e..6d51db00170 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -83,8 +83,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index e97f210997e..36d1fcab944 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -89,8 +89,7 @@ Sender::parse_args (int argc,
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -140,27 +139,22 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->sender_mmdevice_->_this ();
 
   // Register the object reference with the Naming Service and bind to
   // the receivers
   this->connection_manager_.bind_to_receivers (this->sender_name_,
-                                               mmdevice.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                               mmdevice.in ());
 
   // Connect to the receivers
-  this->connection_manager_.connect_to_receivers (mmdevice.in ()
-								ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->connection_manager_.connect_to_receivers (mmdevice.in ());
 
   return 0;
 }
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -175,7 +169,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -237,9 +231,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -273,13 +265,11 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
         } // end while
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -293,61 +283,45 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       //Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // Initialize the Client.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "client::init failed\n"), -1);
 
-      SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      SENDER::instance ()->pace_data ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index b4392ed9a4c..895057ea055 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -62,11 +62,10 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (void);
   // Method to pace and send data from a file.
 
   Connection_Manager &connection_manager (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 3683e3e7ba2..e9f0cf29f1c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -116,21 +116,18 @@ Receiver_Callback::handle_destroy (void)
 
   if (count < 2)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
-          TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          TAO_AV_CORE::instance ()->orb ()->shutdown (0);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Receiver_Callback::handle_destroy Failed\n");
+          ex._tao_print_exception (
+            "Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
         }
 
-      ACE_ENDTRY;
     }
 
   return 0;
@@ -189,8 +186,7 @@ Receiver::parse_args (int argc,
 
 int
 Receiver::init (int argc,
-                char ** argv
-                ACE_ENV_ARG_DECL)
+                char ** argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -230,8 +226,7 @@ Receiver::init (int argc,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->mmdevice_->_this ();
 
   // Register the mmdevice with the naming service.
   CosNaming::Name name (1);
@@ -248,9 +243,7 @@ Receiver::init (int argc,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -271,38 +264,28 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
-      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in ());
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
@@ -319,33 +302,26 @@ main (int argc,
 
       int result =
         RECEIVER::instance ()->init (argc,
-                                     argv
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     argv);
 
       //        // Start sending data.
-      //        result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      //        ACE_TRY_CHECK;
+      //        result = SENDER::instance ()->pace_data ();
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      //orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      //orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index 539f43b8b43..6fa4b596897 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -93,8 +93,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 2e806a208a2..25ccab3f767 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -105,25 +105,19 @@ Sender::eof (void)
 void
 Sender::shutdown (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     // File reading is complete, destroy the stream.
     AVStreams::flowSpec stop_spec;
-    this->streamctrl_->destroy (stop_spec
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-    TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    TAO_AV_CORE::instance ()->orb ()->shutdown (0);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown\n");
+      ex._tao_print_exception ("shutdown\n");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -160,7 +154,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -169,14 +163,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -188,8 +178,7 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -226,8 +215,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->bind_to_receiver ();
 
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -270,8 +258,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->streamctrl_,
                   TAO_StreamCtrl,
@@ -285,9 +272,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -299,7 +284,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -314,7 +299,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -376,9 +361,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -406,22 +389,18 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
          // File reading is complete, destroy the stream.
         AVStreams::flowSpec stop_spec;
-        this->streamctrl_->destroy (stop_spec
-                                    ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->streamctrl_->destroy (stop_spec);
 
         // Shut the orb down.
         //TAO_AV_CORE::instance ()->orb ()->shutdown (1,
-        //                                            ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        //);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
-      //ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+      //ACE_PRINT_EXCEPTION (ex,
        //                    "Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -429,50 +408,36 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV Stream components.
 /*      TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER); */
-      ACE_TRY_CHECK;
+                                      root_poa.in ()); */
 
       // Initialize the AVStreams components.
-      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -493,20 +458,15 @@ main (int argc,
                     "File Opened Successfully\n"));
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = SENDER::instance ()->pace_data ();
       ACE_Time_Value tv(3,0);
       orb->run (tv);
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index 16a78c88b96..3d1169ca464 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -89,11 +89,10 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (void);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -107,7 +106,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (void);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index c532f635976..e4a5c40fe99 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -25,8 +25,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
 
 void
 Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
-                                       AVStreams::MMDevice_ptr sender
-                                       ACE_ENV_ARG_DECL)
+                                       AVStreams::MMDevice_ptr sender)
 {
   this->sender_name_ =
     sender_name;
@@ -37,16 +36,14 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
   CosNaming::Name name (1);
   name.length (1);
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_client_->bind_new_context (name);
 
       //
       // We reach here if there was no exception raised in
@@ -59,11 +56,9 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       // Try binding the receivers context under the sender context.
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sender_context_->bind_new_context (name);
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       //
       // The sender context already exists, probably created by the
@@ -75,9 +70,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_client_->resolve (name);
 
       this->sender_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
@@ -87,31 +80,24 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup ("Receivers");
 
       object =
-        this->sender_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->sender_context_->resolve (name);
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
 
-      this->find_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->find_receivers ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   name [0].id =
     CORBA::string_dup (this->sender_name_.c_str ());
 
   // Register the sender object with the sender context.
   this->sender_context_->rebind (name,
-                                 sender
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 sender);
 }
 
 void
-Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::find_receivers (void)
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -120,14 +106,10 @@ Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
   // Get the list of receivers registered for this sender.
   this->receiver_context_->list (chunk,
                                  binding_list,
-                                 iterator
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 iterator);
 
   // Add the receivers found in the bindinglist to the <receivers>.
-  this->add_to_receivers (binding_list
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->add_to_receivers (binding_list);
 
   if (!CORBA::is_nil (iterator.in ()))
     {
@@ -137,20 +119,15 @@ Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
       while (more)
         {
           more = iterator->next_n (chunk,
-                                   binding_list
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                   binding_list);
 
-          this->add_to_receivers (binding_list
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->add_to_receivers (binding_list);
         }
     }
 }
 
 void
-Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
-                                      ACE_ENV_ARG_DECL)
+Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list)
 {
   for (CORBA::ULong i = 0;
        i < binding_list.length ();
@@ -168,8 +145,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
       // Resolve the reference of the receiver from the receiver
       // context.
       CORBA::Object_var obj =
-        this->receiver_context_->resolve (name
-                                          ACE_ENV_ARG_PARAMETER);
+        this->receiver_context_->resolve (name);
 
       AVStreams::MMDevice_var receiver_device =
         AVStreams::MMDevice::_narrow (obj.in ());
@@ -185,7 +161,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
 }
 
 void
-Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_receivers (void)
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -224,8 +200,7 @@ Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
 
       // Register streamctrl.
       AVStreams::StreamCtrl_var streamctrl_object =
-        streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        streamctrl->_this ();
 
       // Bind the flowname and the corresponding stream controller to
       // the stream controller map
@@ -236,17 +211,14 @@ Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
       (void) streamctrl->bind_devs (this->sender_.in (),
                                     (*iterator).int_id_.in (),
                                     the_qos.inout (),
-                                    flow_spec
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    flow_spec);
     }
 }
 
 void
 Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
                                     const ACE_CString &receiver_name,
-                                    AVStreams::MMDevice_ptr receiver
-                                    ACE_ENV_ARG_DECL)
+                                    AVStreams::MMDevice_ptr receiver)
 {
   this->sender_name_ =
     sender_name;
@@ -264,16 +236,14 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   int sender_context_exists = 0;
 
-  ACE_TRY
+  try
     {
       // Try binding the sender context in the NS
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_client_->resolve (name);
 
       //
       // We reach here if there was no exception raised in <resolve>.
@@ -289,35 +259,27 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Find the receivers context under the sender's context
       object =
-        this->sender_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->sender_context_->resolve (name);
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       name [0].id =
         CORBA::string_dup (this->sender_name_.c_str ());
 
       // Create the sender context
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_client_->bind_new_context (name);
 
       name [0].id =
         CORBA::string_dup ("Receivers");
 
       // Create the receivers context under the sender's context
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->sender_context_->bind_new_context (name);
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   //
   // At this point we either have resolved the receiver context or we
@@ -328,9 +290,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   // Register this receiver object under the receiver context.
   this->receiver_context_->rebind (name,
-                                   receiver
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   receiver);
 
   //
   // Check if the sender was registered.  Note that if we created the
@@ -338,32 +298,27 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
   //
   if (sender_context_exists)
     {
-      ACE_TRY_EX(SENDER_CONTEXT_EXISTS)
+      try
         {
           // Try binding the sender under the sender context
           name [0].id =
             CORBA::string_dup (this->sender_name_.c_str ());
 
           CORBA::Object_var object =
-            this->sender_context_->resolve (name
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
+            this->sender_context_->resolve (name);
 
           this->sender_ =
-            AVStreams::MMDevice::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
+            AVStreams::MMDevice::_narrow (object.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+      catch (const CosNaming::NamingContext::NotFound&)
         {
           // No problem if the sender was not there.
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 void
-Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_sender (void)
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -399,8 +354,7 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
 
   // Register streamctrl.
   AVStreams::StreamCtrl_var streamctrl_object =
-    streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    streamctrl->_this ();
 
   //
   // Since senders terminate the streams, we don't need the streamctrl
@@ -417,9 +371,7 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
     streamctrl->bind_devs (this->sender_.in (),
                            this->receiver_.in (),
                            the_qos.inout (),
-                           flow_spec
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           flow_spec);
 
   if (result == 0)
     ACE_ERROR ((LM_ERROR,
@@ -427,21 +379,16 @@ Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
 
   // Start the data sending.
   AVStreams::flowSpec start_spec;
-  streamctrl->start (start_spec
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  streamctrl->start (start_spec);
 }
 
 void
 Connection_Manager::add_streamctrl (const ACE_CString &flowname,
-                                    TAO_StreamEndPoint *endpoint
-                                    ACE_ENV_ARG_DECL)
+                                    TAO_StreamEndPoint *endpoint)
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_var streamctrl_any =
-    endpoint->get_property_value ("Related_StreamCtrl"
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    endpoint->get_property_value ("Related_StreamCtrl");
 
   AVStreams::StreamCtrl_ptr streamctrl;
 
@@ -458,20 +405,17 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 
 
 void
-Connection_Manager::destroy (const ACE_CString &flowname
-                             ACE_ENV_ARG_DECL)
+Connection_Manager::destroy (const ACE_CString &flowname)
 {
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
 
   this->streamctrls_.unbind(flowname);
-  ACE_CHECK;
 }
 
 void
 Connection_Manager::unbind_sender (const ACE_CString &sender_name,
-                                   AVStreams::MMDevice_ptr sender_mmdevice_obj
-                                   ACE_ENV_ARG_DECL)
+                                   AVStreams::MMDevice_ptr sender_mmdevice_obj)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -484,12 +428,10 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name,
   name [0].id =
     CORBA::string_dup (sender_name.c_str ());
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_client_->resolve (name);
 
       CosNaming::NamingContext_var sender_context =
         CosNaming::NamingContext::_narrow (object.in ());
@@ -498,43 +440,37 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name,
         ACE_DEBUG ((LM_DEBUG,
                     "Sender Context Found\n"));
 
-      ACE_TRY_EX (Resolve_Sender)
+      try
         {
           object =
-            sender_context->resolve (name
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (Resolve_Sender);
+            sender_context->resolve (name);
 
           AVStreams::MMDevice_var mmdevice =
             AVStreams::MMDevice::_narrow (object.in ());
 
           if (mmdevice->_is_equivalent (sender_mmdevice_obj))
           {
-            sender_context->unbind (name
-                                    ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX (Resolve_Sender);
+            sender_context->unbind (name);
 
             if (TAO_debug_level > 0)
               ACE_DEBUG ((LM_DEBUG,
                           "Sender Unbound\n"));
           }
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+      catch (const CosNaming::NamingContext::NotFound&)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Sender object not found\n"));
           // Do not have to unbind.
         }
-      ACE_ENDTRY;
 
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Sender Context Not Found\n"));
       // Do not have to unbind.
     }
-  ACE_ENDTRY;
 
 }
 
@@ -554,12 +490,10 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
   name [0].id =
     CORBA::string_dup (sender_name.c_str ());
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->naming_client_->resolve (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_client_->resolve (name);
 
       CosNaming::NamingContext_var sender_context =
         CosNaming::NamingContext::_narrow (object.in ());
@@ -568,15 +502,13 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
         ACE_DEBUG ((LM_DEBUG,
                     "Sender Context Found\n"));
 
-      ACE_TRY_EX (Resolve_Receiver)
+      try
         {
           name [0].id =
             CORBA::string_dup ("Receivers");
 
           object =
-            sender_context->resolve (name
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (Resolve_Receiver);
+            sender_context->resolve (name);
 
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
@@ -589,40 +521,34 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
             CORBA::string_dup (receiver_name.c_str ());
 
           object =
-            receivers_context->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (Resolve_Receiver);
+            receivers_context->resolve (name);
 
           AVStreams::MMDevice_var  mmdevice =
             AVStreams::MMDevice::_narrow (object.in ());
 
           if (mmdevice->_is_equivalent (receiver_mmdevice))
           {
-            receivers_context->unbind (name
-                                       ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX (Resolve_Receiver);
+            receivers_context->unbind (name);
 
             if (TAO_debug_level > 0)
               ACE_DEBUG ((LM_DEBUG,
                           "Receiver Unbound\n"));
           }
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+      catch (const CosNaming::NamingContext::NotFound&)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Receiver Not found\n"));
           // Do not have to unbind.
         }
-      ACE_ENDTRY;
 
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Sender Context Not Found\n"));
       // Do not have to unbind.
     }
-  ACE_ENDTRY;
 
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 5af3fec6390..0e0547a14b4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -47,30 +47,26 @@ public:
   // Initialize this class.
 
   void bind_to_receivers (const ACE_CString &sender_name,
-                          AVStreams::MMDevice_ptr sender
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                          AVStreams::MMDevice_ptr sender);
   // Method that binds the sender to the Naming Service and retreives
   // the references of any registered receivers.
 
-  void connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_receivers (void);
   // Connect to the receivers that we found.
 
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
-                       AVStreams::MMDevice_ptr receiver
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       AVStreams::MMDevice_ptr receiver);
   // Bind receiver to the sender.
 
-  void connect_to_sender (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_sender (void);
   // Connect to the sender that we found.
 
-  void destroy (const ACE_CString &flowname
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void destroy (const ACE_CString &flowname);
   // Destroy streams associated with <flowname>.
 
   void unbind_sender (const ACE_CString &sender_name,
-                      AVStreams::MMDevice_ptr sender_mmdevice
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS) ;
+                      AVStreams::MMDevice_ptr sender_mmdevice) ;
   // Unbind the sender from the Naming Service
 
   void unbind_receiver (const ACE_CString &sender_name,
@@ -79,8 +75,7 @@ public:
   // Unbind the Receiver from the Naming Service
 
   void add_streamctrl (const ACE_CString &flowname,
-                       TAO_StreamEndPoint *endpoint
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       TAO_StreamEndPoint *endpoint);
   // Add new streamctrl.
 
   // Map of receivers.
@@ -108,10 +103,9 @@ public:
 
 protected:
 
-  void find_receivers (ACE_ENV_SINGLE_ARG_DECL);
+  void find_receivers (void);
 
-  void add_to_receivers (CosNaming::BindingList &binding_list
-                         ACE_ENV_ARG_DECL);
+  void add_to_receivers (CosNaming::BindingList &binding_list);
 
   TAO_Naming_Client naming_client_;
   // The Naming Service client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index bcc4f71458d..bd402aa6754 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -88,8 +88,7 @@ Distributer_Receiver_StreamEndPoint::set_protocol_object (const char *,
 }
 
 CORBA::Boolean
-Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec
-                                                                  ACE_ENV_ARG_DECL_NOT_USED)
+Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec)
 {
   //if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -295,8 +294,7 @@ Distributer::parse_args (int argc,
 
 int
 Distributer::init (int argc,
-                   char ** argv
-                   ACE_ENV_ARG_DECL)
+                   char ** argv)
 {
   /// Initialize the connection class.
   int result =
@@ -343,8 +341,7 @@ Distributer::init (int argc,
     this->distributer_sender_mmdevice_;
 
   AVStreams::MMDevice_var distributer_sender_mmdevice =
-    this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->distributer_sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
                   TAO_MMDevice (&this->receiver_endpoint_strategy_),
@@ -355,30 +352,23 @@ Distributer::init (int argc,
     this->distributer_receiver_mmdevice_;
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->distributer_receiver_mmdevice_->_this ();
 
 
   /// Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->distributer_name_,
-                                            distributer_receiver_mmdevice.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                            distributer_receiver_mmdevice.in ());
 
   /// Connect to sender.
-  this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->connection_manager_.connect_to_sender ();
 
   /// Bind to receivers.
   this->connection_manager_.bind_to_receivers (this->distributer_name_,
-                                               distributer_sender_mmdevice.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                               distributer_sender_mmdevice.in ());
 
   /// Connect to receivers
-  this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->connection_manager_.connect_to_receivers ();
 
   return 0;
 }
@@ -390,33 +380,29 @@ Distributer::done (void) const
 }
 
 void
-Distributer::shut_down (ACE_ENV_SINGLE_ARG_DECL)
+Distributer::shut_down (void)
 {
-  ACE_TRY
+  try
     {
       AVStreams::MMDevice_var receiver_mmdevice =
-        this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->distributer_receiver_mmdevice_->_this ();
 
       DISTRIBUTER::instance ()->connection_manager ().unbind_receiver (this->sender_name_,
                                                                        this->distributer_name_,
                                                                        receiver_mmdevice.in ());
       AVStreams::MMDevice_var sender_mmdevice =
-        this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->distributer_sender_mmdevice_->_this ();
 
       DISTRIBUTER::instance ()->connection_manager ().unbind_sender (this->distributer_name_,
                                                                      sender_mmdevice.in ());
 
-    //  DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    //  ACE_TRY_CHECK;
+    //  DISTRIBUTER::instance ()->connection_manager ().destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Distributer::shut_down");
+      ex._tao_print_exception ("Distributer::shut_down");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -429,78 +415,59 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       /// Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       /// Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       /// Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
 
       if (result != 0)
         return result;
 
       while (!DISTRIBUTER::instance ()->done ())
         {
-          CORBA::Boolean wp = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::Boolean wp = orb->work_pending ();
 
           if (wp)
           {
-            orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+            orb->perform_work ();
 
-            ACE_TRY_CHECK;
           }
         }
 
-      DISTRIBUTER::instance ()->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      DISTRIBUTER::instance ()->shut_down ();
 
-//      orb->shutdown(1 ACE_ENV_ARG_PARAMETER);
-//      ACE_TRY_CHECK;
+//      orb->shutdown(1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"main");
+      ex._tao_print_exception ("main");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   DISTRIBUTER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index ab6f4753a14..f6698e5f3d1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -116,8 +116,7 @@ public:
   /// Store the reference to the protocol object corresponding
   /// to the transport
 
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
-                                                      ACE_ENV_ARG_DECL_NOT_USED);
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
   /// Called when a sender makes a connection request.
 
 private:
@@ -173,8 +172,7 @@ public:
   /// Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Initialize data components.
 
   int parse_args (int argc,
@@ -194,7 +192,7 @@ public:
   void stream_destroyed (void);
   /// Called when stream destroyed
 
-  void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shut_down (void);
   ///Unbind the sender and receiver from the Naming Service
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 573fdb12f34..469bb69d7d2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -48,8 +48,7 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name,
 }
 
 CORBA::Boolean
-Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
+Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -166,8 +165,7 @@ Receiver::receiver_name (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   /// Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -204,19 +202,15 @@ Receiver::init (int,
     this->mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->mmdevice_->_this ();
 
   /// Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->receiver_name_,
-                                            mmdevice.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                            mmdevice.in ());
 
   /// Connect to the sender.
-  this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->connection_manager_.connect_to_sender ();
 
   return 0;
 }
@@ -261,14 +255,13 @@ Receiver::output_file_name (void)
 }
 
 void
-Receiver::shut_down (ACE_ENV_SINGLE_ARG_DECL)
+Receiver::shut_down (void)
 {
-  ACE_TRY
+  try
     {
       AVStreams::MMDevice_var mmdevice_obj =
-        this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->mmdevice_->_this ();
 
-      ACE_TRY_CHECK;
 
       this->connection_manager_.unbind_receiver (this->sender_name_,
                                                  this->receiver_name_,
@@ -276,11 +269,10 @@ Receiver::shut_down (ACE_ENV_SINGLE_ARG_DECL)
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Receiver::shut_down");
+      ex._tao_print_exception ("Receiver::shut_down");
     }
-  ACE_ENDTRY;
 
 }
 
@@ -288,40 +280,29 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       /// Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       /// Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       Receiver receiver;
       int result =
@@ -346,31 +327,25 @@ main (int argc,
 
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       argv);
 
       if (result != 0)
         return result;
 
       while (!done)
         {
-          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->perform_work ();
         }
 
-      receiver.shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      receiver.shut_down ();
 
       ACE_OS::fclose (output_file);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index 19a9c673b8c..48a8b9b0210 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -82,8 +82,7 @@ public:
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
 
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
-                                                      ACE_ENV_ARG_DECL_NOT_USED);
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec);
   /// Called when a distributor tries to connect to the receiver
 
 private:
@@ -107,8 +106,7 @@ public:
   /// Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Initialize data components.
 
   int parse_args (int argc,
@@ -121,7 +119,7 @@ public:
   ACE_CString sender_name (void);
   ACE_CString receiver_name (void);
 
-  void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shut_down (void);
 
 protected:
   Connection_Manager connection_manager_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 34c878c4584..d6b8b855a50 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -150,26 +150,21 @@ Sender::~Sender (void)
 }
 
 void
-Sender::shut_down (ACE_ENV_SINGLE_ARG_DECL)
+Sender::shut_down (void)
 {
-  ACE_TRY
+  try
     {
       AVStreams::MMDevice_var mmdevice =
-        this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sender_mmdevice_->_this ();
 
       SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_,
-                                                                mmdevice.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                                mmdevice.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::shut_down Failed\n");
+      ex._tao_print_exception ("Sender::shut_down Failed\n");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -206,8 +201,7 @@ Sender::parse_args (int argc,
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   /// Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -266,26 +260,22 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->sender_mmdevice_->_this ();
 
   /// Register the object reference with the Naming Service and bind to
   /// the receivers
   this->connection_manager_.bind_to_receivers (this->sender_name_,
-                                               mmdevice.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                               mmdevice.in ());
 
   /// Connect to the receivers
-  this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->connection_manager_.connect_to_receivers ();
 
   return 0;
 }
 
 /// Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
   /// The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -300,7 +290,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       /// The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -314,8 +304,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
               ACE_DEBUG ((LM_DEBUG,
                           "Shut Down called\n"));
 
-              this->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->shut_down ();
 
               break;
             }
@@ -337,8 +326,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n"));
 
-              this->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->shut_down ();
 
               break;
 
@@ -379,9 +367,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
                   /// Run the orb for the wait time so the sender can
                   /// continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
 
                 }
             }
@@ -417,13 +403,11 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
         } /// end while
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -455,62 +439,46 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       ///Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       /// Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       /// Initialize the Client.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "client::init failed\n"), -1);
 
-      SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      SENDER::instance ()->pace_data ();
 
       orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index 6b5e8ef9e76..ed66e878f34 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -109,14 +109,13 @@ public:
   ~Sender (void);
   /// Destructor
 
-  void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shut_down (void);
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Method to initialize the various data components.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (void);
   /// Method to pace and send data from a file.
 
   Connection_Manager &connection_manager (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 16d694eb261..8bb9e81a97b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -28,7 +28,7 @@ FTP_Client_Callback::get_timeout (ACE_Time_Value *&tv,
 int
 FTP_Client_Callback::handle_timeout (void *)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Message_Block mb (BUFSIZ);
       ACE_DEBUG ((LM_DEBUG,"FTP_Client_Callback::handle_timeout\n"));
@@ -49,11 +49,9 @@ FTP_Client_Callback::handle_timeout (void *)
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-                  //CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec);
+                  //CLIENT::instance ()->streamctrl ()->destroy (stop_spec);
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-                  ACE_TRY_CHECK;
                   return 0;
                 }
               else
@@ -68,12 +66,12 @@ FTP_Client_Callback::handle_timeout (void *)
         ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send \n"),-1);
       ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent succesfully\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Client_Callback::handle_timeout Failed");
+      ex._tao_print_exception (
+        "FTP_Client_Callback::handle_timeout Failed");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -218,8 +216,7 @@ Client::init (int argc,char **argv)
   this->argv_ = argv;
 
   CORBA::String_var ior;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       PortableServer::POAManager_var mgr
@@ -235,14 +232,11 @@ Client::init (int argc,char **argv)
       ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1 );
       this->flowname_ = "Data";
 
-      sep_a_ = this->streamendpoint_a_->_this( ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sep_a_ = this->streamendpoint_a_->_this();
 
-      fep_a_obj_ = this->fep_a_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fep_a_obj_ = this->fep_a_->_this ();
 
-      CORBA::String_var s1 = sep_a_->add_fep( fep_a_obj_.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var s1 = sep_a_->add_fep( fep_a_obj_.in());
 
       ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", s1.in() ));
 
@@ -258,21 +252,18 @@ Client::init (int argc,char **argv)
                                        this->filename_), -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::init\n");
+      ex._tao_print_exception ("Client::init\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
 Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       char flow_protocol_str [BUFSIZ];
       if (this->use_sfp_)
@@ -310,35 +301,29 @@ Client::run (void)
 				sep_b.in(),
 				the_qos.inout(),
 				flow_spec
-				ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+ );
 
       timer.stop ();
       timer.elapsed_time (elapsed);
       elapsed.dump ();
-      ACE_TRY_CHECK;
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind failed\n"),-1);
 
       AVStreams::flowSpec start_spec (1);
-      this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->streamctrl_.start (start_spec);
 
       // Schedule a timer for the for the flow handler.
       ACE_Time_Value tv (10000,0);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::run\n");
+      ex._tao_print_exception ("Client::run\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -346,22 +331,18 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
 
 
       int result = 0;
@@ -370,24 +351,20 @@ main (int argc,
         ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
       result = CLIENT::instance ()->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      orb->destroy ();
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
 
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client Failed\n");
+    ex._tao_print_exception ("Client Failed\n");
     return -1;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   CLIENT::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 7a7a0686962..6445b4905fa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -10,19 +10,15 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   protocols [0] = CORBA::string_dup ("TCP");
   protocols [1] = CORBA::string_dup ("UDP");
   protocols [2] = CORBA::string_dup ("RTP/UDP");
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->set_protocol_restriction (protocols
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->set_protocol_restriction (protocols);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint\n");
+      ex._tao_print_exception (
+        "FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
@@ -103,8 +99,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::POAManager_var mgr
         = this->poa_->the_POAManager ();
@@ -126,14 +121,11 @@ Server::init (int argc,
 
       ACE_NEW_RETURN (this->fep_b_, FTP_Server_FlowEndPoint, -1);
 
-      sep_b_ = this->streamendpoint_b_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sep_b_ = this->streamendpoint_b_->_this ();
 
-      fep_b_obj_ = this->fep_b_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fep_b_obj_ = this->fep_b_->_this ();
 
-      CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() );
 
      ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", s1.in() ));
 
@@ -145,38 +137,30 @@ Server::init (int argc,
 
       // Register the video control object with the naming server.
       this->my_naming_client_->rebind (server_sep_b_name,
-                                       sep_b_.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       sep_b_.in ());
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
 Server::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::run\n");
+      ex._tao_print_exception ("server::run\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -224,31 +208,25 @@ main (int argc,
       char **argv)
 {
   int result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   result = FTP_SERVER::instance ()->init (argc,argv);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 07ce3c8e804..02f39b2b8f0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -79,7 +79,7 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
@@ -87,8 +87,7 @@ int main (int argc, char *argv[])
       parse_args (argc, argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
@@ -99,9 +98,7 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
 
       // Connect the two streams and run them...
       AVStreams::flowSpec flow_spec (2);
@@ -130,20 +127,15 @@ int main (int argc, char *argv[])
       TAO_StreamCtrl stream_control_impl;
 
       AVStreams::StreamCtrl_var stream_control =
-        stream_control_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        stream_control_impl._this ();
 
-      obj = orb->string_to_object (ping_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->string_to_object (ping_ior);
       AVStreams::MMDevice_var ping_sender =
-        AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        AVStreams::MMDevice::_narrow (obj.in ());
 
-      obj = orb->string_to_object (pong_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->string_to_object (pong_ior);
       AVStreams::MMDevice_var pong_sender =
-        AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        AVStreams::MMDevice::_narrow (obj.in ());
 
       AVStreams::streamQoS_var the_qos =
         new AVStreams::streamQoS;
@@ -151,34 +143,26 @@ int main (int argc, char *argv[])
       stream_control->bind_devs (pong_sender.in (),
                                  ping_sender.in (),
                                  the_qos.inout (),
-                                 flow_spec
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 flow_spec);
 
       flow_spec.length (0);
-      stream_control->start (flow_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      stream_control->start (flow_spec);
 
       ACE_Time_Value tv (100, 0);
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-      orb->shutdown (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (1);
 
      // flow_spec.length (0);
-     // stream_control->stop (flow_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+     // stream_control->stop (flow_spec);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 886394ae9f9..4b51044600b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -95,7 +95,7 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
@@ -104,8 +104,7 @@ int main (int argc, char *argv[])
       parse_args (argc, argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
@@ -116,9 +115,7 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
 
       // Register the video mmdevice object with the ORB
       Reactive_Strategy *reactive_strategy;
@@ -132,12 +129,10 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::MMDevice_var mmdevice =
-        mmdevice_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        mmdevice_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (mmdevice.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -164,23 +159,18 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::FDev_var ping_fdev =
-        ping_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ping_fdev_impl->_this ();
       AVStreams::FDev_var pong_fdev =
-        pong_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        pong_fdev_impl->_this ();
 
-      mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mmdevice->add_fdev (ping_fdev.in ());
 
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          mmdevice->add_fdev (pong_fdev.in ());
         }
 
       orb->run ();
-      ACE_TRY_CHECK;
 
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating scale factory . . . "));
@@ -190,13 +180,11 @@ int main (int argc, char *argv[])
       recv_latency.dump_results ("Receive", gsf);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 42979b096e9..5b176e2aba8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -111,7 +111,7 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
 
@@ -121,8 +121,7 @@ int main (int argc, char *argv[])
       parse_args (argc, argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
@@ -133,9 +132,7 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
 
       Reactive_Strategy *reactive_strategy;
       ACE_NEW_RETURN (reactive_strategy,
@@ -148,12 +145,10 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::MMDevice_var mmdevice =
-        mmdevice_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        mmdevice_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (mmdevice.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -180,22 +175,17 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::FDev_var ping_fdev =
-        ping_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ping_fdev_impl->_this ();
       AVStreams::FDev_var pong_fdev =
-        pong_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        pong_fdev_impl->_this ();
 
-      mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mmdevice->add_fdev (ping_fdev.in ());
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          mmdevice->add_fdev (pong_fdev.in ());
         }
 
-      orb->run ( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      orb->run ( );
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
@@ -208,13 +198,11 @@ int main (int argc, char *argv[])
       send_latency.dump_results ("Send", gsf);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index f9dc8ccefca..719b55dbc0c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -19,12 +19,10 @@ Receiver_StreamEndPoint::get_callback (const char *,
 
 
   // Get the stream controller for this stream.
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Any_ptr streamctrl_any =
-        this->get_property_value ("Related_StreamCtrl"
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->get_property_value ("Related_StreamCtrl");
 
       AVStreams::StreamCtrl_ptr streamctrl;
       *streamctrl_any >>= streamctrl;
@@ -32,14 +30,12 @@ Receiver_StreamEndPoint::get_callback (const char *,
       // Store the stream control for the stream with the callback.
       this->callback_.streamctrl (streamctrl);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender_StreamEndPoint::get_callback failed");
+      ex._tao_print_exception ("Sender_StreamEndPoint::get_callback failed");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -100,11 +96,9 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
           qos [0].QoSParams [0].property_name = CORBA::string_dup ("video_frame_rate");
           qos [0].QoSParams [0].property_value <<= (CORBA::Short) 30;
 
-          ACE_DECLARE_NEW_CORBA_ENV;
 
           // Initiate the modifying of the qos for the flows.
-          this->streamctrl_->modify_QoS (qos, flow_spec ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->streamctrl_->modify_QoS (qos, flow_spec);
 
           ACE_DEBUG ((LM_DEBUG,
                       "Stream Ctrl available....Modify QoS called\n"));
@@ -140,20 +134,16 @@ Receiver_Callback::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::end_stream\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -171,8 +161,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -191,8 +180,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->mmdevice_->_this ();
 
   // Register the mmdevice with the naming service.
   CosNaming::Name name (1);
@@ -209,9 +197,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -247,40 +233,29 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -305,29 +280,23 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       argv);
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 66ba33d02ed..48b0eca6bee 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -71,8 +71,7 @@ public:
   /// Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Initialize data components.
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index 5788046dcb9..7244d8dcdf0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -38,7 +38,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
 CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                    const AVStreams::flowSpec &/* the_flows */
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   )
                             ACE_THROW_SPEC((CORBA::SystemException,
                                             AVStreams::noSuchFlow,
                                             AVStreams::QoSRequestFailed ))
@@ -123,7 +123,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -132,14 +132,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -151,8 +147,7 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -189,8 +184,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->bind_to_receiver ();
 
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -223,8 +217,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->streamctrl_,
                   TAO_StreamCtrl,
@@ -238,9 +231,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -252,7 +243,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
 
 
@@ -266,7 +257,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -323,9 +314,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -353,20 +342,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+      this->streamctrl_->destroy (stop_spec);
 
         // Shut the orb down.
-        TAO_AV_CORE::instance ()->orb ()->shutdown (1 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        TAO_AV_CORE::instance ()->orb ()->shutdown (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -374,46 +359,33 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -421,18 +393,14 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = SENDER::instance ()->pace_data ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index 22483881f89..78ca9dc022f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -30,8 +30,7 @@ class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
   /// chosen.
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                             const AVStreams::flowSpec &flow_spec
-                             ACE_ENV_ARG_DECL)
+                             const AVStreams::flowSpec &flow_spec)
                             ACE_THROW_SPEC((CORBA::SystemException,
                                             AVStreams::noSuchFlow,
                                             AVStreams::QoSRequestFailed ));
@@ -64,11 +63,10 @@ public:
   /// Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   /// Method to initialize the various data components.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (void);
   /// Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -78,7 +76,7 @@ private:
   int parse_args (int argc, char **argv);
   /// Method to parse the command line arguments.
 
-  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (void);
   /// Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index ee6b23f62df..c827562b411 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -49,25 +49,22 @@ FTP_Client_Callback::handle_timeout (void *)
           this->count_++;
           if (this->count_ == 2)
             {
-              ACE_TRY_NEW_ENV
+              try
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
                   //ACE_DECLARE_NEW_CORBA_ENV;
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
-//                    CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
-//                    ACE_TRY_CHECK;
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec);
+//                    CLIENT::instance ()->streamctrl ()->destroy (stop_spec);
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-                  ACE_TRY_CHECK;
                   return 0;
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Client_Callback::handle_timeout\n");
+                  ex._tao_print_exception (
+                    "FTP_Client_Callback::handle_timeout\n");
                   return -1;
                 }
-              ACE_ENDTRY;
             }
           else
             return 0;
@@ -186,36 +183,29 @@ Client::Client (void)
 int
 Client::bind_to_server (const char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the naming services
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = name;
       CORBA::Object_var server_mmdevice_obj =
-        my_naming_client_->resolve (server_mmdevice_name
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        my_naming_client_->resolve (server_mmdevice_name);
 
       this->server_mmdevice_ =
-        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ());
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " could not resolve Server_Mmdevice in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::bind_to_server\n");
+      ex._tao_print_exception ("Client::bind_to_server\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -257,8 +247,7 @@ Client::init (int argc,char **argv)
 int
 Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       char flow_protocol_str [BUFSIZ];
       if (this->use_sfp_)
@@ -268,7 +257,6 @@ Client::run (void)
       AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
       AVStreams::flowSpec flow_spec (1);
 
-      ACE_TRY_CHECK;
       ACE_INET_Addr addr (this->address_);
       ACE_NEW_RETURN (this->flowname_,
                       char [BUFSIZ],
@@ -287,16 +275,13 @@ Client::run (void)
       ACE_DEBUG ((LM_DEBUG, "(%N,%l) Flowspec: %s\n", entry.entry_to_string() ));
 
       AVStreams::MMDevice_var client_mmdevice
-        = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = this->client_mmdevice_._this ();
 
       CORBA::Boolean result =
         this->streamctrl_.bind_devs (client_mmdevice.in (),
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
-                                     flow_spec
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     flow_spec);
       if (this->bind_to_server ("Server_MMDevice1") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
@@ -304,9 +289,7 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            flow_spec);
       if (this->bind_to_server ("Server_MMDevice2") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
@@ -314,35 +297,29 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            flow_spec);
 
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
       AVStreams::flowSpec start_spec (1);
       start_spec.length (1);
       start_spec [0] = CORBA::string_dup (this->flowname_);
-      this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->streamctrl_.start (start_spec);
       // Schedule a timer for the for the flow handler.
       //TAO_AV_CORE::instance ()->run ();
       ACE_Time_Value tv (10000,0);
 
-      TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Exited the TAO_AV_Core::run\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::run");
+      ex._tao_print_exception ("Client::run");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -350,22 +327,18 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
 
       int result = 0;
       result = CLIENT::instance ()->init (argc,argv);
@@ -375,14 +348,12 @@ main (int argc,
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client Failed\n");
+      ex._tao_print_exception ("Client Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   CLIENT::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 343079ff7dd..216cee6a8ef 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -66,8 +66,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       PortableServer::POAManager_var mgr
@@ -95,35 +94,26 @@ Server::init (int argc,
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice1");
-      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this ();
 
-      ACE_TRY_EX (bind)
+      try
         {
           // Register the video control object with the naming server.
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bind);
+                                         mmdevice.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex)
+      catch (const CosNaming::NamingContext::AlreadyBound&)
         {
           server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2");
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         mmdevice.in ());
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -131,34 +121,27 @@ int
 Server::run (void)
 {
   CORBA::ORB_ptr orb = TAO_AV_CORE::instance ()->orb();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       while( !done )
       {
-        CORBA::Boolean wp = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::Boolean wp = orb->work_pending ();
         if (wp)
          {
-              orb->perform_work( ACE_ENV_SINGLE_ARG_PARAMETER );
-              ACE_TRY_CHECK;
+              orb->perform_work( );
          }
       }
-      ACE_TRY_CHECK;
 
-      orb->shutdown( 1 ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      orb->shutdown( 1 );
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
 
 
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -203,29 +186,23 @@ main (int argc,
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   result = FTP_SERVER::instance ()->init (argc,argv);
   if (result < 0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 11a0624b3f4..e646ffe3698 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -45,21 +45,20 @@ FTP_Client_Callback::handle_timeout (void *)
           this->count_++;
           if (this->count_ == 2)
             {
-              ACE_TRY_NEW_ENV
+              try
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
                   ACE_DEBUG ((LM_DEBUG, "Just before Orb Shutdown\n"));
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-                  ACE_TRY_CHECK;
                   return 0;
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Client_Callback::handle_timeout\n");
+                  ex._tao_print_exception (
+                    "FTP_Client_Callback::handle_timeout\n");
                   return -1;
                 }
-              ACE_ENDTRY;
             }
           else
             return 0;
@@ -192,9 +191,8 @@ Client::Client (void)
 int
 Client::bind_to_server (const char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the naming services
       if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -207,27 +205,22 @@ Client::bind_to_server (const char *name)
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = name;
       CORBA::Object_var server_mmdevice_obj =
-        my_naming_client_->resolve (server_mmdevice_name
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        my_naming_client_->resolve (server_mmdevice_name);
 
       this->server_mmdevice_ =
-        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ());
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " could not resolve Server_Mmdevice in Naming service <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Command_Handler::resolve_reference");
+      ex._tao_print_exception (
+        "Command_Handler::resolve_reference");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -237,8 +230,7 @@ Client::init (int argc,char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableServer::POAManager_var mgr
         = TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
@@ -259,12 +251,9 @@ Client::init (int argc,char **argv)
       ACE_OS::sprintf (this->flowname_,
                        "Data");
       this->fdev_->flowname (this->flowname ());
-      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      mmdevice->add_fdev (fdev.in ()
-                          ACE_ENV_ARG_PARAMETER);
+      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this ();
+      AVStreams::FDev_var fdev = this->fdev_->_this ();
+      mmdevice->add_fdev (fdev.in ());
 
       if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -278,21 +267,18 @@ Client::init (int argc,char **argv)
           ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::init");
+      ex._tao_print_exception ("Client::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
 Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       char flow_protocol_str [BUFSIZ];
       if (this->use_sfp_)
@@ -315,16 +301,13 @@ Client::run (void)
       flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
 
       AVStreams::MMDevice_var client_mmdevice =
-        this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->client_mmdevice_._this ();
 
       CORBA::Boolean result =
         this->streamctrl_.bind_devs (client_mmdevice.in (),
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
-                                     flow_spec
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     flow_spec);
 
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs for client_mmdevice failed\n"),-1);
@@ -335,13 +318,10 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            flow_spec);
 
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"(%N,%l) streamctrl::bind_devs for mmdevice 1 failed\n"),-1);
-      ACE_TRY_CHECK;
       if (this->bind_to_server ("Server_MMDevice2") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
@@ -349,35 +329,29 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            flow_spec);
 
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"(%N,%l) streamctrl::bind_devs for mmdevice 2 failed\n"),-1);
       AVStreams::flowSpec start_spec (1);
       start_spec.length (1);
       start_spec [0] = CORBA::string_dup (this->flowname_);
-      this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->streamctrl_.start (start_spec);
       // Schedule a timer for the for the flow handler.
       //TAO_AV_CORE::instance ()->run ();
 
       ACE_Time_Value tv (10000,0);
-      TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Exited the TAO_AV_Core::run\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::run");
+      ex._tao_print_exception ("Client::run");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -389,29 +363,23 @@ main (int argc,
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   int result = 0;
   result = CLIENT::instance ()->init (argc,argv);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index a83a5b623da..38d2967bd3e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -9,19 +9,15 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   protocols.length (2);
   protocols [0] = CORBA::string_dup ("TCP");
   protocols [1] = CORBA::string_dup ("UDP");
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->set_protocol_restriction (protocols
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->set_protocol_restriction (protocols);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint");
+      ex._tao_print_exception (
+        "FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
@@ -82,15 +78,14 @@ FTP_Server_Callback::handle_end_stream (void)
 //                                 AVStreams::QoS & the_qos,
 //                                 CORBA::Boolean_out met_qos,
 //                                 char *& named_fdev,
-//                                 ACE_ENV_SINGLE_ARG_DECL)
+//)
 // {
 //   ACE_DEBUG ((LM_DEBUG,"FTP_Server_FDev::make_consumer"));
 //   FTP_Server_FlowEndPoint *endpoint;
 //   ACE_NEW_RETURN (endpoint,
 //                   FTP_Server_FlowEndPoint,
 //                   0);
-//   return endpoint->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (0);
+//   return endpoint->_this ();
 // }
 
 Server::Server (void)
@@ -119,8 +114,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       PortableServer::POAManager_var mgr
@@ -148,63 +142,47 @@ Server::init (int argc,
                       FTP_Server_FDev,
                       -1);
       this->fdev_->flowname ("Data");
-      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      mmdevice->add_fdev (fdev.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this ();
+      AVStreams::FDev_var fdev = this->fdev_->_this ();
+      mmdevice->add_fdev (fdev.in ());
 
       // Register the mmdevice with the naming service.
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice1");
-      ACE_TRY_EX (bind)
+      try
         {
           // Register the video control object with the naming server.
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bind);
+                                         mmdevice.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex)
+      catch (const CosNaming::NamingContext::AlreadyBound&)
         {
           server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2");
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         mmdevice.in ());
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
 Server::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      TAO_AV_CORE::instance ()->orb ()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->run ();
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -249,29 +227,23 @@ main (int argc,
 
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      poa.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   int result = 0;
   result = FTP_SERVER::instance ()->init (argc,argv);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index bdd2957c2ec..af8b7b55f76 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -39,7 +39,7 @@ public:
 //                                                        AVStreams::QoS & the_qos,
 //                                                        CORBA::Boolean_out met_qos,
 //                                                        char *& named_fdev,
-//                                                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+//);
 //   // bridge method for the application to override the consumer object
 //   // creation. Default implementation creates a TAO_FlowConsumer.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index ef33207328f..d0d61feb0f5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -169,8 +169,7 @@ Receiver::parse_args (int argc,
 
 int
 Receiver::init (int argc,
-                char ** argv
-                ACE_ENV_ARG_DECL)
+                char ** argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -197,8 +196,7 @@ Receiver::init (int argc,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->mmdevice_->_this ();
 
   // Register the mmdevice with the naming service.
   CosNaming::Name name (1);
@@ -215,9 +213,7 @@ Receiver::init (int argc,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -232,69 +228,52 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       int result =
         RECEIVER::instance ()->init (argc,
-                                     argv
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     argv);
 
       if (result != 0)
         return result;
 
       while (endstream != 2)
         {
-          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->perform_work ();
         }
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   RECEIVER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index f5fb5efa767..d650c3dbe5d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -96,8 +96,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 79169527b6d..5ba3528f2f6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -54,18 +54,14 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 void
-Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Sender::shutdown (void)
 {
   // File reading is complete, destroy the stream.
   AVStreams::flowSpec stop_spec;
-  this->streamctrl_->destroy (stop_spec
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-  TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_AV_CORE::instance ()->orb ()->shutdown (0);
 
 }
 
@@ -103,7 +99,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -112,14 +108,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -131,8 +123,7 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -169,8 +160,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->bind_to_receiver ();
 
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -213,8 +203,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->streamctrl_,
                   TAO_StreamCtrl,
@@ -228,9 +217,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -242,7 +229,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -257,7 +244,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -319,9 +306,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -353,16 +338,13 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
         } // end while
 
-      this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -370,46 +352,33 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -417,17 +386,13 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = SENDER::instance ()->pace_data ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index d37c46f21b9..72bd9067341 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -65,23 +65,22 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (void);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
   // Set the protocol object corresponding to the transport protocol chosen.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
 
 private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (void);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index d3519e0114f..7cca1701be9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -128,7 +128,7 @@ Client::frame_rate (void)
 
 // Method to get the object reference of the server
 int
-Client::bind_to_server (ACE_ENV_SINGLE_ARG_DECL)
+Client::bind_to_server (void)
 {
   // Initialize the naming services
   if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -143,14 +143,10 @@ Client::bind_to_server (ACE_ENV_SINGLE_ARG_DECL)
 
   // Resolve the server object reference from the Naming Service
   CORBA::Object_var server_mmdevice_obj =
-    my_naming_client_->resolve (server_mmdevice_name
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    my_naming_client_->resolve (server_mmdevice_name);
 
   this->server_mmdevice_ =
-    AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->server_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -162,8 +158,7 @@ Client::bind_to_server (ACE_ENV_SINGLE_ARG_DECL)
 
 int
 Client::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -191,8 +186,7 @@ Client::init (int argc,
                       -1);
 
   result
-    = this->bind_to_server (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    = this->bind_to_server ();
 
   // Resolve the object reference of the server from the Naming Service.
   if (result != 0)
@@ -269,17 +263,14 @@ Client::init (int argc,
   flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
 
   AVStreams::MMDevice_var client_mmdevice =
-    this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->client_mmdevice_._this ();
 
   // Bind/Connect  the client and server MMDevices.
   CORBA::Boolean bind_result =
     this->streamctrl_.bind_devs (client_mmdevice.in (),
                                  this->server_mmdevice_.in (),
                                  the_qos.inout (),
-                                 flow_spec
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                 flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
@@ -289,7 +280,7 @@ Client::init (int argc,
 
 // Method to send data at the specified rate
 int
-Client::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Client::pace_data (void)
 {
 
   // Rate at which frames of data need to be sent.
@@ -312,7 +303,7 @@ Client::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 "Inter Frame Time = %d\n",
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
 
       // Continue to send data till the file is read to the end.
@@ -371,9 +362,7 @@ Client::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                                 wait_time.msec ()));
 
                   // run the orb for the wait time so the client can continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -395,22 +384,17 @@ Client::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
       // Since the file is read stop the stream.
       AVStreams::flowSpec stop_spec (1);
-      CLIENT::instance ()->streamctrl ()->destroy (stop_spec
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CLIENT::instance ()->streamctrl ()->destroy (stop_spec);
 
       // Shut the orb down.
       TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-      ACE_TRY_CHECK;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client::pace_data Failed");
+      ex._tao_print_exception ("Client::pace_data Failed");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -418,66 +402,49 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
 
       //Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV STream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // INitialize the Client.
       int result = 0;
       result = CLIENT::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "client::init failed\n"),1);
 
       // Start sending data.
-      result = CLIENT::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = CLIENT::instance ()->pace_data ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
 
     {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client Failed\n");
+    ex._tao_print_exception ("Client Failed\n");
     return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   CLIENT::close ();
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 4f405b5a9da..76f79679002 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -88,14 +88,13 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
   // Set the protocol object corresponding to the transport protocol chosen.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (void);
   // Method to pace and send data from a file.
 
   FILE *file (void);
@@ -114,7 +113,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_server (ACE_ENV_SINGLE_ARG_DECL);
+  int bind_to_server (void);
   // Method that binds the ftp client to the server
 
   ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index db4658830c7..bd3aa1f3a80 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -74,8 +74,7 @@ Server::~Server (void)
 
 int
 Server::init (int,
-              char **
-              ACE_ENV_ARG_DECL)
+              char **)
 {
   int result =
     this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
@@ -94,8 +93,7 @@ Server::init (int,
   server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    this->mmdevice_->_this ();
 
   // Initialize the naming services
   if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -106,9 +104,7 @@ Server::init (int,
 
   // Register the server object with the naming server.
   this->my_naming_client_->rebind (server_mmdevice_name,
-                                   mmdevice.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                   mmdevice.in ());
 
   return 0;
 }
@@ -143,15 +139,12 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       int result =
         parse_args (argc,
@@ -173,58 +166,44 @@ main (int argc,
                        "File Opened Successfully\n"));
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       Server server;
       result =
         server.init (argc,
-                     argv
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     argv);
 
       if (result != 0)
         return result;
 
       while ( !done )
       {
-        if ( orb->work_pending( ACE_ENV_SINGLE_ARG_PARAMETER ) )
+        if ( orb->work_pending( ) )
 	{
-          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->perform_work ();
 	}
       }
 
-      orb->shutdown( 1 ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      orb->shutdown( 1 );
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      ex._tao_print_exception ("server::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index c1c6776efe2..e9040e1f39f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -77,8 +77,7 @@ public:
   // Deestructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index d24c92414ff..de3a2ec9066 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -92,8 +92,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -112,8 +111,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->mmdevice_->_this ();
 
   // Register the mmdevice with the naming service.
   CosNaming::Name name (1);
@@ -130,9 +128,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -168,8 +164,7 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_High_Res_Timer::global_scale_factor ();
 
@@ -177,33 +172,23 @@ main (int argc,
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -228,32 +213,26 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       argv);
 
       if (result != 0)
         return result;
 
       while (!endstream)
         {
-          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->perform_work ();
         }
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 39c4ac3b39e..02e0d800987 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -83,8 +83,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index 9af1f2ba80b..695c05cb6b3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -87,7 +87,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -96,14 +96,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -115,8 +111,7 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -153,8 +148,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->bind_to_receiver ();
 
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -187,8 +181,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->streamctrl_,
                   TAO_StreamCtrl,
@@ -202,9 +195,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -216,7 +207,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -231,7 +222,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -293,9 +284,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -323,22 +312,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -346,8 +329,7 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       ACE_High_Res_Timer::global_scale_factor ();
@@ -355,39 +337,28 @@ main (int argc,
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -395,17 +366,13 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = SENDER::instance ()->pace_data ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index 20e9dc6ef50..014c827d70a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -62,11 +62,10 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Method to initialize the various data components.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL);
+  int pace_data (void);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -76,7 +75,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (void);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index dd2c65abfdd..8410345517c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -74,27 +74,24 @@ int
 Distributer_Receiver_Callback::handle_destroy (void)
 {
   // Called when the sender requests the stream to be shutdown.
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Distributer_Callback::end_stream\n"));
 
       // Destroy the receiver stream
       AVStreams::flowSpec stop_spec;
-      DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec
-                                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec);
 
       // We can close down now.
       DISTRIBUTER::instance ()->done (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Distributer_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception (
+        "Distributer_Callback::handle_destroy Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -130,8 +127,7 @@ Distributer::~Distributer (void)
 
 void
 Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
-                               const ACE_CString &mmdevice_name
-                               ACE_ENV_ARG_DECL)
+                               const ACE_CString &mmdevice_name)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -140,20 +136,16 @@ Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
 
   // Resolve the mmdevice object reference from the Naming Service
   CORBA::Object_var mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_client_->resolve (name);
 
   mmdevice =
-    AVStreams::MMDevice::_narrow (mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    AVStreams::MMDevice::_narrow (mmdevice_obj.in ());
 }
 
 int
 Distributer::init (int /*argc*/,
                    char *[] /*argv*/
-                   ACE_ENV_ARG_DECL)
+                   )
 {
   // Initialize the naming services
   int result =
@@ -177,16 +169,12 @@ Distributer::init (int /*argc*/,
   // Bind to the receiver mmdevice
   ACE_CString mmdevice_name ("Receiver");
   this->bind_to_mmdevice (this->receiver_mmdevice_.out (),
-                          mmdevice_name
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                          mmdevice_name);
 
   // Bind to the sender mmdevice
   mmdevice_name = "Sender";
   this->bind_to_mmdevice (this->sender_mmdevice_.out (),
-                          mmdevice_name
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                          mmdevice_name);
 
   // Initialize the  QoS
   AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
@@ -214,8 +202,7 @@ Distributer::init (int /*argc*/,
     this->distributer_sender_mmdevice_;
 
   AVStreams::MMDevice_var distributer_sender_mmdevice =
-    this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->distributer_sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
                   TAO_MMDevice (&this->receiver_endpoint_strategy_),
@@ -226,8 +213,7 @@ Distributer::init (int /*argc*/,
     this->distributer_receiver_mmdevice_;
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->distributer_receiver_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->receiver_streamctrl_,
                   TAO_StreamCtrl,
@@ -242,9 +228,7 @@ Distributer::init (int /*argc*/,
     this->receiver_streamctrl_->bind_devs (distributer_sender_mmdevice.in (),
                                            this->receiver_mmdevice_.in (),
                                            the_qos.inout (),
-                                           flow_spec
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                           flow_spec);
 
   // Create the forward flow specification to describe the flow.
   TAO_Forward_FlowSpec_Entry sender_entry ("Data_Sender",
@@ -273,9 +257,7 @@ Distributer::init (int /*argc*/,
     sender_streamctrl->bind_devs (sender_mmdevice_.in (),
                                   distributer_receiver_mmdevice.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  flow_spec);
 
   if (res == 0)
     ACE_ERROR_RETURN ((LM_ERROR,"Streamctrl::bind_devs failed\n"),-1);
@@ -305,67 +287,51 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
 
       if (result != 0)
         return result;
 
       while (!DISTRIBUTER::instance ()->done ())
         {
-          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->perform_work ();
         }
 
       // Hack for now....
       ACE_OS::sleep (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"main");
+      ex._tao_print_exception ("main");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   DISTRIBUTER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index 8b9f74cdf07..67244ff68c9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -115,13 +115,11 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
   void bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
-                         const ACE_CString &mmdevice_name
-                         ACE_ENV_ARG_DECL);
+                         const ACE_CString &mmdevice_name);
   // Resolve the reference of the mmdevice from the naming service.
 
   TAO_StreamCtrl *receiver_streamctrl (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index 7a64da3488c..c91db5e09c4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -64,20 +64,16 @@ Receiver_Callback::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::end_stream\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -93,8 +89,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -113,8 +108,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->mmdevice_->_this ();
 
   // Register the mmdevice with the naming service.
   CosNaming::Name name (1);
@@ -131,9 +125,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -169,40 +161,29 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -227,29 +208,23 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       argv);
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index a08f222d24d..df4daa0dcc9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -83,8 +83,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 9e766993cf7..b2bc0bd06ab 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -21,12 +21,10 @@ Sender_StreamEndPoint::get_callback (const char *,
   callback = &this->callback_;
 
   // Get the stream controller for this stream.
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Any_ptr streamctrl_any =
-        this->get_property_value ("Related_StreamCtrl"
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->get_property_value ("Related_StreamCtrl");
 
       AVStreams::StreamCtrl_ptr streamctrl;
       *streamctrl_any >>= streamctrl;
@@ -34,14 +32,12 @@ Sender_StreamEndPoint::get_callback (const char *,
       // Store reference to the streamctrl
       SENDER::instance ()->streamctrl (streamctrl);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender_StreamEndPoint::get_callback failed");
+      ex._tao_print_exception ("Sender_StreamEndPoint::get_callback failed");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -115,8 +111,7 @@ Sender::parse_args (int argc,
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -162,8 +157,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    this->sender_mmdevice_->_this ();
 
   CosNaming::Name name (1);
   name.length (1);
@@ -172,16 +166,14 @@ Sender::init (int argc,
 
   // Register the sender object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                mmdevice.in ());
 
   return 0;
 }
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -196,7 +188,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -207,9 +199,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
           // Run the orb for the wait time so the sender can
           // continue other orb requests.
           ACE_Time_Value wait_time (5);
-          TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          TAO_AV_CORE::instance ()->orb ()->run (wait_time);
         }
 
       // Continue to send data till the file is read to the end.
@@ -269,9 +259,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -302,18 +290,14 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
         {
           // File reading is complete, destroy the stream.
           AVStreams::flowSpec stop_spec;
-          this->streamctrl_->destroy (stop_spec
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->streamctrl_->destroy (stop_spec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -321,67 +305,51 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Sender::init failed\n"),
                           -1);
 
-      SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      SENDER::instance ()->pace_data ();
 
       ACE_Time_Value tv (10);
       orb->run (tv);
       // Hack for now....
       ACE_OS::sleep (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index a5e40f9134e..18b14b3d3bb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -62,11 +62,10 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (void);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index 31bdd2c32e2..2bdc00c0bb7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -127,20 +127,16 @@ Receiver_Callback::handle_destroy (void)
 
   dump_samples (stats_file_name);
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -156,8 +152,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -176,8 +171,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->mmdevice_->_this ();
 
   // Register the mmdevice with the naming service.
   CosNaming::Name name (1);
@@ -194,9 +188,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -236,40 +228,29 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -294,31 +275,25 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       argv);
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 718b2deac25..1023828a24e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -90,8 +90,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index c98b0bed8bb..740b549a1e6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -141,7 +141,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -150,14 +150,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -169,8 +165,7 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -207,8 +202,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->bind_to_receiver ();
 
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -272,8 +266,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->streamctrl_,
                   TAO_StreamCtrl,
@@ -287,9 +280,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -301,7 +292,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -316,7 +307,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -381,9 +372,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -414,22 +403,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -437,45 +420,33 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -483,17 +454,13 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = SENDER::instance ()->pace_data ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close ();  // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index 32cbf2856c9..7bdeb7d7b21 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -62,11 +62,10 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (void);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -76,7 +75,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (void);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
@@ -117,7 +116,7 @@ private:
 
   char* address_;
   // Destination Address.
-  
+
   char* peer_address_;
   // Destination Address.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index 527be2f6f10..3e23a25cdb9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -65,20 +65,16 @@ Receiver_Callback::handle_destroy (void)
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::end_stream\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Receiver_Callback::handle_destroy Failed\n");
+      ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
 
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -96,8 +92,7 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **
-                ACE_ENV_ARG_DECL)
+                char **)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -116,8 +111,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->mmdevice_->_this ();
 
   // Register the mmdevice with the naming service.
   CosNaming::Name name (1);
@@ -134,9 +128,7 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                mmdevice.in ());
 
   return 0;
 }
@@ -172,40 +164,29 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       int result =
         parse_args (argc,
@@ -230,29 +211,23 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       argv);
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init");
+      ex._tao_print_exception ("receiver::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (output_file);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 91af15eaa33..7e4d84d0c5e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -84,8 +84,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 05bc380156d..07d6f6b2294 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -15,8 +15,7 @@ ACE_Time_Value inter_frame_time;
 
 CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
-                                   const AVStreams::flowSpec &the_flows
-                                   ACE_ENV_ARG_DECL)
+                                   const AVStreams::flowSpec &the_flows)
                                    ACE_THROW_SPEC (( CORBA::SystemException,
                                                      AVStreams::noSuchFlow,
                                                      AVStreams::QoSRequestFailed ))
@@ -24,8 +23,7 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
   ACE_DEBUG ((LM_DEBUG,
               "Sender_StreamEndPoint::modify_QoS\n"));
 
-  int result =  this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  int result =  this->change_qos (new_qos, the_flows);
 
   if (result != 0)
     return 0;
@@ -37,7 +35,6 @@ int
 Sender_StreamEndPoint::get_callback (const char *,
                                      TAO_AV_Callback *&callback)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   // Create and return the sender application callback to AVStreams
   // for further upcalls.
   callback = &this->callback_;
@@ -47,8 +44,7 @@ Sender_StreamEndPoint::get_callback (const char *,
                   TAO_Negotiator,
                   -1);
   AVStreams::Negotiator_var negotiator_obj =
-    negotiator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    negotiator->_this ();
 
   this->set_negotiator (negotiator_obj.in ());
 
@@ -192,7 +188,7 @@ Sender::fill_qos (AVStreams::streamQoS &qos)
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (void)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -201,14 +197,10 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->naming_client_->resolve (name);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ());
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -220,8 +212,7 @@ Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 
 int
 Sender::init (int argc,
-              char **argv
-              ACE_ENV_ARG_DECL)
+              char **argv)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -258,8 +249,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->bind_to_receiver ();
 
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -325,8 +315,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->sender_mmdevice_->_this ();
 
   ACE_NEW_RETURN (this->streamctrl_,
                   TAO_StreamCtrl,
@@ -344,9 +333,7 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   qos,
-                                  flow_spec
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  flow_spec);
 
   if (bind_result == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -358,7 +345,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (void)
 {
 
 
@@ -372,7 +359,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
                 this->frame_rate_,
                 inter_frame_time.msec ()));
 
-  ACE_TRY
+  try
     {
       // The time taken for sending a frame and preparing for the next frame
       ACE_High_Res_Timer elapsed_timer;
@@ -434,9 +421,7 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time);
                 }
             }
 
@@ -475,32 +460,24 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
               AVStreams::streamQoS qos;
               this->fill_qos (qos);
               this->streamctrl_->modify_QoS (qos,
-                                             flow_spec
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                             flow_spec);
             }
 
         } // end while
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->streamctrl_->destroy (stop_spec);
 
       // Shut the orb down.
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender::pace_data Failed\n");
+      ex._tao_print_exception ("Sender::pace_data Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -508,45 +485,33 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
+                         0);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = root_poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      root_poa.in ());
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          argv);
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -554,17 +519,13 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = SENDER::instance ()->pace_data ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Sender Failed\n");
+      ex._tao_print_exception ("Sender Failed\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   SENDER::close (); // Explicitly finalize the Unmanaged_Singleton.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index a314624ed28..46676fd5579 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -40,7 +40,7 @@ public:
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                              const AVStreams::flowSpec &/* the_flows */
-                             ACE_ENV_ARG_DECL)
+                             )
                             ACE_THROW_SPEC(( CORBA::SystemException,
                                              AVStreams::noSuchFlow,
                                              AVStreams::QoSRequestFailed ));
@@ -68,11 +68,10 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL_NOT_USED);
+            char **argv);
   // Method to initialize the various data components.
 
-  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (void);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -85,7 +84,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (void);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index 23f3ff6baf8..8551e20c058 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -11,15 +11,15 @@ class Time_impl :
 {
 public:
   virtual TimeModule::TimeOfDay
-    get_gmt (ACE_ENV_SINGLE_ARG_DECL)
+    get_gmt (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void Shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void Shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
-TimeModule::TimeOfDay Time_impl::get_gmt (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TimeModule::TimeOfDay Time_impl::get_gmt (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -36,7 +36,7 @@ TimeModule::TimeOfDay Time_impl::get_gmt (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Time_impl::Shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Time_impl::Shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   exit(0);
@@ -45,34 +45,27 @@ Time_impl::Shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 int
 main(int argc, char * argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       // Get reference to Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var rootpoa =
         PortableServer::POA::_narrow (obj.in ());
 
       // Activate POA manager
       PortableServer::POAManager_var mgr =
-        rootpoa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rootpoa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       PortableServer::POA_var poa;
 
@@ -80,14 +73,10 @@ main(int argc, char * argv[])
       PolicyList.length (3);
 
       PolicyList [0] =
-        rootpoa->create_lifespan_policy (PortableServer::PERSISTENT
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rootpoa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PolicyList [1] =
-        rootpoa->create_id_assignment_policy (PortableServer::USER_ID
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rootpoa->create_id_assignment_policy (PortableServer::USER_ID);
 
       CORBA::Any CallbackPolicy;
       CallbackPolicy <<= BiDirPolicy::BOTH;
@@ -95,15 +84,11 @@ main(int argc, char * argv[])
 
       PolicyList [2] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            CallbackPolicy
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            CallbackPolicy);
 
       poa = rootpoa->create_POA (sServerPoaName,
                                  mgr.in(),
-                                 PolicyList
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 PolicyList);
 
 
       PortableServer::ObjectId_var ServerId =
@@ -114,18 +99,14 @@ main(int argc, char * argv[])
       PortableServer::ServantBase_var self_manage (time_servant);
 
       poa->activate_object_with_id (ServerId.in (),
-                                    time_servant
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    time_servant);
 
       // Get a reference after activating the object
       TimeModule::Time_var tm = time_servant->_this();
 
       // Get reference to initial naming context
       CORBA::Object_var name_obj =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var inc =
         CosNaming::NamingContext::_narrow (name_obj.in ());
@@ -142,33 +123,24 @@ main(int argc, char * argv[])
         CORBA::string_dup ("Time");
 
       inc->rebind (service_name,
-                   tm.in ()
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   tm.in ());
 
       // Run the event loop for fun
       ACE_Time_Value tv (3, 0);
 
       // Accept requests
-      orb->run (&tv
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (&tv);
 
-      rootpoa->destroy (0 , 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rootpoa->destroy (0 , 0);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught an exception\n");
+      ex._tao_print_exception ("Caught an exception\n");
 
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
index 52e3543d1ee..0ece672154c 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
@@ -11,34 +11,30 @@
 //
 int main( int argc, char *argv[] )
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ) ;
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ) ;
 
-      ACE_TRY_EX (nested)
+      try
         {
            CORBA::Object_var naming =
-              orb->resolve_initial_references( "NameService" ACE_ENV_ARG_PARAMETER) ;
-           ACE_TRY_CHECK_EX (nested);
+              orb->resolve_initial_references( "NameService") ;
            if( CORBA::is_nil( naming.in() ) )
              {
                 return 1 ;
              }
         }
-      ACE_CATCH (CORBA::Exception, ex)
+      catch (const CORBA::Exception& ex)
         {
           ACE_UNUSED_ARG (ex);
           return 1 ;
         }
-      ACE_ENDTRY;
     }
-  ACE_CATCH ( CORBA::Exception, ex )
+  catch (const CORBA::Exception& ex)
     {
        ACE_UNUSED_ARG (ex);
        return 2 ;
     }
-  ACE_ENDTRY;
 
   return 0 ;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
index bb7e3d1142d..3aa7dcf576f 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
@@ -7,25 +7,20 @@
 
 int main(int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0);
 
       CORBA::Object_var object =
-        orb_->resolve_initial_references ("InterfaceRepository" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("InterfaceRepository");
 
-      CORBA::Repository_var repo_ = CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Repository_var repo_ = CORBA::Repository::_narrow (object.in ());
 
 
       CORBA::ContainedSeq_var interfaces =
                   repo_->contents (CORBA::dk_Interface,    // Any type of contained object.
                                    1                       // Exclude parents of interfaces.
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   );
 
       CORBA::ULong length = interfaces->length ();
 
@@ -38,9 +33,7 @@ int main(int argc, char** argv)
       CORBA::ULong first_one = 0;
 
       CORBA::InterfaceDef_var the_interface =
-            CORBA::InterfaceDef::_narrow (interfaces[first_one]
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+            CORBA::InterfaceDef::_narrow (interfaces[first_one]);
 
       CORBA::String_var name = the_interface->name();
 
@@ -53,12 +46,10 @@ int main(int argc, char** argv)
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception ...");
+      ex._tao_print_exception ("Exception ...");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
index dbfcefcb23b..6aa1ec88f69 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp
@@ -10,34 +10,24 @@ Test_i::Test_i (CORBA::ORB_ptr orb) :
   orb_ (CORBA::ORB::_duplicate(orb)),
    policies_ (1)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA"
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("RootPOA");
       this->root_poa_ =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
       policies_.length(1);
       policies_[0] =
-        root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
       this->poa_mgr_ =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception");
+      ex._tao_print_exception ("Caught exception");
 
       ACE_ASSERT (0);  // Force termination!
     }
-  ACE_ENDTRY;
 }
 
 Test_i::~Test_i (void)
@@ -46,19 +36,17 @@ Test_i::~Test_i (void)
 }
 
 int
-Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::try_and_create_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableServer::POA_var persistent_poa =
         root_poa_->create_POA ("MyPoa",
                                poa_mgr_.in (),
-                               this->policies_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               this->policies_);
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT&)
     {
       // A transient exception exception may be expected,
       // so we won't print out the word exception but we
@@ -67,20 +55,18 @@ Test_i::try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL)
                   "CORBA::TRANSIENT in Test_i::try_and_create_POA\n"));
       return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "try_and_create_POA Exception ...");
+      ex._tao_print_exception ("try_and_create_POA Exception ...");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-   orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+   orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
index 6e548f96463..59e2f65f292 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h
@@ -18,12 +18,12 @@ public:
    ~Test_i (void);
 
    /// Try and create a persistant POA
-   int try_and_create_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   int try_and_create_POA (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-      
-   void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+
+   void shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
 protected:
    CORBA::ORB_var orb_;
    PortableServer::POA_var root_poa_;
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
index 69909f4e3d5..6c96143e2e6 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -19,7 +19,7 @@ parse_args (int argc, char *argv[])
         ior = get_opts.opt_arg ();
         break;
       case 's':
-        shutdown_server = 1; 
+        shutdown_server = 1;
         break;
       case '?':
       default:
@@ -38,22 +38,19 @@ int
 main (int argc, char *argv[])
 {
   int result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test_var server =
-        Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -65,25 +62,20 @@ main (int argc, char *argv[])
 
       if (shutdown_server)
       {
-        server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        server->shutdown();
       }
       else
       {
-        result = server->try_and_create_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        result = server->try_and_create_POA();
       }
-      
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       result =1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index 65c1f4c8a2b..e7984b80ea0 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -34,17 +34,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,29 +49,23 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       Test_i server_impl (orb.in ());
 
-      root_poa->activate_object (&server_impl
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->activate_object (&server_impl);
 
 
       CORBA::Object_var server = server_impl._this();
-      ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -101,20 +92,16 @@ main (int argc, char *argv[])
         }
 
       poa_manager->activate();
-      
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
+
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "SERVER (%P): Caught exception:");
+      ex._tao_print_exception ("SERVER (%P): Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index fffe62a0cba..2344a2f0dfb 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -10,26 +10,22 @@
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_NEW_ENV
+  try
    {
       int failed = 0;
 
       ACE_DEBUG((LM_DEBUG, "Start of Client\n"));
       // Initialise ORB.
       //
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "");
 
       // Find the Interface Repository.
       //
       ACE_DEBUG((LM_DEBUG, ". Find IFR\n"));
-      CORBA::Object_var ifr_obj = orb->resolve_initial_references( "InterfaceRepository" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var ifr_obj = orb->resolve_initial_references( "InterfaceRepository");
 
       ACE_DEBUG((LM_DEBUG, ". Narrow IFR\n"));
-      CORBA::Repository_var ifr = CORBA::Repository::_narrow( ifr_obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Repository_var ifr = CORBA::Repository::_narrow( ifr_obj.in());
 
       if( CORBA::is_nil( ifr.in() ) )
       {
@@ -46,28 +42,23 @@ int main (int argc, char* argv[])
          ifr->create_interface( "IDL:interface865:1.0",
                                 "interface865",
                                 "1.0",
-                                baseInterfaces  ACE_ENV_ARG_PARAMETER) ;
-      ACE_TRY_CHECK;
+                                baseInterfaces) ;
 
       // Add an operation to the interface.
       // First get some useful things.
       //
       ACE_DEBUG((LM_DEBUG, ". Get primitive (void)\n"));
       CORBA::PrimitiveDef_var voidPrimitive =
-         ifr->get_primitive( CORBA::pk_void ACE_ENV_ARG_PARAMETER) ;
-      ACE_TRY_CHECK;
+         ifr->get_primitive( CORBA::pk_void) ;
       ACE_DEBUG((LM_DEBUG, ". Get primitive (char)\n"));
       CORBA::PrimitiveDef_var charPrimitive =
-         ifr->get_primitive( CORBA::pk_char ACE_ENV_ARG_PARAMETER) ;
-      ACE_TRY_CHECK;
+         ifr->get_primitive( CORBA::pk_char) ;
       ACE_DEBUG((LM_DEBUG, ". Get primitive (long)\n"));
       CORBA::PrimitiveDef_var longPrimitive =
-         ifr->get_primitive( CORBA::pk_long ACE_ENV_ARG_PARAMETER) ;
-      ACE_TRY_CHECK;
+         ifr->get_primitive( CORBA::pk_long) ;
       ACE_DEBUG((LM_DEBUG, ". Get primitive (short)\n"));
       CORBA::PrimitiveDef_var shortPrimitive =
-         ifr->get_primitive( CORBA::pk_short ACE_ENV_ARG_PARAMETER) ;
-      ACE_TRY_CHECK;
+         ifr->get_primitive( CORBA::pk_short) ;
 
       ACE_DEBUG((LM_DEBUG, ". create 3 parameters\n"));
       // The operation has three parameters...
@@ -123,8 +114,7 @@ int main (int argc, char* argv[])
                                       CORBA::OP_NORMAL,
                                       parameters,
                                       exceptions,
-                                      contextIds ACE_ENV_ARG_PARAMETER) ;
-      ACE_TRY_CHECK;
+                                      contextIds) ;
 
 
 
@@ -134,13 +124,10 @@ int main (int argc, char* argv[])
 
       ACE_DEBUG((LM_DEBUG, "About to call create_operation_list\n"));
       orb->create_operation_list(operation.in (),
-		                 opList.out()
-				 ACE_ENV_ARG_PARAMETER) ;
-      ACE_TRY_CHECK;
+		                 opList.out()) ;
 
       ACE_DEBUG((LM_DEBUG, "Call to create_operation_list succeeded\n"));
       CORBA::ULong count = opList->count() ;
-      ACE_TRY_CHECK;
 
       if( count != numParams )
       {
@@ -156,9 +143,7 @@ int main (int argc, char* argv[])
       }
 
       CORBA::Boolean const eq_char =
-        nv->value()->type()->equal (CORBA::_tc_char
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        nv->value()->type()->equal (CORBA::_tc_char);
 
       if( !eq_char  )
       {
@@ -179,9 +164,7 @@ int main (int argc, char* argv[])
       }
 
       CORBA::Boolean const eq_long =
-        nv->value()->type()->equal (CORBA::_tc_long
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        nv->value()->type()->equal (CORBA::_tc_long);
 
       if( !eq_long  )
       {
@@ -202,9 +185,7 @@ int main (int argc, char* argv[])
       }
 
       CORBA::Boolean const eq_short =
-        nv->value()->type()->equal (CORBA::_tc_short
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        nv->value()->type()->equal (CORBA::_tc_short);
 
       if( !eq_short  )
       {
@@ -222,7 +203,7 @@ int main (int argc, char* argv[])
 
       // Finally destroy the interface.
       //
-      interface->destroy(ACE_ENV_SINGLE_ARG_PARAMETER) ;
+      interface->destroy() ;
 
       //orb->destroy();
 
@@ -232,19 +213,17 @@ int main (int argc, char* argv[])
       }
       ACE_DEBUG((LM_DEBUG, ". seems OK\n"));
    }
-   ACE_CATCHANY
+   catch (const CORBA::Exception& ex)
    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception - test failed:\n");
+      ex._tao_print_exception ("Exception - test failed:\n");
       return 1;
    }
-   ACE_CATCHALL
+   catch (...)
    {
      ACE_DEBUG((LM_DEBUG, "An unknown exception occured - test failed\n"));
      return 1;
    }
-   ACE_ENDTRY;
 
-   ACE_CHECK_RETURN(1);
 
    return 0 ;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
index 41e64a4dd51..8b28339da93 100644
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
@@ -57,7 +57,7 @@ ORB_Task::svc (void)
   }
   catch ( const CORBA::Exception& e )
   {
-      ACE_PRINT_EXCEPTION (e, "Exception caught");
+      e._tao_print_exception ("Exception caught");
   }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
index 46148e21dee..eab4bc5f74b 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -35,15 +35,13 @@ CORBA::Boolean
 check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expected_result)
 {
   CORBA::Boolean result = 1;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object1 =
-        orb->string_to_object(ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior1);
 
       CORBA::Object_var object2 =
-        orb->string_to_object (ior2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior2);
 
       const char* expected_result_string = (expected_result ? "true" : "false");
 
@@ -61,14 +59,12 @@ check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expecte
           result = 0;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR, "Vastly unexpected exception comparing %s and %s:\n", ior1, ior2));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception:");
+      ex._tao_print_exception ("Exception:");
       result = 0;
     }
-  ACE_ENDTRY;
   return result;
 }
 
@@ -76,11 +72,10 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -297,16 +292,13 @@ main (int argc, char *argv[])
           result = 1;
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
index 50efe0c1099..bb65e65d76b 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h
@@ -17,7 +17,7 @@ public:
   Client_i (CORBA::ORB_ptr orb);
   // Our constructor
 
-  int init (ACE_ENV_SINGLE_ARG_DECL);
+  int init (void);
   // Initialize the ORB etc.
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
index 74d54ebda92..3102647f113 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -78,32 +78,27 @@ int
 main (int argc,
       char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
 
-  ACE_TRY
+  try
     {
       // Initilaize the ORB, POA etc.
       manager.init (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    argv);
 
       // the command line arguments
       if (parse_args (argc, argv) == -1)
         return -1;
 
       // Merge the different IORS
-      manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager.make_merged_iors ();
 
       if (merged_test)
         {
           // Set properties. This is the most important portion of the
           // test
-          manager.set_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          manager.set_properties ();
         }
 
       // Write IOR to file
@@ -112,16 +107,13 @@ main (int argc,
       // Client, who is going to use the merged IOR
       // Construct that with the managers ORB
       Client_i client_imp (manager.orb ());
-      return client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      return client_imp.init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught");
+      ex._tao_print_exception ("Caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -135,62 +127,47 @@ Manager::Manager (void)
 
 void
 Manager::init (int argc,
-               char *argv[]
-               ACE_ENV_ARG_DECL)
+               char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                0);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (obj_var.in ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
-    root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa_var->the_POAManager ();
 
-  poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager_var->activate ();
 }
 
 int
-Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
+Manager::make_merged_iors (void)
 {
   // First  server
   object_primary =
-    this->orb_->string_to_object (first_ior
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->string_to_object (first_ior);
 
   if (merged_test)
     {
       //Second server
       object_secondary =
-        this->orb_->string_to_object (second_ior
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->orb_->string_to_object (second_ior);
 
       // Get an object reference for the ORBs IORManipultion object!
       CORBA::Object_var IORM =
         this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                              0
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                              0);
 
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
 
       // Create the list
@@ -201,8 +178,7 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
 
       // Create a merged set 1;
       merged_set_ =
-        iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        iorm->merge_iors (iors);
     }
   else
     {
@@ -213,7 +189,7 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
+Manager::set_properties (void)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -241,38 +217,32 @@ Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
   // Set the property
       CORBA::Boolean retval = iorm->set_primary (&iogr_prop,
                                   object_secondary.in (),
-                                  this->merged_set_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  this->merged_set_.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
   if (retval != 0)
     {
       retval = iorm->set_property (&iogr_prop,
-                           this->merged_set_.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                           this->merged_set_.in ());
     }
 
   return 0;
 }
 
 int
-Manager::run (ACE_ENV_SINGLE_ARG_DECL)
+Manager::run (void)
 {
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_DEBUG,
                          "Error in run \n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -327,12 +297,11 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
       ACE_OS::strcpy (expected, "CORBA::TRANSIENT");
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Make a remote call
       CORBA::String_var s =
-          server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          server->remote_call ();
 
       if (!s.in())
         {
@@ -343,15 +312,14 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
           ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, et)
+  catch (const CORBA::TRANSIENT&)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, ec)
+  catch (const CORBA::COMM_FAILURE&)
     {
       ACE_OS::strcpy (received, "CORBA::COMM_FAILURE");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
@@ -389,10 +357,9 @@ int run_abort_test (Simple_Server_ptr server,
       ACE_OS::strcpy (expected, "CORBA::COMM_FAILURE");
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::String_var s = server->abort (request_key);
-      ACE_TRY_CHECK;
 
       if (!s.in())
         {
@@ -403,15 +370,14 @@ int run_abort_test (Simple_Server_ptr server,
           ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, et)
+  catch (const CORBA::TRANSIENT&)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, ec)
+  catch (const CORBA::COMM_FAILURE&)
     {
       ACE_OS::strcpy (received, "CORBA::COMM_FAILURE");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
@@ -444,10 +410,9 @@ int run_shutdown_test (Simple_Server_ptr server,
       ACE_OS::strcpy (expected, "CORBA::TRANSIENT");
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::String_var s = server->shutdown (request_key);
-      ACE_TRY_CHECK;
 
       if (!s.in())
         {
@@ -458,11 +423,10 @@ int run_shutdown_test (Simple_Server_ptr server,
           ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT&)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT("CLIENT> SHUTDOWN expected: '%s'"),
@@ -551,7 +515,7 @@ int run_full_shutdown_test (Simple_Server_ptr server)
 }
 
 int
-Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
+Client_i::init (void)
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
@@ -575,20 +539,14 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
   char **argv = 0;
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                0);
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (data
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->string_to_object (data);
 
   // Combined IOR stuff
   Simple_Server_var server =
-    Simple_Server::_narrow (object.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Simple_Server::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
     {
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
index 81760e158f4..ca3bcae2b41 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h
@@ -20,18 +20,17 @@ public:
   // Ctor
 
   void init (int argc,
-             char *argv[]
-             ACE_ENV_ARG_DECL);
+             char *argv[]);
 
   // Initialize the ORB, POA etc.
 
-  int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int make_merged_iors (void);
   // Merges the different IORS
 
-  int set_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int set_properties (void);
   // Sets the properties for the profiles
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the  ORB event loop..
 
   int write_to_file (void);
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index d597ec0d27d..bfac29d6031 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
         return 1;
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,33 +56,26 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::PolicyList policies;
       policies.length (3);
       policies[0] = root_poa->create_id_assignment_policy (
-          PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          PortableServer::USER_ID);
       policies[1] = root_poa->create_implicit_activation_policy (
-          PortableServer::NO_IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          PortableServer::NO_IMPLICIT_ACTIVATION);
       policies[2] = root_poa->create_lifespan_policy (
-          PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          PortableServer::PERSISTENT);
 
       PortableServer::POA_var poa = root_poa->create_POA (
-          "PERS_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          "PERS_POA", poa_manager.in (), policies);
 
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
       // Instantiate the LCD_Display implementation class
@@ -93,16 +83,13 @@ main (int argc, char *argv[])
       PortableServer::ObjectId_var id =
           PortableServer::string_to_ObjectId ("IOGR_OID");
 
-      poa->activate_object_with_id (id.in(), &display_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->activate_object_with_id (id.in(), &display_impl);
 
       CORBA::Object_var server =
-          poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -119,18 +106,15 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       orb->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
index 6264149b61e..b1331a60f77 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp
@@ -18,7 +18,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 char*
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Simple_Server_i::remote_call (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in()));
@@ -32,7 +32,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_
 
 
 char*
-Simple_Server_i::shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (const char* key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in()));
@@ -52,7 +52,7 @@ Simple_Server_i::shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 char*
-Simple_Server_i::abort (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::abort (const char* key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in()));
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
index f00ae655410..be5b3ba7a95 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h
@@ -21,13 +21,13 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  char* remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  char* remote_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char* shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+  char* shutdown (const char* key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char* abort (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+  char* abort (const char* key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
index b4eb64b13e5..e85d58ef471 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h
@@ -27,7 +27,7 @@ public:
   Client_i (CORBA::ORB_ptr orb);
   // Our constructor
 
-  int init (ACE_ENV_SINGLE_ARG_DECL);
+  int init (void);
   // Initialize the ORB etc.
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
index 8a557179c7c..604643f3f4a 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp
@@ -15,16 +15,14 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
@@ -36,13 +34,10 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   this->server_interceptor_ = interceptor;
 
-  info->add_server_request_interceptor (interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor);
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
index 5c8103cd14f..4400e6235cb 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h
@@ -45,12 +45,10 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the created server request interceptor.  Only valid after
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
index 69617231383..8ae869dc2d0 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp
@@ -19,22 +19,21 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 
 void
 Server_Request_Interceptor::forward_reference (
-  const char* iorstr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const char* iorstr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iorstr_ = CORBA::string_dup (iorstr);
 }
 
 char *
-Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -42,7 +41,7 @@ Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr //
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -51,15 +50,12 @@ Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   IOP::ServiceContext_var svc =
-    ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
   // extract the group component
   TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
@@ -84,11 +80,9 @@ Server_Request_Interceptor::receive_request (
         {
           int argc = 0;
           char** argv = 0;
-          CORBA::ORB_var orb = CORBA::ORB_init(argc,argv,ri->orb_id() ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          CORBA::ORB_var orb = CORBA::ORB_init(argc,argv,ri->orb_id());
 
-          CORBA::Object_var obj = orb->string_to_object (iorstr_.in() ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          CORBA::Object_var obj = orb->string_to_object (iorstr_.in());
 
           ACE_DEBUG ((LM_DEBUG,
                     "SERVER (%P|%t) Request will be forwarded "
@@ -97,7 +91,7 @@ Server_Request_Interceptor::receive_request (
                     "receive_request_service_contexts().\n"));
           request_forwarded_ = 1;
           // Throw forward exception
-          ACE_THROW (PortableInterceptor::ForwardRequest (obj.in()));
+          throw PortableInterceptor::ForwardRequest (obj.in());
         }
       else
         {
@@ -111,16 +105,14 @@ Server_Request_Interceptor::receive_request (
 
 void
 Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -128,8 +120,7 @@ Server_Request_Interceptor::send_exception (
 
 void
 Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
index c9a8151677a..1c7e62a26d4 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h
@@ -46,7 +46,7 @@ public:
   ~Server_Request_Interceptor (void);
 
   /// Set the references to which requests will be forwarded.
-  virtual void forward_reference (const char* iorstr ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void forward_reference (const char* iorstr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -59,38 +59,33 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 0d6a828940b..993aaeef8ca 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -72,25 +72,21 @@ int
 main (int argc,
       char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
 
-  ACE_TRY
+  try
     {
       // Initilaize the ORB, POA etc.
       manager.init (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    argv);
 
       // the command line arguments
       if (parse_args (argc, argv) == -1)
         return -1;
 
       // Merge the different IORS
-      manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager.make_merged_iors ();
 
       // Write IOR to file
       if (manager.write_to_files ())
@@ -99,16 +95,13 @@ main (int argc,
       // Client, who is going to use the merged IOR
       // Construct that with the managers ORB
       Client_i client_imp (manager.orb ());
-      return client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      return client_imp.init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught");
+      ex._tao_print_exception ("Caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -120,56 +113,45 @@ Manager::Manager (void)
 
 void
 Manager::init (int& argc,
-               char**& argv
-               ACE_ENV_ARG_DECL)
+               char**& argv)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                0);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (obj_var.in ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
-    root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa_var->the_POAManager ();
 
-  poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager_var->activate ();
 }
 
 int
-Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
+Manager::make_merged_iors (void)
 {
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_var IORM =
 	  this->orb_->resolve_initial_references (
-		  TAO_OBJID_IORMANIPULATION, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  
+		  TAO_OBJID_IORMANIPULATION, 0);
+
   if (CORBA::is_nil (IORM.in()))
 	  return -1;
 
   TAO_IOP::TAO_IOR_Manipulation_var iorm =
-	  TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+	  TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
   if (CORBA::is_nil (iorm.in()))
 	  return -1;
 
-  CORBA::Object_var first = orb_->string_to_object (first_ior ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var first = orb_->string_to_object (first_ior);
 
   if (CORBA::is_nil (first.in()))
 	  return -1;
@@ -179,8 +161,7 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
   iors.length(1);
   iors [0] = first;
 
-  merged_set_10_ = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  merged_set_10_ = iorm->merge_iors (iors);
 
   if (CORBA::is_nil (merged_set_10_.in()))
     {
@@ -188,14 +169,13 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   int result = set_properties (iorm.in(), merged_set_10_.in(),
-			    first.in(), 10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+			    first.in(), 10);
 
   if (-1 == result)
     {
       return -1;
     }
-  
+
   first = orb_->string_to_object (first_ior);
   if (CORBA::is_nil (first.in()))
     {
@@ -203,20 +183,19 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Object_var second = orb_->string_to_object (second_ior);
-  
+
   if (CORBA::is_nil (second.in()))
     {
       return -1;
     }
 
   // Create the list
-  
+
   iors.length(2);
   iors [0] = first;
   iors [1] = second;
 
-  merged_set_11_ = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  merged_set_11_ = iorm->merge_iors (iors);
 
   if (CORBA::is_nil (merged_set_11_.in()))
     {
@@ -224,8 +203,7 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   result = set_properties (iorm.in(), merged_set_11_.in(),
-			    first.in(), 11 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+			    first.in(), 11);
 
   if (-1 == result)
     {
@@ -239,8 +217,7 @@ int
 Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
 			 CORBA::Object_ptr merged_set,
 			 CORBA::Object_ptr primary,
-			 CORBA::ULong version
-                         ACE_ENV_ARG_DECL)
+			 CORBA::ULong version)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -266,38 +243,32 @@ Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
   // Set the property
   CORBA::Boolean retval = iorm->set_primary (&iogr_prop,
                                              primary,
-					     merged_set
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+					     merged_set);
 
   // Set the primary
   // See we are setting the second ior as the primary
   if (retval != 0)
     {
       retval = iorm->set_property (&iogr_prop,
-                                    merged_set
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                    merged_set);
     }
 
   return 0;
 }
 
 int
-Manager::run (ACE_ENV_SINGLE_ARG_DECL)
+Manager::run (void)
 {
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_DEBUG,
                          "Error in run \n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -344,7 +315,7 @@ Client_i::Client_i (CORBA::ORB_ptr orb)
 {
 }
 
-int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_ARG_DECL)
+int run_remote_test (Simple_Server_ptr server, const char* execute_key)
 {
   char expected[1024], received[1024];
   if (execute_key)
@@ -357,12 +328,11 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A
       ACE_OS::strcpy (expected, "CORBA::TRANSIENT");
     }
 
-  ACE_TRY
+  try
     {
       // Make a remote call
       CORBA::String_var s =
-	      server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->remote_call ();
 
       if (!s.in())
         {
@@ -373,15 +343,14 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A
 	  ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, te)
+  catch (const CORBA::TRANSIENT&)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, cf)
+  catch (const CORBA::COMM_FAILURE&)
     {
       ACE_OS::strcpy (received, "CORBA::COMM_FAILURE");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
 	      ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
@@ -400,7 +369,7 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A
 }
 
 int run_abort_test (Simple_Server_ptr server,
-		    const char* request_key, const char* execute_key ACE_ENV_ARG_DECL)
+		    const char* request_key, const char* execute_key)
 {
   char expected[1024], received[1024];
   if (execute_key)
@@ -414,10 +383,9 @@ int run_abort_test (Simple_Server_ptr server,
       ACE_OS::strcpy (expected, "CORBA::TRANSIENT");
     }
 
-  ACE_TRY
+  try
     {
       CORBA::String_var s = server->abort (request_key);
-      ACE_TRY_CHECK;
 
       if (!s.in())
         {
@@ -428,15 +396,14 @@ int run_abort_test (Simple_Server_ptr server,
 	  ACE_OS::strcpy (received, s.in());
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, te)
+  catch (const CORBA::TRANSIENT&)
     {
       ACE_OS::strcpy (received, "CORBA::TRANSIENT");
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, cf)
+  catch (const CORBA::COMM_FAILURE&)
     {
       ACE_OS::strcpy (received, "CORBA::COMM_FAILURE");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
 	      ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
@@ -455,32 +422,29 @@ int run_abort_test (Simple_Server_ptr server,
   return 0;
 }
 
-int run_test (Simple_Server_ptr server ACE_ENV_ARG_DECL)
+int run_test (Simple_Server_ptr server)
 {
-  int rv = run_abort_test (server, first_key, second_key ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  
+  int rv = run_abort_test (server, first_key, second_key);
+
   if (rv)
     {
       return rv;
     }
-  
-  rv = run_remote_test (server, second_key ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  rv = run_remote_test (server, second_key);
 
   if (rv)
     {
       return rv;
     }
-  
-  rv = run_abort_test (server, second_key, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  rv = run_abort_test (server, second_key, 0);
 
   return rv;
 }
 
 int
-Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
+Client_i::init (void)
 {
   char iogrstr[1024];
   ACE_OS::sprintf (iogrstr, "file://%s", first_iogr_file);
@@ -489,21 +453,15 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
   char **argv = 0;
   this->orb_ = CORBA::ORB_init (argc,
 			        argv,
-			        0
-			        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+			        0);
 
   CORBA::Object_var object =
-	  this->orb_->string_to_object (iogrstr
-				        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+	  this->orb_->string_to_object (iogrstr);
 
 
   // Combined IOR stuff
   Simple_Server_var server =
-	  Simple_Server::_narrow (object.in ()
-				  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+	  Simple_Server::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
   {
@@ -513,8 +471,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
   }
 
   // run tests
-  int result = run_test (server.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = run_test (server.in());
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
index 1bf9b049712..90d02920675 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h
@@ -19,16 +19,15 @@ public:
   // Ctor
 
   void init (int& argc,
-             char**& argv
-             ACE_ENV_ARG_DECL);
+             char**& argv);
 
   // Initialize the ORB, POA etc.
 
-  int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int make_merged_iors (void);
   // Merges the different IORS
 
   /// Run the  ORB event loop..
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
 
   /// Write the merged IOGRs to a file
   int write_to_files (void);
@@ -44,7 +43,7 @@ private:
   /// Sets the properties for the profiles
   int set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
 		      CORBA::Object_ptr merged_set,
-		      CORBA::Object_ptr primary, CORBA::ULong version ACE_ENV_ARG_DECL);
+		      CORBA::Object_ptr primary, CORBA::ULong version);
 
   /// Our ORB
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index 60f306ac782..634a5abd597 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -51,8 +51,7 @@ main (int argc, char *argv[])
 {
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_ORBInitializer *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -61,20 +60,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
         return 1;
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,33 +77,26 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::PolicyList policies;
       policies.length (3);
       policies[0] = root_poa->create_id_assignment_policy (
-          PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          PortableServer::USER_ID);
       policies[1] = root_poa->create_implicit_activation_policy (
-          PortableServer::NO_IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          PortableServer::NO_IMPLICIT_ACTIVATION);
       policies[2] = root_poa->create_lifespan_policy (
-          PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          PortableServer::PERSISTENT);
 
       PortableServer::POA_var poa = root_poa->create_POA (
-          "PERS_POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          "PERS_POA", poa_manager.in (), policies);
 
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
       // Instantiate the LCD_Display implementation class
@@ -116,16 +104,13 @@ main (int argc, char *argv[])
       PortableServer::ObjectId_var id =
 	      PortableServer::string_to_ObjectId ("IOGR_OID");
 
-      poa->activate_object_with_id (id.in(), &display_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->activate_object_with_id (id.in(), &display_impl);
 
       CORBA::Object_var server =
-          poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -148,8 +133,7 @@ main (int argc, char *argv[])
 
       Simple_ServerRequestInterceptor_var interceptor =
         Simple_ServerRequestInterceptor::_narrow (
-           server_interceptor.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+           server_interceptor.in ());
 
       if (CORBA::is_nil (interceptor.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -157,22 +141,16 @@ main (int argc, char *argv[])
                            "server request interceptor.\n"),
                           -1);
 
-      interceptor->forward_reference (merged_iorstr
-				      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      interceptor->forward_reference (merged_iorstr);
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
index c3cc5424921..a83f72c028a 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp
@@ -18,7 +18,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 char*
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::remote_call (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing remote_call()\n", _key.in()));
@@ -32,7 +32,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 char*
-Simple_Server_i::shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (const char* key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in()));
@@ -52,7 +52,7 @@ Simple_Server_i::shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 char*
-Simple_Server_i::abort (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::abort (const char* key)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in()));
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
index 09da165bd14..29009ba799e 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h
@@ -21,13 +21,13 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  char* remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  char* remote_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char* shutdown (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+  char* shutdown (const char* key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char* abort (const char* key ACE_ENV_ARG_DECL_NOT_USED)
+  char* abort (const char* key)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index 6463bd8e9ec..e0b003a58bb 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -16,49 +16,47 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Hello::throw_exception (ACE_ENV_SINGLE_ARG_DECL)
+Hello::throw_exception (void)
   ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException))
 {
-  ACE_THROW (Test::MyException ());
+  throw Test::MyException ();
 }
 
 // Nested sequence step 1 - This op called by the client on the server
 CORBA::Boolean
-Hello::call_me_back (Test::Hello_ptr me ACE_ENV_ARG_DECL)
+Hello::call_me_back (Test::Hello_ptr me)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean result = me->call_back (ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Boolean result = me->call_back ();
   return result;
 }
 
 // Nested sequence step 2 - This op called by the server on the client
-CORBA::Boolean 
-Hello::call_back (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Boolean
+Hello::call_back (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean result = server_->check_request_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Boolean result = server_->check_request_id ();
   return result;
-}    
+}
 
 // Nested sequence step 3 - This op called by the client on the server
-CORBA::Boolean 
-Hello::check_request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean
+Hello::check_request_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The server request interceptor will have set this public static member
@@ -67,7 +65,7 @@ Hello::check_request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::ULong
-Hello::drop_down_dead (ACE_ENV_SINGLE_ARG_DECL)
+Hello::drop_down_dead (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return server_id_;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
index 4967689c88a..a4cd341189b 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
@@ -22,27 +22,27 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void throw_exception (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void throw_exception (void)
     ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException));
-    
-  virtual CORBA::Boolean call_me_back (Test::Hello_ptr me ACE_ENV_ARG_DECL)
+
+  virtual CORBA::Boolean call_me_back (Test::Hello_ptr me)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CORBA::Boolean call_back (ACE_ENV_SINGLE_ARG_DECL)
+
+  virtual CORBA::Boolean call_back (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CORBA::Boolean check_request_id (ACE_ENV_SINGLE_ARG_DECL)
+
+  virtual CORBA::Boolean check_request_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong drop_down_dead (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong drop_down_dead (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-        
+
   static CORBA::Boolean ids_differ_;
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
index e371cd8c9be..3f59631356a 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
@@ -10,8 +10,7 @@
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -19,19 +18,15 @@ Server_ORBInitializer::pre_init (
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -44,9 +39,7 @@ Server_ORBInitializer::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
index d7ca298b858..a512252892d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
@@ -27,20 +27,17 @@ class Server_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
index f7a7b408be7..5d11612ae90 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
@@ -10,8 +10,7 @@
 
 void
 Server_ORBInitializer2::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -19,19 +18,15 @@ Server_ORBInitializer2::pre_init (
 
 void
 Server_ORBInitializer2::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer2::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -44,9 +39,7 @@ Server_ORBInitializer2::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
index a98a94523be..f2608319bee 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
@@ -27,20 +27,17 @@ class Server_ORBInitializer2 :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index 3ace3eaea71..f088e5984ff 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -27,22 +27,21 @@ TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void)
 
 
 char *
-TAO249_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor::name (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor");
 }
 
 void
-TAO249_ServerRequest_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor::destroy (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -50,19 +49,15 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_TRY
+  CORBA::String_var op = ri->operation ();
+  try
   {
     IOP::ServiceContext_var sc =
-      ri->get_request_service_context (IOP::FT_REQUEST
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      ri->get_request_service_context (IOP::FT_REQUEST);
 
     TAO_InputCDR cdr (reinterpret_cast <const char*>
                      (sc->context_data.get_buffer ()),
@@ -72,22 +67,18 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
     if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
       {
-        ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
+        throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
       }
-    ACE_TRY_CHECK;
 
     cdr.reset_byte_order (static_cast <int> (byte_order));
 
     FT::FTRequestServiceContext ftrsc;
 
     if ((cdr >> ftrsc) == 0)
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
-    ACE_TRY_CHECK;
-    
-    ACE_DEBUG ((LM_DEBUG, "TAO249_ServerRequest_Interceptor::receive_request (%P|%t) called for method: %s ... client retention id is: %d\n", op.in (), ftrsc.retention_id ));    
-                            
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
+
+    ACE_DEBUG ((LM_DEBUG, "TAO249_ServerRequest_Interceptor::receive_request (%P|%t) called for method: %s ... client retention id is: %d\n", op.in (), ftrsc.retention_id ));
+
     if (client_id_ == 0)
       {
         client_id_ = ftrsc.retention_id;
@@ -103,32 +94,28 @@ ACE_THROW_SPEC ((CORBA::SystemException,
             ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Same client retention id has been used for TWO consecutive independent invocations!!\n"));
             Hello::ids_differ_ = 0;
           }
-      }      
+      }
   }
-ACE_CATCHANY
+catch (const CORBA::Exception& ex)
   {
     ACE_DEBUG ((LM_ERROR, "Unexpected (non regression) error - test failed\n"));
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception in TAO249_ServerRequest_Interceptor::receive_request \n");  
-    ACE_RE_THROW;
+    ex._tao_print_exception (
+      "Exception in TAO249_ServerRequest_Interceptor::receive_request \n");
+    throw;
   }
-ACE_ENDTRY;
-ACE_CHECK;
 
 }
 
 void
 TAO249_ServerRequest_Interceptor::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -136,10 +123,9 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
 }
-  
+
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
index fdccf530614..ec1f1eadf75 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
@@ -45,45 +45,40 @@ TAO249_ServerRequest_Interceptor (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+virtual char * name (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+virtual void destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest));
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 //@}
 private:
 
 CORBA::ORB_var orb_;
-    
+
 CORBA:: Long client_id_;
 };
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index cc63dbf287e..89f07d67686 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -30,22 +30,21 @@ TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
 
 
 char *
-TAO249_ServerRequest_Interceptor2::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor2::name (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
 }
 
 void
-TAO249_ServerRequest_Interceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor2::destroy (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -53,27 +52,23 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "drop_down_dead"))
   {
-    // bail if not the op we are interested in - 
+    // bail if not the op we are interested in -
     // avoid excess spurious error clutter when client calls ::shutdown
     return;
   }
 
-  ACE_CHECK;
-  ACE_TRY
+  try
   {
     IOP::ServiceContext_var sc =
-      ri->get_request_service_context (IOP::FT_REQUEST
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      ri->get_request_service_context (IOP::FT_REQUEST);
 
     TAO_InputCDR cdr (reinterpret_cast <const char*>
                                        (sc->context_data.get_buffer ()
@@ -84,23 +79,19 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
     if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
       {
-        ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
+        throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
       }
-    ACE_TRY_CHECK;
 
     cdr.reset_byte_order (static_cast <int>(byte_order));
 
     FT::FTRequestServiceContext ftrsc;
 
     if ((cdr >> ftrsc) == 0)
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
-    ACE_TRY_CHECK;
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
     FILE* last_exp_time_file = ACE_OS::fopen ("last_expiration_time", "r+");
     TimeBase::TimeT last_exp_time = 0;
-    
+
     if (!last_exp_time_file)
       {
         // file does not exist ... we're the first server
@@ -126,14 +117,14 @@ ACE_THROW_SPEC ((CORBA::SystemException,
         return;
       }
 
-    
+
     // This is the offset from UTC to posix - a value less than than this will
     // indicate posix is (mistakenly) being used
     TimeBase::TimeT the_seventies = ACE_UINT64_LITERAL (0x1B21DD213814000);
-    
+
     // @warning - this test is fragile. It will break in 2358 A.D. :-)
     if (last_exp_time <= the_seventies)
-      {  
+      {
         ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Expiration time is in wrong format - it is before 1970 A.D. !!\n"));
         ACE_DEBUG ((LM_DEBUG, "Expiration time: %Q\n", last_exp_time));
         ACE_DEBUG ((LM_DEBUG, "1970 A.D.      : %Q\n", the_seventies));
@@ -148,7 +139,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
       }
 
     TimeBase::TimeT now = get_now ();
-    
+
     if (now > last_exp_time)
       {
         // We have passed the exp time... there should be no more retries received after this point...
@@ -158,7 +149,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
             TimeBase::TimeT last_expired_attempt = 0;
             ACE_OS::fread (&last_expired_attempt, 1, sizeof (TimeBase::TimeT), no_more_retries);
             ACE_OS::fclose (no_more_retries);
-            
+
             // There has already been an attempt after the last server passed the expiration time
             ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Client ORB is still retrying after the expiration time!!\n"));
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Expiration time  : %Q\n"), last_exp_time));
@@ -175,7 +166,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
             ACE_OS::fclose (no_more_retries);
           }
       }
-          
+
     // Everthing is fine so far. Write out the expiration time for the next server to check
     ACE_OS::fwrite (&ftrsc.expiration_time, 1, sizeof (TimeBase::TimeT), last_exp_time_file);
     ACE_OS::fflush (last_exp_time_file);
@@ -184,15 +175,13 @@ ACE_THROW_SPEC ((CORBA::SystemException,
     // Goodbye cruel world !!
     ACE_OS::abort ();
   }
-ACE_CATCHANY
+catch (const CORBA::Exception& ex)
   {
     ACE_DEBUG ((LM_ERROR, "Unexpected (non regression problem) error - test failed\n"));
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "Exception in TAO249_ServerRequest_Interceptor2::receive_request \n");
-    ACE_RE_THROW;
+    ex._tao_print_exception (
+      "Exception in TAO249_ServerRequest_Interceptor2::receive_request \n");
+    throw;
   }
-ACE_ENDTRY;
-ACE_CHECK;
 
 }
 
@@ -204,7 +193,7 @@ TAO249_ServerRequest_Interceptor2::get_now (void)
 
   // Now in posix
   ACE_Time_Value time_value = ACE_OS::gettimeofday ();
-  
+
   TimeBase::TimeT sec_part  = time_value.sec ();
   sec_part = sec_part  * 10000000;
   TimeBase::TimeT usec_part = time_value.usec ();
@@ -214,16 +203,14 @@ TAO249_ServerRequest_Interceptor2::get_now (void)
 
 void
 TAO249_ServerRequest_Interceptor2::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -231,10 +218,9 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor2::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
 }
-  
+
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
index 74a92c7e0ed..546d4c52d3d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
@@ -46,38 +46,33 @@ TAO249_ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+virtual char * name (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+virtual void destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest));
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 //@}
@@ -88,7 +83,7 @@ protected:
 private:
 
 CORBA::ORB_var orb_;
-    
+
 CORBA::Long client_id_;
 };
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
index 60c37b8dff5..e8c10b9ec27 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
@@ -39,22 +39,19 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -63,14 +60,12 @@ main (int argc, char *argv[])
                              ior),
                             1);
         }
-        
+
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,8 +73,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -91,39 +85,32 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var me =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      ACE_TRY
+      try
         {
-          hello->throw_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+          hello->throw_exception ();
         }
-      ACE_CATCH (Test::MyException, my_ex)
+      catch (const Test::MyException& my_ex)
         {
           ACE_UNUSED_ARG (my_ex);
           ACE_DEBUG ((LM_DEBUG, "Client catches a MyException, as expected. No problem !\n"));
         }
-      ACE_ENDTRY;
-      
-      result = ! hello->call_me_back (me.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      result = ! hello->call_me_back (me.in ());
+
+      hello->shutdown ();
+
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
+      ex._tao_print_exception (
+        "Test failed (Not regression) because unexpected exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (result)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 682b0d8f86f..55d5b3d7b4d 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, Test::Hello_ptr* refs ACE_ENV_ARG_DECL)
+make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, Test::Hello_ptr* refs)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
   // Create the list
@@ -52,8 +52,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     }
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -76,9 +75,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -86,9 +83,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     {
       retval = iorm->set_primary (&iogr_prop,
                                   refs[0],
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                  new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -98,11 +93,10 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -110,14 +104,11 @@ main (int argc, char *argv[])
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
       Test::Hello_ptr *servers = new Test::Hello_ptr [number_of_servers];
 
@@ -129,12 +120,10 @@ main (int argc, char *argv[])
           const char *ior = ((ior_file += number) += ".ior").c_str ();
 
           CORBA::Object_var tmp =
-            orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->string_to_object(ior);
 
           servers[i] =
-            Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            Test::Hello::_narrow(tmp.in ());
 
           if (CORBA::is_nil (servers[i]))
             {
@@ -145,21 +134,20 @@ main (int argc, char *argv[])
             }
         }
 
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, servers  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, servers);
 
-      Test::Hello_var hello_iogr = Test::Hello::_narrow(iogr.in () ACE_ENV_ARG_PARAMETER);
+      Test::Hello_var hello_iogr = Test::Hello::_narrow(iogr.in ());
 
       CORBA::ULong last_server = 0;
 
-      ACE_TRY
+      try
         {
-          last_server = hello_iogr->drop_down_dead (ACE_ENV_SINGLE_ARG_PARAMETER);
+          last_server = hello_iogr->drop_down_dead ();
           // If the call 'succeeds' the server has identified a regression.
           result = 1;
           ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified by server %u. Test Failed !!\n", last_server));
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, my_ex)
+      catch (const CORBA::COMM_FAILURE& my_ex)
         {
           ACE_UNUSED_ARG (my_ex);
           // We can't use the word exception for fear of upsetting the build log parser
@@ -167,20 +155,17 @@ main (int argc, char *argv[])
                       "although it doesn't in this case) and which we cannot name because the autobuild "
                       "script will think we have a problem if we do mention the word. No problem !\n"));
         }
-      ACE_ENDTRY;
 
       for (CORBA::ULong j = last_server; j < number_of_servers; ++j)
         {
-          ACE_TRY
+          try
             {
-              servers[j]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              servers[j]->shutdown ();
             }
-          ACE_CATCHALL
+          catch (...)
             {
               // Well we tried...
             }
-          ACE_ENDTRY;
 
           CORBA::release (servers [j]);
         }
@@ -192,16 +177,14 @@ main (int argc, char *argv[])
 
       delete [] servers;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
+      ex._tao_print_exception (
+        "Test failed (Not regression) because unexpected exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (result)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
index 8c27291400e..47b626b7723 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
@@ -17,7 +17,7 @@ ACE_RCSID (Hello,
 
 const char *ior_output_file = "test.ior";
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
-    
+
 int
 parse_args (int argc, char *argv[])
 {
@@ -45,17 +45,16 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref ACE_ENV_ARG_DECL)
+make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
   // Create the list
   TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
   iors.length(1);
   iors [0] = CORBA::Object::_duplicate (ref);
-    
+
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -78,9 +77,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -88,9 +85,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     {
       retval = iorm->set_primary (&iogr_prop,
                                   new_ref.in (),
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                  new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -99,7 +94,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_ORBInitializer *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -108,21 +103,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
+
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -130,35 +120,27 @@ 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 ();
+
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
 
@@ -169,42 +151,33 @@ main (int argc, char *argv[])
       ACE_NEW_RETURN (hello_impl,
                       Hello (orb.in (), Test::Hello::_nil ()),
                       1);
-                      
+
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        my_poa->id_to_reference (server_id.in ());
+
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        orb->object_to_string (hello.in ());
+
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ())  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
+
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ()));
+
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        orb->object_to_string (iogr.in ());
+
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -214,28 +187,22 @@ main (int argc, char *argv[])
                               1);
       ACE_OS::fprintf (output_file, "%s", iorgr_string.in ());
       ACE_OS::fclose (output_file);
-          
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
+
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
index 43a23d567ec..c7d677d6035 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
@@ -16,7 +16,7 @@ ACE_RCSID (Hello,
 const char *ior_output_file = "";
 
 CORBA::ULong my_id_number = 0;
-    
+
 int
 parse_args (int argc, char *argv[])
 {
@@ -32,7 +32,7 @@ parse_args (int argc, char *argv[])
       case 'n':
         my_id_number = (CORBA::ULong) ACE_OS::atoi (get_opts.opt_arg ());
         ior_file += get_opts.opt_arg ();
-        ior_file += ".ior";        
+        ior_file += ".ior";
         ior_output_file = CORBA::string_dup (ior_file.c_str ());
         break;
       case '?':
@@ -54,7 +54,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_ORBInitializer2 *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -63,21 +63,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
+
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -85,35 +80,27 @@ 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 ();
+
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
 
@@ -124,23 +111,19 @@ main (int argc, char *argv[])
       ACE_NEW_RETURN (hello_impl,
                       Hello (orb.in (), Test::Hello::_nil (), my_id_number),
                       1);
-                      
+
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        my_poa->id_to_reference (server_id.in ());
+
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-            
+        orb->object_to_string (hello.in ());
+
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -150,26 +133,20 @@ main (int argc, char *argv[])
                            1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
-          
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
+
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
index 995e0eeed0d..e6b390c5f2b 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
@@ -11,21 +11,21 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Hello::ping (ACE_ENV_SINGLE_ARG_DECL)
+Hello::ping (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 void
-Hello::throw_location_forward (ACE_ENV_SINGLE_ARG_DECL)
+Hello::throw_location_forward (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
index c1d688daa82..7f8559b39ee 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
@@ -22,15 +22,15 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void throw_location_forward (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void throw_location_forward (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-        
+
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
   /// the application.
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
index f7a7b408be7..5d11612ae90 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
@@ -10,8 +10,7 @@
 
 void
 Server_ORBInitializer2::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -19,19 +18,15 @@ Server_ORBInitializer2::pre_init (
 
 void
 Server_ORBInitializer2::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer2::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -44,9 +39,7 @@ Server_ORBInitializer2::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
index a98a94523be..f2608319bee 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
@@ -27,20 +27,17 @@ class Server_ORBInitializer2 :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index 226898bcf40..e18c2e67d9f 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -33,22 +33,21 @@ TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
 }
 
 char *
-TAO249_ServerRequest_Interceptor2::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor2::name (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
 }
 
 void
-TAO249_ServerRequest_Interceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO249_ServerRequest_Interceptor2::destroy (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -56,12 +55,11 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor2::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "throw_location_forward"))
   {
@@ -72,9 +70,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (IOP::FT_REQUEST
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (IOP::FT_REQUEST);
 
   TAO_InputCDR cdr (reinterpret_cast <const char*>
                                      (sc->context_data.get_buffer ()
@@ -85,19 +81,15 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
   if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                           CORBA::COMPLETED_NO));
+      throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
     }
-  ACE_CHECK;
 
   cdr.reset_byte_order (static_cast <int>(byte_order));
 
   FT::FTRequestServiceContext ftrsc;
 
   if ((cdr >> ftrsc) == 0)
-    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                             CORBA::COMPLETED_NO));
-  ACE_CHECK;
+    throw CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO);
 
   TimeBase::TimeT now = get_now ();
 
@@ -129,7 +121,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
   // Let's forward the client back to us again. I would like to be able to make this a PERM
   // but there's no such animal in the PortableInterceptor module. Plus as we (currently) transform
   // and marshal *all* forward requests as vanilla LOCATION_FORWARD it doesn't really matter.
-  ACE_THROW (PortableInterceptor::ForwardRequest (server_iogr_.in ()));
+  throw PortableInterceptor::ForwardRequest (server_iogr_.in ());
 }
 
 TimeBase::TimeT
@@ -150,16 +142,14 @@ TAO249_ServerRequest_Interceptor2::get_now (void)
 
 void
 TAO249_ServerRequest_Interceptor2::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO249_ServerRequest_Interceptor2::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -167,8 +157,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 TAO249_ServerRequest_Interceptor2::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
index b7767f6d798..5f537001b96 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
@@ -46,38 +46,33 @@ TAO249_ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+virtual char * name (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+virtual void destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest));
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 //@}
@@ -90,7 +85,7 @@ protected:
 private:
 
 CORBA::ORB_var orb_;
-    
+
 CORBA::Boolean expired_;
 };
 
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
index efc5c8c1da7..f5ca16cd2dd 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
@@ -39,22 +39,19 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -65,38 +62,32 @@ main (int argc, char *argv[])
         }
 
       // Check this isn't generating transients for any other reason
-      hello->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->ping ();
 
 
-      ACE_TRY
+      try
         {
-          hello->throw_location_forward (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          hello->throw_location_forward ();
 
           ACE_DEBUG ((LM_ERROR, "REGRESSION - Test has failed !!!\n"));
           result = 1;
         }
-      ACE_CATCH (CORBA::TRANSIENT, my_ex)
+      catch (const CORBA::TRANSIENT& my_ex)
         {
           ACE_UNUSED_ARG (my_ex);
           ACE_DEBUG ((LM_DEBUG, "Client catches a TRANSIENT, as expected. No problem !\n"));
         }
-      ACE_ENDTRY;
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
+      ex._tao_print_exception (
+        "Test failed (Not regression) because unexpected exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (result)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
index eca1cfc94de..bb339d83c73 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
@@ -17,7 +17,7 @@ ACE_RCSID (Hello,
 
 const char *ior_output_file = "test.ior";
 TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
-    
+
 int
 parse_args (int argc, char *argv[])
 {
@@ -45,17 +45,16 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref ACE_ENV_ARG_DECL)
+make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
   // Create the list
   TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
   iors.length(1);
   iors [0] = CORBA::Object::_duplicate (ref);
-    
+
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -78,9 +77,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -88,9 +85,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     {
       retval = iorm->set_primary (&iogr_prop,
                                   new_ref.in (),
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                  new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -99,7 +94,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_ORBInitializer2 *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -108,21 +103,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
+
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -130,35 +120,27 @@ 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 ();
+
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
 
@@ -169,42 +151,33 @@ main (int argc, char *argv[])
       ACE_NEW_RETURN (hello_impl,
                       Hello (orb.in (), Test::Hello::_nil ()),
                       1);
-                      
+
       PortableServer::ObjectId_var server_id =
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        my_poa->id_to_reference (server_id.in ());
+
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        orb->object_to_string (hello.in ());
+
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ())  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
+
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ()));
+
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        orb->object_to_string (iogr.in ());
+
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -214,30 +187,24 @@ main (int argc, char *argv[])
                               1);
       ACE_OS::fprintf (output_file, "%s", iorgr_string.in ());
       ACE_OS::fclose (output_file);
-        
+
       TAO249_ServerRequest_Interceptor2::server_iogr_ = CORBA::Object::_duplicate (iogr.in ());
-          
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
+
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
index 183bc338fd4..176a7d7dc14 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
@@ -19,37 +19,37 @@ main (int argc, char *argv[])
 
       PortableServer::POA_var root_poa =
       PortableServer::POA::_narrow (poa_object.in ());
-    
+
       PortableServer::POAManager_var poa_manager =
       root_poa->the_POAManager ();
       poa_manager->activate ();
-    
+
       const char* uipmc_ior = "corbaloc:miop:1.0@1.0-domain-1/127.0.0.1:23232";
       CORBA::Object_var obj =orb->string_to_object (uipmc_ior);
-    
+
       CORBA::Object_var tmp = orb->string_to_object (ior_server);
       server_var server = server::_narrow (tmp.in ());
-      
+
       try
         {
           server->method (obj.in());
-          
+
           ACE_DEBUG ((LM_DEBUG, "Test passed !!\n"));
         }
       catch (const CORBA::SystemException& marshal)
         {
           ACE_DEBUG ((LM_ERROR, "Test Failed - Regression. "
                       "Sending UIPMC object ref to server failed with:\n"));
-          ACE_PRINT_EXCEPTION (marshal, "Exception : \n");
+          marshal._tao_print_exception ("Exception : \n");
           result = 1;
         }
-        
-      server->shutdown ();          
+
+      server->shutdown ();
     }
   catch(const CORBA::SystemException& e)
     {
-        ACE_PRINT_EXCEPTION (e, "Unexpected exception - not a regression.\n");
+        e._tao_print_exception ("Unexpected exception - not a regression.\n");
         result = 1;
-    }    
+    }
     return result;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
index 03cb59b88e1..43759b059cf 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
@@ -153,7 +153,7 @@ class HelloClientThread
     {
         while (m_count < NB_HELLO_CALLS)
         {
-            ACE_TRY_NEW_ENV
+            try
             {
                 int count;
                 {
@@ -175,12 +175,12 @@ class HelloClientThread
                 }
                 sleep(CLIENT_SLEEP_TIME);
             }
-            ACE_CATCHANY
+            catch (const CORBA::Exception& ex)
             {
-                ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                     ACE_TEXT ("Exception thrown during say_hello()\n"));
+                ex._tao_print_exception (
+                  ACE_TEXT (
+                    "Exception thrown during say_hello()\n"));
             }
-            ACE_ENDTRY;
         }
         return 1;
     }
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
 
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<<< %s Started - \"s\" = message sent \"R\" = message received >>>\n"), argv[0]));
 
-    ACE_TRY_NEW_ENV
+    try
     {
         /*** in svc.conf
 dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
@@ -292,13 +292,13 @@ static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandl
         helloThread->wait();
         delete helloThread;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception thrown during main()\n"));
+        ex._tao_print_exception (
+          ACE_TEXT (
+            "Exception thrown during main()\n"));
         exit_code = 1;
     }
-    ACE_ENDTRY;
 
     ACE_DEBUG ((LM_DEBUG,
             ACE_TEXT ("\n--------------------------------------------------\n")));
@@ -323,17 +323,17 @@ static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandl
     }
     if (!CORBA::is_nil(orb.in()))
     {
-        ACE_TRY_NEW_ENV
+        try
         {
             orb->destroy();
         }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
         {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Exception thrown during orb check\n"));
+            ex._tao_print_exception (
+              ACE_TEXT (
+                "Exception thrown during orb check\n"));
             exit_code = 1;
         }
-        ACE_ENDTRY;
     }
     exit(exit_code);
     return 0;
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
index aecebcc023c..d7bd3093cb2 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp
@@ -13,21 +13,21 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Hello::ping (ACE_ENV_SINGLE_ARG_DECL)
+Hello::ping (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 CORBA::Boolean
-Hello::has_ft_request_service_context (ACE_ENV_SINGLE_ARG_DECL)
+Hello::has_ft_request_service_context (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ServerRequest_Interceptor2::has_ft_request_sc_;
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
index 86970a50d5d..bfe3791b6c8 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
@@ -22,13 +22,13 @@ public:
   Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
 
   // = The skeleton methods
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean has_ft_request_service_context (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean has_ft_request_service_context (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
index c8a55def2a9..2f25ad62893 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp
@@ -10,8 +10,7 @@
 
 void
 Server_ORBInitializer2::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -19,19 +18,15 @@ Server_ORBInitializer2::pre_init (
 
 void
 Server_ORBInitializer2::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_server_request_interceptors (info);
 }
 
 void
 Server_ORBInitializer2::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr sri =
@@ -44,9 +39,7 @@ Server_ORBInitializer2::register_server_request_interceptors (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = sri;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
index a98a94523be..f2608319bee 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h
@@ -27,20 +27,17 @@ class Server_ORBInitializer2 :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register the necessary interceptors.
   void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
+         PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
index 3b118e75591..afd584a6b3b 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp
@@ -32,22 +32,21 @@ ServerRequest_Interceptor2::~ServerRequest_Interceptor2 (void)
 }
 
 char *
-ServerRequest_Interceptor2::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequest_Interceptor2::name (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequest_Interceptor2");
 }
 
 void
-ServerRequest_Interceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequest_Interceptor2::destroy (void)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequest_Interceptor2::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -55,12 +54,11 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 ServerRequest_Interceptor2::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "has_ft_request_service_context"))
   {
@@ -69,41 +67,36 @@ ACE_THROW_SPEC ((CORBA::SystemException,
     return;
   }
 
-  ACE_TRY
+  try
     {
       IOP::ServiceContext_var sc =
-        ri->get_request_service_context (IOP::FT_REQUEST
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_request_service_context (IOP::FT_REQUEST);
 
       // No exception therefore there was a context
       has_ft_request_sc_ = true;
     }
-  ACE_CATCH (CORBA::BAD_PARAM, ex)
+  catch (const CORBA::BAD_PARAM& ex)
     {
       ACE_UNUSED_ARG (ex);
       // No group version context
       has_ft_request_sc_ = false;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
 ServerRequest_Interceptor2::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequest_Interceptor2::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
@@ -111,8 +104,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
 
 void
 ServerRequest_Interceptor2::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ServerRequestInfo_ptr)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
index 549c8df7fdf..ac8917d5d8b 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h
@@ -45,38 +45,33 @@ ServerRequest_Interceptor2 (void);
  */
 //@{
 /// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+virtual char * name (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+virtual void destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
 ACE_THROW_SPEC ((CORBA::SystemException,
                  PortableInterceptor::ForwardRequest));
 
 virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 
 virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest));
 //@}
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 1f9be0a55a1..3416740c407 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -42,23 +42,20 @@ int
 main (int argc, char *argv[])
 {
   CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // First perform the test with an IOR
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -69,10 +66,9 @@ main (int argc, char *argv[])
         }
 
       // Check this isn't generating exceptions for any other reason
-      hello->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->ping ();
 
-      if (hello->has_ft_request_service_context (ACE_ENV_SINGLE_ARG_PARAMETER))
+      if (hello->has_ft_request_service_context ())
         {
           ACE_DEBUG ((LM_ERROR, "ERROR - REGRESSION - Request made on a plain IOR has a FT_REQUEST service context.\n" ));
           result = 1;
@@ -84,12 +80,10 @@ main (int argc, char *argv[])
 
       // Now repeat the test (for the converse result) with an IOGR
       tmp =
-        orb->string_to_object(iogr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(iogr);
 
       hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -100,10 +94,9 @@ main (int argc, char *argv[])
         }
 
       // Check this isn't generating transients for any other reason
-      hello->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->ping ();
 
-      if (! hello->has_ft_request_service_context (ACE_ENV_SINGLE_ARG_PARAMETER))
+      if (! hello->has_ft_request_service_context ())
         {
           ACE_DEBUG ((LM_ERROR, "ERROR - REGRESSION - Request made on an IOGR has no FT_REQUEST service context.\n" ));
           result = 1;
@@ -113,19 +106,16 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG, "Request made on an IOGR has a FT_REQUEST service context. This is OK.\n" ));
         }
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
+      ex._tao_print_exception (
+        "Test failed (Not regression) because unexpected exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (result)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
index fb31b3d6683..b7f52de4793 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/server.cpp
@@ -48,7 +48,7 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref ACE_ENV_ARG_DECL)
+make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
   // Create the list
@@ -57,8 +57,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
   iors [0] = CORBA::Object::_duplicate (ref);
 
   CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    iorm->merge_iors (iors);
 
   // Property values
 
@@ -81,9 +80,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -91,9 +88,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
     {
       retval = iorm->set_primary (&iogr_prop,
                                   new_ref.in (),
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                  new_ref.in ());
     }
 
   return new_ref._retn ();
@@ -102,7 +97,7 @@ make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_ORBInitializer2 *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -111,21 +106,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -133,35 +123,27 @@ 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 ();
 
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var my_poa =
         root_poa->create_POA ("my_poa",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
 
@@ -177,17 +159,13 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("server_id");
 
       my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       hello_impl);
 
       CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        my_poa->id_to_reference (server_id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -202,21 +180,16 @@ main (int argc, char *argv[])
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         0);
 
       // Narrow
       iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ())  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ()));
 
       CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (iogr.in ());
 
       // Output the IOR to the <iogr_output_file>
       output_file = ACE_OS::fopen (iogr_output_file, "w");
@@ -228,27 +201,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", iorgr_string.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
index a735418a945..7e3d61bcb1b 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
@@ -21,7 +21,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr corb,
 }
 
 CORBA::Object_ptr
-Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version ACE_ENV_ARG_DECL)
+Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version)
 {
   CORBA::Object_var remote_server(
     corb_->string_to_object (ACE_CString(file_prefix + this->server_ior_file_).c_str()));
@@ -29,7 +29,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
   if (CORBA::is_nil (remote_server.in ()))
     {
       ACE_ERROR ((LM_ERROR, "Error: Remote server is not started.\n"));
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   CORBA::Object_var collocated_server(
@@ -38,7 +38,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
   if (CORBA::is_nil (collocated_server.in ()))
     {
       ACE_ERROR ((LM_ERROR, "Error: Collocated server is not started.\n"));
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   FT::TagFTGroupTaggedComponent ft_tag_component;
@@ -50,8 +50,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
   iors [1] = CORBA::Object::_duplicate (collocated_server.ptr());
 
   CORBA::Object_var new_ref =
-    this->iorm_->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->iorm_->merge_iors (iors);
 
   // Property values
 
@@ -73,17 +72,13 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
 
   // Set the property
   CORBA::Boolean retval = this->iorm_->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                              new_ref.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
   retval = this->iorm_->set_primary (&iogr_prop,
                               remote_server.in (),
-                              new_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                              new_ref.in ());
 
   return new_ref._retn ();
 }
@@ -91,34 +86,27 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
 /// Thread entry point
 int Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get a ref to the IORManipulation object
       CORBA::Object_var IORM =
         corb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-        0
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        0);
 
       // Narrow
       this->iorm_ =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1);
 
       CORBA::String_var iorgr_string =
-        corb_->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corb_->object_to_string (iogr.in ());
 
       CORBA::Object_var object =
-        corb_->string_to_object (iorgr_string.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corb_->string_to_object (iorgr_string.in ());
 
       Test_var server =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -130,15 +118,13 @@ int Client_Task::svc (void)
         corb_->string_to_object (ACE_CString(file_prefix + this->server_ior_file_).c_str()));
 
       Test_var remote_server_as_test =
-        Test::_narrow (remote_server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (remote_server.in ());
 
       CORBA::Object_var collocated_server(
         corb_->string_to_object (ACE_CString(file_prefix + this->collocated_ior_file_).c_str()));
 
       Test_var collocated_server_as_test =
-        Test::_narrow (collocated_server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (collocated_server.in ());
 
       if (!collocated_server->_is_collocated())
         { // Collocation is disabled, just skip the test - it has no sense.
@@ -146,37 +132,30 @@ int Client_Task::svc (void)
         }
       else
         {
-          ACE_TRY_NEW_ENV
+          try
           {
             // Following call will fail if the problem is not fixed.
 
             // Because we are using TRANSIENT objects with the SYSTEM_ID policy
             // the object keys won't match so the POA won't be able to dispatch locally.
             // This wouldn't work with 'direct' collocation strategy but the default is 'through poa'.
-            server->myMethod (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            server->myMethod ();
           }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
           {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-              "Exception caught in client task:");
+            ex._tao_print_exception ("Exception caught in client task:");
           }
-          ACE_ENDTRY;
         }
 
-      remote_server_as_test->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      remote_server_as_test->shutdown();
 
-      collocated_server_as_test->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      collocated_server_as_test->shutdown();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Exception caught in client task:");
+      ex._tao_print_exception ("Exception caught in client task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
index 30c2a82fe49..21652b83757 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
@@ -17,9 +17,9 @@ public:
     const ACE_CString& server_ior_file);
 
   CORBA::Object_ptr make_iogr (
-     const char* domain_id, 
-     CORBA::ULongLong group_id, 
-     CORBA::ULong group_version ACE_ENV_ARG_DECL);
+     const char* domain_id,
+     CORBA::ULongLong group_id,
+     CORBA::ULong group_version);
 
   /// Thread entry point
   int svc (void);
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
index 1b5dad7d41f..c86941f3e92 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp
@@ -20,42 +20,35 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var poa_object =
-        sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sorb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       TestImpl * server_impl = 0;
       ACE_NEW_RETURN (server_impl, TestImpl (sorb_.in ()), 1);
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
-      Test_var server = Test::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER);
+      Test_var server = Test::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        sorb_->object_to_string (test_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sorb_->object_to_string (test_obj.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (output_, "w");
@@ -70,21 +63,17 @@ Server_Task::svc (void)
       // Signal the main thread before we call orb->run ();
       this->me_.signal ();
 
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
+      ex._tao_print_exception ("Exception caught in server task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
index e81edb9b66e..2f7fb7e268b 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp
@@ -8,16 +8,16 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb)
 {
 }
 
-// virtual 
-void TestImpl::myMethod (ACE_ENV_SINGLE_ARG_DECL)
+// virtual
+void TestImpl::myMethod (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") );
 }
 
 
-// virtual 
-void TestImpl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+// virtual
+void TestImpl::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Give the client thread time to return from the collocated
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
index fae8f7d2b8d..caf61465a18 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h
@@ -10,10 +10,10 @@ public:
   TestImpl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void myMethod (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void myMethod (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
index 644645faa3c..10f560a64b6 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
@@ -57,7 +57,7 @@ main (int argc, char * argv [])
   ACE_CString client_orb;
   client_orb.set ("client_orb");
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -66,17 +66,13 @@ main (int argc, char * argv [])
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Argv_Type_Converter catc (argc, argv);
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       {
         ACE_Manual_Event me;
@@ -110,16 +106,13 @@ main (int argc, char * argv [])
         ACE_Thread_Manager::instance ()->wait ();
       }
 
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (failed)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
index a7cf486602f..b0ffadbf641 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/server.cpp
@@ -44,7 +44,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -52,9 +52,7 @@ main (int argc, char *argv[])
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv ()                         
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         satc.get_TCHAR_argv ());
 
       {
         ACE_Manual_Event me;
@@ -77,16 +75,13 @@ main (int argc, char *argv[])
         ACE_Thread_Manager::instance ()->wait ();
       }
 
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 93760c93800..ca5afcee699 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -362,21 +362,18 @@ CC_Client::print_usage (void)
 int
 CC_Client::init_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_NEW_RETURN (naming_service_,
                       CC_naming_service,
                       -1);
 
-      this->naming_service_->Init (this->orb_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->naming_service_->Init (this->orb_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -387,15 +384,12 @@ CC_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "internet");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -417,16 +411,13 @@ CC_Client::init (int argc, char **argv)
 
 
           CORBA::Object_var factory_object =
-            this->orb_->string_to_object (this->cc_factory_key_
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->string_to_object (this->cc_factory_key_);
 
 #if 0
           // The test cannot currently run without the naming service.
           this->factory_ =
             CosConcurrencyControl::LockSetFactory::_narrow
-            (factory_object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            (factory_object.in ());
 
           if (CORBA::is_nil (this->factory_.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -440,12 +431,11 @@ CC_Client::init (int argc, char **argv)
                   "Factory received OK\n"));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "CC_Client::init");
+      ex._tao_print_exception ("CC_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index fda16fbaa42..7072b482fc6 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -46,25 +46,20 @@ CC_Command::CC_Command(void)
 }
 
 CosConcurrencyControl::LockSet_var
-CC_Command::GetLockSet (const char *lock_set_name
-                        ACE_ENV_ARG_DECL)
+CC_Command::GetLockSet (const char *lock_set_name)
 {
   CosConcurrencyControl::LockSet_var ccls_ret;
 
-  ACE_TRY
+  try
     {
       if(ACE_OS::strcmp(lock_set_name, "")!=0)
         {
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name ("",
-                                                              lock_set_name
-                                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                              lock_set_name);
 
           ccls_ret =
-            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
         }
       else
         {
@@ -77,11 +72,10 @@ CC_Command::GetLockSet (const char *lock_set_name
             ccls_ret = cc_lockset_.in ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   return ccls_ret;
 }
@@ -166,16 +160,14 @@ int CC_CreateLockSet_Cmd::execute(void)
 
   printf("Executing create command (lock set: %s)\n", name_);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosConcurrencyControl::LockSet_ptr lock_set =
         CC_TestUtils::create_lock_set();
       if(ACE_OS::strcmp(name_,"")!=0)// Do not bind an empty name
         {
           CC_naming_service::Instance()->bind_name(name_,
-                                                   lock_set ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                   lock_set);
         }
       else
         {
@@ -183,12 +175,10 @@ int CC_CreateLockSet_Cmd::execute(void)
           cc_lockset_ = lock_set;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_CreateLockSet_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_CreateLockSet_Cmd::execute(void)");
     }
-  ACE_ENDTRY;
 
   return 1; // CC_SUCCESS
 }
@@ -220,23 +210,17 @@ int CC_Lock_Cmd::execute(void)
   printf("Executing lock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosConcurrencyControl::LockSet_var ccls =
-        GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ccls->lock (mode_
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        GetLockSet(name_);
+      ccls->lock (mode_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Lock_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_Lock_Cmd::execute(void)");
       return 0;
     }
-  ACE_ENDTRY;
   return 1; // CC_SUCCESS
 }
 
@@ -267,24 +251,18 @@ int CC_UnLock_Cmd::execute(void)
   printf("Executing unlock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
-      ccls->unlock (mode_
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ccls->unlock (mode_);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_UnLock_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_UnLock_Cmd::execute(void)");
       return 0;
     }
-  ACE_ENDTRY;
   return 1; // CC_SUCCESS
 }
 
@@ -317,15 +295,11 @@ int CC_TryLock_Cmd::execute(void)
 
   CORBA::Boolean lock_not_held;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
-      lock_not_held = ccls->try_lock (mode_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      lock_not_held = ccls->try_lock (mode_);
 
       if (lock_not_held)
         {
@@ -338,13 +312,11 @@ int CC_TryLock_Cmd::execute(void)
                     "%s lock held\n",
                     CC_TestUtils::get_lock_mode_name (mode_)));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_TryLock_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_TryLock_Cmd::execute(void)");
       return 0;
     }
-  ACE_ENDTRY;
 
   return 1; // CC_SUCCESS
 }
@@ -382,23 +354,17 @@ int CC_ChangeMode_Cmd::execute(void)
          name_, CC_TestUtils::get_lock_mode_name(held_mode_),
          CC_TestUtils::get_lock_mode_name(new_mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
-      ccls->change_mode (held_mode_, new_mode_
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ccls->change_mode (held_mode_, new_mode_);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_ChangeMode_Cmd::execute(void)");
+      ex._tao_print_exception ("CC_ChangeMode_Cmd::execute(void)");
     }
-  ACE_ENDTRY;
   return 1; // CC_SUCCESS
 }
 
@@ -576,30 +542,22 @@ CC_Lookup_Cmd::execute(void)
   // Do the lookup if we haven't done it before
   if(cc_lockset_.in() == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name ("",
-                                                              name_
-                                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                              name_);
 
           CosConcurrencyControl::LockSet_var ccls =
-            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
 
           cc_lockset_ = ccls;
-          ACE_TRY_CHECK;
 
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "CC_UnLock_Cmd::execute(void)");
+          ex._tao_print_exception ("CC_UnLock_Cmd::execute(void)");
         }
-      ACE_ENDTRY;
     }
   return 1; // CC_SUCCESS
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h
index 735d38d7c21..dbd70e7ac12 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h
@@ -44,8 +44,7 @@ class CC_Command
 
  protected:
   CosConcurrencyControl::LockSet_var
-    GetLockSet (const char *lock_set_name
-                ACE_ENV_ARG_DECL);
+    GetLockSet (const char *lock_set_name);
   // Function to look up the lock set we are operating on, or if the
   // name is "" return the global lock set variable
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index d12cb0d1e94..c23a0046c76 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -23,14 +23,12 @@
 
 ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
 
-CC_naming_service::CC_naming_service (CORBA::ORB_var orb
-                                      ACE_ENV_ARG_DECL)
+CC_naming_service::CC_naming_service (CORBA::ORB_var orb)
   : cc_factory_key_ (0),
     orb_ (0),
     factory_ (0)
 {
-  this->Init(orb ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->Init(orb);
 
   instance_ = this;
 }
@@ -43,14 +41,13 @@ CC_naming_service::CC_naming_service(void)
 }
 
 void
-CC_naming_service::Init(CORBA::ORB_var orb
-                        ACE_ENV_ARG_DECL)
+CC_naming_service::Init(CORBA::ORB_var orb)
 {
   this->orb_ = orb;
 
   int success = init_naming_service ();
   if (success < 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 }
 
 CC_naming_service::~CC_naming_service (void)
@@ -72,21 +69,19 @@ CC_naming_service::Instance(void)
 
 CORBA::Object_var
 CC_naming_service::get_obj_from_name (const char *c_name,
-                                      const char *name
-                                      ACE_ENV_ARG_DECL)
+                                      const char *name)
 {
   ACE_DEBUG ((LM_DEBUG, "C: %s, N: %s\n", c_name, name));
   CORBA::Object_var obj;
 
-  ACE_TRY
+  try
     {
       if (ACE_OS::strlen (c_name) == 0)
         {
           CosNaming::Name ns_name (1);
           ns_name.length (1);
           ns_name[0].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          obj = my_name_client_->resolve (ns_name);
         }
       else
         {
@@ -94,47 +89,39 @@ CC_naming_service::get_obj_from_name (const char *c_name,
           ns_name.length (2);
           ns_name[0].id = CORBA::string_dup (c_name);
           ns_name[1].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          obj = my_name_client_->resolve (ns_name);
         }
       if (CORBA::is_nil (obj.in ()) )
         ACE_DEBUG((LM_DEBUG,
                    "OBJ was nill (aieee)\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::get_obj_from_name (...)");
+      ex._tao_print_exception ("CC_Client::get_obj_from_name (...)");
       return obj;
     }
-  ACE_ENDTRY;
 
   return obj;
 }
 
 void
 CC_naming_service::bind_name (const char *n,
-                              CORBA::Object_ptr obj
-                              ACE_ENV_ARG_DECL)
+                              CORBA::Object_ptr obj)
 {
   ACE_DEBUG ((LM_DEBUG, "CC_Client::bind_name\n"));
 
-  ACE_TRY
+  try
     {
       CosNaming::Name ns_name (1);
       ns_name.length (1);
       ns_name[0].id = CORBA::string_dup (n);
       my_name_client_->bind (ns_name,
-                             obj
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             obj);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::bind_name (...)");
+      ex._tao_print_exception ("CC_Client::bind_name (...)");
     }
-  ACE_ENDTRY;
 }
 
 CosConcurrencyControl::LockSetFactory_var
@@ -146,8 +133,7 @@ CC_naming_service::get_lock_set_factory (void)
 int
 CC_naming_service::init_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the naming services
       if (my_name_client_.init (orb_.in ()) != 0)
@@ -157,27 +143,22 @@ CC_naming_service::init_naming_service (void)
                           -1);
 
       CORBA::Object_var factory_obj = get_obj_from_name ("CosConcurrency",
-                                                         "LockSetFactory"
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                         "LockSetFactory");
 
       this->factory_ =
         CosConcurrencyControl::LockSetFactory::_narrow
-        (factory_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        (factory_obj.in ());
 
       if (CORBA::is_nil (this->factory_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " could not resolve lock set factory in Naming service\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::init_naming_service");
+      ex._tao_print_exception ("CC_Client::init_naming_service");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 597a9696840..9a992338ee2 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -38,24 +38,22 @@ public:
   CC_naming_service ();
   // Default constructor
 
-  CC_naming_service (CORBA::ORB_var orb_ ACE_ENV_ARG_DECL);
+  CC_naming_service (CORBA::ORB_var orb_);
   // Constructor
 
   ~CC_naming_service (void);
   // Default destructor.
 
-  void Init (CORBA::ORB_var orb_ ACE_ENV_ARG_DECL);
+  void Init (CORBA::ORB_var orb_);
   // Initialization method must be called after first call of Instance()
   // in order to initialize the object correctly
 
   CORBA::Object_var get_obj_from_name (const char *c_name,
-                                       const char *name
-                                       ACE_ENV_ARG_DECL);
+                                       const char *name);
   // Lookup a name in the naming service (context, name)
 
   void bind_name (const char *n,
-                  CORBA::Object_ptr obj
-                  ACE_ENV_ARG_DECL);
+                  CORBA::Object_ptr obj);
   // Bind a name in the concurrency context.
 
   CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void);
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index f88b2b65f7e..4080b9e369f 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -50,24 +50,20 @@ CC_TestUtils::create_lock_set (void)
   // Create the lock set and return an obj ref corresponding to the
   // key.
   CosConcurrencyControl::LockSet_ptr lock_set(0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       lock_set =
-        CC_naming_service::Instance()->get_lock_set_factory ()->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CC_naming_service::Instance()->get_lock_set_factory ()->create ();
 
       if (CORBA::is_nil (lock_set))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "null lock set objref returned by factory\n"),
                           0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::create_lock_set");
+      ex._tao_print_exception ("CC_Client::create_lock_set");
       return 0;
     }
-  ACE_ENDTRY;
   return lock_set;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 5dfccef2eb5..cda1e777953 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -39,25 +39,21 @@ CC_Test::create_lock_set (void)
   // Create the lock set and return an obj ref corresponding to the
   // key.
   CosConcurrencyControl::LockSet_ptr lock_set(0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       lock_set =
-        this->naming_service_->get_lock_set_factory ()->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_service_->get_lock_set_factory ()->create ();
 
       if (CORBA::is_nil (lock_set))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "null lock set objref returned by factory\n"),
                           0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CC_Client::create_lock_set");
+      ex._tao_print_exception ("CC_Client::create_lock_set");
       return 0;
     }
-  ACE_ENDTRY;
   return lock_set;
 }
 
@@ -103,19 +99,15 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
 
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->lock (mode_);
 
-      ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock set\n",
                   get_lock_mode_name (mode_)));
 
-      lock_not_held = cc_lock_set_->try_lock (mode_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      lock_not_held = cc_lock_set_->try_lock (mode_);
 
       if (lock_not_held)
         {
@@ -129,15 +121,12 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
                     "%s lock held\n",
                     get_lock_mode_name (mode_)));
 
-      cc_lock_set_->unlock (mode_
-                            ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->unlock (mode_);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
-      lock_not_held = cc_lock_set_->try_lock (mode_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      lock_not_held = cc_lock_set_->try_lock (mode_);
 
       if (lock_not_held)
         ACE_DEBUG ((LM_DEBUG,
@@ -152,13 +141,11 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Single_Lock_With_Mode::run");
+      ex._tao_print_exception ("Test_Single_Lock_With_Mode::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   CORBA::release (cc_lock_set_);
 
@@ -181,32 +168,25 @@ Test_Setup_LockSet::~Test_Setup_LockSet (void)
 int
 Test_Setup_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosConcurrencyControl::LockSet_ptr cc_lock_set_ =
         create_lock_set ();
-      this->naming_service_->bind_name (my_name_, cc_lock_set_
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->naming_service_->bind_name (my_name_, cc_lock_set_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Name bound\n"));
 
-      cc_lock_set_->lock (CosConcurrencyControl::read
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      cc_lock_set_->lock (CosConcurrencyControl::read);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Read lock set\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Against_Other_LockSet::run");
+      ex._tao_print_exception ("Test_Against_Other_LockSet::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   return CC_SUCCESS;
 }
@@ -228,32 +208,23 @@ Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void)
 int
 Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var ccls_obj =
         this->naming_service_->get_obj_from_name (const_cast<char *> (""),
-                                                  my_name_
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  my_name_);
 
       CosConcurrencyControl::LockSet_var ccls =
-        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
 
-      ccls->lock (CosConcurrencyControl::read
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ccls->lock (CosConcurrencyControl::read);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Against_Other_LockSet::run");
+      ex._tao_print_exception ("Test_Against_Other_LockSet::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   return CC_SUCCESS;
 }
@@ -275,29 +246,21 @@ Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void)
 int
 Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var ccls_obj =
-        this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_);
 
       CosConcurrencyControl::LockSet_var ccls =
-        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
 
-      ccls->unlock (CosConcurrencyControl::read
-                    ACE_ENV_ARG_PARAMETER);
+      ccls->unlock (CosConcurrencyControl::read);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Unlock_Already_Created_LockSet::run");
+      ex._tao_print_exception ("Test_Unlock_Already_Created_LockSet::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   return CC_SUCCESS;
 }
@@ -322,20 +285,17 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
 
   // Create the lock set
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // lock the lock
-      cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      cc_lock_set_->lock (mode_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock set\n",
                   get_lock_mode_name (mode_)));
 
       // check to see if the lock is held
-      lock_not_held = cc_lock_set_->try_lock (mode_
-                                              ACE_ENV_ARG_PARAMETER);
+      lock_not_held = cc_lock_set_->try_lock (mode_);
 
       if (lock_not_held)
         {
@@ -350,23 +310,20 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
                     get_lock_mode_name (mode_)));
 
       // release the lock
-      cc_lock_set_->unlock (mode_
-                            ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->unlock (mode_);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
       // release the lock again. this should raise an exception
-      cc_lock_set_->unlock (mode_
-                            ACE_ENV_ARG_PARAMETER);
+      cc_lock_set_->unlock (mode_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "attemptet to release %s lock\n",
                   get_lock_mode_name (mode_)));
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCH(CosConcurrencyControl::LockNotHeld, userex)
+  catch (const CosConcurrencyControl::LockNotHeld& userex)
     {
       // We should end here
       ACE_UNUSED_ARG (userex);
@@ -374,13 +331,11 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
       return CC_SUCCESS;
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Release_Not_Held_Lock::run");
+      ex._tao_print_exception ("Test_Release_Not_Held_Lock::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
 
   CORBA::release (cc_lock_set_);
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 5e8ce733528..657405b4ae7 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -12,103 +12,82 @@ ACE_RCSID (CEC_Tests,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int use_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks
-          ACE_ENV_ARG_DECL)
+          int use_callbacks)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_CEC_EventChannel ec_impl (attributes);
-  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec_impl.activate ();
 
   CosEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_impl._this ();
 
   // ****************************************************************
 
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_consumers ();
 
   // and the supplier admin..
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_suppliers ();
 
   // ****************************************************************
 
@@ -121,52 +100,32 @@ run_test (PortableServer::POA_ptr poa,
 
   for (int i = 0; i != iterations; ++i)
     {
-      supplier_0.connect (supplier_admin.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      consumer_0.connect (consumer_admin.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_0.connect (supplier_admin.in ());
+      consumer_0.connect (consumer_admin.in ());
       if (i % 2 == 1)
         {
-          supplier_1.connect (supplier_admin.in ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          consumer_1.connect (consumer_admin.in ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          supplier_1.connect (supplier_admin.in ());
+          consumer_1.connect (consumer_admin.in ());
         }
-      supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_0.disconnect ();
+      consumer_0.disconnect ();
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-          supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          consumer_1.disconnect ();
+          supplier_1.disconnect ();
         }
     }
 
-  supplier_0.connect (supplier_admin.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  consumer_0.connect (consumer_admin.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_0.connect (supplier_admin.in ());
+  consumer_0.connect (consumer_admin.in ());
 
-  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  event_channel->destroy ();
 
-  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&supplier_0);
 
-  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&consumer_0);
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&ec_impl);
 
   CORBA::ULong count_0 = 1;
   CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 0c94a7bdb15..69e9401a06e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -12,91 +12,72 @@ ACE_RCSID (CEC_Tests,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int use_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks
-          ACE_ENV_ARG_DECL)
+          int use_callbacks)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_CEC_EventChannel ec_impl (attributes);
-  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec_impl.activate ();
 
   CosEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_impl._this ();
 
   MTD_Task task (event_channel.in (), use_callbacks);
 
@@ -108,11 +89,9 @@ run_test (PortableServer::POA_ptr poa,
   // Wait for all the threads to complete and the return
   ACE_Thread_Manager::instance ()->wait ();
 
-  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  event_channel->destroy ();
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&ec_impl);
 }
 
 MTD_Task::MTD_Task (CosEventChannelAdmin::EventChannel_ptr ec,
@@ -128,32 +107,28 @@ MTD_Task::svc ()
 {
   for (int i = 0; i < 10; ++i)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
-          this->run_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->run_iteration ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           return -1;
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
 
 void
-MTD_Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
+MTD_Task::run_iteration (void)
 {
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel->for_consumers ();
 
   // and the supplier admin..
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel->for_suppliers ();
 
   // ****************************************************************
 
@@ -166,39 +141,25 @@ MTD_Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
 
   for (int i = 0; i != iterations; ++i)
     {
-      supplier_0.connect (supplier_admin.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      consumer_0.connect (consumer_admin.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_0.connect (supplier_admin.in ());
+      consumer_0.connect (consumer_admin.in ());
       if (i % 2 == 1)
         {
-          supplier_1.connect (supplier_admin.in ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          consumer_1.connect (consumer_admin.in ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          supplier_1.connect (supplier_admin.in ());
+          consumer_1.connect (consumer_admin.in ());
         }
-      supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_0.disconnect ();
+      consumer_0.disconnect ();
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-          supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          consumer_1.disconnect ();
+          supplier_1.disconnect ();
         }
     }
 
-  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&supplier_0);
 
-  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&consumer_0);
 
   CORBA::ULong count_0 = 0;
   CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 1248ee1b8ff..e0799f95255 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -34,7 +34,7 @@ public:
   // = Check the ACE_Task_Base documentation.
   int svc (void);
 
-  void run_iteration (ACE_ENV_SINGLE_ARG_DECL);
+  void run_iteration (void);
   // Run a single iteration of the test
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index abaa9184f9b..990d9da478e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -15,25 +15,19 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -41,24 +35,20 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
@@ -66,56 +56,42 @@ main (int argc, char* argv[])
 
       CEC_Counting_Supplier supplier_00;
 
-      supplier_00.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_00.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_01;
 
-      supplier_01.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_01.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Pull_Counting_Supplier supplier_10;
 
-      supplier_10.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_10.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Pull_Counting_Supplier supplier_11;
 
-      supplier_11.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_11.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
       CEC_Counting_Consumer consumer_00 ("Consumer/00");
-      consumer_00.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_00.connect (consumer_admin.in ());
 
       // ****************************************************************
 
       CEC_Pull_Counting_Consumer consumer_01 ("Consumer/01");
-      consumer_01.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_01.connect (consumer_admin.in ());
 
       // ****************************************************************
 
       CEC_Pull_Counting_Consumer consumer_10 ("Consumer/10");
-      consumer_10.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_10.connect (consumer_admin.in ());
 
       // ****************************************************************
 
@@ -174,36 +150,26 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_10.disconnect ();
 
-      consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_01.disconnect ();
 
-      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_00.disconnect ();
 
-      supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_11.disconnect ();
+      supplier_10.disconnect ();
+      supplier_01.disconnect ();
+      supplier_00.disconnect ();
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // ****************************************************************
 
@@ -222,11 +188,10 @@ main (int argc, char* argv[])
         consumer_task_10.pull_count ();
       consumer_10.dump_results (expected, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 3ff9f720233..a424f4e6c6e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -15,25 +15,19 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -41,24 +35,20 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
@@ -66,49 +56,37 @@ main (int argc, char* argv[])
 
       CEC_Counting_Supplier supplier_00;
 
-      supplier_00.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_00.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_01;
 
-      supplier_01.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_01.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_10;
 
-      supplier_10.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_10.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_11;
 
-      supplier_11.connect (supplier_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_11.connect (supplier_admin.in ());
 
       // ****************************************************************
 
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
       CEC_Counting_Consumer consumer_00 ("Consumer/00");
-      consumer_00.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_00.connect (consumer_admin.in ());
 
       // ****************************************************************
 
       CEC_Counting_Consumer consumer_01 ("Consumer/01");
-      consumer_01.connect (consumer_admin.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_01.connect (consumer_admin.in ());
 
       // ****************************************************************
 
@@ -147,33 +125,24 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_01.disconnect ();
 
-      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_00.disconnect ();
 
-      supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_11.disconnect ();
+      supplier_10.disconnect ();
+      supplier_01.disconnect ();
+      supplier_00.disconnect ();
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // ****************************************************************
 
@@ -186,11 +155,10 @@ main (int argc, char* argv[])
       consumer_00.dump_results (expected, 5);
       consumer_01.dump_results (expected, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 0c5aea70a2f..01df584fecc 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -21,17 +21,13 @@ main (int argc, char* argv[])
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_default_POA ();
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (servant);
+  poa->deactivate_object (oid.in ());
 }
 
 
@@ -46,12 +42,10 @@ RND_Driver::RND_Driver (void)
 int
 RND_Driver::run (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // ****************************************************************
 
@@ -107,16 +101,12 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -126,30 +116,24 @@ RND_Driver::run (int argc, char *argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       this->consumer_admin_ =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       this->supplier_admin_ =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
-      this->supplier_.connect (this->supplier_admin_.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->supplier_.connect (this->supplier_admin_.in ());
 
       // ****************************************************************
 
@@ -163,8 +147,7 @@ RND_Driver::run (int argc, char *argv[])
                           1);
 
           CORBA::Object_var obj =
-            this->consumers_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->consumers_[i]->_this ();
         }
 
       // ****************************************************************
@@ -180,8 +163,7 @@ RND_Driver::run (int argc, char *argv[])
           this->suppliers_[j]->activate ();
 
           CORBA::Object_var obj =
-            this->suppliers_[j]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->suppliers_[j]->_this ();
         }
 
       // ****************************************************************
@@ -190,8 +172,7 @@ RND_Driver::run (int argc, char *argv[])
         {
           ACE_Time_Value tv (0, 50000);
           orb->run (tv);
-          this->supplier_.push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->supplier_.push_new_event ();
         }
 
       ACE_Thread_Manager::instance ()->wait ();
@@ -201,11 +182,8 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nsuppliers_; ++k)
           {
-            deactivate_servant (this->suppliers_[k]
-                                ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-            this->suppliers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            deactivate_servant (this->suppliers_[k]);
+            this->suppliers_[k]->_remove_ref ();
           }
         delete[] this->suppliers_;
         this->suppliers_ = 0;
@@ -215,19 +193,15 @@ RND_Driver::run (int argc, char *argv[])
 
       // We destroy now to verify that the callbacks work and do not
       // produce any problems.
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
       {
         for (int k = 0; k != this->nconsumers_; ++k)
           {
-            deactivate_servant (this->consumers_[k]
-                                ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-            this->consumers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            deactivate_servant (this->consumers_[k]);
+            this->consumers_[k]->_remove_ref ();
           }
         delete[] this->consumers_;
         this->consumers_ = 0;
@@ -235,32 +209,26 @@ RND_Driver::run (int argc, char *argv[])
 
       // ****************************************************************
 
-      deactivate_servant (&ec_impl
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      deactivate_servant (&ec_impl);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Random");
+      ex._tao_print_exception ("Random");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-RND_Driver::timer (const CORBA::Any &e
-                   ACE_ENV_ARG_DECL)
+RND_Driver::timer (const CORBA::Any &e)
 {
   int r = ACE_OS::rand ();
   if (r < 0)
@@ -281,8 +249,7 @@ RND_Driver::timer (const CORBA::Any &e
             CORBA::Any new_event;
             recursion++;
             new_event <<= recursion;
-            this->supplier_.push (new_event ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+            this->supplier_.push (new_event);
           }
       }
       break;
@@ -301,9 +268,7 @@ RND_Driver::timer (const CORBA::Any &e
 
         // ACE_DEBUG ((LM_DEBUG, "Connecting supplier %d\n", n));
 
-        this->suppliers_[n]->connect (this->supplier_admin_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        this->suppliers_[n]->connect (this->supplier_admin_.in ());
       }
       break;
 
@@ -313,9 +278,7 @@ RND_Driver::timer (const CORBA::Any &e
 
         // ACE_DEBUG ((LM_DEBUG, "Connecting consumer %d\n", n));
 
-        this->consumers_[n]->connect (this->consumer_admin_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        this->consumers_[n]->connect (this->consumer_admin_.in ());
       }
       break;
 
@@ -325,8 +288,7 @@ RND_Driver::timer (const CORBA::Any &e
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n));
 
-        this->suppliers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->suppliers_[n]->disconnect ();
       }
       break;
 
@@ -336,25 +298,22 @@ RND_Driver::timer (const CORBA::Any &e
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n));
 
-        this->consumers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->consumers_[n]->disconnect ();
       }
       break;
     }
 }
 
 void
-RND_Driver::event (const CORBA::Any &e
-                   ACE_ENV_ARG_DECL)
+RND_Driver::event (const CORBA::Any &e)
 {
-  this->timer (e ACE_ENV_ARG_PARAMETER);
+  this->timer (e);
 }
 
 // ****************************************************************
 
 void
-RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
-                       ACE_ENV_ARG_DECL)
+RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin)
 {
   CosEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -362,43 +321,37 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->proxy_ = admin->obtain_push_supplier ();
       }
     proxy =
       CosEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ());
   }
   CosEventComm::PushConsumer_var me =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  proxy->connect_push_consumer (me.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
+  proxy->connect_push_consumer (me.in ());
 }
 
 void
-RND_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RND_Consumer::disconnect (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->disconnect_push_supplier ();
   this->proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-RND_Consumer::push (const CORBA::Any &event
-                    ACE_ENV_ARG_DECL)
+RND_Consumer::push (const CORBA::Any &event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->event (event ACE_ENV_ARG_PARAMETER);
+  this->driver_->event (event);
 }
 
 void
-RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Consumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -406,8 +359,7 @@ RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // ****************************************************************
 
 void
-RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
-                       ACE_ENV_ARG_DECL)
+RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin)
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -415,8 +367,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->proxy_ = admin->obtain_push_consumer ();
       }
 
     proxy =
@@ -427,40 +378,35 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
   int r = ACE_OS::rand () % 2;
   if (r == 0)
     {
-      me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      me = this->_this ();
     }
-  proxy->connect_push_supplier (me.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->connect_push_supplier (me.in ());
 }
 
 void
-RND_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RND_Supplier::disconnect (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->disconnect_push_consumer ();
   this->proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-RND_Supplier::push_new_event (ACE_ENV_SINGLE_ARG_DECL)
+RND_Supplier::push_new_event (void)
 {
   CORBA::Any event;
   CORBA::Long recursion = 0;
   event <<= recursion;
 
-  this->push (event ACE_ENV_ARG_PARAMETER);
+  this->push (event);
 }
 
 void
-RND_Supplier::push (CORBA::Any &event
-                    ACE_ENV_ARG_DECL)
+RND_Supplier::push (CORBA::Any &event)
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -473,11 +419,11 @@ RND_Supplier::push (CORBA::Any &event
       CosEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
 
-  proxy->push (event ACE_ENV_ARG_PARAMETER);
+  proxy->push (event);
 }
 
 void
-RND_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Supplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -490,19 +436,16 @@ RND_Supplier::svc (void)
   int niterations = 5000;
   for (int i = 0; i != niterations; ++i)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           ACE_Time_Value tv (0, 10000);
           ACE_OS::sleep (tv);
 
-          this->push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->push_new_event ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
         }
-      ACE_ENDTRY;
       if (i * 100 / niterations >= percent)
         {
           ACE_DEBUG ((LM_DEBUG, "Thread %t %d%%\n", percent));
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index 0b26ea73695..20dd4130a11 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -44,15 +44,13 @@ public:
   RND_Consumer (RND_Driver *driver);
   // Constructor
 
-  void push (const CORBA::Any &event
-             ACE_ENV_ARG_DECL)
+  void push (const CORBA::Any &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin);
+  void disconnect (void);
 
 protected:
   RND_Driver *driver_;
@@ -78,8 +76,7 @@ class RND_Timer : public RND_Consumer
 public:
   RND_Timer (RND_Driver *driver);
 
-  void push (const CORBA::Any &event
-             ACE_ENV_ARG_DECL)
+  void push (const CORBA::Any &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -104,16 +101,14 @@ public:
   RND_Supplier (void);
   // Constructor
 
-  void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin);
+  void disconnect (void);
 
-  void push_new_event (ACE_ENV_SINGLE_ARG_DECL);
-  void push (CORBA::Any &event
-             ACE_ENV_ARG_DECL);
+  void push_new_event (void);
+  void push (CORBA::Any &event);
   // Push a single event...
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual int svc (void);
@@ -142,12 +137,10 @@ public:
   int run (int argc, char *argv[]);
   // Run the test
 
-  void timer (const CORBA::Any &e
-              ACE_ENV_ARG_DECL);
+  void timer (const CORBA::Any &e);
   // The main timer has expired
 
-  void event (const CORBA::Any &e
-              ACE_ENV_ARG_DECL);
+  void event (const CORBA::Any &e);
   // One of the consumers has received an event
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index 85ec4180e9f..dbd64fada44 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -10,101 +10,80 @@ ACE_RCSID( CEC_Tests_Basic,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int with_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int with_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 static void
 run_test (PortableServer::POA_ptr poa,
-          int with_callbacks
-          ACE_ENV_ARG_DECL)
+          int with_callbacks)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa,
                                               poa);
   attributes.disconnect_callbacks = with_callbacks;
 
   TAO_CEC_EventChannel ec_impl (attributes);
-  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec_impl.activate ();
 
   CosEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_impl._this ();
 
   // ****************************************************************
 
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_consumers ();
 
   // Obtain the supplier admin..
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_suppliers ();
 
   // ****************************************************************
 
@@ -128,19 +107,16 @@ run_test (PortableServer::POA_ptr poa,
 
   for (i = 0; i != n; ++i)
     {
-      consumer[i]->connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer[i]->connect (consumer_admin.in ());
 
-      supplier[i]->connect (supplier_admin.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier[i]->connect (supplier_admin.in ());
     }
 
   // ****************************************************************
 
   // Destroy the event channel, *before* disconnecting the
   // clients.
-  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  event_channel->destroy ();
 
   // ****************************************************************
 
@@ -165,17 +141,14 @@ run_test (PortableServer::POA_ptr poa,
 
   for (i = 0; i != n; ++i)
     {
-      deactivate_servant (supplier[i] ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      deactivate_servant (supplier[i]);
       delete supplier[i];
 
-      deactivate_servant (consumer[i] ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      deactivate_servant (consumer[i]);
       delete consumer[i];
     }
   delete[] supplier;
   delete[] consumer;
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&ec_impl);
 }
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
index d143251cf90..3756ba12c54 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
@@ -33,8 +33,9 @@ TestEventConsumer_i::ORB_task::svc ()
     }
   catch (CORBA::SystemException &e)
     {
-      ACE_PRINT_EXCEPTION (e, ACE_TEXT ("TestEventConsumer_i ORB_task: "
-                                        "Caught CORBA::Exception:"));
+      e._tao_print_exception (
+        ACE_TEXT (
+          "TestEventConsumer_i ORB_task: ""Caught CORBA::Exception:"));
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
index 9b0b4e8f62d..5e207d98720 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
@@ -169,8 +169,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     }
   catch (CORBA::Exception &ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           ACE_TEXT ("TimeoutTest: Caught CORBA::Exception:"));
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "TimeoutTest: Caught CORBA::Exception:"));
     }
 
   return 1;
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index a00607b040b..3a60fabd759 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -13,44 +13,35 @@ CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   ACE_ENV_ARG_DECL)
+CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PushConsumer_var consumer =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        consumer_admin->obtain_push_supplier ();
     }
 
-  this->supplier_proxy_->connect_push_consumer (consumer.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->connect_push_consumer (consumer.in ());
 }
 
 void
-CEC_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Consumer::disconnect (void)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_proxy_->disconnect_push_supplier ();
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_poa->servant_to_id (this);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -77,8 +68,7 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Counting_Consumer::push (const CORBA::Any&
-                             ACE_ENV_ARG_DECL_NOT_USED)
+CEC_Counting_Consumer::push (const CORBA::Any&)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count ++;
@@ -94,7 +84,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&
 }
 
 void
-CEC_Counting_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Counting_Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -112,63 +102,53 @@ CEC_Pull_Counting_Consumer::CEC_Pull_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                                     ACE_ENV_ARG_DECL)
+CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PullConsumer_var consumer =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        consumer_admin->obtain_pull_supplier ();
     }
 
-  this->supplier_proxy_->connect_pull_consumer (consumer.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->connect_pull_consumer (consumer.in ());
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Consumer::disconnect (void)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_proxy_->disconnect_pull_supplier ();
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_poa->servant_to_id (this);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPullSupplier::_nil ();
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::pull (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Consumer::pull (void)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       return 0;
     }
   this->event_count++;
-  return this->supplier_proxy_->pull (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_proxy_->pull ();
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
-                                      ACE_ENV_ARG_DECL)
+CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -177,8 +157,7 @@ CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
     }
 
   CORBA::Any_var event =
-    this->supplier_proxy_->try_pull (has_event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->supplier_proxy_->try_pull (has_event);
 
   if (has_event)
     this->event_count++;
@@ -207,7 +186,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Pull_Counting_Consumer::disconnect_pull_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -230,16 +209,14 @@ CEC_Counting_Consumer_Task::
 int
 CEC_Counting_Consumer_Task::svc ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -257,7 +234,7 @@ CEC_Counting_Consumer_Task::pull_count (void)
 }
 
 void
-CEC_Counting_Consumer_Task::run (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Consumer_Task::run (void)
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
@@ -266,9 +243,7 @@ CEC_Counting_Consumer_Task::run (ACE_ENV_SINGLE_ARG_DECL)
   do {
     CORBA::Boolean has_event;
     CORBA::Any_var event =
-      this->consumer_->try_pull (has_event
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->consumer_->try_pull (has_event);
 
     if (this->milliseconds_ != 0)
       {
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index d3ec2cbbb33..7b30ad07f53 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -39,9 +39,8 @@ public:
   CEC_Counting_Consumer (const char* name);
   // Constructor
 
-  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
+  void disconnect (void);
   // Simple connect/disconnect methods..
 
   void dump_results (int expected_count, int tolerance);
@@ -50,10 +49,9 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const CORBA::Any& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -85,21 +83,19 @@ public:
   CEC_Pull_Counting_Consumer (const char* name);
   // Constructor
 
-  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
+  void disconnect (void);
   // Simple connect/disconnect methods..
 
   void dump_results (int expected_count, int tolerance);
   // Print out an error message if the event count is too far from the
   // expected count.
 
-  CORBA::Any *pull (ACE_ENV_SINGLE_ARG_DECL);
-  CORBA::Any *try_pull (CORBA::Boolean_out has_event
-                        ACE_ENV_ARG_DECL);
+  CORBA::Any *pull (void);
+  CORBA::Any *try_pull (CORBA::Boolean_out has_event);
 
   // = The CosEventComm::PullConsumer methods
-  virtual void disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_pull_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -132,7 +128,7 @@ public:
   void stop (void);
   CORBA::ULong pull_count (void);
 
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
   // Run a single iteration of the test
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index b1f8e946266..dce9ffb7e2e 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -13,50 +13,40 @@ CEC_Counting_Supplier::CEC_Counting_Supplier (void)
 
 void
 CEC_Counting_Supplier::connect (
-    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosEventComm::PushSupplier_var supplier =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
       this->consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        supplier_admin->obtain_push_consumer ();
     }
 
-  this->consumer_proxy_->connect_push_supplier (supplier.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->connect_push_supplier (supplier.in ());
 }
 
 void
-CEC_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Supplier::disconnect (void)
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumer_proxy_->disconnect_push_consumer ();
     }
 
   PortableServer::POA_var supplier_poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_poa->servant_to_id (this);
+  supplier_poa->deactivate_object (supplier_id.in ());
 
   this->consumer_proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-CEC_Counting_Supplier::push (const CORBA::Any&
-                ACE_ENV_ARG_DECL)
+CEC_Counting_Supplier::push (const CORBA::Any&)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -65,13 +55,12 @@ CEC_Counting_Supplier::push (const CORBA::Any&
   CORBA::Any event;
   event <<= CORBA::Long(0);
 
-  this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->push (event);
   this->event_count++;
 }
 
 void
-CEC_Counting_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Counting_Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -94,16 +83,14 @@ CEC_Counting_Supplier_Task::
 int
 CEC_Counting_Supplier_Task::svc ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -121,15 +108,14 @@ CEC_Counting_Supplier_Task::push_count (void)
 }
 
 void
-CEC_Counting_Supplier_Task::run (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Supplier_Task::run (void)
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
 
   int stop = 0;
   do {
-    this->supplier_->push (event ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->supplier_->push (event);
 
     if (this->milliseconds_ != 0)
       {
@@ -160,49 +146,40 @@ CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void)
 
 void
 CEC_Pull_Counting_Supplier::connect (
-    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-    ACE_ENV_ARG_DECL)
+    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   CosEventComm::PullSupplier_var supplier =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
       this->consumer_proxy_ =
-        supplier_admin->obtain_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        supplier_admin->obtain_pull_consumer ();
     }
 
-  this->consumer_proxy_->connect_pull_supplier (supplier.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->connect_pull_supplier (supplier.in ());
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Supplier::disconnect (void)
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->consumer_proxy_->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumer_proxy_->disconnect_pull_consumer ();
     }
 
   PortableServer::POA_var supplier_poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_poa->servant_to_id (this);
+  supplier_poa->deactivate_object (supplier_id.in ());
 
   this->consumer_proxy_ =
     CosEventChannelAdmin::ProxyPullConsumer::_nil ();
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Supplier::pull (ACE_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Supplier::pull (void)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -222,8 +199,7 @@ CEC_Pull_Counting_Supplier::pull (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event
-                                      ACE_ENV_ARG_DECL)
+CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -248,7 +224,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Pull_Counting_Supplier::disconnect_pull_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 5f557db27ee..b8505bdb9c8 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -41,17 +41,15 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
+  void disconnect (void);
   // Simple connect/disconnect methods..
 
-  void push (const CORBA::Any& events
-             ACE_ENV_ARG_DECL)
+  void push (const CORBA::Any& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Push an event.
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -79,7 +77,7 @@ public:
   void stop (void);
   CORBA::ULong push_count (void);
 
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
   // Run a single iteration of the test
 
 private:
@@ -115,18 +113,16 @@ public:
 
   // = The CosEventComm::PullSupplier methods
 
-  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
+  void disconnect (void);
   // Simple connect/disconnect methods..
 
   // The PullSupplier methods.
-  CORBA::Any* pull (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Any* pull (void)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  CORBA::Any* try_pull (CORBA::Boolean_out has_event
-                        ACE_ENV_ARG_DECL)
+  CORBA::Any* try_pull (CORBA::Boolean_out has_event)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual void disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_pull_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 7203f01d09c..93e22a5ab75 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -46,16 +46,13 @@ Driver::Driver (void)
 int
 Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,12 +60,10 @@ Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -123,9 +118,7 @@ Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -133,62 +126,51 @@ Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      this->connect_consumers (channel.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_consumers (channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->disconnect_consumers ();
 
-      channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      channel->destroy ();
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX in Consumer");
+      sys_ex._tao_print_exception ("SYS_EX in Consumer");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX in Consumer");
+      ex._tao_print_exception ("NON SYS EX in Consumer");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
 Driver::push_consumer (void* /* consumer_cookie */,
                        ACE_hrtime_t /* arrival */,
-                       const RtecEventComm::EventSet& events
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       const RtecEventComm::EventSet& events)
 {
   // int ID =
   //   (reinterpret_cast<Test_Consumer**> (consumer_cookie)
@@ -280,8 +262,7 @@ Driver::push_consumer (void* /* consumer_cookie */,
 }
 
 void
-Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel
-                           ACE_ENV_ARG_DECL)
+Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
@@ -293,19 +274,16 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel
 
       this->consumers_[i]->connect (this->event_a_,
                                     this->event_b_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    channel);
     }
 }
 
 void
-Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+Driver::disconnect_consumers (void)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumers_[i]->disconnect ();
     }
 }
 
@@ -388,8 +366,7 @@ Test_Consumer::Test_Consumer (Driver *driver, void *cookie)
 void
 Test_Consumer::connect (int event_a,
                         int event_b,
-                        RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -399,25 +376,20 @@ Test_Consumer::connect (int event_a,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_consumers ();
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  RtecEventComm::PushConsumer_var objref = this->_this ();
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos.get_ConsumerQOS ());
 
 }
 
 void
-Test_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Test_Consumer::disconnect (void)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -425,20 +397,19 @@ Test_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
     this->supplier_proxy_._retn ();
 
-  proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  proxy->disconnect_push_supplier ();
 }
 
 void
-Test_Consumer::push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+Test_Consumer::push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->driver_->push_consumer (this->cookie_, arrival, events ACE_ENV_ARG_PARAMETER);
+  this->driver_->push_consumer (this->cookie_, arrival, events);
 }
 
 void
-Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Consumer::disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 1d0adde39fd..3aea5b9c7d3 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -35,17 +35,15 @@ public:
 
   void connect (int event_a,
                 int event_b,
-                RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+                RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the EC.
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -81,8 +79,7 @@ public:
 
   void push_consumer (void* consumer_cookie,
                       ACE_hrtime_t arrival,
-                      const RtecEventComm::EventSet& events
-                      ACE_ENV_ARG_DECL_NOT_USED);
+                      const RtecEventComm::EventSet& events);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
@@ -90,9 +87,8 @@ private:
   int parse_args (int argc, char* argv[]);
   // parse the command line args
 
-  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
-  void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
+  void disconnect_consumers (void);
   // Connect and disconnect the consumers.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index f8dd801aa63..24b73a7dca1 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -34,28 +34,23 @@ ECMS_Driver::ECMS_Driver (void)
 int
 ECMS_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -114,43 +109,35 @@ ECMS_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the Naming Service.\n"),
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      this->connect_suppliers (channel.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_suppliers (channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->activate_suppliers ();
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
@@ -163,20 +150,18 @@ ECMS_Driver::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "suppliers finished\n"));
 
-      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->disconnect_suppliers ();
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX in Supplier");
+      sys_ex._tao_print_exception ("SYS_EX in Supplier");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX in Supplier");
+      ex._tao_print_exception ("NON SYS EX in Supplier");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -184,8 +169,7 @@ int
 ECMS_Driver::supplier_task (Test_Supplier *supplier,
                             void* /* cookie */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Time_Value tv (0, this->event_period_);
 
@@ -269,29 +253,26 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
             }
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-          supplier->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          supplier->consumer_proxy ()->push(event);
 
           // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
 
           ACE_OS::sleep (tv);
         }
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel
-                                ACE_ENV_ARG_DECL)
+ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -303,14 +284,12 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel
       this->suppliers_[i]->connect (buf,
                                     this->event_a_,
                                     this->event_b_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    channel);
     }
 }
 
 void
-ECMS_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECMS_Driver::activate_suppliers (void)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -319,12 +298,11 @@ ECMS_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-ECMS_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ECMS_Driver::disconnect_suppliers (void)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->suppliers_[i]->disconnect ();
     }
 }
 
@@ -427,8 +405,7 @@ void
 Test_Supplier::connect (const char* name,
                         int event_a,
                         int event_b,
-                        RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG,
@@ -448,25 +425,20 @@ Test_Supplier::connect (const char* name,
               0, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_suppliers ();
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
 
   RtecEventComm::PushSupplier_var objref =
-    this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->supplier_._this ();
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos.get_SupplierQOS ());
 }
 
 void
-Test_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Test_Supplier::disconnect (void)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -474,26 +446,24 @@ Test_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
     this->consumer_proxy_._retn ();
 
-  ACE_TRY
+  try
     {
-      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy->disconnect_push_consumer ();
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
       // Ignore, the EC can shutdown before we get a chance to
       // disconnect
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT&)
     {
       // Ignore, the EC can shutdown before we get a chance to
       // disconnect
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -503,7 +473,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Supplier::disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 10b3adb9270..eff3dc62727 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -39,14 +39,13 @@ public:
   void connect (const char* name,
                 int event_a,
                 int event_b,
-                RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+                RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The methods in the skeleton.
 
@@ -99,8 +98,7 @@ public:
 
   void push_supplier (void* supplier_cookie,
                       RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                      const RtecEventComm::EventSet &events
-                      ACE_ENV_ARG_DECL_NOT_USED);
+                      const RtecEventComm::EventSet &events);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
@@ -110,12 +108,11 @@ private:
   int parse_args (int argc, char* argv[]);
   // parse the command line args
 
-  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
-  void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
+  void disconnect_suppliers (void);
   // Connect the suppliers.
 
-  void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void activate_suppliers (void);
   // Activate the suppliers, i.e. they start generating events.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
index 50ea5a9002b..a7f4dc64cef 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
@@ -14,8 +14,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
-                      RtecUDPAdmin::UDP_Addr_out addr
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      RtecUDPAdmin::UDP_Addr_out addr)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
index 232f63a5071..7fcc819f905 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
@@ -27,8 +27,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 2ec6c650a2c..40df46d3aec 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -15,16 +15,13 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   ACE_ENV_ARG_DECL)
+Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   this->proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
   RtecEventComm::PushConsumer_var me =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Simple subscription, but usually the helper classes in
   // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -42,43 +39,35 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
   h1.type   = ACE_ES_EVENT_UNDEFINED;  // first free event type
   h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-  this->proxy_->connect_push_consumer (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_push_consumer (me.in (), qos);
 }
 
 void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
 {
-  ACE_TRY
+  try
     {
       // Disconnect from the proxy
-      this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->proxy_->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions
     }
-  ACE_ENDTRY;
   this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   // Deactivate this object
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   // Get the Object Id used for the servant..
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
   // Deactivate the object
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -98,7 +87,7 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index 1e1d9fdaa17..b09bde069d3 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -24,19 +24,17 @@ public:
   Consumer (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect to the Event Channel
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 5441a632e0e..306419936da 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -31,15 +31,13 @@ static const int data_items = 60000;
 void *
 run_orb_within_thread (void *)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   while (! terminate_threads)
     {
-      ACE_TRY
+      try
         {
           CORBA::Boolean there_is_work =
-            orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending ();
           if (there_is_work)
             {
               // We use a TAO extension. The CORBA mechanism does not
@@ -47,19 +45,15 @@ run_orb_within_thread (void *)
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work (tv);
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "perform work");
+          ex._tao_print_exception ("perform work");
 
           return 0;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
     }
 
   return 0;
@@ -77,14 +71,12 @@ main (int argc, char* argv[])
   // so we have to explicitly invoke this function.
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // **************** HERE IS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb = CORBA::ORB_init (argc, argv, "");
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
@@ -101,16 +93,12 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // **************** THAT COMPLETES THE ORB SETUP
 
@@ -132,15 +120,13 @@ main (int argc, char* argv[])
       // that may involve creating some threads.
       // But it should always be invoked because several internal data
       // structures are initialized at that point.
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       // The event channel is activated as any other CORBA servant.
       // In this case we use the simple implicit activation with the
       // RootPOA
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
 
@@ -176,8 +162,7 @@ main (int argc, char* argv[])
       // Now we create and activate the servant
       AddrServer as_impl (addr);
       RtecUDPAdmin::AddrServer_var address_server =
-        as_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        as_impl._this ();
 
       // We need a local socket to send the data, open it and check
       // that everything is OK:
@@ -198,9 +183,7 @@ main (int argc, char* argv[])
 
       sender->init (event_channel.in (),
                     address_server.in (),
-                    endpoint
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    endpoint);
 
       // Now we connect the sender as a consumer of events, it will
       // receive any event from any source and send it to the "right"
@@ -214,8 +197,7 @@ main (int argc, char* argv[])
       sub.dependencies[0].event.header.source =
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-      sender->connect (sub ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->connect (sub);
 
       // To receive events we need to setup an event handler:
       TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver;
@@ -233,18 +215,14 @@ main (int argc, char* argv[])
       // required by all the local consumer.
       // Then it register for the multicast groups that carry those
       // events:
-      mcast_eh.open (event_channel.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mcast_eh.open (event_channel.in ());
 
       // Again the receiver connects to the event channel as a
       // supplier of events, using the Observer features to detect
       // local consumers and their interests:
       receiver->init (event_channel.in (),
                       endpoint,
-                      address_server.in ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      address_server.in ());
 
       // The Receiver is also a supplier of events.  The exact type of
       // events is only known to the application, because it depends
@@ -263,8 +241,7 @@ main (int argc, char* argv[])
       pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY;
       pub.is_gateway = 1;
 
-      receiver->connect (pub ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      receiver->connect (pub);
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
 
@@ -275,21 +252,15 @@ main (int argc, char* argv[])
       Consumer consumer1;
       Consumer consumer2;
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer1.connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer2.connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
+      consumer1.connect (consumer_admin.in ());
+      consumer2.connect (consumer_admin.in ());
 
       // And now create a supplier
       Supplier supplier;
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier.connect (supplier_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
+      supplier.connect (supplier_admin.in ());
 
       // **************** THAT COMPLETES THE CLIENT SETUP
 
@@ -307,8 +278,7 @@ main (int argc, char* argv[])
 
       for (int i = 0; i < data_items; i++)
         {
-          supplier.perform_push (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          supplier.perform_push ();
         }
 
       ACE_OS::sleep (2); // simple solution ensures ready receivers
@@ -323,16 +293,12 @@ main (int argc, char* argv[])
       // **************** HERE IS THE CLEANUP CODE
 
       // First the easy ones
-      supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer2.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier.disconnect ();
+      consumer1.disconnect ();
+      consumer2.disconnect ();
 
       // Now let us disconnect the Receiver
-      receiver->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      receiver->shutdown ();
 
       int r = mcast_eh.shutdown ();
 
@@ -343,14 +309,12 @@ main (int argc, char* argv[])
         }
 
       // And also disconnect the sender of events
-      sender->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->shutdown ();
 
       // The event channel must be destroyed, so it can release its
       // resources, and inform all the clients that are still
       // connected that it is going away.
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // Deactivating the event channel implementation is not strictly
       // required, the POA will do it for us, but it is good manners:
@@ -361,37 +325,31 @@ main (int argc, char* argv[])
         // is the root POA, but the code is more robust if we don't
         // rely on that.
         PortableServer::POA_var poa =
-          ec_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          ec_impl._default_POA ();
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          poa->servant_to_id (&ec_impl);
         // Deactivate the object
-        poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        poa->deactivate_object (oid.in ());
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // Finally destroy the ORB
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // **************** THAT COMPLETES THE CLEANUP CODE
 
       ACE_DEBUG ((LM_DEBUG,
                   "MCast example finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index 0060bd58ed5..c07e5d2a770 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -14,16 +14,13 @@ Supplier::Supplier (void)
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                   ACE_ENV_ARG_DECL)
+Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   this->proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
 
   RtecEventComm::PushSupplier_var me =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Simple publication, but usually the helper classes in
   // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -36,39 +33,32 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
   h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
   h0.source = 1;                      // first free event source
 
-  this->proxy_->connect_push_supplier (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_push_supplier (me.in (), qos);
 }
 
 void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
 {
   // Disconnect from the EC
-  ACE_TRY
+  try
     {
-      this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->proxy_->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
 }
 
 void
-Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::perform_push (void)
 {
-  ACE_TRY
+  try
     {
       // The event type and source must match our publications
       RtecEventComm::EventSet event (1);
@@ -78,17 +68,15 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
       // Avoid loops throught the event channel federations
       event[0].header.ttl    = 1;
 
-      this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->proxy_->push (event);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index 8f9f50f2a87..432359e4202 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -25,19 +25,18 @@ public:
   Supplier (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect to the event channel
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the event channel
 
-  void perform_push (ACE_ENV_SINGLE_ARG_DECL);
+  void perform_push (void);
   // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index ceb4108095b..94604b1bb1f 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -40,17 +40,13 @@ ECM_Driver::ECM_Driver (void)
 int
 ECM_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,12 +54,10 @@ ECM_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -136,44 +130,32 @@ ECM_Driver::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       CORBA::String_var str =
-        this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n"));
 
-      this->open_federations (ec.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->open_federations (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n"));
 
-      this->open_senders (ec.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->open_senders (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n"));
 
-      this->open_receivers (ec.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->open_receivers (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n"));
 
-      this->activate_federations (ec.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->activate_federations (ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n"));
 
@@ -183,35 +165,29 @@ ECM_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->close_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->close_senders (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->close_receivers ();
+      this->close_senders ();
 
-      this->close_federations (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->close_federations ();
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n"));
 
-      ec_impl.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.shutdown ();
 
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation)
 {
   ACE_DEBUG ((LM_DEBUG, "Federation <%s> shuting down\n",
               federation->name ()));
@@ -220,20 +196,17 @@ ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation
 }
 
 void
-ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                              ACE_ENV_ARG_DECL)
+ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open (this->event_count_,
-                                         ec ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                         ec);
     }
 }
 
 void
-ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                                  ACE_ENV_ARG_DECL)
+ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->federations_running_ = this->local_federations_count_;
   RtecEventComm::Time interval = this->event_period_;
@@ -241,30 +214,26 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->activate (ec,
-                                             interval
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                             interval);
     }
 }
 
 void
-ECM_Driver::close_federations (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Driver::close_federations (void)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->local_federations_[i]->close ();
     }
 }
 
 void
-ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
-                          ACE_ENV_ARG_DECL)
+ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   if (this->endpoint_.dgram ().open (ACE_Addr::sap_any) == -1)
     {
       // @@ TODO throw an application specific exception.
-      ACE_THROW (CORBA::COMM_FAILURE ());
+      throw CORBA::COMM_FAILURE ();
     }
 
   ACE_INET_Addr ignore_from;
@@ -281,26 +250,22 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
                TAO_ECG_UDP_Out_Endpoint (this->endpoint_));
 
       this->all_federations_[i]->open (clone,
-                                       ec
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                       ec);
     }
 }
 
 void
-ECM_Driver::close_senders (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Driver::close_senders (void)
 {
   for (int i = 0; i < this->all_federations_count_; ++i)
     {
-      this->all_federations_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->all_federations_[i]->close ();
     }
   this->endpoint_.dgram ().close ();
 }
 
 void
-ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
@@ -311,19 +276,16 @@ ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
       endpoint.reset (clone);
 
       this->local_federations_[i]->open_receiver (ec,
-                                                  endpoint
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                  endpoint);
     }
 }
 
 void
-ECM_Driver::close_receivers (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Driver::close_receivers (void)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->close_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->local_federations_[i]->close_receiver ();
     }
 }
 
@@ -605,20 +567,16 @@ ECM_Federation::~ECM_Federation (void)
 
 void
 ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
-                      RtecEventChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+                      RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
-    this->addr_server (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->addr_server ();
 
   TAO_ECG_Refcounted_Endpoint ref_endpoint (endpoint);
 
   this->sender_->init (ec,
                        addr_server.in (),
-                       ref_endpoint
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                       ref_endpoint);
 
   // @@ TODO Make this a parameter....
   this->sender_->mtu (64);
@@ -636,21 +594,19 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
       qos.insert_type (this->consumer_ipaddr (i), 0);
     }
   RtecEventChannelAdmin::ConsumerQOS qos_copy = qos.get_ConsumerQOS ();
-  this->sender_->connect (qos_copy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->sender_->connect (qos_copy);
 }
 
 void
-ECM_Federation::close (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Federation::close (void)
 {
-  this->sender_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->sender_->shutdown ();
 }
 
 RtecUDPAdmin::AddrServer_ptr
-ECM_Federation::addr_server (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Federation::addr_server (void)
 {
-  return this->addr_server_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->addr_server_._this ();
 }
 
 // ****************************************************************
@@ -663,8 +619,7 @@ ECM_Supplier::ECM_Supplier (ECM_Local_Federation* federation)
 
 void
 ECM_Supplier::open (const char* name,
-                    RtecEventChannelAdmin::EventChannel_ptr ec
-                    ACE_ENV_ARG_DECL)
+                    RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -682,38 +637,31 @@ ECM_Supplier::open (const char* name,
               0, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_suppliers ();
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
 
-  RtecEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  RtecEventComm::PushSupplier_var objref = this->_this ();
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos.get_SupplierQOS ());
 }
 
 void
-ECM_Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Supplier::close (void)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer ();
 
   this->consumer_proxy_ = 0;
 }
 
 void
 ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
-                        RtecEventComm::Time interval
-                        ACE_ENV_ARG_DECL)
+                        RtecEventComm::Time interval)
 {
   ACE_ConsumerQOS_Factory consumer_qos;
   consumer_qos.start_disjunction_group ();
@@ -723,21 +671,16 @@ ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_consumers ();
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
   RtecEventComm::PushConsumer_var cref =
-    this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_._this ();
 
   this->supplier_proxy_->connect_push_consumer (cref.in (),
-                                                consumer_qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                consumer_qos.get_ConsumerQOS ());
 }
 
 int
@@ -747,8 +690,7 @@ ECM_Supplier::supplier_id (void) const
 }
 
 void
-ECM_Supplier::push (const RtecEventComm::EventSet& events
-                    ACE_ENV_ARG_DECL)
+ECM_Supplier::push (const RtecEventComm::EventSet& events)
 {
   for (u_int i = 0; i < events.length (); ++i)
     {
@@ -756,21 +698,19 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events
       if (e.header.type != ACE_ES_EVENT_INTERVAL_TIMEOUT)
         continue;
 
-      this->federation_->supplier_timeout (this->consumer_proxy_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->federation_->supplier_timeout (this->consumer_proxy_.in ());
     }
 }
 
 void
-ECM_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECM_Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // this->supplier_proxy_->disconnect_push_supplier ();
 }
 
 void
-ECM_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECM_Supplier::disconnect_push_consumer (void)
 {
 }
 
@@ -786,8 +726,7 @@ ECM_Consumer::ECM_Consumer (ECM_Local_Federation *federation)
 void
 ECM_Consumer::open (const char*,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    ACE_RANDR_TYPE &seed
-                    ACE_ENV_ARG_DECL)
+                    ACE_RANDR_TYPE &seed)
 {
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -796,22 +735,19 @@ ECM_Consumer::open (const char*,
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
 
   // = Connect as a consumer.
-  this->consumer_admin_ = ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_ = ec->for_consumers ();
 
-  this->connect (seed ACE_ENV_ARG_PARAMETER);
+  this->connect (seed);
 }
 
 void
-ECM_Consumer::connect (ACE_RANDR_TYPE &seed
-                       ACE_ENV_ARG_DECL)
+ECM_Consumer::connect (ACE_RANDR_TYPE &seed)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_admin_->obtain_push_supplier ();
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -837,17 +773,14 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed
       qos.insert_type (federation->consumer_ipaddr (i), 0);
     }
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  RtecEventComm::PushConsumer_var objref = this->_this ();
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos.get_ConsumerQOS ());
 }
 
 void
-ECM_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Consumer::disconnect (void)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -856,40 +789,36 @@ ECM_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 
   RtecEventChannelAdmin::ProxyPushSupplier_var tmp =
     this->supplier_proxy_._retn ();
-  tmp->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  tmp->disconnect_push_supplier ();
 }
 
 void
-ECM_Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Consumer::close (void)
 {
-  ACE_TRY
+  try
     {
-      this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->disconnect ();
       this->consumer_admin_ =
         RtecEventChannelAdmin::ConsumerAdmin::_nil ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       this->consumer_admin_ =
         RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-ECM_Consumer::push (const RtecEventComm::EventSet& events
-                    ACE_ENV_ARG_DECL)
+ECM_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->federation_->consumer_push (arrival, events ACE_ENV_ARG_PARAMETER);
+  this->federation_->consumer_push (arrival, events);
 }
 
 void
-ECM_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECM_Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -930,8 +859,7 @@ ECM_Local_Federation::~ECM_Local_Federation (void)
 
 void
 ECM_Local_Federation::open (int event_count,
-                            RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+                            RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->event_count_ = event_count;
 
@@ -940,38 +868,32 @@ ECM_Local_Federation::open (int event_count,
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/supplier");
 
-  this->supplier_.open (buf, ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_.open (buf, ec);
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, this->seed_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_.open (buf, ec, this->seed_);
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
 }
 
 void
-ECM_Local_Federation::close (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Local_Federation::close (void)
 {
-  this->consumer_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_.close ();
 
-  this->supplier_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_.close ();
 }
 
 void
 ECM_Local_Federation::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                RtecEventComm::Time interval
-                                ACE_ENV_ARG_DECL)
+                                RtecEventComm::Time interval)
 {
-  this->supplier_.activate (ec, interval ACE_ENV_ARG_PARAMETER);
+  this->supplier_.activate (ec, interval);
 }
 
 void
-ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
-                                        ACE_ENV_ARG_DECL)
+ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer)
 {
   RtecEventComm::EventSet sent (1);
   sent.length (1);
@@ -990,15 +912,13 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
 
   if (this->event_count_ < 0)
     {
-      this->driver_->federation_has_shutdown (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->driver_->federation_has_shutdown (this);
       return;
     }
   int i = this->event_count_ % this->federation_->supplier_types ();
   s.header.type = this->federation_->supplier_ipaddr (i);
 
-  consumer->push (sent ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->push (sent);
 
   this->send_count_++;
 
@@ -1014,18 +934,15 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
       ACE_DEBUG ((LM_DEBUG,
                   "Reconfiguring federation %s: %f %f [%d]\n",
                   this->name (), p, maxp, x));
-      this->consumer_.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      this->consumer_.connect (this->seed_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumer_.disconnect ();
+      this->consumer_.connect (this->seed_);
       this->last_subscription_change_ = ACE_OS::gettimeofday ();
     }
 }
 
 void
 ECM_Local_Federation::consumer_push (ACE_hrtime_t,
-                                     const RtecEventComm::EventSet &event
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     const RtecEventComm::EventSet &event)
 {
   if (event.length () == 0)
     {
@@ -1056,20 +973,16 @@ ECM_Local_Federation::consumer_push (ACE_hrtime_t,
 
 void
 ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                     TAO_ECG_Refcounted_Endpoint ignore_from
-                                     ACE_ENV_ARG_DECL)
+                                     TAO_ECG_Refcounted_Endpoint ignore_from)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
-    this->federation_->addr_server (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->federation_->addr_server ();
 
   ACE_Reactor* reactor = TAO_ORB_Core_instance ()->reactor ();
 
   this->receiver_->init (ec,
                          ignore_from,
-                         addr_server.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         addr_server.in ());
 
   const int bufsize = 512;
   char buf[bufsize];
@@ -1080,8 +993,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   this->mcast_eh_->reactor (reactor);
 
-  this->mcast_eh_->open (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->mcast_eh_->open (ec);
 
   ACE_SupplierQOS_Factory qos;
   for (int i = 0; i < this->consumer_types (); ++i)
@@ -1093,17 +1005,15 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   RtecEventChannelAdmin::SupplierQOS qos_copy =
     qos.get_SupplierQOS ();
-  this->receiver_->connect (qos_copy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->receiver_->connect (qos_copy);
 
 
 }
 
 void
-ECM_Local_Federation::close_receiver (ACE_ENV_SINGLE_ARG_DECL)
+ECM_Local_Federation::close_receiver (void)
 {
-  this->receiver_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->receiver_->shutdown ();
   this->mcast_eh_->shutdown ();
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 19d97e48b72..05c79b18523 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -116,17 +116,16 @@ public:
   // The ipaddr (in host byte order) of the event type <i>
 
   void open (TAO_ECG_UDP_Out_Endpoint *endoint,
-             RtecEventChannelAdmin::EventChannel_ptr ec
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect the UDP sender to the EC.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Close the UDP sender, disconnect from the EC
 
   int sender_local_addr (ACE_INET_Addr& addr);
   // Return the sender local address
 
-  RtecUDPAdmin::AddrServer_ptr addr_server (ACE_ENV_SINGLE_ARG_DECL);
+  RtecUDPAdmin::AddrServer_ptr addr_server (void);
   // This address server can be used to convert event headers
   // (type,source) to UDP addresses (ipaddr,port)
 
@@ -169,28 +168,25 @@ public:
   ECM_Supplier (ECM_Local_Federation* federation);
 
   void open (const char* name,
-             RtecEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr event_channel);
   // This method connects the supplier to the EC.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Disconnect from the EC.
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecEventComm::Time interval
-                 ACE_ENV_ARG_DECL);
+                 RtecEventComm::Time interval);
   // Connect as a consumer to start receiving events.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
   // The supplier ID.
 
-  void push (const RtecEventComm::EventSet& events
-             ACE_ENV_ARG_DECL);
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void push (const RtecEventComm::EventSet& events);
+  void disconnect_push_consumer (void);
   // Implement the callbacks for our consumer personality.
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -226,24 +222,21 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             ACE_RANDR_TYPE &seed
-             ACE_ENV_ARG_DECL);
+             ACE_RANDR_TYPE &seed);
   // This method connects the consumer to the EC.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Disconnect from the EC.
 
-  void connect (ACE_RANDR_TYPE& seed
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void connect (ACE_RANDR_TYPE& seed);
+  void disconnect (void);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   // = The POA_RtecEventComm::PushComsumer methods.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -271,36 +264,31 @@ public:
   // Destructor
 
   void open (int event_count,
-             RtecEventChannelAdmin::EventChannel_ptr event_channel
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr event_channel);
   // Connect both the supplier and the consumer.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Disconnect everybody from the EC
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecEventComm::Time interval
-                 ACE_ENV_ARG_DECL);
+                 RtecEventComm::Time interval);
   // Activate the supplier
 
-  void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
-                         ACE_ENV_ARG_DECL);
+  void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer);
   // The supplier is ready to send a new event.
 
   void consumer_push (ACE_hrtime_t arrival,
-                      const RtecEventComm::EventSet& event
-                      ACE_ENV_ARG_DECL);
+                      const RtecEventComm::EventSet& event);
   // The consumer just received an event.
 
   const ECM_Federation *federation (void) const;
   // The federation description.
 
   void open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
-                      TAO_ECG_Refcounted_Endpoint ignore_from
-                      ACE_ENV_ARG_DECL);
+                      TAO_ECG_Refcounted_Endpoint ignore_from);
   // Connect the UDP receiver to the EC.
 
-  void close_receiver (ACE_ENV_SINGLE_ARG_DECL);
+  void close_receiver (void);
   // Close the UDP receiver, disconnect from the EC
 
   void dump_results (void) const;
@@ -419,41 +407,36 @@ public:
   int run (int argc, char* argv[]);
   // Run the test, read all the configuration files, etc.
 
-  void federation_has_shutdown (ECM_Local_Federation *federation
-                                ACE_ENV_ARG_DECL);
+  void federation_has_shutdown (ECM_Local_Federation *federation);
   // One of the federations has completed its simulation, once all of
   // them finish the test exists.
 
 
 private:
-  void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                         ACE_ENV_ARG_DECL);
+  void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect the federations to the EC.
 
-  void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                             ACE_ENV_ARG_DECL);
+  void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Activate all the federations
 
-  void close_federations (ACE_ENV_SINGLE_ARG_DECL);
+  void close_federations (void);
   // Close the federations, i.e. disconnect from the EC, deactivate
   // the objects, etc.
 
-  void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
-                     ACE_ENV_ARG_DECL);
+  void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect all the senders, so we can start multicasting events.
 
-  void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL);
+  void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec);
   // Connect all the receivers, thus we accept events arriving through
   // multicast.
 
-  void close_senders (ACE_ENV_SINGLE_ARG_DECL);
+  void close_senders (void);
   // Close all the senders to cleanup resources.
 
-  void close_receivers (ACE_ENV_SINGLE_ARG_DECL);
+  void close_receivers (void);
   // Close all the receivers to cleanup resources.
 
-  int shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int shutdown (void);
   // Called when the main thread.
 
   int parse_args (int argc, char* argv[]);
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 2d064471253..cbc8de728be 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -127,17 +127,13 @@ print_priority_info (const char *const name)
 int
 Test_ECG::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -145,15 +141,12 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -254,8 +247,7 @@ Test_ECG::run (int argc, char* argv[])
       print_priority_info ("Test_ECG::run (Main after thr_setprio)");
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -263,8 +255,7 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       auto_ptr<POA_RtecScheduler::Scheduler> scheduler_impl;
       RtecScheduler::Scheduler_var scheduler;
@@ -285,8 +276,7 @@ Test_ECG::run (int argc, char* argv[])
           }
           if (scheduler_impl.get () == 0)
             return -1;
-          scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          scheduler = scheduler_impl->_this ();
           break;
 
         case Test_ECG::ss_runtime:
@@ -308,8 +298,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              scheduler = scheduler_impl->_this ();
             }
           else if (ACE_OS::strcmp (this->lcl_name_, "ECM2") == 0)
             {
@@ -329,8 +318,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              scheduler = scheduler_impl->_this ();
             }
           else if (ACE_OS::strcmp (this->lcl_name_, "ECM3") == 0)
             {
@@ -350,8 +338,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              scheduler = scheduler_impl->_this ();
             }
           else
             {
@@ -364,8 +351,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              scheduler = scheduler_impl->_this ();
             }
           break;
 
@@ -387,8 +373,7 @@ Test_ECG::run (int argc, char* argv[])
         case Test_ECG::ss_runtime:
           {
             CORBA::String_var str =
-              orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              orb->object_to_string (scheduler.in ());
             ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
                         str.in ()));
 
@@ -399,8 +384,7 @@ Test_ECG::run (int argc, char* argv[])
             CosNaming::Name schedule_name (1);
             schedule_name.length (1);
             schedule_name[0].id = CORBA::string_dup (buf);
-            naming_context->bind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            naming_context->bind (schedule_name, scheduler.in ());
 
             if (ACE_Scheduler_Factory::use_config (naming_context.in (),
                                                    buf) == -1)
@@ -417,12 +401,10 @@ Test_ECG::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (ec.in ());
 
       ACE_OS::sleep (5);
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
@@ -433,8 +415,7 @@ Test_ECG::run (int argc, char* argv[])
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup (buf);
-      naming_context->bind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_context->bind (channel_name, ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "waiting to start\n"));
 
@@ -442,32 +423,26 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          orb->run (&tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (&tv);
         }
 
       ACE_DEBUG ((LM_DEBUG, "starting....\n"));
 
       RtecEventChannelAdmin::EventChannel_var local_ec =
         this->get_ec (naming_context.in (),
-                      this->lcl_name_
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      this->lcl_name_);
 
       ACE_DEBUG ((LM_DEBUG, "located local EC\n"));
 
       for (int sd = 0; sd < this->supplier_disconnects_; ++sd)
         {
-          this->connect_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->connect_suppliers (local_ec.in ());
+          this->disconnect_suppliers ();
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Supplier disconnection %d\n", sd));
         }
 
-      this->connect_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_suppliers (local_ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier\n"));
 
@@ -475,14 +450,11 @@ Test_ECG::run (int argc, char* argv[])
       if (this->rmt_name_ != 0)
         {
           tv.set (5, 0);
-          orb->run (&tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (&tv);
 
           RtecEventChannelAdmin::EventChannel_var remote_ec =
             this->get_ec (naming_context.in (),
-                          this->rmt_name_
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                          this->rmt_name_);
           ACE_DEBUG ((LM_DEBUG, "located remote EC\n"));
 
           CosNaming::Name rsch_name (1);
@@ -495,49 +467,37 @@ Test_ECG::run (int argc, char* argv[])
             }
           rsch_name[0].id = CORBA::string_dup (buf);
           CORBA::Object_var tmpobj =
-            naming_context->resolve (rsch_name ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            naming_context->resolve (rsch_name);
 
           RtecScheduler::Scheduler_var remote_sch =
-            RtecScheduler::Scheduler::_narrow (tmpobj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RtecScheduler::Scheduler::_narrow (tmpobj.in ());
 
           this->connect_ecg (local_ec.in (),
                              remote_ec.in (),
-                             remote_sch.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             remote_sch.in ());
 
           ACE_DEBUG ((LM_DEBUG, "connected proxy\n"));
 
           tv.set (5, 0);
-          orb->run (&tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (&tv);
 
           RtecEventChannelAdmin::Observer_ptr observer =
-            this->ecg_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          observer_handle = ec_impl.append_observer (observer
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->ecg_._this ();
+          observer_handle = ec_impl.append_observer (observer);
         }
 
       for (int cd = 0; cd < this->consumer_disconnects_; ++cd)
         {
-          this->connect_consumers (local_ec.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->connect_consumers (local_ec.in ());
+          this->disconnect_consumers ();
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Consumer disconnection %d\n", cd));
         }
-      this->connect_consumers (local_ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_consumers (local_ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer\n"));
 
-      this->activate_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->activate_suppliers (local_ec.in ());
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
@@ -555,16 +515,14 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          ec_impl.remove_observer (observer_handle ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ec_impl.remove_observer (observer_handle);
         }
 
       // Create the EC internal threads
       ec_impl.activate ();
 
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       this->test_stop_ = ACE_OS::gethrtime ();
 
@@ -586,9 +544,7 @@ Test_ECG::run (int argc, char* argv[])
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              infos.out (), deps.out (),
-             configs.out (), anomalies.out ()
-             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+             configs.out (), anomalies.out ());
 
           ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                                 deps.in (),
@@ -597,43 +553,35 @@ Test_ECG::run (int argc, char* argv[])
                                                 this->schedule_file_);
         }
 
-      naming_context->unbind (channel_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_context->unbind (channel_name);
 
       if (this->rmt_name_ != 0)
         {
-          this->ecg_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          this->ecg_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->ecg_.close ();
+          this->ecg_.shutdown ();
         }
 
-      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->disconnect_consumers ();
+      this->disconnect_suppliers ();
 
       ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n"));
       tv.set (5, 0);
-      orb->run (&tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (&tv);
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 RtecEventChannelAdmin::EventChannel_ptr
 Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
-                  const char* process_name
-                  ACE_ENV_ARG_DECL)
+                  const char* process_name)
 {
   const int bufsize = 512;
   char buf[bufsize];
@@ -645,28 +593,24 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
   channel_name[0].id = CORBA::string_dup (buf);
 
   CORBA::Object_var ec_ptr =
-    naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (RtecEventChannelAdmin::EventChannel::_nil ());
+    naming_context->resolve (channel_name);
   if (CORBA::is_nil (ec_ptr.in ()))
     return RtecEventChannelAdmin::EventChannel::_nil ();
 
-  return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
+  return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in ());
 }
 
 void
-Test_ECG::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+Test_ECG::disconnect_suppliers (void)
 {
   for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
     {
-      this->suppliers_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->suppliers_[i]->close ();
     }
 }
 
 void
-Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                             ACE_ENV_ARG_DECL)
+Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec)
 {
   int i;
   for (i = 0; i < this->hp_suppliers_; ++i)
@@ -687,9 +631,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
                                  this->hps_event_b_,
                                  mc,
                                  this->hp_interval_ * 10,
-                                 local_ec
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 local_ec);
     }
 
   for (; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
@@ -711,27 +653,23 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
                                  this->lps_event_b_,
                                  mc,
                                  this->lp_interval_ * 10,
-                                 local_ec
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 local_ec);
     }
 }
 
 void
-Test_ECG::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+Test_ECG::disconnect_consumers (void)
 {
   for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i)
     {
-      this->consumers_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumers_[i]->close ();
     }
 }
 
 void
-Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                              ACE_ENV_ARG_DECL)
+Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec)
 {
-  ACE_TRY
+  try
     {
       int i;
       for (i = 0; i < this->hp_suppliers_; ++i)
@@ -746,9 +684,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
 
           this->suppliers_[i]->activate (buf,
                                          this->hp_interval_ * 10,
-                                         local_ec
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         local_ec);
         }
 
       for (; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
@@ -764,21 +700,17 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
 
           this->suppliers_[i]->activate (buf,
                                          this->lp_interval_ * 10,
-                                         local_ec
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         local_ec);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                             ACE_ENV_ARG_DECL)
+Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec)
 {
   int i;
   for (i = 0; i < this->hp_consumers_; ++i)
@@ -792,9 +724,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
       this->consumers_[i]->open (buf,
                                  this->hpc_event_a_,
                                  this->hpc_event_b_,
-                                 local_ec
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 local_ec);
       this->stats_[i].total_time_ = 0;
       this->stats_[i].lcl_count_ = 0;
       this->stats_[i].rmt_count_ = 0;
@@ -812,9 +742,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
       this->consumers_[i]->open (buf,
                                  this->lpc_event_a_,
                                  this->lpc_event_b_,
-                                 local_ec
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 local_ec);
       this->stats_[i].total_time_ = 0;
       this->stats_[i].lcl_count_ = 0;
       this->stats_[i].rmt_count_ = 0;
@@ -825,8 +753,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
 void
 Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                        RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                       RtecScheduler::Scheduler_ptr remote_sch
-                       ACE_ENV_ARG_DECL)
+                       RtecScheduler::Scheduler_ptr remote_sch)
 {
   RtecScheduler::Scheduler_ptr local_sch =
     ACE_Scheduler_Factory::server ();
@@ -852,36 +779,31 @@ Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
   ACE_OS::strcat (lcl, this->lcl_name_);
 
   this->ecg_.init (remote_ec, local_ec, remote_sch, local_sch,
-                   rmt, lcl ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   rmt, lcl);
 }
 
 void
 Test_ECG::push_supplier (void * /* cookie */,
                          RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                         const RtecEventComm::EventSet &events
-                         ACE_ENV_ARG_DECL)
+                         const RtecEventComm::EventSet &events)
 {
   this->wait_until_ready ();
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) events sent by supplier\n"));
   // @@ TODO we could keep somekind of stats here...
   if (!this->short_circuit_)
     {
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer->push (events);
     }
   else
     {
       int i = 0;
       for (; i < this->hp_consumers_; ++i)
         {
-          this->consumers_[i]->push (events ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->consumers_[i]->push (events);
         }
       for (; i < this->hp_consumers_ + this->lp_consumers_; ++i)
         {
-          this->consumers_[i]->push (events ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->consumers_[i]->push (events);
         }
     }
 }
@@ -889,8 +811,7 @@ Test_ECG::push_supplier (void * /* cookie */,
 void
 Test_ECG::push_consumer (void *consumer_cookie,
                          ACE_hrtime_t arrival,
-                         const RtecEventComm::EventSet &events
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         const RtecEventComm::EventSet &events)
 {
   int ID =
     (reinterpret_cast<Test_Consumer**> (consumer_cookie)
@@ -983,8 +904,7 @@ Test_ECG::wait_until_ready (void)
 
 void
 Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
-                             RtecEventComm::PushConsumer_ptr consumer
-                             ACE_ENV_ARG_DECL)
+                             RtecEventComm::PushConsumer_ptr consumer)
 {
 
   this->running_suppliers_--;
@@ -1002,7 +922,7 @@ Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
   ACE_hrtime_t t = ACE_OS::gethrtime ();
   ORBSVCS_Time::hrtime_to_TimeT (s.header.creation_time, t);
   s.header.type = ACE_ES_EVENT_SHUTDOWN;
-  consumer->push (shutdown ACE_ENV_ARG_PARAMETER);
+  consumer->push (shutdown);
 }
 
 void
@@ -1023,14 +943,13 @@ Test_ECG::shutdown_consumer (int id)
 }
 
 int
-Test_ECG::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_ECG::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n"));
 
   if (this->rmt_name_ != 0)
     {
-      this->ecg_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->ecg_.shutdown ();
     }
 
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
@@ -1281,8 +1200,7 @@ Test_Supplier::open (const char* name,
                      int event_b,
                      int message_count,
                      const RtecScheduler::Period_t& rate,
-                     RtecEventChannelAdmin::EventChannel_ptr ec
-                     ACE_ENV_ARG_DECL)
+                     RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->event_a_ = event_a;
   this->event_b_ = event_b;
@@ -1292,8 +1210,7 @@ Test_Supplier::open (const char* name,
     ACE_Scheduler_Factory::server ();
 
   RtecScheduler::handle_t rt_info =
-    server->create (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    server->create (name);
 
   // The execution times are set to reasonable values, but
   // actually they are changed on the real execution, i.e. we
@@ -1310,9 +1227,7 @@ Test_Supplier::open (const char* name,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                time,
                1,
-                   RtecScheduler::OPERATION
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   RtecScheduler::OPERATION);
 
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -1330,38 +1245,32 @@ Test_Supplier::open (const char* name,
               rt_info, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_suppliers ();
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
 
-  RtecEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  RtecEventComm::PushSupplier_var objref = this->_this ();
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos.get_SupplierQOS ());
 }
 
 void
-Test_Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
+Test_Supplier::close (void)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
     this->consumer_proxy_._retn ();
-  proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+  proxy->disconnect_push_consumer ();
 }
 
 void
 Test_Supplier::activate (const char* name,
                          const RtecScheduler::Period_t& rate,
-                         RtecEventChannelAdmin::EventChannel_ptr ec
-                         ACE_ENV_ARG_DECL)
+                         RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecScheduler::Scheduler_ptr server =
     ACE_Scheduler_Factory::server ();
@@ -1371,8 +1280,7 @@ Test_Supplier::activate (const char* name,
   ACE_OS::strcpy (buf, "consumer_");
   ACE_OS::strcat (buf, name);
   RtecScheduler::handle_t rt_info =
-    server->create (buf ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    server->create (buf);
 
   // The execution times are set to reasonable values, but
   // actually they are changed on the real execution, i.e. we
@@ -1389,9 +1297,7 @@ Test_Supplier::activate (const char* name,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                time,
                1,
-               RtecScheduler::OPERATION
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+               RtecScheduler::OPERATION);
 
   // Also connect our consumer for timeout events from the EC.
   int interval = rate / 10;
@@ -1408,27 +1314,21 @@ Test_Supplier::activate (const char* name,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_consumers ();
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
   RtecEventComm::PushConsumer_var cref =
-    this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_._this ();
 
   this->supplier_proxy_->connect_push_consumer (
        cref.in (),
-       consumer_qos.get_ConsumerQOS ()
-       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+       consumer_qos.get_ConsumerQOS ());
 }
 
 void
-Test_Supplier::push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+Test_Supplier::push (const RtecEventComm::EventSet& events)
 {
 #if 0
    const int bufsize = 128;
@@ -1467,9 +1367,7 @@ Test_Supplier::push (const RtecEventComm::EventSet& events
       if (this->message_count_ < 0)
         {
           this->test_->shutdown_supplier (this->cookie_,
-                                          this->consumer_proxy_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                          this->consumer_proxy_.in ());
         }
       if (this->message_count_ % 2 == 0)
         {
@@ -1483,22 +1381,21 @@ Test_Supplier::push (const RtecEventComm::EventSet& events
     }
   this->test_->push_supplier (this->cookie_,
                               this->consumer_proxy_.in (),
-                              sent
-                              ACE_ENV_ARG_PARAMETER);
+                              sent);
 }
 
 void
-Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Test_Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier ();
 }
 
 void
-Test_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Supplier::disconnect_push_consumer (void)
 {
 }
 
@@ -1517,15 +1414,13 @@ Test_Consumer::Test_Consumer (Test_ECG *test,
 void
 Test_Consumer::open (const char* name,
                      int event_a, int event_b,
-                     RtecEventChannelAdmin::EventChannel_ptr ec
-                     ACE_ENV_ARG_DECL)
+                     RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecScheduler::Scheduler_ptr server =
     ACE_Scheduler_Factory::server ();
 
   RtecScheduler::handle_t rt_info =
-    server->create (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    server->create (name);
 
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -1540,9 +1435,7 @@ Test_Consumer::open (const char* name,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                time,
                0,
-               RtecScheduler::OPERATION
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+               RtecScheduler::OPERATION);
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -1552,44 +1445,38 @@ Test_Consumer::open (const char* name,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_consumers ();
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  RtecEventComm::PushConsumer_var objref = this->_this ();
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos.get_ConsumerQOS ());
 }
 
 void
-Test_Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
+Test_Consumer::close (void)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
     this->supplier_proxy_._retn ();
-  proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  proxy->disconnect_push_supplier ();
 }
 
 void
-Test_Consumer::push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+Test_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->test_->push_consumer (this->cookie_, arrival, events ACE_ENV_ARG_PARAMETER);
+  this->test_->push_consumer (this->cookie_, arrival, events);
 }
 
 void
-Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 4bf7784e0cd..5307080c435 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -50,25 +50,22 @@ public:
              int event_a, int event_b,
              int message_count,
              const RtecScheduler::Period_t& rate,
-             RtecEventChannelAdmin::EventChannel_ptr ec
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Disconnect from the EC.
 
   void activate (const char* name,
                  const RtecScheduler::Period_t& rate,
-                 RtecEventChannelAdmin::EventChannel_ptr ec
-                 ACE_ENV_ARG_DECL);
+                 RtecEventChannelAdmin::EventChannel_ptr ec);
 
-  void push (const RtecEventComm::EventSet& events
-             ACE_ENV_ARG_DECL);
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void push (const RtecEventComm::EventSet& events);
+  void disconnect_push_consumer (void);
   // Implement the callbacks for our consumer personality.
 
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The methods in the skeleton.
 
@@ -120,17 +117,15 @@ public:
 
   void open (const char* name,
              int event_a, int event_b,
-             RtecEventChannelAdmin::EventChannel_ptr ec
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
-  void close (ACE_ENV_SINGLE_ARG_DECL);
+  void close (void);
   // Disconnect from the EC.
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -185,8 +180,7 @@ public:
 
   void push_supplier (void* supplier_cookie,
                       RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                      const RtecEventComm::EventSet &events
-                      ACE_ENV_ARG_DECL_NOT_USED);
+                      const RtecEventComm::EventSet &events);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
@@ -194,45 +188,38 @@ public:
 
   void push_consumer (void* consumer_cookie,
                       ACE_hrtime_t arrival,
-                      const RtecEventComm::EventSet& events
-                      ACE_ENV_ARG_DECL_NOT_USED);
+                      const RtecEventComm::EventSet& events);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
   void shutdown_supplier (void* supplier_cookie,
-                          RtecEventComm::PushConsumer_ptr consumer
-                          ACE_ENV_ARG_DECL);
+                          RtecEventComm::PushConsumer_ptr consumer);
   // One of the suppliers has completed its work.
 
 private:
   RtecEventChannelAdmin::EventChannel_ptr
     get_ec (CosNaming::NamingContext_ptr naming_context,
-            const char* ec_name
-            ACE_ENV_ARG_DECL);
+            const char* ec_name);
   // Helper routine to obtain an EC given its name.
 
-  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
-  void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
+  void disconnect_suppliers (void);
   // Connect the suppliers.
 
-  void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                           ACE_ENV_ARG_DECL);
+  void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
   // Activate the suppliers, i.e. they start generating events.
 
   void connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                     RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                    RtecScheduler::Scheduler_ptr remote_sch
-                    ACE_ENV_ARG_DECL);
+                    RtecScheduler::Scheduler_ptr remote_sch);
   // Connect the EC gateway, it builds the Subscriptions and the
   // Publications list.
 
-  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
-  void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec);
+  void disconnect_consumers (void);
   // Connect and disconnect the consumers.
 
-  int shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int shutdown (void);
   // Called when the main thread (i.e. not the scavenger thread) is
   // shutting down.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index ade2d62e17a..8ce4695e239 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -33,12 +33,10 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                         const char* name,
                         int type_start,
                         int type_count,
-                        RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    scheduler->create (name);
 
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -52,9 +50,7 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   0,
-                  RtecScheduler::OPERATION
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                  RtecScheduler::OPERATION);
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -66,43 +62,34 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_consumers ();
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  RtecEventComm::PushConsumer_var objref = this->_this ();
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos.get_ConsumerQOS ());
 }
 
 void
-Test_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Test_Consumer::disconnect (void)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier ();
 
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
 }
 
 void
@@ -119,8 +106,7 @@ Test_Consumer::accumulate (ACE_Throughput_Stats& stats) const
 }
 
 void
-Test_Consumer::push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+Test_Consumer::push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -159,8 +145,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events
             {
               // We stop the timer as soon as we realize it is time to
               // do so.
-              this->driver_->shutdown_consumer (this->cookie_ ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              this->driver_->shutdown_consumer (this->cookie_);
             }
         }
       else
@@ -177,7 +162,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Consumer::disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 6a086b38087..5621cc3d99a 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -45,11 +45,10 @@ public:
                 const char* name,
                 int type_start,
                 int type_count,
-                RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+                RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the consumer to the EC.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the EC.
 
   void dump_results (const char* name,
@@ -59,10 +58,9 @@ public:
   void accumulate (ACE_Throughput_Stats& stats) const;
   // Add our throughput and latency statistics to <stats>
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 609bf639245..5ca4305b28f 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -16,8 +16,8 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput, 
-           ECT_Consumer_Driver, 
+ACE_RCSID (EC_Throughput,
+           ECT_Consumer_Driver,
            "$Id$")
 
 int
@@ -47,17 +47,13 @@ ECT_Consumer_Driver::~ECT_Consumer_Driver (void)
 int
 ECT_Consumer_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,12 +61,10 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -128,9 +122,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -138,44 +130,35 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (schedule_name);
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
-        RtecScheduler::Scheduler::_narrow (sched_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecScheduler::Scheduler::_narrow (sched_obj.in ());
 
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      this->connect_consumers (scheduler.in (), channel.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_consumers (scheduler.in (), channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
@@ -183,8 +166,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       for (;;)
         {
           ACE_Time_Value tv (1, 0);
-          this->orb_->perform_work (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->perform_work (tv);
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
           if (this->active_count_ <= 0)
             break;
@@ -193,36 +175,30 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->disconnect_consumers ();
 
       if (this->shutdown_event_channel_ != 0)
         {
-          channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          channel->destroy ();
         }
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-ECT_Consumer_Driver::shutdown_consumer (void*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+ECT_Consumer_Driver::shutdown_consumer (void*)
 {
   // int ID =
   //   (reinterpret_cast<Test_Consumer**> (consumer_cookie)
@@ -237,8 +213,7 @@ ECT_Consumer_Driver::shutdown_consumer (void*
 void
 ECT_Consumer_Driver::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
-      RtecEventChannelAdmin::EventChannel_ptr channel
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -258,9 +233,7 @@ ECT_Consumer_Driver::connect_consumers
                                     buf,
                                     this->type_start_,
                                     this->type_count_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    channel);
     }
 }
 
@@ -282,12 +255,11 @@ ECT_Consumer_Driver::dump_results (void)
 }
 
 void
-ECT_Consumer_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ECT_Consumer_Driver::disconnect_consumers (void)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumers_[i]->disconnect ();
 
       delete this->consumers_[i];
       this->consumers_[i] = 0;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 4af70e0f7a8..198c4160cc5 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -44,8 +44,7 @@ public:
   int run (int argc, char* argv[]);
   // Execute the test.
 
-  virtual void shutdown_consumer (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void shutdown_consumer (void* consumer_cookie);
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
@@ -55,9 +54,8 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
-  void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec);
+  void disconnect_consumers (void);
   // Connect and disconnect the consumers.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index 1debc666c37..6aaff0c1448 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -33,8 +33,7 @@ class ECT_Driver
 public:
   virtual ~ECT_Driver (void);
 
-  virtual void shutdown_consumer (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void shutdown_consumer (void* consumer_cookie) = 0;
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 0d75c42b29b..49efa019ecf 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -41,8 +41,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                         int burst_pause,
                         int type_start,
                         int type_count,
-                        RtecEventChannelAdmin::EventChannel_ptr ec
-                        ACE_ENV_ARG_DECL)
+                        RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   this->burst_count_ = burst_count;
   this->burst_size_ = burst_size;
@@ -52,8 +51,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
   this->type_count_ = type_count;
 
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    scheduler->create (name);
 
   ACE_Time_Value tv (0, burst_pause);
   RtecScheduler::Period_t rate = tv.usec () * 10;
@@ -72,9 +70,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   1,
-                  RtecScheduler::OPERATION
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                  RtecScheduler::OPERATION);
 
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -92,51 +88,41 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
               rt_info, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->for_suppliers ();
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
 
   RtecEventComm::PushSupplier_var objref =
-    this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->supplier_._this ();
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos.get_SupplierQOS ());
 }
 
 void
-Test_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Test_Supplier::disconnect (void)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer ();
 
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->supplier_._default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (&this->supplier_);
+  poa->deactivate_object (id.in ());
 }
 
 int
 Test_Supplier::svc ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize a time value to pace the test
       ACE_Time_Value tv (0, this->burst_pause_);
@@ -184,9 +170,8 @@ Test_Supplier::svc ()
               ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                              request_start);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
-              this->consumer_proxy ()->push (event ACE_ENV_ARG_PARAMETER);
+              this->consumer_proxy ()->push (event);
 
-              ACE_TRY_CHECK;
               ACE_hrtime_t end = ACE_OS::gethrtime ();
               this->throughput_.sample (end - test_start,
                                         end - request_start);
@@ -208,21 +193,19 @@ Test_Supplier::svc ()
       ACE_hrtime_t request_start = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      request_start);
-      this->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->consumer_proxy ()->push(event);
       ACE_hrtime_t end = ACE_OS::gethrtime ();
       this->throughput_.sample (end - test_start,
                                 end - request_start);
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "Supplier %4.4x completed\n",
@@ -231,7 +214,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Supplier::disconnect_push_supplier (void)
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 17fbcb8ce02..073e85e601d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -45,14 +45,13 @@ public:
                 int burst_pause,
                 int type_start,
                 int type_count,
-                RtecEventChannelAdmin::EventChannel_ptr ec
-                ACE_ENV_ARG_DECL);
+                RtecEventChannelAdmin::EventChannel_ptr ec);
   // This method connects the supplier to the EC.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void disconnect_push_supplier (void);
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index d2350ca9a04..8a052c303a1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -16,8 +16,8 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
-ACE_RCSID (EC_Throughput, 
-           ECT_Supplier_Driver, 
+ACE_RCSID (EC_Throughput,
+           ECT_Supplier_Driver,
            "$Id$")
 
 int
@@ -46,24 +46,20 @@ ECT_Supplier_Driver::~ECT_Supplier_Driver (void)
 }
 
 void
-ECT_Supplier_Driver::shutdown_consumer (void*
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+ECT_Supplier_Driver::shutdown_consumer (void*)
 {
 }
 
 int
 ECT_Supplier_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -71,12 +67,10 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -140,8 +134,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -149,50 +142,39 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (schedule_name);
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
-        RtecScheduler::Scheduler::_narrow (sched_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecScheduler::Scheduler::_narrow (sched_obj.in ());
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        naming_context->resolve (name);
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
-                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ());
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       this->connect_suppliers (scheduler.in (),
-                               channel.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->activate_suppliers ();
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
@@ -207,38 +189,33 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->disconnect_suppliers ();
 
       ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "orb and poa destroyed\n"));
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX");
+      ex._tao_print_exception ("NON SYS EX");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
 ECT_Supplier_Driver::connect_suppliers
     (RtecScheduler::Scheduler_ptr scheduler,
-     RtecEventChannelAdmin::EventChannel_ptr channel
-     ACE_ENV_ARG_DECL)
+     RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -255,14 +232,12 @@ ECT_Supplier_Driver::connect_suppliers
                                     this->burst_pause_,
                                     this->type_start_,
                                     this->type_count_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    channel);
     }
 }
 
 void
-ECT_Supplier_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECT_Supplier_Driver::activate_suppliers (void)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -271,12 +246,11 @@ ECT_Supplier_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-ECT_Supplier_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ECT_Supplier_Driver::disconnect_suppliers (void)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->suppliers_[i]->disconnect ();
 
       delete this->suppliers_[i];
       this->suppliers_[i] = 0;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index e51f0f73551..27f364428cb 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -34,8 +34,7 @@ public:
   ECT_Supplier_Driver (void);
   virtual ~ECT_Supplier_Driver (void);
 
-  virtual void shutdown_consumer (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void shutdown_consumer (void* consumer_cookie);
   // Not used....
 
   enum {
@@ -51,12 +50,11 @@ private:
   // parse the command line args
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
-  void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec);
+  void disconnect_suppliers (void);
   // Connect the suppliers.
 
-  void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void activate_suppliers (void);
   // Activate the suppliers, i.e. they start generating events.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 8aeb5fbbc40..490fe9dd72f 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -63,20 +63,17 @@ ECT_Throughput::~ECT_Throughput (void)
 int
 ECT_Throughput::run (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Calibrate the high resolution timer *before* starting the
       // test.
       ACE_High_Res_Timer::calibrate ();
 
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -84,15 +81,12 @@ ECT_Throughput::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -185,14 +179,11 @@ ECT_Throughput::run (int argc, char* argv[])
         runtime_infos);
 #endif
       RtecScheduler::Scheduler_var scheduler =
-        scheduler_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        scheduler_impl._this ();
 
 #if 0
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -200,8 +191,7 @@ ECT_Throughput::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       // This is the name we (potentially) register the Scheduling
       // Service in the Naming Service.
@@ -210,14 +200,12 @@ ECT_Throughput::run (int argc, char* argv[])
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::String_var str =
-        this->orb_->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (scheduler.in ());
       ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
                   str.in ()));
 
       // Register the servant with the Naming Context....
-      naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      naming_context->rebind (schedule_name, scheduler.in ());
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
 #endif /* 0 */
@@ -230,31 +218,25 @@ ECT_Throughput::run (int argc, char* argv[])
       TAO_EC_Event_Channel *ec =
         new TAO_EC_Event_Channel (attr);
 
-      ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec->activate ();
 
       auto_ptr<POA_RtecEventChannelAdmin::EventChannel> auto_ec_impl (ec);
       ec_impl = auto_ec_impl;
 
       RtecEventChannelAdmin::EventChannel_var channel =
-        ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl->_this ();
 
       this->connect_consumers (scheduler.in (),
-                               channel.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
       this->connect_suppliers (scheduler.in (),
-                               channel.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               channel.in ());
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->activate_suppliers ();
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
@@ -269,31 +251,25 @@ ECT_Throughput::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->disconnect_consumers ();
 
       ACE_DEBUG ((LM_DEBUG, "consumers disconnected\n"));
 
-      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->disconnect_suppliers ();
 
       ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
 
-      channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      channel->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "channel destroyed\n"));
 
       {
         // Deactivate the EC
         PortableServer::POA_var poa =
-          ec_impl->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          ec_impl->_default_POA ();
         PortableServer::ObjectId_var id =
-          poa->servant_to_id (ec_impl.get () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          poa->servant_to_id (ec_impl.get ());
+        poa->deactivate_object (id.in ());
 
         ACE_DEBUG ((LM_DEBUG, "EC deactivated\n"));
       }
@@ -301,34 +277,28 @@ ECT_Throughput::run (int argc, char* argv[])
       {
         // Deactivate the Scheduler
         PortableServer::POA_var poa =
-          scheduler_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          scheduler_impl._default_POA ();
         PortableServer::ObjectId_var id =
-          poa->servant_to_id (&scheduler_impl ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-        poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          poa->servant_to_id (&scheduler_impl);
+        poa->deactivate_object (id.in ());
 
         ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n"));
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ECT_Throughput::run");
+      ex._tao_print_exception ("ECT_Throughput::run");
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR, "non-corba exception raised\n"));
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-ECT_Throughput::shutdown_consumer (void*
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+ECT_Throughput::shutdown_consumer (void*)
 {
   // int ID =
   //   (reinterpret_cast<Test_Consumer**> (consumer_cookie)
@@ -342,15 +312,14 @@ ECT_Throughput::shutdown_consumer (void*
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%t) shutting down the ORB\n"));
-      // Not needed: this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+      // Not needed: this->orb_->shutdown (0);
     }
 }
 
 void
 ECT_Throughput::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
-      RtecEventChannelAdmin::EventChannel_ptr channel
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -373,17 +342,14 @@ ECT_Throughput::connect_consumers
                                     buf,
                                     start,
                                     this->consumer_type_count_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    channel);
     }
 }
 
 void
 ECT_Throughput::connect_suppliers
      (RtecScheduler::Scheduler_ptr scheduler,
-      RtecEventChannelAdmin::EventChannel_ptr channel
-      ACE_ENV_ARG_DECL)
+      RtecEventChannelAdmin::EventChannel_ptr channel)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -401,14 +367,12 @@ ECT_Throughput::connect_suppliers
                                     this->burst_pause_,
                                     start,
                                     this->supplier_type_count_,
-                                    channel
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    channel);
     }
 }
 
 void
-ECT_Throughput::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECT_Throughput::activate_suppliers (void)
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -427,22 +391,20 @@ ECT_Throughput::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-ECT_Throughput::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+ECT_Throughput::disconnect_suppliers (void)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->suppliers_[i]->disconnect ();
     }
 }
 
 void
-ECT_Throughput::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+ECT_Throughput::disconnect_consumers (void)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumers_[i]->disconnect ();
     }
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index cb1ceae4a8b..cf7a13ac3ad 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -43,8 +43,7 @@ public:
   int run (int argc, char* argv[]);
   // Execute the test.
 
-  virtual void shutdown_consumer (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED);
+  virtual void shutdown_consumer (void* consumer_cookie);
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
@@ -54,18 +53,16 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
-  void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec);
+  void disconnect_consumers (void);
   // Connect and disconnect the consumers.
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          ACE_ENV_ARG_DECL);
-  void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec);
+  void disconnect_suppliers (void);
   // Connect the suppliers.
 
-  void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void activate_suppliers (void);
   // Activate the suppliers, i.e. they start generating events.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 6e4b0d31665..85e43d7675f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -22,25 +22,19 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -50,25 +44,21 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
@@ -79,17 +69,13 @@ main (int argc, char* argv[])
                          event_source,
                          event_type,
                          event_source,
-                         event_type
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         event_type);
 
       supplier1.connect (supplier_admin.in (),
                          event_source,
                          event_type + 1,
                          event_source,
-                         event_type + 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         event_type + 1);
 
       // ****************************************************************
 
@@ -111,27 +97,21 @@ main (int argc, char* argv[])
       consumer_qos01.insert (event_source, event_type + 1, 0);
 
       consumer01.connect (consumer_admin.in (),
-                          consumer_qos01.get_ConsumerQOS ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          consumer_qos01.get_ConsumerQOS ());
 
       Consumer consumer0 ("Consumer/0", event_type);
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
 
       consumer0.connect (consumer_admin.in (),
-                         consumer_qos0.get_ConsumerQOS ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         consumer_qos0.get_ConsumerQOS ());
 
       Consumer consumer1 ("Consumer/1", event_type);
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
 
       consumer1.connect (consumer_admin.in (),
-                         consumer_qos1.get_ConsumerQOS ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         consumer_qos1.get_ConsumerQOS ());
 
       // ****************************************************************
 
@@ -149,26 +129,18 @@ main (int argc, char* argv[])
         {
           ACE_Time_Value tv (0, 10000);
           consumer0.connect (consumer_admin.in (),
-                             consumer_qos0.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             consumer_qos0.get_ConsumerQOS ());
           consumer1.connect (consumer_admin.in (),
-                             consumer_qos1.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             consumer_qos1.get_ConsumerQOS ());
           if (i % 2 == 0)
             {
               consumer01.connect (consumer_admin.in (),
-                                  consumer_qos0.get_ConsumerQOS ()
-                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                  consumer_qos0.get_ConsumerQOS ());
             }
           else
             {
               consumer01.connect (consumer_admin.in (),
-                                  consumer_qos01.get_ConsumerQOS ()
-                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                  consumer_qos01.get_ConsumerQOS ());
             }
 
           ACE_OS::sleep (tv);
@@ -184,29 +156,22 @@ main (int argc, char* argv[])
 
       // Cleanup..
 
-      consumer01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer01.disconnect ();
+      consumer1.disconnect ();
+      consumer0.disconnect ();
 
       // ****************************************************************
 
-      supplier1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier1.disconnect ();
+      supplier0.disconnect ();
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
@@ -224,12 +189,11 @@ main (int argc, char* argv[])
                                task1.push_count (),
                                1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -294,8 +258,7 @@ Consumer::dump_results (int base_count,
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
index 1cb23396ef5..15356ef9f95 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
@@ -40,8 +40,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Number of events of type <event_base_type_> received.
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 93e068b6d84..59c00b65055 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -75,14 +75,13 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_BCast::execute_test (void)
 {
   // Subscription determining which EC events will get sent out on the
   // UDP socket.
   RtecEventChannelAdmin::ConsumerQOS sub;
   int shutdown_event_type;
-  this->build_consumer_qos (0, sub, shutdown_event_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->build_consumer_qos (0, sub, shutdown_event_type);
 
   // Obtain UDP address in the string format for Gateway initialization.
   char address_server_arg [256];
@@ -109,15 +108,12 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL)
     return;
 
   gateway.run (this->orb_.in (),
-               this->event_channel_.in ()
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+               this->event_channel_.in ());
 
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->activate_tasks ();
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "BCast (%P|%t) suppliers are active\n"));
@@ -149,8 +145,7 @@ Simple_Address_Server (const ACE_INET_Addr& address)
 
 void
 Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&,
-                                 RtecUDPAdmin::UDP_Addr& address
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 RtecUDPAdmin::UDP_Addr& address)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   address = this->address_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 3d1b701984a..99048d0c9ab 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -46,7 +46,7 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+  void execute_test (void);
 
   /// Don't dump the EC_Driver results, they are meaningless.
   void dump_results (void);
@@ -73,8 +73,7 @@ public:
   Simple_Address_Server (const ACE_INET_Addr& address);
 
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr& address
-                         ACE_ENV_ARG_DECL)
+                         RtecUDPAdmin::UDP_Addr& address)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 83ee58c7eb8..c95577609b9 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -17,25 +17,19 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -45,25 +39,21 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
@@ -72,30 +62,22 @@ main (int argc, char* argv[])
       EC_Counting_Supplier first_supplier;
 
       first_supplier.activate (consumer_admin.in (),
-                               milliseconds
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               milliseconds);
       first_supplier.connect (supplier_admin.in (),
                               0x00001111UL,
                               0x11110000UL,
                               0x00001111UL,
-                              0x11110000UL
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              0x11110000UL);
 
       EC_Counting_Supplier second_supplier;
 
       second_supplier.activate (consumer_admin.in (),
-                                milliseconds
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                milliseconds);
       second_supplier.connect (supplier_admin.in (),
                                0x01100000UL,
                                0x00000110UL,
                                0x01100000UL,
-                               0x00000110UL
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               0x00000110UL);
 
       // ****************************************************************
 
@@ -110,9 +92,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (0x01100000, 0x00000110, 0);
 
         consumer_bitmask_reject.connect (consumer_admin.in (),
-                                         consumer_qos.get_ConsumerQOS ()
-                                         ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                         consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -127,9 +107,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_null_terminator ();
 
         consumer_bitmask_accept.connect (consumer_admin.in (),
-                                         consumer_qos.get_ConsumerQOS ()
-                                         ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                         consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -144,9 +122,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_null_terminator ();
 
         consumer_bitmask_filter.connect (consumer_admin.in (),
-                                         consumer_qos.get_ConsumerQOS ()
-                                         ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                         consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -162,9 +138,7 @@ main (int argc, char* argv[])
                                              0x01100000, 0x00000110);
 
         consumer_bitmask_value.connect (consumer_admin.in (),
-                                        consumer_qos.get_ConsumerQOS ()
-                                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                        consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -180,9 +154,7 @@ main (int argc, char* argv[])
                                              0x01100000, 0x00000110);
 
         consumer_bitmask_loose.connect (consumer_admin.in (),
-                                        consumer_qos.get_ConsumerQOS ()
-                                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                        consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -194,37 +166,26 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_bitmask_loose.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer_bitmask_value.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer_bitmask_filter.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer_bitmask_accept.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer_bitmask_reject.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_bitmask_loose.disconnect ();
+      consumer_bitmask_value.disconnect ();
+      consumer_bitmask_filter.disconnect ();
+      consumer_bitmask_accept.disconnect ();
+      consumer_bitmask_reject.disconnect ();
 
       // ****************************************************************
 
-      second_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      second_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      first_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      first_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      second_supplier.deactivate ();
+      second_supplier.disconnect ();
+      first_supplier.deactivate ();
+      first_supplier.disconnect ();
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
@@ -241,14 +202,12 @@ main (int argc, char* argv[])
       expected = second_supplier.event_count;
       consumer_bitmask_loose.dump_results (expected, 5);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 5a021eb4e08..52950b5c3aa 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -7,8 +7,8 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests, 
-           Complex, 
+ACE_RCSID (EC_Tests,
+           Complex,
            "$Id$")
 
 int
@@ -16,25 +16,19 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -42,25 +36,21 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
@@ -71,64 +61,48 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier_00;
 
       supplier_00.activate (consumer_admin.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            milliseconds);
       supplier_00.connect (supplier_admin.in (),
                            event_source,
                            event_type,
                            event_source,
-                           event_type
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier supplier_01;
 
       supplier_01.activate (consumer_admin.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            milliseconds);
       supplier_01.connect (supplier_admin.in (),
                            event_source,
                            event_type + 1,
                            event_source,
-                           event_type + 1
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           event_type + 1);
 
       // ****************************************************************
 
       EC_Counting_Supplier supplier_10;
 
       supplier_10.activate (consumer_admin.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            milliseconds);
       supplier_10.connect (supplier_admin.in (),
                            event_source + 1,
                            event_type,
                            event_source + 1,
-                           event_type
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier supplier_11;
 
       supplier_11.activate (consumer_admin.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            milliseconds);
       supplier_11.connect (supplier_admin.in (),
                            event_source + 1,
                            event_type + 1,
                            event_source + 1,
-                           event_type + 1
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           event_type + 1);
 
       // ****************************************************************
 
@@ -145,9 +119,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type, 0);
 
         consumer_00.connect (consumer_admin.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -165,9 +137,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         consumer_01.connect (consumer_admin.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -179,42 +149,29 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      supplier_11.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_10.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_01.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_00.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_01.disconnect ();
+
+      consumer_00.disconnect ();
+
+      supplier_11.deactivate ();
+      supplier_10.deactivate ();
+      supplier_01.deactivate ();
+      supplier_00.deactivate ();
+
+      supplier_11.disconnect ();
+      supplier_10.disconnect ();
+      supplier_01.disconnect ();
+      supplier_00.disconnect ();
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // ****************************************************************
 
@@ -228,11 +185,10 @@ main (int argc, char* argv[])
         + supplier_11.event_count;
       consumer_01.dump_results (expected, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index d5e07b61bb9..04ba3be9f2d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -22,25 +22,19 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -50,25 +44,21 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
@@ -78,9 +68,7 @@ main (int argc, char* argv[])
                          event_source,
                          event_type,
                          event_source,
-                         event_type
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         event_type);
 
       // ****************************************************************
 
@@ -93,18 +81,14 @@ main (int argc, char* argv[])
       consumer_qos0.insert (event_source, event_type, 0);
 
       consumer0.connect (consumer_admin.in (),
-                         consumer_qos0.get_ConsumerQOS ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         consumer_qos0.get_ConsumerQOS ());
 
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
       Consumer consumer1 ("Consumer/1", 200);
 
       consumer1.connect (consumer_admin.in (),
-                         consumer_qos0.get_ConsumerQOS ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         consumer_qos0.get_ConsumerQOS ());
 
       // ****************************************************************
 
@@ -127,30 +111,24 @@ main (int argc, char* argv[])
 
       // The consumers should be disconnected already, but make sure
       // that they did...
-      //consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      //ACE_TRY_CHECK;
-      //consumer0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      //ACE_TRY_CHECK;
+      //consumer1.disconnect ();
+      //consumer0.disconnect ();
 
       // ****************************************************************
 
-      supplier0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier0.disconnect ();
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // ****************************************************************
 
@@ -162,12 +140,11 @@ main (int argc, char* argv[])
       consumer0.dump_results (100, 5);
       consumer1.dump_results (200, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -181,8 +158,7 @@ Consumer::Consumer (const char* name,
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -200,6 +176,5 @@ Consumer::push (const RtecEventComm::EventSet& events
       return;
   }
 
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate ();
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h
index f8e27523603..dbf5944fcab 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.h
@@ -34,8 +34,7 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index f0a3aafbcae..389845e2d77 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -13,103 +13,82 @@ ACE_RCSID (EC_Tests,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int use_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks
-          ACE_ENV_ARG_DECL)
+          int use_callbacks)
 {
   TAO_EC_Event_Channel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_EC_Event_Channel ec_impl (attributes);
-  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec_impl.activate ();
 
   RtecEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_impl._this ();
 
   // ****************************************************************
 
   // Obtain the consumer admin..
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_consumers ();
 
   // and the supplier admin..
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    event_channel->for_suppliers ();
 
   // ****************************************************************
 
@@ -135,57 +114,37 @@ run_test (PortableServer::POA_ptr poa,
   for (int i = 0; i != iterations; ++i)
     {
       supplier_0.connect (supplier_admin.in (),
-                          supplier_qos.get_SupplierQOS ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                          supplier_qos.get_SupplierQOS ());
       consumer_0.connect (consumer_admin.in (),
-                          consumer_qos.get_ConsumerQOS ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                          consumer_qos.get_ConsumerQOS ());
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in (),
-                              supplier_qos.get_SupplierQOS ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                              supplier_qos.get_SupplierQOS ());
           consumer_1.connect (consumer_admin.in (),
-                              consumer_qos.get_ConsumerQOS ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                              consumer_qos.get_ConsumerQOS ());
         }
-      supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_0.disconnect ();
+      consumer_0.disconnect ();
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-          supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          consumer_1.disconnect ();
+          supplier_1.disconnect ();
         }
     }
 
   supplier_0.connect (supplier_admin.in (),
-                      supplier_qos.get_SupplierQOS ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                      supplier_qos.get_SupplierQOS ());
   consumer_0.connect (consumer_admin.in (),
-                      consumer_qos.get_ConsumerQOS ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                      consumer_qos.get_ConsumerQOS ());
 
-  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  event_channel->destroy ();
 
-  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&supplier_0);
 
-  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&consumer_0);
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&ec_impl);
 
   CORBA::ULong count_0 = 1;
   CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index 39c750d1a4d..ffe5ab0ee09 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -8,8 +8,8 @@
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "orbsvcs/Event/EC_Gateway_IIOP.h"
 
-ACE_RCSID (EC_Tests, 
-           Gateway, 
+ACE_RCSID (EC_Tests,
+           Gateway,
            "$Id$")
 
 int
@@ -17,25 +17,19 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -45,61 +39,50 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl_1 (attributes);
-      ec_impl_1.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl_1.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel_1 =
-        ec_impl_1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl_1._this ();
 
       // ****************************************************************
 
       TAO_EC_Event_Channel ec_impl_2 (attributes);
-      ec_impl_2.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl_2.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel_2 =
-        ec_impl_2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl_2._this ();
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_1 =
-        event_channel_1->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel_1->for_consumers ();
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_1 =
-        event_channel_1->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel_1->for_suppliers ();
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_2 =
-        event_channel_2->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel_2->for_consumers ();
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_2 =
-        event_channel_2->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel_2->for_suppliers ();
 
       // ****************************************************************
 
       TAO_EC_Gateway_IIOP gateway;
       gateway.init (event_channel_1.in (),
-                    event_channel_2.in ()
-                    ACE_ENV_ARG_PARAMETER);
+                    event_channel_2.in ());
 
       RtecEventChannelAdmin::Observer_var obs =
-        gateway._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        gateway._this ();
 
       RtecEventChannelAdmin::Observer_Handle h =
-        event_channel_2->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel_2->append_observer (obs.in ());
 
       gateway.observer_handle (h);
 
@@ -112,30 +95,22 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier_00;
 
       supplier_00.activate (consumer_admin_1.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            milliseconds);
       supplier_00.connect (supplier_admin_1.in (),
                            event_source,
                            event_type,
                            event_source,
-                           event_type
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           event_type);
 
       EC_Counting_Supplier supplier_01;
 
       supplier_01.activate (consumer_admin_1.in (),
-                            milliseconds
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            milliseconds);
       supplier_01.connect (supplier_admin_1.in (),
                            event_source,
                            event_type + 1,
                            event_source,
-                           event_type + 1
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           event_type + 1);
 
       // ****************************************************************
 
@@ -150,9 +125,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -181,9 +154,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type + 1, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -208,9 +179,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -228,8 +197,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_00.disconnect ();
 
       // ****************************************************************
 
@@ -239,9 +207,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -270,9 +236,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type + 1, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -297,9 +261,7 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS ()
-                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                             consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -317,43 +279,32 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer_00.disconnect ();
 
-      supplier_01.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_00.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_01.deactivate ();
+      supplier_00.deactivate ();
 
-      supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_01.disconnect ();
+      supplier_00.disconnect ();
 
-      gateway.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway.shutdown ();
 
       // ****************************************************************
 
-      event_channel_1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel_1->destroy ();
 
-      event_channel_2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel_2->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 9f91b760a0a..de9e8f53bab 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -14,91 +14,72 @@ ACE_RCSID (EC_Tests,
            "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks
-                      ACE_ENV_ARG_DECL);
+                      int use_callbacks);
 
 int
 main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 0);
 
-      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (poa.in (), 1);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (servant);
+  poa->deactivate_object (id.in ());
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks
-          ACE_ENV_ARG_DECL)
+          int use_callbacks)
 {
   TAO_EC_Event_Channel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_EC_Event_Channel ec_impl (attributes);
-  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec_impl.activate ();
 
   RtecEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec_impl._this ();
 
   Task task (event_channel.in (), use_callbacks);
 
@@ -110,11 +91,9 @@ run_test (PortableServer::POA_ptr poa,
   // Wait for all the threads to complete and the return
   ACE_Thread_Manager::instance ()->wait ();
 
-  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  event_channel->destroy ();
 
-  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&ec_impl);
 }
 
 Task::Task (RtecEventChannelAdmin::EventChannel_ptr ec,
@@ -130,32 +109,28 @@ Task::svc ()
 {
   for (int i = 0; i < 10; ++i)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
-          this->run_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->run_iteration ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           return -1;
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
 
 void
-Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
+Task::run_iteration (void)
 {
   // Obtain the consumer admin..
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel->for_consumers ();
 
   // and the supplier admin..
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel->for_suppliers ();
 
   // ****************************************************************
 
@@ -181,42 +156,28 @@ Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i != iterations; ++i)
     {
       supplier_0.connect (supplier_admin.in (),
-                          supplier_qos.get_SupplierQOS ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                          supplier_qos.get_SupplierQOS ());
       consumer_0.connect (consumer_admin.in (),
-                          consumer_qos.get_ConsumerQOS ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                          consumer_qos.get_ConsumerQOS ());
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in (),
-                              supplier_qos.get_SupplierQOS ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                              supplier_qos.get_SupplierQOS ());
           consumer_1.connect (consumer_admin.in (),
-                              consumer_qos.get_ConsumerQOS ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                              consumer_qos.get_ConsumerQOS ());
         }
-      supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      supplier_0.disconnect ();
+      consumer_0.disconnect ();
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-          supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          consumer_1.disconnect ();
+          supplier_1.disconnect ();
         }
     }
 
-  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&supplier_0);
 
-  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  deactivate_servant (&consumer_0);
 
   CORBA::ULong count_0 = 0;
   CORBA::ULong count_1 = 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
index 06855260d66..df343b6f2f9 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
@@ -31,7 +31,7 @@ public:
   int svc (void);
 
   /// Run a single iteration of the test
-  void run_iteration (ACE_ENV_SINGLE_ARG_DECL);
+  void run_iteration (void);
 
 private:
   /// The event channel used on the test
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index 37ab5c1fb30..5e2a7583dd0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -17,25 +17,19 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -45,25 +39,21 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
@@ -74,44 +64,32 @@ main (int argc, char* argv[])
       EC_Counting_Supplier first_supplier;
 
       first_supplier.activate (consumer_admin.in (),
-                               milliseconds
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               milliseconds);
       first_supplier.connect (supplier_admin.in (),
                               event_source,
                               event_type,
                               event_source,
-                              event_type
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              event_type);
 
       EC_Counting_Supplier second_supplier;
 
       second_supplier.activate (consumer_admin.in (),
-                                milliseconds
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                milliseconds);
       second_supplier.connect (supplier_admin.in (),
                                event_source,
                                event_type + 1,
                                event_source,
-                               event_type + 1
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               event_type + 1);
 
       EC_Counting_Supplier third_supplier;
 
       third_supplier.activate (consumer_admin.in (),
-                               milliseconds
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               milliseconds);
       third_supplier.connect (supplier_admin.in (),
                               event_source,
                               event_type + 1,
                               event_source,
-                              event_type + 1
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              event_type + 1);
 
       // ****************************************************************
 
@@ -126,9 +104,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         regular_consumer.connect (consumer_admin.in (),
-                                  consumer_qos.get_ConsumerQOS ()
-                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                  consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -144,9 +120,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         negation_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -158,38 +132,28 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      negation_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      negation_consumer.disconnect ();
 
       // ****************************************************************
 
-      regular_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      regular_consumer.disconnect ();
 
       // ****************************************************************
 
-      third_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      third_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      second_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      second_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      first_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      first_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      third_supplier.deactivate ();
+      third_supplier.disconnect ();
+      second_supplier.deactivate ();
+      second_supplier.disconnect ();
+      first_supplier.deactivate ();
+      first_supplier.disconnect ();
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
@@ -201,14 +165,12 @@ main (int argc, char* argv[])
         first_supplier.event_count;
       regular_consumer.dump_results (expected, 5);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index d58d828573f..42e6d25d91c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -42,7 +42,7 @@ EC_Master::~EC_Master (void)
 int
 EC_Master::run (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Calibrate the high resolution timer *before* starting the
       // test.
@@ -50,8 +50,7 @@ EC_Master::run (int argc, char* argv[])
 
       this->seed_ = ACE_OS::time (0);
 
-      this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->initialize_orb_and_poa (argc, argv);
 
       if (this->parse_args (argc, argv))
         return 1;
@@ -86,8 +85,7 @@ EC_Master::run (int argc, char* argv[])
             int targc = argc;
             for (int j = 0; j < targc; ++j)
               targv[j] = argv[j];
-            this->channels_[i]->run_init (targc, targv ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            this->channels_[i]->run_init (targc, targv);
           }
         delete[] targv;
       }
@@ -95,8 +93,7 @@ EC_Master::run (int argc, char* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            this->channels_[i]->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            this->channels_[i]->execute_test ();
           }
       }
 
@@ -117,22 +114,17 @@ EC_Master::run (int argc, char* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            this->channels_[i]->run_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            this->channels_[i]->run_cleanup ();
           }
       }
 
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            this->channels_[i]->disconnect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-            this->channels_[i]->shutdown_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-            this->channels_[i]->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-            this->channels_[i]->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            this->channels_[i]->disconnect_clients ();
+            this->channels_[i]->shutdown_clients ();
+            this->channels_[i]->destroy_ec ();
+            this->channels_[i]->deactivate_ec ();
             this->channels_[i]->cleanup_tasks ();
             this->channels_[i]->cleanup_suppliers ();
             this->channels_[i]->cleanup_consumers ();
@@ -141,36 +133,29 @@ EC_Master::run (int argc, char* argv[])
       }
 
       this->root_poa_->destroy (1,
-                                1
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
    }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC_Driver::run");
+      ex._tao_print_exception ("EC_Driver::run");
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) non-corba exception raised\n"));
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
-                                   ACE_ENV_ARG_DECL)
+EC_Master::initialize_orb_and_poa (int &argc, char* argv[])
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::ORB_init (argc, argv, "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object.in ()))
     {
@@ -180,15 +165,12 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
     }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 }
 
 int
@@ -251,8 +233,7 @@ EC_Observer::~EC_Observer (void)
 }
 
 void
-EC_Observer::initialize_orb_and_poa (int&, char*[]
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+EC_Observer::initialize_orb_and_poa (int&, char*[])
 {
 }
 
@@ -275,7 +256,7 @@ EC_Observer::print_usage (void)
 }
 
 void
-EC_Observer::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Observer::execute_test (void)
 {
   int peer_count = this->master_->channel_count ();
   ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]);
@@ -289,27 +270,22 @@ EC_Observer::execute_test (ACE_ENV_SINGLE_ARG_DECL)
         this->master_->channel (i)->event_channel_.in ();
 
       this->gwys_[i].init (rmt_ec,
-                           this->event_channel_.in ()
-                           ACE_ENV_ARG_PARAMETER);
+                           this->event_channel_.in ());
 
       RtecEventChannelAdmin::Observer_var obs =
-        this->gwys_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->gwys_[i]._this ();
 
       RtecEventChannelAdmin::Observer_Handle h =
-        rmt_ec->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rmt_ec->append_observer (obs.in ());
 
       this->gwys_[i].observer_handle (h);
 
-      ACE_CHECK;
     }
 
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->activate_tasks ();
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Observer[%d] (%P|%t) suppliers are active\n",
@@ -317,7 +293,7 @@ EC_Observer::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Observer::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
+EC_Observer::run_cleanup (void)
 {
   for (int j = 0; j != this->master_->channel_count (); ++j)
     {
@@ -326,12 +302,9 @@ EC_Observer::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
 
       RtecEventChannelAdmin::EventChannel_ptr rmt_ec =
         this->master_->channel (j)->event_channel_.in ();
-      rmt_ec->remove_observer (this->gwys_[j].observer_handle ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      rmt_ec->remove_observer (this->gwys_[j].observer_handle ());
 
-      this->gwys_[j].shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->gwys_[j].shutdown ();
     }
 }
 
@@ -364,25 +337,21 @@ EC_Observer::dump_results (void)
 void
 EC_Observer::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   if (i == 0)
     {
-      this->EC_Driver::connect_consumer (consumer_admin, i
-                                         ACE_ENV_ARG_PARAMETER);
+      this->EC_Driver::connect_consumer (consumer_admin, i);
       return;
     }
   unsigned int x = ACE_OS::rand_r (this->seed_);
   if (x < RAND_MAX / 8)
-    this->EC_Driver::connect_consumer (consumer_admin, i
-                                       ACE_ENV_ARG_PARAMETER);
+    this->EC_Driver::connect_consumer (consumer_admin, i);
 }
 
 void
 EC_Observer::consumer_push (void*,
-                            const RtecEventComm::EventSet&
-                            ACE_ENV_ARG_DECL)
+                            const RtecEventComm::EventSet&)
 {
   unsigned int x = ACE_OS::rand_r (this->seed_);
   if (x < (RAND_MAX / 64))
@@ -392,8 +361,7 @@ EC_Observer::consumer_push (void*,
                     "EC_Observer[%d] (%P|%t) reconnecting\n", this->id_));
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->event_channel_->for_consumers ();
 
       for (int i = 1; i < this->n_consumers_; ++i)
         {
@@ -401,14 +369,12 @@ EC_Observer::consumer_push (void*,
 
           if (this->consumers_[i]->connected ())
             {
-              this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              this->consumers_[i]->disconnect ();
             }
           else
             {
               this->EC_Driver::connect_consumer (consumer_admin.in (),
-                                                 i ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                                                 i);
             }
         }
     }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index bb788c01258..d307ba61e04 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -41,8 +41,7 @@ public:
   virtual int run (int argc, char* argv[]);
 
   /// Obtain the orb and the poa pointers
-  virtual void initialize_orb_and_poa (int& argc, char* argv[]
-                                       ACE_ENV_ARG_DECL);
+  virtual void initialize_orb_and_poa (int& argc, char* argv[]);
 
   /// Accessors
   int channel_count (void) const;
@@ -87,24 +86,21 @@ public:
 
   // = The EC_Driver methods
   /// add some command line args to enable/disable observerions
-  virtual void initialize_orb_and_poa (int& argc, char* argv[]
-                                       ACE_ENV_ARG_DECL);
+  virtual void initialize_orb_and_poa (int& argc, char* argv[]);
   virtual int parse_args (int& argc, char* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
 
   /// Run the suppliers, using the <thread_manager> parameter
-  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
-  void run_cleanup (ACE_ENV_SINGLE_ARG_DECL);
+  void execute_test (void);
+  void run_cleanup (void);
 
   void dump_results (void);
   void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL);
+    int i);
   void consumer_push (void*,
-                      const RtecEventComm::EventSet&
-                      ACE_ENV_ARG_DECL);
+                      const RtecEventComm::EventSet&);
 
 private:
   EC_Master *master_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index b9397f997ed..67056cae531 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -25,17 +25,13 @@ main (int argc, char* argv[])
 const int base_type = 20;
 
 void
-deactivate_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL)
+deactivate_servant (PortableServer::Servant servant)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant->_default_POA ();
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (servant);
+  poa->deactivate_object (oid.in ());
 }
 
 
@@ -53,12 +49,10 @@ RND_Driver::RND_Driver (void)
 int
 RND_Driver::run (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // ****************************************************************
 
@@ -120,16 +114,12 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -139,24 +129,20 @@ RND_Driver::run (int argc, char *argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       this->consumer_admin_ =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       this->supplier_admin_ =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
@@ -176,9 +162,7 @@ RND_Driver::run (int argc, char *argv[])
                          0);
 
         this->timer_.connect (this->consumer_admin_.in (),
-                              qos.get_ConsumerQOS ()
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -188,9 +172,7 @@ RND_Driver::run (int argc, char *argv[])
         qos.insert (0, base_type, 0, 1);
 
         this->supplier_.connect (this->supplier_admin_.in (),
-                                 qos.get_SupplierQOS ()
-                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                 qos.get_SupplierQOS ());
       }
 
       // ****************************************************************
@@ -205,8 +187,7 @@ RND_Driver::run (int argc, char *argv[])
                           1);
 
           CORBA::Object_var obj =
-            this->consumers_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->consumers_[i]->_this ();
         }
 
       // ****************************************************************
@@ -222,8 +203,7 @@ RND_Driver::run (int argc, char *argv[])
           this->suppliers_[j]->activate ();
 
           CORBA::Object_var obj =
-            this->suppliers_[j]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->suppliers_[j]->_this ();
         }
 
       // ****************************************************************
@@ -238,11 +218,8 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nsuppliers_; ++k)
           {
-            deactivate_servant (this->suppliers_[k]
-                                ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-            this->suppliers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            deactivate_servant (this->suppliers_[k]);
+            this->suppliers_[k]->_remove_ref ();
           }
         delete[] this->suppliers_;
         this->suppliers_ = 0;
@@ -252,19 +229,15 @@ RND_Driver::run (int argc, char *argv[])
 
       // We destroy now to verify that the callbacks work and do not
       // produce any problems.
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
       {
         for (int k = 0; k != this->nconsumers_; ++k)
           {
-            deactivate_servant (this->consumers_[k]
-                                ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-            this->consumers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            deactivate_servant (this->consumers_[k]);
+            this->consumers_[k]->_remove_ref ();
           }
         delete[] this->consumers_;
         this->consumers_ = 0;
@@ -272,32 +245,26 @@ RND_Driver::run (int argc, char *argv[])
 
       // ****************************************************************
 
-      deactivate_servant (&ec_impl
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      deactivate_servant (&ec_impl);
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Random");
+      ex._tao_print_exception ("Random");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-RND_Driver::timer (const RtecEventComm::Event &e
-                   ACE_ENV_ARG_DECL)
+RND_Driver::timer (const RtecEventComm::Event &e)
 {
   int r = ACE_OS::rand ();
   if (r < 0)
@@ -317,8 +284,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
             event.length (1);
             event[0] = e;
             event[0].header.source ++;
-            this->supplier_.push (event ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+            this->supplier_.push (event);
           }
       }
       break;
@@ -341,9 +307,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
         qos.insert (0, base_type, 0, 1);
 
         this->suppliers_[n]->connect (this->supplier_admin_.in (),
-                                      qos.get_SupplierQOS ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                      qos.get_SupplierQOS ());
       }
       break;
 
@@ -358,9 +322,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
         qos.insert_type (base_type, 0);
 
         this->consumers_[n]->connect (this->consumer_admin_.in (),
-                                      qos.get_ConsumerQOS ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                      qos.get_ConsumerQOS ());
       }
       break;
 
@@ -370,8 +332,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n));
 
-        this->suppliers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->suppliers_[n]->disconnect ();
       }
       break;
 
@@ -381,44 +342,38 @@ RND_Driver::timer (const RtecEventComm::Event &e
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n));
 
-        this->consumers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->consumers_[n]->disconnect ();
       }
       break;
     }
 }
 
 void
-RND_Driver::event (const RtecEventComm::Event &e
-                   ACE_ENV_ARG_DECL)
+RND_Driver::event (const RtecEventComm::Event &e)
 {
-  this->timer (e ACE_ENV_ARG_PARAMETER);
+  this->timer (e);
 }
 
 // ****************************************************************
 
 void
-RND_Timer::push (const RtecEventComm::EventSet &event
-                 ACE_ENV_ARG_DECL)
+RND_Timer::push (const RtecEventComm::EventSet &event)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      this->driver_->timer (event[0] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->driver_->timer (event[0]);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 }
 
 // ****************************************************************
 
 void
 RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
-                       const RtecEventChannelAdmin::ConsumerQOS &qos
-                       ACE_ENV_ARG_DECL)
+                       const RtecEventChannelAdmin::ConsumerQOS &qos)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -426,44 +381,38 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->proxy_ = admin->obtain_push_supplier ();
       }
     proxy =
       RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ());
   }
   RtecEventComm::PushConsumer_var me =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
   proxy->connect_push_consumer (me.in (),
-                                qos
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                qos);
 }
 
 void
-RND_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RND_Consumer::disconnect (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->disconnect_push_supplier ();
   this->proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-RND_Consumer::push (const RtecEventComm::EventSet &event
-                    ACE_ENV_ARG_DECL)
+RND_Consumer::push (const RtecEventComm::EventSet &event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->event (event[0] ACE_ENV_ARG_PARAMETER);
+  this->driver_->event (event[0]);
 }
 
 void
-RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Consumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -472,8 +421,7 @@ RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
-                       const RtecEventChannelAdmin::SupplierQOS &qos
-                       ACE_ENV_ARG_DECL)
+                       const RtecEventChannelAdmin::SupplierQOS &qos)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -481,49 +429,43 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        this->proxy_ = admin->obtain_push_consumer ();
       }
 
     proxy =
       RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
   RtecEventComm::PushSupplier_var me =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
   proxy->connect_push_supplier (me.in (),
-                                qos
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                qos);
 }
 
 void
-RND_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RND_Supplier::disconnect (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->disconnect_push_consumer ();
   this->proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-RND_Supplier::push_new_event (ACE_ENV_SINGLE_ARG_DECL)
+RND_Supplier::push_new_event (void)
 {
   RtecEventComm::EventSet event (1);
   event.length (1);
   event[0].header.type   = base_type;
   event[0].header.source = 0;
 
-  this->push (event ACE_ENV_ARG_PARAMETER);
+  this->push (event);
 }
 
 void
-RND_Supplier::push (RtecEventComm::EventSet &event
-                    ACE_ENV_ARG_DECL)
+RND_Supplier::push (RtecEventComm::EventSet &event)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -536,11 +478,11 @@ RND_Supplier::push (RtecEventComm::EventSet &event
       RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
 
-  proxy->push (event ACE_ENV_ARG_PARAMETER);
+  proxy->push (event);
 }
 
 void
-RND_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Supplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -553,19 +495,16 @@ RND_Supplier::svc (void)
   int niterations = 5000;
   for (int i = 0; i != niterations; ++i)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           ACE_Time_Value tv (0, 10000);
           ACE_OS::sleep (tv);
 
-          this->push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->push_new_event ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
         }
-      ACE_ENDTRY;
       if (this->verbose_
           && i * 100 / niterations >= percent)
         {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index a1821d24c0b..b18d4a3e44d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -35,16 +35,14 @@ public:
   /// Constructor
   RND_Consumer (RND_Driver *driver);
 
-  void push (const RtecEventComm::EventSet &event
-             ACE_ENV_ARG_DECL)
+  void push (const RtecEventComm::EventSet &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+                const RtecEventChannelAdmin::ConsumerQOS &qos);
+  void disconnect (void);
 
 protected:
   /// The driver
@@ -70,8 +68,7 @@ class RND_Timer : public RND_Consumer
 public:
   RND_Timer (RND_Driver *driver);
 
-  void push (const RtecEventComm::EventSet &event
-             ACE_ENV_ARG_DECL)
+  void push (const RtecEventComm::EventSet &event)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -97,16 +94,14 @@ public:
   RND_Supplier (int verbose);
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
-                const RtecEventChannelAdmin::SupplierQOS &qos
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+                const RtecEventChannelAdmin::SupplierQOS &qos);
+  void disconnect (void);
 
   /// Push a single event...
-  void push_new_event (ACE_ENV_SINGLE_ARG_DECL);
-  void push (RtecEventComm::EventSet &event
-             ACE_ENV_ARG_DECL);
+  void push_new_event (void);
+  void push (RtecEventComm::EventSet &event);
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Active method
@@ -140,12 +135,10 @@ public:
   int run (int argc, char *argv[]);
 
   /// The main timer has expired
-  void timer (const RtecEventComm::Event &e
-              ACE_ENV_ARG_DECL);
+  void timer (const RtecEventComm::Event &e);
 
   /// One of the consumers has received an event
-  void event (const RtecEventComm::Event &e
-              ACE_ENV_ARG_DECL);
+  void event (const RtecEventComm::Event &e);
 
 private:
   RND_Driver (const RND_Driver &);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 1fd8c294029..9bac1970f9c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -90,18 +90,16 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 }
 
 void
-EC_Reconnect::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Reconnect::execute_test (void)
 {
-  this->execute_consumer_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->execute_supplier_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->execute_consumer_test ();
+  this->execute_supplier_test ();
 
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
   this->consumer_reconnect_.dump_results ("Reconnect/consumer", gsf);
   this->supplier_reconnect_.dump_results ("Reconnect/supplier", gsf);
 
-  // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // this->EC_Driver::execute_test ();
 }
 
 void
@@ -110,12 +108,11 @@ EC_Reconnect::dump_results (void)
 }
 
 void
-EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Reconnect::execute_consumer_test (void)
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
-  this->build_consumer_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->build_consumer_qos (0, qos, shutdown_event_type);
 
   if (this->allow_consumer_reconnect_)
     {
@@ -124,9 +121,7 @@ EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           this->consumers_[0]->connect (qos,
-                                        shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        shutdown_event_type);
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->consumer_reconnect_.sample (stop - start_time,
                                             stop - start);
@@ -134,41 +129,33 @@ EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
     }
   else
     {
-      ACE_TRY
+      try
         {
           this->consumers_[0]->connect (qos,
-                                        shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                        shutdown_event_type);
 
           ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
         }
-      ACE_CATCH (RtecEventChannelAdmin::AlreadyConnected, ex)
+      catch (const RtecEventChannelAdmin::AlreadyConnected&)
         {
           /* do nothing */
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Expected AlreadyConnected exception");
+          ex._tao_print_exception ("Expected AlreadyConnected exception");
         }
-      ACE_ENDTRY;
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->event_channel_->for_consumers ();
 
       ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->consumers_[0]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->consumers_[0]->disconnect ();
           this->consumers_[0]->connect (consumer_admin.in (),
                                         qos,
-                                        shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        shutdown_event_type);
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->consumer_reconnect_.sample (stop - start_time,
                                             stop - start);
@@ -177,12 +164,11 @@ EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Reconnect::execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Reconnect::execute_supplier_test (void)
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
-  this->build_supplier_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->build_supplier_qos (0, qos, shutdown_event_type);
 
   if (this->allow_supplier_reconnect_)
     {
@@ -190,9 +176,7 @@ EC_Reconnect::execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL)
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->suppliers_[0]->connect (qos, shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->suppliers_[0]->connect (qos, shutdown_event_type);
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->supplier_reconnect_.sample (stop - start_time,
                                             stop - start);
@@ -200,40 +184,32 @@ EC_Reconnect::execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL)
     }
   else
     {
-      ACE_TRY
+      try
         {
-          this->suppliers_[0]->connect (qos, shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->suppliers_[0]->connect (qos, shutdown_event_type);
 
           ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
         }
-      ACE_CATCH (RtecEventChannelAdmin::AlreadyConnected, ex)
+      catch (const RtecEventChannelAdmin::AlreadyConnected&)
         {
           /* do nothing */
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Expected AlreadyConnected exception");
+          ex._tao_print_exception ("Expected AlreadyConnected exception");
         }
-      ACE_ENDTRY;
 
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->event_channel_->for_suppliers ();
 
       ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->suppliers_[0]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->suppliers_[0]->disconnect ();
           this->suppliers_[0]->connect (supplier_admin.in (),
                                         qos,
-                                        shutdown_event_type
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        shutdown_event_type);
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->supplier_reconnect_.sample (stop - start_time,
                                             stop - start);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
index e99cd4b9ffb..e1524d00b2c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
@@ -51,14 +51,14 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just test connect and disconnect calls.
-  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+  void execute_test (void);
 
   /// Don't dump the EC_Driver results, they are meaningless.
   void dump_results (void);
 
   /// Separate the suppliers and consumers.
-  void execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void execute_consumer_test (void);
+  void execute_supplier_test (void);
 
 private:
   /// What aspect of reconnection are we going to test?
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index b06b6e50355..399a00fe4e7 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -49,13 +49,12 @@ EC_Schedule::print_usage (void)
 }
 
 void
-EC_Schedule::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL)
+EC_Schedule::initialize_ec_impl (void)
 {
   this->scheduler_impl_ = new ACE_Config_Scheduler;
-  this->scheduler_ = this->scheduler_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->scheduler_ = this->scheduler_impl_->_this ();
 
-  this->EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->EC_Driver::initialize_ec_impl ();
 }
 
 void
@@ -72,7 +71,7 @@ EC_Schedule::cleanup_ec (void)
 }
 
 void
-EC_Schedule::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Schedule::execute_test (void)
 {
   CORBA::Long min_priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -92,9 +91,7 @@ EC_Schedule::execute_test (ACE_ENV_SINGLE_ARG_DECL)
                                         infos.out (),
                                         deps.out (),
                                         configs.out (),
-                                        anomalies.out ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        anomalies.out ());
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG,
@@ -115,15 +112,13 @@ void
 EC_Schedule::build_consumer_qos (
   int i,
   RtecEventChannelAdmin::ConsumerQOS& qos,
-  int& shutdown_event_type
-  ACE_ENV_ARG_DECL)
+  int& shutdown_event_type)
 {
   char name[128];
   ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04x", i);
 
   RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->scheduler_->create (name);
 
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -137,9 +132,7 @@ EC_Schedule::build_consumer_qos (
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          time,
                          0,
-                         RtecScheduler::OPERATION
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         RtecScheduler::OPERATION);
 
   int type_start =
     this->consumer_type_start_
@@ -161,15 +154,13 @@ void
 EC_Schedule::build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL)
+      int& shutdown_event_type)
 {
   char name[128];
   ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04x", i);
 
   RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->scheduler_->create (name);
 
   ACE_Time_Value tv (0, this->burst_pause_);
   RtecScheduler::Period_t rate = tv.usec () * 10;
@@ -188,9 +179,7 @@ EC_Schedule::build_supplier_qos (
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          time,
                          1,
-                         RtecScheduler::OPERATION
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         RtecScheduler::OPERATION);
 
   int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
   int supplier_id = i + 1;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
index c139b699227..c627edeb04d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
@@ -52,12 +52,12 @@ public:
   virtual void print_usage (void);
 
   /// Set the scheduling service attribute
-  void initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL);
+  void initialize_ec_impl (void);
   void cleanup_ec (void);
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
 
   /// Don't run the suppliers, just compute the schedule.
-  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+  void execute_test (void);
 
   /// Don't dump the EC_Driver results, they are meaningless.
   void dump_results (void);
@@ -66,13 +66,11 @@ public:
   virtual void build_consumer_qos (
       int i,
       RtecEventChannelAdmin::ConsumerQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED);
+      int& shutdown_event_type);
   virtual void build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED);
+      int& shutdown_event_type);
 
 private:
   /// The scheduler implementation
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index ea2c18a1743..69353f28f52 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -22,19 +22,17 @@ EC_Shutdown::EC_Shutdown (void)
 }
 
 void
-EC_Shutdown::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Shutdown::execute_test (void)
 {
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n"));
 
-  this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_ec ();
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec destroyed\n"));
 
-  this->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate_ec ();
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec deactivated\n"));
@@ -44,16 +42,13 @@ EC_Shutdown::execute_test (ACE_ENV_SINGLE_ARG_DECL)
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec cleanup\n"));
 
-  this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->initialize_ec_impl ();
+  this->connect_consumers ();
+  this->connect_suppliers ();
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) status reset\n"));
 
-  // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // this->EC_Driver::execute_test ();
 }
 
 void
@@ -71,8 +66,7 @@ EC_Shutdown::dump_results (void)
 }
 
 void
-EC_Shutdown::consumer_disconnect (void* cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+EC_Shutdown::consumer_disconnect (void* cookie)
 {
   this->consumer_disconnects_++;
   if (this->verbose ())
@@ -80,8 +74,7 @@ EC_Shutdown::consumer_disconnect (void* cookie
 }
 
 void
-EC_Shutdown::supplier_disconnect (void* cookie
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+EC_Shutdown::supplier_disconnect (void* cookie)
 {
   this->supplier_disconnects_++;
   if (this->verbose ())
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
index 81050629f9f..b24d59eed49 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
@@ -36,18 +36,16 @@ public:
 
   // = The EC_Driver methods
   /// Don't run the suppliers just create the EC and then destroy it.
-  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+  void execute_test (void);
 
   /// Don't dump the EC_Driver results, they are meaningless.
   void dump_results (void);
 
   /// One of the consumers in the test has been disconnected from the EC
-  virtual void consumer_disconnect (void* consumer_cookie
-                                    ACE_ENV_ARG_DECL);
+  virtual void consumer_disconnect (void* consumer_cookie);
 
   /// One of the suppliers in the test has been disconnected from the EC
-  virtual void supplier_disconnect (void* supplier_cookie
-                                    ACE_ENV_ARG_DECL);
+  virtual void supplier_disconnect (void* supplier_cookie);
 
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index f00ec8abab4..267c97c53e2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -19,25 +19,19 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -45,38 +39,31 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
       EC_Counting_Supplier supplier;
 
       supplier.activate (consumer_admin.in (),
-                         50 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         50);
       supplier.connect (supplier_admin.in (),
                         0, 20,
-                        0, 20
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        0, 20);
 
       // ****************************************************************
 
@@ -101,9 +88,7 @@ main (int argc, char* argv[])
                                   0);
 
         interval_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -128,9 +113,7 @@ main (int argc, char* argv[])
                                   0);
 
         conjunction_consumer.connect (consumer_admin.in (),
-                                      consumer_qos.get_ConsumerQOS ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                      consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -151,9 +134,7 @@ main (int argc, char* argv[])
                                   0);
 
         deadline_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -165,29 +146,22 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      deadline_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      deadline_consumer.disconnect ();
 
-      conjunction_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      conjunction_consumer.disconnect ();
 
-      interval_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      interval_consumer.disconnect ();
 
-      supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier.deactivate ();
+      supplier.disconnect ();
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // ****************************************************************
 
@@ -195,11 +169,10 @@ main (int argc, char* argv[])
       conjunction_consumer.dump_results (25, 5);
       deadline_consumer.dump_results (100, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index af77cc9fcbd..8025a446b2b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -7,8 +7,8 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 
-ACE_RCSID (EC_Tests, 
-           Wildcard, 
+ACE_RCSID (EC_Tests,
+           Wildcard,
            "$Id$")
 
 int
@@ -16,25 +16,19 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // ****************************************************************
 
@@ -42,25 +36,21 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
 
       // ****************************************************************
 
@@ -71,80 +61,60 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier;
 
       supplier.activate (consumer_admin.in (),
-                         milliseconds
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         milliseconds);
       supplier.connect (supplier_admin.in (),
                         event_source,
                         event_type,
                         event_source,
-                        event_type
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier other_supplier;
 
       other_supplier.activate (consumer_admin.in (),
-                               milliseconds
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               milliseconds);
       other_supplier.connect (supplier_admin.in (),
                               event_source + 1,
                               event_type + 1,
                               event_source + 1,
-                              event_type + 1
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              event_type + 1);
 
       // ****************************************************************
 
       EC_Counting_Supplier any_source_supplier;
 
       any_source_supplier.activate (consumer_admin.in (),
-                                    milliseconds
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    milliseconds);
       any_source_supplier.connect (supplier_admin.in (),
                                    0,
                                    event_type,
                                    event_source,
-                                   event_type
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier any_type_supplier;
 
       any_type_supplier.activate (consumer_admin.in (),
-                                  milliseconds
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  milliseconds);
       any_type_supplier.connect (supplier_admin.in (),
                                  event_source,
                                  0,
                                  event_source,
-                                 event_type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 event_type);
 
       // ****************************************************************
 
       EC_Counting_Supplier wildcard_supplier;
 
       wildcard_supplier.activate (consumer_admin.in (),
-                                  milliseconds
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  milliseconds);
       wildcard_supplier.connect (supplier_admin.in (),
                                  0,
                                  0,
                                  event_source,
-                                 event_type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 event_type);
 
       // ****************************************************************
 
@@ -159,9 +129,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         regular_consumer.connect (consumer_admin.in (),
-                                  consumer_qos.get_ConsumerQOS ()
-                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                  consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -177,9 +145,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, 0, 0);
 
         any_type_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -195,9 +161,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (0, event_type, 0);
 
         any_source_consumer.connect (consumer_admin.in (),
-                                     consumer_qos.get_ConsumerQOS ()
-                                     ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                     consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -213,9 +177,7 @@ main (int argc, char* argv[])
         consumer_qos.insert (0, 0, 0);
 
         wildcard_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS ()
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                   consumer_qos.get_ConsumerQOS ());
       }
 
       // ****************************************************************
@@ -227,53 +189,37 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      wildcard_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      wildcard_consumer.disconnect ();
 
-      any_source_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      any_source_consumer.disconnect ();
 
-      any_type_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      any_type_consumer.disconnect ();
 
-      regular_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      regular_consumer.disconnect ();
 
-      wildcard_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      wildcard_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      wildcard_supplier.deactivate ();
+      wildcard_supplier.disconnect ();
 
-      any_type_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      any_type_supplier.deactivate ();
 
-      any_source_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      any_source_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      any_source_supplier.deactivate ();
+      any_source_supplier.disconnect ();
 
-      other_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      other_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      other_supplier.deactivate ();
+      other_supplier.disconnect ();
 
-      supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier.deactivate ();
+      supplier.disconnect ();
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // ****************************************************************
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // ****************************************************************
 
@@ -309,11 +255,10 @@ main (int argc, char* argv[])
         + supplier.event_count;
       regular_consumer.dump_results (expected, 5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index fe118587fac..ef5097c6c7a 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -22,16 +22,14 @@ EC_Wrapper::create (void)
 
 EC_Wrapper::~EC_Wrapper (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->destroy_ec ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // ignore
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -59,46 +57,43 @@ EC_Wrapper::init (CORBA::ORB_ptr orb,
                   -1);
   auto_ptr<TAO_EC_Event_Channel> impl_release (impl);
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      impl->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Suppressed the following exception "
-                           "in EC_Wrapper::init:\n");
+      ex._tao_print_exception (
+        "Suppressed the following exception ""in EC_Wrapper::init:\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   this->ec_impl_ = impl_release.release ();
   return 0;
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-EC_Wrapper::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Wrapper::for_consumers (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->ec_impl_)
-    return this->ec_impl_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->ec_impl_->for_consumers ();
   else
     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), RtecEventChannelAdmin::ConsumerAdmin::_nil());
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-EC_Wrapper::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Wrapper::for_suppliers (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->ec_impl_)
-    return this->ec_impl_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->ec_impl_->for_suppliers ();
   else
     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), RtecEventChannelAdmin::SupplierAdmin::_nil());
 }
 
 void
-EC_Wrapper::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Wrapper::destroy_ec (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   auto_ptr<TAO_EC_Event_Channel> ec_impl_aptr (this->ec_impl_);
@@ -106,58 +101,52 @@ EC_Wrapper::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
 
   if (ec_impl_aptr.get ())
     {
-      ec_impl_aptr->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      ec_impl_aptr->destroy ();
     }
 }
 
 void
-EC_Wrapper::destroy (ACE_ENV_SINGLE_ARG_DECL)
+EC_Wrapper::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister from POA.
   this->deactivator_.deactivate ();
 
-  ACE_TRY
+  try
     {
-      this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->destroy_ec ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       this->orb_->shutdown ();
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   this->orb_->shutdown ();
 }
 
 RtecEventChannelAdmin::Observer_Handle
-EC_Wrapper::append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                             ACE_ENV_ARG_DECL)
+EC_Wrapper::append_observer (RtecEventChannelAdmin::Observer_ptr observer)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   if (this->ec_impl_)
-    return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER);
+    return this->ec_impl_->append_observer (observer);
   else
     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
 }
 
 void
-EC_Wrapper::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
-                             ACE_ENV_ARG_DECL)
+EC_Wrapper::remove_observer (RtecEventChannelAdmin::Observer_Handle handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   if (this->ec_impl_)
-    this->ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
+    this->ec_impl_->remove_observer (handle);
   else
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index 20031f40dc1..adc71f8e9b5 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -44,26 +44,24 @@ public:
   /// RtecEventChannelAdmin::Event_Channel methods.
   //@{
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    for_consumers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    for_suppliers (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy the Event Channel, deactivate from POA, and shut down
   /// the ORB.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                     ACE_ENV_ARG_DECL)
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle
-                                ACE_ENV_ARG_DECL)
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -80,7 +78,7 @@ private:
 
   /// Helper - destroys Event Channel and deactivate from POA, if
   /// necessary.
-  void destroy_ec (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void destroy_ec (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Event Channel implementation.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 667ac9e8efb..23c8c23cbff 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -55,13 +55,11 @@ Gateway_EC::parse_args (int argc, char *argv [])
 
 void
 Gateway_EC::write_ior_file (CORBA::ORB_ptr orb,
-                            RtecEventChannelAdmin::EventChannel_ptr ec
-                            ACE_ENV_ARG_DECL)
+                            RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   // Write EC ior to a file.
   CORBA::String_var str;
-  str = orb->object_to_string (ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  str = orb->object_to_string (ec);
 
   FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, "w");
   if (output_file == 0)
@@ -69,7 +67,7 @@ Gateway_EC::write_ior_file (CORBA::ORB_ptr orb,
       ACE_ERROR ((LM_ERROR,
                   "Cannot open output file for writing IOR: %s",
                   this->ec_ior_file_));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   ACE_OS::fprintf (output_file, "%s", str.in ());
@@ -86,30 +84,25 @@ Gateway_EC::run (int argc, char ** argv)
 
   TAO_EC_ORB_Holder orb_destroyer;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
       orb_destroyer.init (orb);
 
       if (parse_args (argc, argv) == -1)
         return -1;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
       if (check_for_nil (poa.in (), "POA") == -1)
         return -1;
       PortableServer::POAManager_var manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      manager->activate ();
 
       // Set up EC.
       TAO_EC_Servant_Var<EC_Wrapper> ec_wrapper (EC_Wrapper::create ());
@@ -125,13 +118,10 @@ Gateway_EC::run (int argc, char ** argv)
       activate (ec,
                 poa.in (),
                 ec_wrapper.in (),
-                ec_deactivator
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                ec_deactivator);
       ec_wrapper->set_deactivator (ec_deactivator);
 
-      this->write_ior_file (orb.in (), ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->write_ior_file (orb.in (), ec.in ());
 
       // Set up multicast components.
       // Obtain mcast gateway from service configurator.
@@ -141,22 +131,17 @@ Gateway_EC::run (int argc, char ** argv)
 
       if (!gateway)
         {
-          ACE_TRY_THROW (CORBA::INTERNAL ());
-          ACE_TRY_CHECK;
+          throw CORBA::INTERNAL ();
         }
-      gateway->run (orb.in (), ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      gateway->run (orb.in (), ec.in ());
 
       // Run server.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected Exception in Gateway EC:");
+      ex._tao_print_exception ("Unexpected Exception in Gateway EC:");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
index 1db97bc26de..801040fa6d4 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h
@@ -37,8 +37,7 @@ private:
   int parse_args (int argc, char *argv[]);
   int check_for_nil (CORBA::Object_ptr obj, const char *message);
   void write_ior_file (CORBA::ORB_ptr orb,
-                       RtecEventChannelAdmin::EventChannel_ptr ec
-                       ACE_ENV_ARG_DECL);
+                       RtecEventChannelAdmin::EventChannel_ptr ec);
   //@}
 
   /// Event Channel ior is written to this file.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index 390b0a14f09..365939b8c4d 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -19,19 +19,18 @@ public:
   //@{
   /// Logs each event.  Initiates shutdown after receiving 100 events
   /// of each type.
-  virtual void push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// No-op.
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Helper - destroys EC, shutdowns the ORB and prints number of
   /// events received.
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL)
+  void disconnect (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Number of events of different types pushed to us by EC.
@@ -57,8 +56,7 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb,
 }
 
 void
-EC_Consumer::push (const RtecEventComm::EventSet &events
-                   ACE_ENV_ARG_DECL)
+EC_Consumer::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < events.length (); ++i)
@@ -88,17 +86,17 @@ EC_Consumer::push (const RtecEventComm::EventSet &events
   if (this->a_events_ >= 100
       && this->b_events_ >= 100
       && this->c_events_ >= 100)
-    this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->disconnect ();
 }
 
 void
-EC_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Consumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->a_events_ == 100
@@ -111,10 +109,9 @@ EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
                   "(A, B, and C), as expected\n"));
     }
 
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_->destroy ();
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 ////////////////////////////////////////////////////////////
@@ -139,36 +136,29 @@ parse_args (int /* argc */, char ** /* argv */)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
       if (check_for_nil (poa.in (), "POA") == -1)
         return 1;
 
       PortableServer::POAManager_var manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
       // Obtain reference to EC.
-      obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
@@ -184,20 +174,16 @@ main (int argc, char *argv[])
       activate (consumer,
                 poa.in (),
                 consumer_impl.in (),
-                consumer_deactivator
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                consumer_deactivator);
       consumer_deactivator.disallow_deactivation ();
 
       // Obtain reference to ConsumerAdmin.
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->for_consumers ();
 
       // Obtain ProxyPushSupplier and connect this consumer.
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       ACE_ConsumerQOS_Factory qos;
       qos.start_disjunction_group (3);
@@ -205,25 +191,19 @@ main (int argc, char *argv[])
       qos.insert_type (B_EVENT_TYPE, 0);
       qos.insert_type (C_EVENT_TYPE, 0);
       supplier->connect_push_consumer (consumer.in (),
-                                       qos.get_ConsumerQOS ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       qos.get_ConsumerQOS ());
 
       // Allow processing of CORBA requests.
-      manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager->activate ();
 
       // Receive events from EC.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Consumer:");
+      ex._tao_print_exception ("Exception in Consumer:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
index ab13f1a28ef..2945e468ffc 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
@@ -7,8 +7,7 @@
 #include "ace/Log_Msg.h"
 
 void
-send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
-             ACE_ENV_ARG_DECL)
+send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer)
 {
   // Events we'll send.
   RtecEventComm::EventSet events (1);
@@ -22,16 +21,13 @@ send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
     {
       // Send 1 event of each type.
       events[0].header.type = A_EVENT_TYPE;
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer->push (events);
 
       events[0].header.type = B_EVENT_TYPE;
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer->push (events);
 
       events[0].header.type = C_EVENT_TYPE;
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer->push (events);
     }
 }
 
@@ -56,37 +52,30 @@ parse_args (int /*argc*/, char ** /*argv*/)
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize ORB and parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       // Obtain reference to EC.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
       // Obtain reference to SupplierAdmin.
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->for_suppliers ();
 
       // Obtain ProxyPushConsumer and connect this supplier.
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       ACE_SupplierQOS_Factory qos;
       qos.insert (SOURCE_ID, A_EVENT_TYPE, 0, 1);
@@ -95,26 +84,20 @@ main (int argc, char *argv[])
 
       consumer->connect_push_supplier
         (RtecEventComm::PushSupplier::_nil (),
-         qos.get_SupplierQOS ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         qos.get_SupplierQOS ());
 
       // Send events to EC.
-      send_events (consumer.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      send_events (consumer.in ());
 
       // Tell EC to shut down.
-      ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec->destroy ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Supplier:");
+      ex._tao_print_exception ("Exception in Supplier:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index 7b95c67318f..473802c28d6 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -18,11 +18,10 @@ public:
   /// PushConsumer methods.
   //@{
   /// Logs each event.  Initiates shutdown after receiving 100 events.
-  virtual void push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException));
   /// No-op.
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -30,7 +29,7 @@ private:
 
   /// Helper - destroys EC, shutdowns the ORB and prints number of
   /// events received.
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Number of events pushed to us by EC.
   size_t n_events_;
@@ -49,8 +48,7 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb,
 }
 
 void
-EC_Consumer::push (const RtecEventComm::EventSet &events
-                   ACE_ENV_ARG_DECL)
+EC_Consumer::push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < events.length (); ++i)
@@ -60,17 +58,17 @@ EC_Consumer::push (const RtecEventComm::EventSet &events
     }
 
   if (this->n_events_ >= 100)
-    this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->disconnect ();
 }
 
 void
-EC_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect (void)
 {
   if (this->n_events_ == 100)
     {
@@ -78,11 +76,9 @@ EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
                   "SUCCESS: consumer received 100 events, as expected\n"));
     }
 
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_->destroy ();
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 ////////////////////////////////////////////////////////////
@@ -107,36 +103,29 @@ parse_args (int /* argc */, char ** /* argv */)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
       if (check_for_nil (poa.in (), "POA") == -1)
         return 1;
 
       PortableServer::POAManager_var manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
       // Obtain reference to EC.
-      obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
@@ -152,44 +141,34 @@ main (int argc, char *argv[])
       activate (consumer,
                 poa.in (),
                 consumer_impl.in (),
-                consumer_deactivator
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                consumer_deactivator);
       consumer_deactivator.disallow_deactivation ();
 
       // Obtain reference to ConsumerAdmin.
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->for_consumers ();
 
       // Obtain ProxyPushSupplier and connect this consumer.
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       ACE_ConsumerQOS_Factory qos;
       qos.start_disjunction_group (1);
       qos.insert_type (ACE_ES_EVENT_ANY, 0);
       supplier->connect_push_consumer (consumer.in (),
-                                       qos.get_ConsumerQOS ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       qos.get_ConsumerQOS ());
 
       // Allow processing of CORBA requests.
-      manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager->activate ();
 
       // Receive events from EC.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Consumer:");
+      ex._tao_print_exception ("Exception in Consumer:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
index d7d0b4f1973..dddfe6c6d60 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
@@ -7,8 +7,7 @@
 #include "ace/Log_Msg.h"
 
 void
-send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
-             ACE_ENV_ARG_DECL)
+send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer)
 {
   RtecEventComm::EventSet events (1);
   events.length (1);
@@ -20,8 +19,7 @@ send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
 
   for (int i = 0; i < 100; ++i)
     {
-      consumer->push (events ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer->push (events);
     }
 }
 
@@ -46,62 +44,50 @@ parse_args (int /*argc*/, char ** /*argv*/)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       // Obtain reference to EC.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
       // Obtain reference to SupplierAdmin.
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->for_suppliers ();
 
       // Obtain ProxyPushConsumer and connect this supplier.
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       ACE_SupplierQOS_Factory qos;
       qos.insert (SOURCE_ID, EVENT_TYPE, 0, 1);
 
       consumer->connect_push_supplier
         (RtecEventComm::PushSupplier::_nil (),
-         qos.get_SupplierQOS ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         qos.get_SupplierQOS ());
 
       // Send 100 events to EC.
-      send_events (consumer.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      send_events (consumer.in ());
 
       // Tell EC to shut down.
-      ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec->destroy ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Supplier:");
+      ex._tao_print_exception ("Exception in Supplier:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index ce7c85cdd95..d93f5402332 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -56,8 +56,7 @@ public:
   // will not have a chance to execute, it is the responsibility of
   // the user.)
   void init (CORBA::ORB_var orb,
-             RtecEventChannelAdmin::EventChannel_var ec
-             ACE_ENV_ARG_DECL);
+             RtecEventChannelAdmin::EventChannel_var ec);
 
   // No-op if the object hasn't been fully initialized.  Otherwise,
   // deregister from reactor and poa, destroy ec or just disconnect from it
@@ -72,12 +71,11 @@ public:
   /// PushConsumer methods.
   //@{
   /// Update our <heartbeats_> database to reflect newly received heartbeats.
-  virtual void push (const RtecEventComm::EventSet &events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet &events)
     ACE_THROW_SPEC((CORBA::SystemException));
 
   /// Initiate shutdown().
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC((CORBA::SystemException));
   //@}
 
@@ -107,9 +105,9 @@ private:
   int check_args (CORBA::ORB_var orb,
                   RtecEventChannelAdmin::EventChannel_var ec);
   /// Connects to EC as a supplier.
-  void connect_as_supplier (ACE_ENV_SINGLE_ARG_DECL);
+  void connect_as_supplier (void);
   /// Connects to EC as a consumer.  Activate with default POA.
-  void connect_as_consumer (ACE_ENV_SINGLE_ARG_DECL);
+  void connect_as_consumer (void);
   /// Call destroy() on the EC.  Does not propagate exceptions.
   void destroy_ec (void);
   /// Registers with orb's reactor for timeouts ocurring every 0.5
@@ -221,13 +219,12 @@ Heartbeat_Application::check_args (CORBA::ORB_var orb,
 
 void
 Heartbeat_Application::init (CORBA::ORB_var orb,
-                             RtecEventChannelAdmin::EventChannel_var ec
-                             ACE_ENV_ARG_DECL)
+                             RtecEventChannelAdmin::EventChannel_var ec)
 {
   // Verify arguments.
   if (this->check_args (orb, ec) == -1)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Get hostname & process id, i.e., identity of this application.
@@ -243,26 +240,22 @@ Heartbeat_Application::init (CORBA::ORB_var orb,
       ACE_ERROR ((LM_ERROR,
                   "Heartbeat_Application::init - "
                   "cannot get hostname\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // Connect to EC as a supplier.
-  this->connect_as_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->connect_as_supplier ();
 
   // Connect to EC as a consumer.
-  ACE_TRY
+  try
     {
-      this->connect_as_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->connect_as_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       this->consumer_proxy_disconnect_.execute ();
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   // Register for reactor timeouts.
   if (this->register_for_timeouts () == -1)
@@ -270,7 +263,7 @@ Heartbeat_Application::init (CORBA::ORB_var orb,
       this->consumer_proxy_disconnect_.execute ();
       this->supplier_proxy_disconnect_.execute ();
       this->deactivator_.deactivate ();
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   this->initialized_ = 1;
@@ -310,26 +303,22 @@ Heartbeat_Application::stop_timeouts (void)
 }
 
 void
-Heartbeat_Application::connect_as_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Heartbeat_Application::connect_as_supplier (void)
 {
   // Obtain reference to SupplierAdmin.
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->ec_->for_suppliers ();
 
   // Obtain ProxyPushConsumer and connect this supplier.
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
   Consumer_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
 
   ACE_SupplierQOS_Factory qos;
   qos.insert (SOURCE_ID, HEARTBEAT, 0, 1);
 
   proxy->connect_push_supplier (RtecEventComm::PushSupplier::_nil (),
-                                qos.get_SupplierQOS ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                qos.get_SupplierQOS ());
 
   // Update resource managers.
   this->consumer_ = proxy._retn ();
@@ -337,7 +326,7 @@ Heartbeat_Application::connect_as_supplier (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Heartbeat_Application::connect_as_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Heartbeat_Application::connect_as_consumer (void)
 {
   // Activate with poa.
   RtecEventComm::PushConsumer_var consumer_ref;
@@ -347,19 +336,15 @@ Heartbeat_Application::connect_as_consumer (ACE_ENV_SINGLE_ARG_DECL)
   activate (consumer_ref,
             poa.in (),
             this,
-            deactivator
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+            deactivator);
 
   // Obtain reference to ConsumerAdmin.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->ec_->for_consumers ();
 
   // Obtain ProxyPushSupplier..
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
   Supplier_Proxy_Disconnect new_proxy_disconnect (proxy.in ());
 
   // Connect this consumer.
@@ -367,9 +352,7 @@ Heartbeat_Application::connect_as_consumer (ACE_ENV_SINGLE_ARG_DECL)
   qos.start_disjunction_group (1);
   qos.insert_type (ACE_ES_EVENT_ANY, 0);
   proxy->connect_push_consumer (consumer_ref.in (),
-                                qos.get_ConsumerQOS ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                qos.get_ConsumerQOS ());
 
   // Update resource managers.
   this->supplier_proxy_disconnect_.set_command (new_proxy_disconnect);
@@ -380,7 +363,7 @@ int
 Heartbeat_Application::handle_timeout (const ACE_Time_Value&,
                                        const void*)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->n_timeouts_++ < HEARTBEATS_TO_SEND)
         {
@@ -399,8 +382,7 @@ Heartbeat_Application::handle_timeout (const ACE_Time_Value&,
                                           (u_char *)this->hostname_and_pid_,
                                           0);
 
-          this->consumer_->push (events ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->consumer_->push (events);
         }
       else
         // We already sent the required number of heartbeats.  Time to
@@ -409,19 +391,16 @@ Heartbeat_Application::handle_timeout (const ACE_Time_Value&,
           this->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Suppressed the following exception in "
-                           "Heartbeat_Application::handle_timeout:\n");
+      ex._tao_print_exception (
+        "Suppressed the following exception in ""Heartbeat_Application::handle_timeout:\n");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-Heartbeat_Application::push (const RtecEventComm::EventSet &events
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Heartbeat_Application::push (const RtecEventComm::EventSet &events)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < events.length (); ++i)
@@ -467,7 +446,7 @@ Heartbeat_Application::push (const RtecEventComm::EventSet &events
 }
 
 void
-Heartbeat_Application::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Heartbeat_Application::disconnect_push_consumer (void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->shutdown ();
@@ -478,18 +457,15 @@ Heartbeat_Application::destroy_ec (void)
 {
   if (!CORBA::is_nil (this->ec_.in ()))
     {
-      ACE_TRY_NEW_ENV
+      try
         {
-          this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->ec_->destroy ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Suppressed the following exception in "
-                               "Application_Heartbeat::destroy_ec\n");
+          ex._tao_print_exception (
+            "Suppressed the following exception in ""Application_Heartbeat::destroy_ec\n");
         }
-      ACE_ENDTRY;
 
       this->ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
     }
@@ -541,18 +517,15 @@ Heartbeat_Application::shutdown (void)
     }
 
   // Shutdown the ORB.
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "The following exception occured in "
-                           "Heartbeat_Application::shutdown:\n");
+      ex._tao_print_exception (
+        "The following exception occured in ""Heartbeat_Application::shutdown:\n");
     }
-  ACE_ENDTRY;
 }
 
 ////////////////////////////////////////////////////////////
@@ -602,36 +575,29 @@ main (int argc, char *argv[])
   // We may want this to be alive beyond the next block.
   TAO_EC_Servant_Var<Heartbeat_Application> app;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return 1;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
       if (check_for_nil (poa.in (), "POA") == -1)
         return 1;
 
       PortableServer::POAManager_var manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
       // Obtain reference to EC.
-      obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references ("Event_Service");
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
       if (check_for_nil (ec.in (), "EC") == -1)
         return 1;
 
@@ -640,27 +606,22 @@ main (int argc, char *argv[])
       if (!app.in ())
         return 1;
 
-      app->init (orb, ec ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      app->init (orb, ec);
 
       // Allow processing of CORBA requests.
-      manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager->activate ();
 
       // Receive events from EC.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in Heartbeat Application:");
+      ex._tao_print_exception ("Exception in Heartbeat Application:");
       // Since there was an exception, application might not have had
       // a chance to shutdown.
       app->shutdown ();
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 874f96cc737..9d49de34f95 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -27,9 +27,9 @@ EC_Connect::EC_Connect (void)
 }
 
 void
-EC_Connect::execute_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Connect::execute_test (void)
 {
-  // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // this->EC_Driver::execute_test ();
 }
 
 int
@@ -111,13 +111,11 @@ EC_Connect::dump_results (void)
 void
 EC_Connect::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_consumer (consumer_admin,
-                                     i
-                                     ACE_ENV_ARG_PARAMETER);
+                                     i);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->consumer_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -126,13 +124,11 @@ EC_Connect::connect_consumer (
 void
 EC_Connect::connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_supplier (supplier_admin,
-                                     i
-                                     ACE_ENV_ARG_PARAMETER);
+                                     i);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->supplier_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -151,24 +147,20 @@ EC_Connect::allocate_supplier (int i)
 }
 
 void
-EC_Connect::connect_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Connect::connect_clients (void)
 {
   this->start_time_ = ACE_OS::gethrtime ();
   switch (this->order_)
     {
     default:
     case 0:
-      this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->connect_consumers ();
+      this->connect_suppliers ();
       return;
 
     case 1:
-      this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->connect_suppliers ();
+      this->connect_consumers ();
       return;
 
     case 2:
@@ -180,47 +172,39 @@ EC_Connect::connect_clients (ACE_ENV_SINGLE_ARG_DECL)
     max = this->n_suppliers_;
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->for_consumers ();
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->for_suppliers ();
 
   for (int i = 0; i != max; ++i)
     {
       if (i < this->n_consumers_)
         {
-          this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->connect_consumer (consumer_admin.in (), i);
         }
       if (i < this->n_suppliers_)
         {
-          this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->connect_supplier (supplier_admin.in (), i);
         }
     }
 
 }
 
 void
-EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Connect::disconnect_clients (void)
 {
   switch (this->order_)
     {
     default:
     case 0:
-      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->disconnect_suppliers ();
+      this->disconnect_consumers ();
       return;
 
     case 1:
-      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->disconnect_consumers ();
+      this->disconnect_suppliers ();
       return;
 
     case 2:
@@ -232,12 +216,10 @@ EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
     max = this->n_suppliers_;
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->for_consumers ();
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->for_suppliers ();
 
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i != max; ++i)
@@ -246,8 +228,7 @@ EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->suppliers_[i]->disconnect ();
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           this->supplier_disconnect_.sample (now - start_time,
@@ -257,8 +238,7 @@ EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->consumers_[i]->disconnect ();
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           this->consumer_disconnect_.sample (now - start_time,
@@ -271,15 +251,14 @@ EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Connect::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Connect::disconnect_consumers (void)
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumers_[i]->disconnect ();
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->consumer_disconnect_.sample (now - start_time,
@@ -293,15 +272,14 @@ EC_Connect::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Connect::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Connect::disconnect_suppliers (void)
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->suppliers_[i]->disconnect ();
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->supplier_disconnect_.sample (now - start_time,
@@ -326,25 +304,21 @@ void
 ECC_Consumer::connect (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   this->EC_Consumer::connect (consumer_admin,
                               qos,
-                              shutdown_event_type
-                              ACE_ENV_ARG_PARAMETER);
+                              shutdown_event_type);
 }
 
 void
 ECC_Consumer::connect (
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Consumer::connect (qos,
-                              shutdown_event_type
-                              ACE_ENV_ARG_PARAMETER);
+                              shutdown_event_type);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
@@ -368,25 +342,21 @@ void
 ECC_Supplier::connect (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   this->EC_Supplier::connect (supplier_admin,
                               qos,
-                              shutdown_event_type
-                              ACE_ENV_ARG_PARAMETER);
+                              shutdown_event_type);
 }
 
 void
 ECC_Supplier::connect (
     const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Supplier::connect (qos,
-                              shutdown_event_type
-                              ACE_ENV_ARG_PARAMETER);
+                              shutdown_event_type);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index caaf08b425a..03e7896e3da 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -51,27 +51,25 @@ public:
   virtual void print_usage (void);
   virtual void print_args (void) const;
 
-  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+  void execute_test (void);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   virtual void dump_results (void);
 
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL);
+    int i);
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i
-    ACE_ENV_ARG_DECL);
-  virtual void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+    int i);
+  virtual void disconnect_consumers (void);
+  virtual void disconnect_suppliers (void);
 
   virtual EC_Consumer* allocate_consumer (int i);
   virtual EC_Supplier* allocate_supplier (int i);
 
-  virtual void connect_clients (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
-  virtual void disconnect_clients (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void connect_clients (void);
+  virtual void disconnect_clients (void);
 
 private:
   ACE_hrtime_t start_time_;
@@ -94,12 +92,10 @@ public:
   virtual void connect (
       RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
   virtual void connect (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
@@ -117,12 +113,10 @@ public:
   virtual void connect (
         RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type
-        ACE_ENV_ARG_DECL);
+        int shutdown_event_type);
   virtual void connect (
       const RtecEventChannelAdmin::SupplierQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index c3c4661d8c2..a8a4c1c9eee 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -56,11 +56,10 @@ EC_Inversion::parse_args (int &argc, char *argv [])
 }
 
 void
-EC_Inversion::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Inversion::connect_consumers (void)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->for_consumers ();
 
   ACE_ConsumerQOS_Factory qos0;
   qos0.start_disjunction_group (2);
@@ -69,8 +68,7 @@ EC_Inversion::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 
   this->consumers_[0]->connect (consumer_admin.in (),
                                 qos0.get_ConsumerQOS (),
-                                ACE_ES_EVENT_UNDEFINED + 1
-                                ACE_ENV_ARG_PARAMETER);
+                                ACE_ES_EVENT_UNDEFINED + 1);
 
   for (int i = 1; i < this->n_consumers_; ++i)
     {
@@ -85,19 +83,17 @@ EC_Inversion::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 
       this->consumers_[i]->connect (consumer_admin.in (),
                                     qos1.get_ConsumerQOS (),
-                                    base_event + 1
-                                    ACE_ENV_ARG_PARAMETER);
+                                    base_event + 1);
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Inversion (%P|%t) connected consumer(s)\n"));
 }
 
 void
-EC_Inversion::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Inversion::connect_suppliers (void)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->for_suppliers ();
 
   ACE_SupplierQOS_Factory qos0;
   qos0.insert (1, ACE_ES_EVENT_UNDEFINED, 0, 1);
@@ -105,8 +101,7 @@ EC_Inversion::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 
   this->suppliers_[0]->connect (supplier_admin.in (),
                                 qos0.get_SupplierQOS (),
-                                ACE_ES_EVENT_UNDEFINED + 1
-                                ACE_ENV_ARG_PARAMETER);
+                                ACE_ES_EVENT_UNDEFINED + 1);
 
   for (int j = 1; j != this->n_suppliers_; ++j)
     {
@@ -120,8 +115,7 @@ EC_Inversion::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 
       this->suppliers_[j]->connect (supplier_admin.in (),
                                     qos1.get_SupplierQOS (),
-                                    base_event + 1
-                                    ACE_ENV_ARG_PARAMETER);
+                                    base_event + 1);
     }
 
   if (this->verbose ())
@@ -129,7 +123,7 @@ EC_Inversion::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Inversion::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Inversion::activate_tasks (void)
 {
   int priority;
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
index 6811eb6c794..8bb062db7c2 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
@@ -41,14 +41,14 @@ public:
   // The options controlling the event types are ignored, and only two
   // consumers are created.
 
-  virtual void connect_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void connect_suppliers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void connect_consumers (void);
+  virtual void connect_suppliers (void);
   // In this test there are two consumers, the high priority consumer
   // receives only events from a single high priority supplier.  The
   // other consumer receives events from a set of low priority
   // suppliers.
 
-  virtual void activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void activate_tasks (void);
   // Activate the suppliers at different priorities
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 2d0cd3903aa..39d220bae76 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -47,22 +47,17 @@ main (int argc, char *argv [])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (manager_object.in ());
 
       CORBA::Any sync_scope;
       sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -71,13 +66,9 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            sync_scope);
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 #else
       ACE_DEBUG ((LM_DEBUG,
                   "CORBA Messaging disabled in this configuration,"
@@ -85,8 +76,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -94,28 +84,22 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Get the event channel object reference
       CORBA::Object_var object =
-        orb->string_to_object (ec_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ec_ior);
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ());
       if (CORBA::is_nil (ec.in ()))
         {
           ACE_ERROR ((LM_ERROR,
@@ -136,16 +120,13 @@ main (int argc, char *argv [])
       // Connect the consumer
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->for_consumers ();
 
       RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer_admin->obtain_push_supplier ();
 
       RtecEventComm::PushConsumer_var consumer_reference =
-        consumer._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        consumer._this ();
 
       // Simple subscription, but usually the helper classes in
       // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -162,9 +143,7 @@ main (int argc, char *argv [])
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
       proxy_supplier->connect_push_consumer (consumer_reference.in (),
-                                             consumer_qos
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             consumer_qos);
 
       ACE_DEBUG ((LM_DEBUG, "Connected consumer\n"));
 
@@ -173,16 +152,13 @@ main (int argc, char *argv [])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->for_suppliers ();
 
       RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier_admin->obtain_push_consumer ();
 
       RtecEventComm::PushSupplier_var supplier_reference =
-        supplier._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        supplier._this ();
 
       // Simple publication, but usually the helper classes in
       // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -194,9 +170,7 @@ main (int argc, char *argv [])
       sh0.source = 1;                      // first free event source
 
       proxy_consumer->connect_push_supplier (supplier_reference.in (),
-                                             supplier_qos
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             supplier_qos);
 
       ACE_DEBUG ((LM_DEBUG, "Connected supplier\n"));
 
@@ -208,8 +182,7 @@ main (int argc, char *argv [])
       while (!task.done () || !consumer.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
 
@@ -239,31 +212,24 @@ main (int argc, char *argv [])
 
       ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput));
 
-      proxy_supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy_supplier->disconnect_push_supplier ();
 
-      proxy_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      proxy_consumer->disconnect_push_consumer ();
 
       PortableServer::ObjectId_var id;
 
-      id = root_poa->servant_to_id (&consumer ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      id = root_poa->servant_to_id (&consumer);
+      root_poa->deactivate_object (id.in ());
 
-      id = root_poa->servant_to_id (&supplier ACE_ENV_ARG_PARAMETER);
-      root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      id = root_poa->servant_to_id (&supplier);
+      root_poa->deactivate_object (id.in ());
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, argv[0]);
+      ex._tao_print_exception (argv[0]);
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -323,8 +289,7 @@ EC_Latency_Consumer::done (void)
 }
 
 void
-EC_Latency_Consumer::push (const RtecEventComm::EventSet& events
-                           ACE_ENV_ARG_DECL_NOT_USED)
+EC_Latency_Consumer::push (const RtecEventComm::EventSet& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t creation;
@@ -344,7 +309,7 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-EC_Latency_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Latency_Consumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -356,7 +321,7 @@ EC_Latency_Supplier::EC_Latency_Supplier (void)
 }
 
 void
-EC_Latency_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Latency_Supplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -380,7 +345,7 @@ Task::done (void)
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       RtecEventComm::EventSet event (1);
       event.length (1);
@@ -394,8 +359,7 @@ Task::svc (void)
           ACE_hrtime_t creation = ACE_OS::gethrtime ();
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                          creation);
-          this->consumer_->push (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->consumer_->push (event);
 
           // ACE_Time_Value tv (0, 5000);
           // ACE_OS::sleep (tv);
@@ -412,10 +376,9 @@ Task::svc (void)
             return 0;
         }
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Task::svc");
+      ex._tao_print_exception ("Task::svc");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 96a182baa25..b88d5855ba1 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -41,10 +41,9 @@ public:
   /// Return 1 when all the messages have been received
   int done (void);
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -66,7 +65,7 @@ public:
   /// Constructor
   EC_Latency_Supplier (void);
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 524d4301164..668480f86b2 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -46,22 +46,17 @@ main (int argc, char *argv [])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (manager_object.in ());
 
       CORBA::Any sync_scope;
       sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -70,13 +65,9 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            sync_scope);
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 #else
       ACE_DEBUG ((LM_DEBUG,
                   "CORBA Messaging disabled in this configuration,"
@@ -84,8 +75,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -93,15 +83,12 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -109,16 +96,13 @@ main (int argc, char *argv [])
       TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
                                             root_poa.in ());
       TAO_EC_Event_Channel ec_impl (attr);
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (ec.in ());
 
       if (ior_file_name != 0)
         {
@@ -132,22 +116,18 @@ main (int argc, char *argv [])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
-      root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->servant_to_id (&ec_impl);
+      root_poa->deactivate_object (id.in ());
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, argv[0]);
+      ex._tao_print_exception (argv[0]);
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index 513434e07f9..727f5a22cdd 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -49,9 +49,9 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_Throughput::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Throughput::execute_test (void)
 {
-  this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->EC_Driver::execute_test ();
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
index f3d5ee6cc04..c460b502266 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
@@ -44,7 +44,7 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // set the throughpution flags
 
-  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+  void execute_test (void);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
index 05fd4d9c983..c7ba18ae47b 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp
@@ -11,8 +11,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
-                      RtecUDPAdmin::UDP_Addr_out addr
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      RtecUDPAdmin::UDP_Addr_out addr)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h
index 8439914f22b..deeced433db 100644
--- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h
+++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h
@@ -40,8 +40,7 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         RtecUDPAdmin::UDP_Addr_out addr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
index 42a1a23e8db..05968cd88b8 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp
@@ -23,16 +23,13 @@ Consumer::event_count (void) const
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   ACE_ENV_ARG_DECL)
+Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   this->proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
   RtecEventComm::PushConsumer_var me =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Simple subscription, but usually the helper classes in
   // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -50,43 +47,35 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
   h1.type   = ACE_ES_EVENT_UNDEFINED;  // first free event type
   h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-  this->proxy_->connect_push_consumer (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_push_consumer (me.in (), qos);
 }
 
 void
-Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (void)
 {
-  ACE_TRY
+  try
     {
       // Disconnect from the proxy
-      this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->proxy_->disconnect_push_supplier ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions
     }
-  ACE_ENDTRY;
   this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   // Deactivate this object
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   // Get the Object Id used for the servant..
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
   // Deactivate the object
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -142,7 +131,7 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
index 84de97e1df1..0442a5ff6e2 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h
@@ -37,19 +37,17 @@ public:
   Consumer (bool valuetype);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect to the Event Channel
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
index 8cdb64a3ca5..b06c957738f 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp
@@ -13,16 +13,13 @@ Supplier::Supplier (bool valuetype) : valuetype_ (valuetype), event_count_ (0)
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                   ACE_ENV_ARG_DECL)
+Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin)
 {
   this->proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
 
   RtecEventComm::PushSupplier_var me =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Simple publication, but usually the helper classes in
   // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this.
@@ -35,33 +32,26 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
   h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
   h0.source = 1;                      // first free event source
 
-  this->proxy_->connect_push_supplier (me.in (), qos
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_push_supplier (me.in (), qos);
 }
 
 void
-Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (void)
 {
   // Disconnect from the EC
-  ACE_TRY
+  try
     {
-      this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->proxy_->disconnect_push_consumer ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
 }
 
 void
@@ -71,9 +61,9 @@ Supplier::insert_into_any (CORBA::Any& any, Components::EventBase* vb)
 }
 
 void
-Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
+Supplier::perform_push (void)
 {
-  ACE_TRY
+  try
     {
       // The event type and source must match our publications
       ++event_count_;
@@ -97,17 +87,15 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
           event[0].data.any_value <<= CORBA::string_dup( "ACE/TAO/CIAO");
         }
 
-      this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->proxy_->push (event);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 }
 
 void
-Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
index 6f8b9b1310b..f8de21817f6 100644
--- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h
@@ -39,19 +39,18 @@ public:
   Supplier (bool valuetype);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect to the event channel
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the event channel
 
-  void perform_push (ACE_ENV_SINGLE_ARG_DECL);
+  void perform_push (void);
   // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
index 30a675ede38..b00d2680fce 100644
--- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp
@@ -38,19 +38,17 @@ main (int argc, char* argv[])
   // and defined in $ACE_ROOT/ace/CORBA_macros.h.
   // If your platform supports native exceptions, and TAO was compiled
   // with native exception support then you can simply use try/catch
-  // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument.
+  // and avoid the argument.
   // Unfortunately many embedded systems cannot use exceptions due to
   // the space and time overhead.
   //
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // **************** HERE STARTS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
@@ -70,9 +68,7 @@ main (int argc, char* argv[])
                           1); // supplied by mapping
 
           orb->register_value_factory (vb_factory->tao_repository_id (),
-                                       vb_factory
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       vb_factory);
           vb_factory->_remove_ref (); // release ownership
         }
 
@@ -81,16 +77,12 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // **************** THAT COMPLETS THE ORB SETUP
 
@@ -112,15 +104,13 @@ main (int argc, char* argv[])
       // that may involve creating some threads.
       // But it should always be invoked because several internal data
       // structures are initialized at that point.
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       // The event channel is activated as any other CORBA servant.
       // In this case we use the simple implicit activation with the
       // RootPOA
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
 
@@ -156,8 +146,7 @@ main (int argc, char* argv[])
       // Now we create and activate the servant
       AddrServer as_impl (addr);
       RtecUDPAdmin::AddrServer_var address_server =
-        as_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        as_impl._this ();
 
       TAO_ECG_Refcounted_Endpoint endpoint(new TAO_ECG_UDP_Out_Endpoint);
 
@@ -187,18 +176,14 @@ main (int argc, char* argv[])
       // required by all the local consumer.
       // Then it register for the multicast groups that carry those
       // events:
-      mcast_eh.open (event_channel.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mcast_eh.open (event_channel.in ());
 
       // Again the receiver connects to the event channel as a
       // supplier of events, using the Observer features to detect
       // local consumers and their interests:
       receiver->init (event_channel.in (),
                       endpoint,
-                      address_server.in ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      address_server.in ());
 
       // The Receiver is also a supplier of events.  The exact type of
       // events is only known to the application, because it depends
@@ -217,8 +202,7 @@ main (int argc, char* argv[])
       pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY;
       pub.is_gateway = 1;
 
-      receiver->connect (pub ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      receiver->connect (pub);
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
 
@@ -228,11 +212,8 @@ main (int argc, char* argv[])
       // channel
       Consumer consumer (valuetype);
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      consumer.connect (consumer_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_consumers ();
+      consumer.connect (consumer_admin.in ());
 
       // **************** THAT COMPLETES THE CLIENT SETUP
 
@@ -244,8 +225,7 @@ main (int argc, char* argv[])
       for (int i = 0; i != 100; ++i)
         {
           CORBA::Boolean there_is_work =
-            orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending ();
           if (there_is_work)
             {
               // We use a TAO extension. The CORBA mechanism does not
@@ -253,8 +233,7 @@ main (int argc, char* argv[])
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work (tv);
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
@@ -268,12 +247,10 @@ main (int argc, char* argv[])
 
       // **************** HERE STARTS THE CLEANUP CODE
 
-      consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      consumer.disconnect ();
 
       // Now let us close the Receiver
-      receiver->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      receiver->shutdown ();
 
       int const r = mcast_eh.shutdown ();
 
@@ -286,8 +263,7 @@ main (int argc, char* argv[])
       // The event channel must be destroyed, so it can release its
       // resources, and inform all the clients that are still
       // connected that it is going away.
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // Deactivating the event channel implementation is not strictly
       // required, the POA will do it for us, but it is good manners:
@@ -298,37 +274,31 @@ main (int argc, char* argv[])
         // is the root POA, but the code is more robust if we don't
         // rely on that.
         PortableServer::POA_var poa =
-          ec_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          ec_impl._default_POA ();
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          poa->servant_to_id (&ec_impl);
         // Deactivate the object
-        poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        poa->deactivate_object (oid.in ());
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // Finally destroy the ORB
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // **************** THAT COMPLETES THE CLEANUP CODE
 
       ACE_DEBUG ((LM_DEBUG,
                   "UDP receiver ready\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
index 07d00c02a6a..d8b7ee230a2 100644
--- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp
+++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp
@@ -37,19 +37,17 @@ main (int argc, char* argv[])
   // and defined in $ACE_ROOT/ace/CORBA_macros.h.
   // If your platform supports native exceptions, and TAO was compiled
   // with native exception support then you can simply use try/catch
-  // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument.
+  // and avoid the argument.
   // Unfortunately many embedded systems cannot use exceptions due to
   // the space and time overhead.
   //
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // **************** HERE STARTS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
@@ -66,16 +64,12 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      poa_manager->activate ();
 
       // **************** THAT COMPLETS THE ORB SETUP
 
@@ -97,15 +91,13 @@ main (int argc, char* argv[])
       // that may involve creating some threads.
       // But it should always be invoked because several internal data
       // structures are initialized at that point.
-      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec_impl.activate ();
 
       // The event channel is activated as any other CORBA servant.
       // In this case we use the simple implicit activation with the
       // RootPOA
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec_impl._this ();
 
       // **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
 
@@ -141,8 +133,7 @@ main (int argc, char* argv[])
       // Now we create and activate the servant
       AddrServer as_impl (addr);
       RtecUDPAdmin::AddrServer_var address_server =
-        as_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        as_impl._this ();
 
       // We need a local socket to send the data, open it and check
       // that everything is OK:
@@ -157,9 +148,7 @@ main (int argc, char* argv[])
       TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create();
       sender->init (event_channel.in (),
                     address_server.in (),
-                    endpoint
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    endpoint);
 
       // Now we connect the sender as a consumer of events, it will
       // receive any event from any source and send it to the "right"
@@ -173,8 +162,7 @@ main (int argc, char* argv[])
       sub.dependencies[0].event.header.source =
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-      sender->connect (sub ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->connect (sub);
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
 
@@ -183,11 +171,8 @@ main (int argc, char* argv[])
       // And now create a supplier
       Supplier supplier (valuetype);
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      supplier.connect (supplier_admin.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        event_channel->for_suppliers ();
+      supplier.connect (supplier_admin.in ());
 
       // **************** THAT COMPLETES THE CLIENT SETUP
 
@@ -199,8 +184,7 @@ main (int argc, char* argv[])
       for (int i = 0; i != 25; ++i)
         {
           CORBA::Boolean there_is_work =
-            orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending ();
           if (there_is_work)
             {
               // We use a TAO extension. The CORBA mechanism does not
@@ -208,13 +192,11 @@ main (int argc, char* argv[])
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work (tv);
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
-          supplier.perform_push (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          supplier.perform_push ();
         }
 
       // **************** THAT COMPLETES THE EVENT LOOP
@@ -222,18 +204,15 @@ main (int argc, char* argv[])
       // **************** HERE STARTS THE CLEANUP CODE
 
       // First the easy ones
-      supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier.disconnect ();
 
       // And also close the sender of events
-      sender->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->shutdown ();
 
       // The event channel must be destroyed, so it can release its
       // resources, and inform all the clients that are still
       // connected that it is going away.
-      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      event_channel->destroy ();
 
       // Deactivating the event channel implementation is not strictly
       // required, the POA will do it for us, but it is good manners:
@@ -244,37 +223,31 @@ main (int argc, char* argv[])
         // is the root POA, but the code is more robust if we don't
         // rely on that.
         PortableServer::POA_var poa =
-          ec_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          ec_impl._default_POA ();
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          poa->servant_to_id (&ec_impl);
         // Deactivate the object
-        poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        poa->deactivate_object (oid.in ());
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
       // Finally destroy the ORB
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // **************** THAT COMPLETES THE CLEANUP CODE
 
       ACE_DEBUG ((LM_DEBUG,
                   "UDP sender ready\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service");
+      ex._tao_print_exception ("Service");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 1b04ac6a4c5..f94031f8750 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -24,21 +24,18 @@ void
 EC_Consumer::connect (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
-  this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
+  this->connect (qos, shutdown_event_type);
 }
 
 void
 EC_Consumer::connect (
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type
-    ACE_ENV_ARG_DECL)
+    int shutdown_event_type)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return; // @@ Throw?
@@ -47,15 +44,12 @@ EC_Consumer::connect (
 
   if (CORBA::is_nil (this->myself_.in ()))
     {
-      this->myself_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->myself_ = this->_this ();
     }
   this->is_active_ = 1;
 
   this->supplier_proxy_->connect_push_consumer (this->myself_.in (),
-                                                qos
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos);
 }
 
 int
@@ -65,33 +59,29 @@ EC_Consumer::connected (void) const
 }
 
 void
-EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect (void)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier ();
 
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-EC_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::shutdown (void)
 {
   if (!this->is_active_)
     return;
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
   this->myself_ = RtecEventComm::PushConsumer::_nil ();
   this->is_active_ = 0;
 }
@@ -110,12 +100,10 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const
 }
 
 void
-EC_Consumer::push (const RtecEventComm::EventSet& events
-                   ACE_ENV_ARG_DECL)
+EC_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->consumer_push (this->cookie_, events ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->driver_->consumer_push (this->cookie_, events);
 
   if (events.length () == 0)
     {
@@ -151,17 +139,15 @@ EC_Consumer::push (const RtecEventComm::EventSet& events
                                 now - creation);
 
       if (e.header.type == this->shutdown_event_type_)
-        this->driver_->consumer_shutdown (this->cookie_ ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->driver_->consumer_shutdown (this->cookie_);
     }
 }
 
 void
-EC_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->consumer_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->driver_->consumer_disconnect (this->cookie_);
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index 439b95f9747..e7e0eb758de 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -46,8 +46,7 @@ public:
   virtual void connect (
       RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
 
   /**
    * The driver program can build the QoS attributes and we use
@@ -56,18 +55,17 @@ public:
    */
   virtual void connect (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type
-      ACE_ENV_ARG_DECL);
+      int shutdown_event_type);
 
   /// returns 0 if it is not connected
   virtual int connected (void) const;
 
   /// The application can invoke this method to disconnect from the EC
   /// and deactivate this class.
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// The application is shutting down, deactivate the consumer.
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
 
   /// Accumulate our statistics to the totals.
   void accumulate (ACE_Throughput_Stats& throughput) const;
@@ -79,10 +77,9 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index 22e3480f3ce..e3fa9afacbb 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -13,52 +13,43 @@ EC_Counting_Consumer::EC_Counting_Consumer (const char* name)
 
 void
 EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                   const RtecEventChannelAdmin::ConsumerQOS &qos
-                   ACE_ENV_ARG_DECL)
+                   const RtecEventChannelAdmin::ConsumerQOS &qos)
 {
   // The canonical protocol to connect to the EC
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        consumer_admin->obtain_push_supplier ();
     }
 
   this->supplier_proxy_->connect_push_consumer (consumer.in (),
-                                                qos
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos);
 }
 
 void
-EC_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Consumer::disconnect (void)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_proxy_->disconnect_push_supplier ();
       this->supplier_proxy_ =
         RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
     }
-  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate ();
 }
 
 void
-EC_Counting_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Consumer::deactivate (void)
 {
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_poa->servant_to_id (this);
+  consumer_poa->deactivate_object (consumer_id.in ());
 
 }
 
@@ -83,8 +74,7 @@ EC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-EC_Counting_Consumer::push (const RtecEventComm::EventSet& events
-                ACE_ENV_ARG_DECL_NOT_USED)
+EC_Counting_Consumer::push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -107,7 +97,7 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-EC_Counting_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Counting_Consumer::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index 06878cb4b9f..5c63615d8f5 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -37,10 +37,9 @@ public:
 
   /// Simple connect/disconnect methods..
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                const RtecEventChannelAdmin::ConsumerQOS &qos
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+                const RtecEventChannelAdmin::ConsumerQOS &qos);
+  void disconnect (void);
+  void deactivate (void);
 
   /// Print out an error message if the event count is too far from the
   /// expected count.
@@ -49,10 +48,9 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   /// The skeleton methods.
-  virtual void push (const RtecEventComm::EventSet& events
-                     ACE_ENV_ARG_DECL)
+  virtual void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Keep track of the number of events received.
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 59bfbe0b6ac..da31b33f29d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -19,16 +19,13 @@ EC_Counting_Supplier::EC_Counting_Supplier (void)
 
 void
 EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                    int milliseconds
-                    ACE_ENV_ARG_DECL)
+                    int milliseconds)
 {
   RtecEventComm::PushConsumer_var consumer =
-    this->consumer_adapter_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_adapter_._this ();
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier ();
 
   // Let's say that the execution time for event 2 is 1
   // milliseconds...
@@ -43,25 +40,19 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume
                             0);
 
   this->supplier_proxy_->connect_push_consumer (consumer.in (),
-                                                consumer_qos.get_ConsumerQOS ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                consumer_qos.get_ConsumerQOS ());
 }
 
 void
-EC_Counting_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Supplier::deactivate (void)
 {
-  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier ();
 
   PortableServer::POA_var consumer_poa =
-    this->consumer_adapter_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->consumer_adapter_._default_POA ();
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (&this->consumer_adapter_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    consumer_poa->servant_to_id (&this->consumer_adapter_);
+  consumer_poa->deactivate_object (consumer_id.in ());
 }
 
 void
@@ -70,8 +61,7 @@ EC_Counting_Supplier::connect (
     int published_source,
     int published_type,
     int event_source,
-    int event_type
-    ACE_ENV_ARG_DECL)
+    int event_type)
 {
   this->event_source_ = event_source;
   this->event_type_ = event_type;
@@ -81,58 +71,47 @@ EC_Counting_Supplier::connect (
                        published_type,
                        0, 1);
   this->connect (supplier_admin,
-                 supplier_qos.get_SupplierQOS ()
-                 ACE_ENV_ARG_PARAMETER);
+                 supplier_qos.get_SupplierQOS ());
 }
 
 void
 EC_Counting_Supplier::connect (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    const RtecEventChannelAdmin::SupplierQOS &qos
-    ACE_ENV_ARG_DECL)
+    const RtecEventChannelAdmin::SupplierQOS &qos)
 {
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
       this->consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        supplier_admin->obtain_push_consumer ();
     }
 
   this->consumer_proxy_->connect_push_supplier (supplier.in (),
-                                                qos
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos);
 }
 
 void
-EC_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Supplier::disconnect (void)
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumer_proxy_->disconnect_push_consumer ();
     }
 
   PortableServer::POA_var supplier_poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_poa->servant_to_id (this);
+  supplier_poa->deactivate_object (supplier_id.in ());
 
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-EC_Counting_Supplier::push (const RtecEventComm::EventSet&
-                ACE_ENV_ARG_DECL)
+EC_Counting_Supplier::push (const RtecEventComm::EventSet&)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -144,19 +123,18 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&
   event[0].header.type = this->event_type_;
   event[0].header.ttl = 1;
 
-  this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->push (event);
   this->event_count++;
 }
 
 void
-EC_Counting_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Counting_Supplier::disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-EC_Counting_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Counting_Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -177,16 +155,14 @@ EC_Counting_Supplier_Task::
 int
 EC_Counting_Supplier_Task::svc ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -204,14 +180,13 @@ EC_Counting_Supplier_Task::push_count (void)
 }
 
 void
-EC_Counting_Supplier_Task::run (ACE_ENV_SINGLE_ARG_DECL)
+EC_Counting_Supplier_Task::run (void)
 {
   this->event_.length (1);
 
   int stop = 0;
   do {
-    this->supplier_->push (this->event_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->supplier_->push (this->event_);
 
     // Sleep for a short time to avoid spinning...
     ACE_OS::sleep (0);
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index 8e6f940daa6..54702a32de9 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -45,31 +45,27 @@ public:
    * receives the timeout.
    */
   void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                 int period
-                 ACE_ENV_ARG_DECL);
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+                 int period);
+  void deactivate (void);
 
   /// Simple connect/disconnect methods..
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 int published_source,
                 int published_type,
                 int event_source,
-                int event_type
-                ACE_ENV_ARG_DECL);
+                int event_type);
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                const RtecEventChannelAdmin::SupplierQOS &qos
-                ACE_ENV_ARG_DECL);
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+                const RtecEventChannelAdmin::SupplierQOS &qos);
+  void disconnect (void);
 
   /// The Consumer side methods.
-  void push (const RtecEventComm::EventSet& events
-             ACE_ENV_ARG_DECL)
+  void push (const RtecEventComm::EventSet& events)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The skeleton methods.
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Count the number of events sent
@@ -108,7 +104,7 @@ public:
   CORBA::ULong push_count (void);
 
   /// Run a single iteration of the test
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
 
 private:
   /// The supplier we are turning into an active object
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 4768e14fb5e..624e05b0c3a 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -61,45 +61,38 @@ EC_Driver::~EC_Driver (void)
 int
 EC_Driver::run (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Calibrate the high resolution timer *before* starting the
       // test.
       ACE_High_Res_Timer::calibrate ();
 
-      this->run_init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run_init (argc, argv);
 
-      this->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->execute_test ();
 
       this->dump_results ();
 
-      this->run_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run_cleanup ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC_Driver::run");
+      ex._tao_print_exception ("EC_Driver::run");
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) non-corba exception raised\n"));
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 void
-EC_Driver::run_init (int &argc, char* argv[]
-                     ACE_ENV_ARG_DECL)
+EC_Driver::run_init (int &argc, char* argv[])
 {
-  this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->initialize_orb_and_poa (argc, argv);
 
   if (this->parse_args (argc, argv))
-    ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
-                                CORBA::COMPLETED_NO));
+    throw CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO);
 
   if (this->verbose ())
     this->print_args ();
@@ -116,41 +109,32 @@ EC_Driver::run_init (int &argc, char* argv[]
     }
 
   if (this->move_to_rt_class () == -1)
-    ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
-                                CORBA::COMPLETED_NO));
+    throw CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO);
 
-  this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->initialize_ec_impl ();
 
   if (this->allocate_consumers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
   if (this->allocate_suppliers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                 CORBA::COMPLETED_NO));
+    throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO);
 
-  this->connect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->connect_clients ();
 }
 
 void
-EC_Driver::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::run_cleanup (void)
 {
-  this->disconnect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect_clients ();
 
-  this->shutdown_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->shutdown_clients ();
 
-  this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_ec ();
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel destroyed\n"));
 
-  this->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate_ec ();
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel deactivated\n"));
@@ -160,26 +144,21 @@ EC_Driver::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
   this->cleanup_consumers ();
   this->cleanup_ec ();
 
-  this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->root_poa_->destroy (1, 1);
   this->root_poa_ = PortableServer::POA::_nil ();
 
-  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->destroy ();
   this->orb_ = CORBA::ORB::_nil ();
 }
 
 void
-EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
-                                   ACE_ENV_ARG_DECL)
+EC_Driver::initialize_orb_and_poa (int &argc, char* argv[])
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::ORB_init (argc, argv, "");
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object.in ()))
     {
@@ -189,15 +168,12 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
     }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object.in ());
 
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 }
 
 void
@@ -272,59 +248,54 @@ EC_Driver::move_to_rt_class (void)
 }
 
 void
-EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::initialize_ec_impl (void)
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
     {
-      this->obtain_remote_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->obtain_remote_ec ();
       return;
     }
 #endif
 
-  this->initialize_new_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->initialize_new_ec ();
 }
 
 #if !defined(EC_DISABLE_REMOTE_EC)
 void
-EC_Driver::obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::obtain_remote_ec (void)
 {
   CosNaming::NamingContext_var naming_context =
-    this->get_naming_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_naming_context ();
 
   CosNaming::Name channel_name (1);
   channel_name.length (1);
   channel_name[0].id = CORBA::string_dup (this->event_service_name_);
 
   CORBA::Object_var tmp =
-    naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    naming_context->resolve (channel_name);
 
   this->event_channel_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RtecEventChannelAdmin::EventChannel::_narrow (tmp.in ());
 }
 
 CosNaming::NamingContext_ptr
-EC_Driver::get_naming_context (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::get_naming_context (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+    this->orb_->resolve_initial_references ("NameService");
 
   if (CORBA::is_nil (naming_obj.in ()))
     ACE_ERROR ((LM_ERROR,
                 "EC_Driver (%P|%t) Unable to obtain the "
                 "Naming Service.\n"));
 
-  return CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+  return CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 #endif
 
 void
-EC_Driver::initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::initialize_new_ec (void)
 {
   TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (),
                                         this->root_poa_.in ());
@@ -335,16 +306,14 @@ EC_Driver::initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL)
     new TAO_EC_Event_Channel (attr);
   this->ec_impl_ = ec;
 
-  ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec->activate ();
 
   this->event_channel_ =
-    this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->ec_impl_->_this ();
 }
 
 void
-EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::deactivate_ec (void)
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
@@ -354,13 +323,10 @@ EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL)
   {
     // Deactivate the EC
     PortableServer::POA_var poa =
-      this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->ec_impl_->_default_POA ();
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-    poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      poa->servant_to_id (this->ec_impl_);
+    poa->deactivate_object (id.in ());
   }
 
   if (this->verbose ())
@@ -369,10 +335,9 @@ EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Driver::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::destroy_ec (void)
 {
-  this->event_channel_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->event_channel_->destroy ();
 }
 
 int
@@ -414,46 +379,38 @@ EC_Driver::allocate_supplier (int i)
 }
 
 void
-EC_Driver::connect_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::connect_clients (void)
 {
-  this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->connect_consumers ();
 
-  this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->connect_suppliers ();
 }
 
 void
-EC_Driver::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::disconnect_clients (void)
 {
-  this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect_suppliers ();
 
-  this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->disconnect_consumers ();
 }
 
 void
-EC_Driver::shutdown_clients (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::shutdown_clients (void)
 {
-  this->shutdown_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->shutdown_suppliers ();
 
-  this->shutdown_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->shutdown_consumers ();
 }
 
 void
-EC_Driver::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::connect_consumers (void)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->for_consumers ();
 
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->connect_consumer (consumer_admin.in (), i);
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) connected consumer(s)\n"));
@@ -462,26 +419,22 @@ EC_Driver::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 void
 EC_Driver::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
-  this->build_consumer_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->build_consumer_qos (i, qos, shutdown_event_type);
 
   this->consumers_[i]->connect (consumer_admin,
                                 qos,
-                                shutdown_event_type
-                                ACE_ENV_ARG_PARAMETER);
+                                shutdown_event_type);
 }
 
 void
 EC_Driver::build_consumer_qos (
   int i,
   RtecEventChannelAdmin::ConsumerQOS& qos,
-  int& shutdown_event_type
-  ACE_ENV_ARG_DECL_NOT_USED)
+  int& shutdown_event_type)
 {
   RtecBase::handle_t rt_info = 0;
 
@@ -502,16 +455,14 @@ EC_Driver::build_consumer_qos (
 }
 
 void
-EC_Driver::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::connect_suppliers (void)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->event_channel_->for_suppliers ();
 
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->connect_supplier (supplier_admin.in (), i);
     }
 
   if (this->verbose ())
@@ -521,26 +472,22 @@ EC_Driver::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 void
 EC_Driver::connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i
-    ACE_ENV_ARG_DECL)
+    int i)
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
-  this->build_supplier_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->build_supplier_qos (i, qos, shutdown_event_type);
 
   this->suppliers_[i]->connect (supplier_admin,
                                 qos,
-                                shutdown_event_type
-                                ACE_ENV_ARG_PARAMETER);
+                                shutdown_event_type);
 }
 
 void
 EC_Driver::build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED)
+      int& shutdown_event_type)
 {
   int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
   int supplier_id = i + 1;
@@ -562,13 +509,12 @@ EC_Driver::build_supplier_qos (
 }
 
 void
-EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::execute_test (void)
 {
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->activate_tasks ();
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers are active\n"));
@@ -614,7 +560,7 @@ EC_Driver::allocate_task (int i)
 }
 
 void
-EC_Driver::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Driver::activate_tasks (void)
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -640,56 +586,52 @@ EC_Driver::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-EC_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::disconnect_suppliers (void)
 {
   if (this->suppliers_ == 0)
     return;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->suppliers_[i]->disconnect ();
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers disconnected\n"));
 }
 
 void
-EC_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::disconnect_consumers (void)
 {
   if (this->consumers_ == 0)
     return;
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumers_[i]->disconnect ();
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) consumers disconnected\n"));
 }
 
 void
-EC_Driver::shutdown_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::shutdown_suppliers (void)
 {
   if (this->suppliers_ == 0)
     return;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->suppliers_[i]->shutdown ();
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers deactivated\n"));
 }
 
 void
-EC_Driver::shutdown_consumers (ACE_ENV_SINGLE_ARG_DECL)
+EC_Driver::shutdown_consumers (void)
 {
   if (this->consumers_ == 0)
     return;
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->consumers_[i]->shutdown ();
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) consumers deactivated\n"));
@@ -1003,25 +945,21 @@ EC_Driver::decode_supplier_cookie (void* cookie) const
 
 void
 EC_Driver::consumer_push (void*,
-                          const RtecEventComm::EventSet&
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const RtecEventComm::EventSet&)
 {
 }
 
 void
-EC_Driver::consumer_shutdown (void*
-                              ACE_ENV_ARG_DECL_NOT_USED)
+EC_Driver::consumer_shutdown (void*)
 {
 }
 
 void
-EC_Driver::consumer_disconnect (void*
-                                ACE_ENV_ARG_DECL_NOT_USED)
+EC_Driver::consumer_disconnect (void*)
 {
 }
 
 void
-EC_Driver::supplier_disconnect (void*
-                                ACE_ENV_ARG_DECL_NOT_USED)
+EC_Driver::supplier_disconnect (void*)
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 64994560a36..0c2ec1a622c 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -64,15 +64,13 @@ public:
   virtual int run (int argc, char* argv[]);
 
   /// The initialization section
-  virtual void run_init (int& argc, char* argv[]
-                         ACE_ENV_ARG_DECL);
+  virtual void run_init (int& argc, char* argv[]);
 
   /// The cleanup section
-  virtual void run_cleanup (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void run_cleanup (void);
 
   /// Initialize the ORB and obtain the RootPOA object
-  virtual void initialize_orb_and_poa (int& argc, char* argv[]
-                                       ACE_ENV_ARG_DECL);
+  virtual void initialize_orb_and_poa (int& argc, char* argv[]);
 
   /// Parse the common command-line arguments for all tests
   virtual int parse_args (int& argc, char* argv[]);
@@ -88,56 +86,52 @@ public:
 
   /// Construct the EC and its helper objects, also activates the EC in
   /// the RootPOA.
-  virtual void initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void initialize_ec_impl (void);
 
   /// By default connect the consumers and then the suppliers, other
   /// orders should work too.
-  virtual void connect_clients (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void connect_clients (void);
 
   /// By default disconnect the suppliers and then the consumers, other
   /// orders should work too.
-  virtual void disconnect_clients (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_clients (void);
 
   /// By default deactivate the suppliers and then the consumers, other
   /// orders should work too.
-  virtual void shutdown_clients (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown_clients (void);
 
   /// Connect all the consumers, by default it lets each consumer
   /// connect itself.
-  virtual void connect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void connect_consumers (void);
 
   /// Connect consumer number <i> using the consumer_admin provided.
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i
-    ACE_ENV_ARG_DECL);
+    int i);
 
   /// Build the QoS requirements for consumer <i>
   virtual void build_consumer_qos (
       int i,
       RtecEventChannelAdmin::ConsumerQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED);
+      int& shutdown_event_type);
 
   /// Connect all the suppliers, by default it lets each supplier
   /// connect itself.
-  virtual void connect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void connect_suppliers (void);
 
   /// Connect supplier number <i> using the supplier_admin provided.
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i
-    ACE_ENV_ARG_DECL);
+    int i);
 
   /// Build the QoS requirements for supplier <i>
   virtual void build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type
-      ACE_ENV_ARG_DECL_NOT_USED);
+      int& shutdown_event_type);
 
   /// Execute the test, by default simply call activate_suppliers()
-  virtual void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void execute_test (void);
 
   /**
    * Dump the results, i.e. invoke dump_results on all the suppliers
@@ -147,22 +141,22 @@ public:
   virtual void dump_results (void);
 
   /// Disconnect all the consumers.
-  virtual void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_consumers (void);
 
   /// Disconnect all the suppliers.
-  virtual void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_suppliers (void);
 
   /// Deactivate all the consumers.
-  virtual void shutdown_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown_consumers (void);
 
   /// Deactivate all the suppliers.
-  virtual void shutdown_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown_suppliers (void);
 
   /// Call EC->destroy
-  virtual void destroy_ec (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void destroy_ec (void);
 
   /// De-activate the EC (and its helper classes).
-  virtual void deactivate_ec (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void deactivate_ec (void);
 
   /// Cleanup the resources
   virtual void cleanup_ec (void);
@@ -181,31 +175,27 @@ public:
 
   /// One of the consumers in the test has received an event
   virtual void consumer_push (void* consumer_cookie,
-                              const RtecEventComm::EventSet& event
-                              ACE_ENV_ARG_DECL);
+                              const RtecEventComm::EventSet& event);
 
   /// One of the consumers has received a shutdown event
-  virtual void consumer_shutdown (void* consumer_cookie
-                                  ACE_ENV_ARG_DECL);
+  virtual void consumer_shutdown (void* consumer_cookie);
 
   /// One of the consumers in the test has been disconnected from the EC
-  virtual void consumer_disconnect (void* consumer_cookie
-                                    ACE_ENV_ARG_DECL);
+  virtual void consumer_disconnect (void* consumer_cookie);
 
   /// One of the suppliers in the test has been disconnected from the EC
-  virtual void supplier_disconnect (void* supplier_cookie
-                                    ACE_ENV_ARG_DECL);
+  virtual void supplier_disconnect (void* supplier_cookie);
 
 #if !defined(EC_DISABLE_REMOTE_EC)
   /// Obtain the EC from the Naming service
-  virtual void obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void obtain_remote_ec (void);
 
   virtual CosNaming::NamingContext_ptr
-       get_naming_context (ACE_ENV_SINGLE_ARG_DECL);
+       get_naming_context (void);
 #endif
 
   /// Initialize the EC using the new implementation
-  virtual void initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void initialize_new_ec (void);
 
   /// Allocate the suppliers and the consumers
   virtual int allocate_consumers (void);
@@ -221,7 +211,7 @@ public:
 
   /// Activate all the tasks, by default runs each supplier on its
   /// own thread.
-  virtual void activate_tasks (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void activate_tasks (void);
 
 protected:
   /// The ORB
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 566a09d3c97..e1c135d0398 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -26,8 +26,7 @@ EC_Supplier::EC_Supplier (EC_Driver *driver,
 }
 
 void
-EC_Supplier::send_event (int event_number
-                         ACE_ENV_ARG_DECL)
+EC_Supplier::send_event (int event_number)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -48,12 +47,11 @@ EC_Supplier::send_event (int event_number
 
   this->event_type (event_number, event[0]);
 
-  this->send_event (event ACE_ENV_ARG_PARAMETER);
+  this->send_event (event);
 }
 
 void
-EC_Supplier::send_event (const RtecEventComm::EventSet& event
-                         ACE_ENV_ARG_DECL)
+EC_Supplier::send_event (const RtecEventComm::EventSet& event)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -72,8 +70,7 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event
 
   ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-  this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->push (event);
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
   this->throughput_.sample (end - this->throughput_start_,
@@ -109,21 +106,17 @@ EC_Supplier::event_type (int event_number,
 void
 EC_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
                       const RtecEventChannelAdmin::SupplierQOS& qos,
-                      int shutdown_event_type
-                      ACE_ENV_ARG_DECL)
+                      int shutdown_event_type)
 {
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    supplier_admin->obtain_push_consumer ();
 
-  this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->connect (qos, shutdown_event_type);
 }
 
 void
 EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
-                      int shutdown_event_type
-                      ACE_ENV_ARG_DECL)
+                      int shutdown_event_type)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return; // @@ Throw?
@@ -133,55 +126,47 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
 
   if (CORBA::is_nil (this->myself_.in ()))
     {
-      this->myself_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->myself_ = this->_this ();
     }
   this->is_active_ = 1;
 
   this->consumer_proxy_->connect_push_supplier (this->myself_.in (),
-                                                qos
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                qos);
 }
 
 void
-EC_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+EC_Supplier::disconnect (void)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer ();
 
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-EC_Supplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+EC_Supplier::shutdown (void)
 {
   if (!this->is_active_)
     return;
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (id.in ());
   this->is_active_ = 0;
   this->myself_ = RtecEventComm::PushSupplier::_nil ();
 }
 
 void
-EC_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+EC_Supplier::disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->supplier_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->driver_->supplier_disconnect (this->cookie_);
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
@@ -225,7 +210,6 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier,
 int
 EC_Supplier_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Initialize a time value to pace the test
   ACE_Time_Value tv (0, this->burst_pause_);
@@ -246,7 +230,7 @@ EC_Supplier_Task::svc (void)
     {
       for (int j = 0; j < this->burst_size_; ++j)
         {
-          ACE_TRY
+          try
             {
               this->supplier_->event_type (j, event[0]);
 
@@ -255,42 +239,38 @@ EC_Supplier_Task::svc (void)
                                              now);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
 
-              this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
+              this->supplier_->send_event (event);
 
-              ACE_TRY_CHECK;
             }
-          ACE_CATCH (CORBA::SystemException, sys_ex)
+          catch (const CORBA::SystemException& sys_ex)
             {
-              ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+              sys_ex._tao_print_exception ("SYS_EX");
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+              ex._tao_print_exception ("SYS_EX");
             }
-          ACE_ENDTRY;
         }
       ACE_OS::sleep (tv);
     }
 
-  ACE_TRY_EX(SHUTDOWN)
+  try
     {
       // Send one event shutdown from each supplier
       event[0].header.type = this->shutdown_event_type_;
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      now);
-      this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SHUTDOWN);
+      this->supplier_->send_event (event);
     }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
+  catch (const CORBA::SystemException& sys_ex)
     {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
+      sys_ex._tao_print_exception ("SYS_EX");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "Supplier task finished\n"));
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index 065a20a15aa..a5bd9d2fb1e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -52,39 +52,35 @@ public:
 
   /// The types of the event is chosen by the driver, based on the
   /// cookie and the <event_number>
-  void send_event (int event_number
-                   ACE_ENV_ARG_DECL);
+  void send_event (int event_number);
 
   /// Send <event> to the EC.
-  void send_event (const RtecEventComm::EventSet& event
-                   ACE_ENV_ARG_DECL);
+  void send_event (const RtecEventComm::EventSet& event);
 
   /// Set the event type and source in <event>
   void send_event (int event_number,
                    const RtecEventComm::Event& event);
 
   /// Send a shutdown event.
-  void send_shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void send_shutdown (void);
 
   /// Connect using a <supplier_admin> and publications (<qos>)
   /// computed by the user
   virtual void connect (
         RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type
-        ACE_ENV_ARG_DECL);
+        int shutdown_event_type);
 
   /// Connect using the current consumer_proxy (useful for reconnect test)
   virtual void connect (
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type
-        ACE_ENV_ARG_DECL);
+        int shutdown_event_type);
 
   /// Disconnect from the EC, also deactivates the object
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Disconnect from the EC, also deactivates the object
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
 
   /// Dump the results...
   virtual void dump_results (const char* name,
@@ -98,7 +94,7 @@ public:
                    RtecEventComm::Event& event);
 
   // = The PushSupplier methods
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 2c77a1e7750..10cc9236643 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -25,7 +25,7 @@ class FTClientMain
 
   ////////////
   // execution
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
 
   /////////////////
   // implementation
@@ -37,10 +37,10 @@ private:
     int & more,             // out
     ACE_CString & command,  // inout
     int retry               // in
-    ACE_ENV_ARG_DECL);
+    );
 
 
-  int next_replica (ACE_ENV_SINGLE_ARG_DECL);
+  int next_replica (void);
 
   ////////////////////
   // forbidden methods
@@ -220,8 +220,7 @@ int FTClientMain::pass (
   long & counter,
   int & more,
   ACE_CString & command,
-  int retry
-  ACE_ENV_ARG_DECL)
+  int retry)
 {
   int result = 0;
 
@@ -275,8 +274,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->set(%ld);\n", operand);
           }
-          this->replica_->set(operand ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          this->replica_->set(operand);
           counter = operand;
           break;
         }
@@ -286,8 +284,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->get();\n");
           }
-          long value = this->replica_->counter(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          long value = this->replica_->counter();
           if (value == operand)
           {
             ACE_OS::fprintf (stdout, "FT Client: Good: Read %ld expecting %ld\n", value, operand);
@@ -307,8 +304,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->counter(%ld);\n", operand);
           }
-          this->replica_->counter(operand ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          this->replica_->counter(operand);
           counter = operand;
           break;
         }
@@ -318,8 +314,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", operand);
           }
-          this->replica_->increment(operand ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          this->replica_->increment(operand);
           counter += operand;
           break;
         }
@@ -329,8 +324,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", -operand);
           }
-          this->replica_->increment(-operand ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          this->replica_->increment(-operand);
           counter -= operand;
           break;
         }
@@ -340,8 +334,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->counter();\n");
           }
-          long attribute = this->replica_->counter(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          long attribute = this->replica_->counter();
           ACE_OS::fprintf (stdout, "FT Client: Attribute: %ld\n", attribute);
           echo = 0;
           break;
@@ -352,8 +345,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->is_alive();\n");
           }
-          int alive = this->replica_->is_alive(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          int alive = this->replica_->is_alive();
           ACE_OS::fprintf (stdout, "FT Client: Is alive?  %d\n", alive);
           break;
         }
@@ -363,8 +355,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->die(%ld);\n", operand);
           }
-          this->replica_->die(static_cast<FT_TEST::TestReplica::Bane> (operand) ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          this->replica_->die(static_cast<FT_TEST::TestReplica::Bane> (operand));
           echo = 0;
           break;
         }
@@ -374,8 +365,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->get_state();\n");
           }
-          state = this->replica_->get_state(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          state = this->replica_->get_state();
           stateValue = counter;
           break;
         }
@@ -387,9 +377,7 @@ int FTClientMain::pass (
             {
               ACE_OS::fprintf (stdout, "FT Client: ->set_state(saved_state);\n");
             }
-            this->replica_->set_state (state.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (-1);
+            this->replica_->set_state (state.in ());
             counter = stateValue;
           }
           else
@@ -404,8 +392,7 @@ int FTClientMain::pass (
           {
             ACE_OS::fprintf (stdout, "FT Client: ->get_update();\n");
           }
-          update = this->replica_->get_update(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          update = this->replica_->get_update();
           updateValue = counter;
           break;
         }
@@ -417,8 +404,7 @@ int FTClientMain::pass (
             {
               ACE_OS::fprintf (stdout, "FT Client: ->set_update(saved_update);\n");
             }
-            this->replica_->set_update(update.in () ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (-1);
+            this->replica_->set_update(update.in ());
             counter = updateValue;
           }
           else
@@ -446,26 +432,23 @@ int FTClientMain::pass (
         {
           if (operand != 0)
           {
-            ACE_TRY_NEW_ENV
+            try
             {
               if (this->verbose_ >= LOUD)
               {
                 ACE_OS::fprintf (stdout, "FT Client: ->shutdown();\n");
               }
-              this->replica_->shutdown( ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+              this->replica_->shutdown();
               // @@ Note: this is here because the corba event loop seems to go to sleep
               // if there's nothing for it to do.
               // not quite sure why, yet.  Dale
-              this->replica_->is_alive(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+              this->replica_->is_alive();
             }
-            ACE_CATCHANY
+            catch (const CORBA::Exception&)
             {
               ACE_OS::fprintf (stdout, "FT Client: Ignoring expected exception during shutdown.\n");
               ; // ignore exception during shutdown
             }
-            ACE_ENDTRY;
           }
           echo = 0;
           more = 0;
@@ -488,8 +471,7 @@ int FTClientMain::pass (
           ACE_OS::fprintf (stdout, "FT Client: ->get();\n");
         }
 
-        long value = this->replica_->get(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (-1);
+        long value = this->replica_->get();
         if (value == counter)
         {
           if (this->verbose_ >= NORMAL)
@@ -508,15 +490,14 @@ int FTClientMain::pass (
   return result;
 }
 
-int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL)
+int FTClientMain::next_replica (void)
 {
   int result = 0;
   if (this->replica_pos_ < this->replica_iors_.size())
   {
     this->replica_name_ = this->replica_iors_[this->replica_pos_].c_str();
     this->replica_pos_ += 1;
-    CORBA::Object_var rep_obj = this->orb_->string_to_object (this->replica_name_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    CORBA::Object_var rep_obj = this->orb_->string_to_object (this->replica_name_);
     this->replica_ = FT_TEST::TestReplica::_narrow (rep_obj.in ());
     if (! CORBA::is_nil (replica_.in ()))
     {
@@ -537,21 +518,19 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 
-int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
+int FTClientMain::run (void)
 {
   int result = 0;
 
   this->orb_ = CORBA::ORB_init(this->argc_, this->argv_);
 
-  int ok = next_replica (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int ok = next_replica ();
   if (ok)
   {
     // retry information
     ACE_CString command;
     int retry = 0;
-    long counter = this->replica_->get(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    long counter = this->replica_->get();
 
     if (this->verbose_ >= NORMAL)
     {
@@ -565,21 +544,19 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
     int more = 1;
     while (more && result == 0 &&  !feof (this->commandIn_))
     {
-      ACE_TRY_NEW_ENV
+      try
       {
-        result = pass (counter, more, command, retry ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        result = pass (counter, more, command, retry);
       }
-      ACE_CATCH (CORBA::SystemException, sysex)
+      catch (const CORBA::SystemException& sysex)
       {
         ACE_OS::fprintf (stdout, "FT Client: Caught system exception: \n");
-        ACE_PRINT_EXCEPTION (sysex, "FT Client");
+        sysex._tao_print_exception ("FT Client");
 
         retry = 0;
         int handled = 0;
 
-        handled = next_replica(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+        handled = next_replica();
         if (handled)
         {
           ACE_OS::fprintf (stdout, "FT Client: Recovering from fault.\n");
@@ -609,10 +586,9 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
         if (! handled)
         {
           ACE_OS::fprintf (stdout, "FT Client: Exception not handled.  Rethrow. ");
-          ACE_RE_THROW;
+          throw;
         }
       }
-      ACE_ENDTRY;
     }
   }
   else
@@ -630,18 +606,15 @@ main (int argc, char *argv[])
   int result = app.parse_args(argc, argv);
   if (result == 0)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
-      result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = app.run ();
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "FT_Client::main\t\n");
+      ex._tao_print_exception ("FT_Client::main\t\n");
       result = -1;
     }
-    ACE_ENDTRY;
   }
   return result;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 996c2a27fb7..e2bd22e9d1c 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -131,7 +131,7 @@ void FTAPP::FT_Creator::usage(FILE* out)const
 
 
 
-int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -140,11 +140,9 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   if ( this->registry_ior_ != 0)
   {
     CORBA::Object_var registry_obj
-      = this->orb_->string_to_object (this->registry_ior_  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      = this->orb_->string_to_object (this->registry_ior_);
     PortableGroup::FactoryRegistry_var registry
-      = PortableGroup::FactoryRegistry::_narrow(registry_obj.in ()  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      = PortableGroup::FactoryRegistry::_narrow(registry_obj.in ());
     if (! CORBA::is_nil (registry.in ()))
     {
       result = this->creator_.set_factory_registry(registry.in());
@@ -153,16 +151,14 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   if (result == 0)
   {
-    result = this->creator_.init (orb ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    result = this->creator_.init (orb);
   }
 
 
   if (result == 0 && this->ns_register_)
   {
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ()))
     {
@@ -171,14 +167,13 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
                         1);
     }
     this->naming_context_=
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
   }
 
   return result;
 }
 
-int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
+int FTAPP::FT_Creator::run (void)
 {
   int result = 0;
   size_t typeCount = this->create_roles_.size();
@@ -189,14 +184,11 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
     ACE_OS::fprintf (stdout, "\nCreator: Creating group of %s\n", role);
     PortableGroup::ObjectGroup_var group = this->creator_.create_group (
       role,
-      this->write_iors_
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (1);
+      this->write_iors_);
 
     if (this->write_iogr_)
     {
-      CORBA::String_var iogr = this->orb_->object_to_string (group.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (1);
+      CORBA::String_var iogr = this->orb_->object_to_string (group.in ());
 
       char iogr_filename[1000];
       ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename)-1, "%s%s_%d.iogr",
@@ -229,9 +221,7 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
       this_name.length (1);
       this_name[0].id = CORBA::string_dup (iogr_name);
 
-      this->naming_context_->rebind (this_name, group.in()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (1);
+      this->naming_context_->rebind (this_name, group.in());
     }
 
     iogr_seq_ += 1;
@@ -242,8 +232,7 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
   for ( nType = 0; result == 0 && nType < typeCount; ++nType)
   {
     const char * role = this->unregister_roles_[nType].c_str();
-    result = this->creator_.unregister_role (role ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    result = this->creator_.unregister_role (role);
   }
 
   return result;
@@ -258,20 +247,17 @@ int
 main (int argc, char *argv[])
 {
   int result = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-    ACE_TRY_CHECK;
     FTAPP::FT_Creator app;
     result = app.parse_args(argc, argv);
     if (result == 0)
     {
-      result = app.init (orb.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = app.init (orb.in ());
       if (result == 0)
       {
-        result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        result = app.run ();
       }
       if (result == 0)
       {
@@ -279,12 +265,10 @@ main (int argc, char *argv[])
       }
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "FT_Creator::main\t\n");
+    ex._tao_print_exception ("FT_Creator::main\t\n");
     result = -1;
   }
-  ACE_ENDTRY;
   return result;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 14e2664fda9..e7908de8f98 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -42,11 +42,11 @@ namespace FTAPP
     // initialization
     int parse_args (int argc, char *argv[]);
 
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     ////////////
     // execution
-    int run (ACE_ENV_SINGLE_ARG_DECL);
+    int run (void);
 
     ////////////
     // shut down
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index ba8b3d7e58d..bdccea37752 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -73,10 +73,8 @@ FT_ReplicaFactory_i::FT_ReplicaFactory_i ()
   , empty_slots_(0)
   , quit_requested_(0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   char const * repo_id =
-    FT_TEST::_tc_TestReplica->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    FT_TEST::_tc_TestReplica->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "TestReplica type_id: %s\n",
@@ -243,7 +241,7 @@ const char * FT_ReplicaFactory_i::identity () const
   return this->identity_.c_str();
 }
 
-int FT_ReplicaFactory_i::idle (int & result ACE_ENV_ARG_DECL)
+int FT_ReplicaFactory_i::idle (int & result)
 {
   result = 0;
   size_t replicaCount = this->replicas_.size();
@@ -258,8 +256,7 @@ int FT_ReplicaFactory_i::idle (int & result ACE_ENV_ARG_DECL)
         // ignore the return status (the replica should shut itself down
         // unless result is non-zero.
         // non-zero result means panic.
-        replica->idle(result ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+        replica->idle(result);
       }
     }
   }
@@ -287,7 +284,7 @@ int FT_ReplicaFactory_i::idle (int & result ACE_ENV_ARG_DECL)
 
 
 
-int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
 
@@ -295,9 +292,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
   {
@@ -308,10 +303,8 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
-  ACE_CHECK_RETURN (-1);
   if (CORBA::is_nil(this->poa_.in ()))
   {
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -320,33 +313,24 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   }
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->object_id_ = this->poa_->activate_object (this);
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->id_to_reference (object_id_.in ());
 
-  this->ior_ = this->orb_->object_to_string (this_obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->ior_ = this->orb_->object_to_string (this_obj.in ());
 
   if (this->factory_registry_ior_ != 0)
   {
     if (ACE_OS::strcmp (this->factory_registry_ior_, "none") != 0)
     {
-      CORBA::Object_var reg_obj = this->orb_->string_to_object(factory_registry_ior_
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      CORBA::Object_var reg_obj = this->orb_->string_to_object(factory_registry_ior_);
       this->factory_registry_ = ::PortableGroup::FactoryRegistry::_narrow(reg_obj.in ());
       if (CORBA::is_nil(this->factory_registry_.in ()))
       {
@@ -362,19 +346,16 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   {
     ///////////////////////////////
     // Find the ReplicationManager
-    ACE_TRY_NEW_ENV
+    try
     {
-      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var rm_obj = orb->resolve_initial_references("ReplicationManager");
+      this->replication_manager_ = ::FT::ReplicationManager::_narrow(rm_obj.in());
       if (!CORBA::is_nil (replication_manager_.in ()))
       {
         this->have_replication_manager_ = 1;
         // empty criteria
         ::PortableGroup::Criteria criteria;
-        this->factory_registry_ = this->replication_manager_->get_factory_registry(criteria  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->factory_registry_ = this->replication_manager_->get_factory_registry(criteria);
         if (CORBA::is_nil (this->factory_registry_.in ()))
         {
           ACE_ERROR ((LM_ERROR,"ReplicaFactory: ReplicationManager failed to return FactoryRegistry.  Factory will not be registered.\n" ));
@@ -382,8 +363,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
       }
       else
       {
-        this->factory_registry_ =  ::PortableGroup::FactoryRegistry::_narrow(rm_obj.in()  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->factory_registry_ =  ::PortableGroup::FactoryRegistry::_narrow(rm_obj.in());
         if (!CORBA::is_nil(this->factory_registry_.in ()))
         {
           ACE_DEBUG ((LM_DEBUG,"Found a FactoryRegistry DBA ReplicationManager\n" ));
@@ -394,15 +374,14 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         }
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       if (this->test_output_file_ == 0) // ignore if this is a test run
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-          "ReplicaFactory: Exception resolving ReplicationManager. Factory will not be registered.\n" );
+        ex._tao_print_exception (
+          "ReplicaFactory: Exception resolving ReplicationManager. Factory will not be registered.\n");
       }
     }
-    ACE_ENDTRY;
 
   }
 
@@ -429,15 +408,12 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
          ));
 
       char const * replica_repository_id =
-        FT_TEST::_tc_TestReplica->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        FT_TEST::_tc_TestReplica->id ();
 
       this->factory_registry_->register_factory(
         roleName,
         replica_repository_id,
-        info
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        info);
     }
     this->registered_ = 1;
   }
@@ -485,8 +461,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ())){
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -495,15 +470,13 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
 
     this->this_name_.length (1);
     this->this_name_[0].id = CORBA::string_dup (this->ns_name_);
 
     this->naming_context_->rebind (this->this_name_, this_obj.in()  // CORBA::Object::_duplicate(this_obj)
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+                            );
   }
 
   // if we're testing.  Create a replica at startup time
@@ -511,21 +484,18 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   {
     // shouldn't be necessary, but create_replica assumes this
     InternalGuard guard (this->internals_);
-    FT_TestReplica_i * replica = create_replica ("test" ACE_ENV_ARG_PARAMETER);
-
-    PortableServer::POA_var poa = replica->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-    ::CORBA::Object_var replica_obj = poa->servant_to_reference(replica ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-    ::CORBA::String_var replicaIOR = this->orb_->object_to_string(replica_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    FT_TestReplica_i * replica = create_replica ("test");
+
+    PortableServer::POA_var poa = replica->_default_POA ();
+    ::CORBA::Object_var replica_obj = poa->servant_to_reference(replica);
+    ::CORBA::String_var replicaIOR = this->orb_->object_to_string(replica_obj.in ());
     write_ior (this->test_output_file_, replicaIOR.in ());
   }
 
   return result;
 }
 
-int FT_ReplicaFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+int FT_ReplicaFactory_i::fini (void)
 {
   if (this->ior_output_file_ != 0)
   {
@@ -534,9 +504,7 @@ int FT_ReplicaFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
   }
   if (this->ns_name_ != 0)
   {
-    this->naming_context_->unbind (this_name_
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->naming_context_->unbind (this_name_);
     this->ns_name_ = 0;
   }
 
@@ -556,9 +524,7 @@ int FT_ReplicaFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
       location.length(1);
       location[0].id = CORBA::string_dup(location_);
       this->factory_registry_->unregister_factory_by_location (
-              location
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+              location);
     }
     else
     {
@@ -577,9 +543,7 @@ int FT_ReplicaFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
         location[0].id = CORBA::string_dup(location_);
         this->factory_registry_->unregister_factory (
                 roleName,
-                location
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (-1);
+                location);
       }
     }
   }
@@ -588,15 +552,14 @@ int FT_ReplicaFactory_i::fini (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 
-void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * replica ACE_ENV_ARG_DECL)
+void FT_ReplicaFactory_i::remove_replica(CORBA::ULong id, FT_TestReplica_i * replica)
 {
   InternalGuard guard (this->internals_);
   if (id < this->replicas_.size())
   {
     if(this->replicas_[id] == replica)
     {
-      replica->fini(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      replica->fini();
       delete replica;
       this->replicas_[id] = 0;
       this->empty_slots_ += 1;
@@ -626,7 +589,6 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -675,7 +637,7 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
     ACE_THROW_RETURN ( PortableGroup::InvalidCriteria(), 0);
   }
 
-  FT_TestReplica_i * replica = create_replica(role ACE_ENV_ARG_PARAMETER);
+  FT_TestReplica_i * replica = create_replica(role);
   if (replica == 0)
   {
     ACE_ERROR ((LM_ERROR,
@@ -696,11 +658,11 @@ CORBA::Object_ptr FT_ReplicaFactory_i::create_object (
 
 
   ::CORBA::Object_ptr replica_obj =
-    replica->_default_POA(ACE_ENV_SINGLE_ARG_PARAMETER)->servant_to_reference(replica);
+    replica->_default_POA()->servant_to_reference(replica);
   METHOD_RETURN(FT_ReplicaFactory_i::create_object) replica_obj->_duplicate(replica_obj);
 }
 
-FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name ACE_ENV_ARG_DECL)
+FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name)
 {
   // assume mutex is locked
   CORBA::ULong factoryId = allocate_id();
@@ -716,13 +678,12 @@ FT_TestReplica_i * FT_ReplicaFactory_i::create_replica(const char * name ACE_ENV
   this->replicas_[factoryId] = pFTReplica;
   this->empty_slots_ -= 1;
 
-  pFTReplica->init (this->orb_ ACE_ENV_ARG_PARAMETER);
+  pFTReplica->init (this->orb_);
   return pFTReplica;
 }
 
 void FT_ReplicaFactory_i::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -743,24 +704,24 @@ void FT_ReplicaFactory_i::delete_object (
     }
     else
     {
-      ACE_THROW(::PortableGroup::ObjectNotFound());
+      throw ::PortableGroup::ObjectNotFound();
     }
   }
   else
   {
-    ACE_THROW(::PortableGroup::ObjectNotFound());
+    throw ::PortableGroup::ObjectNotFound();
   }
   METHOD_RETURN(FT_ReplicaFactory_i::delete_object);
 }
 
-CORBA::Boolean FT_ReplicaFactory_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean FT_ReplicaFactory_i::is_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   METHOD_RETURN(FT_ReplicaFactory_i::is_alive)
     1;
 }
 
-void FT_ReplicaFactory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void FT_ReplicaFactory_i::shutdown (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index a87cb08afe6..ca8eec537e8 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -74,15 +74,15 @@ public:
    * @param orb our ORB -- we keep var to it.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orb);
 
   /**
    * Prepare to exit.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int fini (void);
 
-  int idle(int & result ACE_ENV_ARG_DECL);
+  int idle(int & result);
 
 
   /**
@@ -99,13 +99,13 @@ public:
    * @param id the numerical id assigned to this replica.
    * @param replica a pointer to the Replica object (redundant for safety.)
    */
-  void remove_replica (CORBA::ULong id, FT_TestReplica_i * replica ACE_ENV_ARG_DECL);
+  void remove_replica (CORBA::ULong id, FT_TestReplica_i * replica);
 
   //////////////////
   // CORBA interface
   // See IDL for documentation
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
@@ -116,7 +116,6 @@ public:
     const char * type_id,
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -129,7 +128,6 @@ public:
 
   virtual void delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -139,7 +137,7 @@ public:
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
 
-  virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean is_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /////////////////////////
@@ -149,7 +147,7 @@ private:
    * Actual replica creation happens in this method.
    * @param name becomes part of the objects identity.
    */
-  FT_TestReplica_i * create_replica(const char * name ACE_ENV_ARG_DECL);
+  FT_TestReplica_i * create_replica(const char * name);
 
   /**
    * Find or allocate an ID for a new replica
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 16f1f70eee4..153eefeb0c6 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -60,11 +60,10 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
 {
   int result = 0;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Initialize the ORB.
-    this->orb_ = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_ = CORBA::ORB_init (argc, argv, "");
 
     // Parse arguments.
     result = this->parse_args (argc, argv);
@@ -74,18 +73,15 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
       if (this->rm_ior_ != 0)
       {
         obj = this->orb_->string_to_object (
-          this->rm_ior_ ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          this->rm_ior_);
       }
       else
       {
         obj = this->orb_->resolve_initial_references (
-          "ReplicationManager" ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          "ReplicationManager");
       }
       this->replication_manager_ = FT::ReplicationManager::_narrow (
-        obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        obj.in());
       if (CORBA::is_nil (this->replication_manager_.in()))
       {
         ACE_ERROR ((LM_ERROR,
@@ -97,16 +93,13 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
       }
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO_FT_ReplicationManagerController::init: \n")
-    );
+        "TAO_FT_ReplicationManagerController::init: \n"));
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -162,26 +155,22 @@ int TAO_FT_ReplicationManagerController::run ()
 {
   int result = 0;
 
-  ACE_TRY_NEW_ENV
+  try
   {
     if (this->shutdown_ == 1)
     {
-      this->replication_manager_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->replication_manager_->shutdown ();
       ACE_Time_Value tv (0, 500000);
       ACE_OS::sleep (tv);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (
-      ACE_ANY_EXCEPTION,
+    ex._tao_print_exception (
       ACE_TEXT (
-        "TAO_FT_ReplicationManagerController::run: \n")
-    );
+        "TAO_FT_ReplicationManagerController::run: \n"));
     result = -1;
   }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index ad89659b3bc..6d6d18de21a 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -75,21 +75,21 @@ namespace
 #define KEVORKIAN(value, method)                                   \
   if (this->death_pending_ == (FT_TEST::TestReplica::value)){      \
     suicide (#value " in method " #method);                        \
-    ACE_THROW (FAULT_CODE (                                        \
-      CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                \
-            EFAULT),                                               \
-            CORBA::COMPLETED_NO));                                 \
+    throw FAULT_CODE (                                             \
+             CORBA::SystemException::_tao_minor_code (             \
+               TAO::VMCID,                                         \
+               EFAULT),                                            \
+             CORBA::COMPLETED_NO);                                 \
     } else ;
 
 #define KEVORKIAN_DURING(method)                                   \
   if (this->death_pending_ == FT_TEST::TestReplica::BEFORE_REPLY ){\
     suicide ("read-only method " #method);                         \
-    ACE_THROW (FAULT_CODE (                                        \
-      CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                \
-            EFAULT),                                               \
-            CORBA::COMPLETED_NO));                                 \
+    throw FAULT_CODE (                                             \
+             CORBA::SystemException::_tao_minor_code (             \
+               TAO::VMCID,                                         \
+               EFAULT),                                            \
+             CORBA::COMPLETED_NO);                                 \
     } else ;
 
 #define KEVORKIAN_RETURN(value, method, result)                    \
@@ -97,7 +97,7 @@ namespace
     suicide (#value " in method " #method);                        \
     ACE_THROW_RETURN (FAULT_CODE (                                 \
       CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                \
+            TAO::VMCID,                                            \
             EFAULT),                                               \
             CORBA::COMPLETED_NO),                                  \
       result);                                                     \
@@ -108,7 +108,7 @@ namespace
     suicide ("read-only method " #method);                         \
     ACE_THROW_RETURN (FAULT_CODE (                                 \
       CORBA::SystemException::_tao_minor_code (                    \
-            TAO::VMCID,                                \
+            TAO::VMCID,                                            \
             EFAULT),                                               \
             CORBA::COMPLETED_NO),                                  \
             result);                                               \
@@ -154,11 +154,9 @@ void FT_TestReplica_i::suicide(const char * note)
 //static
 const char * FT_TestReplica_i::repository_id()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   const char * id =
-    FT_TEST::_tc_TestReplica->id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    FT_TEST::_tc_TestReplica->id();
 
   return id;
 }
@@ -183,7 +181,7 @@ unsigned long FT_TestReplica_i::factory_id()const
   return this->factory_id_;
 }
 
-::PortableServer::POA_ptr FT_TestReplica_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+::PortableServer::POA_ptr FT_TestReplica_i::_default_POA (void)
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -199,15 +197,13 @@ PortableServer::ObjectId FT_TestReplica_i::object_id()const
  * @param orbManager our ORB -- we keep var to it.
  * @return zero for success; nonzero is process return code for failure.
  */
-int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
+int FT_TestReplica_i::init (CORBA::ORB_var & orb)
 {
   this->orb_ = orb;
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -216,10 +212,8 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
-  ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil(this->poa_.in ()))
   {
@@ -229,29 +223,26 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
   }
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->object_id_ = this->poa_->activate_object (this);
 
   return 0;
 }
 
-void FT_TestReplica_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL)
+void FT_TestReplica_i::_remove_ref (void)
 {
   //////////////////////////////////////////////////
   // WARNING: The following call invokes fini then deletes this object
-  this->factory_->remove_replica(this->factory_id_, this ACE_ENV_ARG_PARAMETER);
+  this->factory_->remove_replica(this->factory_id_, this);
 }
 
-int FT_TestReplica_i::fini (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+int FT_TestReplica_i::fini (void)
 {
   return 0;
 }
@@ -260,7 +251,7 @@ int FT_TestReplica_i::fini (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  PullMonitorable interface
-CORBA::Boolean FT_TestReplica_i::is_alive (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Boolean FT_TestReplica_i::is_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN_RETURN(DURING_IS_ALIVE, is_alive, 0)
@@ -277,7 +268,7 @@ CORBA::Boolean FT_TestReplica_i::is_alive (ACE_ENV_SINGLE_ARG_DECL)
 
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  Updateable interface
-FT::State * FT_TestReplica_i::get_update (ACE_ENV_SINGLE_ARG_DECL)
+FT::State * FT_TestReplica_i::get_update (void)
   ACE_THROW_SPEC ((CORBA::SystemException, FT::NoUpdateAvailable))
 {
   KEVORKIAN_RETURN(DURING_GET_UPDATE, get_update, 0)
@@ -288,11 +279,11 @@ FT::State * FT_TestReplica_i::get_update (ACE_ENV_SINGLE_ARG_DECL)
   return vState._retn();
 }
 
-void FT_TestReplica_i::set_update (const FT::State & s ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::set_update (const FT::State & s)
   ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidUpdate))
 {
 #if defined(FT_TEST_LACKS_UPDATE)
-  ACE_THROW ( FT::InvalidUpdate () );
+  throw FT::InvalidUpdate ();
 #else // FT_TEST_LACKS_UPDATE
   KEVORKIAN(BEFORE_SET_UPDATE, set_update)
   long counter = loadLong<FT::State>(s, 0);
@@ -303,11 +294,11 @@ void FT_TestReplica_i::set_update (const FT::State & s ACE_ENV_ARG_DECL)
 
 /////////////////////////////////////////////////////
 // class FT_TestReplica_i:  Checkpointable interface
-::FT::State * FT_TestReplica_i::get_state (ACE_ENV_SINGLE_ARG_DECL)
+::FT::State * FT_TestReplica_i::get_state (void)
   ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable))
 {
 #if defined(FT_TEST_LACKS_STATE)
-  ACE_THROW( FT::NoStateAvailable () );
+  throw FT::NoStateAvailable ();
 #else // FT_TEST_LACKS_STATE
   KEVORKIAN_RETURN(DURING_GET_STATE, get_state, 0)
   long counter = load();
@@ -318,11 +309,11 @@ void FT_TestReplica_i::set_update (const FT::State & s ACE_ENV_ARG_DECL)
 #endif // FT_TEST_LACKS_STATE
 }
 
-void FT_TestReplica_i::set_state (const FT::State & s ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::set_state (const FT::State & s)
   ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidState))
 {
 #if defined(FT_TEST_LACKS_STATE)
-  ACE_THROW ( FT::InvalidState () );
+  throw FT::InvalidState ();
 #else // FT_TEST_LACKS_STATE
   KEVORKIAN(BEFORE_SET_STATE, set_state)
   long counter = loadLong<FT::State>(s, 0);
@@ -335,7 +326,6 @@ void FT_TestReplica_i::tao_update_object_group (
     const char * iogr,
     PortableGroup::ObjectGroupRefVersion version,
     CORBA::Boolean is_primary
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -343,14 +333,13 @@ void FT_TestReplica_i::tao_update_object_group (
   ACE_UNUSED_ARG (version);
   ACE_UNUSED_ARG (is_primary);
 
-  ACE_THROW (CORBA::NO_IMPLEMENT());
+  throw CORBA::NO_IMPLEMENT();
 }
 
 //////////////////////////////
 // implement FT_TEST::Replica
 
-void FT_TestReplica_i::set (CORBA::Long value
-    ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::set (CORBA::Long value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN(BEFORE_STATE_CHANGE, set)
@@ -359,8 +348,7 @@ void FT_TestReplica_i::set (CORBA::Long value
   KEVORKIAN(BEFORE_REPLY, set)
 }
 
-CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta
-    ACE_ENV_ARG_DECL)
+CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN_RETURN(BEFORE_STATE_CHANGE, increment, 0)
@@ -371,7 +359,7 @@ CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta
   return counter;
 }
 
-CORBA::Long FT_TestReplica_i::get (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Long FT_TestReplica_i::get (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN_DURING_RETURN(get, 0)
@@ -379,7 +367,7 @@ CORBA::Long FT_TestReplica_i::get (ACE_ENV_SINGLE_ARG_DECL)
   return counter;
 }
 
-CORBA::Long FT_TestReplica_i::counter (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Long FT_TestReplica_i::counter (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN_DURING_RETURN([get]counter, 0)
@@ -387,8 +375,7 @@ CORBA::Long FT_TestReplica_i::counter (ACE_ENV_SINGLE_ARG_DECL)
   return counter;
 }
 
-void FT_TestReplica_i::counter (CORBA::Long counter
-    ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::counter (CORBA::Long counter)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   KEVORKIAN(BEFORE_STATE_CHANGE, [set]counter)
@@ -396,8 +383,7 @@ void FT_TestReplica_i::counter (CORBA::Long counter
   KEVORKIAN(BEFORE_REPLY, [set]counter)
 }
 
-void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when
-      ACE_ENV_ARG_DECL)
+void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_OS::fprintf (stdout, "%s@%s#%lu Received death threat: %d\n",
@@ -407,7 +393,7 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when
   KEVORKIAN(RIGHT_NOW, die)
 }
 
-void FT_TestReplica_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void FT_TestReplica_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_OS::fprintf (stdout, "%s@%s#%lu Shut down requested\n",
@@ -417,7 +403,7 @@ void FT_TestReplica_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 //////////////////////////////////////////////
 // FT_TestReplica_i public non-CORBA interface
-int FT_TestReplica_i::idle (int & result ACE_ENV_ARG_DECL)
+int FT_TestReplica_i::idle (int & result)
 {
   int quit = 0;
   if (this->death_pending_ == FT_TEST::TestReplica::WHILE_IDLE)
@@ -428,15 +414,13 @@ int FT_TestReplica_i::idle (int & result ACE_ENV_ARG_DECL)
       this->factory_->location(),
       static_cast<int> (this->factory_id_ )
       ));
-    this->poa_->deactivate_object (this->object_id_.in ()
-                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->deactivate_object (this->object_id_.in ());
     result = 0;
     quit = 1;
   }
   else if (this->death_pending_ == FT_TEST::TestReplica::CLEAN_EXIT)
   {
-    this->poa_->deactivate_object (this->object_id_.in ()
-                 ACE_ENV_ARG_PARAMETER);
+    this->poa_->deactivate_object (this->object_id_.in ());
     result = 0;
     quit = 1;
   }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index 77551ea21a0..b7b99dc33f0 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -62,20 +62,20 @@ public:
    * @param orbManager our ORB -- we keep var to it.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_var & orb);
 
   /**
    * Prepare to exit.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int fini (void);
 
   /**
    * idle time activity.
    * @param result [out] status code to return from process
    * @returns 0 to continue; nonzero to quit
    */
-  int idle(int &result ACE_ENV_ARG_DECL);
+  int idle(int &result);
 
   void request_quit();
 
@@ -89,57 +89,53 @@ public:
 
   //////////////////////////////////////////
   // Override CORBA servant virtual methods
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (void);
 
 private:
   ///////////////////////////
   // override Replica methods
-  virtual void set (CORBA::Long value
-      ACE_ENV_ARG_DECL)
+  virtual void set (CORBA::Long value)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
-  virtual CORBA::Long increment (CORBA::Long delta
-      ACE_ENV_ARG_DECL)
+  virtual CORBA::Long increment (CORBA::Long delta)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long get (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long get (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long counter (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long counter (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void counter (CORBA::Long counter
-      ACE_ENV_ARG_DECL)
+  virtual void counter (CORBA::Long counter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void die (FT_TEST::TestReplica::Bane when
-      ACE_ENV_ARG_DECL)
+  virtual void die (FT_TEST::TestReplica::Bane when)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ///////////////////////////
   // override PullMonitorable
 
-  virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean is_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ///////////////////////////
   // override Updatable
 
-  virtual ::FT::State * get_update (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::FT::State * get_update (void)
     ACE_THROW_SPEC ((CORBA::SystemException, FT::NoUpdateAvailable));
 
-  virtual void set_update (const FT::State & s ACE_ENV_ARG_DECL)
+  virtual void set_update (const FT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidUpdate));
 
-  virtual ::FT::State * get_state (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::FT::State * get_state (void)
     ACE_THROW_SPEC ((CORBA::SystemException, FT::NoStateAvailable));
 
-  virtual void set_state (const FT::State & s ACE_ENV_ARG_DECL)
+  virtual void set_state (const FT::State & s)
     ACE_THROW_SPEC ((CORBA::SystemException, FT::InvalidState));
 
   ////////////////
@@ -149,7 +145,6 @@ private:
       const char * iogr,
       PortableGroup::ObjectGroupRefVersion version,
       CORBA::Boolean is_primary
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 12357cb9297..30274758980 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -111,8 +111,7 @@ int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, char * argv[])
  * Register this object.
  */
 int ReplicationManagerFaultConsumerAdapter::init (
-  CORBA::ORB_ptr orb
-  ACE_ENV_ARG_DECL)
+  CORBA::ORB_ptr orb)
 {
   ACE_DEBUG ((
     LM_DEBUG,
@@ -131,11 +130,9 @@ int ReplicationManagerFaultConsumerAdapter::init (
   ));
 
   CORBA::Object_var detector_obj = this->orb_->string_to_object (
-    this->detector_ior_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->detector_ior_);
   this->factory_ = ::FT::FaultDetectorFactory::_narrow (
-    detector_obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    detector_obj.in());
   if (CORBA::is_nil (this->factory_.in()))
   {
     ACE_ERROR_RETURN ((
@@ -155,11 +152,9 @@ int ReplicationManagerFaultConsumerAdapter::init (
   ));
 
   CORBA::Object_var notifier_ior = this->orb_->string_to_object (
-    this->notifier_ior_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->notifier_ior_);
   this->notifier_ = ::FT::FaultNotifier::_narrow (
-    notifier_ior.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    notifier_ior.in());
   if (CORBA::is_nil (this->notifier_.in()))
   {
     ACE_ERROR_RETURN ((
@@ -196,11 +191,9 @@ int ReplicationManagerFaultConsumerAdapter::init (
 
   // Get the RootPOA from the ORB.
   CORBA::Object_var poa_obj = this->orb_->resolve_initial_references (
-    "RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    "RootPOA");
   PortableServer::POA_var poa = PortableServer::POA::_narrow (
-    poa_obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa_obj.in());
 
   // Create a fault analyzer.
   TAO::FT_FaultAnalyzer * analyzer = 0;
@@ -218,9 +211,7 @@ int ReplicationManagerFaultConsumerAdapter::init (
   result = this->p_fault_consumer_->init (
     poa.in(),
     this->notifier_.in(),
-    analyzer
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    analyzer);
   if (result != 0)
   {
     ACE_ERROR_RETURN ((
@@ -234,10 +225,8 @@ int ReplicationManagerFaultConsumerAdapter::init (
 
   // Activate the RootPOA.
   PortableServer::POAManager_var poa_manager =
-    poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->the_POAManager ();
+  poa_manager->activate ();
 
   /////////////////////////
   // Set up fault detectors
@@ -255,11 +244,9 @@ int ReplicationManagerFaultConsumerAdapter::init (
     {
       const char * iorName = this->replica_iors_[nRep];
       CORBA::Object_var replica_obj = this->orb_->string_to_object (
-        iorName ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        iorName);
       FT::PullMonitorable_var replica = FT::PullMonitorable::_narrow (
-        replica_obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        replica_obj.in());
       if (CORBA::is_nil(replica.in()))
       {
         ACE_ERROR_RETURN ((
@@ -325,9 +312,7 @@ int ReplicationManagerFaultConsumerAdapter::init (
           this->factory_->create_object (
             type_id.in(),
             criteria.in(),
-            factory_creation_id
-            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            factory_creation_id);
         }
       }
     }
@@ -358,15 +343,14 @@ const char * ReplicationManagerFaultConsumerAdapter::identity () const
 /**
  * Clean house for process shut down.
  */
-int ReplicationManagerFaultConsumerAdapter::fini (ACE_ENV_SINGLE_ARG_DECL)
+int ReplicationManagerFaultConsumerAdapter::fini (void)
 {
   // Delegate to the FT_FaultConsumer.
-  return this->p_fault_consumer_->fini (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->p_fault_consumer_->fini ();
 }
 
 
-int ReplicationManagerFaultConsumerAdapter::idle(int & result
-    ACE_ENV_ARG_DECL_NOT_USED)
+int ReplicationManagerFaultConsumerAdapter::idle(int & result)
 {
   ACE_UNUSED_ARG(result);
   int quit = 0;
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index 6b45d786a6e..de87010da8e 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -43,7 +43,7 @@ public:
   /**
    * Initialize this object
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (CORBA::ORB_ptr orb);
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -55,12 +55,12 @@ public:
    * @param result [out] status code to return from process
    * @returns 0 to continue; nonzero to quit
    */
-  int idle(int &result ACE_ENV_ARG_DECL);
+  int idle(int &result);
 
   /**
    * Clean house for process shut down.
    */
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int fini (void);
 
 
   size_t notifications() const;
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 6d0e445511f..e57d6787089 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -27,7 +27,7 @@ int StubBatchConsumer::parse_args (int argc, char * argv[])
 }
 
 
-::PortableServer::POA_ptr StubBatchConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+::PortableServer::POA_ptr StubBatchConsumer::_default_POA (void)
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -41,7 +41,7 @@ PortableServer::ObjectId StubBatchConsumer::objectId()const
 /**
  * register this object
  */
-int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notifier ACE_ENV_ARG_DECL)
+int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notifier)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -51,9 +51,7 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,10 +59,8 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif
                       -1);
 
   // Get the POA .
-  this->poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+  this->poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
-  ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil(this->poa_.in ()))
   {
@@ -74,23 +70,18 @@ int StubBatchConsumer::init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notif
   }
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as an object
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->id_to_reference (object_id_.in ());
 
   CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil();
 
@@ -112,9 +103,9 @@ const char * StubBatchConsumer::identity () const
 /**
  * Clean house for process shut down.
  */
-void StubBatchConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
+void StubBatchConsumer::fini (void)
 {
-  this->notifier_->disconnect_consumer(this->consumer_id_ ACE_ENV_ARG_PARAMETER);
+  this->notifier_->disconnect_consumer(this->consumer_id_);
 }
 
 
@@ -131,7 +122,6 @@ int StubBatchConsumer::idle(int & result)
 //virtual
 void StubBatchConsumer::push_structured_events (
     const CosNotification::EventBatch & notifications
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -145,7 +135,6 @@ void StubBatchConsumer::push_structured_events (
 void StubBatchConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
@@ -159,7 +148,6 @@ void StubBatchConsumer::offer_change (
 
 //virtual
 void StubBatchConsumer::disconnect_sequence_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index 60df5048d5b..24f067a4fd2 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -38,7 +38,7 @@ public:
    */
   virtual ~StubBatchConsumer ();
 
-  ::PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  ::PortableServer::POA_ptr _default_POA (void);
   ::PortableServer::ObjectId objectId()const;
 
   /**
@@ -49,7 +49,7 @@ public:
   /**
    * Publish this objects IOR.
    */
-  int init (CORBA::ORB_ptr orbManager, ::FT::FaultNotifier_var & notifier ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orbManager, ::FT::FaultNotifier_var & notifier);
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -66,7 +66,7 @@ public:
   /**
    * Clean house for process shut down.
    */
-  void fini (ACE_ENV_SINGLE_ARG_DECL);
+  void fini (void);
 
 
 public:
@@ -76,7 +76,6 @@ public:
 
     virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -84,7 +83,6 @@ public:
       ));
 
     virtual void disconnect_sequence_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -93,7 +91,6 @@ public:
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
      ACE_THROW_SPEC ((
        CORBA::SystemException, CosNotifyComm::InvalidEventType
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 56731cf5f59..448a3438905 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -105,7 +105,7 @@ int StubFaultAnalyzer::parse_args (int argc, char * argv[])
 /**
  * Register this object as necessary
  */
-int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int StubFaultAnalyzer::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -134,16 +134,12 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   // register fault consumers
   if (result == 0)
   {
-    result = this->faultConsumer_.init (orb, this->notifier_
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    result = this->faultConsumer_.init (orb, this->notifier_);
   }
 
   if (result == 0)
   {
-    result = this->batchConsumer_.init (orb, this->notifier_
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    result = this->batchConsumer_.init (orb, this->notifier_);
   }
 
   /////////////////////////
@@ -219,9 +215,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
           this->factory_->create_object (
             type_id.in(),
             criteria.in(),
-            factory_creation_id
-            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            factory_creation_id);
         }
       }
     }
@@ -251,15 +245,15 @@ const char * StubFaultAnalyzer::identity () const
 /**
  * Clean house for process shut down.
  */
-int StubFaultAnalyzer::fini (ACE_ENV_SINGLE_ARG_DECL)
+int StubFaultAnalyzer::fini (void)
 {
-  this->faultConsumer_.fini(ACE_ENV_SINGLE_ARG_PARAMETER);
-  this->batchConsumer_.fini(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->faultConsumer_.fini();
+  this->batchConsumer_.fini();
   return 0;
 }
 
 
-int StubFaultAnalyzer::idle(int & result ACE_ENV_ARG_DECL_NOT_USED)
+int StubFaultAnalyzer::idle(int & result)
 {
   ACE_UNUSED_ARG(result);
   int quit = 0;
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 2a5067ad4a2..eec5a427da0 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -48,7 +48,7 @@ public:
   /**
    * Initialize this object
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orb);
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -60,13 +60,13 @@ public:
    * @param result [out] status code to return from process
    * @returns 0 to continue; nonzero to quit
    */
-  int idle(int &result ACE_ENV_ARG_DECL);
+  int idle(int &result);
 
   /**
    * Prepare to exit.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int fini (void);
 
   /////////////////
   // Implementation
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 25a2934df15..3dfc0f4bdb5 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -17,7 +17,7 @@ StubFaultConsumer::~StubFaultConsumer ()
 {
 }
 
-::PortableServer::POA_ptr StubFaultConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+::PortableServer::POA_ptr StubFaultConsumer::_default_POA (void)
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -156,8 +156,7 @@ int StubFaultConsumer::parse_args (int argc, char * argv[])
  * Register this object.
  */
 int StubFaultConsumer::init (CORBA::ORB_ptr orb,
-    ::FT::FaultNotifier_var & notifier
-    ACE_ENV_ARG_DECL)
+    ::FT::FaultNotifier_var & notifier)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -167,9 +166,7 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb,
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -178,10 +175,8 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb,
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
-  ACE_CHECK_RETURN (-1);
   if (CORBA::is_nil(this->poa_.in ()))
   {
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -190,23 +185,18 @@ int StubFaultConsumer::init (CORBA::ORB_ptr orb,
   }
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as an object
 
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->id_to_reference (object_id_.in ());
 
   CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_nil();
 
@@ -228,9 +218,9 @@ const char * StubFaultConsumer::identity () const
 /**
  * Clean house for process shut down.
  */
-int StubFaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
+int StubFaultConsumer::fini (void)
 {
-  this->notifier_->disconnect_consumer(this->consumer_id_ ACE_ENV_ARG_PARAMETER);
+  this->notifier_->disconnect_consumer(this->consumer_id_);
   return 0;
 }
 
@@ -245,7 +235,6 @@ int StubFaultConsumer::idle(int & result)
 // CORBA methods
 void StubFaultConsumer::push_structured_event(
   const CosNotification::StructuredEvent &notification
-  ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
@@ -290,7 +279,6 @@ void StubFaultConsumer::push_structured_event(
 void StubFaultConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
@@ -301,7 +289,7 @@ void StubFaultConsumer::offer_change (
   ));
 }
 
-void StubFaultConsumer::disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void StubFaultConsumer::disconnect_structured_push_consumer(void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 4e8603710e1..111d44eac95 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -40,7 +40,7 @@ public:
   virtual ~StubFaultConsumer ();
 
 
-  ::PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  ::PortableServer::POA_ptr _default_POA (void);
   ::PortableServer::ObjectId objectId()const;
 
   /**
@@ -51,8 +51,7 @@ public:
   /**
    * Publish this objects IOR.
    */
-  int init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notifier
-    ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orb, ::FT::FaultNotifier_var & notifier);
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -69,7 +68,7 @@ public:
   /**
    * Clean house for process shut down.
    */
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int fini (void);
 
 
   size_t notifications() const;
@@ -80,18 +79,16 @@ public:
     // CORBA methods
     virtual void push_structured_event(
       const CosNotification::StructuredEvent &notification
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType));
 
-   virtual void disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+   virtual void disconnect_structured_push_consumer(void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   ////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 24c320efb8e..49f629c8040 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -22,7 +22,7 @@ StubFaultNotifier::~StubFaultNotifier ()
 }
 
 
-::PortableServer::POA_ptr StubFaultNotifier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+::PortableServer::POA_ptr StubFaultNotifier::_default_POA (void)
 {
   return ::PortableServer::POA::_duplicate(this->poa_.in ());
 }
@@ -107,13 +107,12 @@ int StubFaultNotifier::parse_args (int argc, char * argv[])
 /**
  * Prepare to exit.
  */
-int StubFaultNotifier::fini (ACE_ENV_SINGLE_ARG_DECL)
+int StubFaultNotifier::fini (void)
 {
   if(this->ns_name_ != 0)
   {
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      this->orb_->resolve_initial_references ("NameService");
 
     if (CORBA::is_nil(naming_obj.in ())){
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -122,16 +121,13 @@ int StubFaultNotifier::fini (ACE_ENV_SINGLE_ARG_DECL)
     }
 
     CosNaming::NamingContext_var naming_context =
-      CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(-1);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
 
     CosNaming::Name this_name (1);
     this_name.length (1);
     this_name[0].id = CORBA::string_dup (this->ns_name_);
 
-    naming_context->unbind (this_name
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(-1);
+    naming_context->unbind (this_name);
   }
   return 0;
 }
@@ -140,16 +136,14 @@ int StubFaultNotifier::fini (ACE_ENV_SINGLE_ARG_DECL)
 /**
  * Publish this objects IOR.
  */
-int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int StubFaultNotifier::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
 
   // Use the ROOT POA for now
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA);
 
   if (CORBA::is_nil (poa_object.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -158,10 +152,8 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Get the POA object.
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in ());
 
-  ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil(this->poa_.in ()))
   {
@@ -171,22 +163,17 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   }
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   // Register with the POA.
 
-  this->object_id_ = this->poa_->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->object_id_ = this->poa_->activate_object (this);
 
   // find my identity as a corba object
   CORBA::Object_var this_obj =
-    this->poa_->id_to_reference (object_id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->poa_->id_to_reference (object_id_.in ());
 
   //////////////////////////////////////////
   // resolve references to detector factory
@@ -270,9 +257,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
           this->factory_->create_object (
             type_id.in(),
             criteria.in(),
-            factory_creation_id
-            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            factory_creation_id);
         }
       }
     }
@@ -296,8 +281,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
       this->identity_ += this->ns_name_;
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->orb_->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil(naming_obj.in ())){
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -306,16 +290,13 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
       }
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CosNaming::NamingContext::_narrow (naming_obj.in ());
 
       CosNaming::Name this_name (1);
       this_name.length (1);
       this_name[0].id = CORBA::string_dup (this->ns_name_);
 
-      naming_context->rebind (this_name, this_obj.in()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      naming_context->rebind (this_name, this_obj.in());
     }
   }
   return result;
@@ -345,14 +326,13 @@ const char * StubFaultNotifier::identity () const
 /**
  * Clean house for process shut down.
  */
-void StubFaultNotifier::shutdown_i (ACE_ENV_SINGLE_ARG_DECL)
+void StubFaultNotifier::shutdown_i (void)
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void StubFaultNotifier::push_structured_fault (
     const CosNotification::StructuredEvent & event
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -382,19 +362,17 @@ void StubFaultNotifier::push_structured_fault (
 
 void StubFaultNotifier::push_sequence_fault (
     const CosNotification::EventBatch & events
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   ACE_UNUSED_ARG (events);
-  ACE_THROW (CORBA::NO_IMPLEMENT());
+  throw CORBA::NO_IMPLEMENT();
 }
 
 ::CosNotifyFilter::Filter_ptr StubFaultNotifier::create_subscription_filter (
     const char * constraint_grammar
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -410,7 +388,6 @@ void StubFaultNotifier::push_sequence_fault (
 FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_structured_fault_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -427,7 +404,6 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_structured_fault_consum
 FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_sequence_fault_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -442,7 +418,6 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_sequence_fault_consumer
 
 void StubFaultNotifier::disconnect_consumer (
     FT::FaultNotifier::ConsumerId connection
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -451,35 +426,33 @@ void StubFaultNotifier::disconnect_consumer (
 {
   ACE_UNUSED_ARG(connection);
 
-  ACE_THROW (CORBA::NO_IMPLEMENT());
+  throw CORBA::NO_IMPLEMENT();
 }
 
-CORBA::Boolean StubFaultNotifier::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean StubFaultNotifier::is_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
 }
 
-int StubFaultNotifier::idle(int & result ACE_ENV_ARG_DECL_NOT_USED)
+int StubFaultNotifier::idle(int & result)
 {
   ACE_UNUSED_ARG(result);
   int quit = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     if(!CORBA::is_nil(this->factory_.in ()))
     {
-      int ok = this->factory_->is_alive( ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int ok = this->factory_->is_alive();
       if (!ok)
       {
         quit = 1;
       }
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     quit = 1;
   }
-  ACE_ENDTRY;
   return quit;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index 612c5198fa1..7197c9a72fa 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -48,12 +48,12 @@ public:
   /**
    * Initialize.
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  int init (CORBA::ORB_ptr orb);
 
   /**
    * Prepare to exit.
    */
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int fini (void);
 
   /**
    * Return a string to identify this object for logging/console message purposes.
@@ -65,10 +65,10 @@ public:
    * @param result [out] status code to return from process
    * @returns 0 to continue; nonzero to quit
    */
-  int idle(int &result ACE_ENV_ARG_DECL);
+  int idle(int &result);
 
   // override virtuals
-::PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+::PortableServer::POA_ptr _default_POA (void);
 
   PortableServer::ObjectId objectId()const;
 
@@ -76,7 +76,7 @@ public:
   /**
    * Clean house for process shut down.
    */
-  void shutdown_i (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown_i (void);
 
   ////////////////////////////////
   // CORBA interface FaultNotifier
@@ -84,45 +84,39 @@ public:
 
   virtual void push_structured_fault (
       const CosNotification::StructuredEvent & event
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void push_sequence_fault (
     const CosNotification::EventBatch & events
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter (
     const char * constraint_grammar
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::InvalidGrammar));
 
   virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer,
     CosNotifyFilter::Filter_ptr filter
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disconnect_consumer (
     FT::FaultNotifier::ConsumerId connection
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
   ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
 
   //////////////////////////////////////////
   // CORBA interface PullMonitorable methods
-  virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean is_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
   /////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 8bb35b960a1..4f193a80688 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -40,7 +40,7 @@ int TAO::Object_Group_Creator::set_factory_registry (PortableGroup::FactoryRegis
 }
 
 
-int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USED)
+int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb)
 {
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -49,17 +49,15 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
   {
     ///////////////////////////////
     // Find the ReplicationManager
-    ACE_TRY_NEW_ENV
+    try
     {
       CORBA::Object_var rm_obj
         = orb->resolve_initial_references (
-          "ReplicationManager" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          "ReplicationManager");
 
       this->replication_manager_
         = ::FT::ReplicationManager::_narrow (
-          rm_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          rm_obj.in ());
       if (!CORBA::is_nil (this->replication_manager_.in ()))
       {
         this->have_replication_manager_ = 1;
@@ -67,16 +65,13 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
         ::PortableGroup::Criteria criteria;
         this->registry_
           = this->replication_manager_->get_factory_registry (
-            criteria  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+            criteria);
         if (!CORBA::is_nil (this->registry_.in ()))
         {
           this->detector_infos_
             = this->registry_->list_factories_by_role (
               FT::FAULT_DETECTOR_ROLE_NAME,
-              this->detector_type_id_.out ()
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              this->detector_type_id_.out ());
           CORBA::ULong count = this->detector_infos_->length ();
           ACE_DEBUG ( (LM_DEBUG,
             "%T %n (%P|%t)Object_Group_Creator: found %u factories for FaultDetectors\n",
@@ -88,7 +83,7 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
           ACE_ERROR ( (LM_ERROR,
             "%T %n (%P|%t) Object_Group_Creator: ReplicationManager failed to return FactoryRegistry.\n"
             ));
-          ACE_TRY_THROW (CORBA::NO_IMPLEMENT ());
+          throw CORBA::NO_IMPLEMENT ();
         }
       }
       else
@@ -96,31 +91,29 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USE
         ACE_ERROR ( (LM_ERROR,
           "%T %n (%P|%t) Object_Group_Creator: resolve_initial_references for ReplicationManager failed.\n"
           ));
-        ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST ());
+        throw CORBA::OBJECT_NOT_EXIST ();
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Creator: Exception resolving ReplicationManager,\n");
+      ex._tao_print_exception (
+        "Creator: Exception resolving ReplicationManager,\n");
 
       result = 1;
     }
-    ACE_ENDTRY;
   }
 
   return result;
 }
 
-int TAO::Object_Group_Creator::unregister_role (const char * role ACE_ENV_ARG_DECL)
+int TAO::Object_Group_Creator::unregister_role (const char * role)
 {
   int result = 0;
   ACE_ERROR ( (LM_INFO,
     "%T %n (%P|%t) Object_Group_Creator: Unregistering all factories for %s\n",
     role
     ));
-  this->registry_->unregister_factory_by_role (role ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->registry_->unregister_factory_by_role (role);
   return result;
 }
 
@@ -131,8 +124,7 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
   const char * role,
   const char * type_id,
   PortableGroup::ObjectGroupId group_id,
-  const PortableGroup::Location & location
-  ACE_ENV_ARG_DECL)
+  const PortableGroup::Location & location)
 {
   int result = 0;
 
@@ -187,9 +179,7 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
           info.the_factory->create_object (
             type_id,
             criteria.in (),
-            factory_creation_id
-            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN(-1);
+            factory_creation_id);
           result = 1;
         }
       }
@@ -200,8 +190,7 @@ int TAO::Object_Group_Creator::create_detector_for_replica (
 
 
 CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group (
-    const char * type_id
-    ACE_ENV_ARG_DECL)
+    const char * type_id)
   ACE_THROW_SPEC ( (CORBA::SystemException ))
 {
   CORBA::Object_var group = CORBA::Object::_nil ();
@@ -228,9 +217,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
 
     this->replication_manager_->set_type_properties (
       type_id,
-      properties
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (group._retn ());
+      properties);
 
     ::PortableGroup::GenericFactory::FactoryCreationId_var creation_id;
     PortableGroup::Criteria criteria (1);
@@ -243,9 +230,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
       type_id,
       criteria,
       creation_id
-      ACE_ENV_ARG_PARAMETER
       );
-    ACE_CHECK_RETURN (CORBA::Object::_nil ());
   }
   else
   {
@@ -258,17 +243,14 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_infrastructure_managed_group
 
 CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
     const char * role,
-    int write_iors
-    ACE_ENV_ARG_DECL)
+    int write_iors)
   ACE_THROW_SPEC ( (CORBA::SystemException ))
 {
   CORBA::Object_var group = CORBA::Object::_nil ();
 
   PortableGroup::ObjectGroupId group_id = 0;
   CORBA::String_var type_id;
-  ::PortableGroup::FactoryInfos_var infos = this->registry_->list_factories_by_role (role, type_id
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  ::PortableGroup::FactoryInfos_var infos = this->registry_->list_factories_by_role (role, type_id);
 
   CORBA::ULong count = infos->length ();
   ACE_ERROR ((LM_INFO,
@@ -316,9 +298,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
         type_id.in (),
         criteria,
         creation_id
-        ACE_ENV_ARG_PARAMETER
         );
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       //@@ this is a bit of a hack
       creation_id >>= group_id;
@@ -342,9 +322,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
       CORBA::Object_var created_obj = info.the_factory->create_object (
         type_id.in (),
         info.the_criteria,
-        factory_creation_id.out ()
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        factory_creation_id.out ());
       if ( !CORBA::is_nil (created_obj.in ()) )
       {
 // that which was first shall now be last        if (nFact == 0)
@@ -358,12 +336,9 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
           role,
           type_id.in (),
           group_id,
-          info.the_location
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (CORBA::Object::_nil ());
+          info.the_location);
 
-        const char * replica_ior = orb_->object_to_string (created_obj.in () ACE_ENV_ARG_PARAMETER );
-        ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        const char * replica_ior = orb_->object_to_string (created_obj.in () );
 
 
         if (write_iors)
@@ -417,9 +392,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
           group = this->replication_manager_->add_member (
             group.in (),
             info.the_location,
-            created_obj.in ()
-            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
+            created_obj.in ());
         }
       }
       else
@@ -432,8 +405,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
 
     if (first_location != 0 && this->have_replication_manager_)
     {
-      group = this->replication_manager_->set_primary_member (group.in (), * first_location ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      group = this->replication_manager_->set_primary_member (group.in (), * first_location);
     }
     ACE_ERROR ( (LM_INFO,
       "%T %n (%P|%t) Object_Group_Creator:  Successfully created group of %s\n",
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index 2d3128b96d1..7cbd507c530 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -44,24 +44,22 @@ namespace TAO
 
     /////////////////
     // initialization
-    int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+    int init (CORBA::ORB_ptr orb);
 
     /////////////////
     // functionality
     CORBA::Object_ptr create_group(
         const char * role,
-        int write_iors
-        ACE_ENV_ARG_DECL)
+        int write_iors)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /////////////////
     // functionality
     CORBA::Object_ptr create_infrastructure_managed_group(
-        const char * type_id
-        ACE_ENV_ARG_DECL)
+        const char * type_id)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    int unregister_role(const char * role ACE_ENV_ARG_DECL);
+    int unregister_role(const char * role);
 
     ////////////
     // shut down
@@ -77,8 +75,7 @@ namespace TAO
     const char * role,
     const char * type_id,
     PortableGroup::ObjectGroupId group_id,
-    const PortableGroup::Location & location
-    ACE_ENV_ARG_DECL);
+    const PortableGroup::Location & location);
 
     ////////////////////
     // forbidden methods
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index a446d0d7eff..e81d1e0ddfc 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -18,16 +18,14 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
@@ -39,13 +37,10 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   this->server_interceptor_ = interceptor;
 
-  info->add_server_request_interceptor (interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor);
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
index f2c7f5d20e8..a4a8999d72a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h
@@ -48,12 +48,10 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the created server request interceptor.  Only valid after
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index fe39a7dc7b6..dc02d137738 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -24,7 +24,7 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 }
 
 void
-Server_Request_Interceptor::reset (ACE_ENV_ARG_DECL)
+Server_Request_Interceptor::reset ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_ = 0;
@@ -34,44 +34,40 @@ Server_Request_Interceptor::reset (ACE_ENV_ARG_DECL)
 void
 Server_Request_Interceptor::forward_references (
   CORBA::Object_ptr obj1,
-  CORBA::Object_ptr obj2
-  ACE_ENV_ARG_DECL)
+  CORBA::Object_ptr obj2)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
-    ACE_THROW (CORBA::INV_OBJREF (
-                 CORBA::SystemException::_tao_minor_code (
-                   TAO::VMCID,
-                   EINVAL),
-                 CORBA::COMPLETED_NO));
+    throw CORBA::INV_OBJREF (
+      CORBA::SystemException::_tao_minor_code (
+        TAO::VMCID,
+        EINVAL),
+      CORBA::COMPLETED_NO);
 
   char *argv[] = {NULL};
   int   argc = 0;
-  
+
   // Fetch the ORB having been initialized in main()
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::ORB_init (argc, argv, "Server ORB");
 
-  CORBA::String_var str1 = orb->object_to_string (obj1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var str1 = orb->object_to_string (obj1);
 
-  CORBA::String_var str2 = orb->object_to_string (obj2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var str2 = orb->object_to_string (obj2);
 
-  this->obj_[0] = orb->string_to_object (str1.in () ACE_ENV_ARG_PARAMETER);
-  this->obj_[1] = orb->string_to_object (str2.in () ACE_ENV_ARG_PARAMETER);
+  this->obj_[0] = orb->string_to_object (str1.in ());
+  this->obj_[1] = orb->string_to_object (str2.in ());
 }
 
 char *
-Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::release (this->obj_[0]);
@@ -80,8 +76,7 @@ Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -95,9 +90,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
   if (this->forward_request_thrown_ == true)
     {
       IOP::ServiceContext_var svc =
-        ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
       // extract the group component
       TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
@@ -130,8 +123,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -147,15 +139,13 @@ Server_Request_Interceptor::receive_request (
       this->forward_request_thrown_ = true;
 
       // Throw forward exception
-      ACE_THROW (PortableInterceptor::ForwardRequest (this->obj_[1]));
+      throw PortableInterceptor::ForwardRequest (this->obj_[1]);
     }
 
   if (this->forward_request_thrown_ == true)
     {
       IOP::ServiceContext_var svc =
-        ri->get_request_service_context (IOP::FT_GROUP_VERSION
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->get_request_service_context (IOP::FT_GROUP_VERSION);
 
       // extract the group component
       TAO_InputCDR cdr (reinterpret_cast<const char*> (svc->context_data.get_buffer ()),
@@ -189,16 +179,14 @@ Server_Request_Interceptor::receive_request (
 
 void
 Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -206,8 +194,7 @@ Server_Request_Interceptor::send_exception (
 
 void
 Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
index d8a5ce664cf..0f1ea6e848d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -51,12 +51,11 @@ public:
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
-                                   CORBA::Object_ptr obj2
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   CORBA::Object_ptr obj2)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  /// Reset to initial state, like counter etc, keeps the object-references 
-  virtual void reset (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  /// Reset to initial state, like counter etc, keeps the object-references
+  virtual void reset ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -70,38 +69,33 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 58fd3cc610b..82a81c531bb 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -39,14 +39,11 @@ main (int argc, char *argv[])
 {
   int status = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Client ORB");
 
       if (::parse_args (argc, argv) != 0)
         return -1;
@@ -55,19 +52,17 @@ main (int argc, char *argv[])
       // IOR occurs during the various interceptions executed during
       // this test.
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       ForwardRequestTest::test_var server =
-        ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ForwardRequestTest::test::_narrow (object.in ());
 
       // Before and after the LOCATION_FORWARD_PERM the marshaled
       // object reference must differ.
 
       // Create a stringified/marshaled snapshot of Object reference
       CORBA::String_var marshaled_obj_snapshot1 =
-          orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+          orb->object_to_string (server.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -84,8 +79,7 @@ main (int argc, char *argv[])
                       "CLIENT: Issuing request %d.\n",
                       i));
 
-          number += server->number (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          number += server->number ();
 
           ACE_DEBUG ((LM_INFO,
                       "CLIENT: Number %d .\n",
@@ -106,7 +100,7 @@ main (int argc, char *argv[])
       // consequence the marshaled representation of "server" should
       // look different now, compare to snapshot1.
       CORBA::String_var marshaled_obj_snapshot2 =
-          orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
+          orb->object_to_string (server.in ());
 
       if (strcmp (marshaled_obj_snapshot1.in (), marshaled_obj_snapshot2.in ()) == 0)
         {
@@ -116,16 +110,13 @@ main (int argc, char *argv[])
           ACE_OS::abort ();
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO,
               "Group_Ref_Manip Test passed.\n"));
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index 407c832a27b..082e91dc80f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -46,19 +46,15 @@ parse_args (int argc, char *argv[])
 void
 add_ft_prop (CORBA::ORB_ptr o,
              CORBA::Object_ptr obj1,
-             CORBA::Object_ptr obj2
-             ACE_ENV_ARG_DECL)
+             CORBA::Object_ptr obj2)
 {
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_var IORM =
     o->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                   0
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   0);
 
   TAO_IOP::TAO_IOR_Manipulation_var iorm =
-    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -84,17 +80,13 @@ add_ft_prop (CORBA::ORB_ptr o,
 
   // Set the property for object 1
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              obj1
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              obj1);
 
   if (retval != 0)
     {
       retval = iorm->set_primary (&iogr_prop,
                                   obj1,
-                                  obj1
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                  obj1);
     }
 
 
@@ -104,24 +96,19 @@ add_ft_prop (CORBA::ORB_ptr o,
   ft_tag_component.object_group_ref_version = (CORBA::ULong) 5;
 
   retval = iorm->set_property (&iogr_prop,
-                                              obj2
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              obj2);
 
   if (retval != 0)
     {
       retval = iorm->set_primary (&iogr_prop,
                                   obj2,
-                                  obj2
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                  obj2);
     }
 
   return;
 }
 
-void test_colocal (ForwardRequestTest::test_ptr server
-                   ACE_ENV_ARG_DECL)
+void test_colocal (ForwardRequestTest::test_ptr server)
 {
   CORBA::ULong number = 0;
   for (int i = 1; i <= 25; ++i)
@@ -130,7 +117,7 @@ void test_colocal (ForwardRequestTest::test_ptr server
                   "CLIENT: Issuing colocal request %d.\n",
                   i));
       CORBA::ULong retval =
-         server->number (ACE_ENV_SINGLE_ARG_PARAMETER);
+         server->number ();
       if (retval != 1 && retval != 317)
         {
           // Not a valid return value, forwarding went wrong and
@@ -142,7 +129,6 @@ void test_colocal (ForwardRequestTest::test_ptr server
         }
 
       number += retval;
-      ACE_TRY_CHECK;
 
 
       ACE_DEBUG ((LM_INFO,
@@ -162,8 +148,7 @@ void test_colocal (ForwardRequestTest::test_ptr server
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_ORBInitializer *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -172,17 +157,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "Server ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -190,12 +171,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (::parse_args (argc, argv) != 0)
         return -1;
@@ -209,48 +188,34 @@ main (int argc, char *argv[])
       PortableServer::POA_var first_poa =
         root_poa->create_POA ("first POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
 
 
       PortableServer::ObjectId_var oid1 =
-        first_poa->activate_object (&servant1
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->activate_object (&servant1);
 
       PortableServer::ObjectId_var oid2 =
-        first_poa->activate_object (&servant2
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->activate_object (&servant2);
 
       CORBA::Object_var obj1 =
-        first_poa->servant_to_reference (&servant1
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->servant_to_reference (&servant1);
 
       CORBA::Object_var obj2 =
-        first_poa->servant_to_reference (&servant2
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->servant_to_reference (&servant2);
 
       (void) add_ft_prop (orb.in (),
                           obj1.in (),
-                          obj2.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj2.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj1.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "ForwardRequestTest::test servant 1: <%s>\n",
                   ior.in ()));
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Set the forward references in the server request interceptor.
       PortableInterceptor::ServerRequestInterceptor_var
@@ -258,8 +223,7 @@ main (int argc, char *argv[])
 
       ForwardRequestTest::ServerRequestInterceptor_var interceptor =
         ForwardRequestTest::ServerRequestInterceptor::_narrow (
-           server_interceptor.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+           server_interceptor.in ());
 
       if (CORBA::is_nil (interceptor.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -268,18 +232,16 @@ main (int argc, char *argv[])
                           -1);
 
       interceptor->forward_references (obj1.in (),
-                                       obj2.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       obj2.in ());
 
       // Run co-local test
         {
           ForwardRequestTest::test_var server =
-            ForwardRequestTest::test::_narrow (obj1.in () ACE_ENV_ARG_PARAMETER);
-          test_colocal (server.in() ACE_ENV_ARG_PARAMETER);
+            ForwardRequestTest::test::_narrow (obj1.in ());
+          test_colocal (server.in());
 
           // Reset interceptor for remote tests
-          interceptor->reset (ACE_ENV_SINGLE_ARG_PARAMETER);
+          interceptor->reset ();
         }
 
       // Write each IOR to a file.
@@ -296,24 +258,19 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Run the ORB event loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
index adafe5be28d..283aae38b3c 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp
@@ -18,18 +18,18 @@ test_i::~test_i (void)
 }
 
 CORBA::Short
-test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::number (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
               this->number_));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
index 34f6bcbdbc3..d22fba97d4c 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h
@@ -33,11 +33,11 @@ public:
   ~test_i (void);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short number (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
index 110808818f7..5b95112cdf1 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
@@ -33,7 +33,7 @@ public:
   Client_i (CORBA::ORB_ptr orb);
   // Our constructor
 
-  void init (ACE_ENV_SINGLE_ARG_DECL);
+  void init (void);
   // Initialize the ORB etc.
 
 private:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 543da3eff4f..29c2c8676ce 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -62,30 +62,25 @@ int
 main (int argc,
       char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
 
-  ACE_TRY
+  try
     {
       // Initilaize the ORB, POA etc.
       manager.init (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    argv);
 
       // the command line arguments
       if (parse_args (argc, argv) == -1)
         return -1;
 
       // Merge the different IORS
-      manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager.make_merged_iors ();
 
       // Set properties. This is the most important portion of the
       // test
-      manager.set_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager.set_properties ();
 
       // Write IOR to file
       manager.write_to_file ();
@@ -93,16 +88,13 @@ main (int argc,
       // Client, who is going to use the merged IOR
       // Construct that with the managers ORB
       Client_i client_imp (manager.orb ());
-      client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client_imp.init ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught");
+      ex._tao_print_exception ("Caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -116,60 +108,45 @@ Manager::Manager (void)
 
 void
 Manager::init (int argc,
-               char *argv[]
-               ACE_ENV_ARG_DECL)
+               char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                0);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (obj_var.in ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
-    root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa_var->the_POAManager ();
 
-  poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager_var->activate ();
 }
 
 int
-Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
+Manager::make_merged_iors (void)
 {
   // First  server
   object_primary =
-    this->orb_->string_to_object (first_ior
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->string_to_object (first_ior);
 
   //Second server
   object_secondary =
-    this->orb_->string_to_object (second_ior
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->string_to_object (second_ior);
 
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_var IORM =
     this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                            0);
 
   iorm =
-    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
 
   // Create the list
@@ -180,14 +157,13 @@ Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
 
   // Create a merged set 1;
   merged_set_ =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    iorm->merge_iors (iors);
 
   return 0;
 }
 
 int
-Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
+Manager::set_properties (void)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -214,9 +190,7 @@ Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              this->merged_set_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                              this->merged_set_.in ());
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -224,29 +198,25 @@ Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
     {
       retval = iorm->set_primary (&iogr_prop,
                                   object_secondary.in (),
-                                  this->merged_set_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                  this->merged_set_.in ());
     }
 
   return 0;
 }
 
 int
-Manager::run (ACE_ENV_SINGLE_ARG_DECL)
+Manager::run (void)
 {
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_DEBUG,
                          "Error in run \n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -285,11 +255,10 @@ Client_i::Client_i (CORBA::ORB_ptr orb)
 }
 
 void
-run_test (Simple_Server_ptr server
-          ACE_ENV_ARG_DECL);
+run_test (Simple_Server_ptr server);
 
 void
-Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
+Client_i::init (void)
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
@@ -313,20 +282,14 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
   char **argv = 0;
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                0);
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (data
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->string_to_object (data);
 
   // Combined IOR stuff
   Simple_Server_var server =
-    Simple_Server::_narrow (object.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    Simple_Server::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
     {
@@ -335,47 +298,42 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
                   data));
     }
 
-  run_test (server.in ()
-            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  run_test (server.in ());
 
   ior_buffer.alloc ()->free (data);
   ACE_OS::close (f_handle);
 }
 
 
-void run_test (Simple_Server_ptr server
-               ACE_ENV_ARG_DECL)
+void run_test (Simple_Server_ptr server)
 {
   // We do this twice as we know that there are only two servers.
   for (CORBA::ULong i = 0;
        i < 2;
        i++)
     {
-      ACE_TRY
+      try
         {
           for (CORBA::ULong j = 0;
                j < 10;
                j++)
             {
               // Make a remote call
-              server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              server->remote_call ();
             }
 
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("*********************************\n")));
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("I am going to shutdown the server\n")));
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
           ACE_OS::sleep (2);
         }
-      ACE_CATCH (CORBA::TRANSIENT, t)
+      catch (const CORBA::TRANSIENT& t)
         {
           if (t.completed () != CORBA::COMPLETED_NO)
             {
-              ACE_PRINT_EXCEPTION (t, "Unexpected kind of TRANSIENT");
+              t._tao_print_exception ("Unexpected kind of TRANSIENT");
             }
           else
             {
@@ -386,19 +344,16 @@ void run_test (Simple_Server_ptr server
               ACE_OS::sleep (1);
             }
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, f)
+      catch (const CORBA::COMM_FAILURE& f)
         {
-          ACE_PRINT_EXCEPTION (f, "A (sort of) expected COMM_FAILURE");
+          f._tao_print_exception ("A (sort of) expected COMM_FAILURE");
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Automagically re-issuing request on COMM_FAILURE\n")));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Unexpected exception");
-          ACE_RE_THROW;
+          ex._tao_print_exception ("Unexpected exception");
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
index 6bdc3e7cf1c..f2c0fd796a5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
@@ -36,18 +36,17 @@ public:
   // Ctor
 
   void init (int argc,
-             char *argv[]
-             ACE_ENV_ARG_DECL);
+             char *argv[]);
 
   // Initialize the ORB, POA etc.
 
-  int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int make_merged_iors (void);
   // Merges the different IORS
 
-  int set_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int set_properties (void);
   // Sets the properties for the profiles
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the  ORB event loop..
 
   int write_to_file (void);
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index ade1a560f4d..9dfac7c264f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -36,19 +36,16 @@ main (int argc, char *argv[])
 {
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
         return 1;
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,23 +53,19 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Instantiate the LCD_Display implementation class
       Simple_Server_i display_impl (orb.in ());
 
       Simple_Server_var server =
-        display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        display_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -89,18 +82,15 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
       }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       orb->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 9813825c275..bbe23477614 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -20,7 +20,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 void
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Simple_Server_i::remote_call (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -31,7 +31,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_
 
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
index f7944307d55..d9cdfe56754 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
@@ -34,10 +34,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void remote_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 72014970c1d..95d0056e813 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -32,39 +32,30 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
                                              argv,
-                                             0
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             0);
       // **********************************************************************
 
       // Get an object reference for the ORBs IORManipulation object!
       CORBA::Object_var IORM =
         orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                          0
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          0);
 
       TAO_IOP::TAO_IOR_Manipulation_var iorm =
-               TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+               TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ());
       // **********************************************************************
 
       // Create a few fictitious IORs
       CORBA::Object_var name1 =
         orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz"
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                );
       CORBA::Object_var name2 =
         orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz"
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                );
 
       // **********************************************************************
       // Create IOR list for use with merge_iors.
@@ -75,8 +66,7 @@ main (int argc, char *argv[])
       // **********************************************************************
 
       CORBA::Object_var merged =
-        iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        iorm->merge_iors (iors);
 
       // Check for set and get primaries
       // Make a dummy property set
@@ -84,8 +74,7 @@ main (int argc, char *argv[])
       TAO_FT_IOGR_Property prop (ft_tag_component);
 
       CORBA::Boolean retval =
-        iorm->set_primary (&prop, name2.in (), merged.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        iorm->set_primary (&prop, name2.in (), merged.in ());
 
       if (retval != 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -99,9 +88,7 @@ main (int argc, char *argv[])
 
       // Check whether a primary has been set
       retval = iorm->is_primary_set (&prop,
-                                     merged.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     merged.in ());
 
       if (retval)
         ACE_DEBUG ((LM_DEBUG,
@@ -119,9 +106,7 @@ main (int argc, char *argv[])
       // Get the primary
       CORBA::Object_var prim =
         iorm->get_primary (&prop,
-                           merged.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           merged.in ());
 
       // Check whether we got back the right primary
       if (prim->_is_equivalent (name2.in ()))
@@ -159,9 +144,7 @@ main (int argc, char *argv[])
 
       // Set the property
       retval = iorm->set_property (&prop,
-                                   merged.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   merged.in ());
 
       /// Extract the property
       FT::TagFTGroupTaggedComponent ftc;
@@ -169,10 +152,8 @@ main (int argc, char *argv[])
 
       retval =
         tmp_prop.get_tagged_component (merged.in (),
-                                       ftc
-                                       ACE_ENV_ARG_PARAMETER);
+                                       ftc);
 
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Testing for tagged component \n"));
@@ -190,37 +171,33 @@ main (int argc, char *argv[])
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("\tWe have set the property\n")));
     }
-  ACE_CATCH (TAO_IOP::NotFound, userex)
+  catch (const TAO_IOP::NotFound& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           ACE_TEXT ("Unexpected NotFound Exception!\n"));
+      userex._tao_print_exception (
+        ACE_TEXT (
+          "Unexpected NotFound Exception!\n"));
       return -1;
     }
-  ACE_CATCH (TAO_IOP::Duplicate, userex)
+  catch (const TAO_IOP::Duplicate& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "Unexpected Duplicate Exception!\n");
+      userex._tao_print_exception ("Unexpected Duplicate Exception!\n");
       return -1;
     }
-  ACE_CATCH (TAO_IOP::Invalid_IOR, userex)
+  catch (const TAO_IOP::Invalid_IOR& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "Unexpected Invalid_IOR Exception!\n");
+      userex._tao_print_exception ("Unexpected Invalid_IOR Exception!\n");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,
-                           "Unexpected system Exception!!\n");
+      sysex._tao_print_exception ("Unexpected system Exception!!\n");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected ACE_CATCHANY Exception!\n");
+      ex._tao_print_exception ("Unexpected CORBA Exception!\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "IORManipulation Tests Successfully Completed!\n"));
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index 12e291c0f78..32392aefe58 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -17,7 +17,6 @@ PushConsumer_impl::PushConsumer_impl(CORBA::ORB_ptr orb)
 
 void
 PushConsumer_impl::push (const RtecEventComm::EventSet & event
-             ACE_ENV_ARG_DECL_NOT_USED
              )
              ACE_THROW_SPEC ((
              CORBA::SystemException
@@ -36,21 +35,17 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event
 
 
 void
-PushConsumer_impl::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+PushConsumer_impl::disconnect_push_consumer (void)
                        ACE_THROW_SPEC ((
                        CORBA::SystemException
                        ))
 {
   PortableServer::Current_var current =
-    resolve_init<PortableServer::Current>(orb_.in(), "POACurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    resolve_init<PortableServer::Current>(orb_.in(), "POACurrent");
 
-  PortableServer::POA_var poa = current->get_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = current->get_POA();
 
-  PortableServer::ObjectId_var oid = current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::ObjectId_var oid = current->get_object_id();
 
-  poa->deactivate_object(oid.in ()
-                         ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object(oid.in ());
 }
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
index 11c5601a36e..950766fe295 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
@@ -22,14 +22,12 @@ public:
 
     virtual void push (
         const RtecEventComm::EventSet & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual void disconnect_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 8c1b1757ecf..28deb58d382 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -43,18 +43,16 @@ PushSupplier_impl::~PushSupplier_impl()
   reactor_task_.wait();
 }
 
-int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel ACE_ENV_ARG_DECL)
+int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel)
 {
 
   ACE_DEBUG((LM_DEBUG, "for_suppliers\n"));
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    channel->for_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    channel->for_suppliers();
 
   ACE_DEBUG((LM_DEBUG, "obtain_push_consumer\n"));
   consumer_ =
-    supplier_admin->obtain_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    supplier_admin->obtain_push_consumer();
 
 
 
@@ -72,7 +70,7 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel ACE_
 
     ACE_DEBUG((LM_DEBUG, "connect_push_supplier\n"));
   consumer_->connect_push_supplier(supplier.in(),
-    qos   ACE_ENV_ARG_PARAMETER);
+    qos);
 
   ACE_DEBUG((LM_DEBUG, "push_consumer connected\n"));
 
@@ -90,7 +88,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel ACE_
 
 
 void  PushSupplier_impl::disconnect_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -100,17 +97,13 @@ void  PushSupplier_impl::disconnect_push_supplier (
   reactor_task_.reactor_->end_reactor_event_loop();
 
   PortableServer::Current_var current =
-    resolve_init<PortableServer::Current>(orb_.in(), "POACurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    resolve_init<PortableServer::Current>(orb_.in(), "POACurrent");
 
-  PortableServer::POA_var poa = current->get_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = current->get_POA();
 
-  PortableServer::ObjectId_var oid = current->get_object_id(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::ObjectId_var oid = current->get_object_id();
 
-  poa->deactivate_object (oid.in ()
-                          ACE_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in ());
 }
 
 int PushSupplier_impl::handle_timeout (const ACE_Time_Value &current_time,
@@ -119,8 +112,7 @@ int PushSupplier_impl::handle_timeout (const ACE_Time_Value &current_time,
   ACE_UNUSED_ARG(act);
   ACE_UNUSED_ARG(current_time);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
+  try{
     RtecEventComm::EventSet event (1);
     event.length (1);
     event[0].header.type   = ACE_ES_EVENT_UNDEFINED;
@@ -132,15 +124,13 @@ int PushSupplier_impl::handle_timeout (const ACE_Time_Value &current_time,
     event[0].header.ec_send_time = time_val.sec () * 10000000 + time_val.usec ()* 10;
     event[0].data.any_value <<= seq_no_;
 
-    consumer_->push(event ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    consumer_->push(event);
     ACE_DEBUG((LM_DEBUG, "sending data %d\n", seq_no_));
     ++seq_no_;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+    ex._tao_print_exception ("A CORBA Exception occurred.");
   }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
index dd9897ca66c..28f36099c86 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -27,10 +27,9 @@ public:
   PushSupplier_impl(CORBA::ORB_ptr orb);
   ~PushSupplier_impl();
 
-  int init(RtecEventChannelAdmin::EventChannel_ptr ACE_ENV_ARG_DECL);
+  int init(RtecEventChannelAdmin::EventChannel_ptr);
 
     virtual void  disconnect_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 45874808c2f..f77a5507f73 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -23,7 +23,7 @@ CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
 RtecEventChannelAdmin::EventChannel_ptr
-get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
+get_event_channel(int argc, ACE_TCHAR** argv)
 {
     FtRtecEventChannelAdmin::EventChannel_var channel;
     ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:n"));
@@ -36,12 +36,8 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       {
       case 'i':
         {
-          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
-                                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN(0);
-          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-                                                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN(0);
+          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ());
+          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
         }
         break;
       case 'n':
@@ -67,20 +63,16 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       name[0].id = CORBA::string_dup("FT_EventService");
 
       CosNaming::NamingContext_var naming_context =
-        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService");
 
       channel  = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
-        name
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+        name);
     }
 
     if (use_gateway)
     {
       ACE_AUTO_PTR_RESET (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in()), TAO_FTRTEC::FTEC_Gateway);
-      return gateway->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
+      return gateway->_this();
     }
     else
       return channel._retn();
@@ -88,38 +80,29 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
 
 int main(int argc, ACE_TCHAR** argv)
 {
-  ACE_TRY_NEW_ENV {
-    orb = CORBA::ORB_init(argc, argv, ""
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    orb = CORBA::ORB_init(argc, argv, "");
 
     RtecEventChannelAdmin::EventChannel_var channel
-      = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      = get_event_channel(argc, argv);
 
 
     if (CORBA::is_nil(channel.in()))
       ACE_ERROR_RETURN((LM_ERROR, "Cannot Find FT_EventService\n"), -1);
 
     PortableServer::POA_var poa =
-      resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      resolve_init<PortableServer::POA>(orb.in(), "RootPOA");
 
-    PortableServer::POAManager_var mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    PortableServer::POAManager_var mgr = poa->the_POAManager();
 
-    mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    mgr->activate();
 
     PushConsumer_impl push_consumer_impl(orb.in());
     RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-      channel->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      channel->for_consumers();
 
     RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-      consumer_admin->obtain_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      consumer_admin->obtain_push_supplier();
 
     RtecEventChannelAdmin::ConsumerQOS qos;
     qos.is_gateway = 1;
@@ -134,17 +117,15 @@ int main(int argc, ACE_TCHAR** argv)
       push_consumer_impl._this();
 
     supplier->connect_push_consumer(push_consumer.in(),
-      qos   ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      qos);
 
-    orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+    orb->run();
 
   }
-  ACE_CATCHANY {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+  catch (const CORBA::Exception& ex){
+    ex._tao_print_exception ("A CORBA Exception occurred.");
     return -1;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 9033f5b02c2..a1971b10bdf 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -22,7 +22,7 @@ CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
 RtecEventChannelAdmin::EventChannel_ptr
-get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
+get_event_channel(int argc, ACE_TCHAR** argv)
 {
     FtRtecEventChannelAdmin::EventChannel_var channel;
     ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:nt:?"));
@@ -35,12 +35,8 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       {
       case 'i':
         {
-          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
-                                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN(0);
-          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
-                                                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN(0);
+          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ());
+          channel = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in());
         }
         break;
       case 'n':
@@ -71,21 +67,17 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       name[0].id = CORBA::string_dup("FT_EventService");
 
       CosNaming::NamingContext_var naming_context =
-        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+        resolve_init<CosNaming::NamingContext>(orb.in(), "NameService");
 
       channel  = resolve<FtRtecEventChannelAdmin::EventChannel>(naming_context.in(),
-        name
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(0);
+        name);
     }
 
     if (use_gateway)
     {
       // use local gateway to communicate with FTRTEC
       ACE_AUTO_PTR_RESET (gateway, new TAO_FTRTEC::FTEC_Gateway(orb.in(), channel.in()), TAO_FTRTEC::FTEC_Gateway);
-      return gateway->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
+      return gateway->_this();
     }
     else
       return channel._retn();
@@ -94,49 +86,39 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
 
 int main(int argc, ACE_TCHAR** argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    orb = CORBA::ORB_init(argc, argv, ""
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+  try{
+    orb = CORBA::ORB_init(argc, argv, "");
 
 
     RtecEventChannelAdmin::EventChannel_var channel
-      = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      = get_event_channel(argc, argv);
 
 
     if (CORBA::is_nil(channel.in()))
        return -1;
 
     PortableServer::POA_var poa =
-      resolve_init<PortableServer::POA>(orb.in(), "RootPOA"
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      resolve_init<PortableServer::POA>(orb.in(), "RootPOA");
 
-    PortableServer::POAManager_var mgr = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    PortableServer::POAManager_var mgr = poa->the_POAManager();
 
-    mgr->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    mgr->activate();
 
     PushSupplier_impl push_supplier(orb.in());
-    if (push_supplier.init(channel.in() ACE_ENV_ARG_PARAMETER) == -1)
+    if (push_supplier.init(channel.in()) == -1)
       return -1;
 
     RtecEventComm::PushSupplier_var
       supplier = push_supplier._this();
 
 
-    orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
+    orb->run();
 
   }
-  ACE_CATCHANY {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "A CORBA Exception occurred.");
+  catch (const CORBA::Exception& ex){
+      ex._tao_print_exception ("A CORBA Exception occurred.");
   }
-  ACE_ENDTRY;
 
-    ACE_CHECK_RETURN(-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
index 4586a4d67a1..4732914e80b 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp
@@ -32,8 +32,7 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
 CORBA::Long
 AMI_Test_i::foo (CORBA::Long_out out_l,
                  CORBA::Long in_l,
-                 const char* in_str
-                 ACE_ENV_ARG_DECL)
+                 const char* in_str)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    A::DidTheRightThing))
 {
@@ -58,7 +57,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 
 
 void
-AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
@@ -66,7 +65,7 @@ AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-AMI_Test_i::yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::yadda (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -76,8 +75,7 @@ AMI_Test_i::yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-AMI_Test_i::yadda (CORBA::Long yadda
-                   ACE_ENV_ARG_DECL_NOT_USED)
+AMI_Test_i::yadda (CORBA::Long yadda)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
index 161d329e7ff..9788a022b3b 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h
@@ -33,19 +33,17 @@ public:
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
-                   const char* in_str
-                   ACE_ENV_ARG_DECL)
+                   const char* in_str)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      A::DidTheRightThing));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long yadda (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Long yadda (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void yadda (CORBA::Long yadda
-              ACE_ENV_ARG_DECL)
+  void yadda (CORBA::Long yadda)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index efc9e973701..51a2e8454ca 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -101,8 +101,7 @@ public:
   Handler (void) {};
 
   void foo (CORBA::Long result,
-            CORBA::Long out_l
-            ACE_ENV_ARG_DECL_NOT_USED)
+            CORBA::Long out_l)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -116,29 +115,23 @@ public:
       number_of_replies--;
     };
 
-   void foo_excep (::Messaging::ExceptionHolder * excep_holder
-                  ACE_ENV_ARG_DECL)
+   void foo_excep (::Messaging::ExceptionHolder * excep_holder)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called: \n"));
-      ACE_TRY
+      try
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          excep_holder->raise_exception ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught exception:");
+          ex._tao_print_exception ("Caught exception:");
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     };
 
-  void get_yadda (CORBA::Long result
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda (CORBA::Long result)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -146,23 +139,21 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void set_yadda (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void set_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -178,12 +169,10 @@ int
 main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_client"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -191,12 +180,10 @@ main (int argc, char *argv[])
       ACE_OS::socket_init ();
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       A::AMI_Test_var server =
-        A::AMI_Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        A::AMI_Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -209,8 +196,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -218,15 +204,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Let the client perform the test in a separate thread
 
@@ -253,13 +236,11 @@ main (int argc, char *argv[])
       while (number_of_replies > 0)
         {
           CORBA::Boolean pending =
-            orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending();
 
           if (pending)
             {
-              orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work();
             }
         }
 
@@ -279,19 +260,15 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;
@@ -304,13 +281,13 @@ Client::Client (A::AMI_Test_ptr server,
                 :  ami_test_var_ (A::AMI_Test::_duplicate (server)),
      niterations_ (niterations)
 {
-  the_handler_var_ = handler._this (/* ACE_ENV_SINGLE_ARG_PARAMETER */);
+  the_handler_var_ = handler._this (/* */);
 }
 
 int
 Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Long number = 931232;
 
@@ -318,9 +295,7 @@ Client::svc (void)
         {
           ami_test_var_->sendc_foo (the_handler_var_.in (),
                                     number,
-                                    "Let's talk AMI."
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                    "Let's talk AMI.");
         }
       if (debug)
         {
@@ -329,11 +304,9 @@ Client::svc (void)
                       niterations));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
+      ex._tao_print_exception ("MT_Client: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index ee6a7282b5f..05bfe8816c1 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -61,16 +61,13 @@ int
 main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_server"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +75,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -93,12 +88,10 @@ main (int argc, char *argv[])
       AMI_Test_i ami_test_i (orb.in ());
 
       A::AMI_Test_var ami_test_var =
-        ami_test_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ami_test_i._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (ami_test_var.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -115,29 +108,23 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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 ();
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 442d7a9356f..7a5e182fbaa 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -79,8 +79,7 @@ public:
   // Destructor.
 
   void foo (CORBA::Long ami_return_val,
-            CORBA::Long out_l
-            ACE_ENV_ARG_DECL_NOT_USED)
+            CORBA::Long out_l)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -92,36 +91,31 @@ public:
         }
     };
 
-  void foo_excep (::Messaging::ExceptionHolder * excep_holder
-                  ACE_ENV_ARG_DECL)
+  void foo_excep (::Messaging::ExceptionHolder * excep_holder)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called: \n"
                                   "Testing proper exception handling ...\n"));
-      ACE_TRY
+      try
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          excep_holder->raise_exception ();
         }
-      ACE_CATCH (A::DidTheRightThing, ex)
+      catch (const A::DidTheRightThing&)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "... exception received successfully\n"));
                     }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "... caught the wrong exception -> ERROR\n"));
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     };
 
 
-  void get_yadda (CORBA::Long result
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda (CORBA::Long result)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -129,23 +123,21 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void set_yadda (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void set_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -159,39 +151,31 @@ main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_simple_client"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object_var =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa_var =
-        PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object_var.in ());
 
       PortableServer::POAManager_var poa_manager_var =
-        poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa_var->the_POAManager ();
 
-      poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager_var->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // We reuse the object_var smart pointer!
-      object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object_var = orb->string_to_object (ior);
 
       A::AMI_Test_var ami_test_var =
-        A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        A::AMI_Test::_narrow (object_var.in ());
 
       if (CORBA::is_nil (ami_test_var.in ()))
         {
@@ -206,17 +190,14 @@ main (int argc, char *argv[])
       // Instantiate the ReplyHandler and register that with the POA.
       Handler handler;
       A::AMI_AMI_TestHandler_var the_handler_var =
-        handler._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        handler._this ();
 
       // Try out sending asynchronous messages without a reply handler
       // registered. Things fail if we get an exception.
 
       ami_test_var->sendc_foo (A::AMI_AMI_TestHandler::_nil (),
                                0,
-                               ""
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               "");
 
 
       // Trigger the DidTheRightThing exception on the server side
@@ -226,9 +207,7 @@ main (int argc, char *argv[])
 
       ami_test_var->sendc_foo (the_handler_var.in (),
                                0,
-                               "Let's talk AMI."
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               "Let's talk AMI.");
 
       CORBA::Long l = 931247;
 
@@ -240,24 +219,16 @@ main (int argc, char *argv[])
 
           ami_test_var->sendc_foo (the_handler_var.in (),
                                    l,
-                                   "Let's talk AMI."
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                   "Let's talk AMI.");
         }
 
       // Begin test of attributes
-      ami_test_var->sendc_get_yadda (the_handler_var.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ami_test_var->sendc_get_yadda (the_handler_var.in ());
 
       ami_test_var->sendc_set_yadda (the_handler_var.in (),
-                                     4711
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     4711);
 
-      ami_test_var->sendc_get_yadda (the_handler_var.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ami_test_var->sendc_get_yadda (the_handler_var.in ());
 
       // End test of attributes
 
@@ -280,9 +251,7 @@ main (int argc, char *argv[])
 
       CORBA::Long number = ami_test_var->foo (l,
                                               l,
-                                              "Let's talk SMI."
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              "Let's talk SMI.");
 
       if (debug)
         {
@@ -294,26 +263,20 @@ main (int argc, char *argv[])
       if (shutdown_flag)
         {
           ACE_DEBUG ((LM_DEBUG, "invoking shutdown\n"));
-          ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ami_test_var->shutdown ();
         }
 
       poa_var->destroy (1,  // ethernalize objects
                         0  // wait for completion
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_END_TEST;
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index a9a6dac7d63..4b27b3a0722 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -46,14 +46,12 @@ main (int argc, char *argv[])
   PortableServer::POA_var root_poa = PortableServer::POA::_nil();
   Callback_i *servant = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb = CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,12 +59,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -76,9 +72,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -86,32 +80,26 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -125,18 +113,14 @@ main (int argc, char *argv[])
       servant = new Callback_i (orb.in ());
 
       Callback_var callback =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       // Send the calback object to the server
-      server->callback_object (callback.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->callback_object (callback.in ());
 
       // A  method to kickstart callbacks from the server
       CORBA::Long r =
-        server->test_method (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->test_method (1);
 
       if (r != 0)
         {
@@ -145,20 +129,16 @@ main (int argc, char *argv[])
                       r));
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   if (!CORBA::is_nil(root_poa.in()))
     root_poa->destroy (1,1);
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index acd21da590e..d0f7a2ef9ae 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -43,15 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,12 +57,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -74,9 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -84,21 +78,17 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -110,21 +100,15 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("simple_server");
 
       child_poa->activate_object_with_id (id.in (),
-                                          server_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          server_impl);
 
-      server_impl->_remove_ref(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_impl->_remove_ref();
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -147,31 +131,25 @@ main (int argc, char *argv[])
           // Just process one upcall. We know that we would get the
           // clients IOR in that call.
           CORBA::Boolean pending =
-            orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending();
 
           if (pending)
             {
-              orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work();
             }
           // Now that hopefully we have the clients IOR, just start
           // making remote calls to the client.
-          retval = server_impl->call_client (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          retval = server_impl->call_client ();
         }
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index 8750ae59899..dc7f9f97136 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -14,15 +14,15 @@
 ACE_RCSID(BiDirectional, test_i, "$Id$")
 
 void
-Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Callback_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -34,7 +34,7 @@ Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_A
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -47,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 
 void
 Simple_Server_i::callback_object (Callback_ptr callback
-                                  ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -55,7 +55,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::call_client (void)
 {
   if (this->flag_)
     {
@@ -63,8 +63,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
 
       for (int times = 0; times < this->no_iterations_; ++times)
         {
-          this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->callback_->callback_method ();
 
           if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
             {
@@ -75,8 +74,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
             }
         }
 
-      this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->callback_->shutdown ();
       this->flag_ = 0;
 
       return 1;
@@ -87,8 +85,8 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
index 9cf3cb4977c..33333f74968 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
@@ -31,11 +31,11 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Safe way to shutdown
 
-  void callback_method (ACE_ENV_SINGLE_ARG_DECL)
+  void callback_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -58,18 +58,16 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Boolean do_callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void callback_object (Callback_ptr callback
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void callback_object (Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  int call_client (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int call_client (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
index b6f13134438..2b00e7b4331 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp
@@ -11,7 +11,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "in get_string\n"));
@@ -19,9 +19,9 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
   ACE_DEBUG ((LM_DEBUG,"in shutdown\n"));
 }
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
index 68311a6634e..ea78ac96072 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
@@ -22,10 +22,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
index e8d3ff65f68..3d935510fa1 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -41,23 +41,20 @@ main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Hello_client"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -68,26 +65,21 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client Main - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client Main - shutdown returned\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index e3ba7544ee9..ebdf3be3ad7 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -45,23 +45,20 @@ main (int argc, char *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Hello_server"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "Begin of Hello_Server test\n"));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       //------ Get Root POA & POA Manager references
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -69,25 +66,24 @@ 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 ();
 
       //------- Get IOR Table reference to support CORBALOC URLs
 
       obj =
-        orb->resolve_initial_references("IORTable" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("IORTable");
 
       IORTable::Table_var ior_table =
-        IORTable::Table::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow(obj.in());
 
 
       //------- Get NameService Root Context
 
       obj =
-        orb->resolve_initial_references("NameService" ACE_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("NameService");
 
       CosNaming::NamingContextExt_var root_nc =
-        CosNaming::NamingContextExt::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+        CosNaming::NamingContextExt::_narrow(obj.in());
 
       //-------- Prepare Servant
 
@@ -101,12 +97,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       //--------- Publish IOR using various means
 
@@ -121,7 +115,7 @@ main (int argc, char *argv[])
         }
 
       if (!CORBA::is_nil(ior_table.in()))
-        ior_table->bind("HelloObj", ior.in() ACE_ENV_ARG_PARAMETER);
+        ior_table->bind("HelloObj", ior.in());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -133,34 +127,28 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - Root poa destroyed\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - orb destroyed\n"));
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "server exiting\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_END_TEST;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_END_TEST;
   return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index 0639cfcefeb..e178808d455 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -8,7 +8,7 @@ MCast_Server_i::MCast_Server_i (void)
 }
 
 CORBA::Boolean
-MCast_Server_i::connect_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MCast_Server_i::connect_server (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index 1056dc77929..693419395cb 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -11,7 +11,7 @@ public:
 
   // Simple method just to see that the client contacted the
   // server. If does contact, a '0' is returned.
-  CORBA::Boolean connect_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean connect_server (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index 7a79bec47bc..d227490893d 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -5,29 +5,25 @@
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
 
       ior_mcast_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      init_result = client.init (argc, argv);
 
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException&)
     {
       //
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index 26a0d6c3e12..7edf3b20760 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -15,23 +15,20 @@ ior_mcast_Client_i::~ior_mcast_Client_i (void)
 
 int
 ior_mcast_Client_i::init (int& argc,
-                          char *argv[]
-                          ACE_ENV_ARG_DECL)
+                          char *argv[])
 {
 
-  ACE_TRY
+  try
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
       CORBA::Object_var mcast_server_object =
-        orb->resolve_initial_references ("MCASTServer" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("MCASTServer");
 
       if (CORBA::is_nil (mcast_server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,8 +36,7 @@ ior_mcast_Client_i::init (int& argc,
                           -1);
 
       MCast::Server_var mcast_srvr =
-        MCast::Server::_narrow (mcast_server_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        MCast::Server::_narrow (mcast_server_object.in ());
 
       if (CORBA::is_nil (mcast_srvr.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -49,8 +45,7 @@ ior_mcast_Client_i::init (int& argc,
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        mcast_srvr->connect_server (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        mcast_srvr->connect_server ();
 
       if (ret_value != 0)
         {
@@ -64,17 +59,15 @@ ior_mcast_Client_i::init (int& argc,
                       "The server has been successfully contacted!\n"));
         }
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "client");
+      ex._tao_print_exception ("client");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index 6602be6a96e..46ca60befd4 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -21,10 +21,10 @@ class ior_mcast_Client_i
   ior_mcast_Client_i (void);
   ~ior_mcast_Client_i (void);
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int& argc, char *argv[]);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index be8c6ab97c8..a8cd25a9b2b 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -4,25 +4,20 @@
 
 int main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_i svr_i;
 
-      const int init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      const int init_result = svr_i.init (argc, argv);
 
       if (init_result != 0)
         return 1;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CORBA exception raised in server!");
+      ex._tao_print_exception ("CORBA exception raised in server!");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index e9a12f65dc5..dcb6b1ce180 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -29,40 +29,34 @@ Server_i::~Server_i (void)
 
 int
 Server_i::init (int &argc,
-                char **&argv
-                ACE_ENV_ARG_DECL)
+                char **&argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_TRY
+  try
     {
       // First initialize the ORB, that will remove some arguments...
       this->orb_ =
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
       // Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference.
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager.
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
       // Activate the POA Manager.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::String_var ior;
 
@@ -74,12 +68,10 @@ Server_i::init (int &argc,
         server_i._this ();
 
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -88,11 +80,8 @@ Server_i::init (int &argc,
       else
         {
           ior =
-            this->orb_->object_to_string (mcast_server.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          adapter->bind ("MCASTServer", ior.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->object_to_string (mcast_server.in ());
+          adapter->bind ("MCASTServer", ior.in ());
         }
 
       // Enable such that the server can listen for multicast requests
@@ -103,23 +92,21 @@ Server_i::init (int &argc,
                       "ERROR: Unable to enable multicast "
                       "on specified address.\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       // Run the ORB
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
       //Destroy the POA, waiting until the destruction terminates.
       poa->destroy (1, 1);
       this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index 35844172cac..d55765506e6 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -20,7 +20,7 @@ public:
   Server_i (void);
   ~Server_i (void);
 
-  int init (int &argc, char **&argv ACE_ENV_ARG_DECL);
+  int init (int &argc, char **&argv);
   // Initialize the server multicast.
 
 private:
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index b885f1b28ed..9fbfff745b2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -8,14 +8,12 @@
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var ns_obj =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (ns_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -23,9 +21,7 @@ int main (int argc, char *argv[])
                           1);
 
       CosNaming::NamingContext_var inc =
-        CosNaming::NamingContext::_narrow (ns_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (ns_obj.in ());
 
       if (CORBA::is_nil (inc.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -36,17 +32,15 @@ int main (int argc, char *argv[])
       name.length (1);
       name[0].id = CORBA::string_dup ("yourself");
 
-      inc->bind (name, ns_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      inc->bind (name, ns_obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Test Successful\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Test");
+      ex._tao_print_exception ("Test");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 079c8e9b4e1..a3441b53d83 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -60,21 +60,18 @@ Airplane_Client_i::get_planes (size_t count)
 {
   for (size_t i = 0; i < count; i++)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           CORBA::String_var response =
-            this->server_->get_plane (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->server_->get_plane ();
 
           ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ()));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           ACE_ERROR ((LM_ERROR, "Plane %d exception:\n", i));
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "get_planes");
+          ex._tao_print_exception ("get_planes");
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -104,15 +101,12 @@ Airplane_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "internet");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -125,22 +119,19 @@ Airplane_Client_i::init (int argc, char **argv)
                           -1);
 
       CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (this->server_key_);
 
-      this->server_ = Paper_Airplane_Server::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->server_ = Paper_Airplane_Server::_narrow (server_object.in());
 
       if (CORBA::is_nil (server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
           "Error: invalid server key <%s>\n", this->server_key_), -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_Client_i::init");
+      ex._tao_print_exception ("Airplane_Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 90f93c31e54..3276aac194c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -5,8 +5,8 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_time.h"
 
-ACE_RCSID (ImplRepo, 
-           airplane_i, 
+ACE_RCSID (ImplRepo,
+           airplane_i,
            "$Id$")
 
 // Constructor
@@ -29,7 +29,7 @@ Airplane_i::~Airplane_i (void)
 // Returns a random plane and page number
 
 char *
-Airplane_i::get_plane (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Airplane_i::get_plane (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 10982838106..da4beedac2f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -48,7 +48,7 @@ public:
   ~Airplane_i (void);
 
   /// Returns a random plane.
-  virtual char *get_plane (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char *get_plane (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 45f4bd9bca3..5c3ab7d7763 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -13,32 +13,28 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int retval = server.init (argc, argv);
 
       if (retval == -1)
         return -1;
- 
- 
-      retval = server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+
+      retval = server.run ();
 
       ACE_DEBUG ((LM_DEBUG, "Paper Airplane Server says goodnight\n"));
 
       return retval;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 92ffd886c0f..cad3a9ab157 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -61,17 +61,16 @@ Airplane_Server_i::parse_args (void)
 }
 
 int
-Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
+Airplane_Server_i::init (int argc, char** argv)
 {
   // Since the Implementation Repository keys off of the POA name, we need
   // to use the SERVER_NAME as the POA's name.
   const char *poa_name = SERVER_NAME;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_ = CORBA::ORB_init (argc, argv, 0);
 
       // Save pointers to the command line arguments
       this->argc_ = argc;
@@ -85,18 +84,14 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
 
       // Get the POA from the ORB.
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
       ACE_ASSERT(! CORBA::is_nil (obj.in ()));
 
       // Narrow the object to a POA.
-      root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa_ = PortableServer::POA::_narrow (obj.in ());
 
       // Get the POA_Manager.
-      this->poa_manager_ = this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_ = this->root_poa_->the_POAManager ();
 
       // We now need to create a POA with the persistent and user_id policies,
       // since they are need for use with the Implementation Repository.
@@ -105,28 +100,21 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       policies.length (2);
 
       policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
       this->airplane_poa_ =
         this->root_poa_->create_POA (poa_name,
                               this->poa_manager_.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       ACE_NEW_RETURN (this->server_impl_, Airplane_i, -1);
@@ -135,42 +123,32 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
         PortableServer::string_to_ObjectId ("server");
 
       this->airplane_poa_->activate_object_with_id (server_id.in (),
-                                                    this->server_impl_
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    this->server_impl_);
 
-      obj = this->airplane_poa_->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = this->airplane_poa_->id_to_reference (server_id.in ());
       CORBA::String_var ior =
-        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (obj.in ());
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The ImRified IOR is: <%s>\n", ior.in ()));
 
       TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(airplane_poa_.in());
-      obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = tmp_poa->id_to_reference_i (server_id.in (), false);
       CORBA::String_var plain_ior =
-        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (obj.in ());
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The plain IOR is: <%s>\n", plain_ior.in ()));
 
       // Note : The IORTable will only be used for those clients who try to
       // invoke indirectly using a simple object_key reference
       // like "corbaloc::localhost:8888/airplane_server".
-      obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (obj.in ());
       ACE_ASSERT(! CORBA::is_nil (adapter.in ()));
-      adapter->bind (poa_name, plain_ior.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      adapter->bind (poa_name, plain_ior.in ());
 
-      this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_->activate ();
 
       if (this->ior_output_file_)
         {
@@ -178,28 +156,25 @@ Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
           ACE_OS::fclose (this->ior_output_file_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_Server_i::init");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Airplane_Server_i::init");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Airplane_Server_i::run (void)
 {
-  ACE_TRY
+  try
     {
       ACE_Time_Value tv(60);
       ACE_Time_Value tvStart = ACE_OS::gettimeofday();
 
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
 
       ACE_Time_Value tvEnd = ACE_OS::gettimeofday();
 
@@ -209,14 +184,12 @@ Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
       if (tvEnd - tvStart > tv - ACE_Time_Value(5))
         return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_Server_i::run");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Airplane_Server_i::run");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index 3b9a1b1131e..78b8f0c6873 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -39,10 +39,10 @@ public:
   ~Airplane_Server_i (void);
 
   /// Initialize the Server state - parsing arguments and waiting
-  int init (int argc, char **argv ACE_ENV_ARG_DECL);
+  int init (int argc, char **argv);
 
   /// Run the orb
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index a92bf39e6c8..c99c34d25cd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -96,15 +96,12 @@ Nestea_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "internet");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -117,22 +114,19 @@ Nestea_Client_i::init (int argc, char **argv)
                           -1);
 
       CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (this->server_key_);
 
-      this->server_ = Nestea_Bookshelf::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->server_ = Nestea_Bookshelf::_narrow (server_object.in());
 
       if (CORBA::is_nil (server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
           "Error: invalid server key <%s>\n", this->server_key_), -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_Client_i::init");
+      ex._tao_print_exception ("Nestea_Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 4706cf0304d..654899816c0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -34,8 +34,7 @@ Nestea_i::~Nestea_i (void)
 // Add <cans> number of cans to the bookshelf.
 
 void
-Nestea_i::drink (CORBA::Long cans
-                 ACE_ENV_ARG_DECL_NOT_USED)
+Nestea_i::drink (CORBA::Long cans)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -50,8 +49,7 @@ Nestea_i::drink (CORBA::Long cans
 // Removes <cans> number of cans from the bookshelf.
 
 void
-Nestea_i::crush (CORBA::Long cans
-                 ACE_ENV_ARG_DECL_NOT_USED)
+Nestea_i::crush (CORBA::Long cans)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -69,7 +67,7 @@ Nestea_i::crush (CORBA::Long cans
 // Returns the number of cans in the bookshelf.
 
 CORBA::Long
-Nestea_i::bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::bookshelf_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -81,7 +79,7 @@ Nestea_i::bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Returns comments about your collection.
 
 char *
-Nestea_i::get_praise (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::get_praise (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -100,7 +98,7 @@ Nestea_i::get_praise (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Nestea_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 3e9aa019ff6..5a7ea6eb25d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -45,24 +45,22 @@ public:
   virtual ~Nestea_i (void);
 
   /// Add <cans> number of cans to the bookshelf.
-  virtual void drink (CORBA::Long cans
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void drink (CORBA::Long cans)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Removes <cans> number of cans from the bookshelf.
-  virtual void crush (CORBA::Long cans
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void crush (CORBA::Long cans)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the number of cans in the bookshelf.
-  virtual CORBA::Long bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long bookshelf_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns comments about your collection.
-  virtual char *get_praise (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char *get_praise (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown(void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   /// Saves bookshelf data to a file.
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 51a8ec71ebe..65735e280f7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -11,31 +11,27 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int retval = server.init (argc, argv);
 
       if (retval == -1)
         return -1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Nestea Bookshelf Server says goodnight\n"));
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index f3278167081..89a8efd1587 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -86,18 +86,17 @@ static void printEnvVars() {
 }
 
 int
-Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
+Nestea_Server_i::init (int argc, char** argv)
 {
   printEnvVars();
   // Since the Implementation Repository keys off of the POA name, we need
   // to use the SERVER_NAME as the POA's name.
   const char *poa_name = SERVER_NAME;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_ = CORBA::ORB_init (argc, argv, 0);
 
       // Save pointers to the command line arguments
       this->argc_ = argc;
@@ -111,16 +110,12 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
 
       // Get the POA from the ORB.
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
       ACE_ASSERT(! CORBA::is_nil (obj.in ()));
 
-      this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (obj.in ());
 
-      this->poa_manager_ = this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_ = this->root_poa_->the_POAManager ();
 
       // We now need to create a POA with the persistent and user_id policies,
       // since they are need for use with the Implementation Repository.
@@ -129,28 +124,21 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       policies.length (2);
 
       policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
       this->nestea_poa_ =
         this->root_poa_->create_POA (poa_name,
                               this->poa_manager_.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       ACE_NEW_RETURN (this->server_impl_,
@@ -161,38 +149,28 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
         PortableServer::string_to_ObjectId ("server");
 
       this->nestea_poa_->activate_object_with_id (server_id.in (),
-                                                  this->server_impl_
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  this->server_impl_);
 
-      obj = this->nestea_poa_->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = this->nestea_poa_->id_to_reference (server_id.in ());
       CORBA::String_var ior =
-        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (obj.in ());
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", ior.in ()));
 
       TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(nestea_poa_.in());
-      obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = tmp_poa->id_to_reference_i (server_id.in (), false);
       CORBA::String_var rawior =
-        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (obj.in ());
 
-      obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = this->orb_->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (obj.in ());
       ACE_ASSERT(! CORBA::is_nil (adapter.in ()));
 
-      adapter->bind (poa_name, rawior.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      adapter->bind (poa_name, rawior.in());
 
-      this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_->activate ();
 
       if (this->ior_output_file_)
         {
@@ -200,40 +178,36 @@ Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
           ACE_OS::fclose (this->ior_output_file_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_i::init");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Nestea_i::init");
+      throw;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Nestea_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Nestea_Server_i::run (void)
 {
   int status = 0;
 
-  ACE_TRY
+  try
     {
       ACE_Time_Value tv(SELF_DESTRUCT_SECS);
 
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
+      this->orb_->run (tv);
 
       this->root_poa_->destroy(1, 1);
       this->orb_->destroy();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       status = -1;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_i::run");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("Nestea_i::run");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index ff3aee780de..aca9cd69859 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -39,10 +39,10 @@ public:
   ~Nestea_Server_i (void);
 
   /// Initialize the Server state - parsing arguments and waiting
-  int init (int argc, char **argv ACE_ENV_ARG_DECL);
+  int init (int argc, char **argv);
 
   /// Run the orb
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index f5e1e660533..e643162f41b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -9,22 +9,17 @@ using namespace CORBA;
 
 int main(int argc, char* argv[]) {
 
-  ACE_TRY_NEW_ENV
+  try
   {
- 
-    ORB_var orb = ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    Object_var obj = orb->resolve_initial_references("Test" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    test_var test = test::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+
+    ORB_var orb = ORB_init(argc, argv, 0);
+
+    Object_var obj = orb->resolve_initial_references("Test");
+    test_var test = test::_narrow(obj.in());
     ACE_ASSERT(! is_nil(test.in()));
 
-    Long n = test->get(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    Long m = test->get(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    Long n = test->get();
+    Long m = test->get();
     if (m == n + 1)
       ACE_DEBUG((LM_DEBUG, "Client: All tests ran successfully.\n"));
     else
@@ -32,10 +27,9 @@ int main(int argc, char* argv[]) {
 
     return 0;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client:");
+    ex._tao_print_exception ("client:");
   }
-  ACE_ENDTRY;
   return -1;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
index 769d8126ae4..feb6d972b2e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
@@ -5,33 +5,29 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_i server;
 
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int retval = server.init (argc, argv);
 
       if (retval == -1)
         return -1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "Server: System Exception");
+      sysex._tao_print_exception ("Server: System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "Server: User Exception");
+      userex._tao_print_exception ("Server: User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 21edebb203f..8994cabe3ed 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -23,17 +23,13 @@ public:
   }
   virtual ~test_i () {
   }
-  virtual CORBA::Long get (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) {
+  virtual CORBA::Long get (void) ACE_THROW_SPEC ((CORBA::SystemException)) {
     ++n_;
-    CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
-    PortableServer::Current_var cur = PortableServer::Current::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
+    PortableServer::Current_var cur = PortableServer::Current::_narrow(obj.in());
     ACE_ASSERT(! CORBA::is_nil(cur.in()));
-    PortableServer::POA_var poa = cur->get_POA(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
-    CORBA::String_var poaname = poa->the_name(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+    PortableServer::POA_var poa = cur->get_POA();
+    CORBA::String_var poaname = poa->the_name();
 
     ACE_DEBUG((LM_DEBUG, "%s: get() %d\n", poaname.in(), n_));
     return n_;
@@ -95,44 +91,36 @@ namespace
 }
 
 int
-Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
+Server_i::init (int argc, char** argv)
 {
-  ACE_TRY
+  try
   {
-    this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_ = CORBA::ORB_init (argc, argv, 0);
 
     int retval = this->parse_args (argc, argv);
     if (retval != 0)
       return retval;
 
     CORBA::Object_var obj =
-      this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->orb_->resolve_initial_references ("RootPOA");
     this->root_poa_ =
-      PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      PortableServer::POA::_narrow (obj.in ());
     ACE_ASSERT(! CORBA::is_nil(this->root_poa_.in()));
 
     PortableServer::POAManager_var poa_manager =
-      this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->root_poa_->the_POAManager ();
 
-    obj = this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    obj = this->orb_->resolve_initial_references ("IORTable");
     IORTable::Table_var ior_table =
-      IORTable::Table::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      IORTable::Table::_narrow (obj.in ());
     ACE_ASSERT(! CORBA::is_nil(ior_table.in()));
 
     // If -orbuseimr 1 is specified then all persistent poas will be
     // registered with the imr.
     CORBA::PolicyList policies (2);
     policies.length (2);
-    policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
+    policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
     test_i* test_svt;
     ACE_NEW_RETURN (test_svt, test_i(orb_.in()), -1);
@@ -150,52 +138,40 @@ Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
       PortableServer::POA_var poa =
         this->root_poa_->create_POA (name.c_str(),
         poa_manager.in (),
-        policies
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        policies);
 
-      poa->activate_object_with_id (server_id.in (), test_svt ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->activate_object_with_id (server_id.in (), test_svt);
 
       TAO_Root_POA* tmp_poa = dynamic_cast<TAO_Root_POA*>(poa.in());
-      obj = tmp_poa->id_to_reference_i (server_id.in (), false ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = tmp_poa->id_to_reference_i (server_id.in (), false);
 
-      CORBA::String_var ior = this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var ior = this->orb_->object_to_string (obj.in ());
 
-      ior_table->bind (name.c_str(), ior.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ior_table->bind (name.c_str(), ior.in ());
     }
 
-    policies[0]->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    policies[1]->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    policies[0]->destroy();
+    policies[1]->destroy();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::init");
-    ACE_RE_THROW;
+    ex._tao_print_exception ("Server_i::init");
+    throw;
   }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Server_i::run (void)
 {
-  ACE_TRY
+  try
   {
     PortableServer::POAManager_var poa_manager =
-      this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      this->root_poa_->the_POAManager ();
 
-    poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    poa_manager->activate ();
 
     // We have potentially lots of IORs, so just write out a simple text
     // file that the run_test.pl can use to know we're done.
@@ -210,20 +186,17 @@ Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
       this->server_name_.c_str(),
       this->count_));
 
-    this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->run ();
 
     this->root_poa_->destroy(1, 1);
     this->orb_->destroy();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i::run");
-    ACE_RE_THROW;
+    ex._tao_print_exception ("Server_i::run");
+    throw;
   }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
index 222b179634a..24d8dc97c8d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h
@@ -15,9 +15,9 @@ public:
   Server_i (void);
   ~Server_i (void);
 
-  int init (int argc, char **argv ACE_ENV_ARG_DECL);
+  int init (int argc, char **argv);
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
 
 private:
   int parse_args (int argc, char* argv[]);
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index 3e16668c65b..18febaffa5f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -3,8 +3,8 @@
 
 #include "ifr_dii_client.h"
 
-ACE_RCSID (Application_Test, 
-           client, 
+ACE_RCSID (Application_Test,
+           client,
            "$Id$")
 
 int
@@ -12,20 +12,17 @@ main (int argc, char *argv[])
 {
   IFR_DII_Client client;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (client.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER)
+                       argv)
            == -1)
         {
           return 1;
         }
       else
         {
-           int status = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-           ACE_TRY_CHECK;
+           int status = client.run ();
 
            if (status == -1)
            {
@@ -33,13 +30,11 @@ main (int argc, char *argv[])
            }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client Exception");
+      ex._tao_print_exception ("Client Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index f6dd2238e12..f145d8e2e30 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -23,14 +23,11 @@ IFR_DII_Client::~IFR_DII_Client (void)
 
 int
 IFR_DII_Client::init (int argc,
-                      char *argv[]
-                      ACE_ENV_ARG_DECL)
+                      char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                0);
 
   // In a reall application, we would get the scoped or
   // local name from the Interface Repository and use that
@@ -39,8 +36,7 @@ IFR_DII_Client::init (int argc,
   // we just use the IOR which is stored in a file by the server.
   this->target_ =
     this->orb_->string_to_object ("file://iorfile"
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  );
 
 
   if (CORBA::is_nil (this->target_.in ()))
@@ -60,14 +56,13 @@ IFR_DII_Client::init (int argc,
 }
 
 int
-IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::run (void)
 {
   int result = 0;
 
   if (this->lookup_by_name_)
     {
-      result = this->lookup_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      result = this->lookup_interface_def ();
 
       if (result == -1)
         {
@@ -76,8 +71,7 @@ IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL)
     }
   else
     {
-      result = this->find_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      result = this->find_interface_def ();
 
       if (result == -1)
         {
@@ -85,14 +79,11 @@ IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  this->get_operation_def (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->get_operation_def ();
 
-  this->create_dii_request (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->create_dii_request ();
 
-  this->invoke_and_display (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->invoke_and_display ();
 
   return 0;
 }
@@ -127,11 +118,10 @@ IFR_DII_Client::parse_args (int argc,
 }
 
 int
-IFR_DII_Client::find_interface_def (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::find_interface_def (void)
 {
   this->target_def_ =
-    this->target_->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->target_->_get_interface ();
 
   if (CORBA::is_nil (this->target_def_.in ()))
     {
@@ -144,16 +134,12 @@ IFR_DII_Client::find_interface_def (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::lookup_interface_def (void)
 {
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("InterfaceRepository"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+    this->orb_->resolve_initial_references ("InterfaceRepository");
 
-  this->repo_ = CORBA::Repository::_narrow (obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  this->repo_ = CORBA::Repository::_narrow (obj.in ());
 
   // Is there a contained object of some kind at any level in the
   // repository called "warehouse"?
@@ -162,8 +148,7 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
                               -1,            // Unlimited level recursion.
                               CORBA::dk_all, // Any type of contained object.
                               1              // Exclude parents of interfaces.
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+                              );
 
   CORBA::ULong length = candidates->length ();
   CORBA::Container_var candidate;
@@ -182,9 +167,7 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       candidate =
-        CORBA::Container::_narrow (candidates[i]
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN(-1);
+        CORBA::Container::_narrow (candidates[i]);
 
       // Is this contained item itself a container?
       if (!CORBA::is_nil (candidate.in ()))
@@ -192,8 +175,7 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
           // Does this container contain any interfaces?
           interfaces = candidate->contents (CORBA::dk_Interface,
                                             1     // Exclude parents.
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN(-1);
+                                            );
 
           n_interfaces = interfaces->length ();
 
@@ -213,29 +195,25 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
   // be any length.
   for (CORBA::ULong j = 0; j < n_interfaces  ; ++j)
     {
-      name = interfaces[j]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN(-1);
+      name = interfaces[j]->name ();
 
       if (!ACE_OS::strcmp (name.in (), this->interface_name.in ()))
         {
           this->target_def_ =
-            CORBA::InterfaceDef::_narrow (interfaces[j]
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN(-1);
+            CORBA::InterfaceDef::_narrow (interfaces[j]);
         }
     }
   return 0;
 }
 
 void
-IFR_DII_Client::get_operation_def (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::get_operation_def (void)
 {
   // What operation(s) does this interface contain?
   CORBA::ContainedSeq_var operations =
     this->target_def_->contents (CORBA::dk_Operation,
                                  0  // Do not exclude inherited operations.
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 );
 
   CORBA::ULong n_operations = operations->length ();
   CORBA::String_var operation_name;
@@ -244,15 +222,12 @@ IFR_DII_Client::get_operation_def (ACE_ENV_SINGLE_ARG_DECL)
   // be any length.
   for (CORBA::ULong i = 0; i < n_operations; ++i)
     {
-      operation_name = operations[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      operation_name = operations[i]->name ();
 
       if (!ACE_OS::strcmp (operation_name.in (), this->op_name.in ()))
         {
           this->op_ =
-            CORBA::OperationDef::_narrow (operations[i]
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+            CORBA::OperationDef::_narrow (operations[i]);
 
           break;
         }
@@ -260,20 +235,16 @@ IFR_DII_Client::get_operation_def (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::create_dii_request (void)
 {
-  this->req_ = this->target_->_request (this->op_name.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->req_ = this->target_->_request (this->op_name.in ());
 
-  this->result_ = this->op_->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->result_ = this->op_->result ();
 
   this->req_->set_return_type (this->result_.in ());
 
   CORBA::ParDescriptionSeq_var params =
-    this->op_->params (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->op_->params ();
 
   CORBA::ULong length = params->length ();
 
@@ -284,8 +255,7 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::TCKind const kind =
-        params[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        params[i].type->kind ();
 
       switch (params[i].mode)
       {
@@ -320,9 +290,7 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
                 // The servant will return 0.0 if the title is not found.
                 this->req_->arguments ()->add_value (params[i].name.in (),
                                                      any,
-                                                     CORBA::ARG_OUT
-                                                     ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
+                                                     CORBA::ARG_OUT);
               }
 
             break;
@@ -332,15 +300,13 @@ IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-IFR_DII_Client::invoke_and_display (ACE_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::invoke_and_display (void)
 {
-  this->req_->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->req_->invoke ();
 
   CORBA::TypeCode_var tc = this->req_->return_value ().type ();
 
-  CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind const kind = tc->kind ();
 
   if (kind == CORBA::tk_boolean)
     {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index a362e0053cc..d236e868046 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -19,11 +19,10 @@ public:
   ~IFR_DII_Client (void);
 
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the client.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the client.
 
 private:
@@ -31,20 +30,20 @@ private:
                   char *argv[]);
   // Process the command line arguments.
 
-  int find_interface_def (ACE_ENV_SINGLE_ARG_DECL);
+  int find_interface_def (void);
   // Query the object reference to get its InterfaceDef in the IFR.
 
-  int lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL);
+  int lookup_interface_def (void);
   // Look up the InterfaceDef by name in the IFR.
 
-  void get_operation_def (ACE_ENV_SINGLE_ARG_DECL);
+  void get_operation_def (void);
   // Find the desired operation in the interface definition.
 
-  void create_dii_request (ACE_ENV_SINGLE_ARG_DECL);
+  void create_dii_request (void);
   // Query the interface definition to get the info needed
   // to construct a CORBA::Request.
 
-  void invoke_and_display (ACE_ENV_SINGLE_ARG_DECL);
+  void invoke_and_display (void);
   // Do the invocation and display the results.
 
   CORBA::ORB_var orb_;
@@ -77,7 +76,7 @@ private:
   // Are we looking up info on the target object by querying the
   // IFR directly with the target's name, or indirectly
   // by calling _get_interface() on the target object?
-  
+
   bool debug_;
   // Display results and debugging info?
 };
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 7cfe8d9c287..a9ac55839ef 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -41,41 +41,30 @@ write_ior_to_file (const char *ior)
 int
 main (int argc, char *argv[])
 {
-        ACE_TRY_NEW_ENV
+        try
           {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       inventory_i servant_impl;
 
       warehouse::inventory_var servant =
-        servant_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (servant.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (servant.in ());
 
       int write_result = write_ior_to_file (ior.in ());
 
@@ -87,21 +76,16 @@ main (int argc, char *argv[])
                             -1);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "server exception:");
+      ex._tao_print_exception ("server exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index 45214149850..86bd5e8b464 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -14,8 +14,7 @@ ACE_RCSID (Application_Test,
 CORBA::Boolean
 inventory_i::getCDinfo (const char * artist,
                         char *& title,
-                        CORBA::Float_out price
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        CORBA::Float_out price)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean in_stock = 0;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
index 2e3a4164285..35a178c0d4b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
@@ -12,8 +12,7 @@ class inventory_i : public POA_warehouse::inventory
 public:
   CORBA::Boolean getCDinfo (const char * artist,
                             char *& title,
-                            CORBA::Float_out price
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                            CORBA::Float_out price)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index 410ad1fd4f3..3397a80f770 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -3,8 +3,8 @@
 
 #include "idl3_client.h"
 
-ACE_RCSID (Application_Test, 
-           client, 
+ACE_RCSID (Application_Test,
+           client,
            "$Id$")
 
 int
@@ -12,19 +12,17 @@ main (int argc, char *argv[])
 {
   IDL3_Client client;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (client.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER)
+                       argv)
            == -1)
         {
           return 1;
         }
       else
         {
-          int status = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int status = client.run ();
 
           if (status == -1)
             {
@@ -32,13 +30,11 @@ main (int argc, char *argv[])
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client Exception");
+      ex._tao_print_exception ("Client Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 4dc662ff7f3..5fff9b9379b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -258,19 +258,14 @@ IDL3_Client::~IDL3_Client (void)
 
 int
 IDL3_Client::init (int argc,
-                   char *argv[]
-                   ACE_ENV_ARG_DECL)
+                   char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                0);
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("InterfaceRepository"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("InterfaceRepository");
 
   if (CORBA::is_nil (obj.in ()))
     {
@@ -280,9 +275,7 @@ IDL3_Client::init (int argc,
     }
 
   this->repo_ =
-    CORBA::ComponentIR::Repository::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ComponentIR::Repository::_narrow (obj.in ());
 
   if (CORBA::is_nil (this->repo_.in ()))
     {
@@ -300,10 +293,9 @@ IDL3_Client::init (int argc,
 }
 
 int
-IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+IDL3_Client::run (void)
 {
-  int status = this->component_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->component_test ();
 
   if (status != 0)
     {
@@ -311,17 +303,14 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   status = this->valuetype_test (VALUETYPE_ID,
-                                 "value"
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                 "value");
 
   if (status != 0)
     {
       return status;
     }
 
-  status = this->home_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->home_test ();
 
   if (status != 0)
     {
@@ -329,9 +318,7 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   status = this->valuetype_test (EVENTTYPE_ID,
-                                 "event"
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                 "event");
 
   if (status != 0)
     {
@@ -368,12 +355,10 @@ IDL3_Client::parse_args (int argc,
 }
 
 int
-IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
+IDL3_Client::component_test (void)
 {
   CORBA::Contained_var result =
-    this->repo_->lookup_id (COMPONENT_ID
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->repo_->lookup_id (COMPONENT_ID);
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -387,8 +372,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::String_var str =
-    result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    result->absolute_name ();
 
   const char *tmp = str.in ();
 
@@ -416,13 +400,10 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::ComponentIR::ComponentDef_var comp_def =
-    CORBA::ComponentIR::ComponentDef::_narrow (result.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ComponentIR::ComponentDef::_narrow (result.in ());
 
   CORBA::TypeCode_var comp_tc =
-    comp_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_def->type ();
 
   if (CORBA::is_nil (comp_tc.in ()))
     {
@@ -436,8 +417,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  tmp = comp_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  tmp = comp_tc->id ();
 
   if (tmp == 0 || ACE_OS::strcmp (tmp, COMPONENT_ID) != 0)
     {
@@ -452,8 +432,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var desc =
-    comp_def->describe_ext_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_def->describe_ext_interface ();
 
   if (desc.ptr () == 0)
     {
@@ -467,27 +446,21 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  int status = this->component_attribute_test (desc
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->component_attribute_test (desc);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->component_inheritance_test (comp_def
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->component_inheritance_test (comp_def);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->component_port_test (comp_def
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->component_port_test (comp_def);
 
   if (status != 0)
     {
@@ -498,12 +471,10 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
+IDL3_Client::home_test (void)
 {
   CORBA::Contained_var result =
-    this->repo_->lookup_id (HOME_ID
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->repo_->lookup_id (HOME_ID);
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -517,9 +488,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::ComponentIR::HomeDef_var home =
-    CORBA::ComponentIR::HomeDef::_narrow (result.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ComponentIR::HomeDef::_narrow (result.in ());
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -533,8 +502,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::ComponentIR::ComponentDef_var managed =
-    home->managed_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    home->managed_component ();
 
   if (CORBA::is_nil (managed.in ()))
     {
@@ -547,8 +515,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  CORBA::String_var str = managed->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = managed->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), COMPONENT_ID) != 0)
     {
@@ -562,8 +529,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::ValueDef_var pkey =
-    home->primary_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    home->primary_key ();
 
   if (CORBA::is_nil (pkey.in ()))
     {
@@ -576,8 +542,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  str = pkey->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  str = pkey->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), HOME_KEY_ID) != 0)
     {
@@ -590,9 +555,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  int status = this->home_inheritance_test (home
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->home_inheritance_test (home);
 
   if (status != 0)
     {
@@ -600,8 +563,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Contained::Description_var desc =
-    home->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    home->describe ();
 
   CORBA::ComponentIR::HomeDescription *home_desc = 0;
 
@@ -616,18 +578,14 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  status = this->home_factory_test (home_desc
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->home_factory_test (home_desc);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->home_finder_test (home_desc
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->home_finder_test (home_desc);
 
   if (status != 0)
     {
@@ -639,13 +597,10 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
 
 int
 IDL3_Client::valuetype_test (const char *repo_id,
-                             const char *prefix
-                             ACE_ENV_ARG_DECL)
+                             const char *prefix)
 {
   CORBA::Contained_var result =
-    this->repo_->lookup_id (repo_id
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->repo_->lookup_id (repo_id);
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -660,9 +615,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   CORBA::ExtValueDef_var evd =
-    CORBA::ExtValueDef::_narrow (result.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ExtValueDef::_narrow (result.in ());
 
   if (CORBA::is_nil (evd.in ()))
     {
@@ -676,13 +629,10 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   CORBA::ExtValueDef::ExtFullValueDescription_var desc =
-    evd->describe_ext_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    evd->describe_ext_value ();
 
   int status = this->valuetype_attribute_test (desc,
-                                               prefix
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                               prefix);
 
   if (status != 0)
     {
@@ -690,9 +640,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_inheritance_test (evd,
-                                             prefix
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                             prefix);
 
   if (status != 0)
     {
@@ -700,9 +648,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_operation_test (desc,
-                                           prefix
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                           prefix);
 
   if (status != 0)
     {
@@ -710,9 +656,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_member_test (desc,
-                                        prefix
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                        prefix);
 
   if (status != 0)
     {
@@ -720,9 +664,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_factory_test (desc,
-                                         prefix
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                         prefix);
 
   if (status != 0)
     {
@@ -735,7 +677,6 @@ IDL3_Client::valuetype_test (const char *repo_id,
 int
 IDL3_Client::component_attribute_test (
     CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &desc
-    ACE_ENV_ARG_DECL
   )
 {
   if (desc->attributes.length () != ATTRS_LEN)
@@ -769,8 +710,7 @@ IDL3_Client::component_attribute_test (
         }
 
       CORBA::TCKind kind =
-        desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        desc->attributes[i].type->kind ();
 
       if (kind != ATTR_TC_KINDS[i])
         {
@@ -820,12 +760,10 @@ IDL3_Client::component_attribute_test (
 int
 IDL3_Client::component_inheritance_test (
     CORBA::ComponentIR::ComponentDef_var &comp_def
-    ACE_ENV_ARG_DECL
   )
 {
   CORBA::ComponentIR::ComponentDef_var comp_base =
-    comp_def->base_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_def->base_component ();
 
   if (CORBA::is_nil (comp_base.in ()))
     {
@@ -839,8 +777,7 @@ IDL3_Client::component_inheritance_test (
       return -1;
     }
 
-  CORBA::String_var str = comp_base->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = comp_base->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), COMP_BASE_ID) != 0)
     {
@@ -855,8 +792,7 @@ IDL3_Client::component_inheritance_test (
     }
 
   CORBA::InterfaceDefSeq_var supported =
-    comp_base->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_base->supported_interfaces ();
 
   CORBA::ULong length = supported->length ();
 
@@ -874,8 +810,7 @@ IDL3_Client::component_inheritance_test (
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      str = supported[i]->id ();
 
       if (str.in () == 0
           || ACE_OS::strcmp (str.in (), COMP_SUPPORTED_IDS[i]) != 0)
@@ -898,12 +833,10 @@ IDL3_Client::component_inheritance_test (
 int
 IDL3_Client::component_port_test (
     CORBA::ComponentIR::ComponentDef_var &comp_def
-    ACE_ENV_ARG_DECL
   )
 {
   CORBA::Contained::Description_var desc =
-    comp_def->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_def->describe ();
 
   CORBA::ComponentIR::ComponentDescription *cd = 0;
 
@@ -919,18 +852,14 @@ IDL3_Client::component_port_test (
       return -1;
     }
 
-  int status = this->provides_test (cd->provided_interfaces
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->provides_test (cd->provided_interfaces);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->uses_test (cd->used_interfaces
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->uses_test (cd->used_interfaces);
 
   if (status != 0)
     {
@@ -941,9 +870,7 @@ IDL3_Client::component_port_test (
                                   EMITS_LEN,
                                   "emits",
                                   EMITS_NAMES,
-                                  EMITS_IDS
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  EMITS_IDS);
 
   if (status != 0)
     {
@@ -954,9 +881,7 @@ IDL3_Client::component_port_test (
                                   PUBLISHES_LEN,
                                   "publishes",
                                   PUBLISHES_NAMES,
-                                  PUBLISHES_IDS
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  PUBLISHES_IDS);
 
   if (status != 0)
     {
@@ -967,9 +892,7 @@ IDL3_Client::component_port_test (
                                   CONSUMES_LEN,
                                   "consumes",
                                   CONSUMES_NAMES,
-                                  CONSUMES_IDS
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  CONSUMES_IDS);
 
   if (status != 0)
     {
@@ -980,8 +903,7 @@ IDL3_Client::component_port_test (
 }
 
 int
-IDL3_Client::provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &pds
-                            ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &pds)
 {
   if (pds.length () != PROVIDES_LEN)
     {
@@ -1034,8 +956,7 @@ IDL3_Client::provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &pds
 }
 
 int
-IDL3_Client::uses_test (CORBA::ComponentIR::UsesDescriptionSeq &uds
-                        ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::uses_test (CORBA::ComponentIR::UsesDescriptionSeq &uds)
 {
   if (uds.length () != USES_LEN)
     {
@@ -1108,8 +1029,7 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
                               CORBA::ULong seq_length,
                               const char *port_type,
                               const char **names,
-                              const char **ids
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              const char **ids)
 {
   if (eds.length () != seq_length)
     {
@@ -1166,11 +1086,9 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
 
 int
 IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
-                                         const char *prefix
-                                         ACE_ENV_ARG_DECL)
+                                         const char *prefix)
 {
-  CORBA::ValueDef_var bvd = vd->base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ValueDef_var bvd = vd->base_value ();
 
   if (CORBA::is_nil (bvd.in ()))
     {
@@ -1185,8 +1103,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
       return -1;
     }
 
-  CORBA::String_var str = bvd->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = bvd->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), VT_BASE_ID) != 0)
     {
@@ -1202,8 +1119,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
     }
 
   CORBA::InterfaceDefSeq_var supported =
-    vd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    vd->supported_interfaces ();
 
   CORBA::ULong length = supported->length ();
 
@@ -1222,8 +1138,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      str = supported[i]->id ();
 
       if (str.in () == 0
           || ACE_OS::strcmp (str.in (), VT_SUPPORTED_IDS[i]) != 0)
@@ -1248,7 +1163,6 @@ int
 IDL3_Client::valuetype_attribute_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL
   )
 {
   if (desc->attributes.length () != ATTRS_LEN)
@@ -1284,8 +1198,7 @@ IDL3_Client::valuetype_attribute_test (
         }
 
       CORBA::TCKind kind =
-        desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        desc->attributes[i].type->kind ();
 
       if (kind != ATTR_TC_KINDS[i])
         {
@@ -1339,7 +1252,6 @@ int
 IDL3_Client::valuetype_operation_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL
   )
 {
   CORBA::ULong ops_length = desc->operations.length ();
@@ -1380,8 +1292,7 @@ IDL3_Client::valuetype_operation_test (
         }
 
       CORBA::TCKind ret_kind =
-        desc->operations[i].result.in ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        desc->operations[i].result.in ()->kind ();
 
       if (ret_kind != OP_RET_KINDS[i])
         {
@@ -1457,7 +1368,6 @@ int
 IDL3_Client::valuetype_member_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   CORBA::ULong length = desc->members.length ();
@@ -1517,7 +1427,6 @@ int
 IDL3_Client::valuetype_factory_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   CORBA::ULong length = desc->initializers.length ();
@@ -1621,12 +1530,10 @@ IDL3_Client::valuetype_factory_test (
 }
 
 int
-IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
-                                    ACE_ENV_ARG_DECL)
+IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd)
 {
   CORBA::ComponentIR::HomeDef_var bhd =
-    hd->base_home (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    hd->base_home ();
 
   if (CORBA::is_nil (bhd.in ()))
     {
@@ -1640,8 +1547,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
       return -1;
     }
 
-  CORBA::String_var str = bhd->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = bhd->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), HOME_BASE_ID) != 0)
     {
@@ -1656,8 +1562,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
     }
 
   CORBA::InterfaceDefSeq_var supported =
-    bhd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    bhd->supported_interfaces ();
 
   CORBA::ULong length = supported->length ();
 
@@ -1675,8 +1580,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      str = supported[i]->id ();
 
       if (str.in () == 0
           || ACE_OS::strcmp (str.in (), HOME_SUPPORTED_IDS[i]) != 0)
@@ -1697,8 +1601,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
 }
 
 int
-IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
-                                ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd)
 {
   CORBA::ULong length = hd->factories.length ();
 
@@ -1795,8 +1698,7 @@ IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
 }
 
 int
-IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd
-                               ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd)
 {
   CORBA::ULong length = hd->finders.length ();
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
index 60e84a9f3d4..cf1d3dafaaa 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h
@@ -38,11 +38,10 @@ public:
   // Destructor
 
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the ORB and get the IFR object reference.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Execute test code.
 
 private:
@@ -50,74 +49,59 @@ private:
                   char *argv[]);
   // Process the command line arguments.
 
-  int component_test (ACE_ENV_SINGLE_ARG_DECL);
-  int home_test (ACE_ENV_SINGLE_ARG_DECL);
+  int component_test (void);
+  int home_test (void);
 
   // Also tests eventtype.
   int valuetype_test (const char *repo_id,
-                      const char *prefix
-                      ACE_ENV_ARG_DECL);
+                      const char *prefix);
 
   int component_attribute_test (
       CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &
-      ACE_ENV_ARG_DECL
     );
 
-  int component_inheritance_test (CORBA::ComponentIR::ComponentDef_var &
-                                  ACE_ENV_ARG_DECL);
+  int component_inheritance_test (CORBA::ComponentIR::ComponentDef_var &);
 
-  int component_port_test (CORBA::ComponentIR::ComponentDef_var &
-                           ACE_ENV_ARG_DECL);
+  int component_port_test (CORBA::ComponentIR::ComponentDef_var &);
 
-  int provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &
-                     ACE_ENV_ARG_DECL);
+  int provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &);
 
-  int uses_test (CORBA::ComponentIR::UsesDescriptionSeq &
-                 ACE_ENV_ARG_DECL);
+  int uses_test (CORBA::ComponentIR::UsesDescriptionSeq &);
 
   int event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &,
                        CORBA::ULong seq_length,
                        const char *port_type,
                        const char **names,
-                       const char **ids
-                       ACE_ENV_ARG_DECL);
+                       const char **ids);
 
   int valuetype_inheritance_test (CORBA::ExtValueDef_var &,
-                                  const char *prefix
-                                  ACE_ENV_ARG_DECL);
+                                  const char *prefix);
 
   int valuetype_attribute_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
       const char *prefix
-      ACE_ENV_ARG_DECL
     );
 
   int valuetype_operation_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
       const char *prefix
-      ACE_ENV_ARG_DECL
     );
 
   int valuetype_member_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
       const char *prefix
-      ACE_ENV_ARG_DECL
     );
 
   int valuetype_factory_test (
       CORBA::ExtValueDef::ExtFullValueDescription_var &,
       const char *prefix
-      ACE_ENV_ARG_DECL
     );
 
-  int home_inheritance_test (CORBA::ComponentIR::HomeDef_var &
-                             ACE_ENV_ARG_DECL);
+  int home_inheritance_test (CORBA::ComponentIR::HomeDef_var &);
 
-  int home_factory_test (CORBA::ComponentIR::HomeDescription *
-                         ACE_ENV_ARG_DECL);
+  int home_factory_test (CORBA::ComponentIR::HomeDescription *);
 
-  int home_finder_test (CORBA::ComponentIR::HomeDescription *
-                        ACE_ENV_ARG_DECL);
+  int home_finder_test (CORBA::ComponentIR::HomeDescription *);
 
 private:
   bool debug_;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
index 2b862e5fdb1..b4946c34c67 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (IFR_Inheritance_Test,
 
 void printContents( const CORBA::ContainedSeq& cont )
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       for( unsigned int i=0; i<cont.length(); i++ )
         {
@@ -20,12 +20,10 @@ void printContents( const CORBA::ContainedSeq& cont )
             {
               CORBA::InterfaceDef_var intDef =
                 CORBA::InterfaceDef::_narrow (cont[i]
-                ACE_ENV_ARG_PARAMETER );
-              ACE_TRY_CHECK;
+ );
 
               CORBA::InterfaceDef::FullInterfaceDescription* desc =
-                intDef->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                intDef->describe_interface ();
 
               //printf( "-- %s:\n", (const char*)(desc->name) );
 
@@ -43,40 +41,32 @@ void printContents( const CORBA::ContainedSeq& cont )
             {
               CORBA::ModuleDef_var moduleDef =
                 CORBA::ModuleDef::_narrow (cont[i]
-                                           ACE_ENV_ARG_PARAMETER );
-              ACE_TRY_CHECK;
+ );
 
               CORBA::ContainedSeq_var moduleContents =
                 moduleDef->contents (CORBA::dk_all,1
-                                     ACE_ENV_ARG_PARAMETER );
-              ACE_TRY_CHECK;
+ );
               printContents (moduleContents.in ());
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "printContents");
+      ex._tao_print_exception ("printContents");
       ACE_OS::exit(-1); // the test has failed!
     }
-  ACE_ENDTRY;
 }
 
 
 int  main(int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var      orb = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
       CORBA::Object_var object =
-        orb->resolve_initial_references ("InterfaceRepository"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("InterfaceRepository");
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -89,9 +79,7 @@ int  main(int argc, char** argv)
         }
 
       CORBA::Repository_var  ifr =
-        CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::Repository::_narrow (object.in ());
 
       if (CORBA::is_nil (ifr.in ()))
         {
@@ -100,22 +88,18 @@ int  main(int argc, char** argv)
                             -1);
         }
 
-     CORBA::ContainedSeq_var  cont = ifr->contents (CORBA::dk_all, 0
-                                                    ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     CORBA::ContainedSeq_var  cont = ifr->contents (CORBA::dk_all, 0);
 
      printContents (cont.in ());
 
      orb->shutdown ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "main");
+      ex._tao_print_exception ("main");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index ef26b0b054d..407c0d4c9be 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -58,13 +58,11 @@ int
 Admin_Client::init (int argc,
                     char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       int retval = this->parse_args (argc,
                                      argv);
@@ -73,9 +71,7 @@ Admin_Client::init (int argc,
         return retval;
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("InterfaceRepository"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("InterfaceRepository");
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -88,9 +84,7 @@ Admin_Client::init (int argc,
         }
 
       this->repo_ =
-        CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::Repository::_narrow (object.in ());
 
       if (CORBA::is_nil (this->repo_.in ()))
         {
@@ -99,13 +93,11 @@ Admin_Client::init (int argc,
                             -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Admin_Client::init");
+      ex._tao_print_exception ("Admin_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -113,7 +105,7 @@ Admin_Client::init (int argc,
 int
 Admin_Client::run (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->all_tests_ == 1)
         {
@@ -124,8 +116,7 @@ Admin_Client::run (void)
               // CORBA::BAD_PARAM exception the second time.
               for (CORBA::ULong j = 0; j < this->iterations_; ++j)
                 {
-                  (this->*test_array_[i])(ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  (this->*test_array_[i])();
                 }
             }
         }
@@ -134,19 +125,15 @@ Admin_Client::run (void)
           for (CORBA::ULong j = 0; j < this->iterations_; ++j)
             {
               (this->*test_array_[this->which_test_])(
-                  ACE_ENV_SINGLE_ARG_PARAMETER
                 );
-              ACE_TRY_CHECK;
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Admin_Client::run");
+      ex._tao_print_exception ("Admin_Client::run");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -202,7 +189,7 @@ Admin_Client::parse_args (int argc,
 }
 
 void
-Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::array_test (void)
 {
   if (this->debug_)
     {
@@ -213,17 +200,13 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::IDLType_var atype =
-    this->repo_->create_string (7 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->create_string (7);
 
   CORBA::ArrayDef_var avar =
     this->repo_->create_array (5,
-                               atype.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               atype.in ());
 
-  CORBA::ULong bound = avar->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULong bound = avar->length ();
 
   if (this->debug_)
     {
@@ -234,11 +217,9 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (bound == 5);
 
-  CORBA::TypeCode_var tc = avar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var tc = avar->type ();
 
-  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = tc->kind ();
 
   if (this->debug_)
     {
@@ -249,10 +230,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_array);
 
-  tc = avar->element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  tc = avar->element_type ();
+  kind = tc->kind ();
 
   if (this->debug_)
     {
@@ -264,10 +243,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (kind == CORBA::tk_string);
 
   CORBA::IDLType_var tdef =
-    avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  CORBA::DefinitionKind dk = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    avar->element_type_def ();
+  CORBA::DefinitionKind dk = tdef->def_kind ();
 
   if (this->debug_)
     {
@@ -281,11 +258,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (dk == CORBA::dk_String);
 
   CORBA::StringDef_var pvar =
-    CORBA::StringDef::_narrow (tdef.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  bound = pvar->bound (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::StringDef::_narrow (tdef.in ());
+  bound = pvar->bound ();
 
   if (this->debug_)
     {
@@ -297,12 +271,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (bound == 7);
 
   CORBA::PrimitiveDef_var pdef =
-    this->repo_->get_primitive (CORBA::pk_short
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  avar->element_type_def (pdef.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->get_primitive (CORBA::pk_short);
+  avar->element_type_def (pdef.in ());
 
   if (this->debug_)
     {
@@ -310,10 +280,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
                   ACE_TEXT ("ArrayDef::element_type_def (set)\n")));
     }
 
-  tc = avar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  tc = avar->type ();
+  kind = tc->kind ();
 
   if (this->debug_)
     {
@@ -324,10 +292,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_array);
 
-  tdef = avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  dk = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  tdef = avar->element_type_def ();
+  dk = tdef->def_kind ();
 
   if (this->debug_)
     {
@@ -339,11 +305,8 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (dk == CORBA::dk_Primitive);
 
   CORBA::PrimitiveDef_var zvar =
-    CORBA::PrimitiveDef::_narrow (tdef.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  CORBA::PrimitiveKind pkind = zvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::PrimitiveDef::_narrow (tdef.in ());
+  CORBA::PrimitiveKind pkind = zvar->kind ();
 
   if (this->debug_)
     {
@@ -354,12 +317,11 @@ Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (pkind == CORBA::pk_short);
 
-  avar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  avar->destroy ();
 }
 
 void
-Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::enum_test (void)
 {
   if (this->debug_)
     {
@@ -380,12 +342,9 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_enum ("IDL:my_enum:1.0",
                               "my_enum",
                               "1.0",
-                              members
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              members);
 
-  CORBA::String_var str = evar->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var str = evar->id ();
 
   if (this->debug_)
     {
@@ -396,8 +355,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
 
-  str = evar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = evar->name ();
 
   if (this->debug_)
     {
@@ -408,8 +366,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
 
-  str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = evar->absolute_name ();
 
   if (this->debug_)
     {
@@ -420,8 +377,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_enum") == 0);
 
-  str = evar->version (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = evar->version ();
 
   if (this->debug_)
     {
@@ -433,8 +389,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
 
   CORBA::DefinitionKind dkind =
-    evar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    evar->def_kind ();
 
   if (this->debug_)
     {
@@ -446,8 +401,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (dkind == CORBA::dk_Enum);
 
   CORBA::Contained::Description_var desc =
-    evar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    evar->describe ();
 
   dkind = desc->kind;
 
@@ -499,8 +453,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
 
-  CORBA::TCKind kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = td->type->kind ();
 
   if (this->debug_)
     {
@@ -511,8 +464,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_enum);
 
-  str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = td->type->id ();
 
   if (this->debug_)
     {
@@ -523,8 +475,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0") == 0);
 
-  str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = td->type->name ();
 
   if (this->debug_)
     {
@@ -536,8 +487,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_enum") == 0);
 
   CORBA::ULong count =
-    td->type->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    td->type->member_count ();
 
   if (this->debug_)
     {
@@ -554,8 +504,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < count; ++i)
     {
-      str = td->type->member_name (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      str = td->type->member_name (i);
 
       if (this->debug_)
         {
@@ -576,9 +525,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
   members[2] = CORBA::string_dup ("DUALITY");
   members[3] = CORBA::string_dup ("TRINITY");
 
-  evar->members (members
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  evar->members (members);
 
   if (this->debug_)
     {
@@ -587,8 +534,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::EnumMemberSeq_var fellows =
-    evar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    evar->members ();
 
   count = fellows->length ();
   const char *tmp = 0;
@@ -609,11 +555,8 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
       ACE_ASSERT (ACE_OS::strcmp (fellows[i], members[i]) == 0);
     }
 
-  evar->name ("another_enum"
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  str = evar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  evar->name ("another_enum");
+  str = evar->name ();
 
   if (this->debug_)
     {
@@ -630,8 +573,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "another_enum") == 0);
 
-  str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = evar->absolute_name ();
 
   if (this->debug_)
     {
@@ -642,12 +584,11 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::another_enum") == 0);
 
-  evar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  evar->destroy ();
 }
 
 void
-Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::alias_test (void)
 {
   if (this->debug_)
     {
@@ -660,25 +601,19 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   // This test also tests WstringDef and SequenceDef.
 
   CORBA::IDLType_var sq_elem =
-    this->repo_->create_wstring (7 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->create_wstring (7);
 
   CORBA::SequenceDef_var sq_var =
     this->repo_->create_sequence (5,
-                                  sq_elem.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  sq_elem.in ());
 
   CORBA::AliasDef_var a_var =
     this->repo_->create_alias ("IDL:my_alias:1.0",
                                "my_alias",
                                "1.0",
-                               sq_var.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               sq_var.in ());
 
-  CORBA::String_var str = a_var->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var str = a_var->id ();
 
   if (this->debug_)
     {
@@ -689,8 +624,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
 
-  str = a_var->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = a_var->name ();
 
   if (this->debug_)
     {
@@ -701,8 +635,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
 
-  str = a_var->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = a_var->absolute_name ();
 
   if (this->debug_)
     {
@@ -713,8 +646,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_alias") == 0);
 
-  str = a_var->version (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = a_var->version ();
 
   if (this->debug_)
     {
@@ -731,12 +663,9 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
                   ACE_TEXT ("AliasDef::version (set)\n")));
     }
 
-  a_var->version ("1.1"
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  a_var->version ("1.1");
 
-  str = a_var->version (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = a_var->version ();
 
   if (this->debug_)
     {
@@ -747,11 +676,9 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.1") == 0);
 
-  CORBA::TypeCode_var tc = a_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var tc = a_var->type ();
 
-  str = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = tc->name ();
 
   if (this->debug_)
     {
@@ -762,8 +689,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
 
-  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = tc->kind ();
 
   if (this->debug_)
     {
@@ -775,11 +701,9 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (kind == CORBA::tk_alias);
 
   CORBA::TypeCode_var ct =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    tc->content_type ();
 
-  kind = ct->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  kind = ct->kind ();
 
   if (this->debug_)
     {
@@ -790,8 +714,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_sequence);
 
-  CORBA::ULong length = ct->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULong length = ct->length ();
 
   if (this->debug_)
     {
@@ -803,11 +726,9 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (length == 5);
 
   CORBA::TypeCode_var ct2 =
-    ct->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ct->content_type ();
 
-  kind = ct2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  kind = ct2->kind ();
 
   if (this->debug_)
     {
@@ -819,8 +740,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_wstring);
 
-  length = ct2->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  length = ct2->length ();
 
   if (this->debug_)
     {
@@ -833,8 +753,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (length == 7);
 
   CORBA::Contained::Description_var desc =
-    a_var->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    a_var->describe ();
 
   CORBA::TypeDescription *td;
   desc->value >>= td;
@@ -857,8 +776,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (td->version, "1.1") == 0);
 
-  kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  kind = td->type->kind ();
 
   if (this->debug_)
     {
@@ -869,8 +787,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_alias);
 
-  str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = td->type->id ();
 
   if (this->debug_)
     {
@@ -881,8 +798,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0") == 0);
 
-  str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = td->type->name ();
 
   if (this->debug_)
     {
@@ -894,16 +810,12 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_alias") == 0);
 
   CORBA::IDLType_var i_var =
-    a_var->original_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    a_var->original_type_def ();
 
   CORBA::SequenceDef_var seq_var =
-    CORBA::SequenceDef::_narrow (i_var.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::SequenceDef::_narrow (i_var.in ());
 
-  length = seq_var->bound (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  length = seq_var->bound ();
 
   if (this->debug_)
     {
@@ -914,12 +826,11 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 5);
 
-  a_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  a_var->destroy ();
 }
 
 void
-Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::native_test (void)
 {
   if (this->debug_)
     {
@@ -932,12 +843,9 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::NativeDef_var nvar =
     this->repo_->create_native ("IDL:my_native:1.0",
                                 "my_native",
-                                "1.0"
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "1.0");
 
-  CORBA::String_var str = nvar->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var str = nvar->id ();
 
   if (this->debug_)
     {
@@ -948,8 +856,7 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "IDL:my_native:1.0") == 0);
 
-  str = nvar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = nvar->name ();
 
   if (this->debug_)
     {
@@ -960,8 +867,7 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "my_native") == 0);
 
-  str = nvar->version (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = nvar->version ();
 
   if (this->debug_)
     {
@@ -972,8 +878,7 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "1.0") == 0);
 
-  str = nvar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = nvar->absolute_name ();
 
   if (this->debug_)
     {
@@ -985,8 +890,7 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_native") == 0);
 
   CORBA::DefinitionKind kind =
-    nvar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    nvar->def_kind ();
 
   if (this->debug_)
     {
@@ -997,12 +901,11 @@ Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::dk_Native);
 
-  nvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  nvar->destroy ();
 }
 
 void
-Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::struct_test (void)
 {
   if (this->debug_)
     {
@@ -1016,15 +919,11 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   members.length (3);
 
   members[0].name = CORBA::string_dup ("ub_string");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string);
   members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   members[1].name = CORBA::string_dup ("bd_string");
-  members[1].type_def = this->repo_->create_string (5
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  members[1].type_def = this->repo_->create_string (5);
   members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   CORBA::EnumMemberSeq e_members (2);
@@ -1039,9 +938,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_enum ("IDL:my_enum:1.0",
                               "my_enum",
                               "1.0",
-                              e_members
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              e_members);
   members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
   members[2].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
@@ -1049,16 +946,12 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_struct ("IDL:my_struct:1.0",
                                 "my_struct",
                                 "1.0",
-                                members
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                members);
 
   // This also tests the members() function.
-  CORBA::TypeCode_var tc = svar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var tc = svar->type ();
 
-  CORBA::ULong length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULong length = tc->member_count ();
 
   if (this->debug_)
     {
@@ -1074,8 +967,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      str = tc->member_name (i);
 
       if (this->debug_)
         {
@@ -1089,8 +981,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Contained::Description_var desc =
-    svar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    svar->describe ();
 
   CORBA::TypeDescription *td;
   desc->value >>= td;
@@ -1124,22 +1015,16 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long);
   members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   members[1].name = CORBA::string_dup ("array_mem");
   members[1].type_def =
     this->repo_->create_array (5,
-                               members[0].type_def.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               members[0].type_def.in ());
   members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-  svar->members (members
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  svar->members (members);
 
   if (this->debug_)
     {
@@ -1156,13 +1041,10 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::EnumDef_var e_def_var = svar->create_enum ("IDL:my_def_enum:1.0",
                                                     "my_enum",
                                                     "1.0",
-                                                    def_members
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                    def_members);
 
   CORBA::StructMemberSeq_var out_members =
-    svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    svar->members ();
 
   length = out_members->length ();
   int cmp_result = 0;
@@ -1191,12 +1073,9 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum"
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum");
 
-  str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = fox->absolute_name ();
 
   if (this->debug_)
     {
@@ -1207,12 +1086,9 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
 
-  fox = svar->lookup ("my_enum"
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  fox = svar->lookup ("my_enum");
 
-  str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = fox->absolute_name ();
 
   if (this->debug_)
     {
@@ -1223,15 +1099,11 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_struct::my_enum") == 0);
 
-  CORBA::Container_var outer = fox->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Container_var outer = fox->defined_in ();
   CORBA::Contained_var schizo =
-    CORBA::Contained::_narrow (outer.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::Contained::_narrow (outer.in ());
 
-  str = schizo->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = schizo->absolute_name ();
 
   if (this->debug_)
     {
@@ -1245,9 +1117,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::ContainedSeq_var contents =
     this->repo_->contents (CORBA::dk_all,
-                           0
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           0);
 
   length = contents->length ();
 
@@ -1261,9 +1131,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (length == 2);
 
   contents = svar->contents (CORBA::dk_all,
-                             0
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                             0);
 
   length = contents->length ();
 
@@ -1278,8 +1146,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = contents[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -1304,9 +1171,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   contents = this->repo_->lookup_name ("my_enum",
                                        -1,
                                        CORBA::dk_all,
-                                       0
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                       0);
 
   length = contents->length ();
 
@@ -1321,8 +1186,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = contents[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -1341,9 +1205,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Container::DescriptionSeq_var cont_desc =
     this->repo_->describe_contents (CORBA::dk_all,
                                     0,
-                                    -1
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    -1);
 
   length = cont_desc->length ();
 
@@ -1361,8 +1223,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::TypeDescription *td;
       cont_desc[i].value >>= td;
 
-      str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = td->type->id ();
 
       if (this->debug_)
         {
@@ -1384,9 +1245,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  svar->name ("your_struct"
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  svar->name ("your_struct");
 
   if (this->debug_)
     {
@@ -1395,9 +1254,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   contents = svar->contents (CORBA::dk_all,
-                             0
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                             0);
 
   length = contents->length ();
 
@@ -1414,8 +1271,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = contents[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -1439,14 +1295,12 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (tmp);
 #endif /* ACE_NDEBUG */
 
-  e_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  svar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  e_var->destroy ();
+  svar->destroy ();
 }
 
 void
-Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::union_test (void)
 {
   if (this->debug_)
     {
@@ -1468,38 +1322,29 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_enum ("IDL:disc_enum:1.0",
                               "disc_enum",
                               "1.0",
-                              d_members
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              d_members);
 
   CORBA::StructMemberSeq s_members (1);
   s_members.length (1);
   s_members[0].name = CORBA::string_dup ("string_in_struct");
   s_members[0].type_def =
-    this->repo_->create_string (6
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->create_string (6);
   s_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   CORBA::StructDef_var s_var =
     this->repo_->create_struct ("IDL:struct_in_union:1.0",
                                 "struct_in_union",
                                 "1.0",
-                                s_members
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                s_members);
 
   CORBA::UnionMemberSeq u_members (4);
   u_members.length (4);
 
   u_members[0].name = CORBA::string_dup ("longval");
   u_members[0].type_def =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->get_primitive (CORBA::pk_long);
   u_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
-  CORBA::TypeCode_var d_type = d_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var d_type = d_var->type ();
   TAO_OutputCDR maker2;
   maker2.write_ulong (3);  // THREE
   TAO_InputCDR maker2_in (maker2);
@@ -1513,9 +1358,7 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 
   u_members[1].name = CORBA::string_dup ("longval");
   u_members[1].type_def =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->get_primitive (CORBA::pk_long);
   u_members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   TAO_OutputCDR maker0;
   maker0.write_ulong (2);  // TWO
@@ -1545,9 +1388,7 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 
   u_members[3].name = CORBA::string_dup ("stringval");
   u_members[3].type_def =
-    this->repo_->create_string (17
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->create_string (17);
   u_members[3].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   u_members[3].label <<= CORBA::Any::from_octet (0);   // default case (ONE)
 
@@ -1556,17 +1397,13 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
                                "my_union",
                                "1.0",
                                d_var.in (),
-                               u_members
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               u_members);
 
   CORBA::TypeCode_var disc_tc =
-    u_var->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-   ACE_CHECK;
+    u_var->discriminator_type ();
 
   CORBA::ULong length =
-    disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    disc_tc->member_count ();
 
   if (this->debug_)
     {
@@ -1579,11 +1416,9 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 4);
 
-  CORBA::TypeCode_var tc = u_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var tc = u_var->type ();
 
-  length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  length = tc->member_count ();
 
   if (this->debug_)
     {
@@ -1594,8 +1429,7 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 3);
 
-  CORBA::Long slot = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Long slot = tc->default_index ();
 
   if (this->debug_)
     {
@@ -1611,9 +1445,7 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = tc->member_name (i
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      str = tc->member_name (i);
 
       if (this->debug_)
         {
@@ -1626,9 +1458,7 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
       // Multiple labels for first member shifts index by 1.
       ACE_ASSERT (ACE_OS::strcmp (str.in (), u_members[i + 1].name) == 0);
 
-      CORBA::Any_var label = tc->member_label (i
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var label = tc->member_label (i);
 
       TAO_InputCDR cdr (static_cast<ACE_Message_Block *> (0));
       CORBA::ULong val;
@@ -1668,16 +1498,13 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  s_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  d_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  u_var->destroy ();
+  s_var->destroy ();
+  d_var->destroy ();
 }
 
 void
-Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::exception_test (void)
 {
   if (this->debug_)
     {
@@ -1691,19 +1518,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   members.length (3);
 
   members[0].name = CORBA::string_dup ("ub_string");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string);
   members[0].type =
-    members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    members[0].type_def->type ();
 
   members[1].name = CORBA::string_dup ("bd_string");
-  members[1].type_def = this->repo_->create_string (5
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  members[1].type_def = this->repo_->create_string (5);
+  members[1].type = members[1].type_def->type ();
 
   CORBA::EnumMemberSeq e_members (2);
   e_members.length (2);
@@ -1716,29 +1537,22 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_enum ("IDL:my_enum:1.0",
                               "my_enum",
                               "1.0",
-                              e_members
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              e_members);
 
   members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
 
   members[2].type =
-    members[2].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    members[2].type_def->type ();
 
   CORBA::ExceptionDef_var exvar =
     this->repo_->create_exception ("IDL:my_exception:1.0",
                                    "my_exception",
                                    "1.0",
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   members);
 
-  CORBA::TypeCode_var tc = exvar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var tc = exvar->type ();
 
-  CORBA::ULong length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULong length = tc->member_count ();
 
   if (this->debug_)
     {
@@ -1754,8 +1568,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      str = tc->member_name (i);
 
       if (this->debug_)
         {
@@ -1769,8 +1582,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Contained::Description_var desc =
-    exvar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    exvar->describe ();
 
   CORBA::ExceptionDescription *ed;
   desc->value >>= ed;
@@ -1813,27 +1625,19 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long);
   members[0].type =
-    members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    members[0].type_def->type ();
 
   members[1].name = CORBA::string_dup ("array_mem");
   CORBA::ArrayDef_ptr a_ptr =
     this->repo_->create_array (5,
-                               members[0].type_def.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               members[0].type_def.in ());
   members[1].type_def = a_ptr;
   members[1].type =
-    members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    members[1].type_def->type ();
 
-  exvar->members (members
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  exvar->members (members);
 
   if (this->debug_)
     {
@@ -1850,13 +1654,10 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::EnumDef_var e_def_var = exvar->create_enum ("IDL:my_def_enum:1.0",
                                                      "my_enum",
                                                      "1.0",
-                                                     def_members
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                     def_members);
 
   CORBA::StructMemberSeq_var out_members =
-    exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    exvar->members ();
 
   length = out_members->length ();
   int cmp_result = 0;
@@ -1883,8 +1684,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  a_ptr->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  a_ptr->destroy ();
 
   if (this->debug_)
     {
@@ -1892,8 +1692,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                   ACE_TEXT ("\nArrayDef::destroy\n\n")));
     }
 
-  out_members = exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  out_members = exvar->members ();
   length = out_members->length ();
 
   for (i = 0; i < length; ++i)
@@ -1920,12 +1719,9 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum"
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum");
 
-  str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = fox->absolute_name ();
 
   if (this->debug_)
     {
@@ -1936,12 +1732,9 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (str.in (), "::my_exception::my_enum") == 0);
 
-  fox = exvar->lookup ("my_enum"
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  fox = exvar->lookup ("my_enum");
 
-  str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = fox->absolute_name ();
 
   if (this->debug_)
     {
@@ -1954,9 +1747,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::ContainedSeq_var contents =
     this->repo_->contents (CORBA::dk_all,
-                           0
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           0);
 
   length = contents->length ();
 
@@ -1970,9 +1761,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (length == 2);
 
   contents = exvar->contents (CORBA::dk_all,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              0);
 
   length = contents->length ();
 
@@ -1987,8 +1776,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = contents[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -2007,9 +1795,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   contents = this->repo_->lookup_name ("my_enum",
                                        -1,
                                        CORBA::dk_all,
-                                       0
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                       0);
 
   length = contents->length ();
 
@@ -2024,8 +1810,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = contents[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -2043,9 +1828,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Container::DescriptionSeq_var cont_desc =
     this->repo_->describe_contents (CORBA::dk_all,
                                     0,
-                                    -1
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    -1);
 
   length = cont_desc->length ();
 
@@ -2069,8 +1852,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
           cont_desc[i].value >>= ed;
           CORBA::TypeCode_ptr tc = ed->type.in ();
 
-          length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          length = tc->member_count ();
 
           if (this->debug_)
             {
@@ -2099,8 +1881,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
           cont_desc[i].value >>= td;
           CORBA::TypeCode_ptr tc = td->type.in ();
 
-          length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          length = tc->member_count ();
 
           if (this->debug_)
             {
@@ -2126,9 +1907,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  exvar->name ("your_exception"
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  exvar->name ("your_exception");
 
   if (this->debug_)
     {
@@ -2137,17 +1916,14 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   contents = exvar->contents (CORBA::dk_all,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              0);
 
   length = contents->length ();
   const char *tmp = "::your_exception";
 
   for (i = 0; i < length; ++i)
     {
-      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = contents[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -2167,14 +1943,12 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (tmp);
 #endif /* ACE_NDEBUG */
 
-  e_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  exvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  e_var->destroy ();
+  exvar->destroy ();
 }
 
 void
-Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::constant_test (void)
 {
   if (this->debug_)
     {
@@ -2185,9 +1959,7 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::IDLType_var ivar =
-    this->repo_->get_primitive (CORBA::pk_string
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->get_primitive (CORBA::pk_string);
 
   CORBA::Any any;
   const char *s = "hello";
@@ -2198,14 +1970,10 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
                                   "my_constant",
                                   "1.0",
                                   ivar.in (),
-                                  any
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  any);
 
-  CORBA::TypeCode_var tc = cvar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var tc = cvar->type ();
+  CORBA::TCKind kind = tc->kind ();
 
   if (this->debug_)
     {
@@ -2217,11 +1985,9 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (kind == CORBA::tk_string);
 
   CORBA::IDLType_var tdef =
-    cvar->type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    cvar->type_def ();
   CORBA::DefinitionKind def_kind =
-    tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    tdef->def_kind ();
 
   if (this->debug_)
     {
@@ -2233,8 +1999,7 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (def_kind == CORBA::dk_Primitive);
 
   CORBA::Any_var out_any;
-  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  out_any = cvar->value ();
 
   const char *out_s;
   out_any >>= out_s;
@@ -2248,18 +2013,12 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (ACE_OS::strcmp (out_s, s) == 0);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_double
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  cvar->type_def (ivar.in ()
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ivar = this->repo_->get_primitive (CORBA::pk_double);
+  cvar->type_def (ivar.in ());
 
   CORBA::Double double_val = -1223.42256;
   any <<= double_val;
-  cvar->value (any
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  cvar->value (any);
 
   if (this->debug_)
     {
@@ -2268,8 +2027,7 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
                   ACE_TEXT ("ConstantDef::value (set)\n")));
     }
 
-  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  out_any = cvar->value ();
 
   CORBA::Double out_double_val;
   out_any >>= out_double_val;
@@ -2283,10 +2041,8 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (out_double_val == double_val);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_short
-                                     ACE_ENV_ARG_PARAMETER);
-  cvar->type_def (ivar.in ()
-                  ACE_ENV_ARG_PARAMETER);
+  ivar = this->repo_->get_primitive (CORBA::pk_short);
+  cvar->type_def (ivar.in ());
 
   if (this->debug_)
     {
@@ -2298,11 +2054,8 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Short short_val = -65;
   any <<= short_val;
 
-  cvar->value (any
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  cvar->value (any);
+  out_any = cvar->value ();
 
   CORBA::Short out_short_val;
   out_any >>= out_short_val;
@@ -2316,12 +2069,8 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (out_short_val == short_val);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_float
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  cvar->type_def (ivar.in ()
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ivar = this->repo_->get_primitive (CORBA::pk_float);
+  cvar->type_def (ivar.in ());
 
   if (this->debug_)
     {
@@ -2333,11 +2082,8 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Float float_val = 2.33f;
   any <<= float_val;
 
-  cvar->value (any
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  cvar->value (any);
+  out_any = cvar->value ();
 
   CORBA::Float out_float_val;
   out_any >>= out_float_val;
@@ -2351,12 +2097,8 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (out_float_val == float_val);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_ulonglong
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  cvar->type_def (ivar.in ()
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ivar = this->repo_->get_primitive (CORBA::pk_ulonglong);
+  cvar->type_def (ivar.in ());
 
   if (this->debug_)
     {
@@ -2368,11 +2110,8 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::ULongLong ull_val = 1234567890;
   any <<= ull_val;
 
-  cvar->value (any
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  cvar->value (any);
+  out_any = cvar->value ();
 
   CORBA::ULongLong out_ull_val;
   out_any >>= out_ull_val;
@@ -2392,12 +2131,11 @@ Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
     }
   ACE_ASSERT (out_ull_val == ull_val);
 
-  cvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  cvar->destroy ();
 }
 
 void
-Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::interface_test (void)
 {
   if (this->debug_)
     {
@@ -2416,23 +2154,17 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_interface ("IDL:gp_iface:1.0",
                                    "gp_iface",
                                    "1.0",
-                                   in_bases
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   in_bases);
 
   CORBA::PrimitiveDef_var p_long =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->get_primitive (CORBA::pk_long);
 
   CORBA::AttributeDef_var gp_attr =
     gp_ivar->create_attribute ("IDL:gp_iface/gp_attr:1.0",
                                "gp_attr",
                                "1.0",
                                p_long.in (),
-                               CORBA::ATTR_NORMAL
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               CORBA::ATTR_NORMAL);
 
   in_bases.length (1);
   in_bases[0] = CORBA::InterfaceDef::_duplicate (gp_ivar.in ());
@@ -2441,22 +2173,17 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_interface ("IDL:p_iface:1.0",
                                    "p_iface",
                                    "1.0",
-                                   in_bases
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   in_bases);
 
   CORBA::StringDef_var p_string =
-    this->repo_->create_string (5 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->create_string (5);
 
   CORBA::AttributeDef_var p_attr =
     p_ivar->create_attribute ("IDL:p_iface/p_attr:1.0",
                               "p_attr",
                               "1.0",
                               p_string.in (),
-                              CORBA::ATTR_READONLY
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              CORBA::ATTR_READONLY);
 
   const char *names[] = {"inarg", "inoutarg", "outarg"};
 
@@ -2476,9 +2203,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_exception ("IDL:if_exception:1.0",
                                    "if_exception",
                                    "1.0",
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   members);
 
   CORBA::ExceptionDefSeq get_seq (1);
   get_seq.length (1);
@@ -2491,8 +2216,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
     {
       par_seq[i].name = names[i];
       par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ());
-      par_seq[i].type = p_long->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      par_seq[i].type = p_long->type ();
       par_seq[i].mode = modes[i];
       con_seq[i] = contexts[i];
     }
@@ -2505,13 +2229,10 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
                               CORBA::OP_NORMAL,
                               par_seq,
                               get_seq,
-                              con_seq
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              con_seq);
 
   CORBA::Contained::Description_var desc =
-    p_op->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    p_op->describe ();
 
   CORBA::OperationDescription *od;
   desc->value >>= od;
@@ -2527,8 +2248,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0") == 0);
 
   CORBA::TypeCode_var result = od->result;
-  CORBA::TCKind kind = result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = result->kind ();
 
   if (this->debug_)
     {
@@ -2581,9 +2301,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
       ACE_ASSERT (od->parameters[i].mode == modes[i]);
     }
 
-  CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0"
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0");
 
   if (this->debug_)
     {
@@ -2594,9 +2312,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (is_it == 1);
 
-  is_it = p_ivar->is_a ("IDL:gp_iface:1.0"
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  is_it = p_ivar->is_a ("IDL:gp_iface:1.0");
 
   if (this->debug_)
     {
@@ -2607,9 +2323,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (is_it == 1);
 
-  is_it = gp_ivar->is_a ("IDL:p_iface:1.0"
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  is_it = gp_ivar->is_a ("IDL:p_iface:1.0");
 
   if (this->debug_)
     {
@@ -2621,11 +2335,9 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (is_it == 0);
 
   CORBA::InterfaceDef::FullInterfaceDescription_var fifd =
-    p_ivar->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    p_ivar->describe_interface ();
 
-  CORBA::String_var str = fifd->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var str = fifd->type->id ();
 
   if (this->debug_)
     {
@@ -2723,12 +2435,9 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_interface ("IDL:iface:1.0",
                                    "iface",
                                    "1.0",
-                                   in_bases
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   in_bases);
 
-  desc = ivar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  desc = ivar->describe ();
 
   CORBA::InterfaceDescription *ifd;
   desc->value >>= ifd;
@@ -2762,8 +2471,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::InterfaceDefSeq_var out_bases =
-    ivar->base_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ivar->base_interfaces ();
 
   length = out_bases->length ();
 
@@ -2778,8 +2486,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = out_bases[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = out_bases[i]->name ();
 
       if (this->debug_)
         {
@@ -2793,9 +2500,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::ContainedSeq_var contents = ivar->contents (CORBA::dk_all,
-                                                     0
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                     0);
 
   length = contents->length ();
 
@@ -2810,8 +2515,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = contents[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = contents[i]->name ();
 
       if (this->debug_)
         {
@@ -2822,16 +2526,12 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
         }
 
       CORBA::Container_var cr =
-        contents[i]->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        contents[i]->defined_in ();
 
       CORBA::Contained_var cd =
-        CORBA::Contained::_narrow (cr.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        CORBA::Contained::_narrow (cr.in ());
 
-      str = cd->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = cd->name ();
 
       if (this->debug_)
         {
@@ -2846,18 +2546,14 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
                   || ACE_OS::strcmp (str.in (), "gp_iface") == 0);
     }
 
-  ex_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  gp_ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  p_ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ex_var->destroy ();
+  ivar->destroy ();
+  gp_ivar->destroy ();
+  p_ivar->destroy ();
 }
 
 void
-Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::move_test (void)
 {
   if (this->debug_)
     {
@@ -2877,9 +2573,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_enum ("IDL:o_enum:1.0",
                               "o_enum",
                               "1.0",
-                              e_members
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              e_members);
 
   e_members[0] = CORBA::string_dup ("TEN");
   e_members[1] = CORBA::string_dup ("ELEVEN");
@@ -2888,9 +2582,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_enum ("IDL:i_enum:1.0",
                               "i_enum",
                               "1.0",
-                              e_members
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              e_members);
 
   CORBA::StructMemberSeq s_members (2);
   s_members.length (2);
@@ -2899,26 +2591,20 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   s_members[0].name = s_names[0];
   s_members[0].type_def =
-    this->repo_->get_primitive (CORBA::pk_string
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->get_primitive (CORBA::pk_string);
   s_members[0].type =
-    s_members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    s_members[0].type_def->type ();
 
   s_members[1].name = s_names[1];
   s_members[1].type_def = CORBA::EnumDef::_duplicate (e_var2.in ());
   s_members[1].type =
-    s_members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    s_members[1].type_def->type ();
 
   CORBA::StructDef_var s_var =
     this->repo_->create_struct ("IDL:o_struct:1.0",
                                 "o_struct",
                                 "1.0",
-                                s_members
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                s_members);
 
   CORBA::UnionMemberSeq u_members (2);
   u_members.length (2);
@@ -2927,8 +2613,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   u_members[0].name = u_names[0];
   u_members[0].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
-  u_members[0].type = e_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  u_members[0].type = e_var->type ();
   CORBA::Long label = 0;
   CORBA::Any any;
   any <<= label;
@@ -2936,29 +2621,23 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   u_members[1].name = u_names[1];
   u_members[1].type_def = CORBA::StructDef::_duplicate (s_var.in ());
-  u_members[1].type = s_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  u_members[1].type = s_var->type ();
   label = 1;
   any <<= label;
   u_members[1].label = any;
 
   CORBA::PrimitiveDef_var d_var =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->get_primitive (CORBA::pk_long);
 
   CORBA::UnionDef_var u_var =
     this->repo_->create_union ("IDL:the_union:1.0",
                                "the_union",
                                "1.0",
                                d_var.in (),
-                               u_members
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               u_members);
 
   CORBA::UnionMemberSeq_var out_u_members =
-    u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    u_var->members ();
 
   CORBA::ULong length = out_u_members->length ();
 
@@ -2991,9 +2670,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::ContainedSeq_var out_contents =
     u_var->contents (CORBA::dk_all,
-                     1
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                     1);
 
   length = out_contents->length ();
 
@@ -3008,9 +2685,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   e_var->move (u_var.in (),
                u_names[0],
-               "1.0"
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+               "1.0");
 
   if (this->debug_)
     {
@@ -3018,8 +2693,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
                   ACE_TEXT ("\nEnumDef::move (into union)\n")));
     }
 
-  out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  out_u_members = u_var->members ();
 
   length = out_u_members->length ();
 
@@ -3055,9 +2729,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   out_contents = u_var->contents (CORBA::dk_all,
-                                  1
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  1);
 
   length = out_contents->length ();
 
@@ -3074,8 +2746,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = out_contents[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -3095,15 +2766,11 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   e_var2->move (s_var.in (),
                 s_names[1],
-                "1.0"
-                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                "1.0");
 
   s_var->move (u_var.in (),
                u_names[1],
-               "1.0"
-                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+               "1.0");
 
   if (this->debug_)
     {
@@ -3113,9 +2780,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   out_contents = this->repo_->contents (CORBA::dk_all,
-                                        1
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        1);
 
   length = out_contents->length ();
 
@@ -3128,8 +2793,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 1);
 
-  out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  out_u_members = u_var->members ();
 
   length = out_u_members->length ();
 
@@ -3158,9 +2822,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   out_contents = u_var->contents (CORBA::dk_all,
-                                  1
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  1);
 
   length = out_contents->length ();
 
@@ -3179,8 +2841,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = out_contents[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -3197,16 +2858,12 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
       if (i == 1)
         {
-          s_tmp = CORBA::StructDef::_narrow (out_contents[i]
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          s_tmp = CORBA::StructDef::_narrow (out_contents[i]);
         }
     }
 
   out_contents = s_tmp->contents (CORBA::dk_all,
-                                  0
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  0);
 
   length = out_contents->length ();
 
@@ -3223,8 +2880,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = out_contents[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -3246,8 +2902,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 #endif /* ACE_NDEBUG */
 
   CORBA::StructMemberSeq_var out_s_members =
-    s_tmp->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    s_tmp->members ();
 
   length = out_s_members->length ();
 
@@ -3275,12 +2930,11 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
       ACE_ASSERT (ACE_OS::strcmp (tmp, s_names[i]) == 0);
    }
 
-  u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  u_var->destroy ();
 }
 
 void
-Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
+Admin_Client::module_test (void)
 {
   if (this->debug_)
     {
@@ -3293,23 +2947,17 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::ModuleDef_var outer =
     this->repo_->create_module ("IDL:outer:1.0",
                                 "outer",
-                                "1.0"
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "1.0");
 
   CORBA::ModuleDef_var middle =
     outer->create_module ("IDL:outer/middle:1.0",
                           "middle",
-                          "1.0"
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          "1.0");
 
   CORBA::ModuleDef_var inner =
     middle->create_module ("IDL:outer/middle/inner:1.0",
                            "inner",
-                           "1.0"
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           "1.0");
 
   CORBA::InterfaceDefSeq in_bases (1);
   in_bases.length (0);
@@ -3318,9 +2966,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
     outer->create_interface ("IDL:p_iface:1.0",
                              "p_iface",
                              "1.0",
-                             in_bases
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                             in_bases);
 
   in_bases.length (1);
   in_bases[0] = CORBA::InterfaceDef::_duplicate (p_iface.in ());
@@ -3329,27 +2975,19 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
     inner->create_interface ("IDL:iface:1.0",
                              "iface",
                              "1.0",
-                             in_bases
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                             in_bases);
 
   CORBA::PrimitiveDef_var p_void =
-    this->repo_->get_primitive (CORBA::pk_void
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->get_primitive (CORBA::pk_void);
   CORBA::PrimitiveDef_var p_long =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->repo_->get_primitive (CORBA::pk_long);
 
   CORBA::AttributeDef_var attr =
     p_iface->create_attribute ("IDL:iface/attr:1.0",
                                "attr",
                                "1.0",
                                p_void.in (),
-                               CORBA::ATTR_NORMAL
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               CORBA::ATTR_NORMAL);
 
   CORBA::ULong length = 3;
   CORBA::ULong i = 0;
@@ -3367,8 +3005,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
     {
       par_seq[i].name = p_names[i];
       par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ());
-      par_seq[i].type = p_long->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      par_seq[i].type = p_long->type ();
       par_seq[i].mode = static_cast<CORBA::ParameterMode> (i);
 
       con_seq[i] = contexts[i];
@@ -3381,9 +3018,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_exception ("IDL:if_exception:1.0",
                                    "if_exception",
                                    "1.0",
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   members);
 
   CORBA::ExceptionDefSeq get_seq (1);
   get_seq.length (1);
@@ -3397,19 +3032,14 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
                              CORBA::OP_NORMAL,
                              par_seq,
                              get_seq,
-                             con_seq
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                             con_seq);
 
   CORBA::String_var str;
 
   CORBA::Contained_var result =
-    inner->lookup ("::outer::middle::inner::iface::op"
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    inner->lookup ("::outer::middle::inner::iface::op");
 
-  str = result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = result->absolute_name ();
 
   if (this->debug_)
     {
@@ -3425,12 +3055,9 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (cmp_result == 0);
 
-  result = middle->lookup ("inner::iface::op"
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  result = middle->lookup ("inner::iface::op");
 
-  str = result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  str = result->absolute_name ();
 
   if (this->debug_)
     {
@@ -3450,9 +3077,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->lookup_name ("op",
                               -1,
                               CORBA::dk_all,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              0);
 
   length = cseq->length ();
 
@@ -3467,8 +3092,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = cseq[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -3489,9 +3113,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
   cseq = middle->lookup_name ("attr",
                               3,
                               CORBA::dk_Attribute,
-                              0
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              0);
 
   length = cseq->length ();
 
@@ -3506,8 +3128,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = cseq[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -3524,9 +3145,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
 
   iface->move (outer.in (),
                "iface",
-               "1.0"
-               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+               "1.0");
 
   if (this->debug_)
     {
@@ -3537,9 +3156,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
   cseq = this->repo_->lookup_name ("op",
                                    -1,
                                    CORBA::dk_all,
-                                   0
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   0);
 
   length = cseq->length ();
 
@@ -3554,8 +3171,7 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      str = cseq[i]->absolute_name ();
 
       if (this->debug_)
         {
@@ -3570,8 +3186,6 @@ Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
       ACE_ASSERT (ACE_OS::strcmp (str.in (), "::outer::iface::op") == 0);
     }
 
-  ex_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  outer->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ex_var->destroy ();
+  outer->destroy ();
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
index 2c478800c52..51fd0283640 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
@@ -50,24 +50,24 @@ public:
   // Execute test code.
 
 private:
-  void array_test (ACE_ENV_SINGLE_ARG_DECL);
-  void enum_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void alias_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void native_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void struct_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void union_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void exception_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void constant_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void interface_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void move_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void module_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void array_test (void);
+  void enum_test (void);
+  void alias_test (void);
+  void native_test (void);
+  void struct_test (void);
+  void union_test (void);
+  void exception_test (void);
+  void constant_test (void);
+  void interface_test (void);
+  void move_test (void);
+  void module_test (void);
   // The various IFR tests.
 
   int parse_args (int argc,
                   char *argv[]);
   // Process the command line arguments.
 
-  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(void);
   // Array of pointers to the test functions.
 
   static const char *test_names_[];
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index c29daa4ff2a..a251edf0f60 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -7,8 +7,8 @@
 #include "ace/Stats.h"
 #include "ace/Sample_History.h"
 
-ACE_RCSID (Latency_Test, 
-           Latency_Query_Client, 
+ACE_RCSID (Latency_Test,
+           Latency_Query_Client,
            "$Id$")
 
 const CORBA::ULong DEFAULT_NUMCALLS = 20000;
@@ -28,13 +28,11 @@ int
 Latency_Query_Client::init (int argc,
                             char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       int retval = this->parse_args (argc,
                                      argv);
@@ -45,9 +43,7 @@ Latency_Query_Client::init (int argc,
         }
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("InterfaceRepository"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("InterfaceRepository");
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -60,9 +56,7 @@ Latency_Query_Client::init (int argc,
         }
 
       this->repo_ =
-        CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::Repository::_narrow (object.in ());
 
       if (CORBA::is_nil (this->repo_.in ()))
         {
@@ -71,21 +65,18 @@ Latency_Query_Client::init (int argc,
                             -1);
         }
 
-      retval = this->populate_ifr (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = this->populate_ifr ();
 
       if (retval != 0)
         {
           return retval;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Latency_Query_Client::init:");
+      ex._tao_print_exception ("Latency_Query_Client::init:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -96,12 +87,11 @@ Latency_Query_Client::run (void)
 //  CORBA::DefinitionKind dk;
   CORBA::AttributeMode am;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       for (int j = 0; j < 100; ++j)
         {
-          am = this->attr_->mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          am = this->attr_->mode ();
 
           if (am != CORBA::ATTR_NORMAL)
             {
@@ -116,8 +106,7 @@ Latency_Query_Client::run (void)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          am = this->attr_->mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          am = this->attr_->mode ();
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -127,12 +116,12 @@ Latency_Query_Client::run (void)
 
       if (this->debug_)
         {
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "test finished\n"));
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "High resolution timer calibration...."));
           ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "done\n"));
 
           if (this->do_dump_history_)
@@ -144,19 +133,17 @@ Latency_Query_Client::run (void)
           history.collect_basic_stats (stats);
           stats.dump_results ("Total", gsf);
 
-          ACE_Throughput_Stats::dump_throughput ("Total", 
+          ACE_Throughput_Stats::dump_throughput ("Total",
 											                           gsf,
                                                  test_end - test_start,
                                                  stats.samples_count ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                          "Latency_Query_Client::run:");
+      ex._tao_print_exception ("Latency_Query_Client::run:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -176,10 +163,10 @@ Latency_Query_Client::parse_args (int argc,
         case 'd':
           this->debug_ = true;
           break;
-        case 'h': 
+        case 'h':
           this->do_dump_history_ = true;
           break;
-        case 'i': 
+        case 'i':
           result = ACE_OS::atoi (opts.opt_arg ());
 
           if (result > 0)
@@ -204,17 +191,13 @@ Latency_Query_Client::parse_args (int argc,
 }
 
 int
-Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
+Latency_Query_Client::populate_ifr (void)
 {
-  CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0"
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0");
 
   if (! CORBA::is_nil (irobj.in ()))
     {
-      this->attr_ = CORBA::AttributeDef::_narrow (irobj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->attr_ = CORBA::AttributeDef::_narrow (irobj.in ());
 
       if (CORBA::is_nil (this->attr_.in ()))
         {
@@ -234,23 +217,17 @@ Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
     this->repo_->create_interface ("IDL:dummy:1.0",
                                    "dummy",
                                    "1.0",
-                                   in_bases
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                   in_bases);
 
   CORBA::PrimitiveDef_var p_long =
-    this->repo_->get_primitive (CORBA::pk_long
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->repo_->get_primitive (CORBA::pk_long);
 
   this->attr_ =
     iface->create_attribute ("IDL:dummt/attr:1.0",
                              "attr",
                              "1.0",
                              p_long.in (),
-                             CORBA::ATTR_NORMAL
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                             CORBA::ATTR_NORMAL);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
index fa223454637..1400b2bd059 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
@@ -48,7 +48,7 @@ private:
                   char *argv[]);
   // Process the command line arguments.
 
-  int populate_ifr (ACE_ENV_SINGLE_ARG_DECL);
+  int populate_ifr (void);
   // Put in something to query about.
 
 private:
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index 10146a9a882..0461fce43bb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -21,13 +21,11 @@ int
 Ptest::init (int argc,
                     char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       int retval = this->parse_args (argc,
                                      argv);
@@ -36,9 +34,7 @@ Ptest::init (int argc,
         return retval;
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("InterfaceRepository"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("InterfaceRepository");
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -51,9 +47,7 @@ Ptest::init (int argc,
         }
 
       this->repo_ =
-        CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::Repository::_narrow (object.in ());
 
       if (CORBA::is_nil (this->repo_.in ()))
         {
@@ -62,13 +56,11 @@ Ptest::init (int argc,
                             -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Ptest::init");
+      ex._tao_print_exception ("Ptest::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -76,27 +68,22 @@ Ptest::init (int argc,
 int
 Ptest::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (this->query_ == 1)
         {
-          this->query (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->query ();
         }
       else
         {
-          this->populate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->populate ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Ptest::run");
+      ex._tao_print_exception ("Ptest::run");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -132,7 +119,7 @@ Ptest::parse_args (int argc,
 }
 
 void
-Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
+Ptest::populate (void)
 {
   if (this->debug_)
     {
@@ -145,27 +132,19 @@ Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::StructMemberSeq members (2);
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long);
+  members[0].type = members[0].type_def->type ();
 
   members[1].name = CORBA::string_dup ("array_mem");
   members[1].type_def = this->repo_->create_array (5,
-                                                   members[0].type_def.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+                                                   members[0].type_def.in ());
+  members[1].type = members[1].type_def->type ();
 
 
   CORBA::StructDef_var svar = this->repo_->create_struct ("IDL:my_struct:1.0",
                                                           "my_struct",
                                                           "1.0",
-                                                          members
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                          members);
 
   CORBA::EnumMemberSeq def_members (2);
   def_members.length (2);
@@ -176,13 +155,11 @@ Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::EnumDef_var e_def_var = svar->create_enum ("IDL:my_def_enum:1.0",
                                                     "my_enum",
                                                     "1.0",
-                                                    def_members
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                    def_members);
 }
 
 void
-Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
+Ptest::query (void)
 {
   if (this->debug_)
     {
@@ -199,11 +176,9 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
     "my_enum"
   };
 
-  CORBA::ContainedSeq_var contents = 
+  CORBA::ContainedSeq_var contents =
     this->repo_->contents (CORBA::dk_all,
-                           0
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           0);
 
   CORBA::ULong length = contents->length ();
 
@@ -219,15 +194,12 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::ULong i = 0;
 
   CORBA::StructDef_var svar =
-    CORBA::StructDef::_narrow (contents[i]
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::StructDef::_narrow (contents[i]);
 
   ACE_ASSERT (!CORBA::is_nil (svar.in ()));
 
   CORBA::StructMemberSeq_var out_members =
-    svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    svar->members ();
 
   length = out_members->length ();
 
@@ -265,6 +237,5 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (members);
 #endif /* ACE_NDEBUG */
 
-  svar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  svar->destroy ();
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
index bec1b5d88c7..89b64f0cbfc 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
@@ -50,8 +50,8 @@ public:
   // Execute test code.
 
 private:
-  void populate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void query (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void populate (void);
+  void query (void);
   // The two IFR tests.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
index a7b13988c33..d3a1efe5515 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -24,8 +24,7 @@ int main (int argc, char *argv [])
 {
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       NContextExt_Client_i client;
@@ -33,15 +32,13 @@ int main (int argc, char *argv [])
       if (client.init (argc, argv) != 0)
         return 1;
 
-      result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = client.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index 2f6f2d7ad72..47a07134c43 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -148,10 +148,10 @@ NContextExt_Client_i::get_name ()
 }
 
 int
-NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
+NContextExt_Client_i::run (void)
 {
 
-  ACE_TRY_EX (OuterBlock)
+  try
     {
       CosNaming::Name name;
 
@@ -163,30 +163,24 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 
       // Get the stringified form of the name
        CORBA::String_var str_name =
-        this->naming_context_->to_string (name
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (OuterBlock);
+        this->naming_context_->to_string (name);
 
       CORBA::Object_var factory_object;
 
-      ACE_TRY_EX (InnerBlock)
+      try
         {
           // Resolve the name using the stringified form of the name
           factory_object =
-            this->naming_context_->resolve_str (str_name.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (InnerBlock);
+            this->naming_context_->resolve_str (str_name.in ());
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+      catch (const CosNaming::NamingContext::NotFound&)
         {
         }
-      ACE_ENDTRY;
 
       // Narrow
       Web_Server::Iterator_Factory_var factory =
-        Web_Server::Iterator_Factory::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER);
+        Web_Server::Iterator_Factory::_narrow (factory_object.in ());
 
-      ACE_TRY_CHECK_EX (OuterBlock);
 
       // Create bindings
       CosNaming::BindingIterator_var iter;
@@ -194,16 +188,12 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 
       this->naming_context_->list (2,
                                    bindings_list.out (),
-                                   iter.out ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (OuterBlock);
+                                   iter.out ());
 
       // Convert the stringified name back as CosNaming::Name and print
       // them out.
       CosNaming::Name *nam =
-        this->naming_context_->to_name (str_name.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (OuterBlock);
+        this->naming_context_->to_name (str_name.in ());
 
       // Declare a CosNaming::Name variable and assign length to it.
       CosNaming::Name nm;
@@ -227,9 +217,7 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 
       CORBA::String_var url_string =
         this->naming_context_->to_url (address.in (),
-                                       obj_name.in()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (OuterBlock);
+                                       obj_name.in());
 
       if (this->view_ == 0)
         {
@@ -240,23 +228,21 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
                               url_string);
         }
     }
-  ACE_CATCH (CORBA::NO_MEMORY, ex)
+  catch (const CORBA::NO_MEMORY& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "A system exception oc client side");
+      ex._tao_print_exception ("A system exception oc client side");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "A system exception oc client side");
+      ex._tao_print_exception ("A system exception oc client side");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -267,8 +253,7 @@ NContextExt_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // First initialize the ORB, that will remove some arguments...
@@ -276,7 +261,7 @@ NContextExt_Client_i::init (int argc, char **argv)
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
+                         );
 
       // There must be at least one argument, the file that has to be
       // retrieved
@@ -285,8 +270,7 @@ NContextExt_Client_i::init (int argc, char **argv)
 
       // Get a reference to the Naming Service
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       if (CORBA::is_nil (naming_context_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -295,21 +279,18 @@ NContextExt_Client_i::init (int argc, char **argv)
 
       // Narrow to get the correct reference
       this->naming_context_ =
-        CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContextExt::_narrow (naming_context_object.in ());
 
       if (CORBA::is_nil (this->naming_context_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot narrow Naming Service\n"),
                           1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 930aeaf426a..422a144f817 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -39,7 +39,7 @@ class NContextExt_Client_i
   NContextExt_Client_i (void);
   ~NContextExt_Client_i (void);
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Execute the client example code.
 
   int init (int argc, char **argv);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index 0fc3f158fc1..47a13d574c1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -19,54 +19,48 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 char *
-Basic::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Basic::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
-Basic::remove_member (ACE_ENV_SINGLE_ARG_DECL)
+Basic::remove_member (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
       location[0].id = CORBA::string_dup (this->location_);
       this->lm_->remove_member (this->object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                location);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_));
 
     }
-  ACE_CATCH (PortableGroup::ObjectNotFound, ex)
+  catch (const PortableGroup::ObjectNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::MemberNotFound, ex)
+  catch (const PortableGroup::MemberNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying member\n");
+      ex._tao_print_exception ("Exception caught while destroying member\n");
     }
-  ACE_ENDTRY;
 
 }
 
 void
-Basic::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Basic::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
index 72a6aeb8977..9cfeea8e6ca 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h
@@ -27,13 +27,13 @@ public:
          CORBA::ORB_ptr orb,
          const char *loc);
 
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void remove_member (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void remove_member (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index f112c8a0af6..3c25251db36 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -17,25 +17,20 @@ LB_server::LB_server (int argc, char **argv)
 int
 LB_server::destroy (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->lm_->delete_object (this->fcid_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->lm_->delete_object (this->fcid_.in ());
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_->destroy (1, 1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying LB_server\n");
+      ex._tao_print_exception (
+        "Exception caught while destroying LB_server\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 1;
 
 }
@@ -79,43 +74,33 @@ LB_server::write_ior_to_file (const char *ior)
 int
 LB_server::start_orb_and_poa (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialise the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("LoadManager");
 
       this->lm_ =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->lm_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -123,13 +108,11 @@ LB_server::start_orb_and_poa (void)
                           1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised initialising ORB or POA");
+      ex._tao_print_exception ("Exception raised initialising ORB or POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -138,7 +121,7 @@ LB_server::start_orb_and_poa (void)
 int
 LB_server::create_object_group (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *repository_id = "IDL:Test/Basic:1.0";
 
@@ -157,24 +140,19 @@ LB_server::create_object_group (void)
 
       this->object_group_ = this->lm_->create_object (repository_id,
                                                       criteria,
-                                                      this->fcid_.out ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                      this->fcid_.out ());
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (this->object_group_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (this->object_group_.in ());
 
       this->write_ior_to_file (ior.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while creating object group");
+      ex._tao_print_exception (
+        "Exception raised while creating object group");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -183,11 +161,10 @@ LB_server::create_object_group (void)
 int
 LB_server::register_servant (Basic *servant, const char *loc)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Test::Basic_var basic =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       PortableGroup::Location location (1);
       location.length (1);
@@ -196,17 +173,13 @@ LB_server::register_servant (Basic *servant, const char *loc)
 
       this->lm_->add_member (this->object_group_.in (),
                              location,
-                             basic.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             basic.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while registering servant");
+      ex._tao_print_exception ("Exception raised while registering servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
index 3a588d90066..212ed2b2c70 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Basic_var basic =
-        Test::Basic::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Basic::_narrow (tmp.in ());
 
       if (CORBA::is_nil (basic.in ()))
         {
@@ -64,29 +61,23 @@ main (int argc, char *argv[])
       for (int i = 0; i < 5; i++)
         {
           CORBA::String_var the_string =
-            basic->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            basic->get_string ();
 
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client request handled by object at <%s>\n",
                       the_string.in ()));
 	}
 
-      basic->remove_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      basic->remove_member ();
 
-      basic->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      basic->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client.cpp:");
+      ex._tao_print_exception ("Exception caught in client.cpp:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index 68236f62685..426e83d82b1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -8,7 +8,7 @@ ACE_RCSID (Application_Controlled,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *location1 = "MyLocation 1";
       const char *location2 = "MyLocation 2";
@@ -91,8 +91,7 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      lb_server.orb ()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      lb_server.orb ()->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
@@ -100,13 +99,11 @@ main (int argc, char *argv[])
         return 1;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "lb_server exception");
+      ex._tao_print_exception ("lb_server exception");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 1c0798efa7e..988512a3743 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -16,8 +16,7 @@ CORBA::Object_ptr
 Factory::create_object (
     const char * /*type_id*/,
     const PortableGroup::Criteria & /*the_criteria*/,
-    PortableGroup::GenericFactory::FactoryCreationId_out fcid
-    ACE_ENV_ARG_DECL)
+    PortableGroup::GenericFactory::FactoryCreationId_out fcid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableGroup::NoFactory,
                    PortableGroup::ObjectNotCreated,
@@ -31,7 +30,6 @@ Factory::create_object (
 		    Simple,
 		    CORBA::NO_MEMORY ());
 
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var safe_servant = servant;
 
@@ -53,29 +51,24 @@ Factory::create_object (
   ACE_NEW_THROW_EX (my_fcid,
 		    PortableGroup::GenericFactory::FactoryCreationId,
 		    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   fcid = my_fcid;
 
   *my_fcid <<= tmp_fcid;
 
   this->poa_ =
-    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    servant->_default_POA ();
 
-  this->oid_ = this->poa_->servant_to_id (servant
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->oid_ = this->poa_->servant_to_id (servant);
 
-  return servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return servant->_this ();
 
 }
 
 void
 Factory::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
-      fcid
-    ACE_ENV_ARG_DECL)
+      fcid)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableGroup::ObjectNotFound))
 {
@@ -88,20 +81,18 @@ Factory::delete_object (
       if (this->factory_map_.find (my_fcid, entry) == 0)
         {
 	  if (this->factory_map_.unbind (my_fcid) != 0)
-	    ACE_THROW (CORBA::INTERNAL ());
+	    throw CORBA::INTERNAL ();
 	}
     }
   else
-    ACE_THROW (PortableGroup::ObjectNotFound ());
+    throw PortableGroup::ObjectNotFound ();
 
   if (my_fcid == this->fcid_)
     {
-      this->poa_->deactivate_object (this->oid_.in ()
-		                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->poa_->deactivate_object (this->oid_.in ());
     }
   else
     {
-      ACE_THROW (PortableGroup::ObjectNotFound ());
+      throw PortableGroup::ObjectNotFound ();
     }
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
index 68473814908..925b241a31e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h
@@ -31,8 +31,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::NoFactory,
                      PortableGroup::ObjectNotCreated,
@@ -46,8 +45,7 @@ public:
 
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        factory_creation_id)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableGroup::ObjectNotFound));
 private:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index fef78510c70..d51850a5df6 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -24,22 +24,19 @@ LB_server::orb (void)
 int
 LB_server::run (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Time_Value period (0, 10);
       while (1)
 	{
           this->orb_->perform_work (&period);
-          ACE_TRY_CHECK;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while running LB_server\n");
+      ex._tao_print_exception ("Exception caught while running LB_server\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 1;
 
 }
@@ -48,25 +45,20 @@ LB_server::run (void)
 int
 LB_server::destroy (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->lm_->delete_object (this->fcid_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->lm_->delete_object (this->fcid_.in ());
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_->destroy (1, 1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying LB_server\n");
+      ex._tao_print_exception (
+        "Exception caught while destroying LB_server\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 1;
 
 }
@@ -92,43 +84,33 @@ LB_server::write_ior_to_file (const char *ior)
 int
 LB_server::start_orb_and_poa (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialise the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("LoadManager");
 
       this->lm_ =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->lm_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -136,13 +118,11 @@ LB_server::start_orb_and_poa (void)
                           1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised initialising ORB or POA");
+      ex._tao_print_exception ("Exception raised initialising ORB or POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -151,7 +131,7 @@ LB_server::start_orb_and_poa (void)
 int
 LB_server::create_object_group (const char *loc_1, const char *loc_2)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *repository_id = "IDL:Test/Simple:1.0";
 
@@ -159,12 +139,10 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
       Factory factory_object2;
 
       PortableGroup::GenericFactory_var factory_obj1 =
-        factory_object1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory_object1._this ();
 
       PortableGroup::GenericFactory_var factory_obj2 =
-        factory_object2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory_object2._this ();
 
       PortableGroup::FactoriesValue  factory_infos;
       factory_infos.length (2);
@@ -224,25 +202,20 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
 
       this->object_group_ = this->lm_->create_object (repository_id,
                                                       criteria,
-                                                      this->fcid_.out ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                      this->fcid_.out ());
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (this->object_group_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (this->object_group_.in ());
 
       this->write_ior_to_file (ior.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while creating object group");
+      ex._tao_print_exception (
+        "Exception raised while creating object group");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
index a4de93fd1b0..cd173291fe0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp
@@ -11,7 +11,7 @@ Simple::Simple (void)
 }
 
 char *
-Simple::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO Load Balancing Works!");
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
index 7eb93b15f5c..d8767be2696 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h
@@ -20,7 +20,7 @@ public:
   Simple (void);
   /// Constructor
 
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index 8a85b412846..6d9c534531c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -38,22 +38,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Simple_var simple =
-        Test::Simple::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Simple::_narrow (tmp.in ());
 
       if (CORBA::is_nil (simple.in ()))
         {
@@ -64,23 +61,19 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        simple->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        simple->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client.cpp:");
+      ex._tao_print_exception ("Exception caught in client.cpp:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index b858c9947a5..b776dcc513a 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -21,61 +21,55 @@ Basic::Basic (CORBA::Object_ptr object_group,
 }
 
 CORBA::Short
-Basic::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Basic::number (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 char *
-Basic::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Basic::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
-Basic::remove_member (ACE_ENV_SINGLE_ARG_DECL)
+Basic::remove_member (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
       location[0].id = CORBA::string_dup (this->location_);
       this->lm_->remove_member (this->object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                location);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_));
 
     }
-  ACE_CATCH (PortableGroup::ObjectNotFound, ex)
+  catch (const PortableGroup::ObjectNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::MemberNotFound, ex)
+  catch (const PortableGroup::MemberNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying member\n");
+      ex._tao_print_exception ("Exception caught while destroying member\n");
     }
-  ACE_ENDTRY;
 
 }
 
 void
-Basic::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Basic::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
index ad2bb53be84..5f8a5eb3465 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h
@@ -26,16 +26,16 @@ public:
          CORBA::Short num,
          const char *loc);
 
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void remove_member (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void remove_member (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short number (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index 14c3fdcf727..897fcb345a1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -18,29 +18,22 @@ LB_server::LB_server (int argc, char **argv)
 int
 LB_server::destroy (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->lm_->delete_object (this->basic_fcid_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->lm_->delete_object (this->basic_fcid_.in ());
 
-      this->lm_->delete_object (this->simple_fcid_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->lm_->delete_object (this->simple_fcid_.in ());
 
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_->destroy (1, 1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying LB_server\n");
+      ex._tao_print_exception (
+        "Exception caught while destroying LB_server\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 1;
 
 }
@@ -72,43 +65,33 @@ LB_server::load_manager (void)
 int
 LB_server::start_orb_and_poa (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialise the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("LoadManager" ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("LoadManager");
 
       this->lm_ =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->lm_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -116,13 +99,11 @@ LB_server::start_orb_and_poa (void)
                           1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised initialising ORB or POA");
+      ex._tao_print_exception ("Exception raised initialising ORB or POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -131,7 +112,7 @@ LB_server::start_orb_and_poa (void)
 int
 LB_server::create_basic_object_group (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *repository_id = "IDL:Test/Basic:1.0";
 
@@ -150,23 +131,18 @@ LB_server::create_basic_object_group (void)
 
       this->basic_object_group_ = this->lm_->create_object (repository_id,
                                                             criteria,
-                                                            this->basic_fcid_.out ()
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                            this->basic_fcid_.out ());
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (this->basic_object_group_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (this->basic_object_group_.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while creating object group");
+      ex._tao_print_exception (
+        "Exception raised while creating object group");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -175,7 +151,7 @@ LB_server::create_basic_object_group (void)
 int
 LB_server::create_simple_object_group (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *repository_id = "IDL:Test/Simple:1.0";
 
@@ -194,23 +170,18 @@ LB_server::create_simple_object_group (void)
 
       this->simple_object_group_ = this->lm_->create_object (repository_id,
                                                              criteria,
-                                                             this->simple_fcid_.out ()
-                                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                             this->simple_fcid_.out ());
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (this->simple_object_group_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (this->simple_object_group_.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while creating object group");
+      ex._tao_print_exception (
+        "Exception raised while creating object group");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 
@@ -219,7 +190,7 @@ LB_server::create_simple_object_group (void)
 int
 LB_server::remove_basic_member (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
@@ -229,19 +200,15 @@ LB_server::remove_basic_member (void)
       const char *loc = "MyLocation 1";
 
       this->lm_->remove_member (this->basic_object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                location);
 
       printf("Removed Basic Member at location %s\n\n", loc);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while deleting servant");
+      ex._tao_print_exception ("Exception raised while deleting servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
@@ -249,7 +216,7 @@ LB_server::remove_basic_member (void)
 int
 LB_server::remove_simple_member (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
@@ -259,19 +226,15 @@ LB_server::remove_simple_member (void)
       const char *loc = "MyLocation 1";
 
       this->lm_->remove_member (this->simple_object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                location);
 
       printf("Removed Simple Member at location %s\n\n", loc);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while deleting servant");
+      ex._tao_print_exception ("Exception raised while deleting servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
@@ -279,11 +242,10 @@ LB_server::remove_simple_member (void)
 int
 LB_server::register_basic_servant (Basic *servant, const char *loc)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Test::Basic_var basic =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       PortableGroup::Location location (1);
       location.length (1);
@@ -292,22 +254,18 @@ LB_server::register_basic_servant (Basic *servant, const char *loc)
 
       this->lm_->add_member (this->basic_object_group_.in (),
                              location,
-                             basic.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             basic.in ());
 
       CORBA::Short number = 0;
-      number = servant->number (ACE_ENV_SINGLE_ARG_PARAMETER);
+      number = servant->number ();
 
       printf("Added Basic member %d at location %s\n", number, loc);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while registering servant");
+      ex._tao_print_exception ("Exception raised while registering servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
@@ -315,11 +273,10 @@ LB_server::register_basic_servant (Basic *servant, const char *loc)
 int
 LB_server::register_simple_servant (Simple *servant, const char *loc)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Test::Simple_var simple =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       PortableGroup::Location location (1);
       location.length (1);
@@ -328,22 +285,18 @@ LB_server::register_simple_servant (Simple *servant, const char *loc)
 
       this->lm_->add_member (this->simple_object_group_.in (),
                              location,
-                             simple.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             simple.in ());
 
       CORBA::Short number = 0;
-      number = servant->number (ACE_ENV_SINGLE_ARG_PARAMETER);
+      number = servant->number ();
 
       printf("Added Simple member %d at location %s\n", number, loc);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised while registering servant");
+      ex._tao_print_exception ("Exception raised while registering servant");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index 7949918ee73..ca076d4782c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -21,61 +21,55 @@ Simple::Simple (CORBA::Object_ptr object_group,
 }
 
 CORBA::Short
-Simple::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple::number (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 char *
-Simple::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->location_);
 }
 
 void
-Simple::remove_member (ACE_ENV_SINGLE_ARG_DECL)
+Simple::remove_member (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableGroup::Location location (1);
       location.length (1);
       location[0].id = CORBA::string_dup (this->location_);
       this->lm_->remove_member (this->object_group_.in (),
-                                location
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                location);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_));
 
     }
-  ACE_CATCH (PortableGroup::ObjectNotFound, ex)
+  catch (const PortableGroup::ObjectNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (PortableGroup::MemberNotFound, ex)
+  catch (const PortableGroup::MemberNotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Caught exception in remove_member");
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      ex._tao_print_exception ("Caught exception in remove_member");
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught while destroying member\n");
+      ex._tao_print_exception ("Exception caught while destroying member\n");
     }
-  ACE_ENDTRY;
 
 }
 
 void
-Simple::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
index 0a3d63efa23..5a274f26153 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h
@@ -28,16 +28,16 @@ public:
          CORBA::Short num,
          const char *loc);
 
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void remove_member (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void remove_member (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short number (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 4f4724ab6c6..942f5f24287 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (Manage_object_group,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char *location1 = "MyLocation 1";
 
@@ -111,8 +111,7 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      lb_server.orb ()->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      lb_server.orb ()->shutdown (0);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
@@ -120,13 +119,11 @@ main (int argc, char *argv[])
         return 1;
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "lb_server exception");
+      ex._tao_print_exception ("lb_server exception");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
index ccae399abb8..b82cd08bf98 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
@@ -40,15 +40,14 @@ parse_args (int argc, char *argv[])
 }
 
 void
-check_loads (const CosLoadBalancing::LoadList & loads
-             ACE_ENV_ARG_DECL)
+check_loads (const CosLoadBalancing::LoadList & loads)
 {
   if (loads.length () != 1)
     {
       ACE_ERROR ((LM_ERROR,
                   "ERROR: Load list length is not equal to one.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (loads[0].id != LOAD_ID
@@ -57,33 +56,26 @@ check_loads (const CosLoadBalancing::LoadList & loads
       ACE_ERROR ((LM_ERROR,
                   "ERROR: Returned load is not a CPU load.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       // Obtain a reference to the LoadManager.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("LoadManager"
-					 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("LoadManager");
 
       CosLoadBalancing::LoadManager_var lm =
-        CosLoadBalancing::LoadManager::_narrow (obj.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosLoadBalancing::LoadManager::_narrow (obj.in ());
 
       CosLoadBalancing::Location the_location (1);
       the_location.length (1);
@@ -102,15 +94,13 @@ main (int argc, char *argv[])
       // Try a few times until a load is capable of being retrieved.
       for (int i = 0; i < MAX_RETRIES && retrieved_load == 0; ++i)
         {
-          ACE_TRY_EX (foo)
+          try
             {
-              loads = lm->get_loads (the_location
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (foo);
+              loads = lm->get_loads (the_location);
 
               retrieved_load = 1;
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
               ACE_DEBUG ((LM_DEBUG, ".")); // Show some progress.
 
@@ -118,8 +108,6 @@ main (int argc, char *argv[])
               // LoadManager.
               ACE_OS::sleep (2);
             }
-          ACE_ENDTRY;
-          ACE_TRY_CHECK;
         }
 
       if (retrieved_load == 0)
@@ -131,48 +119,38 @@ main (int argc, char *argv[])
         ACE_DEBUG ((LM_INFO,
                     " DONE\n"));
 
-      ::check_loads (loads.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ::check_loads (loads.in ());
 
       // Attempt to get loads directly from the LoadMonitor.
       CosLoadBalancing::LoadMonitor_var monitor =
-        lm->get_load_monitor (the_location
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        lm->get_load_monitor (the_location);
 
       CosLoadBalancing::Location_var cpu_mon_location =
-        monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        monitor->the_location ();
 
       if (cpu_mon_location.in () != the_location)
         {
           ACE_ERROR ((LM_ERROR,
                       "ERROR: Mismatched CPU load monitor location\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       ACE_DEBUG ((LM_INFO,
                   "Retrieving loads directly from LoadMonitor ..."));
 
-      loads = monitor->loads (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      loads = monitor->loads ();
 
       ACE_DEBUG ((LM_INFO,
                   " DONE\n"));
 
-      ::check_loads (loads.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ::check_loads (loads.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "CPU Load Monitor test:");
+      ex._tao_print_exception ("CPU Load Monitor test:");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO, "CPU Load Monitor test passed.\n\n"));
 
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index d7123478053..2420a638b20 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -30,15 +30,12 @@ BasicLog_Test::~BasicLog_Test (void)
 int
 BasicLog_Test::init (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              "internet"
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              "internet");
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -49,8 +46,7 @@ BasicLog_Test::init (int argc, char *argv[])
         return -1;
 
       // Initialize the factory
-      int init_result = this->init_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int init_result = this->init_factory ();
 
       if (init_result != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,19 +54,18 @@ BasicLog_Test::init (int argc, char *argv[])
                            "services.\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      ex._tao_print_exception ("init");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_RETURN(0);
 
 }
 
 int
-BasicLog_Test::init_factory (ACE_ENV_SINGLE_ARG_DECL)
+BasicLog_Test::init_factory (void)
 {
 
   // Assumpting INS for finding LogServie
@@ -78,11 +73,9 @@ BasicLog_Test::init_factory (ACE_ENV_SINGLE_ARG_DECL)
   //CORBA::Object_var logging_obj = orb_->resolve_initial_references ("BasicLogFactory",
   //                                                         ACE_TRY_ENV);
 
-  this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->resolve_naming_service ();
 
-  this->resolve_basic_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->resolve_basic_factory ();
 
   /*
   if (TAO_debug_level > 0)
@@ -99,7 +92,7 @@ BasicLog_Test::init_factory (ACE_ENV_SINGLE_ARG_DECL)
 
   // Narrow the factory and check the success
   factory_ =
-    DsLogAdmin::BasicLogFactory::_narrow (logging_obj.in () ACE_ENV_ARG_PARAMETER);
+    DsLogAdmin::BasicLogFactory::_narrow (logging_obj.in ());
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -114,9 +107,7 @@ BasicLog_Test::init_factory (ACE_ENV_SINGLE_ARG_DECL)
   */
   // If debugging, get the factory's IOR
   CORBA::String_var str =
-    orb_->object_to_string (basicLog_.in()
-                            ACE_ENV_ARG_PARAMETER); //Init the Client
-  ACE_CHECK_RETURN (-1);
+    orb_->object_to_string (basicLog_.in()); //Init the Client
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -130,38 +121,36 @@ int
 BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize)
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
       DsLogAdmin::LogId id;
       basicLog_ = factory_->create(DsLogAdmin::wrap, maxSize, id);
       // @@ Krish, never use != 0 to compare a NIL object reference!!!
       ACE_ASSERT (!CORBA::is_nil (basicLog_.in ()));
-      ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "The logger id is %d\n",
                   id));
     }
-/*  ACE_CATCH(DsLogAdmin::NoResources, resourceX)
+/*  catch (const DsLogAdmin::NoResources& resourceX)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "no resources creating basic log.\n"),
                         -1);
     }
 */
-  ACE_CATCH(DsLogAdmin::InvalidThreshold, threshold)
+  catch (const DsLogAdmin::InvalidThreshold&)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "invalid threshold creating basic log.\n"),
                         -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,"test_CreateLog");
+      ex._tao_print_exception ("test_CreateLog");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Caught exception creating log.\n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   ACE_RETURN(0);
 }
@@ -169,7 +158,7 @@ BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize)
 int
 BasicLog_Test::test_LogAction ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       DsLogAdmin::LogId id = basicLog_->id ();
 
@@ -202,8 +191,7 @@ BasicLog_Test::test_LogAction ()
 #endif
 
       // make sure that it is full and when writing
-      this->write_records (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->write_records (0);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Wrote records instead should have thrown exception"));
@@ -211,7 +199,7 @@ BasicLog_Test::test_LogAction ()
       basicLog_->set_log_full_action (DsLogAdmin::wrap);
       ACE_ERROR_RETURN((LM_ERROR,"Testing log action halt failed\n"),-1);
     }
-  ACE_CATCH(DsLogAdmin::LogFull, xLogFull)
+  catch (const DsLogAdmin::LogFull&)
     {
       ACE_DEBUG ((LM_DEBUG,"Correctly caught exception LogFull\n"));
 
@@ -240,26 +228,23 @@ BasicLog_Test::test_LogAction ()
         ACE_ERROR_RETURN((LM_ERROR,
                           "Setting log full action to wrap failed\n"),-1);
 
-      ACE_TRY_EX (SECOND)
+      try
         {
-          int i = this->write_records (0 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (SECOND);
+          int i = this->write_records (0);
 
           ACE_DEBUG ((LM_DEBUG,"Test to wrap worked. %d written.\n",i));
         }
-      ACE_CATCH (DsLogAdmin::LogFull, xLogFull)
+      catch (const DsLogAdmin::LogFull&)
         {
           ACE_DEBUG ((LM_ERROR,"Caught exception LogFull.  Fail testing wrapping of the log.\n"));
           return -1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_LogAction");
+          ex._tao_print_exception ("test_LogAction");
           return -1;
         }
-      ACE_ENDTRY;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -286,8 +271,7 @@ int BasicLog_Test::display_records ()
 
 }
 */
-int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
 {
   CORBA::ULongLong numOfRecs = numberOfRecords;
   if (numOfRecs == 0)
@@ -363,43 +347,38 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords
 int
 BasicLog_Test::test_adminState()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   basicLog_->set_administrative_state(DsLogAdmin::locked);
-  ACE_TRY
+  try
     {
-      this->write_records(0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->write_records(0);
 
       ACE_ERROR_RETURN((LM_ERROR,"Setting administrative state to lock failed.  DsLogAdmin::LogLocked not thrown.\n"),-1);
 
     }
-  ACE_CATCH(DsLogAdmin::LogLocked, xLocked)
+  catch (const DsLogAdmin::LogLocked&)
     {
       ACE_DEBUG ((LM_DEBUG,"Setting administrative state to lock succeeded.  DsLogAdmin::LogLocked was caught.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       basicLog_->set_administrative_state(DsLogAdmin::unlocked);
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_adminState");
+      ex._tao_print_exception ("test_adminState");
       ACE_ERROR_RETURN((LM_ERROR,"Setting administrative state to lock failed. Exception throw.\n"),-1);
     }
-  ACE_ENDTRY;
 
   basicLog_->set_administrative_state(DsLogAdmin::unlocked);
-  ACE_TRY_EX(SECOND)
+  try
     {
-      this->write_records(0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SECOND);
+      this->write_records(0);
       ACE_DEBUG ((LM_DEBUG,"Setting administrative state to succeeded.  DsLogAdmin::LogLocked not thrown.\n"));
       ACE_RETURN(0);
 
     }
-  ACE_CATCH(DsLogAdmin::LogLocked, xLocked)
+  catch (const DsLogAdmin::LogLocked&)
     {
       ACE_DEBUG ((LM_DEBUG,"Setting administrative state to lock faild.  DsLogAdmin::LogLocked was caught.\n"));
     }
-  ACE_ENDTRY;
   ACE_RETURN(0);
 }
 
@@ -407,92 +386,82 @@ BasicLog_Test::test_adminState()
 int
 BasicLog_Test::test_logSize (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       basicLog_->set_max_size (1);
-      ACE_TRY_CHECK;
 
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Setting max size less than current size failed.\n"
                          "DsLogAdmin::InvalidParam not thrown.\n"),
                        -1);
     }
-  ACE_CATCH(DsLogAdmin::InvalidParam, xParam)
+  catch (const DsLogAdmin::InvalidParam&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Setting max size less than current size succeeded.\n"
                   "DsLogAdmin::InvalidParam caught.\n"));
     }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(SECOND)
+  try
     {
       basicLog_->set_max_size (10000);
 
       CORBA::ULongLong nrecords = basicLog_->get_n_records ();
-      int i = this->write_records (0 ACE_ENV_ARG_PARAMETER);
+      int i = this->write_records (0);
 
-      ACE_TRY_CHECK_EX (SECOND);
       ACE_DEBUG ((LM_DEBUG,
                   "Increasing max size succeeded. Old record count, %d."
                   "New record count, %d\n",
                   ACE_U64_TO_U32(nrecords),
                   i));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_logSize");
+      ex._tao_print_exception ("test_logSize");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Increasing max size failed. Exception thrown.\n"),
                         -1);
     }
-  ACE_ENDTRY;
   ACE_RETURN(0);
 }
 
 int
 BasicLog_Test::test_logCompaction(CORBA::ULong lifeExpectancy)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   CORBA::ULongLong old_n_records = basicLog_->get_n_records ();
   if (old_n_records <= 0)
     {
-      ACE_TRY
+      try
         {
-          this->write_records (0 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->write_records (0);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_logCompaction");
+          ex._tao_print_exception ("test_logCompaction");
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Caught exception trying to write records "
                              "for test_logCompaction.\n"),
                             -1);
         }
-      ACE_ENDTRY;
     }
 
   CORBA::ULong old_max_life = basicLog_->get_max_record_life ();
 
-  ACE_TRY_EX(SECOND)
+  try
     {
       basicLog_->set_max_record_life (lifeExpectancy);
       // @@: need to modify set_max_record_life
-      ACE_TRY_CHECK_EX (SECOND);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_logCompaction");
+      ex._tao_print_exception ("test_logCompaction");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Caught exception setting max record life "
                          "test_logCompaction.\n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   ACE_OS::sleep (lifeExpectancy + 1); // make sure the records have aged.
   CORBA::ULongLong new_n_records = basicLog_->get_n_records ();
@@ -567,56 +536,49 @@ BasicLog_Test::parse_args (int argc, char *argv[])
 }
 
 void
-BasicLog_Test::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+BasicLog_Test::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (naming_sevice_name_
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references (naming_sevice_name_);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
-BasicLog_Test::resolve_basic_factory (ACE_ENV_SINGLE_ARG_DECL)
+BasicLog_Test::resolve_basic_factory (void)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (basic_log_factory_name_);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_context_->resolve (name);
 
   this->factory_ =
-    DsLogAdmin::BasicLogFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    DsLogAdmin::BasicLogFactory::_narrow (obj.in ());
 }
 
 void
 BasicLog_Test::destroy_log()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (!CORBA::is_nil(basicLog_.in ()))
         {
-          basicLog_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          basicLog_->destroy ();
 
           basicLog_ = DsLogAdmin::BasicLog::_nil ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Destroying log");
+      ex._tao_print_exception ("Destroying log");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -626,28 +588,26 @@ BasicLog_Test::test_log_destroy (void)
   ACE_DEBUG ((LM_ERROR, "Testing destroy log\n"));
   this->basicLog_->destroy ();
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->write_records (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->write_records (1);
       ACE_DEBUG ((LM_INFO, "Wrote to log\n"));
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
       ACE_DEBUG ((LM_ERROR,
                   "Test of destroy log succeeded: "
                   "caught CORBA::OBJECT_NOT_EXIST exception.\n"));
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Destroying log");
+      ex._tao_print_exception ("Destroying log");
       ACE_DEBUG ((LM_ERROR,
                   "Test of destroy log failed: "
                   "caught unexpected exception.\n"));
       return -1;
     }
-  ACE_ENDTRY;
   ACE_ERROR_RETURN ((LM_ERROR,
                      "Test of destroy log failed: no exception thrown.\n"),
                     -1);
@@ -682,7 +642,6 @@ BasicLog_Test::test_week_mask (void)
 
 int BasicLog_Test::delete_records (CORBA::ULongLong /* numberOfRecords */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
 #ifndef ACE_LACKS_LONGLONG_T
   ACE_DEBUG ((LM_INFO,
@@ -703,7 +662,7 @@ int BasicLog_Test::delete_records (CORBA::ULongLong /* numberOfRecords */)
               ACE_U64_TO_U32 (nrecords)));
 
   CORBA::Long retVal =
-    basicLog_->delete_records ("EXTENDED_TCL", "id >= 0" ACE_ENV_ARG_PARAMETER);
+    basicLog_->delete_records ("EXTENDED_TCL", "id >= 0");
 
   ACE_DEBUG ((LM_DEBUG,
               "Number of records in Log after delete = %d\n",
@@ -741,48 +700,43 @@ BasicLog_Test::test_capacity_alarm_threshold (void)
 
   basicLog_->set_capacity_alarm_thresholds (list);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   list.length (1);
   list[0] = 200;
 
-  ACE_TRY
+  try
     {
       basicLog_->set_capacity_alarm_thresholds (list);
-      ACE_TRY_CHECK;
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Setting an invalid alarm threshold failed.  "
                          "DsLogAdmin::InvalidThreshold not thrown.\n"),
                         -1);
     }
-  ACE_CATCH(DsLogAdmin::InvalidThreshold, xParam)
+  catch (const DsLogAdmin::InvalidThreshold&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Setting an invalid alarm threshold succeeded.  "
                   "DsLogAdmin::InvalidThreshold caught.\n"));
     }
-  ACE_ENDTRY;
 
   list.length (2);
   list[0] = 70;
   list[1] = 20;
 
-  ACE_TRY_EX(SECOND)
+  try
     {
       basicLog_->set_capacity_alarm_thresholds (list);
-      ACE_TRY_CHECK_EX (SECOND);
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Setting an invalid alarm threshold failed.  "
                          "DsLogAdmin::InvalidThreshold not thrown.\n"),
                        -1);
     }
-  ACE_CATCH(DsLogAdmin::InvalidThreshold, xParam)
+  catch (const DsLogAdmin::InvalidThreshold&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Setting an invalid alarm threshold succeeded.  "
                   "DsLogAdmin::InvalidThreshold caught.\n"));
     }
-  ACE_ENDTRY;
 
   list.length (2);
   list[0] = 20;
@@ -796,7 +750,7 @@ BasicLog_Test::test_capacity_alarm_threshold (void)
               "The number of records is %d\n",
               ACE_U64_TO_U32(nrecords)));
 
-  this->write_records (0 ACE_ENV_ARG_PARAMETER);
+  this->write_records (0);
 
   return 0;
 
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index cde2e00f5a0..2948bc6de75 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -48,7 +48,7 @@ class BasicLog_Test
 
 int display_records ();
 
-int 
+int
 delete_records (CORBA::ULongLong numberOfRecords);
 
  int
@@ -111,21 +111,21 @@ private:
   BasicLog_Test& operator=(const BasicLog_Test&);
 
   int
-    init_factory (ACE_ENV_SINGLE_ARG_DECL);
+    init_factory (void);
 
   int
     parse_args(int argc, char *argv[]);
   // command line argument parser
 
-  int write_records(CORBA::ULongLong numberOfRecordsToWrite ACE_ENV_ARG_DECL_NOT_USED);
+  int write_records(CORBA::ULongLong numberOfRecordsToWrite);
   // writes enough records to fill the log. Default write enough to fill log. Hopefully, not infinite.
 
   void
-    resolve_basic_factory (ACE_ENV_SINGLE_ARG_DECL);
+    resolve_basic_factory (void);
   // resolve log factory
 
   void
-    resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+    resolve_naming_service (void);
   // resolve nameing service
 
   void
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index c9b304c57bd..1043b523d26 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -15,7 +15,7 @@ McastHello::McastHello (CORBA::ORB_ptr orb,
 }
 
 void
-McastHello::send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL_NOT_USED)
+McastHello::send_forty_two (CORBA::Long forty_two)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->small_request_status_ == 0 &&
@@ -28,7 +28,7 @@ McastHello::send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-McastHello::send_large_octet_array (const Test::Octets &payload ACE_ENV_ARG_DECL_NOT_USED)
+McastHello::send_large_octet_array (const Test::Octets &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean valid_payload = 1;
@@ -55,10 +55,10 @@ McastHello::send_large_octet_array (const Test::Octets &payload ACE_ENV_ARG_DECL
 }
 
 void
-McastHello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+McastHello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 CORBA::Boolean
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
index d0135f3ae55..09a94708ee8 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
@@ -18,18 +18,17 @@ public:
               int instance);
 
   // = The skeleton methods
-  virtual void send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL)
+  virtual void send_forty_two (CORBA::Long forty_two)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return whether all test requests have been received successfully.
   CORBA::Boolean get_status ();
 
   // Silence the builds
-  void send_large_octet_array (const Test::Octets &
-                               ACE_ENV_ARG_DECL_NOT_USED)
+  void send_large_octet_array (const Test::Octets &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index 10180538dbf..e707d2165ad 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -40,18 +40,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
 
       /* Do an unchecked narrow since there's no way to do an is_a on
@@ -71,8 +69,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      hello->send_forty_two (42 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->send_forty_two (42);
 
       Test::Octets payload (MAX_MIOP_OCTET_SEQUENCE);
       payload.length (MAX_MIOP_OCTET_SEQUENCE);
@@ -82,22 +79,17 @@ main (int argc, char *argv[])
           payload[j] = j % 256;
         }
 
-      hello->send_large_octet_array (payload ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->send_large_octet_array (payload);
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index ecf06638ce2..ab309c7fb80 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -52,19 +52,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableGroup::GOA_var root_poa =
-        PortableGroup::GOA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableGroup::GOA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,8 +69,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -83,8 +79,7 @@ main (int argc, char *argv[])
 
 
       CORBA::Object_var group1 =
-        orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior.in ());
 
       // Output the Group IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -97,32 +92,24 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       PortableServer::ObjectId_var id =
-        root_poa->create_id_for_reference (group1.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_for_reference (group1.in ());
 
       // Create and activate an instance of our servant.
       McastHello server_impl (orb.in (), 0);
 
       root_poa->activate_object_with_id (id.in (),
-                                         &server_impl
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         &server_impl);
 
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // Validate that our servants got the right requests.
       if (server_impl.get_status () == 0)
@@ -132,13 +119,11 @@ main (int argc, char *argv[])
       else
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - Success!\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index 08309efacca..d18ea21d273 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -67,7 +67,6 @@ AdminProperties_Task::svc (void)
 
  ACE_DEBUG ((LM_DEBUG, "\n1 supplier sending %d events...\n", event_count));
 
- ACE_DECLARE_NEW_CORBA_ENV;
 
  for (int i = 0 ; i < event_count; ++i)
    {
@@ -75,25 +74,24 @@ AdminProperties_Task::svc (void)
 
      event.remainder_of_body <<= (CORBA::Long)i;
 
-     ACE_TRY
+     try
         {
           ACE_DEBUG((LM_DEBUG, "+"));
-          this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->supplier_->send_event (event);
         }
-      ACE_CATCH (CORBA::IMP_LIMIT, impl_limit)
+      catch (const CORBA::IMP_LIMIT&)
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG, "\nEvent %d was not send due to Impl Limit reached\n", i));
 
           ++ this->client_->rejections_;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: Exception sending event\n");
+          ex._tao_print_exception (
+            "Error: Exception sending event\n");
           return 1;
         }
-      ACE_ENDTRY;
    }
 
 return 0;
@@ -109,7 +107,7 @@ AdminProperties_StructuredPushConsumer::AdminProperties_StructuredPushConsumer (
 
 void
 AdminProperties_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                                               )
   ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   ++events_received_;
@@ -215,7 +213,7 @@ AdminProperties::parse_args(int argc, char *argv[])
 }
 
 void
-AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL)
+AdminProperties::create_channel(bool reject)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
@@ -241,9 +239,7 @@ AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL)
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 
@@ -251,62 +247,48 @@ AdminProperties::create_channel(bool reject ACE_ENV_ARG_DECL)
   CosNotifyChannelAdmin::AdminID adminid;
 
   this->supplier_admin_ = ec_->new_for_suppliers (this->ifgop_,
-                                                  adminid
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ = ec_->new_for_consumers (this->ifgop_,
-                                                  adminid
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
 
 void
-AdminProperties::run_test (ACE_ENV_SINGLE_ARG_DECL)
+AdminProperties::run_test (void)
 {
   bool reject = true;
-  this->create_channel(reject ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->test_max_queue_length (reject ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->create_channel(reject);
+  this->test_max_queue_length (reject);
 
-  this->ec_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_->destroy();
 
   reject = false;
-  this->create_channel(reject ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->test_max_queue_length (reject ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->create_channel(reject);
+  this->test_max_queue_length (reject);
 
-   this->test_max_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+   this->test_max_clients ();
 
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->ec_->destroy ();
 }
 
 void
-AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL)
+AdminProperties::test_max_queue_length (bool reject)
 {
   // Create the consumer
   AdminProperties_StructuredPushConsumer *consumer;
   ACE_NEW (consumer, AdminProperties_StructuredPushConsumer (this));
-  consumer->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  consumer->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->init (root_poa_.in ());
+  consumer->connect (this->consumer_admin_.in ());
 
   // Create the supplier
   TAO_Notify_Tests_StructuredPushSupplier *supplier = 0;
   ACE_NEW (supplier, TAO_Notify_Tests_StructuredPushSupplier ());
-  supplier->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  supplier->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->init (root_poa_.in ());
+  supplier->connect (this->supplier_admin_.in ());
 
   AdminProperties_Task supplier_task;
 
@@ -322,17 +304,14 @@ AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL)
   // received. This relies on our use of -ORBClientConnectionHandler RW.
   supplier_task.wait ();
 
-  this->ORB_run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ORB_run();
 
   // consumer is destroyed by consumer->disconnect()
   CORBA::Long received_count = consumer->events_received_.value ();
 
   // disconnect the participants.
-  consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->disconnect ();
+  supplier->disconnect ();
 
   // If the reject_new_events setting == true, then the supplier should
   // have received an imp_limit exception for each event it tried to push
@@ -367,13 +346,11 @@ AdminProperties::test_max_queue_length (bool reject ACE_ENV_ARG_DECL)
 }
 
 void
-AdminProperties::test_max_clients (ACE_ENV_SINGLE_ARG_DECL)
+AdminProperties::test_max_clients (void)
 {
-  this->create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->create_suppliers ();
 
-  this->create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->create_consumers ();
 
   // check the results and print the assessment.
   if (this->consumers_connected_count_ > this->max_consumers_)
@@ -386,7 +363,7 @@ AdminProperties::test_max_clients (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+AdminProperties::create_suppliers (void)
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -395,7 +372,7 @@ AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 
   int index = 0;
 
-  ACE_TRY
+  try
     {
       TAO_Notify_Tests_StructuredPushSupplier *supplier;
 
@@ -403,31 +380,26 @@ AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_NEW (supplier,
                    TAO_Notify_Tests_StructuredPushSupplier ());
-          supplier->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          supplier->init (root_poa_.in ());
 
-          supplier->connect (this->supplier_admin_.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          supplier->connect (this->supplier_admin_.in ());
 
           this->suppliers_connected_count_++;
         }
     }
-  ACE_CATCH (CORBA::IMP_LIMIT, impl_limit)
+  catch (const CORBA::IMP_LIMIT&)
     {
       if (TAO_debug_level)
         ACE_DEBUG ((LM_DEBUG, "\nImpl Limit excpetion when connecting supplier\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "\nError: Exception in connecting supplier\n");
+      ex._tao_print_exception ("\nError: Exception in connecting supplier\n");
     }
-  ACE_ENDTRY;
 }
 
 void
-AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
+AdminProperties::create_consumers (void)
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -436,33 +408,30 @@ AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
 
   int index = 0;
 
-  ACE_TRY
+  try
     {
       TAO_Notify_Tests_StructuredPushConsumer *consumer;
 
       for (index = 0; index < this->consumers_; ++index)
         {
           ACE_NEW (consumer, TAO_Notify_Tests_StructuredPushConsumer ());
-          consumer->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer->init (root_poa_.in ());
 
-          consumer->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          consumer->connect (this->consumer_admin_.in ());
 
           this->consumers_connected_count_++;
         }
     }
-  ACE_CATCH (CORBA::IMP_LIMIT, impl_limit)
+  catch (const CORBA::IMP_LIMIT&)
     {
       if (TAO_debug_level)
         ACE_DEBUG ((LM_DEBUG, "\nImpl Limit exception when connecting consumer\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "\nError: Exception in connecting consumer \n");
+        ex._tao_print_exception (
+          "\nError: Exception in connecting consumer \n");
     }
-  ACE_ENDTRY;
 }
 
 /***************************************************************************/
@@ -472,19 +441,16 @@ main (int argc, char* argv[])
 {
   AdminProperties test;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      test.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test.init (argc, argv);
 
-      test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test.run_test ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 44abf483bf7..91f171853f5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -32,7 +32,6 @@ public:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      ACE_ENV_ARG_DECL
                                       )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -101,19 +100,19 @@ public:
 
   // Initialization.
 
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_test (void);
   // Run the test.
 
 private:
-  void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
-  void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
-  void create_channel(bool reject ACE_ENV_ARG_DECL);
+  void create_suppliers (void);
+  void create_consumers (void);
+  void create_channel(bool reject);
 
   /// Test MaxSuppliers and MaxConsumers
-  void test_max_clients (ACE_ENV_SINGLE_ARG_DECL);
+  void test_max_clients (void);
 
   /// Test MaxQueueLength properties
-  void test_max_queue_length (bool reject ACE_ENV_ARG_DECL);
+  void test_max_queue_length (bool reject);
 
   // Data Members
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index f3087187a05..bcbe39449ed 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -77,34 +77,26 @@ ConnectDisconnect::on_entity_destroyed (void)
 
 int
 ConnectDisconnect::init (int argc,
-                         char* argv []
-                         ACE_ENV_ARG_DECL)
+                         char* argv [])
 {
   // Initialize the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);;
+                            argv);
 
   // Create all participants.
-  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->create_EC ();
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   this->supplier_admin_ =
     ec_->new_for_suppliers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);;
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
     ec_->new_for_consumers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
@@ -188,21 +180,19 @@ ConnectDisconnect::parse_args(int argc, char *argv[])
 }
 
 void
-ConnectDisconnect::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+ConnectDisconnect::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
+ConnectDisconnect::run_test (void)
 {
   for (int iterations = 0; iterations < count_; ++iterations)
     {
@@ -214,33 +204,22 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
           ACE_NEW (this->any_consumer_[i],
                    CD_PushConsumer (this,
                                     i));
-          this->any_consumer_[i]->init (root_poa_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          this->any_consumer_[i]->connect (this->consumer_admin_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->any_consumer_[i]->init (root_poa_.in ());
+          this->any_consumer_[i]->connect (this->consumer_admin_.in ());
 
           // Create and connect Structured consumers.
           ACE_NEW (this->structured_consumer_[i],
                    CD_StructuredPushConsumer (this,
                                               i));
-          this->structured_consumer_[i]->init (root_poa_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          this->structured_consumer_[i]->connect (this->consumer_admin_.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->structured_consumer_[i]->init (root_poa_.in ());
+          this->structured_consumer_[i]->connect (this->consumer_admin_.in ());
 
           // Create and connect Sequence consumers.
           ACE_NEW (this->sequence_consumer_[i],
                    CD_SequencePushConsumer (this,
                                             i));
-          this->sequence_consumer_[i]->init (root_poa_.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          this->sequence_consumer_[i]->connect (this->consumer_admin_.in ()
-                                                ACE_ENV_ARG_PARAMETER);
+          this->sequence_consumer_[i]->init (root_poa_.in ());
+          this->sequence_consumer_[i]->connect (this->consumer_admin_.in ());
         }
 
       for (i = 0; i < this->suppliers_; ++i)
@@ -248,78 +227,56 @@ ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
           ACE_NEW (this->any_supplier_[i],
                    CD_PushSupplier (this,
                                     i));
-          this->any_supplier_[i]->init (root_poa_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          this->any_supplier_[i]->connect (this->supplier_admin_.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->any_supplier_[i]->init (root_poa_.in ());
+          this->any_supplier_[i]->connect (this->supplier_admin_.in ());
 
           // Create and connect Structured suppliers.
           ACE_NEW (this->structured_supplier_[i],
                    CD_StructuredPushSupplier (this,
                                               i));
-          this->structured_supplier_[i]->init (root_poa_.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          this->structured_supplier_[i]->connect (this->supplier_admin_.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->structured_supplier_[i]->init (root_poa_.in ());
+          this->structured_supplier_[i]->connect (this->supplier_admin_.in ());
 
           // Create and connect Sequence suppliers.
           ACE_NEW (this->sequence_supplier_[i],
                    CD_SequencePushSupplier (this,
                                             i));
-          this->sequence_supplier_[i]->init (root_poa_.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-          this->sequence_supplier_[i]->connect (this->supplier_admin_.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->sequence_supplier_[i]->init (root_poa_.in ());
+          this->sequence_supplier_[i]->connect (this->supplier_admin_.in ());
         }
 
       for (i = 0; i < this->consumers_; ++i)
         {
           // Disconnnect Any consumers.
-          this->any_consumer_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->any_consumer_[i]->disconnect ();
 
           // Disconnect Structured Consumers.
           this->structured_consumer_[i]->disconnect (
-                                             ACE_ENV_SINGLE_ARG_PARAMETER
                                            );
-          ACE_CHECK;
 
           // Disconnect Sequence Consumers.
           this->sequence_consumer_[i]->disconnect (
-                                         ACE_ENV_SINGLE_ARG_PARAMETER
                                      );
-          ACE_CHECK;
         }
 
       for (i = 0; i < this->suppliers_; ++i)
         {
           // Disconnnect Any suppliers.
-          this->any_supplier_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->any_supplier_[i]->disconnect ();
 
           // Disconnect Structured Suppliers.
           this->structured_supplier_[i]->disconnect (
-                                             ACE_ENV_SINGLE_ARG_PARAMETER
                                            );
-          ACE_CHECK;
 
           // Disconnect Sequence Suppliers.
           this->sequence_supplier_[i]->disconnect (
-                                           ACE_ENV_SINGLE_ARG_PARAMETER
                                          );
-          ACE_CHECK;
         }
     }
 }
 
 void
-ConnectDisconnect::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ConnectDisconnect::end_test (void)
 {
   consumer_done( 0 );
 }
@@ -340,9 +297,7 @@ ConnectDisconnect::check_results (void)
     }
 
   // Destroy the channel.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->ec_->destroy ();
 
   return 0;
 }
@@ -359,23 +314,19 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.init (argc, argv);
 
-      client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.run_test ();
 
-      client.end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.end_test ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return client.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index a08cd5dd3ad..d7900b95b72 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -73,21 +73,20 @@ public:
                   char *argv[]);
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // initialization.
 
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_test (void);
   // Run the test.
 
-  void end_test (ACE_ENV_SINGLE_ARG_DECL);
+  void end_test (void);
   // End the test.
 
   int check_results (void);
   // Check if we got the expected results.
 
 protected:
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create EC.
 
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 58d348d5859..788c8e2e44d 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -17,7 +17,6 @@ Event_StructuredPushConsumer::Event_StructuredPushConsumer (Events *test_client)
 void
 Event_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -58,34 +57,27 @@ Events::~Events (void)
 
 int
 Events::init (int argc,
-                   char* argv []
-                   ACE_ENV_ARG_DECL)
+                   char* argv [])
 {
   // Initialize the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            argv);
 
   // Create all participents.
-  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->create_EC ();
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   if (use_default_admin_ == 1)
     {
       this->supplier_admin_ =
-        this->ec_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->ec_->default_supplier_admin ();
     }
   else
     {
       this->supplier_admin_ =
         this->ec_->new_for_suppliers (this->ifgop_,
-                                      adminid
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                      adminid);
     }
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
@@ -93,16 +85,13 @@ Events::init (int argc,
   if (use_default_admin_ == 1)
     {
       this->consumer_admin_ =
-        this->ec_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->ec_->default_consumer_admin ();
     }
   else
     {
       this->consumer_admin_ =
         this->ec_->new_for_consumers (this->ifgop_,
-                                      adminid
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                      adminid);
     }
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -110,34 +99,22 @@ Events::init (int argc,
   ACE_NEW_RETURN (this->consumer_,
                   Event_StructuredPushConsumer (this),
                   -1);
-  this->consumer_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->consumer_->connect (this->consumer_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->consumer_->init (root_poa_.in ());
+  this->consumer_->connect (this->consumer_admin_.in ());
 
   Event_StructuredPushConsumer* consumer2 = 0;
   ACE_NEW_RETURN (consumer2,
                   Event_StructuredPushConsumer (this),
                   -1);
-  consumer2->init (root_poa_.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  consumer2->connect (this->consumer_admin_.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  consumer2->init (root_poa_.in ());
+  consumer2->connect (this->consumer_admin_.in ());
 
   ACE_NEW_RETURN (this->supplier_,
                   Event_StructuredPushSupplier (this),
                   -1);
-  this->supplier_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->supplier_->init (root_poa_.in ());
 
-  this->supplier_->connect (this->supplier_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->supplier_->connect (this->supplier_admin_.in ());
 
   consumer_start( 0 );
 
@@ -188,15 +165,13 @@ Events::parse_args (int argc,
 }
 
 void
-Events::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Events::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               id);
 
   /****************************************************************/
   /*
@@ -213,8 +188,8 @@ Events::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 
   admin[1].value <<= (CORBA::Long)2;
 
-  ec_->set_admin (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;*/
+  ec_->set_admin (admin);
+  */
 
   /****************************************************************/
   ACE_ASSERT (!CORBA::is_nil (this->ec_.in ()));
@@ -232,14 +207,12 @@ Events::on_event_received (void)
 
   if (this->result_count_ == 2 * this->event_count_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->end_test ();
     }
 }
 
 void
-Events::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Events::run_test (void)
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -285,14 +258,12 @@ Events::run_test (ACE_ENV_SINGLE_ARG_DECL)
       qos[0].name = CORBA::string_dup (CosNotification::Priority);
       qos[0].value <<= (CORBA::Short)prio++;
 
-      this->supplier_->send_event (event
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_->send_event (event);
     }
 }
 
 void
-Events::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Events::end_test (void)
 {
   consumer_done( 0 );
 }
@@ -301,9 +272,7 @@ int
 Events::check_results (void)
 {
   // Destroy the channel.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->ec_->destroy ();
 
   if (this->result_count_ == 2 * this->event_count_)
     {
@@ -331,25 +300,20 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       events.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   argv);
 
-      events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      events.run_test ();
 
-      events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      events.ORB_run( );
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return events.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index e7493489b67..f4e6c2b8217 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -37,7 +37,6 @@ public:
   // = StructuredPushSupplier methods.
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
@@ -74,24 +73,23 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // Initialization.
 
   void on_event_received (void);
   // Called when an event is received.
 
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_test (void);
   // Run the test.
 
-  void end_test (ACE_ENV_SINGLE_ARG_DECL);
+  void end_test (void);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create EC
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index 3d54679c307..cb5ac5e0900 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -17,152 +17,125 @@ Filter::~Filter (void)
 }
 
 int
-Filter::init (int argc, char* argv []
-                   ACE_ENV_ARG_DECL)
+Filter::init (int argc, char* argv [])
 {
   // Initialized the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            argv);
 
   // Create all participents.
-  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->create_EC ();
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   this->supplier_admin_ =
     this->ec_->new_for_suppliers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
     this->ec_->new_for_consumers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   this->ffact_ =
-    ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    ec_->default_filter_factory ();
 
   return 0;
 }
 
 void
-Filter::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Filter::run_test (void)
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n"));
 
   CosNotifyFilter::FilterAdmin_var ca_filter_admin =
-    CosNotifyFilter::FilterAdmin::_narrow (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyFilter::FilterAdmin::_narrow (consumer_admin_.in ());
 
-  this->run_filter_test (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->run_filter_test (consumer_admin_.in ());
 
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_->destroy ();
 }
 
 void
-Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL)
+Filter::run_filter_test (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 {
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, " Calling remove_all_filters\n"));
 
   // Clear all filters.
-  filter_admin->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  filter_admin->remove_all_filters ();
 
-  this->verify_filter_count (filter_admin, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->verify_filter_count (filter_admin, 0);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Adding a filter \n"));
 
-  CosNotifyFilter::FilterID id_1 = this->add_filter (filter_admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyFilter::FilterID id_1 = this->add_filter (filter_admin);
 
-  this->verify_filter_count (filter_admin, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->verify_filter_count (filter_admin, 1);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Adding another filter \n"));
 
-  this->add_filter (filter_admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->add_filter (filter_admin);
 
-  this->verify_filter_count (filter_admin, 2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->verify_filter_count (filter_admin, 2);
 
   if (TAO_debug_level)
     {
       ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
-      this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->print_filters (filter_admin);
     }
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Calling remove_filter\n"));
 
   // remove the filter.
-  filter_admin->remove_filter (id_1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  filter_admin->remove_filter (id_1);
 
-  this->verify_filter_count (filter_admin, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->verify_filter_count (filter_admin, 1);
 
   if (TAO_debug_level)
     {
       ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
-      this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->print_filters (filter_admin);
     }
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Calling remove_all_filters \n"));
 
-  filter_admin->remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  filter_admin->remove_all_filters ();
 
   if (TAO_debug_level)
     {
       ACE_DEBUG ((LM_DEBUG, "Calling print_filters \n"));
-      this->print_filters (filter_admin ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->print_filters (filter_admin);
     }
 
   // Make sure all filters are removed -
-  this->verify_filter_count (filter_admin, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->verify_filter_count (filter_admin, 0);
 
   ACE_DEBUG ((LM_DEBUG, "Filters test has run successfully\n"));
 }
 
 void
-Filter::verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count ACE_ENV_ARG_DECL)
+Filter::verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count)
 {
   expected_count = expected_count; // if we don;t do this, we get a warning on linux about arg not used.
-  CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters ();
   ACE_ASSERT (filter_seq->length () == expected_count);
 }
 
 CosNotifyFilter::FilterID
-Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL)
+Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 {
   // setup a filter at the filter admin
   CosNotifyFilter::Filter_var filter =
-    this->ffact_->create_filter ("ETCL" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->ffact_->create_filter ("ETCL");
 
   ACE_ASSERT (!CORBA::is_nil (filter.in ()));
 
@@ -174,11 +147,9 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (test_filter_string);
 
-  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  filter->add_constraints (constraint_list);
 
-  CosNotifyFilter::FilterID id = filter_admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CosNotifyFilter::FilterID id = filter_admin->add_filter (filter.in ());
 
   // Print the ID
   if (TAO_debug_level)
@@ -188,10 +159,9 @@ Filter::add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DE
 }
 
 void
-Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL)
+Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin)
 {
-  CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosNotifyFilter::FilterIDSeq_var filter_seq = filter_admin->get_all_filters ();
 
   ACE_DEBUG ((LM_DEBUG, "Getting all %d filters...\n ", filter_seq->length ()));
 
@@ -203,15 +173,13 @@ Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG
 
 
 void
-Filter::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Filter::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -228,22 +196,18 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       events.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   argv);
 
-      events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      events.run_test ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
index 9bd93156d6d..9c1ed4432d3 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
@@ -35,28 +35,27 @@ public:
   virtual ~Filter (void);
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // initialization.
 
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_test (void);
   // Run the test.
 
 protected:
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create EC
 
   /// Run some tests to check the filters.
-  void run_filter_test (CosNotifyFilter::FilterAdmin_ptr ACE_ENV_ARG_DECL);
+  void run_filter_test (CosNotifyFilter::FilterAdmin_ptr);
 
   /// Print the filter ids.
-  void print_filters (CosNotifyFilter::FilterAdmin_ptr filter_seq ACE_ENV_ARG_DECL);
+  void print_filters (CosNotifyFilter::FilterAdmin_ptr filter_seq);
 
   /// Verify filter count.
-  void verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count ACE_ENV_ARG_DECL);
+  void verify_filter_count (CosNotifyFilter::FilterAdmin_ptr filter_admin, CORBA::ULong expected_count);
 
   /// Add a filter.
-  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin ACE_ENV_ARG_DECL);
+  CosNotifyFilter::FilterID add_filter (CosNotifyFilter::FilterAdmin_ptr filter_admin);
 
   /// The default filter factory.
   CosNotifyFilter::FilterFactory_var ffact_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index ebfd98f3df1..ebaebc1f8b4 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -80,19 +80,14 @@ IdAssignment::parse_args (int argc,
 
 void
 IdAssignment::init (int argc,
-                    char *argv[]
-                    ACE_ENV_ARG_DECL)
+                    char *argv[])
 {
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        ""
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        "");
 
   CORBA::Object_var rootObj =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("NameService");
 
   if (CORBA::is_nil (rootObj.in ()))
     {
@@ -102,17 +97,13 @@ IdAssignment::init (int argc,
 
     }
   CosNaming::NamingContext_var rootNC =
-    CosNaming::NamingContext::_narrow (rootObj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (rootObj.in ());
 
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var obj = rootNC->resolve (name
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var obj = rootNC->resolve (name);
 
   if (CORBA::is_nil (obj.in ()))
     {
@@ -124,14 +115,12 @@ IdAssignment::init (int argc,
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in()
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK;
 
 }
 
 CosNotifyChannelAdmin::ChannelID
-IdAssignment::create_ec (ACE_ENV_SINGLE_ARG_DECL)
+IdAssignment::create_ec (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
@@ -139,23 +128,18 @@ IdAssignment::create_ec (ACE_ENV_SINGLE_ARG_DECL)
   CosNotifyChannelAdmin::EventChannel_var ec =
     this->notify_factory_->create_channel (initial_qos,
                                            initial_admin,
-                                           id
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                           id);
 
   return id;
 }
 
 
 void
-IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id
-                          ACE_ENV_ARG_DECL)
+IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id)
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (id);
 
-  ACE_CHECK;
 
   if (CORBA::is_nil (ec.in()))
     {
@@ -164,23 +148,19 @@ IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id
       return;
     }
 
-   ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-   ACE_CHECK;
+   ec->destroy ();
 }
 
 CosNotifyChannelAdmin::AdminID
-IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
-                                     ACE_ENV_ARG_DECL)
+IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id);
 
-  ACE_CHECK_RETURN (0);
 
   if (CORBA::is_nil (ec.in ()))
     {
@@ -191,9 +171,7 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
     ec->new_for_suppliers (ifgop,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                           adminid);
 
   if (CORBA::is_nil (supplier_admin.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -207,18 +185,15 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
 }
 
 CosNotifyChannelAdmin::AdminID
-IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
-                                     ACE_ENV_ARG_DECL)
+IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id);
 
-  ACE_CHECK_RETURN (0);
 
   if (CORBA::is_nil (ec.in ()))
     {
@@ -229,9 +204,7 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
     ec->new_for_consumers (ifgop,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                           adminid);
 
   if (CORBA::is_nil (consumer_admin.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -249,14 +222,11 @@ void
 IdAssignment::destroy_consumer_admin (
     CosNotifyChannelAdmin::ChannelID channel_id,
     CosNotifyChannelAdmin::AdminID admin_id
-    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id);
 
-  ACE_CHECK;
 
   if (CORBA::is_nil (ec.in ()))
     {
@@ -266,9 +236,7 @@ IdAssignment::destroy_consumer_admin (
     }
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->get_consumeradmin (admin_id
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->get_consumeradmin (admin_id);
 
   if (CORBA::is_nil (consumer_admin.in()))
     {
@@ -276,8 +244,7 @@ IdAssignment::destroy_consumer_admin (
                   " (%P|%t) Unable to get consumer admin\n"));
     }
 
-  consumer_admin->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_admin->destroy ();
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
@@ -289,14 +256,11 @@ void
 IdAssignment::destroy_supplier_admin (
     CosNotifyChannelAdmin::ChannelID channel_id,
     CosNotifyChannelAdmin::AdminID admin_id
-    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id
-                                              ACE_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id);
 
-  ACE_CHECK;
 
   if (CORBA::is_nil (ec.in ()))
     {
@@ -305,16 +269,13 @@ IdAssignment::destroy_supplier_admin (
     }
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->get_supplieradmin (admin_id
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->get_supplieradmin (admin_id);
 
   if (CORBA::is_nil (supplier_admin.in ()))
     ACE_ERROR ((LM_ERROR,
                 " (%P|%t) Unable to get supplier admin\n"));
 
-  supplier_admin->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_admin->destroy ();
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
@@ -322,7 +283,7 @@ IdAssignment::destroy_supplier_admin (
 }
 
 void
-IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
+IdAssignment::run_test(void)
 {
   CosNotifyChannelAdmin::ChannelID* ec_id = 0;
   ACE_NEW (ec_id,
@@ -346,8 +307,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
 
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          ec_id[ec_count] = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ec_id[ec_count] = this->create_ec ();
 
           // Connect <consumer_admin_count_> number of consumers
           // to the current ec.
@@ -356,9 +316,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
                ++cons_count)
             {
               consumer_admin_id [cons_count] =
-                this->create_consumer_admin (ec_id [ec_count]
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                this->create_consumer_admin (ec_id [ec_count]);
             }
 
           // Connect <supplier_admin_count_> number of suppliers
@@ -368,18 +326,14 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
                ++supp_count)
             {
               supplier_admin_id [supp_count] =
-                this->create_supplier_admin (ec_id [ec_count]
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                this->create_supplier_admin (ec_id [ec_count]);
             }
         }
 
       // Destroy the ec, the admins should destroy too.
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          this->destroy_ec (ec_id[ec_count]
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->destroy_ec (ec_id[ec_count]);
         }
 
     } // for
@@ -393,8 +347,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
 
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          ec_id[ec_count] = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ec_id[ec_count] = this->create_ec ();
 
           int cons_count, supp_count;
           // Connect <consumer_admin_count_> number of consumers
@@ -404,9 +357,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
                ++cons_count)
             {
               consumer_admin_id[cons_count] =
-                this->create_consumer_admin (ec_id[ec_count]
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                this->create_consumer_admin (ec_id[ec_count]);
             }
 
           // Connect <supplier_admin_count_> number of suppliers
@@ -414,9 +365,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
           for (supp_count = 0; supp_count < this->supplier_admin_count_; ++supp_count)
             {
               supplier_admin_id[supp_count] =
-                this->create_supplier_admin (ec_id[ec_count]
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                this->create_supplier_admin (ec_id[ec_count]);
             }
 
           // Destroy the admins.
@@ -427,9 +376,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
                ++cons_count)
             {
               this->destroy_consumer_admin (ec_id[ec_count],
-                                            consumer_admin_id[cons_count]
-                                            ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                                            consumer_admin_id[cons_count]);
             }
 
           // Destroy supplier admins
@@ -438,9 +385,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
                ++supp_count)
             {
               this->destroy_supplier_admin (ec_id[ec_count],
-                                            supplier_admin_id[supp_count]
-                                            ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                                            supplier_admin_id[supp_count]);
             }
 
         }
@@ -448,9 +393,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
       // Destroy the ec,
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          this->destroy_ec (ec_id[ec_count]
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->destroy_ec (ec_id[ec_count]);
         }
 
     } // for
@@ -460,8 +403,7 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       IdAssignment test;
 
@@ -469,19 +411,15 @@ int main (int argc, char* argv[])
                        argv);
 
       test.init (argc,
-                 argv
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                 argv);
 
-      test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test.run_test ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: ");
+      ex._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "IdAssignment test suceeded\n"));
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 7b4a7e3920f..5a7d1afdc15 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -27,30 +27,24 @@ public:
   int parse_args (int argc,
                   char *argv[]);
   void init (int argc,
-             char *argv[]
-             ACE_ENV_ARG_DECL);
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+             char *argv[]);
+  void run_test (void);
 
 private:
-  CosNotifyChannelAdmin::ChannelID create_ec (ACE_ENV_SINGLE_ARG_DECL);
-  void destroy_ec (CosNotifyChannelAdmin::ChannelID id
-                   ACE_ENV_ARG_DECL);
+  CosNotifyChannelAdmin::ChannelID create_ec (void);
+  void destroy_ec (CosNotifyChannelAdmin::ChannelID id);
 
   CosNotifyChannelAdmin::AdminID create_supplier_admin (
       CosNotifyChannelAdmin::ChannelID channel_id
-      ACE_ENV_ARG_DECL
     );
   CosNotifyChannelAdmin::AdminID create_consumer_admin (
       CosNotifyChannelAdmin::ChannelID channel_id
-      ACE_ENV_ARG_DECL
     );
 
   void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id,
-                               CosNotifyChannelAdmin::AdminID admin_id
-                               ACE_ENV_ARG_DECL);
+                               CosNotifyChannelAdmin::AdminID admin_id);
   void destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id,
-                               CosNotifyChannelAdmin::AdminID admin_id
-                               ACE_ENV_ARG_DECL);
+                               CosNotifyChannelAdmin::AdminID admin_id);
 
   // = Data members.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 0bb420600c7..7a824f69f10 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -62,19 +62,14 @@ LifeCycle::parse_args (int argc,
 
 void
 LifeCycle::init (int argc,
-                     char* argv[]
-                     ACE_ENV_ARG_DECL)
+                     char* argv[])
 {
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        ""
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        "");
 
   CORBA::Object_var rootObj =
-    orb->resolve_initial_references ("NameService"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("NameService");
 
   if (CORBA::is_nil (rootObj.in ()))
     {
@@ -84,24 +79,18 @@ LifeCycle::init (int argc,
     }
 
   CosNaming::NamingContext_var rootNC =
-    CosNaming::NamingContext::_narrow (rootObj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (rootObj.in ());
 
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var obj = rootNC->resolve (name
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var obj = rootNC->resolve (name);
 
   notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in()
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK;
 
   if (CORBA::is_nil (notify_factory_.in ()))
     {
@@ -113,32 +102,26 @@ LifeCycle::init (int argc,
 }
 
 void
-LifeCycle::run_test(ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::run_test(void)
 {
   for (int i = 0; i < this->count_; ++i)
     {
-     this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_CHECK;
+     this->create_ec ();
 
-     this->create_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_CHECK;
+     this->create_supplier_admin ();
 
-     this->create_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_CHECK;
+     this->create_consumer_admin ();
 
-     this->destroy_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_CHECK;
+     this->destroy_consumer_admin ();
 
-     this->destroy_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_CHECK;
+     this->destroy_supplier_admin ();
 
-     this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_CHECK;
+     this->destroy_ec ();
   }
 }
 
 void
-LifeCycle::create_ec (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::create_ec (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
@@ -146,9 +129,7 @@ LifeCycle::create_ec (ACE_ENV_SINGLE_ARG_DECL)
 
   this->ec_ = notify_factory_->create_channel (initial_qos,
                                                initial_admin,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               id);
 
   if (CORBA::is_nil (ec_.in ())) {
     ACE_ERROR ((LM_ERROR,
@@ -162,16 +143,14 @@ LifeCycle::create_ec (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-LifeCycle::create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::create_supplier_admin (void)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
           CosNotifyChannelAdmin::OR_OP;
 
   supplier_admin_ = this->ec_->new_for_suppliers (ifgop,
-                                                  adminid
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  adminid);
 
   if (CORBA::is_nil (supplier_admin_.in ()))
     {
@@ -186,14 +165,13 @@ LifeCycle::create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-LifeCycle::create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::create_consumer_admin (void)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
-  consumer_admin_ = ec_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_admin_ = ec_->new_for_consumers (ifgop, adminid);
 
   if (CORBA::is_nil (consumer_admin_.in()))
     {
@@ -208,10 +186,9 @@ LifeCycle::create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-LifeCycle::destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::destroy_supplier_admin (void)
 {
-  this->supplier_admin_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_admin_->destroy ();
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
@@ -219,10 +196,9 @@ LifeCycle::destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-LifeCycle::destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::destroy_consumer_admin (void)
 {
-  this->consumer_admin_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer_admin_->destroy ();
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
@@ -230,10 +206,9 @@ LifeCycle::destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-LifeCycle::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
+LifeCycle::destroy_ec (void)
 {
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ec_->destroy ();
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG,
@@ -244,8 +219,7 @@ LifeCycle::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       LifeCycle test;
 
@@ -253,19 +227,15 @@ main (int argc, char *argv[])
                        argv);
 
       test.init (argc,
-                 argv
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                 argv);
 
-      test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test.run_test ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: ");
+      ex._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
index 94a2869641b..9d4b39b17d8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h
@@ -23,19 +23,18 @@ public:
   ~LifeCycle (void);
 
   void init (int argc,
-             char *argv[]
-             ACE_ENV_ARG_DECL);
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+             char *argv[]);
+  void run_test (void);
   int parse_args (int argc,
                   char *argv[]);
 
 private:
-   void create_ec (ACE_ENV_SINGLE_ARG_DECL);
-   void create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL);
-   void create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL);
-   void destroy_ec (ACE_ENV_SINGLE_ARG_DECL);
-   void destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL);
-   void destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL);
+   void create_ec (void);
+   void create_supplier_admin (void);
+   void create_consumer_admin (void);
+   void destroy_ec (void);
+   void destroy_supplier_admin (void);
+   void destroy_consumer_admin (void);
 
    CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
    CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index f8bb9dd472a..3497a62013f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -16,7 +16,6 @@ MultiTypes_PushConsumer::MultiTypes_PushConsumer (MultiTypes* client)
 
 void
 MultiTypes_PushConsumer::push (const CORBA::Any & /*data*/
-                               ACE_ENV_ARG_DECL_NOT_USED
                                )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -35,7 +34,6 @@ MultiTypes_StructuredPushConsumer::MultiTypes_StructuredPushConsumer (MultiTypes
 
 void
 MultiTypes_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
-                                      ACE_ENV_ARG_DECL_NOT_USED
                                       )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -56,7 +54,6 @@ MultiTypes_SequencePushConsumer::MultiTypes_SequencePushConsumer (MultiTypes* cl
 // Since this should *never* happen, I'm not fixing it now.
 void
 MultiTypes_SequencePushConsumer::push_structured_events (const CosNotification::EventBatch & /*notifications*/
-                                                         ACE_ENV_ARG_DECL_NOT_USED
                                                          )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -95,12 +92,10 @@ MultiTypes::on_received_event (MultiTypes_PushConsumer* consumer)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "PushConsumer received event #%d\n", any_event_count_.value ()));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (disconnect_on_last_event_ == 1)
   {
-    consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    consumer->disconnect ();
     if (TAO_debug_level)
       ACE_DEBUG ((LM_DEBUG, "PushConsumer has been disconnected.\n"));
     consumer = 0;
@@ -115,12 +110,10 @@ MultiTypes::on_received_event (MultiTypes_StructuredPushConsumer* consumer)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer received event #%d\n", struct_event_count_.value ()));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (disconnect_on_last_event_ == 1)
   {
-    consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    consumer->disconnect ();
     if (TAO_debug_level)
       ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer has been disconnected.\n"));
     consumer = 0;
@@ -135,12 +128,10 @@ MultiTypes::on_received_event (MultiTypes_SequencePushConsumer* consumer)
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "SequencePushConsumer received event #%d\n", seq_event_count_.value ()));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (disconnect_on_last_event_ == 1)
   {
-    consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    consumer->disconnect ();
 
     if (TAO_debug_level)
       ACE_DEBUG ((LM_DEBUG, "SequencePushConsumer has been disconnected.\n"));
@@ -150,34 +141,26 @@ MultiTypes::on_received_event (MultiTypes_SequencePushConsumer* consumer)
 
 int
 MultiTypes::init (int argc,
-                         char* argv []
-                         ACE_ENV_ARG_DECL)
+                         char* argv [])
 {
   // Initialize the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);;
+                            argv);
 
   // Create all participants.
-  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->create_EC ();
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   this->supplier_admin_ =
     ec_->new_for_suppliers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);;
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
     ec_->new_for_consumers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
@@ -191,43 +174,31 @@ MultiTypes::init (int argc,
   sequence_supplier_ = new TAO_Notify_Tests_SequencePushSupplier ();
 
   // Init and connect all consumers.
-  structured_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  structured_consumer_->init (root_poa_.in ());
 
-  structured_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  structured_consumer_->connect (this->consumer_admin_.in ());
 
-  any_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  any_consumer_->init (root_poa_.in ());
 
-  any_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  any_consumer_->connect (this->consumer_admin_.in ());
 
 
-  sequence_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  sequence_consumer_->init (root_poa_.in ());
 
-  sequence_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  sequence_consumer_->connect (this->consumer_admin_.in ());
 
   // Init and connect all suppliers.
-  any_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  any_supplier_->init (root_poa_.in ());
 
-  any_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  any_supplier_->connect (this->supplier_admin_.in ());
 
-  structured_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  structured_supplier_->init (root_poa_.in ());
 
-  structured_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  structured_supplier_->connect (this->supplier_admin_.in ());
 
-  sequence_supplier_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  sequence_supplier_->init (root_poa_.in ());
 
-  sequence_supplier_->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  sequence_supplier_->connect (this->supplier_admin_.in ());
 
   consumer_start( 0 );
 
@@ -242,21 +213,19 @@ MultiTypes::parse_args(int, char **)
 }
 
 void
-MultiTypes::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+MultiTypes::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
+MultiTypes::run_test (void)
 {
   // Send an Any, all consumers should receive it.
   CORBA::Any any;
@@ -264,8 +233,7 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Sending Any Event..\n"));
-  any_supplier_->send_event (any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  any_supplier_->send_event (any);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n"));
@@ -286,8 +254,7 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Sending Structured Event..\n"));
-  structured_supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  structured_supplier_->send_event (event);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n"));
@@ -314,8 +281,7 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Sending Sequence Event..\n"));
-  sequence_supplier_->send_events (events ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  sequence_supplier_->send_events (events);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 2 events..\n"));
@@ -332,8 +298,7 @@ MultiTypes::run_test (ACE_ENV_SINGLE_ARG_DECL)
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Sending LAST Any Event, Consumers will attempt disconnect..\n"));
-  any_supplier_->send_event (any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  any_supplier_->send_event (any);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Waiting for consumers to receive the 1 event..\n"));
@@ -360,7 +325,7 @@ MultiTypes::wait_for_all_consumers (int expected_count_per_consumer)
 }
 
 void
-MultiTypes::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+MultiTypes::end_test (void)
 {
   consumer_done( 0 );
 }
@@ -369,9 +334,7 @@ int
 MultiTypes::check_results (void)
 {
   // Destroy the channel.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->ec_->destroy ();
 
   return 0;
 }
@@ -388,25 +351,20 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       client.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   argv);
 
-      client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.run_test ();
 
-      client.end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.end_test ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return client.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index ac2701e61b8..4b8fa5ed939 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -40,7 +40,6 @@ public:
 
   void push (
              const CORBA::Any & data
-             ACE_ENV_ARG_DECL
              )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -60,7 +59,6 @@ public:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (const CosNotification::StructuredEvent & notification
-                                      ACE_ENV_ARG_DECL
                                       )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -79,7 +77,6 @@ public:
   // = SequencePushConsumer methods
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -108,14 +105,13 @@ public:
                   char *argv[]);
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // initialization.
 
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_test (void);
   // Run the test.
 
-  void end_test (ACE_ENV_SINGLE_ARG_DECL);
+  void end_test (void);
   // End the test.
 
   int check_results (void);
@@ -125,7 +121,7 @@ protected:
   // Wait to receive events.
   void wait_for_all_consumers (int expected_count_per_consumer);
 
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create EC.
 
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 7842be55e57..67ada03200b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -18,7 +18,6 @@ SequencePushConsumer::SequencePushConsumer (Sequence *test_client)
 void
 SequencePushConsumer::push_structured_events (
     const CosNotification::EventBatch &batch
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -62,8 +61,7 @@ Sequence::~Sequence (void)
 
 int
 Sequence::init (int argc,
-                   char* argv []
-                   ACE_ENV_ARG_DECL)
+                   char* argv [])
 {
   if (TAO_debug_level)
     {
@@ -82,41 +80,30 @@ Sequence::init (int argc,
 
   // Initialize the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            argv);
 
   // Create all participents.
-  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->create_EC ();
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   this->supplier_admin_ =
     this->ec_->new_for_suppliers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
     this->ec_->new_for_consumers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   ACE_NEW_RETURN (this->consumer_,
                   SequencePushConsumer (this),
                   -1);
-  this->consumer_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->consumer_->connect (this->consumer_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->consumer_->init (root_poa_.in ());
+  this->consumer_->connect (this->consumer_admin_.in ());
 
   CosNotification::QoSProperties properties (3);
   properties.length (3);
@@ -133,13 +120,9 @@ Sequence::init (int argc,
   ACE_NEW_RETURN (this->supplier_,
                   SequencePushSupplier (this),
                   -1);
-  this->supplier_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->supplier_->init (root_poa_.in ());
 
-  this->supplier_->connect (this->supplier_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->supplier_->connect (this->supplier_admin_.in ());
 
   consumer_start( 0 );
 
@@ -212,15 +195,13 @@ Sequence::parse_args (int argc,
 }
 
 void
-Sequence::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Sequence::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               id);
   ACE_ASSERT (!CORBA::is_nil (this->ec_.in ()));
 }
 
@@ -234,14 +215,12 @@ Sequence::on_event_received (void)
 
   if (this->events_received_.value () == this->event_count_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->end_test ();
     }
 }
 
 void
-Sequence::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Sequence::run_test (void)
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -301,9 +280,7 @@ Sequence::run_test (ACE_ENV_SINGLE_ARG_DECL)
           if (TAO_debug_level)
             ACE_DEBUG ((LM_DEBUG, "Sending batch with %d events\n", batch.length ()));
 
-          this->supplier_->send_events (batch
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->supplier_->send_events (batch);
 
           // reset
           batch.length (this->supplier_batch_size_);
@@ -316,15 +293,13 @@ Sequence::run_test (ACE_ENV_SINGLE_ARG_DECL)
     {
       batch.length (batch_index); // set the correct length
 
-      this->supplier_->send_events (batch
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_->send_events (batch);
     }
 
 }
 
 void
-Sequence::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Sequence::end_test (void)
 {
   consumer_done( 0 );
 }
@@ -333,9 +308,7 @@ int
 Sequence::check_results (void)
 {
   // Destroy the channel.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->ec_->destroy ();
 
   if (this->events_received_.value () == this->event_count_)
     {
@@ -363,25 +336,20 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       events.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   argv);
 
-      events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      events.run_test ();
 
-      events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      events.ORB_run( );
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return events.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 5a8e1138f3b..f54484b6de3 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -36,7 +36,6 @@ public:
   // = SequencePushConsumer methods
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -75,24 +74,23 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // Initialization.
 
   void on_event_received (void);
   // Called when an event is received.
 
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_test (void);
   // Run the test.
 
-  void end_test (ACE_ENV_SINGLE_ARG_DECL);
+  void end_test (void);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create EC
 
   int event_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index fd0dffb4620..faa27ba5776 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -15,8 +15,7 @@ Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client)
 }
 
 void
-Event_AnyPushConsumer::push (const CORBA::Any & data
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Event_AnyPushConsumer::push (const CORBA::Any & data)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
@@ -55,68 +54,48 @@ Simple_Test::~Simple_Test (void)
 
 int
 Simple_Test::init (int argc,
-                   char* argv []
-                   ACE_ENV_ARG_DECL)
+                   char* argv [])
 {
   // Initialized the base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            argv);
 
   // Create all participents.
-  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->create_EC ();
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
     this->ec_->new_for_suppliers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
     this->ec_->new_for_consumers (this->ifgop_,
-                                  adminid
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   ACE_NEW_RETURN (this->consumer_,
                   Event_AnyPushConsumer (this),
                   -1);
-  this->consumer_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->consumer_->connect (this->consumer_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->consumer_->init (root_poa_.in ());
+  this->consumer_->connect (this->consumer_admin_.in ());
 
   Event_AnyPushConsumer* consumer2;
   ACE_NEW_RETURN (consumer2,
                   Event_AnyPushConsumer (this),
                   -1);
-  consumer2->init (root_poa_.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  consumer2->connect (this->consumer_admin_.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  consumer2->init (root_poa_.in ());
+  consumer2->connect (this->consumer_admin_.in ());
 
   ACE_NEW_RETURN (this->supplier_,
                   Event_AnyPushSupplier (this),
                   -1);
-  this->supplier_->init (root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->supplier_->init (root_poa_.in ());
 
-  this->supplier_->connect (this->supplier_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->supplier_->connect (this->supplier_admin_.in ());
 
   consumer_start( 0 );
 
@@ -161,15 +140,13 @@ Simple_Test::parse_args (int argc,
 }
 
 void
-Simple_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Test::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -186,14 +163,12 @@ Simple_Test::on_event_received (void)
 
   if (this->result_count_ == 2 * this->event_count_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->end_test ();
     }
 }
 
 void
-Simple_Test::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Test::run_test (void)
 {
   CORBA::Any data;
 
@@ -201,14 +176,12 @@ Simple_Test::run_test (ACE_ENV_SINGLE_ARG_DECL)
     {
       data <<= (CORBA::Long)i;
 
-      this->supplier_->send_event (data
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_->send_event (data);
     }
 }
 
 void
-Simple_Test::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Test::end_test (void)
 {
   consumer_done( 0 );
 }
@@ -217,9 +190,7 @@ int
 Simple_Test::check_results (void)
 {
   // Destroy the channel
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->ec_->destroy ();
 
   if (this->result_count_ == 2 * this->event_count_)
     {
@@ -247,25 +218,20 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       events.init (argc,
-                   argv
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   argv);
 
-      events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      events.run_test ();
 
-      events.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      events.ORB_run( );
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return events.check_results ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index a941fcfb027..ed80e117075 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -38,7 +38,6 @@ public:
   // = PushSupplier methods
   virtual void push (
       const CORBA::Any & data
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
@@ -75,24 +74,23 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            char *argv []
-            ACE_ENV_ARG_DECL);
+            char *argv []);
   // initialization.
 
   void on_event_received (void);
   // Called when an event is received.
 
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_test (void);
   // Run the test.
 
-  void end_test (ACE_ENV_SINGLE_ARG_DECL);
+  void end_test (void);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create EC
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index 3933aaa37a1..6725fe62063 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -16,7 +16,6 @@ void
 Updates_StructuredPushConsumer::offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL_NOT_USED
       )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -43,7 +42,6 @@ void
 Updates_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
@@ -66,72 +64,54 @@ Updates::~Updates ()
 
 int
 Updates::init (int argc,
-               char* argv []
-               ACE_ENV_ARG_DECL)
+               char* argv [])
 {
   // Initialize base class.
   Notify_Test_Client::init (argc,
-                            argv
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            argv);
 
   // Create all participents.
-  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->create_EC ();
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
     ec_->new_for_suppliers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
     ec_->new_for_consumers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   ACE_NEW_RETURN (consumer_,
                   Updates_StructuredPushConsumer (this),
                   -1);
-  consumer_->init (root_poa_.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  consumer_->init (root_poa_.in ());
 
-  consumer_->connect (this->consumer_admin_.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  consumer_->connect (this->consumer_admin_.in ());
 
   ACE_NEW_RETURN (supplier_,
                  Updates_StructuredPushSupplier (this),
                  -1);
-  supplier_->init (root_poa_.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  supplier_->init (root_poa_.in ());
 
-  supplier_->connect (this->supplier_admin_.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  supplier_->connect (this->supplier_admin_.in ());
 
   return 0;
 }
 
 void
-Updates::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Updates::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
@@ -198,22 +178,20 @@ Updates::reset_counts (void)
 }
 
 void
-Updates::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Updates::run_test (void)
 {
-  this->test_subscription_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->test_subscription_change ();
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Finished testing subscription_change!\n"));
 
-  this->test_offer_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->test_offer_change ();
 
   ACE_DEBUG ((LM_DEBUG, "Updates test has run successfully!\n"));
 }
 
 void
-Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
+Updates::test_subscription_change (void)
 {
   {
     // reset counts.
@@ -242,9 +220,7 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
 
     this->consumer_->get_proxy_supplier ()->subscription_change (added,
                                                                  removed
-                                                                 ACE_ENV_ARG_PARAMETER
                                                                  );
-    ACE_CHECK;
 
     this->wait_for_updates (3, 0); // The supplier should receive Added (RED, GREEN, BLUE)
 
@@ -280,9 +256,7 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
 
     this->consumer_->get_proxy_supplier ()->subscription_change (added,
                                                                  removed
-                                                                 ACE_ENV_ARG_PARAMETER
                                                                  );
-    ACE_CHECK;
 
     this->wait_for_updates (1, 0); // The supplier should receive Added (PURPLE).
 
@@ -316,9 +290,7 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
 
     this->consumer_->get_proxy_supplier ()->subscription_change (added,
                                                                  removed
-                                                                 ACE_ENV_ARG_PARAMETER
                                                                  );
-    ACE_CHECK;
 
     this->wait_for_updates (0, 4);
     // The supplier should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for.
@@ -337,7 +309,7 @@ Updates::test_subscription_change (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL)
+Updates::test_offer_change (void)
 {
   {
     // reset counts.
@@ -366,9 +338,7 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL)
 
     this->supplier_->get_proxy_consumer ()->offer_change (added,
                                                           removed
-                                                          ACE_ENV_ARG_PARAMETER
                                                           );
-    ACE_CHECK;
 
     this->wait_for_updates (3, 0); // The consumer should receive Added (RED, GREEN, BLUE)
 
@@ -404,9 +374,7 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL)
 
     this->supplier_->get_proxy_consumer ()->offer_change (added,
                                                           removed
-                                                          ACE_ENV_ARG_PARAMETER
                                                                  );
-    ACE_CHECK;
 
     this->wait_for_updates (1, 0); // The consumer should receive Added (PURPLE).
 
@@ -440,9 +408,7 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL)
 
     this->supplier_->get_proxy_consumer ()->offer_change (added,
                                                           removed
-                                                          ACE_ENV_ARG_PARAMETER
                                                           );
-    ACE_CHECK;
 
     this->wait_for_updates (0, 4);
     // The consumer should receive Remove {RED, GREEN} out of the 4 actally removed (RED, GREEN, BLUE, PURPLE) becaue that whats it offered for.
@@ -467,22 +433,18 @@ main (int argc, char* argv[])
 {
   Updates updates;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       updates.init (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    argv);
 
-      updates.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      updates.run_test ();
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index e4c7104f9bf..e5a222c600a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -35,8 +35,7 @@ public:
   // Contructor.
 
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
-                             const CosNotification::EventTypeSeq & removed
-                             ACE_ENV_ARG_DECL)
+                             const CosNotification::EventTypeSeq & removed)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType));
   // Offer change is conveyed here.
@@ -59,7 +58,6 @@ public:
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
@@ -78,10 +76,10 @@ public:
   Updates (void);
   virtual ~Updates ();
 
-  int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv []);
   // initialization.
 
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_test (void);
   // Run the test.
 
   /// print_event_types
@@ -94,17 +92,17 @@ public:
   void wait_for_updates (int expected_added, int expected_removed);
 
 protected:
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create EC
 
   /// Helper to add types.
   void add_type (CosNotification::EventTypeSeq& type_seq, const char* type);
 
   // test subscription_change
-  void test_subscription_change (ACE_ENV_SINGLE_ARG_DECL);
+  void test_subscription_change (void);
 
   // test offer_change
-  void test_offer_change (ACE_ENV_SINGLE_ARG_DECL);
+  void test_offer_change (void);
 
   /// Reset the counts.
   void reset_counts (void);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
index 361f6e6c56e..01b39b306f0 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $experiment_timeout = 60;
 $startup_timeout = 60;
 $notifyior = PerlACE::LocalFile ("notify.ior");
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
index 52dd7d3bcbd..6063fd06080 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $experiment_timeout = 60;
 $startup_timeout = 60;
 $notifyior = PerlACE::LocalFile ("notify.ior");
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index 3e7c1986bb9..da30915c6a8 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -26,25 +26,20 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 
 void
 Notify_Structured_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxysupplier.in ());
 
   CosNotification::QoSProperties properties (2);
   properties.length (2);
@@ -71,20 +66,16 @@ Notify_Structured_Push_Consumer::_connect (
   properties[1].value <<= this->blocking_timeout_;
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_structured_push_consumer (objref.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
 void
 Notify_Structured_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& event
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
index 502c28c924d..9b9e143af85 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -32,13 +32,11 @@ public:
                         unsigned int expected,
                         Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index c1ef387256c..0b836c4bd63 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -71,16 +71,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
 }
@@ -88,8 +85,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the consumer
   ACE_NEW_THROW_EX (consumer_1,
@@ -99,11 +95,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
     expected,
     *client),
     CORBA::NO_MEMORY ());
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -113,61 +107,50 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
     if (status != 0)
       ACE_ERROR_RETURN ((LM_ERROR, "Error: Client init failed.\n"),1);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig::_narrow (object.in ());
 
     if (CORBA::is_nil (sig.in ()))
       ACE_ERROR_RETURN ((LM_ERROR, "Error: Narrow failed.\n"),1);
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      create_consumeradmin (ec.in ());
 
     if (CORBA::is_nil (admin.in ()))
       ACE_ERROR_RETURN ((LM_ERROR, "Error: nil ConsumerAdmin.\n"),1);
 
-    create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_consumers (admin.in (), &client);
 
-    sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->go ();
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n"));
- 
-    client.ORB_run (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+
+    client.ORB_run ();
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
-    consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    consumer_1->disconnect();
 
-    sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->done ();
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 8097361c468..4a3896ba229 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -40,13 +40,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -111,23 +111,20 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
+SendEvent (int id)
 {
   CosNotification::StructuredEvent event;
 
@@ -139,33 +136,28 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
   event.filterable_data[0].name = CORBA::string_dup ("id");
   event.filterable_data[0].value <<= id;
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier_1->send_event (event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (admin);
 }
 
 
@@ -177,28 +169,24 @@ int main (int argc, char* argv[])
 {
   int status = 0;
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
       // Activate the signaler with the POA
       sig_impl.reset( new sig_i( orb ) );
-      sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -215,11 +203,10 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        create_suppliers (admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
@@ -227,8 +214,7 @@ int main (int argc, char* argv[])
         for (int i = 0; i < max_events; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
-          SendEvent (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          SendEvent (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
 
@@ -236,20 +222,17 @@ int main (int argc, char* argv[])
 
         ACE_OS::unlink (ior_output_file);
 
-        supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        supplier_1->disconnect();
 
-        ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        ec->destroy();
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl
index e7c6a92056b..a41a049b9ab 100755
--- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $ior = PerlACE::LocalFile ("supplier.ior");
 $namingior = PerlACE::LocalFile ("naming.ior");
 $notifyior = PerlACE::LocalFile ("notify.ior");
diff --git a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
index 09944124843..ba8579a41f5 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -7,12 +7,11 @@
 int
 ACE_TMAIN (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the base class.
       Notify_Test_Client client;
-      client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      client.init (argc, argv);
 
       CosNotifyChannelAdmin::EventChannelFactory_ptr ecf = client.notify_factory ();
 
@@ -20,17 +19,15 @@ ACE_TMAIN (int argc, char *argv[])
 
       ACE_DEBUG((LM_DEBUG, "Destroying ECF...\n"));
 
-      ecf_ext->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ecf_ext->destroy ();
 
       ACE_DEBUG((LM_DEBUG, "ECF destroyed.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Error: \n"));
+      ex._tao_print_exception (ACE_TEXT("Error: \n"));
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index 4a34581b4f4..67bfc2552e9 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -41,25 +41,20 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var consumer =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxysupplier.in ());
 
   CosNotification::QoSProperties properties (4);
   properties.length (4);
@@ -76,20 +71,16 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[idx].value <<= BATCH_SIZE;
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_sequence_push_consumer (consumer.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_sequence_push_consumer (consumer.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
-                          const CosNotification::EventBatch& events
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++count_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
index e49cb83cab3..4c60891d68c 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
@@ -30,13 +30,11 @@ public:
                                  Notify_Test_Client& client,
                                  int sent);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_events (const CosNotification::EventBatch&
-                               ACE_ENV_ARG_DECL)
+  void push_structured_events (const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index f107177b9d5..3cb7e10ff34 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -25,25 +25,20 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 
 void
 Notify_Structured_Push_Consumer::_connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::STRUCTURED_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxysupplier.in ());
 
   CosNotification::QoSProperties properties (2);
   properties.length (2);
@@ -53,20 +48,16 @@ Notify_Structured_Push_Consumer::_connect (
   properties[1].value <<= this->max_events_per_consumer_;
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_structured_push_consumer (objref.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
 void
 Notify_Structured_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& event
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
index 6eac74346e4..347d20ba278 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
@@ -31,13 +31,11 @@ public:
                         CORBA::Long max_events_per_consumer,
                         Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index d357454f33d..2985122fb7a 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -97,16 +97,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
 }
@@ -114,19 +111,16 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the consumer
   ACE_NEW_THROW_EX (consumer_1,
     Notify_Sequence_Push_Consumer ("consumer1", discard_policy, *client, sent),
     CORBA::NO_MEMORY ());
 
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -136,58 +130,47 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig::_narrow (object.in ());
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      create_consumeradmin (ec.in ());
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
 
-    create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_consumers (admin.in (), &client);
 
     // Tell the supplier to go
-    sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->go ();
 
     ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
- 
+    client.ORB_run( );
+
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
-    consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    consumer_1->disconnect();
 
-    sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->done ();
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 95d08daca21..af6a7107fc7 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -53,13 +53,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -136,23 +136,20 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendBatch (int batch_id ACE_ENV_ARG_DECL)
+SendBatch (int batch_id)
 {
   CosNotification::EventBatch events;
   events.length(BATCH_SIZE);
@@ -181,25 +178,21 @@ SendBatch (int batch_id ACE_ENV_ARG_DECL)
 
     events[i] = event;
   }
-  supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->send_events (events);
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (admin);
 }
 
 
@@ -211,17 +204,15 @@ int main (int argc, char* argv[])
 {
   int status = 0;
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.create_event_channel ("MyEventChannel", 0);
 
       if (use_deadline_ordering)
       {
@@ -233,12 +224,10 @@ int main (int argc, char* argv[])
       }
 
       sig_impl.reset( new sig_i( client.orb() ) );
-      sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        client.orb()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.orb()->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -250,10 +239,9 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-      create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      create_suppliers (admin.in (), client.root_poa ());
 
       sig_impl->wait_for_startup();
 
@@ -261,8 +249,7 @@ int main (int argc, char* argv[])
       for (int i = 0; i < num_events / BATCH_SIZE; ++i)
       {
         ACE_DEBUG((LM_DEBUG, "+"));
-        SendBatch (i ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        SendBatch (i);
       }
       ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -270,19 +257,16 @@ int main (int argc, char* argv[])
 
       ACE_OS::unlink (ior_output_file);
 
-      supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_1->disconnect();
 
-      ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec->destroy();
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index b457324f6ed..896fcb1b9b9 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -86,16 +86,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
 }
@@ -103,8 +100,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   ACE_DEBUG ((LM_DEBUG, "Max Events per Consumer = %d...\n", max_events_per_consumer));
 
@@ -116,11 +112,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                           max_events_per_consumer,
                                           *client),
                     CORBA::NO_MEMORY ());
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -130,26 +124,22 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      status = client.init (argc, argv);
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            client.create_event_channel ("MyEventChannel", 1);
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
-                              orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                              orb->string_to_object (ior);
 
-          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          sig_var sig = sig::_narrow (object.in ());
 
           if (CORBA::is_nil (sig.in ()))
             {
@@ -160,37 +150,30 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            create_consumeradmin (ec.in ());
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              create_consumers (admin.in (), &client);
               // Tell the supplier to go
-              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              sig->go ();
 
               ACE_DEBUG((LM_DEBUG, "Consumer waiting for events...\n"));
 
-              client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-              ACE_TRY_CHECK;
- 
+              client.ORB_run( );
+
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
-              consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              consumer_1->disconnect();
 
-              sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              sig->done ();
             }
         }
     }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "Error: ");
+      e._tao_print_exception ("Error: ");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 9fee28c5c34..12a7edb0518 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -44,13 +44,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -127,23 +127,20 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL)
+SendEvent (int id)
 {
   CosNotification::StructuredEvent event;
 
@@ -164,23 +161,20 @@ SendEvent (int id ACE_ENV_ARG_DECL)
     CORBA::string_dup (CosNotification::Timeout);
   event.header.variable_header[2].value <<= (TimeBase::TimeT) (id * 10000);
 
-  supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
+  supplier_1->send_event (event);
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (admin);
 }
 
 
@@ -192,17 +186,15 @@ int main (int argc, char* argv[])
 {
   int status = 0;
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.create_event_channel ("MyEventChannel", 0);
 
       if (use_deadline_ordering)
       {
@@ -214,15 +206,13 @@ int main (int argc, char* argv[])
       }
 
       sig_impl.reset( new sig_i( client.orb() ) );
-      sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sig_var sig = sig_impl->_this ();
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
         CORBA::String_var ior =
-          client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          client.orb ()->object_to_string (sig.in ());
 
         FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
         ACE_ASSERT (output_file != 0);
@@ -231,11 +221,10 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       ACE_ASSERT(!CORBA::is_nil (admin.in ()));
- 
-      create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      create_suppliers (admin.in (), client.root_poa ());
 
       sig_impl->wait_for_startup();
 
@@ -243,8 +232,7 @@ int main (int argc, char* argv[])
       for (int i = 0; i < num_events; ++i)
       {
         ACE_DEBUG((LM_DEBUG, "+"));
-        SendEvent (i + 1 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        SendEvent (i + 1);
       }
       ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -252,19 +240,16 @@ int main (int argc, char* argv[])
 
       ACE_OS::unlink (ior_output_file);
 
-      supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      supplier_1->disconnect();
 
-      ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ec->destroy();
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
index fce484c2758..3df2a3824a3 100755
--- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $ior = PerlACE::LocalFile ("supplier.ior");
 $namingior = PerlACE::LocalFile ("naming.ior");
 $notifyior = PerlACE::LocalFile ("notify.ior");
diff --git a/TAO/orbsvcs/tests/Notify/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index 1ad6142c0d4..9d3492323f9 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -8,25 +8,22 @@ ACE_TMAIN (int argc, char *argv[])
 {
   TAO_Notify_Tests_Driver driver;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      int result = driver.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int result = driver.init (argc, argv);
 
       if (result == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT("Failed to initialize the Notify Testing Driver.\n")),
                             1);
 
-      driver.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      driver.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT("Error: \n"));
+      ex._tao_print_exception (ACE_TEXT("Error: \n"));
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
index 02cee66d948..d1c6c29a53c 100755
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $experiment_timeout = 60;
 $startup_timeout = 60;
 $notify_conf = PerlACE::LocalFile ("notify.conf");
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test_notify.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test_notify.pl
index ec48dd71e62..ce98549f618 100755
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test_notify.pl
+++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test_notify.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $experiment_timeout = 600;
 $startup_timeout = 600;
 $notify_conf = PerlACE::LocalFile ("notify.conf");
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index ce7921b2522..856843f7660 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -18,8 +18,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 
 void
 Notify_Structured_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& /*event*/
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::StructuredEvent& /*event*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
@@ -30,7 +29,7 @@ Notify_Structured_Push_Consumer::push_structured_event (
   {
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: too many events received.\n")));
   }
- 
+
   if (this->count_ >= this->expected_)
   {
     this->client_.consumer_done (this);
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
index bc4f2933b90..99c00e0bb5c 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
@@ -30,8 +30,7 @@ public:
                         unsigned int expected,
                         Notify_Test_Client& client);
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 851210f4877..2c7065e81b2 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -71,16 +71,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
 }
@@ -88,8 +85,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   for (unsigned int i = 0; i < consumer_count; i++)
   {
@@ -103,21 +99,18 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
       *client),
       CORBA::NO_MEMORY ());
 
-    consumers[ i ]->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    consumers[ i ]->init (client->root_poa ());
 
-    consumers[ i ]->connect (admin ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    consumers[ i ]->connect (admin);
   }
 }
 
 static void
-disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
+disconnect_consumers (void)
 {
   for (unsigned int i = 0; i < consumer_count; i++)
   {
-    consumers[ i ]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    consumers[ i ]->disconnect ();
   }
 }
 
@@ -128,25 +121,21 @@ disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.create_event_channel ("MyEventChannel", 1);
 
       CORBA::Object_var object =
-        client.orb ()->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.orb ()->string_to_object (ior);
 
-      sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sig_var sig = sig::_narrow (object.in ());
 
       if (CORBA::is_nil (sig.in ()))
       {
@@ -157,36 +146,29 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-        create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        create_consumeradmin (ec.in ());
 
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        create_consumers (admin.in (), &client);
 
         // Tell the supplier to go
-        sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        sig->go ();
 
-        client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-        ACE_TRY_CHECK;
+        client.ORB_run( );
 
-        disconnect_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        disconnect_consumers();
 
         ACE_DEBUG ((LM_DEBUG, "Consumer done.\n"));
-        sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        sig->done ();
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 4612ff106bf..c70f1d160cf 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -41,13 +41,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -121,23 +121,20 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
+SendEvent (int id)
 {
   ACE_UNUSED_ARG(id);
   CosNotification::StructuredEvent event;
@@ -146,25 +143,22 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
   event.header.fixed_header.event_type.type_name = CORBA::string_dup ("b");
   event.header.fixed_header.event_name = CORBA::string_dup ("test");
 
-  ACE_TRY_NEW_ENV
+  try
   {
     for (unsigned int i = 0; i < supplier_count; i++)
     {
-      suppliers[i]->send_event (event ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      suppliers[i]->send_event (event);
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   for (unsigned int i = 0; i < supplier_count; i++)
   {
@@ -172,21 +166,18 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
       TAO_Notify_Tests_StructuredPushSupplier (),
       CORBA::NO_MEMORY ());
 
-    suppliers[i]->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    suppliers[i]->init (client->root_poa ());
 
-    suppliers[i]->connect (admin ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    suppliers[i]->connect (admin);
   }
 }
 
 static void
-disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+disconnect_suppliers (void)
 {
   for (unsigned int i = 0; i < supplier_count; ++i)
   {
-    suppliers[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    suppliers[i]->disconnect ();
   }
 }
 
@@ -197,27 +188,23 @@ disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("MyEventChannel", 0);
 
     CORBA::ORB_ptr orb = client.orb ();
 
     sig_impl.reset( new sig_i( orb ) );
-    sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
-      orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->object_to_string (sig.in ());
 
     if (ior_output_file != 0)
     {
@@ -233,10 +220,9 @@ int main (int argc, char* argv[])
     }
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-    create_suppliers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_suppliers (admin.in (), &client);
 
     sig_impl->wait_for_startup();
 
@@ -244,8 +230,7 @@ int main (int argc, char* argv[])
     for (int i = 0; i < event_count; ++i)
     {
       ACE_DEBUG((LM_DEBUG, "+"));
-      SendEvent (i ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      SendEvent (i);
     }
     ACE_DEBUG((LM_DEBUG, "\nEach Supplier sent %d events.\n", event_count));
 
@@ -253,19 +238,16 @@ int main (int argc, char* argv[])
 
     ACE_OS::unlink (ior_output_file);
 
-    disconnect_suppliers(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    disconnect_suppliers();
 
-    ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ec->destroy();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
index a18e675b8e3..8dfe8cd9804 100755
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $experiment_timeout = 60;
 $startup_timeout = 60;
 $shutdown_timeout = 10;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index d8cb3fe8a76..5fb18be9cff 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -29,25 +29,20 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::SEQUENCE_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxysupplier.in ());
 
   CosNotification::QoSProperties properties (3);
   properties.length (3);
@@ -66,19 +61,16 @@ Notify_Sequence_Push_Consumer::_connect (
   }
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_sequence_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
-  const CosNotification::EventBatch& events
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (count_ == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
index a7fe36f0288..5d22ffdc2a2 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
@@ -31,13 +31,11 @@ public:
                                  int expected_count,
                                  Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_events (const CosNotification::EventBatch&
-                               ACE_ENV_ARG_DECL)
+  void push_structured_events (const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index d8e9f5a6552..4ed908f305e 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -30,25 +30,20 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 
 void
 Notify_Structured_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxysupplier.in ());
 
   if (use_ordering_)
   {
@@ -60,20 +55,16 @@ Notify_Structured_Push_Consumer::_connect (
     this->proxy_->set_qos (properties);
   }
 
-  this->proxy_->connect_structured_push_consumer (objref.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
 void
 Notify_Structured_Push_Consumer::push_structured_event (
-                          const CosNotification::StructuredEvent& event
-                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+                          const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
@@ -90,7 +81,7 @@ Notify_Structured_Push_Consumer::push_structured_event (
   {
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: too many events received.\n")));
   }
- 
+
   if (this->count_ >= this->expected_)
   {
     this->client_.consumer_done (this);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
index 01b5b69c922..fb764f049cf 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
@@ -32,13 +32,11 @@ public:
                         int expected,
                         Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_event (const CosNotification::StructuredEvent&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 79f44545167..03626895a55 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -92,16 +92,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
 }
@@ -109,8 +106,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   ACE_NEW_THROW_EX (consumer_1,
     Notify_Sequence_Push_Consumer ("consumer1",
@@ -120,66 +116,53 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
     *client),
     CORBA::NO_MEMORY ());
 
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->_connect (admin);
 }
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      create_consumeradmin (ec.in ());
 
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-    create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_consumers (admin.in (), &client);
 
-    sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
-    consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    consumer_1->disconnect();
 
-    sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->done ();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index c1d572de8c2..5403daa0e41 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -30,13 +30,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -132,23 +132,20 @@ Supplier_Client::parse_args (int argc, char *argv[])
 }
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendBatch (int batch_id ACE_ENV_ARG_DECL)
+SendBatch (int batch_id)
 {
   CosNotification::EventBatch events;
   events.length(BATCH_SIZE);
@@ -175,24 +172,20 @@ SendBatch (int batch_id ACE_ENV_ARG_DECL)
 
     events[i] = event;
   }
-  supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->send_events (events);
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (admin);
 }
 
 
@@ -203,34 +196,29 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("MyEventChannel", 0);
 
     CosNotification::QoSProperties qos (1);
     qos.length (1);
     qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy);
     qos[0].value <<= order_policy;
-    ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ec->set_qos (qos);
 
     CORBA::ORB_ptr orb = client.orb ();
 
     sig_impl.reset( new sig_i( orb ) );
-    sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
-      orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->object_to_string (sig.in ());
 
     if (ior_output_file != 0)
     {
@@ -246,10 +234,9 @@ int main (int argc, char* argv[])
     }
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-    create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_suppliers (admin.in (), client.root_poa ());
 
     sig_impl->wait_for_startup();
 
@@ -257,8 +244,7 @@ int main (int argc, char* argv[])
     for (int i = 0; i < num_events / BATCH_SIZE; ++i)
     {
       ACE_DEBUG((LM_DEBUG, "+"));
-      SendBatch (i ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      SendBatch (i);
     }
     ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -266,19 +252,16 @@ int main (int argc, char* argv[])
 
     ACE_OS::unlink (ior_output_file);
 
-    supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier_1->disconnect();
 
-    ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ec->destroy();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index d86df34f06b..4164884e289 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -88,24 +88,20 @@ Consumer_Client::parse_args (int argc, char *argv[])
 }
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
 }
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the first consumer
   ACE_NEW_THROW_EX (consumer_1,
@@ -115,67 +111,54 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
     expected,
     *client),
     CORBA::NO_MEMORY ());
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->_connect (admin);
 }
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      create_consumeradmin (ec.in ());
 
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
 
-    create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_consumers (admin.in (), &client);
 
-    sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
-    consumer_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    consumer_1->disconnect();
 
-    sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->done ();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index bda45d89f6c..ceafea4d1a5 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -29,13 +29,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -134,23 +134,20 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
+SendEvent (int id)
 {
   CosNotification::StructuredEvent event;
 
@@ -168,66 +165,56 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
     CORBA::string_dup (CosNotification::Timeout);
   event.header.variable_header[2].value <<= (TimeBase::TimeT) (num_events - id);
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier_1->send_event (event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (admin);
 }
 
 int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("MyEventChannel", 0);
 
     CosNotification::QoSProperties qos (1);
     qos.length (1);
     qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy);
     qos[0].value <<= order_policy;
-    ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ec->set_qos (qos);
 
     CORBA::ORB_ptr orb = client.orb ();
 
     sig_impl.reset( new sig_i( orb ) );
-    sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig_impl->_this ();
 
     CORBA::String_var ior =
-      orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->object_to_string (sig.in ());
 
     if (ior_output_file != 0)
     {
@@ -243,10 +230,9 @@ int main (int argc, char* argv[])
     }
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
     ACE_ASSERT(!CORBA::is_nil (admin.in ()));
-    create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_suppliers (admin.in (), client.root_poa ());
 
     sig_impl->wait_for_startup();
 
@@ -254,8 +240,7 @@ int main (int argc, char* argv[])
     for (int i = 0; i < num_events; ++i)
     {
       ACE_DEBUG((LM_DEBUG, "+"));
-      SendEvent (i ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      SendEvent (i);
     }
     ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -263,19 +248,16 @@ int main (int argc, char* argv[])
 
     ACE_OS::unlink (ior_output_file);
 
-    supplier_1->disconnect(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier_1->disconnect();
 
-    ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ec->destroy();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: ");
+    e._tao_print_exception ("Error: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
index 8fe983cb0ac..5039cf66d1a 100755
--- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $ior = PerlACE::LocalFile ("supplier.ior");
 $notifyior = PerlACE::LocalFile ("notify.ior");
 $naming_ior = PerlACE::LocalFile ("naming.ior");
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
index db1cbb75260..9e23199a111 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.cpp
@@ -13,8 +13,7 @@ bool
 Test_Saver::begin_object(CORBA::Long id,
       const ACE_CString &type,
       const TAO_Notify::NVPList& attrs,
-      bool changed
-      ACE_ENV_ARG_DECL_NOT_USED)
+      bool changed)
 {
   ACE_OS::fprintf (stdout, "Test_Saver::begin_object type=\"%s\""
                    "  id=%d changed=\"%d\"", type.c_str(), id, changed);
@@ -29,7 +28,7 @@ Test_Saver::begin_object(CORBA::Long id,
 
 void
 Test_Saver::end_object (CORBA::Long id,
-      const ACE_CString &type ACE_ENV_ARG_DECL_NOT_USED)
+      const ACE_CString &type)
 {
   ACE_OS::fprintf (stdout, "Test_Saver::end_object type=\"%s\" id=%d\n",
                    type.c_str(), id);
diff --git a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
index 287832cf336..f7c13b36c47 100644
--- a/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
+++ b/TAO/orbsvcs/tests/Notify/PluggableTopology/Test_Saver.h
@@ -26,12 +26,10 @@ public:
    virtual bool begin_object (CORBA::Long id,
       const ACE_CString &type,
       const TAO_Notify::NVPList& attrs,
-      bool changed
-      ACE_ENV_ARG_DECL);
+      bool changed);
 
     virtual void end_object (CORBA::Long id,
-      const ACE_CString &type
-      ACE_ENV_ARG_DECL);
+      const ACE_CString &type);
 };
 
 
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
index 7bb9c0d3801..cdb315860a1 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp
@@ -16,11 +16,10 @@ TAO_Notify_Tests_RT_Application_Command::~TAO_Notify_Tests_RT_Application_Comman
 }
 
 void
-TAO_Notify_Tests_RT_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_Application_Command::handle_init (void)
 {
   // Call the Base class.
-  TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Notify_Tests_Application_Command::handle_init ();
 
   CORBA::ORB_var orb;
 
@@ -28,8 +27,7 @@ TAO_Notify_Tests_RT_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO_Notify_Tests_RT_Priority_Mapping* mapping = new TAO_Notify_Tests_RT_Priority_Mapping ();
 
-  mapping->init (orb.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  mapping->init (orb.in ());
 
   LOOKUP_MANAGER->_register (mapping);
 }
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
index 34376e99515..88493add5f7 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h
@@ -36,7 +36,7 @@ public:
   /// Destructor
   ~TAO_Notify_Tests_RT_Application_Command ();
 
-  virtual void handle_init (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void handle_init (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 4d9aa177a6c..74766c7287b 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -177,7 +177,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_POA_Command::execute_i (void)
 {
   if (this->command_ == CREATE)
     {
@@ -188,14 +188,10 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
 
       // Resolve RTORB
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB"
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       // Resolve parent poa.
       PortableServer::POA_var parent_poa;
@@ -203,8 +199,7 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
       LOOKUP_MANAGER->resolve (parent_poa);
 
       // Create the POA.
-      this->create (rt_orb.in (), parent_poa.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->create (rt_orb.in (), parent_poa.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Created RT POA %s\n", this->POA_name_.c_str ()));
     }
@@ -212,18 +207,16 @@ TAO_Notify_Tests_RT_POA_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       PortableServer::POA_var poa;
 
-      LOOKUP_MANAGER->resolve (poa, this->POA_name_.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      LOOKUP_MANAGER->resolve (poa, this->POA_name_.c_str ());
 
-      poa->destroy (1,0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa->destroy (1,0);
 
       ACE_DEBUG ((LM_DEBUG, "Destroyed RT POA %s\n", this->POA_name_.c_str ()));
     }
 }
 
 void
-TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa)
 {
   /*
     lanes bands priomodel
@@ -253,9 +246,7 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
   // Create a priority model policy.
   priority_model_policy =
     rt_orb->create_priority_model_policy (priority_model_,
-                                          server_priority_
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          server_priority_);
 
   if (lanes_.length () != 0)
     {
@@ -275,16 +266,12 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              max_request_buffer_size);
 
 
       // Create a thread-pool policy.
       lanes_policy =
-        rt_orb->create_threadpool_policy (threadpool_id
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id);
 
     }
   else if (thread_pool_static_threads_ > 0)
@@ -305,30 +292,23 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
                                  default_priority,
                                  allow_request_buffering,
                                  max_buffered_requests,
-                                 max_request_buffer_size
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 max_request_buffer_size);
 
       thread_pool_policy =
-                rt_orb->create_threadpool_policy (threadpool_id
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                rt_orb->create_threadpool_policy (threadpool_id);
     }
 
   if (bands_.length () != 0)
     {
       // Create a bands policy.
       bands_policy =
-        rt_orb->create_priority_banded_connection_policy (this->bands_
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rt_orb->create_priority_banded_connection_policy (this->bands_);
     }
 
   CORBA::PolicyList poa_policy_list;
 
   CORBA::Policy_var activation_policy =
-    parent_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    parent_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   if (lanes_.length () == 0 && thread_pool_static_threads_ == 0 && bands_.length () == 0)
     {
@@ -379,12 +359,9 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
 
   // Get the POA Manager.
   PortableServer::POAManager_var poa_manager =
-    parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    parent_poa->the_POAManager ();
 
   parent_poa->create_POA (POA_name_.c_str (),
                           poa_manager.in (),
-                          poa_policy_list
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          poa_policy_list);
 }
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
index b5bcb27a825..cf1ae6b5c80 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
@@ -45,7 +45,7 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void execute_i (void);
 
   /// Get the command name.
   virtual const char* get_name (void);
@@ -53,7 +53,7 @@ public:
 
 protected:
   /// Create the POA with the params parsed.
-  void create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
+  void create (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa);
 
 #ifdef HPUX_11
    // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
index ee30db74bd1..7b9cf2c5d67 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp
@@ -11,16 +11,12 @@ TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping (voi
 }
 
 void
-TAO_Notify_Tests_RT_Priority_Mapping::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_Priority_Mapping::init (CORBA::ORB_ptr orb)
 {
-  CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager"
-                                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = orb->resolve_initial_references ("PriorityMappingManager");
 
   RTCORBA::PriorityMappingManager_var mapping_manager =
-    RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
   this->priority_mapping_ = mapping_manager->mapping ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
index 0e8d308e656..5d40993f662 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h
@@ -35,7 +35,7 @@ public:
   virtual ~TAO_Notify_Tests_RT_Priority_Mapping (void);
 
   /// Init the Mapping manager.
-  void init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  void init (CORBA::ORB_ptr orb);
 
   virtual CORBA::Boolean
       to_native (CORBA::Short corba_priority,
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 43acfd70c38..0212a144027 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -68,7 +68,6 @@ void
 StructuredPushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -135,8 +134,7 @@ StructuredPushConsumer_i::check_serial_number (CORBA::ULong seq)
 
 void
 StructuredPushConsumer_i::push_structured_event (
-        const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL)
+        const CosNotification::StructuredEvent & notification)
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected))
 {
@@ -158,8 +156,7 @@ StructuredPushConsumer_i::push_structured_event (
       ACE_TEXT ("(%P|%t) Structured Consumer failing at event # %d.\n"),
       static_cast<int>(this->received_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
-    ACE_CHECK;
+    throw CORBA::UNKNOWN();
   }
   if (notification.filterable_data.length () > 0)
   {
@@ -229,7 +226,6 @@ StructuredPushConsumer_i::push_structured_event (
 
 void
 StructuredPushConsumer_i::disconnect_structured_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -291,7 +287,6 @@ void
 SequencePushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -358,7 +353,6 @@ SequencePushConsumer_i::check_serial_number (CORBA::ULong seq)
 void
 SequencePushConsumer_i::push_structured_events (
       const CosNotification::EventBatch & notifications
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
       CosEventComm::Disconnected))
@@ -392,8 +386,7 @@ SequencePushConsumer_i::push_structured_events (
         static_cast<int>(this->received_),
         static_cast<int>(nevent + 1)
         ));
-      ACE_THROW (CORBA::UNKNOWN());
-      ACE_CHECK;
+      throw CORBA::UNKNOWN();
     }
     const CosNotification::StructuredEvent & notification = notifications[nevent];
     if (notification.filterable_data.length () > 0)
@@ -452,7 +445,6 @@ SequencePushConsumer_i::push_structured_events (
 
 void
 SequencePushConsumer_i::disconnect_sequence_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -514,7 +506,6 @@ void
 AnyPushConsumer_i::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -581,7 +572,6 @@ AnyPushConsumer_i::check_serial_number (CORBA::ULong seq)
 void
 AnyPushConsumer_i::push (
         const CORBA::Any & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected))
@@ -604,8 +594,7 @@ AnyPushConsumer_i::push (
       ACE_TEXT ("(%P|%t) Any Consumer failing at event # %d.\n"),
       static_cast<int>(this->received_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
-    ACE_CHECK;
+    throw CORBA::UNKNOWN();
   }
   CORBA::ULong seq = 0;
   if (data >>= seq)
@@ -666,7 +655,6 @@ AnyPushConsumer_i::push (
 
 void
 AnyPushConsumer_i::disconnect_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -694,18 +682,15 @@ ReconnectionCallback_i::reconnect_count () const
 void
 ReconnectionCallback_i::reconnect (
     CORBA::Object_ptr reconnection
-    ACE_ENV_ARG_DECL
   ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Consumer received reconnection request\n")
     ));
-  this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection);
   if (!CORBA::is_nil (this->ecf_.in ()))
   {
-    this->consumer_main_.reconnect (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->consumer_main_.reconnect (this->ecf_.in ());
     this->reconnect_count_ += 1;
   }
   else
@@ -717,7 +702,7 @@ ReconnectionCallback_i::reconnect (
 }
 
 CORBA::Boolean
-ReconnectionCallback_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ReconnectionCallback_i::is_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Boolean (1);
@@ -733,16 +718,14 @@ ReconnectionCallback_i::~ReconnectionCallback_i ()
 
 
 void
-ReconnectionCallback_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+ReconnectionCallback_i::fini (void)
 {
   if (this->id_is_valid_)
   {
     NotifyExt::ReconnectionRegistry_var registry =
-      NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in ());
 
-    registry->unregister_callback (this->callback_id_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    registry->unregister_callback (this->callback_id_);
     this->id_is_valid_ = false;
   }
 }
@@ -750,28 +733,22 @@ ReconnectionCallback_i::fini (ACE_ENV_SINGLE_ARG_DECL)
 void
 ReconnectionCallback_i::init (
   PortableServer::POA_ptr poa,
-  CosNotifyChannelAdmin::EventChannelFactory_ptr ecf
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::EventChannelFactory_ptr ecf)
 {
   this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf);
   PortableServer::ObjectId_var reconnection_callback_id =
-    poa->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->activate_object (this);
 
   CORBA::Object_var obj =
-    poa->id_to_reference (reconnection_callback_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id_to_reference (reconnection_callback_id.in ());
 
   NotifyExt::ReconnectionCallback_var callback =
-    NotifyExt::ReconnectionCallback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    NotifyExt::ReconnectionCallback::_narrow (obj.in ());
 
   NotifyExt::ReconnectionRegistry_var registry =
-    NotifyExt::ReconnectionRegistry::_narrow (ecf ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    NotifyExt::ReconnectionRegistry::_narrow (ecf);
 
-  this->callback_id_ = registry->register_callback (callback.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->callback_id_ = registry->register_callback (callback.in ());
   this->id_is_valid_ = true;
 }
 
@@ -915,10 +892,9 @@ void Consumer_Main::usage(FILE * out)const
     , out);
 }
 
-int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+int Consumer_Main::init (int argc, char *argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   if (0 != this->parse_args(argc, argv))
   {
@@ -926,9 +902,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
   {
@@ -938,25 +912,20 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   if (this->use_naming_service_ )
   {
-    this->find_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    this->find_notify_factory ();
   }
   else
   {
-    int ok = resolve_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    int ok = resolve_notify_factory ();
     if (!ok)
     {
       return -1;
@@ -965,11 +934,9 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
   this->reconnecting_ = load_ids ();
 
-  init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  init_event_channel ();
 
-  init_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  init_consumer_admin ();
 
   switch (this->mode_)
   {
@@ -984,8 +951,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
           ));
       }
       this->structured_push_consumer_.set_expectations (this->expect_, this->fail_, this->serial_number_, this->verbose_);
-      init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      init_structured_proxy_supplier ();
       break;
     }
     case MODE_SEQUENCE:
@@ -999,8 +965,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
           ));
       }
       this->sequence_push_consumer_.set_expectations (this->expect_, this->fail_, this->serial_number_, this->verbose_);
-      init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      init_sequence_proxy_supplier ();
       break;
     }
     case MODE_ANY:
@@ -1014,8 +979,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
           ));
       }
       this->any_push_consumer_.set_expectations (this->expect_, this->fail_, this->serial_number_, this->verbose_);
-      init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      init_any_proxy_supplier ();
       break;
     }
     default:
@@ -1029,9 +993,7 @@ int Consumer_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
   this->reconnection_callback_.init (
     this->root_poa_.in (),
-    this->ecf_.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->ecf_.in ());
 
   save_ids ();
   return 0;
@@ -1124,8 +1086,7 @@ Consumer_Main::load_ids()
 
 void
 Consumer_Main::reconnect (
-    CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-    ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->verbose_)
@@ -1136,32 +1097,27 @@ Consumer_Main::reconnect (
   }
   this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (dest_factory);
   this->reconnecting_ = true;
-  init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  init_event_channel ();
 
-  init_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  init_consumer_admin ();
 
   switch (this->mode_)
   {
     case MODE_STRUCTURED:
     {
-      init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      init_structured_proxy_supplier ();
       break;
     }
 
     case MODE_SEQUENCE:
     {
-      init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      init_sequence_proxy_supplier ();
       break;
     }
 
     case MODE_ANY                                                                                            :
     {
-      init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      init_any_proxy_supplier ();
       break;
     }
   }
@@ -1175,30 +1131,25 @@ Consumer_Main::reconnect (
 
 
 int
-Consumer_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::resolve_naming_service (void)
 {
   // ignore redundant calls
   if (CORBA::is_nil (this->naming_context_.in ()))
   {
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
   }
 
   return !CORBA::is_nil (this->naming_context_.in ());
 }
 
 int
-Consumer_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::find_notify_factory (void)
 {
-  int status = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  int status = this->resolve_naming_service ();
   if (status)
   {
     CosNaming::Name name (1);
@@ -1206,48 +1157,38 @@ Consumer_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
     name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
     CORBA::Object_var obj =
-      this->naming_context_->resolve (name
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      this->naming_context_->resolve (name);
 
     this->ecf_ =
       CosNotifyChannelAdmin::EventChannelFactory::_narrow (
                                                       obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER
                                                     );
-    ACE_CHECK_RETURN(0);
   }
   return ! CORBA::is_nil (this->ecf_.in ());
 }
 
 int
-Consumer_Main::resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::resolve_notify_factory (void)
 {
   CORBA::Object_var factory_obj =
-    this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME);
 
   this->ecf_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-      factory_obj.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+      factory_obj.in ());
   return ! CORBA::is_nil (this->ecf_.in ());
 }
 
 void
-Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_event_channel (void)
 {
   bool ok = false;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       this->ec_ = this->ecf_->get_event_channel (
-            this->ec_id_
-            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+            this->ec_id_);
       ok = ! CORBA::is_nil (this->ec_.in ());
       if (ok && this->verbose_)
       {
@@ -1257,10 +1198,9 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   // if we don't have a channel yet, and a channel id file was specified
@@ -1275,13 +1215,10 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
       ACE_OS::fclose (chf);
       this->ec_id_ = ACE_OS::atoi (buffer);
 
-      ACE_DECLARE_NEW_ENV;
-      ACE_TRY_EX (unique_label_1)
+      try
       {
         this->ec_ = this->ecf_->get_event_channel (
-              this->ec_id_
-              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (unique_label_1)
+              this->ec_id_);
         ok = ! CORBA::is_nil (this->ec_.in ());
         if (ok)
         {
@@ -1296,10 +1233,9 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
           this->channel_file_ = "";
         }
       }
-      ACE_CATCHALL
+      catch (...)
       {
       }
-      ACE_ENDTRY;
     }
   }
 
@@ -1343,9 +1279,7 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
     ec_ = this->ecf_->create_channel (
           qosprops,
           adminprops,
-          this->ec_id_
-          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+          this->ec_id_);
     ok = ! CORBA::is_nil (ec_.in ());
     if (ok && this->verbose_)
     {
@@ -1371,17 +1305,16 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
 CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1);
 
 void
-Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_consumer_admin (void)
 {
   bool ok = false;
   if (this->reconnecting_)
   {
     if (this->sa_id_ == default_admin_id)
     {
-      ACE_TRY_EX(TWO)
+      try
       {
-        this->sa_ = this->ec_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX(TWO);
+        this->sa_ = this->ec_->default_consumer_admin ();
         ok = ! CORBA::is_nil (this->sa_.in ());
         this->sa_id_ = default_admin_id;
         if (ok && this->verbose_)
@@ -1397,19 +1330,16 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
             ));
         }
       }
-      ACE_CATCHALL
+      catch (...)
       {
       }
-      ACE_ENDTRY;
     }
     else // not default admin
     {
-      ACE_TRY_EX(ONE)
+      try
       {
         this->sa_ = this->ec_->get_consumeradmin(
-          this->sa_id_
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX(ONE);
+          this->sa_id_);
         ok = ! CORBA::is_nil (this->sa_.in ());
         if (ok && this->verbose_)
         {
@@ -1419,18 +1349,16 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
             ));
         }
       }
-      ACE_CATCHALL
+      catch (...)
       {
       }
-      ACE_ENDTRY;
     }
   }
   else // !reconnecting
   {
-    ACE_TRY_EX(THREE)
+    try
     {
-      this->sa_ = this->ec_->default_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(THREE);
+      this->sa_ = this->ec_->default_consumer_admin ();
       ok = ! CORBA::is_nil (this->sa_.in ());
       this->sa_id_ = default_admin_id;
       if (ok && this->verbose_)
@@ -1446,18 +1374,15 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
 
     if (!ok)
     {
       this->sa_ = this->ec_->new_for_consumers(
         CosNotifyChannelAdmin::OR_OP,
-        this->sa_id_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->sa_id_);
       ok = ! CORBA::is_nil (this->sa_.in ());
 
 #ifdef TEST_SET_QOS
@@ -1473,8 +1398,7 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
         qosprops[i].name = CORBA::string_dup(CosNotification::ConnectionReliability);
         qosprops[i++].value <<= CosNotification::Persistent; // Required, or we won't persist much
         qosprops.length(i);
-        this->sa_->set_qos (qosprops ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        this->sa_->set_qos (qosprops);
       }
 #endif
 
@@ -1496,19 +1420,17 @@ Consumer_Main::init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
   }
 }
 void
-Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_structured_proxy_supplier (void)
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_supplier (
                            this->structured_proxy_id_
-                          ACE_ENV_ARG_PARAMETER
                         );
-      ACE_TRY_CHECK;
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -1518,19 +1440,16 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_supplier(
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
-        this->structured_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        this->structured_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
     if (ok && this->verbose_)
     {
@@ -1541,31 +1460,27 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
     }
   }
   this->structured_proxy_push_supplier_ =
-    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->structured_proxy_push_supplier_.in ()))
   {
     ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) init_structured_proxy_supplier received nil ProxySupplier\n")
         ));
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
   }
 
   if (CORBA::is_nil (this->structured_push_consumer_ref_.in ()))
   {
     PortableServer::ObjectId_var push_consumer_id =
       this->root_poa_->activate_object (
-        &(this->structured_push_consumer_) ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        &(this->structured_push_consumer_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->root_poa_->id_to_reference (push_consumer_id.in ());
 
     this->structured_push_consumer_ref_ =
-      CosNotifyComm::StructuredPushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      CosNotifyComm::StructuredPushConsumer::_narrow (obj.in ());
   }
 
   if (CORBA::is_nil (this->structured_push_consumer_ref_.in ()))
@@ -1574,29 +1489,25 @@ Consumer_Main::init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TEXT ("(%P|%t) Consumer: Error activating structured push consumer\n")
       ));
 
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   this->structured_proxy_push_supplier_->connect_structured_push_consumer (
-    this->structured_push_consumer_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->structured_push_consumer_ref_.in ());
   this->structured_push_consumer_.set_connected(true);
 }
 
 void
-Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_sequence_proxy_supplier (void)
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_supplier(
-        this->sequence_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sequence_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -1606,26 +1517,22 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_supplier(
         CosNotifyChannelAdmin::SEQUENCE_EVENT,
-        this->sequence_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        this->sequence_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
 #ifdef TEST_SET_QOS
     // temporary
     if (ok)
     {
-      set_proxy_qos (proxy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      set_proxy_qos (proxy.in ());
     }
 #endif // TEST_SET_QOS
     if (ok && this->verbose_)
@@ -1637,8 +1544,7 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
     }
   }
   this->sequence_proxy_push_supplier_ =
-    CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->sequence_proxy_push_supplier_.in ()))
   {
@@ -1647,23 +1553,20 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
         static_cast<int>(this->sequence_proxy_id_)
       ));
 
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   if (CORBA::is_nil (this->sequence_push_consumer_ref_.in ()))
   {
     PortableServer::ObjectId_var push_consumer_id =
       this->root_poa_->activate_object (
-        &(this->sequence_push_consumer_) ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        &(this->sequence_push_consumer_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->root_poa_->id_to_reference (push_consumer_id.in ());
 
     this->sequence_push_consumer_ref_ =
-      CosNotifyComm::SequencePushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      CosNotifyComm::SequencePushConsumer::_narrow (obj.in ());
   }
   if (CORBA::is_nil (this->sequence_push_consumer_ref_.in ()))
   {
@@ -1671,21 +1574,18 @@ Consumer_Main::init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TEXT ("(%P|%t) Consumer: Error activating sequence push consumer\n")
       ));
 
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
 
   this->sequence_proxy_push_supplier_->connect_sequence_push_consumer (
-    this->sequence_push_consumer_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->sequence_push_consumer_ref_.in ());
   this->sequence_push_consumer_.set_connected(true);
 
 }
 
 
 void
-Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy
-  ACE_ENV_ARG_DECL)
+Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy)
 {
   // temporary: be sure we can set qos properties for proxyw
   CosNotification::QoSProperties qosprops(2);
@@ -1697,23 +1597,20 @@ Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy
   qosprops[i].name = CORBA::string_dup(CosNotification::ConnectionReliability);
   qosprops[i++].value <<= CosNotification::Persistent; // Required, or we won't persist much
   qosprops.length(i);
-  proxy->set_qos (qosprops ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy->set_qos (qosprops);
 }
 
 void
-Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
+Consumer_Main::init_any_proxy_supplier (void)
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxySupplier_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_supplier(
-        this->any_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->any_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -1730,31 +1627,28 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) Consumer: Get proxy supplier %d threw exception\n"),
         static_cast<int>(this->any_proxy_id_)
         ));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_TEXT ("Error:"));
+      ex._tao_print_exception (ACE_TEXT ("Error:"));
     }
-    ACE_CATCHALL
+    catch (...)
     {
       ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("Error: (%P|%t) Consumer: Get proxy supplier %d threw exception\n"),
         static_cast<int>(this->any_proxy_id_)
         ));
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_supplier(
         CosNotifyChannelAdmin::ANY_EVENT,
-        this->any_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        this->any_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
 
     if (ok && this->verbose_)
@@ -1766,8 +1660,7 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
     }
   }
   this->any_proxy_push_supplier_ =
-    CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->any_proxy_push_supplier_.in ()))
   {
@@ -1775,22 +1668,19 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TEXT ("(%P|%t) Consumer: Received wrong type of push supplier proxy %d\n"),
         static_cast<int>(this->any_proxy_id_)
       ));
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
   if (CORBA::is_nil (this->any_push_consumer_ref_.in ()))
   {
     PortableServer::ObjectId_var push_consumer_id =
       this->root_poa_->activate_object (
-        &(this->any_push_consumer_) ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        &(this->any_push_consumer_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_consumer_id.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->root_poa_->id_to_reference (push_consumer_id.in ());
 
     this->any_push_consumer_ref_ =
-      CosNotifyComm::PushConsumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      CosNotifyComm::PushConsumer::_narrow (obj.in ());
   }
 
   if (CORBA::is_nil (this->any_push_consumer_ref_.in ()))
@@ -1799,38 +1689,32 @@ Consumer_Main::init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TEXT ("(%P|%t) Consumer:Error activating push consumer\n")
       ));
 
-    ACE_THROW (CORBA::BAD_PARAM());
+    throw CORBA::BAD_PARAM();
   }
   this->any_proxy_push_supplier_->connect_any_push_consumer (
-    this->any_push_consumer_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->any_push_consumer_ref_.in ());
 
   this->any_push_consumer_.set_connected(true);
 }
 
-int Consumer_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
+int Consumer_Main::fini (void)
 {
 
-  this->reconnection_callback_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-4);
- 
+  this->reconnection_callback_.fini ();
+
   if (this->disconnect_on_exit_)
   {
     if (!CORBA::is_nil (this->structured_proxy_push_supplier_.in ()))
     {
-      this->structured_proxy_push_supplier_->disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-4);
+      this->structured_proxy_push_supplier_->disconnect_structured_push_supplier ();
     }
     if (!CORBA::is_nil (this->sequence_proxy_push_supplier_.in ()))
     {
-      this->sequence_proxy_push_supplier_->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-4);
+      this->sequence_proxy_push_supplier_->disconnect_sequence_push_supplier ();
     }
     if (!CORBA::is_nil (this->any_proxy_push_supplier_.in ()))
     {
-      this->any_proxy_push_supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-4);
+      this->any_proxy_push_supplier_->disconnect_push_supplier ();
     }
     if (!CORBA::is_nil (this->sa_.in ()) && this->sa_id_ != default_admin_id)
     {
@@ -1849,7 +1733,7 @@ int Consumer_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 
-int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL)
+int Consumer_Main::run (void)
 {
   int result = 0;
 
@@ -1859,8 +1743,7 @@ int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL)
     )
   {
     ACE_Time_Value tv(0, 100 * 1000);
-    this->orb_->run(tv ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(-1);
+    this->orb_->run(tv);
   }
 
   // see if consumers detected errors
@@ -1878,28 +1761,24 @@ main (int argc, char *argv[])
 {
   int result = -1;
   Consumer_Main app;
-  ACE_TRY_NEW_ENV
+  try
   {
-    result = app.init(argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK
+    result = app.init(argc, argv);
 
     if (result == 0)
     {
-      result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = app.run ();
     }
     if (result == 0)
     {
-      app.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      app.fini ();
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: Consumer::main\t\n");
+    ex._tao_print_exception ("Error: Consumer::main\t\n");
     result = -1;
   }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) Consumer exits: code %d\n"),
     result
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index b6326ac31d7..c3bda2e0b63 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -30,7 +30,6 @@ public:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -38,13 +37,11 @@ public:
 
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected));
 
   virtual void disconnect_structured_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -76,7 +73,6 @@ public:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -84,13 +80,11 @@ public:
 
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected));
 
   virtual void disconnect_sequence_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -123,7 +117,6 @@ public:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -131,13 +124,11 @@ public:
 
   virtual void push (
         const CORBA::Any & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException,
         CosEventComm::Disconnected));
 
   virtual void disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -171,19 +162,17 @@ public:
 
   void init (
     PortableServer::POA_ptr poa,
-    CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_
-    ACE_ENV_ARG_DECL);
+    CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_);
 
-  void fini (ACE_ENV_SINGLE_ARG_DECL);
+  void fini (void);
 
   size_t reconnect_count () const;
 
   virtual void reconnect (
       CORBA::Object_ptr reconnection
-      ACE_ENV_ARG_DECL
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean is_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -203,33 +192,32 @@ class Consumer_Main
   int parse_args (int argc, char *argv[]);
   int parse_single_arg (int argc, char *argv[]);
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
-  int run (ACE_ENV_SINGLE_ARG_DECL);
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int init (int argc, char *argv[]);
+  int run (void);
+  int fini (void);
   void usage (FILE * log) const;
 
   void reconnect (
-      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-      ACE_ENV_ARG_DECL)
+      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
   /// Find naming service.
-  int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int resolve_naming_service (void);
 
   /// Resolve the Notify factory from the Naming service.
-  int find_notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  int find_notify_factory (void);
 
   /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory")
-  int resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  int resolve_notify_factory (void);
 
-  void init_event_channel (ACE_ENV_SINGLE_ARG_DECL);
-  void init_consumer_admin (ACE_ENV_SINGLE_ARG_DECL);
-  void init_structured_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL);
-  void init_sequence_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL);
-  void init_any_proxy_supplier (ACE_ENV_SINGLE_ARG_DECL);
+  void init_event_channel (void);
+  void init_consumer_admin (void);
+  void init_structured_proxy_supplier (void);
+  void init_sequence_proxy_supplier (void);
+  void init_any_proxy_supplier (void);
 
-  void set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy ACE_ENV_ARG_DECL);
+  void set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy);
 
   void save_ids();
   bool load_ids();
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 1bd46703440..f2b91f8de26 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -20,7 +20,6 @@ void
 StructuredPushSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -36,7 +35,6 @@ StructuredPushSupplier_i::subscription_change (
 
 void
 StructuredPushSupplier_i::disconnect_structured_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -52,7 +50,6 @@ void
 SequencePushSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -68,7 +65,6 @@ SequencePushSupplier_i::subscription_change (
 
 void
 SequencePushSupplier_i::disconnect_sequence_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -84,7 +80,6 @@ void
 AnyPushSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -100,7 +95,6 @@ AnyPushSupplier_i::subscription_change (
 
 void
 AnyPushSupplier_i::disconnect_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -128,18 +122,15 @@ ReconnectionCallback_i::reconnect_count () const
 void
 ReconnectionCallback_i::reconnect (
     CORBA::Object_ptr reconnection
-    ACE_ENV_ARG_DECL
   ) ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Supplier received reconnection request\n")
     ));
-  this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow (reconnection);
   if (!CORBA::is_nil (this->ecf_.in ()))
   {
-    this->supplier_main_.reconnect (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->supplier_main_.reconnect (this->ecf_.in ());
     this->reconnect_count_ += 1;
   }
   else
@@ -151,7 +142,7 @@ ReconnectionCallback_i::reconnect (
 }
 
 CORBA::Boolean
-ReconnectionCallback_i::is_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ReconnectionCallback_i::is_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Boolean (1);
@@ -166,16 +157,14 @@ ReconnectionCallback_i::~ReconnectionCallback_i ()
 
 
 void
-ReconnectionCallback_i::fini (ACE_ENV_SINGLE_ARG_DECL)
+ReconnectionCallback_i::fini (void)
 {
   if (this->id_is_valid_)
   {
     NotifyExt::ReconnectionRegistry_var registry =
-      NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      NotifyExt::ReconnectionRegistry::_narrow (this->ecf_.in ());
 
-    registry->unregister_callback (this->callback_id_ ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    registry->unregister_callback (this->callback_id_);
     this->id_is_valid_ = false;
   }
 }
@@ -183,28 +172,22 @@ ReconnectionCallback_i::fini (ACE_ENV_SINGLE_ARG_DECL)
 void
 ReconnectionCallback_i::init (
   PortableServer::POA_ptr poa,
-  CosNotifyChannelAdmin::EventChannelFactory_ptr ecf
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::EventChannelFactory_ptr ecf)
 {
   this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf);
   PortableServer::ObjectId_var reconnection_callback_id =
-    poa->activate_object (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->activate_object (this);
 
   CORBA::Object_var obj =
-    poa->id_to_reference (reconnection_callback_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id_to_reference (reconnection_callback_id.in ());
 
   NotifyExt::ReconnectionCallback_var callback =
-    NotifyExt::ReconnectionCallback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    NotifyExt::ReconnectionCallback::_narrow (obj.in ());
 
   NotifyExt::ReconnectionRegistry_var registry =
-    NotifyExt::ReconnectionRegistry::_narrow (ecf ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    NotifyExt::ReconnectionRegistry::_narrow (ecf);
 
-  this->callback_id_ = registry->register_callback (callback.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->callback_id_ = registry->register_callback (callback.in ());
   this->id_is_valid_ = true;
 }
 
@@ -346,10 +329,9 @@ void Supplier_Main::usage(FILE * log)const
       , log);
 }
 
-int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+int Supplier_Main::init (int argc, char *argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   if (0 != this->parse_args(argc, argv))
   {
@@ -357,9 +339,7 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
   {
@@ -369,25 +349,20 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   if (this->use_naming_service_ )
   {
-    this->find_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    this->find_notify_factory ();
   }
   else
   {
-    int ok = resolve_notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
+    int ok = resolve_notify_factory ();
     if (!ok)
     {
       return -1;
@@ -396,31 +371,26 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
   this->reconnecting_ = load_ids ();
 
-  init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  init_event_channel ();
 
-  init_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  init_supplier_admin ();
 
   switch (this->mode_)
   {
     case MODE_STRUCTURED:
     {
-      init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      init_structured_proxy_consumer ();
       break;
     }
     case MODE_SEQUENCE:
     {
-      init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      init_sequence_proxy_consumer ();
       break;
     }
     case MODE_ANY:
     {
 
-      init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      init_any_proxy_consumer ();
       break;
     }
     default:
@@ -433,9 +403,7 @@ int Supplier_Main::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
   }
   this->reconnection_callback_.init (
     this->root_poa_.in (),
-    this->ecf_.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->ecf_.in ());
 
   save_ids ();
   return 0;
@@ -528,36 +496,30 @@ Supplier_Main::load_ids()
 
 void
 Supplier_Main::reconnect (
-    CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-    ACE_ENV_ARG_DECL)
+    CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->ecf_ = CosNotifyChannelAdmin::EventChannelFactory::_duplicate (dest_factory);
   this->reconnecting_ = true;
-  init_event_channel (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  init_event_channel ();
 
-  init_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  init_supplier_admin ();
 
   switch (this->mode_)
   {
     case MODE_STRUCTURED:
     {
-      init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      init_structured_proxy_consumer ();
       break;
     }
     case MODE_SEQUENCE:
     {
-      init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      init_sequence_proxy_consumer ();
       break;
     }
     case MODE_ANY:
     {
-      init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      init_any_proxy_consumer ();
       break;
     }
   }
@@ -565,30 +527,25 @@ Supplier_Main::reconnect (
 
 
 int
-Supplier_Main::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::resolve_naming_service (void)
 {
   // ignore redundant calls
   if (CORBA::is_nil (this->naming_context_.in ()))
   {
     CORBA::Object_var naming_obj =
-      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      CosNaming::NamingContext::_narrow (naming_obj.in ());
   }
 
   return !CORBA::is_nil (this->naming_context_.in ());
 }
 
 int
-Supplier_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::find_notify_factory (void)
 {
-  int status = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  int status = this->resolve_naming_service ();
   if (status)
   {
     CosNaming::Name name (1);
@@ -596,48 +553,38 @@ Supplier_Main::find_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
     name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
     CORBA::Object_var obj =
-      this->naming_context_->resolve (name
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(0);
+      this->naming_context_->resolve (name);
 
     this->ecf_ =
       CosNotifyChannelAdmin::EventChannelFactory::_narrow (
                                                       obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER
                                                     );
-    ACE_CHECK_RETURN(0);
   }
   return ! CORBA::is_nil (this->ecf_.in ());
 }
 
 int
-Supplier_Main::resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::resolve_notify_factory (void)
 {
   CORBA::Object_var factory_obj =
-    this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+    this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME);
 
   this->ecf_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
-      factory_obj.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+      factory_obj.in ());
   return ! CORBA::is_nil (this->ecf_.in ());
 }
 
 void
-Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_event_channel (void)
 {
   bool ok = false;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       this->ec_ = this->ecf_->get_event_channel (
-            this->ec_id_
-            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+            this->ec_id_);
       ok = ! CORBA::is_nil (this->ec_.in ());
       if (ok && this->verbose_)
       {
@@ -647,10 +594,9 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   // if we don't have a channel yet, and a channel id file was specified
@@ -665,13 +611,10 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
       ACE_OS::fclose (chf);
       this->ec_id_ = ACE_OS::atoi (buffer);
 
-      ACE_DECLARE_NEW_ENV;
-      ACE_TRY_EX (unique_label_1)
+      try
       {
         this->ec_ = this->ecf_->get_event_channel (
-              this->ec_id_
-              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (unique_label_1)
+              this->ec_id_);
         ok = ! CORBA::is_nil (this->ec_.in ());
         if (ok)
         {
@@ -686,10 +629,9 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
           this->channel_file_ = "";
         }
       }
-      ACE_CATCHALL
+      catch (...)
       {
       }
-      ACE_ENDTRY;
     }
   }
 
@@ -733,9 +675,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
     ec_ = this->ecf_->create_channel (
           qosprops,
           adminprops,
-          this->ec_id_
-          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+          this->ec_id_);
     ok = ! CORBA::is_nil (ec_.in ());
     if (ok && this->verbose_)
     {
@@ -761,17 +701,15 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
 CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1);
 
 void
-Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_supplier_admin (void)
 {
   bool ok = false;
   if (this->reconnecting_ && this->sa_id_ != default_admin_id)
   {
-    ACE_TRY_EX(ONE)
+    try
     {
       this->sa_ = this->ec_->get_supplieradmin(
-        this->sa_id_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(ONE);
+        this->sa_id_);
       ok = ! CORBA::is_nil (this->sa_.in ());
       if (ok && this->verbose_)
       {
@@ -781,18 +719,16 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
-    ACE_TRY_EX(TWO)
+    try
     {
-      this->sa_ = this->ec_->default_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(TWO);
+      this->sa_ = this->ec_->default_supplier_admin ();
       ok = ! CORBA::is_nil (this->sa_.in ());
       this->sa_id_ = default_admin_id;
       if (ok && this->verbose_)
@@ -808,19 +744,16 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     this->sa_ = this->ec_->new_for_suppliers(
       CosNotifyChannelAdmin::OR_OP,
-      this->sa_id_
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->sa_id_);
     ok = ! CORBA::is_nil (this->sa_.in ());
     if (ok && this->verbose_)
     {
@@ -833,19 +766,17 @@ Supplier_Main::init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_structured_proxy_consumer (void)
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_consumer (
                           this->structured_proxy_id_
-                          ACE_ENV_ARG_PARAMETER
                         );
-      ACE_TRY_CHECK;
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -855,19 +786,16 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_consumer(
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
-        this->structured_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        this->structured_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
     if (ok && this->verbose_)
     {
@@ -878,30 +806,26 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
     }
   }
   this->structured_proxy_push_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->structured_proxy_push_consumer_.in ()))
   {
     ACE_ERROR ((LM_ERROR,
         ACE_TEXT ("(%P|%t) init_structured_proxy_consumer received nil ProxyConsumer\n")
         ));
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+    throw CORBA::OBJECT_NOT_EXIST ();
   }
   if (CORBA::is_nil (this->structured_push_supplier_ref_.in ()))
   {
     PortableServer::ObjectId_var push_supplier_id =
       this->root_poa_->activate_object (
-        &(this->structured_push_supplier_) ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        &(this->structured_push_supplier_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->root_poa_->id_to_reference (push_supplier_id.in ());
 
     this->structured_push_supplier_ref_ =
-      CosNotifyComm::StructuredPushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      CosNotifyComm::StructuredPushSupplier::_narrow (obj.in ());
   }
   if (CORBA::is_nil (structured_push_supplier_ref_.in ()))
   {
@@ -910,28 +834,24 @@ Supplier_Main::init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
         static_cast<int>(this->structured_proxy_id_)
       ));
 
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   this->structured_proxy_push_consumer_->connect_structured_push_supplier (
-    structured_push_supplier_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    structured_push_supplier_ref_.in ());
 }
 
 void
-Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_sequence_proxy_consumer (void)
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_consumer(
-        this->sequence_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sequence_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -941,19 +861,16 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_consumer(
         CosNotifyChannelAdmin::SEQUENCE_EVENT,
-        this->sequence_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        this->sequence_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
     if (ok && this->verbose_)
     {
@@ -964,8 +881,7 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
     }
   }
   this->sequence_proxy_push_consumer_ =
-    CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->sequence_proxy_push_consumer_.in ()))
   {
@@ -973,23 +889,20 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
         static_cast<int>(this->sequence_proxy_id_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   if (CORBA::is_nil (this->sequence_push_supplier_ref_.in ()))
   {
     PortableServer::ObjectId_var push_supplier_id =
       this->root_poa_->activate_object (
-        &(this->sequence_push_supplier_) ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        &(this->sequence_push_supplier_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->root_poa_->id_to_reference (push_supplier_id.in ());
 
     this->sequence_push_supplier_ref_ =
-      CosNotifyComm::SequencePushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      CosNotifyComm::SequencePushSupplier::_narrow (obj.in ());
   }
   if (CORBA::is_nil (sequence_push_supplier_ref_.in ()))
   {
@@ -997,28 +910,24 @@ Supplier_Main::init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
         static_cast<int>(this->sequence_proxy_id_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   this->sequence_proxy_push_consumer_->connect_sequence_push_supplier (
-    sequence_push_supplier_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    sequence_push_supplier_ref_.in ());
 }
 
 void
-Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
+Supplier_Main::init_any_proxy_consumer (void)
 {
   bool ok = false;
   CosNotifyChannelAdmin::ProxyConsumer_var proxy;
   if (this->reconnecting_)
   {
-    ACE_TRY_NEW_ENV
+    try
     {
       proxy = this->sa_->get_proxy_consumer(
-        this->any_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->any_proxy_id_);
       ok = ! CORBA::is_nil (proxy.in ());
       if (ok && this->verbose_)
       {
@@ -1028,19 +937,16 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
     }
-    ACE_CATCHALL
+    catch (...)
     {
     }
-    ACE_ENDTRY;
   }
 
   if (!ok)
   {
     proxy = this->sa_->obtain_notification_push_consumer(
         CosNotifyChannelAdmin::ANY_EVENT,
-        this->any_proxy_id_
-        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        this->any_proxy_id_);
     ok = ! CORBA::is_nil (proxy.in ());
     if (ok && this->verbose_)
     {
@@ -1051,8 +957,7 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
     }
   }
   this->any_proxy_push_consumer_ =
-    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(proxy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(proxy.in ());
 
   if (CORBA::is_nil (this->any_proxy_push_consumer_.in ()))
   {
@@ -1060,23 +965,20 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
         static_cast<int>(this->any_proxy_id_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   if (CORBA::is_nil (this->any_push_supplier_ref_.in ()))
   {
     PortableServer::ObjectId_var push_supplier_id =
       this->root_poa_->activate_object (
-        &(this->any_push_supplier_) ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+        &(this->any_push_supplier_));
 
     CORBA::Object_var obj =
-      this->root_poa_->id_to_reference (push_supplier_id.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      this->root_poa_->id_to_reference (push_supplier_id.in ());
 
     this->any_push_supplier_ref_ =
-      CosNotifyComm::PushSupplier::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      CosNotifyComm::PushSupplier::_narrow (obj.in ());
   }
   if (CORBA::is_nil (any_push_supplier_ref_.in ()))
   {
@@ -1084,21 +986,18 @@ Supplier_Main::init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_TEXT ("(%P|%t) Supplier: Received wrong type of push consumer proxy %d\n"),
         static_cast<int>(this->sequence_proxy_id_)
       ));
-    ACE_THROW (CORBA::UNKNOWN());
+    throw CORBA::UNKNOWN();
   }
 
   this->any_proxy_push_consumer_->connect_any_push_supplier (
-    any_push_supplier_ref_.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    any_push_supplier_ref_.in ());
 }
 
-int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
+int Supplier_Main::fini (void)
 {
   if (this->disconnect_on_exit_)
   {
-    this->reconnection_callback_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-4);
+    this->reconnection_callback_.fini ();
     if (!CORBA::is_nil (this->structured_proxy_push_consumer_.in ()))
     {
       if (this->verbose_)
@@ -1107,8 +1006,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
           ACE_TEXT ("(%P|%t) Disconnecting structured\n")
           ));
       }
-      this->structured_proxy_push_consumer_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-4);
+      this->structured_proxy_push_consumer_->disconnect_structured_push_consumer ();
     }
     if (!CORBA::is_nil (this->sequence_proxy_push_consumer_.in ()))
     {
@@ -1118,8 +1016,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
           ACE_TEXT ("(%P|%t) Disconnecting sequence\n")
           ));
       }
-      this->sequence_proxy_push_consumer_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-4);
+      this->sequence_proxy_push_consumer_->disconnect_sequence_push_consumer ();
     }
     if (!CORBA::is_nil (this->any_proxy_push_consumer_.in ()))
     {
@@ -1129,8 +1026,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
           ACE_TEXT ("(%P|%t) Disconnecting any\n")
           ));
       }
-      this->any_proxy_push_consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-4);
+      this->any_proxy_push_consumer_->disconnect_push_consumer ();
     }
     if (!CORBA::is_nil (this->sa_.in ()) && this->sa_id_ != default_admin_id)
     {
@@ -1148,7 +1044,7 @@ int Supplier_Main::fini (ACE_ENV_SINGLE_ARG_DECL)
   return 0;
 }
 
-void Supplier_Main::send_structured_event (ACE_ENV_SINGLE_ARG_DECL)
+void Supplier_Main::send_structured_event (void)
 {
  CosNotification::StructuredEvent event;
 
@@ -1191,12 +1087,10 @@ void Supplier_Main::send_structured_event (ACE_ENV_SINGLE_ARG_DECL)
       ));
   }
 
-  this->structured_proxy_push_consumer_->push_structured_event (event
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->structured_proxy_push_consumer_->push_structured_event (event);
 }
 
-void Supplier_Main::send_sequence_event (ACE_ENV_SINGLE_ARG_DECL)
+void Supplier_Main::send_sequence_event (void)
 {
  CosNotification::EventBatch event_batch(1);
  event_batch.length (1);
@@ -1241,12 +1135,10 @@ void Supplier_Main::send_sequence_event (ACE_ENV_SINGLE_ARG_DECL)
       ));
   }
 
-  this->sequence_proxy_push_consumer_->push_structured_events (event_batch
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->sequence_proxy_push_consumer_->push_structured_events (event_batch);
 }
 
-void Supplier_Main::send_any_event (ACE_ENV_SINGLE_ARG_DECL)
+void Supplier_Main::send_any_event (void)
 {
   CORBA::Any event;
   event <<= CORBA::ULong (this->serial_number_);
@@ -1259,12 +1151,10 @@ void Supplier_Main::send_any_event (ACE_ENV_SINGLE_ARG_DECL)
       ));
   }
 
-  this->any_proxy_push_consumer_->push (event
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->any_proxy_push_consumer_->push (event);
 }
 
-int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL)
+int Supplier_Main::run (void)
 {
   int result = 0;
   bool paused = false;
@@ -1316,20 +1206,17 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL)
       {
         case MODE_STRUCTURED:
         {
-          send_structured_event (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          send_structured_event ();
           break;
         }
         case MODE_SEQUENCE:
         {
-          send_sequence_event (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          send_sequence_event ();
           break;
         }
         case MODE_ANY:
         {
-          send_any_event (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          send_any_event ();
           break;
         }
       }
@@ -1346,28 +1233,24 @@ main (int argc, char *argv[])
 {
   int result = -1;
   Supplier_Main app;
-  ACE_TRY_NEW_ENV
+  try
   {
-    result = app.init(argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK
+    result = app.init(argc, argv);
 
     if (result == 0)
     {
-      result = app.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = app.run ();
     }
     if (result == 0)
     {
-      app.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      app.fini ();
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: Supplier::main\t\n");
+    ex._tao_print_exception ("Error: Supplier::main\t\n");
     result = -1;
   }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P,%t) Supplier exits: code %d\n"),
     result
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index f429cf7892c..a5abbd355d7 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -28,14 +28,12 @@ class StructuredPushSupplier_i : public virtual POA_CosNotifyComm::StructuredPus
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       CosNotifyComm::InvalidEventType));
 
   virtual void disconnect_structured_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
@@ -45,14 +43,12 @@ class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSup
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       CosNotifyComm::InvalidEventType));
 
   virtual void disconnect_sequence_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
@@ -62,14 +58,12 @@ class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       CosNotifyComm::InvalidEventType));
 
   virtual void disconnect_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
@@ -83,19 +77,17 @@ public:
 
   void init (
     PortableServer::POA_ptr poa,
-    CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_
-    ACE_ENV_ARG_DECL);
+    CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_);
 
-  void fini (ACE_ENV_SINGLE_ARG_DECL);
+  void fini (void);
 
   size_t reconnect_count () const;
 
   virtual void reconnect (
      CORBA::Object_ptr reconnection
-      ACE_ENV_ARG_DECL
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean is_alive (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean is_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -115,36 +107,35 @@ class Supplier_Main
   int parse_args (int argc, char *argv[]);
   int parse_single_arg (int argc, char *argv[]);
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
-  int run (ACE_ENV_SINGLE_ARG_DECL);
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int init (int argc, char *argv[]);
+  int run (void);
+  int fini (void);
   void usage (FILE * log) const;
 
   void reconnect (
-      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory
-      ACE_ENV_ARG_DECL)
+      CosNotifyChannelAdmin::EventChannelFactory_ptr dest_factory)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
   /// Find naming service.
-  int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  int resolve_naming_service (void);
 
   /// Resolve the Notify factory from the Naming service.
-  int find_notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  int find_notify_factory (void);
 
   /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory")
-  int resolve_notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  int resolve_notify_factory (void);
 
-  void init_event_channel (ACE_ENV_SINGLE_ARG_DECL);
-  void init_supplier_admin (ACE_ENV_SINGLE_ARG_DECL);
-  void init_structured_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL);
-  void init_sequence_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL);
-  void init_any_proxy_consumer (ACE_ENV_SINGLE_ARG_DECL);
+  void init_event_channel (void);
+  void init_supplier_admin (void);
+  void init_structured_proxy_consumer (void);
+  void init_sequence_proxy_consumer (void);
+  void init_any_proxy_consumer (void);
 
   /// send events.
-  void send_structured_event (ACE_ENV_SINGLE_ARG_DECL);
-  void send_sequence_event (ACE_ENV_SINGLE_ARG_DECL);
-  void send_any_event (ACE_ENV_SINGLE_ARG_DECL);
+  void send_structured_event (void);
+  void send_sequence_event (void);
+  void send_any_event (void);
 
   void save_ids();
   bool load_ids();
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl
index 67ebe2186a0..b3ab2e48e19 100755
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 my($eventType) = "-any"; # your choice of -any -structured or -sequence
 
 my($notify_port) = "9889";
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 9a7df06e215..4d75d55a852 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -24,25 +24,20 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::SEQUENCE_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxysupplier.in ());
 
   CosNotification::QoSProperties properties (3);
   properties.length (3);
@@ -52,19 +47,16 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[1].value <<= (TimeBase::TimeT) 1 * 1000 * 10000;
 
   this->proxy_->set_qos (properties);
-  this->proxy_->connect_sequence_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_sequence_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
-  const CosNotification::EventBatch& events
-  ACE_ENV_ARG_DECL)
+  const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "{%u}", events.length()));
@@ -77,7 +69,7 @@ Notify_Sequence_Push_Consumer::push_structured_events (
     ACE_ERROR ((LM_ERROR,
       ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too "
       "many events received.\n")));
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
   }
   else if (this->count_ >= this->low_)
   {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
index 7a11dd60c37..b73f3c2a9e7 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
@@ -30,13 +30,11 @@ public:
                                  unsigned int high,
                                  Notify_Test_Client& client);
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  void push_structured_events (const CosNotification::EventBatch&
-                               ACE_ENV_ARG_DECL)
+  void push_structured_events (const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index c59a53095fb..34b829f9524 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -70,24 +70,19 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
-  ACE_CHECK_RETURN (0);
 
   CosNotifyFilter::FilterFactory_var ffact =
-    ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    ec->default_filter_factory ();
 
   CosNotifyFilter::Filter_var filter =
-    ffact->create_filter ("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    ffact->create_filter ("EXTENDED_TCL");
 
   if(CORBA::is_nil(filter.in()))
     {
@@ -103,8 +98,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   constraint_list[0].constraint_expr = CORBA::string_dup (
    "$.enum < 0");
 
-  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  filter->add_constraints (constraint_list);
 
   // apply filter
   admin->add_filter (filter.in ());
@@ -115,8 +109,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the consumer
   Notify_Sequence_Push_Consumer* consumer_1;
@@ -127,11 +120,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                                    *client),
                     CORBA::NO_MEMORY ());
 
-  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->init (client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -141,26 +132,22 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      status = client.init (argc, argv);
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            client.create_event_channel ("MyEventChannel", 1);
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
-                              orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                              orb->string_to_object (ior);
 
-          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          sig_var sig = sig::_narrow (object.in ());
 
           if (CORBA::is_nil (sig.in ()))
             {
@@ -171,33 +158,27 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            create_consumeradmin (ec.in ());
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              create_consumers (admin.in (), &client);
 
               // Tell the supplier to go
-              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              sig->go ();
 
-              client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-              ACE_TRY_CHECK;
+              client.ORB_run( );
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
- 
-              sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+
+              sig->done ();
             }
         }
     }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+      e._tao_print_exception ("Error: Consumer exception: ");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 483a7446f92..d752690b91a 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -40,13 +40,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -112,23 +112,20 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendEvents (int id ACE_ENV_ARG_DECL)
+SendEvents (int id)
 {
   static const char* types[] = { "good", "bad", "ugly" };
   CosNotification::EventBatch events;
@@ -170,33 +167,28 @@ SendEvents (int id ACE_ENV_ARG_DECL)
     events[z] = event;
   }
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier_1->send_events (events);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (admin);
 }
 
 
@@ -208,27 +200,23 @@ int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
       sig_impl.reset( new sig_i( orb ) );
-      sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -245,11 +233,10 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        create_suppliers (admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
@@ -257,8 +244,7 @@ int main (int argc, char* argv[])
         for (int i = 0; i < num_batches; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
-          SendEvents (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          SendEvents (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer...\n"));
 
@@ -268,17 +254,15 @@ int main (int argc, char* argv[])
 
         ACE_OS::unlink (ior_output_file);
 
-        ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        ec->destroy();
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
index 6c3adfc6c49..c9d3a33f09d 100755
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $ior = PerlACE::LocalFile ("supplier.ior");
 $notifyior = PerlACE::LocalFile ("notify.ior");
 $notify_conf = PerlACE::LocalFile ("notify$PerlACE::svcconf_ext");
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index b39323d5890..7da1dca4809 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -29,25 +29,20 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer ()
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxysupplier.in ());
 
   CosNotification::QoSProperties properties(3);
   properties.length(3);
@@ -57,20 +52,16 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[1].value <<= (TimeBase::TimeT) 2 * 1000 * 10000;
 
   proxy_->set_qos(properties);
-  proxy_->connect_sequence_push_consumer (objref.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_->connect_sequence_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
-                          const CosNotification::EventBatch& events
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "{%u}", events.length()));
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
index 1318d05545c..66e93b2f84d 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
@@ -32,13 +32,11 @@ public:
 
   ~Notify_Sequence_Push_Consumer ();
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_events(const CosNotification::EventBatch&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_events(const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 5ac22e79b8b..21a4cd4a3b2 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -75,16 +75,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
 }
@@ -92,8 +89,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   // startup the first consumer
   Notify_Sequence_Push_Consumer* consumer_1;
@@ -103,11 +99,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
     high,
     *client),
     CORBA::NO_MEMORY ());
-  consumer_1->init(client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->init(client->root_poa ());
 
-  consumer_1->_connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer_1->_connect (admin);
 }
 
 // ******************************************************************
@@ -116,43 +110,35 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     ACE_ASSERT(status == 0);
     ACE_UNUSED_ARG(status);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1
-      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("MyEventChannel", 1);
 
     CORBA::ORB_ptr orb = client.orb ();
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
     CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      create_consumeradmin (ec.in ());
 
     if (filter)
     {
       CosNotifyFilter::FilterFactory_var ffact =
-        ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ffact->create_filter ("TCL");
 
       ACE_ASSERT(! CORBA::is_nil(filter.in()));
 
@@ -162,35 +148,29 @@ int main (int argc, char* argv[])
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup(constraintString);
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      filter->add_constraints (constraint_list);
 
       admin->add_filter(filter.in());
     }
 
     ACE_ASSERT (!CORBA::is_nil (admin.in ()));
-    create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_consumers(admin.in (), &client);
 
     // Tell the supplier to go
-    sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    client.ORB_run( );
     ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
-    sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->done ();
 
     return 0;
 
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+    e._tao_print_exception ("Error: Consumer exception: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index 30c0a2e2b0d..aa75ef1b151 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -42,13 +42,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -113,23 +113,20 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendEvents (int id ACE_ENV_ARG_DECL)
+SendEvents (int id)
 {
   static const char* types[] = { "good", "bad", "ugly" };
   CosNotification::EventBatch events;
@@ -171,33 +168,28 @@ SendEvents (int id ACE_ENV_ARG_DECL)
     events[z] = event;
   }
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier_1->send_events(events);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (admin);
 }
 
 
@@ -209,29 +201,24 @@ int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
       sig_impl.reset( new sig_i( orb ) );
-      sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -248,11 +235,10 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        create_suppliers(admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
@@ -260,8 +246,7 @@ int main (int argc, char* argv[])
         for (int i = 0; i < num_batches; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
-          SendEvents (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          SendEvents (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer completion...\n"));
 
@@ -271,17 +256,15 @@ int main (int argc, char* argv[])
 
         ACE_OS::unlink (ior_output_file);
 
-        ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        ec->destroy();
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
index 9a222be7213..f5a670e4c4c 100755
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $ior = PerlACE::LocalFile ("supplier.ior");
 $notifyior = PerlACE::LocalFile ("notify.ior");
 $notify_conf = PerlACE::LocalFile ("notify$PerlACE::svcconf_ext");
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index 18a1c92a0d2..dba87df34f5 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -30,32 +30,26 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name,
 
 void
 Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel ACE_ENV_ARG_DECL)
+                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel)
                                 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(notify_channel);
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::STRUCTURED_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxysupplier.in ());
 
-  this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 static void validate_expression(bool expr, const char* msg)
@@ -70,8 +64,7 @@ static void validate_expression(bool expr, const char* msg)
 
 void
 Notify_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& event
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
index 833b1be664b..d577b7f5002 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
@@ -28,11 +28,11 @@ public:
   Notify_Push_Consumer (const char* name, int sent, bool useFilter, Notify_Test_Client& client);
 
   void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CosNotifyChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::EventChannel_ptr ec)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_event (const CosNotification::StructuredEvent& ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 7f41538007e..cb54a45d762 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -55,50 +55,43 @@ Consumer_Client::parse_args (int argc, char *argv[])
 static void
 create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                  CosNotifyChannelAdmin::EventChannel_ptr ec,
-                 Notify_Test_Client* client
-                 ACE_ENV_ARG_DECL)
+                 Notify_Test_Client* client)
 {
   ACE_NEW_THROW_EX (consumer,
     Notify_Push_Consumer ("Consumer", numEvents, useFilter, *client),
     CORBA::NO_MEMORY ());
 
-  consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->init (client->root_poa ());
 
-  consumer->_connect (admin, ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->_connect (admin, ec);
 }
 
 int main (int argc, char * argv[])
 {
-  ACE_TRY_NEW_ENV;
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("MyEventChannel", 1);
 
     CosNotifyChannelAdmin::AdminID adminid = 0;
     CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-      ec->new_for_consumers(CosNotifyChannelAdmin::AND_OP, adminid ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      ec->new_for_consumers(CosNotifyChannelAdmin::AND_OP, adminid);
 
     ACE_ASSERT(! CORBA::is_nil (consumer_admin.in ()));
 
     if (useFilter)
     {
       CosNotifyFilter::FilterFactory_var ffact =
-        ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ffact->create_filter (GRAMMAR);
 
       if (CORBA::is_nil (filter.in ()))
       {
@@ -113,8 +106,7 @@ int main (int argc, char * argv[])
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1 and group != 0");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      filter->add_constraints (constraint_list);
 
       consumer_admin->add_filter (filter.in ());
     }
@@ -122,37 +114,30 @@ int main (int argc, char * argv[])
     CORBA::ORB_ptr orb = client.orb ();
 
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
-    create_consumer (consumer_admin.in (), ec.in (), &client ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_consumer (consumer_admin.in (), ec.in (), &client);
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n"));
 
-    sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
 
-    sig->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->done();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: Consumer:");
+    e._tao_print_exception ("\nError: Consumer:");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 161d3f3e8c4..86542c868f2 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -31,13 +31,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -65,15 +65,12 @@ private:
 };
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    adminid);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
@@ -100,71 +97,62 @@ send_event (int id)
   // Divide by 3 first so that the type and group aren't synched
   event.filterable_data[2].value <<= static_cast<CORBA::ULong>(id / 3 % 3);
 
-  ACE_TRY_NEW_ENV
+  try
   {
     ACE_DEBUG((LM_DEBUG, "+"));
 
-    supplier->send_event (event ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier->send_event (event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: Supplier: ");
+    e._tao_print_exception ("\nError: Supplier: ");
   }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr poa)
 {
   ACE_NEW_THROW_EX (supplier,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->init (poa);
 
-  supplier->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->connect (admin);
 }
 
 int main (int argc, char * argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV;
+  try
   {
     Notify_Test_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("MyEventChannel", 0);
 
     ACE_ASSERT(! CORBA::is_nil(ec.in()));
 
     CORBA::ORB_ptr orb = client.orb ();
 
     sig_impl.reset( new sig_i( orb ) );
-    sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig_impl->_this ();
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
     ACE_ASSERT(! CORBA::is_nil (admin.in ()));
 
-    create_supplier (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
+    create_supplier (admin.in (), client.root_poa ());
 
     if (ior_file != 0)
     {
       CORBA::String_var ior =
-        client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.orb ()->object_to_string (sig.in ());
 
       FILE *output_file= ACE_OS::fopen (ior_file, "w");
       ACE_ASSERT (output_file != 0);
@@ -181,7 +169,6 @@ int main (int argc, char * argv[])
     {
       ACE_DEBUG((LM_DEBUG, "+"));
       send_event (i);
-      ACE_TRY_CHECK;
     }
     ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -189,16 +176,14 @@ int main (int argc, char * argv[])
 
     ACE_OS::unlink (ior_file);
 
-    ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ec->destroy();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier: ");
+    e._tao_print_exception ("Error: Supplier: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
index ed307c60fd3..d4030df279f 100755
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl
@@ -10,6 +10,8 @@ use strict;
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 my $ior = PerlACE::LocalFile ("supplier.ior");
 my $namingior = PerlACE::LocalFile ("naming.ior");
 my $notifyior = PerlACE::LocalFile ("notify.ior");
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index 232c98a0f45..32aa61440c0 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -77,29 +77,24 @@ Notify_Push_Consumer::Notify_Push_Consumer (const char* name,
 
 void
 Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel ACE_ENV_ARG_DECL)
+                                CosNotifyChannelAdmin::EventChannel_ptr notify_channel)
                                 ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::STRUCTURED_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxy_id_);
 
   if (consumerFilter_ != None)
   {
     CosNotifyFilter::FilterFactory_var ffact =
-      notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      notify_channel->default_filter_factory ();
 
     CosNotifyFilter::Filter_var filter =
-      ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      ffact->create_filter ("TCL");
 
     ACE_ASSERT(! CORBA::is_nil (filter.in ()));
 
@@ -109,8 +104,7 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
     constraint_list[0].event_types.length (0);
     constraint_list[0].constraint_expr = CORBA::string_dup ("group != 1");
 
-    filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    filter->add_constraints (constraint_list);
 
     proxysupplier->add_filter (filter.in ());
   }
@@ -118,15 +112,12 @@ Notify_Push_Consumer::_connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consume
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxysupplier.in ());
 
-  this->proxy_->connect_structured_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_structured_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 static void validate_expression(bool expr, const char* msg)
@@ -141,8 +132,7 @@ static void validate_expression(bool expr, const char* msg)
 
 void
 Notify_Push_Consumer::push_structured_event (
-  const CosNotification::StructuredEvent& event
-  ACE_ENV_ARG_DECL_NOT_USED)
+  const CosNotification::StructuredEvent& event)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_DEBUG, "-"));
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
index 6231ecb69f7..9113d215823 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
@@ -31,11 +31,11 @@ public:
     NS_FilterType supplierFilter, Notify_Test_Client& client);
 
   void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CosNotifyChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::EventChannel_ptr ec)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_event (const CosNotification::StructuredEvent& ACE_ENV_ARG_DECL)
+  void push_structured_event (const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
index 352ef42df08..963ddda3627 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
@@ -5,30 +5,24 @@ void
 Notify_Push_Supplier::_connect (
                 CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
-                bool useFilter
-                ACE_ENV_ARG_DECL)
+                bool useFilter)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxy_id_);
 
   if (useFilter)
     {
       CosNotifyFilter::FilterFactory_var ffact =
-        notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        notify_channel->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        ffact->create_filter ("TCL");
 
       ACE_ASSERT(! CORBA::is_nil (filter.in ()));
 
@@ -38,21 +32,17 @@ Notify_Push_Supplier::_connect (
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("group != 0");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      filter->add_constraints (constraint_list);
 
       proxyconsumer->add_filter (filter.in ());
     }
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
-      proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxyconsumer.in ());
 
-  this->proxy_->connect_structured_push_supplier (objref.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->proxy_->connect_structured_push_supplier (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
index 03f5844fb5d..254ae0b88b4 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
@@ -10,8 +10,7 @@ class Notify_Push_Supplier: public TAO_Notify_Tests_StructuredPushSupplier
 public:
   void _connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
-                bool useFilter
-                ACE_ENV_ARG_DECL)
+                bool useFilter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index eb633882bcc..9a06127d352 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -71,29 +71,25 @@ Consumer_Client::parse_args (int argc, char *argv[])
 static void
 create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                  CosNotifyChannelAdmin::EventChannel_ptr ec,
-                 Notify_Test_Client* client
-                 ACE_ENV_ARG_DECL)
+                 Notify_Test_Client* client)
 {
   ACE_NEW_THROW_EX (consumer,
     Notify_Push_Consumer ("Consumer", numEvents, consumerFilter,
       supplierFilter, *client),
     CORBA::NO_MEMORY ());
 
-  consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->init (client->root_poa ());
 
-  consumer->_connect (admin, ec ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->_connect (admin, ec);
 }
 
 int main (int argc, char * argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     if (status != 0)
     {
       ACE_ERROR((LM_ERROR, "Error: Unable to init consumer.\n"));
@@ -101,26 +97,23 @@ int main (int argc, char * argv[])
     }
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("Struct_Multi_Filter", 1 ACE_ENV_ARG_PARAMETER);
+      client.create_event_channel ("Struct_Multi_Filter", 1);
 
     CosNotifyChannelAdmin::AdminID adminid = 0;
     CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
       ec->new_for_consumers ((consumerFilter == OrOp
       ? CosNotifyChannelAdmin::OR_OP : CosNotifyChannelAdmin::AND_OP),
-      adminid ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      adminid);
 
     ACE_ASSERT(! CORBA::is_nil (consumer_admin.in ()));
 
     if (consumerFilter != None)
     {
       CosNotifyFilter::FilterFactory_var ffact =
-        ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ffact->create_filter (GRAMMAR);
 
       if (CORBA::is_nil (filter.in ()))
       {
@@ -135,8 +128,7 @@ int main (int argc, char * argv[])
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("type != 1");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      filter->add_constraints (constraint_list);
 
       consumer_admin->add_filter (filter.in ());
     }
@@ -144,37 +136,30 @@ int main (int argc, char * argv[])
     CORBA::ORB_ptr orb = client.orb ();
 
     CORBA::Object_var object =
-      orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object (ior);
 
-    sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig::_narrow (object.in ());
 
     ACE_ASSERT(! CORBA::is_nil (sig.in ()));
 
-    create_consumer (consumer_admin.in (), ec.in (), &client ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    create_consumer (consumer_admin.in (), ec.in (), &client);
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer waiting for events...\n"));
 
-    sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->go ();
 
-    client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    client.ORB_run( );
 
     ACE_DEBUG((LM_DEBUG, "\nConsumer done.\n"));
 
-    sig->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig->done();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: Consumer:");
+    e._tao_print_exception ("\nError: Consumer:");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 69463ea273a..1fa4997d470 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -32,13 +32,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -106,16 +106,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers ((use_or_operator ? CosNotifyChannelAdmin::OR_OP :
   CosNotifyChannelAdmin::AND_OP),
-    adminid
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    adminid);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
@@ -142,49 +139,41 @@ send_event (int id)
   // Divide by 3 first so that the type and group aren't synched
   event.filterable_data[2].value <<= static_cast<CORBA::ULong>(id / 3 % 3);
 
-  ACE_TRY_NEW_ENV
+  try
   {
     ACE_DEBUG((LM_DEBUG, "+"));
 
-    supplier->send_event (event ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier->send_event (event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: Supplier: ");
+    e._tao_print_exception ("\nError: Supplier: ");
   }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                              CosNotifyChannelAdmin::EventChannel_ptr ec,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL)
+                             PortableServer::POA_ptr poa)
 {
   ACE_NEW_THROW_EX (supplier,
     Notify_Push_Supplier (),
     CORBA::NO_MEMORY ());
 
-  supplier->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->init (poa);
 
-  supplier->_connect (admin, ec, useFilters ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->_connect (admin, ec, useFilters);
 }
 
 void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel
-                 ACE_ENV_ARG_DECL)
+                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel)
 {
   CosNotifyFilter::FilterFactory_var ffact =
-    notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    notify_channel->default_filter_factory ();
 
   CosNotifyFilter::Filter_var filter =
-    ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ffact->create_filter (GRAMMAR);
 
   ACE_ASSERT(!CORBA::is_nil (filter.in ()));
 
@@ -194,54 +183,48 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup ("type != 0");
 
-  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  filter->add_constraints (constraint_list);
 
-  admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  admin->add_filter (filter.in ());
 }
 
 int main (int argc, char * argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
-  ACE_TRY_NEW_ENV;
+  try
   {
     Supplier_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    int status = client.init (argc, argv);
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
 
     CosNotifyChannelAdmin::EventChannel_var ec =
-      client.create_event_channel ("Struct_Multi_Filter", 0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      client.create_event_channel ("Struct_Multi_Filter", 0);
 
     ACE_ASSERT(! CORBA::is_nil(ec.in()));
 
     CORBA::ORB_ptr orb = client.orb ();
 
     sig_impl.reset( new sig_i( orb ) );
-    sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    sig_var sig = sig_impl->_this ();
 
     CosNotifyChannelAdmin::SupplierAdmin_var admin =
-      create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+      create_supplieradmin (ec.in ());
 
     if (useFilters)
     {
-      add_admin_filter (admin.in (), ec.in () ACE_ENV_ARG_PARAMETER);
+      add_admin_filter (admin.in (), ec.in ());
     }
 
     ACE_ASSERT(! CORBA::is_nil (admin.in ()));
 
-    create_supplier (admin.in(), ec.in(), client.root_poa() ACE_ENV_ARG_PARAMETER);
+    create_supplier (admin.in(), ec.in(), client.root_poa());
 
     // If the ior_file exists, output the ior to it
     if (ior_file != 0)
     {
       CORBA::String_var ior =
-        client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.orb ()->object_to_string (sig.in ());
 
       FILE *output_file= ACE_OS::fopen (ior_file, "w");
       ACE_ASSERT (output_file != 0);
@@ -258,7 +241,6 @@ int main (int argc, char * argv[])
     {
       ACE_DEBUG((LM_DEBUG, "+"));
       send_event (i);
-      ACE_TRY_CHECK;
     }
     ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", num_events));
 
@@ -266,16 +248,14 @@ int main (int argc, char * argv[])
 
     ACE_OS::unlink (ior_file);
 
-    ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    ec->destroy();
 
     return 0;
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier: ");
+    e._tao_print_exception ("Error: Supplier: ");
   }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
index da494261cb1..94dabf1ee99 100755
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl
@@ -10,6 +10,8 @@ use strict;
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 my $ior = PerlACE::LocalFile ("supplier.ior");
 my $namingior = PerlACE::LocalFile ("naming.ior");
 my $notifyior = PerlACE::LocalFile ("notify.ior");
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 07ba1cbfdd9..640f8cfd8c6 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -21,7 +21,7 @@ TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter ()
 }
 
 char*
-TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -32,7 +32,6 @@ TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (ACE_ENV_SINGLE_ARG_DECL_NOT
 
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::ConstraintExpSeq& constraint_list
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -79,7 +78,6 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra
   ACE_NEW_THROW_EX (infoseq_ptr,
                     CosNotifyFilter::ConstraintInfoSeq (0),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return infoseq_ptr;
 }
@@ -87,7 +85,6 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra
 void
 TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::ConstraintIDSeq & /*del_list*/,
                                    const CosNotifyFilter::ConstraintInfoSeq & /*modify_list*/
-                                   ACE_ENV_ARG_DECL_NOT_USED
                                    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -100,7 +97,6 @@ TAO_Notify_Tests_RT_Test_Filter::modify_constraints (const CosNotifyFilter::Cons
 
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::ConstraintIDSeq & /*id_list*/
-                                ACE_ENV_ARG_DECL_NOT_USED
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::ConstraintNotFound))
@@ -109,26 +105,25 @@ TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::Constra
 }
 
 CosNotifyFilter::ConstraintInfoSeq *
-TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
         return 0;
 }
 
 void
-TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
 
 void
-TAO_Notify_Tests_RT_Test_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_Test_Filter::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   PortableServer::POA_var my_POA = _default_POA ();
 
@@ -139,7 +134,7 @@ TAO_Notify_Tests_RT_Test_Filter::destroy (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */
-                           ACE_ENV_ARG_DECL)
+                           )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
 {
@@ -149,14 +144,12 @@ TAO_Notify_Tests_RT_Test_Filter::match (const CORBA::Any & /*filterable_data */
 
 CORBA::Boolean
 TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::StructuredEvent & notification
-                                 ACE_ENV_ARG_DECL
                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_RT_Test_Filter (%x) ::match_structured (%t)\n", this));
@@ -168,14 +161,10 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct
   CORBA::ORB_ptr orb = poa->orb_core ().orb ();
 
   CORBA::Object_var object =
-    orb->resolve_initial_references ("RTCurrent"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    orb->resolve_initial_references ("RTCurrent");
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    RTCORBA::Current::_narrow (object.in ());
 
   // Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources *tss =
@@ -252,7 +241,6 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct
 CORBA::Boolean
 TAO_Notify_Tests_RT_Test_Filter::match_typed (
                             const CosNotification::PropertySeq & /* filterable_data */
-                            ACE_ENV_ARG_DECL
                             )
   ACE_THROW_SPEC (( CORBA::SystemException,
                     CosNotifyFilter::UnsupportedFilterableData))
@@ -264,7 +252,6 @@ TAO_Notify_Tests_RT_Test_Filter::match_typed (
 CosNotifyFilter::CallbackID
 TAO_Notify_Tests_RT_Test_Filter::attach_callback (
                                 CosNotifyComm::NotifySubscribe_ptr /* callback */
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -275,16 +262,15 @@ TAO_Notify_Tests_RT_Test_Filter::attach_callback (
 void
 TAO_Notify_Tests_RT_Test_Filter::detach_callback (
                                 CosNotifyFilter::CallbackID /* callback */
-                                ACE_ENV_ARG_DECL
                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::CallbackNotFound))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CosNotifyFilter::CallbackIDSeq *
-TAO_Notify_Tests_RT_Test_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_RT_Test_Filter::get_callbacks (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index 3ca5f7d6445..70814b3c6f6 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -43,12 +43,12 @@ public:
   ~TAO_Notify_Tests_RT_Test_Filter ();
 
 protected:
-  virtual char * constraint_grammar (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * constraint_grammar (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::InvalidConstraint
@@ -56,7 +56,6 @@ protected:
 
   virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   ACE_ENV_ARG_DECL
                                    )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -64,57 +63,57 @@ protected:
                      CosNotifyFilter::ConstraintNotFound
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::ConstraintNotFound
                      ));
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void remove_all_constraints (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual CORBA::Boolean match (const CORBA::Any & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match (const CORBA::Any & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data ACE_ENV_ARG_DECL)
+  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
                      ));
 
-  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback ACE_ENV_ARG_DECL)
+  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void detach_callback (CosNotifyFilter::CallbackID callback ACE_ENV_ARG_DECL)
+  virtual void detach_callback (CosNotifyFilter::CallbackID callback)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::CallbackNotFound
                      ));
 
-  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
index ecd20e34d7a..f3afd4cf533 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp
@@ -17,17 +17,17 @@ TAO_Notify_Tests_RT_Test_FilterFactory::~TAO_Notify_Tests_RT_Test_FilterFactory
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_var& filter_poa)
 {
   this->filter_poa_ = filter_poa; // save the filter poa.
 
   PortableServer::ServantBase_var servant_var (this);
 
-  return _this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return _this ();
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_grammar ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_grammar)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::InvalidGrammar
@@ -53,23 +53,17 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create_filter (const char *constraint_gr
   PortableServer::ServantBase_var filter_var (filter);
 
   PortableServer::ObjectId_var oid =
-    this->filter_poa_->activate_object (filter
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
+    this->filter_poa_->activate_object (filter);
 
   CORBA::Object_var obj =
-    this->filter_poa_->id_to_reference (oid.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
+    this->filter_poa_->id_to_reference (oid.in ());
 
-  return CosNotifyFilter::Filter::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return CosNotifyFilter::Filter::_narrow (obj.in ());
 }
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_Tests_RT_Test_FilterFactory::create_mapping_filter (const char * /*constraint_grammar*/,
                                                   const CORBA::Any & /*default_value*/
-                                                  ACE_ENV_ARG_DECL
                                                   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index b9c5f4d6075..a660b54c952 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -46,12 +46,11 @@ public:
 
   ///= TAO_Notify_Tests_FilterFactory methods.
 
-  virtual CosNotifyFilter::FilterFactory_ptr create (PortableServer::POA_var& filter_poa ACE_ENV_ARG_DECL);
+  virtual CosNotifyFilter::FilterFactory_ptr create (PortableServer::POA_var& filter_poa);
 
   ///= CosNotifyFilter::FilterFactory methods
 
   virtual CosNotifyFilter::Filter_ptr create_filter (const char * constraint_grammar
-                                                     ACE_ENV_ARG_DECL
                                                      )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -60,7 +59,6 @@ public:
 
   virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter (const char * constraint_grammar,
                                                                     const CORBA::Any & default_value
-                                                                    ACE_ENV_ARG_DECL
                                                                     )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
index c58a75635fc..9527fd0c5dc 100755
--- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $experiment_timeout = 120;
 $startup_timeout = 120;
 $notify_conf = PerlACE::LocalFile ("notify.conf");
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index 463a3fc9b8d..508cc88b296 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -25,11 +25,11 @@
 class TestSupplier
 : public POA_CosNotifyComm::StructuredPushSupplier
 {
-  virtual void disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) {
+  virtual void disconnect_structured_push_supplier(void) throw (CORBA::SystemException) {
   }
 
   virtual void subscription_change( const CosNotification::EventTypeSeq&,
-    const CosNotification::EventTypeSeq& ACE_ENV_ARG_DECL_NOT_USED)
+    const CosNotification::EventTypeSeq&)
     throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
   {
   }
@@ -38,15 +38,15 @@ class TestSupplier
 class TestConsumer
 : public POA_CosNotifyComm::StructuredPushConsumer
 {
-  virtual void disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (CORBA::SystemException) {
+  virtual void disconnect_structured_push_consumer(void) throw (CORBA::SystemException) {
   }
 
-  virtual void offer_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq& ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void offer_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq&)
     throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
   {
   }
 
-  virtual void push_structured_event(const CosNotification::StructuredEvent& ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void push_structured_event(const CosNotification::StructuredEvent&)
     throw (CORBA::SystemException, CosEventComm::Disconnected)
   {
   }
@@ -58,14 +58,12 @@ int main(int ac, char **av)
 
   bool pass1 = false;
   bool pass2 = false;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     CORBA::ORB_var orb;
     PortableServer::POA_var poa;
 
-    orb = CORBA::ORB_init(ac, av, "" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb = CORBA::ORB_init(ac, av, "");
     ACE_ASSERT(! CORBA::is_nil (orb.in ()));
 
     if (ac > 2 && ACE_OS::strcmp (av[1], "-pass") == 0)
@@ -107,11 +105,9 @@ int main(int ac, char **av)
       }
     }
     CORBA::Object_var obj =
-      orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->resolve_initial_references("RootPOA");
     ACE_ASSERT(! CORBA::is_nil (obj.in ()));
-    poa = PortableServer::POA::_narrow(obj.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    poa = PortableServer::POA::_narrow(obj.in ());
     ACE_ASSERT(! CORBA::is_nil (poa.in ()));
     PortableServer::POAManager_var mgr = poa->the_POAManager();
     mgr->activate();
@@ -120,29 +116,22 @@ int main(int ac, char **av)
     policies.length (1);
 
     policies[0] =
-      poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                   ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
     PortableServer::POA_var persistentPOA = poa->create_POA (
                                                     "PersistentPOA",
                                                     mgr.in (),
-                                                    policies
-                                                    ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                                                    policies);
 
-    policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    policies[0]->destroy ();
 
     if (pass1)
     {
       CosNotifyChannelAdmin::EventChannelFactory_var cosecf =
-        TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO_Notify_EventChannelFactory_i::create(persistentPOA.in ());
 
       NotifyExt::EventChannelFactory_var ecf =
-        NotifyExt::EventChannelFactory::_narrow (cosecf.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        NotifyExt::EventChannelFactory::_narrow (cosecf.in ());
 
       if (CORBA::is_nil (ecf.in ()))
       {
@@ -184,48 +173,37 @@ int main(int ac, char **av)
 
       CosNotifyChannelAdmin::ChannelID ecid;
       ::CosNotifyChannelAdmin::EventChannel_var ec =
-        ecf->create_channel(qosprops, adminprops, ecid ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ecf->create_channel(qosprops, adminprops, ecid);
 
       CosNotifyChannelAdmin::AdminID consumer_admin_id;
       CosNotifyChannelAdmin::ConsumerAdmin_var ca =
         ec->new_for_consumers(CosNotifyChannelAdmin::OR_OP,
-          consumer_admin_id
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          consumer_admin_id);
 
       CosNotifyChannelAdmin::AdminID supplier_admin_id;
       CosNotifyChannelAdmin::SupplierAdmin_var sa =
         ec->new_for_suppliers(CosNotifyChannelAdmin::OR_OP,
-          supplier_admin_id
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          supplier_admin_id);
 
       CosNotifyChannelAdmin::ProxyID proxy_id;
       CosNotifyChannelAdmin::ProxySupplier_var ps =
         ca->obtain_notification_push_supplier(
           CosNotifyChannelAdmin::STRUCTURED_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          proxy_id);
 
       CosNotifyChannelAdmin::StructuredProxyPushSupplier_var strps =
         CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow(ps.in());
 
       ps = ca->obtain_notification_push_supplier(
           CosNotifyChannelAdmin::SEQUENCE_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          proxy_id);
 
       CosNotifyChannelAdmin::SequenceProxyPushSupplier_var seqps =
         CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow(ps.in());
 
       ps = ca->obtain_notification_push_supplier(
           CosNotifyChannelAdmin::ANY_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          proxy_id);
 
       CosNotifyChannelAdmin::ProxyPushSupplier_var anyps =
         CosNotifyChannelAdmin::ProxyPushSupplier::_narrow(ps.in());
@@ -233,42 +211,33 @@ int main(int ac, char **av)
       CosNotifyChannelAdmin::ProxyConsumer_var pc =
         sa->obtain_notification_push_consumer(
           CosNotifyChannelAdmin::STRUCTURED_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          proxy_id);
 
       CosNotifyChannelAdmin::StructuredProxyPushConsumer_var strpc = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow(pc.in());
 
       pc = sa->obtain_notification_push_consumer(
           CosNotifyChannelAdmin::SEQUENCE_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          proxy_id);
 
       CosNotifyChannelAdmin::SequenceProxyPushConsumer_var seqpc = CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow(pc.in());
 
       pc =
         sa->obtain_notification_push_consumer(
           CosNotifyChannelAdmin::ANY_EVENT,
-          proxy_id
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          proxy_id);
 
       CosNotifyChannelAdmin::ProxyPushConsumer_var anypc = CosNotifyChannelAdmin::ProxyPushConsumer::_narrow(pc.in());
 
       CosNotifyFilter::FilterFactory_var ff =
-        ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter1 =
-        ff->create_filter("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ff->create_filter("EXTENDED_TCL");
 
       ACE_ASSERT(! CORBA::is_nil (filter1.in ()));
 
       CosNotifyFilter::Filter_var filter2 =
-        ff->create_filter("EXTENDED_TCL" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ff->create_filter("EXTENDED_TCL");
 
       ACE_ASSERT(! CORBA::is_nil (filter2.in ()));
 
@@ -277,82 +246,53 @@ int main(int ac, char **av)
       constraint_list[0].event_types.length(0);
       constraint_list[0].constraint_expr = CORBA::string_dup("Number == 100");
 
-      filter1->add_constraints(constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      filter1->add_constraints(constraint_list);
 
-      filter2->add_constraints(constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      filter2->add_constraints(constraint_list);
 
-      ca->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ca->add_filter (filter1.in());
 
-      sa->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sa->add_filter (filter2.in());
 
-      strps->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      strps->add_filter (filter1.in());
 
-      seqps->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      seqps->add_filter (filter2.in());
 
-      anyps->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      anyps->add_filter (filter1.in());
 
-      strpc->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      strpc->add_filter (filter2.in());
 
-      seqpc->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      seqpc->add_filter (filter1.in());
 
-      anypc->add_filter (filter1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      anypc->add_filter (filter2.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      anypc->add_filter (filter1.in());
+      anypc->add_filter (filter2.in());
 
       CosNotification::EventTypeSeq added1(1), removed1(0);
       added1.length(1);
       added1[0].domain_name = CORBA::string_dup("nightly_builds");
       added1[0].type_name = CORBA::string_dup("*");
-      ca->subscription_change(added1, removed1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ca->subscription_change(added1, removed1);
 
       // Connect a PushConsumer and PushSupplier
       TestSupplier test_supplier_svt;
-      PortableServer::ObjectId_var oid1 = persistentPOA->activate_object (&test_supplier_svt
-                                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Object_var obj1 = persistentPOA->id_to_reference (oid1.in ()
-                                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CosNotifyComm::StructuredPushSupplier_var push_sup = CosNotifyComm::StructuredPushSupplier::_narrow (obj1.in ()
-                                                                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var oid1 = persistentPOA->activate_object (&test_supplier_svt);
+      CORBA::Object_var obj1 = persistentPOA->id_to_reference (oid1.in ());
+      CosNotifyComm::StructuredPushSupplier_var push_sup = CosNotifyComm::StructuredPushSupplier::_narrow (obj1.in ());
 
       TestConsumer test_consumer_svt;
-      PortableServer::ObjectId_var oid2 = persistentPOA->activate_object (&test_consumer_svt
-                                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Object_var obj2 = persistentPOA->id_to_reference (oid2.in ()
-                                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CosNotifyComm::StructuredPushConsumer_var push_cons = CosNotifyComm::StructuredPushConsumer::_narrow (obj2.in ()
-                                                                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var oid2 = persistentPOA->activate_object (&test_consumer_svt);
+      CORBA::Object_var obj2 = persistentPOA->id_to_reference (oid2.in ());
+      CosNotifyComm::StructuredPushConsumer_var push_cons = CosNotifyComm::StructuredPushConsumer::_narrow (obj2.in ());
       strpc->connect_structured_push_supplier(push_sup.in());
       strps->connect_structured_push_consumer(push_cons.in());
 
       strps->suspend_connection();
 
-      persistentPOA->deactivate_object (oid1.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      persistentPOA->deactivate_object (oid1.in ());
 
-      persistentPOA->deactivate_object (oid2.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      persistentPOA->deactivate_object (oid2.in ());
 
-      ecf->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ecf->destroy();
       ////////////////////////////////
       // TODO make this not hardcoded
       ACE_OS::rename ("abc.xml", "loadtest.xml");
@@ -364,13 +304,10 @@ int main(int ac, char **av)
 
       // Create a new ecf, which should load itself from loadtest.xml
       CosNotifyChannelAdmin::EventChannelFactory_var
-        cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in ());
 
-      ACE_TRY_CHECK;
       NotifyExt::EventChannelFactory_var
-        ecf = NotifyExt::EventChannelFactory::_narrow (cosecf.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ecf = NotifyExt::EventChannelFactory::_narrow (cosecf.in ());
 
       if (CORBA::is_nil (ecf.in ()))
       {
@@ -378,32 +315,27 @@ int main(int ac, char **av)
       }
 
       // Force a change, which should write out a new abc.xml.
-      ecf->save_topology (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ecf->save_topology ();
 
-      ecf->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ecf->destroy();
     }
 
-    poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (1);
-    orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (1);
+    poa->destroy (1, 1);
+    orb->destroy ();
     poa = PortableServer::POA::_nil ();
     orb = CORBA::ORB::_nil ();
     retval = 0;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ex, "Error: Unexpected exception caught in main. ");
+    ex._tao_print_exception ("Error: Unexpected exception caught in main. ");
     retval = -1;
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("Error : Unknown exception caught in main.") ));
     retval = -2;
   }
-  ACE_ENDTRY;
   return retval;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 86b477c1bba..3bc1ad86a3b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -95,7 +95,7 @@ TAO_Notify_Tests_Activation_Manager::consumer_count (void)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -112,7 +112,7 @@ TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Suppli
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -129,7 +129,7 @@ TAO_Notify_Tests_Activation_Manager::_register (TAO_Notify_Tests_Periodic_Consum
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -140,7 +140,7 @@ TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Supplier
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -225,20 +225,18 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Activation_Manager::write_ior (void)
 {
   PortableServer::ServantBase_var servant_var (this);
 
-  Notify_Test::Activation_Manager_var am_object = _this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  Notify_Test::Activation_Manager_var am_object = _this ();
 
   CORBA::ORB_var orb;
   LOOKUP_MANAGER->resolve (orb);
 
   // Write IOR to a file, if asked.
   CORBA::String_var str =
-    orb->object_to_string (am_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->object_to_string (am_object.in ());
 
   if (this->ior_output_file_)
     {
@@ -251,7 +249,7 @@ TAO_Notify_Tests_Activation_Manager::write_ior (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_);
 
@@ -260,7 +258,7 @@ TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (ACE_ENV_SINGLE_ARG_D
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Activation_Manager::start (void)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -273,17 +271,15 @@ TAO_Notify_Tests_Activation_Manager::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Notify_Tests_Activation_Manager::signal_peer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Activation_Manager::signal_peer (void)
 {
   CORBA::ORB_var orb;
   LOOKUP_MANAGER->resolve (orb);
 
   CORBA::Object_var object =
-    orb->string_to_object (this->ior_input_file_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->string_to_object (this->ior_input_file_.c_str ());
 
-  Notify_Test::Activation_Manager_var peer = Notify_Test::Activation_Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  Notify_Test::Activation_Manager_var peer = Notify_Test::Activation_Manager::_narrow (object.in ());
 
   if (CORBA::is_nil (peer.in ()))
     {
@@ -292,5 +288,5 @@ TAO_Notify_Tests_Activation_Manager::signal_peer (ACE_ENV_SINGLE_ARG_DECL)
                   this->ior_input_file_.c_str ()));
     }
 
-  peer->start (ACE_ENV_SINGLE_ARG_PARAMETER);
+  peer->start ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index 838516b3d64..3e50b89342a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -55,21 +55,21 @@ public:
   virtual ~TAO_Notify_Tests_Activation_Manager ();
 
   /// Interface impl.
-  virtual void start (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void start (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   /// Register Supplier
-  void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name ACE_ENV_ARG_DECL);
+  void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name);
   /// Register Consumer
-  void _register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name ACE_ENV_ARG_DECL);
+  void _register (TAO_Notify_Tests_Periodic_Consumer* consumer, const char* obj_name);
 
   /// Resolve Supplier
-  void resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name ACE_ENV_ARG_DECL);
+  void resolve (TAO_Notify_Tests_Periodic_Supplier*& supplier, const char* obj_name);
 
   /// Resolve Consumer
-  void resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name ACE_ENV_ARG_DECL);
+  void resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name);
 
   // Activate the tasks for each supplier.
   int activate_suppliers (void);
@@ -96,9 +96,9 @@ public:
   // Returns 1 if the file could be opened for read.
   int ior_input_file (const ACE_TCHAR *file_name);
 
-  void write_ior (ACE_ENV_SINGLE_ARG_DECL);
-  void wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL);
-  void signal_peer (ACE_ENV_SINGLE_ARG_DECL);
+  void write_ior (void);
+  void wait_for_start_signal (void);
+  void signal_peer (void);
 
 protected:
   /// Lock to serialize internal state.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 5172ae18620..f3ce3c8d811 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -92,20 +92,17 @@ TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::handle_init (void)
 {
   /// Fetch the root poa.
   PortableServer::POA_var root_poa;
   LOOKUP_MANAGER->resolve (root_poa);
-  ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->the_POAManager ();
 
   /// Activate the root POA.
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 
   TAO_Notify_Tests_Priority_Mapping* mapping = new TAO_Notify_Tests_Priority_Mapping ();
 
@@ -113,7 +110,7 @@ TAO_Notify_Tests_Application_Command::handle_init (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_wait_for_completion (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_wait_for_completion (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t) Waiting for suppliers and consumers to finish...\n"));
 
@@ -124,7 +121,7 @@ TAO_Notify_Tests_Application_Command::handle_wait_for_completion (ACE_ENV_SINGLE
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Shutting down the Application...\n"));
 
@@ -136,7 +133,7 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (ACE_ENV_SINGLE_ARG_DECL_N
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_dump_stats (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P, %t)Dumpimg stats...\n"));
 
@@ -147,7 +144,7 @@ TAO_Notify_Tests_Application_Command::handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Application_Command::handle_run (void)
 {
   // Run the Consumers
 
@@ -163,62 +160,54 @@ TAO_Notify_Tests_Application_Command::handle_run (ACE_ENV_SINGLE_ARG_DECL_NOT_US
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_signal_peer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::handle_signal_peer (void)
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
 
-  act_mgr->signal_peer (ACE_ENV_SINGLE_ARG_PARAMETER);
+  act_mgr->signal_peer ();
 }
 
 void
-TAO_Notify_Tests_Application_Command::handle_wait_to_start (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::handle_wait_to_start (void)
 {
   TAO_Notify_Tests_Activation_Manager* act_mgr = 0;
   LOOKUP_MANAGER->resolve (act_mgr);
 
-  act_mgr->write_ior (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  act_mgr->write_ior ();
 
-  act_mgr->wait_for_start_signal (ACE_ENV_SINGLE_ARG_PARAMETER);
+  act_mgr->wait_for_start_signal ();
 }
 
 void
-TAO_Notify_Tests_Application_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Application_Command::execute_i (void)
 {
   if (this->command_ == INIT)
     {
-      this->handle_init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_init ();
     }
   else if (this->command_ == RUN)
     {
-      this->handle_run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_run ();
     }
   else if (this->command_ == WAIT_FOR_EVENTS)
     {
-      this->handle_wait_for_completion (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_wait_for_completion ();
     }
   else if (this->command_ == SHUTDOWN)
     {
-      this->handle_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_shutdown ();
     }
   else if (this->command_ == DUMP_STATE)
     {
-      this->handle_dump_stats (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_dump_stats ();
     }
   else if (this->command_ == SIGNAL_PEER)
     {
-      this->handle_signal_peer (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_signal_peer ();
     }
   else if (this->command_ == WAIT_TO_START)
     {
-      this->handle_wait_to_start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_wait_to_start ();
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index ff267fc37a3..76481484705 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -43,7 +43,7 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void execute_i (void);
 
   /// Get the command name.
   virtual const char* get_name (void);
@@ -70,13 +70,13 @@ protected:
   int dump_samples_;
 
   ///= Handlers
-  virtual void handle_init (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_run (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_wait_for_completion (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_shutdown (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_dump_stats (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_signal_peer (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_wait_to_start (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void handle_init (void);
+  void handle_run (void);
+  void handle_wait_for_completion (void);
+  void handle_shutdown (void);
+  void handle_dump_stats (void);
+  void handle_signal_peer (void);
+  void handle_wait_to_start (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 4e63d4ba284..1704b36dcc1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -31,7 +31,7 @@ TAO_Notify_Tests_Command::next (TAO_Notify_Tests_Command* command)
 }
 
 void
-TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Command::execute (void)
 {
   if (this->command_ == INVALID)
     {
@@ -41,19 +41,18 @@ TAO_Notify_Tests_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_DEBUG ((LM_DEBUG, "Executing command: %s\n", this->get_name ()));
 
-      ACE_TRY
+      try
         {
-          this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->execute_i ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-            ACE_TEXT("Error: Exception running command\n"));
+          ex._tao_print_exception (
+            ACE_TEXT(
+              "Error: Exception running command\n"));
         }
-      ACE_ENDTRY;
     }
 
   if (this->next_)
-    this->next_->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->next_->execute ();
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h
index 41f23995f0b..d4427da065a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -50,7 +50,7 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
     /// Implement command execution.
-  virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void execute_i (void) = 0;
 
   /// Return the name of this command.
   virtual const char* get_name (void)= 0;
@@ -68,7 +68,7 @@ protected:
 
 private:
   /// Execute the command.
-  void execute (ACE_ENV_SINGLE_ARG_DECL);
+  void execute (void);
 
   /// Save the next command to exec.
   void next (TAO_Notify_Tests_Command* command);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index e95b8ed81b2..6d40e44cef1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -74,10 +74,10 @@ TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, T
 }
 
 void
-TAO_Notify_Tests_Command_Builder::execute (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Command_Builder::execute (void)
 {
   if (this->start_command_)
-    this->start_command_->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->start_command_->execute ();
 }
 
 ACE_STATIC_SVC_DEFINE(TAO_Notify_Tests_Command_Builder,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
index 7ca63765dbe..f18b14e1230 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
@@ -53,7 +53,7 @@ public:
   void _register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory);
 
   /// Execute the <start_command_>.
-  void execute (ACE_ENV_SINGLE_ARG_DECL);
+  void execute (void);
 
 protected:
   /// The starting command. each command executes the next one when done.
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index 2965bc0094c..f5441eab1bc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -30,32 +30,27 @@ TAO_Notify_Tests_ConsumerAdmin_Command::name (void)
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str ());
 
   // create consumer  admin
   CosNotifyChannelAdmin::ConsumerAdmin_var sa =
     ec->new_for_consumers (this->ifgop_,
-                           this->id_
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           this->id_);
 
-  LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str ());
 }
 
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
-  LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (admin, this->name_.c_str ());
 
   // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "Calling ConsumerAdmin subscription_change : "));
@@ -73,24 +68,21 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG
 
   ACE_DEBUG ((LM_DEBUG, "\n"));
 
-  admin->subscription_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  admin->subscription_change (this->added_, this->removed_);
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void)
 {
   CosNotifyChannelAdmin::ConsumerAdmin_var admin;
 
-  LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (admin, this->name_.c_str ());
 
-  admin->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  admin->set_qos (this->qos_);
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (void)
 {
   //@@ TODO:
 }
@@ -155,26 +147,22 @@ TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (void)
 {
   if (this->command_ == CREATE)
     {
-      this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_create ();
     }
   else if (this->command_ == SUBSCRIPTION)
     {
-      this->handle_subscriptions (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_subscriptions ();
     }
   else if (this->command_ == SET_QOS)
     {
-      this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_set_qos ();
     }
   else if (this->command_ == DUMP_STATE)
     {
-      this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_status ();
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index a94146e47bc..ce8a8c9e785 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -42,7 +42,7 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void execute_i (void);
 
   /// Name of object
   virtual const char* get_name (void);
@@ -80,10 +80,10 @@ protected:
   CosNotification::EventTypeSeq removed_;
 
   /// = Handlers
-  void handle_create (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_status (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
+  void handle_create (void);
+  void handle_subscriptions (void);
+  void handle_status (void);
+  void handle_set_qos (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
index 9441287f68b..2f9f8fadb29 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp
@@ -16,35 +16,31 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::~TAO_Notify_Tests_Consumer_T ()
 {
 }
 
-template <class Consumer_Traits> ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
+template <class Consumer_Traits> typename TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
 TAO_Notify_Tests_Consumer_T<Consumer_Traits>::get_proxy_supplier (void)
 {
   return this->get_proxy ();
 }
 
-template <class Consumer_Traits> ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+template <class Consumer_Traits> typename TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (typename TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Admin_Traits_PTR admin_ptr)
 {
   Consumer_Traits traits;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
     admin_ptr->obtain_notification_push_supplier (traits.type_
                                                   , this->proxy_id_
-                                                  ACE_ENV_ARG_PARAMETER
                                                   );
 
-  ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
 
-  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ()
-  ACE_ENV_ARG_PARAMETER);
+  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ());
 }
 
-template <class Consumer_Traits> ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Admin_Ext_Traits_PTR admin_ptr
-                                             , CosNotification::QoSProperties& qos
-                                             ACE_ENV_ARG_DECL)
+template <class Consumer_Traits> typename TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (typename TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Admin_Ext_Traits_PTR admin_ptr
+                                             , CosNotification::QoSProperties& qos)
 {
   Consumer_Traits traits;
 
@@ -52,18 +48,15 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not
   CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier =
     admin_ptr->obtain_notification_push_supplier_with_qos (traits.type_
                                                            , this->proxy_id_
-                                                           , qos
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
+                                                           , qos);
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ()));
 
-  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return Proxy_Traits_INTERFACE::_narrow (proxy_supplier.in ());
 }
 
 template <class Consumer_Traits> void
-TAO_Notify_Tests_Consumer_T<Consumer_Traits>::subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Consumer_T<Consumer_Traits>::subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed)
 {
   // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "Calling Consumer subscription change: "));
@@ -82,12 +75,11 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::subscription_change (CosNotificati
   ACE_DEBUG ((LM_DEBUG, "\n"));
 
   /// subscribe
-  ACE_TYPENAME Proxy_Traits::PTR proxy_supplier = this->get_proxy ();
+  typename Proxy_Traits::PTR proxy_supplier = this->get_proxy ();
 
   if (proxy_supplier != 0)
     {
-      proxy_supplier->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      proxy_supplier->subscription_change (added, removed);
     }
   else
     ACE_DEBUG ((LM_DEBUG, "Proxy Supplier not available, subscription change not made."));
@@ -97,7 +89,7 @@ template <class Consumer_Traits> void
 TAO_Notify_Tests_Consumer_T<Consumer_Traits>::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNotifyComm::InvalidEventType))
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 82f23b0af2a..5bb80446e24 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -44,14 +44,14 @@ class TAO_Notify_Tests_ConsumerAdmin_Ext_Traits
 template <class Consumer_Traits>
 class TAO_Notify_Tests_Consumer_T : public TAO_Notify_Tests_Peer_T <Consumer_Traits>
 {
-  typedef ACE_TYPENAME Consumer_Traits::Admin_Traits Admin_Traits;
-  typedef ACE_TYPENAME Consumer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
-  typedef ACE_TYPENAME Consumer_Traits::Proxy_Traits Proxy_Traits;
+  typedef typename Consumer_Traits::Admin_Traits Admin_Traits;
+  typedef typename Consumer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef typename Consumer_Traits::Proxy_Traits Proxy_Traits;
 
-  typedef ACE_TYPENAME Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE;
-  typedef ACE_TYPENAME Proxy_Traits::PTR Proxy_Traits_PTR;
-  typedef ACE_TYPENAME Admin_Traits::PTR Admin_Traits_PTR;
-  typedef ACE_TYPENAME Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
+  typedef typename Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE;
+  typedef typename Proxy_Traits::PTR Proxy_Traits_PTR;
+  typedef typename Admin_Traits::PTR Admin_Traits_PTR;
+  typedef typename Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
 
 public:
   /// Constuctor
@@ -64,21 +64,19 @@ public:
   Proxy_Traits_PTR get_proxy_supplier (void);
 
   /// Send subscription_change
-  virtual void subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  virtual void subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed);
 
 protected:
   /// Obtain Proxy.
-  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr);
 
   /// Obtain Proxy with QoS.
   virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
-                                         , CosNotification::QoSProperties& qos
-                                          ACE_ENV_ARG_DECL);
+                                         , CosNotification::QoSProperties& qos);
 
   // = NotifyPublish method
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index 502d535a91a..e4550193bd1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -15,23 +15,19 @@ TAO_Notify_Tests_Direct_Consumer::~TAO_Notify_Tests_Direct_Consumer ()
 }
 
 void
-TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Direct_Consumer::connect (void)
 {
   // Get the POA
   PortableServer::POA_var poa;
-  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str ());
 
   // set the POA
-  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_poa (poa.in ());
 
   // Activate the consumer with the default_POA_.
   CosNotifyComm::StructuredPushConsumer_var consumer_ref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Register the activated object.
-  LOOKUP_MANAGER->_register (consumer_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->_register (consumer_ref.in (), this->name_.c_str ());
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
index d27c57924c0..aedcf83e89a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
@@ -37,7 +37,7 @@ public:
   ~TAO_Notify_Tests_Direct_Consumer ();
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void connect (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
index a647893b1f7..a57d98f22ef 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp
@@ -20,37 +20,30 @@ TAO_Notify_Tests_Direct_Supplier::~TAO_Notify_Tests_Direct_Supplier ()
 }
 
 void
-TAO_Notify_Tests_Direct_Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Direct_Supplier::connect (void)
 {
   // Get the POA
   PortableServer::POA_var poa;
-  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str ());
 
   // set the POA
-  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_poa (poa.in ());
 
   // Get hold of the reference.
   CosNotifyComm::StructuredPushSupplier_var supplier_ref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // Register the activated object.
-  LOOKUP_MANAGER->_register (supplier_ref.in (), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->_register (supplier_ref.in (), this->name_.c_str ());
 
   // Resolve the target object.
-  LOOKUP_MANAGER->resolve (this->target_object_, this->target_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (this->target_object_, this->target_.c_str ());
 }
 
 void
-TAO_Notify_Tests_Direct_Supplier::send_event (const CosNotification::StructuredEvent& event
-                                   ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Direct_Supplier::send_event (const CosNotification::StructuredEvent& event)
 {
   ACE_ASSERT (!CORBA::is_nil (this->target_object_.in ()));
 
-  this->target_object_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->target_object_->push_structured_event (event);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
index 999bf7463ec..27d044d6987 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
@@ -37,11 +37,10 @@ public:
   ~TAO_Notify_Tests_Direct_Supplier ();
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void connect (void);
 
   // Send one event. Bypass sending to the Notify and send directly to taget consumer.
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
 
 protected:
   /// Target object.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 8985aa6f772..ed2088a7f4b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -90,19 +90,16 @@ TAO_Notify_Tests_Worker::svc (void)
   ACE_DEBUG ((LM_ERROR, "Activated Worker Thread for commands @ priority:%d \n", priority));
 #endif
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "Running Commands... \n"));
-      this->cmd_builder_->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->cmd_builder_->execute ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: ORB run error\n");
+      ex._tao_print_exception ("Error: ORB run error\n");
     }
-  ACE_ENDTRY;
 
 
   ACE_DEBUG ((LM_DEBUG, "Finished executing commands\n"));
@@ -137,7 +134,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
   // just disabling it altogether.  It doesn't provide much value, and
   // makes service startup needlessly more verbose.  See bugzilla 2477
   // for details.
-  
+
   ACE_hthread_t current;
   ACE_Thread::self (current);
 
@@ -151,19 +148,16 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
   ACE_DEBUG ((LM_ERROR, "Activated ORB Run Worker Thread to run the ORB @ priority:%d \n", priority));
 #endif
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ()));
 
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -235,15 +229,13 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[])
 }
 
 int
-TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[])
 {
   ACE_Argv_Type_Converter command_line(argc, argv);
 
   this->orb_ = CORBA::ORB_init (command_line.get_argc(),
                                 command_line.get_ASCII_argv(),
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                "");
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
@@ -253,8 +245,7 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
   if (skip_priority_levels_check_ == 0)
     check_supported_priorities (this->orb_.in());
 
-  LOOKUP_MANAGER->init (this->orb_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  LOOKUP_MANAGER->init (this->orb_.in ());
 
   this->cmd_builder_ =
     ACE_Dynamic_Service<TAO_Notify_Tests_Command_Builder>::instance (TAO_Notify_Tests_Name::command_builder);
@@ -272,7 +263,7 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_Notify_Tests_Driver::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Driver::run (void)
 {
   // Task activation flags.
   long flags =
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index 610e6b02e79..20cca6001cb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -107,10 +107,10 @@ public:
   ~TAO_Notify_Tests_Driver ();
 
   /// Init
-  int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, ACE_TCHAR *argv[]);
 
   /// Execute the commands.
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
 
   /// Shutdown
   virtual void shutdown (void);
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 519fee9fc45..83a2da32fa1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -88,7 +88,7 @@ TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
 
@@ -119,40 +119,31 @@ TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG
 
   LOOKUP_MANAGER->resolve (naming);
 
-  notify_service->init_service (orb.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  notify_service->init_service (orb.in ());
 
   // Activate the factory
   notify_factory =
-    notify_service->create (poa.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    notify_service->create (poa.in ());
 
   // Register with the Naming Service
   CosNaming::Name_var name =
-    naming->to_name (TAO_Notify_Tests_Name::event_channel_factory
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    naming->to_name (TAO_Notify_Tests_Name::event_channel_factory);
 
   naming->rebind (name.in (),
-                  notify_factory.in ()
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                  notify_factory.in ());
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::handle_create (void)
 {
   if (this->collocated_ == 1)
     {
-      this->create_collocated_ecf (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->create_collocated_ecf ();
     }
 
   CosNotifyChannelAdmin::EventChannelFactory_var ec_factory;
 
-  LOOKUP_MANAGER->resolve (ec_factory , TAO_Notify_Tests_Name::event_channel_factory ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (ec_factory , TAO_Notify_Tests_Name::event_channel_factory);
 
   CosNotification::QoSProperties qos;
   CosNotification::AdminProperties admin;
@@ -161,65 +152,54 @@ TAO_Notify_Tests_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
   CosNotifyChannelAdmin::EventChannel_var ec =
     ec_factory->create_channel (qos,
                                 admin,
-                                this->id_
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                this->id_);
 
-  LOOKUP_MANAGER->_register (ec.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->_register (ec.in(), this->name_.c_str ());
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::handle_destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::handle_destroy (void)
 {
   ACE_DEBUG ((LM_DEBUG, "Destroying event channel %s\n", this->name_.c_str ()));
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (ec, this->name_.c_str ());
 
-  ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ec->destroy ();
 }
 void
-TAO_Notify_Tests_EventChannel_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (ec, this->name_.c_str ());
 
-  ec->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ec->set_qos (this->qos_);
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_EventChannel_Command::handle_status (void)
 {
   //@@ TODO: Implement
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_EventChannel_Command::execute_i (void)
 {
   if (this->command_ == CREATE)
     {
-      this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_create ();
     }
   else if (this->command_ == DESTROY)
     {
-      this->handle_destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_destroy ();
     }
   else if (this->command_ == SET_QOS)
     {
-      this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_set_qos ();
     }
   else if (this->command_ == DUMP_STATE)
     {
-      this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_status ();
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 35a2baa4bb0..dc8163bb0d1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -47,7 +47,7 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void execute_i (void);
 
   /// Name of object
   virtual const char* get_name (void);
@@ -82,13 +82,13 @@ protected:
   CORBA::Boolean collocated_;
 
   /// Helper method to create a collocated ECF.
-  void create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL);
+  void create_collocated_ecf (void);
 
   /// = Handlers
-  void handle_create (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_destroy (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_status (ACE_ENV_SINGLE_ARG_DECL);
+  void handle_create (void);
+  void handle_destroy (void);
+  void handle_set_qos (void);
+  void handle_status (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index 2bb7bb716b4..2edb48c3742 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -98,44 +98,37 @@ TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str ());
 
   CosNotifyFilter::FilterFactory_var ff =
-    ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ec->default_filter_factory ();
 
-  LOOKUP_MANAGER->_register (ff.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->_register (ff.in(), this->name_.c_str ());
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_create_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_create_filter (void)
 {
   CosNotifyFilter::FilterFactory_var ff;
 
-  LOOKUP_MANAGER->resolve (ff , this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (ff , this->factory_.c_str ());
 
   CosNotifyFilter::Filter_var filter =
-    ff->create_filter ("ETCL" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ff->create_filter ("ETCL");
 
-  LOOKUP_MANAGER->_register (filter.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->_register (filter.in(), this->name_.c_str ());
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_add_constraint (void)
 {
   CosNotifyFilter::Filter_var filter;
 
-  LOOKUP_MANAGER->resolve (filter , this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (filter , this->name_.c_str ());
 
   CosNotifyFilter::ConstraintExpSeq constraint_list (1);
   constraint_list.length (1);
@@ -144,65 +137,54 @@ TAO_Notify_Tests_Filter_Command::handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL)
   constraint_list[0].constraint_expr = CORBA::string_dup (this->constraint_.c_str ());
 
   ACE_DEBUG ((LM_DEBUG, "Adding constraint %s\n", this->constraint_.c_str ()));
-  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  filter->add_constraints (constraint_list);
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_add_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_add_filter (void)
 {
   CosNotifyFilter::Filter_var filter;
 
-  LOOKUP_MANAGER->resolve (filter , this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (filter , this->name_.c_str ());
 
   CosNotifyFilter::FilterAdmin_var filter_admin;
 
-  LOOKUP_MANAGER->resolve (filter_admin , this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (filter_admin , this->factory_.c_str ());
 
-  filter_admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  filter_admin->add_filter (filter.in ());
 }
 
 void
-TAO_Notify_Tests_Filter_Command::handle_destroy_filter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void)
 {
   CosNotifyFilter::Filter_var filter;
 
-  LOOKUP_MANAGER->resolve (filter, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (filter, this->name_.c_str ());
 
-  filter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  filter->destroy ();
 }
 
 void
-TAO_Notify_Tests_Filter_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Filter_Command::execute_i (void)
 {
   if (this->command_ == CREATE_FACTORY)
     {
-      this->handle_create_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_create_filter_factory ();
     }
   else if (this->command_ == CREATE_FILTER)
     {
-      this->handle_create_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_create_filter ();
     }
   else if (this->command_ == ADD_CONSTRAINT)
     {
-      this->handle_add_constraint (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_add_constraint ();
     }
   else if (this->command_ == ADD_FILTER)
     {
-      this->handle_add_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_add_filter ();
     }
   else if (this->command_ == DESTROY)
     {
-      this->handle_destroy_filter (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_destroy_filter ();
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 2678b6c4437..d3acf0efe73 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -42,7 +42,7 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void execute_i (void);
 
   /// Name of object
   virtual const char* get_name (void);
@@ -72,11 +72,11 @@ protected:
   ACE_CString constraint_;
 
   ///= Handlers
-  void handle_create_filter_factory (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_create_filter (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_add_constraint (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_add_filter (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_destroy_filter (ACE_ENV_SINGLE_ARG_DECL);
+  void handle_create_filter_factory (void);
+  void handle_create_filter (void);
+  void handle_add_constraint (void);
+  void handle_add_filter (void);
+  void handle_destroy_filter (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
index 14ebdb482d8..2522e005b08 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -19,28 +19,23 @@ TAO_Notify_Tests_LookupManager::~TAO_Notify_Tests_LookupManager ()
 }
 
 void
-TAO_Notify_Tests_LookupManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::init (CORBA::ORB_ptr orb)
 {
   orb_ = CORBA::ORB::_duplicate (orb);
 
-  this->resolve (this->root_poa_, TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->resolve (this->root_poa_, TAO_Notify_Tests_Name::root_poa);
 
-  this->resolve (this->naming_, TAO_Notify_Tests_Name::naming_service ACE_ENV_ARG_PARAMETER);
+  this->resolve (this->naming_, TAO_Notify_Tests_Name::naming_service);
 }
 
 void
-TAO_Notify_Tests_LookupManager::_register (CORBA::Object_ptr obj, const char* obj_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::_register (CORBA::Object_ptr obj, const char* obj_name)
 {
   CosNaming::Name_var name =
-    this->naming_->to_name (obj_name
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_->to_name (obj_name);
   //@@ Warning: this is rebind..
   this->naming_->rebind (name.in (),
-                         obj
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         obj);
 
   ACE_DEBUG ((LM_DEBUG, "Registered %s with Naming Service\n", obj_name));
 }
@@ -100,13 +95,12 @@ TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const char *poa_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const char *poa_name)
 {
   if (ACE_OS::strcmp (poa_name, TAO_Notify_Tests_Name::root_poa) == 0)
     {
       CORBA::Object_ptr poa_object  =
-                this->orb_->resolve_initial_references(TAO_Notify_Tests_Name::root_poa ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                this->orb_->resolve_initial_references(TAO_Notify_Tests_Name::root_poa);
 
       if (CORBA::is_nil (poa_object))
         {
@@ -115,32 +109,27 @@ TAO_Notify_Tests_LookupManager::resolve (PortableServer::POA_var& poa, const cha
           return;
         }
 
-      poa = PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa = PortableServer::POA::_narrow (poa_object);
 
           this->root_poa_ = poa;
     }
   else
     {
-      poa = root_poa_->find_POA (poa_name, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      poa = root_poa_->find_POA (poa_name, 0);
     }
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (naming_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references (naming_name);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
-  this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in ());
 
   CosNaming::NamingContextExt::_duplicate (this->naming_.in ());
 
@@ -148,107 +137,88 @@ TAO_Notify_Tests_LookupManager::resolve (CosNaming::NamingContextExt_var& naming
 }
 
 CORBA::Object_ptr
-TAO_Notify_Tests_LookupManager::resolve_object (const char* obj_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve_object (const char* obj_name)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (obj_name);
 
   CORBA::Object_var obj =
-    this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
+    this->naming_->resolve (name);
 
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
   return obj._retn ();
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char * factory_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char * factory_name)
 {
-  CORBA::Object_var object = this->resolve_object (factory_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = this->resolve_object (factory_name);
 
-  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ecf = CosNotifyChannelAdmin::EventChannelFactory::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char * channel_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char * channel_name)
 {
-  CORBA::Object_var object = this->resolve_object (channel_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = this->resolve_object (channel_name);
 
-  ec = CosNotifyChannelAdmin::EventChannel::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ec = CosNotifyChannelAdmin::EventChannel::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char * admin_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char * admin_name)
 {
-  CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = this->resolve_object (admin_name);
 
-  sa = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  sa = CosNotifyChannelAdmin::SupplierAdmin::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char * admin_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char * admin_name)
 {
-  CORBA::Object_var object = this->resolve_object (admin_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = this->resolve_object (admin_name);
 
-  ca = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ca = CosNotifyChannelAdmin::ConsumerAdmin::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name)
 {
-  CORBA::Object_var object = this->resolve_object (supplier_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = this->resolve_object (supplier_name);
 
-  supplier = CosNotifyComm::StructuredPushSupplier::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier = CosNotifyComm::StructuredPushSupplier::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char * consumer_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char * consumer_name)
 {
-  CORBA::Object_var object = this->resolve_object (consumer_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = this->resolve_object (consumer_name);
 
-  consumer = CosNotifyComm::StructuredPushConsumer::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer = CosNotifyComm::StructuredPushConsumer::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name)
 {
-  CORBA::Object_var object = this->resolve_object (filter_factory_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = this->resolve_object (filter_factory_name);
 
-  ff = CosNotifyFilter::FilterFactory::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ff = CosNotifyFilter::FilterFactory::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name)
 {
-  CORBA::Object_var object = this->resolve_object (filter_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = this->resolve_object (filter_name);
 
-  filter = CosNotifyFilter::Filter::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  filter = CosNotifyFilter::Filter::_narrow (object.in());
 }
 
 void
-TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name)
 {
-  CORBA::Object_var object = this->resolve_object (filter_admin_name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var object = this->resolve_object (filter_admin_name);
 
-  filter_admin = CosNotifyFilter::FilterAdmin::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  filter_admin = CosNotifyFilter::FilterAdmin::_narrow (object.in());
 }
 
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index b7ebe49ef06..110bc5871c0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -47,7 +47,7 @@ public:
   ~TAO_Notify_Tests_LookupManager ();
 
   /// Init
-  void init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
+  void init (CORBA::ORB_ptr orb);
 
   ///= Register Objects
 
@@ -57,7 +57,7 @@ public:
   void _register (TAO_Notify_Tests_Priority_Mapping *priority_mapping);
 
   /// Register Objects with Naming Service
-  void _register(CORBA::Object_ptr obj, const char* obj_name ACE_ENV_ARG_DECL);
+  void _register(CORBA::Object_ptr obj, const char* obj_name);
 
   ///= Resolve methods
 
@@ -75,17 +75,17 @@ public:
   /// Return the default Naming context.
   void resolve (CosNaming::NamingContextExt_var& naming);
 
-  void resolve (PortableServer::POA_var& poa, const char *poa_name ACE_ENV_ARG_DECL);
-  void resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char *factory_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char *channel_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char *admin_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char *admin_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char *consumer_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name ACE_ENV_ARG_DECL);
-  void resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name ACE_ENV_ARG_DECL);
+  void resolve (PortableServer::POA_var& poa, const char *poa_name);
+  void resolve (CosNaming::NamingContextExt_var& naming, const char *naming_name);
+  void resolve (CosNotifyChannelAdmin::EventChannelFactory_var& ecf, const char *factory_name);
+  void resolve (CosNotifyChannelAdmin::EventChannel_var& ec, const char *channel_name);
+  void resolve (CosNotifyChannelAdmin::SupplierAdmin_var& sa, const char *admin_name);
+  void resolve (CosNotifyChannelAdmin::ConsumerAdmin_var& ca , const char *admin_name);
+  void resolve (CosNotifyComm::StructuredPushSupplier_var& supplier, const char *supplier_name);
+  void resolve (CosNotifyComm::StructuredPushConsumer_var& consumer, const char *consumer_name);
+  void resolve (CosNotifyFilter::FilterFactory_var& ff, const char *filter_factory_name);
+  void resolve (CosNotifyFilter::Filter_var& filter, const char *filter_name);
+  void resolve (CosNotifyFilter::FilterAdmin_var& filter_admin, const char *filter_admin_name);
 
 protected:
   /// Application Starter
@@ -95,7 +95,7 @@ protected:
   TAO_Notify_Tests_Activation_Manager* activation_manager_;
 
   /// Resolve to CORBA::Object
-  CORBA::Object_ptr resolve_object (const char* obj_name ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr resolve_object (const char* obj_name);
 
   // The ORB that we use.
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index cd6a689acfa..22a1adedfa8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -19,31 +19,25 @@ Notify_Test_Client::Notify_Test_Client (void)
 
 Notify_Test_Client::~Notify_Test_Client ()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    root_poa_->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    root_poa_->destroy(1, 1);
+    orb_->destroy();
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "\nError: ");
+    e._tao_print_exception ("\nError: ");
   }
-  ACE_ENDTRY;
 }
 
 int
-Notify_Test_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+Notify_Test_Client::init (int argc, char *argv [])
 {
-  int status = this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->init_ORB (argc, argv);
   if (status == 0)
     {
-      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->resolve_naming_service ();
+      this->resolve_Notify_factory ();
     }
   return status;
 }
@@ -57,14 +51,11 @@ Notify_Test_Client::parse_args (int /*argc*/, char** /*argv*/)
 
 int
 Notify_Test_Client::init_ORB (int argc,
-                              char *argv []
-                              ACE_ENV_ARG_DECL)
+                              char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                "");
 
   if (this->parse_args (argc, argv) != 0)
     {
@@ -72,9 +63,7 @@ Notify_Test_Client::init_ORB (int argc,
     }
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
     {
@@ -83,72 +72,59 @@ Notify_Test_Client::init_ORB (int argc,
       return -1;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate ();
 
   return 0;
 }
 
 void
-Notify_Test_Client::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Test_Client::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
+    throw CORBA::UNKNOWN ();
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
-Notify_Test_Client::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Test_Client::resolve_Notify_factory (void)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_context_->resolve (name);
 
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
                                                     obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER
                                                   );
-  ACE_CHECK;
 }
 
 int
-Notify_Test_Client::ORB_run (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Test_Client::ORB_run (void)
 {
   while (! is_done())
   {
     ACE_Time_Value tv(0, 10 * 1000);
-    orb_->run(tv ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(-1);
+    orb_->run(tv);
   }
 
   ACE_DEBUG((LM_DEBUG, "\nWaiting for stray events...\n"));
 
   ACE_Time_Value tv(2);
-  orb_->run(tv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(-1);
+  orb_->run(tv);
 
   return 0;
 }
@@ -204,8 +180,7 @@ Notify_Test_Client::notify_factory (void)
 
 CosNotifyChannelAdmin::EventChannel_ptr
 Notify_Test_Client::create_event_channel (const char* cname,
-                                          int resolve
-                                          ACE_ENV_ARG_DECL)
+                                          int resolve)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
   CosNaming::Name name (1);
@@ -230,9 +205,7 @@ Notify_Test_Client::create_event_channel (const char* cname,
 
       ec = notify_factory_->create_channel (initial_qos,
                                             initial_admin,
-                                            id
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
+                                            id);
 
 
       naming_context_->rebind(name, ec.in());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 39bbed208fe..50dae888298 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -37,13 +37,13 @@ public:
   Notify_Test_Client (void);
   virtual ~Notify_Test_Client ();
 
-  virtual int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  virtual int init (int argc, char *argv []);
   // starts the orb and resolves the notify factory via a naming service.
 
   virtual int parse_args (int argc, char* argv[]);
   // Allow the user to override this empty method
 
-  int ORB_run (ACE_ENV_SINGLE_ARG_DECL);
+  int ORB_run (void);
   // Call ORB::run to accept requests.
 
   void consumer_start (TAO_Notify_Tests_Peer*);
@@ -70,20 +70,18 @@ public:
   CosNotifyChannelAdmin::EventChannel_ptr create_event_channel (
                                               const char* name,
                                               int resolve
-                                              ACE_ENV_ARG_DECL
                                             );
   // Create an Event Channel.  Ownership is passed to the caller.
 
 protected:
   int init_ORB (int argc,
-                char *argv []
-                ACE_ENV_ARG_DECL);
+                char *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_Notify_factory (void);
   // Try to resolve the Notify factory from the Naming service.
 
   // = Data Members
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index f2e6347a9ea..5826589c013 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -26,7 +26,7 @@ TAO_Notify_Tests_Peer::~TAO_Notify_Tests_Peer ()
 }
 
 void
-TAO_Notify_Tests_Peer::init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Peer::init (PortableServer::POA_ptr poa)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
@@ -87,7 +87,7 @@ TAO_Notify_Tests_Peer::get_name (void)
 }
 
 void
-TAO_Notify_Tests_Peer::set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_Peer::set_poa (PortableServer::POA_ptr poa)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index cff35edb8fa..e8b5424e205 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -40,13 +40,13 @@ public:
   virtual ~TAO_Notify_Tests_Peer ();
 
   /// Init
-  void init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED);
+  void init (PortableServer::POA_ptr poa);
 
   /// Init this object.
   virtual int init_state (ACE_Arg_Shifter& arg_shifter);
 
   /// Set POA
-  void set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL);
+  void set_poa (PortableServer::POA_ptr poa);
 
   // Accessor to set/get our name.
   void set_name (ACE_CString& name);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 556d11fb0f0..2f54bdbbf88 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -27,35 +27,32 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::~TAO_Notify_Tests_Peer_T ()
 }
 
 template <class Peer_Traits>
-ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Proxy_Traits_PTR
+typename TAO_Notify_Tests_Peer_T<Peer_Traits>::Proxy_Traits_PTR
 TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy (void)
 {
   return proxy_.in ();
 }
 
 template <class Peer_Traits>
-ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR
-TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (ACE_ENV_SINGLE_ARG_DECL)
+typename TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR
+TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (void)
 {
-  return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->_this ();
 }
 
 template <class Peer_Traits>
 void
 TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy,
-                                               Proxy_Traits_ID proxy_id
-                                               ACE_ENV_ARG_DECL)
+                                               Proxy_Traits_ID proxy_id)
 {
   // This will decr the ref count on exit.
   // Clients of this class should use raw pointers, not vars.
   PortableServer::ServantBase_var servant_var (this);
 
-  ACE_TYPENAME Peer_Traits::VAR peer_var =
-    this->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  typename Peer_Traits::VAR peer_var =
+    this->activate ();
 
-  this->connect_to_peer (proxy, peer_var.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->connect_to_peer (proxy, peer_var.in ());
 
   // save the proxy
   this->proxy_ = Proxy_Traits_INTERFACE::_duplicate (proxy);
@@ -65,97 +62,75 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy,
   if (this->proxy_name_.length () != 0)
     {
       LOOKUP_MANAGER->_register (this->proxy_.in (),
-                                 this->proxy_name_.c_str ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 this->proxy_name_.c_str ());
     }
 }
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr
-                                               ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr)
 {
-  ACE_TYPENAME Proxy_Traits::VAR proxy_var =
-    this->obtain_proxy (admin_ptr
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  typename Proxy_Traits::VAR proxy_var =
+    this->obtain_proxy (admin_ptr);
 
   ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
 
   this->connect (proxy_var.in (),
-                 this->proxy_id_
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                 this->proxy_id_);
 }
 
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (void)
 {
   // Get the POA
   PortableServer::POA_var poa;
   LOOKUP_MANAGER->resolve (poa,
-                           this->poa_name_.c_str ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           this->poa_name_.c_str ());
 
   // set the POA
-  this->set_poa (poa.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_poa (poa.in ());
 
   // Resolve the admin
-  ACE_TYPENAME Admin_Traits::VAR admin_var;
+  typename Admin_Traits::VAR admin_var;
 
   LOOKUP_MANAGER->resolve (admin_var,
-                           this->admin_name_.c_str ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           this->admin_name_.c_str ());
 
-  ACE_TYPENAME Admin_Ext_Traits::VAR admin_ext_var =
-    Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  typename Admin_Ext_Traits::VAR admin_ext_var =
+    Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in ());
 
-  ACE_TYPENAME Proxy_Traits::VAR proxy_var =
+  typename Proxy_Traits::VAR proxy_var =
     this->obtain_proxy (admin_ext_var.in (),
-                        this->qos_
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        this->qos_);
 
   ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
 
   // connect supplier to proxy,
   // also activates the servant as CORBA object in the POA specified.
   this->connect (proxy_var.in (),
-                 this->proxy_id_
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                 this->proxy_id_);
 }
 
 template <class Peer_Traits>
 void
 TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos (
     CosNotification::QoSProperties& qos
-    ACE_ENV_ARG_DECL
   )
 {
-  this->get_proxy ()->set_qos (qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->get_proxy ()->set_qos (qos);
 }
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
 {
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  ACE_TRY
+  try
     {
       CORBA::Boolean not_exist =
-        this->get_proxy ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->get_proxy ()->_non_existent ();
 
       if (not_exist == 1)
         {
@@ -170,63 +145,57 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
                       this->name_.c_str ()));
         }
     }
-  ACE_CATCH(CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Error: ");
+      ex._tao_print_exception ("Error: ");
       ACE_DEBUG ((LM_DEBUG,
                   "Peer %s is_equivalent transient exception.",
                   this->name_.c_str ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error: ");
+      ex._tao_print_exception ("Error: ");
       ACE_DEBUG ((LM_DEBUG,
                   "Peer %s is_equivanent other exception.",
                   this->name_.c_str ()));
     }
-  ACE_ENDTRY;
 #else
-  ACE_ENV_ARG_NOT_USED;
+;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
-  ACE_TRY_EX(TRY1)
+  try
     {
-      this->disconnect_from_proxy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(TRY1);
+      this->disconnect_from_proxy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Peer %s failed to disconnect from proxy.",
                   this->name_.c_str ()));
     }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(TRY2)
+  try
     {
-      this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(TRY2);
+      this->deactivate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Peer %s failed to deactivate.",
                   this->name_.c_str ()));
     }
-  ACE_ENDTRY;
 }
 
 template <class Peer_Traits>
 PortableServer::POA_ptr
 TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
@@ -234,18 +203,14 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA (
 
 template <class Peer_Traits>
 void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (void)
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 #endif /* TAO_Notify_Tests_Peer_T_CPP */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index 0356c52d844..fd7806f04d2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -29,20 +29,20 @@
 template <class Peer_Traits>
 class TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits::SKELETON
 {
-  typedef ACE_TYPENAME Peer_Traits::Admin_Traits Admin_Traits;
-  typedef ACE_TYPENAME Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
-  typedef ACE_TYPENAME Peer_Traits::Proxy_Traits Proxy_Traits;
+  typedef typename Peer_Traits::Admin_Traits Admin_Traits;
+  typedef typename Peer_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef typename Peer_Traits::Proxy_Traits Proxy_Traits;
 
-  typedef ACE_TYPENAME Peer_Traits::PTR Peer_Traits_PTR;
+  typedef typename Peer_Traits::PTR Peer_Traits_PTR;
 
-  typedef ACE_TYPENAME Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE;
-  typedef ACE_TYPENAME Proxy_Traits::PTR Proxy_Traits_PTR;
-  typedef ACE_TYPENAME Proxy_Traits::ID Proxy_Traits_ID;
+  typedef typename Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE;
+  typedef typename Proxy_Traits::PTR Proxy_Traits_PTR;
+  typedef typename Proxy_Traits::ID Proxy_Traits_ID;
 
-  typedef ACE_TYPENAME Admin_Traits::PTR Admin_Traits_PTR;
+  typedef typename Admin_Traits::PTR Admin_Traits_PTR;
 
-  typedef ACE_TYPENAME Admin_Ext_Traits::INTERFACE Admin_Ext_Traits_INTERFACE;
-  typedef ACE_TYPENAME Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
+  typedef typename Admin_Ext_Traits::INTERFACE Admin_Ext_Traits_INTERFACE;
+  typedef typename Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
 
 public:
   /// Constuctor
@@ -53,60 +53,59 @@ public:
 
   // Activates this servant with the POA supplied in init.
   // Connects to given proxy.
-  void connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID proxy_id ACE_ENV_ARG_DECL);
+  void connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID proxy_id);
 
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier and connects to it.
-  void connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
+  void connect (Admin_Traits_PTR admin_ptr);
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void connect (void);
 
   // Disconnect from the Peer.
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
 
   /// Set Qos
-  void set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL);
+  void set_qos (CosNotification::QoSProperties& qos);
 
   /// Dump status
-  void status (ACE_ENV_SINGLE_ARG_DECL);
+  void status (void);
 
   // Accessor for <proxy_>.
   Proxy_Traits_PTR get_proxy (void);
 
   /// Deactivate the object.
-  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (void);
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 protected:
   /// Activate this object in the default POA.
-  virtual Peer_Traits_PTR activate (ACE_ENV_SINGLE_ARG_DECL);
+  virtual Peer_Traits_PTR activate (void);
 
   ///= To be implemented by specializations.
 
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits_PTR proxy_ptr, Peer_Traits_PTR peer_ptr ACE_ENV_ARG_DECL) = 0;
+  virtual void connect_to_peer (Proxy_Traits_PTR proxy_ptr, Peer_Traits_PTR peer_ptr) = 0;
 
   /// Obtain Proxy.
-  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL) = 0;
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr) = 0;
 
   /// Obtain Proxy with QoS.
   virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
-                                         , CosNotification::QoSProperties& qos
-                                         ACE_ENV_ARG_DECL) = 0;
+                                         , CosNotification::QoSProperties& qos) = 0;
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void disconnect_from_proxy (void) = 0;
 
   // = Data Members
 
   /// The proxy that we are connected to.
-   ACE_TYPENAME Proxy_Traits::VAR proxy_;
+   typename Proxy_Traits::VAR proxy_;
 
   /// This <proxy_> id.
-   ACE_TYPENAME Proxy_Traits::ID proxy_id_;
+   typename Proxy_Traits::ID proxy_id_;
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index a718deb73bf..77c60f9f1cf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -170,7 +170,7 @@ TAO_Notify_Tests_Periodic_Consumer::check_priority (const CosNotification::Prope
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification::StructuredEvent & notification)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -178,7 +178,6 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK;
 
   const CosNotification::PropertySeq& prop_seq =
     notification.header.variable_header;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index 943d189c411..a3e84ea25fd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -57,7 +57,6 @@ protected:
 
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index cfda2e788f8..97f9474689c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -86,9 +86,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
          LOOKUP_MANAGER->resolve (act_mgr);
 
          {
-           ACE_DECLARE_NEW_CORBA_ENV;
-           act_mgr->_register (consumer, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
+           act_mgr->_register (consumer, this->name_.c_str ());
          }
 
          consumer->init_state (arg_shifter);
@@ -160,9 +158,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
   TAO_Notify_Tests_Periodic_Consumer* consumer = 0;
 
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    act_mgr->resolve (consumer, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    act_mgr->resolve (consumer, this->name_.c_str ());
   }
 
   if (consumer == 0)
@@ -172,102 +168,90 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (void)
 {
-  this->consumer ()->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->consumer ()->set_qos (this->qos_);
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (void)
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
 
   if (consumer == 0)
     return;
 
-  consumer->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->connect ();
 
   ACE_DEBUG ((LM_DEBUG, "Consumer %s is connected\n", this->name_.c_str ()));
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void)
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
   if (consumer == 0)
     return;
 
-  consumer->subscription_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->subscription_change (this->added_, this->removed_);
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (void)
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer ();
   if (consumer == 0)
     return;
 
-  consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->disconnect ();
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (void)
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
   if (consumer == 0)
     return;
 
-  consumer->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->deactivate ();
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (void)
 {
   TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer ();
 
   if (consumer == 0)
     return;
 
-  consumer->status (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  consumer->status ();
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (void)
 {
   if (this->command_ == CREATE)
     {
-      this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_create ();
     }
   else if (this->command_ == SUBSCRIPTION)
     {
-      this->handle_subscriptions (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_subscriptions ();
     }
   else if (this->command_ == DISCONNECT)
     {
-      this->handle_disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_disconnect ();
     }
   else if (this->command_ == DEACTIVATE)
     {
-      this->handle_deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_deactivate ();
     }
   else  if (this->command_ == DUMP_STATE)
     {
-      this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_status ();
     }
   else if (this->command_ == SET_QOS)
     {
-      this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_set_qos ();
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index d258c7e2e8a..6e2c3c5c7f5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -44,7 +44,7 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void execute_i (void);
 
   /// Name of object
   virtual const char* get_name (void);
@@ -83,12 +83,12 @@ protected:
   TAO_Notify_Tests_Periodic_Consumer* consumer (void);
 
   ///= Handlers
-  void handle_create (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_subscriptions (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_disconnect (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_deactivate (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_status (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
+  void handle_create (void);
+  void handle_subscriptions (void);
+  void handle_disconnect (void);
+  void handle_deactivate (void);
+  void handle_status (void);
+  void handle_set_qos (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index b2aea30f498..59456515806 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -178,19 +178,18 @@ TAO_Notify_Tests_Periodic_Supplier::activate_task (ACE_Barrier* barrier)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void)
 {
   int WARMUP_COUNT = 10;
 
   for (int i = 0; i < WARMUP_COUNT ; ++i)
     {
-      this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->send_event (this->event_.event ());
     }
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::send_prologue (void)
 {
   // populate event.
   // send the base time and max count.
@@ -211,15 +210,13 @@ TAO_Notify_Tests_Periodic_Supplier::send_prologue (ACE_ENV_SINGLE_ARG_DECL)
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event 0th event\n"));
 
-  this->send_event (zeroth_event.event () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_event (zeroth_event.event ());
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier::handle_svc (void)
 {
-  this->send_prologue (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->send_prologue ();
 
   ACE_hrtime_t before, after;
   TimeBase::TimeT time_t;
@@ -253,8 +250,7 @@ TAO_Notify_Tests_Periodic_Supplier::handle_svc (ACE_ENV_SINGLE_ARG_DECL)
         ACE_DEBUG ((LM_DEBUG, "(%P, %t) Supplier (%s) sending event #%d\n",
                     this->name_.c_str (), i));
 
-      this->send_event (this->event_.event () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->send_event (this->event_.event ());
 
       after = ACE_OS::gethrtime ();
 
@@ -306,11 +302,10 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void)
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Thread_Task (%t) - wait\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // First, send warmup events.
-      this->send_warmup_events (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->send_warmup_events ();
 
       // Next, wait for other threads.
       this->barrier_->wait ();
@@ -321,20 +316,18 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void)
       // now wait till the phase_ period expires.
       ACE_OS::sleep (ACE_Time_Value (0, phase_));
 
-      this->handle_svc (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->handle_svc ();
     }
-  ACE_CATCH (CORBA::UserException, ue)
+  catch (const CORBA::UserException& ue)
     {
-      ACE_PRINT_EXCEPTION (ue,
+      ue._tao_print_exception (
         "Error: Periodic supplier: error sending event. ");
     }
-  ACE_CATCH (CORBA::SystemException, se)
+  catch (const CORBA::SystemException& se)
     {
-      ACE_PRINT_EXCEPTION (se,
+      se._tao_print_exception (
         "Error: Periodic supplier: error sending event. ");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 5bcdf57d34c..ffaf7e4eba6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -64,13 +64,13 @@ public:
 protected:
 
   /// svc method.
-  void handle_svc (ACE_ENV_SINGLE_ARG_DECL);
+  void handle_svc (void);
 
   /// Send a few events before the actual measurements.
-  void send_warmup_events (ACE_ENV_SINGLE_ARG_DECL);
+  void send_warmup_events (void);
 
   /// Send Prologue
-  void send_prologue (ACE_ENV_SINGLE_ARG_DECL);
+  void send_prologue (void);
 
   /// All tasks synch at this barrier.
   ACE_Barrier* barrier_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 9cdfaccbb51..58400838c17 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -76,9 +76,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
          LOOKUP_MANAGER->resolve (act_mgr);
 
          {
-           ACE_DECLARE_NEW_CORBA_ENV;
-           act_mgr->_register (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
+           act_mgr->_register (supplier, this->name_.c_str ());
          }
 
          supplier->init_state (arg_shifter);
@@ -147,9 +145,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
   // Locate the supplier
   TAO_Notify_Tests_Periodic_Supplier* supplier = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  act_mgr->resolve (supplier, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  act_mgr->resolve (supplier, this->name_.c_str ());
 
   if (supplier == 0)
     ACE_DEBUG ((LM_DEBUG, "Supplier %s not found by Lookup Manager\n", this->name_.c_str ()));
@@ -158,104 +154,94 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (void)
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
     return;
 
-  supplier->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->connect ();
 
   ACE_DEBUG ((LM_DEBUG, "Supplier %s is connected\n", this->name_.c_str ()));
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void)
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
     return;
 
-  supplier->offer_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->offer_change (this->added_, this->removed_);
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (void)
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier= this->supplier ();
   if (supplier == 0)
     return;
 
-  supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->disconnect ();
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (void)
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
   if (supplier == 0)
     return;
 
-  supplier->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier->deactivate ();
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (void)
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
 
   if (supplier == 0)
     return;
 
-  supplier->status (ACE_ENV_SINGLE_ARG_PARAMETER);
+  supplier->status ();
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void)
 {
   TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier ();
 
   if (supplier == 0)
     return;
 
-  supplier->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
+  supplier->set_qos (this->qos_);
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (void)
 {
   if (this->command_ == CREATE)
     {
-      this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_create ();
     }
   else if (this->command_ == OFFER)
     {
-      this->handle_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_offers ();
     }
   else if (this->command_ == DISCONNECT)
     {
-      this->handle_disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_disconnect ();
     }
   else if (this->command_ == DEACTIVATE)
     {
-      this->handle_deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_deactivate ();
     }
   else  if (this->command_ == DUMP_STATE)
     {
-      this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_status ();
     }
   else if (this->command_ == SET_QOS)
     {
-      this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_set_qos ();
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 726d7cd0ddd..08398e4940d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -44,7 +44,7 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void execute_i (void);
 
   /// Name of object
   virtual const char* get_name (void);
@@ -83,12 +83,12 @@ protected:
   TAO_Notify_Tests_Periodic_Supplier* supplier (void);
 
   ///= Handlers
-  void handle_create (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_offers (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_disconnect (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_deactivate (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_status (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
+  void handle_create (void);
+  void handle_offers (void);
+  void handle_disconnect (void);
+  void handle_deactivate (void);
+  void handle_status (void);
+  void handle_set_qos (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
index 4ab288212fb..d7a94d18abe 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp
@@ -24,20 +24,20 @@ TAO_Notify_Tests_PushConsumer::~TAO_Notify_Tests_PushConsumer ()
 }
 
 void
-TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_any_push_consumer (peer_ptr ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_any_push_consumer (peer_ptr);
 }
 
 void
-TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (void)
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
-  this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_push_supplier ();
 }
 
 void
-TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
@@ -46,7 +46,7 @@ TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL
 }
 
 void
-TAO_Notify_Tests_PushConsumer::push (const CORBA::Any & /*data*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_PushConsumer::push (const CORBA::Any & /*data*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 5aae9203447..aab6ae3635b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -74,13 +74,13 @@ public:
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_from_proxy (void);
 
   // = PushConsumer methods
-  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -88,7 +88,6 @@ protected:
  /// Default does nothing.
     void push (
         const CORBA::Any & data
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
index f5c3f4d94bd..2125a574fbf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp
@@ -24,29 +24,28 @@ TAO_Notify_Tests_PushSupplier::~TAO_Notify_Tests_PushSupplier ()
 }
 
 void
-TAO_Notify_Tests_PushSupplier::send_event (const CORBA::Any& any ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::send_event (const CORBA::Any& any)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
-  this->proxy_->push (any ACE_ENV_ARG_PARAMETER);
+  this->proxy_->push (any);
 }
 
 void
-TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_any_push_supplier (peer_ptr
-                                        ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_any_push_supplier (peer_ptr);
 }
 
 void
-TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (void)
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
-  this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_push_consumer ();
 }
 
 void
-TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index edf2753e87d..82a27d6dcb3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -73,17 +73,17 @@ public:
   virtual ~TAO_Notify_Tests_PushSupplier ();
 
   /// Send one event.
-  virtual void send_event (const CORBA::Any & data ACE_ENV_ARG_DECL);
+  virtual void send_event (const CORBA::Any & data);
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_from_proxy (void);
 
   // = PushSupplier method
-  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
index 629639070b5..0f8c26001f1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp
@@ -16,29 +16,25 @@ TAO_Notify_Tests_Relay_Consumer::~TAO_Notify_Tests_Relay_Consumer ()
 }
 
 void
-TAO_Notify_Tests_Relay_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_Relay_Consumer::connect (void)
 {
-  TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_Notify_Tests_Direct_Consumer::connect ();
 
   // Resolve the destination object.
-  LOOKUP_MANAGER->resolve (this->destination_object_, this->destination_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (this->destination_object_, this->destination_.c_str ());
 }
 
 void
-TAO_Notify_Tests_Relay_Consumer::push_structured_event (const CosNotification::StructuredEvent &notification
-                                              ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Relay_Consumer::push_structured_event (const CosNotification::StructuredEvent &notification)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
   // The Periodic Consumer will record the run statistics.
-  //TAO_Notify_Tests_Periodic_Consumer::push_structured_event (notification ACE_ENV_ARG_PARAMETER);
-  //ACE_CHECK;
+  //TAO_Notify_Tests_Periodic_Consumer::push_structured_event (notification);
 
   // Forward the event.
   if (CORBA::is_nil (this->destination_object_.in ()))
     ACE_DEBUG ((LM_DEBUG, "(%P,%t) Cannot Relay - Destination object %s is nil", this->destination_.c_str ()));
   else
-    this->destination_object_->push_structured_event (notification ACE_ENV_ARG_PARAMETER);
+    this->destination_object_->push_structured_event (notification);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index 87fe1ecf44a..1dd0739b4e8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -37,10 +37,10 @@ public:
   ~TAO_Notify_Tests_Relay_Consumer ();
 
   /// Connect using options parsed and set initial QoS.
-  virtual void connect (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void connect (void);
 
   void push_structured_event (const CosNotification::StructuredEvent &/*notification*/
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
index e63d3661671..1cf382bd71c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp
@@ -24,21 +24,20 @@ TAO_Notify_Tests_SequencePushConsumer::~TAO_Notify_Tests_SequencePushConsumer ()
 }
 
 void
-TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_sequence_push_consumer (peer_ptr
-                                               ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_sequence_push_consumer (peer_ptr);
 }
 
 void
-TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (void)
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
-  this->proxy_->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_sequence_push_supplier ();
 }
 
 void
-TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
@@ -49,7 +48,7 @@ TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (ACE_EN
 void
 TAO_Notify_Tests_SequencePushConsumer::push_structured_events
    (const CosNotification::EventBatch &/*notifications*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 7e4a4773b27..d17da42daa4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -74,13 +74,13 @@ public:
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_from_proxy (void);
 
   // = SequencePushConsumer methods
-  virtual void disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_sequence_push_consumer (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -88,7 +88,6 @@ protected:
  /// Default does nothing.
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
index 76151253271..dce9988b74a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp
@@ -25,30 +25,28 @@ TAO_Notify_Tests_SequencePushSupplier::~TAO_Notify_Tests_SequencePushSupplier ()
 
 void
 TAO_Notify_Tests_SequencePushSupplier::send_events (const CosNotification::EventBatch& events
-                                          ACE_ENV_ARG_DECL
                                           )
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
-  this->proxy_->push_structured_events (events ACE_ENV_ARG_PARAMETER);
+  this->proxy_->push_structured_events (events);
 }
 
 void
-TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_sequence_push_supplier (peer_ptr
-                                               ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_sequence_push_supplier (peer_ptr);
 }
 
 void
-TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (void)
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
-  this->proxy_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_sequence_push_consumer ();
 }
 
 void
-TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index dad8bd6d0eb..35615eb5c1c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -73,18 +73,17 @@ public:
   virtual ~TAO_Notify_Tests_SequencePushSupplier ();
 
   /// Send one event.
-  virtual void send_events (const CosNotification::EventBatch& events
-                            ACE_ENV_ARG_DECL);
+  virtual void send_events (const CosNotification::EventBatch& events);
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_from_proxy (void);
 
   // = SequencePushSupplier method
-  virtual void disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_sequence_push_supplier (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
index 2db62342778..cc58c87c8ea 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp
@@ -24,21 +24,20 @@ TAO_Notify_Tests_StructuredPushConsumer::~TAO_Notify_Tests_StructuredPushConsume
 }
 
 void
-TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_structured_push_consumer (peer_ptr
-                                               ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_structured_push_consumer (peer_ptr);
 }
 
 void
-TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (void)
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n"));
-  this->proxy_->disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_structured_push_supplier ();
 }
 
 void
-TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
@@ -49,7 +48,7 @@ TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (AC
 void
 TAO_Notify_Tests_StructuredPushConsumer::push_structured_event
    (const CosNotification::StructuredEvent &/*notification*/
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 43ee9ffec52..68d24401d7c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -74,13 +74,13 @@ public:
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_from_proxy (void);
 
   // = StructuredPushConsumer methods
-  virtual void disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_structured_push_consumer (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -88,7 +88,6 @@ protected:
  /// Default does nothing.
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
index 289058864f1..fb9e76fc469 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp
@@ -26,30 +26,28 @@ TAO_Notify_Tests_StructuredPushSupplier::~TAO_Notify_Tests_StructuredPushSupplie
 void
 TAO_Notify_Tests_StructuredPushSupplier::send_event (
     const CosNotification::StructuredEvent& event
-    ACE_ENV_ARG_DECL
   )
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
 
-  this->proxy_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+  this->proxy_->push_structured_event (event);
 }
 
 void
-TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr)
 {
-  proxy_ptr->connect_structured_push_supplier (peer_ptr
-                                               ACE_ENV_ARG_PARAMETER);
+  proxy_ptr->connect_structured_push_supplier (peer_ptr);
 }
 
 void
-TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (void)
 {
   ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n"));
-  this->proxy_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_structured_push_consumer ();
 }
 
 void
-TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   bool this_method_used_only_by_notify_service = false;
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index e1c11dc6a54..5a70d452e8e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -73,18 +73,17 @@ public:
   virtual ~TAO_Notify_Tests_StructuredPushSupplier ();
 
   /// Send one event.
-  virtual void send_event (const CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (const CosNotification::StructuredEvent& event);
 
 protected:
   /// Connect to Peer.
-  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr ACE_ENV_ARG_DECL);
+  virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr);
 
   /// Disconnect from proxy.
-  virtual void disconnect_from_proxy (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_from_proxy (void);
 
   // = StructuredPushSupplier method
-  virtual void disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_structured_push_supplier (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index 5adaa65c92c..83d4993a70b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -90,31 +90,26 @@ TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
 
-  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (ec, this->factory_.c_str ());
 
   // create supplier admin
   CosNotifyChannelAdmin::SupplierAdmin_var sa =
     ec->new_for_suppliers (this->ifgop_,
-                           this->id_
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           this->id_);
 
-  LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->_register (sa.in(), this->name_.c_str ());
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
-  LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (admin, this->name_.c_str ());
 
       // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "Calling SupplierAdmin offer_change : "));
@@ -132,48 +127,41 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG, "\n"));
 
-  admin->offer_change (this->added_, this->removed_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  admin->offer_change (this->added_, this->removed_);
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_status (void)
 {
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void)
 {
   CosNotifyChannelAdmin::SupplierAdmin_var admin;
 
-  LOOKUP_MANAGER->resolve (admin, this->name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  LOOKUP_MANAGER->resolve (admin, this->name_.c_str ());
 
-  admin->set_qos (this->qos_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  admin->set_qos (this->qos_);
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::execute_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Tests_SupplierAdmin_Command::execute_i (void)
 {
   if (this->command_ == CREATE)
     {
-      this->handle_create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_create ();
     }
   else if (this->command_ == OFFER)
     {
-      this->handle_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_offers ();
     }
   else if (this->command_ == SET_QOS)
     {
-      this->handle_set_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_set_qos ();
     }
   else if (this->command_ == DUMP_STATE)
     {
-      this->handle_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->handle_status ();
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index fbed3172551..486e399b201 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -42,7 +42,7 @@ public:
   virtual void init (ACE_Arg_Shifter& arg_shifter);
 
   /// Execute the command.
-  virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void execute_i (void);
 
   /// Name of object
   virtual const char* get_name (void);
@@ -79,10 +79,10 @@ protected:
   CosNotification::EventTypeSeq removed_;
 
   /// = Handlers
-  void handle_create (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_offers (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_status (ACE_ENV_SINGLE_ARG_DECL);
-  void handle_set_qos (ACE_ENV_SINGLE_ARG_DECL);
+  void handle_create (void);
+  void handle_offers (void);
+  void handle_status (void);
+  void handle_set_qos (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
index 3641ca65f32..96aa030b188 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp
@@ -16,35 +16,31 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::~TAO_Notify_Tests_Supplier_T ()
 {
 }
 
-template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
+template <class Supplier_Traits> typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
 TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer (void)
 {
   return this->get_proxy ();
 }
 
-template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+template <class Supplier_Traits> typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Traits_PTR admin_ptr)
 {
   Supplier_Traits traits;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
     admin_ptr->obtain_notification_push_consumer (traits.type_
                                                   , this->proxy_id_
-                                                  ACE_ENV_ARG_PARAMETER
                                                   );
 
-  ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
 
-  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ()
-  ACE_ENV_ARG_PARAMETER);
+  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ());
 }
 
-template <class Supplier_Traits> ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
-TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Ext_Traits_PTR admin_ptr
-                                             , CosNotification::QoSProperties& qos
-                                             ACE_ENV_ARG_DECL)
+template <class Supplier_Traits> typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Admin_Ext_Traits_PTR admin_ptr
+                                             , CosNotification::QoSProperties& qos)
 {
   Supplier_Traits traits;
 
@@ -52,18 +48,15 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (ACE_TYPENAME TAO_Not
   CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer =
     admin_ptr->obtain_notification_push_consumer_with_qos (traits.type_
                                                            , this->proxy_id_
-                                                           , qos
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Proxy_Traits_INTERFACE::_nil ());
+                                                           , qos);
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ()));
 
-  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return Proxy_Traits_INTERFACE::_narrow (proxy_consumer.in ());
 }
 
 template <class Supplier_Traits> void
-TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed)
 {
   // Let the user see what we're subscribed for,
   ACE_DEBUG ((LM_DEBUG, "(%P, %t) Calling Supplier offer change: \n"));
@@ -82,17 +75,15 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::offer_change (CosNotification::Eve
   ACE_DEBUG ((LM_DEBUG, "\n"));
 
   /// subscribe
-  ACE_TYPENAME Proxy_Traits::PTR proxy_consumer = this->get_proxy ();
+  typename Proxy_Traits::PTR proxy_consumer = this->get_proxy ();
 
-  proxy_consumer->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer->offer_change (added, removed);
 }
 
 template <class Supplier_Traits> void
 TAO_Notify_Tests_Supplier_T<Supplier_Traits>::subscription_change (
                                                          const CosNotification::EventTypeSeq & /*added*/,
                                                          const CosNotification::EventTypeSeq & /*removed*/
-        ACE_ENV_ARG_DECL_NOT_USED
         )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index 54d2faba200..a00a7f33fdc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -44,14 +44,14 @@ class TAO_Notify_Tests_SupplierAdmin_Ext_Traits
 template <class Supplier_Traits>
 class TAO_Notify_Tests_Supplier_T : public TAO_Notify_Tests_Peer_T <Supplier_Traits>
 {
-  typedef ACE_TYPENAME Supplier_Traits::Admin_Traits Admin_Traits;
-  typedef ACE_TYPENAME Supplier_Traits::Admin_Ext_Traits Admin_Ext_Traits;
-  typedef ACE_TYPENAME Supplier_Traits::Proxy_Traits Proxy_Traits;
+  typedef typename Supplier_Traits::Admin_Traits Admin_Traits;
+  typedef typename Supplier_Traits::Admin_Ext_Traits Admin_Ext_Traits;
+  typedef typename Supplier_Traits::Proxy_Traits Proxy_Traits;
 
-  typedef ACE_TYPENAME Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE;
-  typedef ACE_TYPENAME Proxy_Traits::PTR Proxy_Traits_PTR;
-  typedef ACE_TYPENAME Admin_Traits::PTR Admin_Traits_PTR;
-  typedef ACE_TYPENAME Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
+  typedef typename Proxy_Traits::INTERFACE Proxy_Traits_INTERFACE;
+  typedef typename Proxy_Traits::PTR Proxy_Traits_PTR;
+  typedef typename Admin_Traits::PTR Admin_Traits_PTR;
+  typedef typename Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
 
 public:
   /// Constuctor
@@ -64,22 +64,20 @@ public:
   Proxy_Traits_PTR get_proxy_consumer (void);
 
   /// Send offer change.
-  void offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed ACE_ENV_ARG_DECL);
+  void offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed);
 
 protected:
   /// Obtain Proxy.
-  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL);
+  virtual Proxy_Traits_PTR obtain_proxy (Admin_Traits_PTR admin_ptr);
 
   /// Obtain Proxy with QoS.
   virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr
-                                         , CosNotification::QoSProperties& qos
-                                          ACE_ENV_ARG_DECL);
+                                         , CosNotification::QoSProperties& qos);
 
     // = NotifySubscribe
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index 4abebdab3f4..cc6a64df10a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -25,25 +25,20 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer ()
 
 void
 Notify_Sequence_Push_Consumer::_connect (
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-  ACE_ENV_ARG_DECL)
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
     CosNotifyChannelAdmin::SEQUENCE_EVENT,
-    proxy_id_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-    proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    proxysupplier.in ());
 
   CosNotification::QoSProperties properties(1);
   properties.length(1);
@@ -51,20 +46,16 @@ Notify_Sequence_Push_Consumer::_connect (
   properties[0].value <<= (CORBA::Long)10;
 
   proxy_->set_qos(properties);
-  proxy_->connect_sequence_push_consumer (objref.in ()
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_->connect_sequence_push_consumer (objref.in ());
 
   // give ownership to POA
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
-  const CosNotification::EventBatch& events
-  ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  const CosNotification::EventBatch& events)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->count_ == 0 )
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
index ccd5af92252..89094dcf08a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
@@ -31,13 +31,11 @@ public:
 
   ~Notify_Sequence_Push_Consumer ();
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_events(const CosNotification::EventBatch&
-                              ACE_ENV_ARG_DECL)
+  void push_structured_events(const CosNotification::EventBatch&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index 271bf5fbeeb..31b8c3b6e0a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -26,39 +26,30 @@ Notify_Structured_Push_Consumer::~Notify_Structured_Push_Consumer ()
 
 void
 Notify_Structured_Push_Consumer::_connect (
-                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+                CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
-      proxy_id_
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxy_id_);
 
   this->proxy_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      proxysupplier.in ());
 
-  proxy_->connect_structured_push_consumer (objref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_->connect_structured_push_consumer (objref.in ());
 
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
 void
 Notify_Structured_Push_Consumer::push_structured_event(
-                          const CosNotification::StructuredEvent& /*event*/
-                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+                          const CosNotification::StructuredEvent& /*event*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->count_ == 0 )
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
index cd34305133d..a342bd45cb2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
@@ -31,13 +31,11 @@ public:
                         Notify_Test_Client& client);
   ~Notify_Structured_Push_Consumer ();
 
-  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL)
+  void _connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void push_structured_event(const CosNotification::StructuredEvent&
-                             ACE_ENV_ARG_DECL)
+  void push_structured_event(const CosNotification::StructuredEvent&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 8d284b588a5..6ed26aeaee9 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -80,28 +80,23 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
-  ACE_CHECK_RETURN (0);
 
   if (filter)
     {
       ACE_DEBUG((LM_DEBUG, "\nConsumer filter enabled.\n"));
 
       CosNotifyFilter::FilterFactory_var ffact =
-          ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+          ec->default_filter_factory ();
 
       CosNotifyFilter::Filter_var filter =
-          ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+          ffact->create_filter (GRAMMAR);
 
       CosNotifyFilter::ConstraintExpSeq constraint_list (1);
       constraint_list.length (1);
@@ -110,11 +105,9 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
       constraint_list[0].constraint_expr =
                                  CORBA::string_dup ("type == 'even'");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      filter->add_constraints (constraint_list);
 
-      admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      admin->add_filter (filter.in ());
     }
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -123,8 +116,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   for(unsigned int i = 0; i < consumers; i++)
     {
@@ -139,11 +131,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                          *client),
                         CORBA::NO_MEMORY ());
 
-      consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer->init (client->root_poa ());
 
-      consumer->_connect (admin ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer->_connect (admin);
     }
 }
 
@@ -154,12 +144,11 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      status = client.init (argc, argv);
 
       if (status == 0)
         {
@@ -171,17 +160,13 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            client.create_event_channel ("MyEventChannel", 1);
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
-                              orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                              orb->string_to_object (ior);
 
-          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          sig_var sig = sig::_narrow (object.in ());
 
           if (CORBA::is_nil (sig.in ()))
             {
@@ -192,34 +177,28 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            create_consumeradmin (ec.in ());
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              create_consumers(admin.in (), &client);
 
               // Tell the supplier to go
-              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              sig->go ();
 
-              client.ORB_run(ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              client.ORB_run();
 
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
-              sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              sig->done ();
             }
         }
     }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+      e._tao_print_exception ("Error: Consumer exception: ");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 7b7df800ca5..a2c6cdd8b32 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -40,13 +40,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -112,23 +112,20 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendEvents (int id ACE_ENV_ARG_DECL)
+SendEvents (int id)
 {
   ACE_UNUSED_ARG(id);
   CosNotification::EventBatch events (amount);
@@ -150,33 +147,28 @@ SendEvents (int id ACE_ENV_ARG_DECL)
     events[z].filterable_data[0].value <<= type;
   }
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier_1->send_events(events);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_SequencePushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (admin);
 }
 
 
@@ -188,29 +180,24 @@ int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
 
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
       sig_impl.reset( new sig_i( orb ) );
-      sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -227,19 +214,17 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        create_suppliers(admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
         ACE_DEBUG((LM_DEBUG, " 1 supplier sending %d events...\n", (max_events*amount)));
         for (int i = 0; i < max_events; ++i)
         {
-          SendEvents (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          SendEvents (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", (max_events*amount)));
 
@@ -247,17 +232,15 @@ int main (int argc, char* argv[])
 
         ACE_OS::unlink (ior_output_file);
 
-        ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        ec->destroy();
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index a45be86190f..2e08e1570fa 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -78,28 +78,23 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
-create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
-                           adminid
-                           ACE_ENV_ARG_PARAMETER);
+                           adminid);
 
-  ACE_CHECK_RETURN (0);
 
   if (filter)
     {
       // Filter Section
       CosNotifyFilter::FilterFactory_var ffact =
-          ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+          ec->default_filter_factory ();
 
       // One Filter
       CosNotifyFilter::Filter_var filter =
-          ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+          ffact->create_filter (GRAMMAR);
 
       CosNotifyFilter::ConstraintExpSeq constraint_list (1);
       constraint_list.length (1);
@@ -108,11 +103,9 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
       constraint_list[0].constraint_expr =
                                  CORBA::string_dup ("type == 'even'");
 
-      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      filter->add_constraints (constraint_list);
 
-      admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      admin->add_filter (filter.in ());
       // End One Filter
     }
 
@@ -122,8 +115,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
-                  Notify_Test_Client* client
-                  ACE_ENV_ARG_DECL)
+                  Notify_Test_Client* client)
 {
   for(unsigned int i = 0; i < consumers; i++)
     {
@@ -138,11 +130,9 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                          *client),
                         CORBA::NO_MEMORY ());
 
-      consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer->init (client->root_poa ());
 
-      consumer->_connect (admin ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      consumer->_connect (admin);
     }
 }
 
@@ -153,12 +143,11 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 int main (int argc, char* argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      status = client.init (argc, argv);
 
       if (status == 0)
         {
@@ -170,17 +159,13 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::EventChannel_var ec =
-          client.create_event_channel ("MyEventChannel", 1
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          client.create_event_channel ("MyEventChannel", 1);
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::Object_var object =
-                              orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                              orb->string_to_object (ior);
 
-          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          sig_var sig = sig::_narrow (object.in ());
 
           if (CORBA::is_nil (sig.in ()))
             {
@@ -191,33 +176,27 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            create_consumeradmin (ec.in ());
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              create_consumers(admin.in (), &client);
 
               // Tell the supplier to go
-              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
- 
-              client.ORB_run( ACE_ENV_SINGLE_ARG_PARAMETER );
-              ACE_TRY_CHECK;
+              sig->go ();
+
+              client.ORB_run( );
               ACE_DEBUG((LM_DEBUG, "Consumer done.\n"));
 
-              sig->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              sig->done ();
             }
         }
     }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+      e._tao_print_exception ("Error: Consumer exception: ");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index f89028a58c1..9d7ec6fac29 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -39,13 +39,13 @@ public:
   {
   }
 
-  void go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void go (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = true;
   }
 
-  void done (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     started_ = false;
@@ -112,23 +112,20 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
-create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      ACE_ENV_ARG_DECL)
+create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
-    adminid
-    ACE_ENV_ARG_PARAMETER);
+    adminid);
 
-  ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
 }
 
 
 static void
-SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
+SendEvent (int id)
 {
   const char* type = ( (id & 1) == 1 ? "odd" : "even" );
   CosNotification::StructuredEvent event;
@@ -145,33 +142,28 @@ SendEvent (int id ACE_ENV_ARG_DECL_NOT_USED)
   event.filterable_data[0].name = CORBA::string_dup("type");
   event.filterable_data[0].value <<= type;
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    supplier_1->send_event(event ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    supplier_1->send_event(event);
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
   }
-  ACE_ENDTRY;
 }
 
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
-                  PortableServer::POA_ptr poa
-                  ACE_ENV_ARG_DECL)
+                  PortableServer::POA_ptr poa)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
     TAO_Notify_Tests_StructuredPushSupplier (),
     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->init (poa);
 
-  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  supplier_1->connect (admin);
 }
 
 
@@ -183,28 +175,23 @@ int main (int argc, char* argv[])
 {
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
   {
     Supplier_Client client;
-    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    status = client.init (argc, argv);
 
     if (status == 0)
     {
       CosNotifyChannelAdmin::EventChannel_var ec =
-        client.create_event_channel ("MyEventChannel", 0
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        client.create_event_channel ("MyEventChannel", 0);
 
       CORBA::ORB_ptr orb = client.orb ();
 
       sig_impl.reset( new sig_i( orb ) );
-      sig_var sig = sig_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sig_var sig = sig_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (sig.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -221,19 +208,17 @@ int main (int argc, char* argv[])
       }
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in ());
       if (!CORBA::is_nil (admin.in ()))
       {
-        create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        create_suppliers(admin.in (), client.root_poa ());
 
         sig_impl->wait_for_startup();
 
         ACE_DEBUG((LM_DEBUG, "1 supplier sending %d events...\n", max_events));
         for (int i = 0; i < max_events; ++i)
         {
-          SendEvent (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          SendEvent (i);
         }
         ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
 
@@ -241,17 +226,15 @@ int main (int argc, char* argv[])
 
         ACE_OS::unlink (ior_output_file);
 
-        ec->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        ec->destroy();
       }
     }
   }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
   {
-    ACE_PRINT_EXCEPTION (e, "Error: Supplier exception: ");
+    e._tao_print_exception ("Error: Supplier exception: ");
     status = 1;
   }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
index 3a94a8421bb..52b391783e5 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $ior = PerlACE::LocalFile ("supplier.ior");
 $namingior = PerlACE::LocalFile ("naming.ior");
 $notifyior = PerlACE::LocalFile ("notify.ior");
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index b68b1bcbed4..7a37115c4b3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -80,12 +80,11 @@ RedGreen_Test::destroy_ec ()
     {
       // Even though we still have a reference, there's no guarantee
       // the EC is still around.  So, trap exceptions.
-      ACE_TRY_NEW_ENV
+      try
         {
-          this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->ec_->destroy ();
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, ex)
+      catch (const CORBA::COMM_FAILURE&)
         {
           // Silently swallow this b/c this could mean the EC is gone
           // or that the network is hosed.  Either way, we're not waiting
@@ -96,12 +95,10 @@ RedGreen_Test::destroy_ec ()
                       "      invoke `destroy()' on the Event Channel in the \n"
                       "      RedGreen destroy_ec. This is likely not a problem.\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                              "in RedGreen destructor; swallowing.\n");
+          ex._tao_print_exception ("in RedGreen destructor; swallowing.\n");
         }
-      ACE_ENDTRY;
 
       this->ec_ = CosNotifyChannelAdmin::EventChannel::_nil ();
     }
@@ -110,54 +107,39 @@ RedGreen_Test::destroy_ec ()
 
 void
 RedGreen_Test::init (int argc,
-                     char *argv []
-                     ACE_ENV_ARG_DECL)
+                     char *argv [])
 {
   this->init_ORB (argc,
-                  argv
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+                  argv);
+  this->resolve_naming_service ();
+  this->resolve_Notify_factory ();
+  this->create_EC ();
+  this->create_supplieradmin ();
+  this->create_consumeradmin ();
+  this->create_consumers ();
+  this->create_suppliers ();
 }
 
 void
-RedGreen_Test::run (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::run (void)
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->send_events ();
 
     while (! consumer_is_done)
     {
       ACE_Time_Value tv(0, 10 * 1000);
-      this->orb_->run(tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run(tv);
     }
 
-    this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->shutdown (0);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "Supplier:");
-    ACE_RE_THROW;
+    ex._tao_print_exception ("Supplier:");
+    throw;
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   worker_.thr_mgr ()->wait ();
 }
@@ -171,19 +153,14 @@ RedGreen_Test::done (void)
 
 void
 RedGreen_Test::init_ORB (int argc,
-                         char *argv []
-                         ACE_ENV_ARG_DECL)
+                         char *argv [])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                ""
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "");
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references("RootPOA");
 
   if (CORBA::is_nil (poa_object))
     {
@@ -192,16 +169,12 @@ RedGreen_Test::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (poa_object);
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 
   worker_.orb (this->orb_.in ());
 
@@ -214,115 +187,95 @@ RedGreen_Test::init_ORB (int argc,
 }
 
 void
-RedGreen_Test::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::resolve_naming_service (void)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
 
   // Need to check return value for errors.
   if (CORBA::is_nil (naming_obj.in ()))
     {
-      ACE_THROW (CORBA::UNKNOWN ());
+      throw CORBA::UNKNOWN ();
     }
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CosNaming::NamingContext::_narrow (naming_obj.in ());
 }
 
 void
-RedGreen_Test::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::resolve_Notify_factory (void)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->naming_context_->resolve (name);
 
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in ()
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK;
 }
 
 void
-RedGreen_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_EC (void)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
-                                               id
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               id);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-RedGreen_Test::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_supplieradmin (void)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
     ec_->new_for_suppliers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 }
 
 void
-RedGreen_Test::create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_consumeradmin (void)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   consumer_admin_ =
     ec_->new_for_consumers (this->ifgop_,
-                            adminid
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
 
 void
-RedGreen_Test::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_consumers (void)
 {
   ACE_NEW (this->normal_consumer_,
            RedGreen_Test_StructuredPushConsumer (this));
-  this->normal_consumer_->connect (this->consumer_admin_.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->normal_consumer_->connect (this->consumer_admin_.in ());
 
   ACE_NEW (this->slow_consumer_,
            SlowConsumer (this));
-  this->slow_consumer_->connect (this->consumer_admin_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->slow_consumer_->connect (this->consumer_admin_.in ());
 }
 
 void
-RedGreen_Test::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_suppliers (void)
 {
   ACE_NEW (this->supplier_,
            RedGreen_Test_StructuredPushSupplier ());
-  this->supplier_->connect (this->supplier_admin_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->supplier_->connect (this->supplier_admin_.in ());
 }
 
 void
-RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::send_events (void)
 {
   // Setup the Consumer 1 to receive
   //event_type : "DOMAIN_GREEN", "DOMAIN_GREEN".
@@ -337,9 +290,7 @@ RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
   this->normal_consumer_->get_proxy_supplier ()->subscription_change (
                                                      added_1,
                                                      removed_1
-                                                     ACE_ENV_ARG_PARAMETER
                                                    );
-  ACE_CHECK;
 
   // Setup the Consumer 2 to receive event_type : "DOMAIN_RED", "TYPE_RED"
   CosNotification::EventTypeSeq added_2(1);
@@ -353,9 +304,7 @@ RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
   this->slow_consumer_->get_proxy_supplier ()->subscription_change (
                                                    added_2,
                                                    removed_2
-                                                   ACE_ENV_ARG_PARAMETER
                                                  );
-  ACE_CHECK;
 
   // Create the events - one of each type
 
@@ -386,13 +335,9 @@ RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
   // let supplier 1 send all these events
   for (int i = 0; i < this->burst_size_; ++i)
     {
-      this->supplier_->send_event (red_event
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_->send_event (red_event);
 
-      this->supplier_->send_event (green_event
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->supplier_->send_event (green_event);
     }
 }
 
@@ -473,21 +418,17 @@ RedGreen_Test_StructuredPushConsumer::dump_stats (const char* msg,
 void
 RedGreen_Test_StructuredPushConsumer::connect (
     CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-    ACE_ENV_ARG_DECL
   )
 {
   // Activate the consumer with the default_POA_.
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
         proxy_supplier_id_
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
@@ -495,30 +436,24 @@ RedGreen_Test_StructuredPushConsumer::connect (
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
         proxysupplier.in ()
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_supplier_->connect_structured_push_consumer (objref.in ());
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test_StructuredPushConsumer::disconnect (void)
 {
   this->proxy_supplier_->
-    disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    disconnect_structured_push_supplier ();
 }
 
 void
 RedGreen_Test_StructuredPushConsumer::offer_change (
     const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
@@ -529,7 +464,6 @@ RedGreen_Test_StructuredPushConsumer::offer_change (
 void
 RedGreen_Test_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -576,7 +510,6 @@ RedGreen_Test_StructuredPushConsumer::push_structured_event (
 
 void
 RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -599,7 +532,6 @@ SlowConsumer::SlowConsumer (RedGreen_Test* RedGreen_Test)
 void
 SlowConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -609,7 +541,6 @@ SlowConsumer::push_structured_event (
 
   RedGreen_Test_StructuredPushConsumer::push_structured_event (
       notification
-      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -646,20 +577,16 @@ RedGreen_Test_StructuredPushSupplier::dump_stats (const char* msg,
 void
 RedGreen_Test_StructuredPushSupplier::connect (
     CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
         CosNotifyChannelAdmin::STRUCTURED_EVENT,
         proxy_consumer_id_
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
@@ -667,24 +594,19 @@ RedGreen_Test_StructuredPushSupplier::connect (
   this->proxy_consumer_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
         proxyconsumer.in ()
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->connect_structured_push_supplier (objref.in ());
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+RedGreen_Test_StructuredPushSupplier::disconnect (void)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   this->proxy_consumer_->disconnect_structured_push_consumer (
-                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
 }
 
@@ -692,7 +614,6 @@ void
 RedGreen_Test_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
@@ -703,7 +624,6 @@ RedGreen_Test_StructuredPushSupplier::subscription_change (
 void
 RedGreen_Test_StructuredPushSupplier::send_event (
     CosNotification::StructuredEvent& event
-    ACE_ENV_ARG_DECL
   )
 {
   event.filterable_data.length (1);
@@ -717,19 +637,16 @@ RedGreen_Test_StructuredPushSupplier::send_event (
                                  start);
   // any
   event.filterable_data[0].value <<= latency_base;
-  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy_consumer_->push_structured_event (event);
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
 
   this->throughput_.sample (end - g_throughput_start_,
                             end - start);
-  ACE_CHECK;
 }
 
 void
 RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -757,16 +674,14 @@ Worker::done (void)
 int
 Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->run ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "Consumer:");
+    ex._tao_print_exception ("Consumer:");
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 480a55ee0b7..5cebcd037f7 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -75,11 +75,10 @@ class RedGreen_Test
   void dump_results (void);
 
   void init (int argc,
-             char *argv []
-             ACE_ENV_ARG_DECL);
+             char *argv []);
   // Initialize the Client.
 
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
   // Run the demo.
 
   void done (void);
@@ -94,32 +93,31 @@ class RedGreen_Test
 
  protected:
   void init_ORB (int argc,
-                 char *argv []
-                 ACE_ENV_ARG_DECL);
+                 char *argv []);
   // Initializes the ORB.
 
-  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (void);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_Notify_factory (void);
   // Try to resolve the Notify factory from the Naming service.
 
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create an EC.
 
-  void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL);
+  void create_supplieradmin(void);
   // Create the Supplier Admin.
 
-  void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL);
+  void create_consumeradmin (void);
   // Create the Consumer Admin.
 
-  void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  void create_consumers (void);
   // Create and initialize the consumers.
 
-  void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void create_suppliers (void);
   // create and initialize the suppliers.
 
-  void send_events (ACE_ENV_SINGLE_ARG_DECL);
+  void send_events (void);
   // send the events.
 
   // = Data Members.
@@ -175,12 +173,11 @@ class RedGreen_Test_StructuredPushConsumer
   RedGreen_Test_StructuredPushConsumer (RedGreen_Test* RedGreen_Test);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect (void);
   // Disconnect from the supplier.
 
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (
@@ -221,7 +218,6 @@ protected:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
@@ -229,13 +225,11 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
 
   virtual void disconnect_structured_push_consumer (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
@@ -249,7 +243,6 @@ public:
 
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
@@ -271,16 +264,14 @@ class RedGreen_Test_StructuredPushSupplier
   RedGreen_Test_StructuredPushSupplier (void);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                ACE_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void disconnect (void);
   // Disconnect from the supplier.
 
-  virtual void send_event (CosNotification::StructuredEvent& event
-                           ACE_ENV_ARG_DECL);
+  virtual void send_event (CosNotification::StructuredEvent& event);
   // Send one event.
 
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
@@ -308,14 +299,12 @@ protected:
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
 
   // = StructuredPushSupplier method
   virtual void disconnect_structured_push_supplier (
-      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
index 25f07f3583e..26532667d31 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
@@ -12,23 +12,19 @@ main (int argc, char *argv [])
 
   client.parse_args (argc, argv);
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      client.init (argc, argv
-                   ACE_ENV_ARG_PARAMETER); //Init the Client
-      ACE_TRY_CHECK;
+      client.init (argc, argv); //Init the Client
 
-      client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.run ();
 
       client.destroy_ec ();
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
index 4b8b36a2e94..32373abd1c8 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl
@@ -8,6 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
+PerlACE::check_privilege_group();
+
 $experiment_timeout = 60;
 $startup_timeout = 60;
 $notifyior = PerlACE::LocalFile ("notify.ior");
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 020b750ffa5..b7002dd7bf2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -44,7 +44,6 @@ Throughput_StructuredPushConsumer::dump_stats (const char* msg,
 void
 Throughput_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -158,7 +157,6 @@ Throughput_StructuredPushSupplier::svc (void)
 
   event.remainder_of_body <<= test_client_->payload_;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   this->throughput_start_ = ACE_OS::gethrtime ();
 
@@ -174,9 +172,7 @@ Throughput_StructuredPushSupplier::svc (void)
           // Any.
           event.filterable_data[0].value <<= Throughput_base;
 
-          this->proxy_->push_structured_event (event
-                                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          this->proxy_->push_structured_event (event);
 
           ACE_hrtime_t end = ACE_OS::gethrtime ();
           this->throughput_.sample (end - this->throughput_start_,
@@ -212,32 +208,24 @@ Notify_Throughput::Notify_Throughput (void)
 
 Notify_Throughput::~Notify_Throughput ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 
   delete payload_;
 }
 
 int
-Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
+Notify_Throughput::init (int argc, char* argv [])
 {
   // Initialize base class.
   Notify_Test_Client::init_ORB (argc,
-                                argv
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                argv);
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
   CORBA::Object_var manager_object =
-    orb_->resolve_initial_references ("ORBPolicyManager"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb_->resolve_initial_references ("ORBPolicyManager");
 
   CORBA::PolicyManager_var policy_manager =
-    CORBA::PolicyManager::_narrow (manager_object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::PolicyManager::_narrow (manager_object.in ());
 
   CORBA::Any sync_scope;
   sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -246,13 +234,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
   policy_list.length (1);
   policy_list[0] =
     orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        sync_scope
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        sync_scope);
   policy_manager->set_policy_overrides (policy_list,
-                                        CORBA::SET_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                        CORBA::SET_OVERRIDE);
 #else
   ACE_DEBUG ((LM_DEBUG,
               "CORBA Messaging disabled in this configuration,"
@@ -269,20 +253,17 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
     }
 
   // Create all participents ...
-  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->create_EC ();
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    ec_->new_for_suppliers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    ec_->new_for_consumers (this->ifgop_, adminid);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
@@ -302,13 +283,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
       ACE_NEW_RETURN (consumers_[i],
                       Throughput_StructuredPushConsumer (this),
                       -1);
-      consumers_[i]->init (root_poa_.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      consumers_[i]->init (root_poa_.in ());
 
-      consumers_[i]->connect (this->consumer_admin_.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      consumers_[i]->connect (this->consumer_admin_.in ());
     }
 
   for (i = 0; i < this->supplier_count_; ++i)
@@ -318,12 +295,8 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
                       -1);
       suppliers_[i]->TAO_Notify_Tests_StructuredPushSupplier::init (
                          root_poa_.in ()
-                         ACE_ENV_ARG_PARAMETER
                        );
-      ACE_CHECK_RETURN (-1);
-      suppliers_[i]->connect (this->supplier_admin_.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      suppliers_[i]->connect (this->supplier_admin_.in ());
     }
 
   return 0;
@@ -424,7 +397,7 @@ Notify_Throughput::parse_args(int argc, char *argv[])
 }
 
 void
-Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Throughput::create_EC (void)
 {
   if (this->collocated_ec_ == 1)
     {
@@ -438,18 +411,14 @@ Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 
       // Activate the factory
       this->notify_factory_ =
-        notify_service->create (this->root_poa_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        notify_service->create (this->root_poa_.in ());
 
       ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
     }
   else
     {
-      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->resolve_naming_service ();
+      this->resolve_Notify_factory ();
     }
 
   // A channel name was specified, use that to resolve the service.
@@ -460,14 +429,10 @@ Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL)
       name[0].id = CORBA::string_dup (ec_name_.c_str ());
 
       CORBA::Object_var obj =
-        this->naming_context_->resolve (name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->naming_context_->resolve (name);
 
       this->ec_ =
-        CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ());
     }
 else
   {
@@ -475,16 +440,14 @@ else
 
     ec_ = notify_factory_->create_channel (initial_qos_,
                                            initial_admin_,
-                                           id
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                           id);
   }
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Notify_Throughput::run_test (void)
 {
 
   ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ,"
@@ -507,9 +470,7 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i < this->supplier_count_; ++i)
     {
       suppliers_[i]->
-        TAO_Notify_Tests_StructuredPushSupplier::init (root_poa_.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        TAO_Notify_Tests_StructuredPushSupplier::init (root_poa_.in ());
 
       if (suppliers_[i]->ACE_Task_Base::activate (THR_NEW_LWP | THR_JOINABLE) != 0)
         {
@@ -532,8 +493,7 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
   if (this->ec_name_.length () == 0) // we are not using a global EC
     {
       // Destroy the ec.
-      this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->ec_->destroy ();
     }
 
   // Signal the workers.
@@ -600,14 +560,11 @@ main (int argc, char* argv[])
       return 1;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      events.init (argc, argv
-                      ACE_ENV_ARG_PARAMETER); //Init the Client
-      ACE_TRY_CHECK;
+      events.init (argc, argv); //Init the Client
 
-      events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      events.run_test ();
 
       ACE_DEBUG ((LM_DEBUG, "Waiting for threads to exit...\n"));
       ACE_Thread_Manager::instance ()->wait ();
@@ -616,12 +573,11 @@ main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "ending main...\n"));
 
     }
-  ACE_CATCH (CORBA::Exception, se)
+  catch (const CORBA::Exception& se)
     {
-      ACE_PRINT_EXCEPTION (se, "Error: ");
+      se._tao_print_exception ("Error: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 802054bd6cf..a6e5fb04aec 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -66,7 +66,6 @@ public:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -141,10 +140,10 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv []);
   // initialization.
 
-  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_test (void);
   // Run the test.
 
   void peer_done (void);
@@ -155,7 +154,7 @@ public:
 
   Worker worker_;
 protected:
-  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
+  void create_EC (void);
   // Create participants.
 
   CORBA::Boolean collocated_ec_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
index 0a3bcf406a3..04eba6bd96f 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
@@ -10,6 +10,8 @@ use PerlACE::Run_Test;
 use File::Copy;
 use Getopt::Std;
 
+PerlACE::check_privilege_group();
+
 # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h
 getopts ("n:s:c:o:h");
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
index f7edd09e396..64a08cb157f 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
@@ -10,6 +10,8 @@ use PerlACE::Run_Test;
 use File::Copy;
 use Getopt::Std;
 
+PerlACE::check_privilege_group();
+
 # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h
 getopts ("n:s:c:o:h");
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
index cb1fdc191c6..93218c3e115 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
@@ -10,6 +10,8 @@ use PerlACE::Run_Test;
 use File::Copy;
 use Getopt::Std;
 
+PerlACE::check_privilege_group();
+
 # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h
 getopts ("n:s:c:o:h");
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
index 822a4b59664..a5d631da445 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
@@ -10,6 +10,8 @@ use PerlACE::Run_Test;
 use File::Copy;
 use Getopt::Std;
 
+PerlACE::check_privilege_group();
+
 # -n notify.conf -s supplier.conf -c consumer.conf -o output_dir -h
 getopts ("n:s:c:o:h");
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
index e7c071cc4a1..b954d95b3b5 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
@@ -10,6 +10,8 @@ use PerlACE::Run_Test;
 use File::Copy;
 use Getopt::Std;
 
+PerlACE::check_privilege_group();
+
 # -n notify.conf -s high_path.conf -c other_paths.conf -o output_dir -h
 getopts ("n:s:c:o:h");
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
index e3679b84172..e4bff7eb2a9 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
@@ -10,6 +10,8 @@ use PerlACE::Run_Test;
 use File::Copy;
 use Getopt::Std;
 
+PerlACE::check_privilege_group();
+
 # -n notify.conf -s high_path.conf -c other_paths.conf -o output_dir -h
 getopts ("n:s:c:o:h");
 
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index bfc5efa2dd0..5b261f0842d 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -27,14 +27,11 @@ ACE_RCSID(CosPropertyService, client, "$Id$")
 
 int
 Client::init (int argc,
-              char *argv[]
-              ACE_ENV_ARG_DECL)
+              char *argv[])
 {
   // Init the ORB.
   manager_.init (argc,
-                 argv
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                 argv);
 
   // Initialize the naming services
   if (my_name_client_.init (manager_.orb()) != 0)
@@ -48,13 +45,9 @@ Client::init (int argc,
   CosNaming::Name propsetdef_name (1);
   propsetdef_name.length (1);
   propsetdef_name [0].id = CORBA::string_dup ("PropertySetDef");
-  CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name
-                                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name);
 
-  this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in ()
-                                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in ());
 
   if (CORBA::is_nil (this->propsetdef_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,63 +60,50 @@ Client::init (int argc,
 // Testing the methods of the property service.
 
 int
-Client::property_tester (ACE_ENV_SINGLE_ARG_DECL)
+Client::property_tester (void)
 {
   // = Testing PropertySet & Iterators.
 
   // Testing define_property () of PropertySet interface.
-  this->test_define_property (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_define_property ();
 
   // Test the number of properties.
-  this->test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_number_of_properties ();
 
   // Testing get_all_property_names.
-  this->test_get_all_property_names (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_all_property_names ();
 
   // Test get_property_value.
-  this->test_get_property_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_property_value ();
 
   // Testing delete property.
-  this->test_delete_property ("no_property" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_delete_property ("no_property");
 
   // Testing get_properties.
-  this->test_get_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_properties ();
 
   // Testing delete_properties.
-  this->test_delete_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_delete_properties ();
 
   // Test the number of properties.
-  this->test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_number_of_properties ();
 
   // Testing define_properties.
-  this->test_define_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_define_properties ();
 
   // Test the number of properties.
-  this->test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_number_of_properties ();
 
   // Testing get_all_property_names.
-  this->test_get_all_property_names (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_all_property_names ();
 
   // Testing get_all_properties.
-  this->test_get_all_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_all_properties ();
 
   // = Testing PropertySetDef & Iterators.
 
   // Testing define_property_with_mode.
-  this->test_define_property_with_mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_define_property_with_mode ();
 
   return 0;
 }
@@ -131,7 +111,7 @@ Client::property_tester (ACE_ENV_SINGLE_ARG_DECL)
 // Testing define_property.
 
 int
-Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_define_property (void)
 {
   CORBA::Any anyval;
 
@@ -142,9 +122,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   anyval >>= CORBA::Any::to_char (ch);
 
   this->propsetdef_->define_property ("char_property",
-                                      anyval
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                      anyval);
 
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
@@ -153,9 +131,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   anyval >>= s;
 
   propsetdef_->define_property ("short_property",
-                                anyval
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                anyval);
 
   // Prepare a Long and "define" that in the PropertySet.
   CORBA::Long l = 931232;
@@ -164,9 +140,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   anyval >>= l;
   CORBA::Any newany(anyval);
   propsetdef_->define_property ("long_property",
-                                anyval
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                anyval);
 
   // Prepare a Float and "define" that in the PropertySet.
   CORBA::Float f = 3.14F;
@@ -175,10 +149,8 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   anyval >>= f;
 
   propsetdef_->define_property ("float_property",
-                                anyval
-                                ACE_ENV_ARG_PARAMETER);
+                                anyval);
 
-  ACE_CHECK_RETURN (-1);
 
   // Prepare a String and "define" that in the PropertySet.
   CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
@@ -186,10 +158,8 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   const char * newstr;
   anyval >>= newstr;
   propsetdef_->define_property ("string_property",
-                                anyval
-                                ACE_ENV_ARG_PARAMETER);
+                                anyval);
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -197,12 +167,11 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
 // Testing get_all_property_names of the PropertySet.
 
 int
-Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_all_property_names (void)
 {
   // Get the size.
   CORBA::ULong num_of_properties =
-    propsetdef_->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    propsetdef_->get_number_of_properties ();
 
   // Get half on the names and half of on the iterator.
   CORBA::ULong how_many = num_of_properties / 2;
@@ -219,9 +188,7 @@ Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
 
   propsetdef_->get_all_property_names (how_many,
                                        names_out,
-                                       iterator_out
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                       iterator_out);
 
   // Get the values back to var.
   names_var = names_out.ptr ();
@@ -249,8 +216,7 @@ Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
           CosPropertyService::PropertyName_out name_out (name_ptr);
 
           // Call the function.
-          CORBA::Boolean next_one_result = iterator_var->next_one (name_out ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          CORBA::Boolean next_one_result = iterator_var->next_one (name_out);
 
           // Get the values back on a _var variable.
           CosPropertyService::PropertyName_var name_var = name_out.ptr ();
@@ -260,14 +226,12 @@ Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
               ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ()));
 
               // Call the function to iterate again.
-              next_one_result = iterator_var->next_one (name_out ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (-1);
+              next_one_result = iterator_var->next_one (name_out);
 
               // Get the values back on a _var variable.
               name_var = name_out.ptr ();
             }
 
-          ACE_CHECK_RETURN (-1);
         }
     }
   return 0;
@@ -277,7 +241,7 @@ Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
 // properties.
 
 int
-Client::test_get_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_properties (void)
 {
   // Get float_property, string_property and no_property. If return
   // value is false and type is tc_void then that name is not there in
@@ -303,10 +267,8 @@ Client::test_get_properties (ACE_ENV_SINGLE_ARG_DECL)
 
   // Get the properties.
   CORBA::Boolean return_val = propsetdef_->get_properties (names.in (),
-                                                           properties_out
-                                                           ACE_ENV_ARG_PARAMETER);
+                                                           properties_out);
   ACE_UNUSED_ARG (return_val);
-  ACE_CHECK_RETURN (-1);
 
 
   if (TAO_debug_level > 0)
@@ -369,10 +331,9 @@ Client::test_get_properties (ACE_ENV_SINGLE_ARG_DECL)
 // Testing, get_number_of_properties.
 
 int
-Client::test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_number_of_properties (void)
 {
-  CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties ();
 
   if (TAO_debug_level > 0)
     {
@@ -386,29 +347,24 @@ Client::test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL)
 // Test delete_property.
 
 int
-Client::test_delete_property (const char *property_name
-                              ACE_ENV_ARG_DECL)
+Client::test_delete_property (const char *property_name)
 {
-  ACE_TRY
+  try
     {
       CORBA::String_var property_name_var (property_name);
 
-      this->propsetdef_->delete_property (property_name_var.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->propsetdef_->delete_property (property_name_var.in ());
     }
-  ACE_CATCH (CORBA::UserException, ex)
+  catch (const CORBA::UserException&)
     {
       // For no property, it is ok to get the user exception.
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Not an user exception");
+      ex._tao_print_exception ("Not an user exception");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -419,7 +375,7 @@ Client::test_delete_property (const char *property_name
 // properties.
 
 int
-Client::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_delete_properties (void)
 {
   CosPropertyService::PropertyNames prop_names;
   prop_names.length (3);
@@ -427,9 +383,7 @@ Client::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
   prop_names [1] = CORBA::string_dup ("short_property");
   prop_names [2] = CORBA::string_dup ("long_property");
   // prop_names [3] = CORBA::string_dup ("no_property");
-  this->propsetdef_->delete_properties (prop_names
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 0);
+  this->propsetdef_->delete_properties (prop_names);
 
   return 0;
 }
@@ -438,7 +392,7 @@ Client::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
 // float in the property set.
 
 int
-Client::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_define_properties (void)
 {
   CosPropertyService::Properties nproperties;
   nproperties.length (4);
@@ -476,8 +430,7 @@ Client::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
   nproperties[3].property_value <<= f;
 
   // Define this sequence of properties now.
-  this->propsetdef_->define_properties (nproperties ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( -1);
+  this->propsetdef_->define_properties (nproperties);
 
   return 0;
 }
@@ -485,12 +438,11 @@ Client::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
 // Test get_all_properties.
 
 int
-Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_all_properties (void)
 {
   // Get the number of current properties.
   CORBA::ULong num_of_properties =
-    this->propsetdef_->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( -1);
+    this->propsetdef_->get_number_of_properties ();
   ACE_UNUSED_ARG (num_of_properties);
 
   // Get half on the properties and half of on the iterator.
@@ -504,9 +456,7 @@ Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
 
   propsetdef_->get_all_properties (how_many,
                                    properties_out,
-                                   iterator_out
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( -1);
+                                   iterator_out);
 
   // Get these values to the _var's.
   CosPropertyService::Properties_var properties = properties_out.ptr ();
@@ -561,15 +511,13 @@ Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
           CosPropertyService::Property_out property_out (property_ptr);
 
           // Call the funtion.
-          CORBA::Boolean next_one_result = iterator->next_one (property_out
-                                                               ACE_ENV_ARG_PARAMETER);
+          CORBA::Boolean next_one_result = iterator->next_one (property_out);
 
           // Get the value to the _var variable.
           CosPropertyService::Property_var property = property_out.ptr ();
 
           while (next_one_result != 0)
             {
-              ACE_CHECK_RETURN ( -1);
               ACE_DEBUG ((LM_DEBUG,
                           "%s : ",
                           property->property_name.in ()));
@@ -611,13 +559,11 @@ Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
                 }
 
               // Call the function for the next iteraton.
-              next_one_result = iterator->next_one (property_out
-                                                    ACE_ENV_ARG_PARAMETER);
+              next_one_result = iterator->next_one (property_out);
 
               // Get the value to the _var variable.
               property = property_out.ptr ();
             }
-          ACE_CHECK_RETURN ( -1);
         }
     }
   return 0;
@@ -626,7 +572,7 @@ Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
 // Testing define property with mode.
 // Defines char, short, long and float properties with different modes.
 int
-Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_define_property_with_mode (void)
 {
   CORBA::Any anyval;
 
@@ -638,9 +584,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
 
   this->propsetdef_->define_property_with_mode ("char_property",
                                                 anyval,
-                                                CosPropertyService::normal
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                CosPropertyService::normal);
 
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
@@ -650,9 +594,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
 
   propsetdef_->define_property_with_mode ("short_property",
                                           anyval,
-                                          CosPropertyService::read_only
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                          CosPropertyService::read_only);
 
   // Prepare a Long and "define" that in the PropertySet.
   CORBA::Long l = 931232;
@@ -662,9 +604,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any newany(anyval);
   propsetdef_->define_property_with_mode ("long_property",
                                           anyval,
-                                          CosPropertyService::fixed_normal
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( -1);
+                                          CosPropertyService::fixed_normal);
 
 
   // Prepare a Float and "define" that in the PropertySet.
@@ -674,9 +614,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
   anyval >>= f;
   propsetdef_->define_property_with_mode ("float_property",
                                           anyval,
-                                          CosPropertyService::fixed_readonly
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( -1);
+                                          CosPropertyService::fixed_readonly);
 
   // Prepare a String and "define" that in the PropertySet.
   CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
@@ -685,79 +623,63 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
   anyval >>= newstr;
 
   propsetdef_->define_property  ("string_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( -1);
+                                 anyval);
 
   return 0;
 }
 
 int
-Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
+Client::test_get_property_value (void)
 {
-  ACE_TRY
+  try
     {
       // Get the ior property.
-      CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR"
-                                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR");
 
       // Check whether the IOR is fine.
       CORBA::Object_var propsetdef_object;
       (*any_ptr) >>= CORBA::Any::to_object (propsetdef_object.out ());
 
       CosPropertyService::PropertySetDef_var propsetdef =
-        CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in ());
 
       if (CORBA::is_nil (propsetdef.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "invalid object reference\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "get_property_value");
+      ex._tao_print_exception ("get_property_value");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       Client client;
 
       if (client.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
-      ACE_TRY_CHECK;
 
-      //  client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      int ret = client.property_tester (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      //  client.run ();
+      int ret = client.property_tester ();
       if (ret != 0)
         ACE_DEBUG ((LM_DEBUG, "Test failed\n"));
       else
         ACE_DEBUG ((LM_DEBUG, "Test succeeded\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "PropertyService Test : client");
+      ex._tao_print_exception ("PropertyService Test : client");
       return -1;
     }
- ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 2d0f0760c99..d32b218b952 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -45,53 +45,50 @@ public:
   // Constructor.
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize the ORB etc, and bind the MMDevices.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the client.  This will call StreamCtrl::bind_devs.
 
-  int property_tester (ACE_ENV_SINGLE_ARG_DECL);
+  int property_tester (void);
   // Testing  the property service methods.
 
 protected:
   int bind_to_remote_mmdevice (int argc,
-                               char *argv[]
-                               ACE_ENV_ARG_DECL);
+                               char *argv[]);
   // Bind to the remote MMDevice.
 
   // = Property Testing.
 
-  int test_define_property (ACE_ENV_SINGLE_ARG_DECL);
+  int test_define_property (void);
   // Testing the define property method.
 
-  int test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL);
+  int test_get_number_of_properties (void);
   // Testing the number of properties, currently in the Property Set.
 
-  int test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL);
+  int test_get_all_property_names (void);
   //Testing get_all_property_names.
 
-  int test_get_property_value (ACE_ENV_SINGLE_ARG_DECL);
+  int test_get_property_value (void);
   // Testing get_property_value.
 
-  int test_get_properties (ACE_ENV_SINGLE_ARG_DECL);
+  int test_get_properties (void);
   //Testing get_properties.  Give the names and get their properties.
 
-  int test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL);
+  int test_get_all_properties (void);
   // Testing get_all_properties.
 
-  int test_delete_property (const char *property_name
-                            ACE_ENV_ARG_DECL);
+  int test_delete_property (const char *property_name);
   // Testing delete_property.
 
-  int test_delete_properties (ACE_ENV_SINGLE_ARG_DECL);
+  int test_delete_properties (void);
   // Testing delete_properties.
 
-  int test_define_properties (ACE_ENV_SINGLE_ARG_DECL);
+  int test_define_properties (void);
   // Defining a sequence of properties.
 
-  int test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL);
+  int test_define_property_with_mode (void);
   // Defines properties with various modes.
 
   TAO_ORB_Manager manager_;
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index d9e9a9f2a3e..11880dad81d 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -40,31 +40,30 @@ public:
   ~TAO_PropertySet_Tester (void);
   // Destructor.
 
-  int test_define_property (ACE_ENV_SINGLE_ARG_DECL);
+  int test_define_property (void);
   // Defines a char,a short, a long, a float and a string property.
 
-  int test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL);
+  int test_get_number_of_properties (void);
   // Gets the number of properties currently defined in the PropertySet.
 
-  int test_delete_property (const char *property_name
-                            ACE_ENV_ARG_DECL);
+  int test_delete_property (const char *property_name);
   // Delete a given property.
 
-  int test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL);
+  int test_is_property_defined (void);
   // Check the following properties are defined or
   // no. "char_property", "short_property" and a "string_property".
 
-  int test_get_property_value (ACE_ENV_SINGLE_ARG_DECL);
+  int test_get_property_value (void);
   // Get the "float_property" and "string_property" and print them
   // out.
 
-  int test_delete_properties (ACE_ENV_SINGLE_ARG_DECL);
+  int test_delete_properties (void);
   // Delete char, short,long, and string properties.
 
-  int test_delete_all_properties (ACE_ENV_SINGLE_ARG_DECL);
+  int test_delete_all_properties (void);
   // Delete all the properties.
 
-  int test_define_properties (ACE_ENV_SINGLE_ARG_DECL);
+  int test_define_properties (void);
   // Define a sequence of properties. a char, a short, a long, a float
   // and a string.
 
@@ -89,14 +88,14 @@ public:
   ~TAO_PropertyNamesIterator_Tester (void);
   // Destructor.
 
-  int test_next_one (ACE_ENV_SINGLE_ARG_DECL);
+  int test_next_one (void);
   // Test next one method. Iterate thru all the names in the
   // PropertySet and print them out.
 
-  int test_reset (ACE_ENV_SINGLE_ARG_DECL);
+  int test_reset (void);
   // Test the reset method.
 
-  int test_next_n (size_t n ACE_ENV_ARG_DECL);
+  int test_next_n (size_t n);
   // Test the next_n method.
 private:
   TAO_PropertyNamesIterator iterator_;
@@ -116,7 +115,7 @@ TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void)
 
 // Defines a char, a short, a long, a float and a string.
 int
-TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_define_property (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_property\n"));
@@ -132,9 +131,7 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
               "Main : Char ch = %c\n",
               ch));
   property_set_.define_property ("char_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+                                 anyval);
 
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
@@ -145,9 +142,7 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
               "Main : Short s = %d\n",
               s));
   property_set_.define_property ("short_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+                                 anyval);
 
 
   // Prepare a Long and "define" that in the PropertySet.
@@ -161,9 +156,7 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::Any newany(anyval);
 
   property_set_.define_property ("long_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+                                 anyval);
 
   // Prepare a Float and "define" that in the PropertySet.
   CORBA::Float f = 3.14;
@@ -174,9 +167,7 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
               "Main : Float f = %f\n",
               f));
   property_set_.define_property ("float_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+                                 anyval);
 
   // Prepare a String and "define" that in the PropertySet.
   ACE_DEBUG ((LM_DEBUG,
@@ -190,21 +181,18 @@ TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
               strvar.in (),
               newstr));
   property_set_.define_property ("string_property",
-                                 anyval
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+                                 anyval);
 
   return 0;
 }
 
 // Testing, get_number_of_properties.
 int
-TAO_PropertySet_Tester::test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_get_number_of_properties (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Main : Number of props : %d\n",
-              property_set_.get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER)));
-  ACE_CHECK_RETURN ( 1);
+              property_set_.get_number_of_properties ()));
 
   return 0;
 }
@@ -212,13 +200,10 @@ TAO_PropertySet_Tester::test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL)
 // Testing the delete_property. Delets property, with the given name,
 // if that exsists.
 int
-TAO_PropertySet_Tester::test_delete_property (const char *property_name
-                                              ACE_ENV_ARG_DECL)
+TAO_PropertySet_Tester::test_delete_property (const char *property_name)
 {
   ACE_DEBUG ((LM_DEBUG, "\nChecking delete_property\n"));
-  property_set_.delete_property (property_name
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+  property_set_.delete_property (property_name);
 
   return 0;
 }
@@ -226,14 +211,12 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name
 // Gets the value of "short_property" and "string_property".
 
 int
-TAO_PropertySet_Tester::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_get_property_value (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking get_property_value\n"));
 
-  CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property"
-                                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+  CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property");
 
   // Get the short value.
   if (anyptr != 0)
@@ -248,9 +231,7 @@ TAO_PropertySet_Tester::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
     ACE_DEBUG ((LM_DEBUG,
                 "Short property not found\n"));
   // Get the string.
-  anyptr = property_set_.get_property_value ("string_property"
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+  anyptr = property_set_.get_property_value ("string_property");
   if (anyptr != 0)
     {
       CORBA::String str;
@@ -268,34 +249,28 @@ TAO_PropertySet_Tester::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
 // "string_property" and "char_property".
 
 int
-TAO_PropertySet_Tester::test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_is_property_defined (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking is_property_defined ()\n"));
-  if (property_set_.is_property_defined ("short_property"
-                                         ACE_ENV_ARG_PARAMETER) == 0)
+  if (property_set_.is_property_defined ("short_property") == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "short_property not defined\n"));
   else
     ACE_DEBUG ((LM_DEBUG,
                 "short_property defined\n"));
-  ACE_CHECK_RETURN ( 1);
-  if (property_set_.is_property_defined ("string_property"
-                                         ACE_ENV_ARG_PARAMETER) == 0)
+  if (property_set_.is_property_defined ("string_property") == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "string_property not defined\n"));
   else
     ACE_DEBUG ((LM_DEBUG,
                 "string_property defined\n"));
-  ACE_CHECK_RETURN ( 1);
-  if (property_set_.is_property_defined ("char_property"
-                                         ACE_ENV_ARG_PARAMETER) == 0)
+  if (property_set_.is_property_defined ("char_property") == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "char_property not defined\n"));
   else
     ACE_DEBUG ((LM_DEBUG,
                 "char_property defined\n"));
-  ACE_CHECK_RETURN ( 1);
 
   return 0;
 }
@@ -304,7 +279,7 @@ TAO_PropertySet_Tester::test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL)
 // PropertySet.  Deleting char, short, long, float and string
 // properties.
 int
-TAO_PropertySet_Tester::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_delete_properties (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_properties == Deleting a sequence of Properties\n"));
@@ -318,9 +293,7 @@ TAO_PropertySet_Tester::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
               "Length of sequence %d, Maxlength : %d\n",
               prop_names.length (),
               prop_names.maximum ()));
-  property_set_.delete_properties (prop_names
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 0);
+  property_set_.delete_properties (prop_names);
 
   return 0;
 }
@@ -328,7 +301,7 @@ TAO_PropertySet_Tester::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
 // Defines a sequnce of properties containing, char, short, long,
 // float and string property in the property set.
 int
-TAO_PropertySet_Tester::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_define_properties (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_properties == Defining sequence of properties\n"));
@@ -376,21 +349,19 @@ TAO_PropertySet_Tester::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
   nproperties[4].property_value <<= strvar.in ();
 
   // Define this sequence of properties now.
-  property_set_.define_properties (nproperties ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+  property_set_.define_properties (nproperties);
 
   return 0;
 }
 
 // Delete all the properties.
 int
-TAO_PropertySet_Tester::test_delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_delete_all_properties (void)
 {
   // Deleting all the properties
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_all_properties\n"));
-  int ret = property_set_.delete_all_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int ret = property_set_.delete_all_properties ();
   if (ret == 1)
     ACE_DEBUG ((LM_DEBUG,
                 "All properties deleted, I guess\n"));
@@ -414,45 +385,40 @@ TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void)
 // Test next one method. Iterate thru all the names in the
 // PropertySet and print them out.
 int
-TAO_PropertyNamesIterator_Tester::test_next_one (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertyNamesIterator_Tester::test_next_one (void)
 {
   CORBA::String_var strvar;
   ACE_DEBUG ((LM_DEBUG,
               "\nTesting next_one of NamesIterator, Iterating thru names.\n"));
   // Let us iterate, now.
-  int ret = iterator_.next_one (strvar.out () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  int ret = iterator_.next_one (strvar.out ());
   while (ret != 0)
     {
       ACE_DEBUG ((LM_DEBUG, "Str : %s\n", strvar.in ()));
-      ret = iterator_.next_one (strvar.out () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (1);
+      ret = iterator_.next_one (strvar.out ());
     }
   return 0;
 }
 
 // Reset the names iterator.
 int
-TAO_PropertyNamesIterator_Tester::test_reset (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PropertyNamesIterator_Tester::test_reset (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Resetting (reset ()) the NamesIterator."));
-  iterator_.reset (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN ( 1);
+  iterator_.reset ();
   return 0;
 }
 
 // Test the next_n method. Get the next n names and print them all.
 int
-TAO_PropertyNamesIterator_Tester::test_next_n (size_t n
-                                               ACE_ENV_ARG_DECL)
+TAO_PropertyNamesIterator_Tester::test_next_n (size_t n)
 {
   CosPropertyService::PropertyNames_var pnames_var;
   ACE_DEBUG ((LM_DEBUG,
               "Checking next_n (), next %d\n",
               n));
-  int ret = iterator_.next_n (n, pnames_var.out () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  int ret = iterator_.next_n (n, pnames_var.out ());
   if (ret == 0)
     {
       // Return if no more items in the iterator.
@@ -470,13 +436,11 @@ TAO_PropertyNamesIterator_Tester::test_next_n (size_t n
 int
 main (int argc, char *argv [])
 {
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb_var = CORBA::ORB_init (argc,
                                                 argv,
-                                                "internet"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                "internet");
 
       // = Checking PropertySet interface.
 
@@ -486,58 +450,45 @@ main (int argc, char *argv [])
 
       // Checking define_property. define a char, a short,a long, a float
       // and a string.
-      propertyset_tester.test_define_property (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_define_property ();
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_get_number_of_properties ();
 
       // Test delete property. Delete "string_property"
-      propertyset_tester.test_delete_property ("string_property" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_delete_property ("string_property");
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_get_number_of_properties ();
 
       // Test delete_properties. Delete char, short, long and float.
-      propertyset_tester.test_delete_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_delete_properties ();
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_get_number_of_properties ();
 
       // Define a sequence of properties. char, short, long, float and
       // string.
-      propertyset_tester.test_define_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_define_properties ();
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_get_number_of_properties ();
 
       // Checking get_property_value. get the value of short and string.
-      propertyset_tester.test_get_property_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_get_property_value ();
 
       // Checking delete_all_properties.
-      propertyset_tester.test_delete_all_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_delete_all_properties ();
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_get_number_of_properties ();
 
       // Define a sequence of properties. char, short, long, float and
       // string.
-      propertyset_tester.test_define_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_define_properties ();
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_get_number_of_properties ();
 
       // = Checking the PropertyNamesIterator interface.
 
@@ -548,39 +499,32 @@ main (int argc, char *argv [])
       TAO_PropertyNamesIterator_Tester names_iterator_tester (propertyset_tester);
 
       // Checking next_one. Iterate thru the property names.
-      names_iterator_tester.test_next_one (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      names_iterator_tester.test_next_one ();
 
       // Checking the reset () method.
-      names_iterator_tester.test_reset (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      names_iterator_tester.test_reset ();
 
       // Iterating again thru the property names.
-      names_iterator_tester.test_next_one (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      names_iterator_tester.test_next_one ();
 
       // Reset again.
-      names_iterator_tester.test_reset (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      names_iterator_tester.test_reset ();
 
       // Checking next_n. Prints out all the names it has got.
-      names_iterator_tester.test_next_n (6 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      names_iterator_tester.test_next_n (6);
 
       // Try next_n without resetting.
-      names_iterator_tester.test_next_n (6 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      names_iterator_tester.test_next_n (6);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_ENV_ARG_PARAMETER.print_exception ("System Exception");
+.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_ENV_ARG_PARAMETER.print_exception ("User Exception");
+.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index bcaeae71a5f..3dd1774a9b9 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -25,18 +25,15 @@ ACE_RCSID(CosPropertyService, server, "$Id$")
 int
 main (int argc, char ** argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       TAO_ORB_Manager m;
 
       // Initialize the ORB.
       m.init_child_poa (argc,
                         argv,
-                        "child_poa"
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        "child_poa");
 
       // Using naming server.
       TAO_Naming_Client my_name_client;
@@ -49,37 +46,29 @@ main (int argc, char ** argv)
                       TAO_PropertySetDef,
                       -1);
       CosPropertyService::PropertySetDef_var propsetdef =
-        propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        propsetdef_impl->_this ();
 
       CosNaming::Name propsetdef_name (1);
       propsetdef_name.length (1);
       propsetdef_name[0].id = CORBA::string_dup ("PropertySetDef");
       my_name_client->bind (propsetdef_name,
-                            propsetdef.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            propsetdef.in ());
       CORBA::Any any_val;
 
       // Make this IOR as one of the properties in there.
-      any_val <<= propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      any_val <<= propsetdef_impl->_this ();
 
-      CORBA::Object_var ior = propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var ior = propsetdef_impl->_this ();
       CORBA::Object_ptr ior_ptr = ior.in ();
       any_val <<= ior_ptr;
       // any_val.replace (CORBA::_tc_Object,
       //                  &ior_ptr,
       //                  1
-      //                  ACE_ENV_ARG_PARAMETER);
-      // ACE_TRY_CHECK;
+      //);
 
       propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR",
                                                   any_val,
-                                                  CosPropertyService::fixed_readonly
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  CosPropertyService::fixed_readonly);
 
       // Create PropertySet factory and then register.
       TAO_PropertySetFactory *propset_factory_impl;
@@ -87,34 +76,27 @@ main (int argc, char ** argv)
                       TAO_PropertySetFactory,
                       -1);
       CosPropertyService::PropertySetFactory_var propset_factory =
-        propset_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        propset_factory_impl->_this ();
 
       CosNaming::Name propset_factory_name (1);
       propset_factory_name.length (1);
       propset_factory_name[0].id = CORBA::string_dup ("PropertySetFactory");
       my_name_client->bind (propset_factory_name,
-                            propset_factory.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            propset_factory.in ());
 
       // Run the ORB Event loop.
-      m.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      m.run ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,
-                           "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return 1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "User Exception");
+      userex._tao_print_exception ("User Exception");
       return 1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG,
               "\nServer is terminating"));
   return 0;
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
index 92ea6cc74f6..f226d42dba3 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
@@ -40,8 +40,7 @@ Object1_impl::~Object1_impl()
 
 void Object1_impl::method1(const char* activity,
     CORBA::Long seconds,
-    char* &output
-    ACE_ENV_ARG_DECL_NOT_USED)
+    char* &output)
   ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException))
 {
   const int scale_factor = 2000;
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
index ffddfb90fa9..ef99d1209a8 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h
@@ -35,7 +35,6 @@ class Object1_impl : public POA_testSched::Object1
     virtual void method1(const char *activity,
                          CORBA::Long seconds,
                          char *&output
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS
                          )
       ACE_THROW_SPEC ((CORBA::SystemException, testSched::testSchedException));
 };
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index c89d3699c52..1e79d4e3d55 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -144,7 +144,7 @@ ORB_Thread(CORBA::ORB_var orb,
 }
 
 int svc(void) {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (parse_args (argc_, argv_) != 0)
         {
@@ -159,8 +159,7 @@ int svc(void) {
 
       CORBA::Object_var obj =
         orb_->string_to_object ("file://server.ior"
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                );
 
 
       if (CORBA::is_nil (obj.in ()))
@@ -172,8 +171,7 @@ int svc(void) {
         }
 
       testSched::Object1_var object1 =
-        testSched::Object1::_narrow (obj.in ()ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        testSched::Object1::_narrow (obj.in ());
 
 
       if (CORBA::is_nil (object1.in ()))
@@ -195,7 +193,6 @@ int svc(void) {
                              node_,
                              file_),
                            CORBA::NO_MEMORY());
-          ACE_TRY_CHECK;
 
 
           // Check to see that the ClientScheduler started correctly
@@ -209,24 +206,17 @@ int svc(void) {
 
 
           /// Create a Current object so we can check on the priority locally
-          obj = orb_->resolve_initial_references ("RTCurrent"
-                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          obj = orb_->resolve_initial_references ("RTCurrent");
           RTCORBA::Current_var current =
-            RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTCORBA::Current::_narrow (obj.in ());
 
 
           /// Test to make sure the priority model is exposed
           CORBA::Policy_var policy =
-            object1->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            object1->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
           RTCORBA::PriorityModelPolicy_var priority_policy =
-            RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
           if (CORBA::is_nil (priority_policy.in ()))
             {
@@ -237,8 +227,7 @@ int svc(void) {
 
           /// Test to make sure we are using Server Declared Priority model
           RTCORBA::PriorityModel priority_model =
-            priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            priority_policy->priority_model ();
 
           if (priority_model != RTCORBA::SERVER_DECLARED)
             {
@@ -250,19 +239,15 @@ int svc(void) {
 
           do_work(before_);
 
-          ACE_TRY_EX(sched_act)
+          try
             {
-               client_sched->schedule_activity (::activity_
-                                                ACE_ENV_ARG_PARAMETER);
-               ACE_TRY_CHECK_EX(sched_act);
+               client_sched->schedule_activity (::activity_);
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-               ACE_PRINT_EXCEPTION (ex,
-                                    "Invalid activity name\n");
+               ex._tao_print_exception ("Invalid activity name\n");
                return -1;
             }
-          ACE_ENDTRY;
 
           ACE_OS::sprintf(buf,
                           "%s\t%s\tBeginning activity at priority %d\n",
@@ -275,7 +260,6 @@ int svc(void) {
           ACE_OS::strcat(client_output_, buf);
 
           do_work(before_);
-          ACE_TRY_CHECK;
 
 
           ACE_OS::sprintf(buf,
@@ -324,7 +308,6 @@ int svc(void) {
                      "%T\t%s\tClient\tBeginning Activity\n",
                      activity_));
           do_work(before_);
-          ACE_TRY_CHECK;
           ACE_DEBUG ((LM_DEBUG,
                       "%T\t%s\tClient\tCalling method1\n",
                       activity_));
@@ -355,13 +338,11 @@ int svc(void) {
       // Finally destroy the ORB
       orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in running the client\n");
+      ex._tao_print_exception ("Exception in running the client\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
  }
 
@@ -377,11 +358,10 @@ private:
 int
 ACE_TMAIN (int argc, char * argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
     CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::ORB_init (argc, argv, "client_orb");
 
     ORB_Thread ot(orb, argc, argv);
 
@@ -395,23 +375,19 @@ ACE_TMAIN (int argc, char * argv[])
 || (TAO_MAJOR_VERSION==1 && TAO_MAJOR_VERSION==3 && TAO_MINOR_VERSION > 1)
 
     orb->orb_core ()->orb_params ()->thread_creation_flags ();
-    ACE_TRY_CHECK;
 
 #else /* TAO version is 1.3.1 or lower */
     orb->orb_core ()->orb_params ()->scope_policy () |
     orb->orb_core ()->orb_params ()->sched_policy ();
-    ACE_TRY_CHECK;
 #endif
 
     ot.activate(flags);
     return ot.wait();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                          "ERROR in running the client\n");
+      ex._tao_print_exception ("ERROR in running the client\n");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index dbc60e82c6f..236c0275b5e 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -43,19 +43,16 @@ ORB_Thread(CORBA::ORB_var orb) : orb_(orb)
 
 int
 svc(void) {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
-      orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_->run();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "svc");
+      ex._tao_print_exception ("svc");
       return 1;
     }
-  ACE_ENDTRY;
 
   exit(0);
   return 0;
@@ -116,8 +113,7 @@ parse_args (int argc, char *argv[])
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (parse_args (argc, argv) != 0)
         {
@@ -127,25 +123,18 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       CORBA::ORB_var orb=
         CORBA::ORB_init (argc,
                          argv,
-                         "testORB"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "testORB");
 
       /// get the root poa
       CORBA::Object_var object=
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var rootPOA=
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       /// Create a manager for the POA
       PortableServer::POAManager_var poa_manager =
-        rootPOA->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rootPOA->the_POAManager ();
 
       CORBA::PolicyList poa_policy_list;
       poa_policy_list.length (1);
@@ -168,31 +157,23 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
         server_sched->create_POA(rootPOA.in(),
                                  "my_RT_POA",
                                  poa_manager.in(),
-                                 poa_policy_list
-                                 ACE_ENV_ARG_PARAMETER);
+                                 poa_policy_list);
 
 
       Object1_impl * servant = 0;
       ACE_NEW_THROW_EX(servant,
                        Object1_impl(),
                        CORBA::NO_MEMORY());
-      ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        RTPOA->activate_object(servant
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTPOA->activate_object(servant);
 
       CORBA::Object_var testObject =
-        RTPOA->id_to_reference(id.in()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTPOA->id_to_reference(id.in());
 
 
       CORBA::String_var testObject_IORString =
-        orb->object_to_string (testObject.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (testObject.in ());
 
 
       // If the ior_output_file exists, output the ior to it
@@ -208,22 +189,20 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       if (use_realtime_)
         {
           /// Schedule the object
-          ACE_TRY_EX(INNER)
+          try
             {
               server_sched->schedule_object(testObject.inout(),
-                                            object_ ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX(INNER);
+                                            object_);
             }
-          ACE_CATCH(RTCosScheduling::UnknownName, ex)
+          catch (const RTCosScheduling::UnknownName& ex)
             {
-              ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                                 "Unknown object passed to schedule_object\n");
+              ex._tao_print_exception (
+                "Unknown object passed to schedule_object\n");
             }
-          ACE_ENDTRY;
         }
 
       // Activate the manager and run the event loop
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate ();
 
       // Need to set the main thread pthread scope and pthread policy to
       // the values that are specified in svc.conf.  This change was
@@ -252,16 +231,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
       delete server_sched;
 
       /// clean up
-      rootPOA->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      rootPOA->destroy (1, 1);
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 9e767cc7dad..84e37b0995a 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -44,11 +44,11 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id ACE_ENV_ARG_DECL)
+  void id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets id.
 
-  CORBA::Short id (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Short id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gets id.
 
@@ -66,14 +66,14 @@ My_Test_Object::~My_Test_Object (void)
 }
 
 CORBA::Short
-My_Test_Object::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+My_Test_Object::id (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return id_;
 }
 
 void
-My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED)
+My_Test_Object::id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
@@ -149,11 +149,10 @@ main (int argc, ACE_TCHAR **argv)
   CosNaming::NamingContext_var root_context_1;
   CosNaming::NamingContext_var root_context_2;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX(bl_a)
+  try
   {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, 0);
 
     // ior's are specified for the name servers through a commandline
     // option or a file.
@@ -161,87 +160,69 @@ main (int argc, ACE_TCHAR **argv)
     // Resolve the first name server
 
     CORBA::Object_var ns1obj = orb->string_to_object (
-                            ACE_TEXT_ALWAYS_CHAR (ns1ref) ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_a);
+                            ACE_TEXT_ALWAYS_CHAR (ns1ref));
 
     if (CORBA::is_nil (ns1obj.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("invalid ior <%s>\n"),
                                ns1ref),
                               -1);
-    root_context_1 = CosNaming::NamingContext::_narrow (ns1obj.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
+    root_context_1 = CosNaming::NamingContext::_narrow (ns1obj.in ());
 
-    ACE_TRY_CHECK_EX(bl_a);
 
     // Resolve the second name server
 
     CORBA::Object_var ns2obj = orb->string_to_object (
-                            ACE_TEXT_ALWAYS_CHAR (ns2ref) ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_a);
+                            ACE_TEXT_ALWAYS_CHAR (ns2ref));
 
     if (CORBA::is_nil (ns2obj.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("invalid ior <%s>\n"),
                                ns2ref),
                               -1);
-    root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_a);
+    root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ());
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to resolve name servers"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to resolve name servers"));
     return -1;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Create a bunch of objects in one context
   // Note: strings to the naming service must be char, not wchar
-  ACE_TRY_EX(bl_b)
+  try
   {
     // Bind one context level under root.
     CosNaming::Name level1;
     level1.length (1);
     level1[0].id = CORBA::string_dup ("level1_context");
     CosNaming::NamingContext_var level1_context;
-    level1_context = root_context_1->bind_new_context (level1
-                                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_b);
+    level1_context = root_context_1->bind_new_context (level1);
     for (i=0; i<o_breath; i++)
     {
       // Instantiate a dummy object and bind it under the new context.
       My_Test_Object *impl1 = new My_Test_Object (i+1);
-      Test_Object_var obj1 = impl1->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(bl_b);
-      impl1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(bl_b);
+      Test_Object_var obj1 = impl1->_this ();
+      impl1->_remove_ref ();
 
       CosNaming::Name obj_name;
       obj_name.length (1);
       char wide_name[16];
       ACE_OS::sprintf(wide_name, "obj_%d", i);
       obj_name[0].id = CORBA::string_dup (wide_name);
-      level1_context->bind (obj_name, obj1.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(bl_b);
+      level1_context->bind (obj_name, obj1.in ());
     }
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to create a lot of objects"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to create a lot of objects"));
     return -1;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Create a deep context tree
-  ACE_TRY_EX(bl_c)
+  try
   {
     CosNaming::NamingContext_var next_context = root_context_1;
     for (i=0; i<c_depth; i++)
@@ -253,23 +234,18 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(deep_name, "deep_%d", i);
       deep[0].id = CORBA::string_dup (deep_name);
       CosNaming::NamingContext_var deep_context;
-      deep_context = next_context->bind_new_context (deep
-                                                     ACE_ENV_ARG_PARAMETER);
+      deep_context = next_context->bind_new_context (deep);
       next_context = deep_context;
-    ACE_TRY_CHECK_EX(bl_c);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to create deep context"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to create deep context"));
     return -1;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Create a wide context tree
-  ACE_TRY_EX(bl_d)
+  try
   {
     for (i=0; i<c_breath; i++)
     {
@@ -280,22 +256,17 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(wide_name, "wide_%d", i);
       wide[0].id = CORBA::string_dup (wide_name);
       CosNaming::NamingContext_var wide_context;
-      wide_context = root_context_1->bind_new_context (wide
-                                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_d);
+      wide_context = root_context_1->bind_new_context (wide);
     }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to create wide context"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to create wide context"));
     return -1;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Delete three selected things, one from each tree
-  ACE_TRY_EX(bl_e)
+  try
   {
     // Remove the second to last object from the Naming Context
     CosNaming::Name wide1;
@@ -304,30 +275,23 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "obj_%d", o_breath-2);
     wide1[1].id = CORBA::string_dup (wide_name);
-    root_context_1->unbind (wide1 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    root_context_1->unbind (wide1);
 
     // Remove the second to last context from the wide root Naming Context
     CosNaming::Name wide2;
     wide2.length (1);
     ACE_OS::sprintf(wide_name, "wide_%d", c_breath-2);
     wide2[0].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_1->resolve (wide2
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    CORBA::Object_var result_obj_ref = root_context_1->resolve (wide2);
     CosNaming::NamingContext_var result_object =
-      CosNaming::NamingContext::_narrow (result_obj_ref.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+      CosNaming::NamingContext::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Problems with resolving wide context ")
                          ACE_TEXT ("- nil object ref.\n")),
                          -1);
-    result_object->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
-    root_context_1->unbind (wide2 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    result_object->destroy();
+    root_context_1->unbind (wide2);
 
     // Remove the last context from the deep Naming Context
     CosNaming::Name deep;
@@ -338,35 +302,27 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(deep_name, "deep_%d", i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
-    result_obj_ref = root_context_1->resolve (deep ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    result_obj_ref = root_context_1->resolve (deep);
     result_object =
-      CosNaming::NamingContext::_narrow (result_obj_ref.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+      CosNaming::NamingContext::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Problems with resolving deep context ")
                          ACE_TEXT ("- nil object ref.\n")),
                          -1);
-    result_object->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
-    root_context_1->unbind (deep ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_e);
+    result_object->destroy();
+    root_context_1->unbind (deep);
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Unable to delete objects"));
+    ex._tao_print_exception (ACE_TEXT ("Unable to delete objects"));
     return -1;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Now use the other name server to access 3 objects next to the
   // deleted objects and the 3 deleted objects
-  ACE_TRY_EX(bl_f)
+  try
   {
     // Access the last object from the Naming Context
     CosNaming::Name wide;
@@ -375,29 +331,23 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "obj_%d", o_breath-1);
     wide[1].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_f);
-    Test_Object_var result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_f);
+    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
+    Test_Object_var result_object = Test_Object::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("Problems with resolving object from ")
                          ACE_TEXT ("redundant server - nil object ref.\n")),
                          -1);
-    ACE_TRY_CHECK_EX(bl_f);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      ACE_TEXT ("Unable to resolve object from redundant server"));
+    ex._tao_print_exception (
+      ACE_TEXT (
+        "Unable to resolve object from redundant server"));
     return -1;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
-  ACE_TRY_EX(bl_g)
+  try
   {
     // Access the deleted second to last object from the Naming Context
     CosNaming::Name wide;
@@ -406,21 +356,18 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "obj_%d", o_breath-2);
     wide[1].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_g);
+    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
     ACE_ERROR_RETURN ((LM_ERROR,
                     ACE_TEXT ("Problems with resolving object from ")
                     ACE_TEXT ("redundant server - deleted object found.\n")),
                     -1);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     //expect exception since the context was deleted
   }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(bl_h)
+  try
   {
     // Access the last context from the wide Naming Context
     CosNaming::Name wide;
@@ -428,30 +375,24 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "wide_%d", c_breath-1);
     wide[0].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_h);
+    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
     CosNaming::NamingContext_var result_object =
-      CosNaming::NamingContext::_narrow (result_obj_ref.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_h);
+      CosNaming::NamingContext::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                       ACE_TEXT ("Problems with resolving wide context from ")
                       ACE_TEXT ("redundant server - nil object ref.\n")),
                       -1);
-    ACE_TRY_CHECK_EX(bl_h);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      ACE_TEXT ("Unable to resolve wide context from redundant server"));
+    ex._tao_print_exception (
+      ACE_TEXT (
+        "Unable to resolve wide context from redundant server"));
     return -1;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
-  ACE_TRY_EX(bl_i)
+  try
   {
     // Access the deleted second to last object from the Naming Context
     CosNaming::Name wide;
@@ -459,21 +400,18 @@ main (int argc, ACE_TCHAR **argv)
     char wide_name[16];
     ACE_OS::sprintf(wide_name, "wide_%d", c_breath-2);
     wide[0].id = CORBA::string_dup (wide_name);
-    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_i);
+    CORBA::Object_var result_obj_ref = root_context_2->resolve (wide);
     ACE_ERROR_RETURN ((LM_ERROR,
                     ACE_TEXT ("Problems with resolving wide context from ")
                     ACE_TEXT ("redundant server - deleted object found.\n")),
                     -1);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     //expect exception since the context was deleted
   }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(bl_j)
+  try
   {
     // Access the deleted last context from the deep Naming Context
     CosNaming::Name deep;
@@ -484,21 +422,18 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(deep_name, "deep_%d", i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
-    CORBA::Object_var result_obj_ref = root_context_1->resolve (deep
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_j);
+    CORBA::Object_var result_obj_ref = root_context_1->resolve (deep);
     ACE_ERROR_RETURN ((LM_ERROR,
                     ACE_TEXT ("Problems with resolving deep context from ")
                     ACE_TEXT ("redundant server - deleted object found.\n")),
                     -1);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     //expect exception since the context was deleted
   }
-  ACE_ENDTRY;
 
-  ACE_TRY_EX(bl_k)
+  try
   {
     // Access the second to last object from the Naming Context
     CosNaming::Name deep;
@@ -509,30 +444,24 @@ main (int argc, ACE_TCHAR **argv)
       ACE_OS::sprintf(deep_name, "deep_%d", i);
       deep[i].id = CORBA::string_dup (deep_name);
     }
-    CORBA::Object_var result_obj_ref = root_context_1->resolve (deep
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_k);
+    CORBA::Object_var result_obj_ref = root_context_1->resolve (deep);
     CosNaming::NamingContext_var result_object =
-      CosNaming::NamingContext::_narrow (result_obj_ref.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK_EX(bl_k);
+      CosNaming::NamingContext::_narrow (result_obj_ref.in ());
     if (CORBA::is_nil (result_object.in ()))
       ACE_ERROR_RETURN ((LM_ERROR,
                       ACE_TEXT ("Problems with resolving deep context from ")
                       ACE_TEXT ("redundant server - nil object ref.\n")),
                       -1);
 
-    ACE_TRY_CHECK_EX(bl_k);
 
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      ACE_TEXT ("Unable to resolve deep context from redundant server"));
+    ex._tao_print_exception (
+      ACE_TEXT (
+        "Unable to resolve deep context from redundant server"));
     return -1;
   }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Redundancy test OK\n")));
   return 0;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index a856587a8f7..4d51cdb0b34 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -336,16 +336,14 @@ main (int argc, char *argv[])
   };
 
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil(poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -353,15 +351,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Initialize the naming services
       TAO_Naming_Client my_name_client;
@@ -386,9 +381,7 @@ main (int argc, char *argv[])
         {
           // create the RT_Info
           config_infos[i].handle =
-            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
-                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point);
 
           // initialize the RT_Info
           ACE_Scheduler_Factory::server ()->
@@ -401,9 +394,7 @@ main (int argc, char *argv[])
                  static_cast<RtecScheduler::Importance_t> (config_infos[i].importance),
                  config_infos[i].quantum,
                  config_infos[i].threads,
-                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type)
-                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type));
 
           // make operations in second half dependant on
           // operations in the first half of the array,
@@ -415,8 +406,7 @@ main (int argc, char *argv[])
                                 config_infos[i - (operation_count / 2)].handle,
                                 2,                             // number of calls
                                 RtecBase::ONE_WAY_CALL    // type of dependency
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                );
             }
         }
 
@@ -430,10 +420,8 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), deps.out (), configs.out (), anomalies.out ()
-         ACE_ENV_ARG_PARAMETER);
+         infos.out (), deps.out (), configs.out (), anomalies.out ());
 
-      ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                             deps.in (),
@@ -442,11 +430,10 @@ main (int argc, char *argv[])
                                             "Sched_Conf_Runtime.h",
                                             format_string);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index 23d60c3709c..811efaad8a7 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -190,16 +190,14 @@ main (int argc, char *argv[])
                   }
   };
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil(poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -207,12 +205,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Initialize the naming services
       TAO_Naming_Client my_name_client;
@@ -237,9 +233,7 @@ main (int argc, char *argv[])
         {
           // create the RT_Info
           config_infos[i].handle =
-            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
-                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point);
 
           // initialize the RT_Info
           ACE_Scheduler_Factory::server ()->
@@ -252,9 +246,7 @@ main (int argc, char *argv[])
                  static_cast<RtecScheduler::Importance_t> (config_infos[i].importance),
                  config_infos[i].quantum,
                  config_infos[i].threads,
-                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type)
-                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                 static_cast<RtecScheduler::Info_Type_t> (config_infos[i].info_type));
         }
 
 
@@ -264,8 +256,7 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
       // register dependency of consumer that will have unresolved remote
       // dependencies on supplier with unresolved remote dependencies
@@ -274,8 +265,7 @@ main (int argc, char *argv[])
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
 
       // register dependency of consumer that will have unresolved local
@@ -285,8 +275,7 @@ main (int argc, char *argv[])
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
 
       // register dependencies on each supplier of first consumer that will
@@ -296,24 +285,21 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[6].handle,
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
       // Register dependencies on each of the other consumers by second
       // consumer that will have both unresolved local and unresolved remote
@@ -323,32 +309,28 @@ main (int argc, char *argv[])
                         config_infos[1].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[3].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[5].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
       ACE_Scheduler_Factory::server ()->
         add_dependency (config_infos[7].handle,
                         config_infos[6].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
       RtecScheduler::RT_Info_Set_var infos;
       RtecScheduler::Dependency_Set_var deps;
@@ -361,8 +343,7 @@ main (int argc, char *argv[])
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          infos.out (), deps.out (),
-         configs.out (), anomalies.out () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         configs.out (), anomalies.out ());
 
       ACE_Scheduler_Factory::dump_schedule (infos.in (),
                                             deps.in (),
@@ -371,11 +352,10 @@ main (int argc, char *argv[])
                                             "Sched_Conf_Anomalies_Runtime.h",
                                             format_string);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 12692c53c26..0a0fb3ba803 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -21,16 +21,14 @@ ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "internet");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil(poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -38,15 +36,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Store a pointer to the local run-time scheduler.
       RtecScheduler::Scheduler_ptr runtime_scheduler =
@@ -64,20 +59,14 @@ main (int argc, char *argv[])
           // Make sure the correct handle is returned by the
           // run-time scheduler's create and lookup methods.
           ACE_ASSERT (infos [i].handle ==
-                      runtime_scheduler->create (infos [i].entry_point
-                                                 ACE_ENV_ARG_PARAMETER));
-          ACE_TRY_CHECK;
+                      runtime_scheduler->create (infos [i].entry_point));
 
           ACE_ASSERT (infos [i].handle ==
-                      runtime_scheduler->lookup (infos [i].entry_point
-                                                 ACE_ENV_ARG_PARAMETER));
-          ACE_TRY_CHECK;
+                      runtime_scheduler->lookup (infos [i].entry_point));
 
           // Make sure the values in the RT_Info returned by get are OK.
           delete rt_info;
-          rt_info = runtime_scheduler->get (infos [i].handle
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          rt_info = runtime_scheduler->get (infos [i].handle);
 
           ACE_ASSERT (rt_info != 0);
           ACE_ASSERT (ACE_OS::strcmp (rt_info->entry_point,
@@ -120,17 +109,13 @@ main (int argc, char *argv[])
                                   static_cast<RtecScheduler::Importance_t> (infos [i].importance),
                                   infos [i].quantum,
                                   infos [i].threads,
-                                  static_cast<RtecScheduler::Info_Type_t> (infos [i].info_type)
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                  static_cast<RtecScheduler::Info_Type_t> (infos [i].info_type));
 
           // Make sure the correct priority values are returned.
           runtime_scheduler->priority (infos [i].handle,
                                        priority,
                                        subpriority,
-                                       p_priority
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       p_priority);
 
           ACE_ASSERT (priority == infos [i].priority);
           ACE_ASSERT (subpriority == infos [i].static_subpriority);
@@ -138,9 +123,7 @@ main (int argc, char *argv[])
           runtime_scheduler->entry_point_priority (infos [i].entry_point,
                                                    priority,
                                                    subpriority,
-                                                   p_priority
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                   p_priority);
 
           ACE_ASSERT (priority == infos [i].priority);
           ACE_ASSERT (subpriority == infos [i].static_subpriority);
@@ -156,20 +139,17 @@ main (int argc, char *argv[])
           runtime_scheduler->
             dispatch_configuration (configs [j].preemption_priority,
                                     priority,
-                                    dispatching_type
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                    dispatching_type);
 
           ACE_ASSERT (priority == configs [j].thread_priority);
           ACE_ASSERT (dispatching_type == configs [j].dispatching_type);
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
+      ex._tao_print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index fb15517f37e..41c5ec1bd6d 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -46,15 +46,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -62,12 +60,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -77,9 +73,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -87,32 +81,26 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -129,30 +117,22 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("client_callback");
 
       child_poa->activate_object_with_id (id.in (),
-                                          &callback_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          &callback_impl);
 
       CORBA::Object_var callback_object =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->id_to_reference (id.in ());
 
       Callback_var callback =
-        Callback::_narrow (callback_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Callback::_narrow (callback_object.in ());
 
 
       CORBA::String_var ior =
-        orb->object_to_string (callback.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (callback.in ());
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client callback activated as <%s>\n", ior.in ()));
 
       // Send the calback object to the server
-      server->callback_object (callback.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->callback_object (callback.in ());
 
       // This is a non-portable, but the only currently available way of
       // determining the number of currently open connections.
@@ -161,8 +141,7 @@ main (int argc, char *argv[])
 
       // A  method to kickstart callbacks from the server
       CORBA::Long r =
-        server->test_method (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->test_method (1);
 
       if (r != 0)
         {
@@ -171,8 +150,7 @@ main (int argc, char *argv[])
                       r));
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // This is a non-portable, but the only currently available way of
       // determining the number of currently open connections.
@@ -191,17 +169,14 @@ main (int argc, char *argv[])
           ACE_OS::abort ();
         }
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index 44ddec21390..2014504133c 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -43,15 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,12 +57,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -74,9 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -84,21 +78,17 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -110,18 +100,13 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("simple_server");
 
       child_poa->activate_object_with_id (id.in (),
-                                          &server_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          &server_impl);
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server activated as <%s>\n", ior.in ()));
 
@@ -144,32 +129,26 @@ main (int argc, char *argv[])
           // Just process one upcall. We know that we would get the
           // clients IOR in that call.
           CORBA::Boolean pending =
-            orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending();
 
           if (pending)
             {
-              orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work();
             }
 
           // Now that hopefully we have the clients IOR, just start
           // making remote calls to the client.
-          retval = server_impl.call_client (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          retval = server_impl.call_client ();
         }
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index af19f459239..cac6e66f604 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
@@ -14,15 +14,15 @@
 ACE_RCSID(BiDirectional, test_i, "$Id$")
 
 void
-Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Callback_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -34,7 +34,7 @@ Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_A
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -47,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 
 void
 Simple_Server_i::callback_object (Callback_ptr callback
-                                  ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -55,7 +55,7 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::call_client (void)
 {
   size_t pre_call_connections =
     this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ();
@@ -64,8 +64,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
     {
       for (int times = 0; times < this->no_iterations_; ++times)
         {
-          this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->callback_->callback_method ();
 
           size_t cur_connections =
             this->orb_->orb_core()->lane_resources().transport_cache().current_size ();
@@ -83,8 +82,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
             }
         }
 
-      this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->callback_->shutdown ();
       this->flag_ = 0;
 
       return 1;
@@ -95,8 +93,8 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
index 9cf3cb4977c..33333f74968 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
@@ -31,11 +31,11 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Safe way to shutdown
 
-  void callback_method (ACE_ENV_SINGLE_ARG_DECL)
+  void callback_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -58,18 +58,16 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Boolean do_callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void callback_object (Callback_ptr callback
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void callback_object (Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  int call_client (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int call_client (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index b3910364baf..4e93ab3c7d3 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -19,8 +19,7 @@ TX_Object_i::~TX_Object_i (void)
 }
 
 void
-TX_Object_i::send (const DataSeq & data
-                   ACE_ENV_ARG_DECL_NOT_USED)
+TX_Object_i::send (const DataSeq & data)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->data_ = data;
@@ -31,14 +30,12 @@ TX_Object_i::send (const DataSeq & data
 }
 
 void
-TX_Object_i::recv (DataSeq_out data
-                   ACE_ENV_ARG_DECL)
+TX_Object_i::recv (DataSeq_out data)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (data,
                     DataSeq,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   (*data) = this->data_;
 
@@ -48,8 +45,8 @@ TX_Object_i::recv (DataSeq_out data
 }
 
 void
-TX_Object_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TX_Object_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
index 53bc2e447c9..0a5a0608374 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
@@ -33,15 +33,13 @@ public:
   // Destructor
   virtual ~TX_Object_i (void);
 
-  virtual void send (const DataSeq & data
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send (const DataSeq & data)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void recv (DataSeq_out data
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void recv (DataSeq_out data)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index 44eeca19e7d..2e7121199a2 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -40,8 +40,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
@@ -50,16 +49,13 @@ 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 obj =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       if (CORBA::is_nil (obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,8 +63,7 @@ main (int argc, char *argv[])
                           -1);
 
       TX_Object_var txObject =
-        TX_Object::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TX_Object::_narrow (obj.in ());
 
       DataSeq data_input;
 
@@ -84,20 +79,17 @@ main (int argc, char *argv[])
                   "Sending  octet sequence of length:\t%u\n",
                   data_input.length ()));
 
-      txObject->send (data_input ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      txObject->send (data_input);
 
       DataSeq_var data_output;
 
-      txObject->recv (data_output.out () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      txObject->recv (data_output.out ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Received octet sequence of length:\t%u\n",
                   data_output->length ()));
 
-      txObject->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      txObject->shutdown ();
 
       // Sanity check
       if (data_output->length () != len
@@ -109,14 +101,12 @@ main (int argc, char *argv[])
                            "the one that was sent.\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ERROR");
+      ex._tao_print_exception ("ERROR");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n"
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index a2a09539439..5e3953c6868 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -42,42 +42,34 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char * argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poaObj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var rootPoa =
-        PortableServer::POA::_narrow (poaObj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poaObj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        rootPoa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rootPoa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (::parse_args (argc, argv) != 0)
         return 1;
 
       TX_Object_i implObject (orb.in ());
 
-      TX_Object_var txObject = implObject._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TX_Object_var txObject = implObject._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (txObject.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (txObject.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -94,27 +86,22 @@ main (int argc, char * argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n"
                   "Event loop finished.\n"));
 
-      rootPoa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rootPoa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ERROR");
+      ex._tao_print_exception ("ERROR");
 
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 2ddfbc0be3d..3e5862fe0ed 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -12,8 +12,7 @@ const char *cert_file = "cacert.pem";
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
@@ -23,29 +22,22 @@ main (int argc, char *argv[])
       // Initialize the ORB
       //
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       //
       // Get the Root POA.
       //
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       //
       // Get a reference to the server.
       //
       obj = orb->string_to_object ("file://server.ior"
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   );
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -59,9 +51,7 @@ main (int argc, char *argv[])
       // Downcast the IOR to the appropriate object type.
       //
       server_var server_obj =
-        server::_narrow (obj.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server::_narrow (obj.in ());
 
       if (CORBA::is_nil (server_obj.in ()))
         {
@@ -79,57 +69,41 @@ main (int argc, char *argv[])
                       -1);
       PortableServer::ServantBase_var theClient = servant;
 
-      client_var client_ref = servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client_var client_ref = servant->_this ();
 
       //
       // Activate the POA manager.
       //
       PortableServer::POAManager_var mgr =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       //
       // Set the server's callback and invoke the test request.
       //
-      server_obj->set_client (client_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_obj->set_client (client_ref.in ());
 
-      server_obj->test_request ("first secure callback to client"
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_obj->test_request ("first secure callback to client");
 
       //
       // Repeat the callback test.
       //
-      server_obj->set_client (client_ref.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      server_obj->test_request ("second secure callback to client"
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_obj->set_client (client_ref.in ());
+      server_obj->test_request ("second secure callback to client");
 
-      server_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_obj->shutdown ();
 
-      poa->destroy (1, 1
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught exception\n"));
+      ex._tao_print_exception (ACE_TEXT ("Caught exception\n"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
index ff5ecb97cb4..30af277ad32 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -15,8 +15,7 @@ client_i::~client_i (void)
 }
 
 void
-client_i::test_reply (const char *msg
-                      ACE_ENV_ARG_DECL_NOT_USED)
+client_i::test_reply (const char *msg)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_INFO,
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
index e5d6603aca9..593fac1e9a2 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h
@@ -30,8 +30,7 @@ public:
   client_i (server_ptr s);
   virtual ~client_i (void);
 
-  virtual void test_reply (const char *msg
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void test_reply (const char *msg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index 881d7d2ca58..f3b2e230f87 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -12,8 +12,7 @@ const char *cert_file = "cacert.pem";
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
@@ -23,22 +22,16 @@ main (int argc, char *argv[])
       // Initialize the ORB
       //
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       //
       // Get the Root POA.
       //
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       //
       // Create the server, get object reference,
@@ -51,17 +44,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var theServer = tmp;
 
       PortableServer::ObjectId_var oid =
-        poa->activate_object (theServer.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->activate_object (theServer.in ());
       CORBA::Object_var server_obj =
-        poa->id_to_reference (oid.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->id_to_reference (oid.in ());
       CORBA::String_var server_IORString =
-        orb->object_to_string (server_obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server_obj.in ());
 
       //
       // Write the IOR to a file.
@@ -79,32 +66,24 @@ main (int argc, char *argv[])
       // Activate the POA manager.
       //
       PortableServer::POAManager_var mgr =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
+      mgr->activate ();
 
       ACE_DEBUG ((LM_INFO,
                   ACE_TEXT ("(%P) calling orb->run () ...\n")));
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      poa->destroy (1, 1
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Caught exception\n"));
+      ex._tao_print_exception (ACE_TEXT ("Caught exception\n"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index f4a66db526f..b16ab2f3f1f 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -15,24 +15,22 @@ server_i::~server_i (void)
 }
 
 void
-server_i::set_client (client_ptr c
-                      ACE_ENV_ARG_DECL_NOT_USED)
+server_i::set_client (client_ptr c)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->client_ = client::_duplicate (c);
 }
 
 void
-server_i::test_request (const char *msg
-                        ACE_ENV_ARG_DECL)
+server_i::test_request (const char *msg)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->client_->test_reply (msg ACE_ENV_ARG_PARAMETER);
+  this->client_->test_reply (msg);
 }
 
 void
-server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
index 443bd091a04..fe6d4278022 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h
@@ -30,15 +30,13 @@ public:
   server_i (CORBA::ORB_ptr orb);
   virtual ~server_i (void);
 
-  virtual void set_client (client_ptr c
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void set_client (client_ptr c)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void test_request (const char *msg
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void test_request (const char *msg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index dd70e280f98..1a71e6962d8 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -6,8 +6,8 @@
 #include "ace/SString.h"
 #include "testC.h"
 
-ACE_RCSID (Send_File, 
-           client, 
+ACE_RCSID (Send_File,
+           client,
            "$Id$")
 
 const char *ior = "file://test.ior";
@@ -50,28 +50,24 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -83,7 +79,7 @@ main (int argc, char *argv[])
 
       for (CORBA::ULong i = 0; i < 2; i++)
         {
-          ACE_TRY_EX(nested_try)
+          try
             {
               ACE_DEBUG ((LM_DEBUG,
                           "CLIENT (%P): Connecting to the server...\n"));
@@ -91,16 +87,15 @@ main (int argc, char *argv[])
               // If we are retrying then make just one request.
               do
                 {
-                  server->send_line ("some data" ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (nested_try);
+                  server->send_line ("some data");
 
                 }
               while (i == 0);
             }
-          ACE_CATCH (CORBA::COMM_FAILURE, ex)
+          catch (const CORBA::COMM_FAILURE& ex)
             {
               // If this happens second time then we are done.
-              if (i != 0) ACE_RE_THROW;
+              if (i != 0) throw;
 
               // Waiting for server to come back
               ACE_DEBUG ((LM_DEBUG,
@@ -110,8 +105,6 @@ main (int argc, char *argv[])
                           wait_time));
               ACE_OS::sleep (wait_time);
             }
-          ACE_ENDTRY;
-          ACE_TRY_CHECK;
         }
 
       if (call_shutdown)
@@ -123,24 +116,20 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG,
                       "CLIENT (%P): Calling shutdown...\n"));
 
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "CLIENT (%P): Done.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CLIENT (%P): Caught exception:");
+      ex._tao_print_exception ("CLIENT (%P): Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index c880f1e4858..dea2f849101 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -6,8 +6,8 @@
 #include "ace/SString.h"
 #include "test_i.h"
 
-ACE_RCSID (Send_File, 
-           server, 
+ACE_RCSID (Send_File,
+           server,
            "$Id$")
 
 const char *ior_output_file = 0;
@@ -41,21 +41,18 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,12 +60,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -79,41 +74,29 @@ main (int argc, char *argv[])
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA ("PersistentPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       PortableServer::ObjectId_var oid =
         PortableServer::string_to_ObjectId ("object1");
-      ACE_TRY_CHECK;
 
       persistent_poa->activate_object_with_id (oid.in (),
-                                               &server_impl
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               &server_impl);
 
 
       CORBA::Object_var server =
         persistent_poa->create_reference_with_id (oid.in (),
-                                                  "IDL:Simple_Server:1.0"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  "IDL:Simple_Server:1.0");
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -140,29 +123,23 @@ main (int argc, char *argv[])
         }
 
 
-      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 (%P): Event loop finished.\n"));
 
-      persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      persistent_poa->destroy (1, 1);
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
       ACE_OS::sleep (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "SERVER (%P): Caught exception:");
+      ex._tao_print_exception ("SERVER (%P): Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index 22b1fd18f1e..f278cf08e3a 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -6,13 +6,12 @@
 #include "test_i.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Send_File, 
-           test_i, 
+ACE_RCSID (Send_File,
+           test_i,
            "$Id$")
 
 void
-Simple_Server_i::send_line (const char *
-                            ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::send_line (const char *)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -33,7 +32,7 @@ Simple_Server_i::send_line (const char *
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
index f0c4aa7be58..dce0675446b 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
@@ -31,11 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void send_line (const char *line
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void send_line (const char *line)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
index ea6e49c399d..7e496abba40 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
@@ -11,7 +11,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
 }
 
 void
-Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Worker::validate_connection (void)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -19,40 +19,34 @@ Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 
   for (int j = 0; j != 100; ++j)
    {
-      ACE_TRY
+      try
         {
-          this->server_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->ping ();
 
           if(TAO_debug_level > 0)
             ACE_DEBUG (( LM_DEBUG,
                          "******** VALIDATED ******* \n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
         }
-      ACE_ENDTRY;
    }
 }
 
 int
 Client_Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Validate connections befire doing any actual work..
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-       ACE_TRY_CHECK;
+      this->validate_connection ();
 
-       this->server_->validate_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
-       ACE_TRY_CHECK;
+       this->server_->validate_protocol ();
 
        for (int i = 0; i < this->niterations_; ++i)
          {
-           this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
-           ACE_TRY_CHECK;
+           this->server_->test_method (i);
 
            if (TAO_debug_level > 0)
              ACE_DEBUG ((LM_DEBUG,
@@ -60,15 +54,13 @@ Client_Worker::svc (void)
                          i));
          }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) Got an exception \n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_Worker : Exception Raised");
+      ex._tao_print_exception ("Client_Worker : Exception Raised");
 
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
index c1f1015fb1b..85099621dfa 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
@@ -43,7 +43,7 @@ public:
   // thread entry point
 
 private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void validate_connection (void);
   // Validate the connection
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
index cad95255acd..066154a3f59 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
@@ -9,15 +9,12 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
 int
 Server_Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index 5da628db89d..901cc538d48 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -53,26 +53,22 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Get Object Reference using IOR file
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       // Cast to Appropriate Type
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -97,23 +93,19 @@ main (int argc, char *argv[])
       // Shut down the server if -x option given in command line
       if (do_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
       // Destroying the ORB..
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
 
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index 29c53ecb7b8..5614a78a8e7 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -41,17 +41,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,12 +57,10 @@ main (int argc, char *argv[])
 
       // Get a Root POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,12 +68,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -95,8 +88,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Worker worker (orb.in ());
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -109,13 +101,11 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index 731adae0864..b688de2b03a 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -17,14 +17,14 @@ ACE_RCSID (MT_IIOP_SSL,
            "$Id$")
 
 void
-Simple_Server_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 void
-Simple_Server_i::validate_protocol (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::validate_protocol (void)
   ACE_THROW_SPEC ((Simple_Server::WrongProtocolType,
                    CORBA::SystemException))
 {
@@ -69,11 +69,11 @@ Simple_Server_i::validate_protocol (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   if (this->validated_ == VALIDATED_NOSUCCESS)
-    ACE_THROW (Simple_Server::WrongProtocolType ());
+    throw Simple_Server::WrongProtocolType ();
 }
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -84,8 +84,8 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
index 55a89d5ebf9..0894e704594 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
@@ -31,17 +31,17 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void ping (ACE_ENV_SINGLE_ARG_DECL)
+  void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void validate_protocol (ACE_ENV_SINGLE_ARG_DECL)
+  void validate_protocol (void)
     ACE_THROW_SPEC ((Simple_Server::WrongProtocolType,
                      CORBA::SystemException));
 
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 82fe2335212..95ff3134ba4 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -13,7 +13,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
 }
 
 void
-Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Worker::validate_connection (void)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -21,38 +21,33 @@ Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 
   for (int j = 0; j != 100; ++j)
    {
-      ACE_TRY
+      try
         {
-          this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
-          this->another_->test_method (j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->test_method (j);
+          this->another_->test_method (j);
           if(TAO_debug_level > 0)
             ACE_DEBUG (( LM_DEBUG,
                          "******** VALIDATED ******* \n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
         }
-      ACE_ENDTRY;
    }
 }
 
 int
 Client_Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Validate connections befire doing any actual work..
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-       ACE_TRY_CHECK;
+      this->validate_connection ();
 
        for (int i = 0; i < this->niterations_; ++i)
          {
-           this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
-           this->another_->test_method (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+           this->server_->test_method (i);
+           this->another_->test_method (i);
 
            if (TAO_debug_level > 0)
              ACE_DEBUG ((LM_DEBUG,
@@ -60,11 +55,9 @@ Client_Worker::svc (void)
                          i));
          }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_Worker : Exception Raised");
+      ex._tao_print_exception ("Client_Worker : Exception Raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index daae1a99760..1d56173a596 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -45,7 +45,7 @@ public:
   // thread entry point
 
 private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void validate_connection (void);
   // Validate the connection
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index cad95255acd..066154a3f59 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -9,15 +9,12 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
 int
 Server_Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 8ef6242213a..0197fd6615e 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -55,13 +55,11 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -74,13 +72,11 @@ main (int argc, char *argv[])
 
       // Get Object Reference using IOR file
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       // Cast to Appropriate Type
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -91,13 +87,11 @@ main (int argc, char *argv[])
 
 
       object =
-        orb->string_to_object (another_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (another_ior);
 
       // Cast to Appropriate Type
       Another_One_var another =
-        Another_One::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Another_One::_narrow (object.in ());
 
 
       Client_Worker client (server.in (),
@@ -117,23 +111,19 @@ main (int argc, char *argv[])
       // Shut down the server if -x option given in command line
       if (do_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
       // Destroying the ORB..
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
 
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index b05e356507c..f6b1490fcda 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -62,17 +62,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -81,12 +78,10 @@ main (int argc, char *argv[])
 
       // Get a Root POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,20 +90,16 @@ main (int argc, char *argv[])
       Another_One_i another_one_impl (orb.in());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       Another_One_var another_one =
-        another_one_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        another_one_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       CORBA::String_var another_ior =
-        orb->object_to_string (another_one.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (another_one.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -117,12 +108,10 @@ main (int argc, char *argv[])
       if (ior_table_name != 0)
         {
           CORBA::Object_var table_object =
-             orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+             orb->resolve_initial_references ("IORTable");
 
           IORTable::Table_var adapter =
-             IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+             IORTable::Table::_narrow (table_object.in ());
 
           if (CORBA::is_nil (adapter.in ()))
             {
@@ -130,9 +119,8 @@ main (int argc, char *argv[])
               return -1;
             }
 
-          adapter->bind ( ior_table_name, ior.in () ACE_ENV_ARG_PARAMETER);
-          adapter->bind ( another_table_name, another_ior.in() ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          adapter->bind ( ior_table_name, ior.in ());
+          adapter->bind ( another_table_name, another_ior.in());
         }
 
 
@@ -161,8 +149,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Worker worker (orb.in ());
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -175,13 +162,11 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index 5c589569d8d..dbe79cedd55 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (MT_Server,
            "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -23,16 +23,16 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 //---------------------------------------------------------------------------
 
 CORBA::Long
-Another_One_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+Another_One_i::test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index 8982498679c..b9277d89035 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -56,7 +56,7 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index e7fb1763591..3c682f2d2df 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -18,17 +18,15 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 }
 
 void
-Foo_i::baz (ACE_ENV_SINGLE_ARG_DECL)
+Foo_i::baz (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Foo::Bar::NoSecurityAttributes))
 {
   SecurityLevel3::ClientCredentials_var credentials =
-    this->current_->client_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->current_->client_credentials ();
 
   CORBA::String_var id =
-    credentials->creds_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    credentials->creds_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "\n"
@@ -39,8 +37,8 @@ Foo_i::baz (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Foo_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Foo_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index c6acd255e3e..4fc3d00a03d 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -27,11 +27,11 @@ public:
          SecurityLevel3::SecurityCurrent_ptr current);
 
   /// Test method.
-  virtual void baz (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void baz (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Foo::Bar::NoSecurityAttributes));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 40877b8871f..27a7b0b511c 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -15,8 +15,7 @@ const char *cert_file = "cacert.pem";
 
 void
 insecure_invocation_test (CORBA::ORB_ptr orb,
-                          CORBA::Object_ptr obj
-                          ACE_ENV_ARG_DECL)
+                          CORBA::Object_ptr obj)
 {
   // Disable protection for this insecure invocation test.
 
@@ -28,9 +27,7 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
   // Create the Security::QOPPolicy.
   CORBA::Policy_var policy =
     orb->create_policy (Security::SecQOPPolicy,
-                        no_protection
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        no_protection);
 
   CORBA::PolicyList policy_list (1);
   policy_list.length (1);
@@ -40,13 +37,10 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
   // protection).
   CORBA::Object_var object =
     obj->_set_policy_overrides (policy_list,
-                                CORBA::SET_OVERRIDE
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                CORBA::SET_OVERRIDE);
 
   Foo::Bar_var server =
-    Foo::Bar::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    Foo::Bar::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
     {
@@ -55,17 +49,16 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
                   "nil.\n",
                   ior));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
-  ACE_TRY
+  try
     {
       // This invocation should result in a CORBA::NO_PERMISSION
       // exception.
-      server->baz (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->baz ();
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, exc)
+  catch (const CORBA::NO_PERMISSION&)
     {
       ACE_DEBUG ((LM_INFO,
                   "(%P|%t) Received CORBA::NO_PERMISSION from "
@@ -73,23 +66,19 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
 
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_ERROR ((LM_ERROR,
               "(%P|%t) ERROR: CORBA::NO_PERMISSION was not thrown.\n"
               "(%P|%t) ERROR: It should have been thrown.\n"));
 
-  ACE_THROW (CORBA::INTERNAL ());
+  throw CORBA::INTERNAL ();
 }
 
 void
-secure_invocation_test (CORBA::Object_ptr object
-                        ACE_ENV_ARG_DECL)
+secure_invocation_test (CORBA::Object_ptr object)
 {
   Foo::Bar_var server =
-    Foo::Bar::_narrow (object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    Foo::Bar::_narrow (object);
 
   if (CORBA::is_nil (server.in ()))
     {
@@ -98,15 +87,13 @@ secure_invocation_test (CORBA::Object_ptr object
                   "nil.\n",
                   ior));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   // This invocation should return successfully.
-  server->baz (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  server->baz ();
 
-  server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  server->shutdown ();
 }
 
 int
@@ -137,22 +124,20 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       // This test sets creates a Security::QOPPolicy with the
       // Quality-of-Protection set to "no protection."  It then
@@ -160,26 +145,21 @@ main (int argc, char *argv[])
       // then result in a CORBA::NO_PERMISSION exception.
       //
       // The server is not shutdown by this test.
-      insecure_invocation_test (orb.in (), object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      insecure_invocation_test (orb.in (), object.in ());
 
       // This test uses the default secure SSLIOP settings to securely
       // invoke a method on the server.  No exception should occur.
       //
       // The server *is* shutdown by this test.
-      secure_invocation_test (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      secure_invocation_test (object.in ());
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 8b7ff656577..4856df76c19 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -40,19 +40,17 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_TString env ("SSL_CERT_FILE=");
       env += cert_file;
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,25 +59,19 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       obj =
-        orb->resolve_initial_references ("SecurityLevel3:SecurityCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("SecurityLevel3:SecurityCurrent");
 
       SecurityLevel3::SecurityCurrent_var security_current =
-        SecurityLevel3::SecurityCurrent::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        SecurityLevel3::SecurityCurrent::_narrow (obj.in ());
 
       if (CORBA::is_nil (security_current.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -97,21 +89,17 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer (server_impl);
 
       Foo::Bar_var server =
-        server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl->_this ();
 
       // Sanity check on SSLIOP profile equivalence.
       // Since the POA is reference counting the servants, this
       // implementation must still exist when the POA is destroyed.
       Foo_i server_impl2 (orb.in (), security_current.in ());
       Foo::Bar_var server2 =
-        server_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl2._this ();
 
       const CORBA::Boolean equivalent =
-        server->_is_equivalent (server2.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->_is_equivalent (server2.in ());
 
       if (equivalent)
         {
@@ -121,8 +109,7 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -139,29 +126,23 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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,
                   "\n"
                   "Event loop finished.\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index 904a68a489b..ee365c81d78 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -41,11 +41,11 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id ACE_ENV_ARG_DECL)
+  void id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets id.
 
-  CORBA::Short id (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Short id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gets id.
 
@@ -63,14 +63,14 @@ My_Test_Object::~My_Test_Object (void)
 }
 
 CORBA::Short
-My_Test_Object::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+My_Test_Object::id (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return id_;
 }
 
 void
-My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED)
+My_Test_Object::id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
@@ -205,17 +205,13 @@ CosNaming_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize ORB.
       this->orbmgr_.init (this->argc_,
-                          this->argv_
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          this->argv_);
 
-      this->orbmgr_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orbmgr_.activate_poa_manager ();
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -224,12 +220,11 @@ CosNaming_Client::init (int argc, char **argv)
       CORBA::ORB_var orb = this->orbmgr_.orb ();
       return this->naming_client_.init (orb.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      ex._tao_print_exception ("init");
       // and return -1 below . . .
     }
-  ACE_ENDTRY;
 
   return -1;
 }
@@ -249,47 +244,41 @@ MT_Test::svc (void)
 
   CosNaming::NamingContext_var name_service;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (SETUP)
+  try
     {
       CORBA::Object_var name_service_obj =
-        orb_->string_to_object (name_service_ior_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
+        orb_->string_to_object (name_service_ior_);
 
       name_service =
-        CosNaming::NamingContext::_narrow (name_service_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
+        CosNaming::NamingContext::_narrow (name_service_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test setup");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test setup");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (name_service.in () == 0)
     return -1;
 
   // Bind the object.
-  ACE_TRY_EX (BIND)
+  try
     {
       name_service->bind (test_name_,
-                          test_ref_.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (BIND);
+                          test_ref_.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK in thread %t\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to bind in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test bind");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test bind");
       // This debug statement works around a IRIX/MIPSPro 7.3 bug (it
       // fails with optimize=1 debug=0; but works with any other
       // settings for those flags).
@@ -297,66 +286,55 @@ MT_Test::svc (void)
                   test_name_.length ()));
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Resolve the object from the Naming Context.
-  ACE_TRY_EX (RESOLVE)
+  try
     {
       CORBA::Object_var result_obj_ref =
-        name_service->resolve (test_name_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
+        name_service->resolve (test_name_);
 
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
+        Test_Object::_narrow (result_obj_ref.in ());
 
       if (!CORBA::is_nil (result_object.in ()))
         {
-          CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (RESOLVE);
+          CORBA::Short id = result_object->id ();
 
           if (id == CosNaming_Client::OBJ1_ID)
             ACE_DEBUG ((LM_DEBUG,
                         "Resolved name OK in thread %t\n"));
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to resolve in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test resolve");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test resolve");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Unbind the object from the Naming Context.
-  ACE_TRY_EX (UNBIND)
+  try
     {
-      name_service->unbind (test_name_
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (UNBIND);
+      name_service->unbind (test_name_);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK in thread %t\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to unbind in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test unbind");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test unbind");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -373,15 +351,12 @@ MT_Test::execute (TAO_Naming_Client &root_context)
   My_Test_Object *test_obj_impl =
     new My_Test_Object (CosNaming_Client::OBJ1_ID);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       test_ref_ =
-        test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_obj_impl->_this ();
 
-      test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_obj_impl->_remove_ref ();
 
       // Get the IOR for the Naming Service.  Each thread can use it
       // in <string_to_object> to create its own stub for the Naming
@@ -393,18 +368,15 @@ MT_Test::execute (TAO_Naming_Client &root_context)
         root_context.get_context ();
 
       name_service_ior_ =
-        orb_->object_to_string (context.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (context.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception while instantiating dummy");
+      ex._tao_print_exception (
+        "Unexpected exception while instantiating dummy");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Create a name for dummy.
   test_name_.length (1);
@@ -424,61 +396,48 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 int
 Simple_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Dummy object instantiation.
       My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
       Test_Object_var test_obj_ref =
-        test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_obj_impl->_this ();
 
       // Give ownership of this object to POA.
-      test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_obj_impl->_remove_ref ();
 
       // Bind an object to the Naming Context.
       CosNaming::Name test_name;
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("Foo");
       root_context->bind (test_name,
-                          test_obj_ref.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          test_obj_ref.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK\n"));
 
       // Resolve the object from the Naming Context.
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->resolve (test_name);
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Object::_narrow (result_obj_ref.in ());
       if (!CORBA::is_nil (result_object.in ()))
         {
-          CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::Short id = result_object->id ();
           if (id == CosNaming_Client::OBJ1_ID)
             ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n"));
         }
 
       // Unbind the object from the Naming Context.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Simple test");
+      ex._tao_print_exception (
+        "Unexpected exception in Simple test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -486,8 +445,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
 int
 Tree_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a tree of contexts: root->level1->level2.  Bind object
       // foo under context level2.
@@ -497,59 +455,45 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level1.length (1);
       level1[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (level1
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level1_context = root_context->bind_new_context (level1);
 
       // Create a new context.
       CosNaming::NamingContext_var level2_context;
-      level2_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level2_context = root_context->new_context ();
 
       // Instantiate a dummy object and bind it under the new context.
       My_Test_Object *impl1 =
         new My_Test_Object (CosNaming_Client::OBJ1_ID);
-      Test_Object_var obj1 = impl1->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj1 = impl1->_this ();
+      impl1->_remove_ref ();
 
       CosNaming::Name obj_name;
       obj_name.length (1);
       obj_name[0].id = CORBA::string_dup ("foo");
-      level2_context->bind (obj_name, obj1.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level2_context->bind (obj_name, obj1.in ());
 
       // Bind the context we just created under level1.
       CosNaming::Name level2 (level1);
       level2.length (2);
       level2[1].id = CORBA::string_dup ("level2_context");
       root_context->bind_context (level2,
-                                  level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  level2_context.in ());
 
       // Resolve and unbind level1/level2/foo, and bind it back.
       CosNaming::Name test_name (level2);
       test_name.length (3);
       test_name[2].id = obj_name[0].id;
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->resolve (test_name);
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Object::_narrow (result_obj_ref.in ());
 
       if (CORBA::is_nil (result_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Problems with resolving foo in Tree Test - nil object ref.\n"),
                           -1);
 
-      CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Short id = result_object->id ();
 
       if (id != CosNaming_Client::OBJ1_ID)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -558,38 +502,24 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       // Unbind the object from the Naming Context and bind it back
       // in.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj1.in ());
 
       // Create new context and rebind under the name level1/level2.
       CosNaming::NamingContext_var new_level2_context;
       new_level2_context =
-        root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->new_context ();
       root_context->rebind_context (level2,
-                                  new_level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  new_level2_context.in ());
 
       // Bind, resolve, rebind, and resolve foo under level1/level2.
       root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Short obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj1.in ());
+      result_obj_ref = root_context->resolve (test_name);
+      result_object = Test_Object::_narrow (result_obj_ref.in ());
+
+      CORBA::Short obj_id = result_object->id ();
 
       if (CORBA::is_nil (result_object.in ())
           || !(obj_id == CosNaming_Client::OBJ1_ID))
@@ -599,25 +529,16 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       My_Test_Object *impl2 =
         new My_Test_Object (CosNaming_Client::OBJ2_ID);
-      Test_Object_var obj2 = impl2->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj2 = impl2->_this ();
 
-      impl2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      impl2->_remove_ref ();
 
       root_context->rebind (test_name,
-                            obj2.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            obj2.in ());
+      result_obj_ref = root_context->resolve (test_name);
+      result_object = Test_Object::_narrow (result_obj_ref.in ());
+
+      obj_id = result_object->id ();
 
       if (CORBA::is_nil (result_object.in ())
           || !( obj_id == CosNaming_Client::OBJ2_ID))
@@ -626,14 +547,13 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
                           -1);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Tree test");
+      ex._tao_print_exception (
+        "Unexpected exception in Tree test");
       return -1;
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
               "All functions work properly \n"));
@@ -643,8 +563,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 int
 Exceptions_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Set things up.
 
@@ -653,174 +572,129 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       context_name.length (1);
       context_name[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (context_name
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level1_context = root_context->bind_new_context (context_name);
       context_name[0].id = CORBA::string_dup ("level2_context");
       CosNaming::NamingContext_var level2_context;
-      level2_context = level1_context->bind_new_context (context_name
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level2_context = level1_context->bind_new_context (context_name);
 
       // Bind a dummy object foo under each context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       root_context->bind (object_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       level1_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            obj.in ());
       level2_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            obj.in ());
 
       // Run exceptions tests.
-      invalid_name_test (root_context
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      already_bound_test (root_context
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      already_bound_test2 (root_context
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      not_found_test (root_context
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      not_found_test2 (root_context
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      not_found_test3 (root_context
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      invalid_name_test (root_context);
+      already_bound_test (root_context);
+      already_bound_test2 (root_context);
+      not_found_test (root_context);
+      not_found_test2 (root_context);
+      not_found_test3 (root_context);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Exceptions test");
+      ex._tao_print_exception (
+        "Unexpected exception in Exceptions test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 void
-Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
-                                    ACE_ENV_ARG_DECL)
+Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (0);
 
-      root_context->resolve (test_name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->resolve (test_name);
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, ex)
+  catch (const CosNaming::NamingContext::InvalidName&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "InvalidName exception works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
-                                     ACE_ENV_ARG_DECL)
+Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound exception (case 1) works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
-                                      ACE_ENV_ARG_DECL)
+Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (2);
       test_name[0].id = CORBA::string_dup ("level1_context");
       test_name[1].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound  exception (case 2) works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
-                                 ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -828,12 +702,10 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("level2_context");
       test_name[2].id = CORBA::string_dup ("bar");
 
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::missing_node &&
           ex.rest_of_name.length () == 1
@@ -846,20 +718,17 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
                     "NotFound  exception (case 1)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -867,12 +736,10 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("level3_context");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::missing_node
           && ex.rest_of_name.length () == 2
@@ -887,21 +754,18 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
                     "NotFound  exception (case 2)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -909,11 +773,10 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("foo");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::not_context
           && ex.rest_of_name.length () == 2
@@ -928,27 +791,22 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
                     "NotFound  exception (case 3)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
 Iterator_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Instantiate four dummy objects.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       // Bind objects to the naming context.
       CosNaming::Name name1;
@@ -964,30 +822,20 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       name4.length (1);
       name4[0].id = CORBA::string_dup ("foo4");
       root_context->bind (name1,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       root_context->bind (name2,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       root_context->bind (name3,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       root_context->bind (name4,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
 
       // List the content of the Naming Context.
       CosNaming::BindingIterator_var iter;
       CosNaming::BindingList_var bindings_list;
       root_context->list (1,
                           bindings_list.out (),
-                          iter.out ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          iter.out ());
       if (CORBA::is_nil (iter.in ())
           || bindings_list->length () != 1
           || bindings_list[0u].binding_type != CosNaming::nobject)
@@ -1000,9 +848,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // Invoke operations on the iterator.
       CosNaming::Binding_var binding;
-      iter->next_one (binding.out ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      iter->next_one (binding.out ());
       if (binding->binding_type != CosNaming::nobject)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::next_one does not function properly\n"),
@@ -1011,8 +857,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
                   "Second binding: %s\n",
                   binding->binding_name[0].id.in ()));
 
-      iter->next_n (2, bindings_list.out () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      iter->next_n (2, bindings_list.out ());
       if (bindings_list->length () != 2
           || bindings_list[0u].binding_type != CosNaming::nobject
           || bindings_list[1u].binding_type != CosNaming::nobject)
@@ -1027,23 +872,19 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // We already iterated over all the bindings, so the following
       // should return false.
-      CORBA::Boolean result = iter->next_one (binding.out ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean result = iter->next_one (binding.out ());
       if (result)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::BindingIterator does not function properly\n"),
                           -1);
-      iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      iter->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Iterator test");
+      ex._tao_print_exception (
+        "Unexpected exception in Iterator test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -1051,92 +892,71 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 int
 Destroy_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a context and bind an object under it.
 
       CosNaming::NamingContext_var my_context;
-      my_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_context = root_context->new_context ();
 
       // Bind a dummy object foo under my_context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       my_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            obj.in ());
 
       // Do the testing.
-      not_empty_test (my_context
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      my_context->unbind (object_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      my_context->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      not_exist_test (my_context
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      not_empty_test (my_context);
+
+      my_context->unbind (object_name);
+      my_context->destroy ();
+
+      not_exist_test (my_context);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Destroy test");
+      ex._tao_print_exception (
+        "Unexpected exception in Destroy test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 void
-Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
+Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref)
 {
-  ACE_TRY
+  try
     {
-      ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ref->destroy ();
     }
 
-  ACE_CATCH (CosNaming::NamingContext::NotEmpty, ex)
+  catch (const CosNaming::NamingContext::NotEmpty&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "NotEmpty exception works properly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
+Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref)
 {
-  ACE_TRY
+  try
     {
-      ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ref->destroy ();
     }
 
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Destroy works properly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
@@ -1153,8 +973,7 @@ Persistent_Test_Begin::~Persistent_Test_Begin (void)
 int
 Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a name structure we will reuse.
       CosNaming::Name test_name;
@@ -1163,21 +982,16 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 
       // Create and bind a naming context under the <root> context.
       CosNaming::NamingContext_var level1_context =
-        root_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->bind_new_context (test_name);
 
       // Create and bind a naming context under <level1> context.
       test_name[0].id = CORBA::string_dup ("level2");
       CosNaming::NamingContext_var level2_context =
-        level1_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        level1_context->bind_new_context (test_name);
 
       // Log the ior of <level1_context> for use by <Persistent_Test_End>.
       CORBA::String_var ior =
-        orb_->object_to_string (level1_context.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (level1_context.in ());
 
       ACE_OS::fprintf (this->file_,
                        "%s",
@@ -1186,14 +1000,12 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 
       ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 1) OK.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 1)");
+      ex._tao_print_exception (
+        "Unexpected exception in Persistent Test (part 1)");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -1212,8 +1024,7 @@ Persistent_Test_End::~Persistent_Test_End (void)
 int
 Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a name structure we will reuse.
       CosNaming::Name test_name;
@@ -1223,12 +1034,10 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       // Convert stringified ior we got from <Persistent_Test_Begin>
       // for <level1> Naming Context to Naming Context reference.
       CORBA::Object_var obj =
-        orb_->string_to_object (ior_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->string_to_object (ior_);
 
       CosNaming::NamingContext_var level1_context =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (obj.in ());
 
       if (CORBA::is_nil (level1_context.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -1237,8 +1046,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 
       //  Resolve for <level2> context through the persistent ior we
       // got from part 1 of this test.
-      obj = level1_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = level1_context->resolve (test_name);
 
       // Now, resolve for <level2> context using the <root> context
       // reference which we obtained through <resolve_initial_references>.
@@ -1246,21 +1054,18 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       test_name[0].id = CORBA::string_dup ("level1");
       test_name[1].id = CORBA::string_dup ("level2");
       CORBA::Object_var obj2 =
-        root_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->resolve (test_name);
 
       // Make sure we got the same answer through both methods.
       if (obj2->_is_equivalent (obj.in ()))
         ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 2) OK.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 2)");
+      ex._tao_print_exception (
+        "Unexpected exception in Persistent Test (part 2)");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
index e8fe27385c1..2850fe0e090 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
@@ -171,18 +171,12 @@ private:
   // the following functions isolate specific tests due to the
   // limitation of only 1 TAO_TRY being allowed per function.
 
-  void invalid_name_test (TAO_Naming_Client &root_context
-                          ACE_ENV_ARG_DECL);
-  void already_bound_test (TAO_Naming_Client &root_context
-                           ACE_ENV_ARG_DECL);
-  void already_bound_test2 (TAO_Naming_Client &root_context
-                            ACE_ENV_ARG_DECL);
-  void not_found_test (TAO_Naming_Client &root_context
-                       ACE_ENV_ARG_DECL);
-  void not_found_test2 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
-  void not_found_test3 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
+  void invalid_name_test (TAO_Naming_Client &root_context);
+  void already_bound_test (TAO_Naming_Client &root_context);
+  void already_bound_test2 (TAO_Naming_Client &root_context);
+  void not_found_test (TAO_Naming_Client &root_context);
+  void not_found_test2 (TAO_Naming_Client &root_context);
+  void not_found_test3 (TAO_Naming_Client &root_context);
 };
 
 class Destroy_Test : public Naming_Test
@@ -205,10 +199,8 @@ public:
 
 private:
   // = The following functions isolate specific tests.
-  void not_empty_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
-  void not_exist_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
+  void not_empty_test (CosNaming::NamingContext_var &ref);
+  void not_exist_test (CosNaming::NamingContext_var &ref);
 };
 
 class Persistent_Test_Begin : public Naming_Test
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 904a68a489b..ee365c81d78 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -41,11 +41,11 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id ACE_ENV_ARG_DECL)
+  void id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets id.
 
-  CORBA::Short id (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Short id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gets id.
 
@@ -63,14 +63,14 @@ My_Test_Object::~My_Test_Object (void)
 }
 
 CORBA::Short
-My_Test_Object::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+My_Test_Object::id (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return id_;
 }
 
 void
-My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED)
+My_Test_Object::id (CORBA::Short id)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
@@ -205,17 +205,13 @@ CosNaming_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize ORB.
       this->orbmgr_.init (this->argc_,
-                          this->argv_
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          this->argv_);
 
-      this->orbmgr_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orbmgr_.activate_poa_manager ();
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -224,12 +220,11 @@ CosNaming_Client::init (int argc, char **argv)
       CORBA::ORB_var orb = this->orbmgr_.orb ();
       return this->naming_client_.init (orb.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      ex._tao_print_exception ("init");
       // and return -1 below . . .
     }
-  ACE_ENDTRY;
 
   return -1;
 }
@@ -249,47 +244,41 @@ MT_Test::svc (void)
 
   CosNaming::NamingContext_var name_service;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (SETUP)
+  try
     {
       CORBA::Object_var name_service_obj =
-        orb_->string_to_object (name_service_ior_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
+        orb_->string_to_object (name_service_ior_);
 
       name_service =
-        CosNaming::NamingContext::_narrow (name_service_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
+        CosNaming::NamingContext::_narrow (name_service_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test setup");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test setup");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (name_service.in () == 0)
     return -1;
 
   // Bind the object.
-  ACE_TRY_EX (BIND)
+  try
     {
       name_service->bind (test_name_,
-                          test_ref_.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (BIND);
+                          test_ref_.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK in thread %t\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to bind in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test bind");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test bind");
       // This debug statement works around a IRIX/MIPSPro 7.3 bug (it
       // fails with optimize=1 debug=0; but works with any other
       // settings for those flags).
@@ -297,66 +286,55 @@ MT_Test::svc (void)
                   test_name_.length ()));
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Resolve the object from the Naming Context.
-  ACE_TRY_EX (RESOLVE)
+  try
     {
       CORBA::Object_var result_obj_ref =
-        name_service->resolve (test_name_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
+        name_service->resolve (test_name_);
 
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
+        Test_Object::_narrow (result_obj_ref.in ());
 
       if (!CORBA::is_nil (result_object.in ()))
         {
-          CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (RESOLVE);
+          CORBA::Short id = result_object->id ();
 
           if (id == CosNaming_Client::OBJ1_ID)
             ACE_DEBUG ((LM_DEBUG,
                         "Resolved name OK in thread %t\n"));
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to resolve in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test resolve");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test resolve");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Unbind the object from the Naming Context.
-  ACE_TRY_EX (UNBIND)
+  try
     {
-      name_service->unbind (test_name_
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (UNBIND);
+      name_service->unbind (test_name_);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK in thread %t\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to unbind in thread %t\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test unbind");
+      ex._tao_print_exception (
+        "Unexpected exception in MT test unbind");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -373,15 +351,12 @@ MT_Test::execute (TAO_Naming_Client &root_context)
   My_Test_Object *test_obj_impl =
     new My_Test_Object (CosNaming_Client::OBJ1_ID);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       test_ref_ =
-        test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_obj_impl->_this ();
 
-      test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_obj_impl->_remove_ref ();
 
       // Get the IOR for the Naming Service.  Each thread can use it
       // in <string_to_object> to create its own stub for the Naming
@@ -393,18 +368,15 @@ MT_Test::execute (TAO_Naming_Client &root_context)
         root_context.get_context ();
 
       name_service_ior_ =
-        orb_->object_to_string (context.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (context.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception while instantiating dummy");
+      ex._tao_print_exception (
+        "Unexpected exception while instantiating dummy");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Create a name for dummy.
   test_name_.length (1);
@@ -424,61 +396,48 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 int
 Simple_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Dummy object instantiation.
       My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
       Test_Object_var test_obj_ref =
-        test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_obj_impl->_this ();
 
       // Give ownership of this object to POA.
-      test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_obj_impl->_remove_ref ();
 
       // Bind an object to the Naming Context.
       CosNaming::Name test_name;
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("Foo");
       root_context->bind (test_name,
-                          test_obj_ref.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          test_obj_ref.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK\n"));
 
       // Resolve the object from the Naming Context.
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->resolve (test_name);
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Object::_narrow (result_obj_ref.in ());
       if (!CORBA::is_nil (result_object.in ()))
         {
-          CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::Short id = result_object->id ();
           if (id == CosNaming_Client::OBJ1_ID)
             ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n"));
         }
 
       // Unbind the object from the Naming Context.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Simple test");
+      ex._tao_print_exception (
+        "Unexpected exception in Simple test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -486,8 +445,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
 int
 Tree_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a tree of contexts: root->level1->level2.  Bind object
       // foo under context level2.
@@ -497,59 +455,45 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level1.length (1);
       level1[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (level1
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level1_context = root_context->bind_new_context (level1);
 
       // Create a new context.
       CosNaming::NamingContext_var level2_context;
-      level2_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level2_context = root_context->new_context ();
 
       // Instantiate a dummy object and bind it under the new context.
       My_Test_Object *impl1 =
         new My_Test_Object (CosNaming_Client::OBJ1_ID);
-      Test_Object_var obj1 = impl1->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj1 = impl1->_this ();
+      impl1->_remove_ref ();
 
       CosNaming::Name obj_name;
       obj_name.length (1);
       obj_name[0].id = CORBA::string_dup ("foo");
-      level2_context->bind (obj_name, obj1.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level2_context->bind (obj_name, obj1.in ());
 
       // Bind the context we just created under level1.
       CosNaming::Name level2 (level1);
       level2.length (2);
       level2[1].id = CORBA::string_dup ("level2_context");
       root_context->bind_context (level2,
-                                  level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  level2_context.in ());
 
       // Resolve and unbind level1/level2/foo, and bind it back.
       CosNaming::Name test_name (level2);
       test_name.length (3);
       test_name[2].id = obj_name[0].id;
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->resolve (test_name);
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Object::_narrow (result_obj_ref.in ());
 
       if (CORBA::is_nil (result_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Problems with resolving foo in Tree Test - nil object ref.\n"),
                           -1);
 
-      CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Short id = result_object->id ();
 
       if (id != CosNaming_Client::OBJ1_ID)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -558,38 +502,24 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       // Unbind the object from the Naming Context and bind it back
       // in.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj1.in ());
 
       // Create new context and rebind under the name level1/level2.
       CosNaming::NamingContext_var new_level2_context;
       new_level2_context =
-        root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->new_context ();
       root_context->rebind_context (level2,
-                                  new_level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  new_level2_context.in ());
 
       // Bind, resolve, rebind, and resolve foo under level1/level2.
       root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Short obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj1.in ());
+      result_obj_ref = root_context->resolve (test_name);
+      result_object = Test_Object::_narrow (result_obj_ref.in ());
+
+      CORBA::Short obj_id = result_object->id ();
 
       if (CORBA::is_nil (result_object.in ())
           || !(obj_id == CosNaming_Client::OBJ1_ID))
@@ -599,25 +529,16 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       My_Test_Object *impl2 =
         new My_Test_Object (CosNaming_Client::OBJ2_ID);
-      Test_Object_var obj2 = impl2->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj2 = impl2->_this ();
 
-      impl2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      impl2->_remove_ref ();
 
       root_context->rebind (test_name,
-                            obj2.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            obj2.in ());
+      result_obj_ref = root_context->resolve (test_name);
+      result_object = Test_Object::_narrow (result_obj_ref.in ());
+
+      obj_id = result_object->id ();
 
       if (CORBA::is_nil (result_object.in ())
           || !( obj_id == CosNaming_Client::OBJ2_ID))
@@ -626,14 +547,13 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
                           -1);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Tree test");
+      ex._tao_print_exception (
+        "Unexpected exception in Tree test");
       return -1;
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
               "All functions work properly \n"));
@@ -643,8 +563,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 int
 Exceptions_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Set things up.
 
@@ -653,174 +572,129 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       context_name.length (1);
       context_name[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (context_name
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level1_context = root_context->bind_new_context (context_name);
       context_name[0].id = CORBA::string_dup ("level2_context");
       CosNaming::NamingContext_var level2_context;
-      level2_context = level1_context->bind_new_context (context_name
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      level2_context = level1_context->bind_new_context (context_name);
 
       // Bind a dummy object foo under each context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       root_context->bind (object_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       level1_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            obj.in ());
       level2_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            obj.in ());
 
       // Run exceptions tests.
-      invalid_name_test (root_context
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      already_bound_test (root_context
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      already_bound_test2 (root_context
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      not_found_test (root_context
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      not_found_test2 (root_context
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      not_found_test3 (root_context
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      invalid_name_test (root_context);
+      already_bound_test (root_context);
+      already_bound_test2 (root_context);
+      not_found_test (root_context);
+      not_found_test2 (root_context);
+      not_found_test3 (root_context);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Exceptions test");
+      ex._tao_print_exception (
+        "Unexpected exception in Exceptions test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 void
-Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
-                                    ACE_ENV_ARG_DECL)
+Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (0);
 
-      root_context->resolve (test_name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->resolve (test_name);
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, ex)
+  catch (const CosNaming::NamingContext::InvalidName&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "InvalidName exception works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
-                                     ACE_ENV_ARG_DECL)
+Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound exception (case 1) works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
-                                      ACE_ENV_ARG_DECL)
+Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (2);
       test_name[0].id = CORBA::string_dup ("level1_context");
       test_name[1].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  catch (const CosNaming::NamingContext::AlreadyBound&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound  exception (case 2) works properly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
-                                 ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -828,12 +702,10 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("level2_context");
       test_name[2].id = CORBA::string_dup ("bar");
 
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::missing_node &&
           ex.rest_of_name.length () == 1
@@ -846,20 +718,17 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
                     "NotFound  exception (case 1)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -867,12 +736,10 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("level3_context");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::missing_node
           && ex.rest_of_name.length () == 2
@@ -887,21 +754,18 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
                     "NotFound  exception (case 2)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
+Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context)
 {
-  ACE_TRY
+  try
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -909,11 +773,10 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("foo");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_context->unbind (test_name);
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n"));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
       if (ex.why == CosNaming::NamingContext::not_context
           && ex.rest_of_name.length () == 2
@@ -928,27 +791,22 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
                     "NotFound  exception (case 3)"
                     " - parameters aren't set correctly\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
 Iterator_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Instantiate four dummy objects.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       // Bind objects to the naming context.
       CosNaming::Name name1;
@@ -964,30 +822,20 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       name4.length (1);
       name4[0].id = CORBA::string_dup ("foo4");
       root_context->bind (name1,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       root_context->bind (name2,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       root_context->bind (name3,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
       root_context->bind (name4,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          obj.in ());
 
       // List the content of the Naming Context.
       CosNaming::BindingIterator_var iter;
       CosNaming::BindingList_var bindings_list;
       root_context->list (1,
                           bindings_list.out (),
-                          iter.out ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          iter.out ());
       if (CORBA::is_nil (iter.in ())
           || bindings_list->length () != 1
           || bindings_list[0u].binding_type != CosNaming::nobject)
@@ -1000,9 +848,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // Invoke operations on the iterator.
       CosNaming::Binding_var binding;
-      iter->next_one (binding.out ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      iter->next_one (binding.out ());
       if (binding->binding_type != CosNaming::nobject)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::next_one does not function properly\n"),
@@ -1011,8 +857,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
                   "Second binding: %s\n",
                   binding->binding_name[0].id.in ()));
 
-      iter->next_n (2, bindings_list.out () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      iter->next_n (2, bindings_list.out ());
       if (bindings_list->length () != 2
           || bindings_list[0u].binding_type != CosNaming::nobject
           || bindings_list[1u].binding_type != CosNaming::nobject)
@@ -1027,23 +872,19 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // We already iterated over all the bindings, so the following
       // should return false.
-      CORBA::Boolean result = iter->next_one (binding.out ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean result = iter->next_one (binding.out ());
       if (result)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::BindingIterator does not function properly\n"),
                           -1);
-      iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      iter->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Iterator test");
+      ex._tao_print_exception (
+        "Unexpected exception in Iterator test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -1051,92 +892,71 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 int
 Destroy_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a context and bind an object under it.
 
       CosNaming::NamingContext_var my_context;
-      my_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_context = root_context->new_context ();
 
       // Bind a dummy object foo under my_context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_Object_var obj = impl->_this ();
+      impl->_remove_ref ();
 
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       my_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            obj.in ());
 
       // Do the testing.
-      not_empty_test (my_context
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      my_context->unbind (object_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      my_context->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      not_exist_test (my_context
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      not_empty_test (my_context);
+
+      my_context->unbind (object_name);
+      my_context->destroy ();
+
+      not_exist_test (my_context);
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Destroy test");
+      ex._tao_print_exception (
+        "Unexpected exception in Destroy test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 void
-Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
+Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref)
 {
-  ACE_TRY
+  try
     {
-      ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ref->destroy ();
     }
 
-  ACE_CATCH (CosNaming::NamingContext::NotEmpty, ex)
+  catch (const CosNaming::NamingContext::NotEmpty&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "NotEmpty exception works properly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
+Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref)
 {
-  ACE_TRY
+  try
     {
-      ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ref->destroy ();
     }
 
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Destroy works properly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
@@ -1153,8 +973,7 @@ Persistent_Test_Begin::~Persistent_Test_Begin (void)
 int
 Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a name structure we will reuse.
       CosNaming::Name test_name;
@@ -1163,21 +982,16 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 
       // Create and bind a naming context under the <root> context.
       CosNaming::NamingContext_var level1_context =
-        root_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->bind_new_context (test_name);
 
       // Create and bind a naming context under <level1> context.
       test_name[0].id = CORBA::string_dup ("level2");
       CosNaming::NamingContext_var level2_context =
-        level1_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        level1_context->bind_new_context (test_name);
 
       // Log the ior of <level1_context> for use by <Persistent_Test_End>.
       CORBA::String_var ior =
-        orb_->object_to_string (level1_context.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (level1_context.in ());
 
       ACE_OS::fprintf (this->file_,
                        "%s",
@@ -1186,14 +1000,12 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 
       ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 1) OK.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 1)");
+      ex._tao_print_exception (
+        "Unexpected exception in Persistent Test (part 1)");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -1212,8 +1024,7 @@ Persistent_Test_End::~Persistent_Test_End (void)
 int
 Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Create a name structure we will reuse.
       CosNaming::Name test_name;
@@ -1223,12 +1034,10 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       // Convert stringified ior we got from <Persistent_Test_Begin>
       // for <level1> Naming Context to Naming Context reference.
       CORBA::Object_var obj =
-        orb_->string_to_object (ior_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->string_to_object (ior_);
 
       CosNaming::NamingContext_var level1_context =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (obj.in ());
 
       if (CORBA::is_nil (level1_context.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -1237,8 +1046,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 
       //  Resolve for <level2> context through the persistent ior we
       // got from part 1 of this test.
-      obj = level1_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = level1_context->resolve (test_name);
 
       // Now, resolve for <level2> context using the <root> context
       // reference which we obtained through <resolve_initial_references>.
@@ -1246,21 +1054,18 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       test_name[0].id = CORBA::string_dup ("level1");
       test_name[1].id = CORBA::string_dup ("level2");
       CORBA::Object_var obj2 =
-        root_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_context->resolve (test_name);
 
       // Make sure we got the same answer through both methods.
       if (obj2->_is_equivalent (obj.in ()))
         ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 2) OK.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 2)");
+      ex._tao_print_exception (
+        "Unexpected exception in Persistent Test (part 2)");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index e8fe27385c1..2850fe0e090 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -171,18 +171,12 @@ private:
   // the following functions isolate specific tests due to the
   // limitation of only 1 TAO_TRY being allowed per function.
 
-  void invalid_name_test (TAO_Naming_Client &root_context
-                          ACE_ENV_ARG_DECL);
-  void already_bound_test (TAO_Naming_Client &root_context
-                           ACE_ENV_ARG_DECL);
-  void already_bound_test2 (TAO_Naming_Client &root_context
-                            ACE_ENV_ARG_DECL);
-  void not_found_test (TAO_Naming_Client &root_context
-                       ACE_ENV_ARG_DECL);
-  void not_found_test2 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
-  void not_found_test3 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
+  void invalid_name_test (TAO_Naming_Client &root_context);
+  void already_bound_test (TAO_Naming_Client &root_context);
+  void already_bound_test2 (TAO_Naming_Client &root_context);
+  void not_found_test (TAO_Naming_Client &root_context);
+  void not_found_test2 (TAO_Naming_Client &root_context);
+  void not_found_test3 (TAO_Naming_Client &root_context);
 };
 
 class Destroy_Test : public Naming_Test
@@ -205,10 +199,8 @@ public:
 
 private:
   // = The following functions isolate specific tests.
-  void not_empty_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
-  void not_exist_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
+  void not_empty_test (CosNaming::NamingContext_var &ref);
+  void not_exist_test (CosNaming::NamingContext_var &ref);
 };
 
 class Persistent_Test_Begin : public Naming_Test
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 9a8d23a4996..da3b881bd0f 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -33,21 +33,18 @@ Client_i::test_for_secure_universal_time (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosTime::UTO_var UTO_server =
-           this->clerk_->secure_universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
+           this->clerk_->secure_universal_time ();
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) test_for_secure_universal_time() successful !!\n"));
         }
-  ACE_ENDTRY;
 }
 
 // The following test retrieves the current universal time as a UTO
@@ -58,13 +55,11 @@ Client_i::test_for_universal_time (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosTime::UTO_var UTO_server =
-        this->clerk_->universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->clerk_->universal_time ();
 
-      ACE_TRY_CHECK;
 
 #ifndef ACE_LACKS_LONGLONG_T
       ACE_DEBUG ((LM_DEBUG,
@@ -90,15 +85,13 @@ Client_i::test_for_universal_time (void)
                   (UTO_server->utc_time ()).tdf));
 #endif
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error:");
+      ex._tao_print_exception ("Error:");
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) test_for_universal_time()\n"));
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -111,31 +104,27 @@ Client_i::test_for_new_universal_time (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_universal_time()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosTime::UTO_var UTO_server = this->clerk_->new_universal_time (time,
                                                                       inaccuracy,
-                                                                      tdf
-                                                                      ACE_ENV_ARG_PARAMETER);
-
-      ACE_ASSERT (UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER) == 999999999);
-      ACE_ASSERT (UTO_server->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER) == 9999);
-      ACE_ASSERT (UTO_server->tdf (ACE_ENV_SINGLE_ARG_PARAMETER) == 99);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacchi == 0);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacclo == 9999);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
-
-      ACE_TRY_CHECK;
+                                                                      tdf);
+
+      ACE_ASSERT (UTO_server->time () == 999999999);
+      ACE_ASSERT (UTO_server->inaccuracy () == 9999);
+      ACE_ASSERT (UTO_server->tdf () == 99);
+      ACE_ASSERT ((UTO_server->utc_time ()).time == 999999999);
+      ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 0);
+      ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 9999);
+      ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
+
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) Test new_universal_time () fails.\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception :\n");
+      ex._tao_print_exception ("Exception :\n");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -151,34 +140,29 @@ Client_i::test_for_uto_from_utc (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing uto_from_utc ()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct
-                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct);
 
       TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi;
       inaccuracy <<= 32;
       inaccuracy |= utc_struct.inacclo;
 
-      ACE_ASSERT (UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER) == 999999999);
-      ACE_ASSERT (UTO_server->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER) == inaccuracy);
-      ACE_ASSERT (UTO_server->tdf (ACE_ENV_SINGLE_ARG_PARAMETER) == 99);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacclo == 50);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacchi == 50);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
+      ACE_ASSERT (UTO_server->time () == 999999999);
+      ACE_ASSERT (UTO_server->inaccuracy () == inaccuracy);
+      ACE_ASSERT (UTO_server->tdf () == 99);
+      ACE_ASSERT ((UTO_server->utc_time ()).time == 999999999);
+      ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 50);
+      ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 50);
+      ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) Test uto_from_utc () fails.\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception :\n");
+      ex._tao_print_exception ("Exception :\n");
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -190,25 +174,21 @@ Client_i::test_for_new_interval (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_interval ()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CosTime::TIO_var TIO_server = this->clerk_->new_interval (lower,
-                                                                upper
-                                                                ACE_ENV_ARG_PARAMETER);
+                                                                upper);
 
-      ACE_ASSERT ((TIO_server->time_interval (ACE_ENV_SINGLE_ARG_PARAMETER)).lower_bound == 666666666);
-      ACE_ASSERT ((TIO_server->time_interval (ACE_ENV_SINGLE_ARG_PARAMETER)).upper_bound == 999999999);
+      ACE_ASSERT ((TIO_server->time_interval ()).lower_bound == 666666666);
+      ACE_ASSERT ((TIO_server->time_interval ()).upper_bound == 999999999);
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "[CLIENT] Process/Thread Id : (%P/%t) Test new_interval () fails.\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception :\n");
+      ex._tao_print_exception ("Exception :\n");
     }
-  ACE_ENDTRY;
 
   return;
 }
@@ -328,9 +308,8 @@ Client_i::~Client_i (void)
 int
 Client_i::obtain_initial_references (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the naming services.
       if (my_name_client_.init (orb_.in ()) != 0)
@@ -359,13 +338,9 @@ Client_i::obtain_initial_references (void)
                   name));
 
       CORBA::Object_var temp_object =
-        my_name_client_->resolve (clerk_name
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        my_name_client_->resolve (clerk_name);
 
-      clerk_ = CosTime::TimeService::_narrow (temp_object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      clerk_ = CosTime::TimeService::_narrow (temp_object.in ());
 
       if (CORBA::is_nil (clerk_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -373,12 +348,12 @@ Client_i::obtain_initial_references (void)
                            "Clerk Reference\n"),
                            -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client :: obtain_initial_references\n");
+      ex._tao_print_exception (
+        "Client :: obtain_initial_references\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -392,16 +367,13 @@ Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    0);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -413,9 +385,7 @@ Client_i::init (int argc, char **argv)
           // option or a file.
 
           CORBA::Object_var server_object =
-          this->orb_->string_to_object (this->ior_
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->string_to_object (this->ior_);
 
           if (CORBA::is_nil (server_object.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -423,13 +393,10 @@ Client_i::init (int argc, char **argv)
                                this->ior_),
                               -1);
           this->clerk_ =
-            CosTime::TimeService::_narrow (server_object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CosTime::TimeService::_narrow (server_object.in ());
 
           ACE_DEBUG ((LM_DEBUG,
                       "[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n"));
-          ACE_TRY_CHECK;
         }
       else
         { // No IOR specified. Use the Naming Service
@@ -439,15 +406,13 @@ Client_i::init (int argc, char **argv)
           if (this->obtain_initial_references () == -1)
             return -1;
 
-          ACE_TRY_CHECK;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init\n");
+      ex._tao_print_exception ("Client_i::init\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 7245e7ddcdf..e2a7d1997bf 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -8,19 +8,16 @@ ACE_RCSID(Trading, Offer_Exporter, "$Id$")
 
 TAO_Offer_Exporter::
 TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
-                    CORBA::Boolean verbose
-                    ACE_ENV_ARG_DECL)
+                    CORBA::Boolean verbose)
   ACE_THROW_SPEC ((CORBA::SystemException))
     : verbose_ (verbose)
 {
   // Initialize the offer sequences and structures.
-  this->create_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->create_offers ();
 
   // Obtain the necessary trading service interfaces.
-  this->register_ = lookup_if->register_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  this->admin_ = lookup_if->admin_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-  // ACE_CHECK;
+  this->register_ = lookup_if->register_if ();
+  this->admin_ = lookup_if->admin_if ();
 }
 
 TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
@@ -34,7 +31,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
 }
 
 void
-TAO_Offer_Exporter::export_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::export_offers (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -55,13 +52,11 @@ TAO_Offer_Exporter::export_offers (ACE_ENV_SINGLE_ARG_DECL)
       this->props_fs_[i][4].value <<= "Default";
     }
 
-  this->export_to (this->register_.in () ACE_ENV_ARG_PARAMETER);
-  // ACE_CHECK;
+  this->export_to (this->register_.in ());
 }
 
 void
-TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
-                               ACE_ENV_ARG_DECL)
+TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
@@ -73,47 +68,38 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
                    CosTrading::MissingMandatoryProperty,
                    CosTrading::DuplicatePropertyName))
 {
-  ACE_TRY
+  try
     {
       for (int i = 0; i < NUM_OFFERS; i++)
         {
-          CORBA::Object_ptr offer_obj= this->plotter_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::Object_ptr offer_obj= this->plotter_[i]._this ();
 
           CosTrading::OfferId_var offer_id =
             reg->_cxx_export (offer_obj,
                               TT_Info::INTERFACE_NAMES[1],
-                              this->props_plotters_[i]
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                              this->props_plotters_[i]);
 
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_obj = this->printer_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          offer_obj = this->printer_[i]._this ();
 
           offer_id = reg->_cxx_export (offer_obj,
                                        TT_Info::INTERFACE_NAMES[2],
-                                       this->props_printers_[i]
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       this->props_printers_[i]);
 
           if (this->verbose_)
             {
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_obj = this->fs_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          offer_obj = this->fs_[i]._this ();
 
           offer_id = reg->_cxx_export (offer_obj,
                                        TT_Info::INTERFACE_NAMES[3],
-                                       this->props_fs_[i]
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK
+                                       this->props_fs_[i]);
 
           if (this->verbose_)
             {
@@ -121,17 +107,16 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::export_offers");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::export_offers");
+      throw;
     }
-  ACE_ENDTRY;
-  // ACE_CHECK;
 }
 
 void
-TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::export_offers_to_all (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
@@ -150,8 +135,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
       ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
     }
 
-  CosTrading::Link_var link_if = this->register_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosTrading::Link_var link_if = this->register_->link_if ();
 
   if (this->verbose_)
     {
@@ -159,8 +143,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
                   " linked to the root trader.\n"));
     }
 
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links ();
 
   if (this->verbose_)
       {
@@ -170,7 +153,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
 
   for (CORBA::ULong i = link_name_seq->length () - 1; i > 0; i--)
     {
-      ACE_TRY
+      try
         {
           if (this->verbose_)
             {
@@ -179,8 +162,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
             }
 
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            link_if->describe_link (link_name_seq[i]);
 
           for (int j = 0; j < NUM_OFFERS; j++)
             {
@@ -195,20 +177,18 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
                           static_cast<const char*> (link_name_seq[i])));
             }
 
-          this->export_to (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->export_to (link_info->target_reg.in ());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // @@ IGNORE??
         }
-      ACE_ENDTRY;
     }
 }
 
 
 void
-TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::withdraw_offers (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -216,33 +196,31 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing all offers.\n"));
 
-  ACE_TRY
+  try
     {
       CORBA::ULong length;
 
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
 
       if (offer_id_seq.ptr () != 0)
         {
           length = offer_id_seq->length ();
           for (CORBA::ULong i = 0; i < length; i++)
             {
-              this->register_->withdraw (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->register_->withdraw (offer_id_seq[i]);
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::withdraw_offers");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::withdraw_offers");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::describe_offers (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -250,11 +228,10 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Describing all offers.\n"));
 
-  ACE_TRY
+  try
     {
       CORBA::ULong length;
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
 
       if (offer_id_seq.ptr () != 0)
         {
@@ -266,30 +243,28 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
           for (CORBA::ULong i = 0; i < length; i++)
             {
               CosTrading::Register::OfferInfo_var offer_info =
-                this->register_->describe (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                this->register_->describe (offer_id_seq[i]);
 
               if (this->verbose_)
                 {
                   ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i]));
                   ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ()));
-                  TT_Info::dump_properties (offer_info->properties, 0 ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TT_Info::dump_properties (offer_info->properties, 0);
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
                 }
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::describe_offers");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::describe_offers");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::modify_offers (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented,
                    CosTrading::IllegalOfferId,
@@ -305,10 +280,9 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Modifying all offers.\n"));
 
-  ACE_TRY
+  try
     {
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids ();
 
       if (offer_id_seq.ptr () != 0)
         {
@@ -328,23 +302,21 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
             {
               this->register_->modify (offer_id_seq[i],
                                        del_list,
-                                       modify_list
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       modify_list);
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Exporter::modify_offers");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::modify_offers");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_Offer_Exporter::
-withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
+withdraw_offers_using_constraints (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -359,37 +331,30 @@ withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "Constraint: %s\n", constraint));
 
-  ACE_TRY
+  try
     {
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER],
-                                   constraint
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   constraint);
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER],
-                                   constraint
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   constraint);
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM],
-                                   constraint
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   constraint);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Offer_Exporter::withdraw_using_constraint");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Exporter::withdraw_using_constraint");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 CosTrading::OfferIdSeq*
-TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::grab_offerids (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
@@ -397,16 +362,14 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
     ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n"));
 
   CosTrading::OfferIdSeq *offer_id_seq;
-  ACE_TRY
+  try
     {
       CORBA::ULong length = NUM_OFFERS;
       CosTrading::OfferIdIterator_ptr offer_id_iter;
 
       this->admin_->list_offers (NUM_OFFERS,
                                  CosTrading::OfferIdSeq_out (offer_id_seq),
-                                 CosTrading::OfferIdIterator_out (offer_id_iter)
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                 CosTrading::OfferIdIterator_out (offer_id_iter));
 
       if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0)
         {
@@ -418,9 +381,7 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
             {
               any_left =
                 offer_id_iter->next_n (length,
-                                       CosTrading::OfferIdSeq_out (id_seq)
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                       CosTrading::OfferIdSeq_out (id_seq));
 
               int offers = id_seq->length ();
               int old_length = offer_id_seq->length ();
@@ -433,8 +394,7 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
             }
           while (any_left);
 
-          offer_id_iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          offer_id_iter->destroy ();
         }
 
       if (this->verbose_)
@@ -444,21 +404,18 @@ TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
             ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *)(*offer_id_seq)[j]));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Offer_Exporter::grab_offerids");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_Offer_Exporter::grab_offerids");
+      throw;
     }
-  ACE_ENDTRY;
   // @@ redundant.
-  //  ACE_CHECK_RETURN (offer_id_seq);
 
   return offer_id_seq;
 }
 
 void
-TAO_Offer_Exporter::create_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Offer_Exporter::create_offers (void)
 {
   const int QUEUE_SIZE = 4;
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index 63389ae3a79..f31142f193b 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -25,13 +25,12 @@ class TAO_TTest_Export TAO_Offer_Exporter
 public:
 
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
-                      CORBA::Boolean verbose
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Boolean verbose)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ~TAO_Offer_Exporter (void);
 
-  void export_offers (ACE_ENV_SINGLE_ARG_DECL)
+  void export_offers (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -44,7 +43,7 @@ public:
                      CosTrading::DuplicatePropertyName));
   // Export a number of offers to the Trading Service.
 
-  void export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
+  void export_offers_to_all (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -58,21 +57,21 @@ public:
   // Export a number of offers to all traders accessible by the
   // bootstrapped trader.
 
-  void withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
+  void withdraw_offers (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
   // Withdraw all exported offers.
 
-  void describe_offers (ACE_ENV_SINGLE_ARG_DECL)
+  void describe_offers (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
   // Describe all the offers registered with the bootstrapped trader.
 
-  void modify_offers (ACE_ENV_SINGLE_ARG_DECL)
+  void modify_offers (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
@@ -87,7 +86,7 @@ public:
                      CosTrading::DuplicatePropertyName));
   // Remove some properties and change some properties in each offer.
 
-  void withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
+  void withdraw_offers_using_constraints (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -97,15 +96,14 @@ public:
 
 private:
 
-  CosTrading::OfferIdSeq* grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
+  CosTrading::OfferIdSeq* grab_offerids (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
-  void create_offers (ACE_ENV_SINGLE_ARG_DECL);
+  void create_offers (void);
   // Fill in each of the offer structures.
 
-  void export_to (CosTrading::Register_ptr reg
-                  ACE_ENV_ARG_DECL)
+  void export_to (CosTrading::Register_ptr reg)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 13f5084d1f6..c2f2049c714 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -12,7 +12,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
 }
 
 void
-TAO_Offer_Importer::perform_queries (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Importer::perform_queries (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -34,12 +34,11 @@ TAO_Offer_Importer::perform_queries (ACE_ENV_SINGLE_ARG_DECL)
   policies.return_card (16*NUM_OFFERS);
   policies.link_follow_rule (CosTrading::always);
 
-  this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
-  // ACE_CHECK;
+  this->perform_queries_with_policies (policies);
 }
 
 void
-TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Importer::perform_directed_queries (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -63,16 +62,14 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
 
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
-  CosTrading::Link_var link_if = this->lookup_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosTrading::Link_var link_if = this->lookup_->link_if ();
 
   if (this->verbose_)
     {
       ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
                   " linked to the root trader.\n"));
     }
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links ();
 
   if (link_name_seq->length () > 0)
     {
@@ -83,15 +80,12 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
         }
 
       CosTrading::Link::LinkInfo_var link_info =
-        link_if->describe_link (link_name_seq[0u] ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        link_if->describe_link (link_name_seq[0u]);
 
       CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
-      CosTrading::Link_var link_if2 = lookup_if->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CosTrading::Link_var link_if2 = lookup_if->link_if ();
 
-      CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links ();
 
       if (link_name_seq2->length () > 0)
         {
@@ -117,8 +111,7 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
               policies.starting_trader (new CosTrading::TraderName
                                         (2, 2, trader_name, 1));
 
-              this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              this->perform_queries_with_policies (policies);
             }
         }
       else
@@ -138,7 +131,6 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Offer_Importer::perform_queries_with_policies (
     const TAO_Policy_Creator& policies
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
@@ -152,7 +144,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
                    CosTrading::DuplicatePropertyName,
                    CosTrading::DuplicatePolicyName))
 {
-  ACE_TRY
+  try
     {
       CosTrading::Lookup::SpecifiedProps desired_props;
 
@@ -189,9 +181,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
                                 8,
                                 offer_seq_out,
                                 offer_iterator_out,
-                                limits_applied_out
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                limits_applied_out);
 
           CosTrading::OfferSeq_var offer_seq (offer_seq_ptr);
           CosTrading::OfferIterator_var offer_iterator (offer_iterator_ptr);
@@ -201,9 +191,7 @@ TAO_Offer_Importer::perform_queries_with_policies (
             {
               ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n"));
               this->display_results (*offer_seq_ptr,
-                                     offer_iterator_ptr
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                     offer_iterator_ptr);
 
               if (limits_applied_out->length () > 0)
                 ACE_DEBUG ((LM_DEBUG, "*** Limits Applied:\n\n"));
@@ -217,21 +205,20 @@ TAO_Offer_Importer::perform_queries_with_policies (
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::perform_queries");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Importer::perform_queries");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
-                                     CosTrading::OfferIterator_ptr offer_iterator
-                                     ACE_ENV_ARG_DECL) const
+                                     CosTrading::OfferIterator_ptr offer_iterator) const
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::ULong length = 0, i = 0;
       ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
@@ -241,15 +228,11 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
         {
           // Call back to the exported object.
           TAO_Trader_Test::Remote_Output_var remote_output =
-            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ());
 
-          remote_output->confirm (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          remote_output->confirm ();
 
-          TT_Info::dump_properties (offer_seq[i].properties, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          TT_Info::dump_properties (offer_seq[i].properties, 1);
           ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
         }
 
@@ -266,39 +249,32 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
               CosTrading::OfferSeq_out iter_offers_out (iter_offers_ptr);
 
               any_left = offer_iterator->next_n (length,
-                                                 iter_offers_out
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                 iter_offers_out);
 
               CosTrading::OfferSeq_var iter_offers (iter_offers_ptr);
               for (length = iter_offers->length (), i = 0; i < length; i++)
                 {
                   // Call back to the exported object.
                   TAO_Trader_Test::Remote_Output_var remote_output =
-                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ());
 
-                  remote_output->confirm (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  remote_output->confirm ();
 
                   CosTrading::PropertySeq& props = iter_offers[i].properties;
-                  TT_Info::dump_properties (props, 1 ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  TT_Info::dump_properties (props, 1);
 
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
                 }
 
             } while (any_left);
 
-          offer_iterator->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          offer_iterator->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Offer_Importer::display_results");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Offer_Importer::display_results");
+      throw;
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 2a5e78885b3..74b47228d6a 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -33,7 +33,7 @@ public:
   TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose = 1);
 
-  void perform_queries (ACE_ENV_SINGLE_ARG_DECL)
+  void perform_queries (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -47,7 +47,7 @@ public:
                      CosTrading::DuplicatePolicyName));
   // Barrage the bootstrapped-to trader with queries.
 
-  void perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
+  void perform_directed_queries (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -64,8 +64,7 @@ public:
 
 private:
 
-  void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager
-                                      ACE_ENV_ARG_DECL)
+  void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -81,8 +80,7 @@ private:
   // pass in <policy_manager>.
 
   void display_results (const CosTrading::OfferSeq& offer_seq,
-                        CosTrading::OfferIterator_ptr offer_iterator
-                        ACE_ENV_ARG_DECL) const
+                        CosTrading::OfferIterator_ptr offer_iterator) const
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Display the results of the query to the screen.
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 282c96ae920..ad62f462b2e 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -6,27 +6,23 @@ ACE_RCSID(Trading, Service_Type_Exporter, "$Id$")
 
 TAO_Service_Type_Exporter::
 TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
-                           CORBA::Boolean verbose
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Boolean verbose)
     ACE_THROW_SPEC ((CORBA::SystemException))
   : verbose_ (verbose),
     lookup_ (lookup_if)
 {
   // Obtain the Service Type Repository.
-  CosTrading::TypeRepository_var obj = lookup_if->type_repos (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosTrading::TypeRepository_var obj = lookup_if->type_repos ();
 
   // Narrow the Service Type Repository.
-  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in ());
 
   // Build the service type descriptions.
   this->create_types ();
 }
 
 void
-TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::remove_all_types (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -37,12 +33,11 @@ TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
 
   for (int i = NUM_TYPES - 1; i >= 0; i--)
     {
-      ACE_TRY
+      try
         {
-          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i]);
         }
-      ACE_CATCH (CosTrading::UnknownServiceType, excp)
+      catch (const CosTrading::UnknownServiceType& excp)
         {
           if (this->verbose_)
             {
@@ -51,18 +46,16 @@ TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
             }
 
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_Service_Type_Exporter::remove_all_types");
+          ex._tao_print_exception (
+            "TAO_Service_Type_Exporter::remove_all_types");
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::add_all_types (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -76,12 +69,11 @@ TAO_Service_Type_Exporter::add_all_types (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "adding all types to the Repository.\n"));
-  this->add_all_types_to (this->repos_.in () ACE_ENV_ARG_PARAMETER);
-  // ACE_CHECK;
+  this->add_all_types_to (this->repos_.in ());
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::add_all_types_to_all (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -96,57 +88,47 @@ TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
               "add all types to all repositories.\n"));
 
   ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
-  CosTrading::Link_var link_if = this->lookup_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosTrading::Link_var link_if = this->lookup_->link_if ();
 
   ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
               " linked to the root trader.\n"));
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links ();
 
   ACE_DEBUG ((LM_DEBUG, "Exporting service types with each of the linked"
               " traders.\n"));
   for (CORBA::ULong i = link_name_seq->length () - 1; i > 0; i--)
     {
       CosTradingRepos::ServiceTypeRepository_ptr str = 0;
-      ACE_TRY
+      try
         {
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
                       static_cast<const char*> (link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            link_if->describe_link (link_name_seq[i]);
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
                       static_cast<const char*> (link_name_seq[i])));
 
           CosTrading::TypeRepository_var remote_repos =
-            link_info->target->type_repos (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            link_info->target->type_repos ();
 
           str =
-            CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ());
 
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // @@ Seth, Ignore all these exceptions?
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
 
       // @@ Seth, But this one?
-      this->add_all_types_to (str ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->add_all_types_to (str);
     }
 }
 
 void
 TAO_Service_Type_Exporter::
-add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
-                  ACE_ENV_ARG_DECL)
+add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -159,54 +141,55 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
 {
   for (int i = 0; i < NUM_TYPES; i++)
     {
-      ACE_TRY
+      try
         {
           repos->add_type (TT_Info::INTERFACE_NAMES[i],
                            this->type_structs_[i].if_name,
                            this->type_structs_[i].props,
-                           this->type_structs_[i].super_types
-                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                           this->type_structs_[i].super_types);
         }
-      ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, ste)
+      catch (
+        const CosTradingRepos::ServiceTypeRepository::ServiceTypeExists& ste)
         {
-          ACE_PRINT_EXCEPTION (ste, "TAO_Service_Type_Exporter::add_all_types");
+          ste._tao_print_exception (
+            "TAO_Service_Type_Exporter::add_all_types");
 
           if (ste.name.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Invalid name: %s\n", ste.name.in ()));
         }
-      ACE_CATCH (CosTrading::IllegalPropertyName, excp)
+      catch (const CosTrading::IllegalPropertyName& excp)
         {
-          ACE_PRINT_EXCEPTION (excp, "TAO_Service_Type_Exporter::add_all_types");
+          excp._tao_print_exception (
+            "TAO_Service_Type_Exporter::add_all_types");
 
           if (excp.name.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Invalid name: %s\n", excp.name.in ()));
         }
-      ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition, vtr)
+      catch (
+        const CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition& vtr)
         {
-          ACE_PRINT_EXCEPTION (vtr, "TAO_Service_Type_Exporter::add_all_types");
+          vtr._tao_print_exception (
+            "TAO_Service_Type_Exporter::add_all_types");
 
           if (vtr.type_1.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Type One: %s\n", vtr.type_2.in ()));
           if (vtr.type_2.in () != 0)
             ACE_DEBUG ((LM_DEBUG, "Type Two: %s\n", vtr.type_2.in ()));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_Service_Type_Exporter::add_all_types");
-          ACE_RE_THROW;
+          ex._tao_print_exception (
+            "TAO_Service_Type_Exporter::add_all_types");
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 void
-TAO_Service_Type_Exporter::list_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::list_all_types (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes sst;
       ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
@@ -214,8 +197,7 @@ TAO_Service_Type_Exporter::list_all_types (ACE_ENV_SINGLE_ARG_DECL)
 
       sst.all_ (1);
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var type_names =
-        this->repos_->list_types (sst ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->repos_->list_types (sst);
 
       CORBA::ULong l = type_names->length ();
       for (CORBA::ULong i = 0; i != l; ++i)
@@ -228,23 +210,20 @@ TAO_Service_Type_Exporter::list_all_types (ACE_ENV_SINGLE_ARG_DECL)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Service_Type_Exporter::list_all_types");
-      ACE_RE_THROW;
+      ex._tao_print_exception ("TAO_Service_Type_Exporter::list_all_types");
+      throw;
     }
-  ACE_ENDTRY;
-  // ACE_CHECK;
 }
 
 void
-TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::describe_all_types (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
                   "describing all types in the Repository.\n"));
@@ -252,9 +231,7 @@ TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]);
 
           if (this->verbose_)
             {
@@ -263,22 +240,21 @@ TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Service_Type_Exporter::describe_all_types");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Service_Type_Exporter::describe_all_types");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_Service_Type_Exporter::fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::fully_describe_all_types (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
                   "fully describing all types in the Repository.\n"));
@@ -286,9 +262,7 @@ TAO_Service_Type_Exporter::fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]);
 
           if (this->verbose_)
             {
@@ -297,13 +271,12 @@ TAO_Service_Type_Exporter::fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_Service_Type_Exporter::fully_describe_all_types");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "TAO_Service_Type_Exporter::fully_describe_all_types");
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index a4a0e011e77..c11ae36f505 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -24,18 +24,17 @@ class TAO_TTest_Export TAO_Service_Type_Exporter
 public:
 
   TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
-                             CORBA::Boolean verbose
-                             ACE_ENV_ARG_DECL)
+                             CORBA::Boolean verbose)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
+  void remove_all_types (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::HasSubTypes));
   // Remove all service types from the trading service instance.
 
-  void add_all_types (ACE_ENV_SINGLE_ARG_DECL)
+  void add_all_types (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -47,7 +46,7 @@ public:
                      CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
   // Add all the generated service types to the trading service instance.
 
-  void add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
+  void add_all_types_to_all (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -60,19 +59,19 @@ public:
   // Add all the generated service types to all the trading service
   // instances linked to the trading service we bootstrapped to.
 
-  void list_all_types (ACE_ENV_SINGLE_ARG_DECL)
+  void list_all_types (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // List all the service types registered with the trading service
   // instance.
 
-  void describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
+  void describe_all_types (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType));
   // Describe all the service types registered with the trading
   // service instance.
 
-  void fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
+  void fully_describe_all_types (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -85,8 +84,7 @@ private:
   void create_types (void);
   // Generate the service type description structures.
 
-  void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
-                         ACE_ENV_ARG_DECL)
+  void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index c28feb6e4f3..b907db37a75 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -16,8 +16,7 @@ TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
 template <class T> CORBA::Any*
 TAO_Simple_Dynamic_Property<T>::evalDP (const char*,
                                         CORBA::TypeCode_ptr,
-                                        const CORBA::Any&
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        const CORBA::Any&)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* return_value = 0;
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 0f7e395b8f5..d9b455df004 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -33,7 +33,7 @@ public:
   virtual CORBA::Any* evalDP (const char* /* name */,
                               CORBA::TypeCode_ptr /* returned_type */,
                               const CORBA::Any& /* extra_info */
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              )
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
 private:
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 8c353be3664..f1bc1fcf674 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -143,8 +143,7 @@ const char* TT_Info::QUERIES[][3] =
 
 void
 TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
-                          CORBA::Boolean print_dynamic
-                          ACE_ENV_ARG_DECL)
+                          CORBA::Boolean print_dynamic)
 {
   TAO_Property_Evaluator prop_eval (prop_seq);
 
@@ -154,15 +153,13 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
       CORBA::Any* value = 0;
       CORBA::TypeCode_ptr tc = 0;
       ACE_DEBUG ((LM_DEBUG, "%-15s: ", prop_seq[k].name.in ()));
-      ACE_TRY
+      try
         {
           CORBA::Boolean is_dynamic = prop_eval.is_dynamic_property (k);
-          ACE_TRY_CHECK;
 
           if (print_dynamic || ! is_dynamic)
             {
-              value = prop_eval.property_value(k ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              value = prop_eval.property_value(k);
 
               tc = value->type ();
             }
@@ -171,18 +168,15 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
               ACE_DEBUG ((LM_DEBUG, "Dynamic Property\n"));
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // @@ Seth, don't pass the exceptions back?
           ACE_DEBUG ((LM_DEBUG, "Error retrieving property value.\n"));
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
 
       if (tc == 0)
         continue;
-      int check = tc->equal (TAO_Trader_Test::_tc_StringSeq ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      int check = tc->equal (TAO_Trader_Test::_tc_StringSeq);
 
       if (check)
         {
@@ -196,8 +190,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
         }
       else
         {
-          check = tc->equal (TAO_Trader_Test::_tc_ULongSeq ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          check = tc->equal (TAO_Trader_Test::_tc_ULongSeq);
 
           if (check)
             {
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index de4935df75c..76fdc207e07 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -16,8 +16,7 @@ class TAO_TTest_Export TT_Info
 public:
 
   static void dump_properties (const CosTrading::PropertySeq& prop_seq,
-                               CORBA::Boolean print_dynamic = 1
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                               CORBA::Boolean print_dynamic = 1);
   // Dump the contents of this property sequence.
 
   enum INTERFACES
@@ -38,7 +37,7 @@ public:
 
     Remote_Output (void) {}
 
-    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (void)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -51,7 +50,7 @@ public:
 
     Printer (void) {}
 
-    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (void)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -63,7 +62,7 @@ public:
   public:
     Plotter (void) {}
 
-    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (void)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -75,7 +74,7 @@ public:
   public:
     File_System (void) {}
 
-    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (void)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -87,7 +86,7 @@ public:
   public:
     PostScript_Printer (void) {}
 
-    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (void)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 67d9232a315..2a7ed294e0f 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -31,11 +31,10 @@ parse_args (int argc, char *argv[],
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_manager.init (argc, argv);
 
       // Command line argument interpretation.
       CORBA::Boolean verbose = 0;
@@ -51,83 +50,61 @@ main (int argc, char** argv)
       TAO_Trading_Components_i& trd_comp = trader->trading_components ();
 
       // Set the service type repository
-      sup_attr.type_repos (type_repos._this (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+      sup_attr.type_repos (type_repos._this ());
 
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
       TAO_Service_Type_Exporter type_exporter
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
-         verbose
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         verbose);
 
-      type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.remove_all_types ();
 
-      type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.add_all_types ();
 
-      type_exporter.list_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.list_all_types ();
 
-      type_exporter.describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.describe_all_types ();
 
-      type_exporter.fully_describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.fully_describe_all_types ();
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
       TAO_Offer_Exporter offer_exporter
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
-         verbose
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         verbose);
 
-      offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers ();
 
-      offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.export_offers ();
 
-      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers ();
 
-      offer_exporter.modify_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.modify_offers ();
 
-      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers ();
 
-      offer_exporter.withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers_using_constraints ();
 
-      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers ();
 
-      offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers ();
 
-      offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.export_offers ();
 
-      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers ();
 
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
       TAO_Offer_Importer offer_importer
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), verbose);
 
-      offer_importer.perform_queries (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_importer.perform_queries ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Trader Export Tests Failed"), -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 9078aa74b23..adb0d0b4042 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -15,11 +15,10 @@ ACE_RCSID (Trading,
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_manager.init (argc, argv);
 
       // Command line argument interpretation.
       TT_Parse_Args parse_args (argc, argv);
@@ -31,8 +30,7 @@ main (int argc, char** argv)
       char* ior = parse_args.ior ();
       CORBA::Object_var trading_obj = (ior == 0) ?
         orb->resolve_initial_references ("TradingService") :
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       if (CORBA::is_nil (trading_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -42,87 +40,64 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if =
-        CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosTrading::Lookup::_narrow (trading_obj.in ());
 
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
       TAO_Service_Type_Exporter type_exporter (lookup_if.in (),
-                                               ! parse_args.quiet ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               ! parse_args.quiet ());
 
-      type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.remove_all_types ();
 
-      type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.add_all_types ();
 
-      type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.remove_all_types ();
 
-      type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.add_all_types ();
 
       if (parse_args.federated ())
         {
-          type_exporter.add_all_types_to_all (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          type_exporter.add_all_types_to_all ();
         }
 
-      type_exporter.list_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.list_all_types ();
 
-      type_exporter.describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.describe_all_types ();
 
-      type_exporter.fully_describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      type_exporter.fully_describe_all_types ();
 
       ACE_DEBUG ((LM_DEBUG, "*** Service Type Exporter tests complete.\n"));
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
-      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet ());
 
       // = Test series.
 
-      offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers ();
 
-      offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.export_offers ();
 
-      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers ();
 
-      offer_exporter.modify_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.modify_offers ();
 
-      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers ();
 
-      offer_exporter.withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers_using_constraints ();
 
-      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers ();
 
-      offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.withdraw_offers ();
 
-      offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.export_offers ();
 
       if (parse_args.federated ())
         {
-          offer_exporter.export_offers_to_all (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          offer_exporter.export_offers_to_all ();
         }
 
-      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_exporter.describe_offers ();
 
       ACE_DEBUG ((LM_DEBUG, "*** Offer Exporter tests complete.\n"));
       ACE_DEBUG ((LM_DEBUG, "*** Now serving dynamic properties.\n"));
@@ -145,14 +120,12 @@ main (int argc, char** argv)
         ACE_DEBUG ((LM_WARNING, "Unable to open %s for output.\n", file));
       }
 
-      orb_manager.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_manager.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trader Export Tests Failed"), -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index f303d292998..9393d00cbf1 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -8,11 +8,10 @@ ACE_RCSID(Trading, import_test, "$Id$")
 int
 main (int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_manager.init (argc, argv);
 
       // Command line argument interpretation.
       TT_Parse_Args parse_args (argc, argv);
@@ -23,8 +22,7 @@ main (int argc, char** argv)
       char* ior = parse_args.ior ();
       CORBA::Object_var trading_obj = (ior == 0) ?
         orb->resolve_initial_references ("TradingService") :
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       if (CORBA::is_nil (trading_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -34,27 +32,23 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if =
-        CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosTrading::Lookup::_narrow (trading_obj.in ());
 
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
       TAO_Offer_Importer offer_importer (lookup_if.in (), ! parse_args.quiet ());
 
-      offer_importer.perform_queries (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      offer_importer.perform_queries ();
 
       if (parse_args.federated ())
         {
-          offer_importer.perform_directed_queries (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          offer_importer.perform_directed_queries ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trader Import Tests Failed."), -1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
index 54eb5f996f4..40a0e221060 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
@@ -24,8 +24,7 @@
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       IOR_corbaname_Client_i client;
 
@@ -33,14 +32,12 @@ int main (int argc, char *argv [])
         return 1;
       else
         {
-          return client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          return client.run ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
     }
-  ACE_ENDTRY;
   return 1;
 }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index d183b4ff8a9..421c80f8d30 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -35,10 +35,10 @@ IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void)
 }
 
 int
-IOR_corbaname_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
+IOR_corbaname_Client_i::run (void)
 {
 
-  ACE_TRY
+  try
     {
       CosNaming::Name name (1);
 
@@ -63,14 +63,11 @@ IOR_corbaname_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 
       // Resolve the stringified name.
       CORBA::Object_var factory_object =
-        this->orb_->string_to_object (corbaname_url.c_str ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (corbaname_url.c_str ());
 
       // Narrow
       corbaname::Status_var factory =
-        corbaname::Status::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corbaname::Status::_narrow (factory_object.in ());
 
       if (CORBA::is_nil (factory.in ()))
         {
@@ -82,8 +79,7 @@ IOR_corbaname_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        factory->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory->print_status ();
 
       if (ret_value == 0)
         {
@@ -92,22 +88,20 @@ IOR_corbaname_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
                       0));
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  catch (const CosNaming::NamingContext::NotFound& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "CosNaming::NamingContext::NotFound");
+      ex._tao_print_exception ("CosNaming::NamingContext::NotFound");
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "A system exception on client side");
+      ex._tao_print_exception ("A system exception on client side");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -118,8 +112,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // First initialize the ORB, that will remove some arguments...
@@ -127,8 +120,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
       // There must be at least one argument, the file that has to be
       // retrieved
@@ -139,12 +131,11 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
                            -1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 96fbbdd52d9..08e4b556666 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -39,7 +39,7 @@ class IOR_corbaname_Client_i
   IOR_corbaname_Client_i (void);
   ~IOR_corbaname_Client_i (void);
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Execute the client example code.
 
   int init (int argc, char **argv);
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 4582f0445a0..8106ca49e23 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -5,35 +5,29 @@
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv,
                          "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         );
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
       // Activate the POA Manager
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Create the servant
       corbaname_Status_i status_i;
@@ -44,14 +38,11 @@ int main (int argc, char* argv[])
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
 
       // Narrow down the reference
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_context_object.in()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_context_object.in());
 
       // Bind Status to the Naming Context
       CosNaming::Name name (1);
@@ -59,25 +50,20 @@ int main (int argc, char* argv[])
       name[0].id = CORBA::string_dup ("STATUS");
 
       naming_context->bind (name,
-                            status.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            status.in ());
 
       // Run the orb
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Destroy the POA, waiting until the destruction terminates
       poa->destroy (1, 1);
       orb->destroy ();
 
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "CORBA exception raised in server!");
+      ex._tao_print_exception ("CORBA exception raised in server!");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
index db6078e18c5..10ee6f6d41b 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
@@ -4,13 +4,13 @@
 
 #include "status_i.h"
 
-corbaname_Status_i::corbaname_Status_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+corbaname_Status_i::corbaname_Status_i (void)
 {
   // Constructor
 }
 
 CORBA::Boolean
-corbaname_Status_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+corbaname_Status_i::print_status (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the client makes a succesful request, return a true value
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
index 9154aacc09e..be0aa750b56 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
@@ -9,9 +9,9 @@
 
 class corbaname_Status_i : public POA_corbaname::Status {
 public:
-  corbaname_Status_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  corbaname_Status_i (void);
 
-  CORBA::Boolean print_status (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean print_status (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index f4f3d3311c2..295242e9569 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -39,13 +39,11 @@ ACE_RCSID (tests_svc_loader,
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, 0);
 
       // There must be at least one argument, the file that has to be
       // retrieved
@@ -60,13 +58,11 @@ int main (int argc, char *argv [])
 
       // Use the first argument to create the object reference.
       CORBA::Object_var object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (argv[1]);
 
       // Check if this object reference is a valid one..
       CORBA::Boolean not_exists =
-        object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        object->_non_existent ();
 
       if (not_exists)
         {
@@ -82,13 +78,11 @@ int main (int argc, char *argv [])
         }
 
     }
-  ACE_CATCH (CORBA::SystemException ,e)
+  catch (const CORBA::SystemException&)
     {
       ACE_DEBUG ((LM_ERROR,
                   "CORBA System Exception Raised!\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/performance-tests/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp
index 3777b0ed92e..9b140685075 100644
--- a/TAO/performance-tests/Anyop/anyop.cpp
+++ b/TAO/performance-tests/Anyop/anyop.cpp
@@ -47,13 +47,11 @@ main (int argc, char *argv[])
   int n = 50000;
   int insertion = 1;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       ACE_Get_Opt get_opt (argc, argv, "dien:");
       int opt;
@@ -91,14 +89,11 @@ main (int argc, char *argv[])
 
       {
         CORBA::Object_var obj =
-          orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar"
-                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar");
 
         Param_Test_var param_test =
           TAO::Narrow_Utils<Param_Test>::unchecked_narrow (obj.in (),
                                                            0);
-        ACE_TRY_CHECK;
         TAO_Stub *stub = param_test->_stubobj ();
         stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0");
 
@@ -937,12 +932,11 @@ main (int argc, char *argv[])
                                                stats.samples_count ());
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Any performance test");
+      ex._tao_print_exception ("Any performance test");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
index f01b5c7570d..bd40514f42b 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
@@ -21,20 +21,17 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->init(argc, argv);
   if (result != 0)
     {
       return result;
     }
 
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->client_setup();
 
-  result = this->run_engine(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->run_engine();
 
   this->cleanup();
   return result;
@@ -42,10 +39,9 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
@@ -56,13 +52,11 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::client_setup(void)
 {
   // Turn the ior_ into a Foo obj ref.
   Foo_var foo = RefHelper<Foo>::string_to_ref(this->orb_.in(),
-                                              this->ior_.c_str()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              this->ior_.c_str());
 
   // Create the ClientEngine object, and give it the Foo obj ref.
   this->engine_ = new Foo_ClientEngine(foo.in(), this->client_id_);
@@ -70,11 +64,9 @@ ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-ClientApp::run_engine(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::run_engine(void)
 {
-  bool result = this->engine_->execute(this->num_loops_ 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  bool result = this->engine_->execute(this->num_loops_);
   return result ? 0 : -1;
 }
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
index 9136ff9d27e..7b211e03de0 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
@@ -28,15 +28,15 @@ class ClientApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    int  run_engine(ACE_ENV_SINGLE_ARG_DECL);
+    int init(int argc, char* argv[]);
+    void client_setup(void);
+    int  run_engine(void);
     void cleanup();
 
     // Helper methods used by the methods above.
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
index 1584ad68bd2..63436dcb529 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
@@ -36,32 +36,25 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->init(argc, argv);
   if (result != 0)
     {
       return result;
     }
 
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_setup();
+  this->csd_setup();
+  this->servant_setup();
   this->collocated_setup();
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_activate();
 
   ACE_High_Res_Timer timer;
   timer.start();
 
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->run_collocated_clients();
+  this->run_orb_event_loop();
 
 
   timer.stop();
@@ -92,17 +85,16 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
   int result = this->parse_args(argc, argv);
-  
+
   if (result != 0)
     {
       return result;
@@ -110,51 +102,44 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   TheAppShutdown->init(this->orb_.in(),
                        this->num_remote_clients_ +
-                       this->num_collocated_clients_
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       this->num_collocated_clients_);
 
   return 0;
 }
 
 
 void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_setup(void)
 {
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_ = this->create_poa(this->orb_.in(),
+                                "ChildPoa");
 }
 
 
 void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::csd_setup(void)
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
   if (this->use_csd_ > 0)
     {
-      if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
+      if (!this->tp_strategy_->apply_to(this->poa_.in()))
         {
           ACE_ERROR((LM_ERROR,
                      "Failed to apply CSD strategy to poa.\n"));
-          ACE_THROW(TestAppException());
+          throw TestAppException();
         }
-      ACE_CHECK;
     }
 }
 
 
 void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::servant_setup(void)
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
                                       this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      this->ior_filename_prefix_.c_str());
 }
 
 
@@ -182,36 +167,33 @@ ServerApp::collocated_setup()
 
 
 void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_activate(void)
 {
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POAManager_var poa_manager
+    = this->poa_->the_POAManager();
 
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate();
 }
 
 
 void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_collocated_clients(void)
 {
   if (this->num_collocated_clients_ > 0)
     {
       if (this->collocated_client_task_.open() == -1)
         {
-          ACE_THROW (TestAppException ());
+          throw TestAppException ();
         }
     }
 }
 
 
 void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_orb_event_loop(void)
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_runner.run();
   TheAppShutdown->wait ();
 }
 
@@ -347,7 +329,7 @@ ServerApp::usage_statement()
 int
 ServerApp::arg_dependency_checks()
 {
-  return (this->num_remote_clients_ 
+  return (this->num_remote_clients_
          + this->num_collocated_clients_) > 0 ? 0 : -1;
 }
 
@@ -376,21 +358,17 @@ ServerApp::set_arg(unsigned&   value,
 
 
 PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name
-                      ACE_ENV_ARG_DECL)
+ServerApp::create_poa(CORBA::ORB_ptr orb,
+                      const char* poa_name)
 {
   // Get the Root POA.
   PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb,
+                                                          "RootPOA");
 
   // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -400,9 +378,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb,
   PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
                                                       root_poa.in(),
                                                       poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                      policies);
 
   // Give away the child POA_ptr from the POA_var variable.
   return poa._retn();
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
index a9029d65703..8082e5bc14a 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
@@ -31,20 +31,20 @@ class ServerApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
+    int init(int argc, char* argv[]);
+    void poa_setup(void);
+    void csd_setup(void);
+    void servant_setup(void);
     void collocated_setup();
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
+    void poa_activate(void);
+    void run_collocated_clients(void);
+    void run_orb_event_loop(void);
     bool check_results();
     void cleanup();
 
@@ -63,8 +63,7 @@ class ServerApp : public TestAppBase
 
 
     PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
+                                       const char* poa_name);
 
     typedef ServantList<Foo_i> ServantListType;
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
index 0f60191a9bd..a8839f31939 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
@@ -4,8 +4,7 @@
 void
 AppHelper::ref_to_file(CORBA::ORB_ptr    orb,
                        CORBA::Object_ptr obj,
-                       const char*       filename
-                       ACE_ENV_ARG_DECL)
+                       const char*       filename)
 {
   CORBA::String_var ior = orb->object_to_string(obj);
 
@@ -16,7 +15,7 @@ AppHelper::ref_to_file(CORBA::ORB_ptr    orb,
       ACE_ERROR((LM_ERROR,
                  "(%P|%t) Cannot open output file [%s] to write IOR.",
                  filename));
-      ACE_THROW (TestAppException());
+      throw TestAppException();
     }
 
   ACE_OS::fprintf(ior_file, "%s", ior.in());
@@ -28,14 +27,11 @@ PortableServer::POA_ptr
 AppHelper::create_poa(const char*                    name,
                       PortableServer::POA_ptr        root_poa,
                       PortableServer::POAManager_ptr mgr,
-                      CORBA::PolicyList&             policies
-                      ACE_ENV_ARG_DECL)
+                      CORBA::PolicyList&             policies)
 {
   PortableServer::POA_var child_poa = root_poa->create_POA(name,
                                                            mgr,
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                           policies);
 
   if (CORBA::is_nil(child_poa.in()))
     {
@@ -50,17 +46,14 @@ AppHelper::create_poa(const char*                    name,
 
 CORBA::Object_ptr
 AppHelper::activate_servant(PortableServer::POA_ptr poa,
-                            PortableServer::Servant servant
-                            ACE_ENV_ARG_DECL)
+                            PortableServer::Servant servant)
 {
   // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = poa->activate_object(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  PortableServer::ObjectId_var oid
+    = poa->activate_object(servant);
 
-  CORBA::Object_var obj 
-    = poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  CORBA::Object_var obj
+    = poa->servant_to_reference(servant);
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -78,24 +71,19 @@ AppHelper::validate_connection (CORBA::Object_ptr obj)
 {
   for (CORBA::ULong j = 0; j != 100; ++j)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
           CORBA::PolicyList_var unused;
-          obj->_validate_connection (unused
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          obj->_validate_connection (unused);
 #else
-          obj->_is_a ("Not_An_IDL_Type"
-                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          obj->_is_a ("Not_An_IDL_Type");
 #endif /* TAO_HAS_MESSAGING == 1 */
           return true;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
         }
-      ACE_ENDTRY;
     }
 
   return false;
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
index bdc6c2ab5b3..e170ddf75e2 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
@@ -16,12 +16,10 @@ struct RefHelper
   typedef typename T::_ptr_type T_ptr;
   typedef typename T::_var_type T_var;
 
-  static T_ptr string_to_ref(CORBA::ORB_ptr orb, 
-                             const char* ior 
-                             ACE_ENV_ARG_DECL)
+  static T_ptr string_to_ref(CORBA::ORB_ptr orb,
+                             const char* ior)
   {
-    CORBA::Object_var obj = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(T::_nil ());
+    CORBA::Object_var obj = orb->string_to_object(ior);
 
     if (CORBA::is_nil(obj.in()))
       {
@@ -30,8 +28,7 @@ struct RefHelper
         ACE_THROW_RETURN (TestAppException(), T::_nil ());
       }
 
-    T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(T::_nil ());
+    T_var t_obj = T::_narrow(obj.in());
 
     if (CORBA::is_nil(t_obj.in()))
       {
@@ -43,13 +40,11 @@ struct RefHelper
     return t_obj._retn();
   }
 
-  static T_ptr resolve_initial_ref(CORBA::ORB_ptr orb, 
-                                   const char* name
-                                   ACE_ENV_ARG_DECL)
+  static T_ptr resolve_initial_ref(CORBA::ORB_ptr orb,
+                                   const char* name)
   {
-    CORBA::Object_var obj 
-      = orb->resolve_initial_references(name ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
+    CORBA::Object_var obj
+      = orb->resolve_initial_references(name);
 
     if (CORBA::is_nil(obj.in()))
       {
@@ -59,8 +54,7 @@ struct RefHelper
         ACE_THROW_RETURN (TestAppException(), T::_nil ());
       }
 
-    T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
+    T_var t_obj = T::_narrow(obj.in());
 
 
     if (CORBA::is_nil(t_obj.in()))
@@ -81,19 +75,16 @@ struct CSD_PT_TestInf_Export AppHelper
 
   static void ref_to_file(CORBA::ORB_ptr    orb,
                           CORBA::Object_ptr obj,
-                          const char*       filename
-                          ACE_ENV_ARG_DECL);
+                          const char*       filename);
 
   static PortableServer::POA_ptr create_poa
                               (const char*                    name,
                                PortableServer::POA_ptr        root_poa,
                                PortableServer::POAManager_ptr mgr,
-                               CORBA::PolicyList&             policies
-                               ACE_ENV_ARG_DECL);
+                               CORBA::PolicyList&             policies);
 
   static CORBA::Object_ptr activate_servant(PortableServer::POA_ptr poa,
-                                            PortableServer::Servant servant
-                                            ACE_ENV_ARG_DECL);
+                                            PortableServer::Servant servant);
 
   // This helper method is used because there is a chance that the
   // initial CORBA request made to the target ORB will fail during
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
index 79d7f28c0d9..c975dea0986 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
@@ -16,17 +16,16 @@ AppShutdown::~AppShutdown()
 }
 
 
-void 
-AppShutdown::init(CORBA::ORB_ptr orb, 
-                  unsigned num_clients
-                  ACE_ENV_ARG_DECL)
+void
+AppShutdown::init(CORBA::ORB_ptr orb,
+                  unsigned num_clients)
 {
   if ((!CORBA::is_nil(this->orb_.in())) ||
       (CORBA::is_nil(orb))              ||
-      (num_clients == 0)) 
+      (num_clients == 0))
     {
       // Already init()'ed, or bad argument values.
-      ACE_THROW(TestAppException());
+      throw TestAppException();
     }
   else
     {
@@ -76,7 +75,7 @@ AppShutdown::client_done()
 }
 
 
-AppShutdown* 
+AppShutdown*
 AppShutdown::instance ()
 {
   static AppShutdown app_shutdown;
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
index 481659d734e..7249def17bf 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
@@ -13,12 +13,11 @@ class CSD_PT_TestInf_Export AppShutdown
     AppShutdown();
     virtual ~AppShutdown();
 
-    void init(CORBA::ORB_ptr orb, 
-              unsigned num_clients
-              ACE_ENV_ARG_DECL);
+    void init(CORBA::ORB_ptr orb,
+              unsigned num_clients);
 
     void wait ();
-    
+
     void client_done();
 
     static AppShutdown* instance ();
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h
index 93acb571cdc..63f34fd4f76 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h
@@ -32,8 +32,7 @@ class CSD_PT_TestInf_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<A
     ClientEngine();
     virtual ~ClientEngine();
 
-    virtual bool execute(unsigned num_loops 
-                         ACE_ENV_ARG_DECL) = 0;
+    virtual bool execute(unsigned num_loops) = 0;
 };
 
 #endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
index c09255b1ae2..d2f2a9e5bb9 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
@@ -72,24 +72,23 @@ ClientTask::svc()
     num_loops = this->num_loops_;
   }
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    if (engine->execute(num_loops ACE_ENV_ARG_PARAMETER) == false)
+    if (engine->execute(num_loops) == false)
       {
         GuardType guard(this->lock_);
         this->failure_count_++;
       }
-    ACE_TRY_CHECK;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "ClientTask::svc Caught exception from execute():");
+    ex._tao_print_exception (
+      "ClientTask::svc Caught exception from execute():");
 
     GuardType guard(this->lock_);
     this->failure_count_ ++;
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
                "(%P|%t) ClientTask::svc caught unknown (...) exception "\
@@ -97,7 +96,6 @@ ClientTask::svc()
     GuardType guard(this->lock_);
     this->failure_count_++;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
index fc2ddbdec04..7653bd6a3c9 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
@@ -17,7 +17,7 @@ OrbRunner::~OrbRunner()
 
 
 void
-OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL)
+OrbRunner::run(void)
 {
   ACE_ASSERT(this->num_orb_threads_ > 0);
 
@@ -27,8 +27,7 @@ OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL)
     {
       // Since the num_orb_threads_ is exactly one, we just use the current
       // (mainline) thread to run the ORB event loop.
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->run();
     }
   else
     {
@@ -43,12 +42,11 @@ OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_ERROR((LM_ERROR,
                      "(%P|%t) Failed to open the OrbTask.\n"));
-          ACE_THROW(TestAppException());
+          throw TestAppException();
         }
 
       // This will use the current (mainline) thread to run the ORB event loop.
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->run();
 
       // Now that the current thread has unblocked from running the orb,
       // make sure to wait for all of the worker threads to complete.
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
index cdbbcfea222..4eb2f529e50 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
@@ -12,7 +12,7 @@ class CSD_PT_TestInf_Export OrbRunner
     OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1);
     virtual ~OrbRunner();
 
-    void run(ACE_ENV_SINGLE_ARG_DECL);
+    void run(void);
 
 
   private:
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp
index 79ba1ba3f5e..c64221af9cc 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp
@@ -51,18 +51,16 @@ OrbShutdownTask::open(void*)
 int
 OrbShutdownTask::svc()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->shutdown(0);
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::shutdown() call "
       "in OrbShutdownTask::svc().\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp
index bca9d522e94..337b7746687 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp
@@ -74,18 +74,16 @@ OrbTask::open(void*)
 int
 OrbTask::svc()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->run();
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::run() method. "
       "OrbTask is stopping.\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
index 22133fa9868..cc340ec4135 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
@@ -19,35 +19,30 @@ ServantList<T>::~ServantList()
 template <typename T>
 void
 ServantList<T>::create_and_activate(unsigned                num_servants,
-                                    CORBA::ORB_ptr          orb, 
+                                    CORBA::ORB_ptr          orb,
                                     PortableServer::POA_ptr poa,
-                                    const char*             ior_fname_prefix
-                                    ACE_ENV_ARG_DECL)
+                                    const char*             ior_fname_prefix)
 {
   for (unsigned i = 0; i < num_servants; i++)
     {
       char buf[32];
       ACE_OS::sprintf(buf, "%02d", i + 1);
-      ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior";  
+      ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior";
       ServantRecord record;
       record.servant_ = new T();
       record.safe_servant_ = record.servant_;
 
-      CORBA::Object_var obj 
-        = AppHelper::activate_servant(poa, 
-                                      record.safe_servant_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-                                     
-      AppHelper::ref_to_file(orb, obj.in(), filename.c_str() ACE_ENV_ARG_PARAMETER); 
-      ACE_CHECK;
+      CORBA::Object_var obj
+        = AppHelper::activate_servant(poa,
+                                      record.safe_servant_.in());
 
-      record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      AppHelper::ref_to_file(orb, obj.in(), filename.c_str());
+
+      record.obj_ = T_stub::_narrow(obj.in());
 
       if (CORBA::is_nil(record.obj_.in()))
         {
-          ACE_THROW (TestAppException());
+          throw TestAppException();
         }
 
       this->servant_records_.push_back(record);
@@ -58,8 +53,7 @@ ServantList<T>::create_and_activate(unsigned                num_servants,
 template <typename T>
 void
 ServantList<T>::create_and_activate(unsigned                num_servants,
-                                    PortableServer::POA_ptr poa
-                                    ACE_ENV_ARG_DECL)
+                                    PortableServer::POA_ptr poa)
 {
   for (unsigned i = 0; i < num_servants; i++)
     {
@@ -67,18 +61,15 @@ ServantList<T>::create_and_activate(unsigned                num_servants,
       record.servant_ = new T();
       record.safe_servant_ = record.servant_;
 
-      CORBA::Object_var obj 
-        = AppHelper::activate_servant(poa, 
-                                      record.safe_servant_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-                                    
-      record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Object_var obj
+        = AppHelper::activate_servant(poa,
+                                      record.safe_servant_.in());
+
+      record.obj_ = T_stub::_narrow(obj.in());
 
       if (CORBA::is_nil(record.obj_.in()))
         {
-          ACE_THROW (TestAppException());
+          throw TestAppException();
         }
 
       this->servant_records_.push_back(record);
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
index 57143d889c1..482fa820ab3 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
@@ -24,13 +24,11 @@ class ServantList
     void create_and_activate(unsigned                num_servants,
                              CORBA::ORB_ptr          orb,
                              PortableServer::POA_ptr poa,
-                             const char*             ior_fname_prefix
-                             ACE_ENV_ARG_DECL);
+                             const char*             ior_fname_prefix);
 
     /// Activate servant and not output ior to a file.
     void create_and_activate(unsigned                num_servants,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL);
+                             PortableServer::POA_ptr poa);
 
 
     /// Get a (copy) of one of the object references (for a specific servant).
@@ -54,7 +52,7 @@ class ServantList
     ServantRecordVector servant_records_;
 };
 
-    
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ServantList_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
index f2a2e97b7a2..8f264fbb111 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
@@ -20,10 +20,9 @@ TestAppBase::name() const
 
 
 int
-TestAppBase::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+TestAppBase::run(int argc, char* argv[])
 {
-  int rc = this->run_i(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int rc = this->run_i(argc, argv);
 
   // Convert 1 to 0.  Leave 0 and -1 as they are.
   return (rc == 1) ? 0 : rc;
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
index b14436b623c..b19cfed2f0d 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
@@ -15,7 +15,7 @@ class CSD_PT_TestInf_Export TestAppBase
     virtual ~TestAppBase();
 
     // Returns 0 for success, and -1 for failure.
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
     const char* name() const;
 
@@ -25,7 +25,7 @@ class CSD_PT_TestInf_Export TestAppBase
     TestAppBase(const char* name);
 
     // Returns -1 for failure, 0 for success
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) = 0;
+    virtual int run_i(int argc, char* argv[]) = 0;
 
 
   private:
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
index 062b6fc0c8e..c578974dee9 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
@@ -24,24 +24,22 @@ main(int argc, char* argv[]) \
 \
   APP_TYPE app; \
 \
-  ACE_TRY_NEW_ENV \
+  try \
   { \
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); \
-    ACE_TRY_CHECK; \
+    int ret = app.run(argc,argv); \
+\
     return ret; \
   } \
-  ACE_CATCHANY \
+  catch (const CORBA::Exception& ex) \
   { \
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, \
-                           "Caught exception:"); \
+     ex._tao_print_exception ("Caught exception:"); \
   } \
-  ACE_CATCHALL \
+  catch (...)\
   { \
     ACE_ERROR((LM_ERROR, \
                "(%P|%t) Unknown (...) exception caught in main() " \
                "for App [%d].\n", app.name())); \
   } \
-  ACE_ENDTRY; \
   \
   return 1; \
 }
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
index a5f4212e47e..d0e6dd72566 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
@@ -19,9 +19,9 @@ Foo_ClientEngine::~Foo_ClientEngine()
 
 
 bool
-Foo_ClientEngine::execute(unsigned num_loops ACE_ENV_ARG_DECL)
+Foo_ClientEngine::execute(unsigned num_loops)
 {
-  // Make sure the connection is established before making  
+  // Make sure the connection is established before making
   // remote invocations.
   if (AppHelper::validate_connection(this->obj_.in()) == false)
     {
@@ -38,40 +38,33 @@ Foo_ClientEngine::execute(unsigned num_loops ACE_ENV_ARG_DECL)
     {
       CORBA::Long i = this->client_id_;
 
-      this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-      this->obj_->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      this->obj_->op1();
+      this->obj_->op2(i);
 
-      CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      CORBA::Long value = this->obj_->op3(i);
       success = (value != i) ? false : success;
 
       for (CORBA::Long j = 1; j <= 5; j++)
         {
-          this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (false);
+          this->obj_->op4(495 + (i * 5) + j);
         }
 
       bool caught_exception = false;
 
-      ACE_TRY_NEW_ENV
+      try
       {
-        this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->obj_->op5();
       }
-      ACE_CATCH (FooException, ex)
+      catch (const FooException&)
       {
         // Expected
         caught_exception = true;
       }
-      ACE_ENDTRY;
 
       success = (!caught_exception) ? false : success;
     }
 
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->done();
   return success;
 }
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h
index c704a9a65cb..244fdd1a03d 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h
@@ -27,7 +27,7 @@ class CSD_PT_TestServant_Export Foo_ClientEngine : public ClientEngine
     Foo_ClientEngine(Foo_ptr obj, unsigned  client_id = 0);
     virtual ~Foo_ClientEngine();
 
-    virtual bool execute(unsigned num_loops ACE_ENV_ARG_DECL);
+    virtual bool execute(unsigned num_loops);
 
     static void expected_results(Foo_Statistics& stats);
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
index cbe2721a94d..a7e4878ef11 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
@@ -22,7 +22,7 @@ Foo_i::~Foo_i()
 
 
 void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Foo_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[0]++;
@@ -30,7 +30,7 @@ Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
+Foo_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(value);
@@ -39,7 +39,7 @@ Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
+Foo_i::op3(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[2]++;
@@ -48,7 +48,7 @@ Foo_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
+Foo_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(value);
@@ -57,16 +57,16 @@ Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)
+Foo_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   this->op_count_[4]++;
-  ACE_THROW (FooException());
+  throw FooException();
 }
 
 
 void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Foo_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   TheAppShutdown->client_done();
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
index 47105f27393..9b3e4307646 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
@@ -14,23 +14,23 @@ class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
     Foo_i();
     virtual ~Foo_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void op2(CORBA::Long value)
                                  ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(CORBA::Long value)
                                  ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void op4(CORBA::Long value)
                                  ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException,
                                                  FooException));
 
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)          
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
 
@@ -38,7 +38,7 @@ class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
 
 
   private:
-    
+
     unsigned op_count_[5];
 };
 
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index 1d7d30499ca..fc17d3ba8b9 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -19,8 +19,7 @@ Callback_i::done (void)
 
 void
 Callback_i::response (Test::TimeStamp time_stamp,
-                      const Test::Payload &
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      const Test::Payload &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index b3423a573b0..455ea532600 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -22,8 +22,7 @@ public:
   /// Implement the CORBA methods
   //@{
   void response (Test::TimeStamp,
-                 const Test::Payload &
-                 ACE_ENV_ARG_DECL_NOT_USED)
+                 const Test::Payload &)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index a4cc4de2484..a45f095f8e3 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -9,8 +9,7 @@
 ACE_RCSID(Callback, Server_i, "$Id$")
 
 void
-Server_i::set_callback (Test::Callback_ptr callback
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Server_i::set_callback (Test::Callback_ptr callback)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_ = Test::Callback::_duplicate (callback);
@@ -18,18 +17,17 @@ Server_i::set_callback (Test::Callback_ptr callback
 
 void
 Server_i::request (Test::TimeStamp time_stamp,
-                   const Test::Payload &payload
-                   ACE_ENV_ARG_DECL)
+                   const Test::Payload &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->callback_.in ()))
     return;
 
-  this->callback_->response (time_stamp, payload ACE_ENV_ARG_PARAMETER);
+  this->callback_->response (time_stamp, payload);
 }
 
 void
-Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->done_ = 1;
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index 60887393721..1f2218083f2 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -17,16 +17,14 @@ public:
 
   /// Implement the CORBA methods
   //@{
-  void set_callback (Test::Callback_ptr callback
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  void set_callback (Test::Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void request (Test::TimeStamp,
-                const Test::Payload &
-                ACE_ENV_ARG_DECL_NOT_USED)
+                const Test::Payload &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index ef0f50f3cc3..c9eed07155a 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -72,21 +72,16 @@ main (int argc, char *argv [])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (manager_object.in ());
 
       CORBA::Any sync_scope;
       sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -95,17 +90,12 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            sync_scope);
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -113,27 +103,22 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Get the event channel object reference
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Server_var server =
-        Test::Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Server::_narrow (object.in ());
       if (CORBA::is_nil (server.in ()))
         {
           ACE_ERROR ((LM_ERROR,
@@ -145,11 +130,9 @@ main (int argc, char *argv [])
 
       Callback_i callback_i (iterations);
 
-      Test::Callback_var callback = callback_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test::Callback_var callback = callback_i._this ();
 
-      server->set_callback (callback.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->set_callback (callback.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Connected callback\n"));
 
@@ -160,8 +143,7 @@ main (int argc, char *argv [])
       while (!callback_i.done () || !task.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
 
@@ -190,22 +172,17 @@ main (int argc, char *argv [])
                                              end - start,
                                              stats.samples_count ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&callback_i ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->servant_to_id (&callback_i);
+      root_poa->deactivate_object (id.in ());
+      orb->destroy ();
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, argv[0]);
+      ex._tao_print_exception (argv[0]);
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -267,13 +244,12 @@ int
 Task::svc (void)
 {
   Test::Payload payload(1024); payload.length(1024);
-  ACE_TRY_NEW_ENV
+  try
     {
       for (;;)
         {
           Test::TimeStamp creation = ACE_OS::gethrtime ();
-          this->server_->request (creation, payload ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->request (creation, payload);
 
           // ACE_Time_Value tv (0, 5000);
           // ACE_OS::sleep (tv);
@@ -285,11 +261,10 @@ Task::svc (void)
             return 0;
         }
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Task::svc");
+      ex._tao_print_exception ("Task::svc");
       this->remaining_messages_ = 0;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index 81ae5c39bd0..4ca5bc60c1e 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -41,21 +41,16 @@ main (int argc, char *argv [])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (manager_object.in ());
 
       CORBA::Any sync_scope;
       sync_scope <<= Messaging::SYNC_WITH_TARGET;
@@ -64,17 +59,12 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            sync_scope);
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,27 +72,22 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       Server_i server_i;
 
-      Test::Server_var server = server_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test::Server_var server = server_i._this ();
 
       CORBA::String_var str =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       if (ior_file_name != 0)
         {
@@ -119,23 +104,19 @@ main (int argc, char *argv [])
       while (!server_i.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
         }
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&server_i ACE_ENV_ARG_PARAMETER);
-      root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->servant_to_id (&server_i);
+      root_poa->deactivate_object (id.in ());
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, argv[0]);
+      ex._tao_print_exception (argv[0]);
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index a5db0ce0523..f96c631d3a1 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -196,14 +196,12 @@ DII_Cubit_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB.
       this->orb_var_ = CORBA::ORB_init (this->argc_,
                                         this->argv_,
-                                        "internet"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        "internet");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -214,15 +212,11 @@ DII_Cubit_Client::init (int argc, char **argv)
 
       // Get a factory object reference from the factory IOR.
       this->factory_var_ =
-        this->orb_var_->string_to_object (this->factory_IOR_
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_var_->string_to_object (this->factory_IOR_);
 
       // Get a Cubit object with a DII request on the Cubit factory.
-      CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit"
-                                                               ACE_ENV_ARG_PARAMETER));
+      CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit"));
 
-      ACE_TRY_CHECK;
 
       // make_cubit takes a char* arg that it doesn't use, but we must
       // still include it in the request.
@@ -234,8 +228,7 @@ DII_Cubit_Client::init (int argc, char **argv)
 
       // Invoke the <make_cubit> operation to ask the Cubit factory
       // for a Cubit object.
-      mc_req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mc_req->invoke ();
 
       // Extract the returned object reference from the request.
       mc_req->return_value () >>= CORBA::Any::to_object (this->obj_var_.out ());
@@ -245,13 +238,11 @@ DII_Cubit_Client::init (int argc, char **argv)
                            " could not obtain Cubit object from Cubit factory <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DII_Cubit_Client::init");
+      ex._tao_print_exception ("DII_Cubit_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -342,17 +333,6 @@ DII_Cubit_Client::print_stats (const char *call_name,
   if (this->call_count_ > 0
       && this->error_count_ == 0)
     {
-#if defined (ACE_LACKS_FLOATING_POINT)
-      // elapsed_time.real_time is in units of microseconds.
-      const u_int calls_per_sec =
-        this->call_count_ * 1000000u / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\treal_time\t= %u ms,\n"
-                  "\t%u calls/second\n",
-                  elapsed_time.real_time / 1000u,
-                  calls_per_sec));
-#else  /* ! ACE_LACKS_FLOATING_POINT */
       // elapsed_time.real_time is in units of seconds.
       double calls_per_sec =
         this->call_count_ / elapsed_time.real_time;
@@ -369,7 +349,6 @@ DII_Cubit_Client::print_stats (const char *call_name,
                   elapsed_time.system_time < 0.0 ? 0.0
                   : elapsed_time.system_time * ACE_ONE_SECOND_IN_MSECS,
                   calls_per_sec < 0.0 ? 0.0 : calls_per_sec));
-#endif /* ! ACE_LACKS_FLOATING_POINT */
     }
   else
     ACE_ERROR ((LM_ERROR,
@@ -385,13 +364,11 @@ DII_Cubit_Client::print_stats (const char *call_name,
 void
 DII_Cubit_Client::cube_short_dii (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_short"
-                                                        ACE_ENV_ARG_PARAMETER));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_short"));
 
-      ACE_TRY_CHECK;
 
       CORBA::Short ret_short = 0;
       CORBA::Short arg_short = -3;
@@ -403,8 +380,7 @@ DII_Cubit_Client::cube_short_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req->invoke ();
 
       req->return_value () >>= ret_short;
 
@@ -416,26 +392,22 @@ DII_Cubit_Client::cube_short_dii (void)
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_short_dii");
+      ex._tao_print_exception ("cube_short_dii");
       return;
     }
-  ACE_ENDTRY;
 }
 
 void
 DII_Cubit_Client::cube_long_dii (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_long"
-                                                        ACE_ENV_ARG_PARAMETER));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_long"));
 
-      ACE_TRY_CHECK;
 
       CORBA::Long ret_long = 0;
       CORBA::Long arg_long = -7;
@@ -447,9 +419,8 @@ DII_Cubit_Client::cube_long_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke ();
 
-      ACE_TRY_CHECK;
 
       req->return_value () >>= ret_long;
 
@@ -461,26 +432,22 @@ DII_Cubit_Client::cube_long_dii (void)
             this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_long_dii");
+      ex._tao_print_exception ("cube_long_dii");
       return;
     }
-  ACE_ENDTRY;
 }
 
 void
 DII_Cubit_Client::cube_octet_dii (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_octet"
-                                                        ACE_ENV_ARG_PARAMETER));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_octet"));
 
-      ACE_TRY_CHECK;
 
       CORBA::Octet ret_octet = 0;
       CORBA::Octet arg_octet = 5;
@@ -494,9 +461,8 @@ DII_Cubit_Client::cube_octet_dii (void)
       // Invoke, check for an exception and verify the result.
       this->call_count_++;
 
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke ();
 
-      ACE_TRY_CHECK;
 
       CORBA::Any::to_octet to_ret_octet (ret_octet);
       req->return_value () >>= to_ret_octet;
@@ -509,26 +475,22 @@ DII_Cubit_Client::cube_octet_dii (void)
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_octet_dii");
+      ex._tao_print_exception ("cube_octet_dii");
       return;
     }
-  ACE_ENDTRY;
 }
 
 void
 DII_Cubit_Client::cube_union_dii (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_union"
-                                                        ACE_ENV_ARG_PARAMETER));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_union"));
 
-      ACE_TRY_CHECK;
 
       Cubit::oneof arg_union;
 
@@ -546,9 +508,8 @@ DII_Cubit_Client::cube_union_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke ();
 
-      ACE_TRY_CHECK;
 
       // Extract the result and check validity.
       Cubit::oneof* ret_ptr;
@@ -564,26 +525,22 @@ DII_Cubit_Client::cube_union_dii (void)
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_union_dii");
+      ex._tao_print_exception ("cube_union_dii");
       return;
     }
-  ACE_ENDTRY;
 }
 
 void
 DII_Cubit_Client::cube_struct_dii (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_struct"
-                                                        ACE_ENV_ARG_PARAMETER));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_struct"));
 
-      ACE_TRY_CHECK;
 
       Cubit::Many arg_struct, *ret_struct_ptr;
 
@@ -600,9 +557,8 @@ DII_Cubit_Client::cube_struct_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke ();
 
-      ACE_TRY_CHECK;
 
       req->return_value () >>= ret_struct_ptr;
 
@@ -616,26 +572,22 @@ DII_Cubit_Client::cube_struct_dii (void)
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_struct_dii");
+      ex._tao_print_exception ("cube_struct_dii");
       return;
     }
-  ACE_ENDTRY;
 }
 
 void
 DII_Cubit_Client::cube_octet_seq_dii (int length)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence"
-                                                         ACE_ENV_ARG_PARAMETER));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence"));
 
-      ACE_TRY_CHECK;
 
       // Same length as in IDL_Cubit tests so timings can be compared.
       // Return value holder is set to a different length to test resizing.
@@ -653,9 +605,8 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
 
       this->call_count_++;
 
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke ();
 
-      ACE_TRY_CHECK;
 
       req->return_value () >>= ret_octet_seq_ptr;
 
@@ -677,26 +628,22 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_octet_seq_dii");
+      ex._tao_print_exception ("cube_octet_seq_dii");
       return;
     }
-  ACE_ENDTRY;
 }
 
 void
 DII_Cubit_Client::cube_long_seq_dii (int length)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence"
-                                                        ACE_ENV_ARG_PARAMETER));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence"));
 
-      ACE_TRY_CHECK;
 
       // Same length as in IDL_Cubit tests so timings can be compared.
       // Return value holder is set to a different length to test
@@ -715,9 +662,8 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
 
       this->call_count_++;
 
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke ();
 
-      ACE_TRY_CHECK;
 
       req->return_value () >>= ret_long_seq_ptr;
 
@@ -739,14 +685,12 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       this->error_count_++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "cube_long_seq_dii");
+      ex._tao_print_exception ("cube_long_seq_dii");
       return;
     }
-  ACE_ENDTRY;
 }
 
 // Wrappers for operations with non-void arg lists and the 3-in-1
@@ -817,32 +761,27 @@ DII_Cubit_Client::run (void)
                          dii_elapsed_time);
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Shut down server via a DII request.
       if (this->shutdown_)
         {
-          CORBA::Request_var req (this->obj_var_->_request ("shutdown"
-                                                            ACE_ENV_ARG_PARAMETER));
+          CORBA::Request_var req (this->obj_var_->_request ("shutdown"));
 
-          ACE_TRY_CHECK;
 
           // Cubit::shutdown () is a oneway operation.
-          req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
+          req->send_oneway ();
 
-          ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
                       "\n\t Shutting down IDL_Cubit server \n\n"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "DII_Cubit_Client: server shutdown");
+      ex._tao_print_exception ("DII_Cubit_Client: server shutdown");
       return -1;
     }
-  ACE_ENDTRY;
 
   return this->error_count_ == 0 ? 0 : 1;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index a1cb973c59d..6ffffc010c1 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -389,9 +389,9 @@ Cubit_Client::check_enabled (u_int mask) const
 // Exercise the union.  Cube a union.
 
 void
-Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL)
+Cubit_Client::cube_union (void)
 {
-  ACE_TRY
+  try
     {
       Cubit::oneof u;
 
@@ -404,11 +404,9 @@ Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL)
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
-        r = this->cubit_->cube_union (u
-                                      ACE_ENV_ARG_PARAMETER);
+        r = this->cubit_->cube_union (u);
       }
 
-      ACE_TRY_CHECK;
 
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG, "cube union ..."));
@@ -432,11 +430,9 @@ Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL)
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
-        r = this->cubit_->cube_union (u
-                                      ACE_ENV_ARG_PARAMETER);
+        r = this->cubit_->cube_union (u);
       }
 
-      ACE_TRY_CHECK;
 
       if (TAO_debug_level > 2)
         ACE_DEBUG ((LM_DEBUG, "cube union ..."));
@@ -452,23 +448,19 @@ Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL)
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_union");
+      ex._tao_print_exception ("from cube_union");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube a short.
 
 void
-Cubit_Client::cube_short (int i
-                          ACE_ENV_ARG_DECL)
+Cubit_Client::cube_short (int i)
 {
-  ACE_TRY
+  try
     {
       CORBA::Short arg_short = this->func (i);
 
@@ -477,11 +469,9 @@ Cubit_Client::cube_short (int i
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_SHORT_START);
 
-        ret_short = cubit_->cube_short (arg_short
-                                        ACE_ENV_ARG_PARAMETER);
+        ret_short = cubit_->cube_short (arg_short);
       }
 
-      ACE_TRY_CHECK;
 
       this->call_count_++;
 
@@ -503,67 +493,53 @@ Cubit_Client::cube_short (int i
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_short");
+      ex._tao_print_exception ("from cube_short");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Oneway test.
 
 void
-Cubit_Client::cube_oneway (int
-                           ACE_ENV_ARG_DECL)
+Cubit_Client::cube_oneway (int)
 {
-  ACE_TRY
+  try
     {
       ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ONEWAY_START);
-      this->cubit_->cube_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->cubit_->cube_oneway ();
       this->call_count_++;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_oneway");
+      ex._tao_print_exception ("from cube_oneway");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
-Cubit_Client::cube_void (int
-                         ACE_ENV_ARG_DECL)
+Cubit_Client::cube_void (int)
 {
-  ACE_TRY
+  try
     {
       ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_VOID_START);
-      this->cubit_->cube_void (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->cubit_->cube_void ();
       this->call_count_++;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_void");
+      ex._tao_print_exception ("from cube_void");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube an octet
 
 void
-Cubit_Client::cube_octet (int i
-                          ACE_ENV_ARG_DECL)
+Cubit_Client::cube_octet (int i)
 {
-  ACE_TRY
+  try
     {
       CORBA::Octet arg_octet = this->func (i);
 
@@ -572,11 +548,9 @@ Cubit_Client::cube_octet (int i
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_START);
 
-        ret_octet = this->cubit_->cube_octet (arg_octet
-                                              ACE_ENV_ARG_PARAMETER);
+        ret_octet = this->cubit_->cube_octet (arg_octet);
       }
 
-      ACE_TRY_CHECK;
 
       this->call_count_++;
 
@@ -599,23 +573,19 @@ Cubit_Client::cube_octet (int i
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_octet");
+      ex._tao_print_exception ("from cube_octet");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // calculate the cube from a long
 
 void
-Cubit_Client::cube_long (int i
-                         ACE_ENV_ARG_DECL)
+Cubit_Client::cube_long (int i)
 {
-  ACE_TRY
+  try
     {
       CORBA::Long arg_long = this->func (i);
 
@@ -624,11 +594,9 @@ Cubit_Client::cube_long (int i
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_START);
 
-        ret_long = this->cubit_->cube_long (arg_long
-                                            ACE_ENV_ARG_PARAMETER);
+        ret_long = this->cubit_->cube_long (arg_long);
       }
 
-      ACE_TRY_CHECK;
 
       this->call_count_++;
 
@@ -654,23 +622,19 @@ Cubit_Client::cube_long (int i
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_long");
+      ex._tao_print_exception ("from cube_long");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube the numbers in a struct
 
 void
-Cubit_Client::cube_struct (int i
-                           ACE_ENV_ARG_DECL)
+Cubit_Client::cube_struct (int i)
 {
-  ACE_TRY
+  try
     {
       Cubit::Many arg_struct;
       Cubit::Many ret_struct;
@@ -685,11 +649,9 @@ Cubit_Client::cube_struct (int i
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_STRUCT_START);
 
-        ret_struct = this->cubit_->cube_struct (arg_struct
-                                                ACE_ENV_ARG_PARAMETER);
+        ret_struct = this->cubit_->cube_struct (arg_struct);
       }
 
-      ACE_TRY_CHECK;
 
       if (TAO_debug_level > 2)
         {
@@ -710,24 +672,20 @@ Cubit_Client::cube_struct (int i
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_struct");
+      ex._tao_print_exception ("from cube_struct");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube the numbers in a sequence
 
 void
 Cubit_Client::cube_long_sequence (int,
-                                  int l
-                                  ACE_ENV_ARG_DECL)
+                                  int l)
 {
-  ACE_TRY
+  try
     {
       this->call_count_++;
 
@@ -752,11 +710,9 @@ Cubit_Client::cube_long_sequence (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_SEQUENCE_START);
 
         this->cubit_->cube_long_sequence (input,
-                                          vout
-                                          ACE_ENV_ARG_PARAMETER);
+                                          vout);
       }
 
-      ACE_TRY_CHECK;
 
       if (output->length () != input.length ())
         {
@@ -785,22 +741,18 @@ Cubit_Client::cube_long_sequence (int,
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_long_sequence");
+      ex._tao_print_exception ("from cube_long_sequence");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 Cubit_Client::cube_octet_sequence (int,
-                                   int l
-                                   ACE_ENV_ARG_DECL)
+                                   int l)
 {
-  ACE_TRY
+  try
     {
       this->call_count_++;
 
@@ -842,11 +794,9 @@ Cubit_Client::cube_octet_sequence (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_SEQUENCE_START);
 
         this->cubit_->cube_octet_sequence (input,
-                                           vout
-                                           ACE_ENV_ARG_PARAMETER);
+                                           vout);
       }
 
-      ACE_TRY_CHECK;
 
       if (output->length () != input.length ())
         {
@@ -874,24 +824,20 @@ Cubit_Client::cube_octet_sequence (int,
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_octet_sequence");
+      ex._tao_print_exception ("from cube_octet_sequence");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Cube the many in a sequence
 
 void
 Cubit_Client::cube_many_sequence (int,
-                                  int l
-                                  ACE_ENV_ARG_DECL)
+                                  int l)
 {
-  ACE_TRY
+  try
     {
       this->call_count_++;
 
@@ -924,11 +870,9 @@ Cubit_Client::cube_many_sequence (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_MANY_SEQUENCE_START);
 
         this->cubit_->cube_many_sequence (input,
-                                          vout
-                                          ACE_ENV_ARG_PARAMETER);
+                                          vout);
       }
 
-      ACE_TRY_CHECK;
 
       if (output->length () != input.length ())
         {
@@ -960,23 +904,19 @@ Cubit_Client::cube_many_sequence (int,
           this->error_count_++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_many_sequence");
+      ex._tao_print_exception ("from cube_many_sequence");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 Cubit_Client::cube_rti_data (int,
                              int numUpdates,
-                             int numAttrs
-                             ACE_ENV_ARG_DECL)
+                             int numAttrs)
 {
-  ACE_TRY
+  try
     {
       this->call_count_++;
 
@@ -1044,11 +984,9 @@ Cubit_Client::cube_rti_data (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_RTI_DATA_START);
 
         this->cubit_->cube_rti_data (input,
-                                     vout
-                                     ACE_ENV_ARG_PARAMETER);
+                                     vout);
       }
 
-      ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
 
@@ -1062,24 +1000,20 @@ Cubit_Client::cube_rti_data (int,
                       "need to check whether cubing happened\n"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_rtti_data");
+      ex._tao_print_exception ("from cube_rtti_data");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 
 // calculate the cube from long contained in an any
 
 void
-Cubit_Client::cube_any (int i
-                        ACE_ENV_ARG_DECL)
+Cubit_Client::cube_any (int i)
 {
-  ACE_TRY
+  try
     {
       CORBA::Long arg_long = this->func (i);
 
@@ -1091,10 +1025,8 @@ Cubit_Client::cube_any (int i
       arg_any <<= arg_long;
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_START);
-        ret_any = this->cubit_->cube_any (arg_any
-                                          ACE_ENV_ARG_PARAMETER);
+        ret_any = this->cubit_->cube_any (arg_any);
       }
-      ACE_TRY_CHECK;
 
       *ret_any >>= ret_long;
 
@@ -1122,24 +1054,20 @@ Cubit_Client::cube_any (int i
 
       delete ret_any;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_any");
+      ex._tao_print_exception ("from cube_any");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 
 // Cube the numbers in a struct
 
 void
-Cubit_Client::cube_any_struct (int i
-                               ACE_ENV_ARG_DECL)
+Cubit_Client::cube_any_struct (int i)
 {
-  ACE_TRY
+  try
     {
       Cubit::Many arg_struct;
       Cubit::Many * ret_struct;
@@ -1156,10 +1084,8 @@ Cubit_Client::cube_any_struct (int i
       arg_any <<= arg_struct;
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_STRUCT_START);
-        ret_any = this->cubit_->cube_any_struct (arg_any
-                                                 ACE_ENV_ARG_PARAMETER);
+        ret_any = this->cubit_->cube_any_struct (arg_any);
       }
-      ACE_TRY_CHECK;
 
       *ret_any >>= ret_struct;
 
@@ -1185,14 +1111,11 @@ Cubit_Client::cube_any_struct (int i
 
       delete ret_any;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from cube_any_struct");
+      ex._tao_print_exception ("from cube_any_struct");
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 
@@ -1213,17 +1136,6 @@ Cubit_Client::print_stats (const char *call_name,
     {
       if (this->call_count_ > 0 && this->error_count_ == 0)
         {
-#if defined (ACE_LACKS_FLOATING_POINT)
-          // elapsed_time.real_time is in units of microseconds.
-          const u_int calls_per_sec =
-            this->call_count_ * 1000000u / elapsed_time.real_time;
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "\treal_time\t= %u ms,\n"
-                      "\t%u calls/second\n",
-                      elapsed_time.real_time / 1000u,
-                      calls_per_sec));
-#else  /* ! ACE_LACKS_FLOATING_POINT */
           // elapsed_time.real_time is in units of seconds.
           double calls_per_sec =
             this->call_count_ / elapsed_time.real_time;
@@ -1240,7 +1152,6 @@ Cubit_Client::print_stats (const char *call_name,
                       elapsed_time.system_time < 0.0 ? 0.0
                       : elapsed_time.system_time * ACE_ONE_SECOND_IN_MSECS,
                       calls_per_sec < 0.0 ? 0.0 : calls_per_sec));
-#endif /* ! ACE_LACKS_FLOATING_POINT */
         }
       else
         {
@@ -1269,8 +1180,7 @@ Cubit_Client::run ()
 
   // Show the results one type at a time.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // VOID
       if (this->check_enabled (TAO_ENABLE_CUBIT_VOID))
@@ -1281,9 +1191,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_void (i
-                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_void (i);
             }
 
           timer.stop ();
@@ -1302,9 +1210,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_short (i
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_short (i);
             }
 
           timer.stop ();
@@ -1323,9 +1229,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_octet (i
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_octet (i);
             }
 
           timer.stop ();
@@ -1344,9 +1248,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_long (i
-                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_long (i);
             }
 
           timer.stop ();
@@ -1364,9 +1266,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_struct (i
-                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_struct (i);
             }
 
           timer.stop ();
@@ -1385,8 +1285,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_union (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_union ();
             }
 
           timer.stop ();
@@ -1406,9 +1305,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_long_sequence (this->loop_count_,
-                                        4
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                        4);
             }
 
           timer.stop ();
@@ -1428,9 +1325,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_long_sequence (this->loop_count_,
-                                        1024
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                        1024);
             }
 
           timer.stop ();
@@ -1455,9 +1350,7 @@ Cubit_Client::run ()
               for (i = 0; i < this->loop_count_; ++i)
                 {
                   this->cube_octet_sequence (this->loop_count_,
-                                             bytes_in_octet_sequence_
-                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                             bytes_in_octet_sequence_);
                 }
             }
           else
@@ -1465,9 +1358,7 @@ Cubit_Client::run ()
               for (i = 0; i < this->loop_count_; ++i)
                 {
                   this->cube_octet_sequence (this->loop_count_,
-                                             16
-                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                             16);
                 }
             }
 
@@ -1488,9 +1379,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_octet_sequence (this->loop_count_,
-                                         4096
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                         4096);
             }
 
           timer.stop ();
@@ -1510,9 +1399,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_many_sequence (this->loop_count_,
-                                        4
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                        4);
             }
 
           timer.stop ();
@@ -1532,9 +1419,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_many_sequence (this->loop_count_,
-                                        1024
-                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                        1024);
             }
 
           timer.stop ();
@@ -1553,17 +1438,11 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_short (i
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_short (i);
 
-              this->cube_octet (i
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_octet (i);
 
-              this->cube_long (i
-                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_long (i);
             }
 
           timer.stop ();
@@ -1583,9 +1462,7 @@ Cubit_Client::run ()
             {
               this->cube_rti_data (this->loop_count_,
                                    2,
-                                   5
-                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                   5);
             }
 
           timer.stop ();
@@ -1604,9 +1481,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_oneway (i
-                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_oneway (i);
             }
 
           timer.stop ();
@@ -1625,9 +1500,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_any (i
-                              ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->cube_any (i);
             }
 
           timer.stop ();
@@ -1645,10 +1518,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_any_struct (i
-                                     ACE_ENV_ARG_PARAMETER);
+              this->cube_any_struct (i);
 
-              ACE_TRY_CHECK;
             }
 
           timer.stop ();
@@ -1658,52 +1529,41 @@ Cubit_Client::run ()
                              elapsed_time);
         }
 
-      this->shutdown_server (this->shutdown_
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->shutdown_server (this->shutdown_);
 
-      ACE_TRY_EX (SHM)
+      try
         {
-          this->cubit_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (SHM);
+          this->cubit_->ping ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Dont do anything..
         }
-      ACE_ENDTRY;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Cubit_Client::run");
+      ex._tao_print_exception ("Cubit_Client::run");
     }
-  ACE_ENDTRY;
 
   return this->error_count_ == 0 ? 0 : 1;
 }
 
 int
-Cubit_Client::shutdown_server (int do_shutdown
-                               ACE_ENV_ARG_DECL)
+Cubit_Client::shutdown_server (int do_shutdown)
 {
   if (do_shutdown)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "shutdown on cubit object\n"));
 
-      ACE_TRY_EX(NOT_COLLOCATED)
+      try
         {
-          this->cubit_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (NOT_COLLOCATED);
+          this->cubit_->shutdown ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Cubit::shutdown_server");
+          ex._tao_print_exception ("Cubit::shutdown_server");
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
     }
 
   return 0;
@@ -1742,14 +1602,12 @@ Cubit_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "internet");
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -1777,14 +1635,10 @@ Cubit_Client::init (int argc, char **argv)
         }
 
       CORBA::Object_var factory_object =
-        this->orb_->string_to_object (this->cubit_factory_key_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (this->cubit_factory_key_);
 
       this->factory_ =
-        Cubit_Factory::_narrow (factory_object.in()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Cubit_Factory::_narrow (factory_object.in());
 
       if (CORBA::is_nil (this->factory_.in ()))
         {
@@ -1799,8 +1653,7 @@ Cubit_Client::init (int argc, char **argv)
 
       // Now retrieve the Cubit obj ref corresponding to the key.
       this->cubit_ =
-        this->factory_->make_cubit (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->factory_->make_cubit ();
 
       if (CORBA::is_nil (this->cubit_.in ()))
         {
@@ -1809,13 +1662,11 @@ Cubit_Client::init (int argc, char **argv)
                             -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Cubit::init");
+      ex._tao_print_exception ("Cubit::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 34f047dae48..21b62d4943d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -82,59 +82,46 @@ private:
                     ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
   // Prints the time stats.
 
-  void cube_union (ACE_ENV_SINGLE_ARG_DECL);
+  void cube_union (void);
   // Exercise the union.  Cube a union.
 
-  void cube_struct (int i
-                    ACE_ENV_ARG_DECL);
+  void cube_struct (int i);
   // calculate the cube from a struct.
 
-  void cube_long (int i
-                  ACE_ENV_ARG_DECL);
+  void cube_long (int i);
   // calculate the cube from a long.
 
-  void cube_oneway (int i
-                    ACE_ENV_ARG_DECL);
+  void cube_oneway (int i);
   // Oneway operation test.
 
-  void cube_void (int i
-                  ACE_ENV_ARG_DECL);
+  void cube_void (int i);
   // Twoway operation test.
 
-  void cube_octet (int i
-                   ACE_ENV_ARG_DECL);
+  void cube_octet (int i);
   // Cube an octet.
 
-  void cube_short (int i
-                   ACE_ENV_ARG_DECL);
+  void cube_short (int i);
   // Cube a short.
 
-  void cube_long_sequence (int i, int l
-                           ACE_ENV_ARG_DECL);
+  void cube_long_sequence (int i, int l);
   // Cube a sequence <l> is the length of the sequence.
 
-  void cube_octet_sequence (int i, int l
-                            ACE_ENV_ARG_DECL);
+  void cube_octet_sequence (int i, int l);
   // Cube a sequence of octets, <l> is the length of the sequence.
 
-  void cube_many_sequence (int i, int l
-                           ACE_ENV_ARG_DECL);
+  void cube_many_sequence (int i, int l);
   // Cube a sequence of manys, <l> is the length of the sequence.
 
-  void cube_rti_data (int i, int numUpdates, int numAttrs
-                      ACE_ENV_ARG_DECL);
+  void cube_rti_data (int i, int numUpdates, int numAttrs);
   // Cube a sequence <l> is the length of the sequence.
 
-  void cube_any_struct (int i
-                    ACE_ENV_ARG_DECL);
+  void cube_any_struct (int i);
   // calculate the cube from a struct in an any.
 
-  void cube_any (int i
-                 ACE_ENV_ARG_DECL);
+  void cube_any (int i);
   // calculate the cube from a long in an any.
 
-  int shutdown_server (int do_shutdown
-                       ACE_ENV_ARG_DECL);
+  int shutdown_server (int do_shutdown);
   // Invoke the method with <do_shutdown> != 0 to shutdown the server.
 
   int argc_;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index 2d7ef27249d..c6c491c2911 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -56,20 +56,17 @@ Cubit_Server::parse_args (void)
 
 int
 Cubit_Server::init (int argc,
-                    char** argv
-                    ACE_ENV_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
+                    char** argv)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
-  ACE_CHECK_RETURN (-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -89,9 +86,7 @@ Cubit_Server::init (int argc,
 
   this->factory_id_ =
     this->orb_manager_.activate_under_child_poa ("factory",
-                                                 this->factory_impl_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                 this->factory_impl_);
 
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
@@ -109,9 +104,9 @@ Cubit_Server::init (int argc,
 }
 
 int
-Cubit_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Cubit_Server::run (void)
 {
-  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cubit_Server::run"),
                       -1);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 87c501fdaf6..b76b5d05446 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -51,11 +51,10 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize the Cubit_Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb
 
 private:
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 91a6f4b7df3..23de6e20cb8 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -128,10 +128,10 @@ Cubit_Factory_i::~Cubit_Factory_i (void)
 }
 
 Cubit_ptr
-Cubit_Factory_i::make_cubit (ACE_ENV_SINGLE_ARG_DECL)
+Cubit_Factory_i::make_cubit (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return my_cubit_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return my_cubit_._this ();
 }
 
 void
@@ -154,7 +154,7 @@ Cubit_i::~Cubit_i (void)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -166,14 +166,14 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa)
 }
 
 void
-Cubit_i::cube_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::cube_oneway (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START);
 }
 
 void
-Cubit_i::cube_void (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::cube_void (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START);
@@ -182,8 +182,7 @@ Cubit_i::cube_void (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Cube an octet
 
 CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_octet (CORBA::Octet o)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_START);
@@ -194,8 +193,7 @@ Cubit_i::cube_octet (CORBA::Octet o
 // Cube a short.
 
 CORBA::Short
-Cubit_i::cube_short (CORBA::Short s
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_short (CORBA::Short s)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_SHORT_START);
@@ -206,8 +204,7 @@ Cubit_i::cube_short (CORBA::Short s
 // Cube a long
 
 CORBA::Long
-Cubit_i::cube_long (CORBA::Long l
-                    ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_long (CORBA::Long l)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_START);
@@ -218,8 +215,7 @@ Cubit_i::cube_long (CORBA::Long l
 // Cube a struct
 
 Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values
-                      ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_struct (const Cubit::Many &values)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_STRUCT_START);
@@ -236,8 +232,7 @@ Cubit_i::cube_struct (const Cubit::Many &values
 // Cube a union
 
 Cubit::oneof
-Cubit_i::cube_union (const Cubit::oneof &values
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_union (const Cubit::oneof &values)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_UNION_START);
@@ -270,8 +265,7 @@ Cubit_i::cube_union (const Cubit::oneof &values
 // Cube a sequence
 void
 Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
-                             Cubit::long_seq_out output
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Cubit::long_seq_out output)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
@@ -297,8 +291,7 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
 // Cube an octet sequence
 void
 Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
-                              Cubit::octet_seq_out output
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Cubit::octet_seq_out output)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_SEQUENCE_START);
@@ -338,8 +331,7 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
 
 void
 Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
-                             Cubit::many_seq_out output
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Cubit::many_seq_out output)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_MANY_SEQUENCE_START);
@@ -372,8 +364,7 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
 
 void
 Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
-                        Cubit::RtiPacket_out output
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        Cubit::RtiPacket_out output)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
@@ -404,8 +395,7 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
 // Cube a long contained in an any
 
 CORBA::Any *
-Cubit_i::cube_any (const CORBA::Any & any
-                   ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_any (const CORBA::Any & any)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_START);
@@ -421,8 +411,7 @@ Cubit_i::cube_any (const CORBA::Any & any
 // Cube a struct contained in an any
 
 CORBA::Any *
-Cubit_i::cube_any_struct (const CORBA::Any & any
-                          ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_any_struct (const CORBA::Any & any)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_STRUCT_START);
@@ -441,7 +430,7 @@ Cubit_i::cube_any_struct (const CORBA::Any & any
 
 // Shutdown.
 
-void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Cubit_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -453,7 +442,7 @@ void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Cubit_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::ping (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // do nothing
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index 74cb14a9238..aa03d0ccb47 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -37,83 +37,72 @@ public:
   ~Cubit_i (void);
   // Destructor
 
-  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (void);
   // Returns the default POA for this servant.
 
-  virtual void cube_oneway (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void cube_oneway (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a oneway call.
 
-  virtual void cube_void (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void cube_void (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a twoway call.
 
-  virtual CORBA::Octet cube_octet (CORBA::Octet o
-                                   ACE_ENV_ARG_DECL)
+  virtual CORBA::Octet cube_octet (CORBA::Octet o)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an octet
 
-  virtual CORBA::Short cube_short (CORBA::Short s
-                                   ACE_ENV_ARG_DECL)
+  virtual CORBA::Short cube_short (CORBA::Short s)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a short
 
-  virtual CORBA::Long cube_long (CORBA::Long l
-                                 ACE_ENV_ARG_DECL)
+  virtual CORBA::Long cube_long (CORBA::Long l)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a long
 
-  virtual Cubit::Many cube_struct (const Cubit::Many &values
-                                   ACE_ENV_ARG_DECL)
+  virtual Cubit::Many cube_struct (const Cubit::Many &values)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a struct.
 
-  virtual Cubit::oneof cube_union (const Cubit::oneof &values
-                                   ACE_ENV_ARG_DECL)
+  virtual Cubit::oneof cube_union (const Cubit::oneof &values)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a union.
 
   virtual void cube_long_sequence (const Cubit::long_seq &input,
-                                   Cubit::long_seq_out output
-                                   ACE_ENV_ARG_DECL)
+                                   Cubit::long_seq_out output)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a sequence.
 
   virtual void cube_octet_sequence (const Cubit::octet_seq &input,
-                                    Cubit::octet_seq_out output
-                                    ACE_ENV_ARG_DECL)
+                                    Cubit::octet_seq_out output)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an octet sequence.
 
   virtual void cube_many_sequence (const Cubit::many_seq & input,
-                                   Cubit::many_seq_out output
-                                   ACE_ENV_ARG_DECL)
+                                   Cubit::many_seq_out output)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an Many sequence.
 
   virtual void cube_rti_data (const Cubit::RtiPacket &input,
-                              Cubit::RtiPacket_out output
-                              ACE_ENV_ARG_DECL)
+                              Cubit::RtiPacket_out output)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a sequence.
 
-  virtual CORBA::Any * cube_any (const CORBA::Any & any
-                                ACE_ENV_ARG_DECL)
+  virtual CORBA::Any * cube_any (const CORBA::Any & any)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a long in an any
 
-  virtual CORBA::Any * cube_any_struct (const CORBA::Any & any
-                                       ACE_ENV_ARG_DECL)
+  virtual CORBA::Any * cube_any_struct (const CORBA::Any & any)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a struct in an any
 
   /// Shutdown routine.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// A ping. Please see the idl file for details.
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -141,7 +130,7 @@ public:
   ~Cubit_Factory_i (void);
   // Destructor.
 
-  virtual Cubit_ptr make_cubit (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Cubit_ptr make_cubit (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Make a cubit object.
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index 389f51d958d..0eadc943da7 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -41,33 +41,29 @@ svr_worker (void *arg)
   ACE_OS::strcat (cmd_line, " -f " THE_IOR);
   ACE_ARGV args (cmd_line);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       int result = cubit_server.init (args.argc (),
-                                      args.argv ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                      args.argv ());
 
       if (result == -1)
         return (void *) 1;
 
       thread_barrier->server_init_.wait ();
-      cubit_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      cubit_server.run ();
 
       thread_barrier->client_fini_.wait ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return (void *) 1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return (void *) 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index f28cd411ef0..87e5372fcc7 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -51,30 +51,27 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tIDL_Cubit: server\n\n"));
-  ACE_TRY_NEW_ENV
+  try
     {
-      int ret = cubit_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int ret = cubit_server.init (argc, argv);
 
       if (ret == -1)
         return -1;
 
-      cubit_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      cubit_server.run ();
 
       ACE_OS::sleep (5);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   ACE_TIMEPROBE_PRINT;
 
   return 0;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 2fb15abdc38..5cd76fa46b3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -65,34 +65,29 @@ Cubit_Task::svc (void)
                        "Create Servants failed.\n"),
                       -1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       GLOBALS::instance ()->barrier_->wait ();
 
       // Handle requests for this object until we're killed, or one of
       // the methods asks us to exit.
-      int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int r = this->orb_manager_.run ();
 
       if (r == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "run"),
                           -1);
-      ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
         this->orb_manager_.orb ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "poa->destroy()");
+      ex._tao_print_exception ("poa->destroy()");
     }
-  ACE_ENDTRY;
 
   // Need to clean up and do a CORBA::release on everything we've
   // created!
@@ -106,8 +101,7 @@ Cubit_Task::svc (void)
 int
 Cubit_Task::initialize_orb (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_ARGV args (this->orbargs_);
 
@@ -122,9 +116,7 @@ Cubit_Task::initialize_orb (void)
       int r = this->orb_manager_.init_child_poa (argc,
                                                  argv,
                                                  "persistent_poa",
-                                                 orb_name
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                 orb_name);
       if (r == -1)
         return -1;
 
@@ -145,12 +137,11 @@ Cubit_Task::initialize_orb (void)
           GLOBALS::instance ()->ready_cnd_.broadcast ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "orb_init");
+      ex._tao_print_exception ("orb_init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -167,24 +158,18 @@ Cubit_Task::get_servant_ior (u_int index)
 int
 Cubit_Task::create_servants (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var manager =
-        poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager();
 
-      manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager->activate();
 
       // Create the array of cubit implementations.
       ACE_NEW_RETURN (this->servants_,
@@ -233,14 +218,11 @@ Cubit_Task::create_servants (void)
           // some client.  Then release the object.
 
           Cubit_var cubit =
-            this->servants_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->servants_[i]->_this ();
 
 
           CORBA::String_var str =
-            this->orb_->object_to_string (cubit.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->object_to_string (cubit.in ());
 
           this->servants_iors_[i] =
             ACE_OS::strdup (str.in ());
@@ -248,12 +230,10 @@ Cubit_Task::create_servants (void)
 
       delete [] buffer;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Cubit_Task::create_servants");
+      ex._tao_print_exception ("Cubit_Task::create_servants");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 876035b66dc..c797e5fa43d 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -16,11 +16,7 @@ inline
 ACE_UINT32
 ACE_round (ACE_timer_t t)
 {
-#if defined (ACE_LACKS_FLOATING_POINT)
-  return t;
-#else
   return static_cast<ACE_UINT32> (t);
-#endif
 }
 
 ACE_RCSID(MT_Cubit, Task_Client, "$Id$")
@@ -555,7 +551,7 @@ Client::find_frequency (void)
 }
 
 CORBA::ORB_ptr
-Client::init_orb (ACE_ENV_SINGLE_ARG_DECL)
+Client::init_orb (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "I'm thread %t\n"));
@@ -584,9 +580,7 @@ Client::init_orb (ACE_ENV_SINGLE_ARG_DECL)
   ACE_OS::sprintf (orbid, "orb:%d", this->id_);
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        orbid
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+                                        orbid);
 
   if (this->id_ == 0)
     {
@@ -615,7 +609,7 @@ Client::init_orb (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+Client::get_cubit (CORBA::ORB_ptr orb)
 {
   char *my_ior =
     this->ts_->use_utilization_test_ == 1
@@ -634,9 +628,7 @@ Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
                       -1);
 
   CORBA::Object_var objref =
-    orb->string_to_object (my_ior
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->string_to_object (my_ior);
 
   if (CORBA::is_nil (objref.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -645,9 +637,7 @@ Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   // Narrow the CORBA::Object reference to the stub object,
   // checking the type along the way using _is_a.
-  this->cubit_ = Cubit::_narrow (objref.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->cubit_ = Cubit::_narrow (objref.in ());
 
   if (CORBA::is_nil (this->cubit_))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -658,9 +648,7 @@ Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
               "(%t) Binding succeeded\n"));
 
   CORBA::String_var str =
-    orb->object_to_string (this->cubit_
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (this->cubit_);
 
   ACE_DEBUG ((LM_DEBUG,
               "(%t) CUBIT OBJECT connected to <%s>\n",
@@ -672,19 +660,16 @@ Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 int
 Client::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = this->init_orb (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = this->init_orb ();
 
       // Find the frequency of CORBA requests based on thread id.
       this->find_frequency ();
 
       // Get the cubit object from the file.
-      int r = this->get_cubit (orb.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int r = this->get_cubit (orb.in ());
       if (r != 0)
         return r;
 
@@ -718,21 +703,18 @@ Client::svc (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%t) CALLING SHUTDOWN() ON THE SERVANT\n"));
-          this->cubit_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->cubit_->shutdown ();
         }
 
       CORBA::release (this->cubit_);
       this->cubit_ = 0;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Task_Client::svc()");
+      ex._tao_print_exception ("Task_Client::svc()");
     }
-  ACE_ENDTRY;
 
   // To avoid a memPartFree on VxWorks.  It will leak memory, though.
   ACE_THR_FUNC_RETURN status = 0;
@@ -748,8 +730,7 @@ Client::svc (void)
 int
 Client::cube_octet (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->call_count_++;
       // Cube an octet.
@@ -759,14 +740,11 @@ Client::cube_octet (void)
       START_QUANTIFY;
 
       if (this->ts_->use_utilization_test_ == 1 && this->ts_->remote_invocations_ == 0)
-        ret_octet = this->cubit_impl_.cube_octet (arg_octet
-                                                  ACE_ENV_ARG_PARAMETER);
+        ret_octet = this->cubit_impl_.cube_octet (arg_octet);
       else
-        ret_octet = this->cubit_->cube_octet (arg_octet
-                                              ACE_ENV_ARG_PARAMETER);
+        ret_octet = this->cubit_->cube_octet (arg_octet);
 
       STOP_QUANTIFY;
-      ACE_TRY_CHECK;
 
       // Perform the cube operation.
       arg_octet = arg_octet * arg_octet * arg_octet;
@@ -782,20 +760,18 @@ Client::cube_octet (void)
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "call to cube_octet()\n");
+      ex._tao_print_exception ("call to cube_octet()\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 Client::cube_short (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->call_count_++;
 
@@ -803,10 +779,8 @@ Client::cube_short (void)
       CORBA::Short ret_short;
 
       START_QUANTIFY;
-      ret_short = this->cubit_->cube_short (arg_short
-                                            ACE_ENV_ARG_PARAMETER);
+      ret_short = this->cubit_->cube_short (arg_short);
       STOP_QUANTIFY;
-      ACE_TRY_CHECK;
       arg_short = arg_short * arg_short * arg_short;
 
       if (arg_short != ret_short)
@@ -819,20 +793,18 @@ Client::cube_short (void)
                             -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "call to cube_short\n");
+      ex._tao_print_exception ("call to cube_short\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 Client::cube_long (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->call_count_++;
 
@@ -840,10 +812,8 @@ Client::cube_long (void)
       CORBA::Long ret_long;
 
       START_QUANTIFY;
-      ret_long = this->cubit_->cube_long (arg_long
-                                          ACE_ENV_ARG_PARAMETER);
+      ret_long = this->cubit_->cube_long (arg_long);
       STOP_QUANTIFY;
-      ACE_TRY_CHECK;
 
       arg_long = arg_long * arg_long * arg_long;
 
@@ -856,20 +826,18 @@ Client::cube_long (void)
                       ret_long));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "call to cube_long()\n");
+      ex._tao_print_exception ("call to cube_long()\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 Client::cube_struct (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Cubit::Many arg_struct;
       Cubit::Many ret_struct;
@@ -881,10 +849,8 @@ Client::cube_struct (void)
       arg_struct.o = func (this->num_);
 
       START_QUANTIFY;
-      ret_struct = this->cubit_->cube_struct (arg_struct
-                                              ACE_ENV_ARG_PARAMETER);
+      ret_struct = this->cubit_->cube_struct (arg_struct);
       STOP_QUANTIFY;
-      ACE_TRY_CHECK;
 
       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
@@ -899,12 +865,11 @@ Client::cube_struct (void)
                       "**cube_struct error!\n"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "call to cube_struct()\n");
+      ex._tao_print_exception ("call to cube_struct()\n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -942,21 +907,18 @@ Client::make_request (void)
     }
   else
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           this->call_count_++;
           START_QUANTIFY;
-          this->cubit_->noop (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->cubit_->noop ();
           STOP_QUANTIFY;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "oneway call noop()\n");
+          ex._tao_print_exception ("oneway call noop()\n");
           return -1;
         }
-      ACE_ENDTRY;
     }
   // return success.
   return 0;
@@ -1016,12 +978,7 @@ ACE_timer_t
 Client::calc_delta (ACE_timer_t real_time,
                     ACE_timer_t delta)
 {
-  ACE_timer_t new_delta;
-#if defined (ACE_LACKS_FLOATING_POINT)
-  new_delta = 40 * real_time / 100  +  60 * delta / 100;
-#else /* !ACE_LACKS_FLOATING_POINT */
-  new_delta = 0.4 * fabs (real_time)  +  0.6 * delta;
-#endif /* ACE_LACKS_FLOATING_POINT */
+  ACE_timer_t new_delta = 0.4 * fabs (real_time)  +  0.6 * delta;
   return new_delta;
 }
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 98b43509b90..0fdb777c5f3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -58,12 +58,6 @@
 # include /**/ <math.h>
 #endif /* ACE_HAS_EXCEPTIONS */
 
-#if defined (ACE_LACKS_FLOATING_POINT)
-// The following is just temporary, until we finish the sqrt()
-// implementation.
-#define sqrt(X) (1)
-#endif /* ACE_LACKS_FLOATING_POINT */
-
 #if defined (ACE_HAS_QUANTIFY)
 # define START_QUANTIFY quantify_start_recording_data ();
 # define STOP_QUANTIFY quantify_stop_recording_data();
@@ -279,14 +273,13 @@ public:
   // cubed.
 
 private:
-  CORBA::ORB_ptr init_orb (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::ORB_ptr init_orb (void);
   // initialize the ORB.
 
   void read_ior (void);
   // reads the cubit ior from a file.
 
-  int get_cubit (CORBA::ORB_ptr orb
-                 ACE_ENV_ARG_DECL);
+  int get_cubit (CORBA::ORB_ptr orb);
   // gets the cubit object.
 
   int run_tests (void);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
index 23cc89ffc17..80be1bd682c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
@@ -38,19 +38,9 @@ ACE_timer_t
 MT_Cubit_Timer::get_elapsed (void)
 {
   ACE_timer_t real_time;
-#if defined (ACE_LACKS_FLOATING_POINT)
-# if defined (CHORUS_MVME)
-  real_time = (this->pstopTime_ - this->pstartTime_) / this->granularity_;
-# else /* CHORUS_MVME */
-  // Store the time in usecs.
-  real_time = (this->delta_.sec () * ACE_ONE_SECOND_IN_USECS  +
-               this->delta_.usec ()) / this->granularity_;
-# endif /* !CHORUS_MVME */
-#else  /* !ACE_LACKS_FLOATING_POINT */
   // Store the time in usecs.
   real_time = (ACE_timer_t) this->delta_.sec () * ACE_ONE_SECOND_IN_USECS  +
               (ACE_timer_t) this->delta_.usec ();
   real_time = real_time/this->granularity_;
-#endif /* !ACE_LACKS_FLOATING_POINT */
   return real_time; // in usecs.
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index cd3adaaf7ca..5e5cf7f7b1a 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -18,32 +18,28 @@ Cubit_i::~Cubit_i (void)
 }
 
 CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_octet (CORBA::Octet o)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Octet) (o * o * o);
 }
 
 CORBA::Short
-Cubit_i::cube_short (CORBA::Short s
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_short (CORBA::Short s)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Short) (s * s * s);
 }
 
 CORBA::Long
-Cubit_i::cube_long (CORBA::Long l
-                    ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_long (CORBA::Long l)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Long) (l * l * l);
 }
 
 Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values
-                      ACE_ENV_ARG_DECL_NOT_USED)
+Cubit_i::cube_struct (const Cubit::Many &values)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Cubit::Many out_values;
@@ -56,13 +52,13 @@ Cubit_i::cube_struct (const Cubit::Many &values
 }
 
 void
-Cubit_i::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::noop (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // does nothing.
 }
 
-void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Cubit_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -71,7 +67,7 @@ void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index eaa646cfb06..f6ccfbac37f 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -29,30 +29,26 @@ public:
            PortableServer::POA_ptr poa);
   ~Cubit_i (void);
 
-  virtual CORBA::Octet cube_octet (CORBA::Octet o
-                                   ACE_ENV_ARG_DECL)
+  virtual CORBA::Octet cube_octet (CORBA::Octet o)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Short cube_short (CORBA::Short s
-                                   ACE_ENV_ARG_DECL)
+  virtual CORBA::Short cube_short (CORBA::Short s)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long cube_long (CORBA::Long l
-                                 ACE_ENV_ARG_DECL)
+  virtual CORBA::Long cube_long (CORBA::Long l)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Cubit::Many cube_struct (const Cubit::Many &values
-                                   ACE_ENV_ARG_DECL)
+  virtual Cubit::Many cube_struct (const Cubit::Many &values)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void noop (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void noop (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableServer::POA_ptr
-      _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+      _default_POA (void);
   // The default POA
 
 protected:
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
index 1d5e7f07ee2..c06f2da81c8 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -13,23 +13,19 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 void
 Roundtrip::test_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
 void
 Roundtrip::shutdown (
-       Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-       ACE_ENV_ARG_DECL_NOT_USED)
+       Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  _tao_rh->shutdown ();
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
index fbabce99373..f78986c76d2 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
@@ -23,12 +23,10 @@ class Roundtrip
 
     // = The skeleton methods
     void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                      Test::Timestamp send_time
-                      ACE_ENV_ARG_DECL)
+                      Test::Timestamp send_time)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-    void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-                   ACE_ENV_ARG_DECL)
+    void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
index 00a51f7de75..c4b3259bbb0 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
@@ -81,22 +81,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -109,8 +106,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start);
         }
 
       ACE_Sample_History history (niterations);
@@ -120,8 +116,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -150,16 +145,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
index a76449261c5..6f8dc163913 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -112,26 +106,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
index c9e68d98406..cc38547a7cc 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
@@ -11,16 +11,15 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip::test_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h
index 4beb6b62d87..c18e2f831b4 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h
@@ -22,11 +22,10 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index e2107878934..dbbbe96c14d 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -24,8 +24,7 @@ Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
 }
 
 void
-Roundtrip_Handler::test_method (Test::Timestamp send_time
-                                ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip_Handler::test_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
@@ -35,42 +34,36 @@ Roundtrip_Handler::test_method (Test::Timestamp send_time
 }
 
 void
-Roundtrip_Handler::test_method_excep (::Messaging::ExceptionHolder *holder
-                                      ACE_ENV_ARG_DECL)
+Roundtrip_Handler::test_method_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_method:");
+      ex._tao_print_exception ("test_method:");
     }
-  ACE_ENDTRY;
 }
 
 void
-Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Roundtrip_Handler::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder
-                                   ACE_ENV_ARG_DECL)
+Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown:");
+      ex._tao_print_exception ("shutdown:");
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index 213377e6629..ee1670353d8 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -29,17 +29,14 @@ public:
   void dump_results (ACE_UINT32 gsf);
 
   // = The skeleton methods
-  virtual void test_method (Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
+  virtual void test_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (::Messaging::ExceptionHolder *holder
-                                  ACE_ENV_ARG_DECL)
+  virtual void test_method_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
-                               ACE_ENV_ARG_DECL)
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
index 6df92f32a3f..157dbe15c4f 100644
--- a/TAO/performance-tests/Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
@@ -13,12 +13,10 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 int
 Server_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index ac678fc1a15..6e0abf22d68 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -72,15 +72,13 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -88,23 +86,19 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -115,8 +109,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start);
         }
 
       Roundtrip_Handler *roundtrip_handler_impl;
@@ -126,11 +119,9 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
 
       Test::AMI_RoundtripHandler_var roundtrip_handler =
-        roundtrip_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_handler_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_hrtime_t test_start = ACE_OS::gethrtime ();
 
@@ -138,20 +129,17 @@ main (int argc, char *argv[])
          {
            // Invoke asynchronous operation....
            roundtrip->sendc_test_method (roundtrip_handler.in (),
-                                         ACE_OS::gethrtime ()
-                                         ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+                                         ACE_OS::gethrtime ());
+           if (orb->work_pending ())
+              orb->perform_work ();
 
-           ACE_TRY_CHECK;
          }
 
        ACE_Time_Value tv (0, 2000);
 
        while (roundtrip_handler_impl->pending_callbacks ())
          {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_TRY_CHECK;
+           orb->perform_work (tv);
          }
 
       ACE_hrtime_t test_end = ACE_OS::gethrtime ();
@@ -166,21 +154,17 @@ main (int argc, char *argv[])
                                              test_end - test_start,
                                              niterations);
 
-      roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      roundtrip->shutdown ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught: ");
+      ex._tao_print_exception ("Exception caught: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp
index 9aefa38f531..f92e231ed00 100644
--- a/TAO/performance-tests/Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Latency/AMI/server.cpp
@@ -73,15 +73,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -89,12 +87,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -106,12 +102,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -123,8 +117,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Task server_task (orb.in ());
       if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -139,18 +132,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
index dbdeba1795e..e2221d4b214 100644
--- a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp
@@ -21,7 +21,7 @@ Client_Task::Client_Task (Test::Roundtrip_ptr reference,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (CORBA::is_nil (this->remote_ref_.in ()))
       {
@@ -45,8 +45,7 @@ Client_Task::svc (void)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) this->remote_ref_->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->remote_ref_->test_method (start);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -69,17 +68,14 @@ Client_Task::svc (void)
                                              stats.samples_count ());
 
       //shutdown the server ORB
-      this->remote_ref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->remote_ref_->shutdown ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
diff --git a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
index f4c6d4c2719..403e7ef30b8 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
@@ -64,12 +64,10 @@ main (int argc, char *argv[])
   //Use Real-time Scheduling class if possible
   set_priority();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, 0);
 
       if (parse_args (argc,argv) == -1)
         return -1;
@@ -106,10 +104,9 @@ main (int argc, char *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
index 5826226a627..324775f0c51 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.cpp
@@ -10,16 +10,15 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip::test_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.h b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
index 4beb6b62d87..c18e2f831b4 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
@@ -22,11 +22,10 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
index 33f309ff316..7c7d790e55d 100644
--- a/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Server_Task.cpp
@@ -23,17 +23,13 @@ Server_Task::get_reference ()
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -41,8 +37,7 @@ Server_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 ();
 
      Roundtrip *rt_impl;
 
@@ -53,8 +48,7 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer(rt_impl);
 
      this->rt_var_ =
-       rt_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       rt_impl->_this ();
 
      if (CORBA::is_nil (this->rt_var_.in ()))
       {
@@ -63,31 +57,25 @@ Server_Task::svc (void)
                           1);
       }
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      ACE_DEBUG ((LM_DEBUG, "Server_Task: Object Activation complete\n"));
 
      // Signal the main thread to spawn the client
      this->cond_.signal ();
 
-     this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->run ();
 
-     root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     root_poa->destroy (1, 1);
 
-     this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->destroy ();
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
 
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
index df15cd65d8a..3df9ac2e593 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
@@ -11,16 +11,15 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip::test_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h
index 4beb6b62d87..c18e2f831b4 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.h
@@ -22,11 +22,10 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index 7bc5b0b292f..2df664cc4c8 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -84,18 +84,16 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -108,15 +106,13 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           CORBA::Request_var request =
-            object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            object->_request ("test_method");
 
           CORBA::ULongLong dummy = 0;
           request->add_in_arg("send_time") <<= dummy;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          request->invoke ();
         }
 
       ACE_Sample_History history (niterations);
@@ -127,15 +123,13 @@ main (int argc, char *argv[])
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
           CORBA::Request_var request =
-            object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            object->_request ("test_method");
 
           CORBA::ULongLong start_time = static_cast <CORBA::ULongLong> (start);
           request->add_in_arg("send_time") <<= start_time;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          request->invoke ();
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -165,20 +159,17 @@ main (int argc, char *argv[])
       if (do_shutdown)
         {
           CORBA::Request_var request =
-            object->_request ("shutdown" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            object->_request ("shutdown");
 
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          request->invoke ();
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp
index a76449261c5..6f8dc163913 100644
--- a/TAO/performance-tests/Latency/DII/server.cpp
+++ b/TAO/performance-tests/Latency/DII/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -112,26 +106,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
index 5cd2f655186..950ca0f7eff 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
@@ -15,13 +15,11 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request
-                   ACE_ENV_ARG_DECL)
+Roundtrip::invoke (CORBA::ServerRequest_ptr request)
 {
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->shutdown (0);
 
       return;
     }
@@ -29,20 +27,15 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->create_list (0, list);
 
       CORBA::Any type_id;
       type_id._tao_set_typecode (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("type_id", type_id, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (0);
 
       const char *arg;
       *(nv->value ()) >>= arg;
@@ -56,8 +49,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
       CORBA::Any result;
       result <<= CORBA::Any::from_boolean (type_matches);
 
-      request->set_result (result ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (result);
 
       return;
     }
@@ -65,23 +57,17 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->create_list (0, list);
 
       CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("send_time", send_time, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (0);
 
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (*(nv->value ()));
 
       return;
     }
@@ -89,14 +75,12 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   CORBA::Any bad_operation;
   CORBA::BAD_OPERATION exception;
   bad_operation <<= exception;
-  request->set_exception (bad_operation ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  request->set_exception (bad_operation);
 }
 
 CORBA::RepositoryId
 Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               PortableServer::POA_ptr)
 {
   return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
 }
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.h b/TAO/performance-tests/Latency/DSI/Roundtrip.h
index d98fa730f1f..ecd7edb359f 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.h
@@ -24,12 +24,10 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The DSI methods
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL);
+  virtual void invoke (CORBA::ServerRequest_ptr request);
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL);
+      PortableServer::POA_ptr poa);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp
index e4460d924b3..3c321546dfa 100644
--- a/TAO/performance-tests/Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Latency/DSI/client.cpp
@@ -80,22 +80,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -108,8 +105,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start);
         }
 
       ACE_Sample_History history (niterations);
@@ -119,8 +115,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -149,16 +144,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp
index e986310ab43..506f78b7293 100644
--- a/TAO/performance-tests/Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Latency/DSI/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,18 +91,13 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (roundtrip_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (roundtrip_impl);
 
       CORBA::Object_var roundtrip =
-        root_poa->id_to_reference (oid.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (oid.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -118,26 +109,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
index 72f83576b44..6f42247d210 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
@@ -11,16 +11,15 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip::test_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
index 4beb6b62d87..c18e2f831b4 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
@@ -22,11 +22,10 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index e7bd528901c..01193a9f47f 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -96,22 +96,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -124,8 +121,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start);
         }
 
       ACE_Sample_History history (niterations);
@@ -144,21 +140,17 @@ main (int argc, char *argv[])
               CORBA::ULongLong start = ACE_OS::gethrtime ();
 
               request[j] =
-                roundtrip->_request ("test_method"
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                roundtrip->_request ("test_method");
 
               request[j]->add_in_arg () <<= start;
               request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-              request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              request[j]->send_deferred ();
             }
 
           for (j = 0; j != burst; ++j)
             {
-              request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              request[j]->get_response ();
 
               CORBA::ULongLong retval;
               if ((request[j]->return_value () >>= retval) == 1)
@@ -193,17 +185,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp
index a76449261c5..6f8dc163913 100644
--- a/TAO/performance-tests/Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Latency/Deferred/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -112,26 +106,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
index 72f83576b44..6f42247d210 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
@@ -11,16 +11,15 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip::test_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
index 4beb6b62d87..c18e2f831b4 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
@@ -22,11 +22,10 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
index 00a51f7de75..c4b3259bbb0 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
@@ -81,22 +81,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -109,8 +106,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start);
         }
 
       ACE_Sample_History history (niterations);
@@ -120,8 +116,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) roundtrip->test_method (start);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           history.sample (now - start);
@@ -150,16 +145,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
index a76449261c5..6f8dc163913 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -112,26 +106,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
index 7177b1a9006..d4bfda66b43 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
@@ -16,28 +16,24 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->roundtrip_->test_method (start);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           this->latency_.sample (now - start);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -51,16 +47,15 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (void)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
-      ACE_TRY
+      try
         {
-          (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->roundtrip_->test_method (dummy);
         }
-      ACE_CATCHANY {} ACE_ENDTRY;
+      catch (const CORBA::Exception&){}
     }
 }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
index 476ee8bd23c..d9d933840c3 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
@@ -29,7 +29,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
index 2bc67948fd0..97a05de4635 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -11,16 +11,15 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip::test_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
index 4beb6b62d87..c18e2f831b4 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
@@ -22,11 +22,10 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
index fcc91075b87..fef8648500d 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
@@ -74,22 +74,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -135,16 +132,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
index 26f9ed145c8..f91bf1958a2 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -112,26 +106,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
index 87cf5ac2264..7bf5c9d2e52 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
@@ -16,28 +16,24 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->roundtrip_->test_method (start);
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           this->latency_.sample (now - start);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -51,16 +47,15 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (void)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
-      ACE_TRY
+      try
         {
-          (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->roundtrip_->test_method (dummy);
         }
-      ACE_CATCHANY {} ACE_ENDTRY;
+      catch (const CORBA::Exception&){}
     }
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
index 476ee8bd23c..d9d933840c3 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
@@ -29,7 +29,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
index 6028512202c..1f8939bedfe 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
@@ -11,16 +11,15 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip::test_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
index 4beb6b62d87..c18e2f831b4 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
@@ -22,11 +22,10 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
index e485bb2b843..598128ad43a 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
@@ -13,12 +13,10 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
 int
 Worker_Thread::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
index bb830e88a0f..87de7522626 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
@@ -74,22 +74,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -135,16 +132,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
index 11acf78a42d..3c2945e1cb5 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
@@ -63,15 +63,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,12 +77,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -96,12 +92,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -113,8 +107,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Worker_Thread worker (orb.in ());
 
@@ -123,18 +116,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
index fd523b90fe6..f988231fea5 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.cpp
@@ -15,7 +15,7 @@ Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
 
 void
 Memory_Growth::send_objref (const Test::PayLoad & /*p*/
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Manual_Event me;
@@ -31,8 +31,8 @@ Memory_Growth::send_objref (const Test::PayLoad & /*p*/
 }
 
 void
-Memory_Growth::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Memory_Growth::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
index f1f2b5646af..276540fc0da 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
@@ -22,11 +22,10 @@ public:
   Memory_Growth (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void send_objref (const Test::PayLoad &p
-                            ACE_ENV_ARG_DECL)
+  virtual void send_objref (const Test::PayLoad &p)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Memory/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp
index f883c9d7749..7bcf50a3245 100644
--- a/TAO/performance-tests/Memory/IORsize/client.cpp
+++ b/TAO/performance-tests/Memory/IORsize/client.cpp
@@ -42,19 +42,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -67,16 +64,13 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(foo_i);
 
       Test::Foo_var foo =
-        foo_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        foo_i->_this ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Memory_Growth_var mem =
-        Test::Memory_Growth::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Memory_Growth::_narrow(tmp.in ());
 
       if (CORBA::is_nil (mem.in ()))
         {
@@ -100,22 +94,17 @@ main (int argc, char *argv[])
       // Make a few calls to the remote object
       for (int iter = 0; iter != n; iter++)
         {
-          mem->send_objref (pl
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          mem->send_objref (pl);
         }
 
       // Let us run the event loop. This way we will not exit
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp
index 712dafdf097..9d347d698b9 100644
--- a/TAO/performance-tests/Memory/IORsize/server.cpp
+++ b/TAO/performance-tests/Memory/IORsize/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,12 +69,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(memory);
 
       Test::Memory_Growth_var mem =
-        memory->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        memory->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (mem.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (mem.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -90,28 +84,22 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Run the evnt loop for ever
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
index 71113a02bf4..1822fd7f190 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.cpp
@@ -11,15 +11,15 @@ Memory_Growth::Memory_Growth (CORBA::ORB_ptr orb)
 }
 
 void
-Memory_Growth::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Memory_Growth::ping (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 void
-Memory_Growth::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Memory_Growth::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
index 9f4ae96b84d..446c1786b99 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
@@ -22,10 +22,10 @@ public:
   Memory_Growth (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
index 50c39fc24fd..24fc9ca067d 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
@@ -40,22 +40,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Memory_Growth_var mem =
-        Test::Memory_Growth::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Memory_Growth::_narrow(tmp.in ());
 
       if (CORBA::is_nil (mem.in ()))
         {
@@ -68,21 +65,17 @@ main (int argc, char *argv[])
       // Make a few calls to the remote object
       for (int iter = 0; iter != n; iter++)
         {
-          mem->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          mem->ping ();
         }
 
       // Let us run the event loop. This way we will not exit
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
index 712dafdf097..9d347d698b9 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,12 +69,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(memory);
 
       Test::Memory_Growth_var mem =
-        memory->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        memory->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (mem.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (mem.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -90,28 +84,22 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Run the evnt loop for ever
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 356f3c6ecbb..535ce35b6df 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -77,8 +77,7 @@ set_rt_scheduling (void)
 
 void
 object_creation_test (PortableServer::POA_ptr poa,
-                      int create_reference_with_id
-                      ACE_ENV_ARG_DECL)
+                      int create_reference_with_id)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nCreating %d object references with %s\n",
@@ -104,16 +103,12 @@ object_creation_test (PortableServer::POA_ptr poa,
         {
           object =
             poa->create_reference_with_id (oid.in (),
-                                           "IDL:Test/Simple:1.0"
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                           "IDL:Test/Simple:1.0");
         }
       else
         {
           object =
-            poa->create_reference ("IDL:Test/Simple:1.0"
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+            poa->create_reference ("IDL:Test/Simple:1.0");
         }
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -135,17 +130,13 @@ main (int argc, char *argv[])
 {
   set_rt_scheduling ();
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -153,16 +144,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -170,41 +157,32 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("TestPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       object_creation_test (root_poa.in (),
                             0  // POA::create_reference
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            );
 
       object_creation_test (child_poa.in (),
                             1  // POA::create_reference_with_id
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            );
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index 9a013dadf0b..7c85158a9a2 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -31,28 +31,24 @@ main (int argc, char *argv [])
 
   Demux_Test_Client demux_test_client;
 
-  ACE_TRY_NEW_ENV;
+  try
     {
-      int r = demux_test_client.init (argc, argv
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int r = demux_test_client.init (argc, argv);
       if (r == -1)
         return -1;
 
-      demux_test_client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      demux_test_client.run ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index c8a5bcd7a4b..76ca11aaff5 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -47,28 +47,23 @@ Demux_Test_Client::~Demux_Test_Client (void)
 //
 
 int
-Demux_Test_Client::init (int argc, char *argv []
-                         ACE_ENV_ARG_DECL)
+Demux_Test_Client::init (int argc, char *argv [])
 {
   this->argc_ = argc;
   this->argv_ = argv;
 
   // Grab the ORB
-  ACE_TRY_EX (GET_ORB)
+  try
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (GET_ORB);
+        CORBA::ORB_init (argc, argv, "");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ORB_init");
-      ACE_RE_THROW_EX (GET_ORB);
+      ex._tao_print_exception ("ORB_init");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // now parse the rest of the arguments to determine the POA depth, the number
   // of objects with each POA and other info
@@ -102,18 +97,14 @@ Demux_Test_Client::init (int argc, char *argv []
           }
 
         // Get the IOR and output it to the file
-        ACE_TRY_EX (IOR)
+        try
           {
-            CORBA::Object_var objref = this->orb_->string_to_object (str
-                                                                     ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX (IOR);
+            CORBA::Object_var objref = this->orb_->string_to_object (str);
 
             // now narrow to Demux_Test object
 
-            this->demux_test_[i][j] = Demux_Test::_narrow (objref.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
+            this->demux_test_[i][j] = Demux_Test::_narrow (objref.in ());
 
-            ACE_TRY_CHECK_EX (IOR);
 
             if (CORBA::is_nil (this->demux_test_[i][j].in ()))
               {
@@ -123,14 +114,11 @@ Demux_Test_Client::init (int argc, char *argv []
                                   -1);
               }
             }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
           {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "object_to_string");
-            ACE_RE_THROW_EX (IOR);
+            ex._tao_print_exception ("object_to_string");
+            throw;
           }
-        ACE_ENDTRY;
-        ACE_CHECK_RETURN (-1);
       } // j and i loop
 
   ACE_OS::fclose (this->ior_fp_);
@@ -255,7 +243,7 @@ Demux_Test_Client::parse_args (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+Demux_Test_Client::run (void)
 {
   // open a temporary results file
   if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0)
@@ -265,59 +253,48 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL)
                          "Failed to open the results file for writing\n"),
                         -1);
     }
-  ACE_TRY_EX (RUN)
+  try
     {
       switch (this->is_)
         {
         case Demux_Test_Client::LINEAR:
-          (void) this->run_linear_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (RUN);
+          (void) this->run_linear_test ();
           break;
         case Demux_Test_Client::RANDOM:
-          (void) this->run_random_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (RUN);
+          (void) this->run_random_test ();
           break;
         case Demux_Test_Client::BEST:
-          (void) this->run_best_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (RUN);
+          (void) this->run_best_test ();
           break;
         case Demux_Test_Client::WORST:
-          (void) this->run_worst_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (RUN);
+          (void) this->run_worst_test ();
           break;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "run failed");
+      ex._tao_print_exception ("run failed");
       ACE_ERROR ((LM_ERROR,
                   "(%N:%l) Demux_Test_Client::run - "
                   "Error running the Client\n"));
-      ACE_RE_THROW_EX (RUN);
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (this->result_fp_);
 
-  ACE_TRY_EX (SHUTDOWN)
+  try
     {
       // call the shutdown method one the first object
-      this->demux_test_[0][0]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SHUTDOWN);
+      this->demux_test_[0][0]->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "shutdown failed");
+      ex._tao_print_exception ("shutdown failed");
       ACE_ERROR ((LM_ERROR,
                   "(%N:%l) Demux_Test_Client::run - "
                   "Error running the Client\n"));
-      ACE_RE_THROW_EX (SHUTDOWN) ;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
       // now print the results
   if (this->print_results () == -1)
@@ -332,7 +309,7 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Demux_Test_Client::run_linear_test (ACE_ENV_SINGLE_ARG_DECL)
+Demux_Test_Client::run_linear_test (void)
 {
   CORBA::ULong j, k, l, m;
   ACE_hrtime_t start, end;
@@ -345,7 +322,7 @@ Demux_Test_Client::run_linear_test (ACE_ENV_SINGLE_ARG_DECL)
             start = ACE_OS::gethrtime ();
 
             // invoke the method
-            this->op_db_[l].op_ (this->demux_test_[j][k].in () ACE_ENV_ARG_PARAMETER);
+            this->op_db_[l].op_ (this->demux_test_[j][k].in ());
 
             end = ACE_OS::gethrtime ();
 
@@ -362,7 +339,7 @@ Demux_Test_Client::run_linear_test (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Demux_Test_Client::run_random_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demux_Test_Client::run_random_test (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Random test\n"));
@@ -370,7 +347,7 @@ Demux_Test_Client::run_random_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 int
-Demux_Test_Client::run_best_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demux_Test_Client::run_best_test (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Best Test\n"));
@@ -378,7 +355,7 @@ Demux_Test_Client::run_best_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 int
-Demux_Test_Client::run_worst_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demux_Test_Client::run_worst_test (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Worst test\n"));
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h
index 7b0a3714f32..9a2ab30a4d3 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.h
@@ -38,7 +38,7 @@ public:
     WORST
   };
 
-  typedef void (*OP_PTR) (Demux_Test_ptr ACE_ENV_ARG_DECL_NOT_USED);
+  typedef void (*OP_PTR) (Demux_Test_ptr);
 
   struct Operation_DB_Entry
   {
@@ -51,10 +51,10 @@ public:
   ~Demux_Test_Client (void);
   // DTOR
 
-  int init (int argc, char *argv [] ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (int argc, char *argv []);
   // initialize the client test bed
 
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (void);
   // run the tests
 
 private:
@@ -65,16 +65,16 @@ private:
   int init_operation_db (void);
   // initialize the operation database
 
-  int run_linear_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_linear_test (void);
   // run linear strategy
 
-  int run_random_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_random_test (void);
   // run random strategy
 
-  int run_best_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_best_test (void);
   // run best strategy (w.r.t to linear)
 
-  int run_worst_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_worst_test (void);
   // run worst strategy (w.r.t to linear)
 
   int print_results (void);
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.inl b/TAO/performance-tests/POA/Demux/demux_test_client.inl
index 0d2081ee78c..0980b9cb8fe 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.inl
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.inl
@@ -1,14 +1,12 @@
 //$Id$
-static void M302 (Demux_Test_ptr objref
-                  ACE_ENV_ARG_DECL)
+static void M302 (Demux_Test_ptr objref)
 {
-  objref->M302 (ACE_ENV_SINGLE_ARG_PARAMETER);
+  objref->M302 ();
 }
 
-static void shutdown (Demux_Test_ptr objref
-                      ACE_ENV_ARG_DECL)
+static void shutdown (Demux_Test_ptr objref)
 {
-  objref->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  objref->shutdown ();
 }
 
 int Demux_Test_Client::init_operation_db (void)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index c8810c36650..0d0a304bf28 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -12,12 +12,12 @@ Demux_Test_i::Demux_Test_i (void)
 Demux_Test_i::~Demux_Test_i (void)
 {}
 
-void Demux_Test_i::M302 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Demux_Test_i::M302 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void Demux_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Demux_Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
index 6d302340364..b5aead8fb81 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.h
@@ -24,15 +24,15 @@ public:
   // dtor
 
   // Return the Default POA of this Servant
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
+  PortableServer::POA_ptr _default_POA (/*env*/)
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     };
 
-  virtual void M302 (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void M302 (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 308a59127c6..8fd3c721113 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -47,8 +47,7 @@ Demux_Test_Server::~Demux_Test_Server (void)
 //
 
 int
-Demux_Test_Server::init (int argc, char *argv []
-                         ACE_ENV_ARG_DECL)
+Demux_Test_Server::init (int argc, char *argv [])
 {
   printf ("here\n");
 
@@ -56,67 +55,53 @@ Demux_Test_Server::init (int argc, char *argv []
   this->argv_ = argv;
 
   // Grab the ORB
-  ACE_TRY_EX(GET_ORB)
+  try
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(GET_ORB);
+        CORBA::ORB_init (argc, argv, "");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ORB_init");
-      ACE_RE_THROW_EX (GET_ORB);
+      ex._tao_print_exception ("ORB_init");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Grab the ROOT POA
-  ACE_TRY_EX (GET_ROOT_POA)
+  try
     {
       CORBA::Object_var temp;      // holder for the myriad of times we get
                                    // an object which we then have to narrow.
       // Get the Root POA
 
       temp =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(GET_ROOT_POA);
+        this->orb_->resolve_initial_references ("RootPOA");
       if (CORBA::is_nil (temp.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Unable to get root poa reference.\n"),
                           1);
 
       this->root_poa_ =
-        PortableServer::POA::_narrow (temp.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (GET_ROOT_POA);
+        PortableServer::POA::_narrow (temp.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "PortableServer::POA::_narrow");
-      ACE_RE_THROW_EX (GET_ROOT_POA);
+      ex._tao_print_exception ("PortableServer::POA::_narrow");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // grab the POA Manager
-  ACE_TRY_EX (GET_POA_MGR)
+  try
     {
 
       this->poa_mgr_ =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (GET_POA_MGR);
+        this->root_poa_->the_POAManager ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "RootPOA->the_POAManager");
-      ACE_RE_THROW_EX (GET_POA_MGR);
+      ex._tao_print_exception ("RootPOA->the_POAManager");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // now parse the rest of the arguments to determine the POA depth, the number
   // of objects with each POA and other info
@@ -133,7 +118,7 @@ Demux_Test_Server::init (int argc, char *argv []
   // init the Policies used by all the POAs
   CORBA::PolicyList policies (2);
 
-  ACE_TRY_EX (POLICY)
+  try
     {
       // The id_uniqueness_policy by default is UNIQUE_ID. So each of our servants
       // will have a unique name
@@ -148,9 +133,7 @@ Demux_Test_Server::init (int argc, char *argv []
                       "Using the USER_ID policy ... \n"));
 
           policies[0] =
-            this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (POLICY);
+            this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID);
         }
       else
         {
@@ -158,9 +141,7 @@ Demux_Test_Server::init (int argc, char *argv []
                       "Using the SYSTEM_ID policy ... \n"));
 
           policies[0] =
-            this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID
-                                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (POLICY);
+            this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID);
         }
 
 
@@ -171,9 +152,7 @@ Demux_Test_Server::init (int argc, char *argv []
                       "Using the TRANSIENT Lifespan policy for the POAs\n"));
 
           policies[1] =
-            this->root_poa_->create_lifespan_policy (PortableServer::TRANSIENT
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (POLICY);
+            this->root_poa_->create_lifespan_policy (PortableServer::TRANSIENT);
         }
       else
         {
@@ -181,20 +160,15 @@ Demux_Test_Server::init (int argc, char *argv []
                       "Using the PERSISTENT Lifespan policy for the POAs\n"));
 
           policies[1] =
-            this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (POLICY);
+            this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "creating policy");
-      ACE_RE_THROW_EX (POLICY);
+      ex._tao_print_exception ("creating policy");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // now create a POA hierarchy of the desired depth and populate each POA with
   // the specified number of objects. Finally, activate these objects.
@@ -228,22 +202,17 @@ Demux_Test_Server::init (int argc, char *argv []
       ACE_OS::memset (poa_name, 0, 128);
       (void) fscanf (this->poa_fp_, "%s", poa_name);
 
-      ACE_TRY_EX (CREATE_POA)
+      try
         {
           this->child_poa_[i] = prev_poa->create_POA (poa_name,
                                                       this->poa_mgr_.in (),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (CREATE_POA);
+                                                      policies);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "create_POA");
-          ACE_RE_THROW_EX (CREATE_POA);
+          ex._tao_print_exception ("create_POA");
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
 
       for (j = 0; j < this->num_objs_; j++)
         {
@@ -252,7 +221,7 @@ Demux_Test_Server::init (int argc, char *argv []
           if (!use_user_id_)
             {
               // activate the object
-              ACE_TRY_EX (ACTIVATE_OBJ)
+              try
                 {
                   Demux_Test_i * demux_test_i_ptr;
                   ACE_NEW_RETURN (demux_test_i_ptr,
@@ -260,41 +229,30 @@ Demux_Test_Server::init (int argc, char *argv []
                                   -1);
 
                   //id = this->child_poa_[i]->activate_object (&this->demux_test_[j],
-                  id = this->child_poa_[i]->activate_object (demux_test_i_ptr
-                                                             ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (ACTIVATE_OBJ);
+                  id = this->child_poa_[i]->activate_object (demux_test_i_ptr);
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "poa->activate_obj");
-                  ACE_RE_THROW_EX (ACTIVATE_OBJ);
+                  ex._tao_print_exception ("poa->activate_obj");
+                  throw;
                 }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (-1);
 
               // Get the IOR and output it to the file
-              ACE_TRY_EX (IOR)
+              try
                 {
-                  CORBA::Object_var demux_var = this->child_poa_[i]->id_to_reference (id.in ()
-                                                                                      ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (IOR);
+                  CORBA::Object_var demux_var = this->child_poa_[i]->id_to_reference (id.in ());
 
                   CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in () ACE_ENV_ARG_PARAMETER);
+                    (demux_var.in ());
 
-                  ACE_TRY_CHECK_EX (IOR);
 
                   ACE_OS::fprintf (this->ior_fp_, "%s\n", ior.in ());
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "object_to_string");
-                  ACE_RE_THROW_EX (IOR);
+                  ex._tao_print_exception ("object_to_string");
+                  throw;
                 }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (-1);
             }
           else
             {
@@ -302,7 +260,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
               char servant_name [128];
 
-              ACE_TRY
+              try
                 {
                   Demux_Test_i * demux_test_i_ptr;
                   ACE_NEW_RETURN (demux_test_i_ptr,
@@ -321,31 +279,24 @@ Demux_Test_Server::init (int argc, char *argv []
                     PortableServer::string_to_ObjectId (servant_name);
 
                   this->child_poa_[i]->activate_object_with_id (oid.in (),
-                                                                demux_test_i_ptr
-                                                                ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                                                                demux_test_i_ptr);
 
                   // Get Object reference for demux_test_i impl object.
-                  CORBA::Object_var demux_var = demux_test_i_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  CORBA::Object_var demux_var = demux_test_i_ptr->_this ();
 
-                  ACE_TRY_CHECK;
 
                   CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in () ACE_ENV_ARG_PARAMETER);
+                    (demux_var.in ());
 
-                  ACE_TRY_CHECK;
 
                   ACE_OS::fprintf (this->ior_fp_, "%s\n", ior.in ());
 
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception& ex)
                 {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "object_to_string");
-                  ACE_RE_THROW;
+                  ex._tao_print_exception ("object_to_string");
+                  throw;
                 }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (-1);
 
             }// end of if (!use_user_id_)
 
@@ -360,20 +311,16 @@ Demux_Test_Server::init (int argc, char *argv []
 
   // now activate the POAs
 
-  ACE_TRY_EX (ACTIVATE)
+  try
     {
-      this->poa_mgr_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->poa_mgr_->activate ();
 
-      ACE_TRY_CHECK_EX (ACTIVATE);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "poa_mgr->activate");
-      ACE_RE_THROW_EX (ACTIVATE);
+      ex._tao_print_exception ("poa_mgr->activate");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // success
   return 0;
@@ -471,23 +418,20 @@ Demux_Test_Server::init_naming_service (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Demux_Test_Server::run (void)
 {
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "run failed");
+      ex._tao_print_exception ("run failed");
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) Demux_Test_Server::run - "
                          "Error running the server\n"),
                         -1);
     }
-  ACE_ENDTRY;
 
   ACE_TIMEPROBE_PRINT;
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index e26ce828e0c..1bdd5d41adf 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -39,10 +39,10 @@ public:
   ~Demux_Test_Server (void);
   // dtor
 
-  int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int run (void);
   // Execute client code.
 
-  int init (int argc, char **argv ACE_ENV_ARG_DECL_NOT_USED);
+  int init (int argc, char **argv);
   // Initialize the communication endpoint with server.
 
   int calculate_avg_latency (void);
diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp
index 629bb31cf5f..763af268bbd 100644
--- a/TAO/performance-tests/POA/Demux/server.cpp
+++ b/TAO/performance-tests/POA/Demux/server.cpp
@@ -31,28 +31,25 @@ int main (int argc, char *argv [])
 
   Demux_Test_Server demux_test_server;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       int r =
-        demux_test_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        demux_test_server.init (argc, argv);
 
       if (r == -1)
         return -1;
 
-      demux_test_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      demux_test_server.run ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
index 048928657c2..7054fb957cf 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -12,23 +12,22 @@ Factory::Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Simple_ptr
-Factory::create_simple_object (ACE_ENV_SINGLE_ARG_DECL)
+Factory::create_simple_object (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple *simple_impl;
   ACE_NEW_THROW_EX (simple_impl,
                     Simple,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Test::Simple::_nil ());
 
   PortableServer::ServantBase_var owner_transfer(simple_impl);
 
-  return simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return simple_impl->_this ();
 }
 
 void
-Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Factory::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
index d7bc357d313..9d9432a65f2 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
@@ -23,10 +23,10 @@ public:
 
   // = The skeleton methods
 
-  virtual Test::Simple_ptr create_simple_object (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Test::Simple_ptr create_simple_object (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
index f15b8b826ff..6fabe5ff9e2 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -10,16 +10,13 @@ Simple::Simple (void)
 }
 
 void
-Simple::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Simple::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (oid.in ());
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
index 7257648e605..5aa5063f182 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
@@ -23,7 +23,7 @@ public:
 
   // = The skeleton methods
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
index d3b7ab3d1e0..b950e933eab 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
@@ -78,22 +78,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Factory_var factory =
-        Test::Factory::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Factory::_narrow (object.in ());
 
       if (CORBA::is_nil (factory.in ()))
         {
@@ -118,8 +115,7 @@ main (int argc, char *argv[])
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
           references[i] =
-            factory->create_simple_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            factory->create_simple_object ();
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           activation.sample (now - start);
@@ -142,8 +138,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          references[j]->destroy ();
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           destruction.sample (now - start);
@@ -161,16 +156,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          factory->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
index 562e77540ef..7f56f5ae556 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -70,15 +70,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -86,15 +84,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -120,8 +115,7 @@ main (int argc, char *argv[])
           PortableServer::ServantBase_var owner_transfer(simple_impl);
 
           references[i] =
-            simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            simple_impl->_this ();
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           activation.sample (now - start);
@@ -144,8 +138,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          references[j]->destroy ();
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
           destruction.sample (now - start);
@@ -161,18 +154,15 @@ main (int argc, char *argv[])
       destruction.collect_basic_stats (destruction_stats);
       destruction_stats.dump_results ("Destruction", gsf);
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
index 9f3699650df..9135f1a72fe 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
@@ -61,15 +61,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -77,12 +75,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -94,12 +90,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(factory_impl);
 
       Test::Factory_var factory =
-        factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (factory.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (factory.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -111,26 +105,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index c3a276474ba..f3945c14ae4 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -242,8 +242,7 @@ private:
 };
 
 void
-child_poa_testing (PortableServer::POA_ptr root_poa
-                   ACE_ENV_ARG_DECL)
+child_poa_testing (PortableServer::POA_ptr root_poa)
 {
   // Policies for the child POA.
   CORBA::PolicyList policies (1);
@@ -251,17 +250,13 @@ child_poa_testing (PortableServer::POA_ptr root_poa
 
   // Id Assignment Policy
   policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Create the child POA under the RootPOA.
   PortableServer::POA_var child_poa =
     root_poa->create_POA ("child POA",
                           PortableServer::POAManager::_nil (),
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          policies);
 
   // Create an array of servants
   test_i *servants =
@@ -298,9 +293,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
 
         objects[i] =
           child_poa->create_reference_with_id (object_ids[i].in (),
-                                               "IDL:test:1.0"
-                                               ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                               "IDL:test:1.0");
       }
   }
 
@@ -313,9 +306,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
     for (i = 0; i < iterations; i++)
       {
         child_poa->activate_object_with_id (object_ids[i].in (),
-                                            &servants[i]
-                                            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                            &servants[i]);
       }
   }
 
@@ -327,9 +318,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
 
     for (i = 0; i < iterations; i++)
       {
-        child_poa->deactivate_object (object_ids[i].in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        child_poa->deactivate_object (object_ids[i].in ());
       }
   }
 
@@ -342,31 +331,24 @@ child_poa_testing (PortableServer::POA_ptr root_poa
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
         return result;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"
-                                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Create an array of servants
       test_i *servants =
@@ -395,8 +377,7 @@ main (int argc, char **argv)
 
         for (i = 0; i < iterations; i++)
           {
-            objects[i] = servants[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            objects[i] = servants[i]._this ();
           }
       }
 
@@ -407,35 +388,27 @@ main (int argc, char **argv)
 
         for (i = 0; i < iterations; i++)
           {
-            object_ids[i] = root_poa->servant_to_id (&servants[i]
-                                                     ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            object_ids[i] = root_poa->servant_to_id (&servants[i]);
           }
       }
 
       // Create the child POA.
-      child_poa_testing (root_poa.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child_poa_testing (root_poa.in ());
 
       // Destroy RootPOA.
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
       // Cleanup
       delete[] object_ids;
       delete[] objects;
       delete[] servants;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 11b369339f8..aca94dff778 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -170,24 +170,19 @@ PP_Test_Client::parse_args (void)
 void
 PP_Test_Client::send_oneway (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START);
-      this->objref_->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->objref_->send_oneway ();
       this->call_count_++;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from send_oneway");
+      ex._tao_print_exception ("from send_oneway");
 
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Twoway test.
@@ -195,24 +190,19 @@ PP_Test_Client::send_oneway (void)
 void
 PP_Test_Client::send_void (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START);
-      this->objref_->send_void (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->objref_->send_void ();
       this->call_count_++;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "from send_void");
+      ex._tao_print_exception ("from send_void");
 
       this->error_count_++;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 // Send an octet
@@ -264,40 +254,35 @@ PP_Test_Client::run ()
 int
 PP_Test_Client::shutdown_server (int do_shutdown)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (do_shutdown)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "shutdown on Pluggable_Test object\n"));
 
-          this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+          this->objref_->shutdown ();
 
-          ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
                       "server, please ACE_OS::exit"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from shutdown_server");
+      ex._tao_print_exception ("from shutdown_server");
 
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 PP_Test_Client::run_oneway (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ULong i;
 
@@ -317,30 +302,26 @@ PP_Test_Client::run_oneway (void)
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
 
-          this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->objref_->shutdown ();
 
           ACE_DEBUG ((LM_DEBUG,
                       "server, please ACE_OS::exit"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from objref_->shutdown");
+      ex._tao_print_exception ("from objref_->shutdown");
 
       return -1;
     }
-  ACE_ENDTRY;
   return this->error_count_ == 0 ? 0 : 1;
 }
 
 int
 PP_Test_Client::run_void (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ULong i;
 
@@ -360,21 +341,18 @@ PP_Test_Client::run_void (void)
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
 
-          this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->objref_->shutdown ();
 
           ACE_DEBUG ((LM_DEBUG,
                       "server, please ACE_OS::exit"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "from objref_->shutdown");
+      ex._tao_print_exception ("from objref_->shutdown");
 
       return -1;
     }
-  ACE_ENDTRY;
   return this->error_count_ == 0 ? 0 : 1;
 }
 
@@ -403,14 +381,12 @@ PP_Test_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "internet");
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
         {
@@ -426,14 +402,10 @@ PP_Test_Client::init (int argc, char **argv)
         }
 
       CORBA::Object_var factory_object =
-        this->orb_->string_to_object (this->factory_key_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (this->factory_key_);
 
       this->factory_ =
-        Pluggable_Test_Factory::_narrow (factory_object.in()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Pluggable_Test_Factory::_narrow (factory_object.in());
 
       if (CORBA::is_nil (this->factory_.in ()))
         {
@@ -449,8 +421,7 @@ PP_Test_Client::init (int argc, char **argv)
       // Now retrieve the Pluggable_Test obj ref corresponding to the key.
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_MAKE_PLUGGABLE_START);
 
-      this->objref_ = this->factory_->make_pluggable_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->objref_ = this->factory_->make_pluggable_test ();
 
       if (CORBA::is_nil (this->objref_.in ()))
         {
@@ -459,13 +430,11 @@ PP_Test_Client::init (int argc, char **argv)
                             -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Pluggable_Test::init");
+      ex._tao_print_exception ("Pluggable_Test::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index 593a4d3bdb7..bdffc79c844 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -49,20 +49,17 @@ PP_Test_Server::parse_args (void)
 
 int
 PP_Test_Server::init (int argc,
-                      char** argv
-                      ACE_ENV_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
+                      char** argv)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
-  ACE_CHECK_RETURN (-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -79,9 +76,7 @@ PP_Test_Server::init (int argc,
 
   this->factory_id_ =
     this->orb_manager_.activate_under_child_poa ("factory",
-                                                 this->factory_impl_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                 this->factory_impl_);
 
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
@@ -100,11 +95,10 @@ PP_Test_Server::init (int argc,
 }
 
 int
-PP_Test_Server::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
+PP_Test_Server::run ()
 {
-  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+  int result = this->orb_manager_.run ();
 
-  ACE_CHECK_RETURN (-1);
 
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.h b/TAO/performance-tests/Pluggable/PP_Test_Server.h
index 24eb43a7126..fb40200b862 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.h
@@ -49,11 +49,10 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize the server state - parsing arguments, etc.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb
 
 private:
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
index 7a112e46393..780b8bb00ef 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
@@ -72,11 +72,11 @@ Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void)
 }
 
 Pluggable_Test_ptr
-Pluggable_Test_Factory_i::make_pluggable_test (ACE_ENV_SINGLE_ARG_DECL)
+Pluggable_Test_Factory_i::make_pluggable_test (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START);
-  return my_pluggable_test_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return my_pluggable_test_._this ();
 }
 
 // Constructor
@@ -95,7 +95,7 @@ PP_Test_i::~PP_Test_i (void)
 // Oneway send
 
 void
-PP_Test_i::send_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+PP_Test_i::send_oneway (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START);
@@ -104,7 +104,7 @@ PP_Test_i::send_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Twoway send
 
 void
-PP_Test_i::send_void (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+PP_Test_i::send_void (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START);
@@ -112,7 +112,7 @@ PP_Test_i::send_void (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Shutdown.
 
-void PP_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void PP_Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h
index 1e866bb103b..237d7276948 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.h
@@ -34,15 +34,15 @@ public:
   ~PP_Test_i (void);
   // Destructor
 
-  virtual void send_oneway (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void send_oneway (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a oneway call.
 
-  virtual void send_void (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void send_void (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a twoway call.
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown routine.
 
@@ -65,7 +65,7 @@ public:
   ~Pluggable_Test_Factory_i (void);
   // Destructor.
 
-  virtual Pluggable_Test_ptr make_pluggable_test (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Pluggable_Test_ptr make_pluggable_test (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Make a Pluggable Test object.
 
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index 6d781f12420..19d3a9fc237 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -15,14 +15,11 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tPluggable_Test: server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       int status = pp_test_server.init (argc,
-                                        argv
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        argv);
 
       if (status == -1)
         {
@@ -32,25 +29,21 @@ main (int argc, char *argv[])
         }
       else
         {
-          pp_test_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          pp_test_server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
       ACE_UNUSED_ARG (sysex);
-      ACE_PRINT_EXCEPTION (sysex,
-                           "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
       ACE_UNUSED_ARG (userex);
-      ACE_PRINT_EXCEPTION (userex,
-                           "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   ACE_TIMEPROBE_PRINT;
 
   return 0;
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index 5a7ad1c1735..c355e16a94d 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -61,35 +61,32 @@ public:
                    const char *protocol,
                    CORBA::ULong invocation_rate,
                    CORBA::ULong message_size,
-                   CORBA::ULong iterations
-                   ACE_ENV_ARG_DECL)
+                   CORBA::ULong iterations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void end_test (ACE_ENV_SINGLE_ARG_DECL)
+  void end_test (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void oneway_sync (ACE_ENV_SINGLE_ARG_DECL)
+  void oneway_sync (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void twoway_sync (ACE_ENV_SINGLE_ARG_DECL)
+  void twoway_sync (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void oneway_method (CORBA::Long session_id,
                       CORBA::ULong iteration,
-                      const ::test::octets &payload
-                      ACE_ENV_ARG_DECL)
+                      const ::test::octets &payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void twoway_method (CORBA::Long &session_id,
                       CORBA::ULong &iteration,
-                      ::test::octets &payload
-                      ACE_ENV_ARG_DECL)
+                      ::test::octets &payload)
     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:
   CORBA::ORB_var orb_;
@@ -143,8 +140,7 @@ test_i::start_test (CORBA::Long session_id,
                     const char *protocol,
                     CORBA::ULong invocation_rate,
                     CORBA::ULong message_size,
-                    CORBA::ULong iterations
-                    ACE_ENV_ARG_DECL)
+                    CORBA::ULong iterations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList protocols;
@@ -176,9 +172,7 @@ test_i::start_test (CORBA::Long session_id,
   // Make sure we have a connection to the server using the test
   // protocol.
   this->policy_manager_->set_policy_overrides (this->test_protocol_policy_,
-                                               CORBA::SET_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::SET_OVERRIDE);
 
   // Since the network maybe unavailable temporarily, make sure to try
   // for a few times before giving up.
@@ -187,15 +181,14 @@ test_i::start_test (CORBA::Long session_id,
 
     test_protocol_setup:
 
-      ACE_TRY_EX (B1)
+      try
         {
           // Send a message to ensure that the connection is setup.
-          this->receiver_->oneway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (B1);
+          this->receiver_->oneway_sync ();
 
           goto test_protocol_success;
         }
-      ACE_CATCH (CORBA::TRANSIENT, exception)
+      catch (const CORBA::TRANSIENT&)
         {
           ++j;
 
@@ -205,13 +198,11 @@ test_i::start_test (CORBA::Long session_id,
               goto test_protocol_setup;
             }
         }
-      ACE_ENDTRY;
 
       ACE_ERROR ((LM_ERROR,
                   "Cannot setup test protocol\n"));
 
-      ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
  test_protocol_success:
@@ -219,9 +210,7 @@ test_i::start_test (CORBA::Long session_id,
   // Use IIOP for setting up the test since the test protocol maybe
   // unreliable.
   this->policy_manager_->set_policy_overrides (this->base_protocol_policy_,
-                                               CORBA::SET_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::SET_OVERRIDE);
 
   // Since the network maybe unavailable temporarily, make sure to try
   // for a few times before giving up.
@@ -230,20 +219,18 @@ test_i::start_test (CORBA::Long session_id,
 
     base_protocol_setup:
 
-      ACE_TRY_EX (B2)
+      try
         {
           // Let the server know what to expect..
           this->receiver_->start_test (session_id,
                                        protocol,
                                        invocation_rate,
                                        message_size,
-                                       iterations
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (B2);
+                                       iterations);
 
           goto base_protocol_success;
         }
-      ACE_CATCH (CORBA::TRANSIENT, exception)
+      catch (const CORBA::TRANSIENT&)
         {
           ACE_OS::sleep (1);
 
@@ -253,131 +240,103 @@ test_i::start_test (CORBA::Long session_id,
               goto base_protocol_setup;
             }
         }
-      ACE_ENDTRY;
 
       ACE_ERROR ((LM_ERROR,
                   "Cannot setup base protocol\n"));
 
-      ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+      throw CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
  base_protocol_success:
 
   // Select the test protocol for these invocation.
   this->policy_manager_->set_policy_overrides (this->test_protocol_policy_,
-                                               CORBA::SET_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::SET_OVERRIDE);
 }
 
 void
-test_i::end_test (ACE_ENV_SINGLE_ARG_DECL)
+test_i::end_test (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use IIOP to indicate end of test to server.
   this->policy_manager_->set_policy_overrides (this->base_protocol_policy_,
-                                               CORBA::SET_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::SET_OVERRIDE);
 
-  this->receiver_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->receiver_->end_test ();
 }
 
 void
-test_i::oneway_sync (ACE_ENV_SINGLE_ARG_DECL)
+test_i::oneway_sync (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->receiver_->oneway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->receiver_->oneway_sync ();
 }
 
 void
-test_i::twoway_sync (ACE_ENV_SINGLE_ARG_DECL)
+test_i::twoway_sync (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->receiver_->twoway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->receiver_->twoway_sync ();
 }
 
 void
 test_i::oneway_method (CORBA::Long session_id,
                        CORBA::ULong iteration,
-                       const ::test::octets &payload
-                       ACE_ENV_ARG_DECL)
+                       const ::test::octets &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->receiver_->oneway_method (session_id,
                                   iteration,
-                                  payload
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  payload);
 }
 
 void
 test_i::twoway_method (CORBA::Long &session_id,
                        CORBA::ULong &iteration,
-                       ::test::octets &payload
-                       ACE_ENV_ARG_DECL)
+                       ::test::octets &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->receiver_->twoway_method (session_id,
                                   iteration,
-                                  payload
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  payload);
 }
 
 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->receiver_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->receiver_->shutdown ();
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rtorb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (object.in ());
 
       int parse_args_result =
         parse_args (argc, argv);
@@ -385,28 +344,19 @@ main (int argc, char **argv)
         return parse_args_result;
 
       object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       object =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       test_var receiver =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       test_i *servant =
         new test_i (orb.in (),
@@ -418,12 +368,10 @@ main (int argc, char **argv)
       ACE_UNUSED_ARG (safe_servant);
 
       test_var test =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       FILE *output_file =
         ACE_OS::fopen (ior_file, "w");
@@ -438,18 +386,15 @@ main (int argc, char **argv)
 
       ACE_OS::fclose (output_file);
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index 586fab9059b..f728f1ccf4d 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -65,35 +65,32 @@ public:
 		   const char *protocol,
 		   CORBA::ULong invocation_rate,
 		   CORBA::ULong message_size,
-		   CORBA::ULong iterations
-                   ACE_ENV_ARG_DECL)
+		   CORBA::ULong iterations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void end_test (ACE_ENV_SINGLE_ARG_DECL)
+  void end_test (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void oneway_sync (ACE_ENV_SINGLE_ARG_DECL)
+  void oneway_sync (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void twoway_sync (ACE_ENV_SINGLE_ARG_DECL)
+  void twoway_sync (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void oneway_method (CORBA::Long session_id,
 		      CORBA::ULong iteration,
-		      const ::test::octets &payload
-		      ACE_ENV_ARG_DECL)
+		      const ::test::octets &payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void twoway_method (CORBA::Long &session_id,
 		      CORBA::ULong &iteration,
-		      ::test::octets &payload
-		      ACE_ENV_ARG_DECL)
+		      ::test::octets &payload)
     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:
   CORBA::ORB_var orb_;
@@ -129,8 +126,7 @@ test_i::start_test (CORBA::Long session_id,
 		    const char *protocol,
 		    CORBA::ULong invocation_rate,
 		    CORBA::ULong message_size,
-		    CORBA::ULong iterations
-                    ACE_ENV_ARG_DECL_NOT_USED)
+		    CORBA::ULong iterations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -173,7 +169,7 @@ test_i::start_test (CORBA::Long session_id,
 }
 
 void
-test_i::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::end_test (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Record end time.
@@ -198,7 +194,7 @@ test_i::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 	      this->number_of_invocations_received_,
 	      this->iterations_ - this->number_of_invocations_received_,
   	      (this->iterations_ - this->number_of_invocations_received_) / (double) this->iterations_ * 100));
-  
+
   if (print_missed_invocations)
     {
       ACE_DEBUG ((LM_DEBUG, "\nFollowing invocations were never received:\n"));
@@ -220,10 +216,10 @@ test_i::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   if (TAO_debug_level > 0)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
 		  "Session id ends %d\n",
 		  this->session_id_));
-      
+
       stats.dump_results ("Inter-arrival times", gsf);
 
       ACE_Throughput_Stats::dump_throughput ("Inter-arrival times", gsf,
@@ -237,13 +233,13 @@ test_i::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-test_i::oneway_sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::oneway_sync (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-test_i::twoway_sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::twoway_sync (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -251,15 +247,14 @@ test_i::twoway_sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 test_i::oneway_method (CORBA::Long session_id,
 		       CORBA::ULong iteration,
-		       const ::test::octets &payload
-		       ACE_ENV_ARG_DECL_NOT_USED)
+		       const ::test::octets &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->session_id_ != session_id)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
 		  "Late message with iteration id = %d: will not count message\n",
-		  iteration));		
+		  iteration));
       return;
     }
 
@@ -289,15 +284,14 @@ test_i::oneway_method (CORBA::Long session_id,
 void
 test_i::twoway_method (CORBA::Long &session_id,
 		       CORBA::ULong &iteration,
-		       ::test::octets &payload
-		       ACE_ENV_ARG_DECL_NOT_USED)
+		       ::test::octets &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->session_id_ != session_id)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
 		  "Late message with iteration id = %d: will not count message\n",
-		  iteration));		
+		  iteration));
       return;
     }
 
@@ -325,21 +319,19 @@ test_i::twoway_method (CORBA::Long &session_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))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 int
@@ -347,14 +339,12 @@ main (int argc, char **argv)
 {
   gsf = ACE_High_Res_Timer::global_scale_factor ();
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int parse_args_result =
         parse_args (argc, argv);
@@ -362,18 +352,13 @@ main (int argc, char **argv)
         return parse_args_result;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       test_i *servant =
 	new test_i (orb.in (),
@@ -383,12 +368,10 @@ main (int argc, char **argv)
       ACE_UNUSED_ARG (safe_servant);
 
       test_var test =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       FILE *output_file =
         ACE_OS::fopen (ior_file, "w");
@@ -403,18 +386,15 @@ main (int argc, char **argv)
 
       ACE_OS::fclose (output_file);
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index 5558f0abcee..81d8ba3eeba 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -183,11 +183,11 @@ public:
           CORBA::PolicyManager_ptr policy_manager,
           test_ptr test);
 
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
 
   void print_stats (void);
 
-  void setup (ACE_ENV_SINGLE_ARG_DECL);
+  void setup (void);
 
 private:
 
@@ -454,14 +454,12 @@ Worker::missed_end_deadline (CORBA::ULong invocation)
 }
 
 void
-Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
+Worker::setup (void)
 {
   // Make sure we have a connection to the server using the test
   // protocol.
   this->policy_manager_->set_policy_overrides (this->test_protocol_policy_,
-                                               CORBA::SET_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::SET_OVERRIDE);
 
   // Since the network maybe unavailable temporarily, make sure to try
   // for a few times before giving up.
@@ -470,15 +468,14 @@ Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
 
     test_protocol_setup:
 
-      ACE_TRY_EX (B1)
+      try
         {
           // Send a message to ensure that the connection is setup.
-          this->test_->oneway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (B1);
+          this->test_->oneway_sync ();
 
           goto test_protocol_success;
         }
-      ACE_CATCH (CORBA::TRANSIENT, exception)
+      catch (const CORBA::TRANSIENT&)
         {
           ++j;
 
@@ -488,7 +485,6 @@ Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
               goto test_protocol_setup;
             }
         }
-      ACE_ENDTRY;
 
       ACE_ERROR ((LM_ERROR,
                   "Cannot setup test protocol\n"));
@@ -501,9 +497,7 @@ Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
   // Use IIOP for setting up the test since the test protocol maybe
   // unreliable.
   this->policy_manager_->set_policy_overrides (this->base_protocol_policy_,
-                                               CORBA::SET_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::SET_OVERRIDE);
 
   // Since the network maybe unavailable temporarily, make sure to try
   // for a few times before giving up.
@@ -512,20 +506,18 @@ Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
 
     base_protocol_setup:
 
-      ACE_TRY_EX (B2)
+      try
         {
           // Let the server know what to expect..
           this->test_->start_test (this->session_id_,
                                    test_protocol,
                                    invocation_rate,
                                    message_size,
-                                   iterations
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (B2);
+                                   iterations);
 
           goto base_protocol_success;
         }
-      ACE_CATCH (CORBA::TRANSIENT, exception)
+      catch (const CORBA::TRANSIENT&)
         {
           ACE_OS::sleep (1);
 
@@ -535,7 +527,6 @@ Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
               goto base_protocol_setup;
             }
         }
-      ACE_ENDTRY;
 
       ACE_ERROR ((LM_ERROR,
                   "Cannot setup base protocol\n"));
@@ -549,13 +540,11 @@ Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Worker::run (ACE_ENV_SINGLE_ARG_DECL)
+Worker::run (void)
 {
   // Select the test protocol for these invocation.
   this->policy_manager_->set_policy_overrides (this->test_protocol_policy_,
-                                               CORBA::SET_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::SET_OVERRIDE);
 
   // Payload.
   ::test::octets_var payload (new ::test::octets);
@@ -609,18 +598,14 @@ Worker::run (ACE_ENV_SINGLE_ARG_DECL)
         {
           this->test_->oneway_method (this->session_id_,
                                       i,
-                                      payload.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                      payload.in ());
         }
       else
         {
           // Use twoway calls for LATENCY.
           this->test_->twoway_method (this->session_id_,
                                       i,
-                                      payload.inout ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                      payload.inout ());
         }
 
       // For PACED and LATENCY, each sender call is individually
@@ -659,8 +644,7 @@ Worker::run (ACE_ENV_SINGLE_ARG_DECL)
   if (test_type == THROUGHPUT &&
       ACE_OS::strcmp (test_protocol, "DIOP") != 0)
     {
-      this->test_->twoway_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->test_->twoway_sync ();
     }
 
   // Record end time for the test.
@@ -668,13 +652,10 @@ Worker::run (ACE_ENV_SINGLE_ARG_DECL)
 
   // Use IIOP to indicate end of test to server.
   this->policy_manager_->set_policy_overrides (this->base_protocol_policy_,
-                                               CORBA::SET_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::SET_OVERRIDE);
 
   // Tell server that the test is over.
-  this->test_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->test_->end_test ();
 }
 
 int
@@ -682,34 +663,24 @@ main (int argc, char **argv)
 {
   gsf = ACE_High_Res_Timer::global_scale_factor ();
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rtorb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (object.in ());
 
       int parse_args_result =
         parse_args (argc, argv);
@@ -718,14 +689,10 @@ main (int argc, char **argv)
 
       // Resolve the Network priority Mapping Manager
       object =
-        orb->resolve_initial_references ("NetworkPriorityMappingManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NetworkPriorityMappingManager");
 
       RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
-        RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ());
 
       // Initialize the custom priority mapping
       Custom_Network_Priority_Mapping *cnpm = 0;
@@ -742,41 +709,33 @@ main (int argc, char **argv)
       mapping_manager->mapping (cnpm);
 
       object =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       test_var test =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       Worker worker (orb.in (),
                      rtorb.in (),
                      policy_manager.in (),
                      test.in ());
 
-      worker.setup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      worker.setup ();
 
-      worker.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      worker.run ();
 
       if (print_statistics)
         worker.print_stats ();
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error!");
+      ex._tao_print_exception ("Error!");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
index fa29e0800ae..4c994050c98 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
@@ -11,8 +11,7 @@
 ACE_RCSID(Latency, test_i, "$Id$")
 
 void
-Test_i::test_method (CORBA::Long id
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Test_i::test_method (CORBA::Long id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -22,17 +21,13 @@ Test_i::test_method (CORBA::Long id
 }
 
 void
-Test_i::shutdown (const char *orb_id
-                  ACE_ENV_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
+Test_i::shutdown (const char *orb_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         0,
-                                        orb_id
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        orb_id);
 
-  orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  orb->shutdown (0);
 }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
index 9fdc65dd4b2..f90df5fce18 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
@@ -31,12 +31,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Long id
-                    ACE_ENV_ARG_DECL_NOT_USED)
+  void test_method (CORBA::Long id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (const char *orb_id
-                 ACE_ENV_ARG_DECL_NOT_USED)
+  void shutdown (const char *orb_id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index 5a1b5a0af83..c1a3c116dda 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -139,27 +139,22 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Obtain Priority Mapping used by the ORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PriorityMappingManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PriorityMappingManager");
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
       if (CORBA::is_nil (mapping_manager.in ()))
         {
@@ -208,13 +203,11 @@ main (int argc, char *argv[])
 
       throughput.dump_results ("Aggregated", gsf);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Orb per priority client: exception raised");
+      ex._tao_print_exception ("Orb per priority client: exception raised");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -254,7 +247,7 @@ Client::svc (void)
               native_priority));
 
   int i = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       char ior[100];
       ACE_OS::sprintf (ior,
@@ -263,12 +256,10 @@ Client::svc (void)
                        priorities[this->id_]);
 
       CORBA::Object_var object =
-        orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->string_to_object (ior);
 
       Test_var server =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -284,13 +275,10 @@ Client::svc (void)
       for (int j = 0; j < 100; ++j)
         {
           /* CORBA::PolicyList_var pols;
-          server->_validate_connection (pols.out ()
-                                        ACE_ENV_ARG_PARAMETER);
+          server->_validate_connection (pols.out ());
           */
 
-          server->test_method (this->id_
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->test_method (this->id_);
         }
 
       this->after_connection_->wait ();
@@ -303,9 +291,7 @@ Client::svc (void)
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
           // Invoke method.
-          server->test_method (this->id_
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->test_method (this->id_);
 
           // Grab timestamp again.
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -323,19 +309,18 @@ Client::svc (void)
 
       /* char orb_name[50];
       ACE_OS::sprintf (orb_name, "%d", priorities[this->id_]);
-      server->shutdown (orb_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;*/
+      server->shutdown (orb_name);
+      */
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       char message[100];
       ACE_OS::sprintf (message,
                        "ORB_per_Priority::client: Exception in thread with native priority = %d, on iteration = %d",
                        this->id_,
                        i);
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, message);
+      ex._tao_print_exception (message);
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index d163ae4de46..c0f42a139b5 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -115,14 +115,13 @@ main (int argc, char *argv[])
   CORBA::ORB_var orb;
   RTCORBA::PriorityMapping *pm = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       char *argv_[256];
       int argc_ = argc;
       for (int i = 0; i < argc; ++i)
         argv_[i] = argv[i];
-      orb = CORBA::ORB_init (argc_, argv_, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb = CORBA::ORB_init (argc_, argv_, "");
 
       // Parse the arguments.
       if (parse_args (argc_, argv_) != 0)
@@ -130,14 +129,10 @@ main (int argc, char *argv[])
 
       // Obtain Priority Mapping used by the ORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PriorityMappingManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PriorityMappingManager");
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
       if (CORBA::is_nil (mapping_manager.in ()))
         {
@@ -148,13 +143,12 @@ main (int argc, char *argv[])
 
       pm = mapping_manager->mapping ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in Orb per priority server:");
+      ex._tao_print_exception (
+        "Caught exception in Orb per priority server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   for (int i = 0; i != nthreads; ++i)
     {
@@ -210,17 +204,15 @@ Server::svc (void)
               priority_,
               native_priority));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       char orb_name[64];
       ACE_OS::sprintf (orb_name, "%d", this->priority_);
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc_, argv_, orb_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc_, argv_, orb_name);
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -228,24 +220,19 @@ Server::svc (void)
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (this->server_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (this->server_);
 
       CORBA::Object_var obj =
-        root_poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (oid.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -267,22 +254,19 @@ Server::svc (void)
       ACE_OS::fclose (output_file);
 
       // Start 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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       char message[100];
       ACE_OS::sprintf (message,
                        "ORB_per_Priority::server: Exception in thread with priority = %d",
                        this->priority_);
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, message);
+      ex._tao_print_exception (message);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index d8094de1d7a..4a5be30dfe1 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -139,24 +139,21 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test_var server =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -167,14 +164,10 @@ main (int argc, char *argv[])
         }
 
       // Obtain Priority Mapping used by the ORB.
-      object = orb->resolve_initial_references ("PriorityMappingManager"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->resolve_initial_references ("PriorityMappingManager");
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
       if (CORBA::is_nil (mapping_manager.in ()))
         {
@@ -225,17 +218,15 @@ main (int argc, char *argv[])
         }
       throughput.dump_results ("Aggregated", gsf);
 
-      server->shutdown ("" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ("");
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception: in Single_Endpoint client::main");
+      ex._tao_print_exception (
+        "Caught exception: in Single_Endpoint client::main");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -280,7 +271,7 @@ Client::svc (void)
 
   int i = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       this->before_connection_->wait ();
 
@@ -288,13 +279,10 @@ Client::svc (void)
       for (int j = 0; j < 100; ++j)
         {
           /*    CORBA::PolicyList_var pols;
-          server_->_validate_connection (pols.out ()
-                                         ACE_ENV_ARG_PARAMETER);
+          server_->_validate_connection (pols.out ());
           */
 
-          server_->test_method (this->id_
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server_->test_method (this->id_);
         }
 
       this->after_connection_->wait ();
@@ -307,9 +295,7 @@ Client::svc (void)
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
           // Invoke method.
-          server_->test_method (this->id_
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server_->test_method (this->id_);
 
           // Grab timestamp again.
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -325,16 +311,15 @@ Client::svc (void)
                                     now - latency_base);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       char message[100];
       ACE_OS::sprintf (message,
                        "Single_Endpoint::client: Exception in thread with corba priority = %d, on iteration = %d",
                        priorities[this->id_],
                        i);
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, message);
+      ex._tao_print_exception (message);
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
index a21dc9dc0c4..629a42191e8 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
@@ -58,15 +58,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -74,12 +72,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -87,12 +83,10 @@ main (int argc, char *argv[])
       Test_i server_impl;
 
       Test_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -109,21 +103,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in Single_Endpoint:server");
+      ex._tao_print_exception ("Caught exception in Single_Endpoint:server");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index f09a8e1343b..ee618b5932b 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -139,8 +139,7 @@ print_params (void)
 }
 
 static void
-twoway_work_test (Test_ptr server
-                  ACE_ENV_ARG_DECL)
+twoway_work_test (Test_ptr server)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -160,9 +159,7 @@ twoway_work_test (Test_ptr server
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->twoway_work_test (work
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      server->twoway_work_test (work);
 
 #if defined (USING_TIMERS)
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -184,8 +181,7 @@ twoway_work_test (Test_ptr server
 }
 
 static void
-oneway_work_test (Test_ptr server
-                  ACE_ENV_ARG_DECL)
+oneway_work_test (Test_ptr server)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -205,9 +201,7 @@ oneway_work_test (Test_ptr server
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->oneway_work_test (work
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      server->oneway_work_test (work);
 
 #if defined (USING_TIMERS)
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -229,8 +223,7 @@ oneway_work_test (Test_ptr server
 }
 
 static void
-oneway_payload_test (Test_ptr server
-                     ACE_ENV_ARG_DECL)
+oneway_payload_test (Test_ptr server)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -253,9 +246,7 @@ oneway_payload_test (Test_ptr server
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->oneway_payload_test (the_data
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      server->oneway_payload_test (the_data);
 
 #if defined (USING_TIMERS)
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -427,7 +418,7 @@ main (int argc, char *argv[])
   if (result != 0)
     return result;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Calibrate the timer.
       gsf = ACE_High_Res_Timer::global_scale_factor ();
@@ -436,9 +427,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       // Get the command line options.
       if (parse_args (argc, argv) != 0)
@@ -449,32 +438,20 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (obj.in ());
 
-      obj = orb->resolve_initial_references ("PolicyCurrent"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+        CORBA::PolicyCurrent::_narrow (obj.in ());
 
-      ACE_TRY_CHECK;
 
-      obj = orb->string_to_object (ior
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->string_to_object (ior);
 
-      Test_var server = Test::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var server = Test::_narrow (obj.in ());
 
       // Print testing parameters.
       print_params ();
@@ -482,9 +459,7 @@ main (int argc, char *argv[])
       // Run the test.
       if (test_twoway)
         {
-          twoway_work_test (server.in ()
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          twoway_work_test (server.in ());
         }
       else
         {
@@ -499,39 +474,29 @@ main (int argc, char *argv[])
           // Set up the sync scope policy.
           sync_scope_policy_list[0] =
             orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                                sync_scope_any
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                sync_scope_any);
 
           switch (level)
           {
             case ORB_LEVEL:
               // Set the sync scope policy at the ORB level.
               policy_manager->set_policy_overrides (sync_scope_policy_list,
-                                                    CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                    CORBA::ADD_OVERRIDE);
               break;
 
             case THREAD_LEVEL:
               // Set the sync scope policy at the thread level.
               policy_current->set_policy_overrides (sync_scope_policy_list,
-                                                    CORBA::ADD_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                    CORBA::ADD_OVERRIDE);
               break;
 
             case OBJECT_LEVEL:
               // Set the sync scope policy at the object level.
               obj = server->_set_policy_overrides (sync_scope_policy_list,
-                                                   CORBA::ADD_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                   CORBA::ADD_OVERRIDE);
 
               // Get the new object reference with the updated policy.
-              server = Test::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              server = Test::_narrow (obj.in ());
               break;
 
             default:
@@ -539,8 +504,7 @@ main (int argc, char *argv[])
           }
 
           // We are done with this policy.
-          sync_scope_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          sync_scope_policy_list[0]->destroy ();
 
           // Are we buffering the oneway requests?
           if (sync_scope == Messaging::SYNC_NONE)
@@ -562,34 +526,24 @@ main (int argc, char *argv[])
               // Set up the buffering constraint policy.
               buffering_constraint_policy_list[0] =
                 orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                                    buffering_constraint_any
-                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                    buffering_constraint_any);
 
               // Set up the constraints (at the object level).
               obj = server->_set_policy_overrides (buffering_constraint_policy_list,
-                                                   CORBA::ADD_OVERRIDE
-                                                   ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                   CORBA::ADD_OVERRIDE);
 
               // We are done with this policy.
-              buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              buffering_constraint_policy_list[0]->destroy ();
 
               // Get the new object reference with the updated policy.
-              server = Test::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              server = Test::_narrow (obj.in ());
             }
 
           // Run the oneway test.
           if (payload_test)
-            oneway_payload_test (server.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+            oneway_payload_test (server.in ());
           else
-            oneway_work_test (server.in ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            oneway_work_test (server.in ());
         }
 
       if (shutdown_server)
@@ -597,8 +551,7 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG,
                       "\nShutting down server\n"));
 
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
       // Destroy the ORB. On some platforms, e.g., Win32, the socket
@@ -607,16 +560,13 @@ main (int argc, char *argv[])
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index f4b4b02b8d1..9453f37b6d7 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -91,14 +91,12 @@ main (int argc, char *argv[])
   if (result != 0)
     return result;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       // Get the command line options.
       if (parse_args (argc, argv) != 0)
@@ -109,29 +107,21 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Test_i server_impl (orb.in ());
 
       Test_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Activated as <%s>\n",
@@ -151,26 +141,20 @@ main (int argc, char *argv[])
 
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "server");
+      ex._tao_print_exception ("server");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
index 97cb2161a4d..361f6e0e653 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
@@ -10,8 +10,7 @@ ACE_RCSID(Reliable, test_i, "$Id$")
 #endif /* __ACE_INLINE__ */
 
 void
-Test_i::oneway_work_test (CORBA::ULong work
-                          ACE_ENV_ARG_DECL_NOT_USED)
+Test_i::oneway_work_test (CORBA::ULong work)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
@@ -24,15 +23,13 @@ Test_i::oneway_work_test (CORBA::ULong work
 }
 
 void
-Test_i::oneway_payload_test (const Test::data &
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Test_i::oneway_payload_test (const Test::data &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Test_i::twoway_work_test (CORBA::ULong work
-                          ACE_ENV_ARG_DECL_NOT_USED)
+Test_i::twoway_work_test (CORBA::ULong work)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
@@ -45,9 +42,8 @@ Test_i::twoway_work_test (CORBA::ULong work
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
+Test_i::shutdown ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
index 3bab9a9e6a4..861256661ca 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
@@ -31,19 +31,16 @@ public:
   // ctor
 
   // = The Test methods.
-  void oneway_payload_test (const Test::data &d
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void oneway_payload_test (const Test::data &d)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void oneway_work_test (CORBA::ULong work
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void oneway_work_test (CORBA::ULong work)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void twoway_work_test (CORBA::ULong work
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void twoway_work_test (CORBA::ULong work)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index d64f68b5139..a9388562968 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -235,25 +235,21 @@ start_synchronization (test_ptr test,
                        Synchronizers &synchronizers)
 {
   CORBA::ULong synchronization_iterations = 1;
-  ACE_TRY_NEW_ENV
+  try
     {
       for (CORBA::ULong i = 0;
            i < synchronization_iterations;
            ++i)
         {
           test->method (work,
-                        prime_number
-                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                        prime_number);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   {
     ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
@@ -349,11 +345,10 @@ max_throughput (test_ptr test,
   CORBA::Short CORBA_priority = 0;
   CORBA::Short native_priority = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       CORBA::Boolean result =
         priority_mapping.to_native (CORBA_priority,
@@ -380,20 +375,16 @@ max_throughput (test_ptr test,
             break;
 
           test->method (work,
-                        prime_number
-                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                        prime_number);
 
           ++calls_made;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   max_rate =
     calls_made / max_throughput_timeout;
@@ -424,9 +415,9 @@ public:
 
   int svc (void);
   ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
-  void reset_priority (ACE_ENV_SINGLE_ARG_DECL);
+  void reset_priority (void);
   void print_stats (ACE_hrtime_t test_end);
-  int setup (ACE_ENV_SINGLE_ARG_DECL);
+  int setup (void);
   void missed_start_deadline (CORBA::ULong invocation);
   void missed_end_deadline (CORBA::ULong invocation);
 
@@ -477,19 +468,15 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Paced_Worker::reset_priority (ACE_ENV_SINGLE_ARG_DECL)
+Paced_Worker::reset_priority (void)
 {
   if (set_priority)
     {
-      this->current_->the_priority (this->priority_
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->current_->the_priority (this->priority_);
     }
   else
     {
-      this->current_->the_priority (continuous_worker_priority
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->current_->the_priority (continuous_worker_priority);
     }
 }
 
@@ -594,17 +581,15 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end)
 }
 
 int
-Paced_Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
+Paced_Worker::setup (void)
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
-      this->reset_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->reset_priority ();
     }
 
   this->CORBA_priority_ =
-    this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->current_->the_priority ();
 
   CORBA::Boolean result =
     this->priority_mapping_.to_native (this->CORBA_priority_,
@@ -638,11 +623,10 @@ Paced_Worker::missed_end_deadline (CORBA::ULong invocation)
 int
 Paced_Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       int result =
-        this->setup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->setup ();
 
       if (result != 0)
         return result;
@@ -664,9 +648,7 @@ Paced_Worker::svc (void)
             }
 
           this->test_->method (work,
-                               prime_number
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               prime_number);
 
           ACE_hrtime_t time_after_call =
             ACE_OS::gethrtime ();
@@ -694,13 +676,11 @@ Paced_Worker::svc (void)
 
       this->print_stats (test_end);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -719,7 +699,7 @@ public:
   int svc (void);
   void print_stats (ACE_Sample_History &history,
                     ACE_hrtime_t test_end);
-  int setup (ACE_ENV_SINGLE_ARG_DECL);
+  int setup (void);
   void print_collective_stats (void);
 
   test_var test_;
@@ -821,18 +801,15 @@ Continuous_Worker::print_collective_stats (void)
 }
 
 int
-Continuous_Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
+Continuous_Worker::setup (void)
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
-      this->current_->the_priority (continuous_worker_priority
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->current_->the_priority (continuous_worker_priority);
     }
 
   this->CORBA_priority_ =
-    this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->current_->the_priority ();
 
   CORBA::Boolean result =
     this->priority_mapping_.to_native (this->CORBA_priority_,
@@ -851,13 +828,12 @@ Continuous_Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
 int
 Continuous_Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_Sample_History history (this->iterations_);
 
       int result =
-        this->setup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->setup ();
 
       if (result != 0)
         return result;
@@ -869,9 +845,7 @@ Continuous_Worker::svc (void)
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
           this->test_->method (work,
-                               prime_number
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               prime_number);
 
           ACE_hrtime_t end = ACE_OS::gethrtime ();
           history.sample (end - start);
@@ -884,13 +858,11 @@ Continuous_Worker::svc (void)
       this->print_stats (history,
                          test_end);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -922,35 +894,25 @@ Task::svc (void)
 
   gsf = ACE_High_Res_Timer::global_scale_factor ();
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior);
 
       test_var test =
-        test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("PriorityMappingManager"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PriorityMappingManager");
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
       RTCORBA::PriorityMapping &priority_mapping =
         *mapping_manager->mapping ();
@@ -1145,17 +1107,14 @@ Task::svc (void)
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1163,11 +1122,10 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       int result =
         parse_args (argc, argv);
@@ -1202,13 +1160,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index 07f49bbd3e0..b88e1ad34fc 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -21,14 +21,13 @@ public:
           PortableServer::POA_ptr poa);
 
   void method (CORBA::ULong work,
-               CORBA::ULong prime_number
-               ACE_ENV_ARG_DECL_NOT_USED)
+               CORBA::ULong prime_number)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  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:
   CORBA::ORB_var orb_;
@@ -44,8 +43,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 void
 test_i::method (CORBA::ULong work,
-                CORBA::ULong prime_number
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CORBA::ULong prime_number)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -60,18 +58,16 @@ test_i::method (CORBA::ULong work,
 }
 
 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;
+  this->orb_->shutdown (0);
 }
 
 static const char *ior_output_file = "ior";
@@ -169,13 +165,10 @@ parse_args (int argc, char *argv[])
 int
 write_ior_to_file (const char *ior_file,
                    CORBA::ORB_ptr orb,
-                   CORBA::Object_ptr object
-                   ACE_ENV_ARG_DECL)
+                   CORBA::Object_ptr object)
 {
   CORBA::String_var ior =
-    orb->object_to_string (object
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (object);
 
   FILE *output_file =
     ACE_OS::fopen (ior_file,
@@ -219,45 +212,31 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       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;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       int result = 0;
       CORBA::ULong stacksize = 0;
@@ -280,9 +259,7 @@ Task::svc (void)
                                              max_request_buffer_size,
                                              allow_borrowing,
                                              policies,
-                                             1
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                             1);
         }
       else if (ACE_OS::strcmp (lanes_file, "empty-file") != 0)
         {
@@ -298,9 +275,7 @@ Task::svc (void)
                                 max_request_buffer_size,
                                 allow_borrowing,
                                 policies,
-                                1
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                1);
 
           if (result != 0)
             return result;
@@ -310,9 +285,7 @@ Task::svc (void)
                                 bands_file,
                                 rt_orb.in (),
                                 policies,
-                                1
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                1);
 
           if (result != 0)
             return result;
@@ -330,15 +303,11 @@ Task::svc (void)
                                        pool_priority,
                                        allow_request_buffering,
                                        max_buffered_requests,
-                                       max_request_buffer_size
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       max_request_buffer_size);
 
           policies.length (policies.length () + 1);
           policies[policies.length () - 1] =
-            rt_orb->create_threadpool_policy (threadpool_id
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            rt_orb->create_threadpool_policy (threadpool_id);
 
           if (ACE_OS::strcmp (bands_file, "empty-file") != 0)
             {
@@ -347,9 +316,7 @@ Task::svc (void)
                                     bands_file,
                                     rt_orb.in (),
                                     policies,
-                                    1
-                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                    1);
 
               if (result != 0)
                 return result;
@@ -359,23 +326,17 @@ Task::svc (void)
       policies.length (policies.length () + 1);
       policies[policies.length () - 1] =
         root_poa->create_implicit_activation_policy
-        (PortableServer::IMPLICIT_ACTIVATION
-         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        (PortableServer::IMPLICIT_ACTIVATION);
 
       policies.length (policies.length () + 1);
       policies[policies.length () - 1] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              default_thread_priority
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              default_thread_priority);
 
       PortableServer::POA_var poa =
         root_poa->create_POA ("RT POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       test_i *servant =
         new test_i (this->orb_.in (),
@@ -385,35 +346,27 @@ Task::svc (void)
       ACE_UNUSED_ARG (safe_servant);
 
       test_var test =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       result =
         write_ior_to_file (ior_output_file,
                            this->orb_.in (),
-                           test.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           test.in ());
 
       if (result != 0)
         return result;
 
-      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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -421,14 +374,12 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       int result =
         parse_args (argc, argv);
@@ -463,13 +414,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
index f7be48d6140..5c13f7380ae 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.cpp
@@ -14,13 +14,11 @@ void
 Roundtrip::test_octet_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::octet_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Octet_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_octet_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_octet_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -28,13 +26,11 @@ void
 Roundtrip::test_long_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::long_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Long_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_long_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_long_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -42,13 +38,11 @@ void
 Roundtrip::test_short_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::short_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Short_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_short_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_short_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -56,13 +50,11 @@ void
 Roundtrip::test_char_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::char_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Char_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_char_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_char_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -71,13 +63,11 @@ void
 Roundtrip::test_longlong_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::longlong_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Longlong_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_longlong_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_longlong_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
@@ -85,23 +75,19 @@ void
 Roundtrip::test_double_method (
                 Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                 const Test::double_load &,
-                Test::Timestamp send_time
-                ACE_ENV_ARG_DECL_NOT_USED)
+                Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Test_Double_Method called\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->test_double_method (send_time ACE_ENV_ARG_PARAMETER);
+  _tao_rh->test_double_method (send_time);
   //ACE_DEBUG ((LM_DEBUG, "RH completed\n"));
 }
 
 void
 Roundtrip::shutdown (
-       Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-       ACE_ENV_ARG_DECL_NOT_USED)
+       Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  _tao_rh->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  _tao_rh->shutdown ();
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
index 967b876ff5d..8ae186869cd 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
@@ -24,47 +24,40 @@ class Roundtrip
     // = The skeleton methods
     void test_octet_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::octet_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
+                            Test::Timestamp send_time)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     void test_long_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::long_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
+                            Test::Timestamp send_time)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     void test_short_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::short_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
+                            Test::Timestamp send_time)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     void test_char_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::char_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
+                            Test::Timestamp send_time)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     void test_longlong_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::longlong_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
+                            Test::Timestamp send_time)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     void test_double_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
 		                    const Test::double_load& ol,
-                            Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
+                            Test::Timestamp send_time)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
 
 
-    void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh
-                   ACE_ENV_ARG_DECL)
+    void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
index 18946dca23f..e5837148380 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, char *argv[])
             ACE_OS::strcmp (data_type, "longlong") != 0)
           return -1;
         break;
-	  
+
 	  case 's':
         sz = ACE_OS::atoi (get_opts.opt_arg ());
         break;
@@ -81,7 +81,7 @@ parse_args (int argc, char *argv[])
 
 
 void
-test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_octet_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -93,8 +93,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) roundtrip->test_octet_method (ol, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) roundtrip->test_octet_method (ol, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -124,7 +123,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 void
-test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_long_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -136,8 +135,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) roundtrip->test_long_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) roundtrip->test_long_method (ll, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -167,7 +165,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 void
-test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_short_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -179,8 +177,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) roundtrip->test_short_method (sl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) roundtrip->test_short_method (sl, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -210,7 +207,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 void
-test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_char_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -222,8 +219,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) roundtrip->test_char_method (cl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) roundtrip->test_char_method (cl, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -253,7 +249,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 void
-test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_longlong_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -265,8 +261,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) roundtrip->test_longlong_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) roundtrip->test_longlong_method (ll, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -296,7 +291,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 void
-test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_double_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -308,8 +303,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) roundtrip->test_double_method (dl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) roundtrip->test_double_method (dl, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -362,22 +356,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -387,61 +378,50 @@ main (int argc, char *argv[])
                             1);
         }
 
-	  Test::octet_load oc;	
+	  Test::octet_load oc;
 
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
           (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               start);
         }
 
       if (ACE_OS::strcmp (data_type, "octet") == 0 )
         {
-          test_octet_seq (roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_octet_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "char") == 0)
         {
-          test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_char_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "long") == 0)
         {
-          test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_long_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "short") == 0)
         {
-          test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_short_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "double") == 0)
         {
-          test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_double_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "longlong") == 0)
         {
-          test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_longlong_seq (roundtrip.in ());
         }
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
index a76449261c5..6f8dc163913 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -112,26 +106,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
index 2d9c8233557..9f324fa8e86 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.cpp
@@ -12,8 +12,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -21,8 +20,7 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -30,8 +28,7 @@ Roundtrip::test_long_method (const Test::long_load &,
 
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -39,8 +36,7 @@ Roundtrip::test_char_method (const Test::char_load &,
 
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -48,8 +44,7 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -58,16 +53,15 @@ Roundtrip::test_double_method (const Test::double_load &,
 
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
index a2c066ceda6..e9ed02ba785 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
@@ -24,36 +24,30 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
+                                    Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
+                                        Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
+                                      Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
index cbd5f79b272..97a6222f8f0 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.cpp
@@ -26,8 +26,7 @@ Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
 // = The skeleton methods for test octet load
 
 void
-Roundtrip_Handler::test_octet_method (Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip_Handler::test_octet_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
@@ -37,28 +36,24 @@ Roundtrip_Handler::test_octet_method (Test::Timestamp send_time
 }
 
 void
-Roundtrip_Handler::test_octet_method_excep (::Messaging::ExceptionHolder *holder
-                                            ACE_ENV_ARG_DECL)
+Roundtrip_Handler::test_octet_method_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_octet_method:");
+      ex._tao_print_exception ("test_octet_method:");
     }
-  ACE_ENDTRY;
 }
 
 // = The skeleton methods for test char load
 
 void
-Roundtrip_Handler::test_char_method (Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip_Handler::test_char_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
@@ -68,28 +63,24 @@ Roundtrip_Handler::test_char_method (Test::Timestamp send_time
 }
 
 void
-Roundtrip_Handler::test_char_method_excep (::Messaging::ExceptionHolder *holder
-                                           ACE_ENV_ARG_DECL)
+Roundtrip_Handler::test_char_method_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_char_method:");
+      ex._tao_print_exception ("test_char_method:");
     }
-  ACE_ENDTRY;
 }
 
 // = The skeleton methods for test long load
 
 void
-Roundtrip_Handler::test_long_method (Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip_Handler::test_long_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
@@ -99,28 +90,24 @@ Roundtrip_Handler::test_long_method (Test::Timestamp send_time
 }
 
 void
-Roundtrip_Handler::test_long_method_excep (::Messaging::ExceptionHolder *holder
-                                           ACE_ENV_ARG_DECL)
+Roundtrip_Handler::test_long_method_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_long_method:");
+      ex._tao_print_exception ("test_long_method:");
     }
-  ACE_ENDTRY;
 }
 
 // = The skeleton methods for test short load
 
 void
-Roundtrip_Handler::test_short_method (Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip_Handler::test_short_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
@@ -130,28 +117,24 @@ Roundtrip_Handler::test_short_method (Test::Timestamp send_time
 }
 
 void
-Roundtrip_Handler::test_short_method_excep (::Messaging::ExceptionHolder *holder
-                                            ACE_ENV_ARG_DECL)
+Roundtrip_Handler::test_short_method_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_short_method:");
+      ex._tao_print_exception ("test_short_method:");
     }
-  ACE_ENDTRY;
 }
 
 // = The skeleton methods for test double load
 
 void
-Roundtrip_Handler::test_double_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip_Handler::test_double_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
@@ -161,28 +144,24 @@ Roundtrip_Handler::test_double_method (Test::Timestamp send_time
 }
 
 void
-Roundtrip_Handler::test_double_method_excep (::Messaging::ExceptionHolder *holder
-                                             ACE_ENV_ARG_DECL)
+Roundtrip_Handler::test_double_method_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_double_method:");
+      ex._tao_print_exception ("test_double_method:");
     }
-  ACE_ENDTRY;
 }
 
 // = The skeleton methods for test longlong load
 
 void
-Roundtrip_Handler::test_longlong_method (Test::Timestamp send_time
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+Roundtrip_Handler::test_longlong_method (Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   --this->pending_callbacks_;
@@ -192,45 +171,39 @@ Roundtrip_Handler::test_longlong_method (Test::Timestamp send_time
 }
 
 void
-Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *holder
-                                               ACE_ENV_ARG_DECL)
+Roundtrip_Handler::test_longlong_method_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_longlong_method:");
+      ex._tao_print_exception ("test_longlong_method:");
     }
-  ACE_ENDTRY;
 }
 
 
 // = Other methods
 
 void
-Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Roundtrip_Handler::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder
-                                   ACE_ENV_ARG_DECL)
+Roundtrip_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown:");
+      ex._tao_print_exception ("shutdown:");
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
index dd3b92aaf7d..dd57789957a 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip_Handler.h
@@ -29,60 +29,47 @@ public:
   void dump_results (ACE_UINT32 gsf);
 
   // = The skeleton methods for test octet load
-  virtual void test_octet_method (Test::Timestamp send_time
-                                  ACE_ENV_ARG_DECL)
+  virtual void test_octet_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void test_octet_method_excep (::Messaging::ExceptionHolder *holder
-                                        ACE_ENV_ARG_DECL)
+  virtual void test_octet_method_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The skeleton methods for test char load
-  virtual void test_char_method (Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL)
+  virtual void test_char_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_char_method_excep (::Messaging::ExceptionHolder *holder
-                                       ACE_ENV_ARG_DECL)
+  virtual void test_char_method_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The skeleton methods for test long load
-  virtual void test_long_method  (Test::Timestamp send_time
-                                  ACE_ENV_ARG_DECL)
+  virtual void test_long_method  (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_long_method_excep (::Messaging::ExceptionHolder *holder
-                                       ACE_ENV_ARG_DECL)
+  virtual void test_long_method_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The skeleton methods for test short load
-  virtual void test_short_method (Test::Timestamp send_time
-                                  ACE_ENV_ARG_DECL)
+  virtual void test_short_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_short_method_excep (::Messaging::ExceptionHolder *holder
-                                        ACE_ENV_ARG_DECL)
+  virtual void test_short_method_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The skeleton methods for test longlong load
-  virtual void test_longlong_method (Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+  virtual void test_longlong_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_longlong_method_excep (::Messaging::ExceptionHolder *holder
-                                           ACE_ENV_ARG_DECL)
+  virtual void test_longlong_method_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The skeleton methods for test double load
-  virtual void test_double_method (Test::Timestamp send_time
-                                   ACE_ENV_ARG_DECL)
+  virtual void test_double_method (Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_double_method_excep (::Messaging::ExceptionHolder *holder
-                                         ACE_ENV_ARG_DECL)
+  virtual void test_double_method_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Other methods
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
-                               ACE_ENV_ARG_DECL)
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
index 6df92f32a3f..157dbe15c4f 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.cpp
@@ -13,12 +13,10 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 int
 Server_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index c1343244eab..89303ea3f11 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -79,8 +79,7 @@ parse_args (int argc, char *argv[])
 void test_octet_seq (Test::Roundtrip_ptr roundtrip,
                      CORBA::ORB_ptr orb,
                      Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                     Roundtrip_Handler *roundtrip_handler_impl
-                     ACE_ENV_ARG_DECL)
+                     Roundtrip_Handler *roundtrip_handler_impl)
 {
   Test::octet_load ol (sz);
   ol.length (sz);
@@ -95,20 +94,17 @@ void test_octet_seq (Test::Roundtrip_ptr roundtrip,
            // Invoke asynchronous operation....
            roundtrip->sendc_test_octet_method (rth.in (),
                                                ol,
-                                               ACE_OS::gethrtime ()
-                                               ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+                                               ACE_OS::gethrtime ());
+           if (orb->work_pending ())
+                  orb->perform_work ();
 
-           ACE_CHECK;
          }
 
   ACE_Time_Value tv (0, 2000);
 
   while (roundtrip_handler_impl->pending_callbacks ())
          {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
+           orb->perform_work (tv);
          }
 
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
@@ -128,8 +124,7 @@ void test_octet_seq (Test::Roundtrip_ptr roundtrip,
 void test_char_seq  (Test::Roundtrip_ptr roundtrip,
                      CORBA::ORB_ptr orb,
                      Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                     Roundtrip_Handler *roundtrip_handler_impl
-                     ACE_ENV_ARG_DECL)
+                     Roundtrip_Handler *roundtrip_handler_impl)
 {
   Test::char_load cl (sz);
   cl.length (sz);
@@ -144,20 +139,17 @@ void test_char_seq  (Test::Roundtrip_ptr roundtrip,
            // Invoke asynchronous operation....
            roundtrip->sendc_test_char_method  (rth.in (),
                                                cl,
-                                               ACE_OS::gethrtime ()
-                                               ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+                                               ACE_OS::gethrtime ());
+           if (orb->work_pending ())
+                  orb->perform_work ();
 
-           ACE_CHECK;
          }
 
   ACE_Time_Value tv (0, 2000);
 
   while (roundtrip_handler_impl->pending_callbacks ())
          {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
+           orb->perform_work (tv);
          }
 
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
@@ -177,8 +169,7 @@ void test_char_seq  (Test::Roundtrip_ptr roundtrip,
 void test_long_seq  (Test::Roundtrip_ptr roundtrip,
                      CORBA::ORB_ptr orb,
                      Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                     Roundtrip_Handler *roundtrip_handler_impl
-                     ACE_ENV_ARG_DECL)
+                     Roundtrip_Handler *roundtrip_handler_impl)
 {
   Test::long_load ll (sz);
   ll.length (sz);
@@ -193,20 +184,17 @@ void test_long_seq  (Test::Roundtrip_ptr roundtrip,
            // Invoke asynchronous operation....
            roundtrip->sendc_test_long_method (rth.in (),
                                               ll,
-                                              ACE_OS::gethrtime ()
-                                              ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+                                              ACE_OS::gethrtime ());
+           if (orb->work_pending ())
+                  orb->perform_work ();
 
-           ACE_CHECK;
          }
 
   ACE_Time_Value tv (0, 2000);
 
   while (roundtrip_handler_impl->pending_callbacks ())
          {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
+           orb->perform_work (tv);
          }
 
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
@@ -226,8 +214,7 @@ void test_long_seq  (Test::Roundtrip_ptr roundtrip,
 void test_short_seq (Test::Roundtrip_ptr roundtrip,
                      CORBA::ORB_ptr orb,
                      Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                     Roundtrip_Handler *roundtrip_handler_impl
-                     ACE_ENV_ARG_DECL)
+                     Roundtrip_Handler *roundtrip_handler_impl)
 {
   Test::short_load sl (sz);
   sl.length (sz);
@@ -242,20 +229,17 @@ void test_short_seq (Test::Roundtrip_ptr roundtrip,
            // Invoke asynchronous operation....
            roundtrip->sendc_test_short_method (rth.in (),
                                                sl,
-                                               ACE_OS::gethrtime ()
-                                               ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+                                               ACE_OS::gethrtime ());
+           if (orb->work_pending ())
+                  orb->perform_work ();
 
-           ACE_CHECK;
          }
 
   ACE_Time_Value tv (0, 2000);
 
   while (roundtrip_handler_impl->pending_callbacks ())
          {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
+           orb->perform_work (tv);
          }
 
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
@@ -275,8 +259,7 @@ void test_short_seq (Test::Roundtrip_ptr roundtrip,
 void test_double_seq (Test::Roundtrip_ptr roundtrip,
                       CORBA::ORB_ptr orb,
                       Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                      Roundtrip_Handler *roundtrip_handler_impl
-                      ACE_ENV_ARG_DECL)
+                      Roundtrip_Handler *roundtrip_handler_impl)
 {
   Test::double_load dl (sz);
   dl.length (sz);
@@ -291,20 +274,17 @@ void test_double_seq (Test::Roundtrip_ptr roundtrip,
            // Invoke asynchronous operation....
            roundtrip->sendc_test_double_method (rth.in (),
                                                 dl,
-                                                ACE_OS::gethrtime ()
-                                                ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+                                                ACE_OS::gethrtime ());
+           if (orb->work_pending ())
+                  orb->perform_work ();
 
-           ACE_CHECK;
          }
 
   ACE_Time_Value tv (0, 2000);
 
   while (roundtrip_handler_impl->pending_callbacks ())
          {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
+           orb->perform_work (tv);
          }
 
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
@@ -324,8 +304,7 @@ void test_double_seq (Test::Roundtrip_ptr roundtrip,
 void test_longlong_seq (Test::Roundtrip_ptr roundtrip,
                         CORBA::ORB_ptr orb,
                         Test::AMI_RoundtripHandler_ptr roundtrip_handler,
-                        Roundtrip_Handler *roundtrip_handler_impl
-                        ACE_ENV_ARG_DECL)
+                        Roundtrip_Handler *roundtrip_handler_impl)
 {
   Test::longlong_load ll (sz);
   ll.length (sz);
@@ -340,20 +319,17 @@ void test_longlong_seq (Test::Roundtrip_ptr roundtrip,
            // Invoke asynchronous operation....
            roundtrip->sendc_test_longlong_method (rth.in (),
                                                   ll,
-                                                  ACE_OS::gethrtime ()
-                                                  ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-                  orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+                                                  ACE_OS::gethrtime ());
+           if (orb->work_pending ())
+                  orb->perform_work ();
 
-           ACE_CHECK;
          }
 
   ACE_Time_Value tv (0, 2000);
 
   while (roundtrip_handler_impl->pending_callbacks ())
          {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_CHECK;
+           orb->perform_work (tv);
          }
 
   ACE_hrtime_t test_end = ACE_OS::gethrtime ();
@@ -395,15 +371,13 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -411,23 +385,19 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -441,9 +411,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = 0;
           (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               start);
         }
 
       Roundtrip_Handler *roundtrip_handler_impl;
@@ -453,82 +421,64 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
 
       Test::AMI_RoundtripHandler_var roundtrip_handler =
-        roundtrip_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_handler_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (ACE_OS::strcmp (data_type, "octet") == 0 )
         {
           test_octet_seq (roundtrip.in (),
                           orb.in (),
                           roundtrip_handler.in (),
-                          roundtrip_handler_impl
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                          roundtrip_handler_impl);
         }
       else if (ACE_OS::strcmp (data_type, "char") == 0)
         {
           test_char_seq (roundtrip.in (),
                          orb.in (),
                          roundtrip_handler.in (),
-                         roundtrip_handler_impl
-                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                         roundtrip_handler_impl);
         }
       else if (ACE_OS::strcmp (data_type, "long") == 0)
         {
           test_long_seq (roundtrip.in (),
                          orb.in (),
                          roundtrip_handler.in (),
-                         roundtrip_handler_impl
-                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                         roundtrip_handler_impl);
         }
       else if (ACE_OS::strcmp (data_type, "short") == 0)
         {
           test_short_seq (roundtrip.in (),
                           orb.in (),
                           roundtrip_handler.in (),
-                          roundtrip_handler_impl
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                          roundtrip_handler_impl);
         }
       else if (ACE_OS::strcmp (data_type, "double") == 0)
         {
           test_double_seq (roundtrip.in (),
                            orb.in (),
                            roundtrip_handler.in (),
-                           roundtrip_handler_impl
-                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                           roundtrip_handler_impl);
         }
       else if (ACE_OS::strcmp (data_type, "longlong") == 0)
         {
           test_longlong_seq (roundtrip.in (),
                              orb.in (),
                              roundtrip_handler.in (),
-                             roundtrip_handler_impl
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             roundtrip_handler_impl);
         }
 
-      roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      roundtrip->shutdown ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught: ");
+      ex._tao_print_exception ("Exception caught: ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
index 9aefa38f531..f92e231ed00 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
@@ -73,15 +73,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -89,12 +87,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -106,12 +102,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -123,8 +117,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Task server_task (orb.in ());
       if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -139,18 +132,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
index 86f6ade0015..dad3b3d2ffb 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.cpp
@@ -12,8 +12,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -21,8 +20,7 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -30,8 +28,7 @@ Roundtrip::test_long_method (const Test::long_load &,
 
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -39,8 +36,7 @@ Roundtrip::test_char_method (const Test::char_load &,
 
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -48,8 +44,7 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -58,16 +53,15 @@ Roundtrip::test_double_method (const Test::double_load &,
 
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
index a2c066ceda6..e9ed02ba785 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
@@ -24,36 +24,30 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
+                                    Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
+                                        Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
+                                      Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
index 624c7ddfb6b..b37083fb488 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
@@ -87,7 +87,7 @@ parse_args (int argc, char *argv[])
 
 
 void
-test_octet_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
+test_octet_seq (const CORBA::Object_var object)
 {
   ACE_Sample_History history (niterations);
 
@@ -101,15 +101,13 @@ test_octet_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       Test::Timestamp start_time = static_cast <Test::Timestamp> (start);
 
       CORBA::Request_var request =
-        object->_request ("test_octet_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        object->_request ("test_octet_method");
 
       request->add_in_arg("octet_load") <<= ol;
       request->add_in_arg("send_time") <<= start_time;
 
       request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      request->invoke ();
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -138,7 +136,7 @@ test_octet_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
 }
 
 void
-test_long_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
+test_long_seq (const CORBA::Object_var object)
 {
   ACE_Sample_History history (niterations);
 
@@ -151,15 +149,13 @@ test_long_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       CORBA::Request_var request =
-        object->_request ("test_long_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        object->_request ("test_long_method");
 
       request->add_in_arg("long_load") <<= ll;
       request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      request->invoke ();
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -188,7 +184,7 @@ test_long_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
 }
 
 void
-test_short_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
+test_short_seq (const CORBA::Object_var object)
 {
   ACE_Sample_History history (niterations);
 
@@ -201,15 +197,13 @@ test_short_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       CORBA::Request_var request =
-        object->_request ("test_short_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        object->_request ("test_short_method");
 
       request->add_in_arg("short_load") <<= sl;
       request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      request->invoke ();
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -238,7 +232,7 @@ test_short_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
 }
 
 void
-test_char_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
+test_char_seq (const CORBA::Object_var object)
 {
   ACE_Sample_History history (niterations);
 
@@ -251,15 +245,13 @@ test_char_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       CORBA::Request_var request =
-        object->_request ("test_char_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        object->_request ("test_char_method");
 
       request->add_in_arg("char_load") <<= cl;
       request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      request->invoke ();
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -288,7 +280,7 @@ test_char_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
 }
 
 void
-test_double_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
+test_double_seq (const CORBA::Object_var object)
 {
   ACE_Sample_History history (niterations);
 
@@ -301,15 +293,13 @@ test_double_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       CORBA::Request_var request =
-        object->_request ("test_double_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        object->_request ("test_double_method");
 
       request->add_in_arg("double_load") <<= dl;
       request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      request->invoke ();
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -338,7 +328,7 @@ test_double_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
 }
 
 void
-test_longlong_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
+test_longlong_seq (const CORBA::Object_var object)
 {
   ACE_Sample_History history (niterations);
 
@@ -351,15 +341,13 @@ test_longlong_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       CORBA::Request_var request =
-        object->_request ("test_longlong_method" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        object->_request ("test_longlong_method");
 
       request->add_in_arg("longlong_load") <<= ll;
       request->add_in_arg("send_time") <<= static_cast <Test::Timestamp> (start);
 
       request->set_return_type (CORBA::_tc_ulonglong);
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      request->invoke ();
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -413,18 +401,16 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -439,69 +425,58 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           CORBA::Request_var request =
-            object->_request ("test_octet_method" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            object->_request ("test_octet_method");
 
           Test::Timestamp dummy = 0;
           request->add_in_arg("octet_load") <<= oc;
           request->add_in_arg("send_time") <<= dummy;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          request->invoke ();
         }
 
 	  // Test various sequence types
 
 	  if (ACE_OS::strcmp (data_type, "octet") == 0 )
         {
-          test_octet_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_octet_seq (object);
         }
       else if (ACE_OS::strcmp (data_type, "char") == 0)
         {
-          test_char_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_char_seq (object);
         }
       else if (ACE_OS::strcmp (data_type, "long") == 0)
         {
-          test_long_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_long_seq (object);
         }
       else if (ACE_OS::strcmp (data_type, "short") == 0)
         {
-          test_short_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_short_seq (object);
         }
       else if (ACE_OS::strcmp (data_type, "double") == 0)
         {
-          test_double_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_double_seq (object);
         }
       else if (ACE_OS::strcmp (data_type, "longlong") == 0)
         {
-          test_longlong_seq (object ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_longlong_seq (object);
         }
 
 
       if (do_shutdown)
         {
           CORBA::Request_var request =
-            object->_request ("shutdown" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            object->_request ("shutdown");
 
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          request->invoke ();
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
index f7ce55b8577..12be41c1cdd 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -112,26 +106,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
index 7fbe1b7db19..0d9ecbb5787 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
@@ -17,13 +17,11 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request
-                   ACE_ENV_ARG_DECL)
+Roundtrip::invoke (CORBA::ServerRequest_ptr request)
 {
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->shutdown (0);
 
       return;
     }
@@ -31,20 +29,15 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->create_list (0, list);
 
       CORBA::Any type_id;
       type_id._tao_set_typecode (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("type_id", type_id, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (0);
 
       const char *arg;
       *(nv->value ()) >>= arg;
@@ -58,8 +51,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
       CORBA::Any result;
       result <<= CORBA::Any::from_boolean (type_matches);
 
-      request->set_result (result ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (result);
 
       return;
     }
@@ -67,32 +59,25 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   else if (ACE_OS::strcmp ("test_octet_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->create_list (0, list);
 
 		  // Set up the argument list
 
 	    CORBA::Any octet_load;
       octet_load._tao_set_typecode (Test::_tc_octet_load);
-	    list->add_value ("octet_load", octet_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
+	    list->add_value ("octet_load", octet_load, CORBA::ARG_IN);
 
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("send_time", send_time, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
 	    // Set up the return value
 
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (1);
 
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (*(nv->value ()));
 
       return;
     }
@@ -100,33 +85,25 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   else if (ACE_OS::strcmp ("test_long_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->create_list (0, list);
 
 		  // Set up the argument list
 
 	    CORBA::Any long_load;
       long_load._tao_set_typecode (Test::_tc_long_load);
-	    list->add_value ("long_load", long_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+	    list->add_value ("long_load", long_load, CORBA::ARG_IN);
 
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("send_time", send_time, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
 	    // Set up the return value
 
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (1);
 
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (*(nv->value ()));
 
       return;
     }
@@ -134,33 +111,25 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   else if (ACE_OS::strcmp ("test_short_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->create_list (0, list);
 
 		  // Set up the argument list
 
 	    CORBA::Any short_load;
       short_load._tao_set_typecode (Test::_tc_short_load);
-	    list->add_value ("short_load", short_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+	    list->add_value ("short_load", short_load, CORBA::ARG_IN);
 
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("send_time", send_time, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
 	    // Set up the return value
 
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (1);
 
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (*(nv->value ()));
 
       return;
     }
@@ -168,33 +137,25 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   else if (ACE_OS::strcmp ("test_char_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->create_list (0, list);
 
 		  // Set up the argument list
 
 	    CORBA::Any char_load;
       char_load._tao_set_typecode (Test::_tc_char_load);
-	    list->add_value ("char_load", char_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+	    list->add_value ("char_load", char_load, CORBA::ARG_IN);
 
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("send_time", send_time, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
 	    // Set up the return value
 
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (1);
 
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (*(nv->value ()));
 
       return;
     }
@@ -202,33 +163,25 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   else if (ACE_OS::strcmp ("test_longlong_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-		
+      this->orb_->create_list (0, list);
+
 		  // Set up the argument list
 
 	    CORBA::Any longlong_load;
       longlong_load._tao_set_typecode (Test::_tc_longlong_load);
-	    list->add_value ("longlong_load", longlong_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-		  
+	    list->add_value ("longlong_load", longlong_load, CORBA::ARG_IN);
+
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("send_time", send_time, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
 	    // Set up the return value
 
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (1);
 
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (*(nv->value ()));
 
       return;
     }
@@ -236,33 +189,25 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   else if (ACE_OS::strcmp ("test_double_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-		
+      this->orb_->create_list (0, list);
+
 		  // Set up the argument list
 
 	    CORBA::Any double_load;
       double_load._tao_set_typecode (Test::_tc_double_load);
-	    list->add_value ("double_load", double_load, CORBA::ARG_IN
-					     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-		  
+	    list->add_value ("double_load", double_load, CORBA::ARG_IN);
+
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      list->add_value ("send_time", send_time, CORBA::ARG_IN);
 
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->arguments (list);
 
 	    // Set up the return value
 
-      CORBA::NamedValue_ptr nv = list->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr nv = list->item (1);
 
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      request->set_result (*(nv->value ()));
 
       return;
     }
@@ -270,14 +215,12 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
   CORBA::Any bad_operation;
   CORBA::BAD_OPERATION exception;
   bad_operation <<= exception;
-  request->set_exception (bad_operation ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  request->set_exception (bad_operation);
 }
 
 CORBA::RepositoryId
 Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               PortableServer::POA_ptr)
 {
   return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
 }
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
index d98fa730f1f..ecd7edb359f 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
@@ -24,12 +24,10 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The DSI methods
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL);
+  virtual void invoke (CORBA::ServerRequest_ptr request);
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL);
+      PortableServer::POA_ptr poa);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
index 8298ea4930b..d3be007ed67 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
@@ -79,7 +79,7 @@ parse_args (int argc, char *argv[])
 }
 
 void
-test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_octet_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -92,9 +92,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_octet_method (ol,
-                                           start
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                           start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -123,7 +121,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 }
 
 void
-test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_long_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -136,9 +134,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_long_method (ll,
-                                          start
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -168,7 +164,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 void
-test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_short_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -181,9 +177,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_short_method (sl,
-                                           start
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                           start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -213,7 +207,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 void
-test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_char_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -226,9 +220,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_char_method (cl,
-                                          start
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -258,7 +250,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 void
-test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_longlong_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -271,9 +263,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_longlong_method (ll,
-                                              start
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -303,7 +293,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 void
-test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_double_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -316,9 +306,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_double_method (dl,
-                                            start
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                            start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -371,22 +359,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -403,55 +388,44 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = 0;
           (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               start);
         }
 
       if (ACE_OS::strcmp (data_type, "octet") == 0 )
         {
-          test_octet_seq (roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_octet_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "char") == 0)
         {
-          test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_char_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "long") == 0)
         {
-          test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_long_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "short") == 0)
         {
-          test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_short_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "double") == 0)
         {
-          test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_double_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "longlong") == 0)
         {
-          test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_longlong_seq (roundtrip.in ());
         }
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
index e986310ab43..506f78b7293 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,18 +91,13 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (roundtrip_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (roundtrip_impl);
 
       CORBA::Object_var roundtrip =
-        root_poa->id_to_reference (oid.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (oid.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -118,26 +109,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
index 5da0733d7e2..c5156625fa4 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.cpp
@@ -12,8 +12,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -21,8 +20,7 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -30,8 +28,7 @@ Roundtrip::test_long_method (const Test::long_load &,
 
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -39,8 +36,7 @@ Roundtrip::test_char_method (const Test::char_load &,
 
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -48,8 +44,7 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -58,16 +53,15 @@ Roundtrip::test_double_method (const Test::double_load &,
 
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
index a2c066ceda6..e9ed02ba785 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
@@ -24,36 +24,30 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
+                                    Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
+                                        Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
+                                      Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index b93bbd8ffbd..f1b31f293b2 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -96,7 +96,7 @@ parse_args (int argc, char *argv[])
 
 
 int
-test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_octet_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -117,22 +117,18 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_octet_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            roundtrip->_request ("test_octet_method");
 
           request[j]->add_in_arg ("octet_load") <<= ol;
           request[j]->add_in_arg ("send_time") <<= start;
                   request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->send_deferred ();
         }
 
       for (j = 0; j != burst; ++j)
         {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->get_response ();
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -169,7 +165,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_long_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -190,22 +186,18 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_long_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            roundtrip->_request ("test_long_method");
 
           request[j]->add_in_arg ("long_load") <<= ll;
           request[j]->add_in_arg ("send_time") <<= start;
                                         request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->send_deferred ();
         }
 
       for (j = 0; j != burst; ++j)
         {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->get_response ();
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -242,7 +234,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_short_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -263,22 +255,18 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_short_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            roundtrip->_request ("test_short_method");
 
           request[j]->add_in_arg ("short_load") <<= sl;
           request[j]->add_in_arg ("send_time") <<= start;
                                         request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->send_deferred ();
         }
 
       for (j = 0; j != burst; ++j)
         {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->get_response ();
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -315,7 +303,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_char_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -336,22 +324,18 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_char_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            roundtrip->_request ("test_char_method");
 
           request[j]->add_in_arg ("char_load") <<= cl;
           request[j]->add_in_arg ("send_time") <<= start;
                                         request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->send_deferred ();
         }
 
       for (j = 0; j != burst; ++j)
         {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->get_response ();
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -388,7 +372,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_longlong_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -409,22 +393,18 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_longlong_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            roundtrip->_request ("test_longlong_method");
 
           request[j]->add_in_arg ("longlong_load") <<= ll;
           request[j]->add_in_arg ("send_time") <<= start;
                                         request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->send_deferred ();
         }
 
       for (j = 0; j != burst; ++j)
         {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->get_response ();
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -461,7 +441,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_double_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -482,22 +462,18 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           request[j] =
-            roundtrip->_request ("test_double_method"
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            roundtrip->_request ("test_double_method");
 
           request[j]->add_in_arg ("double_load") <<= dl;
           request[j]->add_in_arg ("send_time") <<= start;
                                         request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-          request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->send_deferred ();
         }
 
       for (j = 0; j != burst; ++j)
         {
-          request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          request[j]->get_response ();
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -559,22 +535,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -590,9 +563,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = 0;
           (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               start);
         }
 
 
@@ -600,48 +571,39 @@ main (int argc, char *argv[])
 
           if (ACE_OS::strcmp (data_type, "octet") == 0 )
         {
-          test_octet_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_octet_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "char") == 0)
         {
-          test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_char_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "long") == 0)
         {
-          test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_long_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "short") == 0)
         {
-          test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_short_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "double") == 0)
         {
-          test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_double_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "longlong") == 0)
         {
-          test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_longlong_seq (roundtrip.in ());
         }
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
index 20ea98c2655..24964c04bf1 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -112,26 +106,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
index 83dde3b6f0e..4f212246188 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.cpp
@@ -12,8 +12,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -21,8 +20,7 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -30,8 +28,7 @@ Roundtrip::test_long_method (const Test::long_load &,
 
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -39,8 +36,7 @@ Roundtrip::test_char_method (const Test::char_load &,
 
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -48,8 +44,7 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -58,16 +53,15 @@ Roundtrip::test_double_method (const Test::double_load &,
 
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
index a2c066ceda6..e9ed02ba785 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
@@ -24,36 +24,30 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
+                                    Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
+                                        Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
+                                      Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
index 2352cf06b92..985a3445ff0 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
@@ -78,7 +78,7 @@ parse_args (int argc, char *argv[])
 }
 
 void
-test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_octet_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -91,9 +91,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_octet_method (ol,
-                                           start
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                           start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
 
@@ -123,7 +121,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 }
 
 void
-test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_long_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -136,9 +134,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_long_method (ll,
-                                          start
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -167,7 +163,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 }
 
 void
-test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_short_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -179,9 +175,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_short_method (sl,
-                                           start
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                           start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -210,7 +204,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 }
 
 void
-test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_char_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -223,9 +217,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_char_method (cl,
-                                          start
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -254,7 +246,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 }
 
 void
-test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_longlong_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -268,9 +260,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_longlong_method (ll,
-                                              start
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -299,7 +289,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 }
 
 void
-test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
+test_double_seq (Test::Roundtrip_ptr roundtrip)
 {
   ACE_Sample_History history (niterations);
 
@@ -313,9 +303,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
       (void) roundtrip->test_double_method (dl,
-                                            start
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                            start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       history.sample (now - start);
@@ -366,22 +354,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -397,55 +382,44 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = 0;
           (void) roundtrip->test_octet_method (oc,
-                                               start
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               start);
         }
 
       if (ACE_OS::strcmp (data_type, "octet") == 0 )
         {
-          test_octet_seq (roundtrip.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_octet_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "char") == 0)
         {
-          test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_char_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "long") == 0)
         {
-          test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_long_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "short") == 0)
         {
-          test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_short_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "double") == 0)
         {
-          test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_double_seq (roundtrip.in ());
         }
       else if (ACE_OS::strcmp (data_type, "longlong") == 0)
         {
-          test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_longlong_seq (roundtrip.in ());
         }
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
index b3f4e9e135d..bf31e4009df 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -113,26 +107,21 @@ main (int argc, char *argv[])
 
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
index 072b7a2888a..8e892fb74ec 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
@@ -20,48 +20,39 @@ Client_Task::Client_Task (const char *data_type,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       if (ACE_OS::strcmp (this->data_type_.in (), "octet") == 0 )
         {
-          this->test_octet_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_octet_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "long") == 0 )
         {
-          this->test_long_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_long_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "short") == 0 )
         {
-          this->test_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_short_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "char") == 0 )
         {
-          this->test_char_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_char_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "longlong") == 0 )
         {
-          this->test_longlong_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_longlong_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "double") == 0 )
         {
-          this->test_double_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_double_seq ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -75,24 +66,23 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (void)
 {
   CORBA::ULongLong dummy = 0;
   Test::octet_load oc;
 
   for (int i = 0; i != 100; ++i)
     {
-      ACE_TRY
+      try
         {
-          (void) this->roundtrip_->test_octet_method (oc, dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->roundtrip_->test_octet_method (oc, dummy);
         }
-      ACE_CATCHANY {} ACE_ENDTRY;
+      catch (const CORBA::Exception&){}
     }
 }
 
 void
-Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_octet_seq (void)
 {
   Test::octet_load ol (this->size_);
   ol.length (this->size_);
@@ -101,8 +91,7 @@ Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_octet_method (ol, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_octet_method (ol, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -111,7 +100,7 @@ Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_long_seq (void)
 {
   Test::long_load ll (this->size_);
   ll.length (this->size_);
@@ -120,8 +109,7 @@ Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_long_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_long_method (ll, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -131,7 +119,7 @@ Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_short_seq (void)
 {
   Test::short_load sl (this->size_);
   sl.length (this->size_);
@@ -140,8 +128,7 @@ Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_short_method (sl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_short_method (sl, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -150,7 +137,7 @@ Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_char_seq (void)
 {
   Test::char_load cl (this->size_);
   cl.length (this->size_);
@@ -159,8 +146,7 @@ Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_char_method (cl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_char_method (cl, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -169,7 +155,7 @@ Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_longlong_seq (void)
 {
   Test::longlong_load ll (this->size_);
   ll.length (this->size_);
@@ -178,8 +164,7 @@ Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_longlong_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_longlong_method (ll, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -188,7 +173,7 @@ Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_double_seq (void)
 {
   Test::double_load dl (this->size_);
   dl.length (this->size_);
@@ -197,8 +182,7 @@ Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_double_method (dl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_double_method (dl, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
index 340878b4354..59fd29d7eed 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
@@ -31,15 +31,15 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
   /// Some performance test methods
-  void test_octet_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_long_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_short_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_char_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_double_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_octet_seq (void);
+  void test_long_seq (void);
+  void test_short_seq (void);
+  void test_char_seq (void);
+  void test_longlong_seq (void);
+  void test_double_seq (void);
 
 private:
   /// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
index 74274ddbab5..e05abeefaad 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -12,8 +12,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -21,8 +20,7 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -30,8 +28,7 @@ Roundtrip::test_long_method (const Test::long_load &,
 
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -39,8 +36,7 @@ Roundtrip::test_char_method (const Test::char_load &,
 
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -48,8 +44,7 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -57,16 +52,15 @@ Roundtrip::test_double_method (const Test::double_load &,
 
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
index 5b1758055af..b6281d3324a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
@@ -23,36 +23,30 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
+                                    Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
+                                        Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
+                                      Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
index af752262c0d..f1db268f97e 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
@@ -38,11 +38,11 @@ parse_args (int argc, char *argv[])
             ACE_OS::strcmp (data_type, "longlong") != 0)
           return -1;
         break;
-	  
+
 	  case 's':
         sz = ACE_OS::atoi (get_opts.opt_arg ());
         break;
-	  
+
       case 'x':
         do_shutdown = 0;
         break;
@@ -96,22 +96,19 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -159,16 +156,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
index 26f9ed145c8..f91bf1958a2 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
@@ -62,15 +62,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,12 +76,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -95,12 +91,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -112,26 +106,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
index 66daa358433..6b719aa19eb 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
@@ -20,48 +20,39 @@ Client_Task::Client_Task (const char *data_type,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       if (ACE_OS::strcmp (this->data_type_.in (), "octet") == 0 )
         {
-          this->test_octet_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_octet_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "long") == 0 )
         {
-          this->test_long_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_long_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "short") == 0 )
         {
-          this->test_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_short_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "char") == 0 )
         {
-          this->test_char_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_char_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "longlong") == 0 )
         {
-          this->test_longlong_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_longlong_seq ();
         }
       if (ACE_OS::strcmp (this->data_type_.in (), "double") == 0 )
         {
-          this->test_double_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_double_seq ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 0;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -75,24 +66,23 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (void)
 {
   CORBA::ULongLong dummy = 0;
   Test::octet_load oc;
 
   for (int i = 0; i != 100; ++i)
     {
-      ACE_TRY
+      try
         {
-          (void) this->roundtrip_->test_octet_method (oc, dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->roundtrip_->test_octet_method (oc, dummy);
         }
-      ACE_CATCHANY {} ACE_ENDTRY;
+      catch (const CORBA::Exception&){}
     }
 }
 
 void
-Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_octet_seq (void)
 {
   Test::octet_load ol (this->size_);
   ol.length (this->size_);
@@ -101,8 +91,7 @@ Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_octet_method (ol, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_octet_method (ol, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -111,7 +100,7 @@ Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_long_seq (void)
 {
   Test::long_load ll (this->size_);
   ll.length (this->size_);
@@ -120,8 +109,7 @@ Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_long_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_long_method (ll, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -131,7 +119,7 @@ Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_short_seq (void)
 {
   Test::short_load sl (this->size_);
   sl.length (this->size_);
@@ -140,8 +128,7 @@ Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_short_method (sl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_short_method (sl, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -150,7 +137,7 @@ Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_char_seq (void)
 {
   Test::char_load cl (this->size_);
   cl.length (this->size_);
@@ -159,8 +146,7 @@ Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_char_method (cl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_char_method (cl, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -169,7 +155,7 @@ Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_longlong_seq (void)
 {
   Test::longlong_load ll (this->size_);
   ll.length (this->size_);
@@ -178,8 +164,7 @@ Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_longlong_method (ll, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_longlong_method (ll, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
@@ -188,7 +173,7 @@ Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::test_double_seq (void)
 {
   Test::double_load dl (this->size_);
   dl.length (this->size_);
@@ -197,8 +182,7 @@ Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      (void) this->roundtrip_->test_double_method (dl, start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->roundtrip_->test_double_method (dl, start);
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
index 340878b4354..59fd29d7eed 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
@@ -31,15 +31,15 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
   /// Some performance test methods
-  void test_octet_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_long_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_short_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_char_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL);
-  void test_double_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_octet_seq (void);
+  void test_long_seq (void);
+  void test_short_seq (void);
+  void test_char_seq (void);
+  void test_longlong_seq (void);
+  void test_double_seq (void);
 
 private:
   /// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
index d5e5f17b1cd..0c20a36b87c 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.cpp
@@ -12,8 +12,7 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 
 Test::Timestamp
 Roundtrip::test_octet_method (const Test::octet_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -21,8 +20,7 @@ Roundtrip::test_octet_method (const Test::octet_load &,
 
 Test::Timestamp
 Roundtrip::test_long_method (const Test::long_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -30,8 +28,7 @@ Roundtrip::test_long_method (const Test::long_load &,
 
 Test::Timestamp
 Roundtrip::test_char_method (const Test::char_load &,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -39,8 +36,7 @@ Roundtrip::test_char_method (const Test::char_load &,
 
 Test::Timestamp
 Roundtrip::test_longlong_method (const Test::longlong_load &,
-                                 Test::Timestamp send_time
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -48,8 +44,7 @@ Roundtrip::test_longlong_method (const Test::longlong_load &,
 
 Test::Timestamp
 Roundtrip::test_double_method (const Test::double_load &,
-                               Test::Timestamp send_time
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
@@ -57,16 +52,15 @@ Roundtrip::test_double_method (const Test::double_load &,
 
 Test::Timestamp
 Roundtrip::test_short_method (const Test::short_load &,
-                              Test::Timestamp send_time
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Roundtrip::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
index 5b1758055af..b6281d3324a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
@@ -23,36 +23,30 @@ public:
 
   // = The skeleton methods
   Test::Timestamp test_octet_method (const Test::octet_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_long_method (const Test::long_load& ol,
-                                    Test::Timestamp send_time
-                                    ACE_ENV_ARG_DECL)
+                                    Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_short_method (const Test::short_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_char_method (const Test::char_load& ol,
-                                     Test::Timestamp send_time
-                                     ACE_ENV_ARG_DECL)
+                                     Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_longlong_method (const Test::longlong_load& ol,
-                                        Test::Timestamp send_time
-                                        ACE_ENV_ARG_DECL)
+                                        Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Test::Timestamp test_double_method (const Test::double_load& ol,
-                                      Test::Timestamp send_time
-                                      ACE_ENV_ARG_DECL)
+                                      Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
index e485bb2b843..598128ad43a 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.cpp
@@ -13,12 +13,10 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
 int
 Worker_Thread::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
index f12757f7de8..1e3c055b2df 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
@@ -95,24 +95,20 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -160,17 +156,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
index 2f0ba140ea3..20d51c45845 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
@@ -63,15 +63,13 @@ main (int argc, char *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,12 +77,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -96,12 +92,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        roundtrip_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (roundtrip.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -113,8 +107,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Worker_Thread worker (orb.in ());
 
@@ -123,18 +116,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index cead7402c5c..71850aaee22 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -17,8 +17,7 @@ Receiver::Receiver (void)
 }
 
 void
-Receiver::receive_data (const Test::Message &the_message
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Receiver::receive_data (const Test::Message &the_message)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -45,7 +44,7 @@ Receiver::receive_data (const Test::Message &the_message
 }
 
 void
-Receiver::done (ACE_ENV_SINGLE_ARG_DECL)
+Receiver::done (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->message_count_ == 0)
@@ -85,15 +84,12 @@ Receiver::done (ACE_ENV_SINGLE_ARG_DECL)
         }
     }
 
-  ACE_TRY
+  try
     {
-      PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POA_var poa = this->_default_POA ();
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (oid.in ());
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
 }
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index ee6ba542224..322f3e39eb5 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -23,11 +23,10 @@ public:
   Receiver (void);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Message &message
-                             ACE_ENV_ARG_DECL)
+  virtual void receive_data (const Test::Message &message)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void done (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void done (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index c101aeee34e..f4dc0d95a4f 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -12,22 +12,21 @@ Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Receiver_ptr
-Receiver_Factory::create_receiver (ACE_ENV_SINGLE_ARG_DECL)
+Receiver_Factory::create_receiver (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Receiver *receiver_impl = 0;
   ACE_NEW_THROW_EX (receiver_impl,
                     Receiver,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Test::Receiver::_nil ());
   PortableServer::ServantBase_var transfer_ownership(receiver_impl);
 
-  return receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return receiver_impl->_this ();
 }
 
 void
-Receiver_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Receiver_Factory::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h
index b7f7ad8a1ef..c49d4c2f902 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.h
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.h
@@ -22,10 +22,10 @@ public:
   Receiver_Factory (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Receiver_ptr create_receiver (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Test::Receiver_ptr create_receiver (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index 92c312ef9df..6a904e446f2 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -61,22 +61,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Receiver_Factory_var receiver_factory =
-        Test::Receiver_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Receiver_Factory::_narrow(tmp.in ());
 
       if (CORBA::is_nil (receiver_factory.in ()))
         {
@@ -100,19 +97,16 @@ main (int argc, char *argv[])
           message.the_payload.length (message_size);
 
           Test::Receiver_var receiver =
-            receiver_factory->create_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            receiver_factory->create_receiver ();
 
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           for (int i = 0; i != message_count; ++i)
             {
               message.message_id = i;
-              receiver->receive_data (message ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              receiver->receive_data (message);
             }
 
-          receiver->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          receiver->done ();
           ACE_hrtime_t elapsed_time = ACE_OS::gethrtime () - start;
 
           // convert to microseconds
@@ -140,20 +134,16 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          receiver_factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          receiver_factory->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp
index 68afc375a0d..7876dc8e1ca 100644
--- a/TAO/performance-tests/Throughput/server.cpp
+++ b/TAO/performance-tests/Throughput/server.cpp
@@ -36,15 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,12 +50,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,12 +65,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_factory_owner_transfer(receiver_factory_impl);
 
       Test::Receiver_Factory_var receiver_factory =
-        receiver_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        receiver_factory_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (receiver_factory.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (receiver_factory.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -86,27 +80,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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 event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 1e0f7bca6cf..717f8092786 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -133,6 +133,11 @@ else  # interceptors
   ACE_MAKE_OPTIONS += interceptors
 endif # interceptors
 
+# The following is more to document the transport_current,
+# the $TAO_ROOT/tao/orbconf.h file defines it by default
+# CPPFLAGS += -DTAO_HAS_TRANSPORT_CURRENT=1
+transport_current ?= 1
+
 ifeq (1,$(CROSS-COMPILE))
   ACE_MAKE_OPTIONS += cross_compile
 else
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
index 1e48a102f8c..9fe7ff5a30d 100644
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ b/TAO/tao/Abstract_Servant_Base.cpp
@@ -18,12 +18,14 @@ TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void)
   // No-Op.
 }
 
-TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (const TAO_Abstract_ServantBase &)
+TAO_Abstract_ServantBase::TAO_Abstract_ServantBase
+  (const TAO_Abstract_ServantBase &)
 {
   // No-Op
 }
 
-TAO_Abstract_ServantBase & TAO_Abstract_ServantBase::operator= (const TAO_Abstract_ServantBase&)
+TAO_Abstract_ServantBase &
+TAO_Abstract_ServantBase::operator= (const TAO_Abstract_ServantBase&)
 {
   return *this;
 }
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 90feed1c79a..f4a5877ec2c 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -20,13 +20,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/CORBA_macros.h"
+#include /**/ "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
 #include "tao/Collocation_Strategy.h"
 #include "tao/CORBA_methods.h"
@@ -43,8 +42,6 @@ namespace CORBA
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
 
-  class Environment;
-
   class Object;
   typedef Object *Object_ptr;
   typedef TAO_Pseudo_Var_T<Object> Object_var;
@@ -60,18 +57,12 @@ typedef void (*TAO_Skeleton)(
     TAO_ServerRequest &,
     void *,
     void *
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
   );
 
 typedef void (*TAO_Collocated_Skeleton)(
     TAO_Abstract_ServantBase *,
     TAO::Argument **,
     int
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
   );
 
 class TAO_Export TAO_Abstract_ServantBase
@@ -81,49 +72,40 @@ public:
   virtual ~TAO_Abstract_ServantBase (void);
 
   /// Local implementation of the CORBA::Object::_is_a method.
-  virtual CORBA::Boolean _is_a (const char* logical_type_id
-                                ACE_ENV_ARG_DECL) = 0;
+  virtual CORBA::Boolean _is_a (const char* logical_type_id) = 0;
 
   /// Default @c _non_existent: always returns false.
-  virtual CORBA::Boolean _non_existent (
-    ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual CORBA::Boolean _non_existent (void) = 0;
 
   /// Query the Interface Repository.
-  virtual CORBA::InterfaceDef_ptr _get_interface (
-      ACE_ENV_SINGLE_ARG_DECL
-    ) = 0;
+  virtual CORBA::InterfaceDef_ptr _get_interface (void) = 0;
 
   /// Default @c _get_component: always returns nil.
-  virtual CORBA::Object_ptr _get_component (
-    ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual CORBA::Object_ptr _get_component (void) = 0;
 
   /// Default @c _repository_id
-  virtual char * _repository_id (
-    ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual char * _repository_id (void) = 0;
 
   //@{
   /**
    * @name Reference Counting Operations
    */
   /// Increase reference count by one.
-  virtual void _add_ref (
-    ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void _add_ref (void) = 0;
 
   /**
    * Decreases reference count by one; if the resulting reference
    * count equals zero, _remove_ref invokes delete on its this pointer
    * in order to destroy the servant.
    */
-  virtual void _remove_ref (
-    ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void _remove_ref (void) = 0;
 
   /// Returns the current reference count value.
-  virtual CORBA::ULong _refcount_value (
-    ACE_ENV_SINGLE_ARG_DECL) const = 0;
+  virtual CORBA::ULong _refcount_value (void) const = 0;
   //@}
 
   /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual TAO_Stub *_create_stub (void) = 0;
 
   /// Find an operation in the operation table and return a
   /// TAO_Skeleton which can be used to make upcalls
@@ -158,17 +140,14 @@ protected:
    * any) or the exceptions thrown into @a request.
    */
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *servant_upcall
-                          ACE_ENV_ARG_DECL) = 0;
+                          void *servant_upcall) = 0;
 
   virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
                                             void *servant_upcall,
-                                            void *derived_this
-                                            ACE_ENV_ARG_DECL) = 0;
+                                            void *derived_this) = 0;
 
   /// Get this interface's repository id (TAO specific).
   virtual const char *_interface_repository_id (void) const = 0;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index ca0662470c6..a813676ba0d 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -4,7 +4,6 @@
 #include "tao/Profile.h"
 #include "tao/Transport_Acceptor.h"
 #include "tao/Protocol_Factory.h"
-#include "tao/Environment.h"
 #include "tao/ORB_Core.h"
 #include "tao/params.h"
 #include "tao/MProfile.h"
@@ -123,8 +122,7 @@ int
 TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                              ACE_Reactor *reactor,
                              const TAO_EndpointSet &endpoint_set,
-                             bool ignore_address
-                             ACE_ENV_ARG_DECL)
+                             bool ignore_address)
 {
   if (endpoint_set.is_empty ()
       // No endpoints were specified, we let each protocol pick its
@@ -231,7 +229,6 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                             TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (-1);
     }
 
   TAO_EndpointSetIterator endpoints (endpoint_set);
@@ -293,9 +290,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                                                reactor,
                                                addrs,
                                                factory,
-                                               ignore_address
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (-1);
+                                               ignore_address);
 
               if (result != 0)
                 {
@@ -683,8 +678,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                                ACE_Reactor *reactor,
                                ACE_CString &addrs,
                                TAO_ProtocolFactorySetItor &factory,
-                               bool ignore_address
-                               ACE_ENV_ARG_DECL)
+                               bool ignore_address)
 {
   ACE_CString options_tmp;
   this->extract_endpoint_options (addrs,
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index 5f6279a161c..4d738f7f9bc 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -73,8 +73,7 @@ public:
   int open (TAO_ORB_Core *orb_core,
             ACE_Reactor *reactor,
             const TAO_EndpointSet &endpoint_set,
-            bool ignore_address
-            ACE_ENV_ARG_DECL);
+            bool ignore_address);
 
   /// Close all open acceptors.
   int close_all (void);
@@ -134,8 +133,7 @@ private:
               ACE_Reactor *reactor,
               ACE_CString &address,
               TAO_ProtocolFactorySetItor &factory,
-              bool ignore_address
-              ACE_ENV_ARG_DECL);
+              bool ignore_address);
 
 private:
 
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index 86750d406bd..25eb2828608 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -48,17 +48,17 @@ public:
   virtual ~TAO_Adapter (void);
 
   /// Initialize the Adapter
-  virtual void open (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void open (void) = 0;
 
   /// The ORB is shutting down, destroy any resources attached to this
   /// adapter.
   virtual void close (int wait_for_completion
-                      ACE_ENV_ARG_DECL) = 0;
+                      ) = 0;
 
   /// Check if the adapter can be closed in the current context, raise
   /// an exception if not.
   virtual void check_close (int wait_for_completion
-                            ACE_ENV_ARG_DECL) = 0;
+                            ) = 0;
 
   /**
    * Return the priority assigned to this adapter.
@@ -71,7 +71,7 @@ public:
   virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out forward_to
-                        ACE_ENV_ARG_DECL) = 0;
+                        ) = 0;
 
   enum {
     /// The operation was successfully dispatched, an exception may
diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp
index 16aa66007e0..bfdf7fc5280 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -35,47 +35,39 @@ TAO_Adapter_Registry::~TAO_Adapter_Registry (void)
 }
 
 void
-TAO_Adapter_Registry::close (int wait_for_completion
-                             ACE_ENV_ARG_DECL)
+TAO_Adapter_Registry::close (int wait_for_completion)
 {
-  ACE_TRY
+  try
     {
       for (size_t i = 0; i != this->adapters_count_; ++i)
         {
-          this->adapters_[i]->close (wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->adapters_[i]->close (wait_for_completion);
         }
     }
-  ACE_CATCHANY
+  catch (const::CORBA::Exception&ex)
     {
       if (TAO_debug_level > 3)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception in TAO_Adapter_Registry::close ()");
+          ex._tao_print_exception (
+            "Exception in TAO_Adapter_Registry::close ()");
         }
       return;
     }
-  ACE_ENDTRY;
 
   return;
 }
 
 void
-TAO_Adapter_Registry::check_close (int wait_for_completion
-                                   ACE_ENV_ARG_DECL)
+TAO_Adapter_Registry::check_close (int wait_for_completion)
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
-      this->adapters_[i]->check_close (wait_for_completion
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->adapters_[i]->check_close (wait_for_completion);
     }
 }
 
 void
-TAO_Adapter_Registry::insert (TAO_Adapter *adapter
-                              ACE_ENV_ARG_DECL)
+TAO_Adapter_Registry::insert (TAO_Adapter *adapter)
 {
   if (this->adapters_capacity_ == this->adapters_count_)
     {
@@ -84,7 +76,6 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter
       ACE_NEW_THROW_EX (tmp,
                         TAO_Adapter*[this->adapters_capacity_],
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       for (size_t i = 0; i != this->adapters_count_; ++i)
         tmp[i] = this->adapters_[i];
@@ -114,16 +105,11 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter
 void
 TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key,
                                 TAO_ServerRequest &request,
-                                CORBA::Object_out forward_to
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Object_out forward_to)
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
-      int const r = this->adapters_[i]->dispatch (key,
-                                                  request,
-                                                  forward_to
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      int const r = this->adapters_[i]->dispatch (key, request, forward_to);
 
       if (r != TAO_Adapter::DS_MISMATCHED_KEY)
         {
@@ -133,7 +119,7 @@ TAO_Adapter_Registry::dispatch (TAO::ObjectKey &key,
 
   if (CORBA::is_nil (forward_to))
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 }
 
@@ -144,8 +130,7 @@ TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub,
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
       CORBA::Object_ptr x =
-        this->adapters_[i]->create_collocated_object (stub,
-                                                      mprofile);
+        this->adapters_[i]->create_collocated_object (stub, mprofile);
       if (x != 0)
         {
           if (!stub->collocated_servant ())
@@ -153,11 +138,13 @@ TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub,
               // This adapter created an object but it was not able to locate
               // a servant so we need to give the rest of the adapters a chance to
               // initialise the stub and find a servant or forward us or whatever.
-              for (CORBA::Long go_on = 1; go_on && i != this->adapters_count_; ++i)
+              for (CORBA::Long go_on = 1; go_on && i != this->adapters_count_;
+                   ++i)
                 {
                   // initialize_collocated_object only returns 0 if it has completely
                   // initialised the object.
-                  go_on = this->adapters_[i]->initialize_collocated_object (stub);
+                  go_on = this->adapters_[i]->initialize_collocated_object (
+                    stub);
                 }
             }
           return x;
diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h
index 3af900bf370..8dde72b3288 100644
--- a/TAO/tao/Adapter_Registry.h
+++ b/TAO/tao/Adapter_Registry.h
@@ -63,7 +63,7 @@ public:
    * POA while performing an upcall).
    */
   void close (int wait_for_completion
-              ACE_ENV_ARG_DECL);
+             );
 
   /**
    * Verify if the close() call can be invoked in the current
@@ -71,11 +71,11 @@ public:
    * Raise the right exception if not.
    */
   void check_close (int wait_for_completion
-                    ACE_ENV_ARG_DECL);
+                   );
 
   /// Insert a new adapter into the registry.
   void insert (TAO_Adapter *adapter
-               ACE_ENV_ARG_DECL);
+              );
 
   /**
    * Dispatch the request to all the adapters.
@@ -85,7 +85,7 @@ public:
   void dispatch (TAO::ObjectKey &key,
                  TAO_ServerRequest &request,
                  CORBA::Object_out forward_to
-                 ACE_ENV_ARG_DECL);
+                );
 
   /// Create a collocated object using the given profile and stub.
   CORBA::Object_ptr create_collocated_object (TAO_Stub *,
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
index d968f65b205..ee9de863444 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
@@ -83,20 +83,19 @@ CORBA::Boolean
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
                      RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
+                                               ) const
 {
   // The CORBA::TypeCode base class already verified equality of the
   // base attributes (id and name).  Perform an equality comparison of
   // the content.
 
   CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    tc->content_type ();
 
   return
     Traits<StringType>::get_typecode (this->content_type_)->equal (
       rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
+     );
 }
 
 template<typename StringType,
@@ -107,7 +106,7 @@ TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
                      RefCountPolicy>::equivalent_i (
   CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
+  ) const
 {
   // Equivalence already verified in the base class
   // CORBA::TypeCode::equivalent() method.
@@ -121,8 +120,7 @@ template<typename StringType,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+                     RefCountPolicy>::get_compact_typecode_i (void) const
 {
   TAO_TypeCodeFactory_Adapter * const adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -138,22 +136,21 @@ TAO::TypeCode::Alias<StringType,
   CORBA::TypeCode_var compact_content_type =
     Traits<StringType>::get_typecode (
       this->content_type_)->get_compact_typecode (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+        );
 
   if (this->kind_ == CORBA::tk_alias)
     {
       return adapter->create_alias_tc (this->attributes_.id (),
                                        "",  /* empty name */
                                        compact_content_type.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
     }
   else
     {
       return adapter->create_value_box_tc (this->attributes_.id (),
                                            "",  /* empty name */
                                            compact_content_type.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
     }
 }
 
@@ -164,7 +161,7 @@ char const *
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
                      RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -178,7 +175,7 @@ char const *
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
                      RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -192,7 +189,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<StringType,
                      TypeCodeType,
                      RefCountPolicy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return
      CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
index 201f3f001fc..d9f8b60b4c1 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -89,15 +89,12 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::TypeCode_ptr content_type_i (void) const;
 
     private:
 
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
index c3c9e26c1a6..a2db7f4602c 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
@@ -73,29 +73,26 @@ TAO::TypeCode::Alias<char const *,
 CORBA::Boolean
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
+                     TAO::Null_RefCount_Policy>::equal_i (
+  CORBA::TypeCode_ptr tc) const
 {
   // The CORBA::TypeCode base class already verified equality of the
   // base attributes (id and name).  Perform an equality comparison of
   // the content.
 
   CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    tc->content_type ();
 
   return
     Traits<char const *>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
+      rhs_content_type.in ());
 }
 
 CORBA::Boolean
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
+  CORBA::TypeCode_ptr) const
 {
   // Equivalence already verified in the base class
   // CORBA::TypeCode::equivalent() method.
@@ -107,7 +104,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   TAO_TypeCodeFactory_Adapter * const adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -123,30 +120,27 @@ TAO::TypeCode::Alias<char const *,
   CORBA::TypeCode_var compact_content_type =
     Traits<char const *>::get_typecode (
       this->content_type_)->get_compact_typecode (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+        );
 
   if (this->kind_ == CORBA::tk_alias)
     {
       return adapter->create_alias_tc (this->attributes_.id (),
                                        "",  /* empty name */
                                        compact_content_type.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
     }
   else
     {
       return adapter->create_value_box_tc (this->attributes_.id (),
                                            "",  /* empty name */
-                                           compact_content_type.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                           compact_content_type.in ());
     }
 }
 
 char const *
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     TAO::Null_RefCount_Policy>::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -156,8 +150,7 @@ TAO::TypeCode::Alias<char const *,
 char const *
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     TAO::Null_RefCount_Policy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -168,7 +161,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::Null_RefCount_Policy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return
      CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
index ce78541df83..709c11039d8 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
@@ -87,15 +87,12 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::TypeCode_ptr content_type_i (void) const;
 
     private:
 
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index 19a025db41e..6d4fe106f35 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -133,7 +133,7 @@ CORBA::Any::_tao_byte_order (void) const
 
 void
 CORBA::Any::type (CORBA::TypeCode_ptr tc
-                  ACE_ENV_ARG_DECL)
+                  )
 {
   CORBA::Boolean equiv = false;
 
@@ -141,8 +141,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc
     {
       equiv =
         this->impl_->_tao_get_typecode ()->equivalent (tc
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                      );
     }
 
   if (equiv)
@@ -151,7 +150,7 @@ CORBA::Any::type (CORBA::TypeCode_ptr tc
     }
   else
     {
-      ACE_THROW (CORBA::BAD_TYPECODE ());
+      throw ::CORBA::BAD_TYPECODE ();
     }
 }
 
@@ -277,7 +276,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
       return false;
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       TAO::Unknown_IDL_Type *impl = 0;
       ACE_NEW_RETURN (impl,
@@ -286,14 +285,12 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
 
       any.replace (impl);
       impl->_tao_decode (cdr
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception&)
     {
       return false;
     }
-  ACE_ENDTRY;
 
   return true;
 }
diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h
index b158adc7feb..27ff8682aa1 100644
--- a/TAO/tao/AnyTypeCode/Any.h
+++ b/TAO/tao/AnyTypeCode/Any.h
@@ -52,7 +52,6 @@ namespace CORBA
 
   class ValueBase;
   class Exception;
-  class Environment;
 
   /**
    * @class Any
@@ -155,7 +154,7 @@ namespace CORBA
     /// For use along with <<= of a value of aliased type when the alias must
     /// be preserved.
     void type (TypeCode_ptr
-               ACE_ENV_ARG_DECL);
+              );
 
     /// TAO extension, does not return a duplicate.
     CORBA::TypeCode_ptr _tao_get_typecode (void) const;
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
index 97cda1e2d59..7816b59ed9d 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
@@ -62,13 +62,10 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
 {
   _tao_elem = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean const _tao_equiv =
-        any_tc->equivalent (tc
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc);
 
       if (_tao_equiv == false)
         {
@@ -104,8 +101,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
         );
 
       // We know this will work since the unencoded case is covered above.
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
+      TAO::Unknown_IDL_Type *unk = dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
 
       // We don't want the rd_ptr of unk to move, in case it is
       // shared by another Any. This copies the state, not the buffer.
@@ -125,12 +121,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (any_tc);
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
-  return 0;
+  return false;
 }
 
 template<typename T_slice, typename T_forany>
@@ -164,11 +159,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
 template<typename T_slice, typename T_forany>
 void
 TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
-                                                       ACE_ENV_ARG_DECL)
+                                                       )
 {
   if (! this->demarshal_value (cdr))
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
index f7c0d1656ab..40bfa33c897 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
@@ -54,7 +54,7 @@ namespace TAO
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
     virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              );
 
     virtual const void *value (void) const;
     virtual void free_value (void);
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index d5e0e364af3..3c251f5f23a 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -23,10 +23,7 @@ namespace TAO
     : Any_Impl (0, tc),
       kind_ (CORBA::tk_null)
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    this->kind_ = TAO::unaliased_kind (tc
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->kind_ = TAO::unaliased_kind (tc);
 
     switch (this->kind_)
     {
@@ -101,13 +98,11 @@ namespace TAO
                            CORBA::TypeCode_ptr tc,
                            void *_tao_elem)
   {
-    ACE_TRY_NEW_ENV
+    try
       {
         CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
         CORBA::Boolean _tao_equiv =
-          any_tc->equivalent (tc
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          any_tc->equivalent (tc);
 
         if (!_tao_equiv)
           {
@@ -126,8 +121,7 @@ namespace TAO
                 return false;
               }
 
-            Any_Basic_Impl::assign_value (_tao_elem,
-                                          narrow_impl);
+            Any_Basic_Impl::assign_value (_tao_elem, narrow_impl);
             return true;
           }
 
@@ -143,8 +137,7 @@ namespace TAO
         // Get the kind of the type where we are extracting in ie. the
         // aliased  type if there are any. Passing the aliased kind
         // will not help.
-        CORBA::TCKind const tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::TCKind const tck = tc->kind ();
 
         // We don't want the rd_ptr of unk to move, in case it is
         // shared by another Any. This copies the state, not the buffer.
@@ -167,10 +160,9 @@ namespace TAO
         // Duplicated by Any_Impl base class constructor.
         ::CORBA::release (any_tc);
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
       }
-    ACE_ENDTRY;
 
     return false;
   }
@@ -263,21 +255,18 @@ namespace TAO
   }
 
   void
-  Any_Basic_Impl::_tao_decode (TAO_InputCDR &cdr
-                               ACE_ENV_ARG_DECL)
+  Any_Basic_Impl::_tao_decode (TAO_InputCDR &cdr)
   {
     if (! this->demarshal_value (cdr))
       {
-        ACE_THROW (CORBA::MARSHAL ());
+        throw ::CORBA::MARSHAL ();
       }
   }
 
   Any_Basic_Impl *
   Any_Basic_Impl::create_empty (CORBA::TypeCode_ptr tc)
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+    CORBA::TCKind const kind = tc->kind ();
 
     TAO::Any_Basic_Impl * retval = 0;
 
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
index 563a252d54a..848056f6ab4 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
@@ -57,8 +57,7 @@ namespace TAO
     CORBA::Boolean demarshal_value (TAO_InputCDR &,
                                     CORBA::Long);
 
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
+    virtual void _tao_decode (TAO_InputCDR &);
 
     static Any_Basic_Impl *create_empty (CORBA::TypeCode_ptr);
 
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
index 7c892b754d3..75905a1bdb1 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp
@@ -53,12 +53,10 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
                                    CORBA::TypeCode_ptr tc,
                                    T & _tao_elem)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc);
 
       if (_tao_equiv == false)
         {
@@ -108,10 +106,9 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (any_tc);
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return false;
 }
@@ -144,12 +141,11 @@ TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
 
 template<typename T>
 void
-TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                       ACE_ENV_ARG_DECL)
+TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr)
 {
   if (! this->demarshal_value (cdr))
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
index aff9109b34b..48624334d55 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
@@ -50,8 +50,7 @@ namespace TAO
 
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    virtual void _tao_decode (TAO_InputCDR &);
 
     virtual const void *value (void) const;
     static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr);
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
index 91dc8bdab29..a94984c507c 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
@@ -101,12 +101,10 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
 {
   _tao_elem = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc);
 
       if (_tao_equiv == false)
         {
@@ -164,10 +162,9 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (any_tc);
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return false;
 }
@@ -202,12 +199,11 @@ TAO::Any_Dual_Impl_T<T>::free_value (void)
 
 template<typename T>
 void
-TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                      ACE_ENV_ARG_DECL)
+TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr)
 {
   if (! this->demarshal_value (cdr))
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
index e09cdad1f77..be40f181aed 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
@@ -64,8 +64,7 @@ namespace TAO
 
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
+    virtual void _tao_decode (TAO_InputCDR &);
 
     virtual const void *value (void) const;
     virtual void free_value (void);
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp
index f00e5898d4d..cd8a8925a36 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp
@@ -108,9 +108,9 @@ TAO::Any_Impl::_remove_ref (void)
 
 void
 TAO::Any_Impl::_tao_decode (TAO_InputCDR &
-                            ACE_ENV_ARG_DECL)
+                            )
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h
index 0e04ce527b5..71c8824e7d0 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl.h
@@ -51,8 +51,6 @@ namespace CORBA
   class ValueBase;
   class AbstractBase;
   typedef AbstractBase *AbstractBase_ptr;
-
-  class Environment;
 }
 
 namespace TAO
@@ -89,8 +87,7 @@ namespace TAO
     static void _tao_any_string_destructor (void *);
     static void _tao_any_wstring_destructor (void *);
 
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
+    virtual void _tao_decode (TAO_InputCDR &);
 
     virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
     virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
index 4555bf32e9e..4595132c653 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp
@@ -60,12 +60,10 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
 {
   _tao_elem = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc);
 
       if (_tao_equiv == 0)
         {
@@ -119,10 +117,9 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (any_tc);
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -141,7 +138,7 @@ TAO::Any_Impl_T<T>::to_value (CORBA::ValueBase *&) const
   return 0;
 }
 
-template<typename T> 
+template<typename T>
 
 CORBA::Boolean
 TAO::Any_Impl_T<T>::to_abstract_base (CORBA::AbstractBase_ptr &) const
@@ -179,12 +176,11 @@ TAO::Any_Impl_T<T>::free_value (void)
 
 template<typename T>
 void
-TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                 ACE_ENV_ARG_DECL)
+TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr)
 {
   if (! this->demarshal_value (cdr))
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h
index bddd912ecc9..501a85a353a 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h
@@ -27,7 +27,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class Any;
-  class Environment;
 }
 
 namespace TAO
@@ -63,7 +62,7 @@ namespace TAO
 
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &  ACE_ENV_ARG_DECL);
+    virtual void _tao_decode (TAO_InputCDR & );
     virtual const void *value (void) const;
     virtual void free_value (void);
 
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
index adc32568b3f..7eec333b18d 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp
@@ -49,9 +49,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
 
   if (bound > 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::TCKind const kind = tc->kind ();
 
       bounded_tc =
         TAO::TypeCodeFactory::String_Traits<from_T>::create_typecode (kind,
@@ -81,34 +79,28 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
                                                    _tao_destructor destructor,
                                                    CORBA::TypeCode_ptr tc,
                                                    const T *& _tao_elem,
-                                                   CORBA::ULong bound
-  )
+                                                   CORBA::ULong bound)
 {
   _tao_elem = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::TypeCode_ptr any_type = any._tao_get_typecode ();
       CORBA::TypeCode_var unaliased_any_type =
         TAO::unaliased_typecode (any_type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                );
 
       CORBA::TCKind any_kind =
-        unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        unaliased_any_type->kind ();
 
-      CORBA::TCKind try_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::TCKind try_kind = tc->kind ();
 
       if (any_kind != try_kind)
         {
           return false;
         }
 
-      CORBA::ULong length =
-        unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong length = unaliased_any_type->length ();
 
       if (length != bound)
         {
@@ -168,19 +160,16 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
       // Duplicated by Any_Impl base class constructor.
       ::CORBA::release (tc);
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 template<typename T, typename from_T, typename to_T>
 CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::marshal_value (
-    TAO_OutputCDR &cdr
-  )
+TAO::Any_Special_Impl_T<T, from_T, to_T>::marshal_value (TAO_OutputCDR &cdr)
 {
   return (cdr << from_T (this->value_, this->bound_));
 }
@@ -208,10 +197,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void)
 
 template<typename T, typename from_T, typename to_T>
 void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
+TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (TAO_InputCDR &cdr)
 {
   if (this->value_destructor_ != 0)
     {
@@ -221,7 +207,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
 
   if (! this->demarshal_value (cdr))
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
index c166c9293ca..e8dddc81b74 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
@@ -55,7 +55,7 @@ namespace TAO
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
     CORBA::Boolean demarshal_value (TAO_InputCDR &);
     virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              );
 
     virtual const void *value (void) const;
     virtual void free_value (void);
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
index 015d7231ce5..ee0c4633a72 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
@@ -89,12 +89,10 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
 {
   _tao_elem = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc);
 
       if (_tao_equiv == false)
         {
@@ -147,10 +145,9 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
           return true;
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -176,34 +173,28 @@ TAO::Any_SystemException::value (void) const
 CORBA::Boolean
 TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->value_->_tao_encode (cdr
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->value_->_tao_encode (cdr);
       return true;
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return false;
 }
 
 CORBA::Boolean
 TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->value_->_tao_decode (cdr
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->value_->_tao_decode (cdr);
       return true;
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return false;
 }
 
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
index 5b2e0257e79..6bfbe5b71ad 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -27,20 +27,17 @@ TAO::Unknown_IDL_Type::lock_i (void)
 
 TAO::Unknown_IDL_Type::Unknown_IDL_Type (
     CORBA::TypeCode_ptr tc,
-    TAO_InputCDR &cdr
-  )
+    TAO_InputCDR &cdr)
   : TAO::Any_Impl (0, tc, true)
   , cdr_ (static_cast<ACE_Message_Block*>(0), lock_i ())
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->_tao_decode (cdr);
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 }
 
 TAO::Unknown_IDL_Type::Unknown_IDL_Type (
@@ -58,29 +55,26 @@ TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void)
 CORBA::Boolean
 TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // We don't want the rd_ptr to move, in case we are shared by
       // another Any, so we use this to copy the state, not the buffer.
       TAO_InputCDR for_reading (this->cdr_);
 
-      TAO::traverse_status status =
+      TAO::traverse_status const status =
         TAO_Marshal_Object::perform_append (this->type_,
                                             &for_reading,
-                                            &cdr
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            &cdr);
 
       if (status != TAO::TRAVERSE_CONTINUE)
         {
           return false;
         }
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception&)
     {
       return false;
     }
-  ACE_ENDTRY;
 
   return true;
 }
@@ -109,8 +103,7 @@ TAO::Unknown_IDL_Type::_tao_byte_order (void) const
   return this->cdr_.byte_order ();
 }
 void
-TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
-                                    ACE_ENV_ARG_DECL)
+TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr)
 {
   // @@ (JP) The following code depends on the fact that
   //         TAO_InputCDR does not contain chained message blocks,
@@ -122,14 +115,11 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
 
   // Skip over the next argument.
   TAO::traverse_status status =
-    TAO_Marshal_Object::perform_skip (this->type_,
-                                      &cdr
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_Marshal_Object::perform_skip (this->type_, &cdr);
 
   if (status != TAO::TRAVERSE_CONTINUE)
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 
   // This will be the end of the new message block.
@@ -155,9 +145,7 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
   new_mb.rd_ptr (offset);
   new_mb.wr_ptr (offset + size);
 
-  ACE_OS::memcpy (new_mb.rd_ptr (),
-                  begin,
-                  size);
+  ACE_OS::memcpy (new_mb.rd_ptr (), begin, size);
 
   this->cdr_.reset (&new_mb, cdr.byte_order ());
   this->cdr_.char_translator (cdr.char_translator ());
@@ -174,22 +162,17 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
 CORBA::Boolean
 TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong kind = this->type_->kind ();
 
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
+      CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_);
 
       while (kind == CORBA::tk_alias)
         {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tcvar = tcvar->content_type ();
 
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          kind = tcvar->kind ();
         }
 
       if (kind != CORBA::tk_objref)
@@ -200,13 +183,12 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
       // We don't want the rd_ptr to move, in case we are shared by
       // another Any, so we use this to copy the state, not the buffer.
       TAO_InputCDR for_reading (this->cdr_);
-      
+
       return for_reading >> obj;
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return false;
 }
@@ -214,22 +196,17 @@ TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
 CORBA::Boolean
 TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong kind = this->type_->kind ();
 
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
+      CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_);
 
       while (kind == CORBA::tk_alias)
         {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tcvar = tcvar->content_type ();
 
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          kind = tcvar->kind ();
         }
 
       if (kind != CORBA::tk_value)
@@ -237,7 +214,7 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
           return false;
         }
 
-    TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
+      TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
       if (orb_core == 0)
         {
           orb_core = TAO_ORB_Core_instance ();
@@ -253,10 +230,9 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
       TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
       return adapter->stream_to_value (this->cdr_, val);
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return false;
 }
@@ -264,22 +240,17 @@ TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
 CORBA::Boolean
 TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong kind = this->type_->kind ();
 
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
+      CORBA::TypeCode_var tcvar = CORBA::TypeCode::_duplicate (this->type_);
 
       while (kind == CORBA::tk_alias)
         {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tcvar = tcvar->content_type ();
 
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          kind = tcvar->kind ();
         }
 
       if (kind != CORBA::tk_value)
@@ -287,7 +258,7 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
           return false;
         }
 
-    TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
+      TAO_ORB_Core *orb_core = this->cdr_.orb_core ();
       if (orb_core == 0)
         {
           orb_core = TAO_ORB_Core_instance ();
@@ -301,13 +272,11 @@ TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
         }
 
       TAO_Valuetype_Adapter *adapter = orb_core->valuetype_adapter();
-      return adapter->stream_to_abstract_base (this->cdr_,
-                                               obj);
+      return adapter->stream_to_abstract_base (this->cdr_, obj);
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return false;
 }
diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
index 063fb77aeba..af1385ee255 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
@@ -54,7 +54,7 @@ namespace TAO
     virtual int _tao_byte_order (void) const;
 
     virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
+                             );
 
     virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
     virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
index 9c77532c4e3..85ef4a595f1 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
@@ -15,8 +15,7 @@ ACE_RCSID (AnyTypeCode,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
-TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &,
-                                         CORBA::ULong) const
+TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const
 {
   // Empty parameter list.  Nothing to marshal.
 
@@ -40,8 +39,7 @@ TAO::TypeCode::Empty_Param::tao_release (void)
 }
 
 CORBA::Boolean
-TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr
-                                     ACE_ENV_ARG_DECL_NOT_USED) const
+TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr) const
 {
   // Equality has already been established in the
   // CORBA::TypeCode base class.
@@ -50,8 +48,7 @@ TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr
 }
 
 CORBA::Boolean
-TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
-                                          ACE_ENV_ARG_DECL) const
+TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc) const
 {
   // We could refactor this code to the CORBA::TypeCode::equivalent()
   // method but doing so would force us to determine the unaliased
@@ -59,10 +56,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
   // of this TypeCode, choose to optimize away the additional kind
   // unaliasing operation rather than save space.
 
-  CORBA::TCKind const tc_kind =
-    TAO::unaliased_kind (tc
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::TCKind const tc_kind = TAO::unaliased_kind (tc);
 
   if (tc_kind != this->kind_)
     return false;
@@ -71,8 +65,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
 }
 
 CORBA::TypeCode_ptr
-TAO::TypeCode::Empty_Param::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+TAO::TypeCode::Empty_Param::get_compact_typecode_i (void) const
 {
   // Already compact since parameter list is empty.
 
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
index 62b9936a1a9..4887b9d5b63 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
@@ -78,12 +78,9 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
 
     };
 
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
index b84a50f9b72..a1030c33e3c 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -82,15 +82,14 @@ TAO::TypeCode::Enum<StringType,
                     EnumeratorArrayType,
                     RefCountPolicy>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // This call shouldn't throw since CORBA::TypeCode::equal() verified
   // that the TCKind is the same as our's prior to invoking this
   // method, meaning that member_count() is supported.
 
   CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nenumerators != this->nenumerators_)
     return false;
@@ -102,8 +101,7 @@ TAO::TypeCode::Enum<StringType,
       char const * const lhs_name =
         Traits<StringType>::get_string (lhs_enumerator);
       char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                                                    );
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
@@ -118,14 +116,13 @@ TAO::TypeCode::Enum<StringType,
                     EnumeratorArrayType,
                     RefCountPolicy>::equivalent_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
 
   CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nenumerators != this->nenumerators_)
     return false;
@@ -138,7 +135,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Enum<StringType,
                     EnumeratorArrayType,
                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
 
@@ -170,13 +167,13 @@ TAO::TypeCode::Enum<StringType,
                              ""  /* empty name */,
                              tc_enumerators,
                              this->nenumerators_
-                             ACE_ENV_ARG_PARAMETER);
+                            );
 }
 
 template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
 char const *
 TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -186,7 +183,7 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i (
 template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
 char const *
 TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -198,7 +195,7 @@ CORBA::ULong
 TAO::TypeCode::Enum<StringType,
                     EnumeratorArrayType,
                     RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->nenumerators_;
 }
@@ -209,7 +206,7 @@ TAO::TypeCode::Enum<StringType,
                     EnumeratorArrayType,
                     RefCountPolicy>::member_name_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
index 64a4d7bf9b0..13020e87c38 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -80,17 +80,13 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::ULong member_count_i (void) const;
+      virtual char const * member_name_i (CORBA::ULong index) const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
index 64cd8f00d37..e4879dad9cc 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -79,15 +79,14 @@ TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // This call shouldn't throw since CORBA::TypeCode::equal() verified
   // that the TCKind is the same as our's prior to invoking this
   // method, meaning that member_count() is supported.
 
   CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nenumerators != this->nenumerators_)
     return false;
@@ -99,8 +98,7 @@ TAO::TypeCode::Enum<char const *,
       char const * const lhs_name =
         Traits<char const *>::get_string (lhs_enumerator);
       char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                                                    );
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
@@ -114,14 +112,13 @@ TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::equivalent_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
 
   CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nenumerators != this->nenumerators_)
     return false;
@@ -133,7 +130,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
 
@@ -165,14 +162,14 @@ TAO::TypeCode::Enum<char const *,
                              ""  /* empty name */,
                              tc_enumerators,
                              this->nenumerators_
-                             ACE_ENV_ARG_PARAMETER);
+                            );
 }
 
 char const *
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -183,7 +180,7 @@ char const *
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -194,7 +191,7 @@ CORBA::ULong
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->nenumerators_;
 }
@@ -204,7 +201,7 @@ TAO::TypeCode::Enum<char const *,
                     char const * const *,
                     TAO::Null_RefCount_Policy>::member_name_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
index d9f22d44271..91fba95c276 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
@@ -85,17 +85,13 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::ULong member_count_i (void) const;
+      virtual char const * member_name_i (CORBA::ULong index) const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp
index a38566ee6b7..c265e25d28c 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp
@@ -38,18 +38,16 @@ namespace TAO
   CORBA::Boolean
   Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr)
   {
-    ACE_TRY_NEW_ENV
+    try
       {
         this->value_->_tao_encode (cdr
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                  );
 
         return true;
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
       }
-    ACE_ENDTRY;
 
     return false;
   }
@@ -58,18 +56,16 @@ namespace TAO
   CORBA::Boolean
   Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr)
   {
-    ACE_TRY_NEW_ENV
+    try
       {
         this->value_->_tao_decode (cdr
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                  );
 
         return true;
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
       }
-    ACE_ENDTRY;
 
     return false;
   }
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h
index 44f6cd6834c..2b735a03bd7 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.h
+++ b/TAO/tao/AnyTypeCode/ExceptionA.h
@@ -26,11 +26,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // This is used in the implementation of the _raise methods
-#if defined (TAO_HAS_EXCEPTIONS)
 #define TAO_RAISE(EXCEPTION) throw EXCEPTION
-#else
-#define TAO_RAISE(EXCEPTION)
-#endif /* ACE_HAS_EXCEPTIONS */
 
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/Exception.h"
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
index 0fae62d507c..54f67e17f9c 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
@@ -42,18 +42,13 @@ TAO::TypeCode::Fixed<RefCountPolicy>::tao_release (void)
 
 template <class RefCountPolicy>
 CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
+TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc) const
 {
   // The following call won't throw since CORBA::TypeCode::equal() has
   // already established the kind of tc is the same as our kind.
-  CORBA::UShort const tc_digits =
-    tc->fixed_digits (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::UShort const tc_digits = tc->fixed_digits ();
 
-  CORBA::UShort const tc_scale =
-    tc->fixed_scale (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::UShort const tc_scale = tc->fixed_scale ();
 
   return (this->digits_ == tc_digits
           && this->scale_ == tc_scale);
@@ -61,20 +56,17 @@ TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
 
 template <class RefCountPolicy>
 CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                    ACE_ENV_ARG_DECL) const
+TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc) const
 {
   // Since TCKind comparisons must be performed before equal_i() is
   // called, we can also call it to determine equivalence of
   // tk_fixed TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
+  return this->equal_i (tc);
 }
 
 template <class RefCountPolicy>
 CORBA::TypeCode_ptr
-TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (void) const
 {
   // Already compact since tk_fixed TypeCodes have no name or member
   // names, meaning that we can simply call _duplicate() on this
@@ -94,16 +86,14 @@ TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (
 
 template <class RefCountPolicy>
 CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i (void) const
 {
   return this->digits_;
 }
 
 template <class RefCountPolicy>
 CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (void) const
 {
   return this->scale_;
 }
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
index 058b327e37e..8572d7b42fd 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -58,8 +58,7 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
+      virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const;
       virtual void tao_duplicate (void);
       virtual void tao_release (void);
       //@}
@@ -75,14 +74,11 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
+      virtual CORBA::UShort fixed_digits_i (void) const;
+      virtual CORBA::UShort fixed_scale_i (void) const;
 
     private:
 
diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp
index 2151f9753f7..2f777c06be7 100644
--- a/TAO/tao/AnyTypeCode/Marshal.cpp
+++ b/TAO/tao/AnyTypeCode/Marshal.cpp
@@ -34,10 +34,9 @@ TAO_Marshal_Object::~TAO_Marshal_Object (void)
 TAO::traverse_status
 TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
                                   TAO_InputCDR *stream
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
-  CORBA::ULong const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::ULong const kind = tc->kind ();
 
   switch (kind)
     {
@@ -68,75 +67,75 @@ TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
     case CORBA::tk_enum:
       {
         TAO_Marshal_Primitive marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
 
     case CORBA::tk_any:
       {
         TAO_Marshal_Any marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_TypeCode:
       {
         TAO_Marshal_TypeCode marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_Principal:
       {
         TAO_Marshal_Principal marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_objref:
       {
         TAO_Marshal_ObjRef marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_struct:
       {
         TAO_Marshal_Struct marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_union:
       {
         TAO_Marshal_Union marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_string:
       {
         TAO_Marshal_String marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_sequence:
       {
         TAO_Marshal_Sequence marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_array:
       {
         TAO_Marshal_Array marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_alias:
       {
         TAO_Marshal_Alias marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_except:
       {
         TAO_Marshal_Except marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_wstring:
       {
         TAO_Marshal_WString marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     case CORBA::tk_value_box:
     case CORBA::tk_value:
     case CORBA::tk_event:
       {
         TAO_Marshal_Value marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream);
       }
     }
 }
@@ -145,10 +144,9 @@ TAO::traverse_status
 TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
                                     TAO_InputCDR *src,
                                     TAO_OutputCDR *dest
-                                    ACE_ENV_ARG_DECL)
+                                    )
 {
-  CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::ULong kind = tc->kind ();
 
   switch (kind)
     {
@@ -179,75 +177,75 @@ TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
     case CORBA::tk_enum:
       {
         TAO_Marshal_Primitive marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
 
     case CORBA::tk_any:
       {
         TAO_Marshal_Any marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_TypeCode:
       {
         TAO_Marshal_TypeCode marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_Principal:
       {
         TAO_Marshal_Principal marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_objref:
       {
         TAO_Marshal_ObjRef marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_struct:
       {
         TAO_Marshal_Struct marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_union:
       {
         TAO_Marshal_Union marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_string:
       {
         TAO_Marshal_String marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_sequence:
       {
         TAO_Marshal_Sequence marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_array:
       {
         TAO_Marshal_Array marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_alias:
       {
         TAO_Marshal_Alias marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_except:
       {
         TAO_Marshal_Except marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_wstring:
       {
         TAO_Marshal_WString marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     case CORBA::tk_value_box:
     case CORBA::tk_value:
     case CORBA::tk_event:
       {
         TAO_Marshal_Value marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest);
       }
     }
 }
diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h
index 6232bc5f87d..1894457d071 100644
--- a/TAO/tao/AnyTypeCode/Marshal.h
+++ b/TAO/tao/AnyTypeCode/Marshal.h
@@ -33,8 +33,6 @@ namespace CORBA
 {
   class TypeCode;
   typedef TypeCode *TypeCode_ptr;
-
-  class Environment;
 }
 
 class TAO_OutputCDR;
@@ -88,26 +86,22 @@ public:
   /// skip entry point, it allocates the right kind of Marshal_Object
   /// and invokes skip on it.
   static TAO::traverse_status perform_skip (CORBA::TypeCode_ptr tc,
-                                            TAO_InputCDR *context
-                                            ACE_ENV_ARG_DECL);
+                                            TAO_InputCDR *context);
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL) = 0;
+                                     TAO_InputCDR *context) = 0;
 
   /// append entry point, it allocates the right kind of Marshal_Object
   /// and invokes skip on it.
   static TAO::traverse_status perform_append (CORBA::TypeCode_ptr tc,
                                               TAO_InputCDR *src,
-                                              TAO_OutputCDR *dest
-                                              ACE_ENV_ARG_DECL);
+                                              TAO_OutputCDR *dest);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL) = 0;
+                                       TAO_OutputCDR *dest) = 0;
 };
 
 /**
@@ -124,14 +118,12 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
@@ -148,18 +140,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_TypeCode:
+ * @class TAO_Marshal_TypeCode
  *
  * @brief TAO_Marshal_TypeCode
  *
@@ -172,18 +162,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Principal:
+ * @class TAO_Marshal_Principal
  *
  * @brief TAO_Marshal_Principal
  *
@@ -196,18 +184,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_ObjRef:
+ * @class TAO_Marshal_ObjRef
  *
  * @brief TAO_Marshal_ObjRef
  *
@@ -220,42 +206,38 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Struct:
+ * @class TAO_Marshal_Struct
  *
  * @brief TAO_Marshal_Struct
  *
  * marshal a struct
  */
-class TAO_AnyTypeCode_Export TAO_Marshal_Struct: public TAO_Marshal_Object
+class TAO_AnyTypeCode_Export TAO_Marshal_Struct : public TAO_Marshal_Object
 {
 public:
   TAO_Marshal_Struct (void);
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Union:
+ * @class TAO_Marshal_Union
  *
  * @brief TAO_Marshal_Union
  *
@@ -268,18 +250,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_String:
+ * @class TAO_Marshal_String
  *
  * @brief TAO_Marshal_String
  *
@@ -292,18 +272,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Sequence:
+ * @class TAO_Marshal_Sequence
  *
  * @brief TAO_Marshal_Sequence
  *
@@ -316,18 +294,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Array:
+ * @class TAO_Marshal_Array
  *
  * @brief TAO_Marshal_Array
  *
@@ -340,18 +316,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Alias:
+ * @class TAO_Marshal_Alias
  *
  * @brief TAO_Marshal_Alias
  *
@@ -364,18 +338,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Except:
+ * @class TAO_Marshal_Except
  *
  * @brief TAO_Marshal_Except
  *
@@ -388,14 +360,12 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
@@ -412,18 +382,16 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 };
 
 /**
- * @class TAO_Marshal_Value:
+ * @class TAO_Marshal_Value
  *
  * @brief TAO_Marshal_Value
  *
@@ -436,14 +404,12 @@ public:
 
   /// skip operation
   virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
+                                     TAO_InputCDR *context);
 
   /// append operation
   virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
                                        TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
+                                       TAO_OutputCDR *dest);
 
 private:
   CORBA::Boolean nested_processing_;
diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp
index 56528db0c81..90c42779410 100644
--- a/TAO/tao/AnyTypeCode/NVList.cpp
+++ b/TAO/tao/AnyTypeCode/NVList.cpp
@@ -96,23 +96,22 @@ CORBA::NVList::~NVList (void)
 // add an element and just initialize its flags
 CORBA::NamedValue_ptr
 CORBA::NVList::add (CORBA::Flags flags
-                    ACE_ENV_ARG_DECL)
+                    )
 {
   // call the helper to allocate a NamedValue element (if necessary)
   return this->add_element (flags
-                            ACE_ENV_ARG_PARAMETER);
+                           );
 }
 
 // add an element and just initialize its flags and name
 CORBA::NamedValue_ptr
 CORBA::NVList::add_item (const char *name,
                          CORBA::Flags flags
-                         ACE_ENV_ARG_DECL)
+                         )
 {
   // call the helper to allocate a NamedValue element
   CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                               );
 
   if (nv)
     {
@@ -131,12 +130,11 @@ CORBA::NamedValue_ptr
 CORBA::NVList::add_value (const char *name,
                           const CORBA::Any &value,
                           CORBA::Flags flags
-                          ACE_ENV_ARG_DECL)
+                          )
 {
   // Call the helper to allocate a NamedValue element.
   CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                               );
 
   if (nv)
     {
@@ -161,13 +159,12 @@ CORBA::NVList::add_value (const char *name,
 CORBA::NamedValue_ptr
 CORBA::NVList::add_item_consume (char *name,
                                  CORBA::Flags flags
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
 
   // call the helper to allocate a NamedValue element
   CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                               );
 
   if (nv)
     {
@@ -188,12 +185,11 @@ CORBA::NamedValue_ptr
 CORBA::NVList::add_value_consume (char * name,
                                   CORBA::Any * value,
                                   CORBA::Flags flags
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   // call the helper to allocate a NamedValue element
   CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                               );
 
   if (nv)
     {
@@ -216,7 +212,7 @@ CORBA::NVList::add_value_consume (char * name,
 //CORBA::Status
 void
 CORBA::NVList::remove (CORBA::ULong /* n */
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       )
 {
   // not implemented
   // @@ (ASG) - TODO
@@ -225,10 +221,9 @@ CORBA::NVList::remove (CORBA::ULong /* n */
 // Helper method
 CORBA::NamedValue_ptr
 CORBA::NVList::add_element (CORBA::Flags flags
-                            ACE_ENV_ARG_DECL)
+                            )
 {
-  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
+  this->evaluate ();
 
   if (ACE_BIT_DISABLED (flags,
                         CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
@@ -243,7 +238,6 @@ CORBA::NVList::add_element (CORBA::Flags flags
   ACE_NEW_THROW_EX (nv,
                     CORBA::NamedValue,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
 
   // set the flags and enqueue in the queue
   nv->flags_ = flags;
@@ -261,10 +255,9 @@ CORBA::NVList::add_element (CORBA::Flags flags
 // return the item at location n
 CORBA::NamedValue_ptr
 CORBA::NVList::item (CORBA::ULong n
-                     ACE_ENV_ARG_DECL)
+                     )
 {
-  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
+  this->evaluate ();
 
   if (n >= this->max_)
     {
@@ -282,7 +275,7 @@ void
 CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
                                   int flag,
                                   bool &lazy_evaluation
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   // If the list is empty then using lazy evaluation is the only
   // choice.
@@ -298,7 +291,7 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
     {
       this->_tao_decode (cdr,
                          flag
-                         ACE_ENV_ARG_PARAMETER);
+                        );
       return;
     }
 
@@ -317,7 +310,7 @@ CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
 void
 CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
                             int flag
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              ace_mon,
@@ -368,8 +361,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
           (void) TAO_Marshal_Object::perform_append (tc,
                                                      this->incoming_,
                                                      &cdr
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                                    );
         }
 
       delete this->incoming_;
@@ -402,7 +394,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
 void
 CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
                             int flag
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   if (TAO_debug_level > 3)
     {
@@ -438,8 +430,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
 
       CORBA::Any_ptr any = nv->value ();
       any->impl ()->_tao_decode (incoming
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                );
     }
 }
 
@@ -468,7 +459,7 @@ CORBA::NVList::_tao_target_alignment (void)
 }
 
 void
-CORBA::NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::NVList::evaluate (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -482,7 +473,7 @@ CORBA::NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL)
 
   this->_tao_decode (*(incoming.get ()),
                      this->incoming_flag_
-                     ACE_ENV_ARG_PARAMETER);
+                    );
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h
index d78a228726a..9b6e212c11f 100644
--- a/TAO/tao/AnyTypeCode/NVList.h
+++ b/TAO/tao/AnyTypeCode/NVList.h
@@ -165,44 +165,44 @@ namespace CORBA
   public:
 
     /// return the current number of elements in the list
-    ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+    ULong count (void) const;
 
     /// add an element and just initialize the flags
     NamedValue_ptr add (Flags
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                        );
 
     /// add an element and initialize its name and flags
     NamedValue_ptr add_item (const char *,
                              Flags
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                             );
 
     /// initializes a value, name, and flags
     NamedValue_ptr add_value (const char *,
                               const Any &,
                               Flags
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              );
 
     /// just like add_item. In addition, memory management of char *
     /// name is taken over by the NVList
     NamedValue_ptr add_item_consume (char *,
                                      Flags
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                     );
 
     /// just like add_value. In addition, the NVList controls the
     /// memory management of the char *name and Any *value parameter
     NamedValue_ptr add_value_consume (char *,
                                       Any_ptr,
                                       Flags
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      );
 
     /// retrieve the item at the nth location. Raises Bounds
     NamedValue_ptr item (ULong n
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                         );
 
     //  CORBA::Status
     /// remove element at index n. Raises Bounds
     void remove (ULong n
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                 );
 
     // The pseudo object static methods..
     static NVList * _duplicate (NVList *);
@@ -223,18 +223,18 @@ namespace CORBA
     void _tao_incoming_cdr (TAO_InputCDR & cdr,
                             int flag,
                             bool &lazy_evaluation
-                            ACE_ENV_ARG_DECL);
+                           );
 
-    /// Encode the NVList into the CDR stream. <flag> masks the type of
+    /// Encode the NVList into the CDR stream. @a flag masks the type of
     /// arguments (IN, OUT or INOUT) that are to be marshaled.
     void _tao_encode (TAO_OutputCDR & cdr,
                       int flag
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                      );
 
-    /// Decode the NVList arguments from the <cdr> stream.
+    /// Decode the NVList arguments from the @a cdr stream.
     void _tao_decode (TAO_InputCDR & cdr,
                       int flag
-                      ACE_ENV_ARG_DECL);
+                     );
 
     /**
      * Return the required alignment to marshal the NVList without any
@@ -265,24 +265,24 @@ namespace CORBA
     ~NVList (void);
 
   private:
-    /// constructor - cannot be instantiated directly other than
+    /// Constructor - cannot be instantiated directly other than
     /// through the CORBA::ORB::create_list method
     NVList (void);
 
-    /// helper to increase the list size. This is used by all the add_
+    /// Helper to increase the list size. This is used by all the add_
     /// methods of the NVList class
     NamedValue_ptr add_element (Flags
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                               );
 
     /// Lazy evaluation routine to fill up the Anys in the NVList from
     /// the CDR stream.
-    void evaluate (ACE_ENV_SINGLE_ARG_DECL);
+    void evaluate (void);
 
   private:
-    /// internal list of parameters stored as NamedValues
+    /// Internal list of parameters stored as NamedValues
     ACE_Unbounded_Queue<NamedValue_ptr> values_;
 
-    /// maximum length of list
+    /// Maximum length of list
     ULong max_;
 
     /// Reference counter.
diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl
index e89db0e4dfb..d3fd8f93d3c 100644
--- a/TAO/tao/AnyTypeCode/NVList.inl
+++ b/TAO/tao/AnyTypeCode/NVList.inl
@@ -99,11 +99,10 @@ CORBA::NVList::NVList (void)
 
 ACE_INLINE
 CORBA::ULong
-CORBA::NVList::count (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::NVList::count (void) const
 {
   (const_cast<CORBA::NVList *> (this))->evaluate (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    );
 
   return this->max_;
 }
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
index 7ed8cb3d983..094c4c43d94 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
@@ -15,7 +15,7 @@ void
 TAO_NVList_Adapter_Impl::create_list (
       CORBA::Long count,
       CORBA::NVList_ptr &new_list
-      ACE_ENV_ARG_DECL)
+      )
 {
   ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX);
   // Create an empty list
@@ -26,7 +26,6 @@ TAO_NVList_Adapter_Impl::create_list (
                         0,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   // If count is greater than 0, create a list of NamedValues.
   if (count != 0)
@@ -43,7 +42,6 @@ TAO_NVList_Adapter_Impl::create_list (
                                 0,
                                 ENOMEM),
                               CORBA::COMPLETED_NO));
-          ACE_CHECK;
 
           new_list->values_.enqueue_tail (nv);
         }
@@ -53,7 +51,7 @@ TAO_NVList_Adapter_Impl::create_list (
 void
 TAO_NVList_Adapter_Impl::create_named_value (
       CORBA::NamedValue_ptr &nv
-      ACE_ENV_ARG_DECL)
+      )
 {
   ACE_NEW_THROW_EX (nv,
                     CORBA::NamedValue,
diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
index e24ebd357c5..0eea676bc2c 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
@@ -36,11 +36,11 @@ public:
   virtual void create_list (
       CORBA::Long count,
       CORBA::NVList_ptr &new_list
-      ACE_ENV_ARG_DECL);
+     );
 
   virtual void create_named_value (
       CORBA::NamedValue_ptr &nv
-      ACE_ENV_ARG_DECL);
+     );
 
   /// Used to force the initialization of the NVList adapter
   static int Initializer (void);
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
index c897143e4dc..176caed7dc2 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
@@ -55,8 +55,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_release (void)
 template <typename StringType, class RefCountPolicy>
 CORBA::Boolean
 TAO::TypeCode::Objref<StringType, RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ACE_ENV_ARG_DECL_NOT_USED) const
+  CORBA::TypeCode_ptr /* tc */) const
 {
   // Equality has already been established in the
   // CORBA::TypeCode base class.
@@ -67,8 +66,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::equal_i (
 template <typename StringType, class RefCountPolicy>
 CORBA::Boolean
 TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
+  CORBA::TypeCode_ptr) const
 {
   // Equivalence already verified in the base class
   // CORBA::TypeCode::equivalent() method.
@@ -79,8 +77,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i (
 template <typename StringType, class RefCountPolicy>
 CORBA::TypeCode_ptr
 TAO::TypeCode::Objref<StringType,
-                      RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+                      RefCountPolicy>::get_compact_typecode_i (void) const
 {
   TAO_TypeCodeFactory_Adapter * const adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -96,46 +93,39 @@ TAO::TypeCode::Objref<StringType,
   if (this->kind_ == CORBA::tk_abstract_interface)
     {
       return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_component)
     {
       return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
+                                           ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_home)
     {
       return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                      ACE_ENV_ARG_PARAMETER);
+                                      ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_local_interface)
     {
       return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 ""  /* empty name */);
 
     }
   else if (this->kind_ == CORBA::tk_native)
     {
       return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                        ACE_ENV_ARG_PARAMETER);
+                                        ""  /* empty name */);
     }
   else // CORBA::tk_objref
     {
       return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
+                                           ""  /* empty name */);
     }
 }
 
 template <typename StringType, class RefCountPolicy>
 char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -144,8 +134,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (
 
 template <typename StringType, class RefCountPolicy>
 char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
index 8444669513a..5fe946cf468 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
@@ -88,13 +88,13 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
 
     protected:
 
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index 883b13ab3ed..4a1925193a6 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -55,8 +55,7 @@ TAO::TypeCode::Objref<char const *,
 
 CORBA::Boolean
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ACE_ENV_ARG_DECL_NOT_USED) const
+  CORBA::TypeCode_ptr /* tc */) const
 {
   // Equality has already been established in the
   // CORBA::TypeCode base class.
@@ -66,8 +65,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i (
 
 CORBA::Boolean
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
+  CORBA::TypeCode_ptr) const
 {
   // Equivalence already verified in the base class
   // CORBA::TypeCode::equivalent() method.
@@ -78,7 +76,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i (
 CORBA::TypeCode_ptr
 TAO::TypeCode::Objref<char const *,
                       TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   TAO_TypeCodeFactory_Adapter * const adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
@@ -94,45 +92,39 @@ TAO::TypeCode::Objref<char const *,
   if (this->kind_ == CORBA::tk_abstract_interface)
     {
       return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                    ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_component)
     {
       return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
+                                           ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_home)
     {
       return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                      ACE_ENV_ARG_PARAMETER);
+                                      ""  /* empty name */);
     }
   else if (this->kind_ == CORBA::tk_local_interface)
     {
       return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                 ""  /* empty name */);
 
     }
   else if (this->kind_ == CORBA::tk_native)
     {
       return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                        ACE_ENV_ARG_PARAMETER);
+                                        ""  /* empty name */);
     }
   else // CORBA::tk_objref
     {
       return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
+                                           ""  /* empty name */);
     }
 }
 
 char const *
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -141,7 +133,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
 
 char const *
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
index f67bb980e66..e73dc34911c 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
@@ -91,14 +91,11 @@ namespace TAO
        * @see @c CORBA::TypeCode
        */
       //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
+      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
+      virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
 
     protected:
 
diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp
index 9d49724bc2f..8e157d6aeba 100644
--- a/TAO/tao/AnyTypeCode/PolicyA.cpp
+++ b/TAO/tao/AnyTypeCode/PolicyA.cpp
@@ -192,16 +192,14 @@ namespace TAO
         return false;
       }
 
-    ACE_TRY_NEW_ENV
+    try
       {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->value_->_tao_decode (cdr);
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
         return false;
       }
-    ACE_ENDTRY;
 
     return true;
   }
@@ -280,16 +278,14 @@ namespace TAO
         return false;
       }
 
-    ACE_TRY_NEW_ENV
+    try
       {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->value_->_tao_decode (cdr);
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
         return false;
       }
-    ACE_ENDTRY;
 
     return true;
   }
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
index be526f4b094..e35d3bad781 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
@@ -58,7 +58,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
                               TypeCodeType,
                               MemberArrayType>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -77,7 +77,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
       Reset flag (this->in_recursion_);
 
       return this->TypeCodeBase::equal_i (tc
-                                          ACE_ENV_ARG_PARAMETER);
+                                         );
     }
 
   // Nothing else to do.
@@ -90,7 +90,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
                               TypeCodeType,
                               MemberArrayType>::equivalent_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -109,7 +109,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
       Reset flag (this->in_recursion_);
 
       return this->TypeCodeBase::equivalent_i (tc
-                                               ACE_ENV_ARG_PARAMETER);
+                                              );
     }
 
   // Nothing else to do.
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index 027100bb476..a1ad3a2f0db 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -122,9 +122,9 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       //@}
 
 
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
index 76016fe93fe..16d63027525 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
@@ -63,54 +63,50 @@ template <typename TypeCodeType, class RefCountPolicy>
 CORBA::Boolean
 TAO::TypeCode::Sequence<TypeCodeType,
                         RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                                  ACE_ENV_ARG_DECL) const
+                                                  ) const
 {
   // The following calls won't throw since CORBA::TypeCode::equal()
   // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong const tc_length = tc->length ();
 
   if (this->length_ != tc_length)
     return 0;
 
   CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    tc->content_type ();
 
   return
     Traits<TypeCodeType>::get_typecode (this->content_type_)->equal (
       rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
+     );
 }
 
 template <typename TypeCodeType, class RefCountPolicy>
 CORBA::Boolean
 TAO::TypeCode::Sequence<TypeCodeType,
                         RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                       ACE_ENV_ARG_DECL) const
+                                                       ) const
 {
   // The following calls won't throw since CORBA::TypeCode::equal()
   // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong const tc_length = tc->length ();
 
   if (this->length_ != tc_length)
     return 0;
 
   CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    tc->content_type ();
 
   return
     Traits<TypeCodeType>::get_typecode (this->content_type_)->equivalent (
       rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
+     );
 }
 
 template <typename TypeCodeType, class RefCountPolicy>
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Already compact since tk_sequence and tk_array TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -130,7 +126,7 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (
 template <typename TypeCodeType, class RefCountPolicy>
 CORBA::ULong
 TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->length_;
 }
@@ -138,7 +134,7 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i (
 template <typename TypeCodeType, class RefCountPolicy>
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
index 3b8cd242ade..524f468e748 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
@@ -85,14 +85,14 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual CORBA::ULong length_i (void) const;
       virtual CORBA::TypeCode_ptr content_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
 
     private:
 
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
index 874fe38365b..ab5af126c49 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -64,54 +64,50 @@ CORBA::Boolean
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // The following calls won't throw since CORBA::TypeCode::equal()
   // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong const tc_length = tc->length ();
 
   if (this->length_ != tc_length)
     return 0;
 
   CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    tc->content_type ();
 
   return
     Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equal (
       rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
+     );
 }
 
 CORBA::Boolean
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::equivalent_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // The following calls won't throw since CORBA::TypeCode::equal()
   // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong const tc_length = tc->length ();
 
   if (this->length_ != tc_length)
     return 0;
 
   CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    tc->content_type ();
 
   return
     Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equivalent (
       rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
+     );
 }
 
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Already compact since tk_sequence and tk_array TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -132,7 +128,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::ULong
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->length_;
 }
@@ -140,7 +136,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
 CORBA::TypeCode_ptr
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
index 7c3d4746fbc..717fc4ab013 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
@@ -83,14 +83,14 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual CORBA::ULong length_i (void) const;
       virtual CORBA::TypeCode_ptr content_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
 
     private:
 
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
index bae404af34e..7f1502b17db 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
@@ -43,12 +43,11 @@ TAO::TypeCode::String<RefCountPolicy>::tao_release (void)
 template <class RefCountPolicy>
 CORBA::Boolean
 TAO::TypeCode::String<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                                ACE_ENV_ARG_DECL) const
+                                                ) const
 {
   // The following call won't throw since CORBA::TypeCode::equal() has
   // already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong const tc_length = tc->length ();
 
   return (this->length_ == tc_length);
 }
@@ -56,19 +55,19 @@ TAO::TypeCode::String<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
 template <class RefCountPolicy>
 CORBA::Boolean
 TAO::TypeCode::String<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                     ACE_ENV_ARG_DECL) const
+                                                     ) const
 {
   // Since TCKind comparisons must be performed before equal_i() is
   // called, we can also call it to determine equivalence of
   // tk_string-based TypeCodes.
   return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
+                       );
 }
 
 template <class RefCountPolicy>
 CORBA::TypeCode_ptr
 TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Already compact since tk_string and tk_wstring TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -83,7 +82,7 @@ TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (
 template <class RefCountPolicy>
 CORBA::ULong
 TAO::TypeCode::String<RefCountPolicy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->length_;
 }
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h
index 86a7270f12b..362cfbb53fa 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.h
@@ -77,12 +77,12 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual CORBA::ULong length_i (void) const;
 
     private:
 
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
index 2066078627a..1fdaf50c6d8 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -42,12 +42,11 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void)
 CORBA::Boolean
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // The following call won't throw since CORBA::TypeCode::equal() has
   // already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong const tc_length = tc->length ();
 
   return (this->length_ == tc_length);
 }
@@ -55,18 +54,18 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i (
 CORBA::Boolean
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Since TCKind comparisons must be performed before equal_i() is
   // called, we can also call it to determine equivalence of
   // tk_string-based TypeCodes.
   return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
+                       );
 }
 
 CORBA::TypeCode_ptr
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Already compact since tk_string and tk_wstring TypeCodes have no
   // name or member names, meaning that we can simply call
@@ -80,7 +79,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
 
 CORBA::ULong
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->length_;
 }
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
index 8911843a9ee..bc7419e1382 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
@@ -80,12 +80,12 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual CORBA::ULong length_i (void) const;
 
     private:
 
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
index aa50e7bdf78..ba7d3ad20a4 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
@@ -113,15 +113,14 @@ TAO::TypeCode::Struct<StringType,
                       FieldArrayType,
                       RefCountPolicy>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // This call shouldn't throw since CORBA::TypeCode::equal() verified
   // that the TCKind is the same as our's prior to invoking this
   // method, meaning that member_count() is supported.
 
   CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nfields != this->nfields_)
     return false;
@@ -134,8 +133,7 @@ TAO::TypeCode::Struct<StringType,
       char const * const lhs_name =
         Traits<StringType>::get_string (lhs_field.name);
       char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                                                    );
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
@@ -144,13 +142,11 @@ TAO::TypeCode::Struct<StringType,
         Traits<StringType>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
         tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                        );
 
       CORBA::Boolean const equal_members =
         lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                      );
 
       if (!equal_members)
         return false;
@@ -169,14 +165,13 @@ TAO::TypeCode::Struct<StringType,
                       FieldArrayType,
                       RefCountPolicy>::equivalent_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
 
   CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nfields != this->nfields_)
     return false;
@@ -187,13 +182,11 @@ TAO::TypeCode::Struct<StringType,
         Traits<StringType>::get_typecode (this->fields_[i].type);
       CORBA::TypeCode_var const rhs =
         tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                        );
 
       CORBA::Boolean const equiv_members =
         lhs->equivalent (rhs.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                        );
 
       if (!equiv_members)
         return false;
@@ -211,7 +204,7 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   ACE_Array_Base<Struct_Field<CORBA::String_var,
                               CORBA::TypeCode_var> >
@@ -233,8 +226,7 @@ TAO::TypeCode::Struct<StringType,
           tc_fields[i].type =
             Traits<StringType>::get_typecode (
               this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+                );
         }
     }
 
@@ -254,7 +246,7 @@ TAO::TypeCode::Struct<StringType,
                                       ""  /* empty name */,
                                       tc_fields,
                                       this->nfields_
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 template <typename StringType,
@@ -266,7 +258,7 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -282,7 +274,7 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -298,7 +290,7 @@ TAO::TypeCode::Struct<StringType,
                       TypeCodeType,
                       FieldArrayType,
                       RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->nfields_;
 }
@@ -313,7 +305,7 @@ TAO::TypeCode::Struct<StringType,
                       FieldArrayType,
                       RefCountPolicy>::member_name_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -333,7 +325,7 @@ TAO::TypeCode::Struct<StringType,
                       FieldArrayType,
                       RefCountPolicy>::member_type_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   if (index >= this->nfields_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index df44f2d2a3a..3881586b117 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -92,18 +92,18 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::ULong member_count_i (void) const;
       virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
+                                          ) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
+                                                 ) const;
       //@}
 
     protected:
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
index 57e6be6de4e..2b899defcbd 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -107,15 +107,14 @@ TAO::TypeCode::Struct<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // This call shouldn't throw since CORBA::TypeCode::equal() verified
   // that the TCKind is the same as our's prior to invoking this
   // method, meaning that member_count() is supported.
 
   CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nfields != this->nfields_)
     return false;
@@ -128,8 +127,7 @@ TAO::TypeCode::Struct<char const *,
       char const * const lhs_name =
         Traits<char const *>::get_string (lhs_field.name);
       char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                                                    );
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
@@ -138,13 +136,11 @@ TAO::TypeCode::Struct<char const *,
         Traits<char const *>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
         tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                        );
 
       CORBA::Boolean const equal_members =
         lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                      );
 
       if (!equal_members)
         return false;
@@ -160,14 +156,13 @@ TAO::TypeCode::Struct<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::equivalent_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
 
   CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nfields != this->nfields_)
     return false;
@@ -178,13 +173,11 @@ TAO::TypeCode::Struct<char const *,
         Traits<char const *>::get_typecode (this->fields_[i].type);
       CORBA::TypeCode_var const rhs =
         tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                        );
 
       CORBA::Boolean const equiv_members =
         lhs->equivalent (rhs.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                        );
 
       if (!equiv_members)
         return false;
@@ -199,7 +192,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   ACE_Array_Base<Struct_Field<CORBA::String_var,
                               CORBA::TypeCode_var> >
@@ -221,8 +214,7 @@ TAO::TypeCode::Struct<char const *,
           tc_fields[i].type =
             Traits<char const *>::get_typecode (
               this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+                );
         }
     }
 
@@ -242,7 +234,7 @@ TAO::TypeCode::Struct<char const *,
                                       ""  /* empty name */,
                                       tc_fields,
                                       this->nfields_
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 char const *
@@ -251,7 +243,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -264,7 +256,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -277,7 +269,7 @@ TAO::TypeCode::Struct<char const *,
                       TAO::TypeCode::Struct_Field<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->nfields_;
 }
@@ -289,7 +281,7 @@ TAO::TypeCode::Struct<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::member_name_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -306,7 +298,7 @@ TAO::TypeCode::Struct<char const *,
                                                   CORBA::TypeCode_ptr const *> const *,
                       TAO::Null_RefCount_Policy>::member_type_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   if (index >= this->nfields_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
index dea9405238b..4a627573908 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
@@ -96,18 +96,18 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::ULong member_count_i (void) const;
       virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
+                                          ) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
+                                                 ) const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp
index 5abd467b23c..af3ba6357a4 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode.cpp
@@ -32,7 +32,7 @@ CORBA::TypeCode::tao_marshal_kind (TAO_OutputCDR & cdr) const
 
 CORBA::Boolean
 CORBA::TypeCode::equal (TypeCode_ptr tc
-                        ACE_ENV_ARG_DECL) const
+                        ) const
 {
   if (this == tc)
     {
@@ -45,49 +45,42 @@ CORBA::TypeCode::equal (TypeCode_ptr tc
                         false);
     }
 
-  CORBA::TCKind const tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TCKind const tc_kind = tc->kind ();
 
   if (tc_kind != this->kind_)
     return 0;
 
-  ACE_TRY
+  try
     {
-      char const * const tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      char const * const tc_id = tc->id ();
 
-      char const * const this_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      char const * const this_id = this->id ();
 
       if (ACE_OS::strcmp (this_id, tc_id) != 0)
         return 0;
 
-      char const * const tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      char const * const tc_name = tc->name ();
 
-      char const * const this_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      char const * const this_name = this->name ();
 
       if (ACE_OS::strcmp (this_name, tc_name) != 0)
         return 0;
     }
-  ACE_CATCH (CORBA::TypeCode::BadKind, ex)
+  catch (const ::CORBA::TypeCode::BadKind&)
     {
       // Some TypeCodes do not support the id() and name()
       // operations.  Ignore the failure, and continue equality
       // verification using TypeCode subclass-specific techniques
       // below.
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
+                       );
 }
 
 CORBA::Boolean
 CORBA::TypeCode::equivalent (TypeCode_ptr tc
-                             ACE_ENV_ARG_DECL) const
+                             ) const
 {
   if (this == tc)
     {
@@ -105,89 +98,81 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc
 
   CORBA::TypeCode_var unaliased_this =
     TAO::unaliased_typecode (mutable_this
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+                            );
 
   CORBA::TypeCode_var unaliased_tc =
     TAO::unaliased_typecode (tc
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+                            );
 
 
   CORBA::TCKind const this_kind =
-    unaliased_this->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    unaliased_this->kind ();
 
   CORBA::TCKind const tc_kind =
-    unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    unaliased_tc->kind ();
 
   if (tc_kind != this_kind)
     return false;
 
-  ACE_TRY
+  try
     {
       char const * const this_id =
-        unaliased_this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        unaliased_this->id ();
 
       char const * const tc_id =
-        unaliased_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        unaliased_tc->id ();
 
       if (ACE_OS::strlen (this_id) == 0
           || ACE_OS::strlen (tc_id) == 0)
         {
           return unaliased_this->equivalent_i (unaliased_tc.in ()
-                                               ACE_ENV_ARG_PARAMETER);
+                                              );
         }
       else if (ACE_OS::strcmp (this_id, tc_id) != 0)
         {
           return false;
         }
     }
-  ACE_CATCH (CORBA::TypeCode::BadKind, ex)
+  catch (const ::CORBA::TypeCode::BadKind&)
     {
       // Some TypeCodes do not support the id() operation.  Ignore the
       // failure, and continue equivalence verification using TypeCode
       // subclass-specific techniques.
       return unaliased_this->equivalent_i (unaliased_tc.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (false);
 
   return true;
 }
 
 char const *
-CORBA::TypeCode::id_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::id_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
 }
 
 char const *
-CORBA::TypeCode::name_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::name_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
 }
 
 CORBA::ULong
-CORBA::TypeCode::member_count_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::member_count_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
 }
 
 char const *
 CORBA::TypeCode::member_name_i (CORBA::ULong /* index */
-                                ACE_ENV_ARG_DECL) const
+                                ) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
 }
 
 CORBA::TypeCode_ptr
 CORBA::TypeCode::member_type_i (CORBA::ULong /* index */
-                                ACE_ENV_ARG_DECL) const
+                                ) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                     CORBA::TypeCode::_nil ());
@@ -195,66 +180,66 @@ CORBA::TypeCode::member_type_i (CORBA::ULong /* index */
 
 CORBA::Any *
 CORBA::TypeCode::member_label_i (CORBA::ULong /* index */
-                                 ACE_ENV_ARG_DECL) const
+                                 ) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::discriminator_type_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                     CORBA::TypeCode::_nil ());
 }
 
 CORBA::Long
-CORBA::TypeCode::default_index_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::default_index_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
 }
 
 CORBA::ULong
-CORBA::TypeCode::length_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::length_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::content_type_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::content_type_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                     CORBA::TypeCode::_nil ());
 }
 
 CORBA::UShort
-CORBA::TypeCode::fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::fixed_digits_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
 }
 
 CORBA::UShort
-CORBA::TypeCode::fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::fixed_scale_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
 }
 
 CORBA::Visibility
 CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */
-                                      ACE_ENV_ARG_DECL) const
+                                      ) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                     CORBA::PRIVATE_MEMBER);
 }
 
 CORBA::ValueModifier
-CORBA::TypeCode::type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::type_modifier_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                     CORBA::VM_NONE);
 }
 
 CORBA::TypeCode_ptr
-CORBA::TypeCode::concrete_base_type_i (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::concrete_base_type_i (void) const
 {
   ACE_THROW_RETURN (CORBA::TypeCode::BadKind (),
                     CORBA::TypeCode::_nil ());
@@ -300,19 +285,19 @@ CORBA::TypeCode::Bounds::_raise (void) const
 
 void
 CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr
-                                      ACE_ENV_ARG_DECL) const
+                                      ) const
 {
   if (cdr << this->_rep_id ())
     {
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 void
 CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      )
 {
 }
 
@@ -348,19 +333,19 @@ CORBA::TypeCode::BadKind::_raise (void) const
 
 void
 CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr
-                                       ACE_ENV_ARG_DECL) const
+                                       ) const
 {
   if (cdr << this->_rep_id ())
     {
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 void
 CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR &
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       )
 {
 }
 
@@ -406,7 +391,7 @@ operator<< (TAO_OutputCDR & cdr,
 
 CORBA::TypeCode_ptr
 TAO::unaliased_typecode (CORBA::TypeCode_ptr tc
-                         ACE_ENV_ARG_DECL)
+                         )
 {
   if (CORBA::is_nil (tc))
     {
@@ -415,8 +400,7 @@ TAO::unaliased_typecode (CORBA::TypeCode_ptr tc
                         tc);
     }
 
-  CORBA::TCKind tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
+  CORBA::TCKind tc_kind = tc->kind ();
 
   if (tc_kind == CORBA::tk_alias)
     {
@@ -427,11 +411,9 @@ TAO::unaliased_typecode (CORBA::TypeCode_ptr tc
       do
         {
           tc_content =
-            tc_content->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (tc);
+            tc_content->content_type ();
 
-          tc_kind = tc_content->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (tc);
+          tc_kind = tc_content->kind ();
         }
       while (tc_kind == CORBA::tk_alias);
 
@@ -477,7 +459,7 @@ namespace TAO
   {
     CORBA::TypeCode::_duplicate (p);
   }
-   
+
   void
   In_Object_Argument_Cloner_T<CORBA::TypeCode_ptr>::release (
                                                 CORBA::TypeCode_ptr p)
@@ -490,14 +472,13 @@ namespace TAO
 
 CORBA::TCKind
 TAO::unaliased_kind (CORBA::TypeCode_ptr tc
-                     ACE_ENV_ARG_DECL)
+                     )
 {
   CORBA::TypeCode_var unaliased_tc =
     TAO::unaliased_typecode (tc
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TAO_TC_KIND_COUNT);
+                            );
 
-  return unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return unaliased_tc->kind ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h
index 98957712997..1539fa9fed7 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.h
+++ b/TAO/tao/AnyTypeCode/TypeCode.h
@@ -87,9 +87,9 @@ namespace CORBA
       virtual void _raise (void) const;
 
       virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ACE_ENV_ARG_DECL) const;
+                                ) const;
       virtual void _tao_decode (TAO_InputCDR & cdr
-                                ACE_ENV_ARG_DECL);
+                               );
 
     };
 
@@ -116,9 +116,9 @@ namespace CORBA
       virtual void _raise (void) const;
 
       virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ACE_ENV_ARG_DECL) const;
+                                ) const;
       virtual void _tao_decode (TAO_InputCDR & cdr
-                                ACE_ENV_ARG_DECL);
+                               );
 
     };
 
@@ -160,7 +160,7 @@ namespace CORBA
      *         @c TypeCode and @a tc returns identical results.
      */
     Boolean equal (TypeCode_ptr tc
-                   ACE_ENV_ARG_DECL) const;
+                   ) const;
 
     /// Equivalence of two @c TypeCodes.
     /**
@@ -170,10 +170,10 @@ namespace CORBA
      * @see equal
      */
     Boolean equivalent (TypeCode_ptr tc
-                        ACE_ENV_ARG_DECL) const;
+                        ) const;
 
     /// The kind of @c TypeCode.
-    TCKind kind (ACE_ENV_SINGLE_ARG_DECL) const;
+    TCKind kind (void) const;
 
     /// Return @c TypeCode stripped of optional @c name and
     /// @c member_name fields.
@@ -195,7 +195,7 @@ namespace CORBA
      *       the TAO_IDL compiler by invoking it with its "-Gt"
      *       (i.e. enable optimized TypeCodes) command line option.
      */
-    TypeCode_ptr get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const;
+    TypeCode_ptr get_compact_typecode (void) const;
 
     /// The @c RepositoryId globally identifying the type.
     /**
@@ -221,7 +221,7 @@ namespace CORBA
      *       is required by the C++ mapping.  In particular, ownership
      *       is maintained by the @c TypeCode.
      */
-    char const * id (ACE_ENV_SINGLE_ARG_DECL) const;
+    char const * id (void) const;
 
     /// The simple name identifying the type within its enclosing
     /// scope.
@@ -248,7 +248,7 @@ namespace CORBA
      *       behavior is required by the C++ mapping.  In particular,
      *       ownership is maintained by the @c TypeCode.
      */
-    char const * name (ACE_ENV_SINGLE_ARG_DECL) const;
+    char const * name (void) const;
 
     /// The type member count.
     /**
@@ -261,7 +261,7 @@ namespace CORBA
      * @li @c tk_except
      * @li @c tk_event
      */
-    ULong member_count (ACE_ENV_SINGLE_ARG_DECL) const;
+    ULong member_count (void) const;
 
     /// The type member name.
     /**
@@ -280,7 +280,7 @@ namespace CORBA
      *       ownership is maintained by the @c TypeCode.
      */
     char const * member_name (ULong index
-                              ACE_ENV_ARG_DECL) const;
+                              ) const;
 
     /// The type member @c TypeCode.
     /**
@@ -293,7 +293,7 @@ namespace CORBA
      * @li @c tk_event
      */
     TypeCode_ptr member_type (ULong index
-                              ACE_ENV_ARG_DECL) const;
+                              ) const;
 
     /// The union member label.
     /**
@@ -302,7 +302,7 @@ namespace CORBA
      * @li @c tk_union
      */
     Any * member_label (ULong index
-                        ACE_ENV_ARG_DECL) const;
+                        ) const;
 
     /// The type of all non-default union member labels.
     /**
@@ -310,7 +310,7 @@ namespace CORBA
      *
      * @li @c tk_union
      */
-    TypeCode_ptr discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const;
+    TypeCode_ptr discriminator_type (void) const;
 
     /// The index of the default union member.
     /**
@@ -318,7 +318,7 @@ namespace CORBA
      *
      * @li @c tk_union
      */
-    Long default_index (ACE_ENV_SINGLE_ARG_DECL) const;
+    Long default_index (void) const;
 
     /// The length of the type.
     /**
@@ -329,7 +329,7 @@ namespace CORBA
      * @li @c tk_sequence
      * @li @c tk_array
      */
-    ULong length (ACE_ENV_SINGLE_ARG_DECL) const;
+    ULong length (void) const;
 
     /// The underlying content type.
     /**
@@ -340,7 +340,7 @@ namespace CORBA
      * @li @c tk_value_box
      * @li @c tk_alias
      */
-    TypeCode_ptr content_type (ACE_ENV_SINGLE_ARG_DECL) const;
+    TypeCode_ptr content_type (void) const;
 
     /// The number of significant digits.
     /**
@@ -348,7 +348,7 @@ namespace CORBA
      *
      * @li @c tk_fixed
      */
-    UShort fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const;
+    UShort fixed_digits (void) const;
 
     /// The scale factor.
     /**
@@ -356,7 +356,7 @@ namespace CORBA
      *
      * @li @c tk_fixed
      */
-    UShort fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const;
+    UShort fixed_scale (void) const;
 
     /// The @c Visibility of the @c valuetype or @c eventtype member
     /// corresponding to index @a index.
@@ -367,7 +367,7 @@ namespace CORBA
      * @li @c tk_event
      */
     Visibility member_visibility (ULong index
-                                  ACE_ENV_ARG_DECL) const;
+                                  ) const;
 
     /// The @c ValueModifier of the @c valuetype of @c eventtype
     /// represented by this @c TypeCode.
@@ -377,7 +377,7 @@ namespace CORBA
      * @li @c tk_value
      * @li @c tk_event
      */
-    ValueModifier type_modifier (ACE_ENV_SINGLE_ARG_DECL) const;
+    ValueModifier type_modifier (void) const;
 
     /// The @c TypeCode corresponding to the concrete base
     /// @c valuetype or @c eventtype.
@@ -391,7 +391,7 @@ namespace CORBA
      *         @c valuetype or @c eventtype.
      *         @c CORBA::TypeCode::_nil() if no concrete base exists.
      */
-    TypeCode_ptr concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const;
+    TypeCode_ptr concrete_base_type (void) const;
     //@}
 
     /// Marshal the @c TypeCode @c TCKind.
@@ -472,33 +472,33 @@ namespace CORBA
      */
     //@{
     virtual Boolean equal_i (TypeCode_ptr tc
-                             ACE_ENV_ARG_DECL) const = 0;
+                             ) const = 0;
     virtual Boolean equivalent_i (TypeCode_ptr tc
-                                  ACE_ENV_ARG_DECL) const = 0;
+                                  ) const = 0;
     virtual TypeCode_ptr get_compact_typecode_i (
-      ACE_ENV_SINGLE_ARG_DECL) const = 0;
+      void) const = 0;
 
-    virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
+    virtual char const * id_i (void) const;
+    virtual char const * name_i (void) const;
+    virtual ULong member_count_i (void) const;
     virtual char const * member_name_i (ULong index
-                                        ACE_ENV_ARG_DECL) const;
+                                        ) const;
     virtual TypeCode_ptr member_type_i (ULong index
-                                        ACE_ENV_ARG_DECL) const;
+                                        ) const;
     virtual Any * member_label_i (ULong index
-                                  ACE_ENV_ARG_DECL) const;
+                                  ) const;
     virtual TypeCode_ptr discriminator_type_i (
-      ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const;
+      void) const;
+    virtual Long default_index_i (void) const;
+    virtual ULong length_i (void) const;
+    virtual TypeCode_ptr content_type_i (void) const;
+    virtual UShort fixed_digits_i (void) const;
+    virtual UShort fixed_scale_i (void) const;
     virtual Visibility member_visibility_i (ULong index
-                                            ACE_ENV_ARG_DECL) const;
-    virtual ValueModifier type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const;
+                                            ) const;
+    virtual ValueModifier type_modifier_i (void) const;
     virtual TypeCode_ptr concrete_base_type_i (
-      ACE_ENV_SINGLE_ARG_DECL) const;
+      void) const;
     //@}
 
   private:
@@ -546,7 +546,7 @@ namespace TAO
   /// @c TypeCode.
   TAO_AnyTypeCode_Export CORBA::TypeCode_ptr unaliased_typecode (
     CORBA::TypeCode_ptr tc
-    ACE_ENV_ARG_DECL);
+   );
 
   /// Return the unaliased @c TCKind of the given @c TypeCode.
   /**
@@ -556,7 +556,7 @@ namespace TAO
    */
   TAO_AnyTypeCode_Export
   CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL);
+                               );
 
   // ---------------------------------------------------------------
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl
index f06f9f5ba2d..8baaeebea97 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode.inl
@@ -43,113 +43,113 @@ CORBA::TypeCode::_nil (void)
 }
 
 ACE_INLINE CORBA::TCKind
-CORBA::TypeCode::kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+CORBA::TypeCode::kind (void) const
 {
   return this->kind_;
 }
 
 ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::get_compact_typecode (void) const
 {
-  return this->get_compact_typecode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->get_compact_typecode_i ();
 }
 
 ACE_INLINE char const *
-CORBA::TypeCode::id (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::id (void) const
 {
-  return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->id_i ();
 }
 
 ACE_INLINE char const *
-CORBA::TypeCode::name (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::name (void) const
 {
-  return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->name_i ();
 }
 
 ACE_INLINE CORBA::ULong
-CORBA::TypeCode::member_count (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::member_count (void) const
 {
-  return this->member_count_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->member_count_i ();
 }
 
 ACE_INLINE char const *
 CORBA::TypeCode::member_name (ULong index
-                              ACE_ENV_ARG_DECL) const
+                              ) const
 {
   return this->member_name_i (index
-                              ACE_ENV_ARG_PARAMETER);
+                             );
 }
 
 ACE_INLINE CORBA::TypeCode_ptr
 CORBA::TypeCode::member_type (ULong index
-                              ACE_ENV_ARG_DECL) const
+                              ) const
 {
   return this->member_type_i (index
-                              ACE_ENV_ARG_PARAMETER);
+                             );
 }
 
 ACE_INLINE CORBA::Any *
 CORBA::TypeCode::member_label (ULong index
-                               ACE_ENV_ARG_DECL) const
+                               ) const
 {
   return this->member_label_i (index
-                               ACE_ENV_ARG_PARAMETER);
+                              );
 }
 
 ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::discriminator_type (void) const
 {
-  return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->discriminator_type_i ();
 }
 
 ACE_INLINE CORBA::Long
-CORBA::TypeCode::default_index (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::default_index (void) const
 {
-  return this->default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->default_index_i ();
 }
 
 ACE_INLINE CORBA::ULong
-CORBA::TypeCode::length (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::length (void) const
 {
-  return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->length_i ();
 }
 
 ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::content_type (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::content_type (void) const
 {
-  return this->content_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->content_type_i ();
 }
 
 ACE_INLINE CORBA::UShort
-CORBA::TypeCode::fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::fixed_digits (void) const
 {
-  return this->fixed_digits_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->fixed_digits_i ();
 }
 
 ACE_INLINE CORBA::UShort
-CORBA::TypeCode::fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::fixed_scale (void) const
 {
-  return this->fixed_scale_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->fixed_scale_i ();
 }
 
 ACE_INLINE CORBA::Visibility
 CORBA::TypeCode::member_visibility (ULong index
-                                    ACE_ENV_ARG_DECL) const
+                                    ) const
 {
   return this->member_visibility_i (index
-                                    ACE_ENV_ARG_PARAMETER);
+                                   );
 }
 
 ACE_INLINE CORBA::ValueModifier
-CORBA::TypeCode::type_modifier (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::type_modifier (void) const
 {
-  return this->type_modifier_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_modifier_i ();
 }
 
 ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::TypeCode::concrete_base_type (void) const
 {
-  return this->concrete_base_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->concrete_base_type_i ();
 }
 
 ACE_INLINE void
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index 0c488de495a..bd489f01c77 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -482,10 +482,8 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
         && cdr >> discriminant_type.out ())) // No need to use tc_demarshal()
     return false;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   CORBA::TCKind const discriminant_kind =
-    discriminant_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    discriminant_type->kind ();
 
   // Check for valid discriminant type.
   if (!(discriminant_kind == CORBA::tk_enum
@@ -1392,9 +1390,8 @@ namespace
 
          TAO::TypeCodeFactory::TC_Info & info = infos[old_size];
 
-         ACE_DECLARE_NEW_CORBA_ENV;
-         info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-         ACE_CHECK_RETURN (false);  // Should never throw!
+         info.id = tc->id ();
+ // Should never throw!
 
          info.type = tc;
        }
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
index 67edee2d6b8..9cb9957d07e 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -21,13 +21,12 @@ template <typename StringType, typename TypeCodeType>
 bool
 TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
                                                       CORBA::TypeCode_ptr tc
-                                                      ACE_ENV_ARG_DECL) const
+                                                      ) const
 {
   // Check case names.
   char const * const lhs_name = this->name ();
   char const * const rhs_name = tc->member_name (index
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                );
 
   if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
     return 0;
@@ -36,13 +35,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
   CORBA::TypeCode_ptr const lhs_tc = this->type ();
   CORBA::TypeCode_var const rhs_tc =
     tc->member_type (index
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                    );
 
   CORBA::Boolean const equal_members =
     lhs_tc->equal (rhs_tc.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                  );
 
   if (!equal_members)
     return 0;
@@ -50,7 +47,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
   // Check case label.
   return this->equal_label (index,
                             tc
-                            ACE_ENV_ARG_PARAMETER);
+                           );
 }
 
 template <typename StringType, typename TypeCodeType>
@@ -58,7 +55,7 @@ bool
 TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent (
   CORBA::ULong index,
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Member names are ignore when determining equivalence.
 
@@ -66,13 +63,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent (
   CORBA::TypeCode_ptr const lhs_tc = this->type ();
   CORBA::TypeCode_var const rhs_tc =
     tc->member_type (index
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                    );
 
   CORBA::Boolean const equivalent_members =
     lhs_tc->equivalent (rhs_tc.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                       );
 
   if (!equivalent_members)
     return 0;
@@ -81,7 +76,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent (
   // The label must be equal when determining equivalence, too.
   return this->equal_label (index,
                             tc
-                            ACE_ENV_ARG_PARAMETER);
+                           );
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
index 638051bcb6a..e53539887cc 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -78,7 +78,7 @@ namespace TAO
 
       /// Return the IDL @c union case label value embedded within a
       /// @c CORBA::Any.
-      virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const = 0;
+      virtual CORBA::Any * label (void) const = 0;
 
       /// Get the name of the @c union case/member.
       char const * name (void) const;
@@ -110,14 +110,14 @@ namespace TAO
       /// index" in the given @c TypeCode @a tc.
       bool equal (CORBA::ULong index,
                   CORBA::TypeCode_ptr tc
-                  ACE_ENV_ARG_DECL) const;
+                  ) const;
 
       /// Check for equivalence of the @c case attributes contained by
       /// this class and the corresponding member attributes at index
       /// "@a index" in the given @c TypeCode @a tc.
       bool equivalent (CORBA::ULong index,
                        CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL) const;
+                       ) const;
 
     protected:
 
@@ -141,7 +141,7 @@ namespace TAO
        */
       virtual bool equal_label (CORBA::ULong index,
                                 CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL) const = 0;
+                                ) const = 0;
 
     private:
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
index acca54b701e..ecf86e30c38 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp
@@ -54,11 +54,10 @@ bool
 TAO::TypeCode::Case_Enum_T<StringType,
                            TypeCodeType>::equal_label (::CORBA::ULong index,
                                                        ::CORBA::TypeCode_ptr tc
-                                                       ACE_ENV_ARG_DECL) const
+                                                       ) const
 {
   CORBA::Any_var const any = tc->member_label (index
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+                                              );
 
   // The equality operator == below is guaranteed to be defined for
   // the discriminator type since an IDL union discriminator type must
@@ -79,7 +78,7 @@ template <typename StringType,
           typename TypeCodeType>
 CORBA::Any *
 TAO::TypeCode::Case_Enum_T<StringType,
-                           TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const
+                           TypeCodeType>::label (void) const
 {
     TAO_OutputCDR out_cdr;
 
@@ -89,7 +88,6 @@ TAO::TypeCode::Case_Enum_T<StringType,
     ACE_NEW_THROW_EX (retval,
                         CORBA::Any,
                         CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
 
     TAO_InputCDR in_cdr (out_cdr);
     TAO::Unknown_IDL_Type *unk = 0;
@@ -97,7 +95,6 @@ TAO::TypeCode::Case_Enum_T<StringType,
                       TAO::Unknown_IDL_Type (this->discriminator_tc_.in (),
                                              in_cdr),
                       CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
 
     CORBA::Any_var safe_value (retval);
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
index 23886d0e1d4..5db4aef460d 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
@@ -74,11 +74,11 @@ namespace TAO
        */
       //@{
       Case<StringType, TypeCodeType> * clone (void) const;
-      virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const;
+      virtual CORBA::Any * label (void) const;
       virtual bool marshal_label (TAO_OutputCDR & cdr) const;
       virtual bool equal_label (CORBA::ULong index,
                                 CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL) const;
+                                ) const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
index fc7533e98ae..56915ed0bf5 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
@@ -114,11 +114,10 @@ TAO::TypeCode::Case_T<DiscriminatorType,
                       StringType,
                       TypeCodeType>::equal_label (CORBA::ULong index,
                                                   CORBA::TypeCode_ptr tc
-                                                  ACE_ENV_ARG_DECL) const
+                                                  ) const
 {
   CORBA::Any_var const any = tc->member_label (index
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+                                              );
 
   // The equality operator == below is guaranteed to be defined for
   // the discriminator type since an IDL union discriminator type must
@@ -142,14 +141,13 @@ template <typename DiscriminatorType,
 CORBA::Any *
 TAO::TypeCode::Case_T<DiscriminatorType,
                       StringType,
-                      TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const
+                      TypeCodeType>::label (void) const
 {
   CORBA::Any * value = 0;
 
   ACE_NEW_THROW_EX (value,
                     CORBA::Any,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_value (value);
 
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
index c0cff25b880..548199bd4ad 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -111,11 +111,11 @@ namespace TAO
        */
       //@{
       Case<StringType, TypeCodeType> * clone (void) const;
-      virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const;
+      virtual CORBA::Any * label (void) const;
       virtual bool marshal_label (TAO_OutputCDR & cdr) const;
       virtual bool equal_label (CORBA::ULong index,
                                 CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL) const;
+                                ) const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
index 25aba5c6340..c57a1eb8307 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
@@ -56,25 +56,18 @@ TAO::TypeCode::Union<StringType,
     && (enc << this->ncases_);
 
   if (!success)
-    return false;
-
-  offset += enc.total_length ();
+    {
+      return false;
+    }
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
-      TAO_OutputCDR case_enc;
-      offset = ACE_align_binary (offset,
-                                 ACE_CDR::LONG_ALIGN);
-
       case_type const & c = *this->cases_[i];
 
-      if (!c.marshal (case_enc, offset))
-        return false;
-
-      offset += case_enc.total_length ();
-
-      if (!enc.write_octet_array_mb (case_enc.begin ()))
-        return false;
+      if (!c.marshal (enc, offset))
+        {
+          return false;
+        }
     }
 
   return
@@ -118,7 +111,7 @@ TAO::TypeCode::Union<StringType,
                      CaseArrayType,
                      RefCountPolicy>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // These calls shouldn't throw since CORBA::TypeCode::equal()
   // verified that the TCKind is the same as our's prior to invoking
@@ -126,11 +119,9 @@ TAO::TypeCode::Union<StringType,
   // are supported.
 
   CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::Long tc_def = tc->default_index ();
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
@@ -138,14 +129,12 @@ TAO::TypeCode::Union<StringType,
 
   // Check the discriminator type.
   CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->discriminator_type ();
 
   CORBA::Boolean const equal_discriminators =
     Traits<StringType>::get_typecode (this->discriminant_type_)->equal (
       tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+     );
 
   if (!equal_discriminators)
     return false;
@@ -166,8 +155,7 @@ TAO::TypeCode::Union<StringType,
       bool const equal_case =
         lhs_case.equal (i,
                         tc
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                       );
 
       if (!equal_case)
         return false;
@@ -186,31 +174,27 @@ TAO::TypeCode::Union<StringType,
                      CaseArrayType,
                      RefCountPolicy>::equivalent_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
 
   CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::Long tc_def = tc->default_index ();
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
     return false;
 
   CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->discriminator_type ();
 
   CORBA::Boolean const equiv_discriminators =
     Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent (
       tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+     );
 
   if (!equiv_discriminators)
     return false;
@@ -231,8 +215,7 @@ TAO::TypeCode::Union<StringType,
       bool const equivalent_case =
         lhs_case.equivalent (i,
                              tc
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                            );
 
       if (!equivalent_case)
         return false;
@@ -250,7 +233,7 @@ TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
                      RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
 //   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
 //                                              CORBA::TypeCode_var> > elem_type;
@@ -271,8 +254,7 @@ TAO::TypeCode::Union<StringType,
 //           tc_cases[i].name = empty_name;
 //           tc_cases[i].type =
 //             this->cases_[i]->type ()->get_compact_typecode (
-//               ACE_ENV_ARG_PARAMETER);
-//           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+//              );
 //         }
 //     }
 
@@ -297,8 +279,7 @@ TAO::TypeCode::Union<StringType,
 //       this->default_index_,
 //       "",
 //       Traits<StringType>::get_typecode (this->default_case_.type)
-//       ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+//      );
 
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
 
@@ -314,7 +295,7 @@ TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
                      RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -330,7 +311,7 @@ TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
                      RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -346,7 +327,7 @@ TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                       CaseArrayType,
                       RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->ncases_;
 }
@@ -360,7 +341,7 @@ TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
                      RefCountPolicy>::member_name_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const
+                                                     ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -379,7 +360,7 @@ TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
                      RefCountPolicy>::member_type_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const
+                                                     ) const
 {
   if (index >= this->ncases_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
@@ -397,7 +378,7 @@ TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
                      RefCountPolicy>::member_label_i (CORBA::ULong index
-                                                      ACE_ENV_ARG_DECL) const
+                                                      ) const
 {
   if (index >= this->ncases_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
@@ -411,7 +392,6 @@ TAO::TypeCode::Union<StringType,
       ACE_NEW_THROW_EX (any,
                         CORBA::Any,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
 
       CORBA::Any_var safe_any (any);
 
@@ -425,7 +405,7 @@ TAO::TypeCode::Union<StringType,
     }
 
   // Non-default cases.
-  return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->cases_[index]->label ();
 }
 
 template <typename StringType,
@@ -437,7 +417,7 @@ TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
                      RefCountPolicy>::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return
     CORBA::TypeCode::_duplicate (
@@ -453,7 +433,7 @@ TAO::TypeCode::Union<StringType,
                      TypeCodeType,
                      CaseArrayType,
                      RefCountPolicy>::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->default_index_;
 }
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h
index 8089aeea48f..73d520102b3 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -99,23 +99,23 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::ULong member_count_i (void) const;
       virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
+                                          ) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
+                                                 ) const;
       virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual CORBA::Long default_index_i (void) const;
       //@}
 
     protected:
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
index 2d5677d317e..689a05fb2cd 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -56,26 +56,20 @@ TAO::TypeCode::Union<char const *,
     && (enc << this->ncases_);
 
   if (!success)
-    return false;
-
-  offset += enc.total_length ();
+    {
+      return false;
+    }
 
   // Note that we handle the default case below, too.
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
-      TAO_OutputCDR case_enc;
-      offset = ACE_align_binary (offset,
-                                 ACE_CDR::LONG_ALIGN);
       case_type const & c = *this->cases_[i];
 
-      if (!c.marshal (case_enc, offset))
-        return false;
-
-      offset += case_enc.total_length ();
-
-      if (!enc.write_octet_array_mb (case_enc.begin ()))
-        return false;
+      if (!c.marshal (enc, offset))
+        {
+          return false;
+        }
     }
 
   return
@@ -108,34 +102,26 @@ TAO::TypeCode::Union<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // These calls shouldn't throw since CORBA::TypeCode::equal()
   // verified that the TCKind is the same as our's prior to invoking
   // this method, meaning that the CORBA::tk_union TypeCode methods
   // are supported.
 
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::ULong const tc_count = tc->member_count ();
 
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::Long tc_def = tc->default_index ();
 
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
+  if (tc_count != this->ncases_ || tc_def != this->default_index_)
     return false;
 
   // Check the discriminator type.
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::TypeCode_var tc_discriminator = tc->discriminator_type ();
 
   CORBA::Boolean const equal_discriminators =
     Traits<char const *>::get_typecode (this->discriminant_type_)->equal (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+      tc_discriminator.in ());
 
   if (!equal_discriminators)
     return false;
@@ -153,11 +139,7 @@ TAO::TypeCode::Union<char const *,
 
       case_type const & lhs_case = *this->cases_[i];
 
-      bool const equal_case =
-        lhs_case.equal (i,
-                        tc
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      bool const equal_case = lhs_case.equal (i, tc);
 
       if (!equal_case)
         return false;
@@ -172,32 +154,22 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  CORBA::TypeCode_ptr tc) const
 {
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
+  CORBA::ULong const tc_count = tc->member_count ();
 
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::Long tc_def = tc->default_index ();
 
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
+  if (tc_count != this->ncases_ || tc_def != this->default_index_)
     return false;
 
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::TypeCode_var tc_discriminator = tc->discriminator_type ();
 
   CORBA::Boolean const equiv_discriminators =
     Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+      tc_discriminator.in ());
 
   if (!equiv_discriminators)
     return false;
@@ -215,11 +187,7 @@ TAO::TypeCode::Union<char const *,
 
       case_type const & lhs_case = *this->cases_[i];
 
-      bool const equivalent_case =
-        lhs_case.equivalent (i,
-                             tc
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      bool const equivalent_case = lhs_case.equivalent (i, tc);
 
       if (!equivalent_case)
         return false;
@@ -234,7 +202,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
 //   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
 //                                              CORBA::TypeCode_var> > elem_type;
@@ -255,8 +223,7 @@ TAO::TypeCode::Union<char const *,
 //           tc_cases[i].name = empty_name;
 //           tc_cases[i].type =
 //             this->cases_[i]->type ()->get_compact_typecode (
-//               ACE_ENV_ARG_PARAMETER);
-//           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+//              );
 //         }
 //     }
 
@@ -281,8 +248,7 @@ TAO::TypeCode::Union<char const *,
 //       this->default_index_,
 //       "",
 //       Traits<char const *>::get_typecode (this->default_case_.type)
-//       ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+//      );
 
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
 }
@@ -293,7 +259,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -306,7 +272,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -319,7 +285,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->ncases_;
 }
@@ -331,7 +297,7 @@ TAO::TypeCode::Union<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::member_name_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -347,8 +313,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  CORBA::ULong index) const
 {
   if (index >= this->ncases_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
@@ -363,8 +328,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::member_label_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  CORBA::ULong index) const
 {
   if (index >= this->ncases_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
@@ -378,7 +342,6 @@ TAO::TypeCode::Union<char const *,
       ACE_NEW_THROW_EX (any,
                         CORBA::Any,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
 
       CORBA::Any_var safe_any (any);
 
@@ -392,7 +355,7 @@ TAO::TypeCode::Union<char const *,
     }
 
   // Non-default cases.
-  return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->cases_[index]->label ();
 }
 
 CORBA::TypeCode_ptr
@@ -401,7 +364,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return
     CORBA::TypeCode::_duplicate (
@@ -414,7 +377,7 @@ TAO::TypeCode::Union<char const *,
                      TAO::TypeCode::Case<char const *,
                                          CORBA::TypeCode_ptr const *> const * const *,
                      TAO::Null_RefCount_Policy>::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return this->default_index_;
 }
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
index bf58345e03f..4617c259d2e 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
@@ -97,23 +97,23 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::ULong member_count_i (void) const;
       virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
+                                          ) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
+                                                 ) const;
       virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual CORBA::Long default_index_i (void) const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
index 8955d4be01b..df14b999403 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -117,34 +117,30 @@ TAO::TypeCode::Value<StringType,
                      FieldArrayType,
                      RefCountPolicy>::equal_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   // None of these calls should throw since CORBA::TypeCode::equal()
   // verified that the TCKind is the same as our's prior to invoking
   // this method.
 
   CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->type_modifier ();
 
   if (tc_type_modifier != this->type_modifier_)
     return false;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->concrete_base_type ();
 
   CORBA::Boolean const equal_concrete_base_types =
     this->equal (rhs_concrete_base_type.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+                );
 
   if (!equal_concrete_base_types)
     return false;
 
   CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nfields != this->nfields_)
     return false;
@@ -157,17 +153,14 @@ TAO::TypeCode::Value<StringType,
       CORBA::Visibility const lhs_visibility = lhs_field.visibility;
       CORBA::Visibility const rhs_visibility =
         tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                              );
 
       if (lhs_visibility != rhs_visibility)
         return false;
 
       char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_field.name);;
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        Traits<StringType>::get_string (lhs_field.name);
+      char const * const rhs_name = tc->member_name (i);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
@@ -175,14 +168,10 @@ TAO::TypeCode::Value<StringType,
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<StringType>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        tc->member_type (i);
 
       CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        lhs_tc->equal (rhs_tc.in ());
 
       if (!equal_members)
         return false;
@@ -201,23 +190,19 @@ TAO::TypeCode::Value<StringType,
                      FieldArrayType,
                      RefCountPolicy>::equivalent_i (
   CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->type_modifier ();
 
   if (tc_type_modifier != this->type_modifier_)
     return false;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->concrete_base_type ();
 
   CORBA::Boolean const equivalent_concrete_base_types =
-    this->equivalent (rhs_concrete_base_type.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    this->equivalent (rhs_concrete_base_type.in ());
 
   if (!equivalent_concrete_base_types)
     return false;
@@ -226,8 +211,7 @@ TAO::TypeCode::Value<StringType,
   // member_name() operations.
 
   CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->member_count ();
 
   if (tc_nfields != this->nfields_)
     return false;
@@ -240,9 +224,7 @@ TAO::TypeCode::Value<StringType,
       CORBA::Visibility const lhs_visibility =
         lhs_field.visibility;
       CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        tc->member_visibility (i);
 
       if (lhs_visibility != rhs_visibility)
         return false;
@@ -250,14 +232,11 @@ TAO::TypeCode::Value<StringType,
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<StringType>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        tc->member_type (i);
 
       CORBA::Boolean const equiv_types =
         lhs_tc->equivalent (rhs_tc.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+                           );
 
       if (!equiv_types)
         return false;
@@ -274,8 +253,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+                     RefCountPolicy>::get_compact_typecode_i (void) const
 {
   ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
     tc_fields (this->nfields_);
@@ -296,8 +274,7 @@ TAO::TypeCode::Value<StringType,
           tc_fields[i].type =
             Traits<StringType>::get_typecode (
               this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+                );
           tc_fields[i].visibility = this->fields_[i].visibility;
         }
     }
@@ -321,7 +298,7 @@ TAO::TypeCode::Value<StringType,
       Traits<StringType>::get_typecode (this->concrete_base_),
       tc_fields,
       this->nfields_
-      ACE_ENV_ARG_PARAMETER);
+     );
 }
 
 template <typename StringType,
@@ -332,8 +309,7 @@ char const *
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     RefCountPolicy>::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -348,8 +324,7 @@ char const *
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     RefCountPolicy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -364,8 +339,7 @@ CORBA::ULong
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     RefCountPolicy>::member_count_i (void) const
 {
   return this->nfields_;
 }
@@ -378,9 +352,7 @@ char const *
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+                     RefCountPolicy>::member_name_i (CORBA::ULong index) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -398,9 +370,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+                     RefCountPolicy>::member_type_i (CORBA::ULong index) const
 {
   if (index >= this->nfields_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
@@ -419,9 +389,7 @@ CORBA::Visibility
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::member_visibility_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+                     RefCountPolicy>::member_visibility_i (CORBA::ULong index) const
 {
   if (index >= this->nfields_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
@@ -438,8 +406,7 @@ CORBA::ValueModifier
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     RefCountPolicy>::type_modifier_i (void) const
 {
   return this->type_modifier_;
 }
@@ -452,8 +419,7 @@ CORBA::TypeCode_ptr
 TAO::TypeCode::Value<StringType,
                      TypeCodeType,
                      FieldArrayType,
-                     RefCountPolicy>::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     RefCountPolicy>::concrete_base_type_i (void) const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h
index ffc18532e6f..c2c4254fd82 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -101,24 +101,24 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::ULong member_count_i (void) const;
       virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
+                                          ) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
+                                                 ) const;
       virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
+                                                     ) const;
       virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
       virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
       //@}
 
     protected:
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
index f8f661e4bdc..e60d00abdbf 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -107,35 +107,27 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  CORBA::TypeCode_ptr tc) const
 {
   // None of these calls should throw since CORBA::TypeCode::equal()
   // verified that the TCKind is the same as our's prior to invoking
   // this method.
 
   CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    tc->type_modifier ();
 
   if (tc_type_modifier != this->type_modifier_)
     return false;
 
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type ();
 
   CORBA::Boolean const equal_concrete_base_types =
-    this->equal (rhs_concrete_base_type.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    this->equal (rhs_concrete_base_type.in ());
 
   if (!equal_concrete_base_types)
     return false;
 
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::ULong const tc_nfields = tc->member_count ();
 
   if (tc_nfields != this->nfields_)
     return false;
@@ -146,19 +138,14 @@ TAO::TypeCode::Value<char const *,
         this->fields_[i];
 
       CORBA::Visibility const lhs_visibility = lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      CORBA::Visibility const rhs_visibility = tc->member_visibility (i);
 
       if (lhs_visibility != rhs_visibility)
         return false;
 
       char const * const lhs_name =
         Traits<char const *>::get_string (lhs_field.name);;
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      char const * const rhs_name = tc->member_name (i);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
         return false;
@@ -166,14 +153,10 @@ TAO::TypeCode::Value<char const *,
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<char const *>::get_typecode (lhs_field.type);
       CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        tc->member_type (i);
 
       CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        lhs_tc->equal (rhs_tc.in ());
 
       if (!equal_members)
         return false;
@@ -188,24 +171,17 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
+  CORBA::TypeCode_ptr tc) const
 {
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::ValueModifier const tc_type_modifier = tc->type_modifier ();
 
   if (tc_type_modifier != this->type_modifier_)
     return false;
 
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::TypeCode_var rhs_concrete_base_type = tc->concrete_base_type ();
 
   CORBA::Boolean const equivalent_concrete_base_types =
-    this->equivalent (rhs_concrete_base_type.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    this->equivalent (rhs_concrete_base_type.in ());
 
   if (!equivalent_concrete_base_types)
     return false;
@@ -213,9 +189,7 @@ TAO::TypeCode::Value<char const *,
   // Perform a structural comparison, excluding the name() and
   // member_name() operations.
 
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::ULong const tc_nfields = tc->member_count ();
 
   if (tc_nfields != this->nfields_)
     return false;
@@ -226,27 +200,17 @@ TAO::TypeCode::Value<char const *,
                   CORBA::TypeCode_ptr const *> const & lhs_field =
         this->fields_[i];
 
-      CORBA::Visibility const lhs_visibility =
-        lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      CORBA::Visibility const lhs_visibility = lhs_field.visibility;
+      CORBA::Visibility const rhs_visibility = tc->member_visibility (i);
 
       if (lhs_visibility != rhs_visibility)
         return false;
 
       CORBA::TypeCode_ptr const lhs_tc =
         Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      CORBA::TypeCode_var const rhs_tc = tc->member_type (i);
 
-      CORBA::Boolean const equiv_types =
-        lhs_tc->equivalent (rhs_tc.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      CORBA::Boolean const equiv_types = lhs_tc->equivalent (rhs_tc.in ());
 
       if (!equiv_types)
         return false;
@@ -261,7 +225,7 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
     tc_fields (this->nfields_);
@@ -282,8 +246,7 @@ TAO::TypeCode::Value<char const *,
           tc_fields[i].type =
             Traits<char const *>::get_typecode (
               this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+                );
           tc_fields[i].visibility = this->fields_[i].visibility;
         }
     }
@@ -307,7 +270,7 @@ TAO::TypeCode::Value<char const *,
       Traits<char const *>::get_typecode (this->concrete_base_),
       tc_fields,
       this->nfields_
-      ACE_ENV_ARG_PARAMETER);
+     );
 }
 
 char const *
@@ -315,8 +278,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     TAO::Null_RefCount_Policy>::id_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -328,8 +290,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     TAO::Null_RefCount_Policy>::name_i (void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -341,8 +302,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     TAO::Null_RefCount_Policy>::member_count_i (void) const
 {
   return this->nfields_;
 }
@@ -353,8 +313,7 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  CORBA::ULong index) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -370,8 +329,7 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  CORBA::ULong index) const
 {
   if (index >= this->nfields_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
@@ -388,8 +346,7 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::member_visibility_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  CORBA::ULong index) const
 {
   if (index >= this->nfields_)
     ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
@@ -403,8 +360,7 @@ TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+                     TAO::Null_RefCount_Policy>::type_modifier_i (void) const
 {
   return this->type_modifier_;
 }
@@ -415,7 +371,7 @@ TAO::TypeCode::Value<char const *,
                      TAO::TypeCode::Value_Field<char const *,
                                                 CORBA::TypeCode_ptr const *> const *,
                      TAO::Null_RefCount_Policy>::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   return
     CORBA::TypeCode::_duplicate (
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
index 57ba318ab03..6df27155314 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
@@ -98,24 +98,24 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::ULong member_count_i (void) const;
       virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
+                                          ) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
+                                                 ) const;
       virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
+                                                     ) const;
       virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
       virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
       //@}
 
     private:
diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
index 9c6fd0a62f2..1eb4a217261 100644
--- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
+++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp
@@ -78,16 +78,14 @@ namespace TAO
         return false;
       }
 
-    ACE_TRY_NEW_ENV
+    try
       {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->value_->_tao_decode (cdr);
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
         return false;
       }
-    ACE_ENDTRY;
 
     return true;
   }
diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp
index 618c273141a..0bfbd0adb7d 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -50,14 +50,13 @@ TAO::traverse_status
 TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
                                TAO_InputCDR *src,
                                TAO_OutputCDR *dest
-                               ACE_ENV_ARG_DECL)
+                               )
 {
   CORBA::Boolean continue_append = 1;
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE; // status of encode operation
 
-  CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::TCKind const k = tc->kind ();
 
   switch (k)
     {
@@ -116,7 +115,7 @@ TAO::traverse_status
 TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
                          TAO_InputCDR *src,
                          TAO_OutputCDR *dest
-                         ACE_ENV_ARG_DECL)
+                         )
 {
   // Typecode of the element that makes the Any.
   CORBA::TypeCode_var elem_tc;
@@ -136,8 +135,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
     TAO_Marshal_Object::perform_append (elem_tc.in (),
                                         src,
                                         dest
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                       );
 
   if (retval != TAO::TRAVERSE_CONTINUE)
     {
@@ -157,7 +155,7 @@ TAO::traverse_status
 TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                               TAO_InputCDR *src,
                               TAO_OutputCDR *dest
-                              ACE_ENV_ARG_DECL)
+                              )
 {
   CORBA::Boolean continue_append = 1;
   TAO::traverse_status retval =
@@ -194,8 +192,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                   TAO_Marshal_Object::perform_append (CORBA::_tc_long,
                                                       src,
                                                       dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                                     );
               }
             break;
 
@@ -207,8 +204,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                   TAO_Marshal_Object::perform_append (CORBA::_tc_long,
                                                       src,
                                                       dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                                     );
               }
             break;
 
@@ -236,8 +232,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                   TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
                                                       src,
                                                       dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                                     );
               }
             } // end of switch
         }
@@ -275,20 +270,20 @@ TAO::traverse_status
 TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
                                TAO_InputCDR *src,
                                TAO_OutputCDR *dest
-                               ACE_ENV_ARG_DECL)
+                               )
 {
   // write the octet sequence representing the Principal
   return TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
                                              src,
                                              dest
-                                             ACE_ENV_ARG_PARAMETER);
+                                            );
 }
 
 TAO::traverse_status
 TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   CORBA::Boolean continue_append = 1;
 
@@ -361,7 +356,7 @@ TAO::traverse_status
 TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
@@ -369,23 +364,20 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
 
   // Number of fields in the struct.
   const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_count ();
 
   for (CORBA::ULong i = 0;
        i < member_count && retval == TAO::TRAVERSE_CONTINUE;
        ++i)
     {
       // get member type
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+      param = tc->member_type (i);
 
       retval =
         TAO_Marshal_Object::perform_append (param.in (),
                                             src,
                                             dest
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                           );
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE)
@@ -404,15 +396,13 @@ TAO::traverse_status
 TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->discriminator_type ();
 
   CORBA::ULong kind =
-    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    discrim_tc->kind ();
 
   // Save the discriminator value in a temporary variable...
   CORBA::Short short_v = CORBA::Short();
@@ -495,8 +485,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
     }
 
   const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_count ();
 
   const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U);
 
@@ -508,16 +497,14 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
        ++i)
     {
       CORBA::Any_var any = tc->member_label (i
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                            );
 
       CORBA::Octet o;
 
       if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
         {
           CORBA::ULong default_index =
-            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+            tc->default_index ();
 
           if (i != default_index)
             ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
@@ -631,12 +618,11 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
         {
           // Good, use the default to append...
           CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+            tc->member_type (default_member);
           return TAO_Marshal_Object::perform_append (member_tc.in (),
                                                      src,
                                                      dest
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                    );
         }
 
       // If we're here, we have an implicit default case, and we
@@ -647,19 +633,18 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
 
   // If we found the member successfully then just use that one...
   CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_type (current_member);
   return TAO_Marshal_Object::perform_append (member_tc.in (),
                                              src,
                                              dest
-                                             ACE_ENV_ARG_PARAMETER);
+                                            );
 }
 
 TAO::traverse_status
 TAO_Marshal_String::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   CORBA::Boolean continue_append = 1;
 
@@ -688,7 +673,7 @@ TAO::traverse_status
 TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
                               TAO_InputCDR *src,
                               TAO_OutputCDR *dest
-                              ACE_ENV_ARG_DECL)
+                              )
 {
   // Size of element.
   CORBA::ULong bounds;
@@ -721,14 +706,12 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
     {
       // Get element typecode.
       CORBA::TypeCode_var tc2 =
-        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+        tc->content_type ();
 
       TAO::traverse_status retval =
         TAO::TRAVERSE_CONTINUE;
 
-      CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+      CORBA::TCKind kind = tc2->kind ();
 
       switch (kind)
         {
@@ -882,8 +865,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
               retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                            src,
                                                            dest
-                                                            ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                                           );
             }
           break;
         }// end of switch
@@ -906,19 +888,16 @@ TAO::traverse_status
 TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::ULong bounds = tc->length ();
 
   // get element typecode
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::TypeCode_var tc2 = tc->content_type ();
 
   // For CORBA basic types, the copy can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::TCKind kind = tc2->kind ();
 
   // Return status.
   TAO::traverse_status retval =
@@ -1075,8 +1054,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
           retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                        src,
                                                        dest
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                                      );
         }
       break;
     }// end of switch
@@ -1097,7 +1075,7 @@ TAO::traverse_status
 TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_var tc2;
@@ -1107,14 +1085,12 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
 
-  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  tc2 = tc->content_type ();
 
   retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                src,
                                                dest
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                              );
 
   if (retval == TAO::TRAVERSE_CONTINUE
       && continue_append == 1)
@@ -1139,7 +1115,7 @@ TAO::traverse_status
 TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
@@ -1151,8 +1127,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
 
   // Number of fields in the struct.
   const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_count ();
 
   for (CORBA::ULong i = 0;
        i < member_count
@@ -1160,14 +1135,12 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
          && continue_append == 1;
        ++i)
     {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+      param = tc->member_type (i);
 
       retval = TAO_Marshal_Object::perform_append (param.in (),
                                                    src,
                                                    dest
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                                  );
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE
@@ -1187,7 +1160,7 @@ TAO::traverse_status
 TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
                              TAO_InputCDR *src,
                              TAO_OutputCDR *dest
-                             ACE_ENV_ARG_DECL)
+                             )
 {
   CORBA::Boolean continue_append = 1;
 
@@ -1217,7 +1190,7 @@ TAO::traverse_status
 TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
@@ -1273,19 +1246,16 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
 
   // Handle our base valuetype if any.
   CORBA::TypeCode_var param =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->concrete_base_type ();
 
-  CORBA::TCKind const param_kind = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::TCKind const param_kind = param->kind ();
 
   if (param_kind != CORBA::tk_null)
     {
       retval = this->append (param.in (),
                              src,
                              dest
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                            );
 
       if (retval != TAO::TRAVERSE_CONTINUE)
         {
@@ -1295,23 +1265,20 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
 
   // Number of fields in the struct.
   const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_count ();
 
   for (CORBA::ULong i = 0;
        i < member_count && retval == TAO::TRAVERSE_CONTINUE;
        ++i)
     {
       // get member type
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+      param = tc->member_type (i);
 
       retval =
         TAO_Marshal_Object::perform_append (param.in (),
                                             src,
                                             dest
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                           );
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE)
diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp
index f8c486bc6a2..6e73a6851bb 100644
--- a/TAO/tao/AnyTypeCode/skip.cpp
+++ b/TAO/tao/AnyTypeCode/skip.cpp
@@ -41,15 +41,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO::traverse_status
 TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
                              TAO_InputCDR *stream
-                             ACE_ENV_ARG_DECL)
+                             )
 {
   CORBA::Boolean continue_skipping = true;
 
   // Status of skip operation.
   TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
 
-  CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::TCKind const k = tc->kind ();
 
   switch (k)
     {
@@ -106,7 +105,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
 TAO::traverse_status
 TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
                        TAO_InputCDR *stream
-                       ACE_ENV_ARG_DECL)
+                       )
 {
   // Typecode of the element that makes the Any.
   CORBA::TypeCode_var elem_tc;
@@ -117,13 +116,13 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
 
   return TAO_Marshal_Object::perform_skip (elem_tc.in (),
                                            stream
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
 }
 
 TAO::traverse_status
 TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
                             TAO_InputCDR *stream
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   CORBA::Boolean continue_skipping = true;
 
@@ -224,7 +223,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
 TAO::traverse_status
 TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
                              TAO_InputCDR *stream
-                             ACE_ENV_ARG_DECL)
+                             )
 {
   CORBA::Boolean continue_skipping = true;
 
@@ -255,7 +254,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
 TAO::traverse_status
 TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
                           TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
+                          )
 {
   CORBA::Boolean continue_skipping = true;
 
@@ -317,27 +316,24 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
 TAO::traverse_status
 TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
                           TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
+                          )
 {
   TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
   CORBA::TypeCode_var param;
 
   // Number of fields in the struct.
   CORBA::ULong const member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_count ();
 
   for (CORBA::ULong i = 0;
        i < member_count && retval == TAO::TRAVERSE_CONTINUE;
        ++i)
     {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+      param = tc->member_type (i);
 
       retval = TAO_Marshal_Object::perform_skip (param.in (),
                                                  stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                                );
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE)
@@ -355,15 +351,13 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
 TAO::traverse_status
 TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *src
-                         ACE_ENV_ARG_DECL)
+                         )
 {
   CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->discriminator_type ();
 
   CORBA::ULong const kind =
-    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    discrim_tc->kind ();
 
   // Save the discriminator value in a temporary variable...
   CORBA::Short short_v = CORBA::Short();
@@ -438,8 +432,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
     }
 
   const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_count ();
 
   const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U);
 
@@ -450,15 +443,13 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
        i < member_count && current_member == null_member;
        ++i)
     {
-      CORBA::Any_var any = tc->member_label (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+      CORBA::Any_var any = tc->member_label (i);
 
       CORBA::Octet o;
       if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
         {
           CORBA::ULong default_index =
-            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+            tc->default_index ();
 
           if (i != default_index)
             ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
@@ -572,11 +563,10 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
         {
           // Good, use the default to append...
           CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+            tc->member_type (default_member);
           return TAO_Marshal_Object::perform_skip (member_tc.in (),
                                                    src
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                  );
         }
 
       // If we're here, we have an implicit default case, and we
@@ -587,18 +577,17 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
 
   // If we found the member successfully then just use that one...
   CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_type (current_member);
 
   return TAO_Marshal_Object::perform_skip (member_tc.in (),
                                            src
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
 }
 
 TAO::traverse_status
 TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
                           TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
+                          )
 {
   CORBA::Boolean continue_skipping = true;
 
@@ -627,7 +616,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
 TAO::traverse_status
 TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *stream
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   // Size of element.
   CORBA::ULong bounds;
@@ -653,12 +642,10 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
 
   // Get element typecode.
   CORBA::TypeCode_var tc2 =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->content_type ();
 
   // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind const kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::TCKind const kind = tc2->kind ();
 
   char *dummy;
   switch (kind)
@@ -713,8 +700,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
           continue_skipping =
             TAO_Marshal_Object::perform_skip (tc2.in (),
                                               stream
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                             );
         }
       break;
     }// end of switch
@@ -734,22 +720,19 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
 TAO::traverse_status
 TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
+                         )
 {
   CORBA::Boolean continue_skipping = true;
 
   // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::ULong bounds = tc->length ();
 
   // get element typecode
   // Typecode of the element.
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::TypeCode_var tc2 = tc->content_type ();
 
   // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind const kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::TCKind const kind = tc2->kind ();
 
   char *dummy;
   switch (kind)
@@ -804,8 +787,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
           int stop =
             TAO_Marshal_Object::perform_skip (tc2.in (),
                                               stream
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                             );
           if (stop == TAO::TRAVERSE_STOP)
             continue_skipping = false;
         }
@@ -827,7 +809,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
 TAO::traverse_status
 TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
+                         )
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_var tc2;
@@ -837,13 +819,11 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
 
-  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  tc2 = tc->content_type ();
 
   retval = TAO_Marshal_Object::perform_skip (tc2.in (),
                                              stream
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                            );
 
   //  tc2->_decr_refcnt ();
   if (retval == TAO::TRAVERSE_CONTINUE
@@ -869,7 +849,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
 TAO::traverse_status
 TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
                           TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
+                          )
 {
   TAO::traverse_status retval =
     TAO::TRAVERSE_CONTINUE;
@@ -881,20 +861,17 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
 
   // Number of fields in the exception
   const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_count ();
 
   for (CORBA::ULong i = 0;
        i < member_count && retval == TAO::TRAVERSE_CONTINUE;
        ++i)
     {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+      param = tc->member_type (i);
 
       retval = TAO_Marshal_Object::perform_skip (param.in (),
                                                  stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                                );
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE)
@@ -913,7 +890,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
 TAO::traverse_status
 TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
                            TAO_InputCDR *stream
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   CORBA::Boolean continue_skipping = true;
 
@@ -943,7 +920,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
 TAO::traverse_status
 TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
+                         )
 {
   TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
   CORBA::TypeCode_var param;
@@ -1028,16 +1005,13 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
     }
 
   // Handle our base valuetype if any.
-  param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  param = tc->concrete_base_type ();
 
-  CORBA::TCKind const k = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+  CORBA::TCKind const k = param->kind ();
 
   if (k != CORBA::tk_null)
     {
-      retval = this->skip (param.in (), stream ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+      retval = this->skip (param.in (), stream);
 
       if (retval != TAO::TRAVERSE_CONTINUE)
         {
@@ -1047,20 +1021,17 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
 
   // Number of fields in the valuetype.
   CORBA::ULong const member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+    tc->member_count ();
 
   for (CORBA::ULong i = 0;
        i < member_count && retval == TAO::TRAVERSE_CONTINUE;
        ++i)
     {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+      param = tc->member_type (i);
 
       retval = TAO_Marshal_Object::perform_skip (param.in (),
                                                  stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
+                                                );
     }
 
   if (retval == TAO::TRAVERSE_CONTINUE)
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
index f888e2a5abc..55aa49e5bf1 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -64,7 +64,7 @@ TAO::RetArgument::mode (void) const
 TAO::Argument*
 TAO::Void_Return_Argument::clone (void)
 {
-  TAO::Argument* clone_arg;
+  TAO::Argument* clone_arg = 0;
   ACE_NEW_RETURN (clone_arg,
                   Void_Return_Argument (),
                   0);
diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h
index a00875866d7..bc9e282d666 100644
--- a/TAO/tao/Asynch_Queued_Message.h
+++ b/TAO/tao/Asynch_Queued_Message.h
@@ -17,12 +17,12 @@
 
 #include "tao/Queued_Message.h"
 
-#include "ace/Time_Value.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Time_Value.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Message_Block;
 ACE_END_VERSIONED_NAMESPACE_DECL
@@ -45,7 +45,7 @@ public:
    *
    * @param alloc Allocator used for creating @c this object.
    *
-   * @param timeout The relative timeout after which this 
+   * @param timeout The relative timeout after which this
    * message should be expired.
    *
    * @todo I'm almost sure this class will require a callback
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index 07d64561158..ef6c5bc5fed 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -66,7 +66,7 @@ public:
   /// Install the timeout handler
   virtual long schedule_timer (CORBA::ULong ,
                                const ACE_Time_Value &
-                               ACE_ENV_ARG_DECL) = 0;
+                               ) = 0;
 
   /// @name Mutators for refcount
   //@{
diff --git a/TAO/tao/Base_Transport_Property.cpp b/TAO/tao/Base_Transport_Property.cpp
index 4f46e782f41..9433bfa562d 100644
--- a/TAO/tao/Base_Transport_Property.cpp
+++ b/TAO/tao/Base_Transport_Property.cpp
@@ -21,23 +21,20 @@ TAO_Transport_Descriptor_Interface *
 TAO_Base_Transport_Property::duplicate (void)
 {
   // Get a copy of the underlying endpoint
-  TAO_Endpoint * const endpt = this->endpoint_->duplicate ();
+  TAO_Endpoint *const endpt = this->endpoint_->duplicate ();
   if (endpt == 0)
     return 0;
 
   // Construct a copy of our class
   TAO_Base_Transport_Property *prop = 0;
-  ACE_NEW_RETURN (prop,
-                  TAO_Base_Transport_Property (endpt,
-                                               true),
-                  0);
+  ACE_NEW_RETURN (prop, TAO_Base_Transport_Property (endpt, true), 0);
   return prop;
 }
 
 
 CORBA::Boolean
-TAO_Base_Transport_Property::is_equivalent (
-    const TAO_Transport_Descriptor_Interface *rhs)
+TAO_Base_Transport_Property::is_equivalent
+  (const TAO_Transport_Descriptor_Interface *rhs)
 {
   const TAO_Base_Transport_Property *other_desc =
     dynamic_cast<const TAO_Base_Transport_Property *> (rhs);
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
index a1a394d8b5b..23128844c2a 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -40,9 +40,8 @@ public:
   /// The virtual destructor
   virtual ~TAO_BiDir_Adapter (void);
 
-  virtual void load_policy_validators (TAO_Policy_Validator &validator ACE_ENV_ARG_DECL)
+  virtual void load_policy_validators (TAO_Policy_Validator &validator)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 75158d45882..c5767f6cd40 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -32,8 +32,7 @@ TAO_BiDirGIOP_Loader::init (int,
         PortableInterceptor::ORBInitializer::_nil ();
       PortableInterceptor::ORBInitializer_var bidir_orb_initializer;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           /// Register the BiDir ORBInitializer.
           ACE_NEW_THROW_EX (tmp_orb_initializer,
@@ -43,27 +42,23 @@ TAO_BiDirGIOP_Loader::init (int,
                                     TAO::VMCID,
                                     ENOMEM),
                                 CORBA::COMPLETED_NO));
-          ACE_TRY_CHECK;
 
           bidir_orb_initializer = tmp_orb_initializer;
 
           PortableInterceptor::register_orb_initializer (
             bidir_orb_initializer.in ()
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+           );
 
           TAO_BiDirGIOP_Loader::is_activated_ = true;
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception& ex)
         {
           if (TAO_debug_level > 0)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "Caught exception:");
+              ex._tao_print_exception ("Caught exception:");
             }
           return -1;
         }
-      ACE_ENDTRY;
     }
 
   return 0;
@@ -71,7 +66,7 @@ TAO_BiDirGIOP_Loader::init (int,
 
 void
 TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val
-                                              ACE_ENV_ARG_DECL)
+                                              )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Is this true? Does the GIOP protocol version matter here?
@@ -86,7 +81,6 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val
                             TAO::VMCID,
                             ENOMEM),
                         CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   // We may be adding another TAO_BiDirPolicy_Validator instance for
   // the same ORB (different POA). In cases where huge numbers of
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
index f18a84ab0e1..00cd082a9fa 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -52,8 +52,7 @@ public:
   virtual int init (int argc,
                     ACE_TCHAR* []);
 
-  virtual void load_policy_validators (TAO_Policy_Validator &validator
-                                       ACE_ENV_ARG_DECL)
+  virtual void load_policy_validators (TAO_Policy_Validator &validator)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to force the initialization of the ORB code.
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index 0d6734ae2b0..b1e77c43808 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -16,28 +16,24 @@ TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core)
 
 
 void
-TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies
-                                          ACE_ENV_ARG_DECL)
+TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies)
 {
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 
   if (policy.in () == 0)
     return;
 
   BiDirPolicy::BidirectionalPolicy_var srp =
     BiDirPolicy::BidirectionalPolicy::_narrow (policy.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              );
 
   if (srp.in () == 0)
     return;
 
   BiDirPolicy::BidirectionalPolicyValue val =
-    srp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    srp->value ();
 
   // Set the flag in the ORB_Core
   if (val == BiDirPolicy::BOTH)
@@ -45,10 +41,9 @@ TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies
 }
 
 void
-TAO_BiDirPolicy_Validator::merge_policies_impl (TAO_Policy_Set & /*policies*/
-                                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_BiDirPolicy_Validator::merge_policies_impl (TAO_Policy_Set &)
 {
-  return ;
+  return;
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
index 106b1a834c8..d193638a75a 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
@@ -42,14 +42,11 @@ public:
 
   TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core);
 
-  virtual void validate_impl (TAO_Policy_Set &policies
-                              ACE_ENV_ARG_DECL);
+  virtual void validate_impl (TAO_Policy_Set &policies);
 
-  virtual void merge_policies_impl (TAO_Policy_Set &policies
-                                    ACE_ENV_ARG_DECL);
+  virtual void merge_policies_impl (TAO_Policy_Set &policies);
 
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index 2aff9aa8432..3b062cd28ad 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -13,29 +13,23 @@ ACE_RCSID (BiDir_GIOP,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO_BiDir_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+TAO_BiDir_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //
 }
 
 void
-TAO_BiDir_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+TAO_BiDir_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_policy_factories (info);
 }
 
 void
 TAO_BiDir_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  )
 {
   /// Register the BiDir policy factories.
   PortableInterceptor::PolicyFactory_ptr temp_factory =
@@ -48,7 +42,6 @@ TAO_BiDir_ORBInitializer::register_policy_factories (
                          TAO::VMCID,
                          ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::PolicyFactory_var policy_factory = temp_factory;
 
@@ -60,10 +53,7 @@ TAO_BiDir_ORBInitializer::register_policy_factories (
 
   type = BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
+                                 policy_factory.in ());
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
index b09a94da506..7c8c673ce4b 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
@@ -39,21 +39,16 @@ class TAO_BiDir_ORBInitializer
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
-  ///< Register BiDir policy factories.
-  void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL);
-
+  /// Register BiDir policy factories.
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 823dc34c979..397be5ee664 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -14,8 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_BiDir_PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -39,7 +38,6 @@ TAO_BiDir_PolicyFactory::create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
index 9a4175257b5..357c59a85c1 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
@@ -41,8 +41,7 @@ class TAO_BiDir_PolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const CORBA::Any & value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index 71f2fa359d3..d3b548a9347 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -34,7 +34,7 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy
 }
 
 CORBA::PolicyType
-TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_BidirectionalPolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how this minimizes the
@@ -54,7 +54,7 @@ TAO_BidirectionalPolicy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_BidirectionalPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_BidirectionalPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how the following code is
@@ -64,20 +64,18 @@ TAO_BidirectionalPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (tmp, TAO_BidirectionalPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_BidirectionalPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_BidirectionalPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 BiDirPolicy::BidirectionalPolicyValue
-TAO_BidirectionalPolicy::value (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_BidirectionalPolicy::value (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException))
 {
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
index 93ef62f6c19..718016fc381 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
@@ -55,19 +55,16 @@ public:
   virtual TAO_BidirectionalPolicy *clone (void) const;
 
   /// = The BiDir::BidirectionalPolicy methods
-  virtual BiDirPolicy::BidirectionalPolicyValue value (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  virtual BiDirPolicy::BidirectionalPolicyValue value (void)
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/BooleanSeq.pidl b/TAO/tao/BooleanSeq.pidl
index 5ae3d3e667c..8042cc7c138 100644
--- a/TAO/tao/BooleanSeq.pidl
+++ b/TAO/tao/BooleanSeq.pidl
@@ -3,19 +3,7 @@
 // $Id$
 
 /**
- *   This file was used to generate the code in BooleanSeqC.*
- *   The command used to generate code is:
- *
- *     tao_idl
- *          -oA AnyTypeCode
- *          -GA -SS -Sci
- *          -Wb,pre_include=ace/pre.h
- *          -Wb,post_include=ace/post.h
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include=tao/TAO_Export.h
- *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
- *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
- *          BooleanSeq.pidl
+ *   This file is used to generate the code in BooleanSeqC.*
  */
 
 #ifndef TAO_CORBA_BOOLEAN_SEQ_IDL
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index 6bd1851c4ec..5c5f1f78e9e 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -39,7 +39,7 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff
 }
 
 CORBA::PolicyType
-TAO_Buffering_Constraint_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Buffering_Constraint_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE;
@@ -56,27 +56,26 @@ TAO_Buffering_Constraint_Policy::clone (void) const
 }
 
 TAO::BufferingConstraint
-TAO_Buffering_Constraint_Policy::buffering_constraint (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Buffering_Constraint_Policy::buffering_constraint (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->buffering_constraint_;
 }
 
 CORBA::Policy_ptr
-TAO_Buffering_Constraint_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Buffering_Constraint_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Buffering_Constraint_Policy* servant = 0;
   ACE_NEW_THROW_EX (servant,
                     TAO_Buffering_Constraint_Policy (*this),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return servant;
 }
 
 void
-TAO_Buffering_Constraint_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Buffering_Constraint_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
index f09e55b73b0..c03987881ea 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.h
@@ -56,18 +56,18 @@ public:
 
   // = The TAO::Buffering_Constraint_Policy methods
 
-  virtual TAO::BufferingConstraint buffering_constraint (ACE_ENV_SINGLE_ARG_DECL)
+  virtual TAO::BufferingConstraint buffering_constraint (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void get_buffering_constraint (TAO::BufferingConstraint &) const;
 
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 6101e0b01be..7599e3f49c7 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -3,7 +3,6 @@
 #include "tao/CDR.h"
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Core.h"
-#include "tao/Environment.h"
 #include "tao/SystemException.h"
 #include "tao/GIOP_Fragmentation_Strategy.h"
 
@@ -182,31 +181,31 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Data_Block *data_block,
 }
 
 void
-TAO_OutputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
+TAO_OutputCDR::throw_stub_exception (int error_num )
 {
   switch (error_num)
     {
     case 0 :
       break;
     case EINVAL : // wchar from a GIOP 1.0
-      ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO));
+      throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO);
       ACE_NOTREACHED (break);
 #if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
-      ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
-                                         CORBA::COMPLETED_NO));
+      throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
+                                         CORBA::COMPLETED_NO);
       ACE_NOTREACHED (break);
 #endif
     case EACCES : // wchar but no codeset
-      ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO));
+      throw ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
       ACE_NOTREACHED (break);
     default :
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }
 
 void
-TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
+TAO_OutputCDR::throw_skel_exception (int error_num )
 {
   switch (error_num)
     {
@@ -214,23 +213,23 @@ TAO_OutputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
       break;
 
     case EINVAL : // wchar from a GIOP 1.0
-      ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES));
+      throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_YES);
       ACE_NOTREACHED (break);
 
     case EACCES : // wchar but no codeset
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 23,
-                                   CORBA::COMPLETED_YES));
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 23,
+                                   CORBA::COMPLETED_YES);
       ACE_NOTREACHED (break);
 
 #if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
-      ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
-                                         CORBA::COMPLETED_YES));
+      throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
+                                         CORBA::COMPLETED_YES);
       ACE_NOTREACHED (break);
 #endif
 
     default :
-      ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES));
+      throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES);
 
     }
 }
@@ -274,51 +273,51 @@ TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs,
 }
 
 void
-TAO_InputCDR::throw_stub_exception (int error_num ACE_ENV_ARG_DECL)
+TAO_InputCDR::throw_stub_exception (int error_num )
 {
   switch (error_num)
     {
     case 0 :
       break;
     case EINVAL : // wchar from a GIOP 1.0
-      ACE_THROW (CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES));
+      throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES);
       ACE_NOTREACHED(break);
 #if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
-      ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES));
+      throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES);
       ACE_NOTREACHED(break);
 #endif
     case EACCES : // wchar but no codeset
-      ACE_THROW (CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES));
+      throw ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES);
       ACE_NOTREACHED(break);
     default :
-      ACE_THROW (CORBA::MARSHAL (0, CORBA::COMPLETED_YES));
+      throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES);
     }
 }
 
 void
-TAO_InputCDR::throw_skel_exception (int error_num ACE_ENV_ARG_DECL)
+TAO_InputCDR::throw_skel_exception (int error_num )
 {
   switch (error_num)
     {
     case 0 :
       break;
     case EINVAL : // wchar from a GIOP 1.0
-      ACE_THROW (CORBA::MARSHAL(CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO));
+      throw ::CORBA::MARSHAL(CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO);
       ACE_NOTREACHED(break);
 
     case EACCES : // wchar but no codeset
-      ACE_THROW (CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO));
+      throw ::CORBA::BAD_PARAM(CORBA::OMGVMCID | 23, CORBA::COMPLETED_NO);
       ACE_NOTREACHED(break);
 
 #if (ERANGE != EINVAL)
     case ERANGE : // untranslatable character
-      ACE_THROW (CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO));
+      throw ::CORBA::DATA_CONVERSION(CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO);
       ACE_NOTREACHED(break);
 #endif
 
     default :
-      ACE_THROW (CORBA::MARSHAL());
+      throw ::CORBA::MARSHAL();
 
     }
 }
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index d3f75c4d353..1dd62593f70 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -63,11 +63,6 @@ class TAO_ORB_Core;
 class TAO_GIOP_Fragmentation_Strategy;
 class TAO_Stub;
 
-namespace CORBA
-{
-  class Environment;
-}
-
 /**
  * @class TAO_OutputCDR
  *
@@ -167,8 +162,8 @@ public:
   // strings and wstrings?
 
   // = TAO specific methods.
-  static void throw_stub_exception (int error_num ACE_ENV_ARG_DECL);
-  static void throw_skel_exception (int error_num ACE_ENV_ARG_DECL);
+  static void throw_stub_exception (int error_num);
+  static void throw_skel_exception (int error_num);
 
   /**
    * @name Outgoing GIOP Fragment Related Methods
@@ -385,8 +380,8 @@ public:
     clr_mb_flags( ACE_Message_Block::Message_Flags less_flags );
 
   // = TAO specific methods.
-  static void throw_stub_exception (int error_num ACE_ENV_ARG_DECL);
-  static void throw_skel_exception (int error_num ACE_ENV_ARG_DECL);
+  static void throw_stub_exception (int error_num);
+  static void throw_skel_exception (int error_num);
 
 private:
   /// The ORB_Core, required to extract object references.
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
index 637f4d35a89..13fb9f106a8 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -6,19 +6,6 @@
  * $Id$
  *
  * This file is used to generate CONV_FRAMEC.{h,cpp}, using the
- * following command:
- *
- *   tao_idl
- *        -o orig -GA -SS -Sci -Sc
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include="tao/TAO_Export.h"
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- *        -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL
- *        CONV_FRAME.pidl
- *
- * The files are ready to use.
  */
 
 #ifndef TAO_CORBA_CONV_FRAME_PIDL
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 75bd6179945..5bc19c97e5c 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -45,14 +45,13 @@ TAO_CORBALOC_Parser::match_prefix (const char *ior_string) const
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
                                               TAO_MProfile &mprofile
-                                              ACE_ENV_ARG_DECL)
+                                              )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create a TAO_Stub.
   TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0,
                                                   mprofile
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                                 );
 
   TAO_Stub_Auto_Ptr safe_data (data);
 
@@ -75,7 +74,7 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior,
                                               CORBA::ORB_ptr orb
-                                              ACE_ENV_ARG_DECL)
+                                              )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Pass the key string as an argument to resolve_initial_references.
@@ -88,8 +87,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior,
   CORBA::Object_var rir_obj =
     orb->resolve_initial_references (*objkey == '\0' ? "NameService" :
                                      objkey
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                    );
 
   return rir_obj._retn ();
 }
@@ -97,7 +95,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char * ior,
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::parse_string (const char * ior,
                                    CORBA::ORB_ptr orb
-                                   ACE_ENV_ARG_DECL)
+                                   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The decomposition of a corbaloc string is in Section 13.6.10.
@@ -126,7 +124,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
   //  First check for rir
   if (ACE_OS::strncmp (ior,rir_token,rir_token_len) == 0)
     return this->parse_string_rir_helper (ior,orb
-                                          ACE_ENV_ARG_PARAMETER);
+                                         );
 
   // set up space for parsed endpoints. there will be at least 1, and
   // most likely commas will separate endpoints, although they could be
@@ -142,8 +140,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
 
   // Get the Connector Registry from the ORB.
   TAO_Connector_Registry *conn_reg =
-    orb->orb_core ()->connector_registry(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    orb->orb_core ()->connector_registry();
 
   while (1) { // will loop on comma only.
     size_t len = 0;
@@ -158,8 +155,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
       {
         endpoints[ndx].profile_ =
           (*conn_iter)->corbaloc_scan(ior,len
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                     );
 
         if (endpoints[ndx].profile_)
           {
@@ -167,8 +163,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
               (*conn_iter)->object_key_delimiter();
             uiop_compatible = (endpoints[ndx].obj_key_sep_ == '|');
             this->make_canonical (ior,len,endpoints[ndx].prot_addr_
-                                  ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                 );
             ior += len;
             break;
           }
@@ -231,8 +226,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
         endpoints[i].obj_key_sep_ +
         obj_key;
       const char * str = full_ep.c_str();
-      endpoints[i].profile_->parse_string (str ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      endpoints[i].profile_->parse_string (str);
       int share = orb->orb_core()->orb_params()->shared_profile();
       if (mprofile.give_profile(endpoints[i].profile_, share) != -1)
         endpoints[i].profile_ = 0;
@@ -258,8 +252,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
   // Get an object stub out.
   object = this->make_stub_from_mprofile (orb,
                                           mprofile
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                         );
 
   return object;
 }
@@ -268,7 +261,7 @@ void
 TAO_CORBALOC_Parser::make_canonical (const char *ior,
                                      size_t prot_addr_len,
                                      ACE_CString &canonical_endpoint
-                                     ACE_ENV_ARG_DECL)
+                                     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *separator = ACE_OS::strchr (ior, ':');
@@ -359,10 +352,10 @@ TAO_CORBALOC_Parser::make_canonical (const char *ior,
                         ACE_TEXT ("TAO (%P|%t) ")
                         ACE_TEXT ("cannot determine hostname.\n")));
 
-          ACE_THROW (CORBA::INV_OBJREF
+          throw ::CORBA::INV_OBJREF
                      (CORBA::SystemException::_tao_minor_code
                       (TAO::VMCID, EINVAL),
-                      CORBA::COMPLETED_NO));
+                      CORBA::COMPLETED_NO);
         }
       else
         {
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index bf085b2f508..737d0c4c51e 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -57,7 +57,7 @@ public:
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL)
+                                          )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -69,19 +69,19 @@ private:
    */
   CORBA::Object_ptr make_stub_from_mprofile (CORBA::ORB_ptr orb,
                                              TAO_MProfile &mprofile
-                                             ACE_ENV_ARG_DECL)
+                                             )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Gets the pointer to the key_string when the protocol used is RIR
   CORBA::Object_ptr parse_string_rir_helper (const char *corbaloc_name,
                                              CORBA::ORB_ptr orb
-                                             ACE_ENV_ARG_DECL)
+                                             )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void make_canonical (const char *ior,
                        size_t ior_len,
                        ACE_CString &canonical_endpoint
-                       ACE_ENV_ARG_DECL)
+                       )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   struct parsed_endpoint {
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 328bb860795..16ef2275d05 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -63,7 +63,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
 CORBA::Object_ptr
 TAO_CORBANAME_Parser::parse_string (const char *ior,
                                     CORBA::ORB_ptr orb
-                                    ACE_ENV_ARG_DECL)
+                                    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -74,7 +74,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
 
   CORBA::Object_ptr obj = CORBA::Object::_nil ();
 
-  ACE_TRY
+  try
     {
       // The position of the seperator between the obj_addr and key
       // string
@@ -103,8 +103,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
       // Obtain a reference to the naming context
       CORBA::Object_var name_context =
         orb->string_to_object (corbaloc_addr.c_str ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               );
 
       // Check if the Object reference is nil.
       if (CORBA::is_nil (name_context.in ()))
@@ -114,8 +113,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
 
       CORBA::Boolean is_a =
         name_context->_is_a ("IDL:omg.org/CosNaming/NamingContextExt:1.0"
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             );
 
       if (!is_a)
         {
@@ -131,8 +129,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
           // Make a dynamic request for resolve_str in this naming context
           obj = this->parse_string_dynamic_request_helper (name_context.in (),
                                                            key_string
-                                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                       );
         }
       else
         { // There was no key string which implies that the caller wants
@@ -140,15 +137,13 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
           obj = name_context._retn ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const ::CORBA::SystemException& ex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ex, "CORBANAME_Parser");
+          ex._tao_print_exception ("CORBANAME_Parser");
         }
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return obj;
 }
diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h
index ada5f625df5..72da515ac70 100644
--- a/TAO/tao/CORBANAME_Parser.h
+++ b/TAO/tao/CORBANAME_Parser.h
@@ -54,7 +54,7 @@ public:
    virtual CORBA::Object_ptr
    parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
                                         ACE_CString &key_string
-                                        ACE_ENV_ARG_DECL)
+                                        )
      ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 2eb88cc49d3..bcb0e31e1a1 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -25,7 +25,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                                  TAO_SYNCH_MUTEX &thread_lock,
                                                  TAO_ORB_Core &orb_core,
                                                  TAO_Object_Adapter *object_adapter
-                                                 ACE_ENV_ARG_DECL)
+                                                 )
     {
   TAO_CSD_POA *poa = 0;
 
@@ -38,9 +38,8 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                  thread_lock,
                                  orb_core,
                                  object_adapter
-                                 ACE_ENV_ARG_PARAMETER),
+                                ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
 
   TAO_CSD_Strategy_Repository *repo =
@@ -60,8 +59,7 @@ TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
 
   if (! ::CORBA::is_nil (strategy.in ()))
     {
-      poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      poa->set_csd_strategy (strategy.in ());
     }
 
   return poa;
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
index 1d041331e99..3fafa9fe1ea 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
@@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief Interface for CSD_POA servant dispatching strategies.
  */
-class TAO_CSD_FW_Export TAO_CSD_Default_Servant_Dispatcher 
+class TAO_CSD_FW_Export TAO_CSD_Default_Servant_Dispatcher
   : public virtual TAO_Default_Servant_Dispatcher
 {
 public:
@@ -43,8 +43,7 @@ public:
                                          ACE_Lock &lock,
                                          TAO_SYNCH_MUTEX &thread_lock,
                                          TAO_ORB_Core &orb_core,
-                                         TAO_Object_Adapter *object_adapter
-                                         ACE_ENV_ARG_DECL);
+                                         TAO_Object_Adapter *object_adapter);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
index 3a6e3120650..27b95c88f2d 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
@@ -74,27 +74,26 @@ TAO::CSD::FW_Server_Request_Wrapper::~FW_Server_Request_Wrapper()
 void
 TAO::CSD::FW_Server_Request_Wrapper::dispatch
                                             (PortableServer::Servant servant
-                                             ACE_ENV_ARG_DECL)
+                                             )
 {
-  ACE_TRY
+  try
     {
-      servant->_dispatch(*this->request_, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      servant->_dispatch(*this->request_, 0);
     }
   // Only CORBA exceptions are caught here.
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (this->request_->collocated())
         {
           // For collocated requests, we re-throw the exception.
-          ACE_RE_THROW;
+          throw;
         }
       else if (!this->request_->sync_with_server() &&
               this->request_->response_expected() &&
               !this->request_->deferred_reply())
         {
           // The request is a remote request that is expecting a reply.
-          this->request_->tao_send_reply_exception(ACE_ANY_EXCEPTION);
+          this->request_->tao_send_reply_exception(ex);
         }
       else if (TAO_debug_level > 0)
         {
@@ -108,13 +107,10 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch
                       ACE_TEXT ("(%P|%t) exception thrown ")
                       ACE_TEXT ("but client is not waiting a response\n")));
 
-          ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
-              "FW_Server_Request_Wrapper::dispatch ()");
+          ex._tao_print_exception ("FW_Server_Request_Wrapper::dispatch ()");
         }
      }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       // @@ TODO some c++ exception or another, but what do we do with
       //    it?
@@ -130,7 +126,7 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch
       if (this->request_->collocated())
         {
           // For collocated requests, we re-throw the exception.
-          ACE_RE_THROW;
+          throw;
         }
       else if (!this->request_->sync_with_server() &&
               this->request_->response_expected() &&
@@ -151,14 +147,11 @@ TAO::CSD::FW_Server_Request_Wrapper::dispatch
                       ACE_TEXT ("(%P|%t) exception thrown ")
                       ACE_TEXT ("but client is not waiting a response\n")));
 
-          ACE_PRINT_EXCEPTION (
-              exception,
-              "FW_Server_Request_Wrapper::dispatch ()");
+          exception._tao_print_exception (
+            "FW_Server_Request_Wrapper::dispatch ()");
         }
      }
-#endif /* TAO_HAS_EXCEPTIONS */
 
-   ACE_ENDTRY;
 }
 
 
@@ -166,16 +159,11 @@ TAO_ServerRequest*
 TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_ServerRequest*& request)
 {
   // TBD-CSD: Ultimately add an argument for an allocator.
-  TAO_ServerRequest* clone_obj;
+  TAO_ServerRequest* clone_obj = 0;
   ACE_NEW_RETURN (clone_obj,
                   TAO_ServerRequest (),
                   0);
 
-  if (clone_obj == 0)
-    {
-      return 0;
-    }
-
   // TYPE: TAO_Pluggable_Messaging*
   // ACTION: Assuming that a shallow-copy is ok here.
   clone_obj->mesg_base_ = request->mesg_base_;
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
index 5268fb8a357..e01357d3e10 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
@@ -71,7 +71,7 @@ namespace TAO
       void clone();
 
       /// Dispatch the request to the servant.
-      void dispatch(PortableServer::Servant servant ACE_ENV_ARG_DECL);
+      void dispatch(PortableServer::Servant servant);
 
       /// Cancel the request.
       void cancel();
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
deleted file mode 100644
index b67ea4bbc08..00000000000
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// $Id$
-#include "tao/CSD_Framework/CSD_ORBInitializer.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-ACE_RCSID (CSD_Framework,
-           CSD_ORBInitializer,
-           "$Id$")
-
-#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_CSD_ORBInitializer::TAO_CSD_ORBInitializer ()
-{
-}
-
-void
-TAO_CSD_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-TAO_CSD_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
deleted file mode 100644
index 8d6aa8a03e5..00000000000
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CSD_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author Yan Dai (dai_y@ociweb.com)
- */
-//=============================================================================
-
-
-#ifndef TAO_CSD_ORB_INITIALIZER_H
-#define TAO_CSD_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-//#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-#include "tao/PI/ORBInitializerC.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/// CSD ORB initializer.
-class TAO_CSD_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
-{
-public:
-  
-  TAO_CSD_ORBInitializer ();
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_ORB_INITIALIZER_H */
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
index ed74e7c413b..35dde4c21ea 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
@@ -15,7 +15,7 @@ TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter (
   TAO_ORB_Core &orb_core)
   :  TAO_Object_Adapter (creation_parameters, orb_core)
 {
-  
+
 }
 
 TAO_CSD_Object_Adapter::~TAO_CSD_Object_Adapter ()
@@ -26,20 +26,19 @@ void
 TAO_CSD_Object_Adapter::do_dispatch (
   TAO_ServerRequest& req,
   TAO::Portable_Server::Servant_Upcall& upcall
-  ACE_ENV_ARG_DECL)
+  )
 {
   TAO_Root_POA& poa = upcall.poa ();
   TAO_CSD_POA* csd_poa = dynamic_cast<TAO_CSD_POA*> (&poa);
-  
+
   if (csd_poa == 0)
     {
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw ::CORBA::BAD_PARAM ();
     }
 
   TAO::CSD::Strategy_Proxy& proxy
     = csd_poa->servant_dispatching_strategy_proxy ();
-  proxy.dispatch_request (req, upcall ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  proxy.dispatch_request (req, upcall);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
index 34016654cba..6a9346e75cc 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
@@ -28,7 +28,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 /**
  * @class TAO_CSD_Object_Adapter
  *
- * @brief Defines the CSD version Object Adapter which overrides 
+ * @brief Defines the CSD version Object Adapter which overrides
  *        default dispatch implementation.
  *
  * This class will be used as a facade for the CSD POAs in a server
@@ -44,11 +44,11 @@ public:
   /// Destructor
   virtual ~TAO_CSD_Object_Adapter (void);
 
-  /// Hand the request to the Service_Dispatching_Strategy_Proxy for 
+  /// Hand the request to the Service_Dispatching_Strategy_Proxy for
   /// dispatching.
   virtual void do_dispatch (TAO_ServerRequest& req,
                             TAO::Portable_Server::Servant_Upcall& upcall
-                            ACE_ENV_ARG_DECL);
+                           );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
index fa06817ec2c..c9d3a08c683 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
@@ -3,7 +3,6 @@
 #include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
 #include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 #include "tao/CSD_Framework/CSD_Object_Adapter.h"
-#include "tao/CSD_Framework/CSD_ORBInitializer.h"
 #include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -51,37 +50,6 @@ TAO_CSD_Object_Adapter_Factory::init (int /* argc */,
   if (repo != 0)
     repo->init(0,0);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      /// Register the Messaging ORBInitializer.
-      PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      ACE_NEW_THROW_EX (temp_orb_initializer,
-                        TAO_CSD_ORBInitializer,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
-
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_orb_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
   return 0;
 }
 
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index f3cc8e605f5..aa35f6d9995 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -25,7 +25,7 @@ TAO_CSD_POA::TAO_CSD_POA (const String &name,
                    TAO_SYNCH_MUTEX &thread_lock,
                    TAO_ORB_Core &orb_core,
                    TAO_Object_Adapter *object_adapter
-                   ACE_ENV_ARG_DECL)
+                   )
 : TAO_Regular_POA (name,
                    poa_manager,
                    policies,
@@ -34,12 +34,11 @@ TAO_CSD_POA::TAO_CSD_POA (const String &name,
                    thread_lock,
                    orb_core,
                    object_adapter
-                   ACE_ENV_ARG_PARAMETER)
+                  )
 {
   ACE_NEW_THROW_EX (this->sds_proxy_,
                     TAO::CSD::Strategy_Proxy (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 }
 
 
@@ -51,7 +50,7 @@ TAO_CSD_POA::~TAO_CSD_POA (void)
 
 void TAO_CSD_POA::set_csd_strategy (
     ::CSD_Framework::Strategy_ptr strategy
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -59,7 +58,7 @@ void TAO_CSD_POA::set_csd_strategy (
 {
   if (CORBA::is_nil (strategy))
     {
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw ::CORBA::BAD_PARAM ();
     }
   this->sds_proxy_->custom_strategy (strategy);
 }
@@ -73,7 +72,7 @@ TAO_CSD_POA::new_POA (const String &name,
                       TAO_SYNCH_MUTEX &thread_lock,
                       TAO_ORB_Core &orb_core,
                       TAO_Object_Adapter *object_adapter
-                      ACE_ENV_ARG_DECL)
+                      )
 {
   TAO_CSD_POA *poa = 0;
 
@@ -86,9 +85,8 @@ TAO_CSD_POA::new_POA (const String &name,
                              thread_lock,
                              orb_core,
                              object_adapter
-                             ACE_ENV_ARG_PARAMETER),
+                            ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   TAO_CSD_Strategy_Repository *repo =
     ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository");
@@ -98,8 +96,7 @@ TAO_CSD_POA::new_POA (const String &name,
 
   if (! ::CORBA::is_nil (strategy.in ()))
     {
-      poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      poa->set_csd_strategy (strategy.in ());
     }
 
   return poa;
@@ -117,18 +114,16 @@ void TAO_CSD_POA::poa_deactivated_hook ()
 
 void TAO_CSD_POA::servant_activated_hook (PortableServer::Servant servant,
                                const PortableServer::ObjectId& oid
-                               ACE_ENV_ARG_DECL)
+                               )
 {
-  this->sds_proxy_->servant_activated_event (servant, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->sds_proxy_->servant_activated_event (servant, oid);
 }
 
 void TAO_CSD_POA::servant_deactivated_hook (PortableServer::Servant servant,
                                  const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
-  this->sds_proxy_->servant_deactivated_event (servant, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->sds_proxy_->servant_deactivated_event (servant, oid);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
index bcbf2e0495f..6ad06f92dde 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ b/TAO/tao/CSD_Framework/CSD_POA.h
@@ -33,12 +33,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * Implementation of the CSD_Framework::POA interface.
  */
-class TAO_CSD_FW_Export TAO_CSD_POA 
-  : public virtual CSD_Framework::POA, 
+class TAO_CSD_FW_Export TAO_CSD_POA
+  : public virtual CSD_Framework::POA,
     public virtual TAO_Regular_POA
 {
 public:
-  //Constructor 
+  //Constructor
   TAO_CSD_POA (const String &name,
                PortableServer::POAManager_ptr poa_manager,
               const TAO_POA_Policy_Set &policies,
@@ -47,16 +47,16 @@ public:
               TAO_SYNCH_MUTEX &thread_lock,
               TAO_ORB_Core &orb_core,
               TAO_Object_Adapter *object_adapter
-              ACE_ENV_ARG_DECL);
-  
-  //Destructor 
+             );
+
+  //Destructor
   virtual ~TAO_CSD_POA (void);
-  
+
   /// Pass the Strategy object reference to the CSD poa.
   virtual
   void set_csd_strategy (
       ::CSD_Framework::Strategy_ptr s
-      ACE_ENV_ARG_DECL
+
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -69,14 +69,14 @@ public:
   virtual void poa_deactivated_hook ();
 
   /// Hook - A servant has been activated.
-  virtual void servant_activated_hook (PortableServer::Servant servant, 
+  virtual void servant_activated_hook (PortableServer::Servant servant,
                               const PortableServer::ObjectId& oid
-                              ACE_ENV_ARG_DECL);
+                             );
 
   /// Hook - A servant has been deactivated.
-  virtual void servant_deactivated_hook (PortableServer::Servant servant, 
+  virtual void servant_deactivated_hook (PortableServer::Servant servant,
                                 const PortableServer::ObjectId& oid
-                                ACE_ENV_ARG_DECL);
+                               );
 
   ///Method for creating new CSD POA.
   TAO_Root_POA * new_POA (const String &name,
@@ -87,10 +87,10 @@ public:
                           TAO_SYNCH_MUTEX &thread_lock,
                           TAO_ORB_Core &orb_core,
                           TAO_Object_Adapter *object_adapter
-                          ACE_ENV_ARG_DECL);
+                         );
 
   /// Servant Dispatching Strategy proxy accessor.
-  TAO::CSD::Strategy_Proxy& 
+  TAO::CSD::Strategy_Proxy&
     servant_dispatching_strategy_proxy (void) const;
 
 private:
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
index aa641fe9bc7..4fe82909d95 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
@@ -24,7 +24,7 @@ TAO::CSD::Strategy_Base::~Strategy_Base()
 
 CORBA::Boolean
 TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil(poa))
@@ -79,16 +79,14 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa
 
   // Set the CSD Strategy_Base on the strategy proxy object owned by the POA.
   bool strategy_set = false;
-  ACE_TRY_NEW_ENV
+  try
     {
-      poa_impl->set_csd_strategy (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_impl->set_csd_strategy (this);
       strategy_set = true;
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (! strategy_set)
     {
@@ -113,8 +111,8 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa
 void
 TAO::CSD::Strategy_Base::servant_activated_event_i
                                 (PortableServer::Servant ,
-                                 const PortableServer::ObjectId& 
-                                 ACE_ENV_ARG_DECL)
+                                 const PortableServer::ObjectId&
+                                 )
 {
   // do nothing.
 }
@@ -124,7 +122,7 @@ void
 TAO::CSD::Strategy_Base::servant_deactivated_event_i
                                 (PortableServer::Servant,
                                  const PortableServer::ObjectId&
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
   // do nothing.
 }
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
index d65753a27f7..81576348520 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
@@ -77,7 +77,7 @@ namespace TAO
 
       /// This method is invoked to "attach" this strategy object to
       /// the supplied POA.  Returns true for success, and false for failure.
-      CORBA::Boolean apply_to(PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+      CORBA::Boolean apply_to(PortableServer::POA_ptr poa )
         ACE_THROW_SPEC((CORBA::SystemException));
 
     protected:
@@ -91,7 +91,7 @@ namespace TAO
                               PortableServer::POA_ptr         poa,
                               const char*                     operation,
                               PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL) = 0;
+                              ) = 0;
 
       /// Subclass provides implementation to dispatch a collocated request.
       virtual DispatchResult dispatch_collocated_request_i
@@ -100,7 +100,7 @@ namespace TAO
                           PortableServer::POA_ptr         poa,
                           const char*                     operation,
                           PortableServer::Servant         servant
-                          ACE_ENV_ARG_DECL) = 0;
+                          ) = 0;
 
       /// Event - The POA has been activated.
       virtual bool poa_activated_event_i() = 0;
@@ -112,13 +112,13 @@ namespace TAO
       virtual void servant_activated_event_i
                                   (PortableServer::Servant servant,
                                   const PortableServer::ObjectId& oid
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
       /// Event - A servant has been deactivated.
       virtual void servant_deactivated_event_i
                                   (PortableServer::Servant servant,
                                   const PortableServer::ObjectId& oid
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
     private:
 
@@ -132,7 +132,7 @@ namespace TAO
       /// request.
       void dispatch_request(TAO_ServerRequest& server_request,
                             ::TAO::Portable_Server::Servant_Upcall& upcall
-                            ACE_ENV_ARG_DECL);
+                           );
 
       /// Event - The POA has been activated. This happens when the POA_Manager
       ///         is activated.
@@ -145,13 +145,13 @@ namespace TAO
       /// Event - A servant has been activated.
       void servant_activated_event(PortableServer::Servant servant,
                                   const PortableServer::ObjectId& oid
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
       /// Event - A servant has been deactivated.  This also occurs when
       ///         the POA is destroyed.
       void servant_deactivated_event(PortableServer::Servant servant,
                                     const PortableServer::ObjectId& oid
-                                    ACE_ENV_ARG_DECL);
+                                   );
 
       /// The POA to which this strategy has been applied.
       ::PortableServer::POA_var poa_;
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
index 6dce0cf7397..b68910e87ab 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
@@ -16,8 +16,7 @@ ACE_INLINE
 void
 TAO::CSD::Strategy_Base::dispatch_request
                          (TAO_ServerRequest& server_request,
-                          TAO::Portable_Server::Servant_Upcall& upcall
-                          ACE_ENV_ARG_DECL)
+                          TAO::Portable_Server::Servant_Upcall& upcall)
 {
   DispatchResult result;
 
@@ -27,9 +26,7 @@ TAO::CSD::Strategy_Base::dispatch_request
                                                    upcall.user_id(),
                                                    this->poa_.in(),
                                                    server_request.operation(),
-                                                   upcall.servant()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                   upcall.servant());
     }
   else
     {
@@ -37,9 +34,7 @@ TAO::CSD::Strategy_Base::dispatch_request
                                                upcall.user_id(),
                                                this->poa_.in(),
                                                server_request.operation(),
-                                               upcall.servant()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               upcall.servant());
     }
 
   switch (result)
@@ -71,10 +66,7 @@ TAO::CSD::Strategy_Base::dispatch_request
       case DISPATCH_DEFERRED:
         // Perform the "default" dispatching strategy logic for this request
         // right now, using the current thread.
-        upcall.servant()->_dispatch(server_request,
-                                    (void*)&upcall
-                                    ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        upcall.servant()->_dispatch(server_request, (void*)&upcall);
         break;
 
       default:
@@ -113,7 +105,7 @@ TAO::CSD::Strategy_Base::poa_deactivated_event()
       this->poa_deactivated_event_i();
 
       // Reset the poa to nil to decrement the reference count.
-      // This will break the circular dependency of the deletion 
+      // This will break the circular dependency of the deletion
       // of the CSD POA.
       this->poa_ = 0;
     }
@@ -123,22 +115,18 @@ ACE_INLINE
 void
 TAO::CSD::Strategy_Base::servant_activated_event
                                 (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
+                                 const PortableServer::ObjectId& oid)
 {
-  this->servant_activated_event_i(servant, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->servant_activated_event_i(servant, oid);
 }
 
 ACE_INLINE
 void
 TAO::CSD::Strategy_Base::servant_deactivated_event
                                 (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
+                                 const PortableServer::ObjectId& oid)
 {
-  this->servant_deactivated_event_i(servant, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->servant_deactivated_event_i(servant, oid);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
index 959a7cb9ebb..dd0ed342610 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
@@ -73,7 +73,7 @@ namespace TAO
       /// the smart pointer to the custom dispatching strategy object).
       void dispatch_request(TAO_ServerRequest& server_request,
                             TAO::Portable_Server::Servant_Upcall& upcall
-                            ACE_ENV_ARG_DECL);
+                           );
 
 
       /// Event - The POA has been (or is being) activated.
@@ -85,12 +85,12 @@ namespace TAO
       /// Event - A servant has been activated.
       void servant_activated_event(PortableServer::Servant servant,
                                   const PortableServer::ObjectId& oid
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
       /// Event - A servant has been deactivated.
       void servant_deactivated_event(PortableServer::Servant servant,
                                     const PortableServer::ObjectId& oid
-                                    ACE_ENV_ARG_DECL);
+                                   );
 
     private:
 
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
index 957852e6517..68bd0b7ee6a 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
@@ -21,7 +21,7 @@ void
 TAO::CSD::Strategy_Proxy::dispatch_request
                                 (TAO_ServerRequest& server_request,
                                  TAO::Portable_Server::Servant_Upcall& upcall
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
 
   if (this->strategy_impl_ == 0)
@@ -29,16 +29,14 @@ TAO::CSD::Strategy_Proxy::dispatch_request
       // This is the "default" strategy implementation.
       upcall.servant()->_dispatch(server_request,
                                   (void*)&upcall
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 );
     }
   else
     {
       // Delegate to the custom strategy object.
       this->strategy_impl_->dispatch_request(server_request,
                                              upcall
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                            );
     }
 }
 
@@ -70,7 +68,7 @@ void
 TAO::CSD::Strategy_Proxy::servant_activated_event
                                   (PortableServer::Servant servant,
                                    const PortableServer::ObjectId& oid
-                                   ACE_ENV_ARG_DECL)
+                                   )
 {
   // We only need to do something if this proxy holds a custom strategy.
   if (this->strategy_impl_)
@@ -78,8 +76,7 @@ TAO::CSD::Strategy_Proxy::servant_activated_event
       // Delegate to the custom strategy object.
       this->strategy_impl_->servant_activated_event(servant,
                                                oid
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              );
     }
 }
 
@@ -88,7 +85,7 @@ void
 TAO::CSD::Strategy_Proxy::servant_deactivated_event
                                   (PortableServer::Servant servant,
                                    const PortableServer::ObjectId& oid
-                                   ACE_ENV_ARG_DECL)
+                                   )
 {
   // We only need to do something if this proxy holds a custom strategy.
   if (this->strategy_impl_)
@@ -96,8 +93,7 @@ TAO::CSD::Strategy_Proxy::servant_deactivated_event
       // Delegate to the custom strategy object.
       this->strategy_impl_->servant_deactivated_event(servant,
                                                  oid
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                );
     }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
index e1602e2dde3..57854bd9aa8 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
@@ -14,19 +14,7 @@ ACE_INLINE
 TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor(PortableServer::Servant servant)
   : servant_(servant)
 {
-  // This try-catch block is not really necessary for current implementation 
-  // since the _add_ref does not throw exception, but we have to add it to 
-  // satisfy the non-exception builds. If _add_ref really throws an exception 
-  // then this constructor needs deal with the exception.
-  ACE_TRY_NEW_ENV
-  {
-    this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
+  this->servant_->_add_ref ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
index 0e4c596f682..ff94e678bb3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
@@ -28,27 +28,22 @@ TAO::CSD::TP_Collocated_Asynch_Request::prepare_for_queue_i()
 void
 TAO::CSD::TP_Collocated_Asynch_Request::dispatch_i()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->do_dispatch();
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
       // doing anything with it.
     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
       // doing anything with it.
     }
-#endif
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
index c7d7d00fcde..aff5665bd2b 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
@@ -22,27 +22,22 @@ TAO::CSD::TP_Collocated_Synch_Request::~TP_Collocated_Synch_Request()
 void
 TAO::CSD::TP_Collocated_Synch_Request::dispatch_i()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->do_dispatch();
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       // We need to save off a copy of the exception.
-      this->exception_ = ACE_ANY_EXCEPTION._tao_duplicate();
+      this->exception_ = ex._tao_duplicate();
     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_NEW (this->exception_ ,
                CORBA::UNKNOWN (CORBA::SystemException::_tao_minor_code
                                  (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0),
                                   CORBA::COMPLETED_MAYBE));
     }
-#endif
-  ACE_ENDTRY;
 
   this->synch_helper_.dispatched();
 }
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
index cad5fa52bd5..97ec687398c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
@@ -42,9 +42,9 @@ namespace TAO
      * @brief Represents a "queue-able", synchronous, collocated,
      *        CORBA request.
      *
-     * This kind request is the two-way or oneway(with SYNC_WITH_TARGET 
-     * policy applied) collocated request. It is NOT cloned before 
-     * enqueuing and the "enqueuing" thread will block until the request  
+     * This kind request is the two-way or oneway(with SYNC_WITH_TARGET
+     * policy applied) collocated request. It is NOT cloned before
+     * enqueuing and the "enqueuing" thread will block until the request
      * is dispatched/handled or cancelled.
      */
     class TAO_CSD_TP_Export TP_Collocated_Synch_Request
@@ -66,9 +66,9 @@ namespace TAO
 
       /// Wait until the request has been dispatched (and completed), or
       /// until it has been cancelled.
-      /// Returns true if the request has been dispatched, and returns 
+      /// Returns true if the request has been dispatched, and returns
       /// false if the request has been cancelled.
-      bool wait(ACE_ENV_SINGLE_ARG_DECL);
+      bool wait(void);
 
 
     protected:
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
index c92dfe4719f..f946b8fd9c6 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
@@ -27,7 +27,7 @@ TAO::CSD::TP_Collocated_Synch_Request::TP_Collocated_Synch_Request
 
 ACE_INLINE
 bool
-TAO::CSD::TP_Collocated_Synch_Request::wait(ACE_ENV_SINGLE_ARG_DECL)
+TAO::CSD::TP_Collocated_Synch_Request::wait(void)
 {
   bool dispatched = this->synch_helper_.wait_while_pending();
 
@@ -42,18 +42,14 @@ TAO::CSD::TP_Collocated_Synch_Request::wait(ACE_ENV_SINGLE_ARG_DECL)
           // first place.
           CORBA::Exception* ex = this->exception_;
           this->exception_ = 0;
-        
-#if defined (TAO_HAS_EXCEPTIONS)
+
           ACE_Auto_Basic_Ptr<CORBA::Exception> ex_holder(ex);
           ex->_raise ();
-#else
-          ACE_TRY_ENV.exception (ex);
-#endif /* ACE_HAS_EXCEPTIONS */
         }
     }
-  
+
   return dispatched;
-    
+
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
index 70f43c863c7..1da58c328c0 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
@@ -40,27 +40,22 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::dispatch_i()
   // This is done *before* we do_dispatch().
   this->synch_helper_.dispatched();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->do_dispatch();
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
       // doing anything with it.
     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
       // doing anything with it.
     }
-#endif
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
index 0b54d87ed06..f4002388306 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
@@ -42,13 +42,13 @@ namespace TAO
      * @brief Represents a "queue-able", one-way, collocated, CORBA
      *        request with a "Synch Scope" policy of SYNC_WITH_SERVER.
      *
-     * This kind of request is one-way request with the SYNC_WITH_SERVER 
-     * policy applied. It is cloned before enqueuing and the "enqueuing" 
+     * This kind of request is one-way request with the SYNC_WITH_SERVER
+     * policy applied. It is cloned before enqueuing and the "enqueuing"
      * thread will block until it is signalled by the TP_Task thread that
-     * will happen just before the request is dispatched or the request 
+     * will happen just before the request is dispatched or the request
      * is cancelled.
      */
-    class TAO_CSD_TP_Export TP_Collocated_Synch_With_Server_Request 
+    class TAO_CSD_TP_Export TP_Collocated_Synch_With_Server_Request
                                                   : public TP_Corba_Request
     {
     public:
@@ -70,15 +70,15 @@ namespace TAO
       /// *before* the request is dispatched by a worker thread.  This is
       /// different than the TP_Collocated_Synch_Request which waits until
       /// just *after* the request is dispatched by a worker thread.
-      /// Returns true if the request has been dispatched, and returns 
+      /// Returns true if the request has been dispatched, and returns
       /// false if the request has been cancelled.
-      bool wait(ACE_ENV_SINGLE_ARG_DECL);
+      bool wait(void);
 
 
     protected:
 
-      /// Prepare this TP_Collocated_Synch_With_Server_Request object to be 
-      /// placed into the request queue.  This will cause the underlying 
+      /// Prepare this TP_Collocated_Synch_With_Server_Request object to be
+      /// placed into the request queue.  This will cause the underlying
       /// TAO_ServerRequest object to be cloned.
       virtual void prepare_for_queue_i();
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
index 1ff0407d6fd..0a28b4cba66 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
@@ -24,7 +24,7 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::TP_Collocated_Synch_With_Serv
 
 ACE_INLINE
 bool
-TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(void)
 {
   return this->synch_helper_.wait_while_pending();
 }
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
index 2e0a6c7996f..bcf4b289d33 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
@@ -68,7 +68,7 @@ namespace TAO
       void do_clone();
 
       /// Delegate to the FW_Server_Request_Wrapper dispatch() method.
-      void do_dispatch(ACE_ENV_SINGLE_ARG_DECL);
+      void do_dispatch(void);
 
       /// Delegate to the FW_Server_Request_Wrapper cancel() method.
       void do_cancel();
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
index 18d273c34a5..4334a281140 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
@@ -29,10 +29,9 @@ TAO::CSD::TP_Corba_Request::do_clone()
 
 ACE_INLINE
 void
-TAO::CSD::TP_Corba_Request::do_dispatch(ACE_ENV_SINGLE_ARG_DECL)
+TAO::CSD::TP_Corba_Request::do_dispatch(void)
 {
-  this->server_request_.dispatch(this->servant() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->server_request_.dispatch(this->servant());
 }
 
 ACE_INLINE
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
index 6765f02eff6..603f8eae77a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
@@ -20,27 +20,22 @@ TAO::CSD::TP_Custom_Asynch_Request::~TP_Custom_Asynch_Request()
 void
 TAO::CSD::TP_Custom_Asynch_Request::dispatch_i()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       this->execute_op();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
       // doing anything with it.
     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
       // doing anything with it.
     }
-#endif
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
index 6a05c5df7ee..7c266f21c6b 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
@@ -9,25 +9,13 @@ TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation
                                           (PortableServer::Servant servant)
 : servant_ (servant)
 {
-  // This try-catch block is not really necessary for current implementation 
-  // since the _add_ref does not throw exception, but we have to add it to 
-  // satisfy the non-exception builds. If _add_ref really throws an exception 
-  // then this constructor needs deal with the exception.
-  ACE_TRY_NEW_ENV
-  {
-    this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
+  this->servant_->_add_ref ();
 }
 
 
 ACE_INLINE
 void
-TAO::CSD::TP_Custom_Request_Operation::execute()
+TAO::CSD::TP_Custom_Request_Operation::execute (void)
 {
   this->execute_i();
 }
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
index 45529af5802..036a804beac 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
@@ -27,27 +27,22 @@ TAO::CSD::TP_Remote_Request::prepare_for_queue_i()
 void
 TAO::CSD::TP_Remote_Request::dispatch_i()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->do_dispatch();
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
       // doing anything with it.
     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       // Eat these.  We probably should log these, but since we have already
       // unblocked the requesting thread there is no point in saving it or
       // doing anything with it.
     }
-#endif
-  ACE_ENDTRY;
 }
 
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
index 341a449091e..2661a54453c 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
@@ -12,19 +12,7 @@ TAO::CSD::TP_Request::TP_Request(PortableServer::Servant servant,
     servant_ (servant),
     servant_state_(servant_state, false)
 {
-  // This try-catch block is not really necessary for current implementation 
-  // since the _add_ref does not throw exception, but we have to add it to 
-  // satisfy the non-exception builds. If _add_ref really throws an exception 
-  // then this constructor needs deal with the exception.
-  ACE_TRY_NEW_ENV
-  {
-    this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
+  this->servant_->_add_ref ();
 }
 
 
@@ -84,7 +72,7 @@ TAO::CSD::TP_Request::mark_as_ready()
 
 
 ACE_INLINE
-bool 
+bool
 TAO::CSD::TP_Request::is_target(PortableServer::Servant servant)
 {
   // Compare pointers.  Return true only if these are the exact same object.
@@ -97,7 +85,7 @@ void
 TAO::CSD::TP_Request::dispatch()
 {
   this->dispatch_i();
-  
+
 }
 
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
index e6726098b72..ccbec859ea4 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
@@ -56,15 +56,15 @@ namespace TAO
 
       /// Accessor for the servant busy flag.
       TP_Servant_State* find(PortableServer::Servant servant
-                             ACE_ENV_ARG_DECL);
+                            );
 
       /// Insert the servant to map.
       void insert(PortableServer::Servant servant
-                  ACE_ENV_ARG_DECL);
+                 );
 
       /// Remove the servant from map.
       void remove(PortableServer::Servant servant
-                  ACE_ENV_ARG_DECL);
+                 );
 
 
     private:
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
index 1faeb7ad536..1b1e35aba91 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
@@ -18,8 +18,7 @@ TAO::CSD::TP_Servant_State_Map::~TP_Servant_State_Map()
 
 ACE_INLINE
 TAO::CSD::TP_Servant_State*
-TAO::CSD::TP_Servant_State_Map::find(PortableServer::Servant servant
-                                     ACE_ENV_ARG_DECL)
+TAO::CSD::TP_Servant_State_Map::find(PortableServer::Servant servant)
 {
   void* key = servant;
 
@@ -36,8 +35,7 @@ TAO::CSD::TP_Servant_State_Map::find(PortableServer::Servant servant
 
 ACE_INLINE
 void
-TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL)
+TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant)
 {
   void* key = servant;
 
@@ -47,23 +45,22 @@ TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant
 
   if (result == 1)
     {
-      ACE_THROW (PortableServer::POA::ServantAlreadyActive ());
+      throw PortableServer::POA::ServantAlreadyActive ();
     }
-  
+
   ACE_ASSERT (result == 0);
 }
 
 
 ACE_INLINE
 void
-TAO::CSD::TP_Servant_State_Map::remove(PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL)
+TAO::CSD::TP_Servant_State_Map::remove(PortableServer::Servant servant)
 {
   void* key = servant;
 
   if (this->map_.unbind(key) == -1)
     {
-      ACE_THROW (PortableServer::POA::ServantNotActive ());
+      throw PortableServer::POA::ServantNotActive ();
     }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
index 1a9c86ec8da..4ac811786ac 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
@@ -27,12 +27,11 @@ TAO::CSD::TP_Strategy::~TP_Strategy()
 
 TAO::CSD::TP_Strategy::CustomRequestOutcome
 TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op
-                                            ACE_ENV_ARG_DECL)
+                                            )
 {
   TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(op->servant() 
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (REQUEST_REJECTED);
+                        this->get_servant_state(op->servant()
+                                               );
 
   TP_Custom_Synch_Request_Handle request = new
                           TP_Custom_Synch_Request(op, servant_state.in());
@@ -50,12 +49,11 @@ TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op
 
 TAO::CSD::TP_Strategy::CustomRequestOutcome
 TAO::CSD::TP_Strategy::custom_asynch_request(TP_Custom_Request_Operation* op
-                                             ACE_ENV_ARG_DECL)
+                                             )
 {
   TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(op->servant() 
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (REQUEST_REJECTED);
+                        this->get_servant_state(op->servant()
+                                               );
 
   TP_Custom_Asynch_Request_Handle request = new
                           TP_Custom_Asynch_Request(op, servant_state.in());
@@ -92,12 +90,11 @@ TAO::CSD::TP_Strategy::dispatch_remote_request_i
                               PortableServer::POA_ptr         poa,
                               const char*                     operation,
                               PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL)
+                              )
 {
   TP_Servant_State::HandleType servant_state =
                         this->get_servant_state(servant
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DISPATCH_REJECTED);
+                                               );
 
   // Now we can create the TP_Remote_Request object, and then add it to our
   // task_'s "request queue".
@@ -133,12 +130,11 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
                               PortableServer::POA_ptr         poa,
                               const char*                     operation,
                               PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL)
+                              )
 {
   TP_Servant_State::HandleType servant_state =
                         this->get_servant_state(servant
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DISPATCH_REJECTED);
+                                               );
 
   bool is_sync_with_server = server_request.sync_with_server();
   bool is_synchronous      = server_request.response_expected();
@@ -146,7 +142,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
   TP_Collocated_Synch_Request_Handle             synch_request;
   TP_Collocated_Synch_With_Server_Request_Handle synch_with_server_request;
   TP_Request_Handle                              request;
-      
+
   // Create the request object using the appropriate concrete type.
   if (is_sync_with_server)
     {
@@ -177,7 +173,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
       request = synch_request.in();
     }
   else
-    {  
+    {
       // Just use the (base) request handle to hold the request object.
       request = new TP_Collocated_Asynch_Request(server_request,
                                                  object_id,
@@ -201,8 +197,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
   // synchronous request.
   if (!synch_request.is_nil())
     {
-      int srw = synch_request->wait(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (DISPATCH_REJECTED);
+      int srw = synch_request->wait();
       if (srw == false)
         {
           // Raise exception when request was cancelled.
@@ -211,8 +206,7 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
     }
   else if (!synch_with_server_request.is_nil())
     {
-      bool swsr = synch_with_server_request->wait(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (DISPATCH_REJECTED);
+      bool swsr = synch_with_server_request->wait();
       if (swsr == false)
         {
           // Raise exception when request was cancelled.
@@ -224,64 +218,60 @@ TAO::CSD::TP_Strategy::dispatch_collocated_request_i
 }
 
 
-void 
+void
 TAO::CSD::TP_Strategy::servant_activated_event_i
-                                (PortableServer::Servant servant, 
+                                (PortableServer::Servant servant,
                                  const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
   ACE_UNUSED_ARG(oid);
 
   if (this->serialize_servants_)
     {
       // Add the servant to the servant state map.
-      this->servant_state_map_.insert(servant ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->servant_state_map_.insert(servant);
     }
 }
 
 
-void 
+void
 TAO::CSD::TP_Strategy::servant_deactivated_event_i
-                                (PortableServer::Servant servant, 
+                                (PortableServer::Servant servant,
                                  const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
   ACE_UNUSED_ARG(oid);
 
   // Cancel all requests stuck in the queue for the specified servant.
-  this->task_.cancel_servant(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->task_.cancel_servant(servant);
 
   if (this->serialize_servants_)
     {
       // Remove the servant from the servant state map.
-      this->servant_state_map_.remove(servant ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->servant_state_map_.remove(servant);
     }
 }
 
 
-void 
+void
 TAO::CSD::TP_Strategy::cancel_requests(PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL)
+                                       )
 {
   // Cancel all requests stuck in the queue for the specified servant.
-  this->task_.cancel_servant(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->task_.cancel_servant(servant);
 }
 
 
 TAO::CSD::TP_Servant_State::HandleType
 TAO::CSD::TP_Strategy::get_servant_state(PortableServer::Servant servant
-                                         ACE_ENV_ARG_DECL)
+                                         )
 {
   TP_Servant_State::HandleType servant_state;
 
   if (this->serialize_servants_)
     {
       servant_state = this->servant_state_map_.find(servant
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   );
     }
 
   return servant_state;
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
index 2e069caeb6d..0b927f9d0cd 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
@@ -91,7 +91,7 @@ namespace TAO
       /// Will return REQUEST_EXECUTED, REQUEST_CANCELLED, or REQUEST_REJECTED.
       CustomRequestOutcome custom_synch_request
                                         (TP_Custom_Request_Operation* op
-                                         ACE_ENV_ARG_DECL);
+                                        );
 
       /// Inject an asynchronous, custom request into the request queue.
       /// This will return control to the calling thread once the request
@@ -99,12 +99,12 @@ namespace TAO
       /// Will return REQUEST_DISPATCHED or REQUEST_REJECTED.
       CustomRequestOutcome custom_asynch_request
                                          (TP_Custom_Request_Operation* op
-                                          ACE_ENV_ARG_DECL);
+                                         );
 
       /// Cancel all requests that are targeted for the provided servant.
       /// This is requested on the user application level.
       void cancel_requests(PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL);
+                          );
 
     protected:
 
@@ -119,7 +119,7 @@ namespace TAO
                               PortableServer::POA_ptr         poa,
                               const char*                     operation,
                               PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL);
+                             );
 
       /// Handle the dispatching of a collocated request.
       ///
@@ -132,7 +132,7 @@ namespace TAO
                               PortableServer::POA_ptr         poa,
                               const char*                     operation,
                               PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL);
+                             );
 
       /// Event - The POA has been activated.
       /// This will activate the worker thread(s).
@@ -148,13 +148,13 @@ namespace TAO
       virtual void servant_activated_event_i
                                      (PortableServer::Servant servant,
                                       const PortableServer::ObjectId& oid
-                                      ACE_ENV_ARG_DECL);
+                                     );
 
       /// Event - A servant has been deactivated
       virtual void servant_deactivated_event_i
                                     (PortableServer::Servant servant,
                                      const PortableServer::ObjectId& oid
-                                     ACE_ENV_ARG_DECL);
+                                    );
 
 
     private:
@@ -175,7 +175,7 @@ namespace TAO
       */
       TP_Servant_State::HandleType get_servant_state
                                       (PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL);
+                                      );
 
 
       /// This is the active object used by the worker threads.
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
index a196ea9583d..010e0ed9132 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
@@ -136,14 +136,14 @@ TAO::CSD::TP_Task::svc()
   // execution of this svc() method.
   {
     GuardType guard(this->lock_);
-    // Put the thread id into a collection which is used to check whether  
+    // Put the thread id into a collection which is used to check whether
     // the orb shutdown is called by one of the threads in the pool.
     ACE_thread_t thr_id = ACE_OS::thr_self ();
     if (this->activated_threads_.set(thr_id, this->num_threads_) == -1)
       {
         ACE_ERROR_RETURN((LM_ERROR,
           ACE_TEXT("(%P|%t)TP_Task::svc: number of threads is out of range \n")),
-          0); 
+          0);
       }
     ++this->num_threads_;
     this->active_workers_.signal();
@@ -268,10 +268,10 @@ TAO::CSD::TP_Task::close(u_long flag)
 
       ACE_thread_t my_thr_id = ACE_OS::thr_self ();
 
-      // Check whether the calling thread(calling orb shutdown) is one of the 
+      // Check whether the calling thread(calling orb shutdown) is one of the
       // threads in the pool. If it is then it should not wait itself.
       size_t size = this->activated_threads_.size ();
-      
+
       for (size_t i = 0; i < size; i ++)
         {
           ACE_thread_t thr_id = 0;
@@ -299,8 +299,7 @@ TAO::CSD::TP_Task::close(u_long flag)
 
 
 void
-TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant
-                                   ACE_ENV_ARG_DECL)
+TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant)
 {
   GuardType guard(this->lock_);
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
index 65839aeb3b7..e1d85cedf01 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
@@ -102,7 +102,7 @@ namespace TAO
 
       /// Cancel all requests that are targeted for the provided servant.
       void cancel_servant (PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL);
+                          );
 
 
     private:
@@ -145,9 +145,9 @@ namespace TAO
       TP_Queue queue_;
 
       typedef ACE_Array <ACE_thread_t> Thread_Ids;
-            
+
       /// The list of ids for the threads launched by this task.
-      Thread_Ids activated_threads_; 
+      Thread_Ids activated_threads_;
     };
 
   }
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h
index 45edce1884e..c3b86edf0a2 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -78,35 +78,35 @@ namespace TAO
     /// This method implements one of the "starting" client side
     /// interception points.
     virtual void send_request (Invocation_Base &invocation
-                               ACE_ENV_ARG_DECL) = 0;
+                               ) = 0;
 
     /// This method implements one of the "ending" client side
     /// interception point.
     virtual void receive_reply (Invocation_Base &invocation
-                                ACE_ENV_ARG_DECL) = 0;
+                                ) = 0;
 
     /// This method implements one of the "ending" client side
     /// interception point.
     virtual void receive_exception (Invocation_Base &invocation
-                                    ACE_ENV_ARG_DECL) = 0;
+                                    ) = 0;
 
     /// This method implements one of the "ending" client side
     /// interception point.
     virtual void receive_other (Invocation_Base &invocation
-                                ACE_ENV_ARG_DECL) = 0;
+                                ) = 0;
 
     /// Register an interceptor.
     virtual void add_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL) = 0;
+      ) = 0;
 
     /// Register an interceptor with policies.
     virtual void add_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL) = 0;
+      ) = 0;
 
-    virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0;
+    virtual void destroy_interceptors (void) = 0;
 
     /// Convert TAO Invocation status to a PI status
     virtual PortableInterceptor::ReplyStatus reply_status (
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index f9db6518360..e1913041383 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -44,13 +44,12 @@ TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void)
 
 CORBA::OctetSeq *
 TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
-                              ACE_ENV_ARG_DECL)
+                              )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::Codec::InvalidTypeForEncoding))
 {
   this->check_type_for_encoding (data
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                );
 
   // ----------------------------------------------------------------
 
@@ -84,7 +83,6 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
 
       CORBA::OctetSeq_var safe_octet_seq = octet_seq;
 
@@ -108,7 +106,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
 
 CORBA::Any *
 TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
-                              ACE_ENV_ARG_DECL)
+                              )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::Codec::FormatMismatch))
 {
@@ -159,7 +157,6 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
 
       CORBA::Any_var safe_any = any;
 
@@ -173,13 +170,12 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
 
 CORBA::OctetSeq *
 TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
-                                    ACE_ENV_ARG_DECL)
+                                    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::Codec::InvalidTypeForEncoding))
 {
   this->check_type_for_encoding (data
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                );
 
   // ----------------------------------------------------------------
   TAO_OutputCDR cdr ((size_t) 0,            // size
@@ -216,8 +212,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
           TAO_Marshal_Object::perform_append (data._tao_get_typecode (),
                                               &for_reading,
                                               &cdr
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                             );
         }
       else
         {
@@ -237,7 +232,6 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
                               ),
                             CORBA::COMPLETED_NO
                           ));
-      ACE_CHECK_RETURN (0);
 
       CORBA::OctetSeq_var safe_octet_seq = octet_seq;
 
@@ -265,7 +259,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
 CORBA::Any *
 TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
                                     CORBA::TypeCode_ptr tc
-                                    ACE_ENV_ARG_DECL)
+                                    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::Codec::FormatMismatch,
                    IOP::Codec::TypeMismatch))
@@ -333,7 +327,6 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
                               ),
                             CORBA::COMPLETED_NO
                           ));
-      ACE_CHECK_RETURN (0);
 
       CORBA::Any_var safe_any = any;
 
@@ -353,7 +346,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
 void
 TAO_CDR_Encaps_Codec::check_type_for_encoding (
     const CORBA::Any & data
-    ACE_ENV_ARG_DECL
+
   )
 {
   // @@ TODO: Are there any other conditions we need to check?
@@ -361,8 +354,8 @@ TAO_CDR_Encaps_Codec::check_type_for_encoding (
   CORBA::TypeCode_var typecode = data.type ();
   if (this->major_ == 1
       && this->minor_ == 0
-      && typecode->equivalent (CORBA::_tc_wstring ACE_ENV_ARG_PARAMETER))
-    ACE_THROW (IOP::Codec::InvalidTypeForEncoding ());
+      && typecode->equivalent (CORBA::_tc_wstring))
+    throw IOP::Codec::InvalidTypeForEncoding ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 37672c1e4de..5d051df1f75 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -59,21 +59,21 @@ public:
   /// Encode the given data, including the TypeCode, into an octet
   /// sequence.
   virtual CORBA::OctetSeq * encode (const CORBA::Any & data
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::Codec::InvalidTypeForEncoding));
 
   /// Extract the TypeCode and the value from the octet sequence and
   /// place them into an Any.
   virtual CORBA::Any * decode (const CORBA::OctetSeq & data
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                               )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::Codec::FormatMismatch));
 
   /// Encode the given data, excluding the TypeCode, into an octet
   /// sequence.
   virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::Codec::InvalidTypeForEncoding));
 
@@ -81,7 +81,7 @@ public:
   /// TypeCode,  and place it into an Any.
   virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data,
                                      CORBA::TypeCode_ptr tc
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::Codec::FormatMismatch,
                      IOP::Codec::TypeMismatch));
@@ -103,7 +103,7 @@ protected:
    * Codec.
    */
   void check_type_for_encoding (const CORBA::Any & data
-                                ACE_ENV_ARG_DECL);
+                               );
 
 private:
 
diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp
index f532539a4fd..454a4e11df0 100644
--- a/TAO/tao/CodecFactory/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory.cpp
@@ -25,7 +25,7 @@ TAO_CodecFactory_Loader::create_object (
   CORBA::ORB_ptr orb,
   int,
   ACE_TCHAR *[]
-  ACE_ENV_ARG_DECL_NOT_USED)
+  )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj = CORBA::Object::_nil ();
diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h
index 230914bbbac..2c49a66f1ea 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -39,7 +39,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to force the initialization of the ORB code.
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
index 2b1462c9693..f771c9f2d2c 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
@@ -23,7 +23,7 @@ TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core)
 
 IOP::Codec_ptr
 TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::CodecFactory::UnknownEncoding,
                      IOP::CodecFactory::UnsupportedCodeset))
@@ -71,12 +71,12 @@ TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc
                                enc.format,
                                char_trans,
                                wchar_trans
-                               ACE_ENV_ARG_PARAMETER);
+                              );
 }
 
 IOP::Codec_ptr
 TAO_CodecFactory::create_codec (const IOP::Encoding & enc
-                                ACE_ENV_ARG_DECL)
+                                )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::CodecFactory::UnknownEncoding))
 {
@@ -85,7 +85,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc
                                enc.format,
                                0,
                                0
-                               ACE_ENV_ARG_PARAMETER);
+                              );
 }
 
 IOP::Codec_ptr
@@ -94,7 +94,7 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
                                   IOP::EncodingFormat encoding_format,
                                   TAO_Codeset_Translator_Base * char_trans,
                                   TAO_Codeset_Translator_Base * wchar_trans
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::CodecFactory::UnknownEncoding))
 {
@@ -136,7 +136,6 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_MAYBE));
-      ACE_CHECK_RETURN (IOP::Codec::_nil ());
       break;
 
     default:
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index ba0859f667b..1aa638deb0f 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -53,13 +53,13 @@ public:
 
   /// Create a Coder/Decoder for the given type of encoding.
   virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::CodecFactory::UnknownEncoding));
 
   /// Create a Coder/Decoder for the given type of encoding and codesets.
   virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc
-                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::CodecFactory::UnknownEncoding,
                      IOP::CodecFactory::UnsupportedCodeset));
@@ -75,7 +75,7 @@ private:
                                  IOP::EncodingFormat encoding_format,
                                  TAO_Codeset_Translator_Base * char_trans,
                                  TAO_Codeset_Translator_Base * wchar_trans
-                                 ACE_ENV_ARG_DECL)
+                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::CodecFactory::UnknownEncoding));
 private:
diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
index 7f89626dc47..fc476c15e4c 100644
--- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
@@ -19,19 +19,19 @@ ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory ()
+TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory (void)
 {
 }
 
 bool
-TAO_Codeset_Manager_Factory::is_default() const
+TAO_Codeset_Manager_Factory::is_default (void) const
 {
   return false;
 }
 
 
 TAO_Codeset_Manager *
-TAO_Codeset_Manager_Factory::create ()
+TAO_Codeset_Manager_Factory::create (void)
 {
   TAO_Codeset_Manager_i *csm = 0;
   ACE_NEW_RETURN (csm, TAO_Codeset_Manager_i, 0);
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 98664b6f60e..01363024a40 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -327,7 +327,6 @@ TAO_Codeset_Manager_i::computeTCS (CONV_FRAME::CodeSetComponent &remote,
         }
       else
         {
-          ACE_DECLARE_NEW_CORBA_ENV;
           ACE_THROW_RETURN(CORBA::CODESET_INCOMPATIBLE (), 0);
         }
     }
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
index bd3a915c51d..44112ee49c9 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
@@ -45,8 +45,7 @@ TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **)
 void
 TAO_Codeset_Translator_Factory::assign_i (
     TAO_InputCDR *cdr,
-    ACE_Char_Codeset_Translator *trans
-  ) const
+    ACE_Char_Codeset_Translator *trans) const
 {
   cdr->char_translator(trans);
 }
@@ -54,8 +53,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 void
 TAO_Codeset_Translator_Factory::assign_i (
     TAO_OutputCDR *cdr,
-    ACE_Char_Codeset_Translator *trans
-  ) const
+    ACE_Char_Codeset_Translator *trans) const
 {
   cdr->char_translator(trans);
 }
@@ -63,8 +61,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 void
 TAO_Codeset_Translator_Factory::assign_i (
     TAO_InputCDR *cdr,
-    ACE_WChar_Codeset_Translator *trans
-  ) const
+    ACE_WChar_Codeset_Translator *trans) const
 {
   cdr->wchar_translator(trans);
 }
@@ -72,8 +69,7 @@ TAO_Codeset_Translator_Factory::assign_i (
 void
 TAO_Codeset_Translator_Factory::assign_i (
     TAO_OutputCDR *cdr,
-    ACE_WChar_Codeset_Translator *trans
-  ) const
+    ACE_WChar_Codeset_Translator *trans) const
 {
   cdr->wchar_translator(trans);
 }
diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp
index 80b2efca949..0f3e029859f 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -35,22 +35,20 @@ namespace TAO
 
   Invocation_Status
   Collocated_Invocation::invoke (Collocation_Proxy_Broker *cpb,
-                                 Collocation_Strategy strat
-                                 ACE_ENV_ARG_DECL)
+                                 Collocation_Strategy strat)
   {
     Invocation_Status s = TAO_INVOKE_FAILURE;
 
     /// Start the interception point
 #if TAO_HAS_INTERCEPTORS == 1
     s =
-      this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      this->send_request_interception ();
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
 #endif /*TAO_HAS_INTERCEPTORS */
 
-    ACE_TRY
+    try
       {
         if (strat == TAO_CS_THRU_POA_STRATEGY)
           {
@@ -75,9 +73,7 @@ namespace TAO
 
             dispatcher->dispatch (orb_core,
                                   request,
-                                  this->forwarded_to_.out ()
-                                  ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                                  this->forwarded_to_.out ());
           }
         else
           {
@@ -87,9 +83,7 @@ namespace TAO
                            this->details_.args_num (),
                            this->details_.opname (),
                            this->details_.opname_len (),
-                           strat
-                           ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                           strat);
           }
 
         // Invocation completed succesfully
@@ -102,24 +96,20 @@ namespace TAO
             if (this->forwarded_to_.in ())
               this->reply_received (TAO_INVOKE_RESTART);
 
-            s =
-              this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            s = this->receive_other_interception ();
           }
         // NOTE: Any other condition that needs handling?
         else if (this->response_expected ())
           {
             this->reply_received (TAO_INVOKE_SUCCESS);
 
-            s =
-              this->receive_reply_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            s = this->receive_reply_interception ();
           }
         if (s != TAO_INVOKE_SUCCESS)
           return s;
 #endif /*TAO_HAS_INTERCEPTORS */
       }
-    ACE_CATCHANY
+    catch ( ::CORBA::Exception& ex)
       {
         // Ignore exceptions for oneways
         if (this->response_expected_ == false)
@@ -127,39 +117,17 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
         PortableInterceptor::ReplyStatus const status =
-          this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          this->handle_any_exception (&ex);
 
         if (status == PortableInterceptor::LOCATION_FORWARD ||
             status == PortableInterceptor::TRANSPORT_RETRY)
           s = TAO_INVOKE_RESTART;
         else
+#else
+        ACE_UNUSED_ARG (ex);
 #endif /*TAO_HAS_INTERCEPTORS*/
-          ACE_RE_THROW;
+          throw;
       }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-        if (this->response_expected () == false)
-          return TAO_INVOKE_SUCCESS;
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus const st =
-          this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (st == PortableInterceptor::LOCATION_FORWARD ||
-            st == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-          ACE_RE_THROW;
-      }
-# endif  /* ACE_HAS_EXCEPTIONS &&
-            ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
     if (this->forwarded_to_.in () != 0)
       s =  TAO_INVOKE_RESTART;
diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h
index 02f3cfd7c43..9643b564b47 100644
--- a/TAO/tao/Collocated_Invocation.h
+++ b/TAO/tao/Collocated_Invocation.h
@@ -85,7 +85,7 @@ namespace TAO
      */
     Invocation_Status invoke (Collocation_Proxy_Broker *cpb,
                               Collocation_Strategy strat
-                              ACE_ENV_ARG_DECL);
+                             );
 
   private:
 
diff --git a/TAO/tao/Collocation_Proxy_Broker.h b/TAO/tao/Collocation_Proxy_Broker.h
index 6e51a6cabb5..3a058663906 100644
--- a/TAO/tao/Collocation_Proxy_Broker.h
+++ b/TAO/tao/Collocation_Proxy_Broker.h
@@ -39,7 +39,6 @@ namespace CORBA
   typedef Object *Object_ptr;
   typedef TAO_Pseudo_Var_T<Object> Object_var;
   typedef TAO_Pseudo_Out_T<Object> Object_out;
-  class Environment;
 }
 
 namespace TAO
@@ -57,7 +56,7 @@ namespace TAO
     virtual ~Collocation_Proxy_Broker (void);
 
     virtual Collocation_Strategy get_strategy (CORBA::Object_ptr obj
-                                               ACE_ENV_ARG_DECL) = 0;
+                                               ) = 0;
 
     virtual void dispatch (CORBA::Object_ptr obj,
                            CORBA::Object_out forward_obj,
@@ -66,7 +65,7 @@ namespace TAO
                            const char * op,
                            size_t op_len,
                            Collocation_Strategy strategy
-                           ACE_ENV_ARG_DECL) = 0;
+                           ) = 0;
   };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h
index cf626e2b090..129cfd8f7f1 100644
--- a/TAO/tao/Collocation_Resolver.h
+++ b/TAO/tao/Collocation_Resolver.h
@@ -32,8 +32,6 @@ namespace CORBA
 {
   class Object;
   typedef Object *Object_ptr;
-
-  class Environment;
 }
 
 /**
@@ -54,7 +52,7 @@ public:
 
   /// Is @a object collocated?
   virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
-                                        ACE_ENV_ARG_DECL) const = 0;
+                                        ) const = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Compression/Compression.cpp b/TAO/tao/Compression/Compression.cpp
index fc25beff65d..b5ead7ee850 100644
--- a/TAO/tao/Compression/Compression.cpp
+++ b/TAO/tao/Compression/Compression.cpp
@@ -12,8 +12,7 @@ CORBA::Object_ptr
 TAO_Compression_Loader::create_object (
   CORBA::ORB_ptr,
   int,
-  ACE_TCHAR *[]
-  ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_TCHAR *[])
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj = CORBA::Object::_nil ();
diff --git a/TAO/tao/Compression/Compression.h b/TAO/tao/Compression/Compression.h
index ac579fb9c72..1e6036571aa 100644
--- a/TAO/tao/Compression/Compression.h
+++ b/TAO/tao/Compression/Compression.h
@@ -41,8 +41,7 @@ public:
   /// Creates a Compression Manager and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL)
+                                           ACE_TCHAR *argv [])
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to force the initialization of the ORB code.
diff --git a/TAO/tao/Compression/Compression_Manager.cpp b/TAO/tao/Compression/Compression_Manager.cpp
index e4052b730d0..033d2ca1421 100644
--- a/TAO/tao/Compression/Compression_Manager.cpp
+++ b/TAO/tao/Compression/Compression_Manager.cpp
@@ -13,14 +13,11 @@ namespace TAO
 
 void CompressionManager::register_factory (
   ::Compression::CompressorFactory_ptr compressor_factory)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException,
-            ::Compression::FactoryAlreadyRegistered
-          ))
+    ACE_THROW_SPEC ((::CORBA::SystemException, ::Compression::FactoryAlreadyRegistered))
 {
   if (!::CORBA::is_nil (compressor_factory))
     {
-      ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
+      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
 
       CORBA::ULong const length = this->factories_.length ();
 
@@ -31,7 +28,7 @@ void CompressionManager::register_factory (
 
           if (compressor_factory->compressor_id () == current)
             {
-              ACE_THROW (::Compression::FactoryAlreadyRegistered ());
+              throw ::Compression::FactoryAlreadyRegistered ();
             }
         }
       factories_.length (length + 1);
@@ -40,8 +37,7 @@ void CompressionManager::register_factory (
   else
     {
       // @todo Standardize this minor code
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 44,
-                                   CORBA::COMPLETED_YES));
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 44, CORBA::COMPLETED_NO);
     }
 }
 
@@ -53,7 +49,7 @@ CompressionManager::unregister_factory (
             ::Compression::UnknownCompressorId
           ))
 {
-  ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
 
   CORBA::ULong const length = this->factories_.length ();
 
@@ -74,7 +70,7 @@ CompressionManager::unregister_factory (
     }
 
   // todo exception
-  ACE_THROW (::Compression::UnknownCompressorId ());
+  throw ::Compression::UnknownCompressorId ();
 }
 
 ::Compression::CompressorFactory_ptr
@@ -85,15 +81,15 @@ CompressionManager::get_factory (
             ::Compression::UnknownCompressorId
           ))
 {
-  ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_,
+    ::Compression::CompressorFactory::_nil ());
 
   CORBA::ULong const length = this->factories_.length ();
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       ::Compression::CompressorId const current =
-        this->factories_[i]->compressor_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->factories_[i]->compressor_id ();
 
       if (current != compressor_id)
         {
@@ -103,16 +99,13 @@ CompressionManager::get_factory (
       return ::Compression::CompressorFactory::_duplicate (this->factories_[i]);
     }
 
-  ACE_THROW (::Compression::UnknownCompressorId ());
-
-  ACE_NOTREACHED (return ::Compression::CompressorFactory::_nil ());
+  throw ::Compression::UnknownCompressorId ();
 }
 
 ::Compression::Compressor_ptr
 CompressionManager::get_compressor (
             ::Compression::CompressorId compressor_id,
-            ::Compression::CompressionLevel compression_level
-          )
+            ::Compression::CompressionLevel compression_level)
           ACE_THROW_SPEC ((
             ::CORBA::SystemException,
             ::Compression::UnknownCompressorId
@@ -124,11 +117,8 @@ CompressionManager::get_compressor (
 }
 
 ::Compression::CompressorFactorySeq *
-CompressionManager::get_factories (
-          )
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
+CompressionManager::get_factories (void)
+          ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   // todo
   return 0;
diff --git a/TAO/tao/Compression/Compression_Manager.h b/TAO/tao/Compression/Compression_Manager.h
index 0d56910d5e8..0351a4d89e9 100644
--- a/TAO/tao/Compression/Compression_Manager.h
+++ b/TAO/tao/Compression/Compression_Manager.h
@@ -23,7 +23,6 @@
 
 #include "tao/Compression/Compression.h"
 #include "tao/LocalObject.h"
-#include "ace/Synch_Traits.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -34,46 +33,35 @@ namespace TAO
     public virtual TAO_Local_RefCounted_Object
   {
     virtual void register_factory (
-        ::Compression::CompressorFactory_ptr compressor_factory
-      )
+        ::Compression::CompressorFactory_ptr compressor_factory)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
-        ::Compression::FactoryAlreadyRegistered
-      ));
+        ::Compression::FactoryAlreadyRegistered));
 
     virtual void unregister_factory (
-        ::Compression::CompressorId compressor_id
-      )
+        ::Compression::CompressorId compressor_id)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
-        ::Compression::UnknownCompressorId
-      ));
+        ::Compression::UnknownCompressorId));
 
     virtual ::Compression::CompressorFactory_ptr get_factory (
-        ::Compression::CompressorId compressor_id
-      )
+        ::Compression::CompressorId compressor_id)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
-        ::Compression::UnknownCompressorId
-      ));
+        ::Compression::UnknownCompressorId));
 
     virtual ::Compression::Compressor_ptr get_compressor (
         ::Compression::CompressorId compressor_id,
-        ::Compression::CompressionLevel compression_level
-      )
+        ::Compression::CompressionLevel compression_level)
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
-        ::Compression::UnknownCompressorId
-      ));
+        ::Compression::UnknownCompressorId));
 
-    virtual ::Compression::CompressorFactorySeq * get_factories (
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
+    virtual ::Compression::CompressorFactorySeq * get_factories (void)
+      ACE_THROW_SPEC ((::CORBA::SystemException));
 
     private:
-      ACE_SYNCH_MUTEX mutex_;
+      TAO_SYNCH_MUTEX mutex_;
       ::Compression::CompressorFactorySeq factories_;
   };
 }
diff --git a/TAO/tao/Compression/Compressor_Factory.cpp b/TAO/tao/Compression/Compressor_Factory.cpp
index 89db794c56f..4a796ab8209 100644
--- a/TAO/tao/Compression/Compressor_Factory.cpp
+++ b/TAO/tao/Compression/Compressor_Factory.cpp
@@ -17,37 +17,30 @@ CompressorFactory::CompressorFactory (::Compression::CompressorId compressor_id)
 
 ::Compression::CompressorId
 CompressorFactory::compressor_id (void)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
+  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   return compressor_id_;
 }
 
 ::CORBA::ULongLong
 CompressorFactory::compressed_bytes (void)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
+  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   ::CORBA::ULongLong return_value;
   {
-    ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
     return_value = compressed_bytes_;
   }
   return return_value;
 }
 
 ::CORBA::ULongLong
-CompressorFactory::uncompressed_bytes (
-          )
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
+CompressorFactory::uncompressed_bytes (void)
+  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   ::CORBA::ULongLong return_value;
   {
-    ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
     return_value = uncompressed_bytes_;
   }
   return return_value;
@@ -55,13 +48,11 @@ CompressorFactory::uncompressed_bytes (
 
 ::CORBA::Double
 CompressorFactory::average_compression (void)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
+  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   ::CORBA::Double return_value = 0.0;
   {
-    ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
     if (this->uncompressed_bytes_ > 0)
       {
         return_value = static_cast < ::CORBA::Double>((this->uncompressed_bytes_ - this->compressed_bytes_) / this->uncompressed_bytes_);
@@ -74,11 +65,9 @@ void
 CompressorFactory::add_sample (
   ::CORBA::ULongLong compressed_bytes,
   ::CORBA::ULongLong uncompressed_bytes)
-          ACE_THROW_SPEC ((
-            ::CORBA::SystemException
-          ))
+  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
-  ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->compressed_bytes_ += compressed_bytes;
   this->uncompressed_bytes_ += uncompressed_bytes;
 }
diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h
index 67ef3c1c596..a7951189868 100644
--- a/TAO/tao/Compression/Compressor_Factory.h
+++ b/TAO/tao/Compression/Compressor_Factory.h
@@ -23,7 +23,6 @@
 
 #include "tao/Compression/Compression.h"
 #include "tao/LocalObject.h"
-#include "ace/Synch_Traits.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -37,43 +36,29 @@ namespace TAO
       CompressorFactory (::Compression::CompressorId compressor_id);
 
       virtual ::Compression::CompressorId compressor_id (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        ACE_THROW_SPEC (( ::CORBA::SystemException));
 
       virtual ::CORBA::ULongLong compressed_bytes (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        ACE_THROW_SPEC ((::CORBA::SystemException));
 
       virtual ::CORBA::ULongLong uncompressed_bytes (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        ACE_THROW_SPEC ((::CORBA::SystemException));
 
       virtual ::CORBA::Double average_compression (void)
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+        ACE_THROW_SPEC ((::CORBA::SystemException));
 
       virtual ::Compression::Compressor_ptr get_compressor (
-          ::Compression::CompressionLevel compression_level
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        )) = 0;
+          ::Compression::CompressionLevel compression_level)
+        ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
 
       virtual void add_sample (
           ::CORBA::ULongLong compressed_bytes,
-          ::CORBA::ULongLong uncompressed_bytes
-        )
-        ACE_THROW_SPEC ((
-          ::CORBA::SystemException
-        ));
+          ::CORBA::ULongLong uncompressed_bytes)
+        ACE_THROW_SPEC ((::CORBA::SystemException));
 
     private:
-      ACE_SYNCH_MUTEX mutex_;
-      ::Compression::CompressorId compressor_id_;
+      TAO_SYNCH_MUTEX mutex_;
+      ::Compression::CompressorId const compressor_id_;
       ::CORBA::ULongLong compressed_bytes_;
       ::CORBA::ULongLong uncompressed_bytes_;
     };
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor.cpp b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
index 4af3ab9ed72..39c83777f7f 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor.cpp
@@ -38,7 +38,7 @@ ZlibCompressor::compress (
 
   if (retval != Z_OK)
     {
-      ACE_THROW (::Compression::CompressionException ());
+      throw ::Compression::CompressionException ();
     }
   else
     {
@@ -63,7 +63,7 @@ ZlibCompressor::decompress (
 
   if (retval != Z_OK)
     {
-      ACE_THROW (::Compression::CompressionException ());
+      throw ::Compression::CompressionException ();
     }
   else
     {
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 1de294f0b1f..835f64d9264 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -121,7 +121,7 @@ TAO_Connector_Registry::close_all (void)
 int
 TAO_Connector_Registry::make_mprofile (const char *ior,
                                        TAO_MProfile &mprofile
-                                       ACE_ENV_ARG_DECL)
+                                       )
 {
   if (!ior)
     // Failure: Null IOR string pointer
@@ -144,8 +144,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
           const int mp_result =
             (*connector)->make_mprofile (ior,
                                          mprofile
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (mp_result);
+                                        );
 
           if (mp_result == 0)
             return 0;  // Success
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index 05b4e9cd89a..cc333df6749 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -35,11 +35,6 @@ class TAO_MProfile;
 class TAO_Profile;
 class TAO_InputCDR;
 
-namespace CORBA
-{
-  class Environment;
-}
-
 typedef TAO_Connector** TAO_ConnectorSetIterator;
 
 /**
@@ -77,7 +72,7 @@ public:
   /// MProfile.
   int make_mprofile (const char *ior,
                      TAO_MProfile &mprofile
-                     ACE_ENV_ARG_DECL);
+                    );
 
   /// Create a profile based on the contents of @a cdr
   TAO_Profile* create_profile (TAO_InputCDR& cdr);
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index cbd0cd1d0f2..66d2564c879 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -3,7 +3,6 @@
 #include "tao/DLL_Parser.h"
 #include "tao/Object_Loader.h"
 #include "tao/Object.h"
-#include "tao/Environment.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
index 78ccc5c4b5c..ec5a993d8d7 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
 TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
-                                                 ACE_ENV_ARG_DECL_NOT_USED) const
+                                                 ) const
 {
   return object->_is_collocated ();
 }
diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h
index c98aefae6d5..31394883da1 100644
--- a/TAO/tao/Default_Collocation_Resolver.h
+++ b/TAO/tao/Default_Collocation_Resolver.h
@@ -24,10 +24,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-namespace CORBA
-{
-  class Environment;
-}
 /**
  * @class TAO_Default_Collocation_Resolver
  *
@@ -44,7 +40,7 @@ public:
 
   /// Is @a object collocated?
   virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
-                                        ACE_ENV_ARG_DECL) const;
+                                        ) const;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
index 64fb8f94608..031eec86c95 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
@@ -26,7 +26,7 @@ TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (v
 
 
 TAO_Invocation_Endpoint_Selector *
-TAO_Default_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Default_Endpoint_Selector_Factory::get_selector (void)
 {
   // Trivial endpoint selector.  Just return the default selector.
   return this->default_endpoint_selector_;
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h
index b521cab81dd..ac5f7c46e83 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.h
@@ -62,7 +62,7 @@ public:
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
-                             ACE_ENV_SINGLE_ARG_DECL);
+                             void);
 
 private:
 
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
index a06a1307aba..570dfd379ec 100644
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ b/TAO/tao/Default_Protocols_Hooks.cpp
@@ -14,16 +14,14 @@ TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void)
 }
 
 void
-TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core *
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core *)
 {
 }
 
 void
 TAO_Default_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &,
                                                           CORBA::Policy *,
-                                                          CORBA::Short &
-                                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                                          CORBA::Short &)
 {
 }
 
@@ -39,20 +37,18 @@ TAO_Default_Protocols_Hooks::get_selector_bands_policy_hook (CORBA::Policy *,
                                                              CORBA::Short,
                                                              CORBA::Short &,
                                                              CORBA::Short &,
-                                                             int &)
+                                                             bool &)
 {
 }
 
 int
-TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &
-                                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &)
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &)
 {
   return 0;
 }
@@ -60,21 +56,19 @@ TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &
 int
 TAO_Default_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &,
                                                                    CORBA::Short &
-                                                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                                                   )
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short
-                                                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short)
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short)
 {
   return 0;
 }
@@ -82,84 +76,81 @@ TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short
 void
 TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *,
                                                  TAO_Service_Context &,
-                                                 CORBA::Boolean
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                                 CORBA::Boolean)
 {
 }
 
 CORBA::Boolean
 TAO_Default_Protocols_Hooks::set_client_network_priority (IOP::ProfileId,
-                                                          TAO_Stub *
-                                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                                          TAO_Stub *)
 {
   return false;
 }
 
 CORBA::Boolean
 TAO_Default_Protocols_Hooks::set_server_network_priority (IOP::ProfileId,
-                                                          CORBA::Policy *
-                                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                                          CORBA::Policy *)
 {
   return false;
 }
 
 void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  TAO_IIOP_Protocol_Properties &)
 {
 }
 
 void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  TAO_IIOP_Protocol_Properties &)
 {
 }
 
 void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  TAO_UIOP_Protocol_Properties &)
 {
 }
 
 void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  TAO_UIOP_Protocol_Properties &)
 {
 }
 
 void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  TAO_SHMIOP_Protocol_Properties &)
 {
 }
 
 void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  TAO_SHMIOP_Protocol_Properties &)
 {
 }
 
 void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  TAO_DIOP_Protocol_Properties &)
 {
 }
 
 void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  TAO_DIOP_Protocol_Properties &)
 {
 }
 
 void
-TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  TAO_SCIOP_Protocol_Properties &)
 {
 }
 
 void
-TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &
-                                                                      ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  TAO_SCIOP_Protocol_Properties &)
 {
 }
 
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
index 540ed7b70fb..b1194d46ebe 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -33,58 +33,57 @@ public:
   /// destructor
   virtual ~TAO_Default_Protocols_Hooks (void);
 
-  void init_hooks (TAO_ORB_Core *orb_core
-                   ACE_ENV_ARG_DECL);
+  void init_hooks (TAO_ORB_Core *orb_core);
 
   CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
                                               TAO_Stub *stub
-                                              ACE_ENV_ARG_DECL);
+                                             );
 
   CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
                                               CORBA::Policy *policy
-                                              ACE_ENV_ARG_DECL);
+                                             );
 
   void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   CORBA::Long get_dscp_codepoint (void);
 
   void rt_service_context (TAO_Stub *stub,
                            TAO_Service_Context &service_context,
                            CORBA::Boolean restart
-                           ACE_ENV_ARG_DECL);
+                          );
 
   void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                     CORBA::Policy *model_policy,
                                     CORBA::Short &client_priority
-                                    ACE_ENV_ARG_DECL);
+                                   );
 
   void get_selector_hook (CORBA::Policy *model_policy,
                           CORBA::Boolean
@@ -95,23 +94,18 @@ public:
                                        CORBA::Short p,
                                        CORBA::Short &min_priority,
                                        CORBA::Short &max_priority,
-                                       int &in_range);
+                                       bool &in_range);
 
-  int get_thread_CORBA_priority (CORBA::Short &
-                                 ACE_ENV_ARG_DECL);
+  int get_thread_CORBA_priority (CORBA::Short &);
 
-  int get_thread_native_priority (CORBA::Short &
-                                  ACE_ENV_ARG_DECL);
+  int get_thread_native_priority (CORBA::Short &);
 
   int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                            CORBA::Short &
-                                            ACE_ENV_ARG_DECL);
+                                            CORBA::Short &);
 
-  int set_thread_CORBA_priority (CORBA::Short
-                                 ACE_ENV_ARG_DECL);
+  int set_thread_CORBA_priority (CORBA::Short);
 
-  int set_thread_native_priority (CORBA::Short
-                                  ACE_ENV_ARG_DECL);
+  int set_thread_native_priority (CORBA::Short);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
index 180a81b60e4..66d4ecf653f 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -22,7 +22,7 @@ TAO_Stub *
 TAO_Default_Stub_Factory::create_stub (const char *repository_id,
                                        const TAO_MProfile &profiles,
                                        TAO_ORB_Core *orb_core
-                                       ACE_ENV_ARG_DECL)
+                                       )
 {
   TAO_Stub *retval = 0;
 
@@ -30,7 +30,6 @@ TAO_Default_Stub_Factory::create_stub (const char *repository_id,
                     TAO_Stub (repository_id, profiles, orb_core),
                     CORBA::NO_MEMORY (0,
                                       CORBA::COMPLETED_MAYBE));
-  ACE_CHECK_RETURN (retval);
 
   return retval;
 }
diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h
index e0a4c60c5ec..710f5c41c8b 100644
--- a/TAO/tao/Default_Stub_Factory.h
+++ b/TAO/tao/Default_Stub_Factory.h
@@ -51,7 +51,7 @@ public:
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
                                  TAO_ORB_Core *orb_core
-                                 ACE_ENV_ARG_DECL);
+                                );
 
 };
 
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index 4c6f322ec02..f3e03b9f15f 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -3,7 +3,6 @@
 #include "tao/Default_Thread_Lane_Resources_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Exception.h"
-#include "tao/Environment.h"
 #include "tao/ORB_Core.h"
 #include "ace/Log_Msg.h"
 
@@ -28,7 +27,7 @@ TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Ma
 }
 
 int
-TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (void)
 {
   TAO_ORB_Parameters * const params =
     this->orb_core_->orb_params ();
@@ -43,8 +42,7 @@ TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGL
   int const result =
     this->lane_resources_->open_acceptor_registry (endpoint_set,
                                                    ignore_address
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                  );
 
   return result;
 }
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
index 89f94829417..cbeb44fd9df 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -48,7 +48,7 @@ public:
   void finalize (void);
 
   /// Open default resources.
-  int open_default_resources (ACE_ENV_SINGLE_ARG_DECL);
+  int open_default_resources (void);
 
   /// Shutdown reactor.
   void shutdown_reactor (void);
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index cb4c792f819..d86e97751cf 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -301,13 +301,12 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Stra
 TAO::Collocation_Strategy
 POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
-    TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+    TAO_ORB_Core::collocation_strategy (obj);
 
   return strategy;
 }
@@ -321,7 +320,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
     const char * op,
     size_t op_len,
     TAO::Collocation_Strategy strategy
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
@@ -334,7 +333,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
     op,
     op_len,
     strategy
-    ACE_ENV_ARG_PARAMETER);
+   );
 }
 
 //
@@ -383,7 +382,7 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
     int
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -394,9 +393,8 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
       (servant)
     ->get_domain_policy (
           ((TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val *) args[1])->arg ()
-          ACE_ENV_ARG_PARAMETER
+
         );
-  ACE_CHECK;
 }
 
 
@@ -443,7 +441,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< CORBA::Policy> (
@@ -460,7 +458,7 @@ namespace POA_CORBA
       retval =
         this->servant_->get_domain_policy (
           arg_1
-          ACE_ENV_ARG_PARAMETER);
+         );
 
     }
 
@@ -480,7 +478,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -519,8 +517,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
@@ -548,7 +545,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -565,7 +562,7 @@ namespace POA_CORBA
       retval =
         this->servant_-> _is_a (
           arg_1
-          ACE_ENV_ARG_PARAMETER);
+         );
 
     }
 
@@ -580,7 +577,7 @@ void POA_CORBA::DomainManager::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -619,8 +616,7 @@ void POA_CORBA::DomainManager::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
@@ -645,7 +641,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -655,7 +651,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+          );
 
     }
 
@@ -670,7 +666,7 @@ void POA_CORBA::DomainManager::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -707,8 +703,7 @@ void POA_CORBA::DomainManager::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
@@ -723,7 +718,7 @@ void POA_CORBA::DomainManager::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -733,15 +728,13 @@ void POA_CORBA::DomainManager::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
   CORBA::InterfaceDef_ptr _tao_retval =
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    impl->_get_interface ();
 
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
@@ -756,7 +749,7 @@ void POA_CORBA::DomainManager::_interface_skel (
 
   if (_tao_result == 0)
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }
 
@@ -781,7 +774,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
@@ -791,7 +784,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+          );
 
     }
 
@@ -806,7 +799,7 @@ void POA_CORBA::DomainManager::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -843,14 +836,13 @@ void POA_CORBA::DomainManager::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
 CORBA::Boolean POA_CORBA::DomainManager::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return
@@ -877,23 +869,22 @@ const char* POA_CORBA::DomainManager::_interface_repository_id (void) const
 void POA_CORBA::DomainManager::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
+
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     ACE_ENV_ARG_PARAMETER);
+                                    );
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:891
 
 CORBA::DomainManager *
-POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::DomainManager::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub ();
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
@@ -1062,13 +1053,12 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionP
 TAO::Collocation_Strategy
 POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
-    TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+    TAO_ORB_Core::collocation_strategy (obj);
 
   return strategy;
 }
@@ -1082,7 +1072,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
     const char * op,
     size_t op_len,
     TAO::Collocation_Strategy strategy
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
@@ -1095,7 +1085,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
     op,
     op_len,
     strategy
-    ACE_ENV_ARG_PARAMETER);
+   );
 }
 
 //
@@ -1144,7 +1134,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
     int
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1155,9 +1145,8 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
   ->make_domain_manager (
         ((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[1])->arg (),
         ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
-        ACE_ENV_ARG_PARAMETER
+
       );
-  ACE_CHECK;
 }
 
 
@@ -1205,7 +1194,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< CORBA::InterfaceDef> (
@@ -1222,7 +1211,7 @@ namespace POA_CORBA
       this->servant_->make_domain_manager (
         arg_1
         , arg_2
-        ACE_ENV_ARG_PARAMETER);
+       );
 
     }
 
@@ -1242,7 +1231,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -1283,8 +1272,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
@@ -1312,7 +1300,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -1329,7 +1317,7 @@ namespace POA_CORBA
       retval =
         this->servant_-> _is_a (
           arg_1
-          ACE_ENV_ARG_PARAMETER);
+         );
 
     }
 
@@ -1344,7 +1332,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -1383,8 +1371,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
@@ -1409,7 +1396,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -1419,7 +1406,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+          );
 
     }
 
@@ -1434,7 +1421,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -1471,8 +1458,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
@@ -1487,7 +1473,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -1497,15 +1483,14 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
+                                    CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
   CORBA::InterfaceDef_ptr _tao_retval =
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    impl->_get_interface ();
 
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
@@ -1520,7 +1505,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
 
   if (_tao_result == 0)
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }
 
@@ -1545,7 +1530,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
@@ -1555,7 +1540,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+          );
 
     }
 
@@ -1570,7 +1555,7 @@ void POA_CORBA::ConstructionPolicy::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -1607,14 +1592,13 @@ void POA_CORBA::ConstructionPolicy::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
 CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return
@@ -1645,23 +1629,22 @@ const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const
 void POA_CORBA::ConstructionPolicy::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
+
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     ACE_ENV_ARG_PARAMETER);
+                                    );
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:891
 
 CORBA::ConstructionPolicy *
-POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ConstructionPolicy::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub ();
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index 0983a05f4fd..f8810004498 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -68,118 +68,110 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
-  
+
   class _TAO_DomainManager_Direct_Proxy_Impl;
   class _TAO_DomainManager_Strategized_Proxy_Broker;
-  
+
   class TAO_Domain_Export DomainManager
     : public virtual PortableServer::ServantBase
   {
   protected:
     DomainManager (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::DomainManager _stub_type;
     typedef ::CORBA::DomainManager_ptr _stub_ptr_type;
     typedef ::CORBA::DomainManager_var _stub_var_type;
-    
+
     DomainManager (const DomainManager& rhs);
     virtual ~DomainManager (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::DomainManager *_this (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void get_domain_policy_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
       );
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_DomainManager_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_DomainManager_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -189,196 +181,195 @@ namespace POA_CORBA
         const char * op,
         size_t op_len,
         TAO::Collocation_Strategy strategy
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-    
+
     static _TAO_DomainManager_Strategized_Proxy_Broker *
     the_TAO_DomainManager_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from 
+
+
+
+  // TAO_IDL - Generated from
   // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
+
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-  
+
   class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl
   {
   public:
     _TAO_DomainManager_Direct_Proxy_Impl (void);
-    
+
     virtual ~_TAO_DomainManager_Direct_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     get_domain_policy (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
   };
-  
+
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
-  
+
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class ConstructionPolicy;
   typedef ConstructionPolicy *ConstructionPolicy_ptr;
-  
+
   class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
   class _TAO_ConstructionPolicy_Strategized_Proxy_Broker;
-  
+
   class TAO_Domain_Export ConstructionPolicy
     : public virtual POA_CORBA::Policy
   {
   protected:
     ConstructionPolicy (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::ConstructionPolicy _stub_type;
     typedef ::CORBA::ConstructionPolicy_ptr _stub_ptr_type;
     typedef ::CORBA::ConstructionPolicy_var _stub_var_type;
-    
+
     ConstructionPolicy (const ConstructionPolicy& rhs);
     virtual ~ConstructionPolicy (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
+
       );
-    
+
     ::CORBA::ConstructionPolicy *_this (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void make_domain_manager (
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void make_domain_manager_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
-    
+
     static void
     _get_policy_type_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:1859
-    
+
     static void
     copy_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:1859
-    
+
     static void
     destroy_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -388,99 +379,99 @@ namespace POA_CORBA
         const char * op,
         size_t op_len,
         TAO::Collocation_Strategy strategy
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-    
+
     static _TAO_ConstructionPolicy_Strategized_Proxy_Broker *
     the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from 
+
+
+
+  // TAO_IDL - Generated from
   // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
+
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
-  
+
   class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
   {
   public:
     _TAO_ConstructionPolicy_Direct_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ConstructionPolicy_Direct_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     make_domain_manager (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));static void
     _get_policy_type (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2050
-    
+
     static void
     copy (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2050
-    
+
     static void
     destroy (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
   };
-  
+
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:995
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl
index 5e1b77f1084..ac024975dee 100644
--- a/TAO/tao/Domain/DomainS.inl
+++ b/TAO/tao/Domain/DomainS.inl
@@ -33,7 +33,7 @@ POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
   POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
@@ -41,7 +41,7 @@ POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
+
     );
 }
 
@@ -54,7 +54,7 @@ POA_CORBA::ConstructionPolicy::copy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
   POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
@@ -62,7 +62,7 @@ POA_CORBA::ConstructionPolicy::copy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
+
     );
 }
 
@@ -75,7 +75,7 @@ POA_CORBA::ConstructionPolicy::destroy_skel (
     TAO_ServerRequest & server_request,
     void * servant_upcall,
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
   POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
@@ -83,7 +83,7 @@ POA_CORBA::ConstructionPolicy::destroy_skel (
       server_request,
       servant_upcall,
       impl
-      ACE_ENV_ARG_PARAMETER
+
     );
 }
 
@@ -95,7 +95,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
     int num_args
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -105,7 +105,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type (
       servant,
       args,
       num_args
-      ACE_ENV_ARG_PARAMETER
+
     );
 }
 
@@ -118,7 +118,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
     int num_args
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -128,7 +128,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy (
       servant,
       args,
       num_args
-      ACE_ENV_ARG_PARAMETER
+
     );
 }
 
@@ -141,7 +141,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument ** args,
     int num_args
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -151,7 +151,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
       servant,
       args,
       num_args
-      ACE_ENV_ARG_PARAMETER
+
     );
 }
 
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index 253698af938..02cdc148bbf 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -40,15 +40,15 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_sth.cpp:116
 
 namespace POA_CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/tie_sh.cpp:87
-  
+
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  DomainManager_tie : public DomainManager
@@ -68,7 +68,7 @@ namespace POA_CORBA
     // ctor with T*, ownership flag and a POA
     ~DomainManager_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -80,36 +80,36 @@ namespace POA_CORBA
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
-    
+
     ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
   private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     DomainManager_tie (const DomainManager_tie &);
     void operator= (const DomainManager_tie &);
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/tie_sh.cpp:87
-  
+
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  ConstructionPolicy_tie : public ConstructionPolicy
@@ -129,7 +129,7 @@ namespace POA_CORBA
     // ctor with T*, ownership flag and a POA
     ~ConstructionPolicy_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -141,66 +141,66 @@ namespace POA_CORBA
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
-    
+
     CORBA::PolicyType policy_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
-    
+
     ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
-    
+
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
-    
+
     void make_domain_manager (
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
   private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ConstructionPolicy_tie (const ConstructionPolicy_tie &);
     void operator= (const ConstructionPolicy_tie &);
   };
 } // module CORBA
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:1096
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl
index 2287aa6ba7e..937efa3ed1a 100644
--- a/TAO/tao/Domain/DomainS_T.inl
+++ b/TAO/tao/Domain/DomainS_T.inl
@@ -81,7 +81,7 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -93,7 +93,7 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -111,23 +111,23 @@ POA_CORBA::DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::DomainManager_tie<T>::_default_POA (void)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->DomainManager::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->DomainManager::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy  (
     ::CORBA::PolicyType policy_type
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -135,7 +135,7 @@ template <class T> ACE_INLINE
 {
   return this->ptr_->get_domain_policy (
     policy_type
-    ACE_ENV_ARG_PARAMETER
+
   );
 }
 
@@ -192,7 +192,7 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -204,7 +204,7 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean relea
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -222,72 +222,72 @@ POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (void)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->ConstructionPolicy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->ConstructionPolicy::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type  (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->policy_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
+
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::ConstructionPolicy_tie<T>::copy  (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->copy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
+
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstructionPolicy_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
+
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
     ::CORBA::InterfaceDef_ptr object_type,
     ::CORBA::Boolean constr_policy
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -296,7 +296,7 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
   this->ptr_->make_domain_manager (
     object_type,
     constr_policy
-    ACE_ENV_ARG_PARAMETER
+
   );
 }
 
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index cd48cc1d9f4..c9c216b82fa 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -175,7 +175,7 @@ TAO::Collocation_Proxy_Broker *
 
 ::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy (
     ::CORBA::PolicyType policy_type
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -209,8 +209,7 @@ TAO::Collocation_Proxy_Broker *
       this->the_TAO_DomainManager_Proxy_Broker_
     );
 
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
+  _tao_call.invoke (0, 0);
 
   return _tao_retval.retn ();
 }
@@ -245,7 +244,7 @@ CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 CORBA::DomainManager_ptr
 CORBA::DomainManager::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
+
   )
 {
   return
@@ -253,14 +252,14 @@ CORBA::DomainManager::_narrow (
         _tao_objref,
         "IDL:omg.org/CORBA/DomainManager:1.0",
         CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
+
       );
 }
 
 CORBA::DomainManager_ptr
 CORBA::DomainManager::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
+
   )
 {
   return
@@ -268,7 +267,7 @@ CORBA::DomainManager::_unchecked_narrow (
         _tao_objref,
         "IDL:omg.org/CORBA/DomainManager:1.0",
         CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
+
       );
 }
 
@@ -292,7 +291,7 @@ CORBA::DomainManager::_tao_release (DomainManager_ptr obj)
 CORBA::Boolean
 CORBA::DomainManager::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL
+
   )
 {
   if (
@@ -312,7 +311,7 @@ CORBA::DomainManager::_is_a (
     {
       return this->::CORBA::Object::_is_a (
           value
-          ACE_ENV_ARG_PARAMETER
+
         );
     }
 }
@@ -376,7 +375,7 @@ TAO::Collocation_Proxy_Broker *
 void CORBA::ConstructionPolicy::make_domain_manager (
     ::CORBA::InterfaceDef_ptr object_type,
     ::CORBA::Boolean constr_policy
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -412,8 +411,7 @@ void CORBA::ConstructionPolicy::make_domain_manager (
       this->the_TAO_ConstructionPolicy_Proxy_Broker_
     );
 
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  _tao_call.invoke (0, 0);
 }
 
 CORBA::ConstructionPolicy::ConstructionPolicy (void)
@@ -448,7 +446,7 @@ CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 CORBA::ConstructionPolicy_ptr
 CORBA::ConstructionPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
+
   )
 {
   return
@@ -456,14 +454,14 @@ CORBA::ConstructionPolicy::_narrow (
         _tao_objref,
         "IDL:omg.org/CORBA/ConstructionPolicy:1.0",
         CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
+
       );
 }
 
 CORBA::ConstructionPolicy_ptr
 CORBA::ConstructionPolicy::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
+
   )
 {
   return
@@ -471,7 +469,7 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
         _tao_objref,
         "IDL:omg.org/CORBA/ConstructionPolicy:1.0",
         CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
+
       );
 }
 
@@ -495,7 +493,7 @@ CORBA::ConstructionPolicy::_tao_release (ConstructionPolicy_ptr obj)
 CORBA::Boolean
 CORBA::ConstructionPolicy::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL
+
   )
 {
   if (
@@ -519,7 +517,7 @@ CORBA::ConstructionPolicy::_is_a (
     {
       return this->::CORBA::Object::_is_a (
           value
-          ACE_ENV_ARG_PARAMETER
+
         );
     }
 }
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 95d26092808..d2545586694 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -43,7 +43,6 @@
 #include /**/ "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
-#include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
@@ -127,12 +126,10 @@ namespace CORBA
 
     static DomainManager_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static DomainManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static DomainManager_ptr _nil (void)
@@ -147,7 +144,6 @@ namespace CORBA
 
     virtual ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -158,7 +154,7 @@ namespace CORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -248,12 +244,12 @@ namespace CORBA
 
     static ConstructionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ConstructionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ConstructionPolicy_ptr _nil (void)
@@ -269,7 +265,7 @@ namespace CORBA
     virtual void make_domain_manager (
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -280,7 +276,7 @@ namespace CORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index f9003b54193..71ac22beb08 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -37,7 +37,7 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::create_dyn_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL
+
     )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -53,7 +53,7 @@ TAO_DynAnyFactory::create_dyn_any (
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::create_dyn_any_from_type_code (
       CORBA::TypeCode_ptr type
-      ACE_ENV_ARG_DECL
+
     )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -71,7 +71,7 @@ TAO_DynAnyFactory::create_dyn_any_from_type_code (
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::create_dyn_any_without_truncation (
     const CORBA::Any & /* value */
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -87,7 +87,7 @@ DynamicAny::DynAnySeq *
 TAO_DynAnyFactory::create_multiple_dyn_anys (
     const DynamicAny::AnySeq & /* values */,
     ::CORBA::Boolean /* allow_truncate */
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -101,7 +101,7 @@ TAO_DynAnyFactory::create_multiple_dyn_anys (
 DynamicAny::AnySeq *
 TAO_DynAnyFactory::create_multiple_anys (
     const DynamicAny::DynAnySeq & /* values */
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -109,25 +109,22 @@ TAO_DynAnyFactory::create_multiple_anys (
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
-      
+
 // Utility function called by all the DynAny classes
 // to extract the TCKind of possibly aliased types.
 CORBA::TCKind
 TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc
-                            ACE_ENV_ARG_DECL)
+                            )
 {
-  CORBA::TCKind tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+  CORBA::TCKind tck = tc->kind ();
 
   while (tck == CORBA::tk_alias)
     {
       CORBA::TypeCode_var temp =
-        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::tk_null);
+        tc->content_type ();
 
       tck = TAO_DynAnyFactory::unalias (temp.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::tk_null);
+                                       );
     }
 
   return tck;
@@ -136,19 +133,16 @@ TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc
 // Same as above, but returns the type code.
 CORBA::TypeCode_ptr
 TAO_DynAnyFactory::strip_alias (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL)
+                                )
 {
   CORBA::TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
-  CORBA::TCKind tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::TCKind tck = retval->kind ();
 
   while (tck == CORBA::tk_alias)
     {
-      retval = retval->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      retval = retval->content_type ();
 
-      tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      tck = retval->kind ();
     }
 
   return retval._retn ();
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 69fc9a1b05d..e480a94162a 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -49,8 +49,7 @@ public:
   // = The DynamicAnyFactory methods.
   virtual DynamicAny::DynAny_ptr create_dyn_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAnyFactory::InconsistentTypeCode
@@ -58,7 +57,7 @@ public:
 
   virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
       CORBA::TypeCode_ptr type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -67,43 +66,43 @@ public:
 
   virtual DynamicAny::DynAny_ptr create_dyn_any_without_truncation (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAnyFactory::InconsistentTypeCode,
         DynamicAny::MustTruncate
       ));
-  
+
   virtual DynamicAny::DynAnySeq * create_multiple_dyn_anys (
       const DynamicAny::AnySeq & values,
       ::CORBA::Boolean allow_truncate
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAnyFactory::InconsistentTypeCode,
         DynamicAny::MustTruncate
       ));
-  
+
   virtual DynamicAny::AnySeq * create_multiple_anys (
       const DynamicAny::DynAnySeq & values
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-      
+
   /// TAO-specific methods.
-    
+
   /// Obtain the kind of object, after all aliasing has been removed.
   static CORBA::TCKind unalias (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL);
+                               );
 
   /// Same as above, but returns type code instead of TCKind. Caller
   /// must release the return value.
   static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc
-                                          ACE_ENV_ARG_DECL);
+                                         );
 
 private:
   // Not allowed.
diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp
index df513ce1f13..f11b5b34b49 100644
--- a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp
+++ b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp
@@ -42,7 +42,7 @@ namespace TAO
   {
     if (the_dynany->destroyed ())
       {
-        ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+        throw ::CORBA::OBJECT_NOT_EXIST ();
       }
 
     if (the_dynany->has_components ())
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index f37152f87ed..88b8d3a65a9 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -27,12 +27,11 @@ TAO_DynAny_i::~TAO_DynAny_i (void)
 }
 
 void
-TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc
-                              ACE_ENV_ARG_DECL)
+TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc)
 {
   // Check to see if it's a simple type.
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc);
+
   switch (tk)
   {
     case CORBA::tk_null:
@@ -74,16 +73,15 @@ TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc
           break;
         }
     default:
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+      throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
   }
 }
 
 void
-TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
-                                    ACE_ENV_ARG_DECL)
+TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc)
 {
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc);
+
   switch (tk)
   {
     case CORBA::tk_null:
@@ -174,16 +172,11 @@ TAO_DynAny_i::init_common (void)
 }
 
 void
-TAO_DynAny_i::init (CORBA::TypeCode_ptr tc
-                    ACE_ENV_ARG_DECL)
+TAO_DynAny_i::init (CORBA::TypeCode_ptr tc)
 {
-  this->check_typecode (tc
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_typecode (tc);
 
-  this->set_to_default_value (tc
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->set_to_default_value (tc);
 
   this->init_common ();
 
@@ -191,13 +184,10 @@ TAO_DynAny_i::init (CORBA::TypeCode_ptr tc
 }
 
 void
-TAO_DynAny_i::init (const CORBA::Any& any
-                    ACE_ENV_ARG_DECL)
+TAO_DynAny_i::init (const CORBA::Any& any)
 {
   this->type_ = any.type ();
-  this->check_typecode (this->type_.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_typecode (this->type_.in ());
 
   this->init_common ();
 
@@ -207,8 +197,7 @@ TAO_DynAny_i::init (const CORBA::Any& any
 // ****************************************************************
 
 TAO_DynAny_i *
-TAO_DynAny_i::_narrow (CORBA::Object_ptr _tao_objref
-                       ACE_ENV_ARG_DECL_NOT_USED)
+TAO_DynAny_i::_narrow (CORBA::Object_ptr _tao_objref)
 {
   if (CORBA::is_nil (_tao_objref))
     {
@@ -221,8 +210,7 @@ TAO_DynAny_i::_narrow (CORBA::Object_ptr _tao_objref
 // ****************************************************************
 
 void
-TAO_DynAny_i::from_any (const CORBA::Any &any
-                        ACE_ENV_ARG_DECL)
+TAO_DynAny_i::from_any (const CORBA::Any &any)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -231,19 +219,18 @@ TAO_DynAny_i::from_any (const CORBA::Any &any
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var any_tc = any.type ();
 
   CORBA::Boolean equiv =
     this->type_->equivalent (any_tc.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            );
 
   if (!equiv)
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 
 // @@@ (JP) Spec also says we should check for illegal Any
@@ -254,10 +241,8 @@ TAO_DynAny_i::from_any (const CORBA::Any &any
 }
 
 CORBA::Any_ptr
-TAO_DynAny_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
+TAO_DynAny_i::to_any (void)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->destroyed_)
     {
@@ -270,17 +255,13 @@ TAO_DynAny_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     CORBA::Any (this->any_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return retval;
 }
 
 CORBA::Boolean
-TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
-                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
+TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->destroyed_)
     {
@@ -288,33 +269,27 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
                         0);
     }
 
-  TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs);
 
   if (rhs_n == 0)
     {
-      return 0;
+      return false;
     }
 
-  CORBA::Boolean equiv = this->type_->equivalent (rhs_n->type_.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Boolean const equiv = this->type_->equivalent (rhs_n->type_.in ());
 
   if (!equiv)
     {
-      return 0;
+      return false;
     }
 
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (this->type_.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (this->type_.in ());
 
   switch (tk)
     {
     case CORBA::tk_null:
     case CORBA::tk_void:
-      return 1;
+      return true;
     case CORBA::tk_short:
       {
         CORBA::Short rhs_v;
@@ -428,15 +403,11 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
             lhs_v->_tao_get_typecode (),
             *lhs_v);
 
-        CORBA::Boolean b = rhs_dyn->equal (lhs_dyn.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+        CORBA::Boolean const b = rhs_dyn->equal (lhs_dyn.in ());
 
-        rhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+        rhs_dyn->destroy ();
 
-        lhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+        lhs_dyn->destroy ();
 
         return b;
       }
@@ -448,7 +419,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
         this->any_ >>= lhs_v;
         // See CORBA 2.4.2 - must use equal() here.
         return lhs_v->equal (lhs_v
-                             ACE_ENV_ARG_PARAMETER);
+                            );
       }
     case CORBA::tk_objref:
       {
@@ -457,18 +428,15 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
         CORBA::Object_ptr lhs_v;
         this->any_ >>= CORBA::Any::to_object (lhs_v);
         return lhs_v->_is_equivalent (lhs_v
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
       }
     case CORBA::tk_string:
       {
         CORBA::TypeCode_var unaliased_tc =
-          TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+          TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
         CORBA::ULong bound =
-          unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+          unaliased_tc->length ();
 
         const char *rhs_v, *lhs_v;
         CORBA::Boolean rstatus, lstatus;
@@ -502,12 +470,10 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
       {
         CORBA::TypeCode_var unaliased_tc =
           TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+                                         );
 
         CORBA::ULong bound =
-          unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+          unaliased_tc->length ();
 
         const CORBA::WChar *rhs_v, *lhs_v;
         CORBA::Boolean rstatus, lstatus;
@@ -545,14 +511,14 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynAny_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynAny_i::destroy (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (!this->ref_to_component_ || this->container_is_destroying_)
@@ -563,7 +529,7 @@ TAO_DynAny_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 
 
 DynamicAny::DynAny_ptr
-TAO_DynAny_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynAny_i::current_component (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 89c96f90350..a02b03b5077 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -52,22 +52,22 @@ public:
 
   /// Initialize using just a TypeCode
   void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
+            );
 
   /// Initialize using an Any.
   void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
+            );
 
   // = LocalObject methods.
   static TAO_DynAny_i *_narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -76,7 +76,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -84,21 +84,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -108,11 +108,11 @@ public:
 private:
   /// Check if the typecode is acceptable.
   void check_typecode (CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL);
+                      );
 
   /// Used when we are created from a typecode.
   void set_to_default_value (CORBA::TypeCode_ptr tc
-                             ACE_ENV_ARG_DECL);
+                            );
 
   /// Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index e4883a8443f..1a286428a50 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -37,24 +37,22 @@ TAO_DynArray_i::init_common (void)
 
 void
 TAO_DynArray_i::init (const CORBA::Any & any
-                      ACE_ENV_ARG_DECL)
+                      )
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  );
 
   if (kind != CORBA::tk_array)
     {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+      throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
     }
 
   this->type_ = tc;
 
   CORBA::ULong numfields = this->get_tc_length (tc.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               );
   // Resize the array.
   this->da_members_.size (numfields);
 
@@ -80,8 +78,7 @@ TAO_DynArray_i::init (const CORBA::Any & any
     }
 
   CORBA::TypeCode_var field_tc =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_element_type ();
 
   for (CORBA::ULong i = 0; i < numfields; ++i)
     {
@@ -103,29 +100,26 @@ TAO_DynArray_i::init (const CORBA::Any & any
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                &cdr
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              );
     }
 }
 
 void
 TAO_DynArray_i::init (CORBA::TypeCode_ptr tc
-                      ACE_ENV_ARG_DECL)
+                      )
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  );
 
   if (kind != CORBA::tk_array)
     {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+      throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
     }
 
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 
   CORBA::ULong numfields = this->get_tc_length (tc
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               );
 
   // Resize the array.
   this->da_members_.size (numfields);
@@ -133,8 +127,7 @@ TAO_DynArray_i::init (CORBA::TypeCode_ptr tc
   this->init_common ();
 
   CORBA::TypeCode_var elemtype =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_element_type ();
 
   for (CORBA::ULong i = 0; i < numfields; ++i)
     {
@@ -147,29 +140,25 @@ TAO_DynArray_i::init (CORBA::TypeCode_ptr tc
 }
 
 CORBA::TypeCode_ptr
-TAO_DynArray_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::get_element_type (void)
 {
   CORBA::TypeCode_var element_type =
     CORBA::TypeCode::_duplicate (this->type_.in ());
 
   // Strip away aliases (if any) on top of the outer type
-  CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::TCKind kind = element_type->kind ();
 
   while (kind != CORBA::tk_array)
     {
       element_type =
-        element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+        element_type->content_type ();
 
-      kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      kind = element_type->kind ();
     }
 
   // Return the content type.
   CORBA::TypeCode_ptr retval =
-    element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+    element_type->content_type ();
 
   return retval;
 }
@@ -177,22 +166,18 @@ TAO_DynArray_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
 // Get the length from the (possibly aliased) typecode.
 CORBA::ULong
 TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc
-                               ACE_ENV_ARG_DECL)
+                               )
 {
   CORBA::TypeCode_var tctmp = CORBA::TypeCode::_duplicate (tc);
-  CORBA::TCKind kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TCKind kind = tctmp->kind ();
 
   while (kind == CORBA::tk_alias)
     {
-      tctmp = tctmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-      kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      tctmp = tctmp->content_type ();
+      kind = tctmp->kind ();
     }
 
-  CORBA::ULong retval = tctmp->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong retval = tctmp->length ();
 
   return retval;
 }
@@ -201,7 +186,7 @@ TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc
 
 TAO_DynArray_i *
 TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         )
 {
   if (CORBA::is_nil (_tao_objref))
     {
@@ -214,7 +199,7 @@ TAO_DynArray_i::_narrow (CORBA::Object_ptr _tao_objref
 // ****************************************************************
 
 DynamicAny::AnySeq *
-TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::get_elements (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -231,7 +216,6 @@ TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (elements,
                     DynamicAny::AnySeq (length),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   elements->length (length);
   DynamicAny::AnySeq_var safe_retval (elements);
@@ -241,8 +225,7 @@ TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
   // Initialize each Any.
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      tmp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      tmp = this->da_members_[i]->to_any ();
 
       safe_retval[i] = tmp.in ();
     }
@@ -252,7 +235,7 @@ TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
-                              ACE_ENV_ARG_DECL)
+                              )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -261,20 +244,19 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::ULong length = value.length ();
 
   if (length != this->da_members_.size ())
     {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   CORBA::TypeCode_var value_tc;
   CORBA::TypeCode_var element_type =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_element_type ();
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
@@ -282,13 +264,11 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
       value_tc = value[i].type ();
       CORBA::Boolean equivalent =
         value_tc->equivalent (element_type.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             );
 
       if (equivalent)
         {
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->da_members_[i]->destroy ();
 
           this->da_members_[i] =
             TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
@@ -297,13 +277,13 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
         }
       else
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
     }
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::get_elements_as_dyn_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -318,7 +298,6 @@ TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     DynamicAny::DynAnySeq (this->component_count_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->length (this->component_count_);
   DynamicAny::DynAnySeq_var safe_retval (retval);
@@ -329,12 +308,10 @@ TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
       // Set the flag so the caller can't destroy.
       this->set_flag (this->da_members_[i].in (),
                       0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                     );
 
       safe_retval[i] =
         DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
-      ACE_CHECK_RETURN (0);
     }
 
   return safe_retval._retn ();
@@ -343,7 +320,7 @@ TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_DynArray_i::set_elements_as_dyn_any (
     const DynamicAny::DynAnySeq & values
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -353,42 +330,38 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ());
 
   if (values.length () != length)
     {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   CORBA::TypeCode_var element_type =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_element_type ();
 
   CORBA::TypeCode_var val_type;
   CORBA::Boolean equivalent;
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      val_type = values[i]->type ();
 
       equivalent = val_type->equivalent (element_type.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                        );
 
-      ACE_CHECK;
 
       if (equivalent)
         {
           this->da_members_[i] =
-            values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+            values[i]->copy ();
         }
       else
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
     }
 }
@@ -397,7 +370,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 
 void
 TAO_DynArray_i::from_any (const CORBA::Any& any
-                          ACE_ENV_ARG_DECL)
+                          )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -406,14 +379,13 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 
   if (equivalent)
     {
@@ -438,17 +410,15 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
 
       CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ());
       CORBA::ULong arg_length = this->get_tc_length (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                    );
 
       if (length != arg_length)
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       CORBA::TypeCode_var field_tc =
-        this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->get_element_type ();
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
@@ -460,8 +430,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
                                           unk_in));
           field_any.replace (field_unk);
 
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->da_members_[i]->destroy ();
 
           this->da_members_[i] =
             TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
@@ -471,20 +440,19 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                    &cdr
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                                  );
         }
 
       this->current_position_ = arg_length ? 0 : -1;
     }
   else
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 }
 
 CORBA::Any_ptr
-TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::to_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -496,8 +464,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::TypeCode_var field_tc =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_element_type ();
 
   TAO_OutputCDR out_cdr;
   CORBA::Any_var field_any;
@@ -507,8 +474,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
     {
       // Recursive step.
       field_any =
-        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->da_members_[i]->to_any ();
 
       TAO::Any_Impl *field_impl = field_any->impl ();
       TAO_OutputCDR field_out;
@@ -531,8 +497,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
                                                  &out_cdr
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                );
     }
 
   TAO_InputCDR in_cdr (out_cdr);
@@ -541,14 +506,12 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     CORBA::Any,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   TAO::Unknown_IDL_Type *unk = 0;
   ACE_NEW_THROW_EX (unk,
                     TAO::Unknown_IDL_Type (this->type_.in (),
                                            in_cdr),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->replace (unk);
   return retval;
@@ -556,7 +519,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
-                       ACE_ENV_ARG_DECL)
+                       )
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -567,12 +530,10 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
                         0);
     }
 
-  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_var tc = rhs->type ();
 
   CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                             );
 
   if (!equivalent)
     {
@@ -585,16 +546,13 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       rhs->seek (static_cast<CORBA::Long> (i)
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                );
 
-      tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      tmp = rhs->current_component ();
 
       // Recursive step.
       member_equal = tmp->equal (this->da_members_[i].in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                );
 
       if (!member_equal)
         {
@@ -606,14 +564,14 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynArray_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::destroy (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (!this->ref_to_component_ || this->container_is_destroying_)
@@ -623,11 +581,9 @@ TAO_DynArray_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
         {
           this->set_flag (da_members_[i].in (),
                           1
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                         );
 
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->da_members_[i]->destroy ();
         }
 
       this->destroyed_ = 1;
@@ -635,7 +591,7 @@ TAO_DynArray_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::current_component (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -656,8 +612,7 @@ TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
 
   this->set_flag (this->da_members_[index].in (),
                   0
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+                 );
 
   return DynamicAny::DynAny::_duplicate (
             this->da_members_[index].in ()
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index 8e28d989cae..17742413936 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -53,21 +53,21 @@ public:
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
+            );
 
   /// Initialize using an Any.
   void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
+            );
 
   // = LocalObject methods
   static TAO_DynArray_i *_narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   // = Functions specific to DynArray.
 
   virtual DynamicAny::AnySeq * get_elements (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -75,7 +75,7 @@ public:
 
   virtual void set_elements (
       const DynamicAny::AnySeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -84,7 +84,7 @@ public:
       ));
 
   virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -92,7 +92,7 @@ public:
 
   virtual void set_elements_as_dyn_any (
       const DynamicAny::DynAnySeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -104,7 +104,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -113,7 +113,7 @@ public:
     ));
 
   virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -121,21 +121,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -144,11 +144,11 @@ public:
 
 private:
   /// Returns the type of elements contained in the array.
-  CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::TypeCode_ptr get_element_type (void);
 
   /// Gets the length of the array from the typecode.
   CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              );
 
   /// Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 9f4cb8055bf..5eb152bd428 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -34,7 +34,7 @@ TAO_DynCommon::~TAO_DynCommon (void)
 }
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::type (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -50,7 +50,7 @@ TAO_DynCommon::type (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
-                       ACE_ENV_ARG_DECL)
+                       )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -58,35 +58,31 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
-  CORBA::TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var tc = dyn_any->type ();
 
   CORBA::Boolean const equivalent =
     this->type_.in ()->equivalent (tc.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 
   if (equivalent)
     {
-      CORBA::Any_var any = dyn_any->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var any = dyn_any->to_any ();
 
       this->from_any (any.in ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                     );
     }
   else
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 }
 
 void
 TAO_DynCommon::insert_boolean (CORBA::Boolean value
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -99,7 +95,7 @@ TAO_DynCommon::insert_boolean (CORBA::Boolean value
 
 void
 TAO_DynCommon::insert_octet (CORBA::Octet value
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -112,7 +108,7 @@ TAO_DynCommon::insert_octet (CORBA::Octet value
 
 void
 TAO_DynCommon::insert_char (CORBA::Char value
-                            ACE_ENV_ARG_DECL)
+                            )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -125,7 +121,7 @@ TAO_DynCommon::insert_char (CORBA::Char value
 
 void
 TAO_DynCommon::insert_short (CORBA::Short value
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -138,7 +134,7 @@ TAO_DynCommon::insert_short (CORBA::Short value
 
 void
 TAO_DynCommon::insert_ushort (CORBA::UShort value
-                              ACE_ENV_ARG_DECL)
+                              )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -151,7 +147,7 @@ TAO_DynCommon::insert_ushort (CORBA::UShort value
 
 void
 TAO_DynCommon::insert_long (CORBA::Long value
-                            ACE_ENV_ARG_DECL)
+                            )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -164,7 +160,7 @@ TAO_DynCommon::insert_long (CORBA::Long value
 
 void
 TAO_DynCommon::insert_ulong (CORBA::ULong value
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -177,7 +173,7 @@ TAO_DynCommon::insert_ulong (CORBA::ULong value
 
 void
 TAO_DynCommon::insert_float (CORBA::Float value
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -190,7 +186,7 @@ TAO_DynCommon::insert_float (CORBA::Float value
 
 void
 TAO_DynCommon::insert_double (CORBA::Double value
-                              ACE_ENV_ARG_DECL)
+                              )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -203,7 +199,7 @@ TAO_DynCommon::insert_double (CORBA::Double value
 
 void
 TAO_DynCommon::insert_string (const char * value
-                              ACE_ENV_ARG_DECL)
+                              )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -212,42 +208,37 @@ TAO_DynCommon::insert_string (const char * value
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->check_component ();
 
       cc->insert_string (value
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                        );
     }
   else
     {
       CORBA::TypeCode_var unaliased_tc =
         TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                       );
 
       CORBA::TCKind const kind =
-        unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        unaliased_tc->kind ();
 
       if (kind != CORBA::tk_string)
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       CORBA::ULong const bound =
-        unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        unaliased_tc->length ();
 
       if (bound > 0 && bound < ACE_OS::strlen (value))
         {
-          ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+          throw DynamicAny::DynAny::InvalidValue ();
         }
 
       this->any_ <<= CORBA::Any::from_string (const_cast<char *> (value),
@@ -257,7 +248,7 @@ TAO_DynCommon::insert_string (const char * value
 
 void
 TAO_DynCommon::insert_reference (CORBA::Object_ptr value
-                                 ACE_ENV_ARG_DECL)
+                                 )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -266,26 +257,23 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->check_component ();
 
       cc->insert_reference (value
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                           );
     }
   else
     {
       CORBA::Boolean good_type = true;
       CORBA::TCKind const kind =
         TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   );
 
       if (kind != CORBA::tk_objref)
         {
@@ -298,14 +286,12 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
           if (ACE_OS::strcmp (value_id, "IDL:omg.org/CORBA/Object:1.0") != 0)
             {
               const char *my_id =
-                this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+                this->type_->id ();
 
               if (ACE_OS::strcmp (value_id, my_id) != 0)
                 {
                   good_type = value->_is_a (my_id
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK;
+                                           );
                 }
             }
         }
@@ -325,7 +311,7 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
             {
               if (!value->marshal (cdr))
                 {
-                  ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+                  throw DynamicAny::DynAny::InvalidValue ();
                 }
             }
 
@@ -338,14 +324,14 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
         }
       else
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
     }
 }
 
 void
 TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value
-                                ACE_ENV_ARG_DECL)
+                                )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -358,7 +344,7 @@ TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value
 
 void
 TAO_DynCommon::insert_longlong (CORBA::LongLong value
-                                ACE_ENV_ARG_DECL)
+                                )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -371,7 +357,7 @@ TAO_DynCommon::insert_longlong (CORBA::LongLong value
 
 void
 TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value
-                                 ACE_ENV_ARG_DECL)
+                                 )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -384,7 +370,7 @@ TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value
 
 void
 TAO_DynCommon::insert_longdouble (CORBA::LongDouble value
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -397,7 +383,7 @@ TAO_DynCommon::insert_longdouble (CORBA::LongDouble value
 
 void
 TAO_DynCommon::insert_wchar (CORBA::WChar value
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -410,7 +396,7 @@ TAO_DynCommon::insert_wchar (CORBA::WChar value
 
 void
 TAO_DynCommon::insert_wstring (const CORBA::WChar * value
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -419,32 +405,28 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->check_component ();
 
       cc->insert_wstring (value
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                         );
     }
   else
     {
       CORBA::TypeCode_var unaliased_tc =
         this->check_type_and_unalias (CORBA::_tc_wstring
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     );
 
-      CORBA::ULong const bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::ULong const bound = unaliased_tc->length ();
 
       if (bound > 0 && bound < ACE_OS::wslen (value))
         {
-          ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+          throw DynamicAny::DynAny::InvalidValue ();
         }
 
       this->any_ <<= CORBA::Any::from_wstring (const_cast<CORBA::WChar *> (value),
@@ -454,7 +436,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value
 
 void
 TAO_DynCommon::insert_any (const CORBA::Any &value
-                           ACE_ENV_ARG_DECL)
+                           )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -469,7 +451,7 @@ TAO_DynCommon::insert_any (const CORBA::Any &value
 // have fewer Any/DynAny conversions than insert_any, not more.
 void
 TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -478,20 +460,18 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
-  CORBA::Any_var any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Any_var any = value->to_any ();
 
   this->insert_any (any.in ()
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   );
 }
 
 void
 TAO_DynCommon::insert_val (CORBA::ValueBase *value
-                           ACE_ENV_ARG_DECL)
+                           )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -500,29 +480,26 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->check_component ();
 
       cc->insert_val (value
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                     );
     }
   else
     {
       CORBA::TCKind kind =
         TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   );
 
       if (kind != CORBA::tk_value)
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
       // If the arg is 0 we can't do this kind of type checking,
@@ -532,8 +509,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value
         {
           const char *value_id = value->_tao_obv_repository_id ();
           const char *my_id =
-            this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+            this->type_->id ();
 
           // Valuetypes, unlike interfaces, don't have a virtual
           // method to check for a more derived type when the
@@ -542,7 +518,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value
           // here, so if the repo ids don't match, we're hosed.
           if (ACE_OS::strcmp (value_id, my_id) != 0)
             {
-              ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+              throw DynamicAny::DynAny::TypeMismatch ();
             }
         }
 
@@ -554,7 +530,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value
 
       if (!good_insert)
         {
-          ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+          throw DynamicAny::DynAny::InvalidValue ();
         }
 
       TAO_InputCDR in (out);
@@ -569,7 +545,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase *value
 // ****************************************************************
 
 CORBA::Boolean
-TAO_DynCommon::get_boolean (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_boolean (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -580,7 +556,7 @@ TAO_DynCommon::get_boolean (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Octet
-TAO_DynCommon::get_octet (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_octet (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -591,7 +567,7 @@ TAO_DynCommon::get_octet (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Char
-TAO_DynCommon::get_char (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_char (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -602,7 +578,7 @@ TAO_DynCommon::get_char (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Short
-TAO_DynCommon::get_short (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_short (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -613,7 +589,7 @@ TAO_DynCommon::get_short (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::UShort
-TAO_DynCommon::get_ushort (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_ushort (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -624,7 +600,7 @@ TAO_DynCommon::get_ushort (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Long
-TAO_DynCommon::get_long (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_long (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -635,7 +611,7 @@ TAO_DynCommon::get_long (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::ULong
-TAO_DynCommon::get_ulong (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_ulong (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -646,7 +622,7 @@ TAO_DynCommon::get_ulong (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Float
-TAO_DynCommon::get_float (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_float (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -657,7 +633,7 @@ TAO_DynCommon::get_float (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Double
-TAO_DynCommon::get_double (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_double (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -668,7 +644,7 @@ TAO_DynCommon::get_double (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_string (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -684,21 +660,18 @@ TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL)
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->check_component ();
 
-      return cc->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_string ();
     }
   else
     {
       CORBA::TypeCode_var unaliased_tc =
         TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                       );
 
       CORBA::TCKind kind =
-        unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        unaliased_tc->kind ();
 
       if (kind != CORBA::tk_string)
         {
@@ -709,8 +682,7 @@ TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL)
       char *retval = 0;
 
       CORBA::ULong const bound =
-        unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        unaliased_tc->length ();
 
       // We will have caught a type mismatch above, so if this fails,
       // it must be for some other reason.
@@ -725,7 +697,7 @@ TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO_DynCommon::get_reference (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_reference (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -741,10 +713,9 @@ TAO_DynCommon::get_reference (ACE_ENV_SINGLE_ARG_DECL)
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        this->check_component ();
 
-      return cc->get_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_reference ();
     }
   else
     {
@@ -761,7 +732,7 @@ TAO_DynCommon::get_reference (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::get_typecode (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_typecode (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -777,10 +748,9 @@ TAO_DynCommon::get_typecode (ACE_ENV_SINGLE_ARG_DECL)
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->check_component ();
 
-      return cc->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_typecode ();
     }
   else
     {
@@ -797,7 +767,7 @@ TAO_DynCommon::get_typecode (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::LongLong
-TAO_DynCommon::get_longlong (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_longlong (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -808,7 +778,7 @@ TAO_DynCommon::get_longlong (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::ULongLong
-TAO_DynCommon::get_ulonglong (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_ulonglong (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -819,7 +789,7 @@ TAO_DynCommon::get_ulonglong (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::LongDouble
-TAO_DynCommon::get_longdouble (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_longdouble (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -830,7 +800,7 @@ TAO_DynCommon::get_longdouble (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::WChar
-TAO_DynCommon::get_wchar (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_wchar (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -846,10 +816,9 @@ TAO_DynCommon::get_wchar (ACE_ENV_SINGLE_ARG_DECL)
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->check_component ();
 
-      return cc->get_wchar (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_wchar ();
     }
   else
     {
@@ -866,7 +835,7 @@ TAO_DynCommon::get_wchar (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::WChar *
-TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_wstring (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -882,10 +851,9 @@ TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL)
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->check_component ();
 
-      return cc->get_wstring (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_wstring ();
     }
   else
     {
@@ -894,14 +862,12 @@ TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL)
       // BadKind.
       CORBA::TypeCode_var unaliased_tc =
         this->check_type_and_unalias (CORBA::_tc_wstring
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                     );
 
       CORBA::WChar *retval = 0;
 
       CORBA::ULong bound =
-        unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        unaliased_tc->length ();
 
       (void) (this->any_ >>= CORBA::Any::to_wstring (retval,
                                                      bound));
@@ -911,7 +877,7 @@ TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any_ptr
-TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -927,10 +893,9 @@ TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL)
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->check_component ();
 
-      return cc->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_any ();
     }
   else
     {
@@ -953,7 +918,7 @@ TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL)
 // @@@ (JP) TODO - optimize - this version was intended by the OMG to
 // have fewer Any/DynAny conversions than get_any, not more.
 DynamicAny::DynAny_ptr
-TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_dyn_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -966,8 +931,7 @@ TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
                         0);
     }
 
-  CORBA::Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Any_var any = this->get_any ();
 
   return
     TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
@@ -976,7 +940,7 @@ TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::ValueBase *
-TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_val (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -991,17 +955,15 @@ TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL)
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->check_component ();
 
-      return cc->get_val (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_val ();
     }
   else
     {
       CORBA::TCKind kind =
         TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   );
 
       if (kind != CORBA::tk_value)
         {
@@ -1040,7 +1002,7 @@ TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_DynCommon::seek (CORBA::Long slot
-                     ACE_ENV_ARG_DECL)
+                     )
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1070,23 +1032,22 @@ TAO_DynCommon::seek (CORBA::Long slot
 }
 
 void
-TAO_DynCommon::rewind (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::rewind (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   (void) this->seek (0
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                    );
 }
 
 CORBA::Boolean
-TAO_DynCommon::next (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::next (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1112,7 +1073,7 @@ TAO_DynCommon::next (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::copy (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1123,8 +1084,7 @@ TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL)
                         DynamicAny::DynAny::_nil ());
     }
 
-  CORBA::Any_var any = this->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+  CORBA::Any_var any = this->to_any ();
 
   DynamicAny::DynAny_ptr retval =
     TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
@@ -1135,7 +1095,7 @@ TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::ULong
-TAO_DynCommon::component_count (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::component_count (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1153,7 +1113,7 @@ TAO_DynCommon::component_count (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
-                                ACE_ENV_ARG_DECL)
+                                )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1162,26 +1122,21 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->check_component ();
 
-      cc->insert_abstract (value
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      cc->insert_abstract (value);
     }
   else
     {
       CORBA::Boolean good_type = true;
       CORBA::TCKind kind =
-        TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        TAO_DynAnyFactory::unalias (this->type_.in ());
 
       if (kind != CORBA::tk_abstract_interface)
         {
@@ -1196,8 +1151,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
           if (cmp != 0)
             {
               const char *my_id =
-                this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+                this->type_->id ();
 
               if (ACE_OS::strcmp (value_id, my_id) != 0)
                 {
@@ -1208,8 +1162,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
                   // is no way to check for derived valuetypes w/o
                   // type knowledge at compile time.
                   good_type = value->_is_a (my_id
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_CHECK;
+                                           );
                 }
             }
         }
@@ -1222,7 +1175,7 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
           // all cases - nil, objref and valuetype - polymorphically.
           if (!(out << value))
             {
-              ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+              throw DynamicAny::DynAny::InvalidValue ();
             }
 
           TAO_InputCDR in (out);
@@ -1234,13 +1187,13 @@ TAO_DynCommon::insert_abstract (CORBA::AbstractBase_ptr value
         }
       else
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
     }
 }
 
 CORBA::AbstractBase_ptr
-TAO_DynCommon::get_abstract (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_abstract (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1256,17 +1209,15 @@ TAO_DynCommon::get_abstract (ACE_ENV_SINGLE_ARG_DECL)
   if (this->has_components_)
     {
       DynamicAny::DynAny_var cc =
-        this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::AbstractBase::_nil ());
+        this->check_component ();
 
-      return cc->get_abstract (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_abstract ();
     }
   else
     {
       CORBA::TCKind kind =
         TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   );
 
       if (kind != CORBA::tk_abstract_interface)
         {
@@ -1304,7 +1255,7 @@ TAO_DynCommon::get_abstract (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_DynCommon::insert_boolean_seq (
     const CORBA::BooleanSeq &value
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1316,9 +1267,7 @@ TAO_DynCommon::insert_boolean_seq (
 }
 
 void
-TAO_DynCommon::insert_octet_seq (
-    const CORBA::OctetSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_octet_seq (const CORBA::OctetSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1330,9 +1279,7 @@ TAO_DynCommon::insert_octet_seq (
 }
 
 void
-TAO_DynCommon::insert_char_seq (
-    const CORBA::CharSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_char_seq (const CORBA::CharSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1344,9 +1291,7 @@ TAO_DynCommon::insert_char_seq (
 }
 
 void
-TAO_DynCommon::insert_short_seq (
-    const CORBA::ShortSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_short_seq (const CORBA::ShortSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1358,9 +1303,7 @@ TAO_DynCommon::insert_short_seq (
 }
 
 void
-TAO_DynCommon::insert_ushort_seq (
-    const CORBA::UShortSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_ushort_seq (const CORBA::UShortSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1372,9 +1315,7 @@ TAO_DynCommon::insert_ushort_seq (
 }
 
 void
-TAO_DynCommon::insert_long_seq (
-    const CORBA::LongSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_long_seq (const CORBA::LongSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1386,9 +1327,7 @@ TAO_DynCommon::insert_long_seq (
 }
 
 void
-TAO_DynCommon::insert_ulong_seq (
-    const CORBA::ULongSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_ulong_seq (const CORBA::ULongSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1400,9 +1339,7 @@ TAO_DynCommon::insert_ulong_seq (
 }
 
 void
-TAO_DynCommon::insert_float_seq (
-    const CORBA::FloatSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_float_seq (const CORBA::FloatSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1414,9 +1351,7 @@ TAO_DynCommon::insert_float_seq (
 }
 
 void
-TAO_DynCommon::insert_double_seq (
-    const CORBA::DoubleSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_double_seq (const CORBA::DoubleSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1428,9 +1363,7 @@ TAO_DynCommon::insert_double_seq (
 }
 
 void
-TAO_DynCommon::insert_longlong_seq (
-    const CORBA::LongLongSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_longlong_seq (const CORBA::LongLongSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1442,9 +1375,7 @@ TAO_DynCommon::insert_longlong_seq (
 }
 
 void
-TAO_DynCommon::insert_ulonglong_seq (
-    const CORBA::ULongLongSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_ulonglong_seq (const CORBA::ULongLongSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1456,9 +1387,7 @@ TAO_DynCommon::insert_ulonglong_seq (
 }
 
 void
-TAO_DynCommon::insert_longdouble_seq (
-    const CORBA::LongDoubleSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_longdouble_seq (const CORBA::LongDoubleSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1470,9 +1399,7 @@ TAO_DynCommon::insert_longdouble_seq (
 }
 
 void
-TAO_DynCommon::insert_wchar_seq (
-    const CORBA::WCharSeq &value
-    ACE_ENV_ARG_DECL)
+TAO_DynCommon::insert_wchar_seq (const CORBA::WCharSeq &value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1486,8 +1413,7 @@ TAO_DynCommon::insert_wchar_seq (
 // ****************************************************************
 
 CORBA::BooleanSeq *
-TAO_DynCommon::get_boolean_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_boolean_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1500,8 +1426,7 @@ TAO_DynCommon::get_boolean_seq (
 }
 
 CORBA::OctetSeq *
-TAO_DynCommon::get_octet_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_octet_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1514,8 +1439,7 @@ TAO_DynCommon::get_octet_seq (
 }
 
 CORBA::CharSeq *
-TAO_DynCommon::get_char_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_char_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1528,8 +1452,7 @@ TAO_DynCommon::get_char_seq (
 }
 
 CORBA::ShortSeq *
-TAO_DynCommon::get_short_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_short_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1542,8 +1465,7 @@ TAO_DynCommon::get_short_seq (
 }
 
 CORBA::UShortSeq *
-TAO_DynCommon::get_ushort_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_ushort_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1556,8 +1478,7 @@ TAO_DynCommon::get_ushort_seq (
 }
 
 CORBA::LongSeq *
-TAO_DynCommon::get_long_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_long_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1570,8 +1491,7 @@ TAO_DynCommon::get_long_seq (
 }
 
 CORBA::ULongSeq *
-TAO_DynCommon::get_ulong_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_ulong_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1584,8 +1504,7 @@ TAO_DynCommon::get_ulong_seq (
 }
 
 CORBA::FloatSeq *
-TAO_DynCommon::get_float_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_float_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1598,8 +1517,7 @@ TAO_DynCommon::get_float_seq (
 }
 
 CORBA::DoubleSeq *
-TAO_DynCommon::get_double_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_double_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1612,8 +1530,7 @@ TAO_DynCommon::get_double_seq (
 }
 
 CORBA::LongLongSeq *
-TAO_DynCommon::get_longlong_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_longlong_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1626,8 +1543,7 @@ TAO_DynCommon::get_longlong_seq (
 }
 
 CORBA::ULongLongSeq *
-TAO_DynCommon::get_ulonglong_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_ulonglong_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1640,8 +1556,7 @@ TAO_DynCommon::get_ulonglong_seq (
 }
 
 CORBA::LongDoubleSeq *
-TAO_DynCommon::get_longdouble_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_longdouble_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1654,8 +1569,7 @@ TAO_DynCommon::get_longdouble_seq (
 }
 
 CORBA::WCharSeq *
-TAO_DynCommon::get_wchar_seq (
-    ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_wchar_seq (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1671,18 +1585,14 @@ TAO_DynCommon::get_wchar_seq (
 
 void
 TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
-                         CORBA::Boolean destroying
-                         ACE_ENV_ARG_DECL)
+                         CORBA::Boolean destroying)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  CORBA::TypeCode_var tc = component->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var tc = component->type ();
 
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc.in ());
 
   switch (tk)
   {
@@ -1717,7 +1627,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
     case CORBA::tk_fixed:
     case CORBA::tk_value:
     case CORBA::tk_value_box:
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      throw ::CORBA::NO_IMPLEMENT ();
     default:
       TAO::DynAnyFlagUtils<TAO_DynAny_i>::set_flag_t (component,
                                                       destroying);
@@ -1726,7 +1636,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::check_component (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1740,15 +1650,11 @@ TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   DynamicAny::DynAny_var cc =
-    this->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+    this->current_component ();
 
-  CORBA::TypeCode_var tc = cc->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+  CORBA::TypeCode_var tc = cc->type ();
 
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
   // We are here because we are a component that is the target of
   // an insert_*() call on our container. It is
@@ -1778,21 +1684,18 @@ TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc
-                           ACE_ENV_ARG_DECL)
+TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
     ))
 {
-  CORBA::Boolean equivalent =
-    this->type_->equivalent (tc
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Boolean const equivalent =
+    this->type_->equivalent (tc);
 
   if (!equivalent)
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 }
 
@@ -1846,18 +1749,15 @@ TAO_DynCommon::ref_to_component (CORBA::Boolean val)
 
 CORBA::TypeCode_ptr
 TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc
-                                       ACE_ENV_ARG_DECL)
+                                       )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
     ))
 {
-  this->check_type (tc
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  this->check_type (tc);
 
-  return TAO_DynAnyFactory::strip_alias (tc
-                                         ACE_ENV_ARG_PARAMETER);
+  return TAO_DynAnyFactory::strip_alias (tc);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 9e07090e260..a4093d39233 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -42,14 +42,14 @@ public:
   // = Some functions common to all Dynamic Any types.
 
   virtual CORBA::TypeCode_ptr type (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void assign (
       DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
@@ -57,7 +57,7 @@ public:
 
   virtual void insert_boolean (
       CORBA::Boolean value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -66,7 +66,7 @@ public:
 
   virtual void insert_octet (
       CORBA::Octet value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -75,7 +75,7 @@ public:
 
   virtual void insert_char (
       CORBA::Char value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -83,7 +83,7 @@ public:
       ));
   virtual void insert_short (
       CORBA::Short value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -92,7 +92,7 @@ public:
       ));
   virtual void insert_ushort (
       CORBA::UShort value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -102,7 +102,7 @@ public:
 
   virtual void insert_long (
       CORBA::Long value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -111,7 +111,7 @@ public:
 
   virtual void insert_ulong (
       CORBA::ULong value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -120,7 +120,7 @@ public:
 
   virtual void insert_float (
       CORBA::Float value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -129,7 +129,7 @@ public:
 
   virtual void insert_double (
       CORBA::Double value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -138,7 +138,7 @@ public:
 
   virtual void insert_string (
       const char * value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -147,7 +147,7 @@ public:
 
   virtual void insert_reference (
       CORBA::Object_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -156,7 +156,7 @@ public:
 
   virtual void insert_typecode (
       CORBA::TypeCode_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -165,7 +165,7 @@ public:
 
   virtual void insert_longlong (
       CORBA::LongLong value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -174,7 +174,7 @@ public:
 
   virtual void insert_ulonglong (
       CORBA::ULongLong value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -183,7 +183,7 @@ public:
 
   virtual void insert_longdouble (
       CORBA::LongDouble value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -192,7 +192,7 @@ public:
 
   virtual void insert_wchar (
       CORBA::WChar value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -201,7 +201,7 @@ public:
 
   virtual void insert_wstring (
       const CORBA::WChar * value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -210,7 +210,7 @@ public:
 
   virtual void insert_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -219,7 +219,7 @@ public:
 
   virtual void insert_dyn_any (
       DynamicAny::DynAny_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -228,7 +228,7 @@ public:
 
   virtual void insert_val (
       CORBA::ValueBase * value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -236,7 +236,7 @@ public:
       ));
 
   virtual CORBA::Boolean get_boolean (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -244,7 +244,7 @@ public:
       ));
 
   virtual CORBA::Octet get_octet (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -252,7 +252,7 @@ public:
       ));
 
   virtual CORBA::Char get_char (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -260,7 +260,7 @@ public:
       ));
 
   virtual CORBA::Short get_short (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -268,7 +268,7 @@ public:
       ));
 
   virtual CORBA::UShort get_ushort (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -276,7 +276,7 @@ public:
       ));
 
   virtual CORBA::Long get_long (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -284,7 +284,7 @@ public:
       ));
 
   virtual CORBA::ULong get_ulong (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -292,7 +292,7 @@ public:
       ));
 
   virtual CORBA::Float get_float (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -300,7 +300,7 @@ public:
       ));
 
   virtual CORBA::Double get_double (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -308,7 +308,7 @@ public:
       ));
 
   virtual char * get_string (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -316,7 +316,7 @@ public:
       ));
 
   virtual CORBA::Object_ptr get_reference (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -324,7 +324,7 @@ public:
       ));
 
   virtual CORBA::TypeCode_ptr get_typecode (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -332,7 +332,7 @@ public:
       ));
 
   virtual CORBA::LongLong get_longlong (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -340,7 +340,7 @@ public:
       ));
 
   virtual CORBA::ULongLong get_ulonglong (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -348,7 +348,7 @@ public:
       ));
 
   virtual CORBA::LongDouble get_longdouble (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -356,7 +356,7 @@ public:
       ));
 
   virtual CORBA::WChar get_wchar (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -364,7 +364,7 @@ public:
       ));
 
   virtual CORBA::WChar * get_wstring (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -372,7 +372,7 @@ public:
       ));
 
   virtual CORBA::Any * get_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -380,7 +380,7 @@ public:
       ));
 
   virtual DynamicAny::DynAny_ptr get_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -388,7 +388,7 @@ public:
       ));
 
   virtual CORBA::ValueBase * get_val (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -397,38 +397,38 @@ public:
 
   virtual CORBA::Boolean seek (
       CORBA::Long index
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void rewind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean next (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr copy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::ULong component_count (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void insert_abstract (
       CORBA::AbstractBase_ptr value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -436,7 +436,7 @@ public:
       ));
 
   virtual CORBA::AbstractBase_ptr get_abstract (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -445,7 +445,7 @@ public:
 
   virtual void insert_boolean_seq (
       const CORBA::BooleanSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -454,7 +454,7 @@ public:
 
   virtual void insert_octet_seq (
       const CORBA::OctetSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -463,7 +463,7 @@ public:
 
   virtual void insert_char_seq (
       const CORBA::CharSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -472,7 +472,7 @@ public:
 
   virtual void insert_short_seq (
       const CORBA::ShortSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -481,7 +481,7 @@ public:
 
   virtual void insert_ushort_seq (
       const CORBA::UShortSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -490,7 +490,7 @@ public:
 
   virtual void insert_long_seq (
       const CORBA::LongSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -499,7 +499,7 @@ public:
 
   virtual void insert_ulong_seq (
       const CORBA::ULongSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -508,7 +508,7 @@ public:
 
   virtual void insert_float_seq (
       const CORBA::FloatSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -517,7 +517,7 @@ public:
 
   virtual void insert_double_seq (
       const CORBA::DoubleSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -526,7 +526,7 @@ public:
 
   virtual void insert_longlong_seq (
       const CORBA::LongLongSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -535,7 +535,7 @@ public:
 
   virtual void insert_ulonglong_seq (
       const CORBA::ULongLongSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -544,7 +544,7 @@ public:
 
   virtual void insert_longdouble_seq (
       const CORBA::LongDoubleSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -553,7 +553,7 @@ public:
 
   virtual void insert_wchar_seq (
       const CORBA::WCharSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -561,7 +561,7 @@ public:
       ));
 
   virtual CORBA::BooleanSeq * get_boolean_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -569,7 +569,7 @@ public:
       ));
 
   virtual CORBA::OctetSeq * get_octet_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -577,7 +577,7 @@ public:
       ));
 
   virtual CORBA::CharSeq * get_char_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -585,7 +585,7 @@ public:
       ));
 
   virtual CORBA::ShortSeq * get_short_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -593,7 +593,7 @@ public:
       ));
 
   virtual CORBA::UShortSeq * get_ushort_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -601,7 +601,7 @@ public:
       ));
 
   virtual CORBA::LongSeq * get_long_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -609,7 +609,7 @@ public:
       ));
 
   virtual CORBA::ULongSeq * get_ulong_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -617,7 +617,7 @@ public:
       ));
 
   virtual CORBA::FloatSeq * get_float_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -625,7 +625,7 @@ public:
       ));
 
   virtual CORBA::DoubleSeq * get_double_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -633,7 +633,7 @@ public:
       ));
 
   virtual CORBA::LongLongSeq * get_longlong_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -641,7 +641,7 @@ public:
       ));
 
   virtual CORBA::ULongLongSeq * get_ulonglong_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -649,7 +649,7 @@ public:
       ));
 
   virtual CORBA::LongDoubleSeq * get_longdouble_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -657,7 +657,7 @@ public:
       ));
 
   virtual CORBA::WCharSeq * get_wchar_seq (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -676,7 +676,7 @@ public:
   void set_flag (
       DynamicAny::DynAny_ptr component,
       CORBA::Boolean destroying
-      ACE_ENV_ARG_DECL
+
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -684,7 +684,7 @@ public:
 
   // Utility functions.
 
-  DynamicAny::DynAny_ptr check_component (ACE_ENV_SINGLE_ARG_DECL)
+  DynamicAny::DynAny_ptr check_component (void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -692,7 +692,7 @@ public:
       ));
 
   void check_type (CORBA::TypeCode_ptr tc
-                   ACE_ENV_ARG_DECL)
+                   )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
@@ -741,7 +741,7 @@ private:
   // Utility functions used by insert_* and get_*.
 
   CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc
-                                              ACE_ENV_ARG_DECL)
+                                              )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 6ce0a7dcedc..aa2e8f27d89 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -35,19 +35,16 @@ TAO_DynEnum_i::init_common (void)
 }
 
 void
-TAO_DynEnum_i::init (const CORBA::Any &any
-                     ACE_ENV_ARG_DECL)
+TAO_DynEnum_i::init (const CORBA::Any &any)
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_DynAnyFactory::unalias (tc.in ());
 
   if (kind != CORBA::tk_enum)
     {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+      throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
     }
 
   this->type_ = tc;
@@ -76,16 +73,13 @@ TAO_DynEnum_i::init (const CORBA::Any &any
 }
 
 void
-TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc
-                     ACE_ENV_ARG_DECL)
+TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc)
 {
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc);
 
   if (kind != CORBA::tk_enum)
     {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+      throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
     }
 
   this->type_ = CORBA::TypeCode::_duplicate (tc);
@@ -98,8 +92,7 @@ TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc
 // ****************************************************************
 
 TAO_DynEnum_i *
-TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref
-                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref)
 {
   if (CORBA::is_nil (_tao_objref))
     {
@@ -112,30 +105,25 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref
 // ****************************************************************
 
 char *
-TAO_DynEnum_i::get_as_string (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ))
+TAO_DynEnum_i::get_as_string (void)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *retval =
-    this->type_.in ()->member_name (this->value_
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->type_.in ()->member_name (this->value_);
 
   return CORBA::string_dup (retval);
 }
 
 void
 TAO_DynEnum_i::set_as_string (const char *value_as_string
-                              ACE_ENV_ARG_DECL)
+                              )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
     ))
 {
   CORBA::ULong count =
-    this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->type_.in ()->member_count ();
 
   CORBA::ULong i;
   const char *temp = 0;
@@ -143,8 +131,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string
   for (i = 0; i < count; ++i)
     {
       temp = this->type_.in ()->member_name (i
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                            );
 
       if (!ACE_OS::strcmp (value_as_string,
                            temp))
@@ -159,12 +146,12 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string
     }
   else
     {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 }
 
 CORBA::ULong
-TAO_DynEnum_i::get_as_ulong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_DynEnum_i::get_as_ulong (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -174,15 +161,14 @@ TAO_DynEnum_i::get_as_ulong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
     ))
 {
   CORBA::ULong max =
-    this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->type_.in ()->member_count ();
 
   if (value_as_ulong < max)
     {
@@ -190,7 +176,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
     }
   else
     {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 }
 
@@ -198,7 +184,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
 
 void
 TAO_DynEnum_i::from_any (const CORBA::Any& any
-                         ACE_ENV_ARG_DECL)
+                         )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -206,9 +192,7 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any
     ))
 {
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ());
 
   if (kind == CORBA::tk_enum)
     {
@@ -235,12 +219,12 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any
     }
   else
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 }
 
 CORBA::Any_ptr
-TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynEnum_i::to_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -253,7 +237,6 @@ TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     CORBA::Any,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   TAO_InputCDR in_cdr (out_cdr);
   TAO::Unknown_IDL_Type *unk = 0;
@@ -261,33 +244,27 @@ TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
                     TAO::Unknown_IDL_Type (this->type_.in (),
                                            in_cdr),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->replace (unk);
   return retval;
 }
 
 CORBA::Boolean
-TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
-                      ACE_ENV_ARG_DECL)
+TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_var tc = rhs->type ();
 
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ());
 
   if (!equivalent)
     {
-      return 0;
+      return false;
     }
 
-  CORBA::Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Any_var any = rhs->to_any ();
 
   TAO::Any_Impl *impl = any->impl ();
   CORBA::ULong value;
@@ -314,24 +291,24 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynEnum_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynEnum_i::destroy (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (!this->ref_to_component_ || this->container_is_destroying_)
     {
-      this->destroyed_ = 1;
+      this->destroyed_ = true;
     }
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynEnum_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynEnum_i::current_component (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 6732653721e..506844d4543 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -53,21 +53,21 @@ public:
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
+            );
 
   /// Initialize using an Any.
   void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
+            );
 
   // = LocalObject methods.
   static TAO_DynEnum_i *_narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   // = Functions specific to DynEnum.
 
   virtual char * get_as_string (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -75,7 +75,7 @@ public:
 
   virtual void set_as_string (
       const char * value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -83,7 +83,7 @@ public:
       ));
 
   virtual CORBA::ULong get_as_ulong (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -91,7 +91,7 @@ public:
 
   virtual void set_as_ulong (
       CORBA::ULong value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -102,7 +102,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -111,7 +111,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -119,21 +119,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 7d2dff85503..02ef4ec50bc 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -36,19 +36,16 @@ TAO_DynSequence_i::init_common (void)
 }
 
 void
-TAO_DynSequence_i::init (const CORBA::Any& any
-                         ACE_ENV_ARG_DECL)
+TAO_DynSequence_i::init (const CORBA::Any& any)
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_DynAnyFactory::unalias (tc.in ());
 
   if (kind != CORBA::tk_sequence)
     {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+      throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
     }
 
   this->type_ = tc;
@@ -84,8 +81,7 @@ TAO_DynSequence_i::init (const CORBA::Any& any
 
   // Get the type of the sequence elments.
   CORBA::TypeCode_var field_tc =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_element_type ();
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
@@ -107,22 +103,20 @@ TAO_DynSequence_i::init (const CORBA::Any& any
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                &cdr
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              );
     }
 }
 
 void
 TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc
-                         ACE_ENV_ARG_DECL)
+                         )
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  );
 
   if (kind != CORBA::tk_sequence)
     {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+      throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
     }
 
   // Empty sequence.
@@ -137,7 +131,7 @@ TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc
 
 TAO_DynSequence_i *
 TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            )
 {
   if (CORBA::is_nil (_tao_objref))
     {
@@ -150,28 +144,24 @@ TAO_DynSequence_i::_narrow (CORBA::Object_ptr _tao_objref
 // ****************************************************************
 
 CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::get_element_type (void)
 {
   CORBA::TypeCode_var element_type =
     CORBA::TypeCode::_duplicate (this->type_.in ());
 
   // Strip away aliases (if any) on top of the outer type.
-  CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+  CORBA::TCKind kind = element_type->kind ();
 
   while (kind != CORBA::tk_sequence)
     {
-      element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      element_type = element_type->content_type ();
 
-      kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+      kind = element_type->kind ();
     }
 
   // Return the content type.
   CORBA::TypeCode_ptr retval =
-    element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+    element_type->content_type ();
 
   return retval;
 }
@@ -179,7 +169,7 @@ TAO_DynSequence_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
 // = Functions specific to DynSequence.
 
 CORBA::ULong
-TAO_DynSequence_i::get_length (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::get_length (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -194,8 +184,7 @@ TAO_DynSequence_i::get_length (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_DynSequence_i::set_length (CORBA::ULong length
-                               ACE_ENV_ARG_DECL)
+TAO_DynSequence_i::set_length (CORBA::ULong length)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -203,21 +192,19 @@ TAO_DynSequence_i::set_length (CORBA::ULong length
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   // CORBA::TypeCode::length() does not accept aliased type codes.
   CORBA::TypeCode_var stripped_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
-  CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULong bound = stripped_tc->length ();
 
   if (bound > 0 && length > bound)
     {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   // CORBA 2.3.1 has several explicit rules about resetting the
@@ -250,8 +237,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length
       this->da_members_.size (length);
 
       CORBA::TypeCode_var elemtype =
-        stripped_tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        stripped_tc->content_type ();
 
       for (CORBA::ULong i = this->component_count_; i < length; ++i)
         {
@@ -266,8 +252,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length
       // Destroy any dangling members first, then shrink array.
       for (CORBA::ULong j = length; j < this->component_count_; ++j)
         {
-          this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->da_members_[j]->destroy ();
         }
 
       this->da_members_.size (length);
@@ -278,7 +263,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length
 }
 
 DynamicAny::AnySeq *
-TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::get_elements (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -295,7 +280,6 @@ TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (elements,
                     DynamicAny::AnySeq (length),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   elements->length (length);
   DynamicAny::AnySeq_var safe_retval = elements;
@@ -304,9 +288,8 @@ TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::Any_var tmp =
-        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->da_members_[i]->to_any ();
 
-      ACE_CHECK_RETURN (0);
 
       safe_retval[i] = tmp.in ();
     }
@@ -315,8 +298,7 @@ TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
-                                 ACE_ENV_ARG_DECL)
+TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -325,21 +307,19 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var stripped_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   CORBA::ULong length = value.length ();
-  CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULong bound = stripped_tc->length ();
 
   if (bound > 0 && length > bound)
     {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   // CORBA 2.4.2.
@@ -359,8 +339,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
     }
 
   CORBA::TypeCode_var element_type =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_element_type ();
 
   CORBA::TypeCode_var value_tc;
 
@@ -370,16 +349,14 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
       value_tc = value[i].type ();
       CORBA::Boolean equivalent =
         value_tc->equivalent (element_type.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             );
 
       if (equivalent)
         {
           // Destroy any existing members.
           if (i < this->component_count_)
             {
-              this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              this->da_members_[i]->destroy ();
             }
 
           this->da_members_[i] =
@@ -389,15 +366,14 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
         }
       else
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
     }
 
   // Destroy any dangling members.
   for (CORBA::ULong j = length; j < this->component_count_; ++j)
     {
-      this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->da_members_[j]->destroy ();
     }
 
   // If the array shrinks, we must wait until now to do it.
@@ -411,7 +387,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::get_elements_as_dyn_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -426,7 +402,6 @@ TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     DynamicAny::DynAnySeq (this->component_count_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->length (this->component_count_);
   DynamicAny::DynAnySeq_var safe_retval (retval);
@@ -437,12 +412,10 @@ TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
       // Set the flag so the caller can't destroy.
       this->set_flag (this->da_members_[i].in (),
                       0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                     );
 
       safe_retval[i] =
         DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
-      ACE_CHECK_RETURN (0);
     }
 
   return safe_retval._retn ();
@@ -450,9 +423,7 @@ TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynSequence_i::set_elements_as_dyn_any (
-    const DynamicAny::DynAnySeq & values
-    ACE_ENV_ARG_DECL
-  )
+  const DynamicAny::DynAnySeq & values)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -461,21 +432,19 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var stripped_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   CORBA::ULong length = values.length ();
-  CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULong bound = stripped_tc->length ();
 
   if (bound > 0 && length > bound)
     {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   // If the array grows, we must do it now.
@@ -485,46 +454,40 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
     }
 
   CORBA::TypeCode_var element_type =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->get_element_type ();
 
   CORBA::TypeCode_var val_type;
   CORBA::Boolean equivalent;
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      val_type = values[i]->type ();
 
       equivalent = val_type->equivalent (element_type.in ()
-                                         ACE_ENV_ARG_PARAMETER);
+                                        );
 
-      ACE_CHECK;
 
       if (equivalent)
         {
           // Destroy any existing members.
           if (i < this->component_count_)
             {
-              this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              this->da_members_[i]->destroy ();
             }
 
           this->da_members_[i] =
-            values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+            values[i]->copy ();
         }
       else
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
     }
 
   // Destroy any dangling members.
   for (CORBA::ULong j = length; j < this->component_count_; ++j)
     {
-      this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->da_members_[j]->destroy ();
     }
 
   // If the array shrinks, we must wait until now to do it.
@@ -540,8 +503,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
 // ****************************************************************
 
 void
-TAO_DynSequence_i::from_any (const CORBA::Any & any
-                             ACE_ENV_ARG_DECL)
+TAO_DynSequence_i::from_any (const CORBA::Any & any)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -550,14 +512,13 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 
   if (equivalent)
     {
@@ -594,8 +555,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
         }
 
       CORBA::TypeCode_var field_tc =
-        this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->get_element_type ();
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
         {
@@ -609,8 +569,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
 
           if (i < this->component_count_)
             {
-              this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              this->da_members_[i]->destroy ();
             }
 
           this->da_members_[i] =
@@ -621,15 +580,13 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                    &cdr
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                                  );
         }
 
       // Destroy any dangling members.
       for (CORBA::ULong j = arg_length; j < this->component_count_; ++j)
         {
-          this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->da_members_[j]->destroy ();
         }
 
       // If the array shrinks, we must wait until now to do it.
@@ -645,12 +602,12 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
     }
   else
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 }
 
 CORBA::Any_ptr
-TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::to_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -665,15 +622,13 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   out_cdr.write_ulong (this->component_count_);
 
   CORBA::TypeCode_var field_tc =
-    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_element_type ();
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       // Recursive step
       CORBA::Any_var field_any =
-        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->da_members_[i]->to_any ();
 
       TAO::Any_Impl *field_impl = field_any->impl ();
       TAO_OutputCDR field_out;
@@ -696,8 +651,7 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
                                                  &out_cdr
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                );
     }
 
   TAO_InputCDR in_cdr (out_cdr);
@@ -706,22 +660,19 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     CORBA::Any,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   TAO::Unknown_IDL_Type *unk = 0;
   ACE_NEW_THROW_EX (unk,
                     TAO::Unknown_IDL_Type (this->type_.in (),
                                            in_cdr),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->replace (unk);
   return retval;
 }
 
 CORBA::Boolean
-TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
-                          ACE_ENV_ARG_DECL)
+TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -732,12 +683,10 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
                         0);
     }
 
-  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_var tc = rhs->type ();
 
   CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                             );
 
   if (!equivalent)
     {
@@ -755,16 +704,13 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       rhs->seek (static_cast<CORBA::Long> (i)
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                );
 
-      tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      tmp = rhs->current_component ();
 
       // Recursive step.
       member_equal = tmp->equal (this->da_members_[i].in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                );
 
       if (!member_equal)
         {
@@ -776,14 +722,14 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynSequence_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::destroy (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (!this->ref_to_component_ || this->container_is_destroying_)
@@ -793,11 +739,9 @@ TAO_DynSequence_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
         {
           this->set_flag (da_members_[i].in (),
                           1
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                         );
 
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->da_members_[i]->destroy ();
         }
 
       this->destroyed_ = 1;
@@ -805,7 +749,7 @@ TAO_DynSequence_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::current_component (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -826,8 +770,7 @@ TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
 
   this->set_flag (this->da_members_[index].in (),
                   0
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+                 );
 
   return DynamicAny::DynAny::_duplicate (
             this->da_members_[index].in ()
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index e9763e95e5f..440dd3b3c33 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -53,21 +53,21 @@ public:
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
+            );
 
   /// Initialize using an Any.
   void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
+            );
 
   // = LocalObject methods.
   static TAO_DynSequence_i *_narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   // = Functions specific to DynSequence.
 
   virtual CORBA::ULong get_length (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -75,7 +75,7 @@ public:
 
   virtual void set_length (
       CORBA::ULong len
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -83,7 +83,7 @@ public:
       ));
 
   virtual DynamicAny::AnySeq * get_elements (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -91,7 +91,7 @@ public:
 
   virtual void set_elements (
       const DynamicAny::AnySeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -100,7 +100,7 @@ public:
       ));
 
   virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -108,7 +108,7 @@ public:
 
   virtual void set_elements_as_dyn_any (
       const DynamicAny::DynAnySeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -121,7 +121,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -130,7 +130,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -138,21 +138,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -161,7 +161,7 @@ public:
 
 private:
   // Utility, turns the type of elements contained in the sequence.
-  CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::TypeCode_ptr get_element_type (void);
 
   // Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 017ae3c8797..331e55dc52c 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -25,19 +25,16 @@ TAO_DynStruct_i::~TAO_DynStruct_i (void)
 }
 
 void
-TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc
-                                 ACE_ENV_ARG_DECL)
+TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc)
 {
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc);
 
   if (kind == CORBA::tk_struct || kind == CORBA::tk_except)
     {
       return;
     }
 
-  ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+  throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
 }
 
 void
@@ -52,37 +49,31 @@ TAO_DynStruct_i::init_common (void)
 }
 
 void
-TAO_DynStruct_i::init (const CORBA::Any& any
-                       ACE_ENV_ARG_DECL)
+TAO_DynStruct_i::init (const CORBA::Any& any)
 {
   CORBA::TypeCode_ptr tc = any._tao_get_typecode ();
   this->check_typecode (tc
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                       );
 
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 
   this->set_from_any (any
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                     );
 }
 
 
 // This code is common to from_any() and the init() overload that takes
 // an Any argument.
 void
-TAO_DynStruct_i::set_from_any (const CORBA::Any & any
-                               ACE_ENV_ARG_DECL)
+TAO_DynStruct_i::set_from_any (const CORBA::Any & any)
 {
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (any._tao_get_typecode ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   CORBA::ULong numfields =
-    unaliased_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    unaliased_tc->member_count ();
 
   // Resize the array.
   this->da_members_.size (numfields);
@@ -109,9 +100,7 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
     }
 
   // If we have an exception type, unmarshal the repository ID.
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (any._tao_get_typecode ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (any._tao_get_typecode ());
 
   if (kind == CORBA::tk_except)
     {
@@ -123,8 +112,7 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
     {
       CORBA::TypeCode_var field_tc =
         unaliased_tc->member_type (i
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                  );
 
       CORBA::Any field_any;
       TAO_InputCDR unk_in (in);
@@ -143,30 +131,24 @@ TAO_DynStruct_i::set_from_any (const CORBA::Any & any
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                &in
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              );
     }
 }
 
 void
-TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL)
+TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc)
 {
-  this->check_typecode (tc
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_typecode (tc);
 
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
   TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 );
 
   this->component_count_ =
-    unaliased_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    unaliased_tc->member_count ();
 
   // Resize the array.
   this->da_members_.size (this->component_count_);
@@ -178,8 +160,7 @@ TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       mtype = unaliased_tc->member_type (i
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                        );
 
       // Recursively initialize each member.
       this->da_members_[i] =
@@ -192,8 +173,7 @@ TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc
 // ****************************************************************
 
 TAO_DynStruct_i *
-TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref
-                          ACE_ENV_ARG_DECL_NOT_USED)
+TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref)
 {
   if (CORBA::is_nil (_tao_objref))
     {
@@ -206,7 +186,7 @@ TAO_DynStruct_i::_narrow (CORBA::Object_ptr _tao_objref
 // ****************************************************************
 
 DynamicAny::FieldName
-TAO_DynStruct_i::current_member_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::current_member_name (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -235,19 +215,17 @@ TAO_DynStruct_i::current_member_name (ACE_ENV_SINGLE_ARG_DECL)
   // member_name() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                   );
   const char *name =
     unaliased_tc->member_name (this->current_position_
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                              );
 
   return CORBA::string_dup (name);
 }
 
 // Returns the unaliased TCKind.
 CORBA::TCKind
-TAO_DynStruct_i::current_member_kind (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::current_member_kind (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -276,22 +254,19 @@ TAO_DynStruct_i::current_member_kind (ACE_ENV_SINGLE_ARG_DECL)
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+                                   );
   CORBA::TypeCode_var tc =
   unaliased_tc->member_type (this->current_position_
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+                                 );
 
   CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+                                                    );
 
   return retval;
 }
 
 DynamicAny::NameValuePairSeq *
-TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::get_members (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -306,7 +281,6 @@ TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (members,
                     DynamicAny::NameValuePairSeq (this->component_count_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   // We must do this explicitly.
   members->length (this->component_count_);
@@ -316,15 +290,13 @@ TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::TypeCode_var unaliased_tc;
 
   CORBA::TCKind const tc_kind =
-    this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->type_->kind ();
 
   if (tc_kind == CORBA::tk_alias)
     {
       unaliased_tc =
         TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                       );
     }
   else
     {
@@ -336,11 +308,9 @@ TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL)
     {
       safe_retval[i].id =
         CORBA::string_dup (unaliased_tc->member_name (i
-                                                      ACE_ENV_ARG_PARAMETER));
-      ACE_CHECK_RETURN (0);
+                                                     ));
 
-      temp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      temp = this->da_members_[i]->to_any ();
 
       safe_retval[i].value = temp.in ();
     }
@@ -349,8 +319,7 @@ TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
-                              ACE_ENV_ARG_DECL)
+TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -359,7 +328,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::ULong length = values.length ();
@@ -367,7 +336,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
   // Check for length match.
   if (length != this->component_count_)
     {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   CORBA::TypeCode_var value_tc;
@@ -377,29 +346,25 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       // Check for type and name match.
       my_tc = unaliased_tc->member_type (i
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                        );
 
       value_tc = values[i].value.type ();
 
       equivalent = my_tc->equivalent (value_tc.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     );
 
       if (!equivalent)
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
-      this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->da_members_[i]->destroy ();
 
       this->da_members_[i] =
         TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
@@ -411,7 +376,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
 }
 
 DynamicAny::NameDynAnyPairSeq *
-TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::get_members_as_dyn_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -426,7 +391,6 @@ TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (members,
                     DynamicAny::NameDynAnyPairSeq (this->component_count_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   // We must do this explicitly.
   members->length (this->component_count_);
@@ -436,27 +400,23 @@ TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   // member_name() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                   );
 
   // Assign name and value to each pearl on the string.
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       safe_retval[i].id =
         CORBA::string_dup (unaliased_tc->member_name (i
-                                                      ACE_ENV_ARG_PARAMETER));
-      ACE_CHECK_RETURN (0);
+                                                     ));
 
       // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
       // Set the flag so the caller can't destroy.
       this->set_flag (this->da_members_[i].in (),
                       0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                     );
 
       safe_retval[i].value =
         DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
-      ACE_CHECK_RETURN (0);
     }
 
   return safe_retval._retn ();
@@ -465,7 +425,7 @@ TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_DynStruct_i::set_members_as_dyn_any (
     const DynamicAny::NameDynAnyPairSeq & values
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -475,7 +435,7 @@ TAO_DynStruct_i::set_members_as_dyn_any (
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::ULong length = values.length ();
@@ -483,7 +443,7 @@ TAO_DynStruct_i::set_members_as_dyn_any (
   // Check for length match.
   if (length != this->component_count_)
     {
-      ACE_THROW (DynamicAny::DynAny::InvalidValue ());
+      throw DynamicAny::DynAny::InvalidValue ();
     }
 
   CORBA::TypeCode_var value_tc;
@@ -493,34 +453,28 @@ TAO_DynStruct_i::set_members_as_dyn_any (
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       // Check for type and name match.
       my_tc = unaliased_tc->member_type (i
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                        );
 
-      value_tc = values[i].value->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      value_tc = values[i].value->type ();
 
       equivalent = my_tc->equivalent (value_tc.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     );
 
       if (!equivalent)
         {
-          ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+          throw DynamicAny::DynAny::TypeMismatch ();
         }
 
-      this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->da_members_[i]->destroy ();
 
       this->da_members_[i] =
-        values[i].value->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        values[i].value->copy ();
     }
 
   this->current_position_ = length ? 0 : -1;
@@ -529,8 +483,7 @@ TAO_DynStruct_i::set_members_as_dyn_any (
 // ****************************************************************
 
 void
-TAO_DynStruct_i::from_any (const CORBA::Any & any
-                           ACE_ENV_ARG_DECL)
+TAO_DynStruct_i::from_any (const CORBA::Any & any)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -539,14 +492,13 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent =
     this->type_->equivalent (tc.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            );
 
   if (equivalent)
     {
@@ -572,8 +524,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
       // If we have an exception type, unmarshal the repository ID.
       CORBA::TCKind kind =
         TAO_DynAnyFactory::unalias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   );
 
       if (kind == CORBA::tk_except)
         {
@@ -584,14 +535,12 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
       CORBA::TypeCode_var field_tc;
       CORBA::TypeCode_var unaliased =
         TAO::unaliased_typecode (this->type_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                );
 
       for (CORBA::ULong i = 0; i < this->component_count_; ++i)
         {
           field_tc = unaliased->member_type (i
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                            );
 
           CORBA::Any field_any;
           TAO_InputCDR unk_in (in);
@@ -601,8 +550,7 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
                                           unk_in));
           field_any.replace (unk);
 
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->da_members_[i]->destroy ();
 
           this->da_members_[i] =
             TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
@@ -612,20 +560,19 @@ TAO_DynStruct_i::from_any (const CORBA::Any & any
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                    &in
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                                  );
         }
 
       this->current_position_ = this->component_count_ ? 0 : -1;
     }
   else
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 }
 
 CORBA::Any_ptr
-TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::to_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -640,13 +587,11 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   // If we have an exception type, marshal the repository ID.
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                  );
 
   if (kind == CORBA::tk_except)
     {
-      out_cdr << this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      out_cdr << this->type_->id ();
     }
 
   TAO::Any_Impl *field_impl = 0;
@@ -656,13 +601,11 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       CORBA::TypeCode_var field_tc =
-        this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->da_members_[i]->type ();
 
       // Recursive step.
       CORBA::Any_var field_any =
-        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->da_members_[i]->to_any ();
 
       TAO_OutputCDR field_out_cdr;
       field_impl = field_any->impl ();
@@ -684,8 +627,7 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_in_cdr,
                                                  &out_cdr
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                );
     }
 
   TAO_InputCDR in_cdr (out_cdr);
@@ -694,22 +636,19 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     CORBA::Any,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   TAO::Unknown_IDL_Type *unk = 0;
   ACE_NEW_THROW_EX (unk,
                     TAO::Unknown_IDL_Type (this->type_.in (),
                                            in_cdr),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->replace (unk);
   return retval;
 }
 
 CORBA::Boolean
-TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
-                        ACE_ENV_ARG_DECL)
+TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -720,12 +659,10 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
                         0);
     }
 
-  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_var tc = rhs->type ();
 
   CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                             );
 
   if (!equivalent)
     {
@@ -738,16 +675,13 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       rhs->seek (static_cast <CORBA::Long> (i)
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                );
 
-      tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      tmp = rhs->current_component ();
 
       // Recursive step.
       member_equal = tmp->equal (this->da_members_[i].in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                );
 
       if (!member_equal)
         {
@@ -759,14 +693,14 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynStruct_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::destroy (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (!this->ref_to_component_ || this->container_is_destroying_)
@@ -776,11 +710,9 @@ TAO_DynStruct_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
         {
           this->set_flag (da_members_[i].in (),
                           1
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                         );
 
-          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->da_members_[i]->destroy ();
         }
 
       this->destroyed_ = 1;
@@ -788,7 +720,7 @@ TAO_DynStruct_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::current_component (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -816,8 +748,7 @@ TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
 
   this->set_flag (this->da_members_[index].in (),
                   0
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+                 );
 
   return DynamicAny::DynAny::_duplicate (
             this->da_members_[index].in ()
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index 62e9ecf7e1f..0733c23c2dd 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -53,21 +53,21 @@ public:
 
   /// Initialize using just a TypeCode.
   void init (CORBA::TypeCode_ptr tc
-             ACE_ENV_ARG_DECL);
+            );
 
   /// Initialize using an Any.
   void init (const CORBA::Any& any
-             ACE_ENV_ARG_DECL);
+            );
 
   // = LocalObject methods.
   static TAO_DynStruct_i *_narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   // = Functions specific to DynStruct.
 
   virtual DynamicAny::FieldName current_member_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -76,7 +76,7 @@ public:
       ));
 
   virtual CORBA::TCKind current_member_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -85,7 +85,7 @@ public:
       ));
 
   virtual DynamicAny::NameValuePairSeq *get_members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -93,7 +93,7 @@ public:
 
   virtual void set_members (
       const DynamicAny::NameValuePairSeq& value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -102,7 +102,7 @@ public:
       ));
 
   virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -110,7 +110,7 @@ public:
 
   virtual void set_members_as_dyn_any (
       const DynamicAny::NameDynAnyPairSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -122,7 +122,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -131,7 +131,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -139,21 +139,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -163,12 +163,12 @@ public:
 private:
   /// Check if the typecode is acceptable.
   void check_typecode (CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL);
+                      );
 
   /// Code common to the constructor from an Any arg and the member
   /// function from_any().
   void set_from_any (const CORBA::Any &any
-                     ACE_ENV_ARG_DECL);
+                    );
 
   /// Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 9f649f62e11..0ca2d0f5541 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -37,18 +37,16 @@ TAO_DynUnion_i::init_common (void)
 }
 
 void
-TAO_DynUnion_i::init (const CORBA::Any& any
-                      ACE_ENV_ARG_DECL)
+TAO_DynUnion_i::init (const CORBA::Any& any)
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  );
 
   if (kind != CORBA::tk_union)
     {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+      throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
     }
 
   // Initialize the typecode holder.
@@ -59,21 +57,18 @@ TAO_DynUnion_i::init (const CORBA::Any& any
   // Set the from_factory arg to TRUE, so any problems will throw
   // InconsistentTypeCode.
   this->set_from_any (any
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                     );
 }
 
 void
-TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc
-                      ACE_ENV_ARG_DECL)
+TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  );
 
   if (kind != CORBA::tk_union)
     {
-      ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ());
+      throw DynamicAny::DynAnyFactory::InconsistentTypeCode ();
     }
 
   // Initialize the typecode holder and current index.
@@ -83,25 +78,39 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc
 
   // member_type()/member_label() do not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-  TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_DynAnyFactory::strip_alias (this->type_.in ());
 
   CORBA::Any_var first_label =
-    unaliased_tc->member_label (this->current_position_
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    unaliased_tc->member_label (this->current_position_);
 
   // Initialize the discriminator to the label value of the first member.
-  this->discriminator_ =
-    TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
-      first_label.in ()._tao_get_typecode (),
-      first_label.in ());
+  CORBA::TypeCode_var disc_tc = unaliased_tc->discriminator_type ();
+  CORBA::TCKind disc_kind = TAO_DynAnyFactory::unalias (disc_tc.in ());
+  if (disc_kind == CORBA::tk_enum)
+    {
+      // incase the discriminator is an enum type we have to walk
+      // a slightly more complex path because enum labels are
+      // stored as ulong in the union tc
+      this->discriminator_ =
+        TAO::MakeDynAnyUtils::make_dyn_any_t<CORBA::TypeCode_ptr> (
+          disc_tc.in (),
+          disc_tc.in ());
+      CORBA::ULong label_val;
+      first_label >>= label_val;
+      TAO_DynEnum_i::_narrow (this->discriminator_.in ())
+                                    ->set_as_ulong (label_val);
+    }
+  else
+    {
+      this->discriminator_ =
+        TAO::MakeDynAnyUtils::make_dyn_any_t<const CORBA::Any&> (
+          first_label.in ()._tao_get_typecode (),
+          first_label.in ());
+    }
 
   CORBA::TypeCode_var first_type =
     unaliased_tc->member_type (this->current_position_
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              );
 
   // Recursively initialize the member to its default value.
   this->member_ =
@@ -113,8 +122,7 @@ TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc
 // ****************************************************************
 
 TAO_DynUnion_i *
-TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref
-                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref)
 {
   if (CORBA::is_nil (_tao_objref))
     {
@@ -127,8 +135,7 @@ TAO_DynUnion_i::_narrow (CORBA::Object_ptr _tao_objref
 // This code is common to from_any() and the init() overload that takes
 // an Any argument.
 void
-TAO_DynUnion_i::set_from_any (const CORBA::Any & any
-                              ACE_ENV_ARG_DECL)
+TAO_DynUnion_i::set_from_any (const CORBA::Any & any)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -140,12 +147,10 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
   //
   CORBA::TypeCode_var tc =
    TAO_DynAnyFactory::strip_alias (any._tao_get_typecode ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 
   CORBA::TypeCode_var disc_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    tc->discriminator_type ();
 
   CORBA::Any disc_any;
   TAO::Unknown_IDL_Type *unk = 0;
@@ -179,8 +184,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
   // Need this here because we might have been called from init().
   if (!CORBA::is_nil (this->discriminator_.in ()))
     {
-      this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->discriminator_->destroy ();
     }
 
   // Set the discriminator.
@@ -192,17 +196,14 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
   // Move to the next field in the CDR stream.
   (void) TAO_Marshal_Object::perform_skip (disc_tc.in (),
                                            &in
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          );
 
   CORBA::TypeCode_var unaliased =
     TAO_DynAnyFactory::strip_alias (tc.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   CORBA::ULong const count =
-    unaliased->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    unaliased->member_count ();
 
   CORBA::Boolean match = false;
   CORBA::ULong i;
@@ -211,13 +212,11 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
   for (i = 0; i < count; ++i)
     {
       CORBA::Any_var label_any = tc->member_label (i
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                  );
 
       match = this->label_match (label_any.in (),
                                  disc_any
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                );
 
       if (match)
         {
@@ -228,16 +227,14 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
   // Need this here because we might have been called from init().
   if (!CORBA::is_nil (this->member_.in ()))
     {
-      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->member_->destroy ();
     }
 
   if (match)
     {
       CORBA::TypeCode_var member_tc =
         tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                        );
 
       CORBA::Any member_any;
       TAO::Unknown_IDL_Type *unk = 0;
@@ -261,17 +258,14 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
       // default_index() does not work with aliased type codes.
       CORBA::TypeCode_var unaliased_tc =
         TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                       );
 
       CORBA::Long default_index =
-        unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        unaliased_tc->default_index ();
 
       if (default_index == -1)
         {
-           set_to_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-           ACE_CHECK;
+           set_to_no_active_member ();
         }
       else
         {
@@ -279,8 +273,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
 
           CORBA::TypeCode_var default_tc =
             tc->member_type (index
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                            );
 
           CORBA::Any default_any;
           TAO::Unknown_IDL_Type *unk = 0;
@@ -302,7 +295,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any
 // ****************************************************************
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::get_discriminator (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::get_discriminator (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -317,14 +310,13 @@ TAO_DynUnion_i::get_discriminator (ACE_ENV_SINGLE_ARG_DECL)
   // Set the flag so the caller can't destroy.
   this->set_flag (this->discriminator_.in (),
                   0
-                  ACE_ENV_ARG_PARAMETER);
+                 );
 
   return DynamicAny::DynAny::_duplicate (this->discriminator_.in ());
 }
 
 void
-TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
-                                   ACE_ENV_ARG_DECL)
+TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -332,31 +324,26 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
-  CORBA::TypeCode_var tc = value->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TypeCode_var tc = value->type ();
 
   CORBA::TypeCode_var disc_tc =
-    this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->discriminator_->type ();
 
   CORBA::Boolean equivalent = disc_tc->equivalent (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  );
 
   if (!equivalent)
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 
-  CORBA::Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Any_var value_any = value->to_any ();
 
   CORBA::ULong length =
-    this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->type_->member_count ();
 
   CORBA::Any_var label_any;
   CORBA::ULong i;
@@ -364,21 +351,18 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
   // member_label() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   CORBA::Boolean match = 0;
 
   for (i = 0; i < length; ++i)
     {
       label_any = unaliased_tc->member_label (i
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                             );
 
       match = this->label_match (label_any.in (),
                                  value_any.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                );
 
       if (match)
         {
@@ -397,17 +381,14 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
 
       // If we got a match, a named member will be active.
       this->discriminator_->from_any (label_any.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     );
 
       // member_type() does not work with aliased type codes.
       CORBA::TypeCode_var member_tc =
         unaliased_tc->member_type (i
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                  );
 
-      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->member_->destroy ();
 
       // Initialize member to default value.
       this->member_ =
@@ -426,25 +407,21 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
       // default_index() does not work with aliased type codes.
       CORBA::TypeCode_var unaliased_tc =
         TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                       );
 
       // If no match, either the default member or no member is active.
       CORBA::Long default_index =
-        unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        unaliased_tc->default_index ();
 
       if (default_index == -1)
         {
           // This can't throw InvalidValue - if there's no default case
           // and all possible labels are used, we'd have had a match above.
-          this->set_to_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->set_to_no_active_member ();
         }
       else
         {
-          this->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->set_to_default_member ();
 
           this->member_slot_ = static_cast<CORBA::ULong> (default_index);
         }
@@ -452,15 +429,13 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
 
   // If we get here, we update the discriminator no matter what.
   // Any value will correspond to one of the three cases above.
-  this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->discriminator_->destroy ();
 
-  this->discriminator_ = value->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->discriminator_ = value->copy ();
 }
 
 void
-TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::set_to_default_member (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -468,23 +443,21 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   // default_index() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   CORBA::Long default_index =
-    unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    unaliased_tc->default_index ();
 
   if (default_index == -1)
     {
       // No explicit default case.
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
   else
     {
@@ -492,11 +465,9 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
 
       CORBA::TypeCode_var default_tc =
         unaliased_tc->member_type (index
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                  );
 
-      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->member_->destroy ();
 
       this->member_ =
         TAO::MakeDynAnyUtils::make_dyn_any_t<CORBA::TypeCode_ptr> (
@@ -512,7 +483,7 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::set_to_no_active_member (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -520,49 +491,43 @@ TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   // default_index() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   CORBA::Long default_index =
-    unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    unaliased_tc->default_index ();
 
   // Throw an exception is there is an explicit default case or if all
   // possible case label values are used.
   if (default_index != -1)
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
   else
     {
       CORBA::TypeCode_var disc_tc =
-        this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->discriminator_->type ();
 
       CORBA::TCKind kind =
         TAO_DynAnyFactory::unalias (disc_tc.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   );
 
       if (kind == CORBA::tk_enum)
         {
           CORBA::ULong const member_count =
-            this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+            this->type_->member_count ();
 
           CORBA::ULong const label_count =
-            disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+            disc_tc->member_count ();
 
           if (member_count == label_count)
             {
-              ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+              throw DynamicAny::DynAny::TypeMismatch ();
             }
         }
     }
@@ -573,7 +538,7 @@ TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO_DynUnion_i::has_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::has_no_active_member (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -590,7 +555,7 @@ TAO_DynUnion_i::has_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::discriminator_kind (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -602,18 +567,16 @@ TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::TypeCode_var tc =
-    this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+    this->discriminator_->type ();
 
   CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+                                                    );
 
   return retval;
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::member (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::member (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -626,8 +589,7 @@ TAO_DynUnion_i::member (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Boolean has_no_active_member =
-    this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+    this->has_no_active_member ();
 
   if (has_no_active_member)
     {
@@ -639,14 +601,13 @@ TAO_DynUnion_i::member (ACE_ENV_SINGLE_ARG_DECL)
   // Set the flag so the caller can't destroy.
   this->set_flag (this->member_.in (),
                   0
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+                 );
 
   return DynamicAny::DynAny::_duplicate (this->member_.in ());
 }
 
 char *
-TAO_DynUnion_i::member_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::member_name (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -659,8 +620,7 @@ TAO_DynUnion_i::member_name (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Boolean has_no_active_member =
-    this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->has_no_active_member ();
 
   if (has_no_active_member)
     {
@@ -669,14 +629,13 @@ TAO_DynUnion_i::member_name (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   const char *retval = this->type_->member_name (this->member_slot_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                );
 
   return CORBA::string_dup (retval);
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::member_kind (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -689,8 +648,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Boolean has_no_active_member =
-    this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+    this->has_no_active_member ();
 
   if (has_no_active_member)
     {
@@ -699,12 +657,10 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::TypeCode_var tc =
-    this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+    this->member_->type ();
 
   CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::tk_null);
+                                                    );
 
   return retval;
 }
@@ -712,8 +668,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
 // ****************************************************************
 
 void
-TAO_DynUnion_i::from_any (const CORBA::Any& any
-                          ACE_ENV_ARG_DECL)
+TAO_DynUnion_i::from_any (const CORBA::Any& any)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -722,14 +677,13 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 
   if (equivalent)
     {
@@ -742,17 +696,16 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any
       // Set the from_factory arg to FALSE, so any problems will throw
       // TypeMismatch.
       this->set_from_any (any
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                         );
     }
   else
     {
-      ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
+      throw DynamicAny::DynAny::TypeMismatch ();
     }
 }
 
 CORBA::Any_ptr
-TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::to_any (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -768,12 +721,10 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   // Add the discriminator to the CDR stream.
 
   CORBA::TypeCode_var disc_tc =
-    this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->discriminator_->type ();
 
   CORBA::Any_var disc_any =
-    this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->discriminator_->to_any ();
 
   TAO::Any_Impl *disc_any_impl = disc_any->impl ();
   TAO_OutputCDR disc_out_cdr;
@@ -796,19 +747,16 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   (void) TAO_Marshal_Object::perform_append (disc_tc.in (),
                                              &disc_in_cdr,
                                              &out_cdr
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                            );
 
   // Add the member to the CDR stream unless it has no active member.
   if (this->has_no_active_member () == 0)
     {
       CORBA::TypeCode_var member_tc =
-        this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->member_->type ();
 
       CORBA::Any_var member_any =
-        this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->member_->to_any ();
 
       TAO::Any_Impl *member_any_impl = member_any->impl ();
       TAO_OutputCDR member_out_cdr;
@@ -831,8 +779,7 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
       (void) TAO_Marshal_Object::perform_append (member_tc.in (),
                                                 &member_in_cdr,
                                                 &out_cdr
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                               );
     }
 
   // Make the Any.
@@ -842,22 +789,19 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (retval,
                     CORBA::Any,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   TAO::Unknown_IDL_Type *unk = 0;
   ACE_NEW_THROW_EX (unk,
                     TAO::Unknown_IDL_Type (this->type_.in (),
                                            in_cdr),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   retval->replace (unk);
   return retval;
 }
 
 CORBA::Boolean
-TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
-                       ACE_ENV_ARG_DECL)
+TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -869,8 +813,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
     }
 
   TAO_DynUnion_i *impl = TAO_DynUnion_i::_narrow (rhs
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                 );
 
   if (impl == 0)
     {
@@ -878,9 +821,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
     }
 
   CORBA::Boolean equivalent =
-    this->type_->equivalent (impl->type_.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->type_->equivalent (impl->type_.in ());
 
   if (!equivalent)
     {
@@ -888,14 +829,10 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
     }
 
   CORBA::Boolean member_equal =
-    this->member_->equal (impl->member_.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->member_->equal (impl->member_.in ());
 
   CORBA::Boolean disc_equal =
-    this->discriminator_->equal (impl->discriminator_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->discriminator_->equal (impl->discriminator_.in ());
 
   impl->_remove_ref ();
 
@@ -903,14 +840,14 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynUnion_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::destroy (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   if (this->destroyed_)
     {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+      throw ::CORBA::OBJECT_NOT_EXIST ();
     }
 
   if (!this->ref_to_component_ || this->container_is_destroying_)
@@ -919,26 +856,22 @@ TAO_DynUnion_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
 
       this->set_flag (this->member_.in (),
                       1
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                     );
 
-      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->member_->destroy ();
 
       this->set_flag (this->discriminator_.in (),
                       1
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                     );
 
-      this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->discriminator_->destroy ();
 
       this->destroyed_ = 1;
     }
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::current_component (void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -954,8 +887,7 @@ TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->set_flag (this->member_.in (),
                       0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+                     );
 
       return DynamicAny::DynAny::_duplicate (this->member_.in ());
     }
@@ -963,8 +895,7 @@ TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->set_flag (this->discriminator_.in (),
                       0
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
+                     );
 
       return DynamicAny::DynAny::_duplicate (this->discriminator_.in ());
     }
@@ -975,7 +906,7 @@ TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
 CORBA::Boolean
 TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
                              const CORBA::Any &other_any
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -986,8 +917,7 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
   CORBA::TypeCode_var tc = my_any.type ();
 
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                  );
 
   // No need to do any type checking - it was done before this
   // call was made.
@@ -1025,7 +955,37 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
         CORBA::ULong my_val;
         CORBA::ULong other_val;
         my_any >>= my_val;
-        other_any >>= other_val;
+
+        // check whether the discriminator is possibly an enum type
+        // since these get stored as ulong label values as well
+        CORBA::TypeCode_var other_tc = other_any.type ();
+        CORBA::TCKind kind = TAO_DynAnyFactory::unalias (other_tc.in ());
+        if (kind == CORBA::tk_enum)
+          {
+            TAO::Any_Impl *other_impl = other_any.impl ();
+
+            if (other_impl->encoded ())
+              {
+                TAO::Unknown_IDL_Type *other_unk =
+                  dynamic_cast<TAO::Unknown_IDL_Type *> (other_impl);
+
+                // We don't want unk's rd_ptr to move, in case we are
+                // shared by another Any, so we use this to copy the
+                // state, not the buffer.
+                TAO_InputCDR for_reading (other_unk->_tao_get_cdr ());
+                for_reading.read_ulong (other_val);
+              }
+            else
+              {
+                TAO_OutputCDR other_out;
+                other_impl->marshal_value (other_out);
+                TAO_InputCDR other_in (other_out);
+                other_in.read_ulong (other_val);
+              }
+          }
+        else
+          other_any >>= other_val;
+
         return my_val == other_val;
       }
     case CORBA::tk_boolean:
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index e3498b65ef9..28ac989dd3b 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -51,20 +51,20 @@ public:
   ~TAO_DynUnion_i (void);
 
   /// Constructor taking an Any argument.
-  void init (const CORBA::Any& any ACE_ENV_ARG_DECL);
+  void init (const CORBA::Any& any);
 
   /// Constructor taking a typecode argument.
-  void init (CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL);
+  void init (CORBA::TypeCode_ptr tc);
 
   // = LocalObject methods.
   static TAO_DynUnion_i *_narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   // = Functions specific to DynUnion.
 
   virtual DynamicAny::DynAny_ptr get_discriminator (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -72,7 +72,7 @@ public:
 
   virtual void set_discriminator (
       DynamicAny::DynAny_ptr d
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -80,7 +80,7 @@ public:
       ));
 
   virtual void set_to_default_member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -88,7 +88,7 @@ public:
       ));
 
   virtual void set_to_no_active_member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -96,21 +96,21 @@ public:
       ));
 
   virtual CORBA::Boolean has_no_active_member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::TCKind discriminator_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr member (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -118,7 +118,7 @@ public:
       ));
 
   virtual char * member_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -126,7 +126,7 @@ public:
       ));
 
   virtual CORBA::TCKind member_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -137,7 +137,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -146,7 +146,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -154,21 +154,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -179,7 +179,7 @@ private:
   /// Code common to the constructor from an Any arg and the member
   /// function from_any().
   void set_from_any (const CORBA::Any &any
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -192,7 +192,7 @@ private:
   /// Iterative check for label value match.
   CORBA::Boolean label_match (const CORBA::Any &my_any,
                               const CORBA::Any &other_any
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                              )
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp
index d11b799ccde..b5183908461 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp
@@ -18,7 +18,7 @@ TAO_DynValueBox_i::~TAO_DynValueBox_i (void)
 
 CORBA::Any *
 TAO_DynValueBox_i::get_boxed_value (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -31,7 +31,7 @@ TAO_DynValueBox_i::get_boxed_value (
 void
 TAO_DynValueBox_i::set_boxed_value (
     const CORBA::Any & /* boxed */
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -39,12 +39,12 @@ TAO_DynValueBox_i::set_boxed_value (
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 DynamicAny::DynAny_ptr
 TAO_DynValueBox_i::get_boxed_value_as_dyn_any (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -58,14 +58,14 @@ TAO_DynValueBox_i::get_boxed_value_as_dyn_any (
 void
 TAO_DynValueBox_i::set_boxed_value_as_dyn_any (
     DynamicAny::DynAny_ptr /* boxed */
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynValueBox_i.h b/TAO/tao/DynamicAny/DynValueBox_i.h
index b2ca46aec92..4a8bd9c6895 100644
--- a/TAO/tao/DynamicAny/DynValueBox_i.h
+++ b/TAO/tao/DynamicAny/DynValueBox_i.h
@@ -45,34 +45,34 @@ public:
   ~TAO_DynValueBox_i (void);
 
   virtual CORBA::Any * get_boxed_value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       ));
-  
+
   virtual void set_boxed_value (
       const CORBA::Any & boxed
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
         DynamicAny::DynAny::InvalidValue
       ));
-  
+
   virtual DynamicAny::DynAny_ptr get_boxed_value_as_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       ));
-  
+
   virtual void set_boxed_value_as_dyn_any (
       DynamicAny::DynAny_ptr boxed
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.cpp b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
index ba824c12188..6f0aabaaccc 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.cpp
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.cpp
@@ -18,32 +18,32 @@ TAO_DynValueCommon_i::~TAO_DynValueCommon_i (void)
 
 CORBA::Boolean
 TAO_DynValueCommon_i::is_null (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
 }
-  
+
 void
 TAO_DynValueCommon_i::set_to_null (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
-  
+
 void
 TAO_DynValueCommon_i::set_to_value (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynValueCommon_i.h b/TAO/tao/DynamicAny/DynValueCommon_i.h
index 67fb719f242..654619bcc04 100644
--- a/TAO/tao/DynamicAny/DynValueCommon_i.h
+++ b/TAO/tao/DynamicAny/DynValueCommon_i.h
@@ -43,21 +43,21 @@ public:
   TAO_DynValueCommon_i (void);
 
   ~TAO_DynValueCommon_i (void);
-    
+
   virtual CORBA::Boolean is_null (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
   virtual void set_to_null (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
   virtual void set_to_value (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp
index 60bcd9dd209..2db1ded4b65 100644
--- a/TAO/tao/DynamicAny/DynValue_i.cpp
+++ b/TAO/tao/DynamicAny/DynValue_i.cpp
@@ -18,7 +18,7 @@ TAO_DynValue_i::~TAO_DynValue_i (void)
 
 char *
 TAO_DynValue_i::current_member_name (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -30,7 +30,7 @@ TAO_DynValue_i::current_member_name (
 
 CORBA::TCKind
 TAO_DynValue_i::current_member_kind (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -43,7 +43,7 @@ TAO_DynValue_i::current_member_kind (
 
 DynamicAny::NameValuePairSeq *
 TAO_DynValue_i::get_members (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -54,19 +54,19 @@ TAO_DynValue_i::get_members (
 void
 TAO_DynValue_i::set_members (
     const DynamicAny::NameValuePairSeq & /* value */
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 DynamicAny::NameDynAnyPairSeq *
 TAO_DynValue_i::get_members_as_dyn_any (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -77,14 +77,14 @@ TAO_DynValue_i::get_members_as_dyn_any (
 void
 TAO_DynValue_i::set_members_as_dyn_any (
     const DynamicAny::NameDynAnyPairSeq & /* value */
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicAny/DynValue_i.h b/TAO/tao/DynamicAny/DynValue_i.h
index ebcba525df5..205073b735c 100644
--- a/TAO/tao/DynamicAny/DynValue_i.h
+++ b/TAO/tao/DynamicAny/DynValue_i.h
@@ -45,45 +45,45 @@ public:
   ~TAO_DynValue_i (void);
 
   virtual char * current_member_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
         DynamicAny::DynAny::InvalidValue
       ));
-  
+
   virtual CORBA::TCKind current_member_kind (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
         DynamicAny::DynAny::InvalidValue
       ));
-  
+
   virtual DynamicAny::NameValuePairSeq * get_members (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
   virtual void set_members (
       const DynamicAny::NameValuePairSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
         DynamicAny::DynAny::InvalidValue
       ));
-  
+
   virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  
+
   virtual void set_members_as_dyn_any (
       const DynamicAny::NameDynAnyPairSeq & value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index 2bf234a3a27..99c4133f520 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -23,8 +23,7 @@ TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void)
 CORBA::Object_ptr
 TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr,
                                       int,
-                                      ACE_TCHAR *[]
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      ACE_TCHAR *[])
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index 652f52939f9..cf5aa46991c 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -39,8 +39,7 @@ public:
   /// Creates a DynamicAny factory and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           ACE_TCHAR *argv [])
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to force the initialization of the ORB code.
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index f437ba7fb80..dde0661c6fe 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -44,7 +44,7 @@ CORBA::Context::_decr_refcnt (void)
 }
 
 const char *
-CORBA::Context::context_name (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::Context::context_name (void) const
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                          CORBA::COMPLETED_NO),
@@ -52,7 +52,7 @@ CORBA::Context::context_name (ACE_ENV_SINGLE_ARG_DECL) const
 }
 
 CORBA::Context_ptr
-CORBA::Context::parent (ACE_ENV_SINGLE_ARG_DECL) const
+CORBA::Context::parent (void) const
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                          CORBA::COMPLETED_NO),
@@ -61,47 +61,37 @@ CORBA::Context::parent (ACE_ENV_SINGLE_ARG_DECL) const
 
 void
 CORBA::Context::create_child (const char * /* child_ctx_name */,
-                              CORBA::Context_out /* child_ctx */
-                              ACE_ENV_ARG_DECL)
+                              CORBA::Context_out /* child_ctx */)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
+  throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
 void
 CORBA::Context::set_one_value (const char * /* propname */,
-                               const CORBA::Any & /* propvalue */
-                               ACE_ENV_ARG_DECL)
+                               const CORBA::Any & /* propvalue */)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
+  throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
 void
-CORBA::Context::set_values (CORBA::NVList_ptr
-                            ACE_ENV_ARG_DECL)
+CORBA::Context::set_values (CORBA::NVList_ptr)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
+  throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
 void
-CORBA::Context::delete_values (const char * /* propname */
-                               ACE_ENV_ARG_DECL)
+CORBA::Context::delete_values (const char * /* propname */)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
+  throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
 void
 CORBA::Context::get_values (const char * /* start_scope */,
                             CORBA::Flags /* op_flags */,
                             const char * /* pattern */,
-                            CORBA::NVList_ptr & /* values */
-                            ACE_ENV_ARG_DECL)
+                            CORBA::NVList_ptr & /* values */)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
-                                  CORBA::COMPLETED_NO));
+  throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO);
 }
 
 CORBA::ContextList::ContextList (CORBA::ULong len,
@@ -142,8 +132,7 @@ CORBA::ContextList::add_consume (char *ctx)
 }
 
 char *
-CORBA::ContextList::item (CORBA::ULong slot
-                         ACE_ENV_ARG_DECL)
+CORBA::ContextList::item (CORBA::ULong slot)
 {
   char **ctx = 0;
 
@@ -159,10 +148,9 @@ CORBA::ContextList::item (CORBA::ULong slot
 }
 
 void
-CORBA::ContextList::remove (CORBA::ULong
-                           ACE_ENV_ARG_DECL)
+CORBA::ContextList::remove (CORBA::ULong)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::ContextList_ptr
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 7ad9c97795d..8be691e8c81 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -53,8 +53,6 @@ namespace CORBA
   class NVList;
   typedef NVList *NVList_ptr;
 
-  class Environment;
-
   typedef TAO_Pseudo_Var_T<Context> Context_var;
   typedef TAO_Pseudo_Out_T<Context> Context_out;
 
@@ -92,29 +90,29 @@ namespace CORBA
     // = All the spec-required functions below will just throw a
     //   CORBA::NO_IMPLEMENT exception and do nothing else.
 
-    const char *context_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+    const char *context_name (void) const;
 
-    CORBA::Context_ptr parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+    CORBA::Context_ptr parent (void) const;
 
     void create_child (const char *child_ctx_name,
                        CORBA::Context_out child_ctx
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       );
 
     void set_one_value (const char *propname,
                         const CORBA::Any &propvalue
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                        );
 
     void set_values (CORBA::NVList_ptr values
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     );
 
     void delete_values (const char *propname
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                        );
 
     void get_values (const char *start_scope,
                      CORBA::Flags op_flags,
                      const char *pattern,
                      CORBA::NVList_ptr &values
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     );
 
     // Useful for template programming.
     typedef CORBA::Context_ptr _ptr_type;
@@ -170,11 +168,11 @@ namespace CORBA
 
     /// Return the typecode at slot i. Raises the "Bounds" exception.
     char *item (CORBA::ULong slot
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                );
 
     /// Remove the typecode at slot i. Raises the "Bounds" exception.
     void remove (CORBA::ULong slot
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                 );
 
     /// Increment and decrement ref counts.
     void _incr_refcnt (void);
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index 3118f59a81d..fc433181a84 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -24,26 +24,22 @@ namespace TAO
   CORBA::Boolean
   NamedValue_Argument::demarshal (TAO_InputCDR &cdr)
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
         if (this->x_ !=0 && this->x_->value ()->impl ())
           {
             this->x_->value ()->impl ()->_tao_decode (cdr
-                                                      ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                                                     );
           }
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
-        return 0;
+        return false;
       }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (false);
 
     this->byte_order_ = cdr.byte_order ();
 
-    return 1;
+    return true;
   }
 
   void
@@ -57,30 +53,25 @@ namespace TAO
   CORBA::Boolean
   NVList_Argument::marshal (TAO_OutputCDR &cdr)
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
         this->x_->_tao_encode (cdr,
                                CORBA::ARG_IN | CORBA::ARG_INOUT
-                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              );
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
-        return 0;
+        return false;
       }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (false);
 
-    return 1;
+    return true;
   }
 
   CORBA::Boolean
   NVList_Argument::demarshal (TAO_InputCDR &cdr)
   {
 
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+    try
       {
         // Now, get all the "return", "out", and "inout" parameters
         // from the response message body ... return parameter is
@@ -92,17 +83,14 @@ namespace TAO
             cdr,
             CORBA::ARG_OUT | CORBA::ARG_INOUT,
             this->lazy_evaluation_
-            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+           );
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
-        return 0;
+        return false;
       }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (false);
 
-    return 1;
+    return true;
   }
 
   void
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
index ec8e6788bef..7a0968c2b0a 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp
@@ -16,9 +16,7 @@ void
 TAO_DII_Arguments_Converter_Impl::convert (
     TAO_ServerRequest & server_request,
     TAO::Argument * const args[],
-    size_t nargs
-    ACE_ENV_ARG_DECL
-  )
+    size_t nargs)
 {
   // The DII requests on client side always have two arguments
   // - one is the return argument and the other is NVList_Argument.
@@ -34,14 +32,14 @@ TAO_DII_Arguments_Converter_Impl::convert (
   // get_in_arg () from the oneway operation with multiple "IN"
   // parameters.
   CORBA::NVList_ptr lst
-    = static_cast<TAO::NVList_Argument *> (server_request.operation_details ()->args()[1])->arg ();
+    = static_cast<TAO::NVList_Argument *> (
+        server_request.operation_details ()->args()[1])->arg ();
 
-  CORBA::ULong const sz = lst->count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ULong const sz = lst->count ();
 
   if (sz != nargs - 1)
     {
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw ::CORBA::BAD_PARAM ();
     }
 
   // To avoid the use of extraction operators on CORBA::Any, we will
@@ -50,12 +48,11 @@ TAO_DII_Arguments_Converter_Impl::convert (
   TAO_OutputCDR output;
   for (CORBA::ULong i = 0; i < sz; ++i)
     {
-      CORBA::NamedValue_ptr theitem = lst->item (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr theitem = lst->item (i);
 
       if (!(theitem->value ()->impl ()->marshal_value (output)))
         {
-          ACE_THROW (CORBA::BAD_PARAM ());
+          throw ::CORBA::BAD_PARAM ();
         }
     }
 
@@ -64,7 +61,7 @@ TAO_DII_Arguments_Converter_Impl::convert (
     {
       if (!(args[j + 1]->demarshal (input)))
         {
-          ACE_THROW (CORBA::BAD_PARAM ());
+          throw ::CORBA::BAD_PARAM ();
         }
     }
 
diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
index 682c636b9dd..9d9f9e360e8 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
+++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h
@@ -34,19 +34,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief DII_Arguments_Converter_Impl.
  *
- * This class provides the implementation to expand the DII arguments in NVList 
- * to the list of arguments. 
+ * This class provides the implementation to expand the DII arguments in NVList
+ * to the list of arguments.
  */
 class TAO_DynamicInterface_Export TAO_DII_Arguments_Converter_Impl
   : public TAO_DII_Arguments_Converter
 {
 public:
 
-  virtual void convert ( TAO_ServerRequest & server_request,
-                         TAO::Argument * const args[],
-                         size_t nargs
-                         ACE_ENV_ARG_DECL );
- 
+  virtual void convert (TAO_ServerRequest & server_request,
+                        TAO::Argument * const args[],
+                        size_t nargs);
+
   // Used to force the initialization of the ORB code.
   static int Initializer (void);
 };
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 9e7d14808c8..0035b79a946 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -48,13 +48,12 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
   Dynamic::ParameterList *
-  DII_Invocation::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  DII_Invocation::arguments (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Generate the argument list on demand.
     Dynamic::ParameterList *parameter_list =
-      TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      TAO_RequestInfo_Util::make_parameter_list ();
 
     Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
@@ -75,17 +74,14 @@ namespace TAO
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
   Invocation_Status
-  DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time
-                                     ACE_ENV_ARG_DECL)
+  DII_Invocation::remote_invocation (ACE_Time_Value *max_wait_time)
     ACE_THROW_SPEC ((CORBA::Exception))
   {
-    return Synch_Twoway_Invocation::remote_twoway (max_wait_time
-                                                   ACE_ENV_ARG_PARAMETER);
+    return Synch_Twoway_Invocation::remote_twoway (max_wait_time);
   }
 
   Invocation_Status
-  DII_Invocation::handle_user_exception (TAO_InputCDR &cdr
-                                         ACE_ENV_ARG_DECL)
+  DII_Invocation::handle_user_exception (TAO_InputCDR &cdr)
     ACE_THROW_SPEC ((CORBA::Exception))
   {
     Reply_Guard mon (this,
@@ -121,11 +117,9 @@ namespace TAO
       {
           CORBA::TypeCode_var tc =
             this->excp_list_->item (i
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                                   );
 
-          const char *xid = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+          const char *xid = tc->id ();
 
           if (ACE_OS::strcmp (buf.in (), xid) != 0)
             {
@@ -156,7 +150,6 @@ namespace TAO
     // are being used in a TAO gateway.
     this->host_->raw_user_exception (cdr);
 
-
     mon.set_status (TAO_INVOKE_USER_EXCEPTION);
 
     // @@ It would seem that if the remote exception is a
@@ -184,19 +177,17 @@ namespace TAO
                                 response_expected)
       , host_ (req)
   {
-
   }
 
 #if TAO_HAS_INTERCEPTORS == 1
   //@NOTE: Need to figure a way to share this code
   Dynamic::ParameterList *
-  DII_Deferred_Invocation::arguments (ACE_ENV_SINGLE_ARG_DECL)
+  DII_Deferred_Invocation::arguments (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Generate the argument list on demand.
     Dynamic::ParameterList *parameter_list =
-      TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
+      TAO_RequestInfo_Util::make_parameter_list ();
 
     Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
@@ -217,17 +208,12 @@ namespace TAO
 #endif /* TAO_HAS_INTERCEPTORS == 1*/
 
   Invocation_Status
-  DII_Deferred_Invocation::remote_invocation (
-      ACE_Time_Value *max_wait_time
-      ACE_ENV_ARG_DECL
-    )
+  DII_Deferred_Invocation::remote_invocation (ACE_Time_Value *max_wait_time)
     ACE_THROW_SPEC ((CORBA::Exception))
   {
     this->safe_rd_->transport (this->resolver_.transport ());
 
-    return Asynch_Remote_Invocation::remote_invocation (
-        max_wait_time
-        ACE_ENV_ARG_PARAMETER);
+    return Asynch_Remote_Invocation::remote_invocation (max_wait_time);
   }
 }
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h
index ebca5adce29..4136f1def2c 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation.h
@@ -40,8 +40,6 @@ namespace Dynamic
 
 namespace TAO
 {
-  /**
-   */
   class TAO_DynamicInterface_Export DII_Invocation:
     public Synch_Twoway_Invocation
   {
@@ -56,20 +54,14 @@ namespace TAO
                     bool response_expected = true);
 
 #if TAO_HAS_INTERCEPTORS ==1
-    virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL)
+    virtual Dynamic::ParameterList *arguments (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
 
-    Invocation_Status remote_invocation (
-        ACE_Time_Value *max_wait_time
-        ACE_ENV_ARG_DECL
-      )
+    Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time)
       ACE_THROW_SPEC ((CORBA::Exception));
 
-    virtual Invocation_Status handle_user_exception (
-        TAO_InputCDR &cdr
-        ACE_ENV_ARG_DECL
-      )
+    virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr)
       ACE_THROW_SPEC ((CORBA::Exception));
   private:
 
@@ -80,10 +72,6 @@ namespace TAO
 
   };
 
-
-  /*
-   *
-   */
   class TAO_DynamicInterface_Export DII_Deferred_Invocation
     : public Asynch_Remote_Invocation
   {
@@ -98,14 +86,11 @@ namespace TAO
                              bool response_expected = true);
 
 #if TAO_HAS_INTERCEPTORS ==1
-    virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL)
+    virtual Dynamic::ParameterList *arguments (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
 
-    Invocation_Status remote_invocation (
-        ACE_Time_Value *max_wait_time
-        ACE_ENV_ARG_DECL
-      )
+    Invocation_Status remote_invocation (ACE_Time_Value *max_wait_time)
       ACE_THROW_SPEC ((CORBA::Exception));
 
   private:
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index f7a29f0bf92..0807baeb46d 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -51,7 +51,7 @@ namespace TAO
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
         ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL)
+        )
   {
     // Simple sanity check
     if (this->mode_ != TAO_DII_INVOCATION ||
@@ -76,8 +76,7 @@ namespace TAO
 
     Invocation_Status status =
       synch.remote_invocation (max_wait_time
-                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                              );
 
 
     if (status == TAO_INVOKE_RESTART &&
@@ -95,8 +94,7 @@ namespace TAO
         this->object_forwarded (effective_target,
                                 r.stub (),
                                 permanent_forward
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                               );
       }
     return status;
   }
@@ -131,7 +129,7 @@ namespace TAO
   DII_Deferred_Invocation_Adapter::invoke (
       TAO::Exception_Data *ex,
       unsigned long ex_count
-      ACE_ENV_ARG_DECL)
+      )
   {
     // New reply dispatcher on the heap, because we will go out of
     // scope and hand over the  reply dispatcher to the ORB.
@@ -144,8 +142,7 @@ namespace TAO
 
     Invocation_Adapter::invoke (ex,
                                 ex_count
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                               );
   }
 
   Invocation_Status
@@ -154,7 +151,7 @@ namespace TAO
       CORBA::Object_var &effective_target,
       Profile_Transport_Resolver &r,
       ACE_Time_Value *&max_wait_time
-      ACE_ENV_ARG_DECL)
+      )
   {
     // Simple sanity check
     if (this->mode_ != TAO_DII_DEFERRED_INVOCATION ||
@@ -180,8 +177,7 @@ namespace TAO
 
     Invocation_Status status =
       synch.remote_invocation (max_wait_time
-                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                              );
 
     if (status == TAO_INVOKE_RESTART)
       {
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
index c5f89bc129e..d8b63cc4dea 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
@@ -36,7 +36,6 @@ class TAO_DII_Deferred_Reply_Dispatcher;
 namespace  CORBA
 {
   class Object;
-  class Environment;
   class SystemException;
   class ExceptionList;
   class Request;
@@ -99,7 +98,7 @@ namespace TAO
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
         ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
+       );
 
   private:
 
@@ -136,7 +135,7 @@ namespace TAO
     /// Invoke the target
     virtual void invoke (TAO::Exception_Data *ex,
                          unsigned long ex_count
-                         ACE_ENV_ARG_DECL);
+                        );
 
 
   protected:
@@ -145,7 +144,7 @@ namespace TAO
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
         ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
+       );
 
   private:
     CORBA::Request *request_;
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index cce81c3d353..3824b8a39ad 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -79,23 +79,20 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
                   ACE_TEXT ("(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n")));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Call the Request back and send the reply data.
       this->req_->handle_response (this->reply_cdr_,
                                    this->reply_status_
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception during reply handler");
+          ex._tao_print_exception ("Exception during reply handler");
         }
     }
-  ACE_ENDTRY;
 
   // This was dynamically allocated. Now the job is done.
   (void) this->decr_refcount ();
@@ -106,9 +103,8 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
 void
 TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Generate a fake exception....
       CORBA::COMM_FAILURE comm_failure (0,
@@ -117,29 +113,23 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
       TAO_OutputCDR out_cdr;
 
       comm_failure._tao_encode (out_cdr
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               );
 
       // Turn into an output CDR
       TAO_InputCDR cdr (out_cdr);
 
       this->req_->handle_response (cdr,
                                    TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
-              "DII_Deferred_Reply_Dispacher::connection_closed"
-            );
+          ex._tao_print_exception (
+            "DII_Deferred_Reply_Dispacher::connection_closed");
         }
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   (void) this->decr_refcount ();
 }
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
index 9f403653bb5..d3963d7bbf3 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
@@ -58,9 +58,7 @@ public:
 
   /// The following methods are not needed for this class..
   virtual void reply_timed_out (void)  {}
-  virtual long schedule_timer (CORBA::ULong ,
-                               const ACE_Time_Value &
-                               ACE_ENV_ARG_DECL_NOT_USED)
+  virtual long schedule_timer (CORBA::ULong , const ACE_Time_Value &)
   {
     return 0;
   }
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index a23c6c4e06e..fba11751451 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -29,7 +29,7 @@ TAO_Dynamic_Adapter_Impl::create_request (
     CORBA::ExceptionList_ptr exceptions,
     CORBA::Request_ptr &request,
     CORBA::Flags req_flags
-    ACE_ENV_ARG_DECL
+
   )
 {
   ACE_NEW_THROW_EX (request,
@@ -40,7 +40,7 @@ TAO_Dynamic_Adapter_Impl::create_request (
                                     result,
                                     req_flags,
                                     exceptions
-                                    ACE_ENV_ARG_PARAMETER),
+                                   ),
                     CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
                             TAO::VMCID,
@@ -54,14 +54,14 @@ CORBA::Request_ptr
 TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj,
                                    CORBA::ORB_ptr orb,
                                    const char *operation
-                                   ACE_ENV_ARG_DECL)
+                                   )
 {
   CORBA::Request_ptr req = CORBA::Request::_nil ();
   ACE_NEW_THROW_EX (req,
                     CORBA::Request (obj,
                                     orb,
                                     operation
-                                    ACE_ENV_ARG_PARAMETER),
+                                   ),
                     CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
                             TAO::VMCID,
@@ -69,7 +69,6 @@ TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj,
                           ),
                         CORBA::COMPLETED_MAYBE
                       ));
-  ACE_CHECK_RETURN (CORBA::Request::_nil ());
 
   return req;
 }
@@ -122,7 +121,7 @@ TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req)
 void
 TAO_Dynamic_Adapter_Impl::create_exception_list (
     CORBA::ExceptionList_ptr &list
-    ACE_ENV_ARG_DECL
+
   )
 {
   ACE_NEW_THROW_EX (list,
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index 9537488f66c..96e66e9dafc 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -58,12 +58,12 @@ public:
                                CORBA::ExceptionList_ptr exceptions,
                                CORBA::Request_ptr &request,
                                CORBA::Flags req_flags
-                               ACE_ENV_ARG_DECL);
+                              );
 
   virtual CORBA::Request_ptr request (CORBA::Object_ptr obj,
                                       CORBA::ORB_ptr orb,
                                       const char *op
-                                      ACE_ENV_ARG_DECL);
+                                     );
 
   // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest.
 
@@ -82,7 +82,7 @@ public:
   // CORBA::ORB::create_exception_list.
 
   virtual void create_exception_list (CORBA::ExceptionList_ptr &list
-                                      ACE_ENV_ARG_DECL);
+                                     );
 
   // Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index 6e09d9ff5fa..18301ed505d 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -20,24 +20,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
 TAO_DynamicImplementation::_is_a (const char *logical_type_id
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   CORBA::RepositoryId_var id =
-    this->get_id_from_primary_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_id_from_primary_interface ();
 
   return ACE_OS::strcmp (logical_type_id, id.in ()) == 0;
 }
 
 CORBA::Object_ptr
-TAO_DynamicImplementation::_this (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynamicImplementation::_this (void)
 {
   // The _this() function returns a CORBA::Object_ptr for the target
   // object. Unlike _this() for static skeletons, its return type is
   // not interface-specific because a DSI servant may very well
   // incarnate multiple CORBA objects of different types.
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  TAO_Stub *stub = this->_create_stub ();
 
   // Create a object.
   CORBA::Object_ptr retval = CORBA::Object::_nil ();
@@ -51,7 +49,7 @@ TAO_DynamicImplementation::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::InterfaceDef_ptr
-TAO_DynamicImplementation::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynamicImplementation::_get_interface (void)
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -65,14 +63,13 @@ TAO_DynamicImplementation::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::RepositoryId_var id =
-    this->get_id_from_primary_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_id_from_primary_interface ();
 
   // This doesn't take multiple ORBs into account, but it's being
   // used only to resolve the IFR, so we should be ok.
   return adapter->get_interface (TAO_ORB_Core_instance ()->orb (),
                                  id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
 }
 
 const char *
@@ -92,7 +89,7 @@ TAO_DynamicImplementation::_downcast (const char *repository_id)
 }
 
 TAO_Stub *
-TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DynamicImplementation::_create_stub (void)
 {
   // If DynamicImplementation::_this() is invoked outside of the
   // context of a request invocation on a target object being served
@@ -115,27 +112,24 @@ TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::PolicyList_var client_exposed_policies =
     poa_current_impl->poa ()->client_exposed_policies (
         poa_current_impl->priority ()
-        ACE_ENV_ARG_PARAMETER
       );
-  ACE_CHECK_RETURN (0);
 
   CORBA::RepositoryId_var pinterface =
     this->_primary_interface (poa_current_impl->object_id (),
                               poa.in ()
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                             );
 
   return
     poa_current_impl->poa ()->key_to_stub (poa_current_impl->object_key (),
                                            pinterface.in (),
                                            poa_current_impl->priority ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
 }
 
 void
 TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
                                       void * /* context */
-                                      ACE_ENV_ARG_DECL)
+                                      )
 {
   // No need to do any of this if the client isn't waiting.
   if (request.response_expected ())
@@ -163,21 +157,19 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
   ACE_NEW (dsi_request,
            CORBA::ServerRequest (request));
 
-  ACE_TRY
+  try
     {
       // Delegate to user.
       this->invoke (dsi_request
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   );
 
       // Only if the client is waiting.
       if (request.response_expected () && !request.sync_with_server ())
         {
-          dsi_request->dsi_marshal (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          dsi_request->dsi_marshal ();
         }
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception& ex)
     {
       // Only if the client is waiting.
       if (request.response_expected () && !request.sync_with_server ())
@@ -185,14 +177,13 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
           request.tao_send_reply_exception (ex);
         }
     }
-  ACE_ENDTRY;
 
   ::CORBA::release (dsi_request);
 }
 
 CORBA::RepositoryId
 TAO_DynamicImplementation::get_id_from_primary_interface (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
 {
   // If this method is called outside of the
@@ -215,7 +206,7 @@ TAO_DynamicImplementation::get_id_from_primary_interface (
 
   return this->_primary_interface (poa_current_impl->object_id (),
                                    poa.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                  );
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index b9c17c21ea2..53b700b7c6e 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -60,7 +60,7 @@ public:
   /// incarnated by the DSI servant and performs the processing
   /// necessary to execute the request.
   virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                       ) = 0;
 
   /// The _primary_interface() method receives an ObjectId value and a
   /// POA_ptr as input parameters and returns a valid RepositoryId
@@ -68,19 +68,19 @@ public:
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     ) = 0;
 
   /// Local implementation of the CORBA::Object::_is_a method.
   virtual CORBA::Boolean _is_a (const char *logical_type_id
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                );
 
   /// Returns a CORBA::Object_ptr for the target object.
-  CORBA::Object_ptr _this (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::Object_ptr _this (void);
 
   /// Query the Interface Repository for the interface definition.
   virtual CORBA::InterfaceDef_ptr _get_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     );
 
 protected:
@@ -92,17 +92,17 @@ protected:
   virtual void *_downcast (const char *repository_id);
 
   /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual TAO_Stub *_create_stub (void);
 
   /// Turns around and calls invoke.
   virtual void _dispatch (TAO_ServerRequest &request,
                           void *context
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                          );
 
 private:
   /// Encapsulates code common to _is_a(), _get_interface() and _create_stub().
   CORBA::RepositoryId get_id_from_primary_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     );
 };
 
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 18de9aee9d0..ee0c7c39354 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -52,8 +52,7 @@ CORBA::ExceptionList::add_consume (CORBA::TypeCode_ptr tc)
 }
 
 CORBA::TypeCode_ptr
-CORBA::ExceptionList::item (CORBA::ULong slot
-                            ACE_ENV_ARG_DECL)
+CORBA::ExceptionList::item (CORBA::ULong slot)
 {
   CORBA::TypeCode_ptr *tc = 0;
 
@@ -69,10 +68,9 @@ CORBA::ExceptionList::item (CORBA::ULong slot
 }
 
 void
-CORBA::ExceptionList::remove (CORBA::ULong
-                              ACE_ENV_ARG_DECL)
+CORBA::ExceptionList::remove (CORBA::ULong)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
+  throw ::CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::ExceptionList_ptr
@@ -97,7 +95,7 @@ CORBA::ExceptionList::_incr_refcnt (void)
 void
 CORBA::ExceptionList::_decr_refcnt (void)
 {
-  CORBA::ULong refcount = --this->ref_count_;
+  CORBA::ULong const refcount = --this->ref_count_;
 
   if (refcount == 0)
     {
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index f88c3eca2d8..1fd0259e5d0 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -97,12 +97,10 @@ namespace CORBA
     void add_consume (CORBA::TypeCode_ptr tc);
 
     /// Return the typecode at slot i. Raises the "Bounds" exception.
-    CORBA::TypeCode_ptr item (CORBA::ULong slot
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    CORBA::TypeCode_ptr item (CORBA::ULong slot);
 
     /// Remove the typecode at slot i. Raises the "Bounds" exception.
-    void remove (CORBA::ULong slot
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    void remove (CORBA::ULong slot);
 
     /// Increment and decrement ref counts.
     void _incr_refcnt (void);
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 324224b21b2..29d4ede56f4 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -73,7 +73,7 @@ CORBA::Request::Request (CORBA::Object_ptr obj,
                          CORBA::NamedValue_ptr result,
                          CORBA::Flags flags,
                          CORBA::ExceptionList_ptr exceptions
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         )
   : target_ (CORBA::Object::_duplicate (obj)),
     orb_ (CORBA::ORB::_duplicate (orb)),
     opname_ (CORBA::string_dup (op)),
@@ -102,7 +102,7 @@ CORBA::Request::Request (CORBA::Object_ptr obj,
 CORBA::Request::Request (CORBA::Object_ptr obj,
                          CORBA::ORB_ptr orb,
                          const CORBA::Char *op
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         )
   : target_ (CORBA::Object::_duplicate (obj)),
     orb_ (CORBA::ORB::_duplicate (orb)),
     opname_ (CORBA::string_dup (op)),
@@ -147,7 +147,7 @@ CORBA::Request::~Request (void)
 // flow in some exotic situations.
 
 void
-CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Request::invoke (void)
 {
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
@@ -170,8 +170,7 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
 
   _tao_call.invoke (0,
                     0
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   );
 
   // If this request was created by a gateway, then result_
   // and/or args_ are shared by a CORBA::ServerRequest, whose
@@ -181,7 +180,7 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Request::send_oneway (void)
 {
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
@@ -206,12 +205,11 @@ CORBA::Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL)
 
   _tao_call.invoke (0,
                     0
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   );
 }
 
 void
-CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Request::send_deferred (void)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -251,14 +249,12 @@ CORBA::Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL)
 
   _tao_call.invoke (0,
                     0
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   );
 }
 
 #if defined (TAO_HAS_AMI)
 void
-CORBA::Request::sendc (CORBA::Object_ptr handler
-                       ACE_ENV_ARG_DECL)
+CORBA::Request::sendc (CORBA::Object_ptr handler)
 {
   TAO::NamedValue_Argument _tao_retval (this->result_);
 
@@ -280,8 +276,7 @@ CORBA::Request::sendc (CORBA::Object_ptr handler
        );
 
   _tao_call.invoke (dynamic_cast<Messaging::ReplyHandler_ptr>(handler),
-                    &CORBA::Request::_tao_reply_stub
-                    ACE_ENV_ARG_PARAMETER);
+                    &CORBA::Request::_tao_reply_stub);
 
 }
 
@@ -289,11 +284,10 @@ void
 CORBA::Request::_tao_reply_stub (TAO_InputCDR &_tao_in,
                                  Messaging::ReplyHandler_ptr rh,
                                  CORBA::ULong reply_status
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
   // Retrieve Reply Handler object.
-  TAO_DII_Reply_Handler* reply_handler = dynamic_cast<TAO_DII_Reply_Handler*> (rh);
-  ACE_CHECK;
+  TAO_DII_Reply_Handler* reply_handler = dynamic_cast<TAO_DII_Reply_Handler*> (rh);\
 
   // Exception handling
   switch (reply_status)
@@ -301,7 +295,7 @@ CORBA::Request::_tao_reply_stub (TAO_InputCDR &_tao_in,
     case TAO_AMI_REPLY_OK:
     case TAO_AMI_REPLY_NOT_OK:
       {
-        reply_handler->handle_response(_tao_in ACE_ENV_ARG_PARAMETER);
+        reply_handler->handle_response(_tao_in);
         break;
       }
     case TAO_AMI_REPLY_USER_EXCEPTION:
@@ -309,7 +303,7 @@ CORBA::Request::_tao_reply_stub (TAO_InputCDR &_tao_in,
       {
         reply_handler->handle_excep (_tao_in,
                                      reply_status
-                                     ACE_ENV_ARG_PARAMETER);
+                                     );
 
         break;
       }
@@ -318,23 +312,21 @@ CORBA::Request::_tao_reply_stub (TAO_InputCDR &_tao_in,
 #endif /* TAO_HAS_AMI */
 
 void
-CORBA::Request::get_response (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Request::get_response (void)
 {
   while (!this->response_received_)
     {
-      (void) this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      (void) this->orb_->perform_work ();
     }
 
   if (this->lazy_evaluation_)
     {
-      this->args_->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->args_->evaluate ();
     }
 }
 
 CORBA::Boolean
-CORBA::Request::poll_response (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Request::poll_response (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
@@ -347,8 +339,7 @@ CORBA::Request::poll_response (ACE_ENV_SINGLE_ARG_DECL)
       // and the response never gets received, so let the ORB do an
       // atom of work, if necessary, each time we poll.
       ACE_Time_Value tv (0, 0);
-      (void) this->orb_->perform_work (&tv ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      (void) this->orb_->perform_work (&tv);
     }
 
   return this->response_received_;
@@ -357,7 +348,7 @@ CORBA::Request::poll_response (ACE_ENV_SINGLE_ARG_DECL)
 void
 CORBA::Request::handle_response (TAO_InputCDR &incoming,
                                  CORBA::ULong reply_status
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
   // If this request was created by a gateway, then result_
   // and/or args_ are shared by a CORBA::ServerRequest, whose
@@ -372,15 +363,13 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming,
         {
           // We can be sure that the impl is a TAO::Unknown_IDL_Type.
           this->result_->value ()->impl ()->_tao_decode (incoming
-                                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                                        );
         }
 
       this->args_->_tao_incoming_cdr (incoming,
                                       CORBA::ARG_OUT | CORBA::ARG_INOUT,
                                       this->lazy_evaluation_
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                     );
 
       {
         ACE_GUARD (TAO_SYNCH_MUTEX,
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 649eb55d98b..b3616024460 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -128,7 +128,7 @@ namespace CORBA
      *       recommended as the user may not be able to propagate the
      *       exceptions.
      */
-    void invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    void invoke (void);
 
     /// Send a oneway request.
     /**
@@ -136,7 +136,7 @@ namespace CORBA
      *       recommended as the user may not be able to propagate the
      *       exceptions.
      */
-    void send_oneway (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    void send_oneway (void);
 
     /**
      * @name The 'deferred synchronous' methods.
@@ -144,15 +144,15 @@ namespace CORBA
      * The 'deferred synchronous' methods.
      */
     //@{
-    void send_deferred (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    void get_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    CORBA::Boolean poll_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    void send_deferred (void);
+    void get_response (void);
+    CORBA::Boolean poll_response (void);
     //@}
 
     /// Callback method for deferred synchronous requests.
   void handle_response (TAO_InputCDR &incoming,
                         CORBA::ULong reply_status
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                        );
 
 #if defined (TAO_HAS_AMI)
   // The 'asychronous' send method. The object is a DSI based callback
@@ -216,12 +216,12 @@ namespace CORBA
              CORBA::NamedValue_ptr result,
              CORBA::Flags flags,
              CORBA::ExceptionList_ptr exceptions
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+             );
 
     Request (CORBA::Object_ptr obj,
              CORBA::ORB_ptr orb,
              const CORBA::Char *op
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+             );
 
     ~Request (void);
 
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index f540c8652d6..ccd7468d82c 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -93,43 +93,37 @@ CORBA::Request::contexts (void)
 ACE_INLINE CORBA::Any &
 CORBA::Request::add_in_arg (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_element (CORBA::ARG_IN)->any_;
 }
 
 ACE_INLINE CORBA::Any &
 CORBA::Request::add_in_arg (const CORBA::Char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_item (name, CORBA::ARG_IN)->any_;
 }
 
 ACE_INLINE CORBA::Any &
 CORBA::Request::add_inout_arg (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_element (CORBA::ARG_INOUT)->any_;
 }
 
 ACE_INLINE CORBA::Any &
 CORBA::Request::add_inout_arg (const CORBA::Char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_item (name, CORBA::ARG_INOUT)->any_;
 }
 
 ACE_INLINE CORBA::Any &
 CORBA::Request::add_out_arg (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_element (CORBA::ARG_OUT)->any_;
 }
 
 ACE_INLINE CORBA::Any &
 CORBA::Request::add_out_arg (const CORBA::Char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_item (name, CORBA::ARG_OUT)->any_;
 }
 
 ACE_INLINE void
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 5582886beee..2c0cc17b921 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -83,12 +83,12 @@ CORBA::ServerRequest::~ServerRequest (void)
 // inout/out/return values later on.
 void
 CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
   // arguments() must be called before either of these.
   if (this->params_ != 0 || this->exception_ != 0)
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO));
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO);
     }
 
   // Save params for later use when marshaling the reply.
@@ -97,8 +97,7 @@ CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list
   this->params_->_tao_incoming_cdr (*this->orb_server_request_.incoming (),
                                     CORBA::ARG_IN | CORBA::ARG_INOUT,
                                     this->lazy_evaluation_
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   // Pass this alignment back to the TAO_ServerRequest.
   this->orb_server_request_.dsi_nvlist_align (
@@ -111,22 +110,21 @@ CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list
 // only after the parameter list has been provided (maybe empty).
 void
 CORBA::ServerRequest::set_result (const CORBA::Any &value
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   // Setting a result when another result already exists or if an exception
   // exists or before the args have been processeed is an error.
   if (this->retval_ != 0 || this->exception_ != 0 || this->params_ == 0)
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO));
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO);
     }
 
   ACE_NEW_THROW_EX (this->retval_,
                     CORBA::Any (value),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 }
 
-  // NOTE: if "ACE_ENV_SINGLE_ARG_PARAMETER" is set, there has been a system exception,
+  // NOTE: if "" is set, there has been a system exception,
   // and it will take precedence over exceptions reported using the
   // set_exception() mechanism of the ServerRequest, which we assume
   // the application writer will use to report only user exceptions.
@@ -136,25 +134,22 @@ CORBA::ServerRequest::set_result (const CORBA::Any &value
 // Store the exception value.
 void
 CORBA::ServerRequest::set_exception (const CORBA::Any &value
-                                     ACE_ENV_ARG_DECL)
+                                     )
 {
   CORBA::TypeCode_var tc = value.type ();
 
-  CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind const kind = tc->kind ();
 
   // set_exception() can be called at any time, but the Any arg MUST
   // contain an exception.
   if (kind != CORBA::tk_except)
     {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 21,
-                                   CORBA::COMPLETED_MAYBE));
+      throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 21, CORBA::COMPLETED_MAYBE);
     }
 
   ACE_NEW_THROW_EX (this->exception_,
                     CORBA::Any (value),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   this->orb_server_request_.exception_type (TAO_GIOP_USER_EXCEPTION);
 }
@@ -162,7 +157,7 @@ CORBA::ServerRequest::set_exception (const CORBA::Any &value
 // This method will be utilized by the DSI servant to marshal outgoing
 // parameters.
 void
-CORBA::ServerRequest::dsi_marshal (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::ServerRequest::dsi_marshal (void)
 {
   // There was a user exception, no need to marshal any parameters.
   if (this->sent_gateway_exception_)
@@ -194,9 +189,8 @@ CORBA::ServerRequest::dsi_marshal (ACE_ENV_SINGLE_ARG_DECL)
           this->params_->_tao_encode (
                              *this->orb_server_request_.outgoing (),
                              CORBA::ARG_INOUT | CORBA::ARG_OUT
-                             ACE_ENV_ARG_PARAMETER
+
                            );
-          ACE_CHECK;
         }
     }
   else
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 39cae0c7b82..b7d94dd59e1 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -78,7 +78,7 @@ namespace CORBA
     /// parameter list ... on return, their values are available; the
     /// list fed in has typecodes and (perhap) memory assigned.
     void arguments (CORBA::NVList_ptr &list
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                    );
 
     /// Implementation uses this to provide the operation result
     /// ... illegal if exception() was called or params() was not called.
@@ -86,7 +86,7 @@ namespace CORBA
     /// XXX Implementation should be able to assume response has been
     /// sent when this returns, and reclaim memory it allocated.
     void set_result (const CORBA::Any &value
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     );
 
     /// Implementation uses this to provide the exception value which is
     /// the only result of this particular invocation.
@@ -94,7 +94,7 @@ namespace CORBA
     /// XXX Implementation should be able to assume response has been
     /// sent when this returns, and reclaim memory it allocated.
     void set_exception (const CORBA::Any &value
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                        );
 
     // = Get various universal call attributes.
 
@@ -106,7 +106,7 @@ namespace CORBA
     // basic CORBA Object Model.
 
     /// Marshal outgoing parameters.
-    void dsi_marshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    void dsi_marshal (void);
 
     /// Accessor for the Context member.
     CORBA::Context_ptr ctx (void) const;
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index 81d9935832f..88e3d466953 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -89,17 +89,17 @@ CORBA::UnknownUserException::_tao_duplicate (void) const
 void
 CORBA::UnknownUserException::_tao_encode (
     TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
+
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 void
 CORBA::UnknownUserException::_tao_decode (TAO_InputCDR &
-                                         ACE_ENV_ARG_DECL)
+                                         )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 CORBA::TypeCode_ptr
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index ab618060852..c97f08f5dcf 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -80,9 +80,9 @@ namespace CORBA
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL) const;
+                              ) const;
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL);
+                             );
 
     /// Narrow to an UnknowUserException.
     static UnknownUserException * _downcast (CORBA::Exception *ex);
diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h
index 39c8fb6bb48..ed9a0f22403 100644
--- a/TAO/tao/Dynamic_Adapter.h
+++ b/TAO/tao/Dynamic_Adapter.h
@@ -55,8 +55,6 @@ namespace CORBA
   typedef ServerRequest *ServerRequest_ptr;
 
   typedef ULong Flags;
-
-  class Environment;
 }
 
 /**
@@ -84,12 +82,12 @@ public:
                                CORBA::ExceptionList_ptr exceptions,
                                CORBA::Request_ptr &request,
                                CORBA::Flags req_flags
-                               ACE_ENV_ARG_DECL) = 0;
+                               ) = 0;
 
   virtual CORBA::Request_ptr request (CORBA::Object_ptr obj,
                                       CORBA::ORB_ptr orb,
                                       const char *op
-                                      ACE_ENV_ARG_DECL) = 0;
+                                      ) = 0;
 
   // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest.
 
@@ -107,7 +105,7 @@ public:
 
   // CORBA::ORB::create_exception_list.
   virtual void create_exception_list (CORBA::ExceptionList_ptr &
-                                      ACE_ENV_ARG_DECL) = 0;
+                                      ) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
index aff1b5bb0eb..c65338b9971 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy.cpp
@@ -22,8 +22,7 @@ TAO_EndpointPolicy_Initializer::init (void)
   PortableInterceptor::ORBInitializer::_nil ();
   PortableInterceptor::ORBInitializer_var orb_initializer;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Register the EndpointPolicy ORBInitializer.
       ACE_NEW_THROW_EX (temp_orb_initializer,
@@ -33,24 +32,20 @@ TAO_EndpointPolicy_Initializer::init (void)
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       orb_initializer = temp_orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught exception:");
+          ex._tao_print_exception ("Caught exception:");
         }
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_Service_Config::process_directive
     (ace_svc_desc_TAO_Endpoint_Acceptor_Filter_Factory,1); // force replacement
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
index 73b50a6e192..56161ad79be 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.cpp
@@ -31,7 +31,7 @@ CORBA::Policy_ptr
 TAO_EndpointPolicy_Factory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -81,7 +81,6 @@ TAO_EndpointPolicy_Factory::create_policy (
       TAO_EndpointPolicy_i (*endpoint_list),
       CORBA::NO_MEMORY (TAO::VMCID,
       CORBA::COMPLETED_NO));
-    ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
     return tmp;
   }
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
index 667c7f2aa9a..0877fa147df 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h
@@ -48,7 +48,7 @@ public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any & value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 private:
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
index d457e78d389..95f7ec19b8f 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp
@@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_EndpointPolicy_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -24,18 +24,17 @@ TAO_EndpointPolicy_ORBInitializer::pre_init (
 void
 TAO_EndpointPolicy_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 }
 
 void
 TAO_EndpointPolicy_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  )
 {
   TAO_ORBInitInfo * local_info = dynamic_cast <TAO_ORBInitInfo *> (info);
   TAO_ORB_Core * the_orb_core = local_info->orb_core ();
@@ -49,20 +48,18 @@ TAO_EndpointPolicy_ORBInitializer::register_policy_factories (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
 
   PortableInterceptor::PolicyFactory_var policy_factory =
     policy_factory_ptr;
 
-  ACE_TRY
+  try
     {
       info->register_policy_factory (EndpointPolicy::ENDPOINT_POLICY_TYPE,
                                      policy_factory.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    );
     }
-  ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+  catch (const ::CORBA::BAD_INV_ORDER& ex)
     {
       if (ex.minor () == (CORBA::OMGVMCID | 16))
         {
@@ -72,15 +69,13 @@ TAO_EndpointPolicy_ORBInitializer::register_policy_factories (
           // should do no more work in this ORBInitializer.
           return;
         }
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Rethrow any other exceptions...
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
index daeeff7f2c0..b75c52d370a 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.h
@@ -50,11 +50,11 @@ public:
   //@{
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                         )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                          )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
@@ -64,7 +64,7 @@ private:
   /// Register Endpoint policy factories.
   void register_policy_factories (
     PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL);
+   );
 
 };
 
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
index 93090a87bc0..955e6854896 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp
@@ -32,7 +32,7 @@ TAO_EndpointPolicy_i::~TAO_EndpointPolicy_i ()
 
 
 CORBA::PolicyType
-TAO_EndpointPolicy_i::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EndpointPolicy_i::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return EndpointPolicy::ENDPOINT_POLICY_TYPE;
@@ -49,7 +49,7 @@ TAO_EndpointPolicy_i::clone (void) const
 }
 
 EndpointPolicy::EndpointList *
-TAO_EndpointPolicy_i::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EndpointPolicy_i::value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   EndpointPolicy::EndpointList* list = 0;
@@ -61,20 +61,19 @@ TAO_EndpointPolicy_i::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Policy_ptr
-TAO_EndpointPolicy_i::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_EndpointPolicy_i::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EndpointPolicy_i* servant = 0;
   ACE_NEW_THROW_EX (servant,
                     TAO_EndpointPolicy_i (*this),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return servant;
 }
 
 void
-TAO_EndpointPolicy_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EndpointPolicy_i::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->value_.length (0);
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
index f7f9cb629d7..429b6681ebe 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
+++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h
@@ -51,7 +51,7 @@ public:
 
   /// Copy constructor.
   TAO_EndpointPolicy_i (const TAO_EndpointPolicy_i &rhs);
-  
+
   virtual ~TAO_EndpointPolicy_i ();
 
 
@@ -60,20 +60,20 @@ public:
 
   // = The EndpointPolicy::Policy methods
 
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
   virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
 
   virtual EndpointPolicy::EndpointList * value (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    void
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h
index 10ea6491e34..83d838a6f84 100644
--- a/TAO/tao/Endpoint_Selector_Factory.h
+++ b/TAO/tao/Endpoint_Selector_Factory.h
@@ -33,8 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
-  class Environment;
-
   class Exception;
 }
 
@@ -69,7 +67,7 @@ public:
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
-              ACE_ENV_SINGLE_ARG_DECL) = 0;
+              void) = 0;
 
 
 };
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 80ed0821dab..15ca449ef40 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -90,10 +90,8 @@ CORBA::Environment::exception (CORBA::Exception *ex)
 
   this->exception_ = ex;
 
-#if defined (TAO_HAS_EXCEPTIONS)
   if (this->exception_ != 0)
     this->exception_->_raise ();
-#endif /* TAO_HAS_EXCEPTIONS */
 }
 
 void
@@ -106,7 +104,6 @@ CORBA::Environment::clear (void)
 CORBA::Environment&
 CORBA::Environment::default_environment ()
 {
-#if defined (TAO_HAS_EXCEPTIONS)
   //
   // If we are using native C++ exceptions the user is *not* supposed
   // to clear the environment every time she calls into TAO.  In fact
@@ -122,7 +119,6 @@ CORBA::Environment::default_environment ()
   // clear the environment before calling into the ORB.
   //
   TAO_ORB_Core_instance ()->default_environment ()->clear ();
-#endif /* TAO_HAS_EXCEPTIONS */
 
   return TAO_default_environment ();;
 }
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 78b135945b5..5362927702f 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -26,11 +26,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // This is used in the implementation of the _raise methods
-#if defined (TAO_HAS_EXCEPTIONS)
 #define TAO_RAISE(EXCEPTION) throw EXCEPTION
-#else
-#define TAO_RAISE(EXCEPTION)
-#endif /* ACE_HAS_EXCEPTIONS */
 
 #include /**/ "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
@@ -154,10 +150,10 @@ namespace CORBA
     virtual ACE_CString _info (void) const = 0;
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL) const = 0;
+                              ) const = 0;
 
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL) = 0;
+                              ) = 0;
 
     /// Used in the non-copying Any insertion operator.
     static void _tao_any_destructor (void *);
diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp
index 47145cfff9b..8a3c303802d 100644
--- a/TAO/tao/Exclusive_TMS.cpp
+++ b/TAO/tao/Exclusive_TMS.cpp
@@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_Exclusive_TMS::TAO_Exclusive_TMS (TAO_Transport *transport)
   : TAO_Transport_Mux_Strategy (transport),
     request_id_generator_ (0),
-    has_request_ (0),
+    has_request_ (false),
     request_id_ (0),
     rd_ (0)
 {
@@ -38,7 +38,7 @@ TAO_Exclusive_TMS::request_id (void)
   //  == -1 --> no bi-directional connection was negotiated
   // The originating side must have an even request ID, and the other
   // side must have an odd request ID.  Make sure that is the case.
-  int bidir_flag =
+  int const bidir_flag =
     this->transport_->bidirectional_flag ();
 
   if ((bidir_flag == 1 && ACE_ODD (this->request_id_generator_))
@@ -58,7 +58,7 @@ int
 TAO_Exclusive_TMS::bind_dispatcher (CORBA::ULong request_id,
                                     TAO_Reply_Dispatcher *rd)
 {
-  this->has_request_ = 1;
+  this->has_request_ = true;
   this->request_id_ = request_id;
   this->rd_ = rd;
 
@@ -70,7 +70,7 @@ TAO_Exclusive_TMS::unbind_dispatcher (CORBA::ULong request_id)
 {
   if (!this->has_request_ || this->request_id_ != request_id)
     return -1;
-  this->has_request_ = 0;
+  this->has_request_ = false;
   this->request_id_ = 0;
   this->rd_ = 0;
 
@@ -94,7 +94,7 @@ TAO_Exclusive_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
     }
 
   TAO_Reply_Dispatcher *rd = this->rd_;
-  this->has_request_ = 0;
+  this->has_request_ = false;
   this->request_id_ = 0; // @@ What is a good value???
   this->rd_ = 0;
 
diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h
index 84f659bcc68..82932adcfc2 100644
--- a/TAO/tao/Exclusive_TMS.h
+++ b/TAO/tao/Exclusive_TMS.h
@@ -70,9 +70,9 @@ protected:
   /// request_id().
   CORBA::ULong request_id_generator_;
 
-  /// If 0 then the request id and reply dispatcher below are
+  /// If false then the request id and reply dispatcher below are
   /// meaningless
-  int has_request_;
+  bool has_request_;
 
   /// Request id for the current request.
   CORBA::ULong request_id_;
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index b0f0d551994..6f9db22679c 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -2,7 +2,6 @@
 
 #include "tao/FILE_Parser.h"
 #include "tao/ORB.h"
-#include "tao/Environment.h"
 #include "tao/Object.h"
 
 #include "ace/Read_Buffer.h"
@@ -38,7 +37,7 @@ TAO_FILE_Parser::match_prefix (const char *ior_string) const
 CORBA::Object_ptr
 TAO_FILE_Parser::parse_string (const char *ior,
                                CORBA::ORB_ptr orb
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
@@ -60,20 +59,17 @@ TAO_FILE_Parser::parse_string (const char *ior,
     return CORBA::Object::_nil ();
 
   CORBA::Object_ptr object = CORBA::Object::_nil ();
-  ACE_TRY
+  try
     {
-      object = orb->string_to_object (string ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->string_to_object (string);
 
       reader.alloc ()->free (string);
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       reader.alloc ()->free (string);
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object;
 }
diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h
index 2242d33a219..5946fc9e86f 100644
--- a/TAO/tao/FILE_Parser.h
+++ b/TAO/tao/FILE_Parser.h
@@ -47,7 +47,7 @@ public:
   virtual bool match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 5262caa29f6..01e06b447f7 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -75,8 +75,7 @@ int
 TAO_GIOP_Message_Base::generate_request_header (
     TAO_Operation_Details &op,
     TAO_Target_Specification &spec,
-    TAO_OutputCDR &cdr
-  )
+    TAO_OutputCDR &cdr)
 {
   // Get a parser for us
   TAO_GIOP_Message_Generator_Parser *generator_parser = 0;
@@ -195,15 +194,13 @@ TAO_GIOP_Message_Base::generate_reply_header (
       return -1;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Now call the implementation for the rest of the header
       int const result =
         generator_parser->write_reply_header (cdr,
                                               params
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             );
 
       if (!result)
         {
@@ -215,15 +212,14 @@ TAO_GIOP_Message_Base::generate_reply_header (
           return -1;
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("TAO_GIOP_Message_Base::generate_reply_header"));
+        ex._tao_print_exception (
+          ACE_TEXT ("TAO_GIOP_Message_Base::generate_reply_header"));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -865,23 +861,18 @@ int
 TAO_GIOP_Message_Base::generate_exception_reply (
     TAO_OutputCDR &cdr,
     TAO_Pluggable_Reply_Params_Base &params,
-    CORBA::Exception &x
-  )
+    const CORBA::Exception &x)
 {
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Make the GIOP & reply header.
-      this->generate_reply_header (cdr,
-                                   params);
-      x._tao_encode (cdr
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->generate_reply_header (cdr, params);
+      x._tao_encode (cdr);
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception&)
     {
       // Now we know that while handling the error an other error
       // happened -> no hope, close connection.
@@ -893,8 +884,6 @@ TAO_GIOP_Message_Base::generate_exception_reply (
                   ACE_TEXT ("generate_exception_reply ()\n")));
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -959,16 +948,14 @@ TAO_GIOP_Message_Base::process_request (
 
   int parse_error = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       parse_error =
         parser->parse_request_header (request);
 
       // Throw an exception if the
       if (parse_error != 0)
-        ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                       CORBA::COMPLETED_NO));
+        throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO);
 
       TAO_Codeset_Manager *csm = request.orb_core ()->codeset_manager ();
       if (csm)
@@ -995,8 +982,7 @@ TAO_GIOP_Message_Base::process_request (
           this->orb_core_,
           request,
           forward_to
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         );
 
 //@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_END
 
@@ -1059,7 +1045,7 @@ TAO_GIOP_Message_Base::process_request (
         }
     }
   // Only CORBA exceptions are caught here.
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception& ex)
     {
       int result = 0;
 
@@ -1069,7 +1055,7 @@ TAO_GIOP_Message_Base::process_request (
                                                output,
                                                request_id,
                                                &request.reply_service_info (),
-                                               &ACE_ANY_EXCEPTION);
+                                               &ex);
           if (result == -1)
             {
               if (TAO_debug_level > 0)
@@ -1079,9 +1065,8 @@ TAO_GIOP_Message_Base::process_request (
                               ACE_TEXT ("cannot send exception\n"),
                               ACE_TEXT ("process_connector_request ()")));
 
-                  ACE_PRINT_EXCEPTION (
-                      ACE_ANY_EXCEPTION,
-                      "TAO_GIOP_Message_Base::process_request[1]");
+                  ex._tao_print_exception (
+                    "TAO_GIOP_Message_Base::process_request[1]");
                 }
             }
 
@@ -1098,15 +1083,13 @@ TAO_GIOP_Message_Base::process_request (
                       ACE_TEXT ("(%P|%t) exception thrown ")
                       ACE_TEXT ("but client is not waiting a response\n")));
 
-          ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
-              "TAO_GIOP_Message_Base::process_request[2]");
+          ex._tao_print_exception (
+            "TAO_GIOP_Message_Base::process_request[2]");
         }
 
       return result;
     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       // @@ TODO some c++ exception or another, but what do we do with
       //    it?
@@ -1137,9 +1120,8 @@ TAO_GIOP_Message_Base::process_request (
                               ACE_TEXT ("%p: ")
                               ACE_TEXT ("cannot send exception\n"),
                               ACE_TEXT ("process_request ()")));
-                  ACE_PRINT_EXCEPTION (
-                      exception,
-                      "TAO_GIOP_Message_Base::process_request[3]");
+                  exception._tao_print_exception (
+                    "TAO_GIOP_Message_Base::process_request[3]");
                 }
             }
         }
@@ -1157,8 +1139,6 @@ TAO_GIOP_Message_Base::process_request (
 
       return result;
     }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -1182,16 +1162,14 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
 
   CORBA::Boolean response_required = true;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int parse_error =
         parser->parse_locate_header (locate_request);
 
       if (parse_error != 0)
         {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                         CORBA::COMPLETED_NO));
+          throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO);
         }
 
       TAO::ObjectKey tmp_key (locate_request.object_key ().length (),
@@ -1219,8 +1197,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
 
       if (parse_error != 0)
         {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                         CORBA::COMPLETED_NO));
+          throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO);
         }
 
       CORBA::Object_var forward_to;
@@ -1228,9 +1205,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
       this->orb_core_->request_dispatcher ()->dispatch (
           this->orb_core_,
           server_request,
-          forward_to
-           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          forward_to);
 
       if (!CORBA::is_nil (forward_to.in ()))
         {
@@ -1272,7 +1247,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
         }
     }
 
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Normal exception, so the object is not here
       status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
@@ -1281,8 +1256,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
                     ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Base::process_locate_request, ")
                     ACE_TEXT ("CORBA exception raised\n")));
     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       // Normal exception, so the object is not here
       status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
@@ -1291,8 +1265,6 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
                     ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Base::process_locate_request - ")
                     ACE_TEXT ("C++ exception raised\n")));
     }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
 
   return this->make_send_locate_reply (transport,
                                        locate_request,
@@ -1322,9 +1294,9 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport,
   output.more_fragments (false);
 
   // Send the message
-  int result = transport->send_message (output,
-                                        0,
-                                        TAO_Transport::TAO_REPLY);
+  int const result = transport->send_message (output,
+                                              0,
+                                              TAO_Transport::TAO_REPLY);
 
   // Print out message if there is an error
   if (result == -1)
@@ -1383,7 +1355,7 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport)
   message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
 
   size_t bt;
-  int result = transport->send_message_block_chain (&message_block, bt);
+  int const result = transport->send_message_block_chain (&message_block, bt);
   if (result == -1)
     {
       if (TAO_debug_level > 0)
@@ -1452,7 +1424,6 @@ TAO_GIOP_Message_Base::
                          TAO_Transport *transport,
                          void *)
 {
-
   // static CORBA::Octet
   // I hate  this in every method. Till the time I figure out a way
   // around  I will have them here hanging around.
@@ -1511,7 +1482,7 @@ TAO_GIOP_Message_Base::
   message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
 
   size_t bt;
-  int result = transport->send_message_block_chain (&message_block, bt);
+  int const result = transport->send_message_block_chain (&message_block, bt);
   if (result == -1)
     {
       if (TAO_debug_level > 0)
@@ -1524,7 +1495,6 @@ TAO_GIOP_Message_Base::
   ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("(%P|%t) shut down transport, handle %d\n"),
       transport-> id ()));
-
 }
 
 
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index f8c2452f0f7..f991225fdc9 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -132,8 +132,7 @@ public:
   virtual int generate_exception_reply (
       TAO_OutputCDR &cdr,
       TAO_Pluggable_Reply_Params_Base &params,
-      CORBA::Exception &x
-    );
+      const CORBA::Exception &x);
 
   /// Header length
   virtual size_t header_length (void) const;
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index bb355b26f05..bee6b9d2a62 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -66,7 +66,7 @@ public:
   virtual bool write_reply_header (
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Writes the locate _reply message in to the @a output
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index c418123f9b5..f293b39d13f 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -147,14 +147,13 @@ bool
 TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
     TAO_OutputCDR &output,
     TAO_Pluggable_Reply_Params_Base &reply
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Write the service context list.
 #if (TAO_HAS_MINIMUM_CORBA == 1)
   output << reply.service_context_notowned ();
-  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #else
   if (reply.is_dsi_ == false)
     {
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h
index 6c4a50f07be..45dbb9f62c5 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h
@@ -55,7 +55,7 @@ public:
   virtual bool write_reply_header (
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
-      ACE_ENV_ARG_DECL
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 446126132fe..5dc4cf05c60 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -27,8 +27,7 @@ bool
 TAO_GIOP_Message_Generator_Parser_12::write_request_header (
     const TAO_Operation_Details &opdetails,
     TAO_Target_Specification &spec,
-    TAO_OutputCDR &msg
-  )
+    TAO_OutputCDR &msg)
 {
   // First the request id
   msg << opdetails.request_id ();
@@ -95,9 +94,8 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
 bool
 TAO_GIOP_Message_Generator_Parser_12::write_locate_request_header (
     CORBA::ULong request_id,
-    TAO_Target_Specification    &spec,
-    TAO_OutputCDR &msg
-  )
+    TAO_Target_Specification &spec,
+    TAO_OutputCDR &msg)
 {
   // Write the request id
   msg << request_id;
@@ -120,9 +118,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_locate_request_header (
 bool
 TAO_GIOP_Message_Generator_Parser_12::write_reply_header (
     TAO_OutputCDR & output,
-    TAO_Pluggable_Reply_Params_Base &reply
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
+    TAO_Pluggable_Reply_Params_Base &reply)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Write the request ID
@@ -187,8 +183,7 @@ bool
 TAO_GIOP_Message_Generator_Parser_12::write_locate_reply_mesg (
     TAO_OutputCDR & output,
     CORBA::ULong request_id,
-    TAO_GIOP_Locate_Status_Msg &status_info
-  )
+    TAO_GIOP_Locate_Status_Msg &status_info)
 {
   output.write_ulong (request_id);
 
@@ -260,8 +255,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_fragment_header (
 
 int
 TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
-    TAO_ServerRequest &request
-  )
+    TAO_ServerRequest &request)
 {
   // Get the input CDR in the request class
   TAO_InputCDR & input = *request.incoming ();
@@ -339,8 +333,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
 
 int
 TAO_GIOP_Message_Generator_Parser_12::parse_locate_header (
-    TAO_GIOP_Locate_Request_Header &request
-  )
+    TAO_GIOP_Locate_Request_Header &request)
 {
   // Get the stream .
   TAO_InputCDR &msg = request.incoming_stream ();
@@ -367,8 +360,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_locate_header (
 int
 TAO_GIOP_Message_Generator_Parser_12::parse_reply (
     TAO_InputCDR &cdr,
-    TAO_Pluggable_Reply_Params &params
-  )
+    TAO_Pluggable_Reply_Params &params)
 {
   if (TAO_GIOP_Message_Generator_Parser::parse_reply (cdr,
                                                       params) == -1)
@@ -397,8 +389,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_reply (
 int
 TAO_GIOP_Message_Generator_Parser_12::parse_locate_reply (
     TAO_InputCDR &cdr,
-    TAO_Pluggable_Reply_Params &params
-  )
+    TAO_Pluggable_Reply_Params &params)
 {
   if (TAO_GIOP_Message_Generator_Parser::parse_locate_reply (cdr,
                                                              params) == -1)
@@ -442,8 +433,7 @@ TAO_GIOP_Message_Generator_Parser_12::is_ready_for_bidirectional (void) const
 bool
 TAO_GIOP_Message_Generator_Parser_12::marshall_target_spec (
     TAO_Target_Specification &spec,
-    TAO_OutputCDR &msg
-  )
+    TAO_OutputCDR &msg)
 {
   switch (spec.specifier ())
     {
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
index d758a48abab..2fb34e24a4b 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -57,7 +57,7 @@ public:
   virtual bool write_reply_header (
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
-      ACE_ENV_ARG_DECL
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 62e51a2e2a6..baadd95a181 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -676,22 +676,19 @@ int
 TAO_GIOP_Message_Lite::generate_exception_reply (
     TAO_OutputCDR &cdr,
     TAO_Pluggable_Reply_Params_Base &params,
-    CORBA::Exception &x
-  )
+    const CORBA::Exception &x)
 {
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Make the GIOP & reply header. They are version specific.
       this->write_reply_header (cdr,
                                 params);
-      x._tao_encode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      x._tao_encode (cdr);
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception&)
     {
       // Now we know that while handling the error an other error
       // happened -> no hope, close connection.
@@ -702,8 +699,6 @@ TAO_GIOP_Message_Lite::generate_exception_reply (
                   ACE_TEXT ("generate_exception_reply ()\n")));
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -755,8 +750,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
 
   int parse_error = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       parse_error =
         this->parse_request_header (request);
@@ -770,8 +764,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
 
       // Throw an exception if the
       if (parse_error != 0)
-        ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                       CORBA::COMPLETED_NO));
+        throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO);
       request_id = request.request_id ();
 
       response_required = request.response_expected ();
@@ -782,8 +775,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
       this->orb_core_->adapter_registry ()->dispatch (request.object_key (),
                                                       request,
                                                       forward_to
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                      );
 
       if (!CORBA::is_nil (forward_to.in ()))
         {
@@ -827,7 +819,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
         }
     }
   // Only CORBA exceptions are caught here.
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception& ex)
     {
       int result = 0;
 
@@ -837,7 +829,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
                                                this->orb_core_,
                                                request_id,
                                                &request.reply_service_info (),
-                                               &ACE_ANY_EXCEPTION);
+                                               &ex);
           if (result == -1)
             {
               if (TAO_debug_level > 0)
@@ -846,9 +838,8 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
                               ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
                               ACE_TEXT ("cannot send exception\n"),
                               ACE_TEXT ("process_request ()")));
-                  ACE_PRINT_EXCEPTION (
-                      ACE_ANY_EXCEPTION,
-                      "TAO_GIOP_Message_Lite::process_request[2]");
+                  ex._tao_print_exception (
+                    "TAO_GIOP_Message_Lite::process_request[2]");
                 }
             }
 
@@ -865,14 +856,12 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
                       ACE_TEXT ("(%P|%t) exception thrown ")
                       ACE_TEXT ("but client is not waiting a response\n")));
 
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO: ");
+          ex._tao_print_exception ("TAO: ");
         }
 
       return result;
     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       // @@ TODO some c++ exception or another, but what do we do with
       //    it?
@@ -907,9 +896,8 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
                               ACE_TEXT ("%p: ")
                               ACE_TEXT ("cannot send exception\n"),
                               ACE_TEXT ("process_request ()")));
-                  ACE_PRINT_EXCEPTION (
-                      exception,
-                      "TAO_GIOP_Message_Lite::process_request[3]");
+                  exception._tao_print_exception (
+                    "TAO_GIOP_Message_Lite::process_request[3]");
                 }
             }
         }
@@ -927,8 +915,6 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
 
       return result;
     }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -951,16 +937,14 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
 
   CORBA::Boolean response_required = 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int parse_error =
         this->parse_locate_header (locate_request);
 
       if (parse_error != 0)
         {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                         CORBA::COMPLETED_NO));
+          throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO);
         }
 
       // Execute a fake request to find out if the object is there or
@@ -995,8 +979,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
 
       if (parse_error != 0)
         {
-          ACE_TRY_THROW (CORBA::MARSHAL (0,
-                                         CORBA::COMPLETED_NO));
+          throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO);
         }
 
       CORBA::Object_var forward_to;
@@ -1004,8 +987,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
       this->orb_core_->adapter_registry ()->dispatch (server_request.object_key (),
                                                       server_request,
                                                       forward_to
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                      );
 
       if (!CORBA::is_nil (forward_to.in ()))
         {
@@ -1046,7 +1028,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
         }
     }
 
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Normal exception, so the object is not here
       status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
@@ -1055,8 +1037,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
                     ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Lite::process_locate_request - ")
                     ACE_TEXT ("CORBA exception raised\n")));
     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
+  catch (...)
     {
       // Normal exception, so the object is not here
       status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
@@ -1065,8 +1046,6 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
                     ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Lite::process_locate_request - ")
                     ACE_TEXT ("C++ exception raised\n")));
     }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
 
   return this->make_send_locate_reply (transport,
                                        output,
@@ -1200,7 +1179,7 @@ int
 TAO_GIOP_Message_Lite::write_reply_header (
     TAO_OutputCDR &output,
     TAO_Pluggable_Reply_Params_Base &reply
-    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
+     /*  */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1487,9 +1466,8 @@ TAO_GIOP_Message_Lite::send_reply_exception (
 
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Write the exception.
       reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION;
@@ -1504,10 +1482,9 @@ TAO_GIOP_Message_Lite::send_reply_exception (
                                 reply_params);
 
 
-      x->_tao_encode (output ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      x->_tao_encode (output);
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const ::CORBA::Exception&)
     {
       // Now we know that while handling the error an other error
       // happened -> no hope, close connection.
@@ -1519,7 +1496,6 @@ TAO_GIOP_Message_Lite::send_reply_exception (
                   ACE_TEXT ("send_reply_exception ()")));
       return -1;
     }
-  ACE_ENDTRY;
 
   return transport->send_message (output);
 }
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index 7b8e35d512a..df7fd9c33f9 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -141,7 +141,7 @@ public:
   virtual int generate_exception_reply (
       TAO_OutputCDR &cdr,
       TAO_Pluggable_Reply_Params_Base &params,
-      CORBA::Exception &x
+      const CORBA::Exception &x
     );
 
   /// Consolidate fragmented message with associated fragments, being
@@ -252,7 +252,7 @@ private:
   int write_reply_header (
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Writes the locate _reply message in to the <output>
diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h
index 96fa3abc2da..f0619104cb2 100644
--- a/TAO/tao/Generic_Sequence_T.h
+++ b/TAO/tao/Generic_Sequence_T.h
@@ -242,9 +242,9 @@ public:
    * maintains ownership of the underlying buffer.  Elements in the
    * returned buffer may be directly replaced by the caller.  For
    * sequences of strings, wide strings, and object references, the
-   * caller must use the sequence <release> accessor to determine
-   * whether elements should be freed (using <string_free>,
-   * <wstring_free>, or <CORBA::release> for strings, wide strings,
+   * caller must use the sequence @c release accessor to determine
+   * whether elements should be freed (using @c string_free,
+   * @c wstring_free, or @c CORBA::release for strings, wide strings,
    * and object references, respective) before being directly assigned
    * to.
    *
diff --git a/TAO/tao/HTTP_Parser.cpp b/TAO/tao/HTTP_Parser.cpp
index 496734e91b0..3453287349e 100644
--- a/TAO/tao/HTTP_Parser.cpp
+++ b/TAO/tao/HTTP_Parser.cpp
@@ -3,7 +3,6 @@
 #include "tao/HTTP_Parser.h"
 #include "tao/HTTP_Client.h"
 #include "tao/ORB.h"
-#include "tao/Environment.h"
 #include "tao/Object.h"
 
 #include "ace/Read_Buffer.h"
@@ -36,7 +35,7 @@ TAO_HTTP_Parser::match_prefix (const char *ior_string) const
 CORBA::Object_ptr
 TAO_HTTP_Parser::parse_string (const char *ior,
                                CORBA::ORB_ptr orb
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
@@ -120,17 +119,14 @@ TAO_HTTP_Parser::parse_string (const char *ior,
     string += curr->rd_ptr();
 
   CORBA::Object_ptr object = CORBA::Object::_nil ();
-  ACE_TRY
+  try
     {
-      object = orb->string_to_object (string.c_str() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->string_to_object (string.c_str());
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object;
 }
diff --git a/TAO/tao/HTTP_Parser.h b/TAO/tao/HTTP_Parser.h
index 8396039e864..b55ad6a00e3 100644
--- a/TAO/tao/HTTP_Parser.h
+++ b/TAO/tao/HTTP_Parser.h
@@ -48,7 +48,7 @@ public:
   virtual bool match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 17e928e1ed6..4ef9c8103ff 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -67,13 +67,12 @@ CORBA::InterfaceDef_ptr
 TAO_IFR_Client_Adapter_Impl::get_interface (
     CORBA::ORB_ptr orb,
     const char *repo_id
-    ACE_ENV_ARG_DECL
+
   )
 {
   CORBA::Object_var obj =
     orb->resolve_initial_references ("InterfaceRepository"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+                                    );
 
   if (CORBA::is_nil (obj.in ()))
     {
@@ -83,8 +82,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
 
   CORBA::Repository_var repo =
     CORBA::Repository::_narrow (obj.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+                               );
 
   if (CORBA::is_nil (repo.in ()))
     {
@@ -93,8 +91,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
     }
 
   CORBA::Contained_var result = repo->lookup_id (repo_id
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+                                                );
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -103,14 +100,14 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
   else
     {
       return CORBA::InterfaceDef::_narrow (result.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
     }
 }
 
 CORBA::InterfaceDef_ptr
 TAO_IFR_Client_Adapter_Impl::get_interface_remote (
     CORBA::Object_ptr target
-    ACE_ENV_ARG_DECL
+
   )
 {
   TAO::Arg_Traits<CORBA::InterfaceDef>::ret_val _tao_retval;
@@ -129,20 +126,18 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote (
       0
     );
 
-  ACE_TRY
+  try
     {
-      _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK (_tao_retval.excp ());
+      _tao_call.invoke (0, 0);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const ::CORBA::OBJECT_NOT_EXIST&)
     {
       return CORBA::InterfaceDef::_nil ();
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
   return _tao_retval.retn ();
 }
@@ -153,20 +148,18 @@ TAO_IFR_Client_Adapter_Impl::create_operation_list (
     CORBA::ORB_ptr orb,
     CORBA::OperationDef_ptr opDef,
     CORBA::NVList_ptr &result
-    ACE_ENV_ARG_DECL
+
   )
 {
   // Create an empty NVList.
   orb->create_list (0,
                     result
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   );
 
   // Get the parameters (if any) from the OperationDef, and for each
   // parameter add a corresponding entry to the result.
   CORBA::ParDescriptionSeq_var params =
-    opDef->params (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    opDef->params ();
 
   CORBA::ULong paramCount = params->length ();
 
@@ -193,7 +186,7 @@ TAO_IFR_Client_Adapter_Impl::create_operation_list (
           break;
         default:
           // Shouldn't happen
-          ACE_THROW (CORBA::INTERNAL());
+          throw ::CORBA::INTERNAL();
         }
 
       // Add an argument to the NVList.
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index 3686f11a0cd..06deb8c9d07 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -60,12 +60,12 @@ public:
   virtual CORBA::InterfaceDef_ptr get_interface (
       CORBA::ORB_ptr orb,
       const char *repo_id
-      ACE_ENV_ARG_DECL
+
     );
 
   virtual CORBA::InterfaceDef_ptr get_interface_remote (
       CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
+
     );
 
 #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -73,7 +73,7 @@ public:
       CORBA::ORB_ptr orb,
       CORBA::OperationDef_ptr,
       CORBA::NVList_ptr&
-      ACE_ENV_ARG_DECL
+
     );
 #endif /*TAO_HAS_MINIMUM_CORBA*/
 
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index 6f85a0af52e..246a1b678ef 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -47,8 +47,6 @@ namespace CORBA
 
   class NVList;
   typedef NVList *NVList_ptr;
-
-  class Environment;
 }
 
 /**
@@ -80,12 +78,12 @@ public:
   virtual CORBA::InterfaceDef_ptr get_interface (
       CORBA::ORB_ptr orb,
       const char *repo_id
-      ACE_ENV_ARG_DECL
+
     ) = 0;
 
   virtual CORBA::InterfaceDef_ptr get_interface_remote (
       CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
+
     ) = 0;
 
 #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -93,7 +91,7 @@ public:
                CORBA::ORB_ptr orb,
                CORBA::OperationDef_ptr,
                CORBA::NVList_ptr&
-               ACE_ENV_ARG_DECL
+
              ) = 0;
 #endif /*TAO_HAS_MINIMUM_CORBA*/
 };
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 30758b60b00..722e511e226 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -91,13 +91,9 @@ TAO_IIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
   // if they should be spread across multiple profiles.
   if (priority == TAO_INVALID_PRIORITY &&
       this->orb_core_->orb_params ()->shared_profile () == 0)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
+    return this->create_new_profile (object_key, mprofile, priority);
   else
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
+    return this->create_shared_profile (object_key, mprofile, priority);
 }
 
 int
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 3f62e43d82e..8dd55a7767b 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -105,42 +105,33 @@ TAO_IIOP_Connection_Handler::open (void*)
   protocol_properties.dont_route_ =
    this->orb_core ()->orb_params ()->sock_dontroute ();
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool const client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
+  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (client)
         {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->client_protocol_properties_at_orb_level (protocol_properties);
         }
       else
         {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->server_protocol_properties_at_orb_level (protocol_properties);
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
                                protocol_properties.recv_buffer_size_) == -1)
-    return -1;
+    {
+      return -1;
+    }
 
 #if !defined (ACE_LACKS_TCP_NODELAY)
   if (this->peer ().set_option (ACE_IPPROTO_TCP,
@@ -236,7 +227,7 @@ TAO_IIOP_Connection_Handler::open (void*)
           (void) remote_addr.addr_to_string (remote_as_string,
                                              sizeof(remote_as_string));
 
-          ACE_ERROR ((LM_WARNING,
+          ACE_ERROR ((LM_ERROR,
                       ACE_TEXT("TAO (%P|%t) - IIOP_Connection_Handler::open, ")
                       ACE_TEXT("invalid connection from IPv4 mapped IPv6 interface <%s>!\n"),
                       remote_as_string));
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 3d509136a89..bf18d18008a 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -5,7 +5,6 @@
 #include "tao/IIOP_Profile.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
-#include "tao/Environment.h"
 #include "tao/Protocols_Hooks.h"
 #include "tao/Connect_Strategy.h"
 #include "tao/Thread_Lane_Resources.h"
@@ -644,7 +643,7 @@ TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IIOP_Connector::make_profile (void)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -659,7 +658,6 @@ TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                         0,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 7f234d39342..04e09b1c37d 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -112,7 +112,7 @@ protected:
 
   /// More TAO_Connector methods, please check the documentation on
   /// Transport_Connector.h
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile *make_profile (void);
 
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index ceb6d1f4fec..b9b543dbcf9 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -2,7 +2,6 @@
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
 
-#include "tao/Environment.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/IIOP_EndpointsC.h"
@@ -129,7 +128,7 @@ TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 
 void
 TAO_IIOP_Profile::parse_string_i (const char *ior
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   // Pull off the "hostname:port/" part of the objref
   // Copy the string because we are going to modify it...
@@ -139,11 +138,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
   if (okd == 0 || okd == ior)
     {
       // No object key delimiter or no hostname specified.
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      0,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   // Length of host string.
@@ -173,11 +172,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
                        ACE_TEXT ("Invalid IPv6 decimal address specified.\n")));
             }
 
-          ACE_THROW (CORBA::INV_OBJREF (
+          throw ::CORBA::INV_OBJREF (
                        CORBA::SystemException::_tao_minor_code (
                          0,
                          EINVAL),
-                       CORBA::COMPLETED_NO));
+                       CORBA::COMPLETED_NO);
         }
       else
         {
@@ -201,11 +200,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
                    ACE_TEXT ("Host address may be omited only when no port has been specified.\n")));
         }
 
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      0,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
   else if (cp_pos != 0)
     {
@@ -230,11 +229,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
           ACE_INET_Addr ia;
           if (ia.string_to_addr (tmp.in ()) == -1)
             {
-              ACE_THROW (CORBA::INV_OBJREF (
+              throw ::CORBA::INV_OBJREF (
                              CORBA::SystemException::_tao_minor_code (
                                0,
                                EINVAL),
-                             CORBA::COMPLETED_NO));
+                             CORBA::COMPLETED_NO);
             }
           else
             {
@@ -289,11 +288,11 @@ TAO_IIOP_Profile::parse_string_i (const char *ior
                         ACE_TEXT ("cannot determine hostname")));
 
           // @@ What's the right exception to throw here?
-          ACE_THROW (CORBA::INV_OBJREF (
+          throw ::CORBA::INV_OBJREF (
                        CORBA::SystemException::_tao_minor_code (
                          0,
                          EINVAL),
-                       CORBA::COMPLETED_NO));
+                       CORBA::COMPLETED_NO);
         }
       else
         this->endpoint_.host_ = CORBA::string_dup (tmp_host);
@@ -342,7 +341,7 @@ TAO_IIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 
 CORBA::ULong
 TAO_IIOP_Profile::hash (CORBA::ULong max
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        )
 {
   // Get the hash value for all endpoints.
   CORBA::ULong hashval = 0;
@@ -451,7 +450,7 @@ TAO_IIOP_Profile::add_generic_endpoint (TAO_Endpoint *endp)
 }
 
 char *
-TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_IIOP_Profile::to_string (void)
 {
   // corbaloc:iiop:1.2@host:port,iiop:1.2@host:port,.../key
 
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 03cf95694bd..3f273556161 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -95,7 +95,7 @@ public:
   virtual char object_key_delimiter (void) const;
 
   /// Template methods. Please see Profile.h for documentation.
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
+  virtual char * to_string (void);
 
   /// Encode endpoints for RT profiles, using a single TAO_TAG_ENDPOINT
   /// component.
@@ -107,7 +107,7 @@ public:
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
   virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
+                            );
 
 protected:
   /// Destructor is to be called only through <_decr_refcnt>.
@@ -137,7 +137,7 @@ protected:
   virtual int decode_profile (TAO_InputCDR &cdr);
   virtual int decode_endpoints (void);
   virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
+                              );
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index de6dd91494d..9023125147f 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -28,15 +28,13 @@ TAO_IORInfo::~TAO_IORInfo (void)
 
 CORBA::Policy_ptr
 TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
-                                   ACE_ENV_ARG_DECL)
+                                   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  this->check_validity ();
 
   CORBA::Policy_var policy =
-    this->poa_->get_policy (type ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    this->poa_->get_policy (type);
 
   if (!CORBA::is_nil (policy.in ()))
     {
@@ -54,70 +52,60 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
 
 void
 TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
-                                ACE_ENV_ARG_DECL)
+                                )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   if (this->components_established_)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                     CORBA::COMPLETED_NO));
+    throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 
   // Add the given tagged component to all profiles.
   this->poa_->save_ior_component (component
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 );
 }
 
 void
 TAO_IORInfo::add_ior_component_to_profile (
     const IOP::TaggedComponent &component,
     IOP::ProfileId profile_id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   if (this->components_established_)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                     CORBA::COMPLETED_NO));
+    throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 
   this->poa_->save_ior_component_and_profile_id (component,
                                                  profile_id
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                );
 }
 
 char *
-TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IORInfo::manager_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
-  PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  return poa_manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager ();
+  return poa_manager->get_id ();
 }
 
 PortableInterceptor::AdapterState
-TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IORInfo::state (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableInterceptor::NON_EXISTENT);
+  this->check_validity ();
 
-  return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->poa_->get_adapter_state ();
 }
 
 PortableInterceptor::ObjectReferenceTemplate *
-TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IORInfo::adapter_template (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Return the Object Reference Template whenever an IOR Interceptor
   // is invoked.  Its value is the template created for the adapter
@@ -125,8 +113,7 @@ TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL)
   // add_ior_component_to_profile.  It's a const value and its value
   // never changes.
   PortableInterceptor::ObjectReferenceTemplate *adapter_template =
-    this->poa_->get_adapter_template (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->poa_->get_adapter_template ();
 
   if (adapter_template == 0)
     {
@@ -139,11 +126,10 @@ TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::ObjectReferenceFactory *
-TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IORInfo::current_factory (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Return the current_factory that is used to create the object
   // references by the adapter.  Though initially, its value is the
@@ -151,8 +137,7 @@ TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL)
   // can be changed.  The value of the current_factory can be changed
   // only during the call to components_established method.
   PortableInterceptor::ObjectReferenceFactory *adapter_factory =
-    this->poa_->get_obj_ref_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->poa_->get_obj_ref_factory ();
 
   if (adapter_factory == 0)
     {
@@ -167,19 +152,17 @@ TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_IORInfo::current_factory (
     PortableInterceptor::ObjectReferenceFactory * current_factory
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   this->poa_->set_obj_ref_factory (current_factory
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 }
 
 void
-TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IORInfo::check_validity (void)
 {
   if (this->poa_ == 0)
     {
@@ -189,8 +172,7 @@ TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
       // once the POA has invoked all IORInterceptor interception
       // points.  This also prevents memory access violations from
       // occuring if the POA is destroyed before this IORInfo object.
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO::VMCID,
-                                          CORBA::COMPLETED_NO));
+      throw ::CORBA::OBJECT_NOT_EXIST (TAO::VMCID, CORBA::COMPLETED_NO);
     }
 }
 
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index 3d4803a6792..df8723f914f 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -62,13 +62,13 @@ public:
   /// effect for the object whose IOR is being created.
   virtual CORBA::Policy_ptr get_effective_policy (
       CORBA::PolicyType type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles.
   virtual void add_ior_component (
       const IOP::TaggedComponent & component
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles matching the given
@@ -76,28 +76,28 @@ public:
   virtual void add_ior_component_to_profile (
       const IOP::TaggedComponent & component,
       IOP::ProfileId profile_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * manager_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableInterceptor::AdapterState state (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableInterceptor::ObjectReferenceFactory * current_factory (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void current_factory (
       PortableInterceptor::ObjectReferenceFactory * current_factory
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
@@ -132,7 +132,7 @@ protected:
    * this IORInfo object is no longer valid.  Throw an exception in
    * that case.
    */
-  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
+  void check_validity (void);
 
 private:
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index a917dc798d4..b542945f036 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -11,19 +11,19 @@ ACE_RCSID (IORInterceptor,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Impl (void)
+TAO_IORInterceptor_Adapter_Factory_Impl::~
+  TAO_IORInterceptor_Adapter_Factory_Impl (void)
 {
 }
 
 TAO_IORInterceptor_Adapter *
-TAO_IORInterceptor_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IORInterceptor_Adapter_Factory_Impl::create (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IORInterceptor_Adapter_Impl *nia = 0;
   ACE_NEW_THROW_EX (nia,
                     TAO_IORInterceptor_Adapter_Impl (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (nia);
 
   return nia;
 }
@@ -37,13 +37,11 @@ int
 TAO_IORInterceptor_Adapter_Factory_Impl::Initializer (void)
 {
   TAO_ORB_Core::iorinterceptor_adapter_factory_name (
-      "Concrete_IORInterceptor_Adapter_Factory"
-    );
+    "Concrete_IORInterceptor_Adapter_Factory");
 
   return
     ACE_Service_Config::process_directive (
-        ace_svc_desc_TAO_IORInterceptor_Adapter_Factory_Impl
-      );
+    ace_svc_desc_TAO_IORInterceptor_Adapter_Factory_Impl);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
@@ -58,3 +56,4 @@ ACE_STATIC_SVC_DEFINE (
   )
 
 ACE_FACTORY_DEFINE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl)
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index a08507cd6a6..6696a5320c2 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -43,9 +43,7 @@ class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Factory_Impl
 public:
   virtual ~TAO_IORInterceptor_Adapter_Factory_Impl (void);
 
-  virtual TAO_IORInterceptor_Adapter * create (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
+  virtual TAO_IORInterceptor_Adapter * create (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Used to force the initialization of the ORB code.
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index 4b9bc703257..e09b1b72eaf 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -22,32 +22,29 @@ TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
 void
 TAO_IORInterceptor_Adapter_Impl::add_interceptor (
     PortableInterceptor::IORInterceptor_ptr i
-    ACE_ENV_ARG_DECL
+
   )
 {
   this->ior_interceptor_list_.add_interceptor (i
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              );
 }
 
 void
 TAO_IORInterceptor_Adapter_Impl::add_interceptor (
     PortableInterceptor::IORInterceptor_ptr i,
     const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL
+
   )
 {
   this->ior_interceptor_list_.add_interceptor (i,
                                                policies
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              );
 }
 
 void
-TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
+TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (void)
 {
-  this->ior_interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ior_interceptor_list_.destroy_interceptors ();
 
   delete this;
 }
@@ -55,7 +52,7 @@ TAO_IORInterceptor_Adapter_Impl::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_IORInterceptor_Adapter_Impl::establish_components (
   TAO_Root_POA* poa
-  ACE_ENV_ARG_DECL)
+  )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const size_t interceptor_count = this->ior_interceptor_list_.size ();
@@ -71,7 +68,6 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
                           TAO::VMCID,
                           ENOMEM),
                        CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::IORInfo_var info = tao_info;
 
@@ -82,14 +78,13 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
 
   for (size_t i = 0; i < interceptor_count; ++i)
     {
-      ACE_TRY
+      try
         {
           this->ior_interceptor_list_.interceptor (i)->establish_components (
             info.in ()
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+           );
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception& ex)
         {
           // According to the Portable Interceptors specification,
           // IORInterceptor::establish_components() must not throw an
@@ -100,8 +95,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
             {
               CORBA::String_var name =
                 this->ior_interceptor_list_.interceptor (i)->name (
-                  ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                  );
               // @@ What do we do if we get an exception here?
 
               if (name.in () != 0)
@@ -112,20 +106,17 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
                               ACE_TEXT_CHAR_TO_TCHAR (name.in ())));
                 }
 
-              ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "Ignoring exception in "
-                                       "IORInterceptor::establish_components");
+              ex._tao_print_exception (
+                "Ignoring exception in "
+                "IORInterceptor::establish_components");
             }
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 
   tao_info->components_established ();
 
   this->components_established (info.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 
   // The IORInfo instance is no longer valid.  Invalidate it to
   // prevent the user from peforming "illegal" operations.
@@ -135,7 +126,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
 void
 TAO_IORInterceptor_Adapter_Impl::components_established (
   PortableInterceptor::IORInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Iterate over the registered IOR interceptors so that they may be
@@ -148,7 +139,7 @@ TAO_IORInterceptor_Adapter_Impl::components_established (
   // on all the IORInterceptors.
   for (size_t j = 0; j < interceptor_count; ++j)
     {
-      ACE_TRY
+      try
         {
           PortableInterceptor::IORInterceptor_ptr ior_interceptor =
             this->ior_interceptor_list_.interceptor (j);
@@ -159,17 +150,14 @@ TAO_IORInterceptor_Adapter_Impl::components_established (
             {
               ior_3_interceptor->components_established (
                 info
-                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+               );
             }
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception&)
         {
-          ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6,
-                                         CORBA::COMPLETED_NO));
+          throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 6,
+                                      CORBA::COMPLETED_NO);
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
@@ -177,7 +165,7 @@ void
 TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
       const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
       PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const size_t interceptor_count = this->ior_interceptor_list_.size ();
@@ -212,8 +200,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
           ior_3_interceptor->adapter_state_changed (
             seq_obj_ref_template,
             state
-            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+           );
         }
     }
 }
@@ -222,7 +209,7 @@ void
 TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
       const char * id,
       PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// Whenever the POAManager state is changed, the
@@ -245,8 +232,7 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
           ior_3_interceptor->adapter_manager_state_changed (
             id,
             state
-            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+           );
         }
     }
 }
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index 5dc289f77d8..9094acb23fc 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -55,34 +55,34 @@ public:
 
   virtual void add_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL);
+     );
 
   virtual void add_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL);
+     );
 
-  virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void destroy_interceptors (void);
 
-  virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL)
+  virtual void establish_components (TAO_Root_POA *poa )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Call the IORInterceptor::components_established() method on all
   /// registered IORInterceptors.
   virtual void components_established (PortableInterceptor::IORInfo_ptr info
-                                       ACE_ENV_ARG_DECL)
+                                       )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_state_changed (
       const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
       PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       const char * id,
       PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
index 77835d4cfd0..6dfeb9f191c 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
@@ -13,10 +13,10 @@ namespace TAO
   void
   IORInterceptor_Details::apply_policies (
       const CORBA::PolicyList &/*policies*/
-      ACE_ENV_ARG_DECL)
+      )
   {
     // There are currently no policies that apply to IOR Interceptors.
-    ACE_THROW (CORBA::INV_POLICY ());
+    throw ::CORBA::INV_POLICY ();
   }
 }
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.h b/TAO/tao/IORInterceptor/IORInterceptor_Details.h
index bb2ce8b0fa8..9bee1807d7e 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Details.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.h
@@ -52,7 +52,7 @@ namespace TAO
   {
   public:
     void apply_policies (const CORBA::PolicyList& policies
-                         ACE_ENV_ARG_DECL);
+                        );
   };
 }
 
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index 89a85887b92..91e5ab57b63 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -64,19 +64,13 @@ public:
   virtual ~TAO_IORInterceptor_Adapter (void);
 
   virtual void add_interceptor (
-      PortableInterceptor::IORInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL
-    ) = 0;
+      PortableInterceptor::IORInterceptor_ptr interceptor) = 0;
 
   virtual void add_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL
-    ) = 0;
+      const CORBA::PolicyList& policies) = 0;
 
-  virtual void destroy_interceptors (
-      ACE_ENV_SINGLE_ARG_DECL
-      ) = 0;
+  virtual void destroy_interceptors (void) = 0;
 
   /// Call the IORInterceptor::establish_components() method on all
   /// registered IORInterceptors.
@@ -86,25 +80,22 @@ public:
    * IORInterceptor::components_established() once the former is
    * completed.
    */
-  virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL)
+  virtual void establish_components (TAO_Root_POA *poa )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Call the IORInterceptor::components_established() method on all
   /// registered IORInterceptors.
-  virtual void components_established (PortableInterceptor::IORInfo_ptr info
-                                       ACE_ENV_ARG_DECL)
+  virtual void components_established (PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual void adapter_state_changed (
       const TAO::ObjectReferenceTemplate_Array &array_obj_ref_template,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h
index ebb5561ee76..87f6fc0057e 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.h
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.h
@@ -43,7 +43,7 @@ public:
   virtual ~TAO_IORInterceptor_Adapter_Factory (void);
 
   virtual TAO_IORInterceptor_Adapter * create (
-      ACE_ENV_SINGLE_ARG_DECL
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index eceb6b0b06b..adcb4b6d6ca 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -19,7 +19,7 @@ CORBA::Object_ptr
 TAO_IORManip_Loader::create_object (CORBA::ORB_ptr,
                                     int,
                                     ACE_TCHAR *[]
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
index fc45a394fae..8bfbd4e69e2 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ b/TAO/tao/IORManipulation/IORManip_Loader.h
@@ -39,7 +39,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to force the initialization of the ORB code.
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index dcc9217a1fb..28ad17d8f5e 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -26,7 +26,7 @@ TAO_IOR_Manipulation_impl::~TAO_IOR_Manipulation_impl (void)
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::EmptyProfileList,
                    TAO_IOP::Duplicate,
@@ -97,8 +97,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
 
   TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string
                                           Merged_Profiles
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                         );
 
   // Make the stub memory allocation exception safe for the duration
   // of this method.
@@ -112,7 +111,6 @@ TAO_IOR_Manipulation_impl::merge_iors (
 
   CORBA::Object_var new_obj = temp_obj;
 
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Clean up in case of errors.
   if (CORBA::is_nil (new_obj.in ()))
@@ -132,7 +130,7 @@ CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::add_profiles (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::EmptyProfileList,
                    TAO_IOP::Duplicate,
@@ -144,14 +142,14 @@ TAO_IOR_Manipulation_impl::add_profiles (
   buffer [0] = ior1;
   buffer [1] = ior2;
   TAO_IOP::TAO_IOR_Manipulation::IORList iors (2, 2, buffer, 0);
-  return this->merge_iors (iors ACE_ENV_ARG_PARAMETER);
+  return this->merge_iors (iors);
 }
 
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::remove_profiles (
     CORBA::Object_ptr group,
     CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL)
+    )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR,
@@ -197,8 +195,7 @@ TAO_IOR_Manipulation_impl::remove_profiles (
 
   TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string
                                           Diff_Profiles
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                         );
 
   // Make the stub memory allocation exception safe for the duration
   // of this method.
@@ -244,7 +241,7 @@ CORBA::Boolean
 TAO_IOR_Manipulation_impl::set_property (
     TAO_IOP::TAO_IOR_Property_ptr prop,
     CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::Invalid_IOR,
                    TAO_IOP::Duplicate))
@@ -256,7 +253,7 @@ TAO_IOR_Manipulation_impl::set_property (
 
   // Call the implementation object to
   return prop->set_property (group
-                             ACE_ENV_ARG_PARAMETER);
+                            );
 }
 
 //@@ note awkward argument order
@@ -265,7 +262,7 @@ TAO_IOR_Manipulation_impl::set_primary (
     TAO_IOP::TAO_IOR_Property_ptr prop,
     CORBA::Object_ptr new_primary,
     CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::Invalid_IOR,
                    TAO_IOP::Duplicate,
@@ -285,14 +282,14 @@ TAO_IOR_Manipulation_impl::set_primary (
   // Call the callback object to do the rest of the processing.
   return prop->set_primary (new_primary,
                             group
-                            ACE_ENV_ARG_PARAMETER);
+                           );
 }
 
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::get_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL
+
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -308,34 +305,34 @@ TAO_IOR_Manipulation_impl::get_primary (
   // here?
 
   return prop->get_primary (group
-                            ACE_ENV_ARG_PARAMETER);
+                           );
 }
 
 CORBA::Boolean
 TAO_IOR_Manipulation_impl::is_primary_set (
     TAO_IOP::TAO_IOR_Property_ptr prop,
     CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return prop->is_primary_set (group ACE_ENV_ARG_PARAMETER);
+  return prop->is_primary_set (group);
 }
 
 CORBA::Boolean
 TAO_IOR_Manipulation_impl:: remove_primary_tag (
     TAO_IOP::TAO_IOR_Property_ptr prop,
     CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return prop->remove_primary_tag (group ACE_ENV_ARG_PARAMETER);
+  return prop->remove_primary_tag (group);
 }
 
 CORBA::ULong
 TAO_IOR_Manipulation_impl::is_in_ior (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::NotFound))
 {
@@ -365,7 +362,7 @@ TAO_IOR_Manipulation_impl::is_in_ior (
 CORBA::ULong
 TAO_IOR_Manipulation_impl::get_profile_count (
     CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::EmptyProfileList))
 {
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index 9ad320bc8d0..d81fedd2886 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -55,7 +55,7 @@ public:
 
   virtual CORBA::Object_ptr merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -66,7 +66,7 @@ public:
   virtual CORBA::Object_ptr add_profiles (
       CORBA::Object_ptr ior1,
       CORBA::Object_ptr ior2
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -77,7 +77,7 @@ public:
   virtual CORBA::Object_ptr remove_profiles (
     CORBA::Object_ptr group,
     CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR,
@@ -88,7 +88,7 @@ public:
   virtual CORBA::Boolean set_property (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -101,7 +101,7 @@ public:
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr new_primary,
       CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -113,7 +113,7 @@ public:
   virtual CORBA::Object_ptr get_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -123,7 +123,7 @@ public:
   virtual CORBA::Boolean is_primary_set (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr group
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -132,7 +132,7 @@ public:
    virtual CORBA::Boolean remove_primary_tag (
        TAO_IOP::TAO_IOR_Property_ptr prop,
        CORBA::Object_ptr iogr
-       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+       )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -140,7 +140,7 @@ public:
   virtual CORBA::ULong is_in_ior (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -148,7 +148,7 @@ public:
 
   virtual CORBA::ULong get_profile_count (
     CORBA::Object_ptr group
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index 71edf7b3f72..1bf0d21c4fb 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -18,11 +18,9 @@ ACE_RCSID (IORTable,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IOR_Table_Impl_ptr
-TAO::Objref_Traits<TAO_IOR_Table_Impl>::duplicate (
-    TAO_IOR_Table_Impl_ptr p
-  )
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::duplicate (TAO_IOR_Table_Impl_ptr p)
 {
-  if (! ::CORBA::is_nil (p))
+  if (!::CORBA::is_nil (p))
     {
       p->_add_ref ();
     }
@@ -31,24 +29,20 @@ TAO::Objref_Traits<TAO_IOR_Table_Impl>::duplicate (
 }
 
 void
-TAO::Objref_Traits<TAO_IOR_Table_Impl>::release (
-    TAO_IOR_Table_Impl_ptr p
-  )
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::release (TAO_IOR_Table_Impl_ptr p)
 {
   ::CORBA::release (p);
 }
 
 TAO_IOR_Table_Impl_ptr
-TAO::Objref_Traits<TAO_IOR_Table_Impl>::nil (void)
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::nil (void)
 {
   return TAO_IOR_Table_Impl::_nil ();
 }
 
 ::CORBA::Boolean
-TAO::Objref_Traits<TAO_IOR_Table_Impl>::marshal (
-    const TAO_IOR_Table_Impl_ptr ,
-    TAO_OutputCDR &
-  )
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::marshal (const TAO_IOR_Table_Impl_ptr,
+                                                  TAO_OutputCDR &)
 {
   return false;
 }
@@ -58,12 +52,8 @@ TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
 }
 
 char *
-TAO_IOR_Table_Impl::find (const char *object_key
-                          ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::NotFound
-      ))
+TAO_IOR_Table_Impl::find (const char *object_key)
+  ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   // We don't want the lock held during locate, so make it go out
   // of scope before then.
@@ -80,62 +70,38 @@ TAO_IOR_Table_Impl::find (const char *object_key
       ACE_THROW_RETURN (IORTable::NotFound (), 0);
   }
 
-  return this->locator_->locate (object_key ACE_ENV_ARG_PARAMETER);
+  return this->locator_->locate (object_key);
 }
 
 void
-TAO_IOR_Table_Impl::bind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::AlreadyBound
-      ))
+TAO_IOR_Table_Impl::bind (const char * object_key, const char * IOR)
+  ACE_THROW_SPEC ((CORBA::SystemException, IORTable::AlreadyBound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   if (this->map_.bind (object_key, IOR) != 0)
-    ACE_THROW (IORTable::AlreadyBound ());
+    throw IORTable::AlreadyBound ();
 }
 
 void
-TAO_IOR_Table_Impl::rebind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL_NOT_USED
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
+TAO_IOR_Table_Impl::rebind (const char * object_key, const char * IOR)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->map_.rebind (object_key, IOR);
 }
 
 void
-TAO_IOR_Table_Impl::unbind (
-        const char * object_key
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::NotFound
-      ))
+TAO_IOR_Table_Impl::unbind (const char * object_key)
+  ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   if (this->map_.unbind (object_key) != 0)
-    ACE_THROW (IORTable::NotFound ());
+    throw IORTable::NotFound ();
 }
 
 void
-TAO_IOR_Table_Impl::set_locator (
-        IORTable::Locator_ptr locator
-        ACE_ENV_ARG_DECL_NOT_USED
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
+TAO_IOR_Table_Impl::set_locator (IORTable::Locator_ptr locator)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->locator_ = IORTable::Locator::_duplicate (locator);
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index f5f08941c10..e04d59d55dd 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -37,77 +37,51 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_IOR_Table_Impl;
 typedef TAO_IOR_Table_Impl *TAO_IOR_Table_Impl_ptr;
-typedef TAO_Objref_Var_T<TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_var;
-typedef TAO_Objref_Out_T<TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_out;
+typedef TAO_Objref_Var_T <TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_var;
+typedef TAO_Objref_Out_T <TAO_IOR_Table_Impl> TAO_IOR_Table_Impl_out;
 
 class TAO_IOR_Table_Impl
   : public virtual IORTable::Table,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
-    static TAO_IOR_Table_Impl_ptr _nil (void)
-    {
-      return static_cast<TAO_IOR_Table_Impl_ptr> (0);
-    }
+  static TAO_IOR_Table_Impl_ptr
+  _nil (void)
+  {
+    return static_cast<TAO_IOR_Table_Impl_ptr> (0);
+  }
 
   /// Constructor
   TAO_IOR_Table_Impl (void);
 
   /// Find the object, using the locator if it is not on the table.
-  char *find (
-      const char *object_key
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      IORTable::NotFound
-    ));
-
-    /**
-     * @name The IORTable::Table methods
-     *
-     * Please check the IORTable.pidl file for details.
-     */
-    //@{
-    virtual void bind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::AlreadyBound
-      ));
-
-    virtual void rebind (
-        const char * object_key,
-        const char * IOR
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void unbind (
-        const char * object_key
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IORTable::NotFound
-      ));
-
-    virtual void set_locator (
-        IORTable::Locator_ptr the_locator
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    //@}
+  char *find (const char *object_key)
+    ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
+
+  /**
+   * @name The IORTable::Table methods
+   *
+   * Please check the IORTable.pidl file for details.
+   */
+  //@{
+  virtual void bind (const char * object_key, const char * IOR)
+    ACE_THROW_SPEC ((CORBA::SystemException, IORTable::AlreadyBound));
+
+  virtual void rebind (const char * object_key, const char * IOR)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void unbind (const char * object_key)
+    ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
+
+  virtual void set_locator (IORTable::Locator_ptr the_locator)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  //@}
 
 private:
-  typedef ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> Map;
+  typedef ACE_Hash_Map_Manager_Ex <ACE_CString, ACE_CString,
+                                   ACE_Hash <ACE_CString>,
+                                   ACE_Equal_To <ACE_CString>,
+                                   ACE_Null_Mutex> Map;
 
   /// The map
   Map map_;
@@ -123,23 +97,19 @@ private:
 namespace TAO
 {
   template<>
-  struct TAO_IORTable_Export Objref_Traits< TAO_IOR_Table_Impl>
+  struct TAO_IORTable_Export
+  Objref_Traits <TAO_IOR_Table_Impl>
   {
-    static TAO_IOR_Table_Impl_ptr duplicate (
-        TAO_IOR_Table_Impl_ptr
-      );
+    static TAO_IOR_Table_Impl_ptr duplicate (TAO_IOR_Table_Impl_ptr);
 
-    static void release (
-        TAO_IOR_Table_Impl_ptr
-      );
+    static void release (TAO_IOR_Table_Impl_ptr);
 
     static TAO_IOR_Table_Impl_ptr nil (void);
 
-    static ::CORBA::Boolean marshal (
-        const TAO_IOR_Table_Impl_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
+    static ::CORBA::Boolean marshal (const TAO_IOR_Table_Impl_ptr p,
+                                     TAO_OutputCDR &cdr);
+  }
+  ;
 }
 
 
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index aee48d01239..0fb63c1df41 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -65,21 +65,20 @@ TAO_Table_Adapter::create_lock (bool enable_locking,
 }
 
 void
-TAO_Table_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Table_Adapter::open (void)
 {
   ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
-  TAO_IOR_Table_Impl *impl;
+  TAO_IOR_Table_Impl *impl = 0;
   ACE_NEW_THROW_EX (impl,
                     TAO_IOR_Table_Impl (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   this->root_ = impl;
   this->closed_ = false;
 }
 
 void
-TAO_Table_Adapter::close (int  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Table_Adapter::close (int)
 {
   ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
   this->closed_ = true;
@@ -88,7 +87,7 @@ TAO_Table_Adapter::close (int  ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Table_Adapter::check_close (int  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Table_Adapter::check_close (int)
 {
 }
 
@@ -101,8 +100,7 @@ TAO_Table_Adapter::priority (void) const
 int
 TAO_Table_Adapter::dispatch (TAO::ObjectKey &key,
                              TAO_ServerRequest &,
-                             CORBA::Object_out forward_to
-                             ACE_ENV_ARG_DECL)
+                             CORBA::Object_out forward_to)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IOR_Table_Impl_var rootref;
@@ -156,7 +154,7 @@ TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub,
 }
 
 CORBA::Long
-TAO_Table_Adapter::initialize_collocated_object (TAO_Stub * stub)
+TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *stub)
 {
   // Get the effective profile set.
   const TAO_MProfile &mp = stub->forward_profiles () ? *(stub->forward_profiles ())
@@ -169,14 +167,13 @@ TAO_Table_Adapter::initialize_collocated_object (TAO_Stub * stub)
   CORBA::Object_var forward_to = CORBA::Object::_nil ();
   CORBA::Boolean found = false;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       found = this->find_object (key, forward_to.out ());
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (found)
     {
@@ -192,28 +189,20 @@ TAO_Table_Adapter::initialize_collocated_object (TAO_Stub * stub)
 
 CORBA::Long
 TAO_Table_Adapter::find_object (TAO::ObjectKey &key,
-                                CORBA::Object_out forward_to
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Object_out forward_to)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var object_key;
-  TAO::ObjectKey::encode_sequence_to_string (object_key.out (),
-                                            key);
-  ACE_TRY
+  TAO::ObjectKey::encode_sequence_to_string (object_key.out (), key);
+  try
     {
-      CORBA::String_var ior = root_->find (object_key.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      forward_to =
-        this->orb_core_.orb ()->string_to_object (ior.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var ior = root_->find (object_key.in ());
+      forward_to = this->orb_core_.orb ()->string_to_object (ior.in ());
     }
-  ACE_CATCH (IORTable::NotFound, nf_ex)
+  catch (const ::IORTable::NotFound&)
     {
       return 0;
     }
-  ACE_ENDTRY;
   return 1;
 }
 
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index dff331744d7..628b1a4d8ae 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -43,16 +43,13 @@ public:
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (ACE_ENV_SINGLE_ARG_DECL);
-  virtual void close (int wait_for_completion
-                      ACE_ENV_ARG_DECL);
-  virtual void check_close (int wait_for_completion
-                            ACE_ENV_ARG_DECL);
+  virtual void open (void);
+  virtual void close (int wait_for_completion);
+  virtual void check_close (int wait_for_completion);
   virtual int priority (void) const;
   virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
-                        CORBA::Object_out foward_to
-                        ACE_ENV_ARG_DECL)
+                        CORBA::Object_out foward_to)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual const char *name (void) const;
@@ -60,15 +57,14 @@ public:
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &);
 
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *);
+  virtual CORBA::Long initialize_collocated_object (TAO_Stub *stub);
 
 private:
   static ACE_Lock * create_lock (bool enable_locking, TAO_SYNCH_MUTEX &l);
   /// Helper method to find an object bound in the table.
   /// @return 1 if found, 0 otherwise.
   CORBA::Long find_object (TAO::ObjectKey &key,
-                           CORBA::Object_out forward_to
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Object_out forward_to)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The ORB Core we belong to
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 621433e6e40..0ac87661ffd 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -28,7 +28,7 @@ namespace TAO
 
     void
     ImR_Client_Adapter_Impl::imr_notify_startup (
-      TAO_Root_POA* poa ACE_ENV_ARG_DECL)
+      TAO_Root_POA* poa )
     {
       CORBA::Object_var imr = poa->orb_core ().implrepo_service ();
 
@@ -37,9 +37,9 @@ namespace TAO
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%P|%t) ERROR: No usable IMR initial reference ")
                       ACE_TEXT ("available but use IMR has been specified.\n")));
-          ACE_THROW (CORBA::TRANSIENT (
+          throw ::CORBA::TRANSIENT (
               CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-              CORBA::COMPLETED_NO));
+              CORBA::COMPLETED_NO);
         }
 
       if (TAO_debug_level > 0)
@@ -53,8 +53,7 @@ namespace TAO
         ACE_UNUSED_ARG (non_servant_upcall);
 
         imr_locator =
-          ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          ImplementationRepository::Administration::_narrow (imr.in ());
       }
 
       if (CORBA::is_nil(imr_locator.in ()))
@@ -63,9 +62,9 @@ namespace TAO
                       ACE_TEXT ("(%P|%t) ERROR: Narrowed IMR initial reference ")
                       ACE_TEXT ("is nil but use IMR has been specified.\n")));
 
-          ACE_THROW (CORBA::TRANSIENT (
+          throw ::CORBA::TRANSIENT (
               CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-              CORBA::COMPLETED_NO));
+              CORBA::COMPLETED_NO);
         }
 
       TAO_Root_POA *root_poa = poa->object_adapter ().root_poa ();
@@ -73,7 +72,6 @@ namespace TAO
                         ServerObject_i (poa->orb_core ().orb (),
                                         root_poa),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       PortableServer::ServantBase_var safe_servant (this->server_object_);
       ACE_UNUSED_ARG (safe_servant);
@@ -88,17 +86,14 @@ namespace TAO
         root_poa->activate_object_i (this->server_object_,
                                      poa->server_priority (),
                                      wait_occurred_restart_call_ignored
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    );
 
       CORBA::Object_var obj = root_poa->id_to_reference_i (id.in  (), false
-                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                          );
 
       ImplementationRepository::ServerObject_var svr
         = ImplementationRepository::ServerObject::_narrow (obj.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                          );
 
       if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ())
         {
@@ -107,8 +102,7 @@ namespace TAO
         }
 
       CORBA::String_var ior =
-        svr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        svr->_stubobj ()->profile_in_use ()->to_string ();
 
       // Search for "corbaloc:" alone, without the protocol.  This code
       // should be protocol neutral.
@@ -126,7 +120,7 @@ namespace TAO
                     "Informing IMR that we are running at: %s\n",
                     ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str())));
 
-      ACE_TRY
+      try
         {
           // ATTENTION: Trick locking here, see class header for details
           TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa);
@@ -135,23 +129,18 @@ namespace TAO
           imr_locator->server_is_running (poa->name().c_str (),
                                           partial_ior.c_str(),
                                           svr.in()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         );
         }
-      ACE_CATCH (CORBA::SystemException, sysex)
+      catch (const ::CORBA::SystemException&)
         {
-          // Avoid warnings on platforms with native C++ exceptions
-          ACE_UNUSED_ARG (sysex);
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception&)
         {
-          ACE_TRY_THROW (CORBA::TRANSIENT (
+          throw ::CORBA::TRANSIENT (
               CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-              CORBA::COMPLETED_NO));
+              CORBA::COMPLETED_NO);
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "Successfully notified ImR of Startup\n"));
@@ -159,7 +148,7 @@ namespace TAO
 
     void
     ImR_Client_Adapter_Impl::imr_notify_shutdown (
-      TAO_Root_POA* poa ACE_ENV_ARG_DECL)
+      TAO_Root_POA* poa )
     {
       // Notify the Implementation Repository about shutting down.
       CORBA::Object_var imr = poa->orb_core ().implrepo_service ();
@@ -169,7 +158,7 @@ namespace TAO
       if (CORBA::is_nil (imr.in ()))
         return;
 
-      ACE_TRY_NEW_ENV
+      try
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
@@ -182,57 +171,49 @@ namespace TAO
 
           // Get the IMR's administrative object and call shutting_down on it
           ImplementationRepository::Administration_var imr_locator =
-            ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            ImplementationRepository::Administration::_narrow (imr.in ());
 
           imr_locator->server_is_shutting_down (poa->name().c_str ()
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               );
         }
-      ACE_CATCH(CORBA::COMM_FAILURE, ex)
+      catch (const ::CORBA::COMM_FAILURE&)
         {
           // At the moment we call this during ORB shutdown and the ORB is
           // configured to drop replies during shutdown (it does by default in
           // the LF model) we get a COMM_FAILURE exception which we ignore
           if (TAO_debug_level > 0)
             ACE_DEBUG((LM_DEBUG, "Ignoring COMM_FAILURE while unregistering from ImR.\n"));
-          ACE_UNUSED_ARG (ex);
         }
-      ACE_CATCH(CORBA::TRANSIENT, ex)
+      catch (const ::CORBA::TRANSIENT&)
         {
           // Similarly, there are cases where we could get a TRANSIENT.
           if (TAO_debug_level > 0)
             ACE_DEBUG((LM_DEBUG, "Ignoring TRANSIENT while unregistering from ImR.\n"));
-          ACE_UNUSED_ARG (ex);
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "ImR_Client_Adapter_Impl::imr_notify_shutdown()");
+          ex._tao_print_exception (
+            "ImR_Client_Adapter_Impl::imr_notify_shutdown()");
           // Ignore exceptions
         }
-      ACE_ENDTRY;
 
       if (this->server_object_)
         {
           PortableServer::POA_var poa =
-            this->server_object_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+            this->server_object_->_default_POA ();
 
           TAO_Root_POA *root_poa = dynamic_cast <TAO_Root_POA*> (poa.in ());
 
           if (!root_poa)
             {
-              ACE_THROW (CORBA::OBJ_ADAPTER ());
+              throw ::CORBA::OBJ_ADAPTER ();
             }
 
           PortableServer::ObjectId_var id =
             root_poa->servant_to_id_i (this->server_object_
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                      );
 
-          root_poa->deactivate_object_i (id.in() ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          root_poa->deactivate_object_i (id.in());
 
           server_object_ = 0;
         }
diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h
index cf1e19b7f92..e7bc661c089 100644
--- a/TAO/tao/ImR_Client/ImR_Client.h
+++ b/TAO/tao/ImR_Client/ImR_Client.h
@@ -54,10 +54,10 @@ namespace TAO
       static int Initializer (void);
 
       /// ImplRepo helper method, notify the ImplRepo on startup
-      virtual void imr_notify_startup (TAO_Root_POA* poa ACE_ENV_ARG_DECL);
+      virtual void imr_notify_startup (TAO_Root_POA* poa);
 
       /// ImplRepo helper method, notify the ImplRepo on shutdown
-      virtual void imr_notify_shutdown (TAO_Root_POA* poa ACE_ENV_ARG_DECL);
+      virtual void imr_notify_shutdown (TAO_Root_POA* poa);
 
     private:
       /// Implementation Repository Server Object
diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp
index 8e777df8a31..711732af5aa 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.cpp
+++ b/TAO/tao/ImR_Client/ServerObject_i.cpp
@@ -14,25 +14,23 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
 }
 
 void
-ServerObject_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerObject_i::ping (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-ServerObject_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ServerObject_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Note : We want our child POAs to be able to unregister themselves from
   // the ImR, so we must destroy them before shutting down the orb.
-  poa_->destroy(1, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_->destroy(1, 0);
+  this->orb_->shutdown (0);
 }
 
 PortableServer::POA_ptr
-ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerObject_i::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h
index a397952aab6..f7b28b8af41 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.h
+++ b/TAO/tao/ImR_Client/ServerObject_i.h
@@ -45,15 +45,15 @@ public:
                   PortableServer::POA_ptr poa);
 
   /// Ping method.
-  void ping (ACE_ENV_SINGLE_ARG_DECL)
+  void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the server.
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the default POA for this servant.
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
 protected:
   /// Our ORB.  We need this member in case we need to shutdown the
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index b3577fb9e7e..5cd48381edb 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -35,13 +35,10 @@ namespace TAO
 
   void
   Invocation_Adapter::invoke (TAO::Exception_Data *ex_data,
-                              unsigned long ex_count
-                              ACE_ENV_ARG_DECL)
+                              unsigned long ex_count)
   {
     // Should stub object be refcounted here?
-    TAO_Stub *stub =
-      this->get_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    TAO_Stub *stub = this->get_stub ();
 
     TAO_Operation_Details op_details (this->operation_,
                                       this->op_len_,
@@ -51,16 +48,12 @@ namespace TAO
                                       ex_count,
                                       this->is_dii_request_);
 
-    this->invoke_i (stub,
-                    op_details
-                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->invoke_i (stub, op_details);
   }
 
   void
   Invocation_Adapter::invoke_i (TAO_Stub *stub,
-                                TAO_Operation_Details &details
-                                ACE_ENV_ARG_DECL)
+                                TAO_Operation_Details &details)
   {
     // The invocation has got to be within the context of the
     // corresponding ORB's configuration. Otherwise things like
@@ -89,9 +82,7 @@ namespace TAO
         if (cpb_ != 0 || effective_target->_servant () != 0)
           {
             strat =
-              TAO_ORB_Core::collocation_strategy (effective_target.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+              TAO_ORB_Core::collocation_strategy (effective_target.in ());
           }
 
         if (strat == TAO_CS_REMOTE_STRATEGY ||
@@ -102,25 +93,20 @@ namespace TAO
               this->invoke_remote_i (stub,
                                      details,
                                      effective_target,
-                                     max_wait_time
-                                     ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+                                     max_wait_time);
           }
         else
           {
             if (strat == TAO_CS_THRU_POA_STRATEGY)
               {
-                (void) this->set_response_flags (stub,
-                                                 details);
+                (void) this->set_response_flags (stub, details);
               }
 
             status =
               this->invoke_collocated_i (stub,
                                          details,
                                          effective_target,
-                                         strat
-                                         ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+                                         strat);
           }
 
         if (status == TAO_INVOKE_RESTART)
@@ -151,7 +137,7 @@ namespace TAO
   }
 
   TAO_Stub *
-  Invocation_Adapter::get_stub (ACE_ENV_SINGLE_ARG_DECL) const
+  Invocation_Adapter::get_stub (void) const
   {
     TAO_Stub * const stub =
       this->target_->_stubobj ();
@@ -171,8 +157,7 @@ namespace TAO
   Invocation_Adapter::invoke_collocated_i (TAO_Stub *stub,
                                            TAO_Operation_Details &details,
                                            CORBA::Object_var &effective_target,
-                                           Collocation_Strategy strat
-                                           ACE_ENV_ARG_DECL)
+                                           Collocation_Strategy strat)
   {
     // To make a collocated call we must have a collocated proxy broker, the
     // invoke_i() will make sure that we only come here when we have one
@@ -189,11 +174,7 @@ namespace TAO
                                     details,
                                     this->type_ == TAO_TWOWAY_INVOCATION);
 
-    status =
-      coll_inv.invoke (this->cpb_,
-                       strat
-                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    status = coll_inv.invoke (this->cpb_, strat);
 
     if (status == TAO_INVOKE_RESTART &&
         coll_inv.is_forwarded ())
@@ -210,9 +191,7 @@ namespace TAO
 
         (void) this->object_forwarded (effective_target,
                                        stub,
-                                       is_permanent_forward
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                                       is_permanent_forward);
       }
 
     return status;
@@ -258,13 +237,10 @@ namespace TAO
   Invocation_Adapter::invoke_remote_i (TAO_Stub *stub,
                                        TAO_Operation_Details &details,
                                        CORBA::Object_var &effective_target,
-                                       ACE_Time_Value *&max_wait_time
-                                       ACE_ENV_ARG_DECL)
+                                       ACE_Time_Value *&max_wait_time)
   {
     ACE_Time_Value tmp_wait_time;
-    bool is_timeout  =
-      this->get_timeout (stub,
-                         tmp_wait_time);
+    bool const is_timeout = this->get_timeout (stub, tmp_wait_time);
 
     if (is_timeout)
       max_wait_time = &tmp_wait_time;
@@ -285,9 +261,7 @@ namespace TAO
       stub,
       block_connect);
 
-    resolver.resolve (max_wait_time
-                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    resolver.resolve (max_wait_time);
 
     if (TAO_debug_level)
       {
@@ -306,16 +280,14 @@ namespace TAO
         return this->invoke_oneway (details,
                                     effective_target,
                                     resolver,
-                                    max_wait_time
-                                    ACE_ENV_ARG_PARAMETER);
+                                    max_wait_time);
       }
     else if (this->type_ == TAO_TWOWAY_INVOCATION)
       {
         return this->invoke_twoway (details,
                                     effective_target,
                                     resolver,
-                                    max_wait_time
-                                    ACE_ENV_ARG_PARAMETER);
+                                    max_wait_time);
       }
 
     return TAO_INVOKE_FAILURE;
@@ -325,8 +297,7 @@ namespace TAO
   Invocation_Adapter::invoke_twoway (TAO_Operation_Details &details,
                                      CORBA::Object_var &effective_target,
                                      Profile_Transport_Resolver &r,
-                                     ACE_Time_Value *&max_wait_time
-                                     ACE_ENV_ARG_DECL)
+                                     ACE_Time_Value *&max_wait_time)
   {
     // Simple sanity check
     if (this->mode_ != TAO_SYNCHRONOUS_INVOCATION ||
@@ -340,14 +311,10 @@ namespace TAO
                           TAO_INVOKE_FAILURE);
       }
 
-    TAO::Synch_Twoway_Invocation synch (this->target_,
-                                        r,
-                                        details);
+    TAO::Synch_Twoway_Invocation synch (this->target_,  r, details);
 
     Invocation_Status const status =
-      synch.remote_twoway (max_wait_time
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      synch.remote_twoway (max_wait_time);
 
     if (status == TAO_INVOKE_RESTART &&
         synch.is_forwarded ())
@@ -364,9 +331,7 @@ namespace TAO
 
         this->object_forwarded (effective_target,
                                 r.stub (),
-                                is_permanent_forward
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                                is_permanent_forward);
       }
 
     return status;
@@ -376,17 +341,12 @@ namespace TAO
   Invocation_Adapter::invoke_oneway (TAO_Operation_Details &details,
                                      CORBA::Object_var &effective_target,
                                      Profile_Transport_Resolver &r,
-                                     ACE_Time_Value *&max_wait_time
-                                     ACE_ENV_ARG_DECL)
+                                     ACE_Time_Value *&max_wait_time)
   {
-    TAO::Synch_Oneway_Invocation synch (this->target_,
-                                        r,
-                                        details);
+    TAO::Synch_Oneway_Invocation synch (this->target_, r, details);
 
     Invocation_Status const s =
-      synch.remote_oneway (max_wait_time
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      synch.remote_oneway (max_wait_time);
 
     if (s == TAO_INVOKE_RESTART &&
         synch.is_forwarded ())
@@ -402,9 +362,7 @@ namespace TAO
 #endif
         this->object_forwarded (effective_target,
                                 r.stub (),
-                                is_permanent_forward
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                                is_permanent_forward);
       }
 
     return s;
@@ -413,8 +371,7 @@ namespace TAO
   void
   Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target,
                                         TAO_Stub *stub,
-                                        CORBA::Boolean permanent_forward
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Boolean permanent_forward)
   {
     // The object pointer has to be changed to a TAO_Stub pointer
     // in order to obtain the profiles.
@@ -422,22 +379,22 @@ namespace TAO
       effective_target->_stubobj ();
 
     if (stubobj == 0)
-      ACE_THROW (CORBA::INTERNAL (
+      throw ::CORBA::INTERNAL (
         CORBA::SystemException::_tao_minor_code (
           TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
           errno),
-        CORBA::COMPLETED_NO));
+        CORBA::COMPLETED_NO);
 
 
     // Reset the profile in the stubs
     stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward);
 
     if (stub->next_profile () == 0)
-      ACE_THROW (CORBA::TRANSIENT (
+      throw ::CORBA::TRANSIENT (
         CORBA::SystemException::_tao_minor_code (
           TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
           errno),
-        CORBA::COMPLETED_NO));
+        CORBA::COMPLETED_NO);
 
     return;
   }
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index 017851372e1..c6da4157d14 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -43,8 +43,6 @@ namespace  CORBA
   class Object;
   typedef Object *Object_ptr;
   typedef TAO_Pseudo_Var_T<Object> Object_var;
-
-  class Environment;
 }
 
 namespace TAO
@@ -119,7 +117,7 @@ namespace TAO
                         size_t op_len,
                         Collocation_Proxy_Broker *cpb,
                         TAO::Invocation_Type type = TAO_TWOWAY_INVOCATION,
-                        TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION,                        
+                        TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION,
                         CORBA::Boolean is_dii_request = false);
 
     virtual ~Invocation_Adapter (void);
@@ -136,7 +134,7 @@ namespace TAO
      */
     virtual void invoke (TAO::Exception_Data *ex,
                          unsigned long ex_count
-                         ACE_ENV_ARG_DECL);
+                        );
   protected:
     /**
      * The stub pointer passed to this call has all the details about
@@ -148,7 +146,7 @@ namespace TAO
      */
     virtual void invoke_i (TAO_Stub *stub,
                            TAO_Operation_Details &details
-                           ACE_ENV_ARG_DECL);
+                          );
 
     /**
      * @name Helper methods for making different types of invocations.
@@ -179,7 +177,7 @@ namespace TAO
         TAO_Operation_Details &details,
         CORBA::Object_var &effective_target,
         ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
+       );
 
     /// Make a collocated call.
     /**
@@ -197,7 +195,7 @@ namespace TAO
         TAO_Operation_Details &details,
         CORBA::Object_var &effective_target,
         Collocation_Strategy strat
-        ACE_ENV_ARG_DECL);
+       );
 
     /// Helper method to make a two way invocation.
     /**
@@ -211,7 +209,7 @@ namespace TAO
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
         ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
+       );
 
     /// Helper method to make a one way invocation.
     /**
@@ -225,7 +223,7 @@ namespace TAO
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
         ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
+       );
     //@}
 
     /// Helper function that extracts the roundtrip timeout policies
@@ -234,14 +232,14 @@ namespace TAO
                       ACE_Time_Value &val);
 
     /// Helper method that extracts TAO_Stub from the target object.
-    TAO_Stub *get_stub (ACE_ENV_SINGLE_ARG_DECL) const;
+    TAO_Stub *get_stub (void) const;
 
     /// Helper method that takes care of setting the profiles within
     /// the stub object if the target gets forwarded
     void object_forwarded (CORBA::Object_var &effective_target,
                            TAO_Stub *stub,
                            CORBA::Boolean permanent_forward
-                           ACE_ENV_ARG_DECL);
+                          );
 
     /// Helper method to set the response flags within @a details
     void set_response_flags (TAO_Stub *stub,
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index a5558b74465..47727606a5b 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -80,39 +80,22 @@ namespace TAO
 #if TAO_HAS_INTERCEPTORS == 1
 
   Invocation_Status
-  Invocation_Base::send_request_interception (ACE_ENV_SINGLE_ARG_DECL)
+  Invocation_Base::send_request_interception (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (adapter_ != 0)
       {
-        ACE_TRY
+        try
           {
-            this->adapter_->send_request (*this
-                                          ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            this->adapter_->send_request (*this);
           }
-        ACE_CATCHANY
+        catch ( ::CORBA::Exception& ex)
           {
-            (void) this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                               ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            (void) this->handle_any_exception (&ex);
 
             // This is a begin interception point
-            ACE_RE_THROW;
+            throw;
           }
-    # if defined (ACE_HAS_EXCEPTIONS) \
-         && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-        ACE_CATCHALL
-          {
-            (void) this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            // This is a begin interception point
-            ACE_RE_THROW;
-          }
-    # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-        ACE_ENDTRY;
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
         if (this->forwarded_to_.in ())
           return TAO_INVOKE_RESTART;
@@ -123,37 +106,21 @@ namespace TAO
   }
 
   Invocation_Status
-  Invocation_Base::receive_reply_interception (ACE_ENV_SINGLE_ARG_DECL)
+  Invocation_Base::receive_reply_interception (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (adapter_ != 0)
       {
-        ACE_TRY
-          {
-            this->adapter_->receive_reply (*this
-                                           ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        ACE_CATCHANY
+        try
           {
-            (void) this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                               ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            ACE_RE_THROW;
+            this->adapter_->receive_reply (*this);
           }
-    # if defined (ACE_HAS_EXCEPTIONS) \
-         && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-        ACE_CATCHALL
+        catch ( ::CORBA::Exception& ex)
           {
-            (void) this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            (void) this->handle_any_exception (&ex);
 
-            ACE_RE_THROW;
+            throw;
           }
-    # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-        ACE_ENDTRY;
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
         PortableInterceptor::ReplyStatus const status =
           this->adapter_->reply_status (*this);
@@ -168,37 +135,21 @@ namespace TAO
 
 
   Invocation_Status
-  Invocation_Base::receive_other_interception (ACE_ENV_SINGLE_ARG_DECL)
+  Invocation_Base::receive_other_interception (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (adapter_ != 0)
       {
-        ACE_TRY
+        try
           {
-            this->adapter_->receive_other (*this
-                                           ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        ACE_CATCHANY
-          {
-            (void) this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                               ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-
-            ACE_RE_THROW;
+            this->adapter_->receive_other (*this);
           }
-    # if defined (ACE_HAS_EXCEPTIONS) \
-         && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-        ACE_CATCHALL
+        catch ( ::CORBA::Exception& ex)
           {
-            (void) this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            (void) this->handle_any_exception (&ex);
 
-            ACE_RE_THROW;
+            throw;
           }
-    # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-        ACE_ENDTRY;
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
         if (this->forwarded_to_.in ())
           return TAO_INVOKE_RESTART;
@@ -208,8 +159,7 @@ namespace TAO
   }
 
   PortableInterceptor::ReplyStatus
-  Invocation_Base::handle_any_exception (CORBA::Exception *ex
-                                         ACE_ENV_ARG_DECL)
+  Invocation_Base::handle_any_exception (CORBA::Exception *ex)
   {
     this->exception (ex);
 
@@ -218,9 +168,7 @@ namespace TAO
 
     if (adapter_ != 0)
       {
-        this->adapter_->receive_exception (*this
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (PortableInterceptor::UNKNOWN);
+        this->adapter_->receive_exception (*this);
 
         if (this->forwarded_to_.in ())
           {
@@ -236,7 +184,7 @@ namespace TAO
   }
 
   PortableInterceptor::ReplyStatus
-  Invocation_Base::handle_all_exception (ACE_ENV_SINGLE_ARG_DECL)
+  Invocation_Base::handle_all_exception (void)
   {
     CORBA::UNKNOWN ex;
     this->exception (&ex);
@@ -246,9 +194,7 @@ namespace TAO
 
     if (adapter_ != 0)
       {
-        this->adapter_->receive_exception (*this
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (PortableInterceptor::UNKNOWN);
+        this->adapter_->receive_exception (*this);
 
         status =
           this->adapter_->reply_status (*this);
@@ -265,7 +211,7 @@ namespace TAO
     else if (CORBA::UserException::_downcast (exception) != 0)
       this->invoke_status_ = TAO::TAO_INVOKE_USER_EXCEPTION;
 
-    this->forwarded_to_ = CORBA::Object::_nil ();      
+    this->forwarded_to_ = CORBA::Object::_nil ();
     this->caught_exception_ = exception;
   }
 
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index 328127e9dc0..27f204854e9 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -198,27 +198,27 @@ namespace TAO
   protected:
     /// Helper method to invoke send_request interception call to all
     /// the registered interceptors.
-    Invocation_Status send_request_interception (ACE_ENV_SINGLE_ARG_DECL)
+    Invocation_Status send_request_interception (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Helper method to invoke receive_reply interception call to all
     /// the registered interceptors.
-    Invocation_Status receive_reply_interception (ACE_ENV_SINGLE_ARG_DECL)
+    Invocation_Status receive_reply_interception (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Helper method to invoke receive_other interception call to all
     /// the registered interceptors.
-    Invocation_Status receive_other_interception (ACE_ENV_SINGLE_ARG_DECL)
+    Invocation_Status receive_other_interception (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Helper methods to handle interception calls when exceptions
     /// are thrown by the PortableInterceptor.
     PortableInterceptor::ReplyStatus
         handle_any_exception (CORBA::Exception *e
-                              ACE_ENV_ARG_DECL);
+                             );
 
     PortableInterceptor::ReplyStatus
-        handle_all_exception (ACE_ENV_SINGLE_ARG_DECL);
+        handle_all_exception (void);
 
   protected:
     /// The client requestor adapter
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 5221ee8d9c5..3a6981e5a2b 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -29,7 +29,7 @@ TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void)
 void
 TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver *r,
                                                 ACE_Time_Value *max_wait_time
-                                                ACE_ENV_ARG_DECL)
+                                                )
 {
   do
     {
@@ -53,8 +53,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver
               bool success =
                 r->try_parallel_connect (&desc,
                                          max_wait_time
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                                        );
 
               // Check if the connect has completed.
               if (success)
@@ -76,8 +75,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver
               bool retval =
                 r->try_connect (&desc,
                                 max_wait_time
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                               );
 
               // Check if the connect has completed.
               if (retval)
@@ -91,8 +89,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (TAO::Profile_Transport_Resolver
 
   // If we get here, we completely failed to find an endpoint selector
   // that we know how to use, so throw an exception.
-  ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                               CORBA::COMPLETED_NO));
+  throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index 29b33b7d37d..d7142cd86d3 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -44,7 +44,6 @@ namespace TAO
 namespace CORBA
 {
   class Exception;
-  class Environment;
 }
 /**
  * @class TAO_Invocation_Endpoint_Selector
@@ -70,7 +69,7 @@ public:
   /// Select the endpoint and set @a r's @c profile_
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
                                 ACE_Time_Value *val
-                                ACE_ENV_ARG_DECL) = 0;
+                                ) = 0;
 
 };
 
@@ -98,7 +97,7 @@ public:
 
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
                                 ACE_Time_Value *val
-                                ACE_ENV_ARG_DECL);
+                               );
 
 };
 
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp
index bc401286334..a52852f0529 100644
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ b/TAO/tao/LF_Connect_Strategy.cpp
@@ -30,21 +30,19 @@ TAO_LF_Connect_Strategy::synch_options (ACE_Time_Value *timeout,
 {
   if (timeout != 0)
     {
-      options.set (ACE_Synch_Options::USE_REACTOR,
-                   *timeout);
+      options.set (ACE_Synch_Options::USE_REACTOR, *timeout);
     }
   else
     {
       // Making it sure it is blocking.
-      options.set (ACE_Synch_Options::USE_REACTOR,
-                   ACE_Time_Value::zero);
+      options.set (ACE_Synch_Options::USE_REACTOR, ACE_Time_Value::zero);
     }
 }
 
 int
 TAO_LF_Connect_Strategy::wait_i (TAO_LF_Event *ev,
                                  TAO_Transport *transport,
-                               ACE_Time_Value *max_wait_time)
+                                 ACE_Time_Value *max_wait_time)
 {
   if (transport == 0)
     return -1;
@@ -53,9 +51,7 @@ TAO_LF_Connect_Strategy::wait_i (TAO_LF_Event *ev,
     this->orb_core_->leader_follower ();
 
   int result =
-    leader_follower.wait_for_event (ev,
-                                    transport,
-                                    max_wait_time);
+    leader_follower.wait_for_event (ev, transport, max_wait_time);
 
   if (ev->error_detected () && result != -1)
     result = -1;
diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h
index 35e6e514046..515df085157 100644
--- a/TAO/tao/LF_Connect_Strategy.h
+++ b/TAO/tao/LF_Connect_Strategy.h
@@ -50,13 +50,10 @@ public:
    * Concrete implementation for this class. Please see
    * Connect_Strategy.h for details
    */
-  virtual void synch_options (ACE_Time_Value *val,
-                              ACE_Synch_Options &opt);
+  virtual void synch_options (ACE_Time_Value *val, ACE_Synch_Options &opt);
 
 protected:
-  virtual int wait_i (TAO_LF_Event *ev,
-                      TAO_Transport *t,
-                    ACE_Time_Value *val);
+  virtual int wait_i (TAO_LF_Event *ev, TAO_Transport *t, ACE_Time_Value *val);
 
 };
 
diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp
index cc69d6fcea3..f40ccdb1317 100644
--- a/TAO/tao/LF_Event.cpp
+++ b/TAO/tao/LF_Event.cpp
@@ -26,8 +26,7 @@ TAO_LF_Event::~TAO_LF_Event (void)
 }
 
 void
-TAO_LF_Event::state_changed (int new_state,
-                             TAO_Leader_Follower &lf)
+TAO_LF_Event::state_changed (int new_state, TAO_Leader_Follower &lf)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, lf.lock ());
 
diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h
index 5344efdf36f..abad06792e1 100644
--- a/TAO/tao/LF_Event.h
+++ b/TAO/tao/LF_Event.h
@@ -107,8 +107,7 @@ public:
    */
   /// Accessor to change the state. The state isnt changed unless
   /// certain conditions are satisfied.
-  void state_changed (int new_state,
-                      TAO_Leader_Follower &lf);
+  void state_changed (int new_state, TAO_Leader_Follower &lf);
 
   /// Return 1 if the condition was satisfied successfully, 0 if it
   /// has not
diff --git a/TAO/tao/LF_Event_Binder.h b/TAO/tao/LF_Event_Binder.h
index f6dcac517ef..c2b8ff51498 100644
--- a/TAO/tao/LF_Event_Binder.h
+++ b/TAO/tao/LF_Event_Binder.h
@@ -35,8 +35,7 @@ class TAO_Export TAO_LF_Event_Binder
 {
 public:
   /// Constructor
-  TAO_LF_Event_Binder (TAO_LF_Event *event,
-                       TAO_LF_Follower *folloer);
+  TAO_LF_Event_Binder (TAO_LF_Event *event, TAO_LF_Follower *folloer);
 
   /// Destructor
   ~TAO_LF_Event_Binder (void);
diff --git a/TAO/tao/LF_Follower_Auto_Adder.h b/TAO/tao/LF_Follower_Auto_Adder.h
index f1161f6b14f..341c5d1b6d4 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.h
+++ b/TAO/tao/LF_Follower_Auto_Adder.h
@@ -35,8 +35,7 @@ class TAO_Export TAO_LF_Follower_Auto_Adder
 {
 public:
   /// Constructor
-  TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &,
-                              TAO_LF_Follower *follower);
+  TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &, TAO_LF_Follower *follower);
 
   /// Destructor
   ~TAO_LF_Follower_Auto_Adder (void);
diff --git a/TAO/tao/LF_Strategy_Complete.h b/TAO/tao/LF_Strategy_Complete.h
index a3dfb19996e..c39e2f91191 100644
--- a/TAO/tao/LF_Strategy_Complete.h
+++ b/TAO/tao/LF_Strategy_Complete.h
@@ -44,8 +44,7 @@ public:
   virtual void set_upcall_thread (TAO_Leader_Follower &);
   virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time,
                                      TAO_Leader_Follower &);
-  virtual void reset_event_loop_thread (int call_reset,
-                                        TAO_Leader_Follower &);
+  virtual void reset_event_loop_thread (int call_reset, TAO_Leader_Follower &);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
index 694bf8190b9..09fc4819ed8 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
@@ -47,25 +47,22 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport (
 {
   // @todo This is not the right way to do this....
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_ORB_Core *orb_core = transport->orb_core ();
 
       while (!transport->queue_is_empty ())
         {
-          int result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int result = orb_core->run (0, 1);
 
           if (result == -1)
             return -1;
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 75f80855da7..d60771f3915 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -39,8 +39,7 @@ CORBA::LocalObject::_remove_ref (void)
 // create hash tables.
 
 CORBA::ULong
-CORBA::LocalObject::_hash (CORBA::ULong maximum
-                           ACE_ENV_ARG_DECL_NOT_USED)
+CORBA::LocalObject::_hash (CORBA::ULong maximum)
 {
   // Note that we reinterpret_cast to an "ptrdiff_t" instead of
   // CORBA::ULong since we need to first cast to an integer large
@@ -60,8 +59,7 @@ CORBA::LocalObject::_hash (CORBA::ULong maximum
 // such as strcmp(), to allow more comparison algorithms.
 
 CORBA::Boolean
-CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj)
   ACE_THROW_SPEC (())
 {
   return (other_obj == this) ? true : false;
@@ -71,7 +69,7 @@ CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj
 
 
 TAO::ObjectKey *
-CORBA::LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::LocalObject::_key (void)
 {
   if (TAO_debug_level > 0)
     ACE_ERROR ((LM_ERROR,
@@ -87,7 +85,7 @@ CORBA::LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL)
 // the latter case, return FALSE.
 
 CORBA::Boolean
-CORBA::LocalObject::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::LocalObject::_non_existent (void)
 {
   // Always return false.
   return false;
@@ -99,11 +97,9 @@ CORBA::LocalObject::_create_request (CORBA::Context_ptr,
                                      CORBA::NVList_ptr,
                                      CORBA::NamedValue_ptr,
                                      CORBA::Request_ptr &,
-                                     CORBA::Flags
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Flags)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4,
-                                  CORBA::COMPLETED_NO));
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO);
 }
 
 void
@@ -114,16 +110,13 @@ CORBA::LocalObject::_create_request (CORBA::Context_ptr,
                                      CORBA::ExceptionList_ptr,
                                      CORBA::ContextList_ptr,
                                      CORBA::Request_ptr &,
-                                     CORBA::Flags
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::Flags)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4,
-                                  CORBA::COMPLETED_NO));
+  throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO);
 }
 
 CORBA::Request_ptr
-CORBA::LocalObject::_request (const char *
-                              ACE_ENV_ARG_DECL)
+CORBA::LocalObject::_request (const char *)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4,
                                          CORBA::COMPLETED_NO),
@@ -131,7 +124,7 @@ CORBA::LocalObject::_request (const char *
 }
 
 CORBA::Object_ptr
-CORBA::LocalObject::_get_component (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::LocalObject::_get_component (void)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
@@ -139,7 +132,7 @@ CORBA::LocalObject::_get_component (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-CORBA::LocalObject::_repository_id (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::LocalObject::_repository_id (void)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
@@ -147,7 +140,7 @@ CORBA::LocalObject::_repository_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::InterfaceDef_ptr
-CORBA::LocalObject::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::LocalObject::_get_interface (void)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
@@ -155,7 +148,7 @@ CORBA::LocalObject::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::ImplementationDef_ptr
-CORBA::LocalObject::_get_implementation (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::LocalObject::_get_implementation (void)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
@@ -165,8 +158,7 @@ CORBA::LocalObject::_get_implementation (ACE_ENV_SINGLE_ARG_DECL)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 CORBA::Policy_ptr
-CORBA::LocalObject::_get_policy (CORBA::PolicyType
-                                 ACE_ENV_ARG_DECL)
+CORBA::LocalObject::_get_policy (CORBA::PolicyType)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
@@ -174,16 +166,14 @@ CORBA::LocalObject::_get_policy (CORBA::PolicyType
 }
 
 CORBA::Policy_ptr
-CORBA::LocalObject::_get_cached_policy (TAO_Cached_Policy_Type
-                                        ACE_ENV_ARG_DECL)
+CORBA::LocalObject::_get_cached_policy (TAO_Cached_Policy_Type)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Object_ptr
 CORBA::LocalObject::_set_policy_overrides (const CORBA::PolicyList &,
-                                           CORBA::SetOverrideType
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::SetOverrideType)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
@@ -191,8 +181,7 @@ CORBA::LocalObject::_set_policy_overrides (const CORBA::PolicyList &,
 }
 
 CORBA::PolicyList *
-CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &
-                                           ACE_ENV_ARG_DECL)
+CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
@@ -200,8 +189,7 @@ CORBA::LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &
 }
 
 CORBA::Boolean
-CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out
-                                          ACE_ENV_ARG_DECL)
+CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
@@ -211,7 +199,7 @@ CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 CORBA::ORB_ptr
-CORBA::LocalObject::_get_orb (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::LocalObject::_get_orb (void)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index 8c57edb4b6c..bc700bac3c3 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -63,43 +63,31 @@ namespace CORBA
      * regular object.  Or, even easier, add a @c is_local member into
      * CORBA::Object.  I'll take the easier route for now.
      */
-    static LocalObject_ptr _narrow (CORBA::Object_ptr obj
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    static LocalObject_ptr _narrow (CORBA::Object_ptr obj);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
     /// Always returns false.
-    virtual CORBA::Boolean _non_existent (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual CORBA::Boolean _non_existent (void);
 
     /// Throws CORBA::NO_IMPLEMENT.
-    virtual CORBA::ImplementationDef_ptr _get_implementation (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual CORBA::ImplementationDef_ptr _get_implementation (void);
 
     /// Gets info about object from the Interface Repository.
-    virtual CORBA::InterfaceDef_ptr _get_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual CORBA::InterfaceDef_ptr _get_interface (void);
 
     /// Throws NO_IMPLEMENT.
-    virtual CORBA::Object_ptr _get_component (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual CORBA::Object_ptr _get_component (void);
 
     /// Get the repository id.
-    virtual char * _repository_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
+    virtual char * _repository_id (void);
 
     virtual void _create_request (CORBA::Context_ptr ctx,
                                   const char * operation,
                                   CORBA::NVList_ptr arg_list,
                                   CORBA::NamedValue_ptr result,
                                   CORBA::Request_ptr & request,
-                                  CORBA::Flags req_flags
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  CORBA::Flags req_flags);
 
     virtual void _create_request (CORBA::Context_ptr ctx,
                                   const char * operation,
@@ -108,43 +96,33 @@ namespace CORBA
                                   CORBA::ExceptionList_ptr exclist,
                                   CORBA::ContextList_ptr ctxtlist,
                                   CORBA::Request_ptr & request,
-                                  CORBA::Flags req_flags
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  CORBA::Flags req_flags);
 
     /// Throws NO_IMPLEMENT.
-    virtual CORBA::Request_ptr _request (const char * operation
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    virtual CORBA::Request_ptr _request (const char * operation);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
     /// Throws CORBA::NO_IMPLEMENT.
-    CORBA::Policy_ptr _get_policy (CORBA::PolicyType type
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    CORBA::Policy_ptr _get_policy (CORBA::PolicyType type);
 
     /// Throws CORBA::NO_IMPLEMENT.
-    CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type);
 
     /// Throws CORBA::NO_IMPLEMENT.
     CORBA::Object_ptr _set_policy_overrides (
         const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
+        CORBA::SetOverrideType set_add);
 
     /// Throws CORBA::NO_IMPLEMENT.
     CORBA::PolicyList * _get_policy_overrides (
-        const CORBA::PolicyTypeSeq & types
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
+        const CORBA::PolicyTypeSeq & types);
 
     /// Throws CORBA::NO_IMPLEMENT.
     CORBA::Boolean _validate_connection (
-        CORBA::PolicyList_out inconsistent_policies
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
+        CORBA::PolicyList_out inconsistent_policies);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -153,8 +131,7 @@ namespace CORBA
      * address of the object.  On non-32 bit platforms, the hash may
      * be non-unique.
      */
-    virtual CORBA::ULong _hash (CORBA::ULong maximum
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    virtual CORBA::ULong _hash (CORBA::ULong maximum);
 
     /**
      * Try to determine if this object is the same as @c other_obj.
@@ -163,8 +140,7 @@ namespace CORBA
      * different ORB protocols are in use) there is no default
      * implementation.
      */
-    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj)
       ACE_THROW_SPEC (());
 
     // = Reference count managment.
@@ -174,14 +150,12 @@ namespace CORBA
     /// Decrement the reference count.
     virtual void _remove_ref (void);
 
-    virtual CORBA::ORB_ptr _get_orb (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual CORBA::ORB_ptr _get_orb (void);
 
     // = TAO extensions
 
     /// Throws CORBA::NO_IMPLEMENT.
-    virtual TAO::ObjectKey * _key (ACE_ENV_SINGLE_ARG_DECL);
+    virtual TAO::ObjectKey * _key (void);
 
     /// Useful for template programming.
     typedef LocalObject_ptr _ptr_type;
diff --git a/TAO/tao/LocalObject.inl b/TAO/tao/LocalObject.inl
index 3b84db89160..151ac30f6ed 100644
--- a/TAO/tao/LocalObject.inl
+++ b/TAO/tao/LocalObject.inl
@@ -25,8 +25,7 @@ CORBA::LocalObject::_nil (void)
 
 ACE_INLINE
 CORBA::LocalObject_ptr
-CORBA::LocalObject::_narrow (CORBA::Object_ptr obj
-                             ACE_ENV_ARG_DECL_NOT_USED)
+CORBA::LocalObject::_narrow (CORBA::Object_ptr obj)
 {
   if (obj->_is_local () != 0)
     {
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index 203bcd5f605..4d4eb3d9b76 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -31,8 +31,7 @@ namespace TAO
   }
 
   Invocation_Status
-  LocateRequest_Invocation::invoke (ACE_Time_Value *max_wait_time
-                                    ACE_ENV_ARG_DECL)
+  LocateRequest_Invocation::invoke (ACE_Time_Value *max_wait_time)
     ACE_THROW_SPEC ((CORBA::Exception))
   {
     ACE_Countdown_Time countdown (max_wait_time);
@@ -58,19 +57,14 @@ namespace TAO
       }
 
     TAO_Target_Specification tspec;
-    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    this->init_target_spec (tspec);
 
-    TAO_Transport *transport =
-      this->resolver_.transport ();
+    TAO_Transport *transport = this->resolver_.transport ();
 
     TAO_OutputCDR &cdr = transport->out_stream ();
 
     int const retval =
-      transport->generate_locate_request (tspec,
-                                          this->details_,
-                                          cdr);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      transport->generate_locate_request (tspec, this->details_, cdr);
 
     if (retval == -1)
       return TAO_INVOKE_FAILURE;
@@ -78,11 +72,7 @@ namespace TAO
     countdown.update ();
 
     Invocation_Status s =
-      this->send_message (cdr,
-                          TAO_Transport::TAO_TWOWAY_REQUEST,
-                          max_wait_time
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      this->send_message (cdr, TAO_Transport::TAO_TWOWAY_REQUEST, max_wait_time);
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
@@ -96,15 +86,9 @@ namespace TAO
       this->resolver_.transport_released ();
 
     s =
-      this->wait_for_reply (max_wait_time,
-                            rd,
-                            dispatch_guard
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      this->wait_for_reply (max_wait_time, rd, dispatch_guard);
 
-    s = this->check_reply (rd
-                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    s = this->check_reply (rd);
 
     // For some strategies one may want to release the transport
     // back to  cache after receiving the reply. If the idling is
@@ -116,8 +100,7 @@ namespace TAO
   }
 
   Invocation_Status
-  LocateRequest_Invocation::check_reply (TAO_Synch_Reply_Dispatcher &rd
-                                         ACE_ENV_ARG_DECL)
+  LocateRequest_Invocation::check_reply (TAO_Synch_Reply_Dispatcher &rd)
   {
     TAO_InputCDR &cdr =
       rd.reply_cdr ();
@@ -136,7 +119,7 @@ namespace TAO
       case TAO_GIOP_OBJECT_FORWARD:
       case TAO_GIOP_OBJECT_FORWARD_PERM:
         return this->location_forward (cdr
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
 
       case TAO_GIOP_LOC_SYSTEM_EXCEPTION:
         {
@@ -176,9 +159,7 @@ namespace TAO
 
           // Now set this addressing mode in the profile, so that
           // the next invocation need not go through this.
-          this->resolver_.profile ()->addressing_mode (addr_mode
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_SUCCESS);
+          this->resolver_.profile ()->addressing_mode (addr_mode);
 
           // Restart the invocation.
           return TAO_INVOKE_RESTART;
diff --git a/TAO/tao/LocateRequest_Invocation.h b/TAO/tao/LocateRequest_Invocation.h
index 40b213eef37..d1aaebf63da 100644
--- a/TAO/tao/LocateRequest_Invocation.h
+++ b/TAO/tao/LocateRequest_Invocation.h
@@ -65,15 +65,12 @@ namespace TAO
         TAO_Operation_Details &detail);
 
     /// Start the invocation.
-    Invocation_Status invoke (ACE_Time_Value *max_wait_time
-                              ACE_ENV_ARG_DECL)
+    Invocation_Status invoke (ACE_Time_Value *max_wait_time)
       ACE_THROW_SPEC ((CORBA::Exception));
 
   private:
     /// Helper to check the reply status
-    Invocation_Status check_reply (TAO_Synch_Reply_Dispatcher &rd
-                                   ACE_ENV_ARG_DECL);
-
+    Invocation_Status check_reply (TAO_Synch_Reply_Dispatcher &rd);
   };
 }
 
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
index a8058d59eeb..795f38f72f0 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
@@ -25,18 +25,18 @@ namespace TAO
   }
 
   void
-  LocateRequest_Invocation_Adapter::invoke (ACE_ENV_SINGLE_ARG_DECL)
+  LocateRequest_Invocation_Adapter::invoke (void)
   {
     CORBA::Object * const effective_target = this->target_;
 
     TAO_Stub * const stub =
       this->target_->_stubobj ();
     if (stub == 0)
-      ACE_THROW (CORBA::INTERNAL (
+      throw ::CORBA::INTERNAL (
                      CORBA::SystemException::_tao_minor_code (
                        0,
                          EINVAL),
-                        CORBA::COMPLETED_NO));
+                        CORBA::COMPLETED_NO);
 
     // The invocation has got to be within the context of the
     // corresponding ORB's configuration. Otherwise things like
@@ -44,7 +44,7 @@ namespace TAO
     // there are multiple ORB instances in the process, each with its
     // own, local configuration.
     ACE_Service_Config_Guard scg (stub->orb_core ()->configuration ());
-    
+
     ACE_Time_Value tmp_wait_time;
     ACE_Time_Value *max_wait_time = 0;
 
@@ -63,15 +63,13 @@ namespace TAO
                                              stub,
                                              true);
 
-        ACE_TRY
+        try
           {
             resolver.init_inconsistent_policies (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                );
 
             resolver.resolve (max_wait_time
-                              ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                             );
 
             // Dummy operation details that is used to instantiate the
             // LocateRequest class.
@@ -84,21 +82,18 @@ namespace TAO
                                                  op);
 
             s = synch.invoke (max_wait_time
-                              ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                             );
           }
-        ACE_CATCH (CORBA::INV_POLICY, ex)
+        catch (const ::CORBA::INV_POLICY&)
           {
             this->list_ =
               resolver.steal_inconsistent_policies ();
-            ACE_RE_THROW;
+            throw;
           }
-        ACE_CATCHANY
+        catch (const ::CORBA::Exception&)
           {
-            ACE_RE_THROW;
+            throw;
           }
-        ACE_ENDTRY;
-        ACE_CHECK;
       }
 
     return;
diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h
index cfed80c24fc..f0d092ad31b 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.h
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.h
@@ -57,7 +57,7 @@ namespace TAO
         CORBA::Object_ptr target);
 
     /// Start the invocation on the target
-    void invoke (ACE_ENV_SINGLE_ARG_DECL);
+    void invoke (void);
 
     /// Accessor to the inconsistent policy list
     CORBA::PolicyList *get_inconsistent_policies (void);
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index a816035353b..2a8c88be7b7 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -2,7 +2,6 @@
 #include "tao/default_ports.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
-#include "tao/Environment.h"
 #include "tao/debug.h"
 
 #include "ace/SOCK_Acceptor.h"
@@ -39,8 +38,7 @@ TAO_MCAST_Parser::match_prefix (const char *ior_string) const
 
 CORBA::Object_ptr
 TAO_MCAST_Parser::parse_string (const char *ior,
-                                CORBA::ORB_ptr orb
-                                ACE_ENV_ARG_DECL)
+                                CORBA::ORB_ptr orb)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *mcast_name =
@@ -65,9 +63,7 @@ TAO_MCAST_Parser::parse_string (const char *ior,
                                  this->mcast_ttl_.in (),
                                  this->mcast_nic_.in (),
                                  orb,
-                                 timeout
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                 timeout);
 
   return object;
 }
@@ -79,8 +75,7 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name,
                                         const char *mcast_ttl,
                                         const char *mcast_nic,
                                         CORBA::ORB_ptr orb,
-                                        ACE_Time_Value *timeout
-                                        ACE_ENV_ARG_DECL)
+                                        ACE_Time_Value *timeout)
 {
   char buf[2048];
   char *ior = buf;
@@ -109,9 +104,7 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name,
     {
       // Convert IOR to an object reference.
       return_value =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        orb->string_to_object (ior);
     }
 
   // Return object reference.
diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h
index d8132a6f52f..35c8f170ad7 100644
--- a/TAO/tao/MCAST_Parser.h
+++ b/TAO/tao/MCAST_Parser.h
@@ -51,8 +51,7 @@ public:
 
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::ORB_ptr orb)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -63,8 +62,7 @@ private:
                                           const char *mcast_ttl,
                                           const char *mcast_nic,
                                           CORBA::ORB_ptr orb,
-                                          ACE_Time_Value *timeout
-                                          ACE_ENV_ARG_DECL_NOT_USED);
+                                          ACE_Time_Value *timeout);
 
   int multicast_query (char *&buf,
                        const char *service_name,
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index 7433ee4d8c4..2bc39477506 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -2,7 +2,6 @@
 //
 // $Id$
 #include "tao/MProfile.h"
-#include "tao/Environment.h"
 #include "tao/Profile.h"
 #include "tao/PolicyC.h"
 #include "tao/ORB_Constants.h"
@@ -25,22 +24,19 @@ TAO_MProfile::~TAO_MProfile (void)
 {
   if (this->policy_list_ != 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      const CORBA::ULong len = this->policy_list_->length ();
+      CORBA::ULong const len = this->policy_list_->length ();
       for (CORBA::ULong i = 0; i < len; ++i)
         {
-          ACE_TRY
+          try
             {
               CORBA::Policy_ptr policy = (*this->policy_list_)[i];
-              policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              policy->destroy ();
             }
-          ACE_CATCHANY
+          catch (const ::CORBA::Exception&)
             {
               // Ignore all exceptions to allow other policies to be
               // destroyed.
             }
-          ACE_ENDTRY;
         }
 
       delete this->policy_list_;
@@ -289,8 +285,7 @@ TAO_MProfile::is_equivalent (const TAO_MProfile *rhs)
 }
 
 CORBA::ULong
-TAO_MProfile::hash (CORBA::ULong max
-                    ACE_ENV_ARG_DECL)
+TAO_MProfile::hash (CORBA::ULong max)
 {
   CORBA::ULong hashval = 0;
 
@@ -299,9 +294,7 @@ TAO_MProfile::hash (CORBA::ULong max
 
   for (TAO_PHandle h = 0; h < this->last_ ; ++h)
     {
-      hashval += pfiles_[h]->hash (max
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      hashval += pfiles_[h]->hash (max);
     }
 
   // The above hash function return an ULong between 0 and max here we
@@ -312,7 +305,7 @@ TAO_MProfile::hash (CORBA::ULong max
 }
 
 void
-TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO_MProfile::create_policy_list (void)
 {
   ACE_NEW_THROW_EX (this->policy_list_,
                     CORBA::PolicyList,
@@ -322,21 +315,19 @@ TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_MProfile::init_policy_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO_MProfile::init_policy_list (void)
 {
   // The first time this method is called
   // it causes the initialization of the policies
   // for the current profile.
 
-  this->get_current_profile ()->get_policies (*this->policy_list_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->get_current_profile ()->get_policies (*this->policy_list_);
 
-  this->is_policy_list_initialized_ = 1;
+  this->is_policy_list_initialized_ = true;
 }
 
 CORBA::PolicyList *
-TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO_MProfile::policy_list (void)
 {
   if (!this->is_policy_list_initialized_)
     {
@@ -347,11 +338,9 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL)
 
       if (this->policy_list_ == 0)
         {
-          this->create_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->create_policy_list ();
 
-          this->init_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->init_policy_list ();
         }
     }
   CORBA::PolicyList *ret_val = 0;
@@ -359,7 +348,6 @@ TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL)
                     CORBA::PolicyList (*this->policy_list_),
                     CORBA::NO_MEMORY (0,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return ret_val;
 }
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 017c098ee0d..bd0b6f49c93 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -17,13 +17,12 @@
 #define TAO_MPROFILE_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Recursive_Thread_Mutex.h"
 
 #include /**/ "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
@@ -36,8 +35,6 @@ class TAO_Profile;
 namespace CORBA
 {
   class PolicyList;
-
-  class Environment;
 }
 
 typedef CORBA::ULong TAO_PHandle;
@@ -172,14 +169,13 @@ public:
    * profile and the results are averaged together.
    * NON-THREAD SAFE.
    */
-  CORBA::ULong hash (CORBA::ULong max
-                     ACE_ENV_ARG_DECL);
+  CORBA::ULong hash (CORBA::ULong max);
 
 protected:
 
   /// This method handle the dynamic allocation of the data member
   /// <policy_list_>.
- void create_policy_list (ACE_ENV_SINGLE_ARG_DECL);
+ void create_policy_list (void);
 
 public:
 
@@ -189,12 +185,12 @@ public:
 
   /// Gets the policies list associated with the profiles
   /// owned by the TAO_MProfile.
-  CORBA::PolicyList *policy_list (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::PolicyList *policy_list (void);
 
 protected:
 
   /// Initialize the policy list, demarsharling the policy.
-  void init_policy_list (ACE_ENV_SINGLE_ARG_DECL);
+  void init_policy_list (void);
 
 protected:
   /// Stores the policy list for the profile of this MProfile.
diff --git a/TAO/tao/MProfile.inl b/TAO/tao/MProfile.inl
index 2cf4d05d274..2a2d95f46d5 100644
--- a/TAO/tao/MProfile.inl
+++ b/TAO/tao/MProfile.inl
@@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE
 TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
   :  policy_list_ (0),
-     is_policy_list_initialized_ (0),
+     is_policy_list_initialized_ (false),
      forward_from_(0),
      pfiles_ (0),
      current_ (0),
@@ -21,7 +21,7 @@ TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
 ACE_INLINE
 TAO_MProfile::TAO_MProfile (const TAO_MProfile &mprofiles)
   :  policy_list_ (0),
-     is_policy_list_initialized_ (0),
+     is_policy_list_initialized_ (false),
      forward_from_(0),
      pfiles_ (0),
      current_ (0),
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index c43b2756e67..475897559e5 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -3293,7 +3293,6 @@ libTAO_CSD_Framework_la_SOURCES = \
   CSD_Framework/CSD_FrameworkA.cpp \
   CSD_Framework/CSD_FrameworkC.cpp \
   CSD_Framework/CSD_Framework_Loader.cpp \
-  CSD_Framework/CSD_ORBInitializer.cpp \
   CSD_Framework/CSD_Object_Adapter.cpp \
   CSD_Framework/CSD_Object_Adapter_Factory.cpp \
   CSD_Framework/CSD_POA.cpp \
@@ -3323,7 +3322,6 @@ nobase_include_HEADERS += \
   CSD_Framework/CSD_FrameworkC.h \
   CSD_Framework/CSD_FrameworkS.h \
   CSD_Framework/CSD_Framework_Loader.h \
-  CSD_Framework/CSD_ORBInitializer.h \
   CSD_Framework/CSD_Object_Adapter.h \
   CSD_Framework/CSD_Object_Adapter_Factory.h \
   CSD_Framework/CSD_POA.h \
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
index 0a1f3912dc9..846a65647fd 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -54,21 +54,17 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void)
 
   // If sending the exception to the client fails, then we just give
   // up, release the transport and return.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::NO_RESPONSE ex (CORBA::SystemException::_tao_minor_code
                              (TAO_AMH_REPLY_LOCATION_CODE,
                               EFAULT),
                              CORBA::COMPLETED_NO);
-      this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->_tao_rh_send_exception (ex);
     }
-  ACE_CATCHALL
+  catch (...)
     {
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
@@ -86,7 +82,7 @@ TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request,
 }
 
 void
-TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AMH_Response_Handler::_tao_rh_init_reply (void)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -99,11 +95,11 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL)
         // request and is now trying to send back the reply.  Hence we
         // say that the operation has completed but let the server
         // anyway that it is not doing something right.
-        ACE_THROW (CORBA::BAD_INV_ORDER
+        throw ::CORBA::BAD_INV_ORDER
                           (CORBA::SystemException::_tao_minor_code
                                   (TAO_AMH_REPLY_LOCATION_CODE,
                                    EEXIST),
-                           CORBA::COMPLETED_YES));
+                           CORBA::COMPLETED_YES);
       }
   }
 
@@ -135,7 +131,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL)
+TAO_AMH_Response_Handler::_tao_rh_send_reply (void)
 {
 
   {
@@ -145,11 +141,11 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL)
     // server-app saying it is not doing something right.
     if (this->reply_status_ != TAO_RS_INITIALIZED)
       {
-        ACE_THROW (CORBA::BAD_INV_ORDER (
+        throw ::CORBA::BAD_INV_ORDER (
                           CORBA::SystemException::_tao_minor_code (
                                                   TAO_AMH_REPLY_LOCATION_CODE,
                                                   ENOTSUP),
-                          CORBA::COMPLETED_YES));
+                          CORBA::COMPLETED_YES);
       }
     this->reply_status_ = TAO_RS_SENDING;
   }
@@ -181,17 +177,17 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex
-                                                  ACE_ENV_ARG_DECL)
+                                                  )
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
     if (this->reply_status_ != TAO_RS_UNINITIALIZED)
       {
-        ACE_THROW (CORBA::BAD_INV_ORDER (
+        throw ::CORBA::BAD_INV_ORDER (
           CORBA::SystemException::_tao_minor_code (
             TAO_AMH_REPLY_LOCATION_CODE,
             ENOTSUP),
-          CORBA::COMPLETED_YES));
+          CORBA::COMPLETED_YES);
       }
     this->reply_status_ = TAO_RS_SENDING;
   }
@@ -212,7 +208,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex
                                                   reply_params,
                                                   ex) == -1)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
   // Send the Exception
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 585ed1defea..9f25b914054 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -99,14 +99,14 @@ protected:
   /// Sets up the various parameters in anticipation of returning a reply
   /// to the client. return/OUT/INOUT arguments are marshalled into the
   /// Output stream after this method has been called.
-  void _tao_rh_init_reply (ACE_ENV_SINGLE_ARG_DECL);
+  void _tao_rh_init_reply (void);
 
   /// Sends the marshalled reply back to the client.
-  void _tao_rh_send_reply (ACE_ENV_SINGLE_ARG_DECL);
+  void _tao_rh_send_reply (void);
 
   /// Send back an exception to the client.
   void _tao_rh_send_exception (CORBA::Exception &ex
-                               ACE_ENV_ARG_DECL);
+                              );
 
 protected:
 
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 7296456a0ad..b2c5088fa35 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -40,12 +40,11 @@ namespace TAO
 
   Invocation_Status
   Asynch_Remote_Invocation::remote_invocation (ACE_Time_Value *max_wait_time
-                                               ACE_ENV_ARG_DECL)
+                                               )
     ACE_THROW_SPEC ((CORBA::Exception))
   {
     TAO_Target_Specification tspec;
-    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    this->init_target_spec (tspec);
 
     TAO_OutputCDR &cdr =
       this->resolver_.transport ()->messaging_object ()->out_stream ();
@@ -54,8 +53,7 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
     s =
-      this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      this->send_request_interception ();
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
@@ -64,7 +62,7 @@ namespace TAO
     // We have started the interception flow. We need to call the
     // ending interception flow if things go wrong. The purpose of the
     // try block is to take care of the cases when things go wrong.
-    ACE_TRY
+    try
       {
         // Oneway semantics.  See comments for below send_message()
         // call.
@@ -75,12 +73,10 @@ namespace TAO
 
         this->write_header (tspec,
                             cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                           );
 
         this->marshal_data (cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                           );
 
         // Register a reply dispatcher for this invocation. Use the
         // preallocated reply dispatcher.
@@ -115,8 +111,7 @@ namespace TAO
           this->send_message (cdr,
                               TAO_Transport::TAO_ONEWAY_REQUEST,
                               max_wait_time
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                             );
 
 #if TAO_HAS_INTERCEPTORS == 1
         // NOTE: We don't need to do the auto_ptr <> trick. We got here
@@ -132,8 +127,7 @@ namespace TAO
         // proper send, we are supposed to call receiver_other ()
         // interception point. So we do that here
         Invocation_Status tmp =
-          this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          this->receive_other_interception ();
 
         // We got an error during the interception.
         if (s == TAO_INVOKE_SUCCESS && tmp != TAO_INVOKE_SUCCESS)
@@ -152,42 +146,22 @@ namespace TAO
           (void) this->resolver_.transport_released ();
 
       }
-    ACE_CATCHANY
+    catch ( ::CORBA::Exception& ex)
       {
 #if TAO_HAS_INTERCEPTORS == 1
         PortableInterceptor::ReplyStatus const status =
-          this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          this->handle_any_exception (&ex);
 
         if (status == PortableInterceptor::LOCATION_FORWARD ||
             status == PortableInterceptor::TRANSPORT_RETRY)
           s = TAO_INVOKE_RESTART;
         else if (status == PortableInterceptor::SYSTEM_EXCEPTION
             || status == PortableInterceptor::USER_EXCEPTION)
+#else
+        ACE_UNUSED_ARG (ex);
 #endif /*TAO_HAS_INTERCEPTORS*/
-          ACE_RE_THROW;
+          throw;
       }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus st =
-          this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (st == PortableInterceptor::LOCATION_FORWARD ||
-            st == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-          ACE_RE_THROW;
-      }
-# endif  /* ACE_HAS_EXCEPTIONS &&
-            ACE_HAS_BROKEN_UNEXPECTED_EXCEPTION*/
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
     return s;
   }
diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h
index 930d223bd3c..0aee5c7a088 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.h
+++ b/TAO/tao/Messaging/Asynch_Invocation.h
@@ -56,7 +56,7 @@ namespace TAO
                               bool response_expected = true);
 
     Invocation_Status remote_invocation (ACE_Time_Value *value
-                                         ACE_ENV_ARG_DECL)
+                                         )
       ACE_THROW_SPEC ((CORBA::Exception));
 
   protected:
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index f0ef8094e34..67dfb1386bc 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -48,11 +48,10 @@ namespace TAO
   Asynch_Invocation_Adapter::invoke (
     Messaging::ReplyHandler_ptr reply_handler_ptr,
     const TAO_Reply_Handler_Skeleton &reply_handler_skel
-    ACE_ENV_ARG_DECL)
+    )
   {
     TAO_Stub * stub =
-      this->get_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->get_stub ();
 
     if (TAO_debug_level >= 4)
       {
@@ -99,24 +98,22 @@ namespace TAO
 
         if (rd == 0)
           {
-            ACE_THROW (CORBA::NO_MEMORY ());
+            throw ::CORBA::NO_MEMORY ();
           }
 
         this->safe_rd_.reset (rd);
       }
 
-    Invocation_Adapter::invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Invocation_Adapter::invoke (0, 0);
   }
 
   void
   Asynch_Invocation_Adapter::invoke (
     TAO::Exception_Data *ex,
     unsigned long ex_count
-    ACE_ENV_ARG_DECL)
+    )
   {
-    Invocation_Adapter::invoke (ex, ex_count  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Invocation_Adapter::invoke (ex, ex_count );
   }
 
   Invocation_Status
@@ -125,7 +122,7 @@ namespace TAO
     TAO_Operation_Details &details,
     CORBA::Object_var &effective_target,
     Collocation_Strategy strat
-    ACE_ENV_ARG_DECL)
+    )
   {
     // When doing a collocation asynch invocation we shouldn't use the
     // stub args but use the skel args
@@ -135,7 +132,7 @@ namespace TAO
                                                     details,
                                                     effective_target,
                                                     strat
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   );
   }
 
   Invocation_Status
@@ -144,7 +141,7 @@ namespace TAO
     CORBA::Object_var &effective_target,
     Profile_Transport_Resolver &r,
     ACE_Time_Value *&max_wait_time
-    ACE_ENV_ARG_DECL)
+    )
   {
     // Simple sanity check
     if (this->mode_ != TAO_ASYNCHRONOUS_CALLBACK_INVOCATION
@@ -172,8 +169,7 @@ namespace TAO
             this->safe_rd_->schedule_timer (
                 op.request_id (),
                 *max_wait_time
-                ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+               );
           }
       }
 
@@ -186,8 +182,7 @@ namespace TAO
 
     Invocation_Status const s =
       asynch.remote_invocation (max_wait_time
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                               );
 
     if (s == TAO_INVOKE_RESTART &&
         asynch.is_forwarded ())
@@ -204,8 +199,7 @@ namespace TAO
         this->object_forwarded (effective_target,
                                 r.stub (),
                                 permanent_forward
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                               );
       }
 
     return s;
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
index 0a36175d751..85c7501e9dd 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -43,7 +43,6 @@ class TAO_Asynch_Reply_Dispatcher_Base;
 namespace  CORBA
 {
   class Object;
-  class Environment;
   class SystemException;
 }
 
@@ -75,11 +74,11 @@ namespace TAO
 
     void invoke (Messaging::ReplyHandler_ptr reply_handler_ptr,
                  const TAO_Reply_Handler_Skeleton &reply_handler_skel
-                 ACE_ENV_ARG_DECL);
+                );
 
     virtual void invoke (TAO::Exception_Data *ex,
                          unsigned long ex_count
-                         ACE_ENV_ARG_DECL);
+                        );
   protected:
 
     virtual Invocation_Status invoke_twoway (
@@ -87,14 +86,14 @@ namespace TAO
         CORBA::Object_var &effective_target,
         Profile_Transport_Resolver &r,
         ACE_Time_Value *&max_wait_time
-        ACE_ENV_ARG_DECL);
+       );
 
     virtual Invocation_Status invoke_collocated_i (
         TAO_Stub *stub,
         TAO_Operation_Details &details,
         CORBA::Object_var &effective_target,
         Collocation_Strategy strat
-        ACE_ENV_ARG_DECL);
+       );
 
   private:
     /// Autofunctor to manage the reply dispatcher
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index a0a4d13cf08..8b521839467 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -121,22 +121,19 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
 
   if (!CORBA::is_nil (this->reply_handler_.in ()))
     {
-      ACE_TRY_NEW_ENV
+      try
         {
           // Call the Reply Handler's skeleton.
           reply_handler_skel_ (this->reply_cdr_,
                                this->reply_handler_.in (),
                                reply_error
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               );
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception& ex)
         {
           if (TAO_debug_level >= 4)
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "Exception during reply handler");
+            ex._tao_print_exception ("Exception during reply handler");
         }
-      ACE_ENDTRY;
     }
 
   this->decr_refcount ();
@@ -147,7 +144,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
 void
 TAO_Asynch_Reply_Dispatcher::connection_closed (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (!this->try_dispatch_reply ())
         return;
@@ -166,9 +163,8 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
 
       TAO_OutputCDR out_cdr;
 
-      comm_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER);
+      comm_failure._tao_encode (out_cdr);
 
-      ACE_TRY_CHECK;
 
       // Turn into an output CDR
       TAO_InputCDR cdr (out_cdr);
@@ -178,20 +174,18 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
           this->reply_handler_skel_ (cdr,
                                      this->reply_handler_.in (),
                                      TAO_AMI_REPLY_SYSTEM_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                     );
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Asynch_Reply_Dispacher::connection_closed");
+          ex._tao_print_exception (
+            "Asynch_Reply_Dispacher::connection_closed");
         }
 
     }
-  ACE_ENDTRY;
 
   (void) this->decr_refcount ();
 }
@@ -201,9 +195,8 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
 void
 TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Generate a fake exception....
       CORBA::TIMEOUT timeout_failure (
@@ -214,8 +207,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
 
       TAO_OutputCDR out_cdr;
 
-      timeout_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      timeout_failure._tao_encode (out_cdr);
 
       // This is okay here... Everything relies on our refcount being
       // held by the timeout handler, whose refcount in turn is held
@@ -240,21 +232,17 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
           this->reply_handler_skel_ (cdr,
                                      this->reply_handler_.in (),
                                      TAO_AMI_REPLY_SYSTEM_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                     );
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level >= 4)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Asynch_Reply_Dispacher::reply_timed_out");
+          ex._tao_print_exception ("Asynch_Reply_Dispacher::reply_timed_out");
         }
 
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   (void) this->decr_refcount ();
 }
@@ -262,7 +250,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
 long
 TAO_Asynch_Reply_Dispatcher::schedule_timer (CORBA::ULong request_id,
                                              const ACE_Time_Value &max_wait_time
-                                             ACE_ENV_ARG_DECL)
+                                             )
 {
   if (this->timeout_handler_ == 0)
     {
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
index 5b315547813..4989fb659f4 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -60,7 +60,7 @@ public:
   /// Install the timeout handler
   long schedule_timer (CORBA::ULong request_id,
                        const ACE_Time_Value &max_wait_time
-                       ACE_ENV_ARG_DECL);
+                      );
 
 private:
   /// Skeleton for the call back method in the Reply Handler.
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index b621a85b375..fc2b116f39a 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -38,7 +38,7 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy (
 
 TimeBase::TimeT
 TAO_ConnectionTimeoutPolicy::relative_expiry (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->relative_expiry_;
@@ -46,7 +46,7 @@ TAO_ConnectionTimeoutPolicy::relative_expiry (
 
 CORBA::PolicyType
 TAO_ConnectionTimeoutPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return TAO::CONNECTION_TIMEOUT_POLICY_TYPE;
@@ -58,7 +58,7 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
                                    bool &has_timeout,
                                    ACE_Time_Value &time_value)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Policy_var policy = 0;
 
@@ -67,16 +67,14 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
           policy =
             orb_core->get_cached_policy_including_current (
               TAO_CACHED_POLICY_CONNECTION_TIMEOUT
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+             );
         }
       else
         {
           policy =
             stub->get_cached_policy (
               TAO_CACHED_POLICY_CONNECTION_TIMEOUT
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+             );
         }
 
       if (CORBA::is_nil (policy.in ()))
@@ -88,11 +86,9 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
       TAO::ConnectionTimeoutPolicy_var p =
         TAO::ConnectionTimeoutPolicy::_narrow (
           policy.in ()
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         );
 
-      TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TimeBase::TimeT t = p->relative_expiry ();
       TimeBase::TimeT seconds = t / 10000000u;
       TimeBase::TimeT microseconds = (t % 10000000u) / 10;
       time_value.set (ACE_U64_TO_U32 (seconds),
@@ -108,16 +104,15 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
                       time_value.msec ()));
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Ignore all exceptions...
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Policy_ptr
 TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val
-                                            ACE_ENV_ARG_DECL)
+                                            )
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
@@ -132,7 +127,6 @@ TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val
                     TAO_ConnectionTimeoutPolicy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
@@ -148,7 +142,7 @@ TAO_ConnectionTimeoutPolicy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_ConnectionTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ConnectionTimeoutPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how the following code is
@@ -158,13 +152,12 @@ TAO_ConnectionTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_ConnectionTimeoutPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_ConnectionTimeoutPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ConnectionTimeoutPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
index 9e334a307a7..67d4e401033 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -64,22 +64,22 @@ public:
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
   static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   );
 
   /// Returns a copy of <this>.
   virtual TAO_ConnectionTimeoutPolicy *clone (void) const;
 
   // = The TAO::ConnectionTinoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (ACE_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::TimeT relative_expiry (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp
index a03294907a5..b66bcba0eb5 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.cpp
+++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp
@@ -44,7 +44,7 @@ namespace TAO
   }
 
   void ExceptionHolder::raise_exception (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
     )
     {
       TAO_Messaging_Helper::exception_holder_raise (
@@ -54,15 +54,15 @@ namespace TAO
         this->marshaled_exception ().length (),
         this->byte_order (),
         this->is_system_exception ()
-        ACE_ENV_ARG_PARAMETER);
+       );
       }
 
   void ExceptionHolder::raise_exception_with_list (
-      const ::Dynamic::ExceptionList & ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      const ::Dynamic::ExceptionList &
     )
     {
       // todo convert exceptionlist to something we can really use.
-      this->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->raise_exception ();
     }
 
   CORBA::ValueBase*
@@ -72,7 +72,6 @@ namespace TAO
     ACE_NEW_THROW_EX (ret_val,
                       ExceptionHolder,
                       CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
 
     // @todo According to the latest corba spec we should be able to
     // pass this to the ExceptionHolder constructor but the TAO_IDL
@@ -86,13 +85,12 @@ namespace TAO
 
   CORBA::ValueBase *
   ExceptionHolderFactory::create_for_unmarshal (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    void)
   {
     TAO::ExceptionHolder* ret_val = 0;
     ACE_NEW_THROW_EX (ret_val,
                       ExceptionHolder,
                       CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
 
     return ret_val;
   }
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h
index f19f4308d58..ea07d781443 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.h
+++ b/TAO/tao/Messaging/ExceptionHolder_i.h
@@ -60,10 +60,10 @@ namespace TAO
     void set_exception_data (::TAO::Exception_Data* data,
                              ::CORBA::ULong exceptions_count);
 
-    virtual void raise_exception (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    virtual void raise_exception (void);
 
     virtual void raise_exception_with_list (
-        const ::Dynamic::ExceptionList & exc_list ACE_ENV_ARG_DECL_WITH_DEFAULTS
+        const ::Dynamic::ExceptionList & exc_list
       );
 
     virtual CORBA::ValueBase* _copy_value (void);
@@ -91,7 +91,7 @@ namespace TAO
   {
   public:
     virtual CORBA::ValueBase * create_for_unmarshal (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      void);
   };
 
 }
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index 9f0c1f164cf..7c430ebeb62 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -33,7 +33,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
                         CORBA::ULong marshaled_data_length,
                         CORBA::Boolean byte_order,
                         CORBA::Boolean is_system_exception
-                        ACE_ENV_ARG_DECL)
+                        )
 {
   TAO_InputCDR _tao_in ((const char*) marshaled_data,
                         marshaled_data_length,
@@ -45,8 +45,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
     {
       // Could not demarshal the exception id, raise a local
       // CORBA::MARSHAL
-      ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
-                                 CORBA::COMPLETED_YES));
+      throw ::CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_YES);
     }
 
   if (is_system_exception)
@@ -55,8 +54,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
       CORBA::ULong completion = 0;
       if ((_tao_in >> minor) == 0 ||
           (_tao_in >> completion) == 0)
-        ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
-                                   CORBA::COMPLETED_MAYBE));
+        throw ::CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_MAYBE);
 
       CORBA::SystemException* exception =
         TAO::create_system_exception (type_id.in ());
@@ -72,10 +70,8 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
       exception->completed (CORBA::CompletionStatus (completion));
 
       // Raise the exception.
-#if defined (TAO_HAS_EXCEPTIONS)
       ACE_Auto_Basic_Ptr<CORBA::SystemException> e_ptr(exception);
-#endif
-      ACE_ENV_RAISE (exception);
+      exception->_raise ();
 
       return;
     }
@@ -91,16 +87,12 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
       CORBA::Exception * const exception = exception_data[i].alloc ();
 
       if (exception == 0)
-        ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
-                                     CORBA::COMPLETED_YES));
-      exception->_tao_decode (_tao_in ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        throw ::CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_YES);
+      exception->_tao_decode (_tao_in);
 
       // Raise the exception.
-#if defined (TAO_HAS_EXCEPTIONS)
       ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr (exception);
-#endif
-      ACE_ENV_RAISE (exception);
+      exception->_raise ();
 
       return;
     }
@@ -111,8 +103,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
   // @@ It would seem like if the remote exception is a
   //    UserException we can assume that the request was
   //    completed.
-  ACE_THROW (CORBA::UNKNOWN (TAO::VMCID,
-                             CORBA::COMPLETED_YES));
+  throw ::CORBA::UNKNOWN (TAO::VMCID, CORBA::COMPLETED_YES);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index 4c4647e5432..04f69d33aa5 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -64,7 +64,7 @@ typedef void (*TAO_Reply_Handler_Skeleton)(
     TAO_InputCDR &,
     Messaging::ReplyHandler_ptr,
     CORBA::ULong reply_status
-    ACE_ENV_ARG_DECL_NOT_USED
+
     );
 
 namespace TAO
@@ -89,7 +89,7 @@ namespace TAO_Messaging_Helper
            CORBA::ULong marshaled_data_length,
            CORBA::Boolean byte_order,
            CORBA::Boolean is_system_exception
-           ACE_ENV_ARG_DECL);
+          );
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp
index de5d02cbc7c..db1814ff545 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -37,8 +37,7 @@ TAO_Messaging_Loader::init (int,
     PortableInterceptor::ORBInitializer::_nil ();
   PortableInterceptor::ORBInitializer_var orb_initializer;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Register the Messaging ORBInitializer.
 
@@ -49,24 +48,20 @@ TAO_Messaging_Loader::init (int,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       orb_initializer = temp_orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught exception:");
+          ex._tao_print_exception ("Caught exception:");
         }
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
index 82a57e50c9e..d2bc635f550 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -17,9 +17,7 @@ ACE_RCSID (Messaging,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO_Messaging_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
@@ -40,30 +38,22 @@ TAO_Messaging_ORBInitializer::pre_init (
 
 void
 TAO_Messaging_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  PortableInterceptor::ORBInitInfo_ptr info)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_policy_factories (info);
 
-  this->register_value_factory (info
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_value_factory (info);
 }
 
 void
 TAO_Messaging_ORBInitializer::register_value_factory (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_ORBInitInfo::_narrow (info);
 
   if (CORBA::is_nil (tao_info.in ()))
     {
@@ -74,7 +64,7 @@ TAO_Messaging_ORBInitializer::register_value_factory (
                     "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
                     "(%P|%t)   \"TAO_ORBInitInfo *.\"\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
   TAO::ExceptionHolderFactory *base_factory = 0;
@@ -84,14 +74,11 @@ TAO_Messaging_ORBInitializer::register_value_factory (
 
   tao_info->orb_core()->orb ()->register_value_factory (
         Messaging::ExceptionHolder::_tao_obv_static_repository_id (),
-        base_factory
-        ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+        base_factory);
 }
 void
 TAO_Messaging_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   // Register the Messaging policy factories.
 
@@ -103,7 +90,6 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
                           TAO::VMCID,
                           ENOMEM),
                         CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
 
   PortableInterceptor::PolicyFactory_var policy_factory =
@@ -160,14 +146,11 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
   const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]);
   for (CORBA::PolicyType *i = type; i != end; ++i)
     {
-      ACE_TRY
+      try
         {
-          info->register_policy_factory (*i,
-                                         policy_factory.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          info->register_policy_factory (*i, policy_factory.in ());
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+      catch (const ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -177,15 +160,13 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
               // should do no more work in this ORBInitializer.
               return;
             }
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception&)
         {
           // Rethrow any other exceptions...
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h
index e5d57c2a72d..443118bf601 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h
@@ -49,12 +49,10 @@ public:
    */
   //@{
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
@@ -62,14 +60,10 @@ public:
 private:
 
   /// Register Messaging policy factories.
-  void register_policy_factories (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL);
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Register ExceptionHolder value factory
-  void register_value_factory (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL);
+  void register_value_factory (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
index 7fcda386a8b..278d07e5ec6 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -18,8 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
 TAO_Messaging_PolicyFactory::create_buffering_constraint_policy (
-    const CORBA::Any& val
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any& val)
 {
   TAO::BufferingConstraint *buffering_constraint = 0;
   if ((val >>= buffering_constraint) == 0)
@@ -30,7 +29,6 @@ TAO_Messaging_PolicyFactory::create_buffering_constraint_policy (
   ACE_NEW_THROW_EX (servant,
                     TAO_Buffering_Constraint_Policy (*buffering_constraint),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return servant;
 }
@@ -40,33 +38,32 @@ TAO_Messaging_PolicyFactory::create_buffering_constraint_policy (
 CORBA::Policy_ptr
 TAO_Messaging_PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
   if (type == Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE)
     return TAO_RelativeRoundtripTimeoutPolicy::create (value
-                                                       ACE_ENV_ARG_PARAMETER);
+                                                      );
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
   if (type == TAO::CONNECTION_TIMEOUT_POLICY_TYPE)
     return TAO_ConnectionTimeoutPolicy::create (value
-                                                ACE_ENV_ARG_PARAMETER);
+                                               );
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
   if (type == Messaging::SYNC_SCOPE_POLICY_TYPE)
     return TAO_Sync_Scope_Policy::create (value
-                                          ACE_ENV_ARG_PARAMETER);
+                                         );
 #endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
   if (type == TAO::BUFFERING_CONSTRAINT_POLICY_TYPE)
     return this->create_buffering_constraint_policy (value
-                                                     ACE_ENV_ARG_PARAMETER);
+                                                    );
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
   if (
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h
index c2b36ed1a43..a2e5d63eae0 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h
@@ -43,15 +43,13 @@ class TAO_Messaging_PolicyFactory
 public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const CORBA::Any & value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 private:
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
   CORBA::Policy_ptr
-  create_buffering_constraint_policy (const CORBA::Any& val
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  create_buffering_constraint_policy (const CORBA::Any& val);
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 };
 
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index 39d4cc2b50a..3d98a6f8ebb 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -42,7 +42,7 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (
 
 TimeBase::TimeT
 TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->relative_expiry_;
@@ -50,7 +50,7 @@ TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (
 
 CORBA::PolicyType
 TAO_RelativeRoundtripTimeoutPolicy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE;
@@ -62,7 +62,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
                                           bool &has_timeout,
                                           ACE_Time_Value &time_value)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Policy_var policy = 0;
 
@@ -71,15 +71,13 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
           policy =
             orb_core->get_cached_policy_including_current (
               TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+             );
         }
       else
         {
           policy =
             stub->get_cached_policy (TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                    );
         }
 
       if (CORBA::is_nil (policy.in ()))
@@ -91,11 +89,9 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
       Messaging::RelativeRoundtripTimeoutPolicy_var p =
         Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
           policy.in ()
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         );
 
-      TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TimeBase::TimeT t = p->relative_expiry ();
       TimeBase::TimeT seconds = t / 10000000u;
       TimeBase::TimeT microseconds = (t % 10000000u) / 10;
       time_value.set (ACE_U64_TO_U32 (seconds),
@@ -111,16 +107,14 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
                       time_value.msec ()));
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Ignore all exceptions...
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val
-                                            ACE_ENV_ARG_DECL)
+TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val)
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
@@ -135,7 +129,6 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val
                     TAO_RelativeRoundtripTimeoutPolicy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
@@ -151,23 +144,22 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RelativeRoundtripTimeoutPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
 
-  TAO_RelativeRoundtripTimeoutPolicy* tmp;
+  TAO_RelativeRoundtripTimeoutPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_RelativeRoundtripTimeoutPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_RelativeRoundtripTimeoutPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RelativeRoundtripTimeoutPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -222,7 +214,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
 }
 
 CORBA::PolicyType
-TAO_Sync_Scope_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Sync_Scope_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Messaging::SYNC_SCOPE_POLICY_TYPE;
@@ -234,7 +226,7 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
                              bool &has_synchronization,
                              Messaging::SyncScope &scope)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Policy_var policy = 0;
 
@@ -243,47 +235,42 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
           policy =
             orb_core->get_cached_policy_including_current (
               TAO_CACHED_POLICY_SYNC_SCOPE
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+             );
         }
       else
         {
           policy =
             stub->get_cached_policy (TAO_CACHED_POLICY_SYNC_SCOPE
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                    );
         }
 
       if (CORBA::is_nil (policy.in ()))
         {
-          has_synchronization = 0;
+          has_synchronization = false;
           return;
         }
       Messaging::SyncScopePolicy_var p =
         Messaging::SyncScopePolicy::_narrow (policy.in ());
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (p.in ()))
-        ACE_THROW (CORBA::INTERNAL (
+        throw ::CORBA::INTERNAL (
                 CORBA::SystemException::_tao_minor_code (
                   TAO_POLICY_NARROW_CODE,
                   0),
-                CORBA::COMPLETED_NO));
+                CORBA::COMPLETED_NO);
 
       has_synchronization = true;
-      scope = p->synchronization (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      scope = p->synchronization ();
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Ignore all exceptions...
     }
-  ACE_ENDTRY;
 }
 
 CORBA::Policy_ptr
 TAO_Sync_Scope_Policy::create (const CORBA::Any& val
-                               ACE_ENV_ARG_DECL)
+                               )
 {
   Messaging::SyncScope synchronization;
   if ((val >>= synchronization) == 0)
@@ -294,7 +281,6 @@ TAO_Sync_Scope_Policy::create (const CORBA::Any& val
   ACE_NEW_THROW_EX (servant,
                     TAO_Sync_Scope_Policy (synchronization),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return servant;
 }
@@ -310,27 +296,26 @@ TAO_Sync_Scope_Policy::clone (void) const
 }
 
 Messaging::SyncScope
-TAO_Sync_Scope_Policy::synchronization (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Sync_Scope_Policy::synchronization (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->synchronization_;
 }
 
 CORBA::Policy_ptr
-TAO_Sync_Scope_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Sync_Scope_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Sync_Scope_Policy *servant = 0;
   ACE_NEW_THROW_EX (servant,
                     TAO_Sync_Scope_Policy (*this),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return servant;
 }
 
 void
-TAO_Sync_Scope_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Sync_Scope_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h
index 8e1d7ce59f2..dea4905a49a 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -57,22 +57,22 @@ public:
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
   static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   );
 
   /// Returns a copy of <this>.
   virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const;
 
   // = The Messaging::RelativeRoundtripTimeoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (ACE_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::TimeT relative_expiry (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
@@ -122,25 +122,25 @@ public:
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
   static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   );
 
   /// Returns a copy of <this>.
   virtual TAO_Sync_Scope_Policy *clone (void) const;
 
   // = The Messaging::SyncScopePolicy methods.
 
-  virtual Messaging::SyncScope synchronization (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Messaging::SyncScope synchronization (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void get_synchronization (Messaging::SyncScope &synchronization) const;
 
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 68df7c44eb5..bebf349b9be 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -126,8 +126,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
                       *this->lock_,
                       -1);
 
-    result =
-      this->dispatcher_table_.unbind (params.request_id_, rd);
+    result = this->dispatcher_table_.unbind (params.request_id_, rd);
 
     if (TAO_debug_level > 8)
       ACE_DEBUG ((LM_DEBUG,
@@ -194,7 +193,6 @@ TAO_Muxed_TMS::connection_closed (void)
       retval = this->clear_cache ();
     }
   while (retval != -1);
-
 }
 
 int
diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h
index c8f27cfe0eb..5c70284e05a 100644
--- a/TAO/tao/NVList_Adapter.h
+++ b/TAO/tao/NVList_Adapter.h
@@ -35,8 +35,6 @@ namespace CORBA
 
   class NamedValue;
   typedef NamedValue *NamedValue_ptr;
-
-  class Environment;
 }
 
 /**
@@ -47,15 +45,9 @@ class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object
 public:
   virtual ~TAO_NVList_Adapter (void);
 
-  virtual void create_list (
-      CORBA::Long count,
-      CORBA::NVList_ptr &new_list
-      ACE_ENV_ARG_DECL) = 0;
-
-  virtual void create_named_value (
-      CORBA::NamedValue_ptr &nv
-      ACE_ENV_ARG_DECL) = 0;
+  virtual void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) = 0;
 
+  virtual void create_named_value (CORBA::NamedValue_ptr &nv) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Null_Fragmentation_Strategy.cpp b/TAO/tao/Null_Fragmentation_Strategy.cpp
index 79ddde5c290..7146119c73e 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.cpp
+++ b/TAO/tao/Null_Fragmentation_Strategy.cpp
@@ -1,9 +1,7 @@
 // $Id$
 
-
 #include "tao/Null_Fragmentation_Strategy.h"
 
-
 TAO_Null_Fragmentation_Strategy::~TAO_Null_Fragmentation_Strategy (void)
 {
 }
diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h
index ace58815d2d..0a70c65601d 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.h
+++ b/TAO/tao/Null_Fragmentation_Strategy.h
@@ -45,9 +45,7 @@ public:
 
   TAO_Null_Fragmentation_Strategy (void) {}
   virtual ~TAO_Null_Fragmentation_Strategy (void);
-  virtual int fragment (TAO_OutputCDR &,
-                        ACE_CDR::ULong,
-                        ACE_CDR::ULong);
+  virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong);
 
 private:
 
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index a3ce4098b83..b11125fb98f 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -46,12 +46,10 @@ ACE_RCSID (tao,
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_ctype.h"
 
-#if defined (ACE_HAS_EXCEPTIONS)
 void TAO_unexpected_exception_handler (void)
 {
-  throw CORBA::UNKNOWN ();
+  throw ::CORBA::UNKNOWN ();
 }
-#endif  /* ACE_HAS_EXCEPTIONS */
 
 static const char ior_prefix[] = "IOR:";
 
@@ -113,8 +111,7 @@ CORBA::ORB::InvalidName::_tao_duplicate (void) const
   ACE_NEW_RETURN (
       result,
       ::CORBA::ORB::InvalidName (*this),
-      0
-    );
+      0);
   return result;
 }
 
@@ -123,20 +120,14 @@ void CORBA::ORB::InvalidName::_raise (void) const
   TAO_RAISE (*this);
 }
 
-void CORBA::ORB::InvalidName::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
+void CORBA::ORB::InvalidName::_tao_encode (TAO_OutputCDR &) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
-void CORBA::ORB::InvalidName::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
+void CORBA::ORB::InvalidName::_tao_decode (TAO_InputCDR &)
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 // ****************************************************************
@@ -156,21 +147,18 @@ CORBA::ORB::~ORB (void)
 }
 
 void
-CORBA::ORB::shutdown (CORBA::Boolean wait_for_completion
-                     ACE_ENV_ARG_DECL)
+CORBA::ORB::shutdown (CORBA::Boolean wait_for_completion)
 {
   // We cannot lock the exceptions here. We need to propogate
   // BAD_INV_ORDER  exceptions if needed to the caller. Locking
   // exceptions down would render us non-compliant with the spec.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_shutdown ();
 
-  this->orb_core ()->shutdown (wait_for_completion
-                               ACE_ENV_ARG_PARAMETER);
+  this->orb_core ()->shutdown (wait_for_completion);
 }
 
 void
-CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::ORB::destroy (void)
 {
   if (this->orb_core () == 0)
     {
@@ -181,8 +169,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL)
       // CORBA::OBJECT_NOT_EXIST exception if the ORB has been
       // destroyed by the time an ORB function is called.
 
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
-                                          CORBA::COMPLETED_NO));
+      throw ::CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO);
     }
 
   if (TAO_debug_level > 2)
@@ -192,8 +179,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL)
                   ACE_TEXT_CHAR_TO_TCHAR (this->orb_core ()->orbid ())));
     }
 
-  this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_core ()->destroy ();
 
   // Now invalidate the pointer to the ORB_Core that created this
   // ORB.
@@ -201,56 +187,51 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CORBA::ORB::run (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::ORB::run (void)
 {
-  this->run (0 ACE_ENV_ARG_PARAMETER);
+  this->run (0);
 }
 
 void
-CORBA::ORB::run (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
+CORBA::ORB::run (ACE_Time_Value &tv)
 {
-  this->run (&tv ACE_ENV_ARG_PARAMETER);
+  this->run (&tv);
 }
 
 void
-CORBA::ORB::run (ACE_Time_Value *tv
-                 ACE_ENV_ARG_DECL)
+CORBA::ORB::run (ACE_Time_Value *tv)
 {
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_shutdown ();
 
-  this->orb_core ()->run (tv, 0 ACE_ENV_ARG_PARAMETER);
+  this->orb_core ()->run (tv, 0);
 }
 
 void
-CORBA::ORB::perform_work (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::ORB::perform_work (void)
 {
-  this->perform_work (0 ACE_ENV_ARG_PARAMETER);
+  this->perform_work (0);
 }
 
 void
-CORBA::ORB::perform_work (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
+CORBA::ORB::perform_work (ACE_Time_Value &tv)
 {
-  this->perform_work (&tv ACE_ENV_ARG_PARAMETER);
+  this->perform_work (&tv);
 }
 
 void
-CORBA::ORB::perform_work (ACE_Time_Value *tv
-                         ACE_ENV_ARG_DECL)
+CORBA::ORB::perform_work (ACE_Time_Value *tv)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_shutdown ();
 
-  this->orb_core ()->run (tv, 1 ACE_ENV_ARG_PARAMETER);
+  this->orb_core ()->run (tv, 1);
 }
 
 CORBA::Boolean
-CORBA::ORB::work_pending (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
+CORBA::ORB::work_pending (ACE_Time_Value &tv)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_shutdown ();
 
   int const result = this->orb_core_->reactor ()->work_pending (tv);
   if (result == 0 || (result == -1 && errno == ETIME))
@@ -263,11 +244,10 @@ CORBA::ORB::work_pending (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
 }
 
 CORBA::Boolean
-CORBA::ORB::work_pending (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::ORB::work_pending (void)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_shutdown ();
 
   const int result = this->orb_core_->reactor ()->work_pending ();
   if (result == 0)
@@ -282,14 +262,10 @@ CORBA::ORB::work_pending (ACE_ENV_SINGLE_ARG_DECL)
 #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 void
-CORBA::ORB::create_list (CORBA::Long count,
-                         CORBA::NVList_ptr &new_list
-                         ACE_ENV_ARG_DECL)
+CORBA::ORB::create_list (CORBA::Long count, CORBA::NVList_ptr &new_list)
 {
   TAO_NVList_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_NVList_Adapter>::instance (
-        "TAO_NVList_Adapter"
-      );
+    ACE_Dynamic_Service<TAO_NVList_Adapter>::instance ("TAO_NVList_Adapter");
 
   if (adapter == 0)
     {
@@ -297,50 +273,41 @@ CORBA::ORB::create_list (CORBA::Long count,
                   ACE_TEXT ("(%P|%t) %p\n"),
                   ACE_TEXT ("ORB unable to find the ")
                   ACE_TEXT ("NVList Adapter instance")));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
-  adapter->create_list (count, new_list ACE_ENV_ARG_PARAMETER);
+  adapter->create_list (count, new_list);
 }
 
 void
-CORBA::ORB::create_exception_list (CORBA::ExceptionList_ptr &list
-                                   ACE_ENV_ARG_DECL)
+CORBA::ORB::create_exception_list (CORBA::ExceptionList_ptr &list)
 {
   TAO_Dynamic_Adapter *dynamic_adapter =
     ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance (
-        TAO_ORB_Core::dynamic_adapter_name ()
-      );
+        TAO_ORB_Core::dynamic_adapter_name ());
 
-  dynamic_adapter->create_exception_list (list
-                                          ACE_ENV_ARG_PARAMETER);
+  dynamic_adapter->create_exception_list (list);
 }
 
 void
 CORBA::ORB::create_operation_list (CORBA::OperationDef_ptr opDef,
-                                   CORBA::NVList_ptr &result
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::NVList_ptr &result)
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
+        TAO_ORB_Core::ifr_client_adapter_name ());
 
   if (adapter == 0)
     {
-      ACE_THROW (CORBA::INTF_REPOS ());
+      throw ::CORBA::INTF_REPOS ();
     }
 
-  adapter->create_operation_list (this,
-                                  opDef,
-                                  result
-                                  ACE_ENV_ARG_PARAMETER);
+  adapter->create_operation_list (this, opDef, result);
 }
 
 
 void
-CORBA::ORB::create_environment (CORBA::Environment_ptr &environment
-                                ACE_ENV_ARG_DECL)
+CORBA::ORB::create_environment (CORBA::Environment_ptr &environment)
 {
   ACE_NEW_THROW_EX (environment,
                     CORBA::Environment (),
@@ -352,13 +319,11 @@ CORBA::ORB::create_environment (CORBA::Environment_ptr &environment
 }
 
 void
-CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv
-                                ACE_ENV_ARG_DECL)
+CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv)
 {
   TAO_NVList_Adapter *adapter =
     ACE_Dynamic_Service<TAO_NVList_Adapter>::instance (
-        "TAO_NVList_Adapter"
-      );
+        "TAO_NVList_Adapter");
 
   if (adapter == 0)
     {
@@ -367,10 +332,10 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv
                   ACE_TEXT ("ORB unable to find the ")
                   ACE_TEXT ("NVList Adapter instance")));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
-  adapter->create_named_value (nv ACE_ENV_ARG_PARAMETER);
+  adapter->create_named_value (nv);
 }
 
 // The following functions are not implemented - they just throw
@@ -379,8 +344,7 @@ CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv
 CORBA::Boolean
 CORBA::ORB::get_service_information (
   CORBA::ServiceType /* service_type */,
-  CORBA::ServiceInformation_out /* service_information */
-  ACE_ENV_ARG_DECL)
+  CORBA::ServiceInformation_out /* service_information */)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA::SystemException::_tao_minor_code (
@@ -391,62 +355,57 @@ CORBA::ORB::get_service_information (
 }
 
 void
-CORBA::ORB::create_context_list (CORBA::ContextList_ptr &
-                                ACE_ENV_ARG_DECL)
+CORBA::ORB::create_context_list (CORBA::ContextList_ptr &)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 }
 
 void
-CORBA::ORB::get_default_context (CORBA::Context_ptr &
-                                ACE_ENV_ARG_DECL)
+CORBA::ORB::get_default_context (CORBA::Context_ptr &)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 }
 
 void
-CORBA::ORB::send_multiple_requests_oneway (const CORBA::RequestSeq &
-                                          ACE_ENV_ARG_DECL)
+CORBA::ORB::send_multiple_requests_oneway (const CORBA::RequestSeq &)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 }
 
 void
-CORBA::ORB::send_multiple_requests_deferred (const CORBA::RequestSeq &
-                                            ACE_ENV_ARG_DECL)
+CORBA::ORB::send_multiple_requests_deferred (const CORBA::RequestSeq &)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 }
 
 void
-CORBA::ORB::get_next_response (CORBA::Request_ptr &
-                              ACE_ENV_ARG_DECL)
+CORBA::ORB::get_next_response (CORBA::Request_ptr &)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 }
 
 CORBA::Boolean
-CORBA::ORB::poll_next_response (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::ORB::poll_next_response (void)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA::SystemException::_tao_minor_code (
@@ -462,14 +421,11 @@ CORBA::TypeCode_ptr
 CORBA::ORB::create_struct_tc (
     const char *id,
     const char *name,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::StructMemberSeq & members)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -477,10 +433,7 @@ CORBA::ORB::create_struct_tc (
                         0);
     }
 
-  return adapter->create_struct_tc (id,
-                                    name,
-                                    members
-                                    ACE_ENV_ARG_PARAMETER);
+  return adapter->create_struct_tc (id, name, members);
 }
 
 CORBA::TypeCode_ptr
@@ -488,14 +441,11 @@ CORBA::ORB::create_union_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::UnionMemberSeq & members)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -506,22 +456,18 @@ CORBA::ORB::create_union_tc (
   return adapter->create_union_tc (id,
                                    name,
                                    discriminator_type,
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
+                                   members);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_enum_tc (
     const char *id,
     const char *name,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::EnumMemberSeq & members)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -531,22 +477,18 @@ CORBA::ORB::create_enum_tc (
 
   return adapter->create_enum_tc (id,
                                   name,
-                                  members
-                                  ACE_ENV_ARG_PARAMETER);
+                                  members);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_alias_tc (
     const char *id,
     const char *name,
-    CORBA::TypeCode_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr original_type)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -556,22 +498,18 @@ CORBA::ORB::create_alias_tc (
 
   return adapter->create_alias_tc (id,
                                    name,
-                                   original_type
-                                   ACE_ENV_ARG_PARAMETER);
+                                   original_type);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_exception_tc (
     const char *id,
     const char *name,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::StructMemberSeq & members)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -581,21 +519,17 @@ CORBA::ORB::create_exception_tc (
 
   return adapter->create_exception_tc (id,
                                        name,
-                                       members
-                                       ACE_ENV_ARG_PARAMETER);
+                                       members);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_interface_tc (
     const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+    const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -604,20 +538,16 @@ CORBA::ORB::create_interface_tc (
     }
 
   return adapter->create_interface_tc (id,
-                                       name
-                                       ACE_ENV_ARG_PARAMETER);
+                                       name);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_string_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::ULong bound)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -625,20 +555,16 @@ CORBA::ORB::create_string_tc (
                         0);
     }
 
-  return adapter->create_string_tc (bound
-                                    ACE_ENV_ARG_PARAMETER);
+  return adapter->create_string_tc (bound);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_wstring_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::ULong bound)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -646,21 +572,17 @@ CORBA::ORB::create_wstring_tc (
                         0);
     }
 
-  return adapter->create_wstring_tc (bound
-                                     ACE_ENV_ARG_PARAMETER);
+  return adapter->create_wstring_tc (bound);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_fixed_tc (
     CORBA::UShort digits,
-    CORBA::UShort scale
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::UShort scale)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -669,21 +591,17 @@ CORBA::ORB::create_fixed_tc (
     }
 
   return adapter->create_fixed_tc (digits,
-                                   scale
-                                   ACE_ENV_ARG_PARAMETER);
+                                   scale);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_sequence_tc (
     CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr element_type)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -692,21 +610,17 @@ CORBA::ORB::create_sequence_tc (
     }
 
   return adapter->create_sequence_tc (bound,
-                                      element_type
-                                      ACE_ENV_ARG_PARAMETER);
+                                      element_type);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_array_tc (
     CORBA::ULong length,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr element_type)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -715,8 +629,7 @@ CORBA::ORB::create_array_tc (
     }
 
   return adapter->create_array_tc (length,
-                                   element_type
-                                   ACE_ENV_ARG_PARAMETER);
+                                   element_type);
 }
 
 CORBA::TypeCode_ptr
@@ -725,14 +638,11 @@ CORBA::ORB::create_value_tc (
     const char *name,
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::ValueMemberSeq & members)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -744,22 +654,18 @@ CORBA::ORB::create_value_tc (
                                    name,
                                    type_modifier,
                                    concrete_base,
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
+                                   members);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_value_box_tc (
     const char *id,
     const char *name,
-    CORBA::TypeCode_ptr boxed_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr boxed_type)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -769,21 +675,17 @@ CORBA::ORB::create_value_box_tc (
 
   return adapter->create_value_box_tc (id,
                                        name,
-                                       boxed_type
-                                       ACE_ENV_ARG_PARAMETER);
+                                       boxed_type);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_native_tc (
     const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+    const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -792,20 +694,16 @@ CORBA::ORB::create_native_tc (
     }
 
   return adapter->create_native_tc (id,
-                                    name
-                                    ACE_ENV_ARG_PARAMETER);
+                                    name);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_recursive_tc (
-    const char *id
-    ACE_ENV_ARG_DECL
-  )
+    const char *id)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -813,21 +711,17 @@ CORBA::ORB::create_recursive_tc (
                         0);
     }
 
-  return adapter->create_recursive_tc (id
-                                       ACE_ENV_ARG_PARAMETER);
+  return adapter->create_recursive_tc (id);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_abstract_interface_tc (
     const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+    const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -836,21 +730,17 @@ CORBA::ORB::create_abstract_interface_tc (
     }
 
   return adapter->create_abstract_interface_tc (id,
-                                                name
-                                                ACE_ENV_ARG_PARAMETER);
+                                                name);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_local_interface_tc (
     const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+    const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -859,21 +749,17 @@ CORBA::ORB::create_local_interface_tc (
     }
 
   return adapter->create_local_interface_tc (id,
-                                             name
-                                             ACE_ENV_ARG_PARAMETER);
+                                             name);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_component_tc (
     const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+    const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -882,21 +768,17 @@ CORBA::ORB::create_component_tc (
     }
 
   return adapter->create_component_tc (id,
-                                       name
-                                       ACE_ENV_ARG_PARAMETER);
+                                       name);
 }
 
 CORBA::TypeCode_ptr
 CORBA::ORB::create_home_tc (
     const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+    const char *name)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -905,8 +787,7 @@ CORBA::ORB::create_home_tc (
     }
 
   return adapter->create_home_tc (id,
-                                  name
-                                  ACE_ENV_ARG_PARAMETER);
+                                  name);
 }
 
 CORBA::TypeCode_ptr
@@ -915,14 +796,11 @@ CORBA::ORB::create_event_tc (
     const char *name,
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::ValueMemberSeq &members)
 {
   TAO_TypeCodeFactory_Adapter *adapter =
     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
+        TAO_ORB_Core::typecodefactory_adapter_name ());
 
   if (adapter == 0)
     {
@@ -934,8 +812,7 @@ CORBA::ORB::create_event_tc (
                                    name,
                                    type_modifier,
                                    concrete_base,
-                                   members
-                                   ACE_ENV_ARG_PARAMETER);
+                                   members);
 }
 
 // ****************************************************************
@@ -1048,35 +925,28 @@ CORBA::ORB::resolve_service (TAO::MCAST_SERVICEID mcast_service_id)
 }
 
 CORBA::Object_ptr
-CORBA::ORB::resolve_initial_references (const char *name
-                                        ACE_ENV_ARG_DECL)
+CORBA::ORB::resolve_initial_references (const char *name)
 {
-  return this->resolve_initial_references (name,
-                                           0
-                                           ACE_ENV_ARG_PARAMETER);
+  return this->resolve_initial_references (name, 0);
 }
 
 CORBA::Object_ptr
 CORBA::ORB::resolve_initial_references (const char *name,
-                                        ACE_Time_Value *timeout
-                                        ACE_ENV_ARG_DECL)
+                                        ACE_Time_Value *timeout)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_shutdown ();
 
   CORBA::Object_var result;
 
   if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0)
     {
-      result = this->orb_core ()->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      result = this->orb_core ()->root_poa ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0)
     {
       result = this->orb_core ()->resolve_poa_current
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0)
     {
@@ -1089,45 +959,38 @@ CORBA::ORB::resolve_initial_references (const char *name,
   else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0)
     {
       result = this->orb_core ()->resolve_ior_manipulation
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_IORTABLE) == 0)
     {
       result = this->orb_core ()->resolve_ior_table
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_DYNANYFACTORY) == 0)
     {
       result = this->orb_core ()->resolve_dynanyfactory
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_TYPECODEFACTORY) == 0)
     {
       result = this->orb_core ()->resolve_typecodefactory
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_CODECFACTORY) == 0)
     {
       result = this->orb_core ()->resolve_codecfactory
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_COMPRESSIONMANAGER) == 0)
     {
       result = this->orb_core ()->resolve_compression_manager
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        ();
     }
 #if TAO_HAS_INTERCEPTORS == 1
   else if (ACE_OS::strcmp (name, TAO_OBJID_PICurrent) == 0)
     {
       result = this->orb_core ()->resolve_picurrent
-        (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+        ();
     }
 #endif
 
@@ -1158,8 +1021,7 @@ CORBA::ORB::resolve_initial_references (const char *name,
     this->orb_core_->init_ref_map ()->find (ACE_CString (name));
 
   if (ior != this->orb_core_->init_ref_map ()->end ())
-    return this->string_to_object ((*ior).second.c_str ()
-                                   ACE_ENV_ARG_PARAMETER);
+    return this->string_to_object ((*ior).second.c_str ());
 
   // Look for an environment variable called "<name>IOR".
   //
@@ -1174,12 +1036,9 @@ CORBA::ORB::resolve_initial_references (const char *name,
 
   ACE_CString service_ior = ACE_OS::getenv (ior_env_var_name.in ());
 
-  if (ACE_OS::strcmp (service_ior.c_str (), "") != 0 )
+  if (ACE_OS::strcmp (service_ior.c_str (), "") != 0)
     {
-      result =
-        this->string_to_object (service_ior.c_str()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      result = this->string_to_object (service_ior.c_str());
 
       return result._retn ();
     }
@@ -1211,8 +1070,7 @@ CORBA::ORB::resolve_initial_references (const char *name,
   // Is not one of the well known services, try to find it in the
   // InitRef table....check the defaultinitref values also.
 
-  result = this->orb_core ()->resolve_rir (name ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  result = this->orb_core ()->resolve_rir (name);
 
   if (!CORBA::is_nil (result.in ()))
     return result._retn ();
@@ -1224,42 +1082,36 @@ CORBA::ORB::resolve_initial_references (const char *name,
 #if !defined(CORBA_E_MICRO)
 void
 CORBA::ORB::register_initial_reference (const char * id,
-                                        CORBA::Object_ptr obj
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Object_ptr obj)
 {
   if (id == 0 || ACE_OS::strlen (id) == 0)
-    ACE_THROW (CORBA::ORB::InvalidName ());
-  ACE_CHECK;
+    throw ::CORBA::ORB::InvalidName ();
 
   if (CORBA::is_nil (obj))
-    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 27,
-                                 CORBA::COMPLETED_NO));
-  ACE_CHECK;
+    throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, CORBA::COMPLETED_NO);
 
   TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
 
   if (table.register_initial_reference (id, obj) == -1)
-    ACE_THROW (CORBA::ORB::InvalidName ());
+    throw ::CORBA::ORB::InvalidName ();
 }
 #endif
 
 CORBA::ORB::ObjectIdList_ptr
-CORBA::ORB::list_initial_services (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::ORB::list_initial_services (void)
 {
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_shutdown ();
 
   return
-    this->orb_core ()->list_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->orb_core ()->list_initial_references ();
 }
 
 void
-CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::ORB::check_shutdown (void)
 {
   if (this->orb_core () != 0)
     {
-      this->orb_core ()->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_core ()->check_shutdown ();
     }
   else
     {
@@ -1270,15 +1122,14 @@ CORBA::ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
       // CORBA::OBJECT_NOT_EXIST exception if the ORB has been
       // destroyed by the time an ORB function is called.
 
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
-                                          CORBA::COMPLETED_NO));
+      throw ::CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO);
     }
 }
 
 // ****************************************************************
 
 void
-TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ORB::init_orb_globals (void)
 {
   // This method should be invoked atomically.  It is the caller's
   // responsibility to ensure that this condition is satisfied.
@@ -1329,37 +1180,21 @@ CORBA::ORB_init (int &argc,
                  char *argv[],
                  const char *orb_name)
 {
-#ifndef ACE_HAS_EXCEPTIONS
-  // Make sure TAO's singleton manager is initialized.
-  //
-  // We need to initialize before TAO_default_environment() is called
-  // since that call instantiates a TAO_TSS_Singleton.
-  if (TAO_Singleton_Manager::instance ()->init () == -1)
-    {
-      return CORBA::ORB::_nil ();
-    }
-
-  return CORBA::ORB_init (argc,
-                          argv,
-                          orb_name,
-                          TAO_default_environment ());
-#else
   CORBA::Environment env;
   return CORBA::ORB_init (argc,
                           argv,
                           orb_name,
                           env /* unused */);
-#endif  /* !ACE_HAS_EXCEPTIONS */
 }
 
 CORBA::ORB_ptr
 CORBA::ORB_init (int &argc,
                  char *argv[],
                  const char *orbid,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 CORBA::Environment &try_ENV)
 {
   // This ugly macro will go away once we've merged the two ORB_init's.
-  ACE_UNUSED_ARG(ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+  ACE_UNUSED_ARG(try_ENV); // FUZZ: ignore check_for_ace_check
 
   // Use this string variable to hold the orbid
   ACE_CString orbid_string (orbid);
@@ -1383,8 +1218,7 @@ CORBA::ORB_init (int &argc,
         return CORBA::ORB::_nil ();
       }
 
-    TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+    TAO::ORB::init_orb_globals ();
   }
 
   // Make sure the following is done after the global ORB
@@ -1474,7 +1308,6 @@ CORBA::ORB_init (int &argc,
                           CORBA::SystemException::_tao_minor_code (0,
                                                                    ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
       // The ORB table increases the reference count on the ORB Core
       // so do not release it here.  Allow the TAO_ORB_Core_Auto_Ptr
@@ -1539,16 +1372,12 @@ CORBA::ORB_init (int &argc,
         orbinitializer_registry->pre_init (oc.get (),
                                            command_line.get_argc(),
                                            command_line.get_ASCII_argv(),
-                                           slotid
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+                                           slotid);
     }
 
   // Initialize the ORB Core instance.
   result = oc->init (command_line.get_argc(),
-                     command_line.get_ASCII_argv()
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+                     command_line.get_ASCII_argv());
 
   if (orbinitializer_registry != 0)
     {
@@ -1557,9 +1386,7 @@ CORBA::ORB_init (int &argc,
                                           oc.get (),
                                           command_line.get_argc(),
                                           command_line.get_ASCII_argv(),
-                                          slotid
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+                                          slotid);
     }
 
   if (TAO_debug_level > 2)
@@ -1585,12 +1412,10 @@ CORBA::ORB_init (int &argc,
 
 // Object reference stringification.
 char *
-CORBA::ORB::object_to_string (CORBA::Object_ptr obj
-                              ACE_ENV_ARG_DECL)
+CORBA::ORB::object_to_string (CORBA::Object_ptr obj)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_shutdown ();
 
   if (!CORBA::is_nil (obj))
     {
@@ -1645,13 +1470,13 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj
 
       // Marshal the objref into an encapsulation bytestream.
       (void) cdr.write_octet (TAO_ENCAP_BYTE_ORDER);
-      if ((cdr << obj) == 0)
+      if (!(cdr << obj))
         ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
 
       // Now hexify the encapsulated CDR data into a string, and
       // return that string.
 
-      const size_t total_len = cdr.total_length ();
+      size_t const total_len = cdr.total_length ();
 
       char *cp = 0;
       ACE_ALLOCATOR_RETURN (cp,
@@ -1666,9 +1491,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj
       ACE_OS::strcpy (cp, ior_prefix);
       cp += sizeof (ior_prefix) - 1;
 
-      for (const ACE_Message_Block *i = cdr.begin ();
-           i != 0;
-           i = i->cont ())
+      for (const ACE_Message_Block *i = cdr.begin (); i != 0; i = i->cont ())
         {
           const char *bytes = i->rd_ptr ();
           size_t len = i->length ();
@@ -1727,7 +1550,7 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj
       // For now we just use the first profile.
       TAO_Profile *profile = mp.get_profile (0);
 
-      return profile->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return profile->to_string ();
     }
 }
 
@@ -1735,12 +1558,10 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj
 // <resolve_name_service> with an IOR <multicast_to_service>.
 
 CORBA::Object_ptr
-CORBA::ORB::string_to_object (const char *str
-                              ACE_ENV_ARG_DECL)
+CORBA::ORB::string_to_object (const char *str)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_shutdown ();
 
   // Check for NULL pointer
   if (str == 0)
@@ -1756,26 +1577,19 @@ CORBA::ORB::string_to_object (const char *str
 
   if (ior_parser != 0)
     {
-      return ior_parser->parse_string (str,
-                                       this
-                                       ACE_ENV_ARG_PARAMETER);
+      return ior_parser->parse_string (str, this);
     }
 
-
-  if (ACE_OS::strncmp (str,
-                       ior_prefix,
-                       sizeof ior_prefix - 1) == 0)
-    return this->ior_string_to_object (str + sizeof ior_prefix - 1
-                                       ACE_ENV_ARG_PARAMETER);
+  if (ACE_OS::strncmp (str, ior_prefix, sizeof ior_prefix - 1) == 0)
+    return this->ior_string_to_object (str + sizeof ior_prefix - 1);
   else
-    return this->url_ior_string_to_object (str
-                                           ACE_ENV_ARG_PARAMETER);
+    return this->url_ior_string_to_object (str);
 }
 
 // ****************************************************************
 
 char *
-CORBA::ORB::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::ORB::id (void)
 {
   return CORBA::string_dup (this->orb_core_->orbid ());
 }
@@ -1784,12 +1598,9 @@ CORBA::ORB::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 #if !defined(CORBA_E_MICRO)
 CORBA::Policy_ptr
-CORBA::ORB::create_policy (CORBA::PolicyType type,
-                           const CORBA::Any& val
-                           ACE_ENV_ARG_DECL)
+CORBA::ORB::create_policy (CORBA::PolicyType type, const CORBA::Any& val)
 {
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  this->check_shutdown ();
 
   TAO::PolicyFactory_Registry_Adapter *adapter =
     this->orb_core_->policy_factory_registry ();
@@ -1801,20 +1612,15 @@ CORBA::ORB::create_policy (CORBA::PolicyType type,
     }
 
   // Attempt to obtain the policy from the policy factory registry.
-  return adapter->create_policy (
-          type,
-          val
-          ACE_ENV_ARG_PARAMETER);
+  return adapter->create_policy (type, val);
 }
 #endif
 
 #if !defined(CORBA_E_MICRO)
 CORBA::Policy_ptr
-CORBA::ORB::_create_policy (CORBA::PolicyType type
-                            ACE_ENV_ARG_DECL)
+CORBA::ORB::_create_policy (CORBA::PolicyType type)
 {
-  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  this->check_shutdown ();
 
   TAO::PolicyFactory_Registry_Adapter *adapter =
     this->orb_core_->policy_factory_registry ();
@@ -1826,9 +1632,7 @@ CORBA::ORB::_create_policy (CORBA::PolicyType type
     }
 
   // Attempt to obtain the policy from the policy factory registry.
-  return adapter->_create_policy (
-          type
-          ACE_ENV_ARG_PARAMETER);
+  return adapter->_create_policy (type);
 }
 #endif
 
@@ -1838,8 +1642,7 @@ CORBA::ORB::_create_policy (CORBA::PolicyType type
 // implementations ...
 
 CORBA::Object_ptr
-CORBA::ORB::ior_string_to_object (const char *str
-                                  ACE_ENV_ARG_DECL)
+CORBA::ORB::ior_string_to_object (const char *str)
 {
   // Unhex the bytes, and make a CDR deencapsulation stream from the
   // resulting data.
@@ -1897,8 +1700,7 @@ CORBA::ORB::ior_string_to_object (const char *str
 // Convert an URL style IOR in an object
 
 CORBA::Object_ptr
-CORBA::ORB::url_ior_string_to_object (const char* str
-                                      ACE_ENV_ARG_DECL)
+CORBA::ORB::url_ior_string_to_object (const char* str)
 {
   TAO_MProfile mprofile;
   // It is safe to declare this on the stack since the contents of
@@ -1908,14 +1710,10 @@ CORBA::ORB::url_ior_string_to_object (const char* str
   // to hold them all.
 
   TAO_Connector_Registry *conn_reg =
-    this->orb_core_->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->orb_core_->connector_registry ();
 
-  int const retv =
-    conn_reg->make_mprofile (str,
-                             mprofile
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());   // Return nil.
+  int const retv = conn_reg->make_mprofile (str, mprofile);
+  // Return nil.
 
   if (retv != 0)
     {
@@ -1928,16 +1726,13 @@ CORBA::ORB::url_ior_string_to_object (const char* str
     }
 
   // Now make the TAO_Stub.
-  TAO_Stub *data = this->orb_core_->create_stub ((char *) 0,
-                                                 mprofile
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  TAO_Stub *data = this->orb_core_->create_stub ((char *) 0, mprofile);
 
   TAO_Stub_Auto_Ptr safe_objdata (data);
 
   // Figure out if the servant is collocated.
-  CORBA::Object_ptr obj =
-    this->orb_core_->create_object (safe_objdata.get ());
+  CORBA::Object_ptr obj = this->orb_core_->create_object (safe_objdata.get ());
+  
   if (CORBA::is_nil (obj))
     return CORBA::Object::_nil ();
 
@@ -1968,17 +1763,15 @@ CORBA::ORB::set_timeout (ACE_Time_Value *timeout)
 #if !defined(CORBA_E_MICRO)
 CORBA::ValueFactory
 CORBA::ORB::register_value_factory (const char *repository_id,
-                                    CORBA::ValueFactory factory
-                                    ACE_ENV_ARG_DECL)
+                                    CORBA::ValueFactory factory)
 {
   TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter ();
 
   if (vta)
     {
-      int const result = vta->vf_map_rebind (repository_id,
-                                             factory);
+      int const result = vta->vf_map_rebind (repository_id, factory);
 
-      if (result == 0)              // No previous factory found
+      if (result == 0) // No previous factory found
         {
           return 0;
         }
@@ -1997,8 +1790,7 @@ CORBA::ORB::register_value_factory (const char *repository_id,
 
 #if !defined(CORBA_E_MICRO)
 void
-CORBA::ORB::unregister_value_factory (const char *repository_id
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+CORBA::ORB::unregister_value_factory (const char *repository_id)
 {
   TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter ();
 
@@ -2012,8 +1804,7 @@ CORBA::ORB::unregister_value_factory (const char *repository_id
 
 #if !defined(CORBA_E_MICRO)
 CORBA::ValueFactory
-CORBA::ORB::lookup_value_factory (const char *repository_id
-                                  ACE_ENV_ARG_DECL)
+CORBA::ORB::lookup_value_factory (const char *repository_id)
 {
   TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter ();
 
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 6fcdb74d24f..9bae8a49d7d 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -178,10 +178,10 @@ namespace CORBA
       virtual void _raise (void) const;
 
       virtual void _tao_encode (TAO_OutputCDR &
-                                ACE_ENV_ARG_DECL) const;
+                                ) const;
 
       virtual void _tao_decode (TAO_InputCDR &
-                                ACE_ENV_ARG_DECL);
+                               );
     };
 
     typedef char *ObjectId;
@@ -207,7 +207,7 @@ namespace CORBA
     static CORBA::ORB_ptr _nil (void);
 
     /// Return this ORB's ORBid.
-    char * id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    char * id (void);
 
     /**
      * Turn a string-ified object reference back into an object
@@ -215,7 +215,7 @@ namespace CORBA
      * object_to_string(), but not necessarily locally.
      */
     CORBA::Object_ptr string_to_object (const char *str
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        );
 
     /**
      * Turn an object reference into a string.  Each type of ORB,
@@ -225,70 +225,70 @@ namespace CORBA
      * an argument.
      */
     char * object_to_string (CORBA::Object_ptr obj
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                             );
 
 #if !defined(CORBA_E_MICRO)
     // Value factory operations  (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7)
     CORBA::ValueFactory register_value_factory (
         const char *repository_id,
         CORBA::ValueFactory factory
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 #endif
 
 #if !defined(CORBA_E_MICRO)
     void unregister_value_factory (const char * repository_id
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   );
 #endif
 
 #if !defined(CORBA_E_MICRO)
     CORBA::ValueFactory lookup_value_factory (
         const char *repository_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 #endif
 
 #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
     void create_list (CORBA::Long count,
                       CORBA::NVList_ptr &new_list
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                      );
 
     void create_operation_list(CORBA::OperationDef_ptr opDef,
                                CORBA::NVList_ptr& result
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                               );
 
     void create_named_value (CORBA::NamedValue_ptr &nmval
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                             );
 
     void create_exception_list (CORBA::ExceptionList_ptr &exclist
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                );
 
     void create_environment (CORBA::Environment_ptr &new_env
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                             );
 
     // The following are not implemented and just throw
     // CORBA::NO_IMPLEMENT.
 
     void create_context_list (CORBA::ContextList_ptr &ctxtlist
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              );
 
     void get_default_context (CORBA::Context_ptr &ctx
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              );
 
     CORBA::Boolean get_service_information (
       CORBA::ServiceType service_type,
       CORBA::ServiceInformation_out service_information
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
     void send_multiple_requests_oneway (const CORBA::RequestSeq &req
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        );
 
     void send_multiple_requests_deferred (const CORBA::RequestSeq &req
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          );
 
     void get_next_response (CORBA::Request_ptr &req
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                            );
 
-    CORBA::Boolean poll_next_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    CORBA::Boolean poll_next_response (void);
 
     /// The ORB TypeCode creation functions.
 
@@ -296,60 +296,60 @@ namespace CORBA
         const char *id,
         const char *name,
         const CORBA::StructMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_union_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr discriminator_type,
         const CORBA::UnionMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_enum_tc (
         const char *id,
         const char *name,
         const CORBA::EnumMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_alias_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr original_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_exception_tc (
         const char *id,
         const char *name,
         const CORBA::StructMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_interface_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_string_tc (
         CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_wstring_tc (
         CORBA::ULong bound
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_fixed_tc (
         CORBA::UShort digits,
         CORBA::UShort scale
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_sequence_tc (
         CORBA::ULong bound,
         CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_array_tc (
         CORBA::ULong length,
         CORBA::TypeCode_ptr element_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_value_tc (
         const char *id,
@@ -357,42 +357,42 @@ namespace CORBA
         CORBA::ValueModifier type_modifier,
         CORBA::TypeCode_ptr concrete_base,
         const CORBA::ValueMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_value_box_tc (
         const char *id,
         const char *name,
         CORBA::TypeCode_ptr boxed_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_native_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_recursive_tc (
         const char *id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_local_interface_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_component_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
     CORBA::TypeCode_ptr create_home_tc (
         const char *id,
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
         );
 
     CORBA::TypeCode_ptr create_event_tc (
@@ -401,7 +401,7 @@ namespace CORBA
         CORBA::ValueModifier type_modifier,
         CORBA::TypeCode_ptr concrete_base,
         const CORBA::ValueMemberSeq &members
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+        );
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -413,7 +413,7 @@ namespace CORBA
      * If an error occurs during initialization or at runtime, a CORBA
      * system exception will be thrown.
      */
-    void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    void run (void);
 
     /**
      * Instructs the ORB to initialize itself and run its event loop in
@@ -429,7 +429,7 @@ namespace CORBA
      * the server will be buffered by TCP.
      **/
     void run (ACE_Time_Value &tv
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+              );
 
     /**
      * Instructs the ORB to initialize itself and run its event loop in
@@ -447,11 +447,11 @@ namespace CORBA
      * the server will be buffered by TCP.
      **/
     void run (ACE_Time_Value *tv
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+              );
 
     /// Returns an indication of whether the ORB needs to perform some
     /// work.
-    CORBA::Boolean work_pending (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    CORBA::Boolean work_pending (void);
 
     /// Returns an indication of whether the ORB needs to perform some
     /// work but will look for work pending for no more than the
@@ -461,7 +461,7 @@ namespace CORBA
      *       idle timeout.
      */
     CORBA::Boolean work_pending (ACE_Time_Value &tv
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                 );
 
     /**
      * This operation performs an implementation-defined unit of work.
@@ -469,11 +469,11 @@ namespace CORBA
      * is not present; this behavior can be modified by passing an
      * appropriate @c ACE_Time_Value as described in run().
      **/
-    void perform_work (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    void perform_work (void);
     void perform_work (ACE_Time_Value &tv
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       );
     void perform_work (ACE_Time_Value *tv
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                       );
 
     /**
      * This operation instructs the ORB to shut down. Shutting down the
@@ -484,7 +484,7 @@ namespace CORBA
      * has completed.
      */
     void shutdown (CORBA::Boolean wait_for_completion = false
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                   );
 
     /**
      * Explicitly destroy the ORB, releasing any resources.  Note that
@@ -498,11 +498,11 @@ namespace CORBA
      * the ORB in one thread and trying to service a request in another
      * thread are not well defined. TAO does not support such cases.
      */
-    void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    void destroy (void);
 
     CORBA::Object_ptr resolve_initial_references (
         const char *name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     /**
@@ -524,24 +524,24 @@ namespace CORBA
     CORBA::Object_ptr resolve_initial_references (
       const char *name,
       ACE_Time_Value *timeout
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
 #if !defined(CORBA_E_MICRO)
     /// Register an object reference with the ORB.
     void register_initial_reference (const char * id,
                                      CORBA::Object_ptr obj
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                     );
 #endif
 
     /// Returns a sequence of ObjectIds that lists which objects have
     /// references available via the initial references mechanism.
     CORBA::ORB::ObjectIdList_ptr list_initial_services (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      void);
 
 #if !defined(CORBA_E_MICRO)
     CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                      const CORBA::Any& val
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                     );
 #endif
 
     // ----------------------------------------------------------------
@@ -552,7 +552,7 @@ namespace CORBA
     /// Create an empty policy, usually to be filled in later by
     /// demarshaling.
     CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                      ACE_ENV_ARG_DECL);
+                                     );
 #endif
 
     // Reference counting...
@@ -609,15 +609,15 @@ namespace CORBA
 
     /// Convert an OMG IOR into an object reference.
     CORBA::Object_ptr ior_string_to_object (const char* ior
-                                            ACE_ENV_ARG_DECL);
+                                           );
 
     /// Convert an URL style IOR into an object reference.
     CORBA::Object_ptr url_ior_string_to_object (const char* ior
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
     /// Check if ORB has shutdown.  If it has, throw the appropriate
     /// exception.
-    void check_shutdown (ACE_ENV_SINGLE_ARG_DECL);
+    void check_shutdown (void);
 
     /// Set the timeout value
     void set_timeout (ACE_Time_Value * timeout);
@@ -650,7 +650,7 @@ namespace TAO
   {
     /// Initialize the ORB globals correctly, i.e., only when they
     /// haven't been initialized yet.
-    void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL);
+    void init_orb_globals (void);
   }
 }
 
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 947a8408c26..533b348acc1 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -24,9 +24,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace PortableInterceptor
 {
   void
-  register_orb_initializer (
-    ORBInitializer_ptr init
-    ACE_ENV_ARG_DECL)
+  register_orb_initializer (ORBInitializer_ptr init)
   {
     {
       // Using ACE_Static_Object_Lock::instance() precludes
@@ -44,8 +42,7 @@ namespace PortableInterceptor
                       ACE_TEXT ("Unable to pre-initialize TAO\n")));
         }
 
-      TAO::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      TAO::ORB::init_orb_globals ();
     }
 
     // If not, lookup it up.
@@ -70,10 +67,7 @@ namespace PortableInterceptor
 
     if (orbinitializer_registry_ != 0)
       {
-        orbinitializer_registry_->register_orb_initializer (
-          init
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        orbinitializer_registry_->register_orb_initializer (init);
       }
     else
       {
@@ -82,7 +76,7 @@ namespace PortableInterceptor
                     ACE_TEXT ("ERROR: ORBInitializer Registry unable to find the ")
                     ACE_TEXT ("ORBInitializer Registry instance")));
 
-        ACE_THROW (CORBA::INTERNAL ());
+        throw ::CORBA::INTERNAL ();
       }
   }
 }
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
index 88aa2610d27..1882b238e44 100644
--- a/TAO/tao/ORBInitializer_Registry.h
+++ b/TAO/tao/ORBInitializer_Registry.h
@@ -35,10 +35,7 @@ namespace PortableInterceptor
 
   /// Register an ORBInitializer with the global ORBInitializer
   /// table.
-  TAO_Export void register_orb_initializer (
-      ORBInitializer_ptr init
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
+  TAO_Export void register_orb_initializer (ORBInitializer_ptr init);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h
index 3fa0caa8170..3810b271482 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.h
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.h
@@ -55,8 +55,7 @@ namespace TAO
       /// Register an ORBInitializer with the underlying ORBInitializer
       /// array.
       virtual void register_orb_initializer (
-        PortableInterceptor::ORBInitializer_ptr init
-        ACE_ENV_ARG_DECL) = 0;
+        PortableInterceptor::ORBInitializer_ptr init) = 0;
 
       /**
        * Begin initialization of all registered ORBInitializers before
@@ -70,8 +69,7 @@ namespace TAO
         TAO_ORB_Core *orb_core,
         int argc,
         char *argv[],
-        PortableInterceptor::SlotId &slotid
-        ACE_ENV_ARG_DECL) = 0;
+        PortableInterceptor::SlotId &slotid) = 0;
 
       /**
        * Complete initialization of all registered ORBInitializers after
@@ -92,8 +90,7 @@ namespace TAO
         TAO_ORB_Core *orb_core,
         int argc,
         char *argv[],
-        PortableInterceptor::SlotId slotid
-        ACE_ENV_ARG_DECL) = 0;
+        PortableInterceptor::SlotId slotid) = 0;
   };
 }
 
diff --git a/TAO/tao/ORB_Constants.h b/TAO/tao/ORB_Constants.h
index afa933dfdae..6123d76829b 100644
--- a/TAO/tao/ORB_Constants.h
+++ b/TAO/tao/ORB_Constants.h
@@ -44,13 +44,13 @@ namespace CORBA
    * @c 2 is done as follows:
    *
    * @verbatim
-   *   throw (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
+   *   throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
    * @endverbatim
    *
    * *NOT* as:
    *
    * @verbatim
-   *   throw (CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO);
+   *   throw ::CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO);
    * @endverbatim
    */
   const ULong OMGVMCID = 0x4f4d0000U;
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index da5361b6da6..2b60f75309c 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -375,7 +375,7 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
 }
 
 int
-TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
+TAO_ORB_Core::init (int &argc, char *argv[] )
 {
   // Right now, this code expects to begin parsing in argv[1] rather
   // than argv[0].  I don't think that's wise.  I think we need to
@@ -828,7 +828,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                                 TAO_ORB_CORE_INIT_LOCATION_CODE,
                                 ENOMEM),
                               CORBA::COMPLETED_NO));
-          ACE_CHECK_RETURN (-1);
 
           output_stream->open (ACE_TEXT_ALWAYS_CHAR (file_name),
                                ios::out | ios::app);
@@ -944,8 +943,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           this->set_endpoint_helper (TAO_DEFAULT_LANE,
                                      ACE_TEXT_ALWAYS_CHAR (current_arg)
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                    );
 
           arg_shifter.consume_arg ();
         }
@@ -959,8 +957,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           this->set_endpoint_helper (TAO_DEFAULT_LANE,
                                      ACE_TEXT_ALWAYS_CHAR (current_arg)
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                    );
 
           arg_shifter.consume_arg ();
         }
@@ -987,8 +984,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           this->set_endpoint_helper (lane,
                                      endpoints
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                    );
         }
       else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNoProprietaryActivation"))))
@@ -1339,9 +1335,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                       -1);
 
   // Initialize the protocols hooks instance.
-  this->protocols_hooks_->init_hooks (this
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->protocols_hooks_->init_hooks (this);
 
   // As a last step perform initializations of the service callbacks
   this->services_callbacks_init ();
@@ -1357,24 +1351,20 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 int
 TAO_ORB_Core::fini (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Shutdown the ORB and block until the shutdown is complete.
-      this->shutdown (1
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->shutdown (1);
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       ACE_CString message =
         "Exception caught in trying to shutdown ";
       message += this->orbid_;
       message += "\n";
 
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           message.c_str ());
+      ex._tao_print_exception (message.c_str ());
     }
-  ACE_ENDTRY;
 
   // Wait for any server threads, ignoring any failures.
   (void) this->thr_mgr ()->wait ();
@@ -1742,14 +1732,14 @@ TAO::Invocation_Status
 TAO_ORB_Core::service_raise_comm_failure (
     IOP::ServiceContextList &clist,
     TAO_Profile *profile
-    ACE_ENV_ARG_DECL)
+    )
 {
   if (this->ft_service_.service_callback ())
     {
       return this->ft_service_.service_callback ()->
                  raise_comm_failure (clist,
                                      profile
-                                     ACE_ENV_ARG_PARAMETER);
+                                    );
     }
 
   ACE_THROW_RETURN (CORBA::COMM_FAILURE (
@@ -1765,14 +1755,14 @@ TAO::Invocation_Status
 TAO_ORB_Core::service_raise_transient_failure (
     IOP::ServiceContextList &clist,
     TAO_Profile *profile
-    ACE_ENV_ARG_DECL)
+    )
 {
   if (this->ft_service_.service_callback ())
     {
       return
         this->ft_service_.service_callback ()->raise_transient_failure (clist,
                                  profile
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
     }
 
   return TAO::TAO_INVOKE_FAILURE;
@@ -1783,14 +1773,13 @@ TAO_ORB_Core::service_context_list (
     TAO_Stub *stub,
     TAO_Service_Context &service_context,
     CORBA::Boolean restart
-    ACE_ENV_ARG_DECL)
+    )
 {
   // @NOTE: Can use Interceptors instead..
   this->protocols_hooks_->rt_service_context (stub,
                                               service_context,
                                               restart
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                             );
 }
 
 TAO_Client_Strategy_Factory *
@@ -1824,7 +1813,7 @@ TAO_ORB_Core::server_factory (void)
 }
 
 CORBA::Object_ptr
-TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::root_poa (void)
 {
   // DCL ..
   if (CORBA::is_nil (this->root_poa_.in ()))
@@ -1869,16 +1858,14 @@ TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL)
         {
           auto_ptr<TAO_Adapter> poa_adapter (factory->create (this));
 
-          poa_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
+          poa_adapter->open ();
 
           // @@ Not exception safe
           this->root_poa_ =
             poa_adapter->root ();
 
           this->adapter_registry_.insert (poa_adapter.get ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                         );
 
           poa_adapter.release ();
         }
@@ -1905,14 +1892,13 @@ TAO_ORB_Core::poa_adapter (void)
 TAO_Stub *
 TAO_ORB_Core::create_stub (const char *repository_id,
                            const TAO_MProfile &profiles
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   TAO_Stub *retval =
     this->stub_factory ()->create_stub (repository_id,
                                         profiles,
                                         this
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN(0);
+                                       );
   return retval;
 }
 
@@ -1929,7 +1915,7 @@ TAO_Stub *
 TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
                                   const char *type_id,
                                   CORBA::PolicyList *policy_list
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   // Add the Polices contained in "policy_list" to each profile so
   // that those policies will be exposed to the client in the IOR.  In
@@ -1948,15 +1934,13 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
         {
           // Get the ith profile
           profile = mprofile.get_profile (i);
-          profile->policies (policy_list ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          profile->policies (policy_list);
         }
     }
 
   /// Initialize a TAO_Stub object with the mprofile thats passed.
   TAO_Stub *stub =
-    this->create_stub (type_id, mprofile ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (stub);
+    this->create_stub (type_id, mprofile);
 
   stub->base_profiles ().policy_list (policy_list);
 
@@ -1965,7 +1949,7 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
 
 void
 TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator
-                                      ACE_ENV_ARG_DECL)
+                                      )
 {
   if (this->bidir_adapter_ == 0)
     {
@@ -1976,7 +1960,7 @@ TAO_ORB_Core::load_policy_validators (TAO_Policy_Validator &validator
 
   // Call the BiDir library if it has been loaded
   if (this->bidir_adapter_)
-    this->bidir_adapter_->load_policy_validators (validator ACE_ENV_ARG_PARAMETER);
+    this->bidir_adapter_->load_policy_validators (validator);
 }
 
 CORBA::Object_ptr
@@ -2161,7 +2145,7 @@ TAO_ORB_Core::lf_strategy (void)
 int
 TAO_ORB_Core::run (ACE_Time_Value *tv,
                    int perform_work
-                   ACE_ENV_ARG_DECL_NOT_USED)
+                   )
 {
   // ORB::run may be called from a thread, different from the one that
   // did the ORB_init, consequently we must establish the Service
@@ -2281,7 +2265,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
 
 void
 TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
-                        ACE_ENV_ARG_DECL)
+                        )
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
@@ -2293,8 +2277,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
     // shutdowns with the 'wait_for_completion' flag set in the middle
     // of an upcall (because those deadlock).
     this->adapter_registry_.check_close (wait_for_completion
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                        );
 
     // Set the 'has_shutdown' flag, so any further attempt to shutdown
     // becomes a noop.
@@ -2306,8 +2289,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
   }
 
   this->adapter_registry_.close (wait_for_completion
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                );
 
   // Shutdown reactor.
   this->thread_lane_resources_manager ().shutdown_reactor ();
@@ -2341,7 +2323,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
 }
 
 void
-TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::destroy (void)
 {
   //
   // All destroy() should do is (a) call shutdown() and (b) unbind()
@@ -2358,12 +2340,10 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL)
   //
 
   // Shutdown the ORB and block until the shutdown is complete.
-  this->shutdown (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->shutdown (1);
 
   // Invoke Interceptor::destroy() on all registered interceptors.
-  this->destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->destroy_interceptors ();
 
   // Now remove it from the ORB table so that it's ORBid may be
   // reused.
@@ -2371,7 +2351,7 @@ TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::check_shutdown (void)
 {
   if (this->has_shutdown ())
     {
@@ -2379,15 +2359,14 @@ TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
       // CORBA::BAD_INV_ORDER exception with minor code 4 if the ORB
       // has shutdown by the time an ORB function is called.
 
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4,
-                                       CORBA::COMPLETED_NO));
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO);
     }
 }
 
 void
-TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::destroy_interceptors (void)
 {
-  ACE_TRY
+  try
     {
       ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
@@ -2395,8 +2374,7 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
       if (this->client_request_interceptor_adapter_ != 0)
         {
           this->client_request_interceptor_adapter_->destroy_interceptors (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            );
 
           delete this->client_request_interceptor_adapter_;
           this->client_request_interceptor_adapter_ = 0;
@@ -2405,8 +2383,7 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
       if (this->server_request_interceptor_adapter_ != 0)
         {
           this->server_request_interceptor_adapter_->destroy_interceptors (
-            ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            );
 
           delete this->server_request_interceptor_adapter_;
           this->server_request_interceptor_adapter_ = 0;
@@ -2417,14 +2394,13 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
       if (this->ior_interceptor_adapter_ != 0)
         {
           this->ior_interceptor_adapter_->destroy_interceptors (
-              ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              );
 
           this->ior_interceptor_adapter_ = 0;
         }
 
     }
-  ACE_CATCHALL
+  catch (...)
     {
       // .. catch all the exceptions..
       if (TAO_debug_level > 3)
@@ -2434,7 +2410,6 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
                       ACE_TEXT ("::destroy_interceptors () \n")));
         }
     }
-  ACE_ENDTRY;
 
   return;
 }
@@ -2446,7 +2421,7 @@ TAO_ORB_Core::lane_resources (void)
 }
 
 void
-TAO_ORB_Core::resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_typecodefactory_i (void)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
@@ -2470,16 +2445,16 @@ TAO_ORB_Core::resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL)
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("(%P|%t) Unable to instantiate ")
                       ACE_TEXT ("a TypeCodeFactory_Loader\n")));
-          ACE_THROW (CORBA::ORB::InvalidName ());
+          throw ::CORBA::ORB::InvalidName ();
         }
     }
 
   this->typecode_factory_ =
-    loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
+    loader->create_object (this->orb_, 0, 0);
 }
 
 void
-TAO_ORB_Core::resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_codecfactory_i (void)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
@@ -2501,13 +2476,12 @@ TAO_ORB_Core::resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL)
   if (loader != 0)
     {
       this->codec_factory_ =
-        loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        loader->create_object (this->orb_, 0, 0);
     }
 }
 
 void
-TAO_ORB_Core::resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_compression_manager_i (void)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
@@ -2529,13 +2503,12 @@ TAO_ORB_Core::resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_DECL)
   if (loader != 0)
     {
       this->compression_manager_ =
-        loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        loader->create_object (this->orb_, 0, 0);
     }
 }
 
 void
-TAO_ORB_Core::resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_poa_current_i (void)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
@@ -2557,8 +2530,7 @@ TAO_ORB_Core::resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL)
   if (loader != 0)
     {
       this->poa_current_ =
-        loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        loader->create_object (this->orb_, 0, 0);
     }
 }
 
@@ -2566,7 +2538,7 @@ TAO_ORB_Core::resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL)
 #if TAO_HAS_INTERCEPTORS == 1
 
 void
-TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_picurrent_i (void)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
@@ -2588,8 +2560,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL)
   if (loader != 0)
     {
       CORBA::Object_ptr pi =
-        loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        loader->create_object (this->orb_, 0, 0);
 
       this->pi_current_ = pi;
     }
@@ -2599,7 +2570,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-TAO_ORB_Core::resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_dynanyfactory_i (void)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
@@ -2622,13 +2593,12 @@ TAO_ORB_Core::resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL)
   if (loader != 0)
     {
       this->dynany_factory_ =
-        loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        loader->create_object (this->orb_, 0, 0);
     }
 }
 
 void
-TAO_ORB_Core::resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_iormanipulation_i (void)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance
@@ -2650,13 +2620,12 @@ TAO_ORB_Core::resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL)
   if (loader != 0)
     {
       this->ior_manip_factory_ =
-        loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        loader->create_object (this->orb_, 0, 0);
     }
 }
 
 void
-TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_ior_table_i (void)
 {
   TAO_Adapter_Factory *factory =
     ACE_Dynamic_Service<TAO_Adapter_Factory>::instance
@@ -2678,13 +2647,11 @@ TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL)
   if (factory != 0)
     {
       ACE_Auto_Ptr <TAO_Adapter> iortable_adapter (factory->create (this));
-      iortable_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      iortable_adapter->open ();
 
       CORBA::Object_var tmp_root = iortable_adapter->root ();
 
-      this->adapter_registry_.insert (iortable_adapter.get () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->adapter_registry_.insert (iortable_adapter.get ());
 
       // It is now (exception) safe to release ownership from the auto pointers
       this->ior_table_= tmp_root._retn ();
@@ -2695,7 +2662,7 @@ TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL)
 int
 TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane,
                                    const ACE_CString &endpoints
-                                   ACE_ENV_ARG_DECL)
+                                   )
 {
   if (this->orb_params ()->add_endpoints (lane,
                                           endpoints) != 0)
@@ -2717,7 +2684,7 @@ TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane,
 
 CORBA::Object_ptr
 TAO_ORB_Core::resolve_rir (const char *name
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   // Get the table of initial references specified through
   // -ORBInitRef.
@@ -2752,8 +2719,7 @@ TAO_ORB_Core::resolve_rir (const char *name
       else
         {
           TAO_Connector_Registry *conn_reg =
-            this->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            this->connector_registry ();
 
           // Obtain the appropriate object key delimiter for the
           // specified protocol.
@@ -2770,14 +2736,14 @@ TAO_ORB_Core::resolve_rir (const char *name
       list_of_profiles += object_id;
 
       return this->orb ()->string_to_object (list_of_profiles.c_str ()
-                                             ACE_ENV_ARG_PARAMETER);
+                                            );
     }
 
   return CORBA::Object::_nil ();
 }
 
 CORBA::ORB::ObjectIdList *
-TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::list_initial_references (void)
 {
   // Unsupported initial services should NOT be included in the below list!
   static const char *initial_services[] = { TAO_LIST_OF_INITIAL_SERVICES };
@@ -2798,7 +2764,6 @@ TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
                     CORBA::ORB::ObjectIdList (
                       static_cast<CORBA::ULong> (total_size)),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::ORB::ObjectIdList_var list (tmp);
   list->length (static_cast<CORBA::ULong> (total_size));
@@ -2930,11 +2895,10 @@ TAO_ORB_Core::create_data_block_i (size_t size,
 }
 
 TAO_Connector_Registry *
-TAO_ORB_Core::connector_registry (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::connector_registry (void)
 {
   TAO_Connector_Registry *conn =
-    this->lane_resources ().connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->lane_resources ().connector_registry ();
 
   return conn;
 }
@@ -2963,24 +2927,22 @@ TAO_ORB_Core::implrepo_service (void)
   if (CORBA::is_nil (this->implrepo_service_))
     {
 
-      ACE_TRY_NEW_ENV
+      try
         {
           CORBA::Object_var temp =
-            this->orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->resolve_initial_references ("ImplRepoService");
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::Object::_nil ());
 
           // @@ Worry about assigning a different IOR? (brunsch)
           this->implrepo_service_ = temp._retn ();
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception&)
         {
           // Just make sure that we have a null pointer.  Ignore the exception
           // anyway.
           this->implrepo_service_ = CORBA::Object::_nil ();
         }
-      ACE_ENDTRY;
     }
 
   return CORBA::Object::_duplicate (this->implrepo_service_);
@@ -3174,7 +3136,7 @@ TAO_ORB_Core::connection_timeout_hook (Timeout_Hook hook)
 
 CORBA::Policy_ptr
 TAO_ORB_Core::get_policy (CORBA::PolicyType type
-                          ACE_ENV_ARG_DECL)
+                          )
 {
   CORBA::Policy_var result;
 
@@ -3183,16 +3145,14 @@ TAO_ORB_Core::get_policy (CORBA::PolicyType type
   if (policy_manager != 0)
     {
       result = policy_manager->get_policy (type
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+                                          );
     }
 
   if (CORBA::is_nil (result.in ()))
     {
       result =
         this->get_default_policies ()->get_policy (type
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+                                                  );
     }
 
   return result._retn ();
@@ -3200,21 +3160,19 @@ TAO_ORB_Core::get_policy (CORBA::PolicyType type
 
 CORBA::Policy_ptr
 TAO_ORB_Core::get_policy_including_current (CORBA::PolicyType type
-                                            ACE_ENV_ARG_DECL)
+                                            )
 {
   TAO_Policy_Current &policy_current =
     this->policy_current ();
 
   CORBA::Policy_var result =
     policy_current.get_policy (type
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+                              );
 
   if (CORBA::is_nil (result.in ()))
     {
       result = this->get_policy (type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+                                );
     }
 
   return result._retn ();
@@ -3222,7 +3180,7 @@ TAO_ORB_Core::get_policy_including_current (CORBA::PolicyType type
 
 CORBA::Policy_ptr
 TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
   CORBA::Policy_var result;
 
@@ -3232,16 +3190,14 @@ TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type
     {
       result =
         policy_manager->get_cached_policy (type
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+                                          );
     }
 
   if (CORBA::is_nil (result.in ()))
     {
       result =
         this->get_default_policies ()->get_cached_policy (type
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+                                                         );
     }
 
   return result._retn ();
@@ -3250,22 +3206,20 @@ TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type
 CORBA::Policy_ptr
 TAO_ORB_Core::get_cached_policy_including_current (
     TAO_Cached_Policy_Type type
-    ACE_ENV_ARG_DECL)
+    )
 {
   TAO_Policy_Current &policy_current =
     this->policy_current ();
 
   CORBA::Policy_var result =
     policy_current.get_cached_policy (type
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK (CORBA::Policy::_nil ());
+                                     );
 
   if (CORBA::is_nil (result.in ()))
     {
       result =
         this->get_cached_policy (type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+                                );
     }
 
   return result._retn ();
@@ -3288,13 +3242,12 @@ TAO_ORB_Core::default_environment (CORBA::Environment *env)
 void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::IORInterceptor_ptr interceptor
-   ACE_ENV_ARG_DECL)
+   )
 {
   if (this->ior_interceptor_adapter ())
     {
       this->ior_interceptor_adapter_->add_interceptor (interceptor
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                      );
     }
   else
     {
@@ -3303,7 +3256,7 @@ TAO_ORB_Core::add_interceptor (
                   ACE_TEXT ("ERROR: ORB Core unable to find the ")
                   ACE_TEXT ("IORInterceptor Adapter Factory instance")));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -3319,8 +3272,7 @@ TAO_ORB_Core::ior_interceptor_adapter (void)
 
       if (this->ior_interceptor_adapter_ == 0)
         {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
+          try
             {
               TAO_IORInterceptor_Adapter_Factory * ior_ap_factory =
                 ACE_Dynamic_Service<TAO_IORInterceptor_Adapter_Factory>::instance
@@ -3330,18 +3282,15 @@ TAO_ORB_Core::ior_interceptor_adapter (void)
               if (ior_ap_factory)
                 {
                   this->ior_interceptor_adapter_ =
-                    ior_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    ior_ap_factory->create ();
                 }
             }
-          ACE_CATCHANY
+          catch (const ::CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "Cannot initialize the "
-                                   "ior_interceptor_adapter \n");
+              ex._tao_print_exception (
+                "Cannot initialize the "
+                "ior_interceptor_adapter \n");
             }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN(0);
         }
     }
 
@@ -3353,13 +3302,12 @@ TAO_ORB_Core::ior_interceptor_adapter (void)
 void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-   ACE_ENV_ARG_DECL)
+   )
 {
   if (this->clientrequestinterceptor_adapter_i ())
     {
       this->client_request_interceptor_adapter_->add_interceptor (interceptor
-                                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                                 );
     }
   else
     {
@@ -3369,7 +3317,7 @@ TAO_ORB_Core::add_interceptor (
                   ACE_TEXT ("Client Request Interceptor Adapter Factory ")
                   ACE_TEXT ("instance")));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -3404,13 +3352,12 @@ TAO_ORB_Core::clientrequestinterceptor_adapter_i (void)
 void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-   ACE_ENV_ARG_DECL)
+   )
 {
   if (this->serverrequestinterceptor_adapter_i ())
     {
       this->server_request_interceptor_adapter_->add_interceptor (interceptor
-                                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                                 );
     }
   else
     {
@@ -3420,7 +3367,7 @@ TAO_ORB_Core::add_interceptor (
                   ACE_TEXT ("Server Request Interceptor Adapter Factory ")
                   ACE_TEXT ("instance")));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -3428,16 +3375,15 @@ void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
    const CORBA::PolicyList& policies
-   ACE_ENV_ARG_DECL)
+   )
 {
   if (this->clientrequestinterceptor_adapter_i ())
     {
       this->client_request_interceptor_adapter_->add_interceptor (
         interceptor,
         policies
-        ACE_ENV_ARG_PARAMETER);
+       );
 
-      ACE_CHECK;
     }
   else
     {
@@ -3447,7 +3393,7 @@ TAO_ORB_Core::add_interceptor (
                   ACE_TEXT ("Client Request Interceptor Adapter Factory ")
                   ACE_TEXT ("instance")));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -3455,16 +3401,15 @@ void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
    const CORBA::PolicyList& policies
-   ACE_ENV_ARG_DECL)
+   )
 {
   if (this->serverrequestinterceptor_adapter_i ())
     {
       this->server_request_interceptor_adapter_->add_interceptor (
         interceptor,
         policies
-        ACE_ENV_ARG_PARAMETER);
+       );
 
-      ACE_CHECK;
     }
   else
     {
@@ -3474,7 +3419,7 @@ TAO_ORB_Core::add_interceptor (
                   ACE_TEXT ("Server Request Interceptor Adapter Factory ")
                   ACE_TEXT ("instance")));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 }
 
@@ -3520,8 +3465,7 @@ TAO_ORB_Core::valuetype_adapter (void)
 
       if (this->valuetype_adapter_ == 0)
         {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
+          try
             {
               TAO_Valuetype_Adapter_Factory * vt_ap_factory =
                 ACE_Dynamic_Service<TAO_Valuetype_Adapter_Factory>::instance (
@@ -3531,18 +3475,15 @@ TAO_ORB_Core::valuetype_adapter (void)
               if (vt_ap_factory)
                 {
                   this->valuetype_adapter_ =
-                    vt_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                    vt_ap_factory->create ();
                 }
             }
-          ACE_CATCHANY
+          catch (const ::CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "Cannot initialize the "
-                                   "valuetype_adapter \n");
+              ex._tao_print_exception (
+                "Cannot initialize the "
+                "valuetype_adapter \n");
             }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN(0);
         }
 
       if (this->valuetype_adapter_ == 0)
@@ -3578,19 +3519,16 @@ TAO_ORB_Core_instance (void)
           // exist in the ORB table after the ORB reference is
           // destroyed.
 
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
+          try
             {
               int argc = 0;
               CORBA::ORB_var orb =
-                CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::ORB_init (argc, 0, 0);
             }
-          ACE_CATCHANY
+          catch (const ::CORBA::Exception&)
             {
               // @@ What should we do here?
             }
-          ACE_ENDTRY;
         }
     }
 
@@ -3600,7 +3538,7 @@ TAO_ORB_Core_instance (void)
 
 TAO::Collocation_Strategy
 TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object
-                                    ACE_ENV_ARG_DECL)
+                                    )
 {
   TAO_Stub *stub = object->_stubobj ();
   if (!CORBA::is_nil (stub->servant_orb_var ().in ()) &&
@@ -3611,8 +3549,7 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object
 
       const int collocated =
         orb_core->collocation_resolver ().is_collocated (object
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+                                                        );
 
       if (collocated)
         {
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index b655b0f7a72..71e5cac98db 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -187,7 +187,7 @@ public:
   //@}
 
   /// Get the connector registry
-  TAO_Connector_Registry *connector_registry (ACE_ENV_SINGLE_ARG_DECL);
+  TAO_Connector_Registry *connector_registry (void);
 
   /// Get the IOR parser registry
   TAO_Parser_Registry *parser_registry (void);
@@ -214,7 +214,7 @@ public:
   ACE_Thread_Manager *thr_mgr (void);
 
   /// Return the RootPOA, or try to load it if not initialized already.
-  CORBA::Object_ptr root_poa (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr root_poa (void);
 
   /// Get the adapter registry
   TAO_Adapter_Registry *adapter_registry (void);
@@ -243,7 +243,7 @@ public:
    */
   static
   TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
-                                                  ACE_ENV_ARG_DECL);
+                                                 );
   //@}
 
   /// Set/get the collocation flags
@@ -419,24 +419,20 @@ public:
 
   /// Get a policy.  First, check the ORB-level Policy Manager, then
   /// check the ORB defaults.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType type);
 
   /// Get a policy.  First, check the thread current, then check the
   /// ORB-level Policy Manager, then check the ORB defaults.
-  CORBA::Policy_ptr get_policy_including_current (CORBA::PolicyType type
-                                                  ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_policy_including_current (CORBA::PolicyType type);
 
   /// Get a cached policy.  First, check the ORB-level Policy Manager,
   /// then check the ORB defaults.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   /// Get a cached policy.  First, check the thread current, then
   /// check the ORB-level Policy Manager, then check the ORB defaults.
   CORBA::Policy_ptr get_cached_policy_including_current (
-      TAO_Cached_Policy_Type type
-      ACE_ENV_ARG_DECL);
+      TAO_Cached_Policy_Type type);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -571,8 +567,7 @@ public:
   /// Register a TSS cleanup function.  The slot ID for the
   /// corresponding ORB core TSS resource is returned by the reference
   /// argument.  This method return 0 on success, and -1 on failure.
-  int add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup,
-                            size_t &slot_id);
+  int add_tss_cleanup_func (ACE_CLEANUP_FUNC cleanup, size_t &slot_id);
 
   /// Return the underlying TSS cleanup function registry.
   TAO_Cleanup_Func_Registry *tss_cleanup_funcs (void);
@@ -587,22 +582,19 @@ public:
   TAO_Thread_Lane_Resources &lane_resources (void);
 
   /// Run the event loop.
-  int run (ACE_Time_Value *tv,
-           int perform_work
-           ACE_ENV_ARG_DECL);
+  int run (ACE_Time_Value *tv, int perform_work);
 
   /// End the event loop
-  void shutdown (CORBA::Boolean wait_for_completion
-                 ACE_ENV_ARG_DECL);
+  void shutdown (CORBA::Boolean wait_for_completion);
 
   /// Get the shutdown flag value
   bool has_shutdown (void) const;
 
   /// Shutdown the ORB and free resources
-  void destroy (ACE_ENV_SINGLE_ARG_DECL);
+  void destroy (void);
 
   /// Check if ORB has shutdown.  If it has, throw an exception.
-  void check_shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void check_shutdown (void);
 
   /// Returns the <timeout> value used by the server threads to poll
   /// the shutdown flag. If the return value is zero then the server
@@ -613,16 +605,14 @@ public:
   /// based on the endpoint.
   TAO_Stub *create_stub_object (TAO_MProfile &mprofile,
                                 const char *type_id,
-                                CORBA::PolicyList *policy_list
-                                ACE_ENV_ARG_DECL);
+                                CORBA::PolicyList *policy_list);
 
   /// Factory method that create the "right" Stub depending on
   /// wheather RTCORBA is loaded or not. The factory used to create
   /// the stub, is loaded at ORB initialization, and its type depends
   /// on the fact that RTCORBA is being used or not.
   TAO_Stub *create_stub (const char *repository_id,
-                         const TAO_MProfile &profiles
-                         ACE_ENV_ARG_DECL);
+                         const TAO_MProfile &profiles);
 
   /// Create a new object, use the adapter registry to create a
   /// collocated object, if not possible then create a regular
@@ -636,8 +626,7 @@ public:
   /// user decides to use lazy initialization of CORBA object, then
   /// this is the route that we have to take to do the
   /// initialization.
-  CORBA::Long initialize_object (TAO_Stub *the_stub,
-                                 CORBA::Object_ptr obj);
+  CORBA::Long initialize_object (TAO_Stub *the_stub, CORBA::Object_ptr obj);
 
   /// Reinitialise a stub after the effective profile has changed.
   /// This will happen after a location forward has been received
@@ -660,35 +649,34 @@ public:
   CORBA::Boolean imr_endpoints_in_ior (void);
 
   /// Resolve the TypeCodeFactory DLL.
-  CORBA::Object_ptr resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_typecodefactory (void);
 
 #if TAO_HAS_INTERCEPTORS == 1
   /// Resolve the PICurrent.
-  CORBA::Object_ptr resolve_picurrent (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_picurrent (void);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
   /// Resolve POA Current.
-  CORBA::Object_ptr resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_poa_current (void);
 
   /// Resolve the CodecFactory DLL.
-  CORBA::Object_ptr resolve_codecfactory (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_codecfactory (void);
 
   /// Resolve the Compression DLL.
-  CORBA::Object_ptr resolve_compression_manager (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_compression_manager (void);
 
   /// Resolve the Dynamic Any Factory
-  CORBA::Object_ptr resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_dynanyfactory (void);
 
   /// Resolve the IOR Manipulation reference for this ORB.
-  CORBA::Object_ptr resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_ior_manipulation (void);
 
   /// Resolve the IOR Table reference for this ORB.
-  CORBA::Object_ptr resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_ior_table (void);
 
   /// Resolve an initial reference via the -ORBInitRef and
   // -ORBDefaultInitRef options.
-  CORBA::Object_ptr resolve_rir (const char *name
-                                 ACE_ENV_ARG_DECL);
+  CORBA::Object_ptr resolve_rir (const char *name);
 
   /// Resolve the RT ORB reference for this ORB.
   CORBA::Object_ptr resolve_rt_orb (void);
@@ -698,9 +686,7 @@ public:
   const char *server_id (void) const;
 
   /// List all the service known by the ORB
-  CORBA::ORB_ObjectIdList *list_initial_references (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    );
+  CORBA::ORB_ObjectIdList *list_initial_references (void);
 
   /// Reference counting...
   unsigned long _incr_refcnt (void);
@@ -754,15 +740,13 @@ public:
   /**
    * For details on how this is used please see the FT service
    */
-  CORBA::ULong hash_service (TAO_Profile *this_p,
-                             CORBA::ULong max);
+  CORBA::ULong hash_service (TAO_Profile *this_p, CORBA::ULong max);
 
   /// Call the service layers with the Service Context to check
   /// whether they would like to add something to the list.
   void service_context_list (TAO_Stub *stub,
                              TAO_Service_Context &service_context,
-                             CORBA::Boolean retstart
-                             ACE_ENV_ARG_DECL);
+                             CORBA::Boolean retstart);
 
   /// Return a reference to the Fault Tolerant service object.
   TAO_Fault_Tolerance_Service &fault_tolerance_service (void);
@@ -772,16 +756,14 @@ public:
   /// this case.
   TAO::Invocation_Status service_raise_comm_failure (
       IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
+      TAO_Profile *profile);
 
   /// Raise a transient failure exception if a service is not loaded,
   /// else delegate to the service to see what the service has to do
   /// for this case.
   TAO::Invocation_Status service_raise_transient_failure (
       IOP::ServiceContextList &clist,
-      TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
+      TAO_Profile *profile);
 
   //@}
 
@@ -803,25 +785,21 @@ public:
 
   /// Register a client request interceptor.
   void add_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL);
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
 
   /// Register a server request interceptor.
   void add_interceptor (
-    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL);
+    PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
 
   /// Register a client request interceptor with policies.
   void add_interceptor (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL);
+    const CORBA::PolicyList& policies);
 
   /// Register a server request interceptor with policies.
   void add_interceptor (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL);
+    const CORBA::PolicyList& policies);
 
   /// Get the Client Request Interceptor adapter.
   /// Will not create a new one if not available yet.
@@ -834,9 +812,7 @@ public:
 #endif /* TAO_HAS_INTERCEPTORS */
 
   /// Register an IOR interceptor.
-  void add_interceptor (
-    PortableInterceptor::IORInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL);
+  void add_interceptor (PortableInterceptor::IORInterceptor_ptr interceptor);
   //@}
 
   /// Return the valuetype adapter
@@ -871,8 +847,7 @@ public:
 
   /// Call the libraries to handover the validators if they havent
   /// registered yet with the list of validators.
-  void load_policy_validators (TAO_Policy_Validator &validator
-                               ACE_ENV_ARG_DECL);
+  void load_policy_validators (TAO_Policy_Validator &validator);
 
   /// Return the flushing strategy
   /**
@@ -924,7 +899,7 @@ protected:
 
   /// Initialize the guts of the ORB Core.  It is intended that this be
   /// called by <CORBA::ORB_init>.
-  int init (int &argc, char **argv ACE_ENV_ARG_DECL);
+  int init (int &argc, char **argv);
 
   /// Final termination hook, typically called by CORBA::ORB's
   /// destructor.
@@ -937,14 +912,14 @@ protected:
                                        ACE_Lock *lock);
 
   /// Obtain and cache the typecode factory object reference.
-  void resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_typecodefactory_i (void);
 
   /// Obtain and cache the poa current.
-  void resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_poa_current_i (void);
 
 #if TAO_HAS_INTERCEPTORS == 1
   /// Obtain and cache the picurrent factory object reference.
-  void resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_picurrent_i (void);
 
   /// Get the Client Request Interceptor adapter.
   /// If not created, this method will try to create one if needed.
@@ -957,16 +932,16 @@ protected:
 #endif /* TAO_HAS_INTERCEPTORS */
 
   /// Obtain and cache the codec factory object reference.
-  void resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_codecfactory_i (void);
 
   /// Obtain and cache the compression manager object reference.
-  void resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_compression_manager_i (void);
 
   /// Obtain and cache the dynamic any factory object reference.
-  void resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_dynanyfactory_i (void);
 
   /// Obtain and cache the IORManipulation factory object reference.
-  void resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_iormanipulation_i (void);
 
   /// Search the Dynamic service list for well known services that has
   /// callbacks  which can be dynamically loaded.
@@ -975,14 +950,13 @@ protected:
   /// Helper method that invokes Interceptor::destroy() on all
   /// registered interceptors when ORB::destroy() is called. Prevents
   /// exceptions from propagating up the call chain.
-  void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
+  void destroy_interceptors (void);
 
   /// Pointer to the list of protocol loaded into this ORB instance.
   /// Helper method to hold the common code part for -ORBEndpoint and
   /// -ORBListenEndpoint options.
   int set_endpoint_helper (const ACE_CString &lane,
-                           const ACE_CString &endpoints
-                           ACE_ENV_ARG_DECL);
+                           const ACE_CString &endpoints);
 
   /// Return pointer to the policy factory registry associated with
   /// this ORB core.
@@ -1005,7 +979,7 @@ private:
   //@}
 
   /// Obtain and cache the dynamic any factory object reference.
-  void resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL);
+  void resolve_ior_table_i (void);
 
   /// Checks to see whether collocation optimizations have to be
   /// applied on objects in the @a other_orb
diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl
index 06ce24dd019..07ccb547c7c 100644
--- a/TAO/tao/ORB_Core.inl
+++ b/TAO/tao/ORB_Core.inl
@@ -98,8 +98,7 @@ TAO_ORB_Core::object_is_nil (CORBA::Object_ptr obj)
   CORBA::Boolean retval = 0;
   if (this->ft_service_.service_callback ())
     {
-      retval =
-        this->ft_service_.service_callback ()->object_is_nil (obj);
+      retval = this->ft_service_.service_callback ()->object_is_nil (obj);
     }
   return retval;
 }
@@ -352,14 +351,13 @@ TAO_ORB_Core::imr_endpoints_in_ior (void)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_typecodefactory (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->typecode_factory_))
     {
-      this->resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      this->resolve_typecodefactory_i ();
     }
   return CORBA::Object::_duplicate (this->typecode_factory_);
 }
@@ -367,14 +365,13 @@ TAO_ORB_Core::resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL)
 #if TAO_HAS_INTERCEPTORS == 1
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_picurrent (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_picurrent (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->pi_current_))
     {
-      this->resolve_picurrent_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      this->resolve_picurrent_i ();
     }
   return CORBA::Object::_duplicate (this->pi_current_);
 }
@@ -382,27 +379,25 @@ TAO_ORB_Core::resolve_picurrent (ACE_ENV_SINGLE_ARG_DECL)
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_codecfactory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_codecfactory (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->codec_factory_))
     {
-      this->resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      this->resolve_codecfactory_i ();
     }
   return CORBA::Object::_duplicate (this->codec_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_compression_manager (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_compression_manager (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->compression_manager_))
     {
-      this->resolve_compression_manager_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      this->resolve_compression_manager_i ();
     }
   return CORBA::Object::_duplicate (this->compression_manager_);
 }
@@ -455,40 +450,37 @@ TAO_ORB_Core::policy_factory_registry ()
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_dynanyfactory (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->dynany_factory_))
     {
-      this->resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      this->resolve_dynanyfactory_i ();
     }
   return CORBA::Object::_duplicate (this->dynany_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_ior_manipulation (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->ior_manip_factory_))
     {
-      this->resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      this->resolve_iormanipulation_i ();
     }
   return CORBA::Object::_duplicate (this->ior_manip_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_ior_table (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->ior_table_))
     {
-      this->resolve_ior_table_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      this->resolve_ior_table_i ();
     }
   return CORBA::Object::_duplicate (this->ior_table_);
 }
@@ -534,14 +526,13 @@ TAO_ORB_Core::policy_current (void)
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_poa_current (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->poa_current_.in ()))
     {
-      this->resolve_poa_current_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+      this->resolve_poa_current_i ();
     }
   return CORBA::Object::_duplicate (this->poa_current_.in ());
 }
@@ -618,7 +609,7 @@ TAO_ORB_Core::is_permanent_forward_condition
   const TAO_Service_Callbacks *service_callback =
       this->fault_tolerance_service ().service_callback ();
 
-  const CORBA::Boolean permanent_forward_condition =
+  CORBA::Boolean const permanent_forward_condition =
       service_callback &&
       service_callback->is_permanent_forward_condition (obj,
                                                         service_context);
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index 1e697edc9cc..f3cba5e3281 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -14,38 +14,37 @@ ACE_RCSID (ObjRefTemplate,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
-TAO::ORT_Adapter_Impl::tao_server_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ORT_Adapter_Impl::tao_server_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
-  return this->ort_template_->server_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ort_template_->server_id ();
 }
 
 char *
-TAO::ORT_Adapter_Impl::tao_orb_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ORT_Adapter_Impl::tao_orb_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
-  return this->ort_template_->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ort_template_->orb_id ();
 }
 
 PortableInterceptor::AdapterName *
-TAO::ORT_Adapter_Impl::tao_adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ORT_Adapter_Impl::tao_adapter_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
-  return this->ort_template_->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ort_template_->adapter_name ();
 }
 
 CORBA::Object_ptr
 TAO::ORT_Adapter_Impl::make_object (const char *repo_id,
-                                    const PortableInterceptor::ObjectId &id
-                                    ACE_ENV_ARG_DECL)
+                                    const PortableInterceptor::ObjectId &id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ort_factory_->make_object (repo_id,
                                           id
-                                          ACE_ENV_ARG_PARAMETER);
+                                         );
 }
 
 PortableInterceptor::ObjectReferenceTemplate *
@@ -66,8 +65,7 @@ TAO::ORT_Adapter_Impl::get_obj_ref_factory (void)
 
 int
 TAO::ORT_Adapter_Impl::set_obj_ref_factory (
-  PortableInterceptor::ObjectReferenceFactory *cf
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ObjectReferenceFactory *cf)
 {
   this->ort_factory_ = cf;
 
@@ -88,8 +86,7 @@ TAO::ORT_Adapter_Impl::activate (
   const char *server_id,
   const char *orb_id,
   PortableInterceptor::AdapterName *adapter_name,
-  PortableServer::POA_ptr poa
-  ACE_ENV_ARG_DECL)
+  PortableServer::POA_ptr poa)
 {
   // No need to lock here, there is one instance for each POA and
   // when the POA creates and actives an ORT_Adapter it will lock
@@ -102,7 +99,6 @@ TAO::ORT_Adapter_Impl::activate (
                                              adapter_name,
                                              poa),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (-1);
 
   this->ort_template_ = t;
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
index ff30c49bbdf..3b5c09072de 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
@@ -26,11 +26,6 @@
 #include "tao/PortableServer/ORT_Adapter.h"
 #include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -48,8 +43,7 @@ namespace TAO
     virtual int activate (const char *server_id,
                           const char *orb_id,
                           PortableInterceptor::AdapterName *adapter_name,
-                          PortableServer::POA_ptr poa
-                          ACE_ENV_ARG_DECL);
+                          PortableServer::POA_ptr poa);
 
     /// Accessor methods to ObjectReferenceTemplate template
     virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void);
@@ -59,8 +53,7 @@ namespace TAO
 
     /// Set a different ort_factory to be used.
     virtual int set_obj_ref_factory (
-      PortableInterceptor::ObjectReferenceFactory * current_factory
-      ACE_ENV_ARG_DECL);
+      PortableInterceptor::ObjectReferenceFactory * current_factory);
 
     /**
      * @see @c TAO::ORT_Adapter for details.
@@ -72,14 +65,13 @@ namespace TAO
      * Methods
      */
     //@{
-    virtual char * tao_server_id (ACE_ENV_SINGLE_ARG_DECL)
+    virtual char * tao_server_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual char * tao_orb_id (ACE_ENV_SINGLE_ARG_DECL)
+    virtual char * tao_orb_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual PortableInterceptor::AdapterName * tao_adapter_name (
-        ACE_ENV_SINGLE_ARG_DECL)
+    virtual PortableInterceptor::AdapterName * tao_adapter_name (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
@@ -92,8 +84,7 @@ namespace TAO
     //@{
     virtual CORBA::Object_ptr make_object (
         const char * repository_id,
-        const PortableInterceptor::ObjectId & id
-        ACE_ENV_ARG_DECL)
+        const PortableInterceptor::ObjectId & id)
     ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
@@ -111,10 +102,6 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ORT_ADAPTER_IMPL_H */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index 5aade26a354..eb25db6608c 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -29,21 +29,21 @@ namespace TAO
   }
 
   char *
-  ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ObjectReferenceTemplate::server_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->server_id_);
   }
 
   char *
-  ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ObjectReferenceTemplate::orb_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->orb_id_);
   }
 
   PortableInterceptor::AdapterName *
-  ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+  ObjectReferenceTemplate::adapter_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableInterceptor::AdapterName *adapter_name = 0;
@@ -56,7 +56,6 @@ namespace TAO
                               TAO::VMCID,
                               ENOMEM),
                           CORBA::COMPLETED_NO));
-    ACE_CHECK_RETURN (0);
 
     return adapter_name;
   }
@@ -65,7 +64,7 @@ namespace TAO
   ObjectReferenceTemplate::make_object (
       const char *,
       const PortableInterceptor::ObjectId &
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (CORBA::is_nil(poa_.in()))
@@ -73,7 +72,7 @@ namespace TAO
 
     TAO_Root_POA* tao_poa = dynamic_cast<TAO_Root_POA*>(poa_.in());
 
-    return tao_poa->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return tao_poa->invoke_key_to_object ();
   }
 }
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
index cb19700492a..eeb4cae1deb 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
@@ -69,14 +69,13 @@ namespace TAO
      * PortableInterceptor::ObjectReferenceTemplate ValueType.
      */
     //@{
-    virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * server_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * orb_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual PortableInterceptor::AdapterName * adapter_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual PortableInterceptor::AdapterName * adapter_name (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
@@ -89,11 +88,8 @@ namespace TAO
     //@{
     virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-                       CORBA::SystemException
-                       ));
+      const PortableInterceptor::ObjectId & id)
+      ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
   protected:
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 08d10c311ef..3724f359749 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -170,8 +170,7 @@ CORBA::Object::can_convert_to_ior (void) const
 }
 
 char*
-CORBA::Object::convert_to_ior (bool,
-                               const char*) const
+CORBA::Object::convert_to_ior (bool, const char*) const
 {
   return 0;
 }
@@ -192,8 +191,7 @@ CORBA::Object::_servant (void) const
 // logical type ID is passed as a parameter.
 
 CORBA::Boolean
-CORBA::Object::_is_a (const char *type_id
-                      ACE_ENV_ARG_DECL)
+CORBA::Object::_is_a (const char *type_id)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
@@ -222,8 +220,7 @@ CORBA::Object::_is_a (const char *type_id
     return true;
 
   return this->proxy_broker ()->_is_a (this,
-                                     type_id
-                                     ACE_ENV_ARG_PARAMETER);
+                                       type_id);
 }
 
 const char*
@@ -270,13 +267,12 @@ CORBA::Object::_stubobj (void)
 }
 
 CORBA::ULong
-CORBA::Object::_hash (CORBA::ULong maximum
-                      ACE_ENV_ARG_DECL)
+CORBA::Object::_hash (CORBA::ULong maximum)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
   if (this->protocol_proxy_ != 0)
-    return this->protocol_proxy_->hash (maximum ACE_ENV_ARG_PARAMETER);
+    return this->protocol_proxy_->hash (maximum);
   else
     {
       // Locality-constrained object.
@@ -293,8 +289,7 @@ CORBA::Object::_hash (CORBA::ULong maximum
 }
 
 CORBA::Boolean
-CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj
-                               ACE_ENV_ARG_DECL_NOT_USED)
+CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj)
   ACE_THROW_SPEC (())
 {
   if (other_obj == this)
@@ -313,7 +308,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj
 // TAO's extensions
 
 TAO::ObjectKey *
-CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Object::_key (void)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
@@ -370,8 +365,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
                                 CORBA::NVList_ptr arg_list,
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Flags req_flags)
 {
   TAO_OBJECT_IOR_EVALUATE;
 
@@ -381,7 +375,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
   // object references.
   if (ctx != 0 || this->protocol_proxy_ == 0)
     {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      throw ::CORBA::NO_IMPLEMENT ();
     }
 
   TAO_Dynamic_Adapter *dynamic_adapter =
@@ -398,7 +392,6 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
                        0,
                        request,
                        req_flags
-                       ACE_ENV_ARG_PARAMETER
                      );
 }
 #endif
@@ -412,8 +405,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
                                 CORBA::ExceptionList_ptr exceptions,
                                 CORBA::ContextList_ptr,
                                 CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Flags req_flags)
 {
   TAO_OBJECT_IOR_EVALUATE;
 
@@ -423,7 +415,7 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
   // object references.
   if (ctx != 0 || this->protocol_proxy_ == 0)
     {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      throw ::CORBA::NO_IMPLEMENT ();
     }
 
   TAO_Dynamic_Adapter *dynamic_adapter =
@@ -439,15 +431,12 @@ CORBA::Object::_create_request (CORBA::Context_ptr ctx,
                        result,
                        exceptions,
                        request,
-                       req_flags
-                       ACE_ENV_ARG_PARAMETER
-                     );
+                       req_flags);
 }
 #endif
 
 CORBA::Request_ptr
-CORBA::Object::_request (const char *operation
-                         ACE_ENV_ARG_DECL)
+CORBA::Object::_request (const char *operation)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
   if (this->protocol_proxy_)
@@ -461,7 +450,6 @@ CORBA::Object::_request (const char *operation
                                   this,
                                   this->protocol_proxy_->orb_core ()->orb (),
                                   operation
-                                  ACE_ENV_ARG_PARAMETER
                                 );
     }
   else
@@ -476,61 +464,54 @@ CORBA::Object::_request (const char *operation
 // the latter case, return true.
 
 CORBA::Boolean
-CORBA::Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Object::_non_existent (void)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
   CORBA::Boolean retval = false;
 
-  ACE_TRY
+  try
     {
-      retval = this->proxy_broker ()->_non_existent (this
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = this->proxy_broker ()->_non_existent (this);
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const ::CORBA::OBJECT_NOT_EXIST&)
     {
       retval = true;
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (retval);
 
   return retval;
 }
 
 
 CORBA::InterfaceDef_ptr
-CORBA::Object::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Object::_get_interface (void)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
-  return this->proxy_broker ()->_get_interface (this
-                                              ACE_ENV_ARG_PARAMETER);
+  return this->proxy_broker ()->_get_interface (this);
 }
 
 CORBA::ImplementationDef_ptr
-CORBA::Object::_get_implementation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Object::_get_implementation (void)
 {
   return 0;
 }
 
 CORBA::Object_ptr
-CORBA::Object::_get_component (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Object::_get_component (void)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
-  return this->proxy_broker ()->_get_component (this
-                                              ACE_ENV_ARG_PARAMETER);
+  return this->proxy_broker ()->_get_component (this);
 }
 
 char*
-CORBA::Object::_repository_id (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Object::_repository_id (void)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
-  return this->proxy_broker ()->_repository_id (this
-                                              ACE_ENV_ARG_PARAMETER);
+  return this->proxy_broker ()->_repository_id (this);
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -545,28 +526,24 @@ CORBA::Object::_repository_id (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Policy_ptr
 CORBA::Object::_get_policy (
-  CORBA::PolicyType type
-  ACE_ENV_ARG_DECL)
+  CORBA::PolicyType type)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
   if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_policy (type
-                                              ACE_ENV_ARG_PARAMETER);
+    return this->protocol_proxy_->get_policy (type);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
 
 CORBA::Policy_ptr
 CORBA::Object::_get_cached_policy (
-  TAO_Cached_Policy_Type type
-  ACE_ENV_ARG_DECL)
+  TAO_Cached_Policy_Type type)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
   if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_cached_policy (type
-                                                     ACE_ENV_ARG_PARAMETER);
+    return this->protocol_proxy_->get_cached_policy (type);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
@@ -574,8 +551,7 @@ CORBA::Object::_get_cached_policy (
 CORBA::Object_ptr
 CORBA::Object::_set_policy_overrides (
   const CORBA::PolicyList & policies,
-  CORBA::SetOverrideType set_add
-  ACE_ENV_ARG_DECL)
+  CORBA::SetOverrideType set_add)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
@@ -584,9 +560,7 @@ CORBA::Object::_set_policy_overrides (
 
   TAO_Stub* stub =
     this->protocol_proxy_->set_policy_overrides (policies,
-                                                 set_add
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                                 set_add);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
 
@@ -600,7 +574,6 @@ CORBA::Object::_set_policy_overrides (
                         0,
                         ENOMEM),
                       CORBA::COMPLETED_MAYBE));
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // If the stub is collocated and we don't have a collocated server we need
   // to reinitialize it to get it.
@@ -615,58 +588,46 @@ CORBA::Object::_set_policy_overrides (
 }
 
 CORBA::PolicyList *
-CORBA::Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types
-                                      ACE_ENV_ARG_DECL)
+CORBA::Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
   if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_policy_overrides (types
-                                                        ACE_ENV_ARG_PARAMETER);
+    return this->protocol_proxy_->get_policy_overrides (types);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
 CORBA::Object::_validate_connection (
-  CORBA::PolicyList_out inconsistent_policies
-  ACE_ENV_ARG_DECL)
+  CORBA::PolicyList_out inconsistent_policies)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
   inconsistent_policies = 0;
 
-  CORBA::Boolean retval = 0;
-
-#if (TAO_HAS_MINIMUM_CORBA == 1)
-
-  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
-
-  retval = false;
-#else
+  CORBA::Boolean retval = false;
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
   // If the object is collocated then use non_existent to see whether
   // it's there.
   if (this->_is_collocated ())
-      return !(this->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER));
+      return !(this->_non_existent ());
 
   TAO::LocateRequest_Invocation_Adapter tao_call (this);
-  ACE_TRY
+  try
     {
-      tao_call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      tao_call.invoke ();
     }
-  ACE_CATCH (CORBA::INV_POLICY, ex)
+  catch (const ::CORBA::INV_POLICY&)
     {
       inconsistent_policies =
         tao_call.get_inconsistent_policies ();
       retval = false;
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (false);
 
   retval = true;
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -678,7 +639,7 @@ CORBA::Object::_validate_connection (
 
 
 CORBA::ORB_ptr
-CORBA::Object::_get_orb (ACE_ENV_SINGLE_ARG_DECL)
+CORBA::Object::_get_orb (void)
 {
   if (this->orb_core_ != 0)
     {
@@ -772,12 +733,10 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
 
   TAO_Stub *objdata = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_Connector_Registry *connector_registry =
-        orb_core->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_core->connector_registry ();
 
       for (CORBA::ULong i = 0; i != profile_count; ++i)
         {
@@ -819,22 +778,18 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
 
       objdata =
         orb_core->create_stub (obj->ior_->type_id.in (),
-                               mp
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               mp);
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("TAO - ERROR creating stub ")
-                             ACE_TEXT ("object when demarshaling object ")
-                             ACE_TEXT ("reference."));
+        ex._tao_print_exception (
+          ACE_TEXT ("TAO - ERROR creating stub ")
+          ACE_TEXT ("object when demarshaling object ")
+          ACE_TEXT ("reference."));
 
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   TAO_Stub_Auto_Ptr safe_objdata (objdata);
 
@@ -917,12 +872,10 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
 
       TAO_Stub *objdata = 0;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           TAO_Connector_Registry *connector_registry =
-            orb_core->connector_registry (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb_core->connector_registry ();
 
           for (CORBA::ULong i = 0; i != profile_count && cdr.good_bit (); ++i)
             {
@@ -947,22 +900,18 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
 
 
           objdata = orb_core->create_stub (type_hint.in (),
-                                           mp
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                           mp);
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception& ex)
         {
           if (TAO_debug_level > 0)
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 ACE_TEXT ("TAO - ERROR creating stub ")
-                                 ACE_TEXT ("object when demarshaling object ")
-                                 ACE_TEXT ("reference.\n"));
+            ex._tao_print_exception (
+              ACE_TEXT ("TAO - ERROR creating stub ")
+              ACE_TEXT ("object when demarshaling object ")
+              ACE_TEXT ("reference.\n"));
 
           return 0;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
 
       TAO_Stub_Auto_Ptr safe_objdata (objdata);
 
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index d0a0f44d12d..f57c9399a69 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -119,8 +119,7 @@ namespace CORBA
     static CORBA::Object_ptr _nil (void);
 
     /// No-op it is just here to simplify some templates.
-    static CORBA::Object_ptr _narrow (CORBA::Object_ptr obj
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    static CORBA::Object_ptr _narrow (CORBA::Object_ptr obj);
 
     // These calls correspond to over-the-wire operations, or at least
     // do so in many common cases.  The normal implementation assumes a
@@ -129,8 +128,7 @@ namespace CORBA
     // appropriate.
 
     /// Determine if we are of the type specified by the "logical_type_id"
-    virtual CORBA::Boolean _is_a (const char *logical_type_id
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    virtual CORBA::Boolean _is_a (const char *logical_type_id);
 
     /// The repository ID for the most derived class, this is an
     /// implementation method and does no remote invocations!
@@ -144,8 +142,7 @@ namespace CORBA
      * different ORB protocols are in use) there is no default
      * implementation.
      */
-    virtual CORBA::ULong _hash (CORBA::ULong maximum
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    virtual CORBA::ULong _hash (CORBA::ULong maximum);
 
     /**
      * Try to determine if this object is the same as other_obj.  This
@@ -153,36 +150,25 @@ namespace CORBA
      * private state.  Since that changes easily (when different ORB
      * protocols are in use) there is no default implementation.
      */
-    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj)
       ACE_THROW_SPEC (());
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-    virtual CORBA::Boolean _non_existent (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual CORBA::Boolean _non_existent (void);
 
     /// This method is deprecated in the CORBA 2.2 spec, we just return 0
     /// every time.
-    virtual CORBA::ImplementationDef_ptr _get_implementation (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual CORBA::ImplementationDef_ptr _get_implementation (void);
 
     /// Get info about the object from the Interface Repository.
-    virtual InterfaceDef_ptr _get_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual InterfaceDef_ptr _get_interface (void);
 
     /// Get info about the object from the Interface Repository.
-    virtual CORBA::Object_ptr _get_component (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual CORBA::Object_ptr _get_component (void);
 
     /// Get the repository id.
-    virtual char * _repository_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    );
+    virtual char * _repository_id (void);
 
 #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
     // DII operations to create a request.
@@ -196,8 +182,7 @@ namespace CORBA
                                   CORBA::NVList_ptr arg_list,
                                   CORBA::NamedValue_ptr result,
                                   CORBA::Request_ptr &request,
-                                  CORBA::Flags req_flags
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  CORBA::Flags req_flags);
 
     virtual void _create_request (CORBA::Context_ptr ctx,
                                   const char *operation,
@@ -206,8 +191,7 @@ namespace CORBA
                                   CORBA::ExceptionList_ptr exclist,
                                   CORBA::ContextList_ptr ctxtlist,
                                   CORBA::Request_ptr &request,
-                                  CORBA::Flags req_flags
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  CORBA::Flags req_flags);
 #endif
 
     // The default implementation of this method uses the same simple,
@@ -216,37 +200,29 @@ namespace CORBA
     // implementation.
 
     /// DII operation to create a request.
-    virtual CORBA::Request_ptr _request (const char *operation
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    virtual CORBA::Request_ptr _request (const char *operation);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-    CORBA::Policy_ptr _get_policy (CORBA::PolicyType type
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    CORBA::Policy_ptr _get_policy (CORBA::PolicyType type);
 
-    CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    CORBA::Policy_ptr _get_cached_policy (TAO_Cached_Policy_Type type);
 
     CORBA::Object_ptr _set_policy_overrides (
       const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      CORBA::SetOverrideType set_add);
 
     CORBA::PolicyList * _get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      const CORBA::PolicyTypeSeq & types);
 
     CORBA::Boolean _validate_connection (
-      CORBA::PolicyList_out inconsistent_policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      CORBA::PolicyList_out inconsistent_policies);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
-    virtual CORBA::ORB_ptr _get_orb (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      );
+    virtual CORBA::ORB_ptr _get_orb (void);
 
     /**
      * @name Reference Count Managment
@@ -306,7 +282,7 @@ namespace CORBA
 
     /// Return the object key as an out parameter.  Caller should release
     /// return value when finished with it.
-    virtual TAO::ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
+    virtual TAO::ObjectKey *_key (void);
 
     /// Constructor
     Object (TAO_Stub *p,
@@ -314,8 +290,7 @@ namespace CORBA
             TAO_Abstract_ServantBase *servant = 0,
             TAO_ORB_Core *orb_core = 0);
 
-    Object (IOP::IOR *ior,
-            TAO_ORB_Core *orb_core = 0);
+    Object (IOP::IOR *ior, TAO_ORB_Core *orb_core = 0);
 
     /// Get the underlying stub object.
     virtual TAO_Stub *_stubobj (void) const;
diff --git a/TAO/tao/Object.inl b/TAO/tao/Object.inl
index e8c1606bb73..d2d859dc510 100644
--- a/TAO/tao/Object.inl
+++ b/TAO/tao/Object.inl
@@ -67,8 +67,7 @@ CORBA::Object::_nil (void)
 
 ACE_INLINE
 CORBA::Object_ptr
-CORBA::Object::_narrow (CORBA::Object_ptr obj
-                        ACE_ENV_ARG_DECL_NOT_USED)
+CORBA::Object::_narrow (CORBA::Object_ptr obj)
 {
   return CORBA::Object::_duplicate (obj);
 }
diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp
index 38a851353de..372cc8069fa 100644
--- a/TAO/tao/ObjectKey_Table.cpp
+++ b/TAO/tao/ObjectKey_Table.cpp
@@ -144,10 +144,7 @@ TAO::ObjectKey_Table::bind_i (const TAO::ObjectKey &key,
                   TAO::Refcounted_ObjectKey (key),
                   -1);
 
-
-
-  int retval =  this->table_.bind (key,
-                                   key_new);
+  int const retval =  this->table_.bind (key, key_new);
 
   if (retval != -1)
     {
diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h
index 86a84a450ca..bea994c294a 100644
--- a/TAO/tao/ObjectKey_Table.h
+++ b/TAO/tao/ObjectKey_Table.h
@@ -51,7 +51,7 @@ namespace TAO
   {
   public:
     bool operator () (const TAO::ObjectKey &lhs,
-                     const TAO::ObjectKey &rhs) const;
+                      const TAO::ObjectKey &rhs) const;
   };
 
   /**
@@ -109,16 +109,14 @@ namespace TAO
      * new it is bounded to the table. Returns a 0 on success and a -1
      * on failure.
      */
-    int bind (const ObjectKey &key,
-              Refcounted_ObjectKey *&key_new);
+    int bind (const ObjectKey &key, Refcounted_ObjectKey *&key_new);
 
     /// Unbind an ObjectKey from the table.
     int unbind (TAO::Refcounted_ObjectKey *&key);
 
   protected:
     /// Implementation for bind ().
-    int bind_i (const ObjectKey &key,
-                Refcounted_ObjectKey *&key_new);
+    int bind_i (const ObjectKey &key, Refcounted_ObjectKey *&key_new);
 
     /// Implementation for unbind ().
     int unbind_i (Refcounted_ObjectKey *&key);
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index 69b1a7559bc..a8c625b6e46 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -59,8 +59,7 @@ public:
    */
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           ACE_TCHAR* argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           ACE_TCHAR* argv [])
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index b0aa8a56cc5..4bcc45d4ced 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -20,14 +20,14 @@
 #define TAO_OBJECT_PROXY_BROKER_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -38,8 +38,6 @@ namespace CORBA
 
   class Object;
   typedef Object *Object_ptr;
-
-  class Environment;
 }
 
 namespace TAO
@@ -58,24 +56,17 @@ namespace TAO
     virtual ~Object_Proxy_Broker (void);
 
     virtual CORBA::Boolean _is_a (CORBA::Object_ptr target,
-                                  const char *logical_type_id
-                                  ACE_ENV_ARG_DECL) = 0;
+                                  const char *logical_type_id) = 0;
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target
-                                        ACE_ENV_ARG_DECL) = 0;
+  virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target) = 0;
 
-  virtual CORBA::InterfaceDef *_get_interface (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
-    ) = 0;
+  virtual CORBA::InterfaceDef *_get_interface (CORBA::Object_ptr target) = 0;
 
-  virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target
-                                            ACE_ENV_ARG_DECL) = 0;
+  virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target) = 0;
 
-  virtual char * _repository_id (CORBA::Object_ptr target
-                                 ACE_ENV_ARG_DECL) = 0;
+  virtual char * _repository_id (CORBA::Object_ptr target) = 0;
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
   };
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index f5071ad0466..a23bb503ff7 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -2,7 +2,6 @@
 
 #include "tao/Object_Ref_Table.h"
 #include "tao/ORB.h"
-#include "tao/Environment.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h
index 920b0155f1c..142afaab8b3 100644
--- a/TAO/tao/Object_Ref_Table.h
+++ b/TAO/tao/Object_Ref_Table.h
@@ -30,11 +30,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-namespace CORBA
-{
-  class Environment;
-}
-
 /**
  * @class TAO_Object_Ref_Table
  *
diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp
index 6a6808b2738..88f1186acbd 100644
--- a/TAO/tao/Object_T.cpp
+++ b/TAO/tao/Object_T.cpp
@@ -15,17 +15,14 @@ namespace TAO
   T *
   Narrow_Utils<T>::narrow (CORBA::Object_ptr obj,
                            const char *repo_id,
-                           Proxy_Broker_Factory pbf
-                           ACE_ENV_ARG_DECL)
+                           Proxy_Broker_Factory pbf)
   {
     if (CORBA::is_nil (obj))
       {
         return T::_nil ();
       }
 
-    CORBA::Boolean const is_it = obj->_is_a (repo_id
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
+    CORBA::Boolean const is_it = obj->_is_a (repo_id);
 
     if (is_it == false)
       {
@@ -34,33 +31,26 @@ namespace TAO
 
     return TAO::Narrow_Utils<T>::unchecked_narrow (obj,
                                                    repo_id,
-                                                   pbf
-                                                   ACE_ENV_ARG_PARAMETER);
+                                                   pbf);
   }
 
   template<typename T> T *
   Narrow_Utils<T>::unchecked_narrow (CORBA::Object_ptr obj,
                                      Proxy_Broker_Factory pbf)
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
-
     T *proxy = 0;
-    ACE_TRY
+    try
       {
         proxy =
           TAO::Narrow_Utils<T>::unchecked_narrow (obj,
                                                   0,
-                                                  pbf
-                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                                  pbf);
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
         // Swallow the exception
         return T::_nil ();
       }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (proxy);
 
     return proxy;
   }
@@ -68,8 +58,7 @@ namespace TAO
   template<typename T> T *
   Narrow_Utils<T>::unchecked_narrow (CORBA::Object_ptr obj,
                                      const char *,
-                                     Proxy_Broker_Factory pbf
-                                     ACE_ENV_ARG_DECL)
+                                     Proxy_Broker_Factory pbf)
   {
     if (CORBA::is_nil (obj))
       {
diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h
index 0fee83b8170..df39e83d6d6 100644
--- a/TAO/tao/Object_T.h
+++ b/TAO/tao/Object_T.h
@@ -49,8 +49,7 @@ namespace TAO
 
     static T_ptr narrow (CORBA::Object_ptr,
                          const char *repo_id,
-                         Proxy_Broker_Factory
-                         ACE_ENV_ARG_DECL);
+                         Proxy_Broker_Factory);
 
     // Version used the operators.
     static T_ptr unchecked_narrow (CORBA::Object_ptr,
@@ -58,8 +57,7 @@ namespace TAO
 
     static T_ptr unchecked_narrow (CORBA::Object_ptr,
                                    const char *repo_id,
-                                   Proxy_Broker_Factory
-                                   ACE_ENV_ARG_DECL);
+                                   Proxy_Broker_Factory);
 
   private:
     // Code for lazily evaluated IORs.
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index 2ecfcd75efc..56941b574ab 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -57,9 +57,7 @@ public:
   ~TAO_Objref_Var_T (void);
 
   TAO_Objref_Var_T<T> & operator= (T *);
-  TAO_Objref_Var_T<T> & operator= (
-      const TAO_Objref_Var_T<T> &
-    );
+  TAO_Objref_Var_T<T> & operator= (const TAO_Objref_Var_T<T> &);
   T * operator-> (void) const;
 
   // Cast operators.
diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp
index 969f8adfde2..2fe2023f18e 100644
--- a/TAO/tao/PI/ClientRequestDetails.cpp
+++ b/TAO/tao/PI/ClientRequestDetails.cpp
@@ -17,7 +17,7 @@ namespace TAO
   void
   ClientRequestDetails::apply_policies (
       const CORBA::PolicyList &policies
-      ACE_ENV_ARG_DECL)
+      )
   {
     // Flag to check for duplicate ProcessingModePolicy objects in the list.
     bool processing_mode_applied = false;
@@ -36,8 +36,7 @@ namespace TAO
 
         // Obtain the PolicyType from the current Policy object.
         const CORBA::PolicyType policy_type =
-          policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          policy->policy_type ();
 
         if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE)
           {
@@ -45,7 +44,7 @@ namespace TAO
               {
                 // This is the second time we have run into this policy type,
                 // and that is not allowed.
-                ACE_THROW (CORBA::INV_POLICY ());
+                throw ::CORBA::INV_POLICY ();
               }
 
             // Flip the flag to true in order to trap any dupes.
@@ -55,18 +54,16 @@ namespace TAO
             PortableInterceptor::ProcessingModePolicy_var pm_policy =
                     PortableInterceptor::ProcessingModePolicy::_narrow (
                                                  policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+                                                );
 
             // Save the value of the ProcessingModePolicy in our data member.
             this->processing_mode_ =
-              pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+              pm_policy->processing_mode ();
           }
         else
           {
             // We don't support the current policy type.
-            ACE_THROW (CORBA::INV_POLICY ());
+            throw ::CORBA::INV_POLICY ();
           }
       }
   }
diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h
index ec4666ae047..80abab464d6 100644
--- a/TAO/tao/PI/ClientRequestDetails.h
+++ b/TAO/tao/PI/ClientRequestDetails.h
@@ -55,7 +55,7 @@ namespace TAO
     ClientRequestDetails (void);
 
     void apply_policies (const CORBA::PolicyList& policies
-                         ACE_ENV_ARG_DECL);
+                        );
 
     /// Returns true if the ProcessingMode setting permits the "firing"
     /// of the associated client request interceptor based upon the
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index f3df9f77449..1bce119c9ee 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -63,7 +63,7 @@ IOP::ServiceContext *
 TAO_ClientRequestInfo::get_service_context_i (
     TAO_Service_Context &service_context_list,
     IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::ServiceContext_var service_context;
@@ -83,31 +83,28 @@ TAO_ClientRequestInfo::get_service_context_i (
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::target (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::target (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_validity ();
 
   return CORBA::Object::_duplicate (this->invocation_->target ());
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::effective_target (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::effective_target (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_validity ();
 
   return CORBA::Object::_duplicate (this->invocation_->effective_target ());
 }
 
 IOP::TaggedProfile *
-TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::effective_profile (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   IOP::TaggedProfile *tagged_profile = 0;
   ACE_NEW_THROW_EX (tagged_profile,
@@ -117,7 +114,6 @@ TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   IOP::TaggedProfile_var safe_tagged_profile = tagged_profile;
 
@@ -145,11 +141,10 @@ TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::received_exception (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   if (this->invocation_->reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
       && this->invocation_->reply_status () != PortableInterceptor::USER_EXCEPTION)
@@ -171,7 +166,6 @@ TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CORBA::Any_var caught_exception_var = temp;
 
@@ -186,11 +180,10 @@ TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ClientRequestInfo::received_exception_id (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   CORBA::Exception *caught_exception =
     invocation_->caught_exception ();
@@ -208,11 +201,10 @@ TAO_ClientRequestInfo::received_exception_id (
 IOP::TaggedComponent *
 TAO_ClientRequestInfo::get_effective_component (
     IOP::ComponentId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   TAO_Stub *stub =
     this->invocation_->effective_target ()->_stubobj ();
@@ -238,7 +230,6 @@ TAO_ClientRequestInfo::get_effective_component (
                                 TAO::VMCID,
                                 ENOMEM),
                               CORBA::COMPLETED_NO));
-          ACE_CHECK_RETURN (0);
 
           IOP::TaggedComponent_var safe_tagged_component =
             tagged_component;
@@ -259,11 +250,10 @@ TAO_ClientRequestInfo::get_effective_component (
 IOP::TaggedComponentSeq *
 TAO_ClientRequestInfo::get_effective_components (
     IOP::ComponentId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   TAO_Stub *stub =
     this->invocation_->target ()->_stubobj ();
@@ -292,7 +282,6 @@ TAO_ClientRequestInfo::get_effective_components (
                                     TAO::VMCID,
                                     ENOMEM),
                                   CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (0);
 
               safe_tagged_components = tagged_components;
             }
@@ -319,17 +308,16 @@ TAO_ClientRequestInfo::get_effective_components (
 
 CORBA::Policy_ptr
 TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type
-                                           ACE_ENV_ARG_DECL)
+                                           )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  this->check_validity ();
 
   // @@ Do we need to look anywhere else for the request policies?
 
 #if TAO_HAS_CORBA_MESSAGING == 1
   return this->invocation_->target ()->_get_policy (type
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   );
 #else
   ACE_UNUSED_ARG (type);
 
@@ -346,11 +334,10 @@ void
 TAO_ClientRequestInfo::add_request_service_context (
     const IOP::ServiceContext & service_context,
     CORBA::Boolean replace
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   // Get the service context from the list
   TAO_Service_Context &service_context_list =
@@ -358,17 +345,15 @@ TAO_ClientRequestInfo::add_request_service_context (
 
   if (service_context_list.set_context (service_context, replace) == 0)
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15,
-                                       CORBA::COMPLETED_NO));
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
     }
 }
 
 CORBA::ULong
-TAO_ClientRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::request_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // @todo We may have to worry about AMI once we support interceptors
   //       in AMI requests since the Invocation object no longer
@@ -450,27 +435,24 @@ TAO_ClientRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_ClientRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::operation (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   return CORBA::string_dup (
     this->invocation_->operation_details ().opname  ());
 }
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::arguments (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RequestInfo_Util::make_parameter_list ();
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
@@ -480,7 +462,7 @@ TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
 
   return safe_parameter_list._retn ();
 
-  //return this->invocation_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
+  //return this->invocation_->arguments ();
 }
 
 bool
@@ -502,15 +484,13 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList &param_list)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::exceptions (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RequestInfo_Util::make_exception_list ();
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
 
@@ -545,11 +525,10 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
 }
 
 Dynamic::ContextList *
-TAO_ClientRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::contexts (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -557,11 +536,10 @@ TAO_ClientRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::RequestContext *
-TAO_ClientRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::operation_context (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -569,17 +547,15 @@ TAO_ClientRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::result (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Generate the result on demand.
   static const CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RequestInfo_Util::make_any (tk_void_any);
 
   CORBA::Any_var safe_result_any = result_any;
 
@@ -602,31 +578,28 @@ TAO_ClientRequestInfo::result (CORBA::Any *any)
 }
 
 CORBA::Boolean
-TAO_ClientRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::response_expected (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   return this->invocation_->response_expected ();
 }
 
 Messaging::SyncScope
-TAO_ClientRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::sync_scope (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   return this->invocation_->operation_details ().response_flags ();
 }
 
 PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::reply_status (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableInterceptor::SYSTEM_EXCEPTION);
+  this->check_validity ();
 
   if (this->invocation_->reply_status() == -1)
     {
@@ -640,11 +613,10 @@ TAO_ClientRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::forward_reference (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_validity ();
 
   if (this->invocation_->reply_status() != PortableInterceptor::LOCATION_FORWARD)
     {
@@ -661,25 +633,23 @@ TAO_ClientRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any *
 TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                 ACE_ENV_ARG_DECL)
+                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   return this->rs_pi_current_.get_slot (id
-                                        ACE_ENV_ARG_PARAMETER);
+                                       );
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_request_service_context (
     IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Get the service context from the list
   TAO_Service_Context &service_context_list =
@@ -687,17 +657,16 @@ TAO_ClientRequestInfo::get_request_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_reply_service_context (
     IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // Get the service context from the list
   TAO_Service_Context &service_context_list =
@@ -705,15 +674,14 @@ TAO_ClientRequestInfo::get_reply_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 void
-TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::check_validity (void)
 {
   if (this->invocation_ == 0)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                     CORBA::COMPLETED_NO));
+    throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 }
 
 void
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 4671889f2b1..22abd55b4d9 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -79,50 +79,50 @@ public:
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
   virtual CORBA::ULong request_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the operation name for the current request.
   virtual char * operation (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of arguments passed to the current operation.
   virtual Dynamic::ParameterList * arguments (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
   virtual Dynamic::ExceptionList * exceptions (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ContextList * contexts (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::RequestContext * operation_context (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
   virtual CORBA::Any * result (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns true for a two-way operation, and false otherwise.
   virtual CORBA::Boolean response_expected (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   /// Return the sync_scope policy value for the current one-way
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
   virtual Messaging::SyncScope sync_scope (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the reply status for the current request.
@@ -132,18 +132,18 @@ public:
    * TRANSPORT_RETRY, UNKNOWN.
    */
   virtual PortableInterceptor::ReplyStatus reply_status (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// return the object reference to which the request was forwarded.
   virtual CORBA::Object_ptr forward_reference (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   virtual CORBA::Any * get_slot (
       PortableInterceptor::SlotId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
@@ -151,30 +151,30 @@ public:
   /// from the request service context list.
   virtual IOP::ServiceContext * get_request_service_context (
       IOP::ServiceId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the reply service context list.
   virtual IOP::ServiceContext * get_reply_service_context (
       IOP::ServiceId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
   virtual CORBA::Object_ptr target (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
   virtual CORBA::Object_ptr effective_target (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IOP::TaggedProfile * effective_profile (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return an Any containing the received exception, if any.
@@ -183,12 +183,12 @@ public:
    * @note There is no trivial way to extract the exception from an Any.
    */
   virtual CORBA::Any * received_exception (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the repository ID for the received exception.
   virtual char * received_exception_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the first IOP::TaggedComponent that matches the given
@@ -196,7 +196,7 @@ public:
   /// target.
   virtual IOP::TaggedComponent * get_effective_component (
       IOP::ComponentId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return all IOP::TaggedComponent(s) that match the given
@@ -204,14 +204,14 @@ public:
   /// target.
   virtual IOP::TaggedComponentSeq * get_effective_components (
       IOP::ComponentId id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the policy of the given type in effect for the current
   /// request.
   virtual CORBA::Policy_ptr get_request_policy (
       CORBA::PolicyType type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the IOP::ServiceContext to the request (outgoing)
@@ -219,7 +219,7 @@ public:
   virtual void add_request_service_context (
       const IOP::ServiceContext & service_context,
       CORBA::Boolean replace
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   /*
@@ -253,7 +253,7 @@ private:
 
   /// Check if this ClientRequestInfo object is called within the
   /// context of a request.
-  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
+  void check_validity (void);
 
   /// Setup thread scope and request scope
   /// PortableInterceptor::Current objects.
@@ -263,7 +263,7 @@ private:
   IOP::ServiceContext *get_service_context_i (
       TAO_Service_Context &service_context_list,
       IOP::ServiceId id
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 1d1dd7429b2..3575003f79b 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -24,14 +24,14 @@ namespace TAO
   void
   ClientRequestInterceptor_Adapter_Impl::send_request (
       Invocation_Base &invocation
-      ACE_ENV_ARG_DECL)
+      )
   {
     // This method implements one of the "starting" client side
     // interception point.
 
     bool const is_remote_request = invocation.is_remote_request();
 
-    ACE_TRY
+    try
       {
         TAO_ClientRequestInfo ri (&invocation);
 
@@ -42,10 +42,7 @@ namespace TAO
 
             if (registered.details_.should_be_processed (is_remote_request))
               {
-                registered.interceptor_->
-                  send_request (&ri
-                                ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                registered.interceptor_->send_request (&ri);
               }
 
             // The starting interception point completed successfully.
@@ -53,21 +50,15 @@ namespace TAO
             ++invocation.stack_size ();
           }
       }
-    ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+    catch ( ::PortableInterceptor::ForwardRequest& exc)
       {
-        this->process_forward_request (invocation,
-                                       exc
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->process_forward_request (invocation, exc);
       }
-    ACE_ENDTRY;
-    ACE_CHECK;
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::receive_reply (
-    Invocation_Base &invocation
-    ACE_ENV_ARG_DECL)
+    Invocation_Base &invocation)
   {
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
@@ -99,8 +90,7 @@ namespace TAO
             registered.interceptor_->
               receive_reply (
                 &ri
-                ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+               );
           }
       }
 
@@ -111,8 +101,7 @@ namespace TAO
 
   void
   ClientRequestInterceptor_Adapter_Impl::receive_exception (
-      Invocation_Base &invocation
-      ACE_ENV_ARG_DECL)
+      Invocation_Base &invocation)
   {
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
@@ -122,7 +111,7 @@ namespace TAO
     // Notice that the interceptors are processed in the opposite order
     // they were pushed onto the stack since this is an "ending"
     // interception point.
-    ACE_TRY
+    try
       {
         TAO_ClientRequestInfo ri (&invocation);
 
@@ -142,22 +131,15 @@ namespace TAO
 
             if (registered.details_.should_be_processed (is_remote_request))
               {
-                registered.interceptor_->
-                  receive_exception (
-                    &ri
-                    ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                registered.interceptor_->receive_exception (&ri);
               }
           }
       }
-    ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+    catch ( ::PortableInterceptor::ForwardRequest& exc)
       {
-        this->process_forward_request (invocation,
-                                       exc
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->process_forward_request (invocation, exc);
       }
-    ACE_CATCHANY
+    catch ( ::CORBA::Exception& ex)
       {
         // The receive_exception() interception point in the remaining
         // interceptors must be called so call this method (not the
@@ -169,10 +151,9 @@ namespace TAO
         // drops to zero, i.e., once each interceptor has been invoked.
         // This prevents infinite recursion from occuring.
 
-        invocation.exception (&ACE_ANY_EXCEPTION);
+        invocation.exception (&ex);
 
-        this->receive_exception (invocation ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->receive_exception (invocation);
 
         PortableInterceptor::ReplyStatus status =
           this->reply_status (invocation);
@@ -182,16 +163,14 @@ namespace TAO
         // LOCATION_FORWARD).
         if (status == PortableInterceptor::SYSTEM_EXCEPTION
             || status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
+          throw;
       }
-    ACE_ENDTRY;
-    ACE_CHECK;
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::receive_other (
       Invocation_Base &invocation
-      ACE_ENV_ARG_DECL)
+      )
   {
     // This is an "ending" interception point so we only process the
     // interceptors pushed on to the flow stack.
@@ -202,7 +181,7 @@ namespace TAO
     // they were pushed onto the stack since this is an "ending"
     // interception point.
 
-    ACE_TRY
+    try
       {
         TAO_ClientRequestInfo ri (&invocation);
 
@@ -222,22 +201,15 @@ namespace TAO
 
           if (registered.details_.should_be_processed (is_remote_request))
             {
-              registered.interceptor_->
-                receive_other (
-                  &ri
-                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              registered.interceptor_->receive_other (&ri);
             }
         }
       }
-    ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+    catch ( ::PortableInterceptor::ForwardRequest& exc)
       {
-        this->process_forward_request (invocation,
-                                       exc
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->process_forward_request (invocation, exc);
       }
-    ACE_CATCHANY
+    catch ( ::CORBA::Exception& ex)
       {
         // The receive_exception() interception point in the remaining
         // interceptors must be called so call this method (not the
@@ -249,10 +221,9 @@ namespace TAO
         // drops to zero, i.e., once each interceptor has been invoked.
         // This prevents infinite recursion from occuring.
 
-        invocation.exception (&ACE_ANY_EXCEPTION);
+        invocation.exception (&ex);
 
-        this->receive_exception (invocation ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->receive_exception (invocation);
 
         PortableInterceptor::ReplyStatus status =
           this->reply_status (invocation);
@@ -262,53 +233,40 @@ namespace TAO
         // LOCATION_FORWARD).
         if (status == PortableInterceptor::SYSTEM_EXCEPTION
             || status == PortableInterceptor::USER_EXCEPTION)
-          ACE_RE_THROW;
+          throw;
       }
-    ACE_ENDTRY;
-    ACE_CHECK;                                      
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::process_forward_request (
       Invocation_Base &invocation,
-      PortableInterceptor::ForwardRequest &exc
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ForwardRequest &exc)
   {
     invocation.forwarded_reference (exc.forward.in ());
 
     // receive_other() is potentially invoked recursively.
-    this->receive_other (invocation
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->receive_other (invocation);
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::add_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor)
   {
-    this->interceptor_list_.add_interceptor (interceptor ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->interceptor_list_.add_interceptor (interceptor);
   }
 
   void
   ClientRequestInterceptor_Adapter_Impl::add_interceptor (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-    const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    const CORBA::PolicyList& policies)
   {
-    this->interceptor_list_.add_interceptor (interceptor,
-                                             policies
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->interceptor_list_.add_interceptor (interceptor, policies);
   }
 
   void
-  ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (
-    ACE_ENV_SINGLE_ARG_DECL)
+  ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (void)
   {
-    this->interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    this->interceptor_list_.destroy_interceptors ();
   }
 
   PortableInterceptor::ReplyStatus
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index 4b1a7ebc70c..f37ef7e108d 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -79,36 +79,36 @@ namespace TAO
     /// This method implements one of the "starting" client side
     /// interception points.
     virtual void send_request (Invocation_Base &invocation
-                               ACE_ENV_ARG_DECL);
+                              );
 
     /// This method implements one of the "ending" client side
     /// interception point.
     virtual void receive_reply (Invocation_Base &invocation
-                                ACE_ENV_ARG_DECL);
+                               );
 
     /// This method implements one of the "ending" client side
     /// interception point.
     virtual void receive_exception (Invocation_Base &invocation
-                                    ACE_ENV_ARG_DECL);
+                                   );
 
     /// This method implements one of the "ending" client side
     /// interception point.
     virtual void receive_other (Invocation_Base &invocation
-                                ACE_ENV_ARG_DECL);
+                               );
     //@}
 
     /// Register an interceptor.
     virtual void add_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL);
+     );
 
     /// Register an interceptor with policies.
     virtual void add_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL);
+     );
 
-    virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
+    virtual void destroy_interceptors (void);
 
     virtual PortableInterceptor::ReplyStatus reply_status (
       TAO::Invocation_Base const &invocation_base);
@@ -120,7 +120,7 @@ namespace TAO
     /// to notifying the Invocation object of the LOCATION_FORWARD.
     void process_forward_request (Invocation_Base &invocation,
                                   PortableInterceptor::ForwardRequest &exc
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
   private:
 
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index fe216233ca9..ba15a78da6f 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -45,7 +45,7 @@ namespace TAO
   void
   Interceptor_List<InterceptorType,DetailsType>::add_interceptor (
     InterceptorType_ptr_type interceptor
-    ACE_ENV_ARG_DECL)
+    )
   {
     if (!CORBA::is_nil (interceptor))
       {
@@ -59,8 +59,7 @@ namespace TAO
             /// If the Interceptor is not anonymous, make sure an
             /// Interceptor with the same isn't already registered.
             CORBA::String_var name =
-              interceptor->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+              interceptor->name ();
 
             if (ACE_OS::strlen (name.in ()) != 0)
               {
@@ -87,7 +86,7 @@ namespace TAO
                     if (ACE_OS::strcmp (existing_name.in (),
                                         name.in ()) == 0)
                       {
-                        ACE_THROW (PortableInterceptor::ORBInitInfo::DuplicateName ());
+                        throw PortableInterceptor::ORBInitInfo::DuplicateName ();
                       }
                   }
               }
@@ -103,15 +102,13 @@ namespace TAO
       }
     else
       {
-        ACE_THROW (
+        throw
             CORBA::INV_OBJREF (
                 CORBA::SystemException::_tao_minor_code (
                     0,
                     EINVAL
                   ),
-                CORBA::COMPLETED_NO
-              )
-            );
+                CORBA::COMPLETED_NO);
       }
   }
 
@@ -120,7 +117,7 @@ namespace TAO
   Interceptor_List<InterceptorType,DetailsType>::add_interceptor (
     InterceptorType_ptr_type interceptor,
     const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    )
   {
     if (!CORBA::is_nil (interceptor))
       {
@@ -134,8 +131,7 @@ namespace TAO
             /// If the Interceptor is not anonymous, make sure an
             /// Interceptor with the same isn't already registered.
             CORBA::String_var name =
-              interceptor->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+              interceptor->name ();
 
             if (ACE_OS::strlen (name.in ()) != 0)
               {
@@ -162,7 +158,7 @@ namespace TAO
                     if (ACE_OS::strcmp (existing_name.in (),
                                         name.in ()) == 0)
                       {
-                        ACE_THROW (PortableInterceptor::ORBInitInfo::DuplicateName ());
+                        throw PortableInterceptor::ORBInitInfo::DuplicateName ();
                       }
                   }
               }
@@ -170,8 +166,7 @@ namespace TAO
 
         // Create a DetailsType object, and attempt to apply the policies.
         DetailsType details;
-        details.apply_policies(policies ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        details.apply_policies(policies);
 
         /// Increase the length of the Interceptor sequence by one.
         const size_t new_len = old_len + 1;
@@ -186,14 +181,13 @@ namespace TAO
       }
     else
       {
-        ACE_THROW (
+        throw
             CORBA::INV_OBJREF (
                 CORBA::SystemException::_tao_minor_code (
                     0,
                     EINVAL
                   ),
                 CORBA::COMPLETED_NO
-              )
             );
       }
   }
@@ -201,12 +195,12 @@ namespace TAO
   template <typename InterceptorType, typename DetailsType>
   void
   Interceptor_List<InterceptorType,DetailsType>::destroy_interceptors (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   {
     size_t const len = this->interceptors_.size ();
     size_t ilen = len;
 
-    ACE_TRY
+    try
       {
         for (size_t k = 0; k < len; ++k)
           {
@@ -215,8 +209,7 @@ namespace TAO
             // invocation occurs afterwards.
             --ilen;
 
-            this->interceptor (k)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            this->interceptor (k)->destroy ();
 
             // Since Interceptor::destroy() can throw an exception,
             // decrease the size of the interceptor array incrementally
@@ -226,7 +219,7 @@ namespace TAO
             this->interceptors_.size (ilen);
           }
       }
-    ACE_CATCHALL
+    catch (...)
       {
         // Exceptions should not be propagated beyond this call.
         if (TAO_debug_level > 3)
@@ -237,8 +230,6 @@ namespace TAO
                         ACE_TEXT ("::destroy_interceptors () \n")));
           }
       }
-    ACE_ENDTRY;
-    ACE_CHECK;
   }
 }
 
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index 5160ec03377..5cfc907fd76 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -66,14 +66,14 @@ namespace TAO
 
     void add_interceptor (
       InterceptorType_ptr_type i
-      ACE_ENV_ARG_DECL);
+     );
 
     /// Register an interceptor with policies.
     void add_interceptor (InterceptorType_ptr_type i,
                           const CORBA::PolicyList& policies
-                          ACE_ENV_ARG_DECL);
+                         );
 
-    void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
+    void destroy_interceptors (void);
 
     /// Return the registered interceptor in sequence element @a index.
     RegisteredInterceptor& registered_interceptor (
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 7dbc9cb0bb4..469fe4c1ba9 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -76,11 +76,10 @@ TAO_ORBInitInfo::~TAO_ORBInitInfo (void)
 }
 
 CORBA::StringSeq *
-TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::arguments (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // In accordance with the C++ mapping for sequences, it is up to the
   // caller to deallocate storage for returned sequences.
@@ -93,7 +92,6 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
                         0,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CORBA::StringSeq_var safe_args (args);
 
@@ -107,11 +105,10 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_ORBInitInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::orb_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   // In accordance with the C++ mapping for strings, return a copy.
 
@@ -119,7 +116,7 @@ TAO_ORBInitInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 IOP::CodecFactory_ptr
-TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::codec_factory (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->codec_factory_.in ()))
@@ -141,8 +138,7 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
       if (loader != 0)
         {
           CORBA::Object_var cf =
-            loader->create_object (this->orb_core_->orb (), 0, 0 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (IOP::CodecFactory::_nil ());
+            loader->create_object (this->orb_core_->orb (), 0, 0);
 
           this->codec_factory_ = IOP::CodecFactory::_narrow (cf.in ());
         }
@@ -155,37 +151,32 @@ void
 TAO_ORBInitInfo::register_initial_reference (
     const char * id,
     CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::InvalidName))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   if (id == 0 || ACE_OS::strlen (id) == 0)
-    ACE_THROW (PortableInterceptor::ORBInitInfo::InvalidName ());
-  ACE_CHECK;
+    throw PortableInterceptor::ORBInitInfo::InvalidName ();
 
   if (CORBA::is_nil (obj))
-    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 27,
-                                 CORBA::COMPLETED_NO));
-  ACE_CHECK;
+    throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, CORBA::COMPLETED_NO);
 
   TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
 
   if (table.register_initial_reference (id, obj) == -1)
-    ACE_THROW (PortableInterceptor::ORBInitInfo::InvalidName ());
+    throw PortableInterceptor::ORBInitInfo::InvalidName ();
 }
 
 CORBA::Object_ptr
 TAO_ORBInitInfo::resolve_initial_references (
     const char * id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::InvalidName))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->check_validity ();
 
   if (id == 0 || ACE_OS::strlen (id) == 0)
     ACE_THROW_RETURN (PortableInterceptor::ORBInitInfo::InvalidName (),
@@ -196,94 +187,88 @@ TAO_ORBInitInfo::resolve_initial_references (
   // mechanism.
   return
     this->orb_core_->orb ()->resolve_initial_references (id
-                                                         ACE_ENV_ARG_PARAMETER);
+                                                        );
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_core_->add_interceptor (interceptor);
 #else
   ACE_UNUSED_ARG (interceptor);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
 void
 TAO_ORBInitInfo::add_server_request_interceptor (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
-  this->orb_core_->add_interceptor (interceptor ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_core_->add_interceptor (interceptor);
 
 #else
   ACE_UNUSED_ARG (interceptor);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
 void
 TAO_ORBInitInfo::add_ior_interceptor (
     PortableInterceptor::IORInterceptor_ptr interceptor
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   this->orb_core_->add_interceptor (interceptor
-                                     ACE_ENV_ARG_PARAMETER);
+                                    );
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor_with_policy (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
     const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName,
                    CORBA::PolicyError))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   this->orb_core_->add_interceptor (interceptor,
                                     policies
-                                    ACE_ENV_ARG_PARAMETER);
+                                   );
 #else
   ACE_UNUSED_ARG (interceptor);
   ACE_UNUSED_ARG (policies);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
@@ -291,27 +276,26 @@ void
 TAO_ORBInitInfo::add_server_request_interceptor_with_policy (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
     const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName,
                    CORBA::PolicyError))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   this->orb_core_->add_interceptor (interceptor,
                                     policies
-                                    ACE_ENV_ARG_PARAMETER);
+                                   );
 
 #else
   ACE_UNUSED_ARG (interceptor);
   ACE_UNUSED_ARG (policies);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
@@ -319,13 +303,12 @@ void
 TAO_ORBInitInfo::add_ior_interceptor_with_policy (
     PortableInterceptor::IORInterceptor_ptr interceptor,
     const CORBA::PolicyList& policies
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName,
                    CORBA::PolicyError))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   // Since there are currently no PI Policies that pertain to
   // IOR Interceptors, we will always raise the NO_IMPLEMENT
@@ -333,19 +316,18 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy (
   // is currently not implemented/supported.
   ACE_UNUSED_ARG (interceptor);
   ACE_UNUSED_ARG (policies);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
+  throw ::CORBA::NO_IMPLEMENT (
                CORBA::SystemException::_tao_minor_code (
                  0,
                  ENOTSUP),
-               CORBA::COMPLETED_NO));
+               CORBA::COMPLETED_NO);
 }
 
 PortableInterceptor::SlotId
-TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::allocate_slot_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
 #if TAO_HAS_INTERCEPTORS == 1
   // No need to acquire a lock.  This only gets called during ORB
@@ -365,32 +347,30 @@ void
 TAO_ORBInitInfo::register_policy_factory (
     CORBA::PolicyType type,
     PortableInterceptor::PolicyFactory_ptr policy_factory
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity ();
 
   TAO::PolicyFactory_Registry_Adapter *registry =
     this->orb_core_->policy_factory_registry ();
 
   if (registry == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
   registry->register_policy_factory (type,
                                      policy_factory
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 size_t
 TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
-                                       ACE_ENV_ARG_DECL)
+                                       )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity ();
 
   size_t slot_id = 0;
 
@@ -409,7 +389,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
 }
 
 void
-TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::check_validity (void)
 {
   if (this->orb_core_ == 0)
     {
@@ -419,23 +399,21 @@ TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
       // this instance to zero when it is done initializing the ORB,
       // which is why we base "existence" on the validity of the ORB
       // core pointer.
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (0,
-                                          CORBA::COMPLETED_NO));
+      throw ::CORBA::OBJECT_NOT_EXIST (0, CORBA::COMPLETED_NO);
     }
 }
 
 CORBA::ORB_ptr
-TAO_ORBInitInfo::_get_orb (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::_get_orb (void)
 {
-  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::ORB::_nil ());
+  this->check_validity ();
 
   return CORBA::ORB::_duplicate (this->orb_core_->orb ());
 }
 
 TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (CORBA::is_nil (_tao_objref))
diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h
index 63c78095104..72c2cb20624 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -78,18 +78,18 @@ public:
   /// Return the argument vector for the ORB currently being
   /// initialized as a string sequence.
   virtual CORBA::StringSeq * arguments (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ORBid for the ORB currently being initialized.
   virtual char * orb_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the CodecFactory for the ORB currently being
   /// initialized.
   virtual IOP::CodecFactory_ptr codec_factory (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register a mapping between a string and a corresponding object
@@ -105,7 +105,7 @@ public:
   virtual void register_initial_reference (
       const char * id,
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::InvalidName));
 
@@ -114,7 +114,7 @@ public:
   /// since the ORB may not be fully initialized yet.
   virtual CORBA::Object_ptr resolve_initial_references (
       const char * id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::InvalidName));
 
@@ -122,7 +122,7 @@ public:
   /// being initialized.
   virtual void add_client_request_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -130,7 +130,7 @@ public:
   /// being initialized.
   virtual void add_server_request_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -138,7 +138,7 @@ public:
   /// initialized.
   virtual void add_ior_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -147,7 +147,7 @@ public:
   virtual void add_client_request_interceptor_with_policy (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName,
                      CORBA::PolicyError));
@@ -157,7 +157,7 @@ public:
   virtual void add_server_request_interceptor_with_policy (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName,
                      CORBA::PolicyError));
@@ -167,7 +167,7 @@ public:
   virtual void add_ior_interceptor_with_policy (
       PortableInterceptor::IORInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName,
                      CORBA::PolicyError));
@@ -175,7 +175,7 @@ public:
   /// Reserve a slot in table found within the
   /// PortableInterceptor::Current object.
   virtual PortableInterceptor::SlotId allocate_slot_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register a policy factory of the given policy type with the ORB
@@ -183,11 +183,11 @@ public:
   virtual void register_policy_factory (
       CORBA::PolicyType type,
       PortableInterceptor::PolicyFactory_ptr policy_factory
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ORB_ptr _get_orb (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     );
   //@}
 
@@ -210,7 +210,7 @@ public:
    */
   size_t allocate_tss_slot_id (
       ACE_CLEANUP_FUNC cleanup
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a pointer to the ORB Core associated with the ORB being
@@ -249,12 +249,12 @@ public:
 
   static TAO_ORBInitInfo_ptr _narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
 
   static TAO_ORBInitInfo_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
 
   static TAO_ORBInitInfo_ptr _nil (void)
@@ -274,7 +274,7 @@ protected:
   /// Check if this ORBInitInfo instance is valid.  Once post_init()
   /// has been called on each of the ORBInitializers, this ORBInitInfo
   /// is no longer valid.  Throw an exception in that case.
-  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
+  void check_validity (void);
 
 private:
 
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index 1b20c74dcdb..3f43054c41a 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -42,8 +42,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
 
   PortableInterceptor::ORBInitializer_var orb_initializer;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Register the PI ORBInitializer.
 
@@ -54,24 +53,20 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[])
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       orb_initializer = temp_orb_initializer;
 
       this->register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "(%P|%t) Caught exception:");
+          ex._tao_print_exception ("(%P|%t) Caught exception:");
         }
       return -1;
     }
-  ACE_ENDTRY;
 #endif /* !TAO_AS_STATIC_LIBS  && TAO_HAS_INTERCEPTORS == 1 */
   return 0;
 }
@@ -97,7 +92,7 @@ TAO::ORBInitializer_Registry::fini (void)
 void
 TAO::ORBInitializer_Registry::register_orb_initializer (
   PortableInterceptor::ORBInitializer_ptr init
-  ACE_ENV_ARG_DECL)
+  )
 {
   if (!CORBA::is_nil (init))
     {
@@ -109,18 +104,18 @@ TAO::ORBInitializer_Registry::register_orb_initializer (
       size_t const cur_len = this->initializers_.size ();
       size_t const new_len = cur_len + 1;
       if (this->initializers_.size (new_len) != 0)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw ::CORBA::INTERNAL ();
 
       // Add the given ORBInitializer to the sequence.
       this->initializers_[cur_len] =
         PortableInterceptor::ORBInitializer::_duplicate (init);
     }
   else
-    ACE_THROW (CORBA::INV_OBJREF (
+    throw ::CORBA::INV_OBJREF (
                  CORBA::SystemException::_tao_minor_code (
                    0,
                    EINVAL),
-                 CORBA::COMPLETED_NO));
+                 CORBA::COMPLETED_NO);
 }
 
 size_t
@@ -129,7 +124,7 @@ TAO::ORBInitializer_Registry::pre_init (
   int argc,
   char *argv[],
   PortableInterceptor::SlotId &slotid
-  ACE_ENV_ARG_DECL)
+  )
 {
   ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                     guard,
@@ -152,15 +147,13 @@ TAO::ORBInitializer_Registry::pre_init (
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
 
       TAO_ORBInitInfo_var orb_init_info_ = orb_init_info_temp;
 
       for (size_t i = 0; i < initializer_count; ++i)
         {
           this->initializers_[i]->pre_init (orb_init_info_.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                           );
         }
 
       slotid = orb_init_info_temp->slot_count ();
@@ -181,7 +174,7 @@ TAO::ORBInitializer_Registry::post_init (
   int argc,
   char *argv[],
   PortableInterceptor::SlotId slotid
-  ACE_ENV_ARG_DECL)
+  )
 {
   if (pre_init_count > 0)
     {
@@ -201,15 +194,13 @@ TAO::ORBInitializer_Registry::post_init (
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       TAO_ORBInitInfo_var orb_init_info_ = orb_init_info_temp;
 
       for (size_t i = 0; i < pre_init_count; ++i)
         {
           this->initializers_[i]->post_init (orb_init_info_.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                            );
         }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -230,8 +221,7 @@ TAO::ORBInitializer_Registry::post_init (
 
           if (pi)
             {
-              pi->initialize (slot_count ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              pi->initialize (slot_count);
             }
         }
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index cac58a1d4e0..42209ab9be2 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -65,7 +65,7 @@ namespace TAO
     /// array.
     virtual void register_orb_initializer (
                    PortableInterceptor::ORBInitializer_ptr init
-                   ACE_ENV_ARG_DECL);
+                  );
 
     /// Begin initialization of all registered ORBInitializers before
     /// the ORB itself is initialized.
@@ -74,7 +74,7 @@ namespace TAO
                              int argc,
                              char *argv[],
                              PortableInterceptor::SlotId &slotid
-                             ACE_ENV_ARG_DECL);
+                            );
 
     /// Complete initialization of all registered ORBInitializers after
     /// the ORB has been initialized.
@@ -84,7 +84,7 @@ namespace TAO
                             int argc,
                             char *argv[],
                             PortableInterceptor::SlotId slotid
-                            ACE_ENV_ARG_DECL);
+                           );
 
   private:
     // Prevent copying
diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp
index 61a039a52ed..87f37f55389 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -35,8 +35,7 @@ TAO_PI_Init::Initializer (void)
 
   PortableInterceptor::ORBInitializer_var orb_initializer;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Register the PI ORBInitializer.
 
@@ -47,24 +46,20 @@ TAO_PI_Init::Initializer (void)
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       orb_initializer = temp_orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "(%P | %t) Caught exception:");
+          ex._tao_print_exception ("(%P | %t) Caught exception:");
         }
       return -1;
     }
-  ACE_ENDTRY;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
   return status;
 }
diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index d49e331f594..30e4c7ed372 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -32,28 +32,25 @@ TAO::PICurrent::~PICurrent (void)
 
 CORBA::Any *
 TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier
-                         ACE_ENV_ARG_DECL)
+                         )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (identifier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->check_validity (identifier);
 
-  return this->tsc ()->get_slot (identifier ACE_ENV_ARG_PARAMETER);
+  return this->tsc ()->get_slot (identifier);
 }
 
 void
 TAO::PICurrent::set_slot (PortableInterceptor::SlotId identifier,
                          const CORBA::Any &data
-                         ACE_ENV_ARG_DECL)
+                         )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (identifier ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_validity (identifier);
 
-  this->tsc ()->set_slot (identifier, data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->tsc ()->set_slot (identifier, data);
 }
 
 namespace
@@ -90,30 +87,29 @@ TAO::PICurrent::tsc (void)
 
 void
 TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier
-                                ACE_ENV_ARG_DECL)
+                                )
 {
   // If the slot_count is zero, no initialization has been done (if there are
   // no slots, then the PICurrent_impl object is not created as there is no
   // data to copy).
   if (0 == this->slot_count_)
-    ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
-                                     CORBA::COMPLETED_NO));
+    throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO);
 
   // No need to acquire a lock for this check.  At this point, these
   // attributes are read only.
   if (identifier >= this->slot_count_)
-    ACE_THROW (PortableInterceptor::InvalidSlot ());
+    throw PortableInterceptor::InvalidSlot ();
 }
 
 CORBA::ORB_ptr
-TAO::PICurrent::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::PICurrent::_get_orb (void)
 {
   return CORBA::ORB::_duplicate (this->orb_core_.orb ());
 }
 
 void
 TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   // Only allow a single initialization; sc is the number of
   // allocated PICurrent data slots the end user wants. If 0
@@ -125,11 +121,11 @@ TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
     // It MUST be called BEFORE we attempt to get/set any
     // PICurrent slot data.
     if (0 != orb_core_.add_tss_cleanup_func (CleanUpPICurrent, this->tss_slot_))
-      ACE_THROW (CORBA::NO_MEMORY (
+      throw ::CORBA::NO_MEMORY (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      ENOMEM),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
 
     this->slot_count_ = sc;
   }
diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 4cc3e99a218..97985e1d80d 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -72,20 +72,20 @@ namespace TAO
     /// Retrieve information stored in the slot table at the given
     /// SlotId.
     virtual CORBA::Any *get_slot (PortableInterceptor::SlotId id
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
     /// Set information in the slot table at the given SlotId.
     virtual void set_slot (PortableInterceptor::SlotId identifier,
                            const CORBA::Any & data
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
     //@}
 
     virtual CORBA::ORB_ptr _get_orb (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       );
 
     /// Number of slots allocated in the slot table.
@@ -97,10 +97,10 @@ namespace TAO
 
     /// Verify the validity of the given SlotId.
     void check_validity (const PortableInterceptor::SlotId &identifier
-                         ACE_ENV_ARG_DECL);
+                        );
 
     /// Initialize the PICurrent object.
-    void initialize (PortableInterceptor::SlotId sc ACE_ENV_ARG_DECL);
+    void initialize (PortableInterceptor::SlotId sc);
 
   protected:
     /// Destructor
diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index 7cb54b6df2c..e1b5a29c5cc 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Any *
 TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -33,7 +33,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
   {
     if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) Lazy copy of self detected at %N,%l\n")));
-    ACE_THROW (CORBA::INTERNAL ());
+    throw ::CORBA::INTERNAL ();
   }
 
   // Get the slot table that is currently active
@@ -49,7 +49,6 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (any);
     }
   else
     {
@@ -63,7 +62,6 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
                             0,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (any);
     }
 
   return any;
@@ -72,7 +70,7 @@ TAO::PICurrent_Impl::get_slot (PortableInterceptor::SlotId identifier
 void
 TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier,
                                const CORBA::Any & data
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -93,7 +91,7 @@ TAO::PICurrent_Impl::set_slot (PortableInterceptor::SlotId identifier,
   // slots for the reason stated above.
   if (identifier >= this->slot_table_.size ()
       && this->slot_table_.size (identifier + 1) != 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw ::CORBA::INTERNAL ();
 
   this->slot_table_[identifier] = CORBA::Any (data);
 }
diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index 11876b31acb..ec1c051f91e 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -59,14 +59,14 @@ namespace TAO
     /// Retrieve information stored in the slot table at the given
     /// SlotId.
     CORBA::Any *get_slot (PortableInterceptor::SlotId identifier
-                          ACE_ENV_ARG_DECL)
+                          )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
     /// Set information in the slot table at the given SlotId.
     void set_slot (PortableInterceptor::SlotId identifier,
                    const CORBA::Any & data
-                   ACE_ENV_ARG_DECL)
+                   )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp
index 639ad627d58..7f5587703c4 100644
--- a/TAO/tao/PI/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -32,7 +32,7 @@ TAO_PICurrent_Loader::create_object (
   CORBA::ORB_ptr orb,
   int,
   ACE_TCHAR *[]
-  ACE_ENV_ARG_DECL_NOT_USED)
+  )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj = CORBA::Object::_nil ();
diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h
index a1b4e48cfa9..8b6e981c62c 100644
--- a/TAO/tao/PI/PICurrent_Loader.h
+++ b/TAO/tao/PI/PICurrent_Loader.h
@@ -41,7 +41,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL)
+                                           )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp
index c138481d1ee..0bd6def0b1a 100644
--- a/TAO/tao/PI/PI_ORBInitializer.cpp
+++ b/TAO/tao/PI/PI_ORBInitializer.cpp
@@ -16,18 +16,14 @@ ACE_RCSID (tao,
            "$Id$")
 
 void
-TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (info);
 }
 
 
 void
-TAO_PI_ORBInitializer::post_init (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The PI policy factory is stateless and reentrant, so share a
@@ -42,22 +38,17 @@ TAO_PI_ORBInitializer::post_init (
                               TAO::VMCID,
                               ENOMEM),
                             CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       this->policy_factory_ = policy_factory;
     }
 
-
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_policy_factories (info);
 }
 
 
 void
 TAO_PI_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   // Register the PI policy factory.
 
@@ -72,14 +63,12 @@ TAO_PI_ORBInitializer::register_policy_factories (
 
   for (CORBA::PolicyType *i = type; i != end; ++i)
     {
-      ACE_TRY
+      try
         {
           info->register_policy_factory (*i,
-                                         this->policy_factory_.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         this->policy_factory_.in ());
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+      catch (const ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -90,15 +79,13 @@ TAO_PI_ORBInitializer::register_policy_factories (
               // ORBInitializer.
               return;
             }
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception&)
         {
           // Rethrow any other exceptions...
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h
index 92d62abfef6..f77777cafe6 100644
--- a/TAO/tao/PI/PI_ORBInitializer.h
+++ b/TAO/tao/PI/PI_ORBInitializer.h
@@ -50,11 +50,11 @@ public:
   //@{
 
   void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 ACE_ENV_ARG_DECL)
+                 )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  ACE_ENV_ARG_DECL)
+                  )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
@@ -64,7 +64,7 @@ private:
 
   /// Register PortableInterceptor policy factories.
   void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
 
   /// Instance of the PI policy factory.
diff --git a/TAO/tao/PI/PI_PolicyFactory.cpp b/TAO/tao/PI/PI_PolicyFactory.cpp
index 3f82ffff341..c314da293f4 100644
--- a/TAO/tao/PI/PI_PolicyFactory.cpp
+++ b/TAO/tao/PI/PI_PolicyFactory.cpp
@@ -15,7 +15,7 @@ CORBA::Policy_ptr
 TAO_PI_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -34,7 +34,6 @@ TAO_PI_PolicyFactory::create_policy (
                         TAO_ProcessingModePolicy (policy_value),
                         CORBA::NO_MEMORY (TAO::VMCID,
                                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return processing_mode_policy;
     }
diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h
index eb7e4968015..17bd5d9bd0a 100644
--- a/TAO/tao/PI/PI_PolicyFactory.h
+++ b/TAO/tao/PI/PI_PolicyFactory.h
@@ -38,7 +38,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory
 public:
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any & value
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp
index 9c4ed43e4af..8fcaedadd74 100644
--- a/TAO/tao/PI/PolicyFactoryC.cpp
+++ b/TAO/tao/PI/PolicyFactoryC.cpp
@@ -89,7 +89,7 @@ PortableInterceptor::PolicyFactory::~PolicyFactory (void)
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_narrow (
     ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PolicyFactory::_duplicate (
@@ -100,7 +100,7 @@ PortableInterceptor::PolicyFactory::_narrow (
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_unchecked_narrow (
     ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PolicyFactory::_duplicate (
@@ -128,7 +128,7 @@ PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj)
 ::CORBA::Boolean
 PortableInterceptor::PolicyFactory::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -168,7 +168,7 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
 // Hand-crafted.
 ::CORBA::Policy_ptr
 PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
-                                                    ACE_ENV_ARG_DECL)
+                                                    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index 9737af6be89..6b1f0a47ecd 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -108,12 +108,12 @@ namespace PortableInterceptor
 
     static PolicyFactory_ptr _narrow (
         ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PolicyFactory_ptr _unchecked_narrow (
         ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PolicyFactory_ptr _nil (void)
@@ -129,7 +129,7 @@ namespace PortableInterceptor
     virtual ::CORBA::Policy_ptr create_policy (
         ::CORBA::PolicyType type,
         const ::CORBA::Any & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -139,7 +139,7 @@ namespace PortableInterceptor
     // Hand-crafted addition.
     virtual ::CORBA::Policy_ptr _create_policy (
         CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -151,7 +151,7 @@ namespace PortableInterceptor
 
     virtual ::CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp
index f91af3df5da..a9a60845044 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -34,15 +34,15 @@ void
 TAO_PolicyFactory_Registry::register_policy_factory (
   CORBA::PolicyType type,
   PortableInterceptor::PolicyFactory_ptr policy_factory
-  ACE_ENV_ARG_DECL)
+  )
 {
   if (CORBA::is_nil (policy_factory))
     {
-      ACE_THROW (CORBA::BAD_PARAM (
+      throw ::CORBA::BAD_PARAM (
                    CORBA::SystemException::_tao_minor_code (
                      0,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   PortableInterceptor::PolicyFactory_ptr factory =
@@ -59,13 +59,13 @@ TAO_PolicyFactory_Registry::register_policy_factory (
       if (result == 1)
         {
           // PolicyFactory of given type already exists.
-          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 16,
-                                           CORBA::COMPLETED_NO));
+          throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 16,
+                                           CORBA::COMPLETED_NO);
         }
       else
         {
           // Could not add PolicyFactory due to internal bind failures.
-          ACE_THROW (CORBA::INTERNAL ());
+          throw ::CORBA::INTERNAL ();
         }
     }
 }
@@ -73,7 +73,7 @@ TAO_PolicyFactory_Registry::register_policy_factory (
 CORBA::Policy_ptr
 TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
                                            const CORBA::Any &value
-                                           ACE_ENV_ARG_DECL)
+                                           )
 {
   PortableInterceptor::PolicyFactory_ptr policy_factory =
     PortableInterceptor::PolicyFactory::_nil ();
@@ -89,12 +89,12 @@ TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
 
   return policy_factory->create_policy (type,
                                         value
-                                        ACE_ENV_ARG_PARAMETER);
+                                       );
 }
 
 CORBA::Policy_ptr
 TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type
-                                            ACE_ENV_ARG_DECL)
+                                            )
 {
   PortableInterceptor::PolicyFactory_ptr policy_factory =
     PortableInterceptor::PolicyFactory::_nil ();
@@ -110,7 +110,7 @@ TAO_PolicyFactory_Registry::_create_policy (CORBA::PolicyType type
     }
 
   return policy_factory->_create_policy (type
-                                         ACE_ENV_ARG_PARAMETER);
+                                        );
 }
 
 bool
diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h
index 882f386c70c..18ceb0a92d4 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -71,18 +71,18 @@ public:
   void register_policy_factory (
     CORBA::PolicyType type,
     PortableInterceptor::PolicyFactory_ptr policy_factory
-    ACE_ENV_ARG_DECL);
+   );
 
   /// Construct a policy of the given type with the information
   /// contained in the CORBA::Any @a value.
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any &value
-                                   ACE_ENV_ARG_DECL);
+                                  );
 
   /// Create an empty policy, usually to be filled in later by
   /// demarshaling.
   CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                    ACE_ENV_ARG_DECL);
+                                   );
 
   /// Check if a @c PolicyFactory corresponding to the given type,
   /// exists.
diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp
index 9f2feccfe82..9530a0956c2 100644
--- a/TAO/tao/PI/ProcessingModePolicy.cpp
+++ b/TAO/tao/PI/ProcessingModePolicy.cpp
@@ -21,33 +21,32 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy
 }
 
 CORBA::Policy_ptr
-TAO_ProcessingModePolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ProcessingModePolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ProcessingModePolicy *copy = 0;
   ACE_NEW_THROW_EX (copy,
                     TAO_ProcessingModePolicy (this->processing_mode_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return copy;
 }
 
 void
-TAO_ProcessingModePolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ProcessingModePolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 PortableInterceptor::ProcessingMode
-TAO_ProcessingModePolicy::processing_mode (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ProcessingModePolicy::processing_mode (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return processing_mode_;
 }
 
 CORBA::PolicyType
-TAO_ProcessingModePolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ProcessingModePolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE;
diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h
index fe2c82462bf..0b6fbebbcbb 100644
--- a/TAO/tao/PI/ProcessingModePolicy.h
+++ b/TAO/tao/PI/ProcessingModePolicy.h
@@ -47,16 +47,16 @@ public:
   TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode);
 
   virtual PortableInterceptor::ProcessingMode processing_mode
-                                        (ACE_ENV_SINGLE_ARG_DECL)
+                                        (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 65d42175dd2..e05c080d831 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -19,7 +19,7 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Dynamic::ParameterList *
-TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_parameter_list (void)
 {
   Dynamic::ParameterList *parameter_list = 0;
   ACE_NEW_THROW_EX (parameter_list,
@@ -36,7 +36,7 @@ TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_exception_list (void)
 {
   Dynamic::ExceptionList *exception_list = 0;
   ACE_NEW_THROW_EX (exception_list,
@@ -53,7 +53,7 @@ TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ContextList *
-TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_context_list (void)
 {
   Dynamic::ContextList *context_list = 0;
   ACE_NEW_THROW_EX (context_list,
@@ -70,7 +70,7 @@ TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::RequestContext *
-TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_request_context (void)
 {
   Dynamic::RequestContext *request_context = 0;
   ACE_NEW_THROW_EX (request_context,
@@ -88,7 +88,7 @@ TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any *
 TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
-                                ACE_ENV_ARG_DECL)
+                                )
 {
   CORBA::Any *any = 0;
   ACE_NEW_THROW_EX (any,
@@ -98,7 +98,6 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
                         0,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (any);
 
   if (tk_void_any)
     {
diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h
index 4d18f4d2309..240984f3b02 100644
--- a/TAO/tao/PI/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -34,7 +34,6 @@ namespace CORBA
 {
   class StringSeq;
   class Any;
-  class Environment;
 }
 
 namespace Dynamic
@@ -66,19 +65,19 @@ public:
    */
   //@{
   static Dynamic::ParameterList * make_parameter_list (
-    ACE_ENV_SINGLE_ARG_DECL);
+    void);
 
   static Dynamic::ExceptionList * make_exception_list (
-    ACE_ENV_SINGLE_ARG_DECL);
+    void);
 
   static Dynamic::ContextList * make_context_list (
-    ACE_ENV_SINGLE_ARG_DECL);
+    void);
 
   static Dynamic::RequestContext * make_request_context (
-    ACE_ENV_SINGLE_ARG_DECL);
+    void);
 
   static CORBA::Any * make_any (CORBA::Boolean tk_void_any
-                                ACE_ENV_ARG_DECL);
+                               );
   //@}
 };
 
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp
index abc2da4613c..4c8fe0aec64 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.cpp
+++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp
@@ -38,8 +38,7 @@ TAO_PI_Server_Loader::init (int,
   initialized = true;
 
   // Register the ORB initializer.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       /// Register the Messaging ORBInitializer.
       PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
@@ -52,23 +51,18 @@ TAO_PI_Server_Loader::init (int,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h
index 6b4784fb607..23ce59f29a3 100644
--- a/TAO/tao/PI_Server/Policy_Creator_T.h
+++ b/TAO/tao/PI_Server/Policy_Creator_T.h
@@ -32,16 +32,15 @@ namespace TAO
         POLICYTYPE *& policy,
         POLICYVALUE &value,
         const CORBA::Any& val
-        ACE_ENV_ARG_DECL)
+        )
     {
       if ((val >>= value) == 0)
-        ACE_THROW (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE));
+        throw CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
       ACE_NEW_THROW_EX (policy,
                         POLICYTYPE (value),
                         CORBA::NO_MEMORY (TAO::VMCID,
                                           CORBA::COMPLETED_NO));
-      ACE_CHECK;
     }
   }
 }
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 301ea9d90b5..5c5c44e4fca 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -17,27 +17,23 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_PortableServer_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_PortableServer_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 }
 
 void
 TAO_PortableServer_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
 #if !defined (CORBA_E_MICRO)
   // Register the PortableServer policy factories.
@@ -49,7 +45,6 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::PolicyFactory_var policy_factory = tmp;
 
@@ -75,14 +70,11 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
        i != end;
        ++i)
     {
-      ACE_TRY
+      try
         {
-          info->register_policy_factory (*i,
-                                         policy_factory.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          info->register_policy_factory (*i, policy_factory.in ());
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+      catch (const ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -93,15 +85,13 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
               // ORBInitializer.
               return;
             }
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception&)
         {
           // Rethrow any other exceptions...
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 #else
   ACE_UNUSED_ARG (info);
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
index 8aba0600ea2..e35324dcfb9 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -40,13 +40,10 @@ public:
    * PortableInterceptor::ORBInitializer interface.
    */
   //@{
-
-  void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 ACE_ENV_ARG_DECL)
+  void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  ACE_ENV_ARG_DECL)
+  void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
@@ -54,8 +51,7 @@ public:
 private:
 
   /// Register PortableServer policy factories.
-  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                  ACE_ENV_ARG_DECL);
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
index eaa42cf7ff5..d62e0e5f103 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -20,8 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_PortableServer_PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -33,8 +32,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::ThreadPolicy *thread_policy = 0;
       PortableServer::ThreadPolicyValue thr_value;
 
-      TAO::Portable_Server::create_policy (thread_policy, thr_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (thread_policy, thr_value, value);
 
       return thread_policy;
     }
@@ -45,8 +43,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::LifespanPolicy *lifespan_policy = 0;
       PortableServer::LifespanPolicyValue lifespan_value;
 
-      TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value);
 
       return lifespan_policy;
     }
@@ -56,8 +53,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::IdUniquenessPolicy *id_uniqueness_policy = 0;
       PortableServer::IdUniquenessPolicyValue id_uniqueness_value;
 
-      TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value);
 
       return id_uniqueness_policy;
     }
@@ -67,8 +63,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::IdAssignmentPolicy *id_assignment_policy = 0;
       PortableServer::IdAssignmentPolicyValue id_assignment_value;
 
-      TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value);
 
       return id_assignment_policy;
     }
@@ -80,8 +75,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::ImplicitActivationPolicy *implicit_activatation_policy = 0;
       PortableServer::ImplicitActivationPolicyValue implicit_activation_value;
 
-      TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value);
 
       return implicit_activatation_policy;
     }
@@ -91,8 +85,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::ServantRetentionPolicy *servant_retention_policy = 0;
       PortableServer::ServantRetentionPolicyValue servant_retention_value;
 
-      TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value);
 
       return servant_retention_policy;
     }
@@ -102,8 +95,7 @@ TAO_PortableServer_PolicyFactory::create_policy (
       TAO::Portable_Server::RequestProcessingPolicy *request_processing_policy = 0;
       PortableServer::RequestProcessingPolicyValue request_processing_value;
 
-      TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value);
 
       return request_processing_policy;
     }
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
index 1a0c06ff21a..40f95076ee6 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
@@ -32,8 +32,7 @@ class TAO_PortableServer_PolicyFactory
 {
 public:
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any & value
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   const CORBA::Any & value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 7a7714e00c7..c63c768c286 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -34,12 +34,12 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions,
   CORBA::OctetSeq_out oc
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This method implements one of the "starting" server side
   // interception point.
 
-  ACE_TRY
+  try
     {
       oc = 0;
 
@@ -61,8 +61,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
               registered.interceptor_->
                 tao_ft_interception_point (&request_info,
                                            oc
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                          );
             }
 
           if (oc != 0)
@@ -73,8 +72,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
                                        servant_upcall,
                                        exceptions,
                                        nexceptions
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                      );
 
               return;
             }
@@ -84,7 +82,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
           ++server_request.interceptor_count ();
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -94,11 +92,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
                                servant_upcall,
                                exceptions,
                                nexceptions
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
@@ -109,7 +104,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This method implements one of the "intermediate" server side
   // interception point.
@@ -124,10 +119,10 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
       // evaluates to "true," then it is likely that a starting
       // interception point was never invoked.  This is of course, an
       // internal error that must be corrected.
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
-  ACE_TRY
+  try
     {
       // Copy the request scope current (RSC) to the thread scope
       // current (TSC) upon leaving this scope, i.e. just after the
@@ -153,12 +148,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
             {
               registered.interceptor_->
                 receive_request_service_contexts (&request_info
-                                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                 );
             }
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -168,11 +162,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
                                servant_upcall,
                                exceptions,
                                nexceptions
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 #elif TAO_HAS_EXTENDED_FT_INTERCEPTORS == 0
@@ -188,12 +179,12 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This method implements one of the "starting" server side
   // interception point if extended interceptors are not in place.
 
-  ACE_TRY
+  try
     {
       // Copy the request scope current (RSC) to the thread scope
       // current (TSC) upon leaving this scope, i.e. just after the
@@ -220,8 +211,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
             {
               registered.interceptor_->
                 receive_request_service_contexts (&request_info
-                                                  ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                 );
             }
 
           // The starting interception point completed successfully.
@@ -229,7 +219,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
           ++server_request.interceptor_count ();
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -239,11 +229,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
                                servant_upcall,
                                exceptions,
                                nexceptions
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
@@ -256,7 +243,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This method implements an "intermediate" server side interception
   // point.  Interceptors are invoked in the same order they were
@@ -272,7 +259,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
       // evaluates to "true," then it is likely that a starting
       // interception point was never invoked.  This is of course, an
       // internal error that must be corrected.
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
   TAO::ServerRequestInfo request_info (server_request,
@@ -282,7 +269,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
                                        exceptions,
                                        nexceptions);
 
-  ACE_TRY
+  try
     {
       bool is_remote_request = !server_request.collocated ();
 
@@ -295,8 +282,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
             {
               registered.interceptor_->
                 receive_request (&request_info
-                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                );
             }
 
           // Note that no interceptors are pushed on to or popped off
@@ -304,7 +290,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
           // an intermediate interception point.
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -314,11 +300,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
                         servant_upcall,
                         exceptions,
                         nexceptions
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
 }
 
@@ -330,7 +313,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -366,8 +349,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
         {
           registered.interceptor_->
             send_reply (&request_info
-                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                       );
         }
     }
 
@@ -384,7 +366,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -402,7 +384,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
                                        exceptions,
                                        nexceptions);
 
-  ACE_TRY
+  try
     {
       // Unwind the flow stack.
       size_t const len = server_request.interceptor_count ();
@@ -422,12 +404,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
             {
               registered.interceptor_->
                 send_exception (&request_info
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                               );
             }
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -437,10 +418,9 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
                         servant_upcall,
                         exceptions,
                         nexceptions
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       );
     }
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception& ex)
     {
       // The send_exception() interception point in the remaining
       // interceptors must be called so call this method (not the
@@ -452,16 +432,14 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
       // drops to zero, i.e., once each interceptor has been invoked.
       // This prevents infinite recursion from occuring.
 
-      server_request.caught_exception (&ACE_ANY_EXCEPTION);
+      server_request.caught_exception (&ex);
 
       this->send_exception (server_request,
                             args,
                             nargs,
                             servant_upcall,
                             exceptions,
-                            nexceptions
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            nexceptions);
 
       PortableInterceptor::ReplyStatus status =
         server_request.reply_status ();
@@ -471,10 +449,8 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
       // LOCATION_FORWARD).
       if (status == PortableInterceptor::SYSTEM_EXCEPTION
           || status == PortableInterceptor::USER_EXCEPTION)
-        ACE_RE_THROW;
+        throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
@@ -485,7 +461,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   void * servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
-  ACE_ENV_ARG_DECL)
+  )
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -503,7 +479,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   // they were pushed onto the stack since this is an "ending" server
   // side interception point.
 
-  ACE_TRY
+  try
     {
       // Unwind the flow stack.
       size_t const len = server_request.interceptor_count ();
@@ -521,14 +497,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
 
           if (registered.details_.should_be_processed (is_remote_request))
             {
-              registered.interceptor_->
-                send_other (&request_info
-                            ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              registered.interceptor_->send_other (&request_info);
             }
         }
     }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -538,37 +511,30 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
                         servant_upcall,
                         exceptions,
                         nexceptions
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       );
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-  ACE_ENV_ARG_DECL)
+  )
 {
-  this->interceptor_list_.add_interceptor (interceptor ACE_ENV_ARG_PARAMETER);
+  this->interceptor_list_.add_interceptor (interceptor);
 }
 
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-  const CORBA::PolicyList& policies
-  ACE_ENV_ARG_DECL)
+  const CORBA::PolicyList& policies)
 {
-  this->interceptor_list_.add_interceptor (interceptor,
-                                           policies
-                                           ACE_ENV_ARG_PARAMETER);
+  this->interceptor_list_.add_interceptor (interceptor, policies);
 }
 
 void
-TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (
-  ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (void)
 {
-  this->interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->interceptor_list_.destroy_interceptors ();
 }
 
 TAO::PICurrent_Impl *
@@ -591,15 +557,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current (
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::execute_command (
   TAO_ServerRequest & server_request,
-  TAO::Upcall_Command & command
-  ACE_ENV_ARG_DECL)
+  TAO::Upcall_Command & command)
 {
   TAO::PICurrent_Guard const pi_guard (server_request,
                                        true  /* Copy TSC to RSC */);
 
   // The actual upcall.
-  command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  command.execute ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index cd2930965f1..47f296a1504 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -92,8 +92,7 @@ namespace TAO
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions,
-        CORBA::OctetSeq_out oc
-        ACE_ENV_ARG_DECL);
+        CORBA::OctetSeq_out oc);
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
     /// This method implements the "intermediate" server side
@@ -109,8 +108,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+        CORBA::ULong nexceptions);
 
     /// This method an "intermediate" server side interception point.
     void receive_request (
@@ -119,8 +117,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+        CORBA::ULong nexceptions);
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -130,8 +127,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+        CORBA::ULong nexceptions);
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -141,8 +137,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+        CORBA::ULong nexceptions);
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -152,31 +147,27 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL);
+        CORBA::ULong nexceptions);
     //@}
 
     /// Register an interceptor.
     virtual void add_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL);
+     );
 
     virtual void add_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL);
+      const CORBA::PolicyList& policies);
 
-    virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
+    virtual void destroy_interceptors (void);
 
     virtual TAO::PICurrent_Impl *allocate_pi_current (void);
 
-    virtual void deallocate_pi_current (
-        TAO::PICurrent_Impl *picurrent);
+    virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent);
 
     virtual void execute_command (
         TAO_ServerRequest &server_request,
-        TAO::Upcall_Command &command
-        ACE_ENV_ARG_DECL);
+        TAO::Upcall_Command &command);
 
   private:
 
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp
index c06a9429d1d..b416d2faef1 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.cpp
+++ b/TAO/tao/PI_Server/ServerRequestDetails.cpp
@@ -15,14 +15,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   void
-  ServerRequestDetails::apply_policies (
-      const CORBA::PolicyList &policies
-      ACE_ENV_ARG_DECL)
+  ServerRequestDetails::apply_policies (const CORBA::PolicyList &policies)
   {
     // Flag to check for duplicate ProcessingModePolicy objects in the list.
     bool processing_mode_applied = false;
 
-    const CORBA::ULong plen = policies.length ();
+    CORBA::ULong const plen = policies.length ();
 
     for (CORBA::ULong i = 0; i < plen; ++i)
       {
@@ -35,9 +33,8 @@ namespace TAO
           }
 
         // Obtain the PolicyType from the current Policy object.
-        const CORBA::PolicyType policy_type =
-          policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        CORBA::PolicyType const policy_type =
+          policy->policy_type ();
 
         if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE)
           {
@@ -45,7 +42,7 @@ namespace TAO
               {
                 // This is the second time we have run into this policy type,
                 // and that is not allowed.
-                ACE_THROW (CORBA::INV_POLICY ());
+                throw ::CORBA::INV_POLICY ();
               }
 
             // Flip the flag to true in order to trap any dupes.
@@ -54,19 +51,15 @@ namespace TAO
             // Narrow the Policy to the ProcessingModePolicy interface.
             PortableInterceptor::ProcessingModePolicy_var pm_policy =
                     PortableInterceptor::ProcessingModePolicy::_narrow (
-                                                 policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+                                                 policy.in ());
 
             // Save the value of the ProcessingModePolicy in our data member.
-            this->processing_mode_ =
-              pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+            this->processing_mode_ = pm_policy->processing_mode ();
           }
         else
           {
             // We don't support the current policy type.
-            ACE_THROW (CORBA::INV_POLICY ());
+            throw ::CORBA::INV_POLICY ();
           }
       }
   }
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h
index fc34a6a66f5..0ec3b31de8a 100644
--- a/TAO/tao/PI_Server/ServerRequestDetails.h
+++ b/TAO/tao/PI_Server/ServerRequestDetails.h
@@ -53,8 +53,7 @@ namespace TAO
   public:
     ServerRequestDetails (void);
 
-    void apply_policies (const CORBA::PolicyList& policies
-                         ACE_ENV_ARG_DECL);
+    void apply_policies (const CORBA::PolicyList& policies);
 
     /// Returns true if the ProcessingMode setting permits the "firing"
     /// of the associated server request interceptor based upon the
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index 65695dc5317..9ac1c7a4301 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -32,7 +32,7 @@ ACE_RCSID (PI_Server,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::ULong
-TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::ServerRequestInfo::request_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The request ID returned by this method need not correspond to the
@@ -71,14 +71,14 @@ TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-TAO::ServerRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::ServerRequestInfo::operation (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->server_request_.operation ());
 }
 
 Dynamic::ParameterList *
-TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::arguments (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->args_ == 0)
@@ -90,8 +90,7 @@ TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
 
   // Generate the argument list on demand.
   Dynamic::ParameterList * const parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RequestInfo_Util::make_parameter_list ();
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
@@ -120,7 +119,7 @@ TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::exceptions (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->args_ == 0)
@@ -132,8 +131,7 @@ TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
 
   // Generate the exception list on demand.
   Dynamic::ExceptionList * const exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RequestInfo_Util::make_exception_list ();
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
 
@@ -154,7 +152,7 @@ TAO::ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ContextList *
-TAO::ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::contexts (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
@@ -163,7 +161,7 @@ TAO::ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::RequestContext *
-TAO::ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::operation_context (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
@@ -172,7 +170,7 @@ TAO::ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any *
-TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::result (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->args_ == 0)
@@ -184,12 +182,10 @@ TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
 
   // Generate the result on demand.
 
-  static CORBA::Boolean const tk_void_any = 1;
+  static CORBA::Boolean const tk_void_any = true;
 
   CORBA::Any * result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RequestInfo_Util::make_any (tk_void_any);
 
   CORBA::Any_var safe_result_any = result_any;
 
@@ -202,14 +198,14 @@ TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO::ServerRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::ServerRequestInfo::response_expected (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->server_request_.response_expected ();
 }
 
 Messaging::SyncScope
-TAO::ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::sync_scope (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.sync_with_server ())
@@ -221,7 +217,7 @@ TAO::ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::ReplyStatus
-TAO::ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::reply_status (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.reply_status () == -1)
@@ -234,7 +230,7 @@ TAO::ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO::ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::forward_reference (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.reply_status () != PortableInterceptor::LOCATION_FORWARD)
@@ -248,8 +244,7 @@ TAO::ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any *
-TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                  ACE_ENV_ARG_DECL)
+TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -264,49 +259,40 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
   if (pi_current == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  pi_current->check_validity (id);
 
   // Retrieve the request scope PICurrent object.
   TAO::PICurrent_Impl *rsc = this->server_request_.rs_pi_current ();
 
-  return rsc->get_slot (id ACE_ENV_ARG_PARAMETER);
+  return rsc->get_slot (id);
 
 }
 
 IOP::ServiceContext *
-TAO::ServerRequestInfo::get_request_service_context (
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+TAO::ServerRequestInfo::get_request_service_context (IOP::ServiceId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context &service_context_list =
     this->server_request_.request_service_context ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                      ACE_ENV_ARG_PARAMETER);
+  return this->get_service_context_i (service_context_list, id);
 }
 
 IOP::ServiceContext *
-TAO::ServerRequestInfo::get_reply_service_context (
-    IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+TAO::ServerRequestInfo::get_reply_service_context (IOP::ServiceId id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context & service_context_list =
     this->server_request_.reply_service_context ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id
-                                      ACE_ENV_ARG_PARAMETER);
+  return this->get_service_context_i (service_context_list, id);
 }
 
 IOP::ServiceContext *
 TAO::ServerRequestInfo::get_service_context_i (
     TAO_Service_Context & service_context_list,
     IOP::ServiceId id
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::ServiceContext_var service_context;
@@ -329,7 +315,7 @@ TAO::ServerRequestInfo::get_service_context_i (
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::sending_exception (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.reply_status () != PortableInterceptor::SYSTEM_EXCEPTION
@@ -353,7 +339,6 @@ TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CORBA::Any_var caught_exception_var = temp;
 
@@ -364,21 +349,20 @@ TAO::ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO::ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::server_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
     return
       CORBA::string_dup (this->server_request_.orb_core ()->server_id ());
 
-
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
                     0);
 }
 
 char *
-TAO::ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::orb_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
@@ -391,7 +375,7 @@ TAO::ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::AdapterName *
-TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::adapter_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The adapter_name attribute defines a name for the object adapter
@@ -401,8 +385,7 @@ TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
   // in this sequence.
   if (this->servant_upcall_ != 0)
     return
-      this->servant_upcall_->poa ().adapter_name (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->servant_upcall_->poa ().adapter_name ();
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -410,7 +393,7 @@ TAO::ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::ObjectId *
-TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::object_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
@@ -427,7 +410,6 @@ TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
 
       PortableInterceptor::ObjectId_var obj_id = tmp;
 
@@ -439,7 +421,7 @@ TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
       //    case, this is still faster than the
       //    PortableServer::Current::object_id() method since no TSS
       //    access is involved.
-      const CORBA::ULong len = id.length ();
+      CORBA::ULong const len = id.length ();
       obj_id->length (len);
       CORBA::Octet *buffer = obj_id->get_buffer ();
       ACE_OS::memcpy (buffer, id.get_buffer (), len);
@@ -453,11 +435,11 @@ TAO::ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::OctetSeq *
-TAO::ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ServerRequestInfo::adapter_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
-    return this->servant_upcall_->poa ().id (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->servant_upcall_->poa ().id ();
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -466,7 +448,7 @@ TAO::ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO::ServerRequestInfo::target_most_derived_interface (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::Servant const servant =
@@ -486,14 +468,13 @@ TAO::ServerRequestInfo::target_most_derived_interface (
 
 CORBA::Policy_ptr
 TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type
-                                           ACE_ENV_ARG_DECL)
+                                           )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
     {
       CORBA::Policy_var policy =
-        this->servant_upcall_->poa ().get_policy (type ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+        this->servant_upcall_->poa ().get_policy (type);
 
       if (!CORBA::is_nil (policy.in ()))
         {
@@ -519,7 +500,7 @@ TAO::ServerRequestInfo::get_server_policy (CORBA::PolicyType type
 void
 TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
                                   const CORBA::Any &data
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -532,21 +513,19 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
     dynamic_cast <TAO::PICurrent*> (pi_current_obj);
 
   if (pi_current == 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw ::CORBA::INTERNAL ();
 
-  pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  pi_current->check_validity (id);
 
   // Retrieve the "request scope current" (RSC).
   TAO::PICurrent_Impl * rsc = this->server_request_.rs_pi_current ();
 
-  rsc->set_slot (id, data ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  rsc->set_slot (id, data);
 }
 
 CORBA::Boolean
 TAO::ServerRequestInfo::target_is_a (const char * id
-                                     ACE_ENV_ARG_DECL)
+                                     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Implemented in the generated skeleton.
@@ -565,14 +544,14 @@ TAO::ServerRequestInfo::target_is_a (const char * id
     }
 
   return servant->_is_a (id
-                         ACE_ENV_ARG_PARAMETER);
+                        );
 }
 
 void
 TAO::ServerRequestInfo::add_reply_service_context (
     const IOP::ServiceContext & service_context,
     CORBA::Boolean replace
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
@@ -581,8 +560,7 @@ TAO::ServerRequestInfo::add_reply_service_context (
 
   if (service_context_list.set_context (service_context, replace) == 0)
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15,
-                                       CORBA::COMPLETED_NO));
+      throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 15, CORBA::COMPLETED_NO);
     }
 }
 
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index 1ba2e9c0026..c19c6893f6f 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -83,49 +83,49 @@ namespace TAO
 
     /// Return an ID unique to the current request.  This request ID may
     /// or may not be the same as the GIOP request ID.
-    virtual CORBA::ULong request_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::ULong request_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the operation name for the current request.
-    virtual char * operation (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * operation (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the list of arguments passed to the current operation.
     virtual Dynamic::ParameterList * arguments (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the list of exceptions the current operation is capable
     /// of throwing.
     virtual Dynamic::ExceptionList * exceptions (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual Dynamic::ContextList * contexts (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual Dynamic::RequestContext * operation_context (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the result of the current request.  If there is no
     /// return value then an @c Any with @c tk_void @c TypeCode is
     /// returned.  This method is not valid for oneway operations.
     virtual CORBA::Any * result (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Returns @c true for a two-way operation, and @c false otherwise.
     virtual CORBA::Boolean response_expected (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the @c sync_scope policy value for the current one-way
     /// operation.  If the operation is not a one-way, a
     /// @c CORBA::BAD_INV_ORDER exception is thrown.
     virtual Messaging::SyncScope sync_scope (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the reply status for the current request.
@@ -135,20 +135,20 @@ namespace TAO
      * @c TRANSPORT_RETRY, @c UNKNOWN..
      */
     virtual PortableInterceptor::ReplyStatus reply_status (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// If the reply status is
     /// @c PortableInterceptor::LOCATION_FORWARD return the
     /// object reference to which the request was forwarded.
     virtual CORBA::Object_ptr forward_reference (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
     /// Retrieve data from the "request scope" @c PICurrent object.
     virtual CORBA::Any * get_slot (
                                    PortableInterceptor::SlotId id
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
@@ -156,14 +156,14 @@ namespace TAO
     /// @c IOP::ServiceId from the request service context list.
     virtual IOP::ServiceContext * get_request_service_context (
         IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the @c IOP::ServiceContext with the given
     /// @c IOP::ServiceId from the reply service context list.
     virtual IOP::ServiceContext * get_reply_service_context (
         IOP::ServiceId id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return an @c Any containing the exception being sent, if any.
@@ -173,59 +173,59 @@ namespace TAO
      *       @c Any.
      */
     virtual CORBA::Any * sending_exception (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the @c ObjectId for the target object.
     virtual PortableInterceptor::ObjectId * object_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the @c AdapterId for the POA handling the current
     /// request.
     virtual CORBA::OctetSeq * adapter_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the server_id of the server. The value is passed to
     /// the ORB via @c -ORBServerId parameter.
-    virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * server_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the ORBId value that is passed to the @c ORB_init
     /// call.
-    virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * orb_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the name of the object adapter that services requests
     /// for the invoked object.
     virtual PortableInterceptor::AdapterName * adapter_name (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the most derived interface of the target object.
     virtual char * target_most_derived_interface (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Return the policy of the given type in effect for the current
     /// request.
     virtual CORBA::Policy_ptr get_server_policy (
         CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Insert data into the "request scope" @c PICurrent object.
     virtual void set_slot (PortableInterceptor::SlotId id,
                            const CORBA::Any & data
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                           )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::InvalidSlot));
 
     /// Returns true if the target's type corresponds to the given
     /// @c RepositoryId.
     virtual CORBA::Boolean target_is_a (const char * id
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Add the @c IOP::ServiceContext to the reply (outgoing)
@@ -233,7 +233,7 @@ namespace TAO
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   public:
@@ -270,7 +270,7 @@ namespace TAO
     IOP::ServiceContext * get_service_context_i (
         TAO_Service_Context & service_context_list,
         IOP::ServiceId id
-        ACE_ENV_ARG_DECL)
+        )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   protected:
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
index 6b2190b9629..49e43634e81 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
@@ -90,7 +90,7 @@ PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_narrow (
     ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ServerRequestInterceptor::_duplicate (
@@ -101,7 +101,7 @@ PortableInterceptor::ServerRequestInterceptor::_narrow (
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ServerRequestInterceptor::_duplicate (
@@ -129,7 +129,7 @@ PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterc
 ::CORBA::Boolean
 PortableInterceptor::ServerRequestInterceptor::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
index ec784b9d706..0414e800f56 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h
@@ -130,12 +130,12 @@ namespace PortableInterceptor
 
     static ServerRequestInterceptor_ptr _narrow (
         ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ServerRequestInterceptor_ptr _unchecked_narrow (
         ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ServerRequestInterceptor_ptr _nil (void)
@@ -153,7 +153,7 @@ namespace PortableInterceptor
     virtual void tao_ft_interception_point (
         ::PortableInterceptor::ServerRequestInfo_ptr ri,
         ::CORBA::OctetSeq_out os
-        ACE_ENV_ARG_DECL_NOT_USED
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -167,7 +167,7 @@ namespace PortableInterceptor
 
     virtual void receive_request_service_contexts (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -179,7 +179,7 @@ namespace PortableInterceptor
 
     virtual void receive_request (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -191,7 +191,7 @@ namespace PortableInterceptor
 
     virtual void send_reply (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -202,7 +202,7 @@ namespace PortableInterceptor
 
     virtual void send_exception (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -214,7 +214,7 @@ namespace PortableInterceptor
 
     virtual void send_other (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException,
@@ -226,7 +226,7 @@ namespace PortableInterceptor
 
     virtual ::CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
diff --git a/TAO/tao/Parser_Registry.cpp b/TAO/tao/Parser_Registry.cpp
index 8a31b17ac2e..53531b2d534 100644
--- a/TAO/tao/Parser_Registry.cpp
+++ b/TAO/tao/Parser_Registry.cpp
@@ -33,8 +33,7 @@ TAO_Parser_Registry::open (TAO_ORB_Core *orb_core)
   char **names;
   int number_of_names = 0;
 
-  orb_core->resource_factory ()->get_parser_names (names,
-                                                   number_of_names);
+  orb_core->resource_factory ()->get_parser_names (names, number_of_names);
 
   if (number_of_names == 0)
     {
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index d4f8a91a049..3102016a818 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -115,8 +115,7 @@ public:
   virtual int format_message (TAO_OutputCDR &cdr) = 0;
 
   /// Do any initialisations that may be needed.
-  virtual void init (CORBA::Octet major,
-                     CORBA::Octet minor) = 0;
+  virtual void init (CORBA::Octet major, CORBA::Octet minor) = 0;
 
   /// Parse the details of the next message from the @a incoming
   /// and initializes attributes of @a qd. Returns 0 if the message
@@ -152,12 +151,11 @@ public:
       TAO_Pluggable_Reply_Params &reply_info,
       TAO_Queued_Data *qd) = 0;
 
-
   /// Generate a reply message with the exception @a ex.
   virtual int generate_exception_reply (
       TAO_OutputCDR &cdr,
       TAO_Pluggable_Reply_Params_Base &params,
-      CORBA::Exception &ex) = 0;
+      const CORBA::Exception &ex) = 0;
 
   /// Is the messaging object ready for processing BiDirectional
   /// request/response?
diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl
index 7a10993036e..628d0f9c242 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.inl
+++ b/TAO/tao/Pluggable_Messaging_Utils.inl
@@ -18,8 +18,7 @@ TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void)
 
 ACE_INLINE void
 TAO_Pluggable_Reply_Params_Base::service_context_notowned (
-    IOP::ServiceContextList *svc
-  )
+    IOP::ServiceContextList *svc)
 {
   this->service_context_ = svc;
 }
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index e51f5208e3d..84528418d76 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -167,7 +167,7 @@ void CORBA::PolicyError::_raise (void) const
 
 void CORBA::PolicyError::_tao_encode (
     TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
+
   ) const
 {
   if (cdr << *this)
@@ -175,12 +175,12 @@ void CORBA::PolicyError::_tao_encode (
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 void CORBA::PolicyError::_tao_decode (
     TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
+
   )
 {
   if (cdr >> *this)
@@ -188,7 +188,7 @@ void CORBA::PolicyError::_tao_decode (
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 
@@ -303,7 +303,7 @@ void CORBA::InvalidPolicies::_raise (void) const
 
 void CORBA::InvalidPolicies::_tao_encode (
     TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
+
   ) const
 {
   if (cdr << *this)
@@ -311,12 +311,12 @@ void CORBA::InvalidPolicies::_tao_encode (
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 void CORBA::InvalidPolicies::_tao_decode (
     TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
+
   )
 {
   if (cdr >> *this)
@@ -324,7 +324,7 @@ void CORBA::InvalidPolicies::_tao_decode (
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 
@@ -408,7 +408,7 @@ TAO::Collocation_Proxy_Broker *
 // be\be_visitor_operation/operation_cs.cpp:78
 
 CORBA::PolicyType CORBA::Policy::policy_type (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -440,8 +440,7 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       this->the_TAO_Policy_Proxy_Broker_
     );
 
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
+  _tao_call.invoke (0, 0);
 
   return _tao_retval.retn ();
 }
@@ -450,7 +449,7 @@ CORBA::PolicyType CORBA::Policy::policy_type (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::Policy_ptr CORBA::Policy::copy (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -482,8 +481,7 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       this->the_TAO_Policy_Proxy_Broker_
     );
 
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (_tao_retval.excp ());
+  _tao_call.invoke (0, 0);
 
   return _tao_retval.retn ();
 }
@@ -492,7 +490,7 @@ CORBA::PolicyType CORBA::Policy::policy_type (
 // be\be_visitor_operation/operation_cs.cpp:78
 
 void CORBA::Policy::destroy (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -524,8 +522,7 @@ void CORBA::Policy::destroy (
       this->the_TAO_Policy_Proxy_Broker_
     );
 
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  _tao_call.invoke (0, 0);
 }
 
 CORBA::Policy::Policy (void)
@@ -558,7 +555,7 @@ CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
 CORBA::Policy_ptr
 CORBA::Policy::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
+
   )
 {
   return
@@ -566,14 +563,14 @@ CORBA::Policy::_narrow (
         _tao_objref,
         "IDL:omg.org/CORBA/Policy:1.0",
         CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
+
       );
 }
 
 CORBA::Policy_ptr
 CORBA::Policy::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
+
   )
 {
   return
@@ -581,7 +578,7 @@ CORBA::Policy::_unchecked_narrow (
         _tao_objref,
         "IDL:omg.org/CORBA/Policy:1.0",
         CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
+
       );
 }
 
@@ -605,7 +602,7 @@ CORBA::Policy::_tao_release (Policy_ptr obj)
 CORBA::Boolean
 CORBA::Policy::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL
+
   )
 {
   if (
@@ -625,7 +622,7 @@ CORBA::Policy::_is_a (
     {
       return this->::CORBA::Object::_is_a (
           value
-          ACE_ENV_ARG_PARAMETER
+
         );
     }
 }
@@ -694,7 +691,7 @@ CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
 CORBA::PolicyManager_ptr
 CORBA::PolicyManager::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PolicyManager::_duplicate (
@@ -705,7 +702,7 @@ CORBA::PolicyManager::_narrow (
 CORBA::PolicyManager_ptr
 CORBA::PolicyManager::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PolicyManager::_duplicate (
@@ -733,7 +730,7 @@ CORBA::PolicyManager::_tao_release (PolicyManager_ptr obj)
 CORBA::Boolean
 CORBA::PolicyManager::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -823,7 +820,7 @@ CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
 CORBA::PolicyCurrent_ptr
 CORBA::PolicyCurrent::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PolicyCurrent::_duplicate (
@@ -834,7 +831,7 @@ CORBA::PolicyCurrent::_narrow (
 CORBA::PolicyCurrent_ptr
 CORBA::PolicyCurrent::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PolicyCurrent::_duplicate (
@@ -862,7 +859,7 @@ CORBA::PolicyCurrent::_tao_release (PolicyCurrent_ptr obj)
 CORBA::Boolean
 CORBA::PolicyCurrent::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 633fb0db338..829c4027622 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -143,12 +143,12 @@ namespace CORBA
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
+
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        ACE_ENV_ARG_DECL
+
       );
 
     // TAO_IDL - Generated from
@@ -196,12 +196,12 @@ namespace CORBA
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
+
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        ACE_ENV_ARG_DECL
+
       );
 
     // TAO_IDL - Generated from
@@ -264,12 +264,12 @@ namespace CORBA
 
     static Policy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static Policy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static Policy_ptr _nil (void)
@@ -283,7 +283,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::PolicyType policy_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -293,7 +293,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -303,7 +303,7 @@ namespace CORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -314,7 +314,7 @@ namespace CORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -407,12 +407,12 @@ namespace CORBA
 
     static PolicyManager_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PolicyManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PolicyManager_ptr _nil (void)
@@ -427,7 +427,7 @@ namespace CORBA
 
     virtual ::CORBA::PolicyList * get_policy_overrides (
         const ::CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -439,7 +439,7 @@ namespace CORBA
     virtual void set_policy_overrides (
         const ::CORBA::PolicyList & policies,
         ::CORBA::SetOverrideType set_add
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -451,7 +451,7 @@ namespace CORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -516,12 +516,12 @@ namespace CORBA
 
     static PolicyCurrent_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PolicyCurrent_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PolicyCurrent_ptr _nil (void)
@@ -536,7 +536,7 @@ namespace CORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h
index 16746514518..af658e2db7a 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.h
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.h
@@ -37,8 +37,6 @@ namespace CORBA
   typedef Policy *Policy_ptr;
 
   class Any;
-
-  class Environment;
 }
 
 namespace PortableInterceptor
@@ -67,19 +65,16 @@ namespace TAO
     /// initialization.
     virtual void register_policy_factory (
       CORBA::PolicyType type,
-      PortableInterceptor::PolicyFactory_ptr policy_factory
-      ACE_ENV_ARG_DECL) = 0;
+      PortableInterceptor::PolicyFactory_ptr policy_factory) = 0;
 
     /// Construct a policy of the given type with the information
     /// contained in the CORBA::Any @a value.
     virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                             const CORBA::Any &value
-                                             ACE_ENV_ARG_DECL) = 0;
+                                             const CORBA::Any &value) = 0;
 
     /// Create an empty policy, usually to be filled in later by
     /// demarshaling.
-    virtual CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                              ACE_ENV_ARG_DECL) = 0;
+    virtual CORBA::Policy_ptr _create_policy (CORBA::PolicyType type) = 0;
 
     /// Check if a @c PolicyFactory corresponding to the given type,
     /// exists.
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index 14cb7c89456..f538b416258 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -37,45 +37,45 @@ TAO_Policy_Current::implementation (void) const
 CORBA::Policy_ptr
 TAO_Policy_Current::get_policy (
       CORBA::PolicyType policy
-      ACE_ENV_ARG_DECL)
+      )
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_policy (policy ACE_ENV_ARG_PARAMETER);
+  return impl.get_policy (policy);
 }
 
 CORBA::PolicyList *
 TAO_Policy_Current::get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL)
+        )
   ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
+  return impl.get_policy_overrides (ts);
 }
 
 void
 TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies,
                                           CORBA::SetOverrideType set_add
-                                          ACE_ENV_ARG_DECL)
+                                          )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::InvalidPolicies))
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  impl.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
+  impl.set_policy_overrides (policies, set_add);
 }
 
 CORBA::Policy_ptr
 TAO_Policy_Current::get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL)
+                                       )
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
   return impl.get_cached_policy (type
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h
index 889c1971d24..62bbd4e456b 100644
--- a/TAO/tao/Policy_Current.h
+++ b/TAO/tao/Policy_Current.h
@@ -50,24 +50,24 @@ public:
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (
       CORBA::PolicyType policy
-      ACE_ENV_ARG_DECL);
+     );
 
   /// Obtain a single cached policy.
   CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
+                                      );
 
   // = The CORBA::PolicyManager operations
 
   virtual CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_policy_overrides (
         const CORBA::PolicyList & policies,
         CORBA::SetOverrideType set_add
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::InvalidPolicies));
diff --git a/TAO/tao/Policy_Current_Impl.cpp b/TAO/tao/Policy_Current_Impl.cpp
index 9600341a74f..44c07ee2549 100644
--- a/TAO/tao/Policy_Current_Impl.cpp
+++ b/TAO/tao/Policy_Current_Impl.cpp
@@ -8,7 +8,6 @@
 # include "tao/Policy_Current_Impl.inl"
 #endif /* ! __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            Policy_Manager,
            "$Id$")
@@ -18,23 +17,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_Policy_Current_Impl::set_policy_overrides (
     const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::SetOverrideType set_add)
 {
-  this->manager_impl_.set_policy_overrides (policies,
-                                            set_add
-                                            ACE_ENV_ARG_PARAMETER);
+  this->manager_impl_.set_policy_overrides (policies, set_add);
 }
 
 CORBA::PolicyList *
-TAO_Policy_Current_Impl::get_policy_overrides (
-    const CORBA::PolicyTypeSeq & ts
-    ACE_ENV_ARG_DECL
-  )
+TAO_Policy_Current_Impl::get_policy_overrides (const CORBA::PolicyTypeSeq & ts)
 {
-  return this->manager_impl_.get_policy_overrides (ts
-                                                   ACE_ENV_ARG_PARAMETER);
+  return this->manager_impl_.get_policy_overrides (ts);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h
index f5a2c15fca1..7f0606e9199 100644
--- a/TAO/tao/Policy_Current_Impl.h
+++ b/TAO/tao/Policy_Current_Impl.h
@@ -33,11 +33,6 @@
 #include "tao/LocalObject.h"
 #include "tao/Policy_Set.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Policy_Current_Impl
@@ -47,22 +42,17 @@ public:
   TAO_Policy_Current_Impl (void);
 
   /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
 
   /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   // = The CORBA::PolicyManager operations
 
-  CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
+  CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & ts);
   void set_policy_overrides (const CORBA::PolicyList & policies,
                              CORBA::SetOverrideType set_add
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                             );
 
 private:
   /// The implementation.
@@ -71,10 +61,6 @@ private:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #if defined (__ACE_INLINE__)
 # include "tao/Policy_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl
index c7cc06d9743..753f38fb1e5 100644
--- a/TAO/tao/Policy_Current_Impl.inl
+++ b/TAO/tao/Policy_Current_Impl.inl
@@ -11,19 +11,15 @@ TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current_Impl::get_policy (
-      CORBA::PolicyType policy
-      ACE_ENV_ARG_DECL)
+TAO_Policy_Current_Impl::get_policy (CORBA::PolicyType policy)
 {
-  return this->manager_impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
+  return this->manager_impl_.get_policy (policy);
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type
-                                            ACE_ENV_ARG_DECL)
+TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type)
 {
-  return this->manager_impl_.get_cached_policy (type
-                                                ACE_ENV_ARG_PARAMETER);
+  return this->manager_impl_.get_cached_policy (type);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index a46a6a948a6..2bc80902620 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -16,23 +16,21 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::PolicyList *
-TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
-                                          ACE_ENV_ARG_DECL)
+TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts)
      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
+  return this->impl_.get_policy_overrides (ts);
 }
 
 void
 TAO_Policy_Manager::set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add
-                                          ACE_ENV_ARG_DECL)
+                                          CORBA::SetOverrideType set_add)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::InvalidPolicies))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-  this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
+  this->impl_.set_policy_overrides (policies, set_add);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 38b5b11d152..44b56684184 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -47,24 +47,19 @@ public:
   TAO_Policy_Manager (void);
 
   /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
 
   /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   // = The CORBA::PolicyManager operations
 
   virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
+        const CORBA::PolicyTypeSeq & ts)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_policy_overrides (const CORBA::PolicyList & policies,
-                                     CORBA::SetOverrideType set_add
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     CORBA::SetOverrideType set_add)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::InvalidPolicies));
 
diff --git a/TAO/tao/Policy_Manager.inl b/TAO/tao/Policy_Manager.inl
index b982fad4f14..04149822c24 100644
--- a/TAO/tao/Policy_Manager.inl
+++ b/TAO/tao/Policy_Manager.inl
@@ -11,17 +11,14 @@ TAO_Policy_Manager::TAO_Policy_Manager (void)
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Manager::get_policy (
-  CORBA::PolicyType policy
-  ACE_ENV_ARG_DECL)
+TAO_Policy_Manager::get_policy (CORBA::PolicyType policy)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
+  return this->impl_.get_policy (policy);
 }
 
 ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL)
+TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type)
 {
 
   // @@ Previous code used a "double-checked locking hack" to check
@@ -31,8 +28,7 @@ TAO_Policy_Manager::get_cached_policy (TAO_Cached_Policy_Type type
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
 
-  return this->impl_.get_cached_policy (type
-                                        ACE_ENV_ARG_PARAMETER);
+  return this->impl_.get_cached_policy (type);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index 5b0eda9ad12..93f1a6beca9 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/Policy_Set.h"
-#include "tao/Environment.h"
 #include "tao/SystemException.h"
 #include "tao/debug.h"
 
@@ -26,17 +25,14 @@ TAO_Policy_Set::TAO_Policy_Set (TAO_Policy_Scope scope)
 
 TAO_Policy_Set::~TAO_Policy_Set (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->cleanup_i ();
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // Ignore exceptions...
     }
-  ACE_ENDTRY;
 }
 
 TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
@@ -51,7 +47,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
   // Copy over the policy list.
   this->policy_list_.length (rhs.policy_list_.length ());
 
-  ACE_TRY_NEW_ENV
+  try
     {
       for (CORBA::ULong i = 0; i < rhs.policy_list_.length (); ++i)
         {
@@ -63,8 +59,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
             }
 
           CORBA::Policy_var copy =
-            policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+            policy->copy ();
 
           // Add the "cacheable" policies into the cache.
           if (copy->_tao_cached_type () != TAO_CACHED_POLICY_UNCACHED)
@@ -76,31 +71,27 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
           this->policy_list_[i] = copy._retn ();
         }
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 4)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "TAO_Policy_Set::TAO_Policy_Set");
+        ex._tao_print_exception ("TAO_Policy_Set::TAO_Policy_Set");
 
       // "Try" to make this recoverable as we must have run out of memory.
       this->policy_list_.length (0);
     }
-  ACE_ENDTRY;
 }
 
 void
 TAO_Policy_Set::copy_from (TAO_Policy_Set *source
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   if (source == 0)
     {
       return;
     }
 
-  this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->cleanup_i ();
 
   for (CORBA::ULong i = 0; i < source->policy_list_.length (); ++i)
     {
@@ -113,12 +104,11 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source
 
       if (! this->compatible_scope (policy->_tao_scope()))
         {
-          ACE_THROW (CORBA::NO_PERMISSION ());
+          throw ::CORBA::NO_PERMISSION ();
         }
 
       CORBA::Policy_var copy =
-        policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        policy->copy ();
 
       CORBA::ULong const length = this->policy_list_.length ();
       this->policy_list_.length (length + 1);
@@ -134,14 +124,13 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source
 }
 
 void
-TAO_Policy_Set::cleanup_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Policy_Set::cleanup_i (void)
 {
   const CORBA::ULong len = this->policy_list_.length ();
   // Cleanup the policy list.
   for (CORBA::ULong i = 0; i < len; ++i)
     {
-      this->policy_list_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->policy_list_[i]->destroy ();
       this->policy_list_[i] = CORBA::Policy::_nil ();
     }
 
@@ -158,18 +147,17 @@ TAO_Policy_Set::cleanup_i (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
                                       CORBA::SetOverrideType set_add
-                                      ACE_ENV_ARG_DECL)
+                                      )
 {
   // @@ The spec does not say what to do on this case.
   if (set_add != CORBA::SET_OVERRIDE && set_add != CORBA::ADD_OVERRIDE)
     {
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw ::CORBA::BAD_PARAM ();
     }
 
   if (set_add == CORBA::SET_OVERRIDE)
     {
-      this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->cleanup_i ();
     }
 
   // Flag, indicating whether we have already overridden
@@ -188,8 +176,7 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
         }
 
       const CORBA::PolicyType policy_type =
-        policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        policy->policy_type ();
 
       if (policy_type == TAO_RT_SERVER_PROTOCOL_POLICY_TYPE)
         {
@@ -201,32 +188,29 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
           // responsibility of the user to return it to consistent state.
           if (server_protocol_set)
             {
-              ACE_THROW (CORBA::INV_POLICY ());
+              throw ::CORBA::INV_POLICY ();
             }
 
           server_protocol_set = true;
         }
 
-      this->set_policy (policy ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->set_policy (policy);
     }
 }
 
 void
 TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   if (! this->compatible_scope (policy->_tao_scope()))
     {
-      ACE_THROW (CORBA::NO_PERMISSION ());
+      throw ::CORBA::NO_PERMISSION ();
     }
 
   const CORBA::PolicyType policy_type =
-    policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    policy->policy_type ();
 
-  CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Policy_var copy = policy->copy ();
 
   CORBA::ULong j = 0;
   const CORBA::ULong length = this->policy_list_.length ();
@@ -234,13 +218,11 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
   while (j != length)
     {
       CORBA::ULong current =
-        this->policy_list_[j]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->policy_list_[j]->policy_type ();
 
       if (current == policy_type)
         {
-          this->policy_list_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->policy_list_[j]->destroy ();
 
           this->policy_list_[j] = copy.ptr ();
           break;
@@ -270,7 +252,7 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
 
 CORBA::PolicyList *
 TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
-                                      ACE_ENV_ARG_DECL)
+                                      )
 {
   CORBA::ULong const slots = types.length ();
   CORBA::PolicyList *policy_list_ptr = 0;
@@ -281,7 +263,6 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
       ACE_NEW_THROW_EX (policy_list_ptr,
                         CORBA::PolicyList (this->policy_list_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
 
       return policy_list_ptr;
     }
@@ -289,7 +270,6 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
   ACE_NEW_THROW_EX (policy_list_ptr,
                     CORBA::PolicyList (slots),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   CORBA::PolicyList_var policy_list (policy_list_ptr);
   policy_list->length (slots);
@@ -303,8 +283,7 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
       for (CORBA::ULong i = 0; i < length; ++i)
         {
           CORBA::ULong const current =
-            this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+            this->policy_list_[i]->policy_type ();
 
           if (current != slot)
             {
@@ -324,15 +303,14 @@ TAO_Policy_Set::get_policy_overrides (const CORBA::PolicyTypeSeq &types
 
 CORBA::Policy_ptr
 TAO_Policy_Set::get_policy (CORBA::PolicyType type
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   const CORBA::ULong length = this->policy_list_.length ();
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       const CORBA::ULong current =
-        this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->policy_list_[i]->policy_type ();
 
       if (current != type)
         {
@@ -359,7 +337,7 @@ TAO_Policy_Set::get_cached_const_policy (TAO_Cached_Policy_Type type) const
 
 CORBA::Policy_ptr
 TAO_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   )
 {
   if (type != TAO_CACHED_POLICY_UNCACHED
       && type < TAO_CACHED_POLICY_MAX_CACHED)
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index 873e114f321..8df15b71161 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -54,8 +54,7 @@ public:
 
   /// Copy the state from @a source, it uses the copy() operator to
   /// obtain independent copies of all the policies.
-  void copy_from (TAO_Policy_Set* source
-                  ACE_ENV_ARG_DECL);
+  void copy_from (TAO_Policy_Set* source);
 
   /**
    * Modify the list of policies to include @a policies.
@@ -65,18 +64,15 @@ public:
    * No attempt is made to validate the policies for consistency.
    */
   void set_policy_overrides (const CORBA::PolicyList & policies,
-                             CORBA::SetOverrideType set_add
-                             ACE_ENV_ARG_DECL);
+                             CORBA::SetOverrideType set_add);
 
   /// Get the values (if any) for the policies in @a types, if @a
   /// types is an empty list the method returns *all* the current
   /// policies.
-  CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types
-                                            ACE_ENV_ARG_DECL);
+  CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types);
 
   /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
 
   /// Obtain a cached policy for speedy lookups.
   /**
@@ -90,12 +86,10 @@ public:
   CORBA::Policy_ptr get_cached_const_policy (TAO_Cached_Policy_Type type) const;
 
   /// Obtain a single cached policy.
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   /// Utility method to set a single policy.
-  void set_policy (const CORBA::Policy_ptr policy
-                   ACE_ENV_ARG_DECL);
+  void set_policy (const CORBA::Policy_ptr policy);
 
   /// Returns the policy at the specified index.
   /// @c CORBA::Policy::_nil () is returned if the policy doesn't
@@ -108,7 +102,7 @@ private:
 
   /// Remove and destroy all the policy objects owned by this policy
   /// manager.
-  void cleanup_i (ACE_ENV_SINGLE_ARG_DECL);
+  void cleanup_i (void);
 
   /// Utility method to determine if a policy's scope is compatible with ours.
   CORBA::Boolean compatible_scope (TAO_Policy_Scope policy_scope) const;
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index b9753bd0fc2..660f63644a4 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/Policy_Validator.h"
-#include "tao/Environment.h"
 #include "tao/debug.h"
 
 #include "ace/Log_Msg.h"
@@ -24,9 +23,9 @@ TAO_Policy_Validator::~TAO_Policy_Validator (void)
   delete this->next_;
 }
 
-TAO_ORB_Core & 
+TAO_ORB_Core &
 TAO_Policy_Validator::orb_core() const
-{ 
+{
   return this->orb_core_;
 }
 
@@ -66,30 +65,24 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator)
 
 
 void
-TAO_Policy_Validator::validate (TAO_Policy_Set &policies
-                                ACE_ENV_ARG_DECL)
+TAO_Policy_Validator::validate (TAO_Policy_Set &policies)
 {
-  this->validate_impl (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validate_impl (policies);
 
   if (this->next_ != 0)
     {
-      this->next_->validate (policies ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->next_->validate (policies);
     }
 }
 
 void
-TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies
-                                      ACE_ENV_ARG_DECL)
+TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies)
 {
-  this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->merge_policies_impl (policies);
 
   if (this->next_)
     {
-      this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->next_->merge_policies (policies);
     }
 }
 
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index 6cc2eb6aab5..b666ff8bfde 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -36,8 +36,6 @@ class TAO_ORB_Core;
 namespace CORBA
 {
   typedef ULong PolicyType;
-
-  class Environment;
 }
 
 /**
@@ -66,14 +64,12 @@ public:
    * are consistent and legal.  Throw an appropriate exception
    * if that is not the case.
    */
-  void validate (TAO_Policy_Set &policies
-                 ACE_ENV_ARG_DECL);
+  void validate (TAO_Policy_Set &policies);
 
   /**
    * Add/merge policies.
    **/
-  void merge_policies (TAO_Policy_Set &policies
-                       ACE_ENV_ARG_DECL);
+  void merge_policies (TAO_Policy_Set &policies);
 
   /**
    * Return whether the specified policy type is legal for the
@@ -99,11 +95,9 @@ public:
  TAO_ORB_Core & orb_core() const;
 
 protected:
-  virtual void validate_impl (TAO_Policy_Set &policies
-                              ACE_ENV_ARG_DECL) = 0;
+  virtual void validate_impl (TAO_Policy_Set &policies) = 0;
 
-  virtual void merge_policies_impl (TAO_Policy_Set &policies
-                                    ACE_ENV_ARG_DECL) = 0;
+  virtual void merge_policies_impl (TAO_Policy_Set &policies) = 0;
 
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) = 0;
 
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
index eafd895d3a6..f07d536b979 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -18,7 +18,7 @@ TAO_Acceptor_Filter_Factory::~TAO_Acceptor_Filter_Factory(void)
 TAO_Acceptor_Filter*
 TAO_Acceptor_Filter_Factory::create_object (TAO_POA_Manager& )
 {
-  TAO_Acceptor_Filter *filter;
+  TAO_Acceptor_Filter *filter = 0;
 
   ACE_NEW_RETURN (filter,
                   TAO_Default_Acceptor_Filter (),
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index a0996627247..d58ba68db7b 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -78,15 +78,14 @@ TAO_Active_Object_Map::set_system_id_size
 TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
                                               int unique_id_policy,
                                               int persistent_id_policy,
-                                              const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
-                                              ACE_ENV_ARG_DECL)
+                                              const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
   : user_id_map_ (0),
     servant_map_ (0),
     id_uniqueness_strategy_ (0),
     lifespan_strategy_ (0),
     id_assignment_strategy_ (0),
     id_hint_strategy_ (0),
-    using_active_maps_ (0)
+    using_active_maps_ (false)
 {
   TAO_Active_Object_Map::set_system_id_size (creation_parameters);
 
@@ -97,14 +96,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
       ACE_NEW_THROW_EX (id_uniqueness_strategy,
                         TAO_Unique_Id_Strategy,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
     {
       ACE_NEW_THROW_EX (id_uniqueness_strategy,
                         TAO_Multiple_Id_Strategy,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
 
   // Give ownership to the auto pointer.
@@ -117,14 +114,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
       ACE_NEW_THROW_EX (lifespan_strategy,
                         TAO_Persistent_Strategy,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
     {
       ACE_NEW_THROW_EX (lifespan_strategy,
                         TAO_Transient_Strategy,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
 
   // Give ownership to the auto pointer.
@@ -137,21 +132,18 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
       ACE_NEW_THROW_EX (id_assignment_strategy,
                         TAO_User_Id_Strategy,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else if (unique_id_policy)
     {
       ACE_NEW_THROW_EX (id_assignment_strategy,
                         TAO_System_Id_With_Unique_Id_Strategy,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
     {
       ACE_NEW_THROW_EX (id_assignment_strategy,
                         TAO_System_Id_With_Multiple_Id_Strategy,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
 
   // Give ownership to the auto pointer.
@@ -162,19 +154,17 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
        || creation_parameters.allow_reactivation_of_system_ids_)
       && creation_parameters.use_active_hint_in_ids_)
     {
-      this->using_active_maps_ = 1;
+      this->using_active_maps_ = true;
 
       ACE_NEW_THROW_EX (id_hint_strategy,
                         TAO_Active_Hint_Strategy (creation_parameters.active_object_map_size_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
   else
     {
       ACE_NEW_THROW_EX (id_hint_strategy,
                         TAO_No_Hint_Strategy,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
     }
 
   // Give ownership to the auto pointer.
@@ -190,7 +180,6 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
           ACE_NEW_THROW_EX (sm,
                             servant_linear_map (creation_parameters.active_object_map_size_),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
           break;
 #else
           ACE_ERROR ((LM_ERROR,
@@ -205,7 +194,6 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
           ACE_NEW_THROW_EX (sm,
                             servant_hash_map (creation_parameters.active_object_map_size_),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
           break;
         }
     }
@@ -224,7 +212,6 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
           ACE_NEW_THROW_EX (uim,
                             user_id_linear_map (creation_parameters.active_object_map_size_),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
           break;
 #else
           ACE_ERROR ((LM_ERROR,
@@ -239,7 +226,6 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
           ACE_NEW_THROW_EX (uim,
                             user_id_hash_map (creation_parameters.active_object_map_size_),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
           break;
         }
     }
@@ -252,14 +238,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
           ACE_NEW_THROW_EX (uim,
                             user_id_linear_map (creation_parameters.active_object_map_size_),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
           break;
 
         case TAO_DYNAMIC_HASH:
           ACE_NEW_THROW_EX (uim,
                             user_id_hash_map (creation_parameters.active_object_map_size_),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
           break;
 #else
         case TAO_LINEAR:
@@ -274,12 +258,11 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
         case TAO_ACTIVE_DEMUX:
         default:
 
-          this->using_active_maps_ = 1;
+          this->using_active_maps_ = true;
 
           ACE_NEW_THROW_EX (uim,
                             user_id_active_map (creation_parameters.active_object_map_size_),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
           break;
         }
     }
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index 7232685a272..807d142e29c 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -50,8 +50,7 @@ public:
   TAO_Active_Object_Map (int user_id_policy,
                          int unique_id_policy,
                          int persistent_id_policy,
-                         const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
-                         ACE_ENV_ARG_DECL);
+                         const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
 
   /// Destructor.
   ~TAO_Active_Object_Map (void);
@@ -228,7 +227,7 @@ public:
 
   /// Flag to see if we are using active maps in this active object
   /// map.
-  int using_active_maps_;
+  bool using_active_maps_;
 
   /// Size of the system id produced by the map.
   static size_t system_id_size_;
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
index 33c267042ba..4af1c0925f4 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -65,7 +65,7 @@ namespace TAO
     void
     Active_Policy_Strategies::update (Cached_Policies &policies,
                                       ::TAO_Root_POA *poa
-                                      ACE_ENV_ARG_DECL)
+                                      )
     {
       this->thread_strategy_factory_ =
         ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategyFactory");
@@ -134,103 +134,89 @@ namespace TAO
 
       if (this->lifespan_strategy_ != 0)
         {
-          this->lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->lifespan_strategy_->strategy_init (poa);
         }
 
       if (this->request_processing_strategy_ != 0)
         {
-          this->request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->request_processing_strategy_->strategy_init (poa, policies.servant_retention());
         }
 
       if (this->id_uniqueness_strategy_ != 0)
         {
-          this->id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->id_uniqueness_strategy_->strategy_init (poa);
         }
 
       if (this->implicit_activation_strategy_ != 0)
         {
-          this->implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->implicit_activation_strategy_->strategy_init (poa);
         }
 
       if (this->thread_strategy_ != 0)
         {
-          this->thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->thread_strategy_->strategy_init (poa);
         }
 
       if (this->servant_retention_strategy_ != 0)
         {
-          this->servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->servant_retention_strategy_->strategy_init (poa);
         }
 
       if (this->id_assignment_strategy_ != 0)
         {
-          this->id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->id_assignment_strategy_->strategy_init (poa);
         }
     }
 
     void
-    Active_Policy_Strategies::cleanup (ACE_ENV_SINGLE_ARG_DECL)
+    Active_Policy_Strategies::cleanup (void)
     {
 
       if (this->lifespan_strategy_ != 0)
         {
-          this->lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->lifespan_strategy_factory_->destroy (lifespan_strategy_);
 
           this->lifespan_strategy_ = 0;
         }
 
       if (this->request_processing_strategy_ != 0)
         {
-          this->request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->request_processing_strategy_factory_->destroy (request_processing_strategy_);
 
           this->request_processing_strategy_ = 0;
         }
 
       if (this->id_uniqueness_strategy_ != 0)
         {
-          this->id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_);
 
           this->id_uniqueness_strategy_ = 0;
         }
 
       if (this->implicit_activation_strategy_ != 0)
         {
-          this->implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_);
 
           this->implicit_activation_strategy_ = 0;
         }
 
       if (this->thread_strategy_ != 0)
         {
-          this->thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->thread_strategy_factory_->destroy (thread_strategy_);
 
           this->thread_strategy_ = 0;
         }
 
       if (this->servant_retention_strategy_ != 0)
         {
-          this->servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->servant_retention_strategy_factory_->destroy (servant_retention_strategy_);
 
           this->servant_retention_strategy_ = 0;
         }
 
       if (this->id_assignment_strategy_ != 0)
         {
-          this->id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->id_assignment_strategy_factory_->destroy (id_assignment_strategy_);
 
           this->id_assignment_strategy_ = 0;
         }
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
index 685c6978c2b..829acb189c5 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -58,9 +58,9 @@ namespace TAO
 
       void update (Cached_Policies &policies,
                    TAO_Root_POA* poa
-                   ACE_ENV_ARG_DECL);
+                  );
 
-      void cleanup (ACE_ENV_SINGLE_ARG_DECL);
+      void cleanup (void);
 
       ThreadStrategy *thread_strategy (void) const;
 
diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp
index 1b97b7269b8..91820c955f9 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.cpp
+++ b/TAO/tao/PortableServer/Adapter_Activator.cpp
@@ -27,8 +27,7 @@ namespace TAO
 
     CORBA::Boolean
     Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                        const char *name
-                                        ACE_ENV_ARG_DECL)
+                                        const char *name)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       // Default policies
@@ -38,25 +37,19 @@ namespace TAO
       PortableServer::POA_var child =
         parent->create_POA (name,
                             this->poa_manager_.in (),
-                            default_policies
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                            default_policies);
 
-      ACE_TRY
+      try
         {
-          child->the_activator (this ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          child->the_activator (this);
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception&)
         {
           (void) child->destroy (1,
-                                 1
-                                 ACE_ENV_ARG_PARAMETER);
+                                 1);
 
           return false;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
 
       // Finally everything is fine
       return true;
diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h
index 9d70eaabddf..71bff543e51 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.h
+++ b/TAO/tao/PortableServer/Adapter_Activator.h
@@ -45,8 +45,7 @@ namespace TAO
       Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
 
       CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                      const char *name
-                                      ACE_ENV_ARG_DECL)
+                                      const char *name)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     protected:
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index 26939a27be7..e61e6b46315 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -21,8 +21,7 @@ namespace TAO
 {
   CORBA::Boolean
   Collocated_Object_Proxy_Broker::_is_a (CORBA::Object_ptr target,
-                                         const char *type_id
-                                         ACE_ENV_ARG_DECL)
+                                         const char *type_id)
   {
     TAO_Stub *stub = target->_stubobj ();
 
@@ -32,32 +31,23 @@ namespace TAO
           == TAO_ORB_Core::THRU_POA)
       {
         TAO::Portable_Server::Servant_Upcall servant_upcall (
-          stub->servant_orb_var ()->orb_core ()
-        );
+          stub->servant_orb_var ()->orb_core ());
 
       CORBA::Object_var forward_to;
       servant_upcall.prepare_for_upcall (
           stub->profile_in_use ()->object_key (),
           "_is_a",
-          forward_to.out ()
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (0);
-
-      servant_upcall.pre_invoke_collocated_request (
-          ACE_ENV_SINGLE_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (0);
-
-      return servant_upcall.servant ()->_is_a (type_id
-                                               ACE_ENV_ARG_PARAMETER);
+          forward_to.out ());
+
+      servant_upcall.pre_invoke_collocated_request ();
+
+      return servant_upcall.servant ()->_is_a (type_id);
     }
 
     // Direct collocation strategy is used.
     if (target->_servant () != 0)
       {
-        return target->_servant ()->_is_a (type_id
-                                           ACE_ENV_ARG_PARAMETER);
+        return target->_servant ()->_is_a (type_id);
       }
 
     return 0;
@@ -66,13 +56,12 @@ namespace TAO
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   char *
-  Collocated_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target
-                                                  ACE_ENV_ARG_DECL)
+  Collocated_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target)
   {
     TAO_Stub *stub = target->_stubobj ();
     char * _tao_retval = 0;
 
-    ACE_TRY
+    try
       {
         // Which collocation strategy should we use?
         if (stub != 0 &&
@@ -80,51 +69,37 @@ namespace TAO
               ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
           {
             TAO::Portable_Server::Servant_Upcall servant_upcall (
-                stub->servant_orb_var ()->orb_core ()
-                );
+                stub->servant_orb_var ()->orb_core ());
 
             CORBA::Object_var forward_to;
             servant_upcall.prepare_for_upcall (
                 stub->profile_in_use ()->object_key (),
                 "_repository_id",
-                forward_to.out ()
-                ACE_ENV_ARG_PARAMETER
-              );
-            ACE_TRY_CHECK;
+                forward_to.out ());
 
             _tao_retval =
-              servant_upcall.servant ()->_repository_id (
-                                             ACE_ENV_SINGLE_ARG_PARAMETER
-                                           );
-            ACE_TRY_CHECK;
+              servant_upcall.servant ()->_repository_id ();
           }
         // Direct collocation strategy is used.
         else if (target->_servant () != 0)
           {
-            _tao_retval =
-              target->_servant ()->_repository_id (
-                                       ACE_ENV_SINGLE_ARG_PARAMETER
-                                     );
-            ACE_TRY_CHECK;
+            _tao_retval = target->_servant ()->_repository_id ();
           }
       }
-    ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+    catch (const ::CORBA::OBJECT_NOT_EXIST&)
       {
         // Ignore this exception.
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
-        ACE_RE_THROW;
+        throw;
       }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (_tao_retval);
 
     return _tao_retval;
   }
 
   CORBA::Boolean
-  Collocated_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target
-                                                 ACE_ENV_ARG_DECL)
+  Collocated_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target)
   {
     CORBA::Boolean _tao_retval = true;
 
@@ -136,50 +111,36 @@ namespace TAO
         ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
       {
         TAO::Portable_Server::Servant_Upcall servant_upcall (
-          target->_stubobj ()->servant_orb_var ()->orb_core ()
-          );
+          target->_stubobj ()->servant_orb_var ()->orb_core ());
 
         CORBA::Object_var forward_to;
 
         servant_upcall.prepare_for_upcall (
           target->_stubobj ()->object_key (),
           "_non_existent",
-          forward_to.out ()
-          ACE_ENV_ARG_PARAMETER
-          );
-        ACE_CHECK_RETURN (_tao_retval);
-
-        servant_upcall.pre_invoke_collocated_request (
-            ACE_ENV_SINGLE_ARG_PARAMETER
-          );
-        ACE_CHECK_RETURN (_tao_retval);
-
-        _tao_retval =
-          servant_upcall.servant ()->_non_existent (
-                                         ACE_ENV_SINGLE_ARG_PARAMETER
-                                       );
-        ACE_CHECK_RETURN (_tao_retval);
+          forward_to.out ());
+
+        servant_upcall.pre_invoke_collocated_request ();
+
+        _tao_retval = servant_upcall.servant ()->_non_existent ();
       }
     // Direct collocation strategy is used.
     else if (target->_servant () != 0)
       {
-        _tao_retval =
-          target->_servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (_tao_retval);
+        _tao_retval = target->_servant ()->_non_existent ();
       }
 
     return _tao_retval;
   }
 
   CORBA::Object_ptr
-  Collocated_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target
-                                                  ACE_ENV_ARG_DECL)
+  Collocated_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target)
   {
     CORBA::Object_var _tao_retval (CORBA::Object::_nil ());
 
     TAO_Stub *stub = target->_stubobj ();
 
-    ACE_TRY
+    try
       {
         // Which collocation strategy should we use?
         if (stub != 0 &&
@@ -187,58 +148,42 @@ namespace TAO
               ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
           {
             TAO::Portable_Server::Servant_Upcall servant_upcall (
-                stub->servant_orb_var ()->orb_core ()
-                );
+                stub->servant_orb_var ()->orb_core ());
 
             CORBA::Object_var forward_to;
             servant_upcall.prepare_for_upcall (
                 stub->profile_in_use ()->object_key (),
                 "_component",
-                forward_to.out ()
-                ACE_ENV_ARG_PARAMETER
-              );
-            ACE_TRY_CHECK;
+                forward_to.out ());
 
-            _tao_retval =
-              servant_upcall.servant ()->_get_component (
-                                             ACE_ENV_SINGLE_ARG_PARAMETER
-                                           );
-            ACE_TRY_CHECK;
+            _tao_retval = servant_upcall.servant ()->_get_component ();
           }
         // Direct collocation strategy is used.
         else if (target->_servant () != 0)
           {
-            _tao_retval =
-              target->_servant ()->_get_component (
-                                       ACE_ENV_SINGLE_ARG_PARAMETER
-                                     );
-            ACE_TRY_CHECK;
+            _tao_retval = target->_servant ()->_get_component ();
           }
       }
-    ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+    catch (const ::CORBA::OBJECT_NOT_EXIST&)
       {
         // Ignore this exception.
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
-        ACE_RE_THROW;
+        throw;
       }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (_tao_retval._retn ());
 
     return _tao_retval._retn ();
   }
 
   CORBA::InterfaceDef_ptr
-  Collocated_Object_Proxy_Broker::_get_interface (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL)
+  Collocated_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target)
   {
     CORBA::InterfaceDef_ptr _tao_retval = 0;
 
     TAO_Stub *stub = target->_stubobj ();
 
-    ACE_TRY
+    try
       {
         // Which collocation strategy should we use?
         if (stub != 0 &&
@@ -246,50 +191,34 @@ namespace TAO
               == TAO_ORB_Core::THRU_POA)
           {
             TAO::Portable_Server::Servant_Upcall servant_upcall (
-                target->_stubobj ()->servant_orb_var ()->orb_core ()
-                );
+                target->_stubobj ()->servant_orb_var ()->orb_core ());
 
             CORBA::Object_var forward_to;
 
             servant_upcall.prepare_for_upcall (
                 target->_stubobj ()->object_key (),
                 "_interface",
-                forward_to.out ()
-                ACE_ENV_ARG_PARAMETER
-              );
-            ACE_TRY_CHECK;
+                forward_to.out ());
 
-            servant_upcall.pre_invoke_collocated_request (
-                ACE_ENV_SINGLE_ARG_PARAMETER
-              );
-            ACE_TRY_CHECK;
+            servant_upcall.pre_invoke_collocated_request ();
 
             _tao_retval =
-              servant_upcall.servant ()->_get_interface (
-                  ACE_ENV_SINGLE_ARG_PARAMETER
-                );
-            ACE_TRY_CHECK;
+              servant_upcall.servant ()->_get_interface ();
           }
         // Direct collocation strategy is used.
         else if (target->_servant () != 0)
           {
-            _tao_retval =
-              target->_servant ()->_get_interface (
-                  ACE_ENV_SINGLE_ARG_PARAMETER
-                );
-            ACE_TRY_CHECK;
+            _tao_retval = target->_servant ()->_get_interface ();
           }
       }
-    ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+    catch (const ::CORBA::OBJECT_NOT_EXIST&)
       {
         // Ignore this exception.
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
-        ACE_RE_THROW;
+        throw;
       }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (_tao_retval);
 
     return _tao_retval;
   }
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
index cd28b880933..a07598ca017 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
@@ -45,24 +45,17 @@ namespace TAO
     /// Please see the documentation in Object_Proxy_Broker.h for
     /// details.
     virtual CORBA::Boolean _is_a (CORBA::Object_ptr target,
-                                  const char *logical_type_id
-                                  ACE_ENV_ARG_DECL);
+                                  const char *logical_type_id);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target
-                                        ACE_ENV_ARG_DECL);
+  virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target);
 
-  virtual CORBA::InterfaceDef * _get_interface (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
-    );
+  virtual CORBA::InterfaceDef * _get_interface (CORBA::Object_ptr target);
 
-  virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target
-                                            ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target);
 
-  virtual char * _repository_id (CORBA::Object_ptr target
-                                 ACE_ENV_ARG_DECL);
+  virtual char * _repository_id (CORBA::Object_ptr target);
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
diff --git a/TAO/tao/PortableServer/DII_Arguments_Converter.h b/TAO/tao/PortableServer/DII_Arguments_Converter.h
index 2849d7fc42a..60109b80891 100644
--- a/TAO/tao/PortableServer/DII_Arguments_Converter.h
+++ b/TAO/tao/PortableServer/DII_Arguments_Converter.h
@@ -34,20 +34,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * @brief TAO_DII_Arguments_Converter.
  *
  * Abstract class that convert the DII arguments in NVList to the
- * list of arguments. This is a base class for the actual implementation 
+ * list of arguments. This is a base class for the actual implementation
  * in the DynamicInterface library.
  */
 class TAO_PortableServer_Export TAO_DII_Arguments_Converter : public ACE_Service_Object
 {
 public:
-  
+
   virtual ~TAO_DII_Arguments_Converter (void);
-  
+
   virtual void convert ( TAO_ServerRequest & server_request,
                          TAO::Argument * const args[],
-                         size_t nargs
-                         ACE_ENV_ARG_DECL) = 0;
-
+                         size_t nargs) = 0;
 };
 
 
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index 8152f2fb385..f101c6ba237 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -24,101 +24,71 @@ TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void)
 }
 
 void
-TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
-                                                 ACE_ENV_ARG_DECL)
+TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies)
 {
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_SERVANT_RETENTION
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 
   PortableServer::ServantRetentionPolicy_var srp =
-    PortableServer::ServantRetentionPolicy::_narrow (policy.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::ServantRetentionPolicy::_narrow (policy.in ());
   PortableServer::ServantRetentionPolicyValue servant_retention =
-    srp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    srp->value ();
 
-  policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policy = policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING);
 
   PortableServer::RequestProcessingPolicy_var rpp =
-    PortableServer::RequestProcessingPolicy::_narrow (policy.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::RequestProcessingPolicy::_narrow (policy.in ());
   PortableServer::RequestProcessingPolicyValue request_processing =
-    rpp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    rpp->value ();
 
   // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or
   // USE_SERVANT_MANAGER policies.
   if (servant_retention == PortableServer::NON_RETAIN)
     if (request_processing != PortableServer::USE_SERVANT_MANAGER &&
         request_processing  != PortableServer::USE_DEFAULT_SERVANT)
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
+      throw PortableServer::POA::InvalidPolicy ();
 
   // USE_ACTIVE_OBJECT_MAP_ONLY requires the RETAIN policy.
   if (request_processing == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
     if (servant_retention != PortableServer::RETAIN)
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
-
-  policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS
-                                ACE_ENV_ARG_PARAMETER);
+      throw PortableServer::POA::InvalidPolicy ();
 
-  ACE_CHECK;
+  policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS);
 
   PortableServer::IdUniquenessPolicy_var iup =
-    PortableServer::IdUniquenessPolicy::_narrow (policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::IdUniquenessPolicy::_narrow (policy.in ());
   PortableServer::IdUniquenessPolicyValue id_uniqueness =
-    iup->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    iup->value ();
 
   policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION);
 
   PortableServer::ImplicitActivationPolicy_var iap =
-    PortableServer::ImplicitActivationPolicy::_narrow (policy.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::ImplicitActivationPolicy::_narrow (policy.in ());
   PortableServer::ImplicitActivationPolicyValue implicit_activation =
-    iap->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    iap->value ();
 
-  policy =
-    policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT);
 
   PortableServer::IdAssignmentPolicy_var idap =
-    PortableServer::IdAssignmentPolicy::_narrow (policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::IdAssignmentPolicy::_narrow (policy.in ());
   PortableServer::IdAssignmentPolicyValue id_assignment =
-    idap->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    idap->value ();
 
   // USE_DEFAULT_SERVANT requires the MULTIPLE_ID policy.
   if (request_processing == PortableServer::USE_DEFAULT_SERVANT)
     if (id_uniqueness != PortableServer::MULTIPLE_ID)
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
+      throw PortableServer::POA::InvalidPolicy ();
 
   // IMPLICIT_ACTIVATION requires the SYSTEM_ID and RETAIN policies.
   if (implicit_activation == PortableServer::IMPLICIT_ACTIVATION)
     if (servant_retention != PortableServer::RETAIN ||
         id_assignment != PortableServer::SYSTEM_ID)
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
+      throw PortableServer::POA::InvalidPolicy ();
 #else /* TAO_HAS_MINIMUM_POA == 0 */
   ACE_UNUSED_ARG (policies);
-  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 }
 
@@ -148,9 +118,7 @@ TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
 }
 
 void
-TAO_POA_Default_Policy_Validator::merge_policies_impl (
-  TAO_Policy_Set &
-  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_POA_Default_Policy_Validator::merge_policies_impl (TAO_Policy_Set &)
 {
 }
 
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h
index ce099b9d402..717794e7787 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.h
@@ -45,12 +45,10 @@ protected:
    * are consistent and legal.  Throw an appropriate exception
    * if that is not the case.
    */
-  void validate_impl (TAO_Policy_Set &policies
-                      ACE_ENV_ARG_DECL);
+  void validate_impl (TAO_Policy_Set &policies);
 
   /// Add/merge policies.
-  void merge_policies_impl (TAO_Policy_Set &policies
-                            ACE_ENV_ARG_DECL);
+  void merge_policies_impl (TAO_Policy_Set &policies);
 
   /**
    * Return whether the specified policy type is legal for the
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index d964a4d4f90..63e6773dac9 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -20,8 +20,7 @@ TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                                  ACE_Lock &lock,
                                                  TAO_SYNCH_MUTEX &thread_lock,
                                                  TAO_ORB_Core &orb_core,
-                                                 TAO_Object_Adapter *object_adapter
-                                                 ACE_ENV_ARG_DECL)
+                                                 TAO_Object_Adapter *object_adapter)
 {
   TAO_Root_POA *poa = 0;
 
@@ -33,9 +32,8 @@ TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                   lock,
                                   thread_lock,
                                   orb_core,
-                                  object_adapter
-                                  ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+                                  object_adapter),
+                    CORBA::NO_MEMORY ());
 
   return poa;
 }
@@ -45,8 +43,7 @@ TAO_Default_Servant_Dispatcher::pre_invoke_remote_request (
   TAO_Root_POA &,
   CORBA::Short,
   TAO_ServerRequest &,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-  ACE_ENV_ARG_DECL_NOT_USED)
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
 }
 
@@ -54,8 +51,7 @@ void
 TAO_Default_Servant_Dispatcher::pre_invoke_collocated_request (
   TAO_Root_POA &,
   CORBA::Short,
-  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
-  ACE_ENV_ARG_DECL_NOT_USED)
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 {
 }
 
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
index e5f5f2b71db..5b988184834 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
@@ -44,15 +44,13 @@ public:
         TAO_Root_POA &poa,
         CORBA::Short servant_priority,
         TAO_ServerRequest &req,
-        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-        ACE_ENV_ARG_DECL);
+        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
 
   /// Pre_invoke collocated request.
   void pre_invoke_collocated_request (
         TAO_Root_POA &poa,
         CORBA::Short servant_priority,
-        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-        ACE_ENV_ARG_DECL);
+        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
 
   /// Post_invoke request.
   void post_invoke (
@@ -67,8 +65,7 @@ public:
         ACE_Lock &lock,
         TAO_SYNCH_MUTEX &thread_lock,
         TAO_ORB_Core &orb_core,
-        TAO_Object_Adapter *object_adapter
-        ACE_ENV_ARG_DECL);
+        TAO_Object_Adapter *object_adapter);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index d7ce947dbae..f49f84a1d71 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -26,48 +26,35 @@ TAO::Direct_Collocation_Upcall_Wrapper::upcall (
   int num_args,
   const char * op,
   size_t op_len,
-  TAO::Collocation_Strategy strategy
-  ACE_ENV_ARG_DECL
-)
-ACE_THROW_SPEC ((CORBA::Exception))
+  TAO::Collocation_Strategy strategy)
+    ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO_Abstract_ServantBase * const servant = obj->_servant ();
 
   TAO_Collocated_Skeleton collocated_skel;
-  int const status = servant->_find (op,
-                                     collocated_skel,
-                                     strategy,
-                                     op_len);
+
+  int const status = servant->_find (op, collocated_skel, strategy, op_len);
 
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO));
+      throw ::CORBA::BAD_OPERATION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
 
-  ACE_TRY
+#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+  try
     {
-      collocated_skel (servant,
-                       args,
-                       num_args
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
+#endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/
+      collocated_skel (servant, args, num_args);
 #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
+    }
+  catch (const ::PortableServer::ForwardRequest& forward_request)
     {
       forward_obj =
         CORBA::Object::_duplicate (forward_request.forward_reference.in ());
-      return;
     }
 #else
-  ACE_CATCHANY
-    {
-      ACE_UNUSED_ARG (forward_obj);
-      ACE_RE_THROW;
-    }
+  ACE_UNUSED_ARG (forward_obj);
 #endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
index edc4c39f479..e84fb58ade4 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
@@ -33,8 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
-  class Environment;
-
   class Object;
   typedef Object *Object_ptr;
   typedef TAO_Pseudo_Var_T<Object> Object_var;
@@ -63,9 +61,7 @@ namespace TAO
       int num_args,
       const char * op,
       size_t op_len,
-      TAO::Collocation_Strategy strategy
-      ACE_ENV_ARG_DECL
-    )
+      TAO::Collocation_Strategy strategy)
     ACE_THROW_SPEC ((CORBA::Exception));
   };
 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
index 7d036f83c72..619f02bc679 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -20,33 +20,32 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    IdAssignmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+    IdAssignmentPolicy::copy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       IdAssignmentPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
                         IdAssignmentPolicy (this->value_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return copy;
     }
 
     void
-    IdAssignmentPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    IdAssignmentPolicy::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::IdAssignmentPolicyValue
-    IdAssignmentPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    IdAssignmentPolicy::value (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
-    IdAssignmentPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    IdAssignmentPolicy::policy_type (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::ID_ASSIGNMENT_POLICY_ID;
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h
index 83cec156f2c..cf9db21a4f1 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h
@@ -45,16 +45,16 @@ namespace TAO
     public:
       IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value);
 
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      ::PortableServer::IdAssignmentPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ::PortableServer::IdAssignmentPolicyValue value (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Return the cached policy type for this policy.
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
index 969a6bfa112..eb32db2161c 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
@@ -14,13 +14,12 @@ namespace TAO
   namespace Portable_Server
   {
     void
-    IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/
-					 ACE_ENV_ARG_DECL_NOT_USED)
+    IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/)
     {
     }
 
     void
-    IdAssignmentStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    IdAssignmentStrategy::strategy_cleanup(void)
     {
     }
 
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h
index d53a67c62b3..b9c826c6758 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h
@@ -32,9 +32,9 @@ namespace TAO
       : public Policy_Strategy
     {
     public:
-      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+      virtual void strategy_init(TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
       /**
        * Returns the key type the says which specific policy we have
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
index 2d0dd83a80c..e6fe455dd42 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
@@ -41,7 +41,7 @@ namespace TAO
 
       virtual void destroy (
         IdAssignmentStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
index 475632c8363..735a937dc19 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -14,12 +14,12 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    IdAssignmentStrategy*
+    IdAssignmentStrategy *
     IdAssignmentStrategyFactoryImpl::create (
       ::PortableServer::IdAssignmentPolicyValue value)
     {
-      IdAssignmentStrategy* strategy = 0;
-      const char * strategy_name = 0;
+      IdAssignmentStrategy *strategy = 0;
+      const char *strategy_name = 0;
 
       switch (value)
       {
@@ -36,20 +36,18 @@ namespace TAO
       }
 
       strategy =
-        ACE_Dynamic_Service<IdAssignmentStrategy>::instance (strategy_name);
+        ACE_Dynamic_Service <IdAssignmentStrategy>::instance (strategy_name);
 
       if (strategy == 0)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
-                    strategy_name));
+                   ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"),
+                   strategy_name));
 
       return strategy;
     }
 
     void
-    IdAssignmentStrategyFactoryImpl::destroy (
-      IdAssignmentStrategy * /*strategy*/
-      ACE_ENV_ARG_DECL_NOT_USED)
+    IdAssignmentStrategyFactoryImpl::destroy (IdAssignmentStrategy *)
     {
       // Noop because both types are singletons
     }
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
index 1e7cadb3267..a42768ac668 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
@@ -37,9 +37,7 @@ namespace TAO
       virtual IdAssignmentStrategy* create (
         ::PortableServer::IdAssignmentPolicyValue value);
 
-      virtual void destroy (
-        IdAssignmentStrategy *strategy
-        ACE_ENV_ARG_DECL);
+      virtual void destroy (IdAssignmentStrategy *strategy);
     };
   }
 }
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
index 8796492f65d..4949af6817b 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -20,33 +20,32 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    IdUniquenessPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+    IdUniquenessPolicy::copy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       IdUniquenessPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
                         IdUniquenessPolicy (this->value_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return copy;
     }
 
     void
-    IdUniquenessPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    IdUniquenessPolicy::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::IdUniquenessPolicyValue
-    IdUniquenessPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    IdUniquenessPolicy::value (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
-    IdUniquenessPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    IdUniquenessPolicy::policy_type (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::ID_UNIQUENESS_POLICY_ID;
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h
index f1446d6e2fe..944738e6b94 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h
@@ -45,16 +45,16 @@ namespace TAO
     public:
       IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value);
 
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      ::PortableServer::IdUniquenessPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ::PortableServer::IdUniquenessPolicyValue value (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Return the cached policy type for this policy.
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
index b3f973ef19f..c3387398970 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
@@ -42,7 +42,7 @@ namespace TAO
       /// Cleanup the given strategy instance
       virtual void destroy (
         IdUniquenessStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
index 47530f5a9a9..64adaf777f5 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
@@ -57,7 +57,7 @@ namespace TAO
     void
     IdUniquenessStrategyFactoryImpl::destroy (
       IdUniquenessStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
       switch (strategy->type ())
       {
@@ -73,8 +73,7 @@ namespace TAO
 
           if (strategy_factory != 0)
             {
-              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              strategy_factory->destroy (strategy);
             }
           break;
         }
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
index 8846237437d..fe78dfe3f9f 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
@@ -39,7 +39,7 @@ namespace TAO
 
       virtual void destroy (
         IdUniquenessStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
index 8fb4db2d48b..84cdac1b80d 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -14,22 +14,19 @@ namespace TAO
   namespace Portable_Server
   {
     void
-    IdUniquenessStrategyMultiple::strategy_init (
-      TAO_Root_POA * /*poa*/
-      ACE_ENV_ARG_DECL_NOT_USED)
+    IdUniquenessStrategyMultiple::strategy_init (TAO_Root_POA * /*poa*/)
     {
     }
 
     void
-    IdUniquenessStrategyMultiple::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    IdUniquenessStrategyMultiple::strategy_cleanup (void)
     {
     }
 
     bool
-    IdUniquenessStrategyMultiple::is_servant_activation_allowed (
-      PortableServer::Servant /*servant*/,
-      bool & /*wait_occurred_restart_call*/)
+    IdUniquenessStrategyMultiple::is_servant_activation_allowed
+      (PortableServer::Servant/*servant*/,
+       bool &/*wait_occurred_restart_call*/)
     {
       // With the multiple id strategy we can always activate the servant
       // another time
@@ -43,7 +40,7 @@ namespace TAO
     }
 
     ::PortableServer::IdUniquenessPolicyValue
-    IdUniquenessStrategyMultiple::type() const
+    IdUniquenessStrategyMultiple::type () const
     {
       return ::PortableServer::MULTIPLE_ID;
     }
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
index 92179068d95..a385f72c0c5 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
@@ -33,9 +33,9 @@ namespace TAO
       : public IdUniquenessStrategy
     {
     public:
-      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+      virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup (ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup (void);
 
       virtual bool is_servant_activation_allowed (
         PortableServer::Servant servant,
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
index 061cb611907..b2e3e2b2dbb 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -22,14 +22,14 @@ namespace TAO
     void
     IdUniquenessStrategyUnique::strategy_init (
       TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL_NOT_USED)
+      )
     {
       poa_ = poa;
     }
 
     void
     IdUniquenessStrategyUnique::strategy_cleanup (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      void)
     {
       poa_ = 0;
     }
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
index 8bcdbe180f7..ef39a1dad61 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
@@ -36,9 +36,9 @@ namespace TAO
       IdUniquenessStrategyUnique (void);
 
       virtual void strategy_init (TAO_Root_POA *poa
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
-      virtual void strategy_cleanup (ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup (void);
 
       virtual bool is_servant_activation_allowed (
         PortableServer::Servant servant,
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
index b29178c143f..391077edfc1 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -40,10 +40,9 @@ namespace TAO
     void
     IdUniquenessStrategyUniqueFactoryImpl::destroy (
       IdUniquenessStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
index 721ae2a6eb9..5b031d00bbd 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
@@ -39,7 +39,7 @@ namespace TAO
 
       virtual void destroy (
         IdUniquenessStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
 
   }
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h
index e5b55bd6077..2f5bef0c049 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.h
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h
@@ -51,10 +51,10 @@ namespace TAO
       virtual ~ImR_Client_Adapter (void);
 
       /// ImplRepo helper method, notify the ImplRepo on startup
-      virtual void imr_notify_startup (TAO_Root_POA* poa ACE_ENV_ARG_DECL) = 0;
+      virtual void imr_notify_startup (TAO_Root_POA* poa ) = 0;
 
       /// ImplRepo helper method, notify the ImplRepo on shutdown
-      virtual void imr_notify_shutdown (TAO_Root_POA* poa ACE_ENV_ARG_DECL) = 0;
+      virtual void imr_notify_shutdown (TAO_Root_POA* poa ) = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
index c683f2640c7..287d32547e0 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -20,33 +20,32 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    ImplicitActivationPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+    ImplicitActivationPolicy::copy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ImplicitActivationPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
                         ImplicitActivationPolicy (this->value_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return copy;
     }
 
     void
-    ImplicitActivationPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ImplicitActivationPolicy::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::ImplicitActivationPolicyValue
-    ImplicitActivationPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ImplicitActivationPolicy::value (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
-    ImplicitActivationPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ImplicitActivationPolicy::policy_type (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
index fb0a3d99179..50f1465a0c5 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
@@ -45,16 +45,16 @@ namespace TAO
     public:
       ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value);
 
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      ::PortableServer::ImplicitActivationPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ::PortableServer::ImplicitActivationPolicyValue value (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Return the cached policy type for this policy.
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
index f2761572e36..ad404a21c14 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -13,16 +13,13 @@ namespace TAO
   namespace Portable_Server
   {
     void
-    ImplicitActivationStrategy::strategy_init (
-      TAO_Root_POA * /*poa*/
-      ACE_ENV_ARG_DECL_NOT_USED)
+    ImplicitActivationStrategy::strategy_init (TAO_Root_POA * /*poa*/)
     {
       // dependent on type create the correct strategy.
     }
 
     void
-    ImplicitActivationStrategy::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ImplicitActivationStrategy::strategy_cleanup (void)
     {
     }
   }
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
index 22ca61b5cbf..852ade6ac1b 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
@@ -30,9 +30,9 @@ namespace TAO
       : public Policy_Strategy
     {
     public:
-      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+      virtual void strategy_init(TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
       virtual bool allow_implicit_activation (void) const = 0;
     };
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
index f5d1a8aa5f4..9444ff5b91b 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
@@ -41,7 +41,7 @@ namespace TAO
 
       virtual void destroy (
         ImplicitActivationStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
index 0fa7771687c..1656fcd5c12 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -50,7 +50,7 @@ namespace TAO
     void
     ImplicitActivationStrategyFactoryImpl::destroy (
       ImplicitActivationStrategy * /*strategy*/
-      ACE_ENV_ARG_DECL_NOT_USED)
+      )
     {
       // Noop because both types are singletons
     }
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
index 6b9e87ef7f3..ca6cd277172 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
@@ -40,7 +40,7 @@ namespace TAO
 
       virtual void destroy (
         ImplicitActivationStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
index b61dd7b3cbb..32d14ed4fe0 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -20,33 +20,32 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    LifespanPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+    LifespanPolicy::copy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       LifespanPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
                         LifespanPolicy (this->value_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return copy;
     }
 
     void
-    LifespanPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    LifespanPolicy::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::LifespanPolicyValue
-    LifespanPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    LifespanPolicy::value (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
-    LifespanPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    LifespanPolicy::policy_type (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::LIFESPAN_POLICY_ID;
diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h
index 8782763623f..50c3246bc08 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.h
+++ b/TAO/tao/PortableServer/LifespanPolicy.h
@@ -45,16 +45,16 @@ namespace TAO
     public:
       LifespanPolicy (::PortableServer::LifespanPolicyValue value);
 
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      ::PortableServer::LifespanPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ::PortableServer::LifespanPolicyValue value (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Return the cached policy type for this policy.
diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp
index aea66e7161c..46ae7a9c870 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategy.cpp
@@ -27,16 +27,13 @@ namespace TAO
     }
 
     void
-    LifespanStrategy::strategy_init (
-      TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL_NOT_USED)
+    LifespanStrategy::strategy_init (TAO_Root_POA *poa)
     {
       poa_ = poa;
     }
 
     void
-    LifespanStrategy::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    LifespanStrategy::strategy_cleanup (void)
     {
       poa_ = 0;
     }
diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h
index 895c20335d8..70e0c06c04d 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.h
+++ b/TAO/tao/PortableServer/LifespanStrategy.h
@@ -37,15 +37,15 @@ namespace TAO
     public:
       LifespanStrategy (void);
 
-      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+      virtual void strategy_init(TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
       void create (const char *name, const TAO::ObjectKey &key);
 
-      virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL) = 0;
+      virtual void notify_startup (void) = 0;
 
-      virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
+      virtual void notify_shutdown (void) = 0;
 
       /**
        * Validate the passed object key if it belongs to this POA.
@@ -70,7 +70,7 @@ namespace TAO
         const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const = 0;
 
       /// Check the state of the POA.
-      virtual void check_state (ACE_ENV_SINGLE_ARG_DECL) = 0;
+      virtual void check_state (void) = 0;
 
       virtual ::PortableServer::LifespanPolicyValue type() const = 0;
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h
index 085e2c75228..01b13ba6e45 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactory.h
+++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h
@@ -42,7 +42,7 @@ namespace TAO
       /// Cleanup the given strategy instance
       virtual void destroy (
         LifespanStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
index 07e24aebc59..02b20df1881 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -52,7 +52,7 @@ namespace TAO
     void
     LifespanStrategyFactoryImpl::destroy (
       LifespanStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
       switch (strategy->type ())
       {
@@ -63,8 +63,7 @@ namespace TAO
 
           if (strategy_factory != 0)
             {
-              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              strategy_factory->destroy (strategy);
             }
           break;
         }
@@ -75,8 +74,7 @@ namespace TAO
 
           if (strategy_factory != 0)
             {
-              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              strategy_factory->destroy (strategy);
             }
           break;
         }
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
index e0ece8266bb..e2a9074a622 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
@@ -40,7 +40,7 @@ namespace TAO
       /// Cleanup the given strategy instance
       virtual void destroy (
         LifespanStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
index 6b2e3420c14..3d089ef2b79 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -23,10 +23,9 @@ namespace TAO
     void
     LifespanStrategyPersistent::strategy_init (
       TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL)
+      )
     {
-      LifespanStrategy::strategy_init (poa ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      LifespanStrategy::strategy_init (poa);
 
       this->use_imr_ = this->poa_->orb_core ().use_implrepo ();
     }
@@ -68,7 +67,7 @@ namespace TAO
     }
 
     void
-    LifespanStrategyPersistent::notify_startup (ACE_ENV_SINGLE_ARG_DECL)
+    LifespanStrategyPersistent::notify_startup (void)
     {
       if (this->use_imr_)
         {
@@ -97,8 +96,7 @@ namespace TAO
 
           if (adapter != 0)
             {
-              adapter->imr_notify_startup (this->poa_ ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              adapter->imr_notify_startup (this->poa_);
             }
           else
             {
@@ -109,13 +107,13 @@ namespace TAO
                           ACE_TEXT ("(%P|%t) ERROR: No ImR_Client library ")
                           ACE_TEXT ("available but use IMR has been specified.\n")));
 
-              ACE_THROW (CORBA::INTERNAL ());
+              throw ::CORBA::INTERNAL ();
             }
         }
     }
 
     void
-    LifespanStrategyPersistent::notify_shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    LifespanStrategyPersistent::notify_shutdown (void)
     {
       ImR_Client_Adapter *adapter =
         ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
@@ -124,8 +122,7 @@ namespace TAO
 
       if (adapter != 0)
         {
-          adapter->imr_notify_shutdown (this->poa_ ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          adapter->imr_notify_shutdown (this->poa_);
         }
     }
 
@@ -135,10 +132,9 @@ namespace TAO
     }
 
     void
-    LifespanStrategyPersistent::check_state (ACE_ENV_SINGLE_ARG_DECL)
+    LifespanStrategyPersistent::check_state (void)
     {
-      this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->poa_->tao_poa_manager().check_state ();
     }
 
     ::PortableServer::LifespanPolicyValue
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
index 01634563c72..ce8c9a7bdd6 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
@@ -36,11 +36,11 @@ namespace TAO
     public:
       LifespanStrategyPersistent ();
 
-      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+      virtual void strategy_init(TAO_Root_POA *poa);
 
-      virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL);
+      virtual void notify_startup (void);
 
-      virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL);
+      virtual void notify_shutdown (void);
 
       char key_type (void) const;
 
@@ -55,7 +55,7 @@ namespace TAO
                 const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
 
       /// Check the state of the POA.
-      virtual void check_state (ACE_ENV_SINGLE_ARG_DECL);
+      virtual void check_state (void);
 
       virtual ::PortableServer::LifespanPolicyValue type() const;
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
index ab24406bf5f..29ed3ec4cac 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -40,10 +40,9 @@ namespace TAO
     void
     LifespanStrategyPersistentFactoryImpl::destroy (
       LifespanStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
index b32a3c63440..4be1c1e4a6c 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
@@ -40,7 +40,7 @@ namespace TAO
       /// Cleanup the given strategy instance
       virtual void destroy (
         LifespanStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
index d1859883dac..dd2fd1b5dfb 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -25,12 +25,12 @@ namespace TAO
     }
 
     void
-    LifespanStrategyTransient::notify_startup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    LifespanStrategyTransient::notify_startup (void)
     {
     }
 
     void
-    LifespanStrategyTransient::notify_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    LifespanStrategyTransient::notify_shutdown (void)
     {
     }
 
@@ -41,9 +41,10 @@ namespace TAO
     }
 
     bool
-    LifespanStrategyTransient::validate (
-      CORBA::Boolean is_persistent,
-      const TAO::Portable_Server::Temporary_Creation_Time &creation_time) const
+    LifespanStrategyTransient::validate (CORBA::Boolean is_persistent,
+                                         const TAO::Portable_Server::
+                                         Temporary_Creation_Time
+                                         &creation_time) const
     {
       return (!is_persistent && this->creation_time_ == creation_time);
     }
@@ -53,30 +54,32 @@ namespace TAO
     {
       CORBA::ULong keylength = sizeof (char);
 
-      #if (POA_NO_TIMESTAMP == 0)
-        // Calculate the space required for the timestamp.
-          keylength += TAO::Portable_Server::Creation_Time::creation_time_length ();
-      #endif /* POA_NO_TIMESTAMP */
+#if (POA_NO_TIMESTAMP == 0)
+      // Calculate the space required for the timestamp.
+      keylength += TAO::Portable_Server::Creation_Time::creation_time_length
+        ();
+#endif /* POA_NO_TIMESTAMP */
 
       return keylength;
     }
 
     void
-    LifespanStrategyTransient::create_key (
-      CORBA::Octet *buffer,
-      CORBA::ULong& starting_at)
+    LifespanStrategyTransient::create_key (CORBA::Octet *buffer,
+                                           CORBA::ULong &starting_at)
     {
       // Copy the persistence byte.
-      buffer[starting_at] = (CORBA::Octet) this->key_type ();
+      buffer[starting_at] = (CORBA::Octet)this->key_type ();
       starting_at += this->key_type_length ();
 
-      #if (POA_NO_TIMESTAMP == 0)
-        // Then copy the timestamp for transient POAs.
-        ACE_OS::memcpy (&buffer[starting_at],
-                        this->creation_time_.creation_time (),
-                       TAO::Portable_Server::Creation_Time::creation_time_length ());
-        starting_at += TAO::Portable_Server::Creation_Time::creation_time_length ();
-      #endif /* POA_NO_TIMESTAMP */
+#if (POA_NO_TIMESTAMP == 0)
+      // Then copy the timestamp for transient POAs.
+      ACE_OS::memcpy (&buffer[starting_at],
+                      this->creation_time_.creation_time (),
+                      TAO::Portable_Server::Creation_Time::creation_time_length
+                      ());
+      starting_at += TAO::Portable_Server::Creation_Time::creation_time_length
+        ();
+#endif /* POA_NO_TIMESTAMP */
     }
 
     char
@@ -86,19 +89,17 @@ namespace TAO
     }
 
     void
-    LifespanStrategyTransient::check_state (ACE_ENV_SINGLE_ARG_DECL)
+    LifespanStrategyTransient::check_state (void)
     {
-      if (this->poa_->tao_poa_manager().get_state_i () ==
-            PortableServer::POAManager::INACTIVE)
-      {
-        ACE_THROW (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 4,
-                                            CORBA::COMPLETED_NO));
-      }
+      if (this->poa_->tao_poa_manager ().get_state_i () ==
+        PortableServer::POAManager::INACTIVE)
+        {
+          throw ::CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO);
+        }
       else
-      {
-        this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
-      }
+        {
+          this->poa_->tao_poa_manager ().check_state ();
+        }
     }
 
     bool
@@ -108,7 +109,7 @@ namespace TAO
     }
 
     ::PortableServer::LifespanPolicyValue
-    LifespanStrategyTransient::type() const
+    LifespanStrategyTransient::type () const
     {
       return ::PortableServer::TRANSIENT;
     }
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h
index 6638973712f..46ebb3f5a15 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h
@@ -35,9 +35,9 @@ namespace TAO
     public:
       LifespanStrategyTransient (void);
 
-      virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL);
+      virtual void notify_startup (void);
 
-      virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL);
+      virtual void notify_shutdown (void);
 
       char key_type (void) const;
 
@@ -52,7 +52,7 @@ namespace TAO
                      const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
 
       /// Check the state of the POA.
-      virtual void check_state (ACE_ENV_SINGLE_ARG_DECL);
+      virtual void check_state (void);
 
       virtual ::PortableServer::LifespanPolicyValue type() const;
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
index 896745f0846..0072ac6fd52 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -40,10 +40,9 @@ namespace TAO
     void
     LifespanStrategyTransientFactoryImpl::destroy (
       LifespanStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
index e3a8c076934..dd238cad044 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
@@ -41,7 +41,7 @@ namespace TAO
       /// Cleanup the given strategy instance
       virtual void destroy (
         LifespanStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp
index 007b1ca5e05..7ce7d293988 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp
@@ -14,11 +14,9 @@ ACE_RCSID (PortableServer,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &,
-                                  void *
-                                  ACE_ENV_ARG_DECL)
+TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, void *)
 {
-  ACE_THROW (CORBA::BAD_OPERATION ());
+  throw ::CORBA::BAD_OPERATION ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h
index dd3d9447932..50931390395 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.h
+++ b/TAO/tao/PortableServer/Local_Servant_Base.h
@@ -43,12 +43,10 @@ class TAO_PortableServer_Export TAO_Local_ServantBase
 protected:
   /// This is an auxiliary method for _this().  Make sure *not* to
   /// register with the default POA.
-  TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_Stub *_create_stub (void);
 
   /// Throws CORBA::BAD_OPERATION exception.
-  void _dispatch (TAO_ServerRequest &request,
-                  void *servant_upcall
-                  ACE_ENV_ARG_DECL);
+  void _dispatch (TAO_ServerRequest &request, void *servant_upcall);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.inl b/TAO/tao/PortableServer/Local_Servant_Base.inl
index f811de25b9f..20eaf3f2e55 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.inl
+++ b/TAO/tao/PortableServer/Local_Servant_Base.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_Stub *
-TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Local_ServantBase::_create_stub (void)
 {
   return 0;
 }
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
index 2660f700538..6c3a108831f 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -27,11 +27,13 @@ namespace TAO
       if (this->object_adapter_.non_servant_upcall_nesting_level_ != 0)
         {
           // Remember previous instance of non_servant_upcall.
-          this->previous_ = this->object_adapter_.non_servant_upcall_in_progress_;
+          this->previous_ =
+            this->object_adapter_.non_servant_upcall_in_progress_;
 
           // Assert that the thread is the same as the one before.
-          ACE_ASSERT (ACE_OS::thr_equal (this->object_adapter_.non_servant_upcall_thread_,
-                                         ACE_OS::thr_self ()));
+          ACE_ASSERT (ACE_OS::thr_equal (
+                      this->object_adapter_.non_servant_upcall_thread_,
+                      ACE_OS::thr_self ()));
         }
 
       // Remember which thread is calling the adapter activators.
@@ -67,20 +69,17 @@ namespace TAO
 
           // Check if all pending requests are over.
           if (this->poa_.waiting_destruction () &&
-              this->poa_.outstanding_requests () == 0)
+            this->poa_.outstanding_requests () == 0)
             {
-              ACE_TRY_NEW_ENV
+              try
                 {
-                  this->poa_.complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  this->poa_.complete_destruction_i ();
                 }
-              ACE_CATCHANY
+              catch (const::CORBA::Exception&ex)
                 {
                   // Ignore exceptions
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "TAO_POA::complete_destruction_i");
+                  ex._tao_print_exception ("TAO_POA::complete_destruction_i");
                 }
-              ACE_ENDTRY;
             }
 
           // If locking is enabled.
diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h
index 34d89eb42db..8fab6447616 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ b/TAO/tao/PortableServer/ORT_Adapter.h
@@ -64,12 +64,12 @@ namespace TAO
                           const char *orb_id,
                           PortableInterceptor::AdapterName *,
                           PortableServer::POA_ptr poa
-                          ACE_ENV_ARG_DECL) = 0;
+                          ) = 0;
 
     /// Set a different ort_factory to be used.
     virtual int set_obj_ref_factory (
       PortableInterceptor::ObjectReferenceFactory *current_factory
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+      ) = 0;
 
     /// Accessor methods to ObjectReferenceTemplate template
     virtual PortableInterceptor::ObjectReferenceTemplate *
@@ -99,7 +99,7 @@ namespace TAO
     virtual CORBA::Object_ptr make_object (
       const char * repository_id,
       const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index eba1da2172c..08d88ae3bc8 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -243,56 +243,49 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
 
 void
 TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies
-                                           ACE_ENV_ARG_DECL)
+                                           )
 {
   // Initialize the default policies.
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
   TAO::Portable_Server::ThreadPolicy thread_policy (PortableServer::ORB_CTRL_MODEL);
-  policies.merge_policy (&thread_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.merge_policy (&thread_policy);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if !defined (CORBA_E_MICRO)
   // Lifespan policy.
   TAO::Portable_Server::LifespanPolicy lifespan_policy (PortableServer::TRANSIENT);
-  policies.merge_policy (&lifespan_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.merge_policy (&lifespan_policy);
 #endif
 
 #if !defined (CORBA_E_MICRO)
   // ID uniqueness policy.
   TAO::Portable_Server::IdUniquenessPolicy id_uniqueness_policy (PortableServer::UNIQUE_ID);
-  policies.merge_policy (&id_uniqueness_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.merge_policy (&id_uniqueness_policy);
 #endif
 
 #if !defined (CORBA_E_MICRO)
   // ID assignment policy.
   TAO::Portable_Server::IdAssignmentPolicy id_assignment_policy (PortableServer::SYSTEM_ID);
-  policies.merge_policy (&id_assignment_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.merge_policy (&id_assignment_policy);
 #endif
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   // Implicit activation policy.
   TAO::Portable_Server::ImplicitActivationPolicy implicit_activation_policy
     (PortableServer::NO_IMPLICIT_ACTIVATION);
-  policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.merge_policy (&implicit_activation_policy);
 
   // Servant retention policy.
   TAO::Portable_Server::ServantRetentionPolicy servant_retention_policy
     (PortableServer::RETAIN);
-  policies.merge_policy (&servant_retention_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.merge_policy (&servant_retention_policy);
 
   // Request processing policy.
   TAO::Portable_Server::RequestProcessingPolicy request_processing_policy
     (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
-  policies.merge_policy (&request_processing_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.merge_policy (&request_processing_policy);
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 #if defined (CORBA_E_MICRO)
   ACE_UNUSED_ARG (policies);
@@ -350,7 +343,7 @@ int
 TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
                                       TAO_ServerRequest &req,
                                       CORBA::Object_out forward_to
-                                      ACE_ENV_ARG_DECL)
+                                      )
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
 
@@ -365,8 +358,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
     servant_upcall.prepare_for_upcall (key,
                                        operation,
                                        forward_to
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (result);
+                                      );
 
   if (result != TAO_Adapter::DS_OK)
     return result;
@@ -375,22 +367,19 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
   if (req.collocated ())
     {
       servant_upcall.pre_invoke_collocated_request (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (result);
+        );
     }
   else
     {
       servant_upcall.pre_invoke_remote_request (req
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (result);
+                                               );
     }
 
   // Servant dispatch.
   {
     ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START);
 
-    do_dispatch (req, servant_upcall ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (result);
+    do_dispatch (req, servant_upcall);
   }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -413,7 +402,7 @@ void
 TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
                                 PortableServer::ObjectId &system_id,
                                 TAO_Root_POA *&poa
-                                ACE_ENV_ARG_DECL)
+                                )
 {
   TAO_Object_Adapter::poa_name poa_system_name;
   CORBA::Boolean is_root = false;
@@ -436,7 +425,7 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
   }
 
   if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
+    throw ::CORBA::OBJ_ADAPTER ();
 
   {
     ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_FIND_POA_START);
@@ -446,19 +435,17 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
                              is_root,
                              poa_creation_time,
                              poa
-                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                            );
   }
 
   if (result != 0)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 2,
-                                        CORBA::COMPLETED_NO));
+    throw ::CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 int
 TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
                                   TAO_Root_POA *&poa
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   int result = -1;
 
@@ -481,19 +468,14 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
     {
       TAO_Root_POA *current = 0;
 
-      ACE_TRY
+      try
         {
-          current = parent->find_POA_i (*iterator,
-                                        1
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          current = parent->find_POA_i (*iterator, 1);
         }
-      ACE_CATCH (PortableServer::POA::AdapterNonExistent, ex)
+      catch (const PortableServer::POA::AdapterNonExistent&)
         {
           return -1;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
 
       parent = current;
     }
@@ -503,7 +485,6 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
 #else
   ACE_UNUSED_ARG (folded_name);
   ACE_UNUSED_ARG (poa);
-  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   return result;
@@ -514,7 +495,7 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
                                         CORBA::Boolean root,
                                         const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
                                         TAO_Root_POA *&poa
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        )
 {
   int result = 0;
 
@@ -541,12 +522,9 @@ TAO_Object_Adapter::bind_poa (const poa_name &folded_name,
                               poa_name_out system_name)
 {
   if (poa->persistent ())
-    return this->bind_persistent_poa (folded_name,
-                                      poa,
-                                      system_name);
+    return this->bind_persistent_poa (folded_name, poa, system_name);
   else
-    return this->bind_transient_poa (poa,
-                                     system_name);
+    return this->bind_transient_poa (poa, system_name);
 }
 
 int
@@ -555,33 +533,24 @@ TAO_Object_Adapter::unbind_poa (TAO_Root_POA *poa,
                                 const poa_name &system_name)
 {
   if (poa->persistent ())
-    return this->unbind_persistent_poa (folded_name,
-                                        system_name);
+    return this->unbind_persistent_poa (folded_name, system_name);
   else
     return this->unbind_transient_poa (system_name);
 }
 
 int
-TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key
-                                      ACE_ENV_ARG_DECL)
+TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START);
 
   PortableServer::ObjectId id;
   TAO_Root_POA *poa = 0;
 
-  this->locate_poa (key,
-                    id,
-                    poa
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->locate_poa (key, id, poa);
 
   PortableServer::Servant servant = 0;
   TAO_SERVANT_LOCATION servant_location =
-    poa->locate_servant_i (id,
-                           servant
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->locate_servant_i (id, servant);
 
   switch (servant_location)
     {
@@ -600,33 +569,24 @@ TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key
 
 TAO_SERVANT_LOCATION
 TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key,
-                                    PortableServer::Servant &servant
-                                    ACE_ENV_ARG_DECL)
+                                    PortableServer::Servant &servant)
 {
   PortableServer::ObjectId id;
   TAO_Root_POA *poa = 0;
 
-  this->locate_poa (key,
-                    id,
-                    poa
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
+  this->locate_poa (key, id, poa);
 
   TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id,
-                                                                 servant
-                                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
+                                                                 servant);
 
   return servant_location;
 }
 
 void
-TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Object_Adapter::open (void)
 {
   // Add in the default POA policies to the default list.
-  this->init_default_policies (this->default_poa_policies ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->init_default_policies (this->default_poa_policies ());
 
   // If a POA extension hasn't changed the servant dispatcher, initialize the
   // default one.
@@ -644,9 +604,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   ::CORBA::PolicyList policy;
   PortableServer::POAManager_var poa_manager
     = poa_manager_factory_->create_POAManager (TAO_DEFAULT_ROOTPOAMANAGER_NAME,
-                                              policy
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              policy);
 #else
   PortableServer::POAManager_ptr poa_manager_ptr;
   ::CORBA::PolicyList policy_list;
@@ -655,7 +613,6 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
                     CORBA::NO_MEMORY
                     (CORBA::SystemException::_tao_minor_code (0, ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager = poa_manager_ptr;
   // Keep reference of POAManager in TAO_Object_Adapter so the POAManager
@@ -666,8 +623,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
 
   // This makes sure that the default resources are open when the Root
   // POA is created.
-  this->orb_core_.thread_lane_resources_manager ().open_default_resources (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_core_.thread_lane_resources_manager ().open_default_resources ();
 
   TAO_POA_Policy_Set policies (this->default_poa_policies ());
 
@@ -680,14 +636,11 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   // Implicit activation policy.
   TAO::Portable_Server::ImplicitActivationPolicy implicit_activation_policy
     (PortableServer::IMPLICIT_ACTIVATION);
-  policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.merge_policy (&implicit_activation_policy);
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Merge policies from the ORB level.
-  this->validator ().merge_policies (policies.policies ()
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validator ().merge_policies (policies.policies ());
 
   // If any of the policy objects specified are not valid for the ORB
   // implementation, if conflicting policy objects are specified, or
@@ -695,10 +648,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   // administrative action that has not been performed, an
   // InvalidPolicy exception is raised containing the index in the
   // policies parameter value of the first offending policy object.
-  policies.validate_policies (this->validator (),
-                              this->orb_core_
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies.validate_policies (this->validator (), this->orb_core_);
 
   // Construct a new POA
   TAO_Root_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME);
@@ -710,8 +660,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
                                                 this->thread_lock (),
                                                 this->orb_core_,
                                                 this
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               );
 
   // The Object_Adapter will keep a reference to the Root POA so that
   // on its destruction, it can check whether the Root POA has been
@@ -719,22 +668,18 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   this->root_->_add_ref ();
 
   // Lock access for the duration of this transaction.
-  TAO::Portable_Server::POA_Guard poa_guard (*this->root_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO::Portable_Server::POA_Guard poa_guard (*this->root_);
 
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
   // for this servant.
-  this->root_->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->root_->establish_components ();
 }
 
 void
-TAO_Object_Adapter::close (int wait_for_completion
-                           ACE_ENV_ARG_DECL)
+TAO_Object_Adapter::close (int wait_for_completion)
 {
-  this->check_close (wait_for_completion ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->check_close (wait_for_completion);
 
   // Shutting down the ORB causes all object adapters to be destroyed,
   // since they cannot exist in the absence of an ORB. Shut down is
@@ -762,11 +707,8 @@ TAO_Object_Adapter::close (int wait_for_completion
     this->poa_manager_factory_ = 0;
 #endif
   }
-  CORBA::Boolean etherealize_objects = 1;
-  root->destroy (etherealize_objects,
-                 wait_for_completion
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Boolean etherealize_objects = true;
+  root->destroy (etherealize_objects, wait_for_completion);
   ::CORBA::release (root);
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   release_poa_manager_factory (factory);
@@ -774,13 +716,10 @@ TAO_Object_Adapter::close (int wait_for_completion
 }
 
 void
-TAO_Object_Adapter::check_close (int wait_for_completion
-                                 ACE_ENV_ARG_DECL)
+TAO_Object_Adapter::check_close (int wait_for_completion)
 {
   TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (),
-                                                 wait_for_completion
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                 wait_for_completion);
 }
 
 int
@@ -792,8 +731,7 @@ TAO_Object_Adapter::priority (void) const
 int
 TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                               TAO_ServerRequest &request,
-                              CORBA::Object_out forward_to
-                              ACE_ENV_ARG_DECL)
+                              CORBA::Object_out forward_to)
 {
   if (key.length() < TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE
       || ACE_OS::memcmp (key.get_buffer (),
@@ -809,7 +747,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
   TAO::ServerRequestInterceptor_Adapter *sri_adapter =
     orb_core_.serverrequestinterceptor_adapter ();
 
-  ACE_TRY
+  try
     {
       if (sri_adapter != 0)
         {
@@ -822,8 +760,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                                  0,  // exceptions
                                                  0, // nexceptions
                                                  ocs.out ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                );
 
           /// If we have a cached result, just go ahead and send the reply
           /// and let us  return
@@ -854,8 +791,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                                          0,  // servant_upcall
                                                          0,  // exceptions
                                                          0   // nexceptions
-                                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                        );
 
           // If a PortableInterceptor::ForwardRequest exception was
           // thrown, then set the forward_to object reference and return
@@ -871,10 +807,9 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
       result = this->dispatch_servant (key,
                                        request,
                                        forward_to
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
 
 #if TAO_HAS_INTERCEPTORS == 1
-      ACE_TRY_CHECK;
 
       if (result == TAO_Adapter::DS_FORWARD)
         {
@@ -887,12 +822,11 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                        0,  // servant_upcall
                                        0,  // exceptions
                                        0   // nexceptions
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                      );
             }
         }
     }
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception& ex)
     {
       // Just assume the current exception is a system exception, the
       // status can only change when the interceptor changes this
@@ -903,7 +837,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
 
       if (sri_adapter != 0)
         {
-          request.caught_exception (&ACE_ANY_EXCEPTION);
+          request.caught_exception (&ex);
 
           sri_adapter->send_exception (request,
                                        0,  // args
@@ -911,8 +845,7 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
                                        0,  // servant_upcall
                                        0,  // exceptions
                                        0   // nexceptions
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                      );
 
           status =
             request.reply_status ();
@@ -924,11 +857,9 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
       if (status == PortableInterceptor::SYSTEM_EXCEPTION
           || status == PortableInterceptor::USER_EXCEPTION)
         {
-          ACE_RE_THROW;
+          throw;
         }
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (result);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
   return result;
@@ -1026,18 +957,13 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp)
 
       TAO_ServantBase *servant = 0;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
-          this->find_servant (objkey.in (),
-              servant
-              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->find_servant (objkey.in (), servant);
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception&)
         {
         }
-      ACE_ENDTRY;
 
       return servant;
     }
@@ -1069,8 +995,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void)
 int
 TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (
   const poa_name &system_name,
-  TAO_Root_POA *&poa
-  ACE_ENV_ARG_DECL)
+  TAO_Root_POA *&poa)
 {
   poa_name folded_name;
   int result = this->persistent_poa_system_map_.recover_key (system_name,
@@ -1078,8 +1003,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (
 
   if (result == 0)
     {
-      result = this->persistent_poa_system_map_.find (system_name,
-                                                      poa);
+      result = this->persistent_poa_system_map_.find (system_name, poa);
       if (result != 0
           || folded_name != poa->folded_name ())
         {
@@ -1088,11 +1012,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (
                                                                    poa);
           if (result != 0)
             {
-              result =
-                this->object_adapter_->activate_poa (folded_name,
-                                                     poa
-                                                     ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (-1);
+              result = this->object_adapter_->activate_poa (folded_name, poa);
             }
         }
     }
@@ -1148,8 +1068,7 @@ TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
 int
 TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (
   const poa_name &system_name,
-  TAO_Root_POA *&poa
-  ACE_ENV_ARG_DECL)
+  TAO_Root_POA *&poa)
 {
   int result =
     this->object_adapter_->persistent_poa_name_map_->find (system_name,
@@ -1157,10 +1076,7 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (
   if (result != 0)
     {
       result =
-        this->object_adapter_->activate_poa (system_name,
-                                             poa
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        this->object_adapter_->activate_poa (system_name, poa);
     }
 
   return result;
@@ -1173,8 +1089,7 @@ TAO_Object_Adapter::No_Hint_Strategy::bind_persistent_poa (
   poa_name_out system_name)
 {
   int result =
-    this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                           poa);
+    this->object_adapter_->persistent_poa_name_map_->bind (folded_name, poa);
   if (result == 0)
     ACE_NEW_RETURN (system_name,
                     poa_name (folded_name),
@@ -1279,7 +1194,7 @@ TAO_Object_Adapter::iteratable_poa_name::end (void) const
 }
 
 void
-TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void)
 {
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
@@ -1290,10 +1205,9 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG
                               ACE_OS::thr_self ()))
     {
       // If so wait...
-      int result =
-        this->non_servant_upcall_condition_.wait ();
+      int const result = this->non_servant_upcall_condition_.wait ();
       if (result == -1)
-        ACE_THROW (CORBA::OBJ_ADAPTER ());
+        throw ::CORBA::OBJ_ADAPTER ();
     }
 }
 
@@ -1301,18 +1215,16 @@ void
 TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void)
 {
   // Non-exception throwing version.
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->wait_for_non_servant_upcalls_to_complete ();
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR,
                   "TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete "
                   "threw exception it should not have!\n"));
     }
-  ACE_ENDTRY;
 }
 
 void
@@ -1327,12 +1239,9 @@ TAO_Object_Adapter::servant_dispatcher (TAO_Servant_Dispatcher *dispatcher)
 void
 TAO_Object_Adapter::do_dispatch (TAO_ServerRequest& req,
                                  TAO::Portable_Server::Servant_Upcall& upcall
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
-  upcall.servant ()->_dispatch(req,
-                               &upcall
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  upcall.servant ()->_dispatch(req, &upcall);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index b2c6418afc9..1a9c0e22ef3 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -92,21 +92,21 @@ public:
   int dispatch_servant (const TAO::ObjectKey &key,
                         TAO_ServerRequest &req,
                         CORBA::Object_out forward_to
-                        ACE_ENV_ARG_DECL);
+                       );
 
   int locate_servant (const TAO::ObjectKey &key
-                      ACE_ENV_ARG_DECL);
+                     );
 
   TAO_SERVANT_LOCATION find_servant (const TAO::ObjectKey &key,
                                      PortableServer::Servant &servant
-                                     ACE_ENV_ARG_DECL);
+                                    );
 
   int find_poa (const poa_name &system_name,
                 CORBA::Boolean activate_it,
                 CORBA::Boolean root,
                 const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
                 TAO_Root_POA *&poa
-                ACE_ENV_ARG_DECL);
+               );
 
   int bind_poa (const poa_name &folded_name,
                 TAO_Root_POA *poa,
@@ -118,7 +118,7 @@ public:
 
   int activate_poa (const poa_name &folded_name,
                     TAO_Root_POA *&poa
-                    ACE_ENV_ARG_DECL);
+                   );
 
   ACE_Lock &lock (void);
 
@@ -133,7 +133,7 @@ public:
   TAO_ORB_Core &orb_core (void) const;
 
   /// Wait for non-servant upcalls to complete.
-  void wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_DECL);
+  void wait_for_non_servant_upcalls_to_complete (void);
 
   /// Non-exception throwing version.
   void wait_for_non_servant_upcalls_to_complete_no_throw (void);
@@ -155,20 +155,20 @@ public:
 
   /// Initialize the default set of POA policies.
   void init_default_policies (TAO_POA_Policy_Set &policies
-                              ACE_ENV_ARG_DECL);
+                             );
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void open (void);
   virtual void close (int wait_for_completion
-                      ACE_ENV_ARG_DECL);
+                     );
   virtual void check_close (int wait_for_completion
-                            ACE_ENV_ARG_DECL);
+                           );
   virtual int priority (void) const;
   virtual int dispatch (TAO::ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out forward_to
-                        ACE_ENV_ARG_DECL);
+                       );
   virtual const char *name (void) const;
   virtual CORBA::Object_ptr root (void);
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
@@ -179,31 +179,31 @@ public:
 protected:
 
   int locate_servant_i (const TAO::ObjectKey &key
-                        ACE_ENV_ARG_DECL);
+                       );
 
   TAO_SERVANT_LOCATION find_servant_i (const TAO::ObjectKey &key,
                                        PortableServer::Servant &servant
-                                       ACE_ENV_ARG_DECL);
+                                      );
 
   void dispatch_servant_i (const TAO::ObjectKey &key,
                            TAO_ServerRequest &req,
                            void *context
-                           ACE_ENV_ARG_DECL);
+                          );
 
   void locate_poa (const TAO::ObjectKey &key,
                    PortableServer::ObjectId &id,
                    TAO_Root_POA *&poa
-                   ACE_ENV_ARG_DECL);
+                  );
 
   int find_transient_poa (const poa_name &system_name,
                           CORBA::Boolean root,
                           const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
                           TAO_Root_POA *&poa
-                          ACE_ENV_ARG_DECL);
+                         );
 
   int find_persistent_poa (const poa_name &system_name,
                            TAO_Root_POA *&poa
-                           ACE_ENV_ARG_DECL);
+                          );
 
   int bind_transient_poa (TAO_Root_POA *poa,
                           poa_name_out system_name);
@@ -222,7 +222,7 @@ protected:
 
   virtual void do_dispatch (TAO_ServerRequest& req,
                             TAO::Portable_Server::Servant_Upcall& upcall
-                            ACE_ENV_ARG_DECL);
+                           );
 
 public:
 
@@ -242,7 +242,7 @@ public:
 
     virtual int find_persistent_poa (const poa_name &system_name,
                                      TAO_Root_POA *&poa
-                                     ACE_ENV_ARG_DECL) = 0;
+                                     ) = 0;
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
                                      TAO_Root_POA *poa,
@@ -277,7 +277,7 @@ public:
 
     virtual int find_persistent_poa (const poa_name &system_name,
                                      TAO_Root_POA *&poa
-                                     ACE_ENV_ARG_DECL);
+                                    );
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
                                      TAO_Root_POA *poa,
@@ -315,7 +315,7 @@ public:
 
     virtual int find_persistent_poa (const poa_name &system_name,
                                      TAO_Root_POA *&poa
-                                     ACE_ENV_ARG_DECL);
+                                    );
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
                                      TAO_Root_POA *poa,
diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl
index 2fe048e9a5e..0a0777bc6ab 100644
--- a/TAO/tao/PortableServer/Object_Adapter.inl
+++ b/TAO/tao/PortableServer/Object_Adapter.inl
@@ -51,36 +51,36 @@ TAO_Object_Adapter::transient_poa_name_size ()
 
 ACE_INLINE int
 TAO_Object_Adapter::locate_servant (const TAO::ObjectKey &key
-                                    ACE_ENV_ARG_DECL)
+                                    )
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (-1);
 
   return this->locate_servant_i (key
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
 }
 
 ACE_INLINE TAO_SERVANT_LOCATION
 TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key,
                                   PortableServer::Servant &servant
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND);
 
   return this->find_servant_i (key,
                                servant
-                               ACE_ENV_ARG_PARAMETER);
+                              );
 }
 
 ACE_INLINE int
 TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
                                          TAO_Root_POA *&poa
-                                         ACE_ENV_ARG_DECL)
+                                         )
 {
   return this->hint_strategy_->find_persistent_poa (system_name,
                                                     poa
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   );
 }
 
 ACE_INLINE int
@@ -89,13 +89,13 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name,
                               CORBA::Boolean root,
                               const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
                               TAO_Root_POA *&poa
-                              ACE_ENV_ARG_DECL)
+                              )
 {
   if (activate_it)
     {
       return this->find_persistent_poa (system_name,
                                         poa
-                                        ACE_ENV_ARG_PARAMETER);
+                                       );
     }
   else
     {
@@ -103,7 +103,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name,
                                        root,
                                        poa_creation_time,
                                        poa
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
     }
 }
 
diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h
index d573d2c9f8e..87b81a7dec7 100644
--- a/TAO/tao/PortableServer/Operation_Table.h
+++ b/TAO/tao/PortableServer/Operation_Table.h
@@ -29,27 +29,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ServerRequest;
 class TAO_Abstract_ServantBase;
 
-namespace CORBA
-{
-  class Environment;
-}
-
 typedef void (*TAO_Skeleton)(
     TAO_ServerRequest &,
     void *,
     void *
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
   );
 
 typedef void (*TAO_Collocated_Skeleton)(
     TAO_Abstract_ServantBase *,
     TAO::Argument **,
     int
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
-    , CORBA::Environment &
-#endif
   );
 
 /**
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 344495551a1..a271dfdf4d1 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -53,14 +53,14 @@ TAO_POA_Manager::~TAO_POA_Manager (void)
 }
 
 char *
-TAO_POA_Manager::get_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_POA_Manager::get_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->id_.in ());
 }
 
 void
-TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_POA_Manager::activate_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
@@ -71,7 +71,7 @@ TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL)
 
   if (this->state_ == PortableServer::POAManager::INACTIVE)
     {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
+      throw PortableServer::POAManager::AdapterInactive ();
     }
   else
     {
@@ -88,22 +88,20 @@ TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   this->adapter_manager_state_changed (this->state_
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      );
 }
 
 void
 TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
                                CORBA::Boolean wait_for_completion
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
                                                       wait_for_completion
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                     );
 
   // This operation changes the state of the POA manager to
   // inactive. If issued while the POA manager is in the inactive
@@ -113,7 +111,7 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
 
   if (this->state_ == PortableServer::POAManager::INACTIVE)
     {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
+      throw PortableServer::POAManager::AdapterInactive ();
     }
   else
     {
@@ -157,8 +155,7 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
 
       poa->deactivate_all_objects_i (etherealize_objects,
                                      wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    );
     }
 
   // If the ORB::shutdown operation is called, it makes a call on
@@ -168,13 +165,12 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
   // of ORB::shutdown.
 
   this->adapter_manager_state_changed (this->state_
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      );
 }
 
 void
 TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::State state
-                                                ACE_ENV_ARG_DECL)
+                                                )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::AdapterState adapter_state =
@@ -187,8 +183,7 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat
     {
       ior_adapter->adapter_manager_state_changed (this->id_.in (),
                                                   adapter_state
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                 );
     }
 }
 
@@ -196,15 +191,14 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat
 
 void
 TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
                                                       wait_for_completion
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                     );
 
   // This operation changes the state of the POA manager to
   // holding. If issued while the POA manager is in the inactive
@@ -216,7 +210,7 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
 
   if (this->state_ == PortableServer::POAManager::INACTIVE)
     {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
+      throw PortableServer::POAManager::AdapterInactive ();
     }
   else
     {
@@ -244,27 +238,24 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
         {
           TAO_Root_POA *poa = *iterator;
           poa->wait_for_completions (wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                    );
         }
     }
 
   this->adapter_manager_state_changed (this->state_
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      );
 }
 
 void
 TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
-                                     ACE_ENV_ARG_DECL)
+                                     )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
                                                       wait_for_completion
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                     );
 
   // This operation changes the state of the POA manager to
   // discarding. If issued while the POA manager is in the inactive
@@ -277,7 +268,7 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
 
   if (this->state_ == PortableServer::POAManager::INACTIVE)
     {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
+      throw PortableServer::POAManager::AdapterInactive ();
     }
   else
     {
@@ -306,13 +297,12 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
         {
           TAO_Root_POA *poa = *iterator;
           poa->wait_for_completions (wait_for_completion
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                    );
         }
     }
 
   this->adapter_manager_state_changed (this->state_
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -322,10 +312,10 @@ TAO_POA_Manager::remove_poa (TAO_Root_POA *poa)
 {
   int const result = this->poa_collection_.remove (poa);
 
-  // The #if really only needs to go around the 
-  // "this->poa_manager_factory_.remove_poamanager (this);" line, but it's 
-  // moved out as an optimization for now.  If additional non-CORBA/e and 
-  // non-minimum POA code needs to go in that clause the #if would have to 
+  // The #if really only needs to go around the
+  // "this->poa_manager_factory_.remove_poamanager (this);" line, but it's
+  // moved out as an optimization for now.  If additional non-CORBA/e and
+  // non-minimum POA code needs to go in that clause the #if would have to
   // move back in.
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -347,7 +337,7 @@ TAO_POA_Manager::register_poa (TAO_Root_POA *poa)
 }
 
 void
-TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO_POA_Manager::check_state (void)
 {
   if (state_ == PortableServer::POAManager::ACTIVE)
     {
@@ -367,12 +357,12 @@ TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL)
       // should be re-issued. (Of course, an ORB may always reject a
       // request for other reasons and raise some other system
       // exception.)
-      ACE_THROW (
+      throw
         CORBA::TRANSIENT (
           CORBA::SystemException::_tao_minor_code (
             TAO_POA_DISCARDING,
             1),
-          CORBA::COMPLETED_NO));
+          CORBA::COMPLETED_NO);
     }
 
   if (state_ == PortableServer::POAManager::HOLDING)
@@ -388,7 +378,7 @@ TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL)
 
       // Since there is no queuing in TAO, we immediately raise a
       // TRANSIENT exception.
-      ACE_THROW (CORBA::TRANSIENT (
+      throw ( ::CORBA::TRANSIENT (
         CORBA::SystemException::_tao_minor_code (
           TAO_POA_HOLDING,
           1),
@@ -408,7 +398,7 @@ TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL)
       // co-resident in the same process, the ORB could raise the
       // OBJ_ADAPTER system exception, with standard minor code 1, to
       // indicate that the object implementation is unavailable.
-      ACE_THROW (CORBA::OBJ_ADAPTER (
+      throw ( ::CORBA::OBJ_ADAPTER (
         CORBA::SystemException::_tao_minor_code (
           TAO_POA_INACTIVE,
           1),
@@ -417,7 +407,7 @@ TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::ORB_ptr
-TAO_POA_Manager::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_POA_Manager::_get_orb (void)
 {
   return CORBA::ORB::_duplicate (this->object_adapter_.orb_core ().orb ());
 }
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 386f008e10c..6e37d9db634 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -62,34 +62,34 @@ class TAO_PortableServer_Export TAO_POA_Manager :
 
 public:
 
-  void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void activate (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   void hold_requests (CORBA::Boolean wait_for_completion
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void discard_requests (CORBA::Boolean wait_for_completion
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                         )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void deactivate (CORBA::Boolean etherealize_objects,
                    CORBA::Boolean wait_for_completion
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                   )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::POAManager::State get_state (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAManager::State get_state (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char *get_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  char *get_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   TAO_POA_Manager (TAO_Object_Adapter &object_adapter,
@@ -104,13 +104,13 @@ public:
   ~TAO_POA_Manager (void);
 
   /// Check the state of this POA manager
-  void check_state (ACE_ENV_SINGLE_ARG_DECL);
+  void check_state (void);
 
   PortableServer::POAManager::State get_state_i ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ORB_ptr _get_orb (
-      ACE_ENV_SINGLE_ARG_DECL
+
     );
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
@@ -119,31 +119,31 @@ public:
 
 protected:
 
-  void activate_i (ACE_ENV_SINGLE_ARG_DECL)
+  void activate_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void deactivate_i (CORBA::Boolean etherealize_objects,
                      CORBA::Boolean wait_for_completion
-                     ACE_ENV_ARG_DECL)
+                     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   /// Method needed for notifying the IORInterceptors that the state
   /// of POAManager changed.
   void adapter_manager_state_changed (PortableServer::POAManager::State state
-                                      ACE_ENV_ARG_DECL)
+                                      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   void hold_requests_i (CORBA::Boolean wait_for_completion
-                        ACE_ENV_ARG_DECL)
+                        )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void discard_requests_i (CORBA::Boolean wait_for_completion
-                           ACE_ENV_ARG_DECL)
+                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
@@ -170,7 +170,7 @@ protected:
   CORBA::String_var id_;
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-  
+
   TAO_POAManager_Factory& poa_manager_factory_;
   CORBA::PolicyList policies_;
 
diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl
index 9c47eea1ba6..c8bcd0e7c50 100644
--- a/TAO/tao/PortableServer/POAManager.inl
+++ b/TAO/tao/PortableServer/POAManager.inl
@@ -14,46 +14,46 @@ TAO_POA_Manager::lock (void)
 }
 
 ACE_INLINE void
-TAO_POA_Manager::activate (ACE_ENV_SINGLE_ARG_DECL)
+TAO_POA_Manager::activate (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
 
-  this->activate_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->activate_i ();
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE void
 TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion
-                                ACE_ENV_ARG_DECL)
+                                )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
 
-  this->hold_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER);
+  this->hold_requests_i (wait_for_completion);
 }
 
 ACE_INLINE void
 TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion
-                                   ACE_ENV_ARG_DECL)
+                                   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
 
-  this->discard_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER);
+  this->discard_requests_i (wait_for_completion);
 }
 
 ACE_INLINE void
 TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
                              CORBA::Boolean wait_for_completion
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
@@ -62,7 +62,7 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
 
   this->deactivate_i (etherealize_objects,
                       wait_for_completion
-                      ACE_ENV_ARG_PARAMETER);
+                     );
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -75,7 +75,7 @@ TAO_POA_Manager::get_state_i (void)
 }
 
 ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO_POA_Manager::get_state (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access to the POAManager for the duration of this transaction
@@ -130,7 +130,7 @@ TAO_POA_Manager::generate_manager_id (void) const
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::PolicyList& TAO_POA_Manager::get_policies ()
 {
   return this->policies_;
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp
index a52000bd13b..8fa54df8ab7 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.cpp
+++ b/TAO/tao/PortableServer/POAManagerFactory.cpp
@@ -27,7 +27,7 @@ TAO_POAManager_Factory::~TAO_POAManager_Factory (void)
 TAO_POAManager_Factory::create_POAManager (
   const char * id,
   const ::CORBA::PolicyList & policies
-  ACE_ENV_ARG_DECL)
+  )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ::PortableServer::POAManagerFactory::ManagerAlreadyExists,
                      ::CORBA::PolicyError))
@@ -37,13 +37,11 @@ TAO_POAManager_Factory::create_POAManager (
 
   // Merge policies from the ORB level.
   this->object_adapter_.validator ().merge_policies (tao_policies.policies ()
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ());
+                                                     );
 
   // Merge in any policies that the user may have specified.
   tao_policies.merge_policies (policies
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ());
+                             );
 
   // If any of the policy objects specified are not valid for the ORB
   // implementation, if conflicting policy objects are specified, or
@@ -53,15 +51,13 @@ TAO_POAManager_Factory::create_POAManager (
   // policies parameter value of the first offending policy object.
   tao_policies.validate_policies (this->object_adapter_.validator (),
                                   this->object_adapter_.orb_core ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ());
+                                 );
 
   PortableServer::POAManager_var poamanager;
 
   if (id != 0)
   {
-    poamanager = this->find (id ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ());
+    poamanager = this->find (id);
 
     // If we already have a manager with the same name throw an exception
     if (!CORBA::is_nil (poamanager.in()))
@@ -81,7 +77,6 @@ TAO_POAManager_Factory::create_POAManager (
                       CORBA::NO_MEMORY
                       (CORBA::SystemException::_tao_minor_code (0, ENOMEM),
                        CORBA::COMPLETED_NO));
-    ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ());
     poamanager = pm;
   }
 
@@ -92,7 +87,7 @@ TAO_POAManager_Factory::create_POAManager (
 
 ::PortableServer::POAManagerFactory::POAManagerSeq *
 TAO_POAManager_Factory::list (
-  ACE_ENV_SINGLE_ARG_DECL)
+  void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers;
@@ -102,7 +97,6 @@ TAO_POAManager_Factory::list (
                     PortableServer::POAManagerFactory::POAManagerSeq (
                       number_of_poamanagers),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   poamanagers->length (number_of_poamanagers);
 
@@ -121,7 +115,7 @@ TAO_POAManager_Factory::list (
 
 ::PortableServer::POAManager_ptr
 TAO_POAManager_Factory::find (
-  const char * id ACE_ENV_ARG_DECL)
+  const char * id )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ::PortableServer::POAManager_ptr poamanager =
@@ -132,8 +126,7 @@ TAO_POAManager_Factory::find (
         ++iterator)
     {
       CORBA::String_var poamanagerid =
-        (*iterator)->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (::PortableServer::POAManager::_nil());
+        (*iterator)->get_id ();
 
       if (ACE_OS::strcmp (id, poamanagerid.in()) == 0)
         {
diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h
index 105bd3aa3d9..ea0fa1d0cee 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.h
+++ b/TAO/tao/PortableServer/POAManagerFactory.h
@@ -50,17 +50,17 @@ public:
   virtual ::PortableServer::POAManager_ptr create_POAManager (
       const char * id,
       const ::CORBA::PolicyList & policies
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                       ::PortableServer::POAManagerFactory::ManagerAlreadyExists,
                       ::CORBA::PolicyError));
 
   virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (
-      ACE_ENV_SINGLE_ARG_DECL)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::PortableServer::POAManager_ptr find (
-      const char * id ACE_ENV_ARG_DECL)
+      const char * id )
   ACE_THROW_SPEC ((CORBA::SystemException));
 
   void remove_all_poamanagers (void);
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 78817e266f0..561ddb683bb 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -44,33 +44,30 @@ namespace TAO
 
     void
     Cached_Policies::update (TAO_POA_Policy_Set &policy_set
-                                     ACE_ENV_ARG_DECL)
+                                     )
     {
       for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++)
         {
           CORBA::Policy_var policy = policy_set.get_policy_by_index (i);
 
           this->update_policy (policy.in ()
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                              );
         }
     }
 
     void
     Cached_Policies::update_policy (const CORBA::Policy_ptr policy
-                                    ACE_ENV_ARG_DECL)
+                                    )
     {
 
     #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
       ::PortableServer::ThreadPolicy_var thread
         = ::PortableServer::ThreadPolicy::_narrow (policy
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                  );
 
       if (!CORBA::is_nil (thread.in ()))
         {
-          this->thread_ = thread->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->thread_ = thread->value ();
 
           return;
         }
@@ -79,13 +76,11 @@ namespace TAO
     #if !defined (CORBA_E_MICRO)
       ::PortableServer::LifespanPolicy_var lifespan
         = ::PortableServer::LifespanPolicy::_narrow (policy
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                    );
 
       if (!CORBA::is_nil (lifespan.in ()))
         {
-          this->lifespan_ = lifespan->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->lifespan_ = lifespan->value ();
 
           return;
         }
@@ -94,13 +89,11 @@ namespace TAO
     #if !defined (CORBA_E_MICRO)
       ::PortableServer::IdUniquenessPolicy_var id_uniqueness
         = ::PortableServer::IdUniquenessPolicy::_narrow (policy
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                        );
 
       if (!CORBA::is_nil (id_uniqueness.in ()))
         {
-          this->id_uniqueness_ = id_uniqueness->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->id_uniqueness_ = id_uniqueness->value ();
 
           return;
         }
@@ -109,13 +102,11 @@ namespace TAO
     #if !defined (CORBA_E_MICRO)
       ::PortableServer::IdAssignmentPolicy_var id_assignment
         = ::PortableServer::IdAssignmentPolicy::_narrow (policy
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                        );
 
       if (!CORBA::is_nil (id_assignment.in ()))
         {
-          this->id_assignment_ = id_assignment->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->id_assignment_ = id_assignment->value ();
 
           return;
         }
@@ -125,39 +116,33 @@ namespace TAO
 
       ::PortableServer::ImplicitActivationPolicy_var implicit_activation
         = ::PortableServer::ImplicitActivationPolicy::_narrow (policy
-                                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                              );
 
       if (!CORBA::is_nil (implicit_activation.in ()))
         {
-          this->implicit_activation_ = implicit_activation->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->implicit_activation_ = implicit_activation->value ();
 
           return;
         }
 
       ::PortableServer::ServantRetentionPolicy_var servant_retention
         = ::PortableServer::ServantRetentionPolicy::_narrow (policy
-                                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                            );
 
       if (!CORBA::is_nil (servant_retention.in ()))
         {
-          this->servant_retention_ = servant_retention->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->servant_retention_ = servant_retention->value ();
 
           return;
         }
 
       ::PortableServer::RequestProcessingPolicy_var request_processing
         = ::PortableServer::RequestProcessingPolicy::_narrow (policy
-                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                             );
 
       if (!CORBA::is_nil (request_processing.in ()))
         {
-          this->request_processing_ = request_processing->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->request_processing_ = request_processing->value ();
 
           return;
         }
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index c4b29a57d8e..60465f8238a 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -56,7 +56,7 @@ namespace TAO
 
       /// Update the cached policy values.
       void update (TAO_POA_Policy_Set &policy_set
-                   ACE_ENV_ARG_DECL);
+                  );
 
       /**
        * @name Accessor methods to cached values.
@@ -81,7 +81,7 @@ namespace TAO
 
       /// Helper method to update a particular policy.
       void update_policy (const CORBA::Policy_ptr policy
-                          ACE_ENV_ARG_DECL);
+                         );
 
       ::PortableServer::ThreadPolicyValue thread_;
 
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
index a1e30c3faed..2dcaf4ceefa 100644
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -18,7 +18,7 @@ namespace TAO
   namespace Portable_Server
   {
     PortableServer::POA_ptr
-    POA_Current::get_POA (ACE_ENV_SINGLE_ARG_DECL)
+    POA_Current::get_POA (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::Current::NoContext))
     {
@@ -31,7 +31,7 @@ namespace TAO
     }
 
     PortableServer::ObjectId *
-    POA_Current::get_object_id (ACE_ENV_SINGLE_ARG_DECL)
+    POA_Current::get_object_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::Current::NoContext))
     {
@@ -44,7 +44,7 @@ namespace TAO
     }
 
     PortableServer::Servant
-    POA_Current::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+    POA_Current::get_servant (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::Current::NoContext))
     {
@@ -57,7 +57,7 @@ namespace TAO
     }
 
     CORBA::Object_ptr
-    POA_Current::get_reference (ACE_ENV_SINGLE_ARG_DECL)
+    POA_Current::get_reference (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::Current::NoContext))
     {
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
index 4af15a2b241..57a97f0e37e 100644
--- a/TAO/tao/PortableServer/POA_Current.h
+++ b/TAO/tao/PortableServer/POA_Current.h
@@ -48,7 +48,7 @@ namespace TAO
        * Can raise the @c NoContext exception if this function is
        * not invoked in the context of an upcall.
        */
-      PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL)
+      PortableServer::POA_ptr get_POA (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::Current::NoContext));
 
@@ -57,7 +57,7 @@ namespace TAO
        * raise the @c NoContext exception if this function is not
        * invoked in the context of an upcall.
        */
-      PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL)
+      PortableServer::ObjectId *get_object_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::Current::NoContext));
 
@@ -70,7 +70,7 @@ namespace TAO
        * Object::is_equivalent operation to compare the two references may not
        * necessarily return true.
        */
-      CORBA::Object_ptr get_reference (ACE_ENV_SINGLE_ARG_DECL)
+      CORBA::Object_ptr get_reference (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::Current::NoContext));
 
@@ -79,7 +79,7 @@ namespace TAO
        * context it is called. If called outside the context of the POA
        * dispatched operation, a NoContext exception is raised
        */
-      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
+      PortableServer::Servant get_servant (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::Current::NoContext));
 
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp
index 081147aad3c..5656041765c 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp
@@ -10,7 +10,7 @@ CORBA::Object_ptr
 TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr,
                                         int,
                                         ACE_TCHAR * []
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::POA_Current* adapter = 0;
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h
index 6ef224d32fd..678ce9f043c 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.h
+++ b/TAO/tao/PortableServer/POA_Current_Factory.h
@@ -35,7 +35,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL)
+                                           )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
index a2943714015..f13233c81e9 100644
--- a/TAO/tao/PortableServer/POA_Guard.cpp
+++ b/TAO/tao/PortableServer/POA_Guard.cpp
@@ -16,32 +16,31 @@ namespace TAO
   namespace Portable_Server
   {
     POA_Guard::POA_Guard (::TAO_Root_POA &poa
-                          ACE_ENV_ARG_DECL,
+                          ,
                           int check_for_destruction)
       : guard_ (poa.lock ())
     {
       if (!this->guard_.locked ())
-        ACE_THROW (
+        throw
           CORBA::INTERNAL (
             CORBA::SystemException::_tao_minor_code (
               TAO_GUARD_FAILURE,
               0),
-            CORBA::COMPLETED_NO));
+            CORBA::COMPLETED_NO);
 
       // Check if a non-servant upcall is in progress.  If a non-servant
       // upcall is in progress, wait for it to complete.  Unless of
       // course, the thread making the non-servant upcall is this thread.
-      poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      poa.object_adapter ().wait_for_non_servant_upcalls_to_complete ();
 
       if (check_for_destruction &&
           poa.cleanup_in_progress ())
-        ACE_THROW (
+        throw
           CORBA::BAD_INV_ORDER (
             CORBA::SystemException::_tao_minor_code (
               TAO_POA_BEING_DESTROYED,
               0),
-            CORBA::COMPLETED_NO));
+            CORBA::COMPLETED_NO);
     }
   }
 }
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
index da0f74dedae..ae77c6de2be 100644
--- a/TAO/tao/PortableServer/POA_Guard.h
+++ b/TAO/tao/PortableServer/POA_Guard.h
@@ -42,7 +42,7 @@ namespace TAO
     {
     public:
       POA_Guard (::TAO_Root_POA &poa
-                 ACE_ENV_ARG_DECL,
+                 ,
                  int check_for_destruction = 1);
 
     private:
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index af860e75a75..cd60ac7b1a2 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -34,7 +34,7 @@ TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void)
 
 void
 TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
-                                                       ACE_ENV_ARG_DECL)
+                                                       )
 {
   CORBA::ULong cep_index = client_exposed_policies->length ();
 
@@ -49,8 +49,7 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
         {
           client_exposed_policies->length (cep_index + 1);
           (*client_exposed_policies)[cep_index] =
-                                  policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+                                  policy->copy ();
 
           cep_index++;
         }
@@ -60,16 +59,14 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
 void
 TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
                                        TAO_ORB_Core &orb_core
-                                       ACE_ENV_ARG_DECL)
+                                       )
 {
   // Just give a last chance for all the unloaded validators in other
   // libraries to be registered
-  orb_core.load_policy_validators (validator ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_core.load_policy_validators (validator);
 
   // Validate that all of the specified policies make sense.
-  validator.validate (this->impl_  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  validator.validate (this->impl_ );
 
   // Verify that all policies are legal for the currently loaded
   // POA extensions.
@@ -79,15 +76,14 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
     {
       CORBA::Policy_var policy = this->impl_.get_policy_by_index (i);
 
-      CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::PolicyType type = policy->policy_type ();
 
       if (validator.legal_policy (type) == 0)
         {
 #if ! defined (CORBA_E_MICRO)
           // An invalid policy was specified.  Let the user know about
           // it.
-          ACE_THROW (PortableServer::POA::InvalidPolicy ());
+          throw PortableServer::POA::InvalidPolicy ();
 #else
           ACE_ERROR ((LM_ERROR, "Invalid policy\n"));
 #endif
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index 3958133d756..36090a1db9d 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -47,27 +47,27 @@ public:
 
   /// Obtain a single cached policy.
   CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
+                                      );
 
   void merge_policies (const CORBA::PolicyList &policies
-                       ACE_ENV_ARG_DECL);
+                      );
 
   void merge_policy (const CORBA::Policy_ptr policy
-                     ACE_ENV_ARG_DECL);
+                    );
 
   void validate_policies (TAO_Policy_Validator &validator,
                           TAO_ORB_Core &orb_core
-                          ACE_ENV_ARG_DECL);
+                         );
 
   /// Add all of the client exposed policies to the specified list.
   void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
-                                          ACE_ENV_ARG_DECL);
+                                         );
 
   TAO_Policy_Set &policies (void);
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL);
+                               );
 
 protected:
   TAO_Policy_Set impl_;
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.inl b/TAO/tao/PortableServer/POA_Policy_Set.inl
index 4181baecf48..e91e7111d94 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.inl
+++ b/TAO/tao/PortableServer/POA_Policy_Set.inl
@@ -18,36 +18,34 @@ TAO_POA_Policy_Set::get_policy_by_index (CORBA::ULong index)
 
 ACE_INLINE CORBA::Policy_ptr
 TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL)
+                                       )
 {
   return this->impl_.get_cached_policy (type
-                                        ACE_ENV_ARG_PARAMETER);
+                                       );
 }
 
 ACE_INLINE void
 TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies
-                                    ACE_ENV_ARG_DECL)
+                                    )
 {
   // Add the policies if they don't exist, override them if they do.
   this->impl_.set_policy_overrides (policies,
                                     CORBA::ADD_OVERRIDE
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 }
 
 ACE_INLINE void
 TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
-  this->impl_.set_policy (policy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->impl_.set_policy (policy);
 }
 
 ACE_INLINE CORBA::Policy_ptr
 TAO_POA_Policy_Set::get_policy (CORBA::PolicyType policy
-                                ACE_ENV_ARG_DECL)
+                                )
 {
-  return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
+  return this->impl_.get_policy (policy);
 }
 
 ACE_INLINE TAO_Policy_Set &
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 9eae2512e9b..38d9d2ffe71 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -260,13 +260,12 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::~_TAO_Policy_Strategized_Proxy_
 TAO::Collocation_Strategy
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
-    TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+    TAO_ORB_Core::collocation_strategy (obj);
 
   return strategy;
 }
@@ -280,7 +279,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
     const char * op,
     size_t op_len,
     TAO::Collocation_Strategy strategy
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
@@ -293,7 +292,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
     op,
     op_len,
     strategy
-    ACE_ENV_ARG_PARAMETER);
+   );
 }
 
 //
@@ -345,7 +344,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
     int
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -355,9 +354,8 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
     dynamic_cast<POA_CORBA::Policy_ptr>
       (servant)
     ->policy_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER
+
         );
-  ACE_CHECK;
 }
 // TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
@@ -367,7 +365,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
     int
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -377,9 +375,8 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
     dynamic_cast<POA_CORBA::Policy_ptr>
       (servant)
     ->copy (
-          ACE_ENV_SINGLE_ARG_PARAMETER
+
         );
-  ACE_CHECK;
 }
 // TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
@@ -389,7 +386,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
     int
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -398,9 +395,8 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
   dynamic_cast<POA_CORBA::Policy_ptr>
     (servant)
   ->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER
+
       );
-  ACE_CHECK;
 }
 
 
@@ -447,7 +443,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::PolicyType> (
@@ -457,7 +453,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_->policy_type (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+          );
 
     }
 
@@ -477,7 +473,7 @@ void POA_CORBA::Policy::_get_policy_type_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -514,8 +510,7 @@ void POA_CORBA::Policy::_get_policy_type_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 namespace POA_CORBA
@@ -539,7 +534,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< CORBA::Policy> (
@@ -549,7 +544,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_->copy (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+          );
 
     }
 
@@ -569,7 +564,7 @@ void POA_CORBA::Policy::copy_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -606,8 +601,7 @@ void POA_CORBA::Policy::copy_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 namespace POA_CORBA
@@ -627,10 +621,10 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       this->servant_->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
+        );
 
     }
 
@@ -648,7 +642,7 @@ void POA_CORBA::Policy::destroy_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -683,8 +677,7 @@ void POA_CORBA::Policy::destroy_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
@@ -712,7 +705,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -729,7 +722,7 @@ namespace POA_CORBA
       retval =
         this->servant_-> _is_a (
           arg_1
-          ACE_ENV_ARG_PARAMETER);
+         );
 
     }
 
@@ -744,7 +737,7 @@ void POA_CORBA::Policy::_is_a_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -783,8 +776,7 @@ void POA_CORBA::Policy::_is_a_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
@@ -809,7 +801,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -819,7 +811,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _non_existent (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+          );
 
     }
 
@@ -834,7 +826,7 @@ void POA_CORBA::Policy::_non_existent_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -871,8 +863,7 @@ void POA_CORBA::Policy::_non_existent_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
@@ -887,7 +878,7 @@ void POA_CORBA::Policy::_interface_skel (
     TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
   TAO_IFR_Client_Adapter *_tao_adapter =
@@ -897,15 +888,13 @@ void POA_CORBA::Policy::_interface_skel (
 
   if (_tao_adapter == 0)
     {
-      ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
+      throw ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO);
     }
 
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
   CORBA::InterfaceDef_ptr _tao_retval =
-    impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    impl->_get_interface ();
 
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
@@ -920,7 +909,7 @@ void POA_CORBA::Policy::_interface_skel (
 
   if (_tao_result == 0)
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      throw ::CORBA::MARSHAL ();
     }
 }
 
@@ -945,7 +934,7 @@ namespace POA_CORBA
     {
     }
 
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void execute (void)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
@@ -955,7 +944,7 @@ namespace POA_CORBA
 
       retval =
         this->servant_-> _get_component (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
+          );
 
     }
 
@@ -970,7 +959,7 @@ void POA_CORBA::Policy::_component_skel (
     TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
-    ACE_ENV_ARG_DECL
+
   )
 {
 
@@ -1007,14 +996,13 @@ void POA_CORBA::Policy::_component_skel (
                          , exceptions
                          , nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        );
 
 }
 
 CORBA::Boolean POA_CORBA::Policy::_is_a (
     const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return
@@ -1041,23 +1029,22 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const
 void POA_CORBA::Policy::_dispatch (
     TAO_ServerRequest & req,
     void * servant_upcall
-    ACE_ENV_ARG_DECL
+
   )
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     ACE_ENV_ARG_PARAMETER);
+                                    );
 }
 
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:891
 
 CORBA::Policy *
-POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Policy::_this (void)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO_Stub *stub = this->_create_stub ();
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 91d1c44b232..4f6a78dc428 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -97,45 +97,45 @@ namespace POA_CORBA
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
 
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
 
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
 
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
-        ACE_ENV_ARG_DECL
+
       );
 
     ::CORBA::Policy *_this (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -144,7 +144,7 @@ namespace POA_CORBA
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual CORBA::PolicyType policy_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -154,14 +154,14 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -171,14 +171,14 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -188,7 +188,7 @@ namespace POA_CORBA
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
-        ACE_ENV_ARG_DECL
+
       );
   };
 
@@ -210,7 +210,7 @@ namespace POA_CORBA
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -223,7 +223,7 @@ namespace POA_CORBA
         const char * op,
         size_t op_len,
         TAO::Collocation_Strategy strategy
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((CORBA::Exception));
 
@@ -259,7 +259,7 @@ namespace POA_CORBA
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -273,7 +273,7 @@ namespace POA_CORBA
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -287,7 +287,7 @@ namespace POA_CORBA
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
-        ACE_ENV_ARG_DECL
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index 6bf094e5c33..6424524af08 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -84,14 +84,14 @@ namespace POA_CORBA
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     CORBA::PolicyType policy_type (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -101,7 +101,7 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -111,7 +111,7 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl
index 4bccdaee36d..c896883e321 100644
--- a/TAO/tao/PortableServer/PolicyS_T.inl
+++ b/TAO/tao/PortableServer/PolicyS_T.inl
@@ -81,7 +81,7 @@ POA_CORBA::Policy_tie<T>::_tied_object (T &obj)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = &obj;
   this->rel_ = 0;
 }
@@ -93,7 +93,7 @@ POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
     {
       delete this->ptr_;
     }
-  
+
   this->ptr_ = obj;
   this->rel_ = release;
 }
@@ -111,61 +111,61 @@ POA_CORBA::Policy_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::Policy_tie<T>::_default_POA (void)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
-  
-  return this->Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+  return this->Policy::_default_POA ();
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->policy_type (
-    ACE_ENV_SINGLE_ARG_PARAMETER
+
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->copy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
+
   );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
 void POA_CORBA::Policy_tie<T>::destroy  (
-    ACE_ENV_SINGLE_ARG_DECL
+
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    ACE_ENV_SINGLE_ARG_PARAMETER
+
   );
 }
 
diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h
index d0854a95849..90ab76fe374 100644
--- a/TAO/tao/PortableServer/Policy_Strategy.h
+++ b/TAO/tao/PortableServer/Policy_Strategy.h
@@ -35,9 +35,9 @@ namespace TAO
       : public ACE_Service_Object
     {
     public:
-      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL) = 0;
+      virtual void strategy_init(TAO_Root_POA *poa ) = 0;
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL) = 0;
+      virtual void strategy_cleanup(void) = 0;
 
       virtual ~Policy_Strategy (void) {};
     };
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
index 08f4965c8e7..336bf44a057 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -4,7 +4,6 @@ ACE_RCSID (PortableServer,
            POA,
            "$Id$")
 
-//
 #if !defined (__ACE_INLINE__)
 # include "tao/PortableServer/Regular_POA.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -19,7 +18,7 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name,
                   TAO_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
                   TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
+                  )
   : TAO_Root_POA (name,
                   poa_manager,
                   policies,
@@ -28,7 +27,7 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name,
                   thread_lock,
                   orb_core,
                   object_adapter
-                  ACE_ENV_ARG_PARAMETER),
+                 ),
      parent_ (parent)
 {
 }
@@ -38,7 +37,7 @@ TAO_Regular_POA::~TAO_Regular_POA (void)
 }
 
 void
-TAO_Regular_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Regular_POA::remove_from_parent_i (void)
 {
   // Remove POA from the parent
   if (this->parent_ != 0)
@@ -46,7 +45,7 @@ TAO_Regular_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL)
       int result = this->parent_->delete_child (this->name_);
       if (result != 0)
         {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
     }
 }
diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h
index eddd7bf3205..0aa05f9f33d 100644
--- a/TAO/tao/PortableServer/Regular_POA.h
+++ b/TAO/tao/PortableServer/Regular_POA.h
@@ -46,15 +46,15 @@ public:
                    TAO_SYNCH_MUTEX &thread_lock,
                    TAO_ORB_Core &orb_core,
                    TAO_Object_Adapter *object_adapter
-                   ACE_ENV_ARG_DECL);
+                  );
 
   virtual ~TAO_Regular_POA (void);
 
-  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POA_ptr the_parent (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  virtual void remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void remove_from_parent_i (void);
 
   virtual CORBA::Boolean root (void) const;
 
diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl
index 04b4b4b091b..bbfe8339c0e 100644
--- a/TAO/tao/PortableServer/Regular_POA.inl
+++ b/TAO/tao/PortableServer/Regular_POA.inl
@@ -5,7 +5,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Regular_POA::the_parent (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->parent_);
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index b24192c3439..99e04676cbb 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -22,33 +22,32 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    RequestProcessingPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+    RequestProcessingPolicy::copy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       RequestProcessingPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
                         RequestProcessingPolicy (this->value_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return copy;
     }
 
     void
-    RequestProcessingPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    RequestProcessingPolicy::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::RequestProcessingPolicyValue
-    RequestProcessingPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    RequestProcessingPolicy::value (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
-    RequestProcessingPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    RequestProcessingPolicy::policy_type (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::REQUEST_PROCESSING_POLICY_ID;
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h
index 34f850757f1..f9783203f29 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h
@@ -45,16 +45,16 @@ namespace TAO
     public:
       RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value);
 
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      ::PortableServer::RequestProcessingPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ::PortableServer::RequestProcessingPolicyValue value (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Return the cached policy type for this policy.
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
index 535faabda48..9a5f04eb0a3 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -30,7 +30,7 @@ namespace TAO
     RequestProcessingStrategy::strategy_init(
       TAO_Root_POA *poa,
       ::PortableServer::ServantRetentionPolicyValue sr_value
-      ACE_ENV_ARG_DECL_NOT_USED)
+      )
     {
       poa_ = poa;
       sr_value_ = sr_value;
@@ -39,13 +39,13 @@ namespace TAO
     void
     RequestProcessingStrategy::strategy_init(
       TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL_NOT_USED)
+      )
     {
       poa_ = poa;
     }
 
     void
-    RequestProcessingStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    RequestProcessingStrategy::strategy_cleanup(void)
     {
       poa_ = 0;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
index 19ae155a117..fa8fdc6f861 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h
@@ -54,42 +54,42 @@ namespace TAO
 
       virtual void strategy_init(
         TAO_Root_POA *poa
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual void strategy_init(
         TAO_Root_POA *poa,
         ::PortableServer::ServantRetentionPolicyValue
-        ACE_ENV_ARG_DECL);
+       );
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
       virtual PortableServer::ServantManager_ptr get_servant_manager (
-        ACE_ENV_SINGLE_ARG_DECL)
+        void)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy)) = 0;
 
       virtual void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy)) = 0;
 
-      virtual void set_servant (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+      virtual void set_servant (PortableServer::Servant servant )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy)) = 0;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-      virtual PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
+      virtual PortableServer::Servant get_servant (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy)) = 0;
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
         PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
 
       virtual PortableServer::Servant locate_servant (
         const char *operation,
@@ -97,20 +97,20 @@ namespace TAO
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
         bool &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
 
       virtual void cleanup_servant (
         PortableServer::Servant servant,
         const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
 
       virtual PortableServer::Servant system_id_to_servant (
         const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
 
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ObjectNotActive,
                            PortableServer::POA::WrongPolicy)) = 0;
@@ -119,7 +119,7 @@ namespace TAO
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantNotActive,
                            PortableServer::POA::WrongPolicy)) = 0;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
index 718132bda26..3becbba1b37 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -24,7 +24,7 @@ namespace TAO
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     PortableServer::ServantManager_ptr
-    RequestProcessingStrategyAOMOnly::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+    RequestProcessingStrategyAOMOnly::get_servant_manager (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::POA::WrongPolicy))
     {
@@ -35,27 +35,27 @@ namespace TAO
     void
     RequestProcessingStrategyAOMOnly::set_servant_manager (
       PortableServer::ServantManager_ptr /*imgr*/
-                         ACE_ENV_ARG_DECL)
+                         )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     void
     RequestProcessingStrategyAOMOnly::set_servant (
       PortableServer::Servant /*servant*/
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     PortableServer::Servant
-    RequestProcessingStrategyAOMOnly::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+    RequestProcessingStrategyAOMOnly::get_servant (void)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::POA::WrongPolicy))
     {
@@ -67,11 +67,11 @@ namespace TAO
     RequestProcessingStrategyAOMOnly::locate_servant (
       const PortableServer::ObjectId & system_id,
       PortableServer::Servant & servant
-      ACE_ENV_ARG_DECL)
+      )
     {
       return this->poa_->servant_present (system_id,
                                           servant
-                                          ACE_ENV_ARG_PARAMETER);
+                                         );
     }
 
     PortableServer::Servant
@@ -81,15 +81,14 @@ namespace TAO
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
       bool & /*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
+      )
     {
       PortableServer::Servant servant = 0;
 
       servant = this->poa_->find_servant (system_id,
                                           servant_upcall,
                                           poa_current_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                         );
 
       if (servant == 0)
         {
@@ -104,29 +103,29 @@ namespace TAO
     PortableServer::Servant
     RequestProcessingStrategyAOMOnly::system_id_to_servant (
       const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
+      )
     {
       return this->poa_->find_servant (system_id
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
     }
 
     PortableServer::Servant
     RequestProcessingStrategyAOMOnly::id_to_servant (
       const PortableServer::ObjectId &id
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy))
     {
       return this->poa_->user_id_to_servant_i (id
-                                               ACE_ENV_ARG_PARAMETER);
+                                              );
     }
 
     void
     RequestProcessingStrategyAOMOnly::cleanup_servant (
       PortableServer::Servant servant,
       const PortableServer::ObjectId &user_id
-      ACE_ENV_ARG_DECL)
+      )
     {
       if (servant)
         {
@@ -134,8 +133,7 @@ namespace TAO
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
           ACE_UNUSED_ARG (non_servant_upcall);
 
-          servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          servant->_remove_ref ();
         }
 
       // This operation causes the association of the Object Id specified
@@ -145,7 +143,7 @@ namespace TAO
 
       if (result != 0)
         {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
     }
 
@@ -158,12 +156,12 @@ namespace TAO
     PortableServer::ObjectId *
     RequestProcessingStrategyAOMOnly::servant_to_id (
       PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantNotActive,
                          PortableServer::POA::WrongPolicy))
     {
-      return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
+      return this->poa_->servant_to_user_id (servant);
     }
 
     void
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
index 6e16c94e876..69555e2a84d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -43,26 +43,26 @@ namespace TAO
 #if (TAO_HAS_MINIMUM_POA == 0)
 
       PortableServer::ServantManager_ptr
-      get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+      get_servant_manager (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
       void
       set_servant_manager (PortableServer::ServantManager_ptr imgr
-                           ACE_ENV_ARG_DECL)
+                           )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
       void
       set_servant (PortableServer::Servant servant
-                   ACE_ENV_ARG_DECL)
+                   )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
       PortableServer::Servant
-      get_servant (ACE_ENV_SINGLE_ARG_DECL)
+      get_servant (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
@@ -70,7 +70,7 @@ namespace TAO
       TAO_SERVANT_LOCATION
       locate_servant (const PortableServer::ObjectId &system_id,
                       PortableServer::Servant &servant
-                      ACE_ENV_ARG_DECL);
+                     );
 
       virtual
       PortableServer::Servant
@@ -79,15 +79,15 @@ namespace TAO
                       TAO::Portable_Server::Servant_Upcall &servant_upcall,
                       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
                       bool &wait_occurred_restart_call
-                      ACE_ENV_ARG_DECL);
+                     );
 
       virtual PortableServer::Servant system_id_to_servant (
         const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ObjectNotActive,
                            PortableServer::POA::WrongPolicy));
@@ -95,13 +95,13 @@ namespace TAO
       virtual void cleanup_servant (
         PortableServer::Servant servant,
         const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantNotActive,
                            PortableServer::POA::WrongPolicy));
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
index 820605a1d42..1b4356873ea 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -43,10 +43,9 @@ namespace TAO
     void
     RequestProcessingStrategyAOMOnlyFactoryImpl::destroy (
       RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
index 44a9df665af..4c872b79d0c 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
@@ -40,7 +40,7 @@ namespace TAO
 
       virtual void destroy (
         RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index 208b7770b31..d28ded5325d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -30,14 +30,14 @@ namespace TAO
 
     void
     RequestProcessingStrategyDefaultServant::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      void)
     {
       this->default_servant_ = 0;
     }
 
     PortableServer::ServantManager_ptr
     RequestProcessingStrategyDefaultServant::get_servant_manager (
-      ACE_ENV_SINGLE_ARG_DECL)
+      void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -48,16 +48,16 @@ namespace TAO
     void
     RequestProcessingStrategyDefaultServant::set_servant_manager (
       PortableServer::ServantManager_ptr /*imgr*/
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     PortableServer::Servant
     RequestProcessingStrategyDefaultServant::get_servant (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -69,7 +69,7 @@ namespace TAO
     void
     RequestProcessingStrategyDefaultServant::set_servant (
       PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -95,8 +95,7 @@ namespace TAO
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
           ACE_UNUSED_ARG (non_servant_upcall);
 
-          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          servant->_add_ref ();
         }
     }
 
@@ -104,14 +103,13 @@ namespace TAO
     RequestProcessingStrategyDefaultServant::locate_servant (
       const PortableServer::ObjectId & system_id,
       PortableServer::Servant & servant
-      ACE_ENV_ARG_DECL)
+      )
     {
       TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
 
       location = this->poa_->servant_present (system_id,
                                               servant
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
+                                             );
 
       if (location == TAO_SERVANT_NOT_FOUND)
         {
@@ -131,15 +129,14 @@ namespace TAO
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
       bool & /*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
+      )
     {
       PortableServer::Servant servant = 0;
 
       servant = this->poa_->find_servant (system_id,
                                           servant_upcall,
                                           poa_current_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                         );
 
       if (servant == 0)
         {
@@ -168,15 +165,14 @@ namespace TAO
     PortableServer::Servant
     RequestProcessingStrategyDefaultServant::system_id_to_servant (
       const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
+      )
     {
       PortableServer::Servant servant = this->default_servant_.in ();
 
       if (servant == 0)
         {
           servant = this->poa_->find_servant (system_id
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                             );
         }
 
       return servant;
@@ -185,7 +181,7 @@ namespace TAO
     PortableServer::Servant
     RequestProcessingStrategyDefaultServant::id_to_servant (
       const PortableServer::ObjectId & /*id*/
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -210,7 +206,7 @@ namespace TAO
     RequestProcessingStrategyDefaultServant::cleanup_servant (
       PortableServer::Servant servant,
       const PortableServer::ObjectId &user_id
-      ACE_ENV_ARG_DECL)
+      )
     {
       if (servant)
         {
@@ -218,8 +214,7 @@ namespace TAO
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
           ACE_UNUSED_ARG (non_servant_upcall);
 
-          servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          servant->_remove_ref ();
         }
 
       // This operation causes the association of the Object Id specified
@@ -229,7 +224,7 @@ namespace TAO
 
       if (result != 0)
         {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
     }
 
@@ -242,7 +237,7 @@ namespace TAO
     PortableServer::ObjectId *
     RequestProcessingStrategyDefaultServant::servant_to_id (
       PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -266,7 +261,7 @@ namespace TAO
             }
         }
 
-      return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
+      return this->poa_->servant_to_user_id (servant);
     }
 
     void
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
index dea5baa5697..53b8fea0084 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -41,33 +41,33 @@ namespace TAO
     public:
       RequestProcessingStrategyDefaultServant (void);
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
       PortableServer::ServantManager_ptr
-      get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+      get_servant_manager (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
       void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy));
 
-      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
+      PortableServer::Servant get_servant (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
       void set_servant (
         PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy));
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
         PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual PortableServer::Servant locate_servant (
         const char *operation,
@@ -75,15 +75,15 @@ namespace TAO
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
         bool &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual PortableServer::Servant system_id_to_servant (
         const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ObjectNotActive,
                            PortableServer::POA::WrongPolicy));
@@ -91,13 +91,13 @@ namespace TAO
       virtual void cleanup_servant (
         PortableServer::Servant servant,
         const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantNotActive,
                            PortableServer::POA::WrongPolicy));
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
index 027240a7c2a..949eaa6a2b1 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -47,10 +47,9 @@ namespace TAO
     void
     RequestProcessingStrategyDefaultServantFactoryImpl::destroy (
       RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
index 220c4ffdfc1..6d97191bd48 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
@@ -42,7 +42,7 @@ namespace TAO
 
       virtual void destroy (
         RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
index 9ee872f1a90..bc7fbd65f87 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
@@ -43,7 +43,7 @@ namespace TAO
 
       virtual void destroy (
         RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
index 138fee4eb92..f31beb3ca33 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -81,7 +81,7 @@ namespace TAO
     void
     RequestProcessingStrategyFactoryImpl::destroy (
       RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
       RequestProcessingStrategyFactory *strategy_factory = 0;
 
@@ -127,8 +127,7 @@ namespace TAO
 
       if (strategy_factory != 0)
         {
-          strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          strategy_factory->destroy (strategy);
         }
     }
   }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
index fa07f1c30a3..46139e3049a 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
@@ -39,7 +39,7 @@ namespace TAO
 
       virtual void destroy (
         RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
index ab9874f5e5d..21f9262017a 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -23,13 +23,13 @@ namespace TAO
   namespace Portable_Server
   {
     RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator (void) :
-      etherealize_objects_ (1)
+      etherealize_objects_ (true)
     {
     }
 
     void
     RequestProcessingStrategyServantActivator::strategy_cleanup (
-      ACE_ENV_SINGLE_ARG_DECL)
+      void)
     {
       {
         Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -39,13 +39,12 @@ namespace TAO
           PortableServer::ServantActivator::_nil ();
       }
 
-      RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      RequestProcessingStrategy::strategy_cleanup ();
     }
 
     PortableServer::ServantManager_ptr
     RequestProcessingStrategyServantActivator::get_servant_manager (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -55,7 +54,7 @@ namespace TAO
     void
     RequestProcessingStrategyServantActivator::set_servant_manager (
       PortableServer::ServantManager_ptr imgr
-      ACE_ENV_ARG_DECL)
+      )
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::POA::WrongPolicy))
     {
@@ -66,32 +65,24 @@ namespace TAO
       // standard minor code 6 being raised (see 11.3.9.12 of the corba spec)
       if (!CORBA::is_nil (this->servant_activator_.in ()))
         {
-          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6,
-                                           CORBA::COMPLETED_NO));
+          throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6, CORBA::COMPLETED_NO);
         }
 
       this->servant_activator_ =
-        PortableServer::ServantActivator::_narrow (imgr
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        PortableServer::ServantActivator::_narrow (imgr);
 
-      this->validate_servant_manager (this->servant_activator_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->validate_servant_manager (this->servant_activator_.in ());
     }
 
     TAO_SERVANT_LOCATION
     RequestProcessingStrategyServantActivator::locate_servant (
       const PortableServer::ObjectId &system_id,
       PortableServer::Servant &servant
-      ACE_ENV_ARG_DECL)
+      )
     {
       TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
 
-      location = this->poa_->servant_present (system_id,
-                                              servant
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
+      location = this->poa_->servant_present (system_id, servant);
 
       if (location == TAO_SERVANT_NOT_FOUND)
         {
@@ -111,15 +102,13 @@ namespace TAO
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
       bool &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL)
+      )
     {
       PortableServer::Servant servant = 0;
 
       servant = this->poa_->find_servant (system_id,
                                           servant_upcall,
-                                          poa_current_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                          poa_current_impl);
 
       if (servant != 0)
         {
@@ -145,14 +134,9 @@ namespace TAO
       // reference.
       //
 
-      this->validate_servant_manager (this->servant_activator_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->validate_servant_manager (this->servant_activator_.in ());
 
-      servant =
-        this->incarnate_servant (poa_current_impl.object_id ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      servant = this->incarnate_servant (poa_current_impl.object_id ());
 
       // If the incarnate operation returns a servant that is
       // already active for a different Object Id and if the POA
@@ -202,9 +186,7 @@ namespace TAO
           CORBA::Boolean cleanup_in_progress = 0;
           this->etherealize_servant (poa_current_impl.object_id (),
                                      servant,
-                                     cleanup_in_progress
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                     cleanup_in_progress);
 
           // We ended up waiting on a condition variable, the
           // POA state may have changed while we are waiting.
@@ -221,7 +203,7 @@ namespace TAO
       const PortableServer::ObjectId& object_id,
       PortableServer::Servant servant,
       CORBA::Boolean cleanup_in_progress
-      ACE_ENV_ARG_DECL)
+      )
     {
       CORBA::Boolean remaining_activations =
         this->poa_->servant_has_remaining_activations (servant);
@@ -237,15 +219,13 @@ namespace TAO
                                              this->poa_,
                                              servant,
                                              cleanup_in_progress,
-                                             remaining_activations
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                             remaining_activations);
     }
 
     PortableServer::Servant
     RequestProcessingStrategyServantActivator::incarnate_servant (
       const PortableServer::ObjectId& object_id
-      ACE_ENV_ARG_DECL)
+      )
     {
       PortableServer::Servant servant = 0;
 
@@ -258,9 +238,7 @@ namespace TAO
       // Invocations of etherealize on the servant manager are serialized.
       // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
       servant = this->servant_activator_->incarnate (object_id,
-                                                     this->poa_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                                     this->poa_);
 
       if (servant == 0)
         {
@@ -278,7 +256,7 @@ namespace TAO
     RequestProcessingStrategyServantActivator::cleanup_servant (
       PortableServer::Servant servant,
       const PortableServer::ObjectId &user_id
-      ACE_ENV_ARG_DECL)
+      )
     {
       // If a servant manager is associated with the POA,
       // ServantLocator::etherealize will be invoked with the oid and the
@@ -312,9 +290,7 @@ namespace TAO
             {
               this->etherealize_servant (user_id,
                                          servant,
-                                         this->poa_->cleanup_in_progress ()
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+                                         this->poa_->cleanup_in_progress ());
             }
           else
             {
@@ -322,18 +298,17 @@ namespace TAO
               Non_Servant_Upcall non_servant_upcall (*this->poa_);
               ACE_UNUSED_ARG (non_servant_upcall);
 
-              servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              servant->_remove_ref ();
             }
         }
 
       // This operation causes the association of the Object Id specified
       // by the oid parameter and its servant to be removed from the
       // Active Object Map.
-      int result = this->poa_->unbind_using_user_id (user_id);
+      int const result = this->poa_->unbind_using_user_id (user_id);
 
       if (result != 0)
-        ACE_THROW (CORBA::OBJ_ADAPTER ());
+        throw ::CORBA::OBJ_ADAPTER ();
     }
 
     void
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
index 559cc8ce071..0bff114eb4c 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
@@ -38,21 +38,21 @@ namespace TAO
     public:
       RequestProcessingStrategyServantActivator (void);
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
-      PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+      PortableServer::ServantManager_ptr get_servant_manager (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
       void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                ACE_ENV_ARG_DECL)
+                                )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
         PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual PortableServer::Servant locate_servant (
         const char *operation,
@@ -60,12 +60,12 @@ namespace TAO
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
         bool &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual void cleanup_servant (
         PortableServer::Servant servant,
         const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
 
@@ -76,12 +76,12 @@ namespace TAO
     private:
       PortableServer::Servant incarnate_servant (
         const PortableServer::ObjectId& object_id
-        ACE_ENV_ARG_DECL);
+       );
 
       void etherealize_servant (const PortableServer::ObjectId& object_id,
         PortableServer::Servant servant,
         CORBA::Boolean cleanup_in_progress
-        ACE_ENV_ARG_DECL);
+       );
 
     private:
       PortableServer::ServantActivator_var servant_activator_;
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
index 7f57f08204f..00f26e37559 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -59,10 +59,9 @@ namespace TAO
     void
     RequestProcessingStrategyServantActivatorFactoryImpl::destroy (
       RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
index b9aae2ca3d6..6e3cef0f752 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
@@ -42,7 +42,7 @@ namespace TAO
 
       virtual void destroy (
         RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
index aebefaa0118..1df11bca5bf 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -27,7 +27,7 @@ namespace TAO
 
     void
     RequestProcessingStrategyServantLocator::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL)
+      void)
     {
       {
         Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -36,13 +36,12 @@ namespace TAO
         this->servant_locator_ = PortableServer::ServantLocator::_nil ();
       }
 
-      RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      RequestProcessingStrategy::strategy_cleanup ();
     }
 
     PortableServer::ServantManager_ptr
     RequestProcessingStrategyServantLocator::get_servant_manager (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -52,7 +51,7 @@ namespace TAO
     void
     RequestProcessingStrategyServantLocator::set_servant_manager (
       PortableServer::ServantManager_ptr imgr
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -63,30 +62,27 @@ namespace TAO
       // standard minor code 6 being raised (see 11.3.9.12 of the corba spec)
       if (!CORBA::is_nil (this->servant_locator_.in ()))
         {
-          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6,
-                                           CORBA::COMPLETED_NO));
+          throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6,
+                                           CORBA::COMPLETED_NO);
         }
 
       this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr
-                                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                                       );
 
-      this->validate_servant_manager (this->servant_locator_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->validate_servant_manager (this->servant_locator_.in ());
     }
 
     TAO_SERVANT_LOCATION
     RequestProcessingStrategyServantLocator::locate_servant (
       const PortableServer::ObjectId &system_id,
       PortableServer::Servant &servant
-      ACE_ENV_ARG_DECL)
+      )
     {
       TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
 
       location = this->poa_->servant_present (system_id,
                                               servant
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
+                                             );
 
       if (location == TAO_SERVANT_NOT_FOUND)
         {
@@ -106,15 +102,14 @@ namespace TAO
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
       bool &/*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
+      )
     {
       PortableServer::Servant servant = 0;
 
       servant = this->poa_->find_servant (system_id,
                                           servant_upcall,
                                           poa_current_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                         );
 
       if (servant != 0)
         {
@@ -140,8 +135,7 @@ namespace TAO
       // reference.
       //
 
-      this->validate_servant_manager (this->servant_locator_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->validate_servant_manager (this->servant_locator_.in ());
 
       // No serialization of invocations of preinvoke or
       // postinvoke may be assumed; there may be multiple
@@ -169,8 +163,7 @@ namespace TAO
                                            this->poa_,
                                            operation,
                                            cookie
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                          );
 
       if (servant == 0)
         {
@@ -193,7 +186,7 @@ namespace TAO
     RequestProcessingStrategyServantLocator::cleanup_servant (
       PortableServer::Servant servant,
       const PortableServer::ObjectId &user_id
-      ACE_ENV_ARG_DECL)
+      )
     {
       if (servant)
         {
@@ -201,8 +194,7 @@ namespace TAO
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
           ACE_UNUSED_ARG (non_servant_upcall);
 
-          servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          servant->_remove_ref ();
         }
 
       // This operation causes the association of the Object Id specified
@@ -212,7 +204,7 @@ namespace TAO
 
       if (result != 0)
         {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
     }
 
@@ -234,22 +226,19 @@ namespace TAO
 
       if (!CORBA::is_nil (this->servant_locator_.in ()))
         {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
+          try
             {
               servant_locator_->postinvoke (system_id,
                                             this->poa_,
                                             servant_upcall.operation (),
                                             servant_upcall.locator_cookie (),
                                             servant_upcall.servant ()
-                                            ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                           );
             }
-          ACE_CATCHANY
+          catch (const ::CORBA::Exception&)
             {
               // Ignore errors from servant locator ....
             }
-          ACE_ENDTRY;
         }
     }
   }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
index 255c5448cfd..d8421919159 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
@@ -38,23 +38,23 @@ namespace TAO
     public:
       RequestProcessingStrategyServantLocator (void);
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
       PortableServer::ServantManager_ptr get_servant_manager (
-        ACE_ENV_SINGLE_ARG_DECL)
+        void)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy));
 
       void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy));
 
       virtual TAO_SERVANT_LOCATION locate_servant (
         const PortableServer::ObjectId &system_id,
         PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual void post_invoke_servant_cleanup(
         const PortableServer::ObjectId &system_id,
@@ -66,12 +66,12 @@ namespace TAO
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
         bool &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual void cleanup_servant (
         PortableServer::Servant servant,
         const PortableServer::ObjectId &user_id
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
index 9e5c094dd4f..8ba3bc27b77 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -59,10 +59,9 @@ namespace TAO
     void
     RequestProcessingStrategyServantLocatorFactoryImpl::destroy (
       RequestProcessingStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
index adce55b71f2..eb36b20eba1 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
@@ -42,7 +42,7 @@ namespace TAO
 
       virtual void destroy (
         RequestProcessingStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
index 580cbb8fdc1..d383a2ddd89 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -25,7 +25,7 @@ namespace TAO
 
     PortableServer::Servant
     RequestProcessingStrategyServantManager::get_servant (
-      ACE_ENV_SINGLE_ARG_DECL)
+      void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -36,58 +36,57 @@ namespace TAO
     void
     RequestProcessingStrategyServantManager::set_servant (
       PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
       ACE_UNUSED_ARG (servant);
 
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     void
     RequestProcessingStrategyServantManager::validate_servant_manager (
       PortableServer::ServantManager_ptr servant_manager
-      ACE_ENV_ARG_DECL)
+      )
     {
       // When no servant manager is set, give an exception with minor code 4,
       // see 11.3.8.6 of the corba spec
       if (CORBA::is_nil (servant_manager))
         {
-          ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 4,
-                                         CORBA::COMPLETED_NO));
+          throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO);
         }
     }
 
     PortableServer::Servant
     RequestProcessingStrategyServantManager::system_id_to_servant (
       const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
+      )
     {
       return this->poa_->find_servant (system_id
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
     }
 
     PortableServer::ObjectId *
     RequestProcessingStrategyServantManager::servant_to_id (
       PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantNotActive,
                          PortableServer::POA::WrongPolicy))
     {
-      return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
+      return this->poa_->servant_to_user_id (servant);
     }
 
     PortableServer::Servant
     RequestProcessingStrategyServantManager::id_to_servant (
       const PortableServer::ObjectId &id
-      ACE_ENV_ARG_DECL)
+      )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy))
     {
-      return this->poa_->user_id_to_servant_i (id ACE_ENV_ARG_PARAMETER);
+      return this->poa_->user_id_to_servant_i (id);
     }
 
     ::PortableServer::RequestProcessingPolicyValue
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
index ee152e2585e..be63e7652ae 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
@@ -37,32 +37,32 @@ namespace TAO
     public:
       RequestProcessingStrategyServantManager (void);
 
-      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
+      PortableServer::Servant get_servant (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
-      void set_servant (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+      void set_servant (PortableServer::Servant servant )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
       void validate_servant_manager (
         PortableServer::ServantManager_ptr servant_manager
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual PortableServer::Servant system_id_to_servant (
         const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ObjectNotActive,
                            PortableServer::POA::WrongPolicy));
 
       virtual PortableServer::ObjectId *servant_to_id (
         PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantNotActive,
                            PortableServer::POA::WrongPolicy));
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 2eebbc9fa21..12f5ffdbc43 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -80,15 +80,13 @@ TAO_Root_POA::objectkey_prefix [TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::ThreadPolicy_ptr
-TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                                    ACE_ENV_ARG_DECL)
+TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ThreadPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
                     TAO::Portable_Server::ThreadPolicy (value),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
 
   return policy;
 }
@@ -98,15 +96,13 @@ TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
 #if !defined (CORBA_E_MICRO)
 
 PortableServer::LifespanPolicy_ptr
-TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                      ACE_ENV_ARG_DECL)
+TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::LifespanPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
                     TAO::Portable_Server::LifespanPolicy (value),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
 
   return policy;
 }
@@ -115,15 +111,13 @@ TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
 
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdUniquenessPolicy_ptr
-TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                           ACE_ENV_ARG_DECL)
+TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::IdUniquenessPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
                     TAO::Portable_Server::IdUniquenessPolicy (value),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
 
   return policy;
 }
@@ -131,15 +125,13 @@ TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyVal
 
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdAssignmentPolicy_ptr
-TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                           ACE_ENV_ARG_DECL)
+TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::IdAssignmentPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
                     TAO::Portable_Server::IdAssignmentPolicy (value),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
 
   return policy;
 }
@@ -148,43 +140,37 @@ TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyVal
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::ImplicitActivationPolicy_ptr
-TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                                 ACE_ENV_ARG_DECL)
+TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ImplicitActivationPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
                     TAO::Portable_Server::ImplicitActivationPolicy (value),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
 
   return policy;
 }
 
 PortableServer::ServantRetentionPolicy_ptr
-TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                               ACE_ENV_ARG_DECL)
+TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::ServantRetentionPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
                     TAO::Portable_Server::ServantRetentionPolicy (value),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
 
   return policy;
 }
 
 PortableServer::RequestProcessingPolicy_ptr
-TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                                ACE_ENV_ARG_DECL)
+TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Portable_Server::RequestProcessingPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
                     TAO::Portable_Server::RequestProcessingPolicy (value),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
 
   return policy;
 }
@@ -193,18 +179,14 @@ TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessin
 
 void
 TAO_Root_POA::set_obj_ref_factory (
-  PortableInterceptor::ObjectReferenceFactory *current_factory
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ObjectReferenceFactory *current_factory)
 {
-  TAO::ORT_Adapter *adapter = this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO::ORT_Adapter *adapter = this->ORT_adapter ();
 
   if (adapter)
     {
       // Activate a different factory
-      this->ort_adapter_->set_obj_ref_factory (current_factory
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->ort_adapter_->set_obj_ref_factory (current_factory);
     }
 }
 
@@ -215,8 +197,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
                             ACE_Lock &lock,
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
-                            TAO_Object_Adapter *object_adapter
-                            ACE_ENV_ARG_DECL)
+                            TAO_Object_Adapter *object_adapter)
   : name_ (name),
     poa_manager_ (* (dynamic_cast <TAO_POA_Manager*> (poa_manager))),
 
@@ -261,9 +242,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
 
   // Parse the policies that are used in the critical path in
   // a cache.
-  this->cached_policies_.update (this->policies_
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->cached_policies_.update (this->policies_);
 
 #if (TAO_HAS_MINIMUM_POA == 1)
   // If this is the RootPOA, set the value of the ImplicitActivationPolicy
@@ -284,9 +263,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
 
   // Set the active strategies to be used by this POA
   this->active_policy_strategies_.update (this->cached_policies_,
-                                          this
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          this);
 
   // Set the folded name of this POA.
   this->set_folded_name (parent);
@@ -295,7 +272,7 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
   int result = this->poa_manager_.register_poa (this);
   if (result != 0)
     {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
+      throw ::CORBA::OBJ_ADAPTER ();
     }
 
   // Add self to Object Adapter class.
@@ -309,28 +286,25 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
       // further errors...
       this->poa_manager_.remove_poa (this);
 
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
+      throw ::CORBA::OBJ_ADAPTER ();
     }
 
   // Set the id for this POA.
   this->set_id (parent);
 
   // Notify the Lifespan strategy of our startup
-  ACE_TRY
+  try
     {
-      this->active_policy_strategies_.lifespan_strategy()->notify_startup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->active_policy_strategies_.lifespan_strategy()->notify_startup ();
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       this->poa_manager_.remove_poa (this);
       this->object_adapter ().unbind_poa (this,
                                           this->folded_name_,
                                           this->system_name_.in ());
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 TAO_Root_POA::~TAO_Root_POA (void)
@@ -339,7 +313,7 @@ TAO_Root_POA::~TAO_Root_POA (void)
 }
 
 void
-TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::complete_destruction_i (void)
 {
   // No longer awaiting destruction.
   this->waiting_destruction_ = 0;
@@ -348,18 +322,17 @@ TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
   int result = this->poa_manager_.remove_poa (this);
 
   if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
+    throw ::CORBA::OBJ_ADAPTER ();
 
   // Remove POA from the Object Adapter.
   result = this->object_adapter ().unbind_poa (this,
                                                this->folded_name_,
                                                this->system_name_.in ());
   if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
+    throw ::CORBA::OBJ_ADAPTER ();
 
   // Cleanup all strategies
-  this->active_policy_strategies_.cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->active_policy_strategies_.cleanup ();
 
   // Forced cleanup.  The new memory management scheme is evil and can
   // lead to reference deadlock, i.e., POA holds object A, but POA
@@ -390,8 +363,7 @@ TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
 PortableServer::POA_ptr
 TAO_Root_POA::create_POA_i (const char *adapter_name,
                             PortableServer::POAManager_ptr poa_manager,
-                            const CORBA::PolicyList &policies
-                            ACE_ENV_ARG_DECL)
+                            const CORBA::PolicyList &policies)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -401,14 +373,10 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
   TAO_POA_Policy_Set tao_policies (this->object_adapter ().default_poa_policies ());
 
   // Merge policies from the ORB level.
-  this->object_adapter ().validator ().merge_policies (tao_policies.policies ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  this->object_adapter ().validator ().merge_policies (tao_policies.policies ());
 
   // Merge in any policies that the user may have specified.
-  tao_policies.merge_policies (policies
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  tao_policies.merge_policies (policies);
 
   // If any of the policy objects specified are not valid for the ORB
   // implementation, if conflicting policy objects are specified, or
@@ -417,9 +385,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
   // InvalidPolicy exception is raised containing the index in the
   // policies parameter value of the first offending policy object.
   tao_policies.validate_policies (this->object_adapter ().validator (),
-                                  this->orb_core_
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                  this->orb_core_);
 
   // If the poa_manager parameter is null, a new POAManager object is
   // created and associated with the new POA. Otherwise, the specified
@@ -440,8 +406,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
       while (!CORBA::is_nil (poa.in ()))
       {
         root_poa = poa;
-        poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+        poa = poa->the_parent ();
       }
 
       // Get the POAManagerFactory instance owned by RootPOA.
@@ -454,8 +419,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
       // is created.
       the_poa_manager
         = tao_poa_manager_factory->create_POAManager (0,
-                                                      empty_policies
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                      empty_policies);
 #else
 
       PortableServer::POAManager_ptr the_poa_manager_ptr;
@@ -465,7 +429,6 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
       the_poa_manager = the_poa_manager_ptr;
 #endif /* TAO_HAS_MINIMUM_POA == 0 && ! CORBA_E_COMPACT) */
 
-      ACE_CHECK_RETURN (PortableServer::POA::_nil ());
     }
   else
     {
@@ -474,9 +437,7 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
 
   PortableServer::POA_var poa = this->create_POA_i (adapter_name,
                                                     the_poa_manager.in (),
-                                                    tao_policies
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                    tao_policies);
 
   return poa._retn ();
 }
@@ -490,8 +451,7 @@ TAO_Root_POA::new_POA (const String &name,
                        ACE_Lock &lock,
                        TAO_SYNCH_MUTEX &thread_lock,
                        TAO_ORB_Core &orb_core,
-                       TAO_Object_Adapter *object_adapter
-                       ACE_ENV_ARG_DECL)
+                       TAO_Object_Adapter *object_adapter)
 {
   TAO_Regular_POA *poa = 0;
 
@@ -503,10 +463,8 @@ TAO_Root_POA::new_POA (const String &name,
                              lock,
                              thread_lock,
                              orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
+                             object_adapter),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return poa;
 }
@@ -515,8 +473,7 @@ TAO_Root_POA::new_POA (const String &name,
 PortableServer::POA_ptr
 TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
                             PortableServer::POAManager_ptr poa_manager,
-                            const TAO_POA_Policy_Set &policies
-                            ACE_ENV_ARG_DECL)
+                            const TAO_POA_Policy_Set &policies)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -551,8 +508,7 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
                                       this->object_adapter ().lock (),
                                       this->object_adapter ().thread_lock (),
                                       this->orb_core_,
-                                      this->object_adapter_
-                                      ACE_ENV_ARG_PARAMETER);
+                                      this->object_adapter_);
 
   // Give ownership of the new map to the POA_var.  Note, that it
   // is important for the POA_var to take ownership before
@@ -560,7 +516,6 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
   PortableServer::POA_var new_poa = poa;
 
   // Check for exception in construction of the POA.
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Add to children map
   result = this->children_.bind (adapter_name,
@@ -580,8 +535,7 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
   // for this servant.
-  poa->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  poa->establish_components ();
 
   // Note: Creating a POA using a POA manager that is in the active
   // state can lead to race conditions if the POA supports preexisting
@@ -603,18 +557,14 @@ TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
 #if ! defined (CORBA_E_MICRO)
 PortableServer::POA_ptr
 TAO_Root_POA::find_POA (const char *adapter_name,
-                        CORBA::Boolean activate_it
-                        ACE_ENV_ARG_DECL)
+                        CORBA::Boolean activate_it)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  TAO_Root_POA *poa = this->find_POA_i (adapter_name,
-                                   activate_it
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  TAO_Root_POA *poa = this->find_POA_i (adapter_name, activate_it);
 
   return PortableServer::POA::_duplicate (poa);
 }
@@ -623,8 +573,7 @@ TAO_Root_POA::find_POA (const char *adapter_name,
 #if ! defined (CORBA_E_MICRO)
 TAO_Root_POA *
 TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
-                          CORBA::Boolean activate_it
-                          ACE_ENV_ARG_DECL)
+                          CORBA::Boolean activate_it)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
@@ -641,11 +590,10 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
           if (!CORBA::is_nil (this->adapter_activator_.in ()))
             {
               // Check our state
-              this->check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK_RETURN (0);
+              this->check_state ();
 
               CORBA::Boolean success = false;
-              ACE_TRY_EX (UnknownAdapter)
+              try
                 {
                   // ATTENTION: Trick locking here, see class header for details
                   TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (
@@ -658,18 +606,13 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
                   success =
                     this->adapter_activator_->unknown_adapter (
                       this,
-                      child_name.c_str ()
-                      ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (UnknownAdapter);
+                      child_name.c_str ());
                 }
-              ACE_CATCH (CORBA::SystemException, ex)
+              catch (const ::CORBA::SystemException&)
                 {
-                  ACE_TRY_THROW_EX (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO),
-                                    UnknownAdapter);
+                  throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 1,
+                                              CORBA::COMPLETED_NO);
                 }
-              ACE_ENDTRY;
-              ACE_CHECK_RETURN (0);
 
               if (success)
                 {
@@ -718,8 +661,7 @@ TAO_Root_POA::tao_poa_manager ()
 PortableServer::POA_ptr
 TAO_Root_POA::create_POA (const char *adapter_name,
                           PortableServer::POAManager_ptr poa_manager,
-                          const CORBA::PolicyList &policies
-                          ACE_ENV_ARG_DECL)
+                          const CORBA::PolicyList &policies)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -729,14 +671,12 @@ TAO_Root_POA::create_POA (const char *adapter_name,
 
   return this->create_POA_i (adapter_name,
                              poa_manager,
-                             policies
-                             ACE_ENV_ARG_PARAMETER);
+                             policies);
 }
 #endif
 
 PortableServer::ObjectId *
-TAO_Root_POA::servant_to_id (PortableServer::Servant servant
-                             ACE_ENV_ARG_DECL)
+TAO_Root_POA::servant_to_id (PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -746,24 +686,21 @@ TAO_Root_POA::servant_to_id (PortableServer::Servant servant
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->servant_to_id_i (servant
-                                ACE_ENV_ARG_PARAMETER);
+  return this->servant_to_id_i (servant);
 }
 
 PortableServer::ObjectId *
-TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant
-                                  ACE_ENV_ARG_DECL)
+TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
-    servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
+    servant_to_user_id (servant);
 }
 
 PortableServer::Servant
-TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference
-                                    ACE_ENV_ARG_DECL)
+TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
@@ -772,37 +709,33 @@ TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->reference_to_servant_i (reference
-                                       ACE_ENV_ARG_PARAMETER);
+  return this->reference_to_servant_i (reference);
 }
 
 CORBA::Object_ptr
-TAO_Root_POA::servant_to_reference (PortableServer::Servant servant
-                                    ACE_ENV_ARG_DECL)
+TAO_Root_POA::servant_to_reference (PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
 
-  return this->servant_to_reference_i (servant
-                                       ACE_ENV_ARG_PARAMETER);
+  return this->servant_to_reference_i (servant);
 }
 
 PortableServer::POAList *
-TAO_Root_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::the_children (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->the_children_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->the_children_i ();
 }
 
 
 PortableServer::Servant
-TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid
-                             ACE_ENV_ARG_DECL)
+TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -810,13 +743,11 @@ TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->id_to_servant_i (oid
-                                ACE_ENV_ARG_PARAMETER);
+  return this->id_to_servant_i (oid);
 }
 
 CORBA::Object_ptr
-TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid
-                               ACE_ENV_ARG_DECL)
+TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -824,14 +755,13 @@ TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->id_to_reference_i (oid, true ACE_ENV_ARG_PARAMETER);
+  return this->id_to_reference_i (oid, true);
 }
 
 
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
-                                        const char *intf
-                                        ACE_ENV_ARG_DECL)
+                                        const char *intf)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
@@ -839,38 +769,32 @@ TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
 
   return this->create_reference_with_id_i (id,
                                            intf,
-                                           this->server_priority ()
-                                           ACE_ENV_ARG_PARAMETER);
+                                           this->server_priority ());
 }
 
 
 void
 TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects,
-                       CORBA::Boolean wait_for_completion
-                       ACE_ENV_ARG_DECL)
+                       CORBA::Boolean wait_for_completion)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
-  TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER, 0);
-  ACE_CHECK;
+  TAO::Portable_Server::POA_Guard poa_guard (*this , 0);
   ACE_UNUSED_ARG (poa_guard);
 
   this->destroy_i (etherealize_objects,
-                   wait_for_completion
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   wait_for_completion);
 }
 
 void
-TAO_Root_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Root_POA::remove_from_parent_i (void)
 {
   // The root poa has no parent, so this is a noop
 }
 
 void
 TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
-                         CORBA::Boolean wait_for_completion
-                         ACE_ENV_ARG_DECL)
+                         CORBA::Boolean wait_for_completion)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->cleanup_in_progress_)
@@ -878,9 +802,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (),
-                                                      wait_for_completion
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                      wait_for_completion);
 
   this->cleanup_in_progress_ = 1;
 
@@ -895,8 +817,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
   // re-creation of its associated POA in the same process.)
 
   // Remove POA from the parent
-  this->remove_from_parent_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->remove_from_parent_i ();
 
   TAO::ORT_Array array_obj_ref_template (1);
 
@@ -931,9 +852,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
       // Notify the state changes to the IORInterceptors
       this->adapter_state_changed (array_obj_ref_template,
-                                   PortableInterceptor::INACTIVE
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   PortableInterceptor::INACTIVE);
 
       if (adapter != 0)
         adapter->release (array_obj_ref_template[0]);
@@ -949,15 +868,11 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
       TAO_Root_POA *destroy_child_poa = (*destroy_iterator).int_id_;
 
       destroy_child_poa->destroy_i (etherealize_objects,
-                                    wait_for_completion
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    wait_for_completion);
     }
 
   // Notify the lifespan strategy of our shutdown
-  this->active_policy_strategies_.lifespan_strategy()->notify_shutdown (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->active_policy_strategies_.lifespan_strategy()->notify_shutdown ();
 
 // @todo, is the exception handling above correct, should we just fail when
 // the notify above fails
@@ -974,9 +889,7 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
   // destroying the POAs.
 
   this->deactivate_all_objects_i (etherealize_objects,
-                                  wait_for_completion
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  wait_for_completion);
 
   // If there are no outstanding requests and that we are not in a
   // non-servant upcall or if we are in a non-servant upcall, make
@@ -1014,15 +927,12 @@ TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
       // it. (a hack).
       PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
 
-      this->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->complete_destruction_i ();
 
       this->adapter_state_ = PortableInterceptor::NON_EXISTENT;
 
       this->adapter_state_changed (my_array_obj_ref_template,
-                                   this->adapter_state_
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                   this->adapter_state_);
 
       if (ort_adapter != 0)
         {
@@ -1061,7 +971,7 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child)
 }
 
 PortableServer::POAList *
-TAO_Root_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::the_children_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList_var children;
@@ -1070,7 +980,6 @@ TAO_Root_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (children,
                     PortableServer::POAList (child_current),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   children->length (child_current);
 
@@ -1087,7 +996,7 @@ TAO_Root_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::AdapterName *
-TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::adapter_name_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The adapter name is the sequence of names starting from the
@@ -1103,8 +1012,7 @@ TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
   // parent.
   while (!CORBA::is_nil (poa.in ()))
     {
-      poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      poa = poa->the_parent ();
 
       ++len;
     }
@@ -1118,7 +1026,6 @@ TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   PortableInterceptor::AdapterName_var safe_names (names);
 
@@ -1133,11 +1040,9 @@ TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::ULong ilen = len;
   for (CORBA::ULong i = 1; i < len; ++i)
     {
-      (*names)[--ilen] = poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      (*names)[--ilen] = poa->the_name ();
 
-      poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      poa = poa->the_parent ();
 
       // If this condition asserts, the POA hierarchy was modified
       // (i.e. reduced in size) by another thread!
@@ -1149,8 +1054,7 @@ TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile,
-                                 const IOP::TaggedComponent &component
-                                 ACE_ENV_ARG_DECL)
+                                 const IOP::TaggedComponent &component)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles.
@@ -1160,9 +1064,7 @@ TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile,
     {
       TAO_Profile *profile = mprofile.get_profile (i);
 
-      profile->add_tagged_component (component
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      profile->add_tagged_component (component);
     }
 }
 
@@ -1170,8 +1072,7 @@ void
 TAO_Root_POA::add_ior_component_to_profile (
     TAO_MProfile & mprofile,
     const IOP::TaggedComponent &component,
-    IOP::ProfileId profile_id
-    ACE_ENV_ARG_DECL)
+    IOP::ProfileId profile_id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles matching the given
@@ -1186,9 +1087,7 @@ TAO_Root_POA::add_ior_component_to_profile (
 
       if (profile->tag () == profile_id)
         {
-          profile->add_tagged_component (component
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          profile->add_tagged_component (component);
 
           found_profile = true;
         }
@@ -1198,15 +1097,13 @@ TAO_Root_POA::add_ior_component_to_profile (
   // supposed to throw a CORBA::BAD_PARAM exception if no profile
   // matched the given ProfileId.
   if (found_profile == false)
-    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 29,
-                                 CORBA::COMPLETED_NO));
+    throw ::CORBA::BAD_PARAM (CORBA::OMGVMCID | 29, CORBA::COMPLETED_NO);
 }
 
 void
 TAO_Root_POA::adapter_state_changed (
    const TAO::ORT_Array &array_obj_ref_template,
-   PortableInterceptor::AdapterState state
-   ACE_ENV_ARG_DECL)
+   PortableInterceptor::AdapterState state)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IORInterceptor_Adapter *ior_adapter =
@@ -1214,18 +1111,14 @@ TAO_Root_POA::adapter_state_changed (
 
   if (ior_adapter)
     {
-      ior_adapter->adapter_state_changed (array_obj_ref_template,
-                                          state
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ior_adapter->adapter_state_changed (array_obj_ref_template, state);
     }
 }
 
 PortableServer::ObjectId *
 TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
                                  CORBA::Short priority,
-                                 bool &wait_occurred_restart_call
-                                 ACE_ENV_ARG_DECL)
+                                 bool &wait_occurred_restart_call)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
@@ -1233,13 +1126,11 @@ TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
   return this->active_policy_strategies_.servant_retention_strategy()->
     activate_object (servant,
                      priority,
-                     wait_occurred_restart_call
-                     ACE_ENV_ARG_PARAMETER);
+                     wait_occurred_restart_call);
 }
 
 PortableServer::ObjectId *
-TAO_Root_POA::activate_object (PortableServer::Servant servant
-                               ACE_ENV_ARG_DECL)
+TAO_Root_POA::activate_object (PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
@@ -1254,9 +1145,7 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant
       PortableServer::ObjectId *result =
         this->activate_object_i (servant,
                                  this->server_priority (),
-                                 wait_occurred_restart_call
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                 wait_occurred_restart_call);
 
       // If we ended up waiting on a condition variable, the POA state
       // may have changed while we are waiting.  Therefore, we need to
@@ -1271,8 +1160,7 @@ TAO_Root_POA::activate_object (PortableServer::Servant servant
 #if !defined (CORBA_E_MICRO)
 void
 TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                       PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL)
+                                       PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -1288,9 +1176,7 @@ TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id,
       this->activate_object_with_id_i (id,
                                        servant,
                                        this->server_priority (),
-                                       wait_occurred_restart_call
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                       wait_occurred_restart_call);
 
       // If we ended up waiting on a condition variable, the POA state
       // may have changed while we are waiting.  Therefore, we need to
@@ -1308,8 +1194,7 @@ void
 TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant servant,
                                          CORBA::Short priority,
-                                         bool &wait_occurred_restart_call
-                                         ACE_ENV_ARG_DECL)
+                                         bool &wait_occurred_restart_call)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -1319,31 +1204,23 @@ TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
     activate_object_with_id (id,
                              servant,
                              priority,
-                             wait_occurred_restart_call
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                             wait_occurred_restart_call);
 }
 #endif
 
 void
 TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                        CORBA::Boolean wait_for_completion
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::Boolean wait_for_completion)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->deactivate_all_objects_i (etherealize_objects
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate_all_objects_i (etherealize_objects);
 
-  this->wait_for_completions (wait_for_completion
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->wait_for_completions (wait_for_completion);
 }
 
 void
-TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion
-                                    ACE_ENV_ARG_DECL)
+TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion)
 {
   while (this->object_adapter ().enable_locking_ &&
          wait_for_completion &&
@@ -1354,7 +1231,7 @@ TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion
       int result = this->outstanding_requests_condition_.wait ();
       if (result == -1)
         {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
     }
 }
@@ -1362,8 +1239,7 @@ TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion
 /* static */
 void
 TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
-                                                    CORBA::Boolean wait_for_completion
-                                                    ACE_ENV_ARG_DECL)
+                                                    CORBA::Boolean wait_for_completion)
 {
   if (wait_for_completion)
     {
@@ -1384,8 +1260,8 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core
                 {
                   // CORBA 2.3 specifies which minor code corresponds
                   // to this particular problem.
-                  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 3,
-                                                   CORBA::COMPLETED_NO));
+                  throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 3,
+                                                   CORBA::COMPLETED_NO);
                 }
             }
           else
@@ -1398,8 +1274,7 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core
 }
 
 void
-TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects
-                                        ACE_ENV_ARG_DECL)
+TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1407,12 +1282,11 @@ TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects
     etherealize_objects (etherealize_objects);
 
   this->active_policy_strategies_.servant_retention_strategy ()->
-    deactivate_all_objects (ACE_ENV_SINGLE_ARG_PARAMETER);
+    deactivate_all_objects ();
 }
 
 void
-TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid
-                                 ACE_ENV_ARG_DECL)
+TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -1420,23 +1294,18 @@ TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
 
-  this->deactivate_object_i (oid
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->deactivate_object_i (oid);
 }
 
 
 void
-TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id
-                                   ACE_ENV_ARG_DECL)
+TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   this->active_policy_strategies_.servant_retention_strategy()->
-    deactivate_object (id
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    deactivate_object (id);
 }
 
 CORBA::Boolean
@@ -1446,8 +1315,7 @@ TAO_Root_POA::is_persistent (void) const
 }
 
 CORBA::Object_ptr
-TAO_Root_POA::create_reference (const char *intf
-                                ACE_ENV_ARG_DECL)
+TAO_Root_POA::create_reference (const char *intf)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1455,14 +1323,12 @@ TAO_Root_POA::create_reference (const char *intf
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
 
   return this->create_reference_i (intf,
-                                   this->server_priority ()
-                                   ACE_ENV_ARG_PARAMETER);
+                                   this->server_priority ());
 }
 
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_i (const char *intf,
-                                  CORBA::Short priority
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Short priority)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1473,13 +1339,12 @@ TAO_Root_POA::create_reference_i (const char *intf,
     }
 
   return this->active_policy_strategies_.servant_retention_strategy()->
-    create_reference (intf, priority ACE_ENV_ARG_PARAMETER);
+    create_reference (intf, priority);
 }
 
 CORBA::Object_ptr
 TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id,
-                                             const PortableServer::ObjectId & id
-                                             ACE_ENV_ARG_DECL)
+                                             const PortableServer::ObjectId & id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const PortableInterceptor::ObjectId &user_oid =
@@ -1490,20 +1355,18 @@ TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id,
     {
       // Ask the ORT to create the object.
       return this->ort_adapter_->make_object (repository_id,
-                                              user_oid
-                                              ACE_ENV_ARG_PARAMETER);
+                                              user_oid);
     }
   else
     {
-      return this->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+      return this->invoke_key_to_object ();
     }
 }
 
 CORBA::Object_ptr
 TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
                                           const char *intf,
-                                          CORBA::Short priority
-                                          ACE_ENV_ARG_DECL)
+                                          CORBA::Short priority)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the POA has the SYSTEM_ID policy and it detects that the
@@ -1524,34 +1387,31 @@ TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_i
     }
 
   return this->active_policy_strategies_.servant_retention_strategy()->
-    create_reference_with_id (user_id, intf, priority ACE_ENV_ARG_PARAMETER);
+    create_reference_with_id (user_id, intf, priority);
 }
 
 PortableServer::ObjectId *
-TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant
-                               ACE_ENV_ARG_DECL)
+TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.request_processing_strategy()->
-    servant_to_id (servant ACE_ENV_ARG_PARAMETER);
+    servant_to_id (servant);
 }
 
 CORBA::Object_ptr
-TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant
-                                      ACE_ENV_ARG_DECL)
+TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
-    servant_to_reference (servant ACE_ENV_ARG_PARAMETER);
+    servant_to_reference (servant);
 }
 
 PortableServer::Servant
-TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference
-                                      ACE_ENV_ARG_DECL)
+TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
@@ -1566,8 +1426,7 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference
 
   PortableServer::ObjectId system_id;
   bool const is_generated =
-    this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->is_poa_generated (reference, system_id);
 
   if (!is_generated)
     {
@@ -1579,8 +1438,7 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference
 
   PortableServer::Servant servant =
     this->active_policy_strategies_.request_processing_strategy()->
-      system_id_to_servant (system_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+      system_id_to_servant (system_id);
 
   if (servant != 0)
     {
@@ -1595,8 +1453,7 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference
       // conforming caller need not invoke _remove_ref on the returned
       // Servant if the type of the Servant uses the default reference
       // counting inherited from ServantBase.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      servant->_add_ref ();
     }
 
   return servant;
@@ -1604,11 +1461,9 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference
 
 bool
 TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference,
-                                PortableServer::ObjectId &system_id
-                                ACE_ENV_ARG_DECL)
+                                PortableServer::ObjectId &system_id)
 {
-  TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  TAO::ObjectKey_var key = reference->_key ();
 
   TAO_Object_Adapter::poa_name poa_system_name;
   CORBA::Boolean is_root = false;
@@ -1642,7 +1497,7 @@ TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference,
 
 PortableServer::ObjectId *
 TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
@@ -1663,8 +1518,7 @@ TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
   PortableServer::ObjectId system_id;
   bool const is_generated = this->is_poa_generated (reference,
                                                     system_id
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                   );
 
   if (!is_generated)
     {
@@ -1676,15 +1530,15 @@ TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
   TAO_POA_GUARD_RETURN (0);
 
   return this->active_policy_strategies_.servant_retention_strategy()->
-    system_id_to_object_id (system_id ACE_ENV_ARG_PARAMETER);
+    system_id_to_object_id (system_id);
 }
 
 PortableServer::Servant
 TAO_Root_POA::find_servant (const PortableServer::ObjectId &system_id
-                            ACE_ENV_ARG_DECL)
+                            )
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
-    find_servant (system_id ACE_ENV_ARG_PARAMETER);
+    find_servant (system_id);
 }
 
 int
@@ -1698,15 +1552,15 @@ void
 TAO_Root_POA::cleanup_servant (
   PortableServer::Servant servant,
   const PortableServer::ObjectId &user_id
-  ACE_ENV_ARG_DECL)
+  )
 {
   this->active_policy_strategies_.request_processing_strategy()->
-    cleanup_servant (servant, user_id ACE_ENV_ARG_PARAMETER);
+    cleanup_servant (servant, user_id);
 }
 
 PortableServer::Servant
 TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -1714,8 +1568,7 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
 
   PortableServer::Servant servant =
     this->active_policy_strategies_.request_processing_strategy()->
-      id_to_servant (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+      id_to_servant (id);
 
   if (servant != 0)
     {
@@ -1730,8 +1583,7 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
       // conforming caller need not invoke _remove_ref on the returned
       // Servant if the type of the Servant uses the default reference
       // counting inherited from ServantBase.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      servant->_add_ref ();
     }
 
   return servant;
@@ -1739,36 +1591,35 @@ TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
 
 PortableServer::Servant
 TAO_Root_POA::user_id_to_servant_i (const PortableServer::ObjectId &id
-                                    ACE_ENV_ARG_DECL)
+                                    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
-    user_id_to_servant (id ACE_ENV_ARG_PARAMETER);
+    user_id_to_servant (id);
 }
 
 CORBA::Object_ptr
 TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id,
                                  bool indirect
-                                 ACE_ENV_ARG_DECL)
+                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
-    id_to_reference (id, indirect ACE_ENV_ARG_PARAMETER);
+    id_to_reference (id, indirect);
 }
 
 CORBA::OctetSeq *
-TAO_Root_POA::id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::OctetSeq *id = 0;
   ACE_NEW_THROW_EX (id,
                     CORBA::OctetSeq (this->id_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return id;
 }
@@ -1779,7 +1630,7 @@ TAO_Root_POA::locate_servant_i (const char *operation,
                                 TAO::Portable_Server::Servant_Upcall &servant_upcall,
                                 TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
                                 bool &wait_occurred_restart_call
-                                ACE_ENV_ARG_DECL)
+                                )
 {
   return this->active_policy_strategies_.request_processing_strategy()->
     locate_servant (operation,
@@ -1787,7 +1638,7 @@ TAO_Root_POA::locate_servant_i (const char *operation,
                     servant_upcall,
                     poa_current_impl,
                     wait_occurred_restart_call
-                    ACE_ENV_ARG_PARAMETER);
+                   );
 }
 
 /* static */
@@ -2137,7 +1988,7 @@ TAO_Root_POA::object_adapter (void)
 }
 
 CORBA::Object_ptr
-TAO_Root_POA::invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::invoke_key_to_object (void)
 {
   PortableServer::ObjectId_var &system_id =
     *this->key_to_object_params_.system_id_;
@@ -2152,7 +2003,7 @@ TAO_Root_POA::invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL)
                               this->key_to_object_params_.collocated_,
                               this->key_to_object_params_.priority_,
                               this->key_to_object_params_.indirect_
-                              ACE_ENV_ARG_PARAMETER);
+                             );
 }
 
 CORBA::Object_ptr
@@ -2162,13 +2013,12 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
                              CORBA::Boolean collocated,
                              CORBA::Short priority,
                              bool indirect
-                             ACE_ENV_ARG_DECL)
+                             )
 {
   // Check if the ORB is still running, otherwise throw an exception.
   // @@ What if the ORB was destroyed?  In that case we shouldn't even
   //    get here!
-  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->orb_core_.check_shutdown ();
 
   //
   // ImplRepo related.
@@ -2197,8 +2047,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
         }
 
       CORBA::String_var imr_str =
-        imr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (obj);
+        imr->_stubobj ()->profile_in_use ()->to_string ();
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -2240,8 +2089,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
 
       obj =
         this->orb_core_.orb ()->string_to_object (ior.c_str ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (obj);
+                                                 );
 
       return obj;
     }
@@ -2253,8 +2101,7 @@ orbkey:
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   TAO_Stub *data =
-    this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    this->key_to_stub_i (key, type_id, priority);
 
   TAO_Stub_Auto_Ptr safe_data (data);
 
@@ -2267,7 +2114,6 @@ orbkey:
                                             servant),
                         CORBA::INTERNAL ());
 
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   else
     {
@@ -2275,7 +2121,6 @@ orbkey:
                         CORBA::Object (data,
                                        collocated),
                         CORBA::INTERNAL ());
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
 
   data->servant_orb (this->orb_core_.orb ());
@@ -2290,27 +2135,25 @@ TAO_Stub *
 TAO_Root_POA::key_to_stub (const TAO::ObjectKey &key,
                            const char *type_id,
                            CORBA::Short priority
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   // Check if the ORB is still running, otherwise throw an exception.
   // @@ What if the ORB was destroyed?  In that case we shouldn't even
   //    get here!
-  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->orb_core_.check_shutdown ();
 
-  return this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
+  return this->key_to_stub_i (key, type_id, priority);
 }
 
 TAO_Stub *
 TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
                              const char *type_id,
                              CORBA::Short priority
-                             ACE_ENV_ARG_DECL)
+                             )
 {
   CORBA::PolicyList_var client_exposed_policies =
     this->client_exposed_policies (priority
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                  );
 
   TAO_Acceptor_Filter* filter = 0;
 
@@ -2337,42 +2180,39 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
       client_exposed_policies._retn (),
       filter,
       this->orb_core_.lane_resources ().acceptor_registry ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+     );
 
   return data;
 }
 
 void
-TAO_Root_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::establish_components (void)
 {
   TAO_IORInterceptor_Adapter *ior_adapter =
     this->orb_core_.ior_interceptor_adapter ();
 
   if (ior_adapter)
     {
-      ior_adapter->establish_components (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ior_adapter->establish_components (this);
     }
 }
 
 void
 TAO_Root_POA::components_established (PortableInterceptor::IORInfo_ptr info
-                                      ACE_ENV_ARG_DECL)
+                                      )
 {
   TAO_IORInterceptor_Adapter *ior_adapter =
     this->orb_core_.ior_interceptor_adapter ();
 
   if (ior_adapter)
     {
-      ior_adapter->components_established (info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ior_adapter->components_established (info);
     }
 }
 
 void
 TAO_Root_POA::save_ior_component (const IOP::TaggedComponent &component
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  )
 {
   const CORBA::ULong old_len = this->tagged_component_.length ();
 
@@ -2383,8 +2223,7 @@ TAO_Root_POA::save_ior_component (const IOP::TaggedComponent &component
 void
 TAO_Root_POA::
 save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
-                                   IOP::ProfileId profile_id
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   IOP::ProfileId profile_id)
 {
   // The length of this->tagged_component_id_ is the same as the
   // length of the profile_id_array_ since we are trying to make a
@@ -2408,8 +2247,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
                                   const char *type_id,
                                   CORBA::PolicyList *policy_list,
                                   TAO_Acceptor_Filter *filter,
-                                  TAO_Acceptor_Registry &acceptor_registry
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_Acceptor_Registry &acceptor_registry)
 {
   int error = 0;
 
@@ -2468,8 +2306,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
     this->orb_core_.create_stub_object (mprofile,
                                         type_id,
                                         policy_list
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                       );
 
   // Add the saved tagged components methods to the profiles.
   CORBA::ULong len = this->tagged_component_.length ();
@@ -2477,8 +2314,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
     {
       this->add_ior_component (mprofile,
                                this->tagged_component_[i]
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                              );
       }
 
   len = this->tagged_component_id_.length ();
@@ -2488,8 +2324,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
       this->add_ior_component_to_profile (mprofile,
                                           this->tagged_component_id_[k],
                                           this->profile_id_array_[k]
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                         );
     }
 
   return stub;
@@ -2497,21 +2332,19 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
 
 CORBA::PolicyList *
 TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */
-                                       ACE_ENV_ARG_DECL)
+                                       )
 {
   CORBA::PolicyList *client_exposed_policies = 0;
   ACE_NEW_THROW_EX (client_exposed_policies,
                     CORBA::PolicyList (),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CORBA::PolicyList_var policies = client_exposed_policies;
 
   // Add in all of the client exposed policies.
   this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                    );
 
   return policies._retn ();
 }
@@ -2519,19 +2352,19 @@ TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */
 TAO_SERVANT_LOCATION
 TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
                                 PortableServer::Servant &servant
-                                ACE_ENV_ARG_DECL)
+                                )
 {
   return this->active_policy_strategies_.request_processing_strategy()->
-          locate_servant (system_id, servant ACE_ENV_ARG_PARAMETER);
+          locate_servant (system_id, servant);
 }
 
 TAO_SERVANT_LOCATION
 TAO_Root_POA::servant_present (const PortableServer::ObjectId &system_id,
                                PortableServer::Servant &servant
-                               ACE_ENV_ARG_DECL)
+                               )
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
-          servant_present (system_id, servant ACE_ENV_ARG_PARAMETER);
+          servant_present (system_id, servant);
 }
 
 PortableServer::Servant
@@ -2539,25 +2372,25 @@ TAO_Root_POA::find_servant (
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL)
+        )
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
           find_servant (system_id,
                         servant_upcall,
                         poa_current_impl
-                        ACE_ENV_ARG_PARAMETER);
+                       );
 }
 
 int
 TAO_Root_POA::find_servant_priority (
          const PortableServer::ObjectId &system_id,
          CORBA::Short &priority
-        ACE_ENV_ARG_DECL)
+        )
 {
   return this->active_policy_strategies_.servant_retention_strategy()->
           find_servant_priority (system_id,
                                  priority
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
 }
 
 TAO::ORT_Adapter_Factory *
@@ -2574,8 +2407,7 @@ TAO_Root_POA::ORT_adapter_i (void)
   if (this->ort_adapter_ != 0)
     return this->ort_adapter_;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO::ORT_Adapter_Factory * ort_ap_factory =
         this->ORT_adapter_factory ();
@@ -2587,8 +2419,7 @@ TAO_Root_POA::ORT_adapter_i (void)
       // create the adapter so that in case this fails, we just
       // return 0 and not a not activated adapter
       PortableInterceptor::AdapterName *adapter_name =
-        this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->adapter_name_i ();
 
       this->ort_adapter_ =
           ort_ap_factory->create ();
@@ -2604,17 +2435,14 @@ TAO_Root_POA::ORT_adapter_i (void)
                                     this->orb_core_.orbid (),
                                     adapter_name,
                                     this
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Cannot initialize the "
-                           "object_reference_template_adapter\n");
+      ex._tao_print_exception (
+        "(%P|%t) Cannot initialize the "
+        "object_reference_template_adapter\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return this->ort_adapter_;
 }
@@ -2622,7 +2450,7 @@ TAO_Root_POA::ORT_adapter_i (void)
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::AdapterActivator_ptr
-TAO_Root_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::the_activator (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
@@ -2633,7 +2461,7 @@ TAO_Root_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
@@ -2647,7 +2475,7 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::ServantManager_ptr
-TAO_Root_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::get_servant_manager (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -2655,12 +2483,12 @@ TAO_Root_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
   TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
 
   return this->active_policy_strategies_.request_processing_strategy()->
-    get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
+    get_servant_manager ();
 }
 
 void
 TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                              ACE_ENV_ARG_DECL)
+                              )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -2668,21 +2496,20 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
   TAO_POA_GUARD;
 
   this->active_policy_strategies_.request_processing_strategy()->
-    set_servant_manager (imgr ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    set_servant_manager (imgr);
 }
 
 PortableServer::Servant
-TAO_Root_POA::get_servant_i (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::get_servant_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   return this->active_policy_strategies_.request_processing_strategy()->
-    get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
+    get_servant ();
 }
 
 PortableServer::Servant
-TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::get_servant (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::NoServant,
                    PortableServer::POA::WrongPolicy))
@@ -2691,8 +2518,7 @@ TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
   TAO_POA_GUARD_RETURN (0);
 
   PortableServer::Servant servant =
-    this->get_servant_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->get_servant_i ();
 
   if (servant != 0)
     {
@@ -2707,8 +2533,7 @@ TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
       // conforming caller need not invoke _remove_ref on the returned
       // Servant if the type of the Servant uses the default reference
       // counting inherited from ServantBase.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      servant->_add_ref ();
 
       return servant;
     }
@@ -2723,7 +2548,7 @@ TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_Root_POA::set_servant (PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL)
+                           )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -2731,8 +2556,7 @@ TAO_Root_POA::set_servant (PortableServer::Servant servant
   TAO_POA_GUARD;
 
   this->active_policy_strategies_.request_processing_strategy()->
-    set_servant (servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    set_servant (servant);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
@@ -2849,7 +2673,7 @@ TAO_Root_POA::root (void) const
 }
 
 TAO::ORT_Adapter *
-TAO_Root_POA::ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::ORT_adapter (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->ort_adapter_ != 0)
@@ -2902,17 +2726,16 @@ TAO_Root_POA::ort_adapter_factory_name (const char *name)
 }
 
 CORBA::Policy_ptr
-TAO_Root_POA::get_policy (CORBA::PolicyType policy
-                          ACE_ENV_ARG_DECL)
+TAO_Root_POA::get_policy (CORBA::PolicyType policy)
 {
-  return this->policies_.get_policy (policy ACE_ENV_ARG_PARAMETER);
+  return this->policies_.get_policy (policy);
 }
 
 void
-TAO_Root_POA::check_state (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::check_state (void)
 {
   this->active_policy_strategies_.lifespan_strategy ()->
-    check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    check_state ();
 }
 
 const char *
@@ -2934,7 +2757,7 @@ TAO_Root_POA::imr_client_adapter_name (void)
 }
 
 PortableServer::POAManager_ptr
-TAO_Root_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Root_POA::the_POAManager (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManager::_duplicate (&this->poa_manager_);
@@ -2942,7 +2765,7 @@ TAO_Root_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 PortableServer::POAManagerFactory_ptr
-TAO_Root_POA::the_POAManagerFactory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Root_POA::the_POAManagerFactory (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_);
@@ -2950,7 +2773,7 @@ TAO_Root_POA::the_POAManagerFactory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 #endif
 
 CORBA::ORB_ptr
-TAO_Root_POA::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Root_POA::_get_orb (void)
 {
   return CORBA::ORB::_duplicate (this->orb_core_.orb ());
 }
@@ -3002,15 +2825,13 @@ TAO_Root_POA::poa_deactivated_hook ()
 
 void
 TAO_Root_POA::servant_activated_hook (PortableServer::Servant,
-                                      const PortableServer::ObjectId&
-                                      ACE_ENV_ARG_DECL)
+                                      const PortableServer::ObjectId&)
 {
 }
 
 void
 TAO_Root_POA::servant_deactivated_hook (PortableServer::Servant,
-                                        const PortableServer::ObjectId&
-                                        ACE_ENV_ARG_DECL)
+                                        const PortableServer::ObjectId&)
 {
 }
 
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index 34128790c9b..d7d69bfb6e3 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -130,7 +130,7 @@ public:
       const char *adapter_name,
       PortableServer::POAManager_ptr poa_manager,
       const CORBA::PolicyList &policies
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
@@ -138,20 +138,20 @@ public:
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
                                     CORBA::Boolean activate_it
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 #endif
 
   void destroy (CORBA::Boolean etherealize_objects,
                 CORBA::Boolean wait_for_completion
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::ThreadPolicy_ptr create_thread_policy (
       PortableServer::ThreadPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -159,7 +159,7 @@ public:
 #if !defined (CORBA_E_MICRO)
   PortableServer::LifespanPolicy_ptr create_lifespan_policy (
       PortableServer::LifespanPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif
@@ -167,7 +167,7 @@ public:
 #if !defined (CORBA_E_MICRO)
   PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
       PortableServer::IdUniquenessPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif
@@ -175,7 +175,7 @@ public:
 #if !defined (CORBA_E_MICRO)
   PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
       PortableServer::IdAssignmentPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif
@@ -184,97 +184,97 @@ public:
   PortableServer::ImplicitActivationPolicy_ptr
   create_implicit_activation_policy (
       PortableServer::ImplicitActivationPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::ServantRetentionPolicy_ptr
   create_servant_retention_policy (
       PortableServer::ServantRetentionPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::RequestProcessingPolicy_ptr
   create_request_processing_policy (
       PortableServer::RequestProcessingPolicyValue value
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
-  char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  char * the_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POA_ptr the_parent (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POAList *the_children (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POAManager_ptr the_POAManager (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::POAManagerFactory_ptr the_POAManagerFactory (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif
 
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+  PortableInterceptor::AdapterName *adapter_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Store the given TaggedComponent for eventual insertion into all
   /// object reference profiles.
   void save_ior_component (const IOP::TaggedComponent &component
-                           ACE_ENV_ARG_DECL);
+                          );
 
   /// Store the given TaggedComponent for eventual insertion into all
   /// object reference profiles with the given ProfileId.
   void save_ior_component_and_profile_id (
     const IOP::TaggedComponent &component,
     IOP::ProfileId profile_id
-    ACE_ENV_ARG_DECL);
+   );
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::AdapterActivator_ptr the_activator (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::ServantManager_ptr get_servant_manager (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                            )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant get_servant (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
   void set_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
   PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
@@ -282,7 +282,7 @@ public:
 #if !defined (CORBA_E_MICRO)
   void activate_object_with_id (const PortableServer::ObjectId &id,
                                 PortableServer::Servant p_servant
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
@@ -290,44 +290,44 @@ public:
 #endif
 
   void deactivate_object (const PortableServer::ObjectId &oid
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                          )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference (const char *intf
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id (
       const PortableServer::ObjectId &oid,
       const char *intf
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant p_servant
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::Servant reference_to_servant (
       CORBA::Object_ptr reference
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
@@ -335,37 +335,37 @@ public:
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OctetSeq *id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Accessor for POA policies.
   TAO_POA_Policy_Set &policies (void);
 
   /// Get the set policy of the given type.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy);
 
   /// This method gives the policies that are exposed to the client.
   /// These policies are shipped within the IOR.
   virtual CORBA::PolicyList *client_exposed_policies (
       CORBA::Short object_priority
-      ACE_ENV_ARG_DECL
+
     );
 
   TAO_Root_POA (const String &name,
@@ -376,7 +376,7 @@ public:
                 TAO_SYNCH_MUTEX &thread_lock,
                 TAO_ORB_Core &orb_core,
                 TAO_Object_Adapter *object_adapter
-                ACE_ENV_ARG_DECL);
+               );
 
   virtual ~TAO_Root_POA (void);
 
@@ -398,7 +398,7 @@ public:
   static void check_for_valid_wait_for_completions (
       const TAO_ORB_Core &orb_core,
       CORBA::Boolean wait_for_completion
-      ACE_ENV_ARG_DECL
+
     );
 
   /// ORB Core for POA.
@@ -421,7 +421,7 @@ public:
   TAO_Stub* key_to_stub (const TAO::ObjectKey &key,
                          const char *type_id,
                          CORBA::Short priority
-                         ACE_ENV_ARG_DECL);
+                        );
 
   /// Accessor methods to POA state.
   /**
@@ -429,7 +429,7 @@ public:
    * and NON_EXISTENT states.
    */
   PortableInterceptor::AdapterState get_adapter_state (
-    ACE_ENV_SINGLE_ARG_DECL);
+    void);
 
   virtual void *thread_pool (void) const;
 
@@ -451,7 +451,7 @@ public:
   /// Gets the value of TAO_POA_Static_Resources::imr_client_adapter_name_.
   static const char *imr_client_adapter_name (void);
 
-  CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr invoke_key_to_object (void);
 
   CORBA::Boolean system_id (void);
 
@@ -462,7 +462,7 @@ public:
 
   bool is_poa_generated (CORBA::Object_ptr reference,
                          PortableServer::ObjectId &system_id
-                         ACE_ENV_ARG_DECL);
+                        );
 
   /*
    * Validate if the servant may be activated
@@ -491,7 +491,7 @@ public:
     bool &wait_occurred_restart_call);
 
   void deactivate_object_i (const PortableServer::ObjectId &oid
-                            ACE_ENV_ARG_DECL)
+                            )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy));
@@ -503,18 +503,18 @@ public:
   bool has_system_id (void) const;
 
   PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id
-                                        ACE_ENV_ARG_DECL);
+                                       );
 
   TAO_SERVANT_LOCATION servant_present (
     const PortableServer::ObjectId &system_id,
     PortableServer::Servant &servant
-    ACE_ENV_ARG_DECL);
+   );
 
   PortableServer::Servant find_servant (
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL);
+       );
 
   /**
    * Find the the servant with ObjectId <system_id>, and retrieve
@@ -527,14 +527,14 @@ public:
   int find_servant_priority (
         const PortableServer::ObjectId &system_id,
         CORBA::Short &priority
-        ACE_ENV_ARG_DECL);
+       );
 
   int unbind_using_user_id (const PortableServer::ObjectId &user_id);
 
   void cleanup_servant (
     PortableServer::Servant servant,
     const PortableServer::ObjectId &user_id
-    ACE_ENV_ARG_DECL);
+   );
 
   void post_invoke_servant_cleanup(
     const PortableServer::ObjectId &system_id,
@@ -548,7 +548,7 @@ public:
       PortableServer::Servant p_servant,
       CORBA::Short priority,
       bool &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
@@ -556,13 +556,13 @@ public:
 
   CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid,
                                        bool indirect
-                                       ACE_ENV_ARG_DECL)
+                                       )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant
-                                             ACE_ENV_ARG_DECL)
+                                             )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
@@ -572,18 +572,18 @@ public:
   int is_poa_generated_id (const PortableServer::ObjectId &id);
 
   /// Check the state of this POA
-  void check_state (ACE_ENV_SINGLE_ARG_DECL);
+  void check_state (void);
 
   int delete_child (const String &child);
 
   PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid
-                                                ACE_ENV_ARG_DECL)
+                                                )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
   virtual CORBA::ORB_ptr _get_orb (
-      ACE_ENV_SINGLE_ARG_DECL
+
     );
 
   /// These hooks are needed by the CSD strategy to override
@@ -598,12 +598,12 @@ public:
   /// Hook - A servant has been activated.
   virtual void servant_activated_hook (PortableServer::Servant servant,
                                const PortableServer::ObjectId& oid
-                               ACE_ENV_ARG_DECL);
+                              );
 
   /// Hook - A servant has been deactivated.
   virtual void servant_deactivated_hook (PortableServer::Servant servant,
                                  const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL);
+                                );
 
 protected:
 
@@ -622,14 +622,14 @@ protected:
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
                             TAO_Object_Adapter *object_adapter
-                            ACE_ENV_ARG_DECL);
+                           );
 
 #if ! defined (CORBA_E_MICRO)
   PortableServer::POA_ptr create_POA_i (
       const char *adapter_name,
       PortableServer::POAManager_ptr poa_manager,
       const CORBA::PolicyList &policies
-      ACE_ENV_ARG_DECL
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
@@ -638,32 +638,32 @@ protected:
   PortableServer::POA_ptr create_POA_i (const String &adapter_name,
                                         PortableServer::POAManager_ptr poa_manager,
                                         const TAO_POA_Policy_Set &policies
-                                        ACE_ENV_ARG_DECL)
+                                        )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   TAO_Root_POA *find_POA_i (const ACE_CString &child_name,
                        CORBA::Boolean activate_it
-                       ACE_ENV_ARG_DECL)
+                       )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 #endif
 
   void destroy_i (CORBA::Boolean etherealize_objects,
                   CORBA::Boolean wait_for_completion
-                  ACE_ENV_ARG_DECL)
+                  )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL);
+  void complete_destruction_i (void);
 
-  PortableServer::POAList *the_children_i (ACE_ENV_SINGLE_ARG_DECL)
+  PortableServer::POAList *the_children_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  PortableInterceptor::AdapterName *adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
+  PortableInterceptor::AdapterName *adapter_name_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Method to notify the IOR Interceptors when there is a state
@@ -671,13 +671,13 @@ protected:
   void adapter_state_changed (
       const TAO::ORT_Array &array_obj_ref_template,
       PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles.
   void add_ior_component (TAO_MProfile & mprofile,
                           const IOP::TaggedComponent & component
-                          ACE_ENV_ARG_DECL)
+                          )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles matching the given
@@ -685,7 +685,7 @@ protected:
   void add_ior_component_to_profile (TAO_MProfile & mprofile,
                                      const IOP::TaggedComponent & component,
                                      IOP::ProfileId profile_id
-                                     ACE_ENV_ARG_DECL)
+                                     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Wrapper for the ORB's key_to_object that will alter the object pointer
@@ -696,22 +696,22 @@ protected:
                                    CORBA::Boolean collocated,
                                    CORBA::Short priority,
                                    bool indirect
-                                   ACE_ENV_ARG_DECL);
+                                  );
 
   /// Like key_to_stub() but assume that the ORB is not shutting down.
   virtual TAO_Stub* key_to_stub_i (const TAO::ObjectKey &key,
                                    const char *type_id,
                                    CORBA::Short priority
-                                   ACE_ENV_ARG_DECL);
+                                  );
 
   TAO_Stub *create_stub_object (const TAO::ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
                                 TAO_Acceptor_Registry &acceptor_registry
-                                ACE_ENV_ARG_DECL);
+                               );
 
-  PortableServer::Servant get_servant_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant get_servant_i (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
@@ -721,32 +721,32 @@ protected:
                                   PortableServer::Servant p_servant,
                                   CORBA::Short priority,
                                   bool &wait_occurred_restart_call
-                                  ACE_ENV_ARG_DECL)
+                                  )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 #endif
 
-  virtual void remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void remove_from_parent_i (void);
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects
-                                 ACE_ENV_ARG_DECL)
+                                 )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
                                  CORBA::Boolean wait_for_completion
-                                 ACE_ENV_ARG_DECL)
+                                 )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   void wait_for_completions (CORBA::Boolean wait_for_completion
-                             ACE_ENV_ARG_DECL);
+                            );
 
   CORBA::Object_ptr create_reference_i (const char *intf,
                                         CORBA::Short priority
-                                        ACE_ENV_ARG_DECL)
+                                        )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
@@ -754,13 +754,13 @@ protected:
       const PortableServer::ObjectId &oid,
       const char *intf,
       CORBA::Short priority
-      ACE_ENV_ARG_DECL
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::Servant reference_to_servant_i (
       CORBA::Object_ptr reference
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
@@ -768,13 +768,13 @@ protected:
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr servant_to_reference_i (PortableServer::Servant p_servant
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid
-                                           ACE_ENV_ARG_DECL)
+                                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
@@ -787,12 +787,12 @@ protected:
    * IORInterceptor::components_established() once the former is
    * completed.
    */
-  void establish_components (ACE_ENV_SINGLE_ARG_DECL);
+  void establish_components (void);
 
   /// Call the IORInterceptor::components_established() method on all
   /// registered IORInterceptors.
   void components_established (PortableInterceptor::IORInfo_ptr info
-                               ACE_ENV_ARG_DECL);
+                              );
 
   void set_folded_name (TAO_Root_POA *parent);
 
@@ -811,7 +811,7 @@ protected:
 protected:
   /// Accessor methods to ObjectReferenceTemplate
   PortableInterceptor::ObjectReferenceTemplate *
-    get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
+    get_adapter_template (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Accessor methods to ObjectReferenceTemplate, non locked version
@@ -819,18 +819,18 @@ protected:
 
   /// Accessor methods to PortableInterceptor::ObjectReferenceFactory
   PortableInterceptor::ObjectReferenceFactory *
-    get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
+    get_obj_ref_factory (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the object reference factory
   void set_obj_ref_factory (
     PortableInterceptor::ObjectReferenceFactory *current_factory
-    ACE_ENV_ARG_DECL);
+   );
 
 
   TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant &servant
-                                         ACE_ENV_ARG_DECL);
+                                        );
 
   PortableServer::Servant locate_servant_i (
       const char *operation,
@@ -838,7 +838,7 @@ protected:
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
       TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
       bool &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL
+
     );
 
 public:
@@ -846,13 +846,13 @@ public:
   CORBA::Object_ptr
   invoke_key_to_object_helper_i (const char * repository_id,
                                  const PortableServer::ObjectId & id
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 )
     ACE_THROW_SPEC ((CORBA::SystemException));
 protected:
 
   /// Get the ORT adapter, in case there is no adapter yet, this method will
   /// try to create one and hold the POA lock
-  TAO::ORT_Adapter *ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
+  TAO::ORT_Adapter *ORT_adapter (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the ORT adapter, in case there is no adapter yet, this method will
diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl
index 116d1d99c4f..57851ab838f 100644
--- a/TAO/tao/PortableServer/Root_POA.inl
+++ b/TAO/tao/PortableServer/Root_POA.inl
@@ -26,25 +26,24 @@ TAO_Root_POA::policies (void)
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_Root_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Root_POA::the_parent (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_nil ();
 }
 
 ACE_INLINE PortableInterceptor::AdapterName *
-TAO_Root_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::adapter_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->adapter_name_i ();
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_Root_POA::get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::get_adapter_template (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO::ORT_Adapter *adapter = this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO::ORT_Adapter *adapter = this->ORT_adapter ();
 
   if (adapter)
     {
@@ -66,11 +65,10 @@ TAO_Root_POA::get_adapter_template_i ()
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
-TAO_Root_POA::get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Root_POA::get_obj_ref_factory (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO::ORT_Adapter *adapter = this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  TAO::ORT_Adapter *adapter = this->ORT_adapter ();
 
   if (adapter)
     {
@@ -99,7 +97,7 @@ TAO_Root_POA::name (void) const
 }
 
 ACE_INLINE char *
-TAO_Root_POA::the_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Root_POA::the_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.c_str ());
@@ -226,7 +224,7 @@ TAO_Root_POA::orb_core (void) const
 }
 
 ACE_INLINE PortableInterceptor::AdapterState
-TAO_Root_POA::get_adapter_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Root_POA::get_adapter_state (void)
 {
   return this->adapter_state_;
 }
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
index 106e91dcd65..b2598398103 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -23,33 +23,32 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    ServantRetentionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+    ServantRetentionPolicy::copy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ServantRetentionPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
                         ServantRetentionPolicy (this->value_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return copy;
     }
 
     void
-    ServantRetentionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ServantRetentionPolicy::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::ServantRetentionPolicyValue
-    ServantRetentionPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ServantRetentionPolicy::value (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return this->value_;
     }
 
     CORBA::PolicyType
-    ServantRetentionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ServantRetentionPolicy::policy_type (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::SERVANT_RETENTION_POLICY_ID;
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h
index 948d7ee33dc..354ade7d9fc 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h
@@ -45,16 +45,16 @@ namespace TAO
     public:
       ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value);
 
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      ::PortableServer::ServantRetentionPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ::PortableServer::ServantRetentionPolicyValue value (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Return the cached policy type for this policy.
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index 77377a53539..41ffc3ef013 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -47,24 +47,24 @@ namespace TAO
       virtual TAO_SERVANT_LOCATION servant_present (
         const PortableServer::ObjectId &system_id,
         PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
 
       virtual PortableServer::Servant find_servant (
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
         TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
 
       virtual int find_servant_priority (
         const PortableServer::ObjectId &system_id,
         CORBA::Short &priority
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
 
       virtual PortableServer::ObjectId *activate_object (
         PortableServer::Servant servant,
         CORBA::Short priority,
         bool &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantAlreadyActive,
                            PortableServer::POA::WrongPolicy)) = 0;
@@ -75,7 +75,7 @@ namespace TAO
         PortableServer::Servant servant,
         CORBA::Short priority,
         bool &wait_occurred_restart_call
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantAlreadyActive,
                            PortableServer::POA::ObjectAlreadyActive,
@@ -83,22 +83,22 @@ namespace TAO
 #endif
 
       virtual void deactivate_object (const PortableServer::ObjectId &id
-                                      ACE_ENV_ARG_DECL) = 0;
+                                      ) = 0;
 
       virtual PortableServer::Servant find_servant (
         const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
 
       virtual PortableServer::ObjectId *system_id_to_object_id (
         const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongAdapter,
                            PortableServer::POA::WrongPolicy)) = 0;
 
       virtual PortableServer::Servant user_id_to_servant (
         const PortableServer::ObjectId &id
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ObjectNotActive,
                            PortableServer::POA::WrongPolicy)) = 0;
@@ -106,25 +106,25 @@ namespace TAO
       virtual CORBA::Object_ptr id_to_reference (
         const PortableServer::ObjectId &id,
         bool indirect
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ObjectNotActive,
                            PortableServer::POA::WrongPolicy)) = 0;
 
-      virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void deactivate_all_objects (void)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy)) = 0;
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantNotActive,
                            PortableServer::POA::WrongPolicy)) = 0;
 
       virtual CORBA::Object_ptr servant_to_reference (
         PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantNotActive,
                            PortableServer::POA::WrongPolicy)) = 0;
@@ -132,7 +132,7 @@ namespace TAO
       virtual CORBA::Object_ptr create_reference (
         const char *intf,
         CORBA::Short priority
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy)) = 0;
 
@@ -140,7 +140,7 @@ namespace TAO
         const PortableServer::ObjectId &oid,
         const char *intf,
         CORBA::Short priority
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
       virtual int rebind_using_user_id_and_system_id (
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
index 84d581d0c18..76cc8bfe9cf 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
@@ -41,7 +41,7 @@ namespace TAO
 
       virtual void destroy (
         ServantRetentionStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
index c1a5c11f000..f6d22016419 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -50,7 +50,7 @@ namespace TAO
     void
     ServantRetentionStrategyFactoryImpl::destroy (
       ServantRetentionStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
       const char *strategy_factory_name = 0;
 
@@ -73,8 +73,7 @@ namespace TAO
 
       if (servantretention_strategy_factory != 0)
         {
-          servantretention_strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          servantretention_strategy_factory->destroy (strategy);
         }
     }
   }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
index b6864c9984e..a3d45b9f353 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
@@ -39,7 +39,7 @@ namespace TAO
 
       virtual void destroy (
         ServantRetentionStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
index 3b48b5ab1bf..c82ebb8b052 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -33,34 +33,29 @@ namespace TAO
     }
 
     void
-    ServantRetentionStrategyNonRetain::strategy_init (
-      TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL_NOT_USED)
+    ServantRetentionStrategyNonRetain::strategy_init (TAO_Root_POA *poa)
     {
       poa_ = poa;
     }
 
     void
-    ServantRetentionStrategyNonRetain::strategy_cleanup (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ServantRetentionStrategyNonRetain::strategy_cleanup (void)
     {
       poa_ = 0;
     }
 
     void
     ServantRetentionStrategyNonRetain::deactivate_object (
-      const PortableServer::ObjectId &/*id*/
-      ACE_ENV_ARG_DECL)
+      const PortableServer::ObjectId &/*id*/)
     {
       // When using Non_Retain we don't have an active object map and we just
       // can't deactivate any object
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
     PortableServer::Servant
     ServantRetentionStrategyNonRetain::find_servant (
-      const PortableServer::ObjectId &/*system_id*/
-      ACE_ENV_ARG_DECL)
+      const PortableServer::ObjectId &/*system_id*/)
     {
       ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
                         0);
@@ -68,8 +63,7 @@ namespace TAO
 
     PortableServer::ObjectId *
     ServantRetentionStrategyNonRetain::system_id_to_object_id (
-      const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
+      const PortableServer::ObjectId &system_id)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongAdapter,
                          PortableServer::POA::WrongPolicy))
@@ -80,15 +74,13 @@ namespace TAO
       ACE_NEW_THROW_EX (id,
                         PortableServer::ObjectId (system_id),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
 
       return id;
     }
 
     PortableServer::Servant
     ServantRetentionStrategyNonRetain::user_id_to_servant (
-      const PortableServer::ObjectId &/*id*/
-      ACE_ENV_ARG_DECL)
+      const PortableServer::ObjectId &/*id*/)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -100,8 +92,7 @@ namespace TAO
     CORBA::Object_ptr
     ServantRetentionStrategyNonRetain::id_to_reference (
       const PortableServer::ObjectId &/*id*/,
-      bool /*indirect*/
-      ACE_ENV_ARG_DECL)
+      bool /*indirect*/)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -113,8 +104,7 @@ namespace TAO
     TAO_SERVANT_LOCATION
     ServantRetentionStrategyNonRetain::servant_present (
       const PortableServer::ObjectId &/*system_id*/,
-      PortableServer::Servant &/*servant*/
-      ACE_ENV_ARG_DECL_NOT_USED)
+      PortableServer::Servant &/*servant*/)
     {
       return TAO_SERVANT_NOT_FOUND;
     }
@@ -123,8 +113,7 @@ namespace TAO
     ServantRetentionStrategyNonRetain::find_servant (
       const PortableServer::ObjectId &system_id,
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
-      TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-      ACE_ENV_ARG_DECL_NOT_USED)
+      TAO::Portable_Server::POA_Current_Impl &poa_current_impl)
     {
       // We have the NON_RETAIN policy, user id is the system id.
 
@@ -140,8 +129,7 @@ namespace TAO
     int
     ServantRetentionStrategyNonRetain::find_servant_priority (
         const PortableServer::ObjectId &/*system_id*/,
-        CORBA::Short &/*priority*/
-        ACE_ENV_ARG_DECL)
+        CORBA::Short &/*priority*/)
     {
       return -1;
     }
@@ -161,8 +149,7 @@ namespace TAO
     }
 
     void
-    ServantRetentionStrategyNonRetain::deactivate_all_objects (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ServantRetentionStrategyNonRetain::deactivate_all_objects (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -170,8 +157,7 @@ namespace TAO
 
     PortableServer::ObjectId *
     ServantRetentionStrategyNonRetain::servant_to_user_id (
-      PortableServer::Servant /*servant*/
-      ACE_ENV_ARG_DECL)
+      PortableServer::Servant /*servant*/)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -182,8 +168,7 @@ namespace TAO
 
     CORBA::Object_ptr
     ServantRetentionStrategyNonRetain::servant_to_reference (
-      PortableServer::Servant /*servant*/
-      ACE_ENV_ARG_DECL)
+      PortableServer::Servant /*servant*/)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -196,8 +181,7 @@ namespace TAO
     ServantRetentionStrategyNonRetain::activate_object (
       PortableServer::Servant /*servant*/,
       CORBA::Short /*priority*/,
-      bool &/*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
+      bool &/*wait_occurred_restart_call*/)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
                          PortableServer::POA::WrongPolicy))
@@ -212,22 +196,20 @@ namespace TAO
       const PortableServer::ObjectId &/*id*/,
       PortableServer::Servant /*servant*/,
       CORBA::Short /*priority*/,
-      bool &/*wait_occurred_restart_call*/
-      ACE_ENV_ARG_DECL)
+      bool &/*wait_occurred_restart_call*/)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
                          PortableServer::POA::ObjectAlreadyActive,
                          PortableServer::POA::WrongPolicy))
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 #endif
 
     CORBA::Object_ptr
     ServantRetentionStrategyNonRetain::create_reference (
       const char *intf,
-      CORBA::Short priority
-      ACE_ENV_ARG_DECL)
+      CORBA::Short priority)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -249,7 +231,6 @@ namespace TAO
       ACE_NEW_THROW_EX (sys_id,
                         PortableServer::ObjectId,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       system_id = sys_id;
 
@@ -264,17 +245,14 @@ namespace TAO
                                              priority,
                                              true);
 
-      return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                        user_id
-                                                        ACE_ENV_ARG_PARAMETER);
+      return this->poa_->invoke_key_to_object_helper_i (intf, user_id);
     }
 
     CORBA::Object_ptr
     ServantRetentionStrategyNonRetain::create_reference_with_id (
       const PortableServer::ObjectId &oid,
       const char *intf,
-      CORBA::Short priority
-      ACE_ENV_ARG_DECL)
+      CORBA::Short priority)
         ACE_THROW_SPEC ((CORBA::SystemException))
     {
       // This operation creates an object reference that encapsulates the
@@ -290,11 +268,10 @@ namespace TAO
 
       // Otherwise, it is the NON_RETAIN policy.  Therefore, user id
       // is the same as system id.
-      PortableServer::ObjectId *sys_id;
+      PortableServer::ObjectId *sys_id = 0;
       ACE_NEW_THROW_EX (sys_id,
                         PortableServer::ObjectId (oid),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       system_id = sys_id;
 
@@ -306,9 +283,7 @@ namespace TAO
                                              priority,
                                              true);
 
-      return this->poa_->invoke_key_to_object_helper_i (intf,
-                                                        oid
-                                                        ACE_ENV_ARG_PARAMETER);
+      return this->poa_->invoke_key_to_object_helper_i (intf, oid);
     }
 
     int
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
index 2b8780343dc..6950af6e4c0 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -36,9 +36,9 @@ namespace TAO
     public:
       ServantRetentionStrategyNonRetain (void);
 
-      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+      virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
       CORBA::ULong waiting_servant_deactivation (void) const;
 
@@ -46,8 +46,7 @@ namespace TAO
       PortableServer::ObjectId *
       activate_object (PortableServer::Servant servant,
                        CORBA::Short priority,
-                       bool &wait_occurred_restart_call
-                            ACE_ENV_ARG_DECL)
+                       bool &wait_occurred_restart_call)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
                          PortableServer::POA::WrongPolicy));
@@ -58,93 +57,81 @@ namespace TAO
       activate_object_with_id (const PortableServer::ObjectId &id,
                                PortableServer::Servant servant,
                                CORBA::Short priority,
-                               bool &wait_occurred_restart_call
-                               ACE_ENV_ARG_DECL)
+                               bool &wait_occurred_restart_call)
         ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
                    PortableServer::POA::WrongPolicy));
 #endif
 
-      virtual void deactivate_object (const PortableServer::ObjectId &id
-                                      ACE_ENV_ARG_DECL);
+      virtual void deactivate_object (const PortableServer::ObjectId &id);
 
       virtual PortableServer::Servant find_servant (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
+        const PortableServer::ObjectId &system_id);
 
       virtual int is_servant_in_map (PortableServer::Servant servant,
                                      bool &wait_occurred_restart_call);
 
       virtual PortableServer::ObjectId *system_id_to_object_id (
         const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongAdapter,
                            PortableServer::POA::WrongPolicy));
 
       virtual
       PortableServer::Servant
-      user_id_to_servant (const PortableServer::ObjectId &id
-                          ACE_ENV_ARG_DECL)
+      user_id_to_servant (const PortableServer::ObjectId &id)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy));
 
       CORBA::Object_ptr
       id_to_reference (const PortableServer::ObjectId &id,
-                       bool indirect
-                       ACE_ENV_ARG_DECL)
+                       bool indirect)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy));
 
       virtual TAO_SERVANT_LOCATION servant_present (
         const PortableServer::ObjectId &system_id,
-        PortableServer::Servant &servant
-        ACE_ENV_ARG_DECL);
+        PortableServer::Servant &servant);
 
       virtual PortableServer::Servant find_servant (
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL);
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl);
 
       virtual int find_servant_priority (
         const PortableServer::ObjectId &system_id,
-        CORBA::Short &priority
-        ACE_ENV_ARG_DECL);
+        CORBA::Short &priority);
 
-      virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void deactivate_all_objects (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
       virtual PortableServer::ObjectId *servant_to_user_id (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        PortableServer::Servant servant)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantNotActive,
                            PortableServer::POA::WrongPolicy));
 
       virtual CORBA::Object_ptr servant_to_reference (
-        PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        PortableServer::Servant servant)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantNotActive,
                            PortableServer::POA::WrongPolicy));
 
       virtual CORBA::Object_ptr create_reference (
         const char *intf,
-        CORBA::Short priority
-        ACE_ENV_ARG_DECL)
+        CORBA::Short priority)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy));
 
       virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId &oid,
         const char *intf,
-        CORBA::Short priority
-        ACE_ENV_ARG_DECL)
+        CORBA::Short priority)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual int rebind_using_user_id_and_system_id (
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
index 8da6d151764..80f95a4b549 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -46,10 +46,9 @@ namespace TAO
     void
     ServantRetentionStrategyNonRetainFactoryImpl::destroy (
       ServantRetentionStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
index 407d148d4b0..e7351acdbbf 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
@@ -41,7 +41,7 @@ namespace TAO
 
       virtual void destroy (
         ServantRetentionStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index b12a5e5b324..fce866f9a08 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -38,9 +38,7 @@ namespace TAO
     }
 
     void
-    ServantRetentionStrategyRetain::strategy_init (
-      TAO_Root_POA *poa
-      ACE_ENV_ARG_DECL)
+    ServantRetentionStrategyRetain::strategy_init (TAO_Root_POA *poa)
     {
       poa_ = poa;
 
@@ -51,8 +49,7 @@ namespace TAO
                                                !poa->allow_multiple_activations (),
                                                poa->is_persistent (),
                                                poa->orb_core().server_factory ()->active_object_map_creation_parameters ()
-                                               ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ());
-      ACE_CHECK;
+                                              ), CORBA::NO_MEMORY ());
 
       // Give ownership of the new map to the auto pointer.  Note, that it
       // is important for the auto pointer to take ownership before
@@ -60,7 +57,6 @@ namespace TAO
       auto_ptr<TAO_Active_Object_Map> new_active_object_map (active_object_map);
 
       // Check for exception in construction of the active object map.
-      ACE_CHECK;
 
       // Finally everything is fine.  Make sure to take ownership away
       // from the auto pointer.
@@ -68,8 +64,7 @@ namespace TAO
     }
 
     void
-    ServantRetentionStrategyRetain::strategy_cleanup(
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ServantRetentionStrategyRetain::strategy_cleanup(void)
     {
       // Delete the active object map.
       delete this->active_object_map_;
@@ -78,8 +73,7 @@ namespace TAO
 
     void
     ServantRetentionStrategyRetain::deactivate_object (
-      const PortableServer::ObjectId &id
-      ACE_ENV_ARG_DECL)
+      const PortableServer::ObjectId &id)
     {
 
       TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
@@ -91,18 +85,15 @@ namespace TAO
       // Id, the operation raises an ObjectNotActive exception.
       if (result != 0)
         {
-          ACE_THROW (PortableServer::POA::ObjectNotActive ());
+          throw PortableServer::POA::ObjectNotActive ();
         }
 
-      this->deactivate_map_entry (active_object_map_entry
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->deactivate_map_entry (active_object_map_entry);
     }
 
     void
     ServantRetentionStrategyRetain::deactivate_map_entry (
-      TAO_Active_Object_Map_Entry *active_object_map_entry
-      ACE_ENV_ARG_DECL)
+      TAO_Active_Object_Map_Entry *active_object_map_entry)
     {
       // Decrement the reference count.
       CORBA::UShort const new_count = --active_object_map_entry->reference_count_;
@@ -115,16 +106,14 @@ namespace TAO
           this->poa_->servant_deactivated_hook (
             active_object_map_entry->servant_,
             active_object_map_entry->user_id_
-            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+           );
         }
 
       if (new_count == 0)
         {
           this->poa_->cleanup_servant (active_object_map_entry->servant_,
                                        active_object_map_entry->user_id_
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                      );
         }
       else
         {
@@ -153,8 +142,7 @@ namespace TAO
 
     PortableServer::Servant
     ServantRetentionStrategyRetain::find_servant (
-      const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
+      const PortableServer::ObjectId &system_id)
     {
       // Find user id from system id.
       PortableServer::ObjectId_var user_id;
@@ -191,8 +179,7 @@ namespace TAO
 
     PortableServer::ObjectId *
     ServantRetentionStrategyRetain::system_id_to_object_id (
-      const PortableServer::ObjectId &system_id
-      ACE_ENV_ARG_DECL)
+      const PortableServer::ObjectId &system_id)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongAdapter,
                          PortableServer::POA::WrongPolicy))
@@ -213,8 +200,7 @@ namespace TAO
 
     PortableServer::Servant
     ServantRetentionStrategyRetain::user_id_to_servant (
-      const PortableServer::ObjectId &id
-      ACE_ENV_ARG_DECL)
+      const PortableServer::ObjectId &id)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -240,8 +226,7 @@ namespace TAO
     CORBA::Object_ptr
     ServantRetentionStrategyRetain::id_to_reference (
       const PortableServer::ObjectId &id,
-      bool indirect
-      ACE_ENV_ARG_DECL)
+      bool indirect)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -269,7 +254,7 @@ namespace TAO
 
           return this->poa_->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
                                                             id
-                                                            ACE_ENV_ARG_PARAMETER);
+                                                           );
         }
       else
         {
@@ -283,8 +268,7 @@ namespace TAO
     TAO_SERVANT_LOCATION
     ServantRetentionStrategyRetain::servant_present (
       const PortableServer::ObjectId &system_id,
-      PortableServer::Servant &servant
-      ACE_ENV_ARG_DECL)
+      PortableServer::Servant &servant)
     {
       // Find user id from system id.
       PortableServer::ObjectId_var user_id;
@@ -317,8 +301,7 @@ namespace TAO
     ServantRetentionStrategyRetain::find_servant (
       const PortableServer::ObjectId &system_id,
       TAO::Portable_Server::Servant_Upcall &servant_upcall,
-      TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-      ACE_ENV_ARG_DECL)
+      TAO::Portable_Server::POA_Current_Impl &poa_current_impl)
     {
       PortableServer::ObjectId user_id;
       // If we have the RETAIN policy, convert/transform from system id to
@@ -361,8 +344,7 @@ namespace TAO
     int
     ServantRetentionStrategyRetain::find_servant_priority (
         const PortableServer::ObjectId &system_id,
-        CORBA::Short &priority
-        ACE_ENV_ARG_DECL)
+        CORBA::Short &priority)
     {
       PortableServer::ObjectId user_id;
       // If we have the RETAIN policy, convert/transform from system id to
@@ -495,8 +477,7 @@ namespace TAO
     }
 
     void
-    ServantRetentionStrategyRetain::deactivate_all_objects (
-      ACE_ENV_SINGLE_ARG_DECL)
+    ServantRetentionStrategyRetain::deactivate_all_objects (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -538,15 +519,13 @@ namespace TAO
            ++i)
         {
           this->deactivate_map_entry (map_entries[i]
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                     );
         }
     }
 
     PortableServer::ObjectId *
     ServantRetentionStrategyRetain::servant_to_user_id (
-      PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
+      PortableServer::Servant servant)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -613,8 +592,7 @@ namespace TAO
           // sevant is activated.
           this->poa_->servant_activated_hook (servant,
                                               user_id.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                             );
 
           // ATTENTION: Trick locking here, see class header for details
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -624,8 +602,7 @@ namespace TAO
           // is invoked at least once on the Servant argument before
           // returning. Otherwise, the POA does not increment or decrement
           // the reference count of the Servant passed to this function.
-          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          servant->_add_ref ();
 
           return user_id._retn ();
         }
@@ -640,8 +617,7 @@ namespace TAO
     PortableServer::ObjectId *
     ServantRetentionStrategyRetain::servant_to_system_id_i (
       PortableServer::Servant servant,
-      CORBA::Short &priority
-      ACE_ENV_ARG_DECL)
+      CORBA::Short &priority)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantNotActive,
                          PortableServer::POA::WrongPolicy))
@@ -708,8 +684,7 @@ namespace TAO
           // sevant is activated.
           this->poa_->servant_activated_hook (servant,
                                               system_id.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                             );
 
           // ATTENTION: Trick locking here, see class header for details
           Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -719,8 +694,7 @@ namespace TAO
           // is invoked at least once on the Servant argument before
           // returning. Otherwise, the POA does not increment or decrement
           // the reference count of the Servant passed to this function.
-          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          servant->_add_ref ();
 
           return system_id._retn ();
         }
@@ -732,8 +706,7 @@ namespace TAO
 
     CORBA::Object_ptr
     ServantRetentionStrategyRetain::servant_to_reference (
-      PortableServer::Servant servant
-      ACE_ENV_ARG_DECL)
+      PortableServer::Servant servant)
         ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableServer::POA::ServantNotActive,
                       PortableServer::POA::WrongPolicy))
@@ -750,8 +723,7 @@ namespace TAO
       PortableServer::ObjectId_var system_id =
         this->servant_to_system_id_i (servant,
                                       priority
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+                                     );
 
       PortableServer::ObjectId user_id;
 
@@ -782,15 +754,14 @@ namespace TAO
       return this->poa_->invoke_key_to_object_helper_i (
               servant->_interface_repository_id (),
               user_id
-              ACE_ENV_ARG_PARAMETER);
+             );
     }
 
     PortableServer::ObjectId *
     ServantRetentionStrategyRetain::activate_object (
       PortableServer::Servant servant,
       CORBA::Short priority,
-      bool &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL)
+      bool &wait_occurred_restart_call)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
                          PortableServer::POA::WrongPolicy))
@@ -838,8 +809,7 @@ namespace TAO
       // sevant is activated.
       this->poa_->servant_activated_hook (servant,
                                           user_id.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                         );
 
       // ATTENTION: Trick locking here, see class header for details
       Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -849,8 +819,7 @@ namespace TAO
       // least once on the Servant argument before returning. When the POA
       // no longer needs the Servant, it will invoke _remove_ref on it the
       // same number of times.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      servant->_add_ref ();
 
       return user_id._retn ();
     }
@@ -861,8 +830,7 @@ namespace TAO
       const PortableServer::ObjectId &id,
       PortableServer::Servant servant,
       CORBA::Short priority,
-      bool &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL)
+      bool &wait_occurred_restart_call)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
                          PortableServer::POA::ObjectAlreadyActive,
@@ -880,7 +848,7 @@ namespace TAO
       if (this->poa_->has_system_id () &&
           !this->poa_->is_poa_generated_id (id))
         {
-          ACE_THROW (CORBA::BAD_PARAM ());
+          throw ::CORBA::BAD_PARAM ();
         }
 
       // If the CORBA object denoted by the Object Id value is already
@@ -898,7 +866,7 @@ namespace TAO
     // in the Active Object Map, the ServantAlreadyActive exception is raised.
       if (result)
         {
-          ACE_THROW (PortableServer::POA::ObjectAlreadyActive ());
+          throw PortableServer::POA::ObjectAlreadyActive ();
         }
       else if (wait_occurred_restart_call)
         {
@@ -916,7 +884,7 @@ namespace TAO
       // same then the ORB shall return SUCCESS.
       if (!priorities_match)
         {
-          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1,
+          throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1,
                                            CORBA::COMPLETED_NO));
         }
 
@@ -931,7 +899,7 @@ namespace TAO
             }
           else
             {
-              ACE_THROW (PortableServer::POA::ServantAlreadyActive ());
+              throw PortableServer::POA::ServantAlreadyActive ();
             }
         }
 
@@ -942,7 +910,7 @@ namespace TAO
                                                         id,
                                                         priority) != 0)
         {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
+          throw ::CORBA::OBJ_ADAPTER ();
         }
 
       //
@@ -953,8 +921,7 @@ namespace TAO
       // sevant is activated.
       this->poa_->servant_activated_hook (servant,
                                           id
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                         );
 
       // ATTENTION: Trick locking here, see class header for details
       Non_Servant_Upcall non_servant_upcall (*this->poa_);
@@ -964,16 +931,14 @@ namespace TAO
       // _add_ref at least once on the Servant argument before
       // returning. When the POA no longer needs the Servant, it will
       // invoke _remove_ref on it the same number of times.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      servant->_add_ref ();
     }
 #endif
 
     CORBA::Object_ptr
     ServantRetentionStrategyRetain::create_reference (
       const char *intf,
-      CORBA::Short priority
-      ACE_ENV_ARG_DECL)
+      CORBA::Short priority)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy))
     {
@@ -1017,7 +982,7 @@ namespace TAO
 
       return this->poa_->invoke_key_to_object_helper_i (intf,
                                                         user_id
-                                                        ACE_ENV_ARG_PARAMETER);
+                                                       );
 
     }
 
@@ -1025,8 +990,7 @@ namespace TAO
     ServantRetentionStrategyRetain::create_reference_with_id (
       const PortableServer::ObjectId &oid,
       const char *intf,
-      CORBA::Short priority
-      ACE_ENV_ARG_DECL)
+      CORBA::Short priority)
         ACE_THROW_SPEC ((CORBA::SystemException))
     {
       // This operation creates an object reference that encapsulates the
@@ -1065,7 +1029,7 @@ namespace TAO
 
       return this->poa_->invoke_key_to_object_helper_i (intf,
                                                   oid
-                                                  ACE_ENV_ARG_PARAMETER);
+                                                 );
     }
 
     int
@@ -1095,7 +1059,7 @@ namespace TAO
 
 
     ::PortableServer::ServantRetentionPolicyValue
-    ServantRetentionStrategyRetain::type() const
+    ServantRetentionStrategyRetain::type(void) const
     {
       return ::PortableServer::RETAIN;
     }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index a34d82c52b0..4ea03f1fa3f 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -36,9 +36,9 @@ namespace TAO
 
       CORBA::ULong waiting_servant_deactivation (void) const;
 
-      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+      virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
       virtual int is_servant_in_map (PortableServer::Servant servant,
                                      bool &wait_occurred_restart_call);
@@ -48,7 +48,7 @@ namespace TAO
       activate_object (PortableServer::Servant servant,
                        CORBA::Short priority,
                        bool &wait_occurred_restart_call
-                            ACE_ENV_ARG_DECL)
+                            )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantAlreadyActive,
                          PortableServer::POA::WrongPolicy));
@@ -59,38 +59,34 @@ namespace TAO
       activate_object_with_id (const PortableServer::ObjectId &id,
                                PortableServer::Servant servant,
                                CORBA::Short priority,
-                               bool &wait_occurred_restart_call
-                               ACE_ENV_ARG_DECL)
+                               bool &wait_occurred_restart_call)
         ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
                    PortableServer::POA::WrongPolicy));
 #endif
 
-      void deactivate_object (const PortableServer::ObjectId &id
-                              ACE_ENV_ARG_DECL);
+      void deactivate_object (const PortableServer::ObjectId &id);
 
       virtual PortableServer::Servant find_servant (
         const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL);
+       );
 
       virtual PortableServer::ObjectId * system_id_to_object_id (
-        const PortableServer::ObjectId &system_id
-        ACE_ENV_ARG_DECL)
+        const PortableServer::ObjectId &system_id)
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongAdapter,
                            PortableServer::POA::WrongPolicy));
 
       virtual
       PortableServer::Servant
-      user_id_to_servant (const PortableServer::ObjectId &id
-                     ACE_ENV_ARG_DECL)
+      user_id_to_servant (const PortableServer::ObjectId &id)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy));
 
       CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id,
-                                         bool indirect ACE_ENV_ARG_DECL)
+                                         bool indirect)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ObjectNotActive,
                          PortableServer::POA::WrongPolicy));
@@ -98,27 +94,25 @@ namespace TAO
       virtual
       TAO_SERVANT_LOCATION
       servant_present (const PortableServer::ObjectId &system_id,
-                       PortableServer::Servant &servant
-                       ACE_ENV_ARG_DECL);
+                       PortableServer::Servant &servant);
 
       virtual PortableServer::Servant find_servant (
         const PortableServer::ObjectId &system_id,
         TAO::Portable_Server::Servant_Upcall &servant_upcall,
-        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
-        ACE_ENV_ARG_DECL);
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl);
 
       virtual int find_servant_priority (
         const PortableServer::ObjectId &system_id,
         CORBA::Short &priority
-        ACE_ENV_ARG_DECL);
+       );
 
-      virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
+      virtual void deactivate_all_objects (void)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::WrongPolicy));
 
       virtual PortableServer::ObjectId *servant_to_user_id (
         PortableServer::Servant servant
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::ServantNotActive,
                            PortableServer::POA::WrongPolicy));
@@ -126,7 +120,7 @@ namespace TAO
       virtual
       CORBA::Object_ptr
       servant_to_reference (PortableServer::Servant servant
-                            ACE_ENV_ARG_DECL)
+                            )
         ACE_THROW_SPEC ((CORBA::SystemException,
                       PortableServer::POA::ServantNotActive,
                       PortableServer::POA::WrongPolicy));
@@ -135,7 +129,7 @@ namespace TAO
       CORBA::Object_ptr create_reference (
         const char *intf,
         CORBA::Short priority
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException,
                            PortableServer::POA::WrongPolicy));
 
@@ -144,7 +138,7 @@ namespace TAO
         const PortableServer::ObjectId &oid,
         const char *intf,
         CORBA::Short priority
-        ACE_ENV_ARG_DECL)
+        )
           ACE_THROW_SPEC ((CORBA::SystemException));
 
       virtual ::PortableServer::ServantRetentionPolicyValue type() const;
@@ -158,12 +152,12 @@ namespace TAO
 
       void
       deactivate_map_entry (TAO_Active_Object_Map_Entry *active_object_map_entry
-                            ACE_ENV_ARG_DECL);
+                           );
 
       PortableServer::ObjectId *servant_to_system_id_i (
           PortableServer::Servant p_servant,
           CORBA::Short &priority
-          ACE_ENV_ARG_DECL
+
         )
         ACE_THROW_SPEC ((CORBA::SystemException,
                          PortableServer::POA::ServantNotActive,
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
index f801a3b5e25..a07f01c7a96 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -42,10 +42,9 @@ namespace TAO
     void
     ServantRetentionStrategyRetainFactoryImpl::destroy (
       ServantRetentionStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
index 1dbddfbb378..87e553d33d7 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
@@ -39,7 +39,7 @@ namespace TAO
 
       virtual void destroy (
         ServantRetentionStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index abdd228aafa..1126c01c9b0 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -74,32 +74,31 @@ TAO_ServantBase::~TAO_ServantBase (void)
 }
 
 PortableServer::POA_ptr
-TAO_ServantBase::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServantBase::_default_POA (void)
 {
   CORBA::Object_var object =
-    TAO_ORB_Core_instance ()->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    TAO_ORB_Core_instance ()->root_poa ();
 
   return PortableServer::POA::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
 }
 
 CORBA::Boolean
 TAO_ServantBase::_is_a (const char *logical_type_id
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        )
 {
   static char const id[] = "IDL:omg.org/CORBA/Object:1.0";
   return ACE_OS::strcmp (logical_type_id, id) == 0;
 }
 
 CORBA::Boolean
-TAO_ServantBase::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServantBase::_non_existent (void)
 {
   return false;
 }
 
 CORBA::InterfaceDef_ptr
-TAO_ServantBase::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServantBase::_get_interface (void)
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -116,17 +115,17 @@ TAO_ServantBase::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
   // used only to resolve the IFR, so we should be ok.
   return adapter->get_interface (TAO_ORB_Core_instance ()->orb (),
                                  this->_interface_repository_id ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
 }
 
 CORBA::Object_ptr
-TAO_ServantBase::_get_component (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServantBase::_get_component (void)
 {
   return CORBA::Object::_nil ();
 }
 
 char *
-TAO_ServantBase::_repository_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServantBase::_repository_id (void)
 {
   return CORBA::string_dup (this->_interface_repository_id ());
 }
@@ -151,7 +150,7 @@ TAO_ServantBase::_find (const char *opname,
 }
 
 TAO_Stub *
-TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServantBase::_create_stub (void)
 {
   TAO_Stub *stub = 0;
 
@@ -171,19 +170,16 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
             poa_current_impl->object_key (),
             this->_interface_repository_id (),
             poa_current_impl->priority ()
-            ACE_ENV_ARG_PARAMETER
+
           );
-      ACE_CHECK_RETURN (0);
     }
   else
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        this->_default_POA ();
 
       CORBA::Object_var object =
-        poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        poa->servant_to_reference (this);
 
       // Get the stub object
       stub = object->_stubobj ();
@@ -202,7 +198,7 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
 void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
                                                    void * servant_upcall,
                                                    void * derived_this
-                                                   ACE_ENV_ARG_DECL)
+                                                   )
 {
   TAO_Skeleton skel;
   char const * const opname = req.operation ();
@@ -222,7 +218,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
                    skel,
                    static_cast <unsigned int> (req.operation_length())) == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      throw ::CORBA::BAD_OPERATION ();
     }
 
   CORBA::Boolean const send_reply =
@@ -230,7 +226,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
     && req.response_expected ()
     && !req.deferred_reply ();
 
-  ACE_TRY
+  try
     {
       // Invoke the skeleton, it will demarshal the arguments, invoke
       // the right operation on the skeleton class, and marshal any
@@ -239,8 +235,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
       skel (req,
             servant_upcall,
             derived_this
-            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+           );
 
       /*
        * Dispatch resolution specialization add hook.
@@ -258,7 +253,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
           req.tao_send_reply ();
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       // If an exception was raised we should marshal it and send
       // the appropriate reply to the client
@@ -267,22 +262,19 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
           if (req.collocated ())
             {
               // Report the exception to the collocated client.
-              ACE_RE_THROW;
+              throw;
             }
           else
-            req.tao_send_reply_exception (ACE_ANY_EXCEPTION);
+            req.tao_send_reply_exception (ex);
         }
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   return;
 }
 
 void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
                                                     void * servant_upcall,
-                                                    void * derived_this
-                                                    ACE_ENV_ARG_DECL)
+                                                    void * derived_this)
 {
   TAO_Skeleton skel;
   const char *opname = req.operation ();
@@ -302,10 +294,10 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
                    skel,
                    static_cast <unsigned int> (req.operation_length())) == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      throw ::CORBA::BAD_OPERATION ();
     }
 
-  ACE_TRY
+  try
     {
       // Invoke the skeleton, it will demarshal the arguments, invoke
       // the right operation on the skeleton class, and marshal any
@@ -314,8 +306,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
       skel (req,
             servant_upcall,
             derived_this
-            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+           );
 
       // It is our job to send the already marshaled reply, but only
       // send if it is expected and it has not already been sent
@@ -325,26 +316,24 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
       // exception.
 
     }
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception& ex)
     {
       // If an exception was raised we should marshal it and send
       // the appropriate reply to the client
-      req.tao_send_reply_exception (ACE_ANY_EXCEPTION);
+      req.tao_send_reply_exception (ex);
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   return;
 }
 
 void
-TAO_ServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServantBase::_add_ref (void)
 {
   ++this->ref_count_;
 }
 
 void
-TAO_ServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServantBase::_remove_ref (void)
 {
   long const new_count = --this->ref_count_;
 
@@ -353,7 +342,7 @@ TAO_ServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::ULong
-TAO_ServantBase::_refcount_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+TAO_ServantBase::_refcount_value (void) const
 {
   return static_cast<CORBA::ULong> (this->ref_count_.value ());
 }
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 9dedba87c90..217a3ea006b 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -68,35 +68,35 @@ public:
 
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     );
 
   /// Local implementation of the CORBA::Object::_is_a method.
   virtual CORBA::Boolean _is_a (const char *logical_type_id
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                );
 
   /// Default _non_existent: always returns false.
   virtual CORBA::Boolean _non_existent (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     );
 
   /// Query the Interface Repository for the interface definition.
   virtual CORBA::InterfaceDef_ptr _get_interface (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     );
 
   /// Default _get_component: always returns CORBA::Object::_nil().
   virtual CORBA::Object_ptr _get_component (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     );
 
   /// Get the repository id.
   virtual char * _repository_id (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      void
     );
 
   /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Stub *_create_stub (void);
 
   /**
    * Dispatches a request to the object: find the operation, cast the
@@ -107,7 +107,7 @@ public:
    */
   virtual void _dispatch (TAO_ServerRequest &request,
                           void *servant_upcall
-                          ACE_ENV_ARG_DECL) = 0;
+                          ) = 0;
 
   /// Please see documentation in tao/Abstract_Servant_Base.h for
   /// details.
@@ -128,19 +128,19 @@ public:
    * @name Reference Counting Operations
    */
   /// Increase reference count by one.
-  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (void);
 
   /**
    * Decreases reference count by one; if the resulting reference
    * count equals zero, _remove_ref invokes delete on its this pointer
    * in order to destroy the servant.
    */
-  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (void);
 
   /**
    * Returns the current reference count value.
    */
-  virtual CORBA::ULong _refcount_value (ACE_ENV_SINGLE_ARG_DECL) const;
+  virtual CORBA::ULong _refcount_value (void) const;
   //@}
 
 protected:
@@ -157,12 +157,12 @@ protected:
   virtual void synchronous_upcall_dispatch (TAO_ServerRequest & req,
                                             void * servant_upcall,
                                             void * derived_this
-                                            ACE_ENV_ARG_DECL);
+                                           );
 
   virtual void asynchronous_upcall_dispatch (TAO_ServerRequest & req,
                                              void * servant_upcall,
                                              void * derived_this
-                                             ACE_ENV_ARG_DECL);
+                                            );
 
 protected:
   /// Reference counter.
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index 10c062e52d1..82737fc268c 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -58,7 +58,7 @@ public:
       CORBA::Short servant_priority,
 			TAO_ServerRequest &req,
       TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-      ACE_ENV_ARG_DECL
+
     ) = 0;
 
   /// Pre_invoke collocated request.
@@ -66,7 +66,7 @@ public:
       TAO_Root_POA &poa,
       CORBA::Short servant_priority,
       TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-      ACE_ENV_ARG_DECL) = 0;
+      ) = 0;
 
   /// Post_invoke request.
   virtual void post_invoke (
@@ -82,7 +82,7 @@ public:
       TAO_SYNCH_MUTEX &thread_lock,
       TAO_ORB_Core &orb_core,
       TAO_Object_Adapter *object_adapter
-      ACE_ENV_ARG_DECL) = 0;
+      ) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index 8cf4469939e..81bdd7f8020 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -53,7 +53,7 @@ namespace TAO
       const TAO::ObjectKey &key,
       const char *operation,
       CORBA::Object_out forward_to
-      ACE_ENV_ARG_DECL)
+      )
     {
       while (1)
         {
@@ -64,8 +64,7 @@ namespace TAO
                                         operation,
                                         forward_to,
                                         wait_occurred_restart_call
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+                                       );
 
           if (result == TAO_Adapter::DS_FAILED &&
               wait_occurred_restart_call)
@@ -90,8 +89,7 @@ namespace TAO
       const TAO::ObjectKey &key,
       const char *operation,
       CORBA::Object_out forward_to,
-      bool &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL)
+      bool &wait_occurred_restart_call)
     {
       // Acquire the object adapter lock first.
       int result = this->object_adapter_->lock ().acquire ();
@@ -108,19 +106,16 @@ namespace TAO
       // upcall is in progress, wait for it to complete.  Unless of
       // course, the thread making the non-servant upcall is this thread.
       this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+        );
 
       // Locate the POA.
       this->object_adapter_->locate_poa (key,
                                          this->system_id_,
                                          this->poa_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+                                        );
 
       // Check the state of the POA.
-      this->poa_->check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+      this->poa_->check_state ();
 
       // Setup current for this request.
       this->current_context_.setup (this->poa_,
@@ -133,36 +128,31 @@ namespace TAO
       // We have setup the POA Current.  Record this for later use.
       this->state_ = POA_CURRENT_SETUP;
 
-      ACE_TRY
+#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+      try
         {
+#endif /* TAO_HAS_MINIMUM_CORBA */
           // Lookup the servant.
           this->servant_ =
             this->poa_->locate_servant_i (operation,
                                           this->system_id_,
                                           *this,
                                           this->current_context_,
-                                          wait_occurred_restart_call
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                          wait_occurred_restart_call);
 
           if (wait_occurred_restart_call)
             return TAO_Adapter::DS_FAILED;
-        }
 #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-      ACE_CATCH (PortableServer::ForwardRequest, forward_request)
+        }
+      catch (const ::PortableServer::ForwardRequest& forward_request)
         {
           forward_to =
             CORBA::Object::_duplicate (forward_request.forward_reference.in ());
           return TAO_Adapter::DS_FORWARD;
         }
 #else
-      ACE_CATCHANY
-        {
-          ACE_UNUSED_ARG (forward_to);
-          ACE_RE_THROW;
-        }
+      ACE_UNUSED_ARG (forward_to);
 #endif /* TAO_HAS_MINIMUM_CORBA */
-      ACE_ENDTRY;
 
       // Now that we know the servant.
       this->current_context_.servant (this->servant_);
@@ -183,8 +173,7 @@ namespace TAO
         }
 
       // Serialize servants (if appropriate).
-      this->single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+      this->single_threaded_poa_setup ();
 
       // We have acquired the servant lock.  Record this for later use.
       this->state_ = SERVANT_LOCK_ACQUIRED;
@@ -194,29 +183,22 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::pre_invoke_remote_request (
-      TAO_ServerRequest &req
-      ACE_ENV_ARG_DECL)
+    Servant_Upcall::pre_invoke_remote_request (TAO_ServerRequest &req)
     {
       this->object_adapter_->servant_dispatcher_->pre_invoke_remote_request (
         this->poa (),
         this->priority (),
         req,
-        this->pre_invoke_state_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->pre_invoke_state_);
     }
 
     void
-    Servant_Upcall::pre_invoke_collocated_request (
-      ACE_ENV_SINGLE_ARG_DECL)
+    Servant_Upcall::pre_invoke_collocated_request (void)
     {
       this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request (
         this->poa (),
         this->priority (),
-        this->pre_invoke_state_
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->pre_invoke_state_);
     }
 
     void
@@ -235,11 +217,10 @@ namespace TAO
     }
 
     ::TAO_Root_POA *
-    Servant_Upcall::lookup_POA (const TAO::ObjectKey &key
-                                ACE_ENV_ARG_DECL)
+    Servant_Upcall::lookup_POA (const TAO::ObjectKey &key)
     {
       // Acquire the object adapter lock first.
-      int result = this->object_adapter_->lock ().acquire ();
+      int const result = this->object_adapter_->lock ().acquire ();
       if (result == -1)
         // Locking error.
         ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
@@ -253,15 +234,10 @@ namespace TAO
       // upcall is in progress, wait for it to complete.  Unless of
       // course, the thread making the non-servant upcall is this thread.
       this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+        );
 
       // Locate the POA.
-      this->object_adapter_->locate_poa (key,
-                                         this->system_id_,
-                                         this->poa_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->object_adapter_->locate_poa (key, this->system_id_, this->poa_);
 
       return this->poa_;
     }
@@ -340,7 +316,7 @@ namespace TAO
     }
 
     void
-    Servant_Upcall::single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL)
+    Servant_Upcall::single_threaded_poa_setup (void)
     {
 #if (TAO_HAS_MINIMUM_POA == 0)
       // Serialize servants (if necessary).
@@ -351,13 +327,11 @@ namespace TAO
       // lock.  Otherwise, the thread that wants to release this lock will
       // not be able to do so since it can't acquire the object adapterx
       // lock.
-        int result = this->poa_->enter();
+      int const result = this->poa_->enter();
 
-        if (result == -1)
-          // Locking error.
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-#else
-        ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
+      if (result == -1)
+        // Locking error.
+        throw ::CORBA::OBJ_ADAPTER ();
 #endif /* !TAO_HAS_MINIMUM_POA == 0 */
     }
 
@@ -394,21 +368,17 @@ namespace TAO
 
           if (new_count == 0)
             {
-              ACE_DECLARE_NEW_CORBA_ENV;
-              ACE_TRY
+              try
                 {
                   this->poa_->cleanup_servant (
                     this->active_object_map_entry_->servant_,
-                    this->active_object_map_entry_->user_id_
-                    ACE_ENV_ARG_PARAMETER);
+                    this->active_object_map_entry_->user_id_);
 
-                  ACE_TRY_CHECK;
                 }
-              ACE_CATCHALL
+              catch (...)
                 {
                   // Ignore errors from servant cleanup ....
                 }
-              ACE_ENDTRY;
 
               if (this->poa_->waiting_servant_deactivation() > 0 &&
                   this->object_adapter_->enable_locking_)
@@ -447,21 +417,16 @@ namespace TAO
           // non-servant upcalls to be in progress at this point.
           if (this->poa_->waiting_destruction_)
             {
-              ACE_DECLARE_NEW_CORBA_ENV;
 
-              ACE_TRY
+              try
                 {
-                  this->poa_->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  this->poa_->complete_destruction_i ();
                 }
-              ACE_CATCHANY
+              catch (const ::CORBA::Exception& ex)
                 {
                   // Ignore exceptions
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                       "TAO_POA::~complete_destruction_i");
+                  ex._tao_print_exception ("TAO_POA::~complete_destruction_i");
                 }
-              ACE_ENDTRY;
-              ACE_CHECK;
 
               this->poa_ = 0;
             }
diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h
index 94b91f4368f..13a4cb096d1 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Servant_Upcall.h
@@ -101,28 +101,28 @@ namespace TAO
       int prepare_for_upcall (const TAO::ObjectKey &key,
                               const char *operation,
                               CORBA::Object_out forward_to
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                              );
 
       /// Helper.
       int prepare_for_upcall_i (const TAO::ObjectKey &key,
                                 const char *operation,
                                 CORBA::Object_out forward_to,
                                 bool &wait_occurred_restart_call
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                );
 
       /// Run pre_invoke for a remote request.
       void pre_invoke_remote_request (TAO_ServerRequest &req
-                                      ACE_ENV_ARG_DECL);
+                                     );
 
       /// Run pre_invoke for a collocated request.
-      void pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_DECL);
+      void pre_invoke_collocated_request (void);
 
       /// Run post_invoke for a request.
       void post_invoke (void);
 
       /// Locate POA.
       ::TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
       /// POA accessor.
       ::TAO_Root_POA &poa (void) const;
@@ -187,7 +187,7 @@ namespace TAO
     protected:
 
       void post_invoke_servant_cleanup (void);
-      void single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL);
+      void single_threaded_poa_setup (void);
       void single_threaded_poa_cleanup (void);
       void servant_cleanup (void);
       void poa_cleanup (void);
diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp
index e5fca921aaa..5c5b012e62a 100644
--- a/TAO/tao/PortableServer/Servant_var.cpp
+++ b/TAO/tao/PortableServer/Servant_var.cpp
@@ -19,21 +19,17 @@ template <class T>
 T *
 PortableServer::Servant_var<T>::_duplicate (T * p)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (p != 0)
         {
-          p->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          p->_add_ref ();
         }
     }
-  ACE_CATCHALL
+  catch (...)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return p;
 }
@@ -45,19 +41,17 @@ PortableServer::Servant_var<T>::~Servant_var (void)  /* throw () */
   // can't assume that it will not throw.  If it does, then we are in
   // trouble.  In any event, we can't let the exception escape our
   // destructor.
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->ptr_ != 0)
         {
-          this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->ptr_->_remove_ref ();
         }
     }
-  ACE_CATCHALL
+  catch (...)
     {
       // Forget the exception..
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
index ce53b971ea4..40d3c9cfcc8 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -21,33 +21,32 @@ namespace TAO
     }
 
     CORBA::Policy_ptr
-    ThreadPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+    ThreadPolicy::copy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ThreadPolicy *copy = 0;
       ACE_NEW_THROW_EX (copy,
                         ThreadPolicy (this->value_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return copy;
     }
 
     void
-    ThreadPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ThreadPolicy::destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
     ::PortableServer::ThreadPolicyValue
-    ThreadPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ThreadPolicy::value (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return value_;
     }
 
     CORBA::PolicyType
-    ThreadPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ThreadPolicy::policy_type (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return ::PortableServer::THREAD_POLICY_ID;
diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h
index 5159fc646be..cd160aa8452 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.h
+++ b/TAO/tao/PortableServer/ThreadPolicy.h
@@ -45,16 +45,16 @@ namespace TAO
     public:
       ThreadPolicy (::PortableServer::ThreadPolicyValue value);
 
-      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Policy_ptr copy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      void destroy (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      ::PortableServer::ThreadPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ::PortableServer::ThreadPolicyValue value (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      CORBA::PolicyType policy_type (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       /// Return the cached policy type for this policy.
diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp
index c3d6a446a4a..900d238a905 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategy.cpp
@@ -13,13 +13,12 @@ namespace TAO
   namespace Portable_Server
   {
     void
-    ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/
-				   ACE_ENV_ARG_DECL_NOT_USED)
+    ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/)
     {
     }
 
     void
-    ThreadStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ThreadStrategy::strategy_cleanup (void)
     {
     }
   }
diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h
index 622ad7d3748..e8926702829 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.h
+++ b/TAO/tao/PortableServer/ThreadStrategy.h
@@ -37,9 +37,9 @@ namespace TAO
 
       virtual int exit () = 0;
 
-      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+      virtual void strategy_init (TAO_Root_POA *poa);
 
-      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+      virtual void strategy_cleanup(void);
 
       virtual ::PortableServer::ThreadPolicyValue type() const = 0;
     };
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h
index a22078ed773..374832e8973 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactory.h
+++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h
@@ -42,7 +42,7 @@ namespace TAO
       /// Cleanup the given strategy instance
       virtual void destroy (
         ThreadStrategy *strategy
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
index b21116e42b1..403750f6777 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -59,7 +59,7 @@ namespace TAO
     void
     ThreadStrategyFactoryImpl::destroy (
       ThreadStrategy *strategy
-      ACE_ENV_ARG_DECL)
+      )
     {
       switch (strategy->type ())
       {
@@ -70,8 +70,7 @@ namespace TAO
 
           if (strategy_factory != 0)
             {
-              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              strategy_factory->destroy (strategy);
             }
           break;
         }
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
index cfe8b44147c..324e4802743 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
@@ -39,7 +39,7 @@ namespace TAO
 
       virtual void destroy (
         ThreadStrategy *strategy
-        ACE_ENV_ARG_DECL);
+       );
     };
   }
 }
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
index 44edaa4b6a9..9aba0bb6f8b 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -26,7 +26,7 @@ namespace TAO
     }
 
     ::PortableServer::ThreadPolicyValue
-    ThreadStrategyORBControl::type() const
+    ThreadStrategyORBControl::type () const
     {
       return ::PortableServer::ORB_CTRL_MODEL;
     }
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
index e5561d2bed8..c082224cb0f 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -44,12 +44,9 @@ namespace TAO
     }
 
     void
-    ThreadStrategySingleFactoryImpl::destroy (
-      ThreadStrategy *strategy
-      ACE_ENV_ARG_DECL)
+    ThreadStrategySingleFactoryImpl::destroy (ThreadStrategy *strategy)
     {
-      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      strategy->strategy_cleanup ();
 
       delete strategy;
     }
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
index 3dbcce78a99..c5873d0129e 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
@@ -39,9 +39,7 @@ namespace TAO
       virtual ThreadStrategy* create (
         ::PortableServer::ThreadPolicyValue value);
 
-      virtual void destroy (
-        ThreadStrategy *strategy
-        ACE_ENV_ARG_DECL);
+      virtual void destroy (ThreadStrategy *strategy);
     };
   }
 }
diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp
index dd6b7d8e85f..f45184d950e 100644
--- a/TAO/tao/PortableServer/Upcall_Command.cpp
+++ b/TAO/tao/PortableServer/Upcall_Command.cpp
@@ -2,7 +2,6 @@
 
 #include "tao/PortableServer/Upcall_Command.h"
 
-
 ACE_RCSID (PortableServer,
            Upcall_Command,
            "$Id$")
diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h
index 40c216457f7..5f56e59e95d 100644
--- a/TAO/tao/PortableServer/Upcall_Command.h
+++ b/TAO/tao/PortableServer/Upcall_Command.h
@@ -26,14 +26,8 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-namespace CORBA
-{
-  class Environment;
-}
-
 namespace TAO
 {
-
   /**
    * @class Upcall_Command
    *
@@ -54,7 +48,7 @@ namespace TAO
     virtual ~Upcall_Command (void);
 
     /// Execute the upcall.
-    virtual void execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
+    virtual void execute (void) = 0;
 
   };
 
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index e3fa5544e75..6c7f92a1973 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -29,41 +29,30 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
                              TAO::Argument * const args[],
                              size_t nargs,
                              TAO::Upcall_Command & command
-
 #if TAO_HAS_INTERCEPTORS == 1
                              , void * servant_upcall
                              , CORBA::TypeCode_ptr const * exceptions
                              , CORBA::ULong nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-                             ACE_ENV_ARG_DECL
                              )
 {
   if (server_request.collocated ()
     && server_request.operation_details ()->is_dii_request ())
     {
-      TAO_DII_Arguments_Converter* dii_arguments_converter 
+      TAO_DII_Arguments_Converter* dii_arguments_converter
           = ACE_Dynamic_Service<TAO_DII_Arguments_Converter>::instance ("DII_Arguments_Converter");
-      
+
       if (dii_arguments_converter != 0)
-        {  
-          dii_arguments_converter->convert (server_request,
-                                            args,
-                                            nargs 
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+        {
+          dii_arguments_converter->convert (server_request, args, nargs);
         }
       else
-        ACE_THROW (CORBA::NO_IMPLEMENT ());
+        throw ::CORBA::NO_IMPLEMENT ();
     }
 
   if (server_request.incoming ())
     {
-      this->pre_upcall (*server_request.incoming (),
-                        args,
-                        nargs
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->pre_upcall (*server_request.incoming (), args, nargs);
     }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -97,7 +86,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
   TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
     server_request.orb_core ()->serverrequestinterceptor_adapter ();
 
-  ACE_TRY
+  try
     {
       {
         if (interceptor_adapter != 0)
@@ -108,9 +97,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
                                                   the_nargs,
                                                   servant_upcall,
                                                   exceptions,
-                                                  nexceptions
-                                                  ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                                                  nexceptions);
           }
 
         // Don't bother performing the upcall if an interceptor caused a
@@ -120,17 +107,13 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
           {
             if (interceptor_adapter != 0)
               {
-                interceptor_adapter->execute_command (server_request,
-                                                      command
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                interceptor_adapter->execute_command (server_request, command);
               }
             else
 #endif /* TAO_HAS_INTERCEPTORS */
               {
                 // The actual upcall.
-                command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-                TAO_INTERCEPTOR_CHECK;
+                command.execute ();
               }
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -163,13 +146,11 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
                                                the_nargs,
                                                servant_upcall,
                                                exceptions,
-                                               nexceptions
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                               nexceptions);
             }
         }
     }
-  ACE_CATCHANY
+  catch ( ::CORBA::Exception& ex)
     {
       // Just assume the current exception is a system exception, the
       // status can only change when the interceptor changes this
@@ -178,7 +159,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
       PortableInterceptor::ReplyStatus status =
         PortableInterceptor::SYSTEM_EXCEPTION;
 
-      server_request.caught_exception (&ACE_ANY_EXCEPTION);
+      server_request.caught_exception (&ex);
 
       if (interceptor_adapter != 0)
         {
@@ -187,56 +168,17 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
                                                the_nargs,
                                                servant_upcall,
                                                exceptions,
-                                               nexceptions
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               nexceptions);
 
-          status =
-            server_request.reply_status ();
+          status = server_request.reply_status ();
         }
 
       if (status == PortableInterceptor::SYSTEM_EXCEPTION
           || status == PortableInterceptor::USER_EXCEPTION)
         {
-          ACE_RE_THROW;
+          throw;
         }
     }
-# if defined (ACE_HAS_EXCEPTIONS) \
-  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // Just assume the current exception is a system exception, the
-      // status can only change when the interceptor changes this
-      // and this is only done when the sri_adapter is available. If we
-      // don't have an sri_adapter we just rethrow the exception
-      PortableInterceptor::ReplyStatus status =
-        PortableInterceptor::SYSTEM_EXCEPTION;
-
-      CORBA::UNKNOWN ex;
-
-      server_request.caught_exception (&ex);
-
-      if (interceptor_adapter != 0)
-        {
-          interceptor_adapter->send_exception (server_request,
-                                               the_args,
-                                               the_nargs,
-                                               servant_upcall,
-                                               exceptions,
-                                               nexceptions
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          status =
-            server_request.reply_status ();
-        }
-
-      if (status == PortableInterceptor::SYSTEM_EXCEPTION)
-        ACE_TRY_THROW (ex);
-    }
-# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-  ACE_ENDTRY;
-  ACE_CHECK;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
   if (server_request.response_expected ()
@@ -254,11 +196,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
     {
       if (server_request.outgoing ())
         {
-          this->post_upcall (*server_request.outgoing (),
-                             args,
-                             nargs
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          this->post_upcall (*server_request.outgoing (), args, nargs);
         }
     }
 }
@@ -266,8 +204,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
 void
 TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr,
                                  TAO::Argument * const * args,
-                                 size_t nargs
-                                 ACE_ENV_ARG_DECL)
+                                 size_t nargs)
 {
   // Demarshal the operation "in" and "inout" arguments, if any.
 
@@ -284,9 +221,7 @@ TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr,
     {
       if (!(*i)->demarshal (cdr))
         {
-          TAO_InputCDR::throw_skel_exception (errno
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          TAO_InputCDR::throw_skel_exception (errno);
         }
     }
 }
@@ -294,8 +229,7 @@ TAO::Upcall_Wrapper::pre_upcall (TAO_InputCDR & cdr,
 void
 TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr,
                                   TAO::Argument * const * args,
-                                  size_t nargs
-                                  ACE_ENV_ARG_DECL)
+                                  size_t nargs)
 {
   // Marshal the operation "inout" and "out" arguments and return
   // value, if any.
@@ -307,9 +241,7 @@ TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr,
     {
       if (!(*i)->marshal (cdr))
         {
-          TAO_OutputCDR::throw_skel_exception (errno
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          TAO_OutputCDR::throw_skel_exception (errno);
         }
     }
 
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index f0ba3f1c7e0..585fad89eb4 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -40,11 +40,6 @@ namespace PortableServer
   typedef ::TAO_ServantBase ServantBase;
 }
 
-namespace CORBA
-{
-  class Environment;
-}
-
 namespace TAO
 {
   class Argument;
@@ -88,14 +83,12 @@ namespace TAO
                  TAO::Argument * const args[],
                  size_t nargs,
                  TAO::Upcall_Command & command
-
 #if TAO_HAS_INTERCEPTORS == 1
                  , void * servant_upcall
                  , CORBA::TypeCode_ptr const * exceptions
                  , CORBA::ULong nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-                 ACE_ENV_ARG_DECL);
+                );
 
   private:
 
@@ -107,8 +100,7 @@ namespace TAO
      */
     void pre_upcall (TAO_InputCDR & cdr,
                      TAO::Argument * const * args,
-                     size_t nargs
-                     ACE_ENV_ARG_DECL);
+                     size_t nargs);
 
     /// Perform post-upcall operations.
     /**
@@ -117,8 +109,7 @@ namespace TAO
      */
     void post_upcall (TAO_OutputCDR & cdr,
                       TAO::Argument * const * args,
-                      size_t nargs
-                      ACE_ENV_ARG_DECL);
+                      size_t nargs);
 
   };
 
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index 4ef9552bfd4..86da46eaefb 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -18,25 +18,21 @@
   ACE_GUARD_THROW_EX (ACE_Lock, \
                       monitor, \
                       this->lock (), \
-                      CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK
+                      CORBA::OBJ_ADAPTER ())
 
 #define TAO_OBJECT_ADAPTER_GUARD_RETURN(RETURN) \
   ACE_GUARD_THROW_EX (ACE_Lock, \
                       monitor, \
                       this->lock (), \
-                      CORBA::OBJ_ADAPTER ()); \
-  ACE_CHECK_RETURN (RETURN)
+                      CORBA::OBJ_ADAPTER ())
 
 #define TAO_POA_GUARD \
-  TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
-  ACE_UNUSED_ARG (poa_guard); \
-  ACE_CHECK
+  TAO::Portable_Server::POA_Guard poa_guard (*this); \
+  ACE_UNUSED_ARG (poa_guard)
 
 #define TAO_POA_GUARD_RETURN(RETURN) \
-  TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
-  ACE_UNUSED_ARG (poa_guard); \
-  ACE_CHECK_RETURN (RETURN)
+  TAO::Portable_Server::POA_Guard poa_guard (*this); \
+  ACE_UNUSED_ARG (poa_guard)
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 2be968a0821..13b2f22d776 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -97,14 +97,12 @@ TAO_Profile::_decr_refcnt (void)
 
 void
 TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component
-                                   ACE_ENV_ARG_DECL)
+                                   )
 {
   // Sanity checks.
-  this->verify_orb_configuration (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->verify_orb_configuration ();
 
-  this->verify_profile_version (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->verify_profile_version ();
 
   // ----------------------------------------------------------------
 
@@ -330,7 +328,7 @@ TAO_Profile::set_tagged_components (TAO_OutputCDR &out_cdr)
 
 void
 TAO_Profile::policies (CORBA::PolicyList *policy_list
-                       ACE_ENV_ARG_DECL)
+                       )
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -362,8 +360,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
     {
       TAO_OutputCDR out_CDR;
       policy_value_seq[i].ptype =
-        (*policy_list)[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        (*policy_list)[i]->policy_type ();
 
       out_CDR << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
       (*policy_list)[i]->_tao_encode (out_CDR);
@@ -417,7 +414,6 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
 #else /* TAO_HAS_CORBA_MESSAGING == 1 */
 
   ACE_UNUSED_ARG (policy_list);
-  ACE_ENV_ARG_NOT_USED;  // FUZZ: ignore check_for_ace_check
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 }
@@ -426,7 +422,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
 
 void
 TAO_Profile::get_policies (CORBA::PolicyList& pl
-                           ACE_ENV_ARG_DECL)
+                           )
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1) && !defined (CORBA_E_MICRO)
 
@@ -462,7 +458,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl
 
           if (!(in_cdr >> policy_value_seq))
             {
-              ACE_THROW (CORBA::INV_OBJREF ());
+              throw ::CORBA::INV_OBJREF ();
             }
 
           // Here we extract the Messaging::PolicyValue out of the sequence
@@ -476,13 +472,12 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl
 
           for (CORBA::ULong i = 0; i < length; ++i)
             {
-              ACE_TRY_NEW_ENV
+              try
                 {
                   policy =
                     this->orb_core_->orb ()->_create_policy (
                       policy_value_seq[i].ptype
-                      ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                     );
 
                   if (!CORBA::is_nil (policy.in ()))
                     {
@@ -493,7 +488,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl
                         policy_value_seq[i].pvalue.length ());
 
                       if (!(in_cdr >> ACE_InputCDR::to_boolean (byte_order)))
-                        ACE_TRY_THROW (CORBA::INV_OBJREF ());
+                        throw ::CORBA::INV_OBJREF ();
 
                       in_cdr.reset_byte_order (static_cast <int> (byte_order));
 
@@ -514,7 +509,7 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl
                                     ACE_TEXT ("policies.\n")));
                     }
                 }
-              ACE_CATCHANY
+              catch (const ::CORBA::Exception& ex)
                 {
                   // This case should occur when in the IOR are
                   // embedded policies that TAO doesn't support, so as
@@ -522,25 +517,23 @@ TAO_Profile::get_policies (CORBA::PolicyList& pl
                   // just ignore these un-understood policies.
 
                   if (TAO_debug_level >= 5)
-                    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION,
-                                        ACE_TEXT ("IOR contains ")
-                                        ACE_TEXT ("unsupported policies."));
+                    ex._tao_print_exception (
+                      ACE_TEXT ("IOR contains ")
+                      ACE_TEXT ("unsupported policies."));
                 }
-              ACE_ENDTRY;
             }
         }
     }
 
 #else
   ACE_UNUSED_ARG (pl);
-  ACE_ENV_ARG_NOT_USED;    // FUZZ: ignore check_for_ace_check
 #endif /* (TAO_HAS_CORBA_MESSAGING == 1) */
 
 }
 
 
 void
-TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Profile::verify_orb_configuration (void)
 {
   // If the ORB isn't configured to support tagged components, then
   // throw an exception.
@@ -564,16 +557,16 @@ TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL)
       // possible to add components to the profile.
       // @todo: We need the proper minor code as soon as the spec is
       //        updated.
-      ACE_THROW (CORBA::BAD_PARAM (
+      throw ::CORBA::BAD_PARAM (
                    CORBA::SystemException::_tao_minor_code (
                       0,
                       EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 }
 
 void
-TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Profile::verify_profile_version (void)
 {
   // GIOP 1.0 does not support tagged components.  Throw an exception
   // if the profile is a GIOP 1.0 profile.
@@ -595,11 +588,11 @@ TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL)
       // possible to add components to the profile.
       // @todo: We need the proper minor code as soon as the spec is
       //        updated.
-      ACE_THROW (CORBA::BAD_PARAM (
+      throw ::CORBA::BAD_PARAM (
                    CORBA::SystemException::_tao_minor_code (
                      0,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 }
 
@@ -618,7 +611,7 @@ TAO_Profile::supports_non_blocking_oneways (void) const
 
 void
 TAO_Profile::addressing_mode (CORBA::Short addr
-                              ACE_ENV_ARG_DECL)
+                              )
 {
   // ** See race condition note about addressing mode in Profile.h **
   switch (addr)
@@ -630,25 +623,25 @@ TAO_Profile::addressing_mode (CORBA::Short addr
       break;
 
     default:
-      ACE_THROW (CORBA::BAD_PARAM (
+      throw ::CORBA::BAD_PARAM (
              CORBA::SystemException::_tao_minor_code (
                0,
                EINVAL),
-             CORBA::COMPLETED_NO));
+             CORBA::COMPLETED_NO);
     }
 }
 
 void
 TAO_Profile::parse_string (const char *ior
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   if (!ior || !*ior)
     {
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      0,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   // Remove the "N.n@" version prefix, if it exists, and verify the
@@ -676,15 +669,14 @@ TAO_Profile::parse_string (const char *ior
   if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
       this->version_.minor >  TAO_DEF_GIOP_MINOR)
     {
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      0,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
-  this->parse_string_i (ior
-                        ACE_ENV_ARG_PARAMETER);
+  this->parse_string_i (ior);
 }
 
 CORBA::Boolean
@@ -811,14 +803,14 @@ TAO_Unknown_Profile::endpoint_count (void) const
 
 void
 TAO_Unknown_Profile::parse_string (const char *
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   )
 {
   // @@ THROW something????
 }
 
 void
 TAO_Unknown_Profile::parse_string_i (const char *
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     )
 {
   // @@ THROW something????
 }
@@ -830,7 +822,7 @@ TAO_Unknown_Profile::object_key_delimiter (void) const
 }
 
 char *
-TAO_Unknown_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Unknown_Profile::to_string (void)
 {
   // @@ THROW something?
   return 0;
@@ -906,7 +898,7 @@ TAO_Unknown_Profile::is_equivalent_hook (const TAO_Profile * /* other */)
 
 CORBA::ULong
 TAO_Unknown_Profile::hash (CORBA::ULong max
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           )
 {
   return (ACE::hash_pjw (reinterpret_cast <const char*>
                                           (this->body_.get_buffer ()),
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index faaa73af08a..fd248cb2fbb 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -94,7 +94,7 @@ public:
 
   /// Add the given tagged component to the profile.
   void add_tagged_component (const IOP::TaggedComponent &component
-                             ACE_ENV_ARG_DECL);
+                            );
 
   /**
    * Return the current addressing mode for this profile.
@@ -135,11 +135,11 @@ public:
   /// This method sets the client exposed policies, i.e., the ones
   /// propagated in the IOR, for this profile.
   virtual void policies (CORBA::PolicyList *policy_list
-                         ACE_ENV_ARG_DECL);
+                        );
 
   /// Accessor for the client exposed policies of this profile.
   virtual void  get_policies (CORBA::PolicyList &policy_list
-                              ACE_ENV_ARG_DECL);
+                             );
 
   /// Returns true if this profile can specify multicast endpoints.
   virtual int supports_multicast (void) const;
@@ -175,7 +175,7 @@ public:
    * the critical path, this decision seems like a good thing.
    */
   virtual void addressing_mode (CORBA::Short addr_mode
-                                ACE_ENV_ARG_DECL);
+                               );
 
   /// The object key delimiter.
   virtual char object_key_delimiter (void) const = 0;
@@ -183,12 +183,12 @@ public:
   /// Initialize this object using the given input string.
   /// Supports URL style of object references
   virtual void parse_string (const char *string
-                             ACE_ENV_ARG_DECL);
+                            );
 
   /// Return a string representation for this profile.  Client must
   /// deallocate memory. Only one endpoint is included into the
   /// string.
-  virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual char* to_string (void) = 0;
 
   /**
    * Encodes this profile's endpoints into a tagged component.
@@ -262,7 +262,7 @@ public:
 
   /// Return a hash value for this object.
   virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL) = 0;
+                             ) = 0;
   //@}
 
   //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_ADD_HOOK
@@ -292,7 +292,7 @@ protected:
 
   /// Protocol specific implementation of parse_string ()
   virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL) = 0;
+                               ) = 0;
   //@}
 
   /// To be used by inherited classes
@@ -330,11 +330,11 @@ private:
 
   /// Verify that the current ORB's configuration supports tagged
   /// components in IORs.
-  void verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL);
+  void verify_orb_configuration (void);
 
   /// Verify that the given profile supports tagged components,
   /// i.e. is not a GIOP 1.0 profile.
-  void verify_profile_version (ACE_ENV_SINGLE_ARG_DECL);
+  void verify_profile_version (void);
 
   // Profiles should not be copied or assigned!
   TAO_Profile (const TAO_Profile&);
@@ -417,9 +417,9 @@ public:
 
   // = The TAO_Profile methods look above
   virtual void parse_string (const char *string
-                             ACE_ENV_ARG_DECL);
+                            );
   virtual char object_key_delimiter (void) const;
-  virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL);
+  virtual char* to_string (void);
   virtual int decode (TAO_InputCDR& cdr);
   virtual int encode (TAO_OutputCDR &stream) const;
   virtual int encode_endpoints (void);
@@ -428,7 +428,7 @@ public:
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
   virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
+                            );
 
   virtual int decode_profile (TAO_InputCDR &cdr);
   virtual int decode_endpoints (void);
@@ -443,7 +443,7 @@ private:
   virtual void create_profile_body (TAO_OutputCDR &encap) const;
 
   virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
+                              );
 private:
   TAO_opaque body_;
 };
diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp
index 0a6026f543c..bc81f383513 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -77,25 +77,23 @@ namespace TAO
 
   void
   Profile_Transport_Resolver::resolve (ACE_Time_Value *max_time_val
-                                       ACE_ENV_ARG_DECL)
+                                       )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_Countdown_Time countdown (max_time_val);
 
     TAO_Invocation_Endpoint_Selector *es =
       this->stub_->orb_core ()->endpoint_selector_factory ()->get_selector (
-          ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+          );
 
     // Select the endpoint
     es->select_endpoint (this,
                          max_time_val
-                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                        );
 
     if (this->transport_.get () == 0)
       {
-        ACE_THROW (CORBA::INTERNAL ());
+        throw ::CORBA::INTERNAL ();
       }
 
     const TAO_GIOP_Message_Version& version =
@@ -104,11 +102,11 @@ namespace TAO
     // Initialize the messaging object
     if (this->transport_->messaging_init (version.major, version.minor) == -1)
       {
-        ACE_THROW (CORBA::INTERNAL (
+        throw ::CORBA::INTERNAL (
                           CORBA::SystemException::_tao_minor_code (
                             0,
                             EINVAL),
-                          CORBA::COMPLETED_NO));
+                          CORBA::COMPLETED_NO);
       }
 
     if (!this->transport_->is_tcs_set ())
@@ -124,20 +122,20 @@ namespace TAO
   Profile_Transport_Resolver::try_connect (
       TAO_Transport_Descriptor_Interface *desc,
        ACE_Time_Value *timeout
-       ACE_ENV_ARG_DECL
+
      )
   {
-    return this->try_connect_i (desc, timeout, 0 ACE_ENV_ARG_PARAMETER);
+    return this->try_connect_i (desc, timeout, 0);
   }
 
   bool
   Profile_Transport_Resolver::try_parallel_connect (
        TAO_Transport_Descriptor_Interface *desc,
        ACE_Time_Value *timeout
-       ACE_ENV_ARG_DECL
+
      )
   {
-    return this->try_connect_i (desc, timeout, 1 ACE_ENV_ARG_PARAMETER);
+    return this->try_connect_i (desc, timeout, 1);
   }
 
 
@@ -146,13 +144,12 @@ namespace TAO
        TAO_Transport_Descriptor_Interface *desc,
        ACE_Time_Value *timeout,
        bool parallel
-       ACE_ENV_ARG_DECL
+
      )
   {
     TAO_Connector_Registry *conn_reg =
       this->stub_->orb_core ()->connector_registry (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (false);
+        );
 
     if (conn_reg == 0)
       {
@@ -188,14 +185,13 @@ namespace TAO
     if (parallel)
       {
         this->transport_.set (con->parallel_connect (this, desc, timeout
-                                                     ACE_ENV_ARG_PARAMETER));
+                                                    ));
       }
     else
       {
         this->transport_.set (con->connect (this, desc, timeout
-                                            ACE_ENV_ARG_PARAMETER));
+                                           ));
       }
-    ACE_CHECK_RETURN (false);
     // A timeout error occurred.
     // If the user has set a roundtrip timeout policy, throw a timeout
     // exception.  Otherwise, just fall through and return false to
@@ -250,7 +246,7 @@ namespace TAO
 
   void
   Profile_Transport_Resolver::init_inconsistent_policies (
-    ACE_ENV_SINGLE_ARG_DECL)
+    void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_NEW_THROW_EX (this->inconsistent_policies_,
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 2816f63dc2c..031e75e3885 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -40,7 +40,6 @@ class TAO_Transport_Descriptor_Interface;
 
 namespace CORBA
 {
-  class Environment;
   class Object;
   class PolicyList;
 
@@ -90,7 +89,7 @@ namespace TAO
      * the profile.
      */
     void resolve (ACE_Time_Value *val
-                  ACE_ENV_ARG_DECL)
+                  )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     //@{
@@ -141,11 +140,11 @@ namespace TAO
     /// method will return false.
     bool try_connect (TAO_Transport_Descriptor_Interface *desc,
                       ACE_Time_Value *val
-                      ACE_ENV_ARG_DECL);
+                     );
 
     bool try_parallel_connect (TAO_Transport_Descriptor_Interface *desc,
                                ACE_Time_Value *val
-                               ACE_ENV_ARG_DECL);
+                              );
 
     /// This method wraps a call to the orb core to see if parallel
     /// connection attempts are even desired. This is controlled by
@@ -154,7 +153,7 @@ namespace TAO
 
     /// Initialize the inconsistent policy list that this object has
     /// cached.
-    void init_inconsistent_policies (ACE_ENV_SINGLE_ARG_DECL)
+    void init_inconsistent_policies (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     CORBA::PolicyList *inconsistent_policies (void) const;
@@ -170,7 +169,7 @@ namespace TAO
     bool try_connect_i (TAO_Transport_Descriptor_Interface *desc,
                         ACE_Time_Value *val,
                         bool parallel
-                        ACE_ENV_ARG_DECL);
+                       );
 
     /// Target object
     mutable CORBA::Object *obj_;
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index 06ba73100fb..6597a08ad1f 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -14,26 +14,23 @@
 #define TAO_PROTOCOLS_HOOKS_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "ace/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Object.h"
-
 #include /**/ "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
 #include "tao/IOP_IORC.h"
 #include "ace/SString.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
   class Policy;
-  class Environment;
 }
 
 class TAO_ORB_Core;
@@ -111,70 +108,66 @@ public:
   virtual ~TAO_Protocols_Hooks (void);
 
   /// Initialize the protocols hooks instance.
-  virtual void init_hooks (TAO_ORB_Core *orb_core
-                           ACE_ENV_ARG_DECL) = 0;
+  virtual void init_hooks (TAO_ORB_Core *orb_core) = 0;
 
-  virtual CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
-                                                      TAO_Stub *stub
-                                                      ACE_ENV_ARG_DECL) = 0;
+  virtual CORBA::Boolean set_client_network_priority (
+    IOP::ProfileId protocol_tag,
+    TAO_Stub *stub) = 0;
 
-  virtual CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
-                                                      CORBA::Policy *policy
-                                                      ACE_ENV_ARG_DECL) = 0;
+  virtual CORBA::Boolean set_server_network_priority (
+    IOP::ProfileId protocol_tag,
+    CORBA::Policy *policy) = 0;
 
-  virtual void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void server_protocol_properties_at_orb_level (
+    TAO_IIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void client_protocol_properties_at_orb_level (
+    TAO_IIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void server_protocol_properties_at_orb_level (
+    TAO_UIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void client_protocol_properties_at_orb_level (
+    TAO_UIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void server_protocol_properties_at_orb_level (
+    TAO_SHMIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void client_protocol_properties_at_orb_level (
+    TAO_SHMIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void server_protocol_properties_at_orb_level (
+    TAO_DIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void client_protocol_properties_at_orb_level (
+    TAO_DIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void server_protocol_properties_at_orb_level (
+    TAO_SCIOP_Protocol_Properties &protocol_properties) = 0;
 
-  virtual void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                        ACE_ENV_ARG_DECL) = 0;
+  virtual void client_protocol_properties_at_orb_level (
+    TAO_SCIOP_Protocol_Properties &protocol_properties) = 0;
 
   virtual CORBA::Long get_dscp_codepoint (void) = 0;
 
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
-                                   CORBA::Boolean restart
-                                   ACE_ENV_ARG_DECL) = 0;
+                                   CORBA::Boolean restart) = 0;
 
   virtual void add_rt_service_context_hook (
     TAO_Service_Context &service_context,
     CORBA::Policy *model_policy,
-    CORBA::Short &client_priority
-    ACE_ENV_ARG_DECL) = 0;
+    CORBA::Short &client_priority) = 0;
 
   virtual void get_selector_hook (CORBA::Policy *model_policy,
-                                  CORBA::Boolean
-                                  &is_client_propagated,
+                                  CORBA::Boolean &is_client_propagated,
                                   CORBA::Short &server_priority) = 0;
 
   virtual void get_selector_bands_policy_hook (CORBA::Policy *bands_policy,
                                                CORBA::Short priority,
                                                CORBA::Short &min_priority,
                                                CORBA::Short &max_priority,
-                                               int &in_range) = 0;
+                                               bool &in_range) = 0;
 
   /**
    * @name Accessor and modifier to the current thread priority, used to
@@ -183,23 +176,17 @@ public:
    * these operations are no-ops.
    */
   //@{
-  virtual int get_thread_CORBA_priority (CORBA::Short &
-                                         ACE_ENV_ARG_DECL) = 0;
+  virtual int get_thread_CORBA_priority (CORBA::Short &) = 0;
 
-  virtual int get_thread_native_priority (CORBA::Short &
-                                          ACE_ENV_ARG_DECL) = 0;
+  virtual int get_thread_native_priority (CORBA::Short &) = 0;
 
   virtual int get_thread_CORBA_and_native_priority (
     CORBA::Short &,
-    CORBA::Short &
-    ACE_ENV_ARG_DECL) = 0;
-
-  virtual int set_thread_CORBA_priority (CORBA::Short
-                                         ACE_ENV_ARG_DECL) = 0;
+    CORBA::Short &) = 0;
 
-  virtual int set_thread_native_priority (CORBA::Short
-                                          ACE_ENV_ARG_DECL) = 0;
+  virtual int set_thread_CORBA_priority (CORBA::Short) = 0;
 
+  virtual int set_thread_native_priority (CORBA::Short) = 0;
   //@}
 };
 
diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
index de53baf576f..870a14485e8 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -12,12 +12,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
   :  policy_ (policy)
+   , min_ (ACE_Sched_Params::priority_min (this->policy_))
+   , max_ (ACE_Sched_Params::priority_max (this->policy_))
 {
-  this->min_ =
-    ACE_Sched_Params::priority_min (this->policy_);
-
-  this->max_ =
-    ACE_Sched_Params::priority_max (this->policy_);
 }
 
 TAO_Continuous_Priority_Mapping::~TAO_Continuous_Priority_Mapping (void)
@@ -29,7 +26,7 @@ TAO_Continuous_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
                                             RTCORBA::NativePriority &native_priority)
 {
   if (corba_priority < 0)
-    return 0;
+    return false;
 
 #if defined (ACE_WIN32)
 
@@ -42,13 +39,13 @@ TAO_Continuous_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
                                          current_native_priority);
 
       if (next_native_priority == current_native_priority)
-        return 0;
+        return false;
 
       current_native_priority = next_native_priority;
     }
 
   native_priority = static_cast<RTCORBA::NativePriority> (current_native_priority);
-  return 1;
+  return true;
 
 #else
 
@@ -56,24 +53,24 @@ TAO_Continuous_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
     {
       native_priority = corba_priority + this->min_;
       if (native_priority > this->max_)
-        return 0;
+        return false;
     }
   else if (this->min_ > this->max_)
     {
       native_priority = this->min_ - corba_priority;
       if (native_priority < this->max_)
-        return 0;
+        return false;
     }
   else
     {
       // There is only one native priority.
       if (corba_priority != 0)
-        return 0;
+        return false;
 
       native_priority = this->min_;
     }
 
-  return 1;
+  return true;
 
 #endif /* ACE_WIN32 */
 
@@ -90,10 +87,10 @@ TAO_Continuous_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priori
   for (corba_priority = 0; ; ++corba_priority)
     {
       if (current_native_priority == native_priority)
-        return 1;
+        return true;
 
       else if (current_native_priority == this->max_)
-        return 0;
+        return false;
 
       else
         current_native_priority =
@@ -107,24 +104,24 @@ TAO_Continuous_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priori
     {
       if (native_priority < this->min_
           || native_priority > this->max_)
-        return 0;
+        return false;
       corba_priority = native_priority - this->min_;
     }
   else if (this->min_ > this->max_)
     {
       if (native_priority > this->min_
           || native_priority < this->max_)
-        return 0;
+        return false;
       corba_priority = this->min_ - native_priority;
     }
   else if (this->min_ == this->max_)
     {
       if (native_priority != this->min_)
-        return 0;
+        return false;
       corba_priority = 0;
     }
 
-  return 1;
+  return true;
 
 #endif /* ACE_WIN32 */
 
diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
index 124b0bfefa9..c57b9a85397 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -26,7 +26,7 @@ TAO_Direct_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
                                         RTCORBA::NativePriority &native_priority)
 {
   native_priority = corba_priority;
-  return 1;
+  return true;
 }
 
 CORBA::Boolean
@@ -34,7 +34,7 @@ TAO_Direct_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
                                        RTCORBA::Priority &corba_priority)
 {
   corba_priority = native_priority;
-  return 1;
+  return true;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
index 68d4353dbd8..0f56c3838c2 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
@@ -107,7 +107,7 @@ TAO_Linear_Network_Priority_Mapping::to_network (
                 "TAO_Linear_Network_Priority_Mapping::to_network corba_priority %d\n",
                 corba_priority));
 
-  const int total_slots = sizeof (dscp) / sizeof (int);
+  int const total_slots = sizeof (dscp) / sizeof (int);
 
   int array_slot =
     static_cast<int> (((corba_priority - RTCORBA::minPriority) / double (RTCORBA::maxPriority - RTCORBA::minPriority)) * total_slots);
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
index db440ed994f..682f18f3ec9 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
@@ -8,7 +8,7 @@
 #include "tao/RTCORBA/Network_Priority_Mapping_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (RTCORBA, 
+ACE_RCSID (RTCORBA,
            Network_Priority_Mapping_Manager,
            "$Id$")
 
@@ -22,15 +22,9 @@ TAO_Network_Priority_Mapping_Manager::~TAO_Network_Priority_Mapping_Manager (
 }
 
 TAO_Network_Priority_Mapping_Manager_ptr
-TAO_Network_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Network_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj)
 {
-  if (CORBA::is_nil (obj))
-    {
-      return TAO_Network_Priority_Mapping_Manager::_nil ();
-    }
-
-  return 
+  return
     TAO_Network_Priority_Mapping_Manager::_duplicate (
         dynamic_cast<TAO_Network_Priority_Mapping_Manager_ptr> (obj)
       );
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
index ce9955490ac..9513e2aaff9 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h
@@ -68,7 +68,7 @@ public:
     );
   static TAO_Network_Priority_Mapping_Manager_ptr _narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   static TAO_Network_Priority_Mapping_Manager_ptr _nil (void)
     {
@@ -120,7 +120,7 @@ public:
   static TAO_Network_Priority_Mapping_Manager_ptr duplicate (TAO_Network_Priority_Mapping_Manager_ptr);
   static void release (TAO_Network_Priority_Mapping_Manager_ptr);
   static TAO_Network_Priority_Mapping_Manager_ptr nil (void);
-  static TAO_Network_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
+  static TAO_Network_Priority_Mapping_Manager_ptr narrow (CORBA::Object * );
   static CORBA::Object * upcast (void *);
 
 private:
diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
index 919fecdfcab..f50348fbe8d 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl
@@ -123,10 +123,10 @@ TAO_Network_Priority_Mapping_Manager_var::nil (void)
 ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr
 TAO_Network_Priority_Mapping_Manager_var::narrow (
     CORBA::Object *p
-    ACE_ENV_ARG_DECL
+
   )
 {
-  return ::TAO_Network_Priority_Mapping_Manager::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::TAO_Network_Priority_Mapping_Manager::_narrow (p);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
index bf04acf99bd..60c1aab2796 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -8,8 +8,8 @@
 #include "tao/RTCORBA/Priority_Mapping_Manager.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (RTCORBA, 
-           Priority_Mapping_Manager, 
+ACE_RCSID (RTCORBA,
+           Priority_Mapping_Manager,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -20,15 +20,9 @@ TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void)
 }
 
 TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj)
 {
-  if (CORBA::is_nil (obj))
-    {
-      return TAO_Priority_Mapping_Manager::_nil ();
-    }
-
-  return 
+  return
     TAO_Priority_Mapping_Manager::_duplicate (
         dynamic_cast<TAO_Priority_Mapping_Manager_ptr> (obj)
       );
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index 8b4c428998a..78a1cc4beff 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -63,7 +63,7 @@ public:
   static TAO_Priority_Mapping_Manager_ptr _duplicate (TAO_Priority_Mapping_Manager_ptr obj);
   static TAO_Priority_Mapping_Manager_ptr _narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   static TAO_Priority_Mapping_Manager_ptr _nil (void)
     {
@@ -115,7 +115,7 @@ public:
   static TAO_Priority_Mapping_Manager_ptr duplicate (TAO_Priority_Mapping_Manager_ptr);
   static void release (TAO_Priority_Mapping_Manager_ptr);
   static TAO_Priority_Mapping_Manager_ptr nil (void);
-  static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
+  static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * );
   static CORBA::Object * upcast (void *);
 
 private:
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
index 4d8fa4007ab..fc6957e33b8 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl
@@ -123,10 +123,10 @@ TAO_Priority_Mapping_Manager_var::nil (void)
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
 TAO_Priority_Mapping_Manager_var::narrow (
     CORBA::Object *p
-    ACE_ENV_ARG_DECL
+
   )
 {
-  return ::TAO_Priority_Mapping_Manager::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::TAO_Priority_Mapping_Manager::_narrow (p);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index da80af57638..c03ea57414b 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -186,7 +186,7 @@ RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::PriorityModelPolicy_ptr
 RTCORBA::PriorityModelPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PriorityModelPolicy::_duplicate (
@@ -197,7 +197,7 @@ RTCORBA::PriorityModelPolicy::_narrow (
 RTCORBA::PriorityModelPolicy_ptr
 RTCORBA::PriorityModelPolicy::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PriorityModelPolicy::_duplicate (
@@ -225,7 +225,7 @@ RTCORBA::PriorityModelPolicy::_tao_release (PriorityModelPolicy_ptr obj)
 CORBA::Boolean
 RTCORBA::PriorityModelPolicy::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -319,7 +319,7 @@ RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::ThreadpoolPolicy_ptr
 RTCORBA::ThreadpoolPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ThreadpoolPolicy::_duplicate (
@@ -330,7 +330,7 @@ RTCORBA::ThreadpoolPolicy::_narrow (
 RTCORBA::ThreadpoolPolicy_ptr
 RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ThreadpoolPolicy::_duplicate (
@@ -358,7 +358,7 @@ RTCORBA::ThreadpoolPolicy::_tao_release (ThreadpoolPolicy_ptr obj)
 CORBA::Boolean
 RTCORBA::ThreadpoolPolicy::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -452,7 +452,7 @@ RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::ProtocolProperties_ptr
 RTCORBA::ProtocolProperties::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ProtocolProperties::_duplicate (
@@ -463,7 +463,7 @@ RTCORBA::ProtocolProperties::_narrow (
 RTCORBA::ProtocolProperties_ptr
 RTCORBA::ProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ProtocolProperties::_duplicate (
@@ -491,7 +491,7 @@ RTCORBA::ProtocolProperties::_tao_release (ProtocolProperties_ptr obj)
 CORBA::Boolean
 RTCORBA::ProtocolProperties::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -647,7 +647,7 @@ RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::ServerProtocolPolicy_ptr
 RTCORBA::ServerProtocolPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ServerProtocolPolicy::_duplicate (
@@ -658,7 +658,7 @@ RTCORBA::ServerProtocolPolicy::_narrow (
 RTCORBA::ServerProtocolPolicy_ptr
 RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ServerProtocolPolicy::_duplicate (
@@ -686,7 +686,7 @@ RTCORBA::ServerProtocolPolicy::_tao_release (ServerProtocolPolicy_ptr obj)
 CORBA::Boolean
 RTCORBA::ServerProtocolPolicy::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -780,7 +780,7 @@ RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::ClientProtocolPolicy_ptr
 RTCORBA::ClientProtocolPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ClientProtocolPolicy::_duplicate (
@@ -791,7 +791,7 @@ RTCORBA::ClientProtocolPolicy::_narrow (
 RTCORBA::ClientProtocolPolicy_ptr
 RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return ClientProtocolPolicy::_duplicate (
@@ -819,7 +819,7 @@ RTCORBA::ClientProtocolPolicy::_tao_release (ClientProtocolPolicy_ptr obj)
 CORBA::Boolean
 RTCORBA::ClientProtocolPolicy::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -913,7 +913,7 @@ RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::PrivateConnectionPolicy_ptr
 RTCORBA::PrivateConnectionPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PrivateConnectionPolicy::_duplicate (
@@ -924,7 +924,7 @@ RTCORBA::PrivateConnectionPolicy::_narrow (
 RTCORBA::PrivateConnectionPolicy_ptr
 RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PrivateConnectionPolicy::_duplicate (
@@ -952,7 +952,7 @@ RTCORBA::PrivateConnectionPolicy::_tao_release (PrivateConnectionPolicy_ptr obj)
 CORBA::Boolean
 RTCORBA::PrivateConnectionPolicy::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -1046,7 +1046,7 @@ RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::TCPProtocolProperties_ptr
 RTCORBA::TCPProtocolProperties::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return TCPProtocolProperties::_duplicate (
@@ -1057,7 +1057,7 @@ RTCORBA::TCPProtocolProperties::_narrow (
 RTCORBA::TCPProtocolProperties_ptr
 RTCORBA::TCPProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return TCPProtocolProperties::_duplicate (
@@ -1085,7 +1085,7 @@ RTCORBA::TCPProtocolProperties::_tao_release (TCPProtocolProperties_ptr obj)
 CORBA::Boolean
 RTCORBA::TCPProtocolProperties::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -1179,7 +1179,7 @@ RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::GIOPProtocolProperties_ptr
 RTCORBA::GIOPProtocolProperties::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return GIOPProtocolProperties::_duplicate (
@@ -1190,7 +1190,7 @@ RTCORBA::GIOPProtocolProperties::_narrow (
 RTCORBA::GIOPProtocolProperties_ptr
 RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return GIOPProtocolProperties::_duplicate (
@@ -1218,7 +1218,7 @@ RTCORBA::GIOPProtocolProperties::_tao_release (GIOPProtocolProperties_ptr obj)
 CORBA::Boolean
 RTCORBA::GIOPProtocolProperties::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -1312,7 +1312,7 @@ RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_poin
 RTCORBA::UnixDomainProtocolProperties_ptr
 RTCORBA::UnixDomainProtocolProperties::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return UnixDomainProtocolProperties::_duplicate (
@@ -1323,7 +1323,7 @@ RTCORBA::UnixDomainProtocolProperties::_narrow (
 RTCORBA::UnixDomainProtocolProperties_ptr
 RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return UnixDomainProtocolProperties::_duplicate (
@@ -1351,7 +1351,7 @@ RTCORBA::UnixDomainProtocolProperties::_tao_release (UnixDomainProtocolPropertie
 CORBA::Boolean
 RTCORBA::UnixDomainProtocolProperties::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -1445,7 +1445,7 @@ RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_po
 RTCORBA::SharedMemoryProtocolProperties_ptr
 RTCORBA::SharedMemoryProtocolProperties::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return SharedMemoryProtocolProperties::_duplicate (
@@ -1456,7 +1456,7 @@ RTCORBA::SharedMemoryProtocolProperties::_narrow (
 RTCORBA::SharedMemoryProtocolProperties_ptr
 RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return SharedMemoryProtocolProperties::_duplicate (
@@ -1484,7 +1484,7 @@ RTCORBA::SharedMemoryProtocolProperties::_tao_release (SharedMemoryProtocolPrope
 CORBA::Boolean
 RTCORBA::SharedMemoryProtocolProperties::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -1578,7 +1578,7 @@ RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor (void *_tao_void_po
 RTCORBA::UserDatagramProtocolProperties_ptr
 RTCORBA::UserDatagramProtocolProperties::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return UserDatagramProtocolProperties::_duplicate (
@@ -1589,7 +1589,7 @@ RTCORBA::UserDatagramProtocolProperties::_narrow (
 RTCORBA::UserDatagramProtocolProperties_ptr
 RTCORBA::UserDatagramProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return UserDatagramProtocolProperties::_duplicate (
@@ -1617,7 +1617,7 @@ RTCORBA::UserDatagramProtocolProperties::_tao_release (UserDatagramProtocolPrope
 CORBA::Boolean
 RTCORBA::UserDatagramProtocolProperties::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -1711,7 +1711,7 @@ RTCORBA::StreamControlProtocolProperties::_tao_any_destructor (void *_tao_void_p
 RTCORBA::StreamControlProtocolProperties_ptr
 RTCORBA::StreamControlProtocolProperties::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return StreamControlProtocolProperties::_duplicate (
@@ -1722,7 +1722,7 @@ RTCORBA::StreamControlProtocolProperties::_narrow (
 RTCORBA::StreamControlProtocolProperties_ptr
 RTCORBA::StreamControlProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return StreamControlProtocolProperties::_duplicate (
@@ -1750,7 +1750,7 @@ RTCORBA::StreamControlProtocolProperties::_tao_release (StreamControlProtocolPro
 CORBA::Boolean
 RTCORBA::StreamControlProtocolProperties::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -1910,7 +1910,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_po
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 RTCORBA::PriorityBandedConnectionPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PriorityBandedConnectionPolicy::_duplicate (
@@ -1921,7 +1921,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_narrow (
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return PriorityBandedConnectionPolicy::_duplicate (
@@ -1949,7 +1949,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_tao_release (PriorityBandedConnectionP
 CORBA::Boolean
 RTCORBA::PriorityBandedConnectionPolicy::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -2043,7 +2043,7 @@ RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::Current_ptr
 RTCORBA::Current::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return Current::_duplicate (
@@ -2054,7 +2054,7 @@ RTCORBA::Current::_narrow (
 RTCORBA::Current_ptr
 RTCORBA::Current::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return Current::_duplicate (
@@ -2082,7 +2082,7 @@ RTCORBA::Current::_tao_release (Current_ptr obj)
 CORBA::Boolean
 RTCORBA::Current::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -2176,7 +2176,7 @@ RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::Mutex_ptr
 RTCORBA::Mutex::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return Mutex::_duplicate (
@@ -2187,7 +2187,7 @@ RTCORBA::Mutex::_narrow (
 RTCORBA::Mutex_ptr
 RTCORBA::Mutex::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return Mutex::_duplicate (
@@ -2215,7 +2215,7 @@ RTCORBA::Mutex::_tao_release (Mutex_ptr obj)
 CORBA::Boolean
 RTCORBA::Mutex::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
@@ -2363,18 +2363,18 @@ void RTCORBA::RTORB::MutexNotFound::_raise (void) const
 
 void RTCORBA::RTORB::MutexNotFound::_tao_encode (
     TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
+
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 void RTCORBA::RTORB::MutexNotFound::_tao_decode (
     TAO_InputCDR &
-    ACE_ENV_ARG_DECL
+
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 // TAO extension - the virtual _type method.
@@ -2458,18 +2458,18 @@ void RTCORBA::RTORB::InvalidThreadpool::_raise (void) const
 
 void RTCORBA::RTORB::InvalidThreadpool::_tao_encode (
     TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
+
   ) const
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 void RTCORBA::RTORB::InvalidThreadpool::_tao_decode (
     TAO_InputCDR &
-    ACE_ENV_ARG_DECL
+
   )
 {
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 // TAO extension - the virtual _type method.
@@ -2495,7 +2495,7 @@ RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer)
 RTCORBA::RTORB_ptr
 RTCORBA::RTORB::_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return RTORB::_duplicate (
@@ -2506,7 +2506,7 @@ RTCORBA::RTORB::_narrow (
 RTCORBA::RTORB_ptr
 RTCORBA::RTORB::_unchecked_narrow (
     CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return RTORB::_duplicate (
@@ -2534,7 +2534,7 @@ RTCORBA::RTORB::_tao_release (RTORB_ptr obj)
 CORBA::Boolean
 RTCORBA::RTORB::_is_a (
     const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   if (
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 51d166c6bcf..7a3f336dd87 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -284,12 +284,12 @@ namespace RTCORBA
 
     static PriorityModelPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PriorityModelPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PriorityModelPolicy_ptr _nil (void)
@@ -303,7 +303,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::PriorityModel priority_model (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -313,7 +313,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual RTCORBA::Priority server_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -323,7 +323,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -333,7 +333,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -344,7 +344,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -418,12 +418,12 @@ namespace RTCORBA
 
     static ThreadpoolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ThreadpoolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ThreadpoolPolicy_ptr _nil (void)
@@ -437,7 +437,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual RTCORBA::ThreadpoolId threadpool (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -447,7 +447,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -457,7 +457,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -468,7 +468,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -537,12 +537,12 @@ namespace RTCORBA
 
     static ProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ProtocolProperties_ptr _nil (void)
@@ -557,7 +557,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -719,12 +719,12 @@ namespace RTCORBA
 
     static ServerProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ServerProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ServerProtocolPolicy_ptr _nil (void)
@@ -738,7 +738,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::ProtocolList * protocols (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -748,7 +748,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -758,7 +758,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -769,7 +769,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -843,12 +843,12 @@ namespace RTCORBA
 
     static ClientProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ClientProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static ClientProtocolPolicy_ptr _nil (void)
@@ -862,7 +862,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::ProtocolList * protocols (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -872,7 +872,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -882,7 +882,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -893,7 +893,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -967,12 +967,12 @@ namespace RTCORBA
 
     static PrivateConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PrivateConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PrivateConnectionPolicy_ptr _nil (void)
@@ -986,7 +986,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -996,7 +996,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1007,7 +1007,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1076,12 +1076,12 @@ namespace RTCORBA
 
     static TCPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static TCPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static TCPProtocolProperties_ptr _nil (void)
@@ -1095,7 +1095,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long send_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1106,7 +1106,7 @@ namespace RTCORBA
 
     virtual void send_buffer_size (
         ::CORBA::Long send_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1116,7 +1116,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long recv_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1127,7 +1127,7 @@ namespace RTCORBA
 
     virtual void recv_buffer_size (
         ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1137,7 +1137,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean keep_alive (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1148,7 +1148,7 @@ namespace RTCORBA
 
     virtual void keep_alive (
         ::CORBA::Boolean keep_alive
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1158,7 +1158,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean dont_route (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1169,7 +1169,7 @@ namespace RTCORBA
 
     virtual void dont_route (
         ::CORBA::Boolean dont_route
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1179,7 +1179,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean no_delay (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1190,7 +1190,7 @@ namespace RTCORBA
 
     virtual void no_delay (
         ::CORBA::Boolean no_delay
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1200,7 +1200,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean enable_network_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1211,7 +1211,7 @@ namespace RTCORBA
 
     virtual void enable_network_priority (
         ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1222,7 +1222,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1291,12 +1291,12 @@ namespace RTCORBA
 
     static GIOPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static GIOPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static GIOPProtocolProperties_ptr _nil (void)
@@ -1311,7 +1311,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1380,12 +1380,12 @@ namespace RTCORBA
 
     static UnixDomainProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static UnixDomainProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static UnixDomainProtocolProperties_ptr _nil (void)
@@ -1399,7 +1399,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long send_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1410,7 +1410,7 @@ namespace RTCORBA
 
     virtual void send_buffer_size (
         ::CORBA::Long send_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1420,7 +1420,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long recv_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1431,7 +1431,7 @@ namespace RTCORBA
 
     virtual void recv_buffer_size (
         ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1442,7 +1442,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1511,12 +1511,12 @@ namespace RTCORBA
 
     static SharedMemoryProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static SharedMemoryProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static SharedMemoryProtocolProperties_ptr _nil (void)
@@ -1530,7 +1530,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long send_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1541,7 +1541,7 @@ namespace RTCORBA
 
     virtual void send_buffer_size (
         ::CORBA::Long send_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1551,7 +1551,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long recv_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1562,7 +1562,7 @@ namespace RTCORBA
 
     virtual void recv_buffer_size (
         ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1572,7 +1572,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean keep_alive (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1583,7 +1583,7 @@ namespace RTCORBA
 
     virtual void keep_alive (
         ::CORBA::Boolean keep_alive
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1593,7 +1593,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean dont_route (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1604,7 +1604,7 @@ namespace RTCORBA
 
     virtual void dont_route (
         ::CORBA::Boolean dont_route
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1614,7 +1614,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean no_delay (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1625,7 +1625,7 @@ namespace RTCORBA
 
     virtual void no_delay (
         ::CORBA::Boolean no_delay
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1635,7 +1635,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long preallocate_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1646,7 +1646,7 @@ namespace RTCORBA
 
     virtual void preallocate_buffer_size (
         ::CORBA::Long preallocate_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1656,7 +1656,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual char * mmap_filename (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1667,7 +1667,7 @@ namespace RTCORBA
 
     virtual void mmap_filename (
         const char * mmap_filename
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1677,7 +1677,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual char * mmap_lockname (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1688,7 +1688,7 @@ namespace RTCORBA
 
     virtual void mmap_lockname (
         const char * mmap_lockname
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1699,7 +1699,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1768,12 +1768,12 @@ namespace RTCORBA
 
     static UserDatagramProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static UserDatagramProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static UserDatagramProtocolProperties_ptr _nil (void)
@@ -1787,7 +1787,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean enable_network_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1798,7 +1798,7 @@ namespace RTCORBA
 
     virtual void enable_network_priority (
         ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1809,7 +1809,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -1878,12 +1878,12 @@ namespace RTCORBA
 
     static StreamControlProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static StreamControlProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static StreamControlProtocolProperties_ptr _nil (void)
@@ -1897,7 +1897,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long send_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1908,7 +1908,7 @@ namespace RTCORBA
 
     virtual void send_buffer_size (
         ::CORBA::Long send_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1918,7 +1918,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Long recv_buffer_size (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1929,7 +1929,7 @@ namespace RTCORBA
 
     virtual void recv_buffer_size (
         ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1939,7 +1939,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean keep_alive (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1950,7 +1950,7 @@ namespace RTCORBA
 
     virtual void keep_alive (
         ::CORBA::Boolean keep_alive
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1960,7 +1960,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean dont_route (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1971,7 +1971,7 @@ namespace RTCORBA
 
     virtual void dont_route (
         ::CORBA::Boolean dont_route
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1981,7 +1981,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean no_delay (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1992,7 +1992,7 @@ namespace RTCORBA
 
     virtual void no_delay (
         ::CORBA::Boolean no_delay
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2002,7 +2002,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Boolean enable_network_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2013,7 +2013,7 @@ namespace RTCORBA
 
     virtual void enable_network_priority (
         ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2024,7 +2024,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2180,12 +2180,12 @@ namespace RTCORBA
 
     static PriorityBandedConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static PriorityBandedConnectionPolicy_ptr _nil (void)
@@ -2199,7 +2199,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::PriorityBands * priority_bands (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2209,7 +2209,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2219,7 +2219,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2230,7 +2230,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2299,12 +2299,12 @@ namespace RTCORBA
 
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static Current_ptr _nil (void)
@@ -2318,7 +2318,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual RTCORBA::Priority the_priority (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2329,7 +2329,7 @@ namespace RTCORBA
 
     virtual void the_priority (
         ::RTCORBA::Priority the_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2340,7 +2340,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2409,12 +2409,12 @@ namespace RTCORBA
 
     static Mutex_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static Mutex_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static Mutex_ptr _nil (void)
@@ -2428,7 +2428,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void lock (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2438,7 +2438,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void unlock (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2449,7 +2449,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean try_lock (
         ::TimeBase::TimeT max_wait
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2460,7 +2460,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
@@ -2529,12 +2529,12 @@ namespace RTCORBA
 
     static RTORB_ptr _narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static RTORB_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     static RTORB_ptr _nil (void)
@@ -2548,7 +2548,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::Mutex_ptr create_mutex (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2559,7 +2559,7 @@ namespace RTCORBA
 
     virtual void destroy_mutex (
         ::RTCORBA::Mutex_ptr the_mutex
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2594,12 +2594,12 @@ namespace RTCORBA
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
+
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL
+
         );
 
       // TAO_IDL - Generated from
@@ -2621,7 +2621,7 @@ namespace RTCORBA
     virtual ::RTCORBA::Mutex_ptr create_named_mutex (
         const char * name,
         ::CORBA::Boolean_out created_flag
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2632,7 +2632,7 @@ namespace RTCORBA
 
     virtual ::RTCORBA::Mutex_ptr open_named_mutex (
         const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2649,7 +2649,7 @@ namespace RTCORBA
         ::CORBA::Boolean dont_route,
         ::CORBA::Boolean no_delay,
         ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2661,7 +2661,7 @@ namespace RTCORBA
     virtual ::RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties (
         ::CORBA::Long send_buffer_size,
         ::CORBA::Long recv_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2679,7 +2679,7 @@ namespace RTCORBA
         ::CORBA::Long preallocate_buffer_size,
         const char * mmap_filename,
         const char * mmap_lockname
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2690,7 +2690,7 @@ namespace RTCORBA
 
     virtual ::RTCORBA::UserDatagramProtocolProperties_ptr create_user_datagram_protocol_properties (
         ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2706,7 +2706,7 @@ namespace RTCORBA
         ::CORBA::Boolean dont_route,
         ::CORBA::Boolean no_delay,
         ::CORBA::Boolean enable_network_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2741,12 +2741,12 @@ namespace RTCORBA
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
+
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL
+
         );
 
       // TAO_IDL - Generated from
@@ -2773,7 +2773,7 @@ namespace RTCORBA
         ::CORBA::Boolean allow_request_buffering,
         ::CORBA::ULong max_buffered_requests,
         ::CORBA::ULong max_request_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2789,7 +2789,7 @@ namespace RTCORBA
         ::CORBA::Boolean allow_request_buffering,
         ::CORBA::ULong max_buffered_requests,
         ::CORBA::ULong max_request_buffer_size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2800,7 +2800,7 @@ namespace RTCORBA
 
     virtual void destroy_threadpool (
         ::RTCORBA::ThreadpoolId threadpool
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2813,7 +2813,7 @@ namespace RTCORBA
     virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
         ::RTCORBA::PriorityModel priority_model,
         ::RTCORBA::Priority server_priority
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2824,7 +2824,7 @@ namespace RTCORBA
 
     virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
         ::RTCORBA::ThreadpoolId threadpool
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2835,7 +2835,7 @@ namespace RTCORBA
 
     virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
         const ::RTCORBA::PriorityBands & priority_bands
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2846,7 +2846,7 @@ namespace RTCORBA
 
     virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
         const ::RTCORBA::ProtocolList & protocols
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2857,7 +2857,7 @@ namespace RTCORBA
 
     virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
         const ::RTCORBA::ProtocolList & protocols
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2867,7 +2867,7 @@ namespace RTCORBA
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        void
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2878,7 +2878,7 @@ namespace RTCORBA
 
     virtual CORBA::Boolean _is_a (
         const char *type_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
       );
 
     virtual const char* _interface_repository_id (void) const;
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index 5c9170dd78e..ee285a98732 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -30,18 +30,14 @@ TAO_RT_Current::~TAO_RT_Current (void)
 }
 
 RTCORBA::Priority
-TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Current::the_priority (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_Protocols_Hooks *tph =
-    this->orb_core_->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
 
   RTCORBA::Priority priority;
 
-  int result =
-    tph->get_thread_CORBA_priority (priority
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int const result = tph->get_thread_CORBA_priority (priority);
 
   if (result == -1)
     ACE_THROW_RETURN (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO), -1);
@@ -50,21 +46,16 @@ TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_RT_Current::the_priority (RTCORBA::Priority the_priority
-                              ACE_ENV_ARG_DECL)
+TAO_RT_Current::the_priority (RTCORBA::Priority the_priority)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core_->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
 
-  int result =
-    tph->set_thread_CORBA_priority (the_priority
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  int const result = tph->set_thread_CORBA_priority (the_priority);
 
   if (result == -1)
-    ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
+    throw ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index 58b994d0bee..c80d668dd8e 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -52,11 +52,10 @@ public:
   /// Default constructor.
   TAO_RT_Current (TAO_ORB_Core *orb_core);
 
-  virtual RTCORBA::Priority the_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual RTCORBA::Priority the_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void the_priority (RTCORBA::Priority the_priority
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void the_priority (RTCORBA::Priority the_priority)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index a74d7ea7277..ff81c17061e 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -32,7 +32,7 @@ RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void)
 }
 
 TAO_Invocation_Endpoint_Selector *
-RT_Endpoint_Selector_Factory::get_selector (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+RT_Endpoint_Selector_Factory::get_selector (void)
 {
   return this->rt_invocation_endpoint_selector_;
 }
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
index f361563ad22..90a7b58caed 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
@@ -61,7 +61,7 @@ public:
   virtual ~RT_Endpoint_Selector_Factory (void);
 
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
-              ACE_ENV_SINGLE_ARG_DECL);
+              void);
 
 private:
   TAO_RT_Invocation_Endpoint_Selector *rt_invocation_endpoint_selector_;
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index 841c73bc6dc..bc92b6104dc 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -18,35 +18,30 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy *
 TAO_RT_Endpoint_Utils::policy (TAO_Cached_Policy_Type type,
-                               TAO::Profile_Transport_Resolver &r
-                               ACE_ENV_ARG_DECL)
+                               TAO::Profile_Transport_Resolver &r)
 {
   CORBA::Policy *policy = CORBA::Policy::_nil ();
 
   TAO_RT_Stub *rt_stub = dynamic_cast<TAO_RT_Stub *> (r.stub ());
 
-  ACE_TRY
+  try
     {
       policy =
         rt_stub->get_cached_policy (type
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   );
     }
-  ACE_CATCH (CORBA::INV_POLICY, ex)
+  catch (const ::CORBA::INV_POLICY&)
     {
       if (r.inconsistent_policies ())
         {
           CORBA::PolicyList *p = r.inconsistent_policies ();
           p->length (1);
           (*p)[0u] = rt_stub->TAO_Stub::get_cached_policy (type
-                                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                          );
         }
 
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return policy;
 }
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
index 649c3ca2896..22b71e8a727 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
@@ -46,7 +46,7 @@ public:
   static
   CORBA::Policy *policy (TAO_Cached_Policy_Type type,
                          TAO::Profile_Transport_Resolver &r
-                         ACE_ENV_ARG_DECL);
+                        );
 
 private:
   /// ctor.
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index a850ca0bea8..c076c003c0a 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -27,17 +27,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_RT_Invocation_Endpoint_Selector::select_endpoint (
     TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *val
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *val)
 {
   if (r == 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw ::CORBA::INTERNAL ();
 
   CORBA::Policy_var client_protocol_policy_base =
-    TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL,
-                                   *r
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL, *r);
 
   if (client_protocol_policy_base.ptr () == 0)
     {
@@ -45,11 +41,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint (
         {
           r->profile (r->stub ()->profile_in_use ());
 
-          int status =
-            this->endpoint_from_profile (*r,
-                                         val
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          int const status = this->endpoint_from_profile (*r, val);
 
           if (status == 1)
             return;
@@ -58,16 +50,13 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint (
 
       // If we get here, we completely failed to find an endpoint selector
       // that we know how to use, so throw an exception.
-      ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                                   CORBA::COMPLETED_NO));
+      throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
     }
   else
     {
       RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
         RTCORBA::ClientProtocolPolicy::_narrow (
-          client_protocol_policy_base.in ()
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+          client_protocol_policy_base.in ());
 
       /// Cast to TAO_ClientProtocolPolicy
       TAO_ClientProtocolPolicy *tao_client_protocol_policy =
@@ -82,8 +71,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint (
         client_protocol_policy.in (),
         client_protocols,
         val
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+       );
     }
 }
 
@@ -92,8 +80,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po
     TAO::Profile_Transport_Resolver &r,
     RTCORBA::ClientProtocolPolicy_ptr client_protocol_policy,
     RTCORBA::ProtocolList &client_protocols,
-    ACE_Time_Value *val
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *val)
 {
   CORBA::Boolean valid_profile_found = false;
 
@@ -124,11 +111,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po
 
               r.profile (profile);
 
-              int const status =
-                this->endpoint_from_profile (r,
-                                             val
-                                             ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              int const status = this->endpoint_from_profile (r, val);
 
               if (status == 1)
                 return;
@@ -143,45 +126,36 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po
     {
       if (r.inconsistent_policies ())
         {
-          CORBA::PolicyList *p =
-            r.inconsistent_policies ();
+          CORBA::PolicyList *p = r.inconsistent_policies ();
 
           p->length (1);
-          (*p)[0u] =
-            CORBA::Policy::_duplicate (client_protocol_policy);
+          (*p)[0u] = CORBA::Policy::_duplicate (client_protocol_policy);
         }
-      ACE_THROW (CORBA::INV_POLICY ());
+      throw ::CORBA::INV_POLICY ();
     }
 
   // If we get here, we found at least one pertinent profile, but no
   // usable endpoints.
-  ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                               CORBA::COMPLETED_NO));
+  throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 
 }
 
 int
 TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
     TAO::Profile_Transport_Resolver &r,
-    ACE_Time_Value *val
-    ACE_ENV_ARG_DECL)
+    ACE_Time_Value *val)
 {
   // Narrow to the RT Stub.
-  TAO_RT_Stub *rt_stub =
-    dynamic_cast <TAO_RT_Stub *> (r.stub ());
+  TAO_RT_Stub *rt_stub = dynamic_cast <TAO_RT_Stub *> (r.stub ());
 
   // Get the priority model policy.
   CORBA::Policy_var priority_model_policy =
-    rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
 
   // Get the bands policy.
   CORBA::Policy_var bands_policy =
-    TAO_RT_Endpoint_Utils::policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION,
-                                   r
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO_RT_Endpoint_Utils::policy (
+      TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION, r);
 
   int all_endpoints_are_valid = 0;
   int match_priority = 0;
@@ -198,12 +172,10 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
         {
           if (r.inconsistent_policies ())
             {
-              CORBA::PolicyList *p =
-                r.inconsistent_policies ();
+              CORBA::PolicyList *p = r.inconsistent_policies ();
 
               p->length (1);
-              (*p)[0u] =
-                CORBA::Policy::_duplicate (bands_policy.in ());
+              (*p)[0u] = CORBA::Policy::_duplicate (bands_policy.in ());
             }
           // Indicate error.
           ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
@@ -221,7 +193,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
         r.stub ()->orb_core ()->get_protocols_hooks ();
 
       CORBA::Short server_priority = 0;
-      CORBA::Boolean is_client_propagated = 0;
+      CORBA::Boolean is_client_propagated = false;
 
       // Check the priority model policy to see if it is client
       // propagated.
@@ -241,8 +213,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
           int status =
             protocol_hooks->get_thread_CORBA_priority (
               client_thread_priority  // side effect
-              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+             );
           if (status == -1)
             {
               ACE_THROW_RETURN (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
@@ -263,7 +234,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
             {
 
               // Check which band range we fall in.
-              int in_range = 0;
+              bool in_range = false;
               protocol_hooks->get_selector_bands_policy_hook (
                 bands_policy.in (),
                 client_thread_priority,
@@ -277,11 +248,9 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
                   if (r.inconsistent_policies ())
                     {
 
-                      CORBA::PolicyList *p =
-                        r.inconsistent_policies ();
+                      CORBA::PolicyList *p = r.inconsistent_policies ();
                       p->length (2);
-                      (*p)[0u] =
-                        CORBA::Policy::_duplicate (bands_policy.in ());
+                      (*p)[0u] = CORBA::Policy::_duplicate (bands_policy.in ());
                       (*p)[1u] =
                         CORBA::Policy::_duplicate (
                           priority_model_policy.in ());
@@ -304,8 +273,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
   while (ep != 0)
     {
       // Get the priority of the endpoint.
-      CORBA::Short endpoint_priority =
-        ep->priority ();
+      CORBA::Short endpoint_priority = ep->priority ();
 
       // If <all_endpoints_are_valid> or match the priority of the
       // client thread or match the priority of the band or
@@ -337,8 +305,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
 
           CORBA::Policy_var private_connection_policy =
             rt_stub->get_cached_policy (TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                                       );
 
           if (!CORBA::is_nil (private_connection_policy.in ()))
             {
@@ -360,8 +327,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
           bool status =
             r.try_connect (&rt_transport_descriptor,
                            val
-                           ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+                          );
 
           // Check if the invocation has completed.
           if (status == true)
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
index 4c6d75e022e..2222edd4fe2 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
@@ -52,7 +52,7 @@ public:
 
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *r,
                                 ACE_Time_Value *val
-                                ACE_ENV_ARG_DECL);
+                               );
 
 protected:
   void select_endpoint_based_on_client_protocol_policy (
@@ -60,12 +60,12 @@ protected:
       RTCORBA::ClientProtocolPolicy_ptr client_protocol_policy,
       RTCORBA::ProtocolList &protocols,
       ACE_Time_Value *v
-      ACE_ENV_ARG_DECL
+
     );
 
   int endpoint_from_profile (TAO::Profile_Transport_Resolver &r,
                              ACE_Time_Value *v
-                             ACE_ENV_ARG_DECL);
+                            );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index 701505481ee..e00d5d921ec 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -17,24 +17,24 @@ TAO_RT_Mutex::~TAO_RT_Mutex (void)
 }
 
 void
-TAO_RT_Mutex::lock (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Mutex::lock (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->mu_.acquire () != 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw ::CORBA::INTERNAL ();
 }
 
 void
-TAO_RT_Mutex::unlock (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Mutex::unlock (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->mu_.release () != 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    throw ::CORBA::INTERNAL ();
 }
 
 CORBA::Boolean
 TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time
-                        ACE_ENV_ARG_DECL)
+                        )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int result;
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index 2381712964f..89732b0008b 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -58,11 +58,11 @@ class TAO_RTCORBA_Export TAO_RT_Mutex
 public:
 
   /// Acquire the lock.
-  virtual void lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void lock (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Release the lock.
-  virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void unlock (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -72,7 +72,7 @@ public:
    * using this operation in your program designs.
    */
   virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the name of the mutex.
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 7f6e2cc028b..946039ec5dc 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -41,41 +41,33 @@ TAO_RT_ORB::~TAO_RT_ORB (void)
 }
 
 RTCORBA::Mutex_ptr
-TAO_RT_ORB::create_mutex (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_ORB::create_mutex (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->mutex_mgr_.create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->mutex_mgr_.create_mutex ();
 }
 
 void
-TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex
-                           ACE_ENV_ARG_DECL)
+TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->mutex_mgr_.destroy_mutex (mutex
-                                  ACE_ENV_ARG_PARAMETER);
+  this->mutex_mgr_.destroy_mutex (mutex);
 }
 
 
 RTCORBA::Mutex_ptr
 TAO_RT_ORB::create_named_mutex (const char *name,
-                                CORBA::Boolean_out created_flag
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Boolean_out created_flag)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->mutex_mgr_.create_named_mutex (name,
-                                              created_flag
-                                              ACE_ENV_ARG_PARAMETER);
+  return this->mutex_mgr_.create_named_mutex (name, created_flag);
 }
 
 RTCORBA::Mutex_ptr
-TAO_RT_ORB::open_named_mutex (const char *name
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::MutexNotFound))
+TAO_RT_ORB::open_named_mutex (const char *name)
+  ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound))
 {
-  return this->mutex_mgr_.open_named_mutex (name
-                                            ACE_ENV_ARG_PARAMETER);
+  return this->mutex_mgr_.open_named_mutex (name);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -89,7 +81,7 @@ TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
 }
 
 RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Named_RT_Mutex_Manager::create_mutex (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RT_Mutex *mutex = 0;
@@ -100,7 +92,6 @@ TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
 
   return mutex;
 }
@@ -109,8 +100,7 @@ TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL)
 // as also indicated by the comment below.
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
 void
-TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex
-                                           ACE_ENV_ARG_DECL)
+TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RT_Mutex *tao_mutex =
@@ -126,19 +116,17 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex
                           monitor,
                           this->lock_,
                           CORBA::INTERNAL ());
-      ACE_CHECK;
 
       int result =
         this->map_.unbind (name);
 
       if (result != 0)
-        ACE_THROW (CORBA::INTERNAL ());
+        throw ::CORBA::INTERNAL ();
     }
 }
 #else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 void
-TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -146,8 +134,7 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr
 
 RTCORBA::Mutex_ptr
 TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
-                                                CORBA::Boolean_out created_flag
-                                                ACE_ENV_ARG_DECL)
+                                                CORBA::Boolean_out created_flag)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
@@ -156,18 +143,16 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
                       monitor,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
 
   // Optimistic that we'll find it.
-  created_flag = 0;
+  created_flag = false;
 
   // If we find the mutex, simply return it.
   RTCORBA::Mutex_var mutex;
-  if (this->map_.find (name,
-                       mutex) != 0)
+  if (this->map_.find (name, mutex) != 0)
     {
       // Oops, we didn't find it.
-      created_flag = 1;
+      created_flag = true;
 
       RTCORBA::Mutex_ptr tmp_mutex;
 
@@ -179,14 +164,11 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
 
       mutex = tmp_mutex;
 
       // Add it to the map.
-      int result =
-        this->map_.bind (name,
-                         mutex);
+      int const result = this->map_.bind (name, mutex);
 
       if (result != 0)
         ACE_THROW_RETURN (CORBA::INTERNAL (),
@@ -204,8 +186,7 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
 }
 
 RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name
-                                              ACE_ENV_ARG_DECL)
+TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::MutexNotFound))
 {
@@ -215,12 +196,10 @@ TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name
                       monitor,
                       this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
 
   // If we find the mutex, simply return it.
   RTCORBA::Mutex_var mutex;
-  if (this->map_.find (name,
-                       mutex) != 0)
+  if (this->map_.find (name, mutex) != 0)
     ACE_THROW_RETURN (RTCORBA::RTORB::MutexNotFound (),
                       RTCORBA::Mutex::_nil ());
 
@@ -242,7 +221,7 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                             CORBA::Boolean dont_route,
                                             CORBA::Boolean no_delay,
                                             CORBA::Boolean enable_network_priority
-                                            ACE_ENV_ARG_DECL)
+                                            )
   ACE_THROW_SPEC ((CORBA::SystemException ))
 {
   TAO_TCP_Protocol_Properties *tmp = 0;
@@ -255,7 +234,6 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                         enable_network_priority),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::TCPProtocolProperties::_nil ());
 
   return tmp;
 }
@@ -264,7 +242,7 @@ RTCORBA::UnixDomainProtocolProperties_ptr
 TAO_RT_ORB::create_unix_domain_protocol_properties (
                                                     CORBA::Long send_buffer_size,
                                                     CORBA::Long recv_buffer_size
-                                                    ACE_ENV_ARG_DECL)
+                                                    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UnixDomain_Protocol_Properties *tmp = 0;
@@ -274,7 +252,6 @@ TAO_RT_ORB::create_unix_domain_protocol_properties (
                                                recv_buffer_size),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::UnixDomainProtocolProperties::_nil ());
 
   return tmp;
 }
@@ -288,8 +265,7 @@ TAO_RT_ORB::create_shared_memory_protocol_properties (
                                                       CORBA::Boolean no_delay,
                                                       CORBA::Long preallocate_buffer_size,
                                                       const char *mmap_filename,
-                                                      const char *mmap_lockname
-                                                      ACE_ENV_ARG_DECL)
+                                                      const char *mmap_lockname)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_SharedMemory_Protocol_Properties *tmp = 0;
@@ -304,7 +280,6 @@ TAO_RT_ORB::create_shared_memory_protocol_properties (
                                                           mmap_lockname),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::SharedMemoryProtocolProperties::_nil ());
 
   return tmp;
 }
@@ -312,7 +287,7 @@ TAO_RT_ORB::create_shared_memory_protocol_properties (
 RTCORBA::UserDatagramProtocolProperties_ptr
 TAO_RT_ORB::create_user_datagram_protocol_properties (
                                                       CORBA::Boolean enable_network_priority
-                                                      ACE_ENV_ARG_DECL)
+                                                      )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UserDatagram_Protocol_Properties *tmp = 0;
@@ -321,7 +296,6 @@ TAO_RT_ORB::create_user_datagram_protocol_properties (
                                                  enable_network_priority),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::UserDatagramProtocolProperties::_nil ());
 
   return tmp;
 }
@@ -334,7 +308,7 @@ TAO_RT_ORB::create_stream_control_protocol_properties (
                                                        CORBA::Boolean dont_route,
                                                        CORBA::Boolean no_delay,
                                                        CORBA::Boolean enable_network_priority
-                                                       ACE_ENV_ARG_DECL)
+                                                       )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_StreamControl_Protocol_Properties *tmp = 0;
@@ -348,7 +322,6 @@ TAO_RT_ORB::create_stream_control_protocol_properties (
                                                   enable_network_priority),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::StreamControlProtocolProperties::_nil ());
 
   return tmp;
 }
@@ -361,7 +334,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                CORBA::Boolean allow_request_buffering,
                                CORBA::ULong max_buffered_requests,
                                CORBA::ULong max_request_buffer_size
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->tp_manager_->create_threadpool (stacksize,
@@ -372,7 +345,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                                max_buffered_requests,
                                                max_request_buffer_size,
                                                this->dynamic_thread_idle_timeout_
-                                               ACE_ENV_ARG_PARAMETER);
+                                              );
 }
 
 RTCORBA::ThreadpoolId
@@ -382,7 +355,7 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                           CORBA::Boolean allow_request_buffering,
                                           CORBA::ULong max_buffered_requests,
                                           CORBA::ULong max_request_buffer_size
-                                          ACE_ENV_ARG_DECL)
+                                          )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->tp_manager_->create_threadpool_with_lanes (stacksize,
@@ -392,23 +365,21 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                           max_buffered_requests,
                                                           max_request_buffer_size,
                                                           this->dynamic_thread_idle_timeout_
-                                                          ACE_ENV_ARG_PARAMETER);
+                                                         );
 }
 
 void
-TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                ACE_ENV_ARG_DECL)
+TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::InvalidThreadpool))
 {
-  this->tp_manager_->destroy_threadpool (threadpool
-                                         ACE_ENV_ARG_PARAMETER);
+  this->tp_manager_->destroy_threadpool (threadpool);
 }
 
 RTCORBA::PriorityModelPolicy_ptr
 TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
                                           RTCORBA::Priority server_priority
-                                          ACE_ENV_ARG_DECL)
+                                          )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityModelPolicy *tmp = 0;
@@ -416,14 +387,12 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
                     TAO_PriorityModelPolicy (priority_model, server_priority),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::PriorityModelPolicy::_nil ());
 
   return tmp;
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
-TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
-                                      ACE_ENV_ARG_DECL)
+TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ThreadpoolPolicy *tmp = 0;
@@ -431,7 +400,6 @@ TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
                     TAO_ThreadpoolPolicy (threadpool),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::ThreadpoolPolicy::_nil ());
 
   return tmp;
 }
@@ -439,7 +407,7 @@ TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 TAO_RT_ORB::create_priority_banded_connection_policy (const
                                                       RTCORBA::PriorityBands & priority_bands
-                                                      ACE_ENV_ARG_DECL)
+                                                      )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityBandedConnectionPolicy *tmp = 0;
@@ -447,13 +415,12 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const
                     TAO_PriorityBandedConnectionPolicy (priority_bands),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::PriorityBandedConnectionPolicy::_nil ());
 
   return tmp;
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
-TAO_RT_ORB::create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_ORB::create_private_connection_policy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PrivateConnectionPolicy *tmp = 0;
@@ -461,14 +428,13 @@ TAO_RT_ORB::create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_PrivateConnectionPolicy (),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::PrivateConnectionPolicy::_nil ());
 
   return tmp;
 }
 
 RTCORBA::ServerProtocolPolicy_ptr
 TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                           ACE_ENV_ARG_DECL)
+                                           )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ServerProtocolPolicy *tmp = 0;
@@ -476,14 +442,13 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco
                     TAO_ServerProtocolPolicy (protocols),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::ServerProtocolPolicy::_nil ());
 
   return tmp;
 }
 
 RTCORBA::ClientProtocolPolicy_ptr
 TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                           ACE_ENV_ARG_DECL)
+                                           )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ClientProtocolPolicy *tmp = 0;
@@ -491,7 +456,6 @@ TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protoco
                     TAO_ClientProtocolPolicy (protocols),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::ClientProtocolPolicy::_nil ());
 
   return tmp;
 }
@@ -530,18 +494,14 @@ TAO_RT_ORB::modify_thread_scheduling_policy (CORBA::ORB_ptr orb)
 
 #if defined (linux)
 
-  int sched_policy =
-    orb->orb_core ()->orb_params ()->ace_sched_policy ();
+  int const sched_policy = orb->orb_core ()->orb_params ()->ace_sched_policy ();
 
-  int minimum_priority =
-    ACE_Sched_Params::priority_min (sched_policy);
+  int const minimum_priority = ACE_Sched_Params::priority_min (sched_policy);
 
   ACE_hthread_t thread_id;
   ACE_Thread::self (thread_id);
 
-  return ACE_Thread::setprio (thread_id,
-                              minimum_priority,
-                              sched_policy);
+  return ACE_Thread::setprio (thread_id, minimum_priority, sched_policy);
 
 #else /* linux */
 
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index 612108d048d..9c5852963c2 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -60,23 +60,18 @@ public:
   /// Destructor.
   ~TAO_Named_RT_Mutex_Manager (void);
 
-  RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  RTCORBA::Mutex_ptr create_mutex (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void destroy_mutex (RTCORBA::Mutex_ptr the_mutex)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::Mutex_ptr create_named_mutex (const char *name,
-                                         CORBA::Boolean_out created_flag
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         CORBA::Boolean_out created_flag)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  RTCORBA::Mutex_ptr open_named_mutex (const char * name
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTCORBA::RTORB::MutexNotFound
-                     ));
+  RTCORBA::Mutex_ptr open_named_mutex (const char * name)
+    ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound));
 
 private:
 
@@ -117,7 +112,7 @@ public:
    * consistant priority inheritance/piority ceiling semantics
    * can be guaranteed.
    */
-  virtual RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual RTCORBA::Mutex_ptr create_mutex (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -125,8 +120,7 @@ public:
    * instances are destroyed as soon as their reference counts go to
    * 0.
    */
-  virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -135,16 +129,12 @@ public:
    * is set to 0.
    */
   virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name,
-                                                 CORBA::Boolean_out created_flag
-                                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                 CORBA::Boolean_out created_flag)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Retrieve a previously created mutex.
-  virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS )
-     ACE_THROW_SPEC ((CORBA::SystemException,
-                      RTCORBA::RTORB::MutexNotFound
-                      ));
+  virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name)
+     ACE_THROW_SPEC ((CORBA::SystemException, RTCORBA::RTORB::MutexNotFound));
 
   /**
    * Create and return a TCPProtocolProperties instance with the specified
@@ -157,15 +147,13 @@ public:
                                   CORBA::Boolean keep_alive,
                                   CORBA::Boolean dont_route,
                                   CORBA::Boolean no_delay,
-                                  CORBA::Boolean enable_network_priority
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  CORBA::Boolean enable_network_priority)
     ACE_THROW_SPEC ((CORBA::SystemException ));
 
   RTCORBA::UnixDomainProtocolProperties_ptr
   create_unix_domain_protocol_properties (
                                           CORBA::Long send_buffer_size,
-                                          CORBA::Long recv_buffer_size
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          CORBA::Long recv_buffer_size                                          )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::SharedMemoryProtocolProperties_ptr
@@ -178,13 +166,13 @@ public:
                                             CORBA::Long preallocate_buffer_size,
                                             const char *mmap_filename,
                                             const char *mmap_lockname
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::UserDatagramProtocolProperties_ptr
   create_user_datagram_protocol_properties (
                                             CORBA::Boolean enable_network_priority
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::StreamControlProtocolProperties_ptr
@@ -195,7 +183,7 @@ public:
                                              CORBA::Boolean dont_route,
                                              CORBA::Boolean no_delay,
                                              CORBA::Boolean enable_network_priority
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a RTCORBA threadpool to manage a set of threads without lanes.
@@ -207,7 +195,7 @@ public:
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
                      CORBA::ULong max_request_buffer_size
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -221,12 +209,12 @@ public:
                                 CORBA::Boolean allow_request_buffering,
                                 CORBA::ULong max_buffered_requests,
                                 CORBA::ULong max_request_buffer_size
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Free the resources associated with the specified threadpool.
   virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
@@ -235,13 +223,12 @@ public:
   create_priority_model_policy (
                                 RTCORBA::PriorityModel priority_model,
                                 RTCORBA::Priority server_priority
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a ThreadpoolPolicy instance for POA creation
   virtual RTCORBA::ThreadpoolPolicy_ptr
-  create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  create_threadpool_policy (RTCORBA::ThreadpoolId threadpool)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -250,8 +237,7 @@ public:
    */
   virtual RTCORBA::PriorityBandedConnectionPolicy_ptr
   create_priority_banded_connection_policy (const RTCORBA::PriorityBands &
-                                            priority_bands
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            priority_bands)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -260,7 +246,7 @@ public:
    * to the server.
    */
   virtual RTCORBA::PrivateConnectionPolicy_ptr
-  create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  create_private_connection_policy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -268,8 +254,7 @@ public:
    * communication protocols on the server side.
    */
   virtual RTCORBA::ServerProtocolPolicy_ptr
-  create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  create_server_protocol_policy (const RTCORBA::ProtocolList & protocols)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -277,8 +262,7 @@ public:
    * communication protocols on the client side.
    */
   virtual RTCORBA::ClientProtocolPolicy_ptr
-  create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  create_client_protocol_policy (const RTCORBA::ProtocolList & protocols)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Reference to our creating ORB Core.
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index 464c35660aa..1651d70f8a9 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -62,9 +62,7 @@ TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type,
 }
 
 void
-TAO_RT_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //
@@ -120,14 +118,10 @@ TAO_RT_ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   TAO_Priority_Mapping_Manager_var safe_manager = manager;
 
-  info->register_initial_reference ("PriorityMappingManager",
-                                    manager
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->register_initial_reference ("PriorityMappingManager", manager);
 
   // Create the initial priority mapping instance.
   TAO_Network_Priority_Mapping *npm = 0;
@@ -155,22 +149,16 @@ TAO_RT_ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   TAO_Network_Priority_Mapping_Manager_var safe_network_manager =
     network_manager;
 
   info->register_initial_reference ("NetworkPriorityMappingManager",
-                                    network_manager
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    network_manager);
 
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
-  TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info);
 
   if (CORBA::is_nil (tao_info.in ()))
     {
@@ -181,7 +169,7 @@ TAO_RT_ORBInitializer::pre_init (
                     "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
                     "(%P|%t)   \"TAO_ORBInitInfo *.\"\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
   // Create the RT_ORB.
@@ -194,13 +182,9 @@ TAO_RT_ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
   CORBA::Object_var safe_rt_orb = rt_orb;
 
-  info->register_initial_reference (TAO_OBJID_RTORB,
-                                    rt_orb
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->register_initial_reference (TAO_OBJID_RTORB, rt_orb);
 
   // Create the RT_Current.
   CORBA::Object_ptr current = CORBA::Object::_nil ();
@@ -211,13 +195,9 @@ TAO_RT_ORBInitializer::pre_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
   CORBA::Object_var safe_rt_current = current;
 
-  info->register_initial_reference (TAO_OBJID_RTCURRENT,
-                                    current
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->register_initial_reference (TAO_OBJID_RTCURRENT, current);
 
   tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_);
   tao_info->orb_core ()->orb_params ()->sched_policy (this->sched_policy_);
@@ -225,21 +205,15 @@ TAO_RT_ORBInitializer::pre_init (
 }
 
 void
-TAO_RT_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+TAO_RT_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-
-  ACE_CHECK;
+  this->register_policy_factories (info);
 }
 
 void
 TAO_RT_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   // The RTCorba policy factory is stateless and reentrant, so share a
   // single instance between all ORBs.
@@ -253,7 +227,6 @@ TAO_RT_ORBInitializer::register_policy_factories (
                               TAO::VMCID,
                               ENOMEM),
                             CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       this->policy_factory_ = policy_factory;
     }
@@ -277,14 +250,11 @@ TAO_RT_ORBInitializer::register_policy_factories (
        i != end;
        ++i)
     {
-      ACE_TRY
+      try
         {
-          info->register_policy_factory (*i,
-                                         this->policy_factory_.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          info->register_policy_factory (*i, this->policy_factory_.in ());
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+      catch (const ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -295,15 +265,13 @@ TAO_RT_ORBInitializer::register_policy_factories (
               // ORBInitializer.
               return;
             }
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception&)
         {
           // Rethrow any other exceptions...
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index c2f04c46c04..9a4cbe33ad2 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -65,20 +65,16 @@ public:
                          long scope_policy,
                          ACE_Time_Value const &dynamic_thread_idle_timeout);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register RTCORBA policy factories.
-  void register_policy_factories (
-                                  PortableInterceptor::ORBInitInfo_ptr info
-                                  ACE_ENV_ARG_DECL);
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
   /// Instance of the RTCorba policy factory.
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 381da1bd572..12a87c1646e 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -22,8 +22,7 @@ TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader (void)
 }
 
 int
-TAO_RT_ORB_Loader::init (int argc,
-                         ACE_TCHAR* argv[])
+TAO_RT_ORB_Loader::init (int argc, ACE_TCHAR* argv[])
 {
   ACE_TRACE ("TAO_RT_ORB_Loader::init");
 
@@ -153,7 +152,7 @@ TAO_RT_ORB_Loader::init (int argc,
     }
 
   // Register the ORB initializer.
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -171,23 +170,19 @@ TAO_RT_ORB_Loader::init (int argc,
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var orb_initializer;
       orb_initializer = temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught while "
-                           "initializing the RTORB");
+      ex._tao_print_exception (
+        "Unexpected exception caught while "
+        "initializing the RTORB");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h
index a3e2d4cd375..4184730effb 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.h
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h
@@ -42,8 +42,7 @@ public:
   virtual ~TAO_RT_ORB_Loader (void);
 
   /// Initialize the RT ORB loader hooks.
-  virtual int init (int argc,
-                    ACE_TCHAR* []);
+  virtual int init (int argc, ACE_TCHAR* []);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index cd80662c192..3b7bfc73eb8 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -16,34 +16,27 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_RT_PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
   if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-    return TAO_PriorityModelPolicy::create (value
-                                            ACE_ENV_ARG_PARAMETER);
+    return TAO_PriorityModelPolicy::create (value);
 
   if (type == RTCORBA::THREADPOOL_POLICY_TYPE)
-    return TAO_ThreadpoolPolicy::create (value
-                                         ACE_ENV_ARG_PARAMETER);
+    return TAO_ThreadpoolPolicy::create (value);
 
   if (type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE)
-    return TAO_ServerProtocolPolicy::create (value
-                                             ACE_ENV_ARG_PARAMETER);
+    return TAO_ServerProtocolPolicy::create (value);
 
   if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-    return TAO_ClientProtocolPolicy::create (value
-                                             ACE_ENV_ARG_PARAMETER);
+    return TAO_ClientProtocolPolicy::create (value);
 
   if (type == RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE)
-    return TAO_PrivateConnectionPolicy::create (value
-                                                ACE_ENV_ARG_PARAMETER);
+    return TAO_PrivateConnectionPolicy::create (value);
 
   if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-    return TAO_PriorityBandedConnectionPolicy::create (value
-                                                       ACE_ENV_ARG_PARAMETER);
+    return TAO_PriorityBandedConnectionPolicy::create (value);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
@@ -52,7 +45,7 @@ TAO_RT_PolicyFactory::create_policy (
 CORBA::Policy_ptr
 TAO_RT_PolicyFactory::_create_policy (
     CORBA::PolicyType type
-    ACE_ENV_ARG_DECL)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -67,7 +60,6 @@ TAO_RT_PolicyFactory::_create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }
@@ -81,7 +73,6 @@ TAO_RT_PolicyFactory::_create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }
@@ -95,7 +86,6 @@ TAO_RT_PolicyFactory::_create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h
index 0d7877c9489..d51b6ec34c8 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.h
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h
@@ -48,12 +48,12 @@ public:
 
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any &value
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 
   CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 5cb4737b17a..ca04f9ed871 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -55,8 +55,7 @@ TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void)
 }
 
 CORBA::Policy_ptr
-TAO_PriorityModelPolicy::create (const CORBA::Any &
-                                 ACE_ENV_ARG_DECL)
+TAO_PriorityModelPolicy::create (const CORBA::Any &)
 {
   /*
    * @@ The following code should be changed once the OMG spec has
@@ -74,28 +73,28 @@ TAO_PriorityModelPolicy::get_priority_model (void)
 }
 
 RTCORBA::PriorityModel
-TAO_PriorityModelPolicy::priority_model (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityModelPolicy::priority_model (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->priority_model_;
 }
 
 RTCORBA::Priority
-TAO_PriorityModelPolicy::server_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityModelPolicy::server_priority (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->server_priority_;
 }
 
 CORBA::PolicyType
-TAO_PriorityModelPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityModelPolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PriorityModelPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityModelPolicy* tmp = 0;
@@ -103,13 +102,12 @@ TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_PriorityModelPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_PriorityModelPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityModelPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -176,7 +174,7 @@ TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy (void)
 
 CORBA::Policy_ptr
 TAO_ThreadpoolPolicy::create (const CORBA::Any &val
-                              ACE_ENV_ARG_DECL)
+                              )
 {
   RTCORBA::ThreadpoolId value;
   if ((val >>= value) == 0)
@@ -188,27 +186,26 @@ TAO_ThreadpoolPolicy::create (const CORBA::Any &val
                     TAO_ThreadpoolPolicy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 RTCORBA::ThreadpoolId
-TAO_ThreadpoolPolicy::threadpool (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ThreadpoolPolicy::threadpool (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->id_;
 }
 
 CORBA::PolicyType
-TAO_ThreadpoolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ThreadpoolPolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::THREADPOOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ThreadpoolPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ThreadpoolPolicy* tmp = 0;
@@ -216,13 +213,12 @@ TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_ThreadpoolPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_ThreadpoolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ThreadpoolPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -266,27 +262,26 @@ TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void)
 
 CORBA::Policy_ptr
 TAO_PrivateConnectionPolicy::create (const CORBA::Any &
-                                     ACE_ENV_ARG_DECL)
+                                     )
 {
   TAO_PrivateConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PrivateConnectionPolicy (),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 CORBA::PolicyType
-TAO_PrivateConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrivateConnectionPolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PrivateConnectionPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PrivateConnectionPolicy* tmp = 0;
@@ -294,13 +289,12 @@ TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_PrivateConnectionPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_PrivateConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrivateConnectionPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -351,7 +345,7 @@ TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy (void)
 
 CORBA::Policy_ptr
 TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val
-                                            ACE_ENV_ARG_DECL)
+                                            )
 {
   RTCORBA::PriorityBands *value = 0;
   if ((val >>= value) == 0)
@@ -363,13 +357,12 @@ TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val
                     TAO_PriorityBandedConnectionPolicy (*value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 RTCORBA::PriorityBands *
-TAO_PriorityBandedConnectionPolicy::priority_bands (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PriorityBandedConnectionPolicy::priority_bands (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::PriorityBands *tmp;
@@ -377,20 +370,19 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (ACE_ENV_SINGLE_ARG_DECL)
                     RTCORBA::PriorityBands (this->priority_bands_),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return tmp;
 }
 
 CORBA::PolicyType
-TAO_PriorityBandedConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityBandedConnectionPolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_PriorityBandedConnectionPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityBandedConnectionPolicy *tmp = 0;
@@ -398,13 +390,12 @@ TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_PriorityBandedConnectionPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_PriorityBandedConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityBandedConnectionPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -468,7 +459,7 @@ TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy (void)
 
 CORBA::Policy_ptr
 TAO_ServerProtocolPolicy::create (const CORBA::Any &val
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   RTCORBA::ProtocolList *value = 0;
   if ((val >>= value) == 0)
@@ -480,13 +471,12 @@ TAO_ServerProtocolPolicy::create (const CORBA::Any &val
                     TAO_ServerProtocolPolicy (*value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 RTCORBA::ProtocolList *
-TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerProtocolPolicy::protocols (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList *tmp = 0;
@@ -494,20 +484,19 @@ TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
                     RTCORBA::ProtocolList (this->protocols_),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return tmp;
 }
 
 CORBA::PolicyType
-TAO_ServerProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerProtocolPolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ServerProtocolPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ServerProtocolPolicy* tmp = 0;
@@ -515,13 +504,12 @@ TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_ServerProtocolPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_ServerProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerProtocolPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -578,7 +566,7 @@ TAO_ClientProtocolPolicy::~TAO_ClientProtocolPolicy ()
 
 CORBA::Policy_ptr
 TAO_ClientProtocolPolicy::create (const CORBA::Any &val
-                                  ACE_ENV_ARG_DECL)
+                                  )
 {
   RTCORBA::ProtocolList *value = 0;
   if ((val >>= value) == 0)
@@ -590,13 +578,12 @@ TAO_ClientProtocolPolicy::create (const CORBA::Any &val
                     TAO_ClientProtocolPolicy (*value),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 RTCORBA::ProtocolList *
-TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientProtocolPolicy::protocols (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList *tmp = 0;
@@ -604,20 +591,19 @@ TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
                     RTCORBA::ProtocolList (this->protocols_),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return tmp;
 }
 
 CORBA::PolicyType
-TAO_ClientProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientProtocolPolicy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ClientProtocolPolicy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ClientProtocolPolicy* tmp = 0;
@@ -625,13 +611,12 @@ TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_ClientProtocolPolicy (*this),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
 void
-TAO_ClientProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientProtocolPolicy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -732,7 +717,7 @@ TAO_TCP_Protocol_Properties::~TAO_TCP_Protocol_Properties (void)
 }
 
 CORBA::Long
-TAO_TCP_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::send_buffer_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
@@ -740,14 +725,14 @@ TAO_TCP_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_TCP_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                               )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_TCP_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::recv_buffer_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
@@ -755,14 +740,14 @@ TAO_TCP_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_TCP_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                               )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
 CORBA::Boolean
-TAO_TCP_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::keep_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->keep_alive_;
@@ -770,14 +755,14 @@ TAO_TCP_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_TCP_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->keep_alive_ = keep_alive;
 }
 
 CORBA::Boolean
-TAO_TCP_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::dont_route (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->dont_route_;
@@ -785,13 +770,13 @@ TAO_TCP_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_TCP_Protocol_Properties::dont_route (CORBA::Boolean dont_route
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->dont_route_ = dont_route;
 }
 
-CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->no_delay_;
@@ -799,14 +784,14 @@ CORBA::Boolean TAO_TCP_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NO
 
 void
 TAO_TCP_Protocol_Properties::no_delay (CORBA::Boolean no_delay
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->no_delay_ = no_delay;
 }
 
 CORBA::Boolean
-TAO_TCP_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Protocol_Properties::enable_network_priority (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->enable_network_priority_;
@@ -814,7 +799,7 @@ TAO_TCP_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NO
 
 void
 TAO_TCP_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                                      )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->enable_network_priority_ = enable;
@@ -863,7 +848,7 @@ TAO_UnixDomain_Protocol_Properties::~TAO_UnixDomain_Protocol_Properties (void)
 }
 
 CORBA::Long
-TAO_UnixDomain_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UnixDomain_Protocol_Properties::send_buffer_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
@@ -871,14 +856,14 @@ TAO_UnixDomain_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NO
 
 void
 TAO_UnixDomain_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                                      )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_UnixDomain_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UnixDomain_Protocol_Properties::recv_buffer_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
@@ -886,7 +871,7 @@ TAO_UnixDomain_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NO
 
 void
 TAO_UnixDomain_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                                      )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
@@ -933,7 +918,7 @@ TAO_SharedMemory_Protocol_Properties::~TAO_SharedMemory_Protocol_Properties (voi
 
 
 CORBA::Long
-TAO_SharedMemory_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::send_buffer_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
@@ -941,14 +926,14 @@ TAO_SharedMemory_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_
 
 void
 TAO_SharedMemory_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                                        )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_SharedMemory_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::recv_buffer_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
@@ -956,14 +941,14 @@ TAO_SharedMemory_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_
 
 void
 TAO_SharedMemory_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                                        )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
 CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::keep_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->keep_alive_;
@@ -971,14 +956,14 @@ TAO_SharedMemory_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_US
 
 void
 TAO_SharedMemory_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
-                                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                                  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->keep_alive_ = keep_alive;
 }
 
 CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::dont_route (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->dont_route_;
@@ -986,14 +971,14 @@ TAO_SharedMemory_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_US
 
 void
 TAO_SharedMemory_Protocol_Properties::dont_route (CORBA::Boolean dont_route
-                                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                                  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->dont_route_ = dont_route;
 }
 
 CORBA::Boolean
-TAO_SharedMemory_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::no_delay (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->no_delay_;
@@ -1001,14 +986,14 @@ TAO_SharedMemory_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED
 
 void
 TAO_SharedMemory_Protocol_Properties::no_delay (CORBA::Boolean no_delay
-                                                ACE_ENV_ARG_DECL_NOT_USED)
+                                                )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->no_delay_ = no_delay;
 }
 
 CORBA::Long
-TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->preallocate_buffer_size_;
@@ -1016,14 +1001,14 @@ TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (ACE_ENV_SINGLE_AR
 
 void
 TAO_SharedMemory_Protocol_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                                               )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->preallocate_buffer_size_ = preallocate_buffer_size;
 }
 
 char *
-TAO_SharedMemory_Protocol_Properties::mmap_filename (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::mmap_filename (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_filename_.rep ();
@@ -1031,14 +1016,14 @@ TAO_SharedMemory_Protocol_Properties::mmap_filename (ACE_ENV_SINGLE_ARG_DECL_NOT
 
 void
 TAO_SharedMemory_Protocol_Properties::mmap_filename (const char * mmap_filename
-                                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                                     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_filename_.set (mmap_filename);
 }
 
 char *
-TAO_SharedMemory_Protocol_Properties::mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SharedMemory_Protocol_Properties::mmap_lockname (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_lockname_.rep ();
@@ -1046,7 +1031,7 @@ TAO_SharedMemory_Protocol_Properties::mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_NOT
 
 void
 TAO_SharedMemory_Protocol_Properties::mmap_lockname (const char * mmap_lockname
-                                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                                     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_lockname_.set (mmap_lockname);
@@ -1104,7 +1089,7 @@ TAO_UserDatagram_Protocol_Properties::~TAO_UserDatagram_Protocol_Properties (voi
 }
 
 CORBA::Boolean
-TAO_UserDatagram_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UserDatagram_Protocol_Properties::enable_network_priority (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->enable_network_priority_;
@@ -1112,7 +1097,7 @@ TAO_UserDatagram_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_AR
 
 void
 TAO_UserDatagram_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
+                                                               )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->enable_network_priority_ = enable;
@@ -1152,7 +1137,7 @@ TAO_StreamControl_Protocol_Properties::~TAO_StreamControl_Protocol_Properties (v
 }
 
 CORBA::Long
-TAO_StreamControl_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StreamControl_Protocol_Properties::send_buffer_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
@@ -1160,14 +1145,14 @@ TAO_StreamControl_Protocol_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL
 
 void
 TAO_StreamControl_Protocol_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                                         )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_StreamControl_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StreamControl_Protocol_Properties::recv_buffer_size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
@@ -1175,14 +1160,14 @@ TAO_StreamControl_Protocol_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL
 
 void
 TAO_StreamControl_Protocol_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                                         )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
 CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StreamControl_Protocol_Properties::keep_alive (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->keep_alive_;
@@ -1190,14 +1175,14 @@ TAO_StreamControl_Protocol_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_U
 
 void
 TAO_StreamControl_Protocol_Properties::keep_alive (CORBA::Boolean keep_alive
-                                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                                   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->keep_alive_ = keep_alive;
 }
 
 CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StreamControl_Protocol_Properties::dont_route (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->dont_route_;
@@ -1205,13 +1190,13 @@ TAO_StreamControl_Protocol_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_U
 
 void
 TAO_StreamControl_Protocol_Properties::dont_route (CORBA::Boolean dont_route
-                                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                                   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->dont_route_ = dont_route;
 }
 
-CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->no_delay_;
@@ -1219,14 +1204,14 @@ CORBA::Boolean TAO_StreamControl_Protocol_Properties::no_delay (ACE_ENV_SINGLE_A
 
 void
 TAO_StreamControl_Protocol_Properties::no_delay (CORBA::Boolean no_delay
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                                 )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->no_delay_ = no_delay;
 }
 
 CORBA::Boolean
-TAO_StreamControl_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StreamControl_Protocol_Properties::enable_network_priority (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->enable_network_priority_;
@@ -1234,7 +1219,7 @@ TAO_StreamControl_Protocol_Properties::enable_network_priority (ACE_ENV_SINGLE_A
 
 void
 TAO_StreamControl_Protocol_Properties::enable_network_priority (CORBA::Boolean enable
-                                                                ACE_ENV_ARG_DECL_NOT_USED)
+                                                                )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->enable_network_priority_ = enable;
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index ed8e1cfe6a4..401eafaf4df 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -68,19 +68,19 @@ public:
    */
   RTCORBA::PriorityModel get_priority_model (void);
 
-  RTCORBA::PriorityModel priority_model (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  RTCORBA::PriorityModel priority_model (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  RTCORBA::Priority server_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  RTCORBA::Priority server_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method writes a CDR representation of the object state.
@@ -97,8 +97,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -138,16 +137,16 @@ public:
   /// Copy constructor.
   TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs);
 
-  RTCORBA::ThreadpoolId threadpool (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  RTCORBA::ThreadpoolId threadpool (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -158,8 +157,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -195,13 +193,13 @@ public:
   /// Copy constructor.
   TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs);
 
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -212,8 +210,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -254,16 +251,16 @@ public:
    */
   RTCORBA::PriorityBands &priority_bands_rep (void);
 
-  RTCORBA::PriorityBands *priority_bands (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  RTCORBA::PriorityBands *priority_bands (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method writes a CDR representation of the current object.
@@ -280,8 +277,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -329,16 +325,16 @@ public:
   RTCORBA::ProtocolList & protocols_rep (void);
 
   RTCORBA::ProtocolList *protocols
-  (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -349,8 +345,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -393,16 +388,16 @@ public:
   RTCORBA::ProtocolList & protocols_rep (void);
 
   RTCORBA::ProtocolList *protocols
-  (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = CDR Encoder/Decoder.
@@ -421,8 +416,7 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
+  static CORBA::Policy_ptr create (const CORBA::Any &val);
 
 protected:
 
@@ -463,46 +457,40 @@ public:
                                CORBA::Boolean no_delay,
                                CORBA::Boolean enable_network_priority);
 
-  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Long send_buffer_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void send_buffer_size (CORBA::Long send_buffer_size)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Long recv_buffer_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void recv_buffer_size (CORBA::Long recv_buffer_size)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean keep_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void keep_alive (CORBA::Boolean keep_alive
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void keep_alive (CORBA::Boolean keep_alive)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean dont_route (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void dont_route (CORBA::Boolean dont_route
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void dont_route (CORBA::Boolean dont_route)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean no_delay (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void no_delay (CORBA::Boolean no_delay
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void no_delay (CORBA::Boolean no_delay)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean enable_network_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void enable_network_priority (CORBA::Boolean enable
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void enable_network_priority (CORBA::Boolean enable)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method writes a CDR representation of TCPProtocolProperties.
@@ -548,18 +536,16 @@ public:
   TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size,
                                       CORBA::Long recv_buffer_size);
 
-  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Long send_buffer_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void send_buffer_size (CORBA::Long send_buffer_size)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Long recv_buffer_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void recv_buffer_size (CORBA::Long recv_buffer_size)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -621,63 +607,56 @@ public:
 
   // = IDL interface methods.
 
-  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Long send_buffer_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void send_buffer_size (CORBA::Long send_buffer_size)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Long recv_buffer_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void recv_buffer_size (CORBA::Long recv_buffer_size)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean keep_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void keep_alive (CORBA::Boolean keep_alive
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void keep_alive (CORBA::Boolean keep_alive)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean dont_route (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void dont_route (CORBA::Boolean dont_route
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void dont_route (CORBA::Boolean dont_route)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean no_delay (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void no_delay (CORBA::Boolean no_delay
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                 )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean enable_network_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Long preallocate_buffer_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void preallocate_buffer_size (CORBA::Long preallocate_buffer_size
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void preallocate_buffer_size (CORBA::Long preallocate_buffer_size)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char *mmap_filename (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  char *mmap_filename (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void mmap_filename (const char *mmap_filename
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void mmap_filename (const char *mmap_filename)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  char *mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  char *mmap_lockname (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void mmap_lockname (const char *mmap_lockname
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void mmap_lockname (const char *mmap_lockname)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -734,11 +713,10 @@ public:
   /// Constructor.
   TAO_UserDatagram_Protocol_Properties (CORBA::Boolean enable_network_priority);
 
-  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean enable_network_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void enable_network_priority (CORBA::Boolean enable
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void enable_network_priority (CORBA::Boolean enable)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method writes a CDR representation of UserDatagramProtocolProperties.
@@ -781,46 +759,40 @@ public:
                                          CORBA::Boolean no_delay,
                                          CORBA::Boolean enable_network_priority);
 
-  CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Long send_buffer_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void send_buffer_size (CORBA::Long send_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void send_buffer_size (CORBA::Long send_buffer_size)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Long recv_buffer_size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void recv_buffer_size (CORBA::Long recv_buffer_size
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void recv_buffer_size (CORBA::Long recv_buffer_size)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean keep_alive (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void keep_alive (CORBA::Boolean keep_alive
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void keep_alive (CORBA::Boolean keep_alive)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean dont_route (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void dont_route (CORBA::Boolean dont_route
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void dont_route (CORBA::Boolean dont_route)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean no_delay (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void no_delay (CORBA::Boolean no_delay
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void no_delay (CORBA::Boolean no_delay)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean enable_network_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean enable_network_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void enable_network_priority (CORBA::Boolean enable
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void enable_network_priority (CORBA::Boolean enable)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method writes a CDR representation of StreamControlProtocolProperties.
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index bcb82f8efbf..139538e68d8 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -40,8 +40,7 @@ TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void)
 }
 
 void
-TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
-                                    ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core)
 {
   this->orb_core_ = orb_core;
 
@@ -51,9 +50,7 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
       TAO_OBJID_PRIORITYMAPPINGMANAGER);
 
   this->mapping_manager_ =
-    TAO_Priority_Mapping_Manager::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_Priority_Mapping_Manager::_narrow (obj.in ());
 
   // Save a reference to the priority mapping manager.
   CORBA::Object_var object =
@@ -61,33 +58,26 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
       TAO_OBJID_NETWORKPRIORITYMAPPINGMANAGER);
 
   this->network_mapping_manager_ =
-    TAO_Network_Priority_Mapping_Manager::_narrow (object.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_Network_Priority_Mapping_Manager::_narrow (object.in ());
 
   object =
     this->orb_core_->object_ref_table ().resolve_initial_reference (
       TAO_OBJID_RTCURRENT);
 
-  this->current_ =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->current_ = RTCORBA::Current::_narrow (object.in ());
 
 }
 
 RTCORBA::ProtocolProperties_ptr
 TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag,
                                                     CORBA::Policy_ptr policy
-                                                    ACE_ENV_ARG_DECL)
+                                                    )
 {
   if (CORBA::is_nil (policy))
     return 0;
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (policy
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    RTCORBA::ServerProtocolPolicy::_narrow (policy);
 
   if (CORBA::is_nil (server_protocol_policy.in ()))
     return 0;
@@ -106,7 +96,8 @@ TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag,
     {
       if (protocols[j].protocol_type == protocol_tag)
         {
-          return RTCORBA::ProtocolProperties::_duplicate (protocols[j].transport_protocol_properties.in ());
+          return RTCORBA::ProtocolProperties::_duplicate (
+                  protocols[j].transport_protocol_properties.in ());
         }
     }
 
@@ -115,16 +106,13 @@ TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag,
 
 RTCORBA::ProtocolProperties_ptr
 TAO_RT_Protocols_Hooks::client_protocol_properties (IOP::ProfileId protocol_tag,
-                                                    CORBA::Policy_ptr policy
-                                                    ACE_ENV_ARG_DECL)
+                                                    CORBA::Policy_ptr policy)
 {
   if (CORBA::is_nil (policy))
     return 0;
 
   RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
-    RTCORBA::ClientProtocolPolicy::_narrow (policy
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    RTCORBA::ClientProtocolPolicy::_narrow (policy);
 
   if (CORBA::is_nil (client_protocol_policy.in ()))
     return 0;
@@ -143,7 +131,8 @@ TAO_RT_Protocols_Hooks::client_protocol_properties (IOP::ProfileId protocol_tag,
     {
       if (protocols[j].protocol_type == protocol_tag)
         {
-          return RTCORBA::ProtocolProperties::_duplicate (protocols[j].transport_protocol_properties.in ());
+          return RTCORBA::ProtocolProperties::_duplicate (
+                  protocols[j].transport_protocol_properties.in ());
         }
     }
 
@@ -151,57 +140,44 @@ TAO_RT_Protocols_Hooks::client_protocol_properties (IOP::ProfileId protocol_tag,
 }
 
 RTCORBA::ProtocolProperties_ptr
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  IOP::ProfileId protocol_tag)
 {
   CORBA::Policy_var policy =
-    this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
-  return this->server_protocol_properties (protocol_tag,
-                                           policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return this->server_protocol_properties (protocol_tag, policy.in ());
 }
 
 RTCORBA::ProtocolProperties_ptr
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  IOP::ProfileId protocol_tag)
 {
   CORBA::Policy_var policy =
-    this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->orb_core_->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
 
-  return this->client_protocol_properties (protocol_tag,
-                                           policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return this->client_protocol_properties (protocol_tag, policy.in ());
 }
 
 RTCORBA::ProtocolProperties_ptr
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_object_level (IOP::ProfileId protocol_tag,
-                                                                    TAO_Stub *stub
-                                                                    ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_object_level (
+  IOP::ProfileId protocol_tag,
+  TAO_Stub *stub)
 {
   CORBA::Policy_var policy =
-    stub->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    stub->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
 
-  return this->client_protocol_properties (protocol_tag,
-                                           policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
+  return this->client_protocol_properties (protocol_tag, policy.in ());
 }
 
 void
 TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Properties &to,
                                                      RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
+                                                     )
 {
   RTCORBA::TCPProtocolProperties_var protocol_properties =
     RTCORBA::TCPProtocolProperties::_narrow (from
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                            );
 
   to.send_buffer_size_ = protocol_properties->send_buffer_size ();
   to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
@@ -213,89 +189,67 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_IIOP_Protocol_Propertie
 
 void
 TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+                                                                 )
 {
   RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->extract_protocol_properties (to, from.in ());
 }
 
 void
 TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+                                                                 )
 {
   RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_protocol_properties_at_orb_level (IOP::TAG_INTERNET_IOP);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    this->extract_protocol_properties (to, from.in ());
 }
 
 void
-TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_UIOP_Protocol_Properties &to,
-                                                     RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::extract_protocol_properties (
+  TAO_UIOP_Protocol_Properties &to,
+  RTCORBA::ProtocolProperties_ptr from)
 {
   RTCORBA::UnixDomainProtocolProperties_var protocol_properties =
-    RTCORBA::UnixDomainProtocolProperties::_narrow (from
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::UnixDomainProtocolProperties::_narrow (from);
 
   to.send_buffer_size_ = protocol_properties->send_buffer_size ();
   to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
 }
 
 void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  TAO_UIOP_Protocol_Properties &to)
 {
   RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->extract_protocol_properties (to, from.in ());
 }
 
 void
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  TAO_UIOP_Protocol_Properties &to)
 {
   RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_protocol_properties_at_orb_level (TAO_TAG_UIOP_PROFILE);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    this->extract_protocol_properties (to, from.in ());
 }
 
 void
-TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SHMIOP_Protocol_Properties &to,
-                                                     RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::extract_protocol_properties (
+  TAO_SHMIOP_Protocol_Properties &to,
+  RTCORBA::ProtocolProperties_ptr from)
 {
   RTCORBA::SharedMemoryProtocolProperties_var protocol_properties =
-    RTCORBA::SharedMemoryProtocolProperties::_narrow (from
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::SharedMemoryProtocolProperties::_narrow (from);
 
   to.preallocate_buffer_size_ = protocol_properties->preallocate_buffer_size ();
   to.mmap_filename_ = protocol_properties->mmap_filename ();
@@ -303,89 +257,67 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SHMIOP_Protocol_Propert
 }
 
 void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  TAO_SHMIOP_Protocol_Properties &to)
 {
   RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->extract_protocol_properties (to, from.in ());
 }
 
 void
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  TAO_SHMIOP_Protocol_Properties &to)
 {
   RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_protocol_properties_at_orb_level (TAO_TAG_SHMEM_PROFILE);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    this->extract_protocol_properties (to, from.in ());
 }
 
 void
-TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_DIOP_Protocol_Properties &to,
-                                                     RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::extract_protocol_properties (
+  TAO_DIOP_Protocol_Properties &to,
+  RTCORBA::ProtocolProperties_ptr from)
 {
   RTCORBA::UserDatagramProtocolProperties_var protocol_properties =
-    RTCORBA::UserDatagramProtocolProperties::_narrow (from
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::UserDatagramProtocolProperties::_narrow (from);
 
   to.enable_network_priority_ = protocol_properties->enable_network_priority ();
 }
 
 void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  TAO_DIOP_Protocol_Properties &to)
 {
   RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->extract_protocol_properties (to, from.in ());
 }
 
 void
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  TAO_DIOP_Protocol_Properties &to)
 {
   RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_protocol_properties_at_orb_level (TAO_TAG_DIOP_PROFILE);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    this->extract_protocol_properties (to, from.in ());
 }
 
 void
-TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SCIOP_Protocol_Properties &to,
-                                                     RTCORBA::ProtocolProperties_ptr from
-                                                     ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::extract_protocol_properties (
+  TAO_SCIOP_Protocol_Properties &to,
+  RTCORBA::ProtocolProperties_ptr from)
 {
   RTCORBA::StreamControlProtocolProperties_var protocol_properties =
-    RTCORBA::StreamControlProtocolProperties::_narrow (from
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::StreamControlProtocolProperties::_narrow (from);
 
   to.send_buffer_size_ = protocol_properties->send_buffer_size ();
   to.recv_buffer_size_ = protocol_properties->recv_buffer_size ();
@@ -396,40 +328,31 @@ TAO_RT_Protocols_Hooks::extract_protocol_properties (TAO_SCIOP_Protocol_Properti
 }
 
 void
-TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::server_protocol_properties_at_orb_level (
+  TAO_SCIOP_Protocol_Properties &to)
 {
   RTCORBA::ProtocolProperties_var from =
-    this->server_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->extract_protocol_properties (to, from.in ());
 }
 
 void
-TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &to
-                                                                 ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::client_protocol_properties_at_orb_level (
+  TAO_SCIOP_Protocol_Properties &to)
 {
   RTCORBA::ProtocolProperties_var from =
-    this->client_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_protocol_properties_at_orb_level (TAO_TAG_SCIOP_PROFILE);
 
   if (!CORBA::is_nil (from.in ()))
-    this->extract_protocol_properties (to,
-                                       from.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+    this->extract_protocol_properties (to, from.in ());
 }
 
 CORBA::Boolean
-TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag,
-                                              RTCORBA::ProtocolProperties_ptr protocol_properties
-                                              ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::set_network_priority (
+  IOP::ProfileId protocol_tag,
+  RTCORBA::ProtocolProperties_ptr protocol_properties)
 {
   if (CORBA::is_nil (protocol_properties))
       return false;
@@ -437,9 +360,7 @@ TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag,
   if (protocol_tag == IOP::TAG_INTERNET_IOP)
     {
       RTCORBA::TCPProtocolProperties_var tcp_protocol_properties =
-        RTCORBA::TCPProtocolProperties::_narrow (protocol_properties
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        RTCORBA::TCPProtocolProperties::_narrow (protocol_properties);
 
       return tcp_protocol_properties->enable_network_priority ();
     }
@@ -447,9 +368,7 @@ TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag,
   if (protocol_tag == TAO_TAG_DIOP_PROFILE)
     {
       RTCORBA::UserDatagramProtocolProperties_var udp_protocol_properties =
-        RTCORBA::UserDatagramProtocolProperties::_narrow (protocol_properties
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        RTCORBA::UserDatagramProtocolProperties::_narrow (protocol_properties);
 
       return udp_protocol_properties->enable_network_priority ();
     }
@@ -457,9 +376,7 @@ TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag,
   if (protocol_tag == TAO_TAG_SCIOP_PROFILE)
     {
       RTCORBA::StreamControlProtocolProperties_var sctp_protocol_properties =
-        RTCORBA::StreamControlProtocolProperties::_narrow (protocol_properties
-                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+        RTCORBA::StreamControlProtocolProperties::_narrow (protocol_properties);
 
       return sctp_protocol_properties->enable_network_priority ();
     }
@@ -470,7 +387,7 @@ TAO_RT_Protocols_Hooks::set_network_priority (IOP::ProfileId protocol_tag,
 CORBA::Boolean
 TAO_RT_Protocols_Hooks::set_client_network_priority (IOP::ProfileId protocol_tag,
                                                      TAO_Stub *stub
-                                                     ACE_ENV_ARG_DECL)
+                                                     )
 {
   if (protocol_tag != IOP::TAG_INTERNET_IOP &&
       protocol_tag != TAO_TAG_DIOP_PROFILE &&
@@ -478,20 +395,16 @@ TAO_RT_Protocols_Hooks::set_client_network_priority (IOP::ProfileId protocol_tag
     return false;
 
   RTCORBA::ProtocolProperties_var protocol_properties =
-    this->client_protocol_properties_at_object_level (protocol_tag,
-                                                      stub
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    this->client_protocol_properties_at_object_level (protocol_tag, stub);
 
   return this->set_network_priority (protocol_tag,
-                                     protocol_properties.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+                                     protocol_properties.in ());
 }
 
 CORBA::Boolean
 TAO_RT_Protocols_Hooks::set_server_network_priority (IOP::ProfileId protocol_tag,
                                                      CORBA::Policy *policy
-                                                     ACE_ENV_ARG_DECL)
+                                                     )
 {
   if (protocol_tag != IOP::TAG_INTERNET_IOP &&
       protocol_tag != TAO_TAG_DIOP_PROFILE &&
@@ -499,14 +412,9 @@ TAO_RT_Protocols_Hooks::set_server_network_priority (IOP::ProfileId protocol_tag
     return false;
 
   RTCORBA::ProtocolProperties_var protocol_properties =
-    this->server_protocol_properties (protocol_tag,
-                                      policy
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    this->server_protocol_properties (protocol_tag, policy);
 
-  return this->set_network_priority (protocol_tag,
-                                     protocol_properties.in ()
-                                     ACE_ENV_ARG_PARAMETER);
+  return this->set_network_priority (protocol_tag, protocol_properties.in ());
 }
 
 CORBA::Long
@@ -518,8 +426,7 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
 
   CORBA::Long codepoint = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Make several invocation, changing the priority of this thread
       // for each.
@@ -527,9 +434,8 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
       RTCORBA::NetworkPriorityMapping *pm =
         this->network_mapping_manager_->mapping ();
 
-      const CORBA::Short priority =
-        this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Short const priority =
+        this->current_->the_priority ();
 
       if (pm->to_network (priority, codepoint) == 0)
         {
@@ -544,18 +450,16 @@ TAO_RT_Protocols_Hooks::get_dscp_codepoint (void)
           return -1;
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_RT_Protocols_Hooks::get_dscp_codepoint");
+          ex._tao_print_exception (
+            "TAO_RT_Protocols_Hooks::get_dscp_codepoint");
         }
 
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return codepoint;
 }
@@ -564,9 +468,7 @@ void
 TAO_RT_Protocols_Hooks::rt_service_context (
     TAO_Stub *stub,
     TAO_Service_Context &service_context,
-    CORBA::Boolean restart
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::Boolean restart)
 {
   // If the restart flag is true, then this call for a
   // reinvocation. We need not prepare the Service Context List once
@@ -577,27 +479,22 @@ TAO_RT_Protocols_Hooks::rt_service_context (
         dynamic_cast<TAO_RT_Stub *> (stub);
 
       CORBA::Policy_var priority_model_policy =
-        rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
 
       if (!CORBA::is_nil (priority_model_policy.in ()))
         {
           CORBA::Short client_priority;
 
-          int status =
-            this->get_thread_CORBA_priority (client_priority
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          int const status =
+            this->get_thread_CORBA_priority (client_priority);
 
           if (status == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
+            throw ::CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO);
 
           this->add_rt_service_context_hook (service_context,
                                              priority_model_policy.in (),
                                              client_priority
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                            );
         }
       else
         {
@@ -612,14 +509,11 @@ TAO_RT_Protocols_Hooks::add_rt_service_context_hook (
     TAO_Service_Context &service_context,
     CORBA::Policy *model_policy,
     CORBA::Short &client_priority
-    ACE_ENV_ARG_DECL
+
   )
 {
-
   RTCORBA::PriorityModelPolicy_var model_policy_ptr =
-    RTCORBA::PriorityModelPolicy::_narrow (model_policy
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::PriorityModelPolicy::_narrow (model_policy);
 
   TAO_PriorityModelPolicy *priority_model =
     static_cast<TAO_PriorityModelPolicy *> (model_policy_ptr.in ());
@@ -632,7 +526,7 @@ TAO_RT_Protocols_Hooks::add_rt_service_context_hook (
       if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0)
           || (cdr << client_priority) == 0)
         {
-          ACE_THROW (CORBA::MARSHAL ());
+          throw ::CORBA::MARSHAL ();
         }
 
       service_context.set_context (IOP::RTCorbaPriority, cdr);
@@ -643,18 +537,15 @@ void
 TAO_RT_Protocols_Hooks::get_selector_hook (
     CORBA::Policy *model_policy,
     CORBA::Boolean &is_client_propagated,
-    CORBA::Short &server_priority
-  )
+    CORBA::Short &server_priority)
 {
-
   RTCORBA::PriorityModelPolicy_var model_policy_ptr =
     RTCORBA::PriorityModelPolicy::_narrow (model_policy);
 
   TAO_PriorityModelPolicy *priority_model_policy =
     static_cast<TAO_PriorityModelPolicy *> (model_policy_ptr.in ());
 
-  if (priority_model_policy->get_priority_model ()
-        == RTCORBA::CLIENT_PROPAGATED)
+  if (priority_model_policy->get_priority_model () == RTCORBA::CLIENT_PROPAGATED)
     {
       is_client_propagated = true;
     }
@@ -673,7 +564,7 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook (
     CORBA::Short priority,
     CORBA::Short &min_priority,
     CORBA::Short &max_priority,
-    int &in_range
+    bool &in_range
   )
 {
   RTCORBA::PriorityBandedConnectionPolicy_var bands_policy_ptr =
@@ -693,22 +584,20 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook (
           min_priority = bands[i].low;
           max_priority = bands[i].high;
 
-          in_range = 1;
+          in_range = true;
           break;
         }
     }
 }
 
 int
-TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority
-                                                   ACE_ENV_ARG_DECL)
+TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority)
 {
   CORBA::Short native_priority = 0;
   int const result =
     this->get_thread_CORBA_and_native_priority (priority,
                                                 native_priority
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                               );
 
   if (result == -1)
     {
@@ -720,9 +609,7 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority
 
 int
 TAO_RT_Protocols_Hooks::get_thread_native_priority (
-    CORBA::Short &native_priority
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
+    CORBA::Short &native_priority)
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
@@ -746,14 +633,10 @@ TAO_RT_Protocols_Hooks::get_thread_native_priority (
 int
 TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (
     CORBA::Short &priority,
-    CORBA::Short &native_priority
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::Short &native_priority)
 {
-  int result =
-    this->get_thread_native_priority (native_priority
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int const result =
+    this->get_thread_native_priority (native_priority);
 
   if (result == -1)
     {
@@ -777,7 +660,7 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (
 
 int
 TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority
-                                                   ACE_ENV_ARG_DECL)
+                                                   )
 {
   TAO_Priority_Mapping *priority_mapping =
     this->mapping_manager_.in ()->mapping ();
@@ -789,15 +672,12 @@ TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority
       return -1;
     }
 
-  return this->set_thread_native_priority (native_priority
-                                           ACE_ENV_ARG_PARAMETER);
+  return this->set_thread_native_priority (native_priority);
 }
 
 int
 TAO_RT_Protocols_Hooks::set_thread_native_priority (
-    CORBA::Short native_priority
-    ACE_ENV_ARG_DECL_NOT_USED
-   )
+  CORBA::Short native_priority)
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index a1542f2e2a8..45601367061 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -44,57 +44,53 @@ public:
 
   /// Initialize the protocols hooks instance.
   void init_hooks (TAO_ORB_Core *orb_core
-                   ACE_ENV_ARG_DECL);
+                  );
 
   CORBA::Boolean set_client_network_priority (IOP::ProfileId protocol_tag,
-                                              TAO_Stub *stub
-                                              ACE_ENV_ARG_DECL);
+                                              TAO_Stub *stub);
 
   CORBA::Boolean set_server_network_priority (IOP::ProfileId protocol_tag,
-                                              CORBA::Policy *policy
-                                              ACE_ENV_ARG_DECL);
+                                              CORBA::Policy *policy);
 
   void server_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_IIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void server_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_UIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void server_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_SHMIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void server_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_DIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void server_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   void client_protocol_properties_at_orb_level (TAO_SCIOP_Protocol_Properties &protocol_properties
-                                                ACE_ENV_ARG_DECL);
+                                               );
 
   CORBA::Long get_dscp_codepoint (void);
 
   void rt_service_context (TAO_Stub *stub,
                            TAO_Service_Context &service_context,
-                           CORBA::Boolean restart
-                           ACE_ENV_ARG_DECL);
+                           CORBA::Boolean restart);
 
   void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                     CORBA::Policy *model_policy,
-                                    CORBA::Short &client_priority
-                                    ACE_ENV_ARG_DECL);
+                                    CORBA::Short &client_priority);
 
   void get_selector_hook (CORBA::Policy *model_policy,
                           CORBA::Boolean
@@ -105,7 +101,7 @@ public:
                                        CORBA::Short priority,
                                        CORBA::Short &min_priority,
                                        CORBA::Short &max_priority,
-                                       int &in_range);
+                                       bool &in_range);
 
   /**
    * Accessor and modifier to the current thread priority, used to
@@ -113,21 +109,15 @@ public:
    * some critical components.
    */
   //@{
-  int get_thread_CORBA_priority (CORBA::Short &
-                                 ACE_ENV_ARG_DECL);
+  int get_thread_CORBA_priority (CORBA::Short &);
 
-  int get_thread_native_priority (CORBA::Short &
-                                  ACE_ENV_ARG_DECL);
+  int get_thread_native_priority (CORBA::Short &);
 
-  int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                            CORBA::Short &
-                                            ACE_ENV_ARG_DECL);
+  int get_thread_CORBA_and_native_priority (CORBA::Short &, CORBA::Short &);
 
-  int set_thread_CORBA_priority (CORBA::Short
-                                 ACE_ENV_ARG_DECL);
+  int set_thread_CORBA_priority (CORBA::Short);
 
-  int set_thread_native_priority (CORBA::Short
-                                  ACE_ENV_ARG_DECL);
+  int set_thread_native_priority (CORBA::Short);
 
   //@}
 
@@ -135,45 +125,40 @@ protected:
 
   RTCORBA::ProtocolProperties_ptr server_protocol_properties (IOP::ProfileId protocol_tag,
                                                               CORBA::Policy_ptr policy
-                                                              ACE_ENV_ARG_DECL);
+                                                             );
 
   RTCORBA::ProtocolProperties_ptr client_protocol_properties (IOP::ProfileId protocol_tag,
                                                               CORBA::Policy_ptr policy
-                                                              ACE_ENV_ARG_DECL);
+                                                             );
 
   RTCORBA::ProtocolProperties_ptr server_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
-                                                                           ACE_ENV_ARG_DECL);
+                                                                          );
 
   RTCORBA::ProtocolProperties_ptr client_protocol_properties_at_orb_level (IOP::ProfileId protocol_tag
-                                                                           ACE_ENV_ARG_DECL);
+                                                                          );
 
   RTCORBA::ProtocolProperties_ptr client_protocol_properties_at_object_level (IOP::ProfileId protocol_tag,
                                                                               TAO_Stub *stub
-                                                                              ACE_ENV_ARG_DECL);
+                                                                             );
 
   void extract_protocol_properties (TAO_IIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
+                                    RTCORBA::ProtocolProperties_ptr from);
 
   void extract_protocol_properties (TAO_UIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
+                                    RTCORBA::ProtocolProperties_ptr from);
 
   void extract_protocol_properties (TAO_SHMIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
+                                    RTCORBA::ProtocolProperties_ptr from);
 
   void extract_protocol_properties (TAO_DIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
+                                    RTCORBA::ProtocolProperties_ptr from);
 
   void extract_protocol_properties (TAO_SCIOP_Protocol_Properties &to,
-                                    RTCORBA::ProtocolProperties_ptr from
-                                    ACE_ENV_ARG_DECL);
+                                    RTCORBA::ProtocolProperties_ptr from);
 
   CORBA::Boolean set_network_priority (IOP::ProfileId protocol_tag,
                                        RTCORBA::ProtocolProperties_ptr protocol_properties
-                                       ACE_ENV_ARG_DECL);
+                                      );
 
 protected:
 
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index a82714e4802..1e69053a4cf 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -26,7 +26,7 @@ TAO_RT_Stub::TAO_RT_Stub (const char *repository_id,
     priority_model_policy_ (0),
     priority_banded_connection_policy_ (0),
     client_protocol_policy_ (0),
-    are_policies_parsed_ (0)
+    are_policies_parsed_ (false)
 {
 }
 
@@ -43,13 +43,12 @@ TAO_RT_Stub::~TAO_RT_Stub (void)
 }
 
 void
-TAO_RT_Stub::parse_policies (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::parse_policies (void)
 {
   CORBA::PolicyList_var policy_list
-    = this->base_profiles_.policy_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    = this->base_profiles_.policy_list ();
 
-  CORBA::ULong length = policy_list->length ();
+  CORBA::ULong const length = policy_list->length ();
 
   // Cache away the policies that we'll need later.
   for (CORBA::ULong i = 0; i < length; ++i)
@@ -67,16 +66,15 @@ TAO_RT_Stub::parse_policies (ACE_ENV_SINGLE_ARG_DECL)
         this->exposed_client_protocol (policy_list[i]);
     }
 
-  this->are_policies_parsed_ = 1;
+  this->are_policies_parsed_ = true;
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::exposed_priority_model (void)
 {
   if (!this->are_policies_parsed_)
     {
-      this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      this->parse_policies ();
     }
 
   return CORBA::Policy::_duplicate (this->priority_model_policy_.in ());
@@ -89,12 +87,11 @@ TAO_RT_Stub::exposed_priority_model (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::exposed_priority_banded_connection (void)
 {
   if (!this->are_policies_parsed_)
     {
-      this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      this->parse_policies ();
     }
 
   return CORBA::Policy::_duplicate (this->priority_banded_connection_policy_.in ());
@@ -103,17 +100,15 @@ TAO_RT_Stub::exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_RT_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy)
 {
-  this->priority_banded_connection_policy_ =
-    CORBA::Policy::_duplicate (policy);
+  this->priority_banded_connection_policy_ = CORBA::Policy::_duplicate (policy);
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::exposed_client_protocol (void)
 {
   if (!this->are_policies_parsed_)
     {
-      this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+      this->parse_policies ();
     }
 
   return CORBA::Policy::_duplicate (this->client_protocol_policy_.in ());
@@ -128,85 +123,77 @@ TAO_RT_Stub::exposed_client_protocol (CORBA::Policy_ptr policy)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 CORBA::Policy_ptr
-TAO_RT_Stub::get_policy (CORBA::PolicyType type
-                         ACE_ENV_ARG_DECL)
+TAO_RT_Stub::get_policy (CORBA::PolicyType type)
 {
   // If we are dealing with a client exposed policy, check if any
   // value came in the IOR/reconcile IOR value and overrides.
   if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-    return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->exposed_priority_model ();
 
   if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-    return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->effective_priority_banded_connection ();
 
   if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-    return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->effective_client_protocol ();
 
-  return this->TAO_Stub::get_policy (type ACE_ENV_ARG_PARAMETER);
+  return this->TAO_Stub::get_policy (type);
 }
 
 CORBA::Policy_ptr
-TAO_RT_Stub::get_cached_policy (TAO_Cached_Policy_Type type
-                                ACE_ENV_ARG_DECL)
+TAO_RT_Stub::get_cached_policy (TAO_Cached_Policy_Type type)
 {
   // If we are dealing with a client exposed policy, check if any
   // value came in the IOR/reconcile IOR value and overrides.
   if (type == TAO_CACHED_POLICY_PRIORITY_MODEL)
-    return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->exposed_priority_model ();
 
   if (type == TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION)
-    return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->effective_priority_banded_connection ();
 
   if (type == TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL)
-    return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return this->effective_client_protocol ();
 
-  return this->TAO_Stub::get_cached_policy (type ACE_ENV_ARG_PARAMETER);
+  return this->TAO_Stub::get_cached_policy (type);
 }
 
 
 TAO_Stub *
 TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
-                                   CORBA::SetOverrideType set_add
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::SetOverrideType set_add)
 {
   // Validity check.  Make sure requested policies are allowed to be
   // set at this scope.
   for (CORBA::ULong i = 0; i < policies.length ();  ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      if (CORBA::is_nil (policy))
-        continue;
-
-      CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE ||
-          type == RTCORBA::THREADPOOL_POLICY_TYPE ||
-          type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE)
-        ACE_THROW_RETURN (CORBA::NO_PERMISSION (), 0);
-
+      if (!CORBA::is_nil (policy))
+        {
+          CORBA::PolicyType const type = policy->policy_type ();
+
+          if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE ||
+              type == RTCORBA::THREADPOOL_POLICY_TYPE ||
+              type == RTCORBA::SERVER_PROTOCOL_POLICY_TYPE)
+            ACE_THROW_RETURN (CORBA::NO_PERMISSION (), 0);
+        }
     }
 
   // We are not required to check for consistency of <policies> with
   // overrides at other levels or with policies exported in the IOR.
-  return this->TAO_Stub::set_policy_overrides(policies, set_add ACE_ENV_ARG_PARAMETER);
+  return this->TAO_Stub::set_policy_overrides(policies, set_add);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
 CORBA::Policy *
-TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::effective_priority_banded_connection (void)
 {
   // Get effective override.
   CORBA::Policy_var override =
-    this->TAO_Stub::get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    this->TAO_Stub::get_cached_policy (
+      TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
 
   // Get the value from the ior.
-  CORBA::Policy_var exposed =
-    this->exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  CORBA::Policy_var exposed = this->exposed_priority_banded_connection ();
 
   // Reconcile client-exposed and locally set values.
   if (CORBA::is_nil (exposed.in ()))
@@ -216,17 +203,13 @@ TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
     return exposed._retn ();
 
   RTCORBA::PriorityBandedConnectionPolicy_var override_policy_var =
-    RTCORBA::PriorityBandedConnectionPolicy::_narrow (override.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    RTCORBA::PriorityBandedConnectionPolicy::_narrow (override.in ());
 
   TAO_PriorityBandedConnectionPolicy *override_policy =
     static_cast<TAO_PriorityBandedConnectionPolicy *> (override_policy_var.in ());
 
   RTCORBA::PriorityBandedConnectionPolicy_var exposed_policy_var =
-    RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed.in ());
 
   TAO_PriorityBandedConnectionPolicy *exposed_policy =
     static_cast<TAO_PriorityBandedConnectionPolicy *> (exposed_policy_var.in ());
@@ -241,23 +224,19 @@ TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
 
   // Both override and exposed have been set and neither has empty
   // priority bands.  This is illegal (ptc/99-05-03, sec. 4.12.1).
-  ACE_THROW_RETURN (CORBA::INV_POLICY (),
-                    0);
+  ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
 }
 
 CORBA::Policy *
-TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::effective_client_protocol (void)
 {
   // Get effective override.
   CORBA::Policy_var override =
-    this->TAO_Stub::get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    this->TAO_Stub::get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
 
   // Get the value from the ior.
   CORBA::Policy_var exposed =
-    this->exposed_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    this->exposed_client_protocol ();
 
   // Reconcile client-exposed and locally set values.
   if (CORBA::is_nil (exposed.in ()))
@@ -267,17 +246,13 @@ TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
     return exposed._retn ();
 
   RTCORBA::ClientProtocolPolicy_var override_policy_var =
-    RTCORBA::ClientProtocolPolicy::_narrow (override.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    RTCORBA::ClientProtocolPolicy::_narrow (override.in ());
 
   TAO_ClientProtocolPolicy *override_policy =
     static_cast<TAO_ClientProtocolPolicy *> (override_policy_var.in ());
 
   RTCORBA::ClientProtocolPolicy_var exposed_policy_var =
-    RTCORBA::ClientProtocolPolicy::_narrow (exposed.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    RTCORBA::ClientProtocolPolicy::_narrow (exposed.in ());
 
   TAO_ClientProtocolPolicy *exposed_policy =
     static_cast<TAO_ClientProtocolPolicy *> (exposed_policy_var.in ());
@@ -295,8 +270,7 @@ TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
 
   // Both override and exposed have been set and neither has empty
   // protocols.  This is illegal (ptc/99-05-03, sec. 4.15.4).
-  ACE_THROW_RETURN (CORBA::INV_POLICY (),
-                    0);
+  ACE_THROW_RETURN (CORBA::INV_POLICY (), 0);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index fcaf8a32562..cdc16fd9a81 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -63,22 +63,19 @@ public:
    * policy type.  Returns the effective override for all other policy
    * types.
    */
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType type);
 
-  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                       ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
-                                  CORBA::SetOverrideType set_add
-                                  ACE_ENV_ARG_DECL);
+                                  CORBA::SetOverrideType set_add);
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
 private:
 
   /// Helper method used to parse the policies.
-  void parse_policies (ACE_ENV_SINGLE_ARG_DECL);
+  void parse_policies (void);
 
   void exposed_priority_model (CORBA::Policy_ptr policy);
 
@@ -89,17 +86,17 @@ private:
   /// Returns the CORBA::Policy (which will be narrowed to be
   /// used as RTCORBA::PriorityModelPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Policy_ptr exposed_priority_model (void);
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::PriorityBandedConnectionPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Policy_ptr exposed_priority_banded_connection (void);
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::ClientProtocolPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Policy_ptr exposed_client_protocol (void);
 
   // = Methods for obtaining effective policies.
   //
@@ -108,8 +105,8 @@ private:
   //   override for a given policy type, and then reconciling it with
   //   the policy value exported in the Object's IOR.
 
-  CORBA::Policy *effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL);
-  CORBA::Policy *effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL);
+  CORBA::Policy *effective_priority_banded_connection (void);
+  CORBA::Policy *effective_client_protocol (void);
 
   // The following attribute are used to cache
   // the different kind of policies and avoid to
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index 84f376955cd..cbcc331f8c5 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -25,11 +25,8 @@ TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void)
 TAO_Stub *
 TAO_RT_Stub_Factory::create_stub (const char *repository_id,
                                   const TAO_MProfile &profiles,
-                                  TAO_ORB_Core *orb_core
-                                  ACE_ENV_ARG_DECL)
+                                  TAO_ORB_Core *orb_core)
 {
-  // @@ TODO: As soon as the RT_STUB is done change this to
-  // create an RT_STUB
   TAO_Stub *retval = 0;
 
   ACE_NEW_THROW_EX (retval,
@@ -37,8 +34,6 @@ TAO_RT_Stub_Factory::create_stub (const char *repository_id,
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_MAYBE));
 
-  ACE_CHECK_RETURN (retval);
-
   return retval;
 }
 
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h
index 27a8f8cf712..109783a88af 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h
@@ -53,8 +53,7 @@ public:
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core
-                                 ACE_ENV_ARG_DECL);
+                                 TAO_ORB_Core *orb_core);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index 1b7aa28ff78..3035e8c84c4 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -43,23 +43,20 @@ TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (voi
 }
 
 int
-TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (void)
 {
   TAO_ORB_Parameters *params =
     this->orb_core_->orb_params ();
 
   TAO_EndpointSet endpoint_set;
 
-  params->get_endpoint_set (TAO_DEFAULT_LANE,
-                            endpoint_set);
+  params->get_endpoint_set (TAO_DEFAULT_LANE, endpoint_set);
 
   bool ignore_address = false;
 
-  int result =
+  int const result =
     this->default_lane_resources_->open_acceptor_registry (endpoint_set,
-                                                           ignore_address
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                           ignore_address);
 
   return result;
 }
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index a1cfe5cdbf8..3b1d8633d5b 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -54,7 +54,7 @@ public:
   void finalize (void);
 
   /// Open default resources.
-  int open_default_resources (ACE_ENV_SINGLE_ARG_DECL);
+  int open_default_resources (void);
 
   /// Shutdown reactor.
   void shutdown_reactor (void);
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 32476bbef4b..ba8c1bdb44a 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -53,36 +53,32 @@ TAO_Thread_Pool_Threads::svc (void)
     return 0;
 
   // Set TSS resources for this thread.
-  TAO_Thread_Pool_Threads::set_tss_resources (orb_core,
-                                              this->lane_);
+  TAO_Thread_Pool_Threads::set_tss_resources (orb_core, this->lane_);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Do the work
       this->run (orb_core);
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       // No point propagating this exception.  Print it out.
       ACE_ERROR ((LM_ERROR,
                   "orb->run() raised exception for thread %t\n"));
 
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "");
+      ex._tao_print_exception ("");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 int
-TAO_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER)
+TAO_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core)
 {
   CORBA::ORB_ptr orb = orb_core.orb ();
 
   // Run the ORB.
-  orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->run ();
 
   return 0;
 }
@@ -105,15 +101,14 @@ TAO_Dynamic_Thread_Pool_Threads::TAO_Dynamic_Thread_Pool_Threads (TAO_Thread_Lan
 }
 
 int
-TAO_Dynamic_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER)
+TAO_Dynamic_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core)
 {
   CORBA::ORB_ptr orb = orb_core.orb ();
 
   if (this->lane_.dynamic_thread_idle_timeout () == ACE_Time_Value::zero)
     {
       // No timeout specified, run the ORB until it shutdowns
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
     }
   else
     {
@@ -146,7 +141,7 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
                                   CORBA::ULong static_threads,
                                   CORBA::ULong dynamic_threads,
                                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  )
   : pool_ (pool),
     id_ (id),
     lane_priority_ (lane_priority),
@@ -224,11 +219,11 @@ TAO_Thread_Lane::shutting_down (void)
 }
 
 void
-TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Thread_Lane::validate_and_map_priority (void)
 {
   // Make sure that static_threads_number_ is not zero.
   if (this->static_threads_number_ == 0)
-    ACE_THROW (CORBA::BAD_PARAM ());
+    throw ::CORBA::BAD_PARAM ();
 
   // Check that the priority is in bounds.
   if (this->lane_priority_ < RTCORBA::minPriority
@@ -238,7 +233,7 @@ TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL)
 //      || this->lane_priority_ > RTCORBA::maxPriority
      )
     {
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw ::CORBA::BAD_PARAM ();
     }
 
   CORBA::ORB_ptr orb =
@@ -247,13 +242,11 @@ TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL)
   // Get the priority mapping manager.
   CORBA::Object_var obj =
     orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    );
 
   TAO_Priority_Mapping_Manager_var mapping_manager =
     TAO_Priority_Mapping_Manager::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          );
 
   RTCORBA::PriorityMapping *pm =
     mapping_manager.in ()->mapping ();
@@ -264,7 +257,7 @@ TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL)
                    this->native_priority_);
 
   if (!result)
-    ACE_THROW (CORBA::DATA_CONVERSION ());
+    throw ::CORBA::DATA_CONVERSION ();
 
   if (TAO_debug_level > 3)
     {
@@ -277,11 +270,10 @@ TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Thread_Lane::open (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Thread_Lane::open (void)
 {
   // Validate and map priority.
-  this->validate_and_map_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validate_and_map_priority ();
 
   // Create a string with the pool:thread id.
   char pool_lane_id[10];
@@ -318,19 +310,17 @@ TAO_Thread_Lane::open (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   // Open the acceptor registry.
-  int result = 0;
-  result =
+  int const result =
     this->resources_.open_acceptor_registry (endpoint_set,
                                              ignore_address
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                            );
 
   if (result == -1)
-    ACE_THROW (CORBA::INTERNAL (
+    throw ::CORBA::INTERNAL (
                  CORBA::SystemException::_tao_minor_code (
                    TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
                    0),
-                 CORBA::COMPLETED_NO));
+                 CORBA::COMPLETED_NO);
 }
 
 TAO_Thread_Lane::~TAO_Thread_Lane (void)
@@ -468,7 +458,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size,
                                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                                  ACE_ENV_ARG_DECL)
+                                  )
   : manager_ (manager),
     id_ (id),
     stack_size_ (stack_size),
@@ -483,7 +473,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
 {
   // No support for buffering.
   if (allow_request_buffering)
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
+    throw ::CORBA::NO_IMPLEMENT ();
 
   // Create one lane.
   ACE_NEW (this->lanes_,
@@ -495,7 +485,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                             static_threads,
                             dynamic_threads,
                             dynamic_thread_idle_timeout
-                            ACE_ENV_ARG_PARAMETER));
+                           ));
 }
 
 TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
@@ -507,7 +497,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size,
                                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                                  ACE_ENV_ARG_DECL)
+                                  )
   : manager_ (manager),
     id_ (id),
     stack_size_ (stack_size),
@@ -523,7 +513,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
   // No support for buffering or borrowing.
   if (allow_borrowing ||
       allow_request_buffering)
-    ACE_THROW (CORBA::NO_IMPLEMENT ());
+    throw ::CORBA::NO_IMPLEMENT ();
 
   // Create multiple lane.
   ACE_NEW (this->lanes_,
@@ -538,19 +528,18 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                               lanes[i].static_threads,
                               lanes[i].dynamic_threads,
                               dynamic_thread_idle_timeout
-                              ACE_ENV_ARG_PARAMETER));
+                             ));
 }
 
 void
-TAO_Thread_Pool::open (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Thread_Pool::open (void)
 {
   // Open all the lanes.
   for (CORBA::ULong i = 0;
        i != this->number_of_lanes_;
        ++i)
     {
-      this->lanes_[i]->open (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->lanes_[i]->open ();
     }
 }
 
@@ -728,11 +717,10 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                             CORBA::ULong max_buffered_requests,
                                             CORBA::ULong max_request_buffer_size,
                                             ACE_Time_Value const &dynamic_thread_idle_timeout
-                                            ACE_ENV_ARG_DECL)
+                                            )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
-  ACE_CHECK_RETURN (0);
 
   return this->create_threadpool_i (stacksize,
                                     static_threads,
@@ -742,7 +730,7 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                     max_buffered_requests,
                                     max_request_buffer_size,
                                     dynamic_thread_idle_timeout
-                                    ACE_ENV_ARG_PARAMETER);
+                                   );
 }
 
 RTCORBA::ThreadpoolId
@@ -753,11 +741,10 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                        CORBA::ULong max_buffered_requests,
                                                        CORBA::ULong max_request_buffer_size,
                                                        ACE_Time_Value const &dynamic_thread_idle_timeout
-                                                       ACE_ENV_ARG_DECL)
+                                                       )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
-  ACE_CHECK_RETURN (0);
 
   return this->create_threadpool_with_lanes_i (stacksize,
                                                lanes,
@@ -766,12 +753,12 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                max_buffered_requests,
                                                max_request_buffer_size,
                                                dynamic_thread_idle_timeout
-                                               ACE_ENV_ARG_PARAMETER);
+                                              );
 }
 
 void
 TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                             ACE_ENV_ARG_DECL)
+                                             )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::InvalidThreadpool))
 {
@@ -783,7 +770,6 @@ TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
   // results in a deadlock
   {
     TAO_THREAD_POOL_MANAGER_GUARD;
-    ACE_CHECK;
 
     // Unbind the thread pool from the map.
     int result =
@@ -792,7 +778,7 @@ TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
 
     // If the thread pool is not found in our map.
     if (result != 0)
-      ACE_THROW (RTCORBA::RTORB::InvalidThreadpool ());
+      throw RTCORBA::RTORB::InvalidThreadpool ();
   }
 
   // Mark the thread pool that we are shutting down.
@@ -821,7 +807,7 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                               CORBA::ULong max_buffered_requests,
                                               CORBA::ULong max_request_buffer_size,
                                               ACE_Time_Value const &dynamic_thread_idle_timeout
-                                              ACE_ENV_ARG_DECL)
+                                              )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create the thread pool.
@@ -838,12 +824,11 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                      max_buffered_requests,
                                      max_request_buffer_size,
                                      dynamic_thread_idle_timeout
-                                     ACE_ENV_ARG_PARAMETER),
+                                    ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return this->create_threadpool_helper (thread_pool
-                                         ACE_ENV_ARG_PARAMETER);
+                                        );
 }
 
 RTCORBA::ThreadpoolId
@@ -854,7 +839,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                                          CORBA::ULong max_buffered_requests,
                                                          CORBA::ULong max_request_buffer_size,
                                                          ACE_Time_Value const &dynamic_thread_idle_timeout
-                                                         ACE_ENV_ARG_DECL)
+                                                         )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create the thread pool.
@@ -870,25 +855,23 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                      max_buffered_requests,
                                      max_request_buffer_size,
                                      dynamic_thread_idle_timeout
-                                     ACE_ENV_ARG_PARAMETER),
+                                    ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return this->create_threadpool_helper (thread_pool
-                                         ACE_ENV_ARG_PARAMETER);
+                                        );
 }
 
 RTCORBA::ThreadpoolId
 TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
-                                                   ACE_ENV_ARG_DECL)
+                                                   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure of safe deletion in case of errors.
   auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool);
 
   // Open the pool.
-  thread_pool->open (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  thread_pool->open ();
 
   // Create the static threads.
   int result =
@@ -931,10 +914,9 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
 }
 
 TAO_Thread_Pool *
-TAO_Thread_Pool_Manager::get_threadpool (RTCORBA::ThreadpoolId thread_pool_id ACE_ENV_ARG_DECL)
+TAO_Thread_Pool_Manager::get_threadpool (RTCORBA::ThreadpoolId thread_pool_id )
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
-  ACE_CHECK_RETURN (0);
 
   TAO_Thread_Pool *thread_pool = 0;
   int result =
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index cd0047741e9..f68dd67cd98 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -90,7 +90,7 @@ public:
 
 protected:
   /// Do the real work
-  virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER);
+  virtual int run (TAO_ORB_Core &orb_core);
 
   /// Lane to which this thread belongs to.
   TAO_Thread_Lane &lane_;
@@ -112,7 +112,7 @@ public:
 
 protected:
   /// Do the real work
-  virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER);
+  virtual int run (TAO_ORB_Core &orb_core);
 };
 
 class TAO_Thread_Pool;
@@ -135,14 +135,13 @@ public:
                    CORBA::Short lane_priority,
                    CORBA::ULong static_threads,
                    CORBA::ULong dynamic_threads,
-                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                   ACE_ENV_ARG_DECL);
+                   ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   /// Destructor.
   ~TAO_Thread_Lane (void);
 
   /// Open the lane.
-  void open (ACE_ENV_SINGLE_ARG_DECL);
+  void open (void);
 
   /// Finalize the resources.
   void finalize (void);
@@ -198,7 +197,7 @@ public:
 private:
 
   /// Validate lane's priority and map it to a native value.
-  void validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_and_map_priority (void);
 
   int create_threads_i (TAO_Thread_Pool_Threads &thread_pool,
                         CORBA::ULong number_of_threads,
@@ -269,8 +268,7 @@ public:
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size,
-                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                   ACE_ENV_ARG_DECL);
+                   ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   /// Constructor (for pools with lanes).
   TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
@@ -281,14 +279,13 @@ public:
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size,
-                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                   ACE_ENV_ARG_DECL);
+                   ACE_Time_Value const &dynamic_thread_idle_timeout);
 
   /// Destructor.
   ~TAO_Thread_Pool (void);
 
   /// Open the pool.
-  void open (ACE_ENV_SINGLE_ARG_DECL);
+  void open (void);
 
   /// Finalize the resources.
   void finalize (void);
@@ -386,8 +383,7 @@ public:
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
                      CORBA::ULong max_request_buffer_size,
-                     ACE_Time_Value const &dynamic_thread_idle_timeout
-                     ACE_ENV_ARG_DECL)
+                     ACE_Time_Value const &dynamic_thread_idle_timeout)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a threadpool with lanes.
@@ -399,16 +395,16 @@ public:
                                 CORBA::ULong max_buffered_requests,
                                 CORBA::ULong max_request_buffer_size,
                                 ACE_Time_Value const &dynamic_thread_idle_timeout
-                                ACE_ENV_ARG_DECL)
+                                )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy a threadpool.
   void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                           ACE_ENV_ARG_DECL)
+                           )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
-  TAO_Thread_Pool *get_threadpool (RTCORBA::ThreadpoolId thread_pool_id ACE_ENV_ARG_DECL);
+  TAO_Thread_Pool *get_threadpool (RTCORBA::ThreadpoolId thread_pool_id);
 
   /// Collection of thread pools.
   typedef ACE_Hash_Map_Manager<RTCORBA::ThreadpoolId, TAO_Thread_Pool *, ACE_Null_Mutex> THREAD_POOLS;
@@ -433,8 +429,7 @@ private:
                        CORBA::Boolean allow_request_buffering,
                        CORBA::ULong max_buffered_requests,
                        CORBA::ULong max_request_buffer_size,
-                       ACE_Time_Value const &dynamic_thread_idle_timeout
-                       ACE_ENV_ARG_DECL)
+                       ACE_Time_Value const &dynamic_thread_idle_timeout)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::ThreadpoolId
@@ -445,12 +440,11 @@ private:
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size,
                                   ACE_Time_Value const &dynamic_thread_idle_timeout
-                                  ACE_ENV_ARG_DECL)
+                                  )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::ThreadpoolId
-  create_threadpool_helper (TAO_Thread_Pool *thread_pool
-                            ACE_ENV_ARG_DECL)
+  create_threadpool_helper (TAO_Thread_Pool *thread_pool)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @}
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index 0eecb7136a9..e49aaefad0c 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -20,8 +20,7 @@ ACE_RCSID(RTPortableServer,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
-TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
-                                            ACE_ENV_ARG_DECL) const
+TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object) const
 {
   // Make sure that the servant is in the same ORB that created this
   // object.
@@ -37,8 +36,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
   TAO::Portable_Server::Servant_Upcall servant_upcall (orb_core);
   TAO_Root_POA *poa =
     servant_upcall.lookup_POA (object->_stubobj ()->object_key ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                              );
 
   // Get the thread pool associated with this POA.
   TAO_Thread_Pool *target_thread_pool =
@@ -98,7 +96,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
 
   if (-1 == poa->find_servant_priority (servant_upcall.system_id_,
                                         target_priority
-                                        ACE_ENV_ARG_PARAMETER))
+                                       ))
   {
     return false;
   };
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
index 64f3016a4bd..a820c4dda34 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
@@ -42,10 +42,8 @@ class TAO_RTPortableServer_Export TAO_RT_Collocation_Resolver :
   public TAO_Collocation_Resolver
 {
 public:
-
   /// Is @a object collocated?
-  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
-                                        ACE_ENV_ARG_DECL) const;
+  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object) const;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 3f8c6fb2673..32d8f6856d7 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -45,7 +45,7 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
                         TAO_SYNCH_MUTEX &thread_lock,
                         TAO_ORB_Core &orb_core,
                         TAO_Object_Adapter *object_adapter
-                        ACE_ENV_ARG_DECL)
+                        )
   : TAO_Regular_POA (name,
                      poa_manager,
                      policies,
@@ -54,15 +54,13 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
                      thread_lock,
                      orb_core,
                      object_adapter
-                     ACE_ENV_ARG_PARAMETER),
+                    ),
   thread_pool_ (0)
 {
-  ACE_CHECK;
 
   // Parse the RT policies and update our policy cache.
   this->parse_rt_policies (this->policies ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          );
 }
 
 TAO_RT_POA::~TAO_RT_POA (void)
@@ -78,7 +76,7 @@ TAO_RT_POA::new_POA (const String &name,
                      TAO_SYNCH_MUTEX &thread_lock,
                      TAO_ORB_Core &orb_core,
                      TAO_Object_Adapter *object_adapter
-                     ACE_ENV_ARG_DECL)
+                     )
 {
   TAO_RT_POA *poa = 0;
 
@@ -91,40 +89,35 @@ TAO_RT_POA::new_POA (const String &name,
                                 thread_lock,
                                 orb_core,
                                 object_adapter
-                                ACE_ENV_ARG_PARAMETER),
+                               ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return poa;
 }
 
 void
 TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
-                               ACE_ENV_ARG_DECL)
+                               )
 {
   {
     CORBA::Policy_var policy =
       policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                 );
 
     RTCORBA::PriorityModelPolicy_var priority_model =
       RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                            );
 
     if (!CORBA::is_nil (priority_model.in ()))
       {
         RTCORBA::PriorityModel rt_priority_model =
-          priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          priority_model->priority_model ();
 
         this->cached_policies_.priority_model (
           TAO::Portable_Server::Cached_Policies::PriorityModel (rt_priority_model));
 
         RTCORBA::Priority priority =
-          priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          priority_model->server_priority ();
 
         this->cached_policies_.server_priority (priority);
       }
@@ -133,13 +126,12 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
   this->thread_pool_ =
     TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
                                                       policies.policies ()
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                     );
 }
 
 void
 TAO_RT_POA::validate_priority (RTCORBA::Priority priority
-                               ACE_ENV_ARG_DECL)
+                               )
 {
   if (priority < RTCORBA::minPriority
            // The line below will always be false unless the value of
@@ -148,7 +140,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
 //      || priority > RTCORBA::maxPriority
      )
     {
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw ::CORBA::BAD_PARAM ();
     }
 
   // If this POA is using a thread pool with lanes, make sure the
@@ -170,7 +162,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
             return;
         }
 
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw ::CORBA::BAD_PARAM ();
     }
   else
     // Else we are dealing with a thread pool without lanes.
@@ -179,13 +171,11 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
       CORBA::Policy_var bands =
         this->policies ().get_cached_policy (
           TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+         );
 
       RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
         = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                           );
 
       TAO_PriorityBandedConnectionPolicy *priority_bands_i =
         dynamic_cast <TAO_PriorityBandedConnectionPolicy *>
@@ -207,13 +197,13 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
                 return;
             }
 
-          ACE_THROW (CORBA::BAD_PARAM ());
+          throw ::CORBA::BAD_PARAM ();
         }
     }
 }
 
 void
-TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::validate_policies (void)
 {
   // For each of the above operations, if the POA supports the
   // IMPLICIT_ACTIVATION option for the ImplicitActivationPolicy then
@@ -224,7 +214,7 @@ TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL)
   if (this->cached_policies_.implicit_activation () ==
       PortableServer::IMPLICIT_ACTIVATION)
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
   // For each of the above operations, if the POA does not support the
@@ -233,7 +223,7 @@ TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL)
   if (this->cached_policies_.priority_model () !=
       TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      throw PortableServer::POA::WrongPolicy ();
     }
 
   // In all other respects the semantics of the corresponding
@@ -246,24 +236,21 @@ TAO_Stub *
 TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                            const char *type_id,
                            CORBA::Short priority
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   // Client exposed policies.
   CORBA::PolicyList_var client_exposed_policies =
     this->client_exposed_policies (priority
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                  );
 
   // Server protocol policy.
   CORBA::Policy_var protocol =
     this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                        );
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
     RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                           );
 
   TAO_ServerProtocolPolicy *server_protocol =
     dynamic_cast <TAO_ServerProtocolPolicy *> (server_protocol_policy.in ());
@@ -308,7 +295,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                                            client_exposed_policies._retn (),
                                            &filter,
                                            *acceptor_registry
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
     }
 
   // If this POA has the SERVER_DECLARED policy, create the IOR with
@@ -330,7 +317,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                                                       client_exposed_policies._retn (),
                                                       &filter,
                                                       lanes[i]->resources ().acceptor_registry ()
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                     );
         }
 
       ACE_ASSERT (0);
@@ -342,13 +329,11 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
   CORBA::Policy_var bands =
     this->policies ().get_cached_policy (
       TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+     );
 
   RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
     = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                       );
 
   TAO_PriorityBandedConnectionPolicy *priority_bands_i =
     dynamic_cast <TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ());
@@ -358,7 +343,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
                                    client_exposed_policies._retn (),
                                    &filter,
                                    priority_bands_i
-                                   ACE_ENV_ARG_PARAMETER);
+                                  );
 }
 
 TAO_Stub *
@@ -367,7 +352,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
                                 TAO_PriorityBandedConnectionPolicy *priority_bands
-                                ACE_ENV_ARG_DECL)
+                                )
 {
   int error = 0;
 
@@ -442,7 +427,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
     this->orb_core_.create_stub_object (mprofile,
                                         type_id,
                                         policy_list
-                                        ACE_ENV_ARG_PARAMETER);
+                                       );
 }
 
 size_t
@@ -486,21 +471,19 @@ TAO_RT_POA::lane_required (TAO_Thread_Lane *lane,
 
 CORBA::PolicyList *
 TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
-                                     ACE_ENV_ARG_DECL)
+                                     )
 {
   CORBA::PolicyList *client_exposed_policies = 0;
   ACE_NEW_THROW_EX (client_exposed_policies,
                     CORBA::PolicyList (),
                     CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   CORBA::PolicyList_var safe_client_exposed_policies = client_exposed_policies;
 
   // Add in all of the client exposed policies.
   this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                    );
 
   // Check if the priority model policy has been set, and if so, let
   // the client know about it.
@@ -532,7 +515,6 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
                                                  priority),
                         CORBA::NO_MEMORY (TAO::VMCID,
                                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
 
       (*client_exposed_policies)[current_length] = priority_model_policy;
     }
@@ -546,7 +528,7 @@ PortableServer::POA_ptr
 TAO_RT_POA::create_POA (const char *adapter_name,
                         PortableServer::POAManager_ptr poa_manager,
                         const CORBA::PolicyList &policies
-                        ACE_ENV_ARG_DECL)
+                        )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -554,35 +536,32 @@ TAO_RT_POA::create_POA (const char *adapter_name,
   PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name,
                                                            poa_manager,
                                                            policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (poa);
+                                                          );
   return poa;
 }
 
 PortableServer::POA_ptr
 TAO_RT_POA::find_POA (const char *adapter_name,
                       CORBA::Boolean activate_it
-                      ACE_ENV_ARG_DECL)
+                      )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
   PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
                                                          activate_it
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (poa);
+                                                        );
   return poa;
 }
 
 void
 TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
                      CORBA::Boolean wait_for_completion
-                     ACE_ENV_ARG_DECL)
+                     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_Regular_POA::destroy (etherealize_objects,
                           wait_for_completion
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                         );
 }
 
 
@@ -590,13 +569,12 @@ TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
 
 PortableServer::ThreadPolicy_ptr
 TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ThreadPolicy_ptr policy =
     this->TAO_Regular_POA::create_thread_policy (value
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+                                        );
   return policy;
 }
 
@@ -605,13 +583,12 @@ TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
 #if !defined (CORBA_E_MICRO)
 PortableServer::LifespanPolicy_ptr
 TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                    ACE_ENV_ARG_DECL)
+                                    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::LifespanPolicy_ptr policy =
     this->TAO_Regular_POA::create_lifespan_policy (value
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+                                          );
   return policy;
 }
 #endif
@@ -619,13 +596,12 @@ TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdUniquenessPolicy_ptr
 TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                         ACE_ENV_ARG_DECL)
+                                         )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdUniquenessPolicy_ptr policy =
     this->TAO_Regular_POA::create_id_uniqueness_policy (value
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+                                               );
   return policy;
 }
 #endif
@@ -633,13 +609,12 @@ TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue
 #if !defined (CORBA_E_MICRO)
 PortableServer::IdAssignmentPolicy_ptr
 TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                         ACE_ENV_ARG_DECL)
+                                         )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdAssignmentPolicy_ptr policy =
     this->TAO_Regular_POA::create_id_assignment_policy (value
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+                                               );
   return policy;
 }
 #endif
@@ -649,80 +624,73 @@ TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue
 
 PortableServer::ImplicitActivationPolicy_ptr
 TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                               ACE_ENV_ARG_DECL)
+                                               )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ImplicitActivationPolicy_ptr policy =
     this->TAO_Regular_POA::create_implicit_activation_policy (value
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+                                                     );
   return policy;
 }
 
 PortableServer::ServantRetentionPolicy_ptr
 TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                             ACE_ENV_ARG_DECL)
+                                             )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ServantRetentionPolicy_ptr policy =
     this->TAO_Regular_POA::create_servant_retention_policy (value
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+                                                   );
   return policy;
 }
 
 
 PortableServer::RequestProcessingPolicy_ptr
 TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                              ACE_ENV_ARG_DECL)
+                                              )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::RequestProcessingPolicy_ptr policy =
     this->TAO_Regular_POA::create_request_processing_policy (value
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (policy);
+                                                    );
   return policy;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
 char *
-TAO_RT_POA::the_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char * name =
-    this->TAO_Regular_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (name);
+    this->TAO_Regular_POA::the_name ();
   return name;
 }
 
 PortableServer::POA_ptr
-TAO_RT_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_parent (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_ptr parent =
-    this->TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (parent);
+    this->TAO_Regular_POA::the_parent ();
   return parent;
 }
 
 PortableServer::POAList *
-TAO_RT_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_children (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList *children =
-    this->TAO_Regular_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (children);
+    this->TAO_Regular_POA::the_children ();
   return children;
 }
 
 PortableServer::POAManager_ptr
-TAO_RT_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_POAManager (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAManager_ptr poa_manager =
-    this->TAO_Regular_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (poa_manager);
+    this->TAO_Regular_POA::the_POAManager ();
   return poa_manager;
 }
 
@@ -730,83 +698,76 @@ TAO_RT_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 PortableServer::AdapterActivator_ptr
-TAO_RT_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_activator (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::AdapterActivator_ptr activator =
-    this->TAO_Regular_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (activator);
+    this->TAO_Regular_POA::the_activator ();
   return activator;
 }
 
 void
 TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                           ACE_ENV_ARG_DECL)
+                           )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_Regular_POA::the_activator (adapter_activator
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 }
 
 PortableServer::ServantManager_ptr
-TAO_RT_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::get_servant_manager (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ServantManager_ptr servant_manager =
-    this->TAO_Regular_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant_manager);
+    this->TAO_Regular_POA::get_servant_manager ();
   return servant_manager;
 }
 
 void
 TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                 ACE_ENV_ARG_DECL)
+                                 )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   this->TAO_Regular_POA::set_servant_manager (imgr
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                     );
 }
 
 PortableServer::Servant
-TAO_RT_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::get_servant (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::NoServant,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_Regular_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant);
+    this->TAO_Regular_POA::get_servant ();
   return servant;
 }
 
 void
 TAO_RT_POA::set_servant (PortableServer::Servant servant
-                         ACE_ENV_ARG_DECL)
+                         )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   this->TAO_Regular_POA::set_servant (servant
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                             );
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 PortableServer::ObjectId *
 TAO_RT_POA::activate_object (PortableServer::Servant p_servant
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
     this->TAO_Regular_POA::activate_object (p_servant
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (object_id);
+                                   );
   return object_id;
 }
 
@@ -814,7 +775,7 @@ TAO_RT_POA::activate_object (PortableServer::Servant p_servant
 void
 TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                                      PortableServer::Servant p_servant
-                                     ACE_ENV_ARG_DECL)
+                                     )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -822,82 +783,76 @@ TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
 {
   this->TAO_Regular_POA::activate_object_with_id (id,
                                           p_servant
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         );
 }
 #endif
 
 void
 TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid
-                               ACE_ENV_ARG_DECL)
+                               )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   this->TAO_Regular_POA::deactivate_object (oid
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 }
 
 CORBA::Object_ptr
 TAO_RT_POA::create_reference (const char *intf
-                              ACE_ENV_ARG_DECL)
+                              )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::create_reference (intf
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
+                                    );
   return obj;
 }
 
 CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
                                       const char *intf
-                                      ACE_ENV_ARG_DECL)
+                                      )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::create_reference_with_id (oid,
                                              intf
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
+                                            );
   return obj;
 }
 
 PortableServer::ObjectId *
 TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant
-                           ACE_ENV_ARG_DECL)
+                           )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
     this->TAO_Regular_POA::servant_to_id (p_servant
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (object_id);
+                                 );
   return object_id;
 }
 
 CORBA::Object_ptr
 TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::servant_to_reference (p_servant
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
+                                        );
   return obj;
 }
 
 
 PortableServer::Servant
 TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
@@ -905,58 +860,54 @@ TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference
 {
   PortableServer::Servant servant =
     this->TAO_Regular_POA::reference_to_servant (reference
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant);
+                                        );
   return servant;
 }
 
 PortableServer::ObjectId *
 TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
     this->TAO_Regular_POA::reference_to_id (reference
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (object_id);
+                                   );
   return object_id;
 }
 
 PortableServer::Servant
 TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid
-                           ACE_ENV_ARG_DECL)
+                           )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
     this->TAO_Regular_POA::id_to_servant (oid
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (servant);
+                                 );
   return servant;
 }
 
 CORBA::Object_ptr
 TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid
-                             ACE_ENV_ARG_DECL)
+                             )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_Regular_POA::id_to_reference (oid
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (obj);
+                                   );
   return obj;
 }
 
 CORBA::OctetSeq *
-TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Regular_POA::id ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 4f2937ff125..1cf913567bf 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -53,29 +53,25 @@ public:
 
   // RTCORBA specific methods
   CORBA::Object_ptr create_reference_with_priority (const char * intf,
-                                                    RTCORBA::Priority priority
-                                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                    RTCORBA::Priority priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                            const char * intf,
-                                                           RTCORBA::Priority priority
-                                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                           RTCORBA::Priority priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant,
-                                                            RTCORBA::Priority priority
-                                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                            RTCORBA::Priority priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
                                              PortableServer::Servant p_servant,
-                                             RTCORBA::Priority priority
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             RTCORBA::Priority priority)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
@@ -85,182 +81,167 @@ public:
   // Standard POA interface methods
   PortableServer::POA_ptr create_POA (const char *adapter_name,
                                       PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      const CORBA::PolicyList &policies)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    CORBA::Boolean activate_it)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 
   void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                CORBA::Boolean wait_for_completion)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
-                                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ThreadPolicy_ptr create_thread_policy (
+    PortableServer::ThreadPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if !defined (CORBA_E_MICRO)
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::LifespanPolicy_ptr create_lifespan_policy (
+    PortableServer::LifespanPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif
 
 #if !defined (CORBA_E_MICRO)
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
+    PortableServer::IdUniquenessPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif
 
 #if !defined (CORBA_E_MICRO)
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
+    PortableServer::IdAssignmentPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ImplicitActivationPolicy_ptr
+    create_implicit_activation_policy (
+      PortableServer::ImplicitActivationPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ServantRetentionPolicy_ptr
+    create_servant_retention_policy (
+      PortableServer::ServantRetentionPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::RequestProcessingPolicy_ptr
+    create_request_processing_policy (
+      PortableServer::RequestProcessingPolicyValue value)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
 
-  char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  char * the_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POA_ptr the_parent (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAList *the_children (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAManager_ptr the_POAManager (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
-  PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::AdapterActivator_ptr the_activator (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ServantManager_ptr get_servant_manager (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void set_servant_manager (PortableServer::ServantManager_ptr imgr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant get_servant (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant (PortableServer::Servant servant
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void set_servant (PortableServer::Servant servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
 #if !defined (CORBA_E_MICRO)
   void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 #endif
 
-  void deactivate_object (const PortableServer::ObjectId &oid
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void deactivate_object (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr create_reference (const char *intf
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr create_reference (const char *intf)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              const char *intf)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OctetSeq *id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // End standard POA interface methods.
 
-  virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority
-                                                      ACE_ENV_ARG_DECL);
+  virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority);
 
   TAO_RT_POA (const String &name,
               PortableServer::POAManager_ptr poa_manager,
@@ -269,8 +250,7 @@ public:
               ACE_Lock &lock,
               TAO_SYNCH_MUTEX &thread_lock,
               TAO_ORB_Core &orb_core,
-              TAO_Object_Adapter *object_adapter
-              ACE_ENV_ARG_DECL);
+              TAO_Object_Adapter *object_adapter);
 
   virtual ~TAO_RT_POA (void);
 
@@ -281,28 +261,24 @@ protected:
   /// Template method for creating new POA's of this type.
   virtual TAO_Root_POA *new_POA (const String &name,
                                  PortableServer::POAManager_ptr poa_manager,
-                            const TAO_POA_Policy_Set &policies,
-                            TAO_Root_POA *parent,
-                            ACE_Lock &lock,
-                            TAO_SYNCH_MUTEX &thread_lock,
-                            TAO_ORB_Core &orb_core,
-                            TAO_Object_Adapter *object_adapter
-                            ACE_ENV_ARG_DECL);
+                                 const TAO_POA_Policy_Set &policies,
+                                 TAO_Root_POA *parent,
+                                 ACE_Lock &lock,
+                                 TAO_SYNCH_MUTEX &thread_lock,
+                                 TAO_ORB_Core &orb_core,
+                                 TAO_Object_Adapter *object_adapter);
 
   virtual TAO_Stub *key_to_stub_i (const TAO::ObjectKey &key,
                                    const char *type_id,
-                                   CORBA::Short priority
-                                   ACE_ENV_ARG_DECL);
+                                   CORBA::Short priority);
 
-  void validate_priority (RTCORBA::Priority priority
-                          ACE_ENV_ARG_DECL);
+  void validate_priority (RTCORBA::Priority priority);
 
-  void validate_policies (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_policies (void);
 
   /// Parse the policy list for RT policies and update our
   /// cached policy instance.
-  void parse_rt_policies (TAO_POA_Policy_Set &policies
-                          ACE_ENV_ARG_DECL);
+  void parse_rt_policies (TAO_POA_Policy_Set &policies);
 
   size_t endpoint_count (void);
 
@@ -311,7 +287,7 @@ protected:
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
                                 TAO_PriorityBandedConnectionPolicy *priority_bands
-                                ACE_ENV_ARG_DECL);
+                               );
 
   int lane_required (TAO_Thread_Lane *lane,
                      TAO_PriorityBandedConnectionPolicy *priority_bands);
diff --git a/TAO/tao/RTPortableServer/RT_POA.inl b/TAO/tao/RTPortableServer/RT_POA.inl
index bc0d00c7114..8a50bd7f91e 100644
--- a/TAO/tao/RTPortableServer/RT_POA.inl
+++ b/TAO/tao/RTPortableServer/RT_POA.inl
@@ -12,39 +12,35 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_priority (const char * intf,
                                             RTCORBA::Priority priority
-                                            ACE_ENV_ARG_DECL)
+                                            )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->validate_policies ();
 
-  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->validate_priority (priority);
 
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
   return this->create_reference_i (intf,
                                    priority
-                                   ACE_ENV_ARG_PARAMETER);
+                                  );
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                    const char * intf,
                                                    RTCORBA::Priority priority
-                                                   ACE_ENV_ARG_DECL)
+                                                   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->validate_policies ();
 
-  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  this->validate_priority (priority);
 
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
@@ -52,23 +48,21 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI
   return this->create_reference_with_id_i (oid,
                                            intf,
                                            priority
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
 }
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
                                            RTCORBA::Priority priority
-                                           ACE_ENV_ARG_DECL)
+                                           )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->validate_policies ();
 
-  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->validate_priority (priority);
 
   while (1)
     {
@@ -81,8 +75,7 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
         this->activate_object_i (servant,
                                  priority,
                                  wait_occurred_restart_call
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                );
 
       // If we ended up waiting on a condition variable, the POA state
       // may have changed while we are waiting.  Therefore, we need to
@@ -98,18 +91,16 @@ ACE_INLINE void
 TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                   PortableServer::Servant servant,
                                                   RTCORBA::Priority priority
-                                                  ACE_ENV_ARG_DECL)
+                                                  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validate_policies ();
 
-  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validate_priority (priority);
 
   while (1)
     {
@@ -122,8 +113,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
                                        servant,
                                        priority,
                                        wait_occurred_restart_call
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                      );
 
       // If we ended up waiting on a condition variable, the POA state
       // may have changed while we are waiting.  Therefore, we need to
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index 4e11afb2d2e..59351f89c8d 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -35,16 +35,13 @@ TAO_POA_RT_Policy_Validator::~TAO_POA_RT_Policy_Validator (void)
 
 void
 TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies
-                                            ACE_ENV_ARG_DECL)
+                                            )
 {
-  this->validate_thread_pool (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validate_thread_pool (policies);
 
-  this->validate_server_protocol (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validate_server_protocol (policies);
 
-  this->validate_priorities (policies ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validate_priorities (policies);
 }
 
 CORBA::Boolean
@@ -59,15 +56,14 @@ TAO_POA_RT_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
 
 void
 TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
-                                                       ACE_ENV_ARG_DECL)
+                                                       )
 {
   // Make sure we have an endpoint for at least one of the protocols
   // specified in the RTCORBA::ServerProtocolPolicy.  This ensure we
   // will be able to create non-nil object references.
   CORBA::Policy_var protocol =
     policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 
   if (CORBA::is_nil (protocol.in ()))
     {
@@ -81,15 +77,13 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
       if (!CORBA::is_nil (protocol.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (protocol.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          policies.set_policy (protocol.in ());
         }
     }
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
     RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                           );
 
   TAO_ServerProtocolPolicy *server_protocol =
     dynamic_cast <TAO_ServerProtocolPolicy *>
@@ -154,13 +148,13 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
         }
 
       if (!found)
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
+        throw PortableServer::POA::InvalidPolicy ();
     }
 }
 
 void
 TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
-                                                  ACE_ENV_ARG_DECL)
+                                                  )
 {
   // Initialize to the default priority/priority model.
   CORBA::Short priority =
@@ -170,23 +164,19 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
 
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 
   RTCORBA::PriorityModelPolicy_var priority_model =
     RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          );
 
   if (!CORBA::is_nil (priority_model.in ()))
     {
-      priority = priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      priority = priority_model->server_priority ();
 
       rt_priority_model =
         TAO::Portable_Server::Cached_Policies::PriorityModel (
-          priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_CHECK;
+          priority_model->priority_model ());
 
       // Check that the priority is in bounds.
       if (priority < RTCORBA::minPriority
@@ -196,7 +186,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
 //          || priority > RTCORBA::maxPriority
          )
         {
-          ACE_THROW (PortableServer::POA::InvalidPolicy ());
+          throw PortableServer::POA::InvalidPolicy ();
         }
     }
   else
@@ -205,18 +195,16 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
     {
       if (this->thread_pool_ != 0 &&
           this->thread_pool_->with_lanes ())
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
+        throw PortableServer::POA::InvalidPolicy ();
     }
 
   policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 
   RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
     = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                       );
 
   TAO_PriorityBandedConnectionPolicy *bands_policy =
     dynamic_cast<TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ());
@@ -236,14 +224,14 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
     {
       // Checks 0.
       if (rt_priority_model == TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED)
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
+        throw PortableServer::POA::InvalidPolicy ();
 
       RTCORBA::PriorityBands &bands =
         bands_policy->priority_bands_rep ();
 
       // Checks 1.
       if (bands.length () == 0)
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
+        throw PortableServer::POA::InvalidPolicy ();
 
       // Checks 2.
       for (CORBA::ULong i = 0; i < bands.length (); ++i)
@@ -259,7 +247,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
 //              || bands[i].high > RTCORBA::maxPriority
              )
             {
-              ACE_THROW (PortableServer::POA::InvalidPolicy ());
+              throw PortableServer::POA::InvalidPolicy ();
             }
         }
 
@@ -278,7 +266,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
             }
 
           if (!match)
-            ACE_THROW (PortableServer::POA::InvalidPolicy ());
+            throw PortableServer::POA::InvalidPolicy ();
         }
 
       //
@@ -315,7 +303,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
                 match = 1;
             }
           if (!match)
-            ACE_THROW (PortableServer::POA::InvalidPolicy ());
+            throw PortableServer::POA::InvalidPolicy ();
         }
 
       // Done with checks.
@@ -354,7 +342,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
             match = 1;
         }
       if (!match)
-        ACE_THROW (PortableServer::POA::InvalidPolicy ());
+        throw PortableServer::POA::InvalidPolicy ();
 
       // Done with checks.
       return;
@@ -364,24 +352,22 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
 
 void
 TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies
-                                                   ACE_ENV_ARG_DECL)
+                                                   )
 {
   this->thread_pool_ =
     TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
                                                       policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                     );
 }
 
 void
 TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
-                                                  ACE_ENV_ARG_DECL)
+                                                  )
 {
   // Check if the user has specified the priority model policy.
   CORBA::Policy_var priority_model =
     policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 
   if (CORBA::is_nil (priority_model.in ()))
     {
@@ -389,22 +375,19 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
       // at the ORB level.
       priority_model =
         this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          );
 
       if (!CORBA::is_nil (priority_model.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (priority_model.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          policies.set_policy (priority_model.in ());
         }
     }
 
   // Check if the user has specified the server protocol policy.
   CORBA::Policy_var server_protocol =
     policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 
   if (CORBA::is_nil (server_protocol.in ()))
     {
@@ -413,22 +396,19 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
       server_protocol =
         this->orb_core_.get_cached_policy (
           TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+         );
 
       if (!CORBA::is_nil (server_protocol.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (server_protocol.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          policies.set_policy (server_protocol.in ());
         }
     }
 
   // Check if the user has specified the thread pool policy.
   CORBA::Policy_var thread_pool =
     policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 
   if (CORBA::is_nil (thread_pool.in ()))
     {
@@ -436,14 +416,12 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
       // the ORB level.
       thread_pool =
         this->orb_core_.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                          );
 
       if (!CORBA::is_nil (thread_pool.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (thread_pool.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          policies.set_policy (thread_pool.in ());
         }
     }
 }
@@ -552,24 +530,21 @@ TAO_POA_RT_Policy_Validator::server_protocol_policy_from_acceptor_registry (RTCO
 TAO_Thread_Pool *
 TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
                                                   TAO_Policy_Set &policies
-                                                  ACE_ENV_ARG_DECL)
+                                                  )
 {
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                               );
 
   RTCORBA::ThreadpoolPolicy_var thread_pool_policy =
     RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                       );
 
   if (CORBA::is_nil (thread_pool_policy.in ()))
     return 0;
 
   RTCORBA::ThreadpoolId thread_pool_id =
-    thread_pool_policy->threadpool (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    thread_pool_policy->threadpool ();
 
   // Get the RTORB.
   CORBA::Object_var object =
@@ -577,8 +552,7 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
 
   RTCORBA::RTORB_var rt_orb =
     RTCORBA::RTORB::_narrow (object.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                            );
 
   TAO_RT_ORB *tao_rt_orb =
     dynamic_cast <TAO_RT_ORB *> (rt_orb.in ());
@@ -587,8 +561,7 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
     tao_rt_orb->tp_manager ();
 
   TAO_Thread_Pool *thread_pool =
-    tp_manager.get_threadpool (thread_pool_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    tp_manager.get_threadpool (thread_pool_id);
 
   if (thread_pool == 0)
     ACE_THROW_RETURN (PortableServer::POA::InvalidPolicy (),
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
index 2f96666c544..4dd3bfd3460 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
@@ -55,7 +55,7 @@ public:
 
   static TAO_Thread_Pool *extract_thread_pool (TAO_ORB_Core &orb_core,
                                                TAO_Policy_Set &policies
-                                               ACE_ENV_ARG_DECL);
+                                              );
 
 protected:
 
@@ -65,11 +65,11 @@ protected:
    * if that is not the case.
    */
   void validate_impl (TAO_Policy_Set &policies
-                      ACE_ENV_ARG_DECL);
+                     );
 
   /// Add/merge policies.
   void merge_policies_impl (TAO_Policy_Set &policies
-                            ACE_ENV_ARG_DECL);
+                           );
 
   /**
    * Return whether the specified policy type is legal for the
@@ -81,13 +81,13 @@ protected:
 
 private:
   void validate_server_protocol (TAO_Policy_Set &policies
-                                 ACE_ENV_ARG_DECL);
+                                );
 
   void validate_priorities (TAO_Policy_Set &policies
-                            ACE_ENV_ARG_DECL);
+                           );
 
   void validate_thread_pool (TAO_Policy_Set &policies
-                             ACE_ENV_ARG_DECL);
+                            );
 
   TAO_Thread_Pool *thread_pool_;
 
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 25b735ea832..9da4313a3fd 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -37,7 +37,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
   CORBA::Short servant_priority,
   TAO_ServerRequest &req,
   TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-  ACE_ENV_ARG_DECL)
+  )
 {
   TAO_Service_Context &request_service_context =
     req.request_service_context ();
@@ -80,8 +80,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
     }
 
   // Remember current thread's priority.
-  TAO_Protocols_Hooks *tph =
-    poa.orb_core ().get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = poa.orb_core ().get_protocols_hooks ();
 
   const char *priority_model = 0;
   RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
@@ -113,11 +112,11 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
                             context->context_data.length ());
           CORBA::Boolean byte_order;
           if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-            ACE_THROW (CORBA::MARSHAL ());
+            throw ::CORBA::MARSHAL ();
           cdr.reset_byte_order (static_cast<int> (byte_order));
 
           if ((cdr >> target_priority) == 0)
-            ACE_THROW (CORBA::MARSHAL ());
+            throw ::CORBA::MARSHAL ();
 
           // Save the target priority in the response service
           // context to propagate back to the client as specified
@@ -165,9 +164,9 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
           if (tph->get_thread_CORBA_and_native_priority (
                 pre_invoke_state.original_CORBA_priority_,
                 pre_invoke_state.original_native_priority_
-                ACE_ENV_ARG_PARAMETER) == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                               CORBA::COMPLETED_NO));
+               ) == -1)
+            throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
+                                               CORBA::COMPLETED_NO);
 
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t): %s processing using %s ")
@@ -200,19 +199,17 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
       if (tph->get_thread_CORBA_and_native_priority (
             pre_invoke_state.original_CORBA_priority_,
             pre_invoke_state.original_native_priority_
-            ACE_ENV_ARG_PARAMETER) == -1)
-        ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                           CORBA::COMPLETED_NO));
+           ) == -1)
+        throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
+                                           CORBA::COMPLETED_NO);
 
       // Priority needs to be changed temporarily changed for the
       // duration of request.
       if (target_priority != pre_invoke_state.original_CORBA_priority_)
         {
-          if (tph->set_thread_CORBA_priority (target_priority
-                                              ACE_ENV_ARG_PARAMETER)
-              == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                               CORBA::COMPLETED_NO));
+          if (tph->set_thread_CORBA_priority (target_priority) == -1)
+            throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
+                                               CORBA::COMPLETED_NO);
 
           pre_invoke_state.state_ =
             TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
@@ -221,7 +218,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
             {
               CORBA::Short native_priority;
               tph->get_thread_native_priority (native_priority
-                                               ACE_ENV_ARG_PARAMETER);
+                                              );
 
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("%s processing using %s ")
@@ -255,14 +252,12 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
   CORBA::Policy_var policy =
     poa.policies ().get_cached_policy (
       TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+     );
 
   CORBA::Boolean set_server_network_priority =
     tph->set_server_network_priority (req.transport ()->tag (),
                                       policy.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                     );
 
   TAO_Connection_Handler *connection_handler =
     req.transport ()->connection_handler ();
@@ -274,7 +269,7 @@ void
 TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa,
                                                           CORBA::Short servant_priority,
                                                           TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                                          ACE_ENV_ARG_DECL)
+                                                          )
 {
   TAO_Thread_Pool *thread_pool =
     static_cast <TAO_Thread_Pool *> (poa.thread_pool ());
@@ -305,25 +300,19 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa,
   //
 
   // Remember current thread's priority.
-  TAO_Protocols_Hooks *tph =
-    poa.orb_core ().get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = poa.orb_core ().get_protocols_hooks ();
 
-  if (tph->get_thread_CORBA_and_native_priority (pre_invoke_state.original_CORBA_priority_,
-                                                 pre_invoke_state.original_native_priority_
-                                                 ACE_ENV_ARG_PARAMETER)
-      == -1)
-    ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                       CORBA::COMPLETED_NO));
+  if (tph->get_thread_CORBA_and_native_priority (
+        pre_invoke_state.original_CORBA_priority_,
+        pre_invoke_state.original_native_priority_) == -1)
+    throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 
   // Change the priority of the current thread for the duration of
   // request.
   if (servant_priority != pre_invoke_state.original_CORBA_priority_)
     {
-      if (tph->set_thread_CORBA_priority (servant_priority
-                                          ACE_ENV_ARG_PARAMETER)
-          == -1)
-        ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                           CORBA::COMPLETED_NO));
+      if (tph->set_thread_CORBA_priority (servant_priority) == -1)
+        throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 
       pre_invoke_state.state_ =
         TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
@@ -341,9 +330,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
       pre_invoke_state.state_ =
         TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::NO_ACTION_REQUIRED;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-
-      ACE_TRY
+      try
         {
           // Reset the priority of the current thread back to its original
           // value.
@@ -351,22 +338,19 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
             poa.orb_core ().get_protocols_hooks ();
 
           if (tph->set_thread_native_priority (
-                 pre_invoke_state.original_native_priority_
-                                               ACE_ENV_ARG_PARAMETER)
+                 pre_invoke_state.original_native_priority_)
               == -1)
-            ACE_THROW (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
-                                               CORBA::COMPLETED_NO));
-          ACE_TRY_CHECK;
+            throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2,
+                                               CORBA::COMPLETED_NO);
         }
-      ACE_CATCHANY
+      catch (const ::CORBA::Exception& ex)
         {
           // Eat up the exception.
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception caught: TAO - "
-                               "Priority_Model_Processing::"
-                               "~Priority_Model_Processing");
+          ex._tao_print_exception (
+            "Exception caught: TAO - "
+            "Priority_Model_Processing::"
+            "~Priority_Model_Processing");
         }
-      ACE_ENDTRY;
     }
 }
 
@@ -378,7 +362,7 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                             TAO_SYNCH_MUTEX &thread_lock,
                                             TAO_ORB_Core &orb_core,
                                             TAO_Object_Adapter *object_adapter
-                                            ACE_ENV_ARG_DECL)
+                                            )
 {
   TAO_RT_POA *poa = 0;
 
@@ -391,9 +375,8 @@ TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
                                 thread_lock,
                                 orb_core,
                                 object_adapter
-                                ACE_ENV_ARG_PARAMETER),
+                               ),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return poa;
 }
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index 2e3af3ce333..5a06ff45afb 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -49,13 +49,13 @@ public:
                                   CORBA::Short servant_priority,
                                   TAO_ServerRequest &req,
                                   TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                  ACE_ENV_ARG_DECL);
+                                 );
 
   /// Pre_invoke collocated request.
   void pre_invoke_collocated_request (TAO_Root_POA &poa,
                                       CORBA::Short servant_priority,
                                       TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
-                                      ACE_ENV_ARG_DECL);
+                                     );
 
   /// Post_invoke request.
   void post_invoke (TAO_Root_POA &poa,
@@ -69,7 +69,7 @@ public:
                                  TAO_SYNCH_MUTEX &thread_lock,
                                  TAO_ORB_Core &orb_core,
                                  TAO_Object_Adapter *object_adapter
-                                 ACE_ENV_ARG_DECL);
+                                );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 08a4c9584f8..151fd8879d0 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -33,8 +33,7 @@ TAO_RTScheduler_Current::~TAO_RTScheduler_Current (void)
 }
 
 void
-TAO_RTScheduler_Current::init (TAO_ORB_Core* orb
-                               ACE_ENV_ARG_DECL)
+TAO_RTScheduler_Current::init (TAO_ORB_Core* orb)
 {
   this->orb_ = orb;
 
@@ -72,8 +71,7 @@ void
 TAO_RTScheduler_Current::begin_scheduling_segment (
     const char * name,
     CORBA::Policy_ptr sched_param,
-    CORBA::Policy_ptr implicit_sched_param
-    ACE_ENV_ARG_DECL)
+    CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -89,7 +87,6 @@ TAO_RTScheduler_Current::begin_scheduling_segment (
                                           TAO::VMCID,
                                           ENOMEM),
                                           CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       this->implementation (impl);
     }
@@ -97,8 +94,7 @@ TAO_RTScheduler_Current::begin_scheduling_segment (
   impl->begin_scheduling_segment (name,
                                   sched_param,
                                   implicit_sched_param
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 );
 }
 
 
@@ -106,25 +102,23 @@ void
 TAO_RTScheduler_Current::update_scheduling_segment (const char * name,
                                                     CORBA::Policy_ptr sched_param,
                                                     CORBA::Policy_ptr implicit_sched_param
-                                                    ACE_ENV_ARG_DECL)
+                                                    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
 
   if (impl == 0)
-    ACE_THROW (CORBA::BAD_INV_ORDER ());
+    throw ::CORBA::BAD_INV_ORDER ();
 
   impl->update_scheduling_segment (name,
                                    sched_param,
                                    implicit_sched_param
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  );
 }
 
 void
-TAO_RTScheduler_Current::end_scheduling_segment (const char * name
-                                                 ACE_ENV_ARG_DECL)
+TAO_RTScheduler_Current::end_scheduling_segment (const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
@@ -133,18 +127,16 @@ TAO_RTScheduler_Current::end_scheduling_segment (const char * name
     {
       ACE_ERROR ((LM_ERROR,
                   "Missing scheduling context OR DT cancelled\n"));
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      throw ::CORBA::BAD_INV_ORDER ();
       return;
     }
 
   impl->end_scheduling_segment (name
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               );
 }
 
 RTScheduling::DistributableThread_ptr
-TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_RTScheduler_Current::lookup(const RTScheduling::Current::IdType & id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::DistributableThread_var DT;
@@ -166,8 +158,7 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
                                 CORBA::Policy_ptr sched_param,
                                 CORBA::Policy_ptr implicit_sched_param,
                                 CORBA::ULong stack_size,
-                                RTCORBA::Priority base_priority
-                                ACE_ENV_ARG_DECL)
+                                RTCORBA::Priority base_priority)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
@@ -182,11 +173,11 @@ TAO_RTScheduler_Current::spawn (RTScheduling::ThreadAction_ptr start,
                       implicit_sched_param,
                       stack_size,
                       base_priority
-                      ACE_ENV_ARG_PARAMETER);
+                     );
 }
 
 RTScheduling::Current::IdType *
-TAO_RTScheduler_Current::id (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current::id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
@@ -194,11 +185,11 @@ TAO_RTScheduler_Current::id (ACE_ENV_SINGLE_ARG_DECL)
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->id ();
 }
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current::scheduling_parameter (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -207,11 +198,11 @@ TAO_RTScheduler_Current::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->scheduling_parameter ();
 }
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current::implicit_scheduling_parameter (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
@@ -219,11 +210,11 @@ TAO_RTScheduler_Current::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->implicit_scheduling_parameter ();
 }
 
 RTScheduling::Current::NameList *
-TAO_RTScheduler_Current::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current::current_scheduling_segment_names (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RTScheduler_Current_i *impl = this->implementation ();
@@ -231,23 +222,21 @@ TAO_RTScheduler_Current::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DE
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return impl->current_scheduling_segment_names ();
 }
 
 RTCORBA::Priority
-TAO_RTScheduler_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current::the_priority (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->rt_current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->rt_current_->the_priority ();
 }
 
 void
-TAO_RTScheduler_Current::the_priority (RTCORBA::Priority the_priority
-                                       ACE_ENV_ARG_DECL)
+TAO_RTScheduler_Current::the_priority (RTCORBA::Priority the_priority)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->rt_current_->the_priority(the_priority
-                                  ACE_ENV_ARG_PARAMETER);
+  this->rt_current_->the_priority(the_priority);
 }
 
 TAO_RTScheduler_Current_i*
@@ -293,8 +282,7 @@ TAO_RTScheduler_Current_i::scheduler (void)
 }
 
 TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
-                                                      DT_Hash_Map* dt_hash
-                                                      ACE_ENV_ARG_DECL)
+                                                      DT_Hash_Map* dt_hash)
   :orb_ (orb),
    dt_ (RTScheduling::DistributableThread::_nil ()),
    previous_current_ (0),
@@ -304,9 +292,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
     this->orb_->object_ref_table ().resolve_initial_reference (
       "RTScheduler");
 
-  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ());
 }
 
 TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
@@ -317,8 +303,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
   CORBA::Policy_ptr sched_param,
   CORBA::Policy_ptr implicit_sched_param,
   RTScheduling::DistributableThread_ptr dt,
-  TAO_RTScheduler_Current_i* prev_current
-  ACE_ENV_ARG_DECL)
+  TAO_RTScheduler_Current_i* prev_current)
   : orb_ (orb),
     guid_ (guid),
     name_ (CORBA::string_dup (name)),
@@ -333,8 +318,7 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
       "RTScheduler");
 
   this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                      );
 }
 
 TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i (void)
@@ -345,8 +329,7 @@ void
 TAO_RTScheduler_Current_i::begin_scheduling_segment(
   const char * name,
   CORBA::Policy_ptr sched_param,
-  CORBA::Policy_ptr implicit_sched_param
-  ACE_ENV_ARG_DECL)
+  CORBA::Policy_ptr implicit_sched_param)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -371,8 +354,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
                                                       name,
                                                       sched_param,
                                                       implicit_sched_param
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                     );
 
       if (CORBA::is_nil (this->dt_.in ()))
         //Create new DT.
@@ -385,8 +367,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
       // Error in binding to the map - cancel thread.
       if (result != 0)
         {
-          this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->cancel_thread ();
         }
 
       // Remember parameters for the scheduling segment.
@@ -400,8 +381,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
       // Check current DT state.
       if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
         {
-          this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->cancel_thread ();
         }
 
       // Inform scheduler of start of nested scheduling segment.
@@ -410,8 +390,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
          name,
          sched_param,
          implicit_sched_param
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        );
 
       TAO_TSS_Resources *tss =
         TAO_TSS_Resources::instance ();
@@ -431,7 +410,6 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
                                           TAO::VMCID,
                                           ENOMEM),
                                           CORBA::COMPLETED_NO));
-        ACE_CHECK;
 
       tss->rtscheduler_current_impl_ = new_current;
     }
@@ -441,15 +419,14 @@ void
 TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name,
                                                       CORBA::Policy_ptr sched_param,
                                                       CORBA::Policy_ptr implicit_sched_param
-                                                      ACE_ENV_ARG_DECL)
+                                                      )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   // Check if DT has been cancelled
   if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
     {
-      this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->cancel_thread ();
     }
 
   // Let scheduler know of the updates.
@@ -457,8 +434,7 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name,
                                                name,
                                                sched_param,
                                                implicit_sched_param
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              );
 
   // Remember the new values.
   this->name_ = CORBA::string_dup (name);
@@ -467,15 +443,13 @@ TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name,
 }
 
 void
-TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name
-                                                   ACE_ENV_ARG_DECL)
+TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if DT has been cancelled
   if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
     {
-      this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->cancel_thread ();
     }
 
   if (this->previous_current_ == 0)
@@ -484,8 +458,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name
       // terminating.
       this->scheduler_->end_scheduling_segment(this->guid_,
                                                name
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                              );
 
       // Cleanup DT.
       this->cleanup_DT ();
@@ -501,8 +474,7 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name
       this->scheduler_->end_nested_scheduling_segment (this->guid_,
                                                        name,
                                                        this->previous_current_->sched_param_
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                      );
 
       // Cleanup current.
       this->cleanup_current ();
@@ -521,14 +493,13 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start,
                                   CORBA::Policy_ptr implicit_sched_param,
                                   CORBA::ULong stack_size,
                                   RTCORBA::Priority base_priority
-                                  ACE_ENV_ARG_DECL)
+                                  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if DT has been cancelled.
   if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED)
     {
-      this->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->cancel_thread ();
     }
 
   // Create new task for new DT.
@@ -576,7 +547,7 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start,
 int
 DTTask::activate_task (RTCORBA::Priority base_priority,
                        CORBA::ULong stack_size
-                       ACE_ENV_ARG_DECL)
+                       )
 {
   // Activate thread.
   long default_flags = THR_NEW_LWP | THR_JOINABLE;
@@ -591,8 +562,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority,
 
   RTCORBA::PriorityMappingManager_var mapping_manager =
     RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                             );
 
   RTCORBA::PriorityMapping *pm =
     mapping_manager->mapping ();
@@ -622,8 +592,7 @@ DTTask::activate_task (RTCORBA::Priority base_priority,
   return 0;
 }
 
-DTTask::DTTask (//ACE_Thread_Manager *manager,
-                TAO_ORB_Core *orb,
+DTTask::DTTask (TAO_ORB_Core *orb,
                 DT_Hash_Map *dt_hash,
                 TAO_RTScheduler_Current_i* new_current,
                 RTScheduling::ThreadAction_ptr start,
@@ -631,8 +600,7 @@ DTTask::DTTask (//ACE_Thread_Manager *manager,
                 const char *name,
                 CORBA::Policy_ptr sched_param,
                 CORBA::Policy_ptr implicit_sched_param)
-  ://manager_ (manager),
-   orb_ (orb),
+  :orb_ (orb),
    dt_hash_ (dt_hash),
    current_ (new_current),
    start_ (RTScheduling::ThreadAction::_duplicate (start)),
@@ -651,7 +619,7 @@ DTTask::~DTTask (void)
 int
 DTTask::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       TAO_TSS_Resources *tss =
@@ -662,31 +630,26 @@ DTTask::svc (void)
       this->current_->begin_scheduling_segment (this->name_.in (),
                                                 this->sched_param_.in (),
                                                 this->implicit_sched_param_.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               );
 
       // Invoke entry point into new DT.
       this->start_->_cxx_do (this->data_
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            );
 
       this->current_->end_scheduling_segment (this->name_.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 RTScheduling::Current::IdType *
-TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RTScheduler_Current_i::id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -696,21 +659,21 @@ TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current_i::scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RTScheduler_Current_i::scheduling_parameter (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Policy::_duplicate (this->sched_param_);
 }
 
 CORBA::Policy_ptr
-TAO_RTScheduler_Current_i::implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RTScheduler_Current_i::implicit_scheduling_parameter (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Policy::_duplicate (this->implicit_sched_param_);
 }
 
 RTScheduling::Current::NameList *
-TAO_RTScheduler_Current_i::current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RTScheduler_Current_i::current_scheduling_segment_names (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTScheduling::Current::NameList* name_list;
@@ -741,7 +704,7 @@ TAO_RTScheduler_Current_i::name (void)
 #endif /* THREAD_CANCELLED */
 
 void
-TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
+TAO_RTScheduler_Current_i::cancel_thread (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   size_t guid;
@@ -756,8 +719,7 @@ TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
   // Let the scheduler know that the thread has
   // been cancelled.
   this->scheduler_->cancel (this->guid_
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           );
 
   this->cleanup_DT ();
 
@@ -765,7 +727,7 @@ TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
   this->delete_all_currents ();
 
   // Throw exception.
-  ACE_THROW (CORBA::THREAD_CANCELLED ());
+  throw ::CORBA::THREAD_CANCELLED ();
 }
 
 void
@@ -953,10 +915,10 @@ TAO_RTScheduler_Current_var::nil (void)
 TAO_RTScheduler_Current_ptr
 TAO_RTScheduler_Current_var::narrow (
     CORBA::Object *p
-    ACE_ENV_ARG_DECL
+
   )
 {
-  return ::TAO_RTScheduler_Current::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::TAO_RTScheduler_Current::_narrow (p);
 }
 
 CORBA::Object *
@@ -969,7 +931,7 @@ TAO_RTScheduler_Current_var::upcast (void *src)
 
 TAO_RTScheduler_Current_ptr TAO_RTScheduler_Current::_narrow (
     CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
+
   )
 {
   return
diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h
index 0189511e16f..0cdc365d86c 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -85,14 +85,12 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
   TAO_RTScheduler_Current (void);
   virtual ~TAO_RTScheduler_Current (void);
 
-  void init (TAO_ORB_Core* orb
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void init (TAO_ORB_Core* orb);
 
-  virtual RTCORBA::Priority the_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual RTCORBA::Priority the_priority (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void the_priority (RTCORBA::Priority the_priority
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void the_priority (RTCORBA::Priority the_priority)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void rt_current (RTCORBA::Current_ptr rt_current);
@@ -100,27 +98,22 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
   virtual void begin_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param
-     ACE_ENV_ARG_DECL)
+     CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param
-     ACE_ENV_ARG_DECL)
+     CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
-  virtual void end_scheduling_segment
-    (const char * name
-     ACE_ENV_ARG_DECL)
+  virtual void end_scheduling_segment (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RTScheduling::DistributableThread_ptr
-    lookup(const RTScheduling::Current::IdType & id
-           ACE_ENV_ARG_DECL_NOT_USED)
+    lookup(const RTScheduling::Current::IdType & id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // returns a null reference if
@@ -134,24 +127,20 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
            CORBA::Policy_ptr sched_param,
            CORBA::Policy_ptr implicit_sched_param,
            CORBA::ULong stack_size,
-           RTCORBA::Priority base_priority
-           ACE_ENV_ARG_DECL)
+           RTCORBA::Priority base_priority)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual ::RTScheduling::Current::IdType *
-    id (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::RTScheduling::Current::IdType *id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual ::CORBA::Policy_ptr
-    scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CORBA::Policy_ptr scheduling_parameter (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual ::CORBA::Policy_ptr
-    implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL)
+  virtual ::CORBA::Policy_ptr implicit_scheduling_parameter (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::RTScheduling::Current::NameList *
-    current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL)
+    current_scheduling_segment_names (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   TAO_RTScheduler_Current_i* implementation (void);
@@ -173,7 +162,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current
 
   static TAO_RTScheduler_Current_ptr _narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
 
   static TAO_RTScheduler_Current_ptr _nil (void)
@@ -226,7 +215,7 @@ public:
   static TAO_RTScheduler_Current_ptr nil (void);
   static TAO_RTScheduler_Current_ptr narrow (
       CORBA::Object *
-      ACE_ENV_ARG_DECL_NOT_USED
+
     );
   static CORBA::Object * upcast (void *);
 
@@ -245,8 +234,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
  public:
 
   TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
-                             DT_Hash_Map* dt_hash
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                             DT_Hash_Map* dt_hash);
 
   TAO_RTScheduler_Current_i (TAO_ORB_Core* orb,
                              DT_Hash_Map* dt_hash,
@@ -255,8 +243,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
                              CORBA::Policy_ptr sched_param,
                              CORBA::Policy_ptr implicit_sched_param,
                              RTScheduling::DistributableThread_ptr dt,
-                             TAO_RTScheduler_Current_i* prev_current
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                             TAO_RTScheduler_Current_i* prev_current);
 
   virtual ~TAO_RTScheduler_Current_i (void);
 
@@ -267,56 +254,47 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
            CORBA::Policy_ptr sched_param,
            CORBA::Policy_ptr implicit_sched_param,
            CORBA::ULong stack_size,
-           RTCORBA::Priority base_priority
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+           RTCORBA::Priority base_priority)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void begin_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param
-     ACE_ENV_ARG_DECL)
+     CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment
     (const char * name,
      CORBA::Policy_ptr sched_param,
-     CORBA::Policy_ptr implicit_sched_param
-     ACE_ENV_ARG_DECL)
+     CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
-  virtual void end_scheduling_segment
-    (const char * name
-     ACE_ENV_ARG_DECL)
+  virtual void end_scheduling_segment (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual RTScheduling::Current::IdType *
-    id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual RTScheduling::Current::IdType *id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-  void  id (RTScheduling::Current::IdType guid );
+  void id (RTScheduling::Current::IdType guid);
 
-  virtual CORBA::Policy_ptr
-    scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Policy_ptr scheduling_parameter (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr
-    implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Policy_ptr implicit_scheduling_parameter (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-
   void scheduling_parameter (CORBA::Policy_ptr);
 
   void implicit_scheduling_parameter (CORBA::Policy_ptr);
 
   virtual RTScheduling::Current::NameList *
-    current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    current_scheduling_segment_names (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
+  void cancel_thread (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void cleanup_DT (void);
@@ -353,8 +331,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
 class DTTask : public ACE_Task <ACE_SYNCH>
 {
 public:
-  DTTask (//ACE_Thread_Manager manager,
-          TAO_ORB_Core* orb,
+  DTTask (TAO_ORB_Core* orb,
           DT_Hash_Map* dt_hash,
           TAO_RTScheduler_Current_i*,
           RTScheduling::ThreadAction_ptr start,
@@ -366,13 +343,11 @@ public:
   virtual ~DTTask (void);
 
   int activate_task (RTCORBA::Priority base_priority,
-                     CORBA::ULong stack_size
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     CORBA::ULong stack_size);
 
   virtual int svc (void);
 
  private:
-  //ACE_Thread_Manager* manager_;
   TAO_ORB_Core* orb_;
   DT_Hash_Map* dt_hash_;
   TAO_RTScheduler_Current_i* current_;
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp
index 87c9e02a245..db091728591 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.cpp
+++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp
@@ -15,14 +15,14 @@ TAO_DistributableThread::~TAO_DistributableThread (void)
 }
 
 void
-TAO_DistributableThread::cancel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_DistributableThread::cancel (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->state_ = RTScheduling::DistributableThread::CANCELLED;
 }
 
 RTScheduling::DistributableThread::DT_State
-TAO_DistributableThread::state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_DistributableThread::state (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->state_;
@@ -31,7 +31,6 @@ TAO_DistributableThread::state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 RTScheduling::DistributableThread_ptr
 TAO_DistributableThread_Factory::create_DT (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   TAO_DistributableThread* DT = 0;
 
   ACE_NEW_THROW_EX (DT,
@@ -41,11 +40,6 @@ TAO_DistributableThread_Factory::create_DT (void)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  //RTScheduling::DistributableThread_var dt = RTScheduling::DistributableThread::_narrow (DT
-  //                                                                             ACE_ENV_ARG_PARAMETER);
-  //ACE_CHECK;
 
   return DT;
 }
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h
index 281eb6984cf..8fc2dca562a 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.h
+++ b/TAO/tao/RTScheduling/Distributable_Thread.h
@@ -15,18 +15,16 @@ class TAO_RTScheduler_Export TAO_DistributableThread:
   public TAO_Local_RefCounted_Object
 {
  public:
-  
   TAO_DistributableThread (void);
 
   ~TAO_DistributableThread (void);
 
-  virtual void cancel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void cancel (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-   
-  virtual RTScheduling::DistributableThread::DT_State state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual RTScheduling::DistributableThread::DT_State state (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
  private:
   RTScheduling::DistributableThread::DT_State state_;
 };
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index 574b964f843..b88594c4c84 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -24,8 +24,7 @@ static TAO_RTScheduler_Current_var current_cleanup;
 
 void
  TAO_RTScheduler_ORB_Initializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //
@@ -42,8 +41,7 @@ void
                 "In pre_init\n"));
 
   TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                          );
 
   if (CORBA::is_nil (tao_info.in ()))
     {
@@ -54,7 +52,7 @@ void
                     "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
                     "(%P|%t)   \"TAO_ORBInitInfo *.\"\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
 
@@ -65,22 +63,18 @@ void
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   current_cleanup = this->current_;
 
   this->current_->init (tao_info->orb_core ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                       );
 
   CORBA::Object_var current_obj = RTScheduling::Current::_narrow (this->current_
-                                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                                 );
 
   info->register_initial_reference ("RTScheduler_Current",
                                     current_obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 
   Client_Interceptor *client_interceptor = 0;
   ACE_NEW_THROW_EX (client_interceptor,
@@ -90,14 +84,12 @@ void
                         TAO::VMCID,
                         ENOMEM),
                         CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var safe_client =
     client_interceptor;
 
   info->add_client_request_interceptor (client_interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                       );
 
   Server_Interceptor *server_interceptor = 0;
   ACE_NEW_THROW_EX (server_interceptor,
@@ -107,14 +99,12 @@ void
                         TAO::VMCID,
                         ENOMEM),
                         CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var safe_server =
     server_interceptor;
 
   info->add_server_request_interceptor (server_interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                       );
 
   // Set the RTScheduler_Manager
   TAO_RTScheduler_Manager *manager = 0;
@@ -126,20 +116,17 @@ void
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
 
   TAO_RTScheduler_Manager_var safe_manager = manager;
 
   info->register_initial_reference ("RTSchedulerManager",
                                     manager
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   );
 }
 
 void
-TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
-                                            ACE_ENV_ARG_DECL)
+TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -148,28 +135,25 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
   //TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-  //                                                           ACE_ENV_ARG_PARAMETER);
-  //ACE_CHECK;
+  //                                                          );
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "In post_init\n"));
 
   CORBA::Object_var rt_current_obj = info->resolve_initial_references ("RTCurrent"
-                                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                                      );
 
 
   RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (rt_current_obj.in ()
-                                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                              );
 
   if (CORBA::is_nil (rt_current.in ()))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) ::post_init \n"
                   "(%P|%t) Unable to narrow to RTCORBA::Current\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
   this->current_->rt_current (rt_current.in ());
diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
index 8b242f9af9e..09bf03a1c91 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h
@@ -43,12 +43,10 @@ class TAO_RTScheduler_ORB_Initializer
   , public virtual TAO_Local_RefCounted_Object
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index bc4f99432bb..f30e2dfa964 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -36,7 +36,7 @@ TAO_RTScheduler_Loader::init (int,
   initialized = 1;
 
   // Register the ORB initializer.
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -49,22 +49,19 @@ TAO_RTScheduler_Loader::init (int,
                           TAO::VMCID,
                           ENOMEM),
 					  CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught while initializing the RTScheduler:");
+      ex._tao_print_exception (
+        "Unexpected exception caught while initializing the RTScheduler:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
index 79e85a12dd4..773ab9cdc02 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
@@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void)
 {
- 
+
 }
 
 TAO_RTScheduler_Manager::~TAO_RTScheduler_Manager (void)
@@ -20,10 +20,9 @@ TAO_RTScheduler_Manager::~TAO_RTScheduler_Manager (void)
 }
 
 TAO_RTScheduler_Manager_ptr
-TAO_RTScheduler_Manager::_narrow (CORBA::Object_ptr obj
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_RTScheduler_Manager::_narrow (CORBA::Object_ptr obj)
 {
-  return 
+  return
     TAO_RTScheduler_Manager::_duplicate (
         dynamic_cast<TAO_RTScheduler_Manager *> (obj)
       );
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h
index be6d4637d0d..b4981756215 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -36,15 +36,13 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Manager :
 {
 public:
 
-        TAO_RTScheduler_Manager (void);
+  TAO_RTScheduler_Manager (void);
+
   /// Constructor.
   TAO_RTScheduler_Manager (TAO_ORB_Core*);
 
-  ///
-  void rtscheduler (RTScheduling::Scheduler_ptr rtscheduler
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  void rtscheduler (RTScheduling::Scheduler_ptr rtscheduler);
 
-  ///
   RTScheduling::Scheduler_ptr rtscheduler (void);
 
 public:
@@ -55,7 +53,7 @@ public:
   static TAO_RTScheduler_Manager_ptr _duplicate (TAO_RTScheduler_Manager_ptr obj);
   static TAO_RTScheduler_Manager_ptr _narrow (
       CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      );
 
   static TAO_RTScheduler_Manager_ptr _nil (void)
     {
@@ -107,7 +105,7 @@ public:
   static TAO_RTScheduler_Manager_ptr duplicate (TAO_RTScheduler_Manager_ptr);
   static void release (TAO_RTScheduler_Manager_ptr);
   static TAO_RTScheduler_Manager_ptr nil (void);
-  static TAO_RTScheduler_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
+  static TAO_RTScheduler_Manager_ptr narrow (CORBA::Object * );
   static CORBA::Object * upcast (void *);
 
 private:
diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
index da473a28e64..cb2b4924159 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl
@@ -129,9 +129,9 @@ TAO_RTScheduler_Manager_var::nil (void)
 ACE_INLINE ::TAO_RTScheduler_Manager_ptr
 TAO_RTScheduler_Manager_var::narrow (
   CORBA::Object * p
-  ACE_ENV_ARG_DECL)
+  )
 {
-  return ::TAO_RTScheduler_Manager::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ::TAO_RTScheduler_Manager::_narrow (p);
 }
 
 ACE_INLINE CORBA::Object *
@@ -221,14 +221,13 @@ TAO_RTScheduler_Manager::rtscheduler (void)
 
 ACE_INLINE void
 TAO_RTScheduler_Manager::rtscheduler (RTScheduling::Scheduler_ptr rtscheduler
-                                      ACE_ENV_ARG_DECL)
+                                      )
 {
   this->rtscheduler_ = RTScheduling::Scheduler::_duplicate (rtscheduler);
   this->orb_->orb ()->register_initial_reference (
     "RTScheduler",
     RTScheduling::Scheduler::_duplicate (this->rtscheduler_.in ())
-    ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+   );
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index d0a8fc4c313..c499d30905f 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -22,8 +22,7 @@ const IOP::ServiceId
 Client_Interceptor::SchedulingInfo = 30;
 
 void
-Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL)
+Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -75,7 +74,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
             {
               ACE_DEBUG ((LM_DEBUG,
                           "No Scheduling Segment Context\n"));
-              ACE_THROW (CORBA::INTERNAL ());
+              throw ::CORBA::INTERNAL ();
 
             }
 
@@ -90,7 +89,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
                                               current->dt_hash (),
                                               guid,
                                               0,
-                                              current->implicit_scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER),
+                                              current->implicit_scheduling_parameter (),
                                               0,
                                               dt.in (),
                                               current));
@@ -119,8 +118,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 void
-Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_NOT_USED)
+Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -140,8 +138,7 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 void
-Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -161,8 +158,7 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 void
-Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                       ACE_ENV_ARG_DECL)
+Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -187,8 +183,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
         }
 
       CORBA::Any_var ex =
-        ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->received_exception ();
       CORBA::TypeCode_var type = ex->type ();
 
       if (CORBA::is_nil (type.in ()))
@@ -197,8 +192,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
                       "type = 0 \n"));
           return;
         }
-      const char * id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      const char * id = type->id ();
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -213,8 +207,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
         {
           // Perform the necessary cleanup as the
           // thread was cancelled.
-          current->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          current->cancel_thread ();
         }
       else
         {
@@ -227,8 +220,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
 }
 
 void
-Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -249,14 +241,14 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 }
 
 char*
-Client_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return  CORBA::string_dup ("RTSchdeuler_Client_Interceptor");
 }
 
 void
-Client_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -270,8 +262,8 @@ Server_Interceptor::Server_Interceptor (TAO_RTScheduler_Current_ptr current)
 }
 
 void
-Server_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr
-                                                      ACE_ENV_ARG_DECL_NOT_USED)
+Server_Interceptor::receive_request_service_contexts (
+  PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -283,7 +275,7 @@ Server_Interceptor::receive_request_service_contexts (PortableInterceptor::Serve
 
 void
 Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                     ACE_ENV_ARG_DECL)
+                                     )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -293,22 +285,19 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
 
   IOP::ServiceContext_var serv_cxt;
 
-  ACE_TRY
+  try
     {
       serv_cxt =
         ri->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        );
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "Invalid Service Request\n"));
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -328,7 +317,6 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
                              TAO::VMCID,
                              ENOMEM),
                            CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   // Scheduler retrieves scheduling parameters
   // from request and populates the out
@@ -371,7 +359,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
 
   if (result != 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      throw ::CORBA::INTERNAL ();
     }
 
   // Create new temporary current. Note that the new <sched_param> is
@@ -392,7 +380,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
 
 void
 Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL)
+                                )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -410,8 +398,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
       if (current->DT ()->state () == RTScheduling::DistributableThread::CANCELLED)
         {
-          current->cancel_thread (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          current->cancel_thread ();
 
           return;
         }
@@ -421,8 +408,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
       // Inform scheduler that upcall is complete.
       RTScheduling::Scheduler_var scheduler = current->scheduler ();
-      scheduler->send_reply (ri ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      scheduler->send_reply (ri);
 
       current->cleanup_DT ();
       current->cleanup_current ();
@@ -443,7 +429,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
 void
 Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -469,7 +455,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
 
 void
 Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -494,14 +480,14 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
 }
 
 char*
-Server_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     return  CORBA::string_dup ("RTSchdeuler_Server_Interceptor");
 }
 
 void
-Server_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h
index 1a8c74a389a..194a03cccdc 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -26,32 +26,30 @@ public:
 
   //  Client_Interceptor (RTScheduling::Current_ptr current);
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                             )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual char* name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static const IOP::ServiceId SchedulingInfo;
@@ -66,34 +64,29 @@ class TAO_RTScheduler_Export Server_Interceptor :
 public:
   Server_Interceptor (TAO_RTScheduler_Current_ptr current);
 
-  virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual char* name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static const IOP::ServiceId SchedulingInfo;
diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h
index e7b7fc530cd..62af6e4cbde 100644
--- a/TAO/tao/RTScheduling/ThreadAction.h
+++ b/TAO/tao/RTScheduling/ThreadAction.h
@@ -12,14 +12,14 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class TAO_RTScheduler_Export TAO_ThreadAction: 
+class TAO_RTScheduler_Export TAO_ThreadAction:
 public RTScheduling::ThreadAction,
   public TAO_Local_RefCounted_Object
 {
  public:
-  
+
   virtual void do (CORBA::VoidData data
-		   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+       )
       ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp
index 17a9d2d642a..707c9ca9c4f 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -57,14 +57,12 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev,
                   ACE_TEXT ("connection completion - wait ()\n")));
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       while (ev->keep_waiting ())
         {
           result =
-            this->orb_core_->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_core_->run (max_wait_time, 1);
 
           // Did we timeout? If so, stop running the loop.
           if (result == 0 &&
@@ -81,11 +79,10 @@ TAO_Reactive_Connect_Strategy::wait_i (TAO_LF_Event *ev,
             break;
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       result = -1;
     }
-  ACE_ENDTRY;
 
   // Set the result.
   if (result != -1 && ev->error_detected ())
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
index 085779f99ed..167e74e8b8a 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -33,22 +33,19 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport,
   int result = 0;
 
   // @@ Should we pass this down?  Can we?
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_ORB_Core * const orb_core = transport->orb_core ();
 
       while (!msg->all_data_sent () && result >= 0)
         {
-          result = orb_core->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          result = orb_core->run (max_wait_time, 1);
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
@@ -57,25 +54,22 @@ int
 TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport)
 {
   // @@ Should we pass this down?  Can we?
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_ORB_Core * const orb_core = transport->orb_core ();
 
       while (!transport->queue_is_empty ())
         {
-          int const result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int const result = orb_core->run (0, 1);
 
           if (result == -1)
             return -1;
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp
index 417722db92b..10c0805d385 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -35,8 +35,7 @@ namespace TAO
   }
 
   void
-  Remote_Invocation::init_target_spec (TAO_Target_Specification &target_spec
-                                       ACE_ENV_ARG_DECL)
+  Remote_Invocation::init_target_spec (TAO_Target_Specification &target_spec)
   {
     /**
      * Mega hack for RTCORBA start. I don't think that
@@ -46,9 +45,7 @@ namespace TAO
     this->resolver_.stub ()->orb_core ()->service_context_list (
       this->resolver_.stub (),
       this->details_.request_service_context (),
-      0
-      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      0);
     /**
      * Mega hack for RTCORBA END
      */
@@ -66,10 +63,10 @@ namespace TAO
           IOP::TaggedProfile *tp =
             pfile->create_tagged_profile ();
 
-        if (tp)
-          {
-            target_spec.target_specifier (*tp);
-          }
+          if (tp)
+            {
+              target_spec.target_specifier (*tp);
+            }
         }
         break;
 
@@ -80,10 +77,7 @@ namespace TAO
       CORBA::ULong index = 0;
       IOP::IOR *ior_info = 0;
       int const retval =
-        this->resolver_.stub ()->create_ior_info (ior_info,
-                                                  index
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->resolver_.stub ()->create_ior_info (ior_info, index);
 
       if (retval == -1)
         {
@@ -99,8 +93,7 @@ namespace TAO
           return;
         }
 
-      target_spec.target_specifier (*ior_info,
-                                    index);
+      target_spec.target_specifier (*ior_info, index);
       break;
     }
 
@@ -110,10 +103,9 @@ namespace TAO
   void
   Remote_Invocation::write_header (TAO_Target_Specification &spec,
                                    TAO_OutputCDR &out_stream
-                                   ACE_ENV_ARG_DECL)
+                                   )
   {
-    this->resolver_.transport ()->clear_translators (0,
-                                                     &out_stream);
+    this->resolver_.transport ()->clear_translators (0, &out_stream);
 
     // Send the request for the header
     if (this->resolver_.transport ()->generate_request_header (this->details_,
@@ -121,39 +113,32 @@ namespace TAO
                                                                out_stream)
         == -1)
       {
-        ACE_THROW (CORBA::MARSHAL ());
+        throw ::CORBA::MARSHAL ();
       }
 
-    this->resolver_.transport ()->assign_translators (0,
-                                                      &out_stream);
+    this->resolver_.transport ()->assign_translators (0, &out_stream);
   }
 
   void
-  Remote_Invocation::marshal_data (TAO_OutputCDR &out_stream
-                                   ACE_ENV_ARG_DECL)
+  Remote_Invocation::marshal_data (TAO_OutputCDR &out_stream)
   {
     if (this->details_.marshal_args (out_stream) == false)
       {
-        ACE_THROW (CORBA::MARSHAL ());
+        throw ::CORBA::MARSHAL ();
       }
-
-    return;
   }
 
   Invocation_Status
   Remote_Invocation::send_message (TAO_OutputCDR &cdr,
                                    short message_semantics,
-                                   ACE_Time_Value *max_wait_time
-                                   ACE_ENV_ARG_DECL)
+                                   ACE_Time_Value *max_wait_time)
   {
     TAO_Protocols_Hooks *tph =
       this->resolver_.stub ()->orb_core ()->get_protocols_hooks ();
 
-    CORBA::Boolean set_client_network_priority =
+    CORBA::Boolean const set_client_network_priority =
       tph->set_client_network_priority (this->resolver_.transport ()->tag (),
-                                        this->resolver_.stub ()
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                                        this->resolver_.stub ());
 
     TAO_Connection_Handler *connection_handler =
       this->resolver_.transport ()->connection_handler ();
diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h
index 9bb187a3ea8..066cb23f624 100644
--- a/TAO/tao/Remote_Invocation.h
+++ b/TAO/tao/Remote_Invocation.h
@@ -29,11 +29,6 @@ class TAO_Operation_Details;
 class TAO_Target_Specification;
 class TAO_OutputCDR;
 
-namespace CORBA
-{
-  class Environment;
-}
-
 namespace TAO
 {
   class Profile_Transport_Resolver;
@@ -71,23 +66,19 @@ namespace TAO
   protected:
 
     /// Initialize the @a spec.
-    void init_target_spec (TAO_Target_Specification &spec
-                           ACE_ENV_ARG_DECL);
+    void init_target_spec (TAO_Target_Specification &spec);
 
     /// Write the GIOP header into the stream.
     void write_header (TAO_Target_Specification &spec,
-                       TAO_OutputCDR &out_stream
-                       ACE_ENV_ARG_DECL);
+                       TAO_OutputCDR &out_stream);
 
     /// Marshal the arguments into the stream.
-    void marshal_data (TAO_OutputCDR &cdr
-                       ACE_ENV_ARG_DECL);
+    void marshal_data (TAO_OutputCDR &cdr);
 
     /// Write the message onto the socket
     Invocation_Status send_message (TAO_OutputCDR &cdr,
                                     short message_semantics,
-                                    ACE_Time_Value *max_wait_time
-                                    ACE_ENV_ARG_DECL);
+                                    ACE_Time_Value *max_wait_time);
 
   protected:
     /// Our resolver
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index fd4bc75cde0..38593b6d754 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -20,8 +20,7 @@ namespace TAO
 {
   CORBA::Boolean
   Remote_Object_Proxy_Broker::_is_a (CORBA::Object_ptr target,
-                                     const char *type_id
-                                     ACE_ENV_ARG_DECL)
+                                     const char *type_id)
   {
     TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
     TAO::Arg_Traits<char *>::in_arg_val _tao_id (type_id);
@@ -39,8 +38,7 @@ namespace TAO
                                       5,
                                       0);
 
-    tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval.excp ());
+    tao_call.invoke (0, 0);
 
     return _tao_retval.retn ();
   }
@@ -48,8 +46,7 @@ namespace TAO
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   CORBA::Boolean
-  Remote_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target
-                                             ACE_ENV_ARG_DECL)
+  Remote_Object_Proxy_Broker::_non_existent (CORBA::Object_ptr target)
   {
     TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
 
@@ -65,15 +62,13 @@ namespace TAO
                                        13,
                                        0);
 
-    _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval.excp ());
+    _tao_call.invoke (0, 0);
 
     return _tao_retval.retn ();
   }
 
   CORBA::Object_ptr
-  Remote_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target
-                                              ACE_ENV_ARG_DECL)
+  Remote_Object_Proxy_Broker::_get_component (CORBA::Object_ptr target)
   {
     TAO::Arg_Traits<CORBA::Object>::ret_val _tao_retval;
 
@@ -89,15 +84,13 @@ namespace TAO
                                        10,
                                        0);
 
-    _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval.excp ());
+    _tao_call.invoke (0, 0);
 
     return _tao_retval.retn ();
   }
 
   CORBA::InterfaceDef_ptr
-  Remote_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target
-                                              ACE_ENV_ARG_DECL)
+  Remote_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target)
   {
     TAO_IFR_Client_Adapter *adapter =
       ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -110,13 +103,11 @@ namespace TAO
                         0);
     }
 
-  return adapter->get_interface_remote (target
-                                        ACE_ENV_ARG_PARAMETER);
+  return adapter->get_interface_remote (target);
   }
 
   char *
-  Remote_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target
-                                              ACE_ENV_ARG_DECL)
+  Remote_Object_Proxy_Broker::_repository_id (CORBA::Object_ptr target)
   {
     TAO::Arg_Traits< ::CORBA::Char *>::ret_val _tao_retval;
 
@@ -132,8 +123,7 @@ namespace TAO
                                        14,
                                        0);
 
-    _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (_tao_retval.excp ());
+    _tao_call.invoke (0, 0);
 
     return _tao_retval.retn ();
   }
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h
index eab7f29e5b7..d6488b41289 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ b/TAO/tao/Remote_Object_Proxy_Broker.h
@@ -46,24 +46,17 @@ namespace TAO
     /// details.
 
     virtual CORBA::Boolean _is_a (CORBA::Object_ptr target,
-                                  const char *logical_type_id
-                                  ACE_ENV_ARG_DECL);
+                                  const char *logical_type_id);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target
-                                        ACE_ENV_ARG_DECL);
+  virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target);
 
-  virtual CORBA::InterfaceDef * _get_interface (
-      CORBA::Object_ptr target
-      ACE_ENV_ARG_DECL
-    );
+  virtual CORBA::InterfaceDef * _get_interface (CORBA::Object_ptr target);
 
-  virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target
-                                            ACE_ENV_ARG_DECL);
+  virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target);
 
-  virtual char * _repository_id (CORBA::Object_ptr target
-                                 ACE_ENV_ARG_DECL);
+  virtual char * _repository_id (CORBA::Object_ptr target);
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
   };
diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp
index 3663d1ee49e..3b6cc4b02b4 100644
--- a/TAO/tao/Request_Dispatcher.cpp
+++ b/TAO/tao/Request_Dispatcher.cpp
@@ -4,8 +4,8 @@
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (tao, 
-           Request_Dispatcher, 
+ACE_RCSID (tao,
+           Request_Dispatcher,
            "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -17,15 +17,12 @@ TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void)
 void
 TAO_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
                                   TAO_ServerRequest &request,
-                                  CORBA::Object_out forward_to
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Object_out forward_to)
 {
   // Dispatch based on object key
   orb_core->adapter_registry ()->dispatch (request.object_key (),
                                            request,
-                                           forward_to
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                           forward_to);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
index ce097986e58..e70b0f2f81a 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -57,8 +57,7 @@ public:
    */
   virtual void dispatch (TAO_ORB_Core *orb_core,
                          TAO_ServerRequest &request,
-                         CORBA::Object_out forward_to
-                         ACE_ENV_ARG_DECL);
+                         CORBA::Object_out forward_to);
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index 49c90159837..d429a356686 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -82,8 +82,7 @@ namespace TAO
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions,
-        CORBA::OctetSeq_out oc
-        ACE_ENV_ARG_DECL) = 0;
+        CORBA::OctetSeq_out oc) = 0;
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
     /// This method implements the "intermediate" server side
@@ -99,8 +98,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL) = 0;
+        CORBA::ULong nexceptions) = 0;
 
     /// This method an "intermediate" server side interception point.
     virtual void receive_request (
@@ -109,8 +107,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL) = 0;
+        CORBA::ULong nexceptions) = 0;
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -120,8 +117,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL) = 0;
+        CORBA::ULong nexceptions) = 0;
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -131,8 +127,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL) = 0;
+        CORBA::ULong nexceptions) = 0;
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -142,22 +137,20 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-        ACE_ENV_ARG_DECL) = 0;
+        CORBA::ULong nexceptions) = 0;
     //@}
 
     /// Register an interceptor.
     virtual void add_interceptor (
-      PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      ACE_ENV_ARG_DECL) = 0;
+      PortableInterceptor::ServerRequestInterceptor_ptr interceptor) = 0;
 
     /// Register an interceptor with policies.
     virtual void add_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
       const CORBA::PolicyList& policies
-      ACE_ENV_ARG_DECL) = 0;
+      ) = 0;
 
-    virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0;
+    virtual void destroy_interceptors (void) = 0;
 
     virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0;
 
@@ -167,7 +160,7 @@ namespace TAO
     virtual void execute_command (
         TAO_ServerRequest &server_request,
         TAO::Upcall_Command &command
-        ACE_ENV_ARG_DECL) = 0;
+        ) = 0;
   };
 }
 
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index 53a12caf6e0..ab3ad6e9882 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -1,7 +1,6 @@
 #include "tao/Service_Callbacks.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
-#include "tao/Environment.h"
 #include "tao/Invocation_Utils.h"
 
 ACE_RCSID (tao,
@@ -56,8 +55,7 @@ TAO_Service_Callbacks::is_permanent_forward_condition (const CORBA::Object_ptr,
 TAO::Invocation_Status
 TAO_Service_Callbacks::raise_comm_failure (
     IOP::ServiceContextList &,
-    TAO_Profile * /*profile*/
-    ACE_ENV_ARG_DECL)
+    TAO_Profile * /*profile*/)
 {
   ACE_THROW_RETURN (CORBA::COMM_FAILURE (
       CORBA::SystemException::_tao_minor_code (
@@ -70,8 +68,7 @@ TAO_Service_Callbacks::raise_comm_failure (
 TAO::Invocation_Status
 TAO_Service_Callbacks::raise_transient_failure (
     IOP::ServiceContextList &,
-    TAO_Profile * /*profile*/
-    ACE_ENV_ARG_DECL)
+    TAO_Profile * /*profile*/ )
 {
   ACE_THROW_RETURN (CORBA::TRANSIENT (
       CORBA::SystemException::_tao_minor_code (
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index 1c9e89ff0a3..c4a865fb9f2 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -40,8 +40,6 @@ namespace CORBA
 {
   class Object;
   typedef Object *Object_ptr;
-
-  class Environment;
 }
 
 namespace IOP
@@ -103,14 +101,14 @@ public:
   virtual TAO::Invocation_Status raise_comm_failure (
       IOP::ServiceContextList &clist,
       TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
+     );
 
   /// Allow the service layer to decide whether the TRANSIENT
   /// exception should be thrown or a reinvocation is needed
   virtual TAO::Invocation_Status raise_transient_failure (
       IOP::ServiceContextList &clist,
       TAO_Profile *profile
-      ACE_ENV_ARG_DECL);
+     );
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
index 78cc30595b6..a3b21b71162 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -17,8 +17,7 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
-TAO_Service_Context::set_context_i (IOP::ServiceId id,
-                                    TAO_OutputCDR &cdr)
+TAO_Service_Context::set_context_i (IOP::ServiceId id, TAO_OutputCDR &cdr)
 {
   IOP::ServiceContext context;
   context.context_id = id;
diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h
index 9a379d726f4..0f9b90e458a 100644
--- a/TAO/tao/Service_Context.h
+++ b/TAO/tao/Service_Context.h
@@ -68,7 +68,6 @@ public:
   /// Constructor
   TAO_Service_Context (void);
 
-
   /// = Generic components
 
   /// Insert the component into the list, making a copy of the octet
@@ -81,8 +80,7 @@ public:
   /// If the replace flag is true, update the specified context.
   /// Return 0 if the component was present and the replace flag
   /// was not set to true.
-  int set_context (const IOP::ServiceContext &context,
-                   CORBA::Boolean replace);
+  int set_context (const IOP::ServiceContext &context, CORBA::Boolean replace);
 
   /// Insert the component into the list, but efficiently stealing the
   /// contents of the octet sequence.
@@ -113,7 +111,7 @@ public:
   /// list.
   void set_context (IOP::ServiceContext &context, TAO_OutputCDR &cdr);
 
-  /// Is the <id> available in the underlying service context list? If
+  /// Is the @a id available in the underlying service context list? If
   /// so return true, else return false
   bool is_service_id (IOP::ServiceId id);
 
@@ -123,11 +121,11 @@ public:
 
   /// Return the underlying service context list
   IOP::ServiceContextList &service_info (void);
-  const IOP::ServiceContextList &service_info (void) const;
 
-  // @@ Note: The above method is only for backward comptiblity. We
+  // @note This method is only for backward comptiblity. We
   // need to get this removed once RT folks have their service
   // addition info done through this interface
+  const IOP::ServiceContextList &service_info (void) const;
 
 private:
   /// Helper methods to implement set_context()
diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl
index 26988bc8d8b..035925bb348 100644
--- a/TAO/tao/Service_Context.inl
+++ b/TAO/tao/Service_Context.inl
@@ -24,8 +24,7 @@ TAO_Service_Context::service_info (void) const
 
 
 ACE_INLINE void
-TAO_Service_Context::set_context (IOP::ServiceId id,
-                                  TAO_OutputCDR &cdr)
+TAO_Service_Context::set_context (IOP::ServiceId id, TAO_OutputCDR &cdr)
 {
   this->set_context_i (id,
                        cdr);
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp
index 10707265d59..af6f5edb1fa 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.cpp
+++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp
@@ -2,15 +2,18 @@
 
 #include "tao/SmartProxies/Smart_Proxies.h"
 
-ACE_RCSID(SmartProxies, Smart_Proxies, "$Id$")
+ACE_RCSID(SmartProxies,
+          Smart_Proxies,
+          "$Id$")
 
 #if !defined (__ACE_INLINE__)
 #include "tao/SmartProxies/Smart_Proxies.inl"
 #endif /* defined INLINE */
 
-// Add this line to please the AIX linker, otherwise it complains
-// "ld: 0711-244 ERROR: No csects or exported symbols have been saved."
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_NDEBUG) && defined (AIX)
-int the_bogus_value_to_please_linker_to_export_symbol;
-#endif
+TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base (void)
+{
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.inl b/TAO/tao/SmartProxies/Smart_Proxies.inl
index 232cacd0f34..79966fdc732 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.inl
+++ b/TAO/tao/SmartProxies/Smart_Proxies.inl
@@ -15,9 +15,4 @@ TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (CORBA::Object_ptr proxy)
 {
 }
 
-ACE_INLINE
-TAO_Smart_Proxy_Base::~TAO_Smart_Proxy_Base (void)
-{
-}
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp
index 4886def2ffe..d3f2eead383 100644
--- a/TAO/tao/Strategies/COIOP_Connector.cpp
+++ b/TAO/tao/Strategies/COIOP_Connector.cpp
@@ -63,8 +63,8 @@ TAO_COIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 
 TAO_Transport *
 TAO_COIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
-                                     TAO_Transport_Descriptor_Interface &,
-                                     ACE_Time_Value * /*max_wait_time*/)
+                                      TAO_Transport_Descriptor_Interface &,
+                                      ACE_Time_Value * /*max_wait_time*/)
 {
   // No remote connection possible with COIOP
   return 0;
@@ -89,7 +89,7 @@ TAO_COIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_COIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_COIOP_Connector::make_profile (void)
 {
   // The endpoint should be of the form:
   //    N.n@uuid/object_key
@@ -104,7 +104,6 @@ TAO_COIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h
index f311f4a1c41..1b7be889cd9 100644
--- a/TAO/tao/Strategies/COIOP_Connector.h
+++ b/TAO/tao/Strategies/COIOP_Connector.h
@@ -84,7 +84,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile * make_profile (void);
   //@}
 
   /// Cancel the passed cvs handler from the connector
diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp
index 5357ad8203f..39d6804470e 100644
--- a/TAO/tao/Strategies/COIOP_Profile.cpp
+++ b/TAO/tao/Strategies/COIOP_Profile.cpp
@@ -99,8 +99,7 @@ TAO_COIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 }
 
 void
-TAO_COIOP_Profile::parse_string_i (const char *ior
-                                  ACE_ENV_ARG_DECL)
+TAO_COIOP_Profile::parse_string_i (const char *ior)
 {
   // Pull off the "hostname:port/" part of the objref
   // Copy the string because we are going to modify it...
@@ -110,11 +109,11 @@ TAO_COIOP_Profile::parse_string_i (const char *ior
   if (okd == 0 || okd == ior)
     {
       // No object key delimiter or no hostname specified.
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   // Length of host string.
@@ -158,8 +157,7 @@ TAO_COIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_COIOP_Profile::hash (CORBA::ULong max
-                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_COIOP_Profile::hash (CORBA::ULong max)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -209,7 +207,7 @@ TAO_COIOP_Profile::add_endpoint (TAO_COIOP_Endpoint *endp)
 }
 
 char *
-TAO_COIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_COIOP_Profile::to_string (void)
 {
   CORBA::String_var key;
   TAO::ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h
index 9f8af464281..075a2ccdbe5 100644
--- a/TAO/tao/Strategies/COIOP_Profile.h
+++ b/TAO/tao/Strategies/COIOP_Profile.h
@@ -65,12 +65,11 @@ public:
   ~TAO_COIOP_Profile (void);
 
   /// Template methods. Please tao/Profile.h for documentation.
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
+  virtual char * to_string (void);
   virtual int encode_endpoints (void);
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
+  virtual CORBA::ULong hash (CORBA::ULong max);
   /**
    * Add <endp> to this profile's list of endpoints (it is inserted
    * next to the head of the list).  This profiles takes ownership of
@@ -83,7 +82,7 @@ protected:
   /// Template methods. Please see tao/Profile.h for documentation.
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
+                              );
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual int decode_endpoints (void);
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp
index 93c665bf99f..7f3dfd91d76 100644
--- a/TAO/tao/Strategies/COIOP_Transport.cpp
+++ b/TAO/tao/Strategies/COIOP_Transport.cpp
@@ -94,9 +94,7 @@ TAO_COIOP_Transport::send (iovec *,
 }
 
 ssize_t
-TAO_COIOP_Transport::recv (char *,
-                          size_t ,
-                          const ACE_Time_Value *)
+TAO_COIOP_Transport::recv (char *, size_t , const ACE_Time_Value *)
 {
   return 0;
 }
diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index dcf01927702..d60634a8a0d 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -684,7 +684,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
   // before the object key.
   for (size_t i = 0; i < len; ++i)
     if (options[i] == option_delimiter)
-      option_count++;
+      ++option_count;
 
   // The idea behind the following loop is to split the options into
   // (option, name) pairs.
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 9cb798f02ae..f630807e90e 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -128,37 +128,25 @@ TAO_DIOP_Connection_Handler::open (void*)
   // for consistency with other protocols.
   TAO_DIOP_Protocol_Properties protocol_properties;
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
+  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  try
     {
       if (client)
         {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->client_protocol_properties_at_orb_level (protocol_properties);
         }
       else
         {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->server_protocol_properties_at_orb_level (protocol_properties);
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   this->udp_socket_.open (this->local_addr_);
 
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index b7fd7318cef..c70dc9ff725 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -164,7 +164,7 @@ TAO_DIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_DIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_DIOP_Connector::make_profile (void)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -179,7 +179,6 @@ TAO_DIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index 7d4c8c1f182..90061e3d823 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -84,7 +84,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile * make_profile (void);
   //@}
 
   /// Cancel the passed cvs handler from the connector
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 9ce819cebb8..246a505e5ce 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -118,8 +118,7 @@ TAO_DIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 }
 
 void
-TAO_DIOP_Profile::parse_string_i (const char *ior
-                                  ACE_ENV_ARG_DECL)
+TAO_DIOP_Profile::parse_string_i (const char *ior)
 {
   // Pull off the "hostname:port/" part of the objref
   // Copy the string because we are going to modify it...
@@ -129,11 +128,11 @@ TAO_DIOP_Profile::parse_string_i (const char *ior
   if (okd == 0 || okd == ior)
     {
       // No object key delimiter or no hostname specified.
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   // Length of host string.
@@ -144,11 +143,11 @@ TAO_DIOP_Profile::parse_string_i (const char *ior
   if (cp_pos == ior)
     {
       // No hostname specified!  It is required by the spec.
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
   else if (cp_pos != 0)
     {
@@ -198,11 +197,11 @@ TAO_DIOP_Profile::parse_string_i (const char *ior
                         ACE_TEXT ("cannot determine hostname")));
 
           // @@ What's the right exception to throw here?
-          ACE_THROW (CORBA::INV_OBJREF (
+          throw ::CORBA::INV_OBJREF (
                        CORBA::SystemException::_tao_minor_code (
                          TAO::VMCID,
                          EINVAL),
-                       CORBA::COMPLETED_NO));
+                       CORBA::COMPLETED_NO);
         }
       else
         this->endpoint_.host_ = CORBA::string_dup (tmp_host);
@@ -238,8 +237,7 @@ TAO_DIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_DIOP_Profile::hash (CORBA::ULong max
-                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_DIOP_Profile::hash (CORBA::ULong max)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -289,7 +287,7 @@ TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp)
 }
 
 char *
-TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_DIOP_Profile::to_string (void)
 {
   CORBA::String_var key;
   TAO::ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index f2c670042dd..f2db5d68c01 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -77,12 +77,11 @@ public:
 
 
   /// Template methods. Please tao/Profile.h for documentation.
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
+  virtual char * to_string (void);
   virtual int encode_endpoints (void);
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
+  virtual CORBA::ULong hash (CORBA::ULong max);
   /**
    * Add <endp> to this profile's list of endpoints (it is inserted
    * next to the head of the list).  This profiles takes ownership of
@@ -94,8 +93,7 @@ protected:
 
   /// Template methods. Please see tao/Profile.h for documentation.
   virtual int decode_profile (TAO_InputCDR& cdr);
-  virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
+  virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual int decode_endpoints (void);
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
index 96c1cf8c8b2..eecb8e70779 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
@@ -34,8 +34,8 @@ TAO_OC_Endpoint_Selector_Factory::init (int argc, ACE_TCHAR *argv[])
                                ACE_TEXT ("-connect_timeout")) == 0) &&
           count < argc-1)
         {
-          count++;
-          long ms = ACE_OS::strtol(argv[count],0,10);
+          ++count;
+          long const ms = ACE_OS::strtol(argv[count],0,10);
           timeout.msec (ms);
         }
     }
@@ -48,7 +48,7 @@ TAO_OC_Endpoint_Selector_Factory::init (int argc, ACE_TCHAR *argv[])
 
 
 TAO_Invocation_Endpoint_Selector *
-TAO_OC_Endpoint_Selector_Factory::get_selector ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+TAO_OC_Endpoint_Selector_Factory::get_selector (void)
 {
   // Trivial endpoint selector.  Just return the default selector.
   return this->oc_endpoint_selector_;
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
index c1cae879efb..de45e4fdc5e 100644
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
@@ -66,8 +66,7 @@ public:
 
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (
-                             ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Invocation_Endpoint_Selector *get_selector (void);
 
 protected:
   /// The possible endpoint selector strategies that can be
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
index 5b0938be1df..9708dbdffd2 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
@@ -21,7 +21,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Time_Value TAO_Optimized_Connection_Endpoint_Selector::timeout_;
 
-TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv)
+TAO_Optimized_Connection_Endpoint_Selector::
+TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv)
 {
   TAO_Optimized_Connection_Endpoint_Selector::timeout_ = tv;
   if (TAO_debug_level)
@@ -38,7 +39,8 @@ TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Se
     }
 }
 
-TAO_Optimized_Connection_Endpoint_Selector::~TAO_Optimized_Connection_Endpoint_Selector (void)
+TAO_Optimized_Connection_Endpoint_Selector::
+~TAO_Optimized_Connection_Endpoint_Selector (void)
 {
 }
 
@@ -78,9 +80,8 @@ TAO_Optimized_Connection_Endpoint_Selector::check_profile (TAO_Profile *p,
 
 void
 TAO_Optimized_Connection_Endpoint_Selector::select_endpoint
-  ( TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *max_wait_time
-    ACE_ENV_ARG_DECL)
+  (TAO::Profile_Transport_Resolver *r,
+   ACE_Time_Value *max_wait_time)
 {
   TAO_Stub *stub = r->stub();
   TAO_Profile *p = stub->profile_in_use();
@@ -143,20 +144,14 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint
       if (r->blocked_connect () ||
          (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ()))
         {
-          const size_t endpoint_count =
-            r->profile ()->endpoint_count ();
+          const size_t endpoint_count = r->profile ()->endpoint_count ();
 
-          TAO_Endpoint *ep =
-            r->profile ()->endpoint ();
+          TAO_Endpoint *ep = r->profile ()->endpoint ();
 
           for (size_t i = 0; i < endpoint_count; ++i)
             {
               TAO_Base_Transport_Property desc (ep);
-              const bool retval =
-                r->try_connect (&desc,
-                                max_wait_time
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
+              const bool retval = r->try_connect (&desc, max_wait_time);
 
               // Check if the connect has completed.
               if (retval)
@@ -171,8 +166,7 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint
 
   // If we get here, we completely failed to find an endpoint selector
   // that we know how to use, so throw an exception.
-  ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                               CORBA::COMPLETED_NO));
+  throw ::CORBA::TRANSIENT (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
index 818541916c6..c2490a44b0b 100644
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
+++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
@@ -64,8 +64,7 @@ public:
                     ACE_Time_Value &tv);
 
   virtual void select_endpoint (TAO::Profile_Transport_Resolver *,
-                                ACE_Time_Value *max_wait_time
-                                ACE_ENV_ARG_DECL);
+                                ACE_Time_Value *max_wait_time);
 private:
 
   int check_profile (TAO_Profile *,
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index 72d72832118..a4408abdd2f 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -107,37 +107,26 @@ TAO_SCIOP_Connection_Handler::open (void*)
   protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
+  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (client)
         {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->client_protocol_properties_at_orb_level (protocol_properties);
         }
       else
         {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->server_protocol_properties_at_orb_level (protocol_properties);
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index c045c772059..7c7a41492ad 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -356,7 +356,7 @@ TAO_SCIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SCIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SCIOP_Connector::make_profile (void)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -371,7 +371,6 @@ TAO_SCIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
index 32654e24662..2327ce9880e 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -93,7 +93,7 @@ protected:
 
   /// More TAO_Connector methods, please check the documentation on
   /// Transport_Connector.h
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile *make_profile (void);
 
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index a09a100ef89..72e9a609a1d 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -138,7 +138,7 @@ TAO_SCIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 
 void
 TAO_SCIOP_Profile::parse_string_i (const char *ior
-                                   ACE_ENV_ARG_DECL)
+                                   )
 {
   // Pull off the "hostname:port/" part of the objref
   // Copy the string because we are going to modify it...
@@ -148,11 +148,11 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior
   if (okd == 0 || okd == ior)
     {
       // No object key delimiter or no hostname specified.
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   // Length of host string.
@@ -163,11 +163,11 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior
   if (cp_pos == ior)
     {
       // No hostname specified!  It is required by the spec.
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
   else if (cp_pos != 0)
     {
@@ -217,11 +217,11 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior
                         ACE_TEXT ("cannot determine hostname")));
 
           // @@ What's the right exception to throw here?
-          ACE_THROW (CORBA::INV_OBJREF (
+          throw ::CORBA::INV_OBJREF (
                        CORBA::SystemException::_tao_minor_code (
                          TAO::VMCID,
                          EINVAL),
-                       CORBA::COMPLETED_NO));
+                       CORBA::COMPLETED_NO);
         }
       else
         this->endpoint_.host_ = CORBA::string_dup (tmp_host);
@@ -262,7 +262,7 @@ TAO_SCIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 
 CORBA::ULong
 TAO_SCIOP_Profile::hash (CORBA::ULong max
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        )
 {
   // Get the hash value for all endpoints.
   CORBA::ULong hashval = 0;
@@ -312,7 +312,7 @@ TAO_SCIOP_Profile::add_endpoint (TAO_SCIOP_Endpoint *endp)
 }
 
 char *
-TAO_SCIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SCIOP_Profile::to_string (void)
 {
   CORBA::String_var key;
   TAO::ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index 4bfc18ebb6a..4aca872c3d7 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -73,12 +73,12 @@ public:
   ~TAO_SCIOP_Profile (void);
 
   /// Template methods. Please see Profile.h for documentation.
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
+  virtual char * to_string (void);
   virtual int encode_endpoints (void);
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
   virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
+                            );
   /**
    * Add <endp> to this profile's list of endpoints (it is inserted
    * next to the head of the list).  This profiles takes ownership of
@@ -92,7 +92,7 @@ protected:
   virtual int decode_profile (TAO_InputCDR &cdr);
   virtual int decode_endpoints (void);
   virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
+                              );
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
 
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index fa502e57458..d90a04cc655 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -237,8 +237,7 @@ TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
 }
 
 int
-TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix,
-                                       ACE_OFF_T size)
+TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix, ACE_OFF_T size)
 {
   this->mmap_file_prefix_ = prefix;
   this->mmap_size_ = size;
@@ -247,8 +246,7 @@ TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix,
 }
 
 int
-TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
-                             ACE_Reactor *reactor)
+TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor)
 {
   this->orb_core_ = orb_core;
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 272ebbeab56..861d4828250 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -91,37 +91,26 @@ TAO_SHMIOP_Connection_Handler::open (void*)
   protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
+  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (client)
         {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->client_protocol_properties_at_orb_level (protocol_properties);
         }
       else
         {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->server_protocol_properties_at_orb_level (protocol_properties);
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 9b0490b6c26..1ac25106500 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -285,7 +285,7 @@ TAO_SHMIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SHMIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_SHMIOP_Connector::make_profile (void)
 {
   // The endpoint should be of the form:
   //    N.n@port/object_key
@@ -300,7 +300,6 @@ TAO_SHMIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
index 014e4afcc90..295672e9d28 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -102,7 +102,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile *make_profile (void);
 
   /// Cancel the passed cvs handler from the connector
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 71a73c4dc7c..04786b75501 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -128,7 +128,7 @@ TAO_SHMIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 
 void
 TAO_SHMIOP_Profile::parse_string_i (const char *string
-                                    ACE_ENV_ARG_DECL)
+                                    )
 {
   // Pull off the "hostname:port/" part of the objref
   // Copy the string because we are going to modify it...
@@ -140,11 +140,11 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
   if (cp == 0)
     {
       // No host/port delimiter!
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   char *okd = ACE_OS::strchr (start, this->object_key_delimiter_);
@@ -152,11 +152,11 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
   if (okd == 0)
     {
       // No object key delimiter!
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   // Don't increment the pointer 'cp' directly since we still need
@@ -180,11 +180,11 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
       ACE_INET_Addr ia;
       if (ia.string_to_addr (tmp.in ()) == -1)
         {
-          ACE_THROW (CORBA::INV_OBJREF (
+          throw ::CORBA::INV_OBJREF (
               CORBA::SystemException::_tao_minor_code (
                   TAO::VMCID,
                   EINVAL),
-              CORBA::COMPLETED_NO));
+              CORBA::COMPLETED_NO);
         }
       else
         {
@@ -222,11 +222,11 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
                           ACE_TEXT ("cannot determine hostname")));
 
             // @@ What's the right exception to throw here?
-            ACE_THROW (CORBA::INV_OBJREF (
+            throw ::CORBA::INV_OBJREF (
                          CORBA::SystemException::_tao_minor_code (
                            TAO::VMCID,
                            EINVAL),
-                         CORBA::COMPLETED_NO));
+                         CORBA::COMPLETED_NO);
           }
         else
           this->endpoint_.host_ = tmp;
@@ -248,11 +248,11 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
         }
 
       // @@ What's the right exception to throw here?
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   start = ++okd;  // increment past the object key separator
@@ -291,7 +291,7 @@ TAO_SHMIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 
 CORBA::ULong
 TAO_SHMIOP_Profile::hash (CORBA::ULong max
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          )
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -329,7 +329,7 @@ TAO_SHMIOP_Profile::add_endpoint (TAO_SHMIOP_Endpoint *endp)
 }
 
 char *
-TAO_SHMIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SHMIOP_Profile::to_string (void)
 {
   CORBA::String_var key;
   TAO::ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index d75215ed4a9..7d103435dc2 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -76,12 +76,12 @@ public:
 
 
   /// Template methods, please see Profile.h for documentation.
-  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
+  virtual char * to_string (void);
   virtual int encode_endpoints (void);
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
   virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
+                            );
   /**
    * Add <endp> to this profile's list of endpoints (it is inserted
    * next to the head of the list).  This profiles takes ownership of
@@ -94,7 +94,7 @@ protected:
   /// Template methods. Please see tao/Profile.h for documentation.
   virtual int decode_profile (TAO_InputCDR& cdr);
   virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
+                              );
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual int decode_endpoints (void);
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 66ad7e60780..815adace6b4 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -88,37 +88,26 @@ TAO_UIOP_Connection_Handler::open (void*)
   protocol_properties.recv_buffer_size_ =
     this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
 
-  TAO_Protocols_Hooks *tph =
-    this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
-  bool client =
-    this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;;
+  bool const client = this->transport ()->opened_as () == TAO::TAO_CLIENT_ROLE;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (client)
         {
-          tph->client_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->client_protocol_properties_at_orb_level (protocol_properties);
         }
       else
         {
-          tph->server_protocol_properties_at_orb_level (
-            protocol_properties
-            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tph->server_protocol_properties_at_orb_level (protocol_properties);
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   if (this->set_socket_option (this->peer (),
                                protocol_properties.send_buffer_size_,
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 5a9ded4d3c7..fd9891fcd6a 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -79,7 +79,7 @@ TAO_UIOP_Connector::close (void)
 
 TAO_Profile *
 TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len
-                                   ACE_ENV_ARG_DECL)
+                                   )
 {
   if (this->check_prefix (str) != 0)
     return 0;
@@ -95,7 +95,7 @@ TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len
       return 0;
     }
   len = (separator - str) + 1;
-  return this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->make_profile ();
 }
 
 
@@ -326,7 +326,7 @@ TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_UIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
+TAO_UIOP_Connector::make_profile (void)
 {
   TAO_Profile *profile = 0;
   ACE_NEW_THROW_EX (profile,
@@ -337,7 +337,6 @@ TAO_UIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 
-  ACE_CHECK_RETURN (0);
 
   return profile;
 }
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index e575b6b27d4..1b464857928 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -74,7 +74,7 @@ public:
   virtual int check_prefix (const char *endpoint);
 
   virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len
-                                      ACE_ENV_ARG_DECL);
+                                     );
 
   virtual char object_key_delimiter (void) const;
 
@@ -112,7 +112,7 @@ protected:
                                   TAO_Transport_Descriptor_Interface &desc,
                                   ACE_Time_Value *timeout = 0);
 
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile *make_profile (void);
 
   //@}
 
diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp
index 91eefcecd09..0399804ad53 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -63,8 +63,7 @@ TAO_UIOP_Protocol_Factory::make_acceptor (void)
 }
 
 int
-TAO_UIOP_Protocol_Factory::init (int /* argc */,
-                                 ACE_TCHAR* /* argv */ [])
+TAO_UIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 {
   return 0;
 }
diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
index d314968e62d..0ab0d04ffd2 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
@@ -54,7 +54,7 @@ TAO_UIOP_Lite_Protocol_Factory::make_acceptor (void)
   TAO_Acceptor *acceptor = 0;
 
   // We are Lite factory
-  CORBA::Boolean lite_factory = 1;
+  CORBA::Boolean lite_factory = true;
   ACE_NEW_RETURN (acceptor,
                   TAO_UIOP_Acceptor (lite_factory),
                   0);
@@ -63,8 +63,7 @@ TAO_UIOP_Lite_Protocol_Factory::make_acceptor (void)
 }
 
 int
-TAO_UIOP_Lite_Protocol_Factory::init (int /* argc */,
-                                      ACE_TCHAR* /* argv */ [])
+TAO_UIOP_Lite_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 {
   return 0;
 }
@@ -75,7 +74,7 @@ TAO_UIOP_Lite_Protocol_Factory::make_connector (void)
   TAO_Connector *connector = 0;
 
   // We are a lite factory
-  CORBA::Boolean lite_factory = 1;
+  CORBA::Boolean lite_factory = true;
   ACE_NEW_RETURN (connector,
                   TAO_UIOP_Connector (lite_factory),
                   0);
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 1e665915348..9556bcca35a 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -95,16 +95,15 @@ TAO_UIOP_Profile::endpoint_count (void) const
 }
 
 void
-TAO_UIOP_Profile::parse_string_i (const char *string
-                                  ACE_ENV_ARG_DECL)
+TAO_UIOP_Profile::parse_string_i (const char *string)
 {
   if (!string || !*string)
     {
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      0,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   // Remove the "N.n@" version prefix, if it exists, and verify the
@@ -127,11 +126,11 @@ TAO_UIOP_Profile::parse_string_i (const char *string
   if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
       this->version_.minor  > TAO_DEF_GIOP_MINOR)
     {
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      0,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
 
@@ -144,11 +143,11 @@ TAO_UIOP_Profile::parse_string_i (const char *string
 
   if (cp == 0)
     {
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
       // No rendezvous point specified
     }
 
@@ -161,11 +160,11 @@ TAO_UIOP_Profile::parse_string_i (const char *string
 
   if (this->endpoint_.object_addr_.set (rendezvous.in ()) != 0)
     {
-      ACE_THROW (CORBA::INV_OBJREF (
+      throw ::CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
                      TAO::VMCID,
                      EINVAL),
-                   CORBA::COMPLETED_NO));
+                   CORBA::COMPLETED_NO);
     }
 
   start = ++cp;  // increment past the object key separator
@@ -203,8 +202,7 @@ TAO_UIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_UIOP_Profile::hash (CORBA::ULong max
-                        ACE_ENV_ARG_DECL_NOT_USED)
+TAO_UIOP_Profile::hash (CORBA::ULong max)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -243,7 +241,7 @@ TAO_UIOP_Profile::add_endpoint (TAO_UIOP_Endpoint *endp)
 
 
 char *
-TAO_UIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UIOP_Profile::to_string (void)
 {
   CORBA::String_var key;
   TAO::ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index fe515c4d388..357cb6e1e7d 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -75,12 +75,11 @@ public:
   ~TAO_UIOP_Profile (void);
 
   /// Template methods. Please see Profile.h for documentation.
-  virtual char *to_string (ACE_ENV_SINGLE_ARG_DECL);
+  virtual char *to_string (void);
   virtual int encode_endpoints (void);
   virtual TAO_Endpoint *endpoint (void);
   virtual CORBA::ULong endpoint_count (void) const;
-  virtual CORBA::ULong hash (CORBA::ULong max
-                             ACE_ENV_ARG_DECL);
+  virtual CORBA::ULong hash (CORBA::ULong max);
   /**
    * Add <endp> to this profile's list of endpoints (it is inserted
    * next to the head of the list).  This profiles takes ownership of
@@ -93,8 +92,7 @@ protected:
   /// Protected template methods. Please see documentation in
   /// Profile.h for details.
   virtual int decode_profile (TAO_InputCDR& cdr);
-  virtual void parse_string_i (const char *string
-                               ACE_ENV_ARG_DECL);
+  virtual void parse_string_i (const char *string);
   virtual void create_profile_body (TAO_OutputCDR &cdr) const;
   virtual int decode_endpoints (void);
   virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile);
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index d8befc55809..b7bf67f65f8 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -36,7 +36,8 @@ public:
  * etc.
  *
  */
-class TAO_Strategies_Export TAO_Advanced_Resource_Factory : public TAO_Default_Resource_Factory
+class TAO_Strategies_Export TAO_Advanced_Resource_Factory :
+  public TAO_Default_Resource_Factory
 {
 public:
   // = Initialization and termination methods.
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 5cf600ee90c..38ae601c3a4 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -155,9 +155,7 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles,
 }
 
 int
-TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
-                           CORBA::ULong &index
-                           ACE_ENV_ARG_DECL)
+TAO_Stub::create_ior_info (IOP::IOR *&ior_info, CORBA::ULong &index)
 {
   // We are creating the IOR info. Let us not be disturbed. So grab a
   // lock.
@@ -172,10 +170,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
     {
       if (this->forwarded_ior_info_ == 0)
         {
-          this->get_profile_ior_info (*this->forward_profiles_,
-                                      tmp_info
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          this->get_profile_ior_info (*this->forward_profiles_, tmp_info);
 
           this->forwarded_ior_info_ = tmp_info;
         }
@@ -199,10 +194,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
   // Else we look at the base profiles
   if (this->ior_info_ == 0)
     {
-      this->get_profile_ior_info (this->base_profiles_,
-                                  tmp_info
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      this->get_profile_ior_info (this->base_profiles_, tmp_info);
 
       this->ior_info_ = tmp_info;
     }
@@ -212,8 +204,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
        ind < this->base_profiles_.profile_count ();
        ++ind)
     {
-      if (this->base_profiles_.get_profile (ind) ==
-          this->profile_in_use_)
+      if (this->base_profiles_.get_profile (ind) == this->profile_in_use_)
         {
           index = ind;
           ior_info = this->ior_info_;
@@ -246,17 +237,11 @@ TAO_Stub::object_key (void) const
 }
 
 int
-TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
-                                IOP::IOR *&ior_info
-                                ACE_ENV_ARG_DECL)
+TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles, IOP::IOR *&ior_info)
 {
-
-
   ACE_NEW_THROW_EX (ior_info,
                     IOP::IOR (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (-1);
-
 
   // Get the number of elements
   CORBA::ULong const count = profiles.profile_count ();
@@ -270,8 +255,7 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
     {
       TAO_Profile *prof = profiles.get_profile (index);
 
-      IOP::TaggedProfile *tp =
-        prof->create_tagged_profile ();
+      IOP::TaggedProfile *tp = prof->create_tagged_profile ();
 
       if (tp == 0)
         ACE_THROW_RETURN (CORBA::NO_MEMORY (),
@@ -295,8 +279,7 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated)
         }
       else
         {
-          this->object_proxy_broker_ =
-            the_tao_remote_object_proxy_broker ();
+          this->object_proxy_broker_ = the_tao_remote_object_proxy_broker ();
         }
       this->is_collocated_ = collocated;
     }
@@ -308,11 +291,10 @@ TAO_Stub::is_collocated (CORBA::Boolean collocated)
 // NOTE that this must NOT go across the network!
 
 CORBA::ULong
-TAO_Stub::hash (CORBA::ULong max
-                ACE_ENV_ARG_DECL)
+TAO_Stub::hash (CORBA::ULong max)
 {
   // we rely on the profile objects that its address info
-  return this->base_profiles_.hash (max ACE_ENV_ARG_PARAMETER);
+  return this->base_profiles_.hash (max);
 }
 
 // Expensive comparison of objref data, to see if two objrefs
@@ -428,8 +410,7 @@ TAO_Stub::forward_back_one (void)
 // specific reconciliation, etc.
 
 CORBA::Policy_ptr
-TAO_Stub::get_policy (CORBA::PolicyType type
-                      ACE_ENV_ARG_DECL)
+TAO_Stub::get_policy (CORBA::PolicyType type)
 {
   // No need to lock, the stub only changes its policies at
   // construction time...
@@ -437,26 +418,19 @@ TAO_Stub::get_policy (CORBA::PolicyType type
   CORBA::Policy_var result;
   if (this->policies_ != 0)
     {
-      result =
-        this->policies_->get_policy (type
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK (CORBA::Policy::_nil ());
+      result = this->policies_->get_policy (type);
     }
 
   if (CORBA::is_nil (result.in ()))
     {
-      result =
-        this->orb_core_->get_policy_including_current (type
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK (CORBA::Policy::_nil ());
+      result = this->orb_core_->get_policy_including_current (type);
     }
 
   return result._retn ();
 }
 
 CORBA::Policy_ptr
-TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type
-                             ACE_ENV_ARG_DECL)
+TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type)
 {
   // No need to lock, the stub only changes its policies at
   // construction time...
@@ -464,20 +438,13 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type
   CORBA::Policy_var result;
   if (this->policies_ != 0)
     {
-      result =
-        this->policies_->get_cached_policy (type
-                                            ACE_ENV_ARG_PARAMETER);
-
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
+      result = this->policies_->get_cached_policy (type);
     }
 
   if (CORBA::is_nil (result.in ()))
     {
       result =
-        this->orb_core_->get_cached_policy_including_current (type
-                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+        this->orb_core_->get_cached_policy_including_current (type);
     }
 
   return result._retn ();
@@ -485,8 +452,7 @@ TAO_Stub::get_cached_policy (TAO_Cached_Policy_Type type
 
 TAO_Stub *
 TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
-                                CORBA::SetOverrideType set_add
-                                ACE_ENV_ARG_DECL)
+                                CORBA::SetOverrideType set_add)
 {
   // Notice the use of an explicit constructor....
   auto_ptr<TAO_Policy_Set> policy_manager (
@@ -494,34 +460,22 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 
   if (set_add == CORBA::SET_OVERRIDE)
     {
-      policy_manager->set_policy_overrides (policies,
-                                            set_add
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      policy_manager->set_policy_overrides (policies, set_add);
     }
   else if (this->policies_ == 0)
     {
-      policy_manager->set_policy_overrides (policies,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      policy_manager->set_policy_overrides (policies, CORBA::SET_OVERRIDE);
     }
   else
     {
       policy_manager->copy_from (this->policies_
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                 );
 
-      policy_manager->set_policy_overrides (policies,
-                                            set_add
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      policy_manager->set_policy_overrides (policies, set_add);
     }
 
   TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (),
-                                                 this->base_profiles_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                                 this->base_profiles_);
 
   stub->policies_ = policy_manager.release ();
 
@@ -532,8 +486,7 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 }
 
 CORBA::PolicyList *
-TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types
-                                ACE_ENV_ARG_DECL)
+TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types)
 {
   if (this->policies_ == 0)
     {
@@ -541,14 +494,12 @@ TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types
       ACE_NEW_THROW_EX (policy_list_ptr,
                         CORBA::PolicyList (),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
 
       return policy_list_ptr;
     }
   else
     {
-      return this->policies_->get_policy_overrides (types
-                                                    ACE_ENV_ARG_PARAMETER);
+      return this->policies_->get_policy_overrides (types);
     }
 }
 
@@ -562,13 +513,10 @@ TAO_Stub::transport_queueing_strategy (void)
   bool has_synchronization;
   Messaging::SyncScope scope;
 
-  this->orb_core_->call_sync_scope_hook (this,
-                                         has_synchronization,
-                                         scope);
+  this->orb_core_->call_sync_scope_hook (this, has_synchronization, scope);
 
   if (has_synchronization == true)
-    return this->orb_core_->get_transport_queueing_strategy  (this,
-                                                              scope);
+    return this->orb_core_->get_transport_queueing_strategy  (this, scope);
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
@@ -603,7 +551,7 @@ TAO_Stub::marshal (TAO_OutputCDR &cdr)
     }
   else
     {
-        ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
+      ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
                                 guard,
                                 *this->profile_lock_ptr_,
                                 0));
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 052419021ae..bc72329e84a 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -77,18 +77,18 @@ public:
    * types.
    */
   virtual CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                        ACE_ENV_ARG_DECL);
+                                       );
 
   virtual CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type
-                                               ACE_ENV_ARG_DECL);
+                                              );
 
   virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
                                           CORBA::SetOverrideType set_add
-                                          ACE_ENV_ARG_DECL);
+                                         );
 
   virtual CORBA::PolicyList *get_policy_overrides (
     const CORBA::PolicyTypeSeq & types
-    ACE_ENV_ARG_DECL);
+   );
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -107,7 +107,7 @@ public:
    * equivalent).
    */
   CORBA::ULong hash (CORBA::ULong maximum
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                     );
 
   /// Implement the is_equivalent() method for the CORBA::Object
   CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj);
@@ -252,7 +252,7 @@ public:
    */
   int create_ior_info (IOP::IOR *&ior_info,
                        CORBA::ULong &index
-                       ACE_ENV_ARG_DECL);
+                      );
 
   /// Deallocate the TAO_Stub object.
   /**
@@ -306,7 +306,7 @@ private:
   /// THREAD-SAFE Create the IOR info
   int get_profile_ior_info (TAO_MProfile &profile,
                             IOP::IOR *&ior_info
-                            ACE_ENV_ARG_DECL);
+                           );
 
 private:
 
diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h
index d500f7d83db..ac056c56a60 100644
--- a/TAO/tao/Stub_Factory.h
+++ b/TAO/tao/Stub_Factory.h
@@ -29,7 +29,6 @@
 #include /**/ "tao/Versioned_Namespace.h"
 
 #include "ace/Service_Object.h"
-#include "ace/CORBA_macros.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -38,11 +37,6 @@ class TAO_MProfile;
 class TAO_ORB_Core;
 class TAO_Stub;
 
-namespace CORBA
-{
-  class Environment;
-}
-
 /**
  * @class TAO_Stub_Factory
  *
@@ -62,8 +56,7 @@ public:
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core
-                                 ACE_ENV_ARG_DECL) = 0;
+                                 TAO_ORB_Core *orb_core) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index abe453e0d0c..d1b4d7cc30d 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -50,8 +50,7 @@ namespace TAO
   }
 
   Invocation_Status
-  Synch_Twoway_Invocation::remote_twoway (ACE_Time_Value *max_wait_time
-                                          ACE_ENV_ARG_DECL)
+  Synch_Twoway_Invocation::remote_twoway (ACE_Time_Value *max_wait_time)
     ACE_THROW_SPEC ((CORBA::Exception))
   {
     ACE_Countdown_Time countdown (max_wait_time);
@@ -60,16 +59,14 @@ namespace TAO
                                    this->details_.reply_service_info ());
 
     TAO_Target_Specification tspec;
-    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    this->init_target_spec (tspec);
 
     Invocation_Status s = TAO_INVOKE_FAILURE;
 
 #if TAO_HAS_INTERCEPTORS == 1
     // Start the interception point here..
     s =
-      this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      this->send_request_interception ();
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
@@ -78,7 +75,7 @@ namespace TAO
     // We have started the interception flow. We need to call the
     // ending interception flow if things go wrong. The purpose of the
     // try block is to do just this.
-    ACE_TRY
+    try
       {
         TAO_OutputCDR &cdr = this->resolver_.transport ()->out_stream ();
 
@@ -89,12 +86,10 @@ namespace TAO
 
         this->write_header (tspec,
                             cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                           );
 
         this->marshal_data (cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                           );
 
         // Register a reply dispatcher for this invocation. Use the
         // preallocated reply dispatcher.
@@ -121,8 +116,7 @@ namespace TAO
         s = this->send_message (cdr,
                                 TAO_Transport::TAO_TWOWAY_REQUEST,
                                 max_wait_time
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                               );
 
 #if TAO_HAS_INTERCEPTORS == 1
         // @@NOTE: Too much code repetition.
@@ -132,8 +126,7 @@ namespace TAO
         if (s == TAO_INVOKE_RESTART)
           {
             const Invocation_Status tmp =
-              this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              this->receive_other_interception ();
 
             if (tmp != TAO_INVOKE_SUCCESS)
               s = tmp;
@@ -172,15 +165,13 @@ namespace TAO
           this->wait_for_reply (max_wait_time,
                                 rd,
                                 dispatch_guard
-                                ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                               );
 
 #if TAO_HAS_INTERCEPTORS == 1
         if (s == TAO_INVOKE_RESTART)
           {
             Invocation_Status const tmp =
-              this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              this->receive_other_interception ();
 
             // Push the latest values for the return..
             if (tmp != TAO_INVOKE_SUCCESS)
@@ -196,8 +187,7 @@ namespace TAO
         // in the interface. The call violated the contract
 
         s = this->check_reply_status (rd
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                     );
 
         // For some strategies one may want to release the transport
         // back to  cache after receiving the reply.
@@ -208,15 +198,11 @@ namespace TAO
         Invocation_Status tmp = TAO_INVOKE_FAILURE;
         if (s == TAO_INVOKE_RESTART)
           {
-            tmp =
-              this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            tmp = this->receive_other_interception ();
           }
         else if (s == TAO_INVOKE_SUCCESS)
           {
-            tmp  =
-              this->receive_reply_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            tmp = this->receive_reply_interception ();
           }
         if (tmp != TAO_INVOKE_SUCCESS)
           s = tmp;
@@ -225,42 +211,22 @@ namespace TAO
         if (s != TAO_INVOKE_SUCCESS)
           return s;
       }
-    ACE_CATCHANY
+    catch ( ::CORBA::Exception& ex)
       {
 #if TAO_HAS_INTERCEPTORS == 1
         PortableInterceptor::ReplyStatus const status =
-          this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          this->handle_any_exception (&ex);
 
         if (status == PortableInterceptor::LOCATION_FORWARD ||
             status == PortableInterceptor::TRANSPORT_RETRY)
           s = TAO_INVOKE_RESTART;
         else if (status == PortableInterceptor::SYSTEM_EXCEPTION
                  || status == PortableInterceptor::USER_EXCEPTION)
+#else
+        ACE_UNUSED_ARG (ex);
 #endif /*TAO_HAS_INTERCEPTORS*/
-          ACE_RE_THROW;
-      }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus const st =
-          this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (st == PortableInterceptor::LOCATION_FORWARD ||
-            st == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-          ACE_RE_THROW;
+          throw;
       }
-# endif  /* ACE_HAS_EXCEPTIONS &&
-            ACE_HAS_BROKEN_UNEXPECTED_EXCEPTION*/
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
     return s;
   }
@@ -268,8 +234,7 @@ namespace TAO
   Invocation_Status
   Synch_Twoway_Invocation::wait_for_reply (ACE_Time_Value *max_wait_time,
                                            TAO_Synch_Reply_Dispatcher &rd,
-                                           TAO_Bind_Dispatcher_Guard &bd
-                                           ACE_ENV_ARG_DECL)
+                                           TAO_Bind_Dispatcher_Guard &bd)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /*
@@ -281,11 +246,11 @@ namespace TAO
      */
 
     const int reply_error =
-      this->resolver_.transport ()->wait_strategy ()->wait (max_wait_time,
-                                                            rd);
+      this->resolver_.transport ()->wait_strategy ()->wait (max_wait_time, rd);
+
     if (TAO_debug_level > 0 && max_wait_time != 0)
       {
-        const CORBA::ULong msecs = max_wait_time->msec ();
+        CORBA::ULong const msecs = max_wait_time->msec ();
 
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) - Synch_Twoway_Invocation::wait_for_reply, "
@@ -342,22 +307,20 @@ namespace TAO
             (void) bd.unbind_dispatcher ();
             this->resolver_.transport ()->close_connection ();
 
-            ACE_TRY
+            try
               {
                 return
                   this->orb_core ()->service_raise_comm_failure (
                     this->details_.request_service_context ().service_info (),
                     this->resolver_.profile ()
-                    ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                   );
 
               }
-            ACE_CATCHANY
+            catch (const ::CORBA::Exception&)
               {
                 this->resolver_.stub ()->reset_profiles ();
-                ACE_RE_THROW;
+                throw;
               }
-            ACE_ENDTRY;
           }
       }
 
@@ -366,7 +329,7 @@ namespace TAO
 
   Invocation_Status
   Synch_Twoway_Invocation::check_reply_status (TAO_Synch_Reply_Dispatcher &rd
-                                               ACE_ENV_ARG_DECL)
+                                               )
   {
     /*
      * Precondition: We probably got a reply. <ACE_Thread::self> is
@@ -405,14 +368,14 @@ namespace TAO
         break;
       case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
         return this->location_forward (cdr
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
       case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM:
         {
           // Unmarshal the location forward object and set the
           // variable this->forward_to_.
           Invocation_Status const s
             = this->location_forward (cdr
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
           if (s != TAO_INVOKE_FAILURE)
             {
               // de-marshalling of permanent object reference was successfull
@@ -438,10 +401,10 @@ namespace TAO
         }
       case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION:
         return this->handle_user_exception (cdr
-                                            ACE_ENV_ARG_PARAMETER);
+                                           );
       case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION:
         return this->handle_system_exception (cdr
-                                              ACE_ENV_ARG_PARAMETER);
+                                             );
 
       case TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE:
         {
@@ -464,8 +427,7 @@ namespace TAO
           // Now set this addressing mode in the profile, so that
           // the next invocation need not go through this.
           this->resolver_.profile ()->addressing_mode (addr_mode
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+                                                      );
 
           mon.set_status (TAO_INVOKE_RESTART);
 
@@ -477,8 +439,7 @@ namespace TAO
   }
 
   Invocation_Status
-  Synch_Twoway_Invocation::location_forward (TAO_InputCDR &inp_stream
-                                             ACE_ENV_ARG_DECL)
+  Synch_Twoway_Invocation::location_forward (TAO_InputCDR &inp_stream)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Reply_Guard mon (this,
@@ -511,8 +472,7 @@ namespace TAO
   }
 
   Invocation_Status
-  Synch_Twoway_Invocation::handle_user_exception (TAO_InputCDR &cdr
-                                                  ACE_ENV_ARG_DECL)
+  Synch_Twoway_Invocation::handle_user_exception (TAO_InputCDR &cdr)
     ACE_THROW_SPEC ((CORBA::Exception))
   {
     Reply_Guard mon (this,
@@ -535,14 +495,9 @@ namespace TAO
                           TAO_INVOKE_FAILURE);
       }
 
-    CORBA::Exception *exception =
-      this->details_.corba_exception (buf.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    CORBA::Exception *exception = this->details_.corba_exception (buf.in ());
 
-    exception->_tao_decode (cdr
-                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    exception->_tao_decode (cdr);
 
     if (TAO_debug_level > 5)
       {
@@ -555,25 +510,19 @@ namespace TAO
 
     mon.set_status (TAO_INVOKE_USER_EXCEPTION);
 
-#if defined (TAO_HAS_EXCEPTIONS)
     // If we have native exceptions, we must manage the memory allocated
     // by the call above to alloc(). Otherwise the Environment class
     // manages the memory.
     auto_ptr<CORBA::Exception> safety (exception);
 
-    // Direct throw because we don't have the ACE_TRY_ENV.
+    // Direct throw because we don't have the try_ENV.
     exception->_raise ();
-#else
-    // We can not use ACE_THROW here.
-    ACE_TRY_ENV.exception (exception);
-#endif
 
     return TAO_INVOKE_USER_EXCEPTION;
   }
 
   Invocation_Status
-  Synch_Twoway_Invocation::handle_system_exception (TAO_InputCDR &cdr
-                                                    ACE_ENV_ARG_DECL)
+  Synch_Twoway_Invocation::handle_system_exception (TAO_InputCDR &cdr)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     Reply_Guard mon (this, TAO_INVOKE_FAILURE);
@@ -625,12 +574,11 @@ namespace TAO
            * right way to do things. But a need to be compliant is
            * forcing us into this.
            */
-          const Invocation_Status s =
+          Invocation_Status const s =
             this->orb_core ()->service_raise_transient_failure (
               this->details_.request_service_context ().service_info (),
               this->resolver_.profile ()
-              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+             );
 
           if (s == TAO_INVOKE_RESTART)
             return s;
@@ -653,8 +601,7 @@ namespace TAO
         // Fall through and raise an exception.
       }
 
-    CORBA::SystemException *ex =
-      TAO::create_system_exception (type_id.in ());
+    CORBA::SystemException *ex = TAO::create_system_exception (type_id.in ());
 
     if (ex == 0)
       {
@@ -666,12 +613,10 @@ namespace TAO
                         TAO_INVOKE_FAILURE);
       }
 
-#if defined (TAO_HAS_EXCEPTIONS)
     // Without this, the call to create_system_exception() above
     // causes a memory leak. On platforms without native exceptions,
     // the CORBA::Environment class manages the memory.
     auto_ptr<CORBA::SystemException> safety (ex);
-#endif
 
     ex->minor (minor);
     ex->completed (CORBA::CompletionStatus (completion));
@@ -684,7 +629,7 @@ namespace TAO
     mon.set_status (TAO_INVOKE_SYSTEM_EXCEPTION);
 
     // Raise the exception.
-    ACE_ENV_RAISE (ex);
+    ex->_raise ();
 
     return TAO_INVOKE_SYSTEM_EXCEPTION;
   }
@@ -700,34 +645,28 @@ namespace TAO
   }
 
   Invocation_Status
-  Synch_Oneway_Invocation::remote_oneway (ACE_Time_Value *max_wait_time
-                                          ACE_ENV_ARG_DECL)
+  Synch_Oneway_Invocation::remote_oneway (ACE_Time_Value *max_wait_time)
     ACE_THROW_SPEC ((CORBA::Exception))
   {
     ACE_Countdown_Time countdown (max_wait_time);
 
-    const CORBA::Octet response_flags =
-       this->details_.response_flags ();
+    const CORBA::Octet response_flags = this->details_.response_flags ();
 
     Invocation_Status s = TAO_INVOKE_FAILURE;
 
     if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER) ||
         response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
       {
-        s = Synch_Twoway_Invocation::remote_twoway (max_wait_time
-                                                    ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+        s = Synch_Twoway_Invocation::remote_twoway (max_wait_time);
 
         return s;
       }
 
     TAO_Target_Specification tspec;
-    this->init_target_spec (tspec ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    this->init_target_spec (tspec);
 
 #if TAO_HAS_INTERCEPTORS == 1
-    s = this->send_request_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+    s = this->send_request_interception ();
 
     if (s != TAO_INVOKE_SUCCESS)
       return s;
@@ -738,21 +677,16 @@ namespace TAO
 
     TAO_OutputCDR &cdr = transport->out_stream ();
 
-    ACE_TRY
+    try
       {
         cdr.message_attributes (this->details_.request_id (),
                                 this->resolver_.stub (),
                                 TAO_Transport::TAO_ONEWAY_REQUEST,
                                 max_wait_time);
 
-        this->write_header (tspec,
-                            cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->write_header (tspec, cdr);
 
-        this->marshal_data (cdr
-                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->marshal_data (cdr);
 
         countdown.update ();
 
@@ -761,9 +695,7 @@ namespace TAO
             // We have a connected transport so we can send the message
             s = this->send_message (cdr,
                                     TAO_Transport::TAO_ONEWAY_REQUEST,
-                                    max_wait_time
-                                    ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                                    max_wait_time);
           }
         else
           {
@@ -778,46 +710,25 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
         s =
-          this->receive_other_interception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          this->receive_other_interception ();
 #endif /*TAO_HAS_INTERCEPTORS */
       }
-    ACE_CATCHANY
+    catch ( ::CORBA::Exception& ex)
       {
 #if TAO_HAS_INTERCEPTORS == 1
         PortableInterceptor::ReplyStatus const status =
-          this->handle_any_exception (&ACE_ANY_EXCEPTION
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          this->handle_any_exception (&ex);
 
         if (status == PortableInterceptor::LOCATION_FORWARD ||
             status == PortableInterceptor::TRANSPORT_RETRY)
           s = TAO_INVOKE_RESTART;
         else if (status == PortableInterceptor::SYSTEM_EXCEPTION
             || status == PortableInterceptor::USER_EXCEPTION)
+#else
+        ACE_UNUSED_ARG (ex);
 #endif /*TAO_HAS_INTERCEPTORS*/
-          ACE_RE_THROW;
-      }
-# if defined (ACE_HAS_EXCEPTIONS) \
-     && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
-    ACE_CATCHALL
-      {
-#if TAO_HAS_INTERCEPTORS == 1
-        PortableInterceptor::ReplyStatus const st =
-          this->handle_all_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (st == PortableInterceptor::LOCATION_FORWARD ||
-            st == PortableInterceptor::TRANSPORT_RETRY)
-          s = TAO_INVOKE_RESTART;
-        else
-#endif /*TAO_HAS_INTERCEPTORS == 1*/
-          ACE_RE_THROW;
+          throw;
       }
-# endif  /* ACE_HAS_EXCEPTIONS &&
-            ACE_HAS_BROKEN_UNEXPECTED_EXCEPTION*/
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
 
     return s;
   }
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index e3441f6b7be..d3b711d460e 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -80,8 +80,7 @@ namespace TAO
      * invocation. This method is also nerve centre for the
      * interceptor invocation points.
      */
-    Invocation_Status remote_twoway (ACE_Time_Value *max_wait_time
-                                     ACE_ENV_ARG_DECL)
+    Invocation_Status remote_twoway (ACE_Time_Value *max_wait_time)
       ACE_THROW_SPEC ((CORBA::Exception));
 
   protected:
@@ -92,19 +91,16 @@ namespace TAO
      * example the DII needs a totally different method of
      * user exception exception handling
      */
-    virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr
-                                                     ACE_ENV_ARG_DECL)
+    virtual Invocation_Status handle_user_exception (TAO_InputCDR &cdr)
       ACE_THROW_SPEC ((CORBA::Exception));
 
     /// Helper method used to handle location forwarded replies.
-    Invocation_Status location_forward (TAO_InputCDR &cdr
-                                        ACE_ENV_ARG_DECL)
+    Invocation_Status location_forward (TAO_InputCDR &cdr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Helper method used to handle system exceptions from the remote
     /// objects.
-    Invocation_Status handle_system_exception (TAO_InputCDR &cdr
-                                               ACE_ENV_ARG_DECL)
+    Invocation_Status handle_system_exception (TAO_InputCDR &cdr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// As the name suggests waits for a reply from the remote ORB.
@@ -113,8 +109,7 @@ namespace TAO
      */
     Invocation_Status wait_for_reply (ACE_Time_Value *max_wait_time,
                                       TAO_Synch_Reply_Dispatcher &rd,
-                                      TAO_Bind_Dispatcher_Guard &bd
-                                      ACE_ENV_ARG_DECL)
+                                      TAO_Bind_Dispatcher_Guard &bd)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -124,10 +119,7 @@ namespace TAO
     /**
      * This method returns an exception when there is an error.
      */
-    Invocation_Status check_reply_status (
-        TAO_Synch_Reply_Dispatcher &rd
-        ACE_ENV_ARG_DECL);
-
+    Invocation_Status check_reply_status (TAO_Synch_Reply_Dispatcher &rd);
   };
 
   /**
@@ -167,8 +159,7 @@ namespace TAO
 
     /// Method used by the adapter to kickstart an oneway invocation
     /// to the remote object.
-    Invocation_Status remote_oneway (ACE_Time_Value *max_wait_time
-                                     ACE_ENV_ARG_DECL)
+    Invocation_Status remote_oneway (ACE_Time_Value *max_wait_time)
       ACE_THROW_SPEC ((CORBA::Exception));
   };
 
@@ -182,8 +173,7 @@ namespace TAO
   {
   public:
 
-    Reply_Guard (Invocation_Base *s,
-                 Invocation_Status is);
+    Reply_Guard (Invocation_Base *s, Invocation_Status is);
 
     /// The destructor calls Invocation_Base::reply_received with the
     /// right reply status, which is useful for PI's.
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index dd2bc0c19d9..9e03e639281 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "tao/SystemException.h"
-#include "tao/Environment.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CORBA_String.h"
 #include "tao/CDR.h"
@@ -112,7 +111,7 @@ CORBA::SystemException::operator= (const CORBA::SystemException &src)
 
 void
 CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
-                                     ACE_ENV_ARG_DECL) const
+                                     ) const
 {
   if (cdr.write_string (this->_rep_id ())
       && cdr.write_ulong (this->minor ())
@@ -121,12 +120,12 @@ CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 void
 CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr
-                                     ACE_ENV_ARG_DECL)
+                                     )
 {
   // The string is read by the caller, to determine the exact type of
   // the exception.  We just decode the fields...
@@ -140,7 +139,7 @@ CORBA::SystemException::_tao_decode (TAO_InputCDR &cdr
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 CORBA::ULong
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 2a343346d3a..7c2c999804d 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -57,8 +57,6 @@ namespace TAO
 
 namespace CORBA
 {
-  class Environment;
-
   /**
    * @enum CompletionStatus
    *
@@ -123,10 +121,10 @@ namespace CORBA
     virtual ACE_CString _info (void) const;
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL) const;
+                              ) const;
 
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL);
+                             );
 
     /// Helper to create a minor status value.
     static CORBA::ULong _tao_minor_code (u_int location,
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 18666d56946..448e00e270f 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -383,7 +383,7 @@ TAO_ServerRequest::tao_send_reply (void)
 }
 
 void
-TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
+TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex)
 {
   if (this->response_expected_ && !this->collocated ())
     {
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 8034d920b28..ff0129ade41 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -223,7 +223,7 @@ public:
 
   void tao_send_reply (void);
 
-  void tao_send_reply_exception (CORBA::Exception&);
+  void tao_send_reply_exception (const CORBA::Exception& ex);
 
   /// Set the boolean member to 1.
   void is_dsi (void);
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index 4438d66db11..9fa29b29fe6 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -12,23 +12,20 @@
 # include "tao/TAO_Singleton_Manager.inl"
 #endif /* ! __ACE_INLINE__ */
 
-#if defined (ACE_HAS_EXCEPTIONS)
-# if defined (ACE_MVS)
-#   include /**/ <unexpect.h>
+#if defined (ACE_MVS)
+#  include /**/ <unexpect.h>
+#else
+# if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
+#  include /**/ <exception>
 # else
-#  if defined (ACE_HAS_STANDARD_CPP_LIBRARY)
-#   include /**/ <exception>
-#  else
-#   include /**/ <exception.h>
-#  endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
-# endif /* ACE_MVS */
-#endif /* ACE_HAS_EXCEPTIONS */
+#  include /**/ <exception.h>
+# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
+#endif /* ACE_MVS */
 
 ACE_RCSID (tao,
            TAO_Singleton_Manager,
            "$Id$")
 
-
 namespace
 {
   // Singleton instance pointer.
@@ -65,9 +62,7 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void)
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
     , internal_lock_ (0)
 # endif /* ACE_MT_SAFE */
-#if defined (ACE_HAS_EXCEPTIONS)
     , old_unexpected_ (0)
-#endif  /* ACE_HAS_EXCEPTIONS */
 {
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   ACE_NEW (this->internal_lock_,
@@ -269,7 +264,6 @@ TAO_Singleton_Manager::fini (void)
   this->internal_lock_ = 0;
 #endif /* ACE_MT_SAFE */
 
-#if defined (ACE_HAS_EXCEPTIONS)
   // Restore the old unexpected exception handler since TAO will no
   // longer be handling exceptions.  Allow the application to once
   // again handle unexpected exceptions.
@@ -280,7 +274,6 @@ TAO_Singleton_Manager::fini (void)
 # else
   (void) set_unexpected (this->old_unexpected_);
 # endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-#endif /* ACE_HAS_EXCEPTIONS */
 
   // Indicate that this TAO_Singleton_Manager instance has been shut down.
   this->object_manager_state_ = OBJ_MAN_SHUT_DOWN;
@@ -314,7 +307,6 @@ TAO_Singleton_Manager::shutting_down (void)
     : 1;
 }
 
-#if defined (ACE_HAS_EXCEPTIONS)
 void
 TAO_Singleton_Manager::_set_unexpected (TAO_unexpected_handler u)
 {
@@ -332,7 +324,6 @@ TAO_Singleton_Manager::_set_unexpected (TAO_unexpected_handler u)
   this->old_unexpected_ = set_unexpected (u);
 # endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
 }
-#endif /* ACE_HAS_EXCEPTIONS */
 
 int
 TAO_Singleton_Manager::at_exit_i (void *object,
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index daa0cf74975..33b60e6251f 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -8,7 +8,7 @@
  *  $Id$
  *
  *   Header file for the TAO-specific Singleton Manager.  Based
- *   entirely on ace/Object_Manager.{h,i,cpp}.
+ *   entirely on ace/Object_Manager.{h,inl,cpp}.
  *
  *  @author  Ossama Othman <ossama@uci.edu>
  */
@@ -30,9 +30,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_HAS_EXCEPTIONS)
 typedef void (*TAO_unexpected_handler)(void);
-#endif  /* ACE_HAS_EXCEPTIONS */
 
 /**
  * @class TAO_Singleton_Manager
@@ -122,7 +120,6 @@ public:
                       ACE_CLEANUP_FUNC cleanup_hook,
                       void *param);
 
-#if defined (ACE_HAS_EXCEPTIONS)
   /// Set a new unexpected exception handler.
   /**
    * The old one will be stored for restoration later on.
@@ -131,7 +128,6 @@ public:
    *       old unexpected exception handler pointer to be lost.
    */
   void _set_unexpected (TAO_unexpected_handler u);
-#endif /* ACE_HAS_EXCEPTIONS */
 
 protected:
 
@@ -173,7 +169,6 @@ private:
   TAO_SYNCH_RECURSIVE_MUTEX *internal_lock_;
 #endif /* ACE_MT_SAFE */
 
-#if defined (ACE_HAS_EXCEPTIONS)
   /// The old unexpected exception handler.
   /**
    * A pointer to the old unexpected exception handler is stored so
@@ -183,7 +178,6 @@ private:
    * TAO was unloaded.
    */
   TAO_unexpected_handler old_unexpected_;
-#endif  /* ACE_HAS_EXCEPTIONS */
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TC.mpc b/TAO/tao/TC.mpc
index 33e94224c50..6bed615c2c1 100644
--- a/TAO/tao/TC.mpc
+++ b/TAO/tao/TC.mpc
@@ -2,6 +2,7 @@
 
 project(*) : taolib_with_idl, tao_versioning_idl_defaults, install, interceptors, pi {
 
+  requires    += transport_current
   sharedname   = TAO_TC
   dynamicflags = TAO_TRANSPORT_CURRENT_BUILD_DLL
 
@@ -30,7 +31,7 @@ project(*) : taolib_with_idl, tao_versioning_idl_defaults, install, interceptors
     idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \
                 -Wb,export_macro=TAO_Transport_Current_Export \
                 -o TransportCurrent -I./TransportCurrent
-    idlflags -= -Sa -St
+    idlflags -= -Sa -St -Sci -SS
 
     TransportCurrent/TC.idl
   }
diff --git a/TAO/tao/TC_IIOP.mpc b/TAO/tao/TC_IIOP.mpc
index 1fb04a36329..db143dcfdf4 100644
--- a/TAO/tao/TC_IIOP.mpc
+++ b/TAO/tao/TC_IIOP.mpc
@@ -2,6 +2,7 @@
 
 project(*) : taolib_with_idl, tao_versioning_idl_defaults, install, tc, interceptors, pi {
 
+  requires    += transport_current
   sharedname   = TAO_TC_IIOP
 
   dynamicflags = TAO_TRANSPORT_CURRENT_BUILD_DLL
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index 9f639f4b6c4..d3044934790 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -104,7 +104,7 @@ TAO_Thread_Lane_Resources::acceptor_registry (void)
 }
 
 TAO_Connector_Registry *
-TAO_Thread_Lane_Resources::connector_registry (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Thread_Lane_Resources::connector_registry (void)
 {
   // Double check.
   if (this->connector_registry_ == 0)
@@ -354,7 +354,7 @@ TAO_Thread_Lane_Resources::ami_response_handler_allocator (void)
 int
 TAO_Thread_Lane_Resources::open_acceptor_registry (const TAO_EndpointSet &endpoint_set,
                                                    bool ignore_address
-                                                   ACE_ENV_ARG_DECL)
+                                                   )
 {
   // Access the acceptor registry.
   TAO_Acceptor_Registry &ar = this->acceptor_registry ();
@@ -364,8 +364,7 @@ TAO_Thread_Lane_Resources::open_acceptor_registry (const TAO_EndpointSet &endpoi
                         this->leader_follower ().reactor (),
                         endpoint_set,
                         ignore_address
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       );
 
   return result;
 }
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index d6cd7005f67..48955aa1b81 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -40,11 +40,6 @@ class TAO_New_Leader_Generator;
 class TAO_Connector_Registry;
 class TAO_Resource_Factory;
 
-namespace CORBA
-{
-  class Environment;
-}
-
 namespace TAO
 {
   class Transport_Cache_Manager;
@@ -74,8 +69,7 @@ public:
 
   /// Open the acceptor registry.
   int open_acceptor_registry (const TAO_EndpointSet &endpoint_set,
-                              bool ignore_address
-                              ACE_ENV_ARG_DECL);
+                              bool ignore_address);
 
   /// Finalize resources.
   void finalize (void);
@@ -97,7 +91,7 @@ public:
    * @note Returning a pointer helps to return 0 in case of
    * exceptions.
    */
-  TAO_Connector_Registry *connector_registry (ACE_ENV_SINGLE_ARG_DECL);
+  TAO_Connector_Registry *connector_registry (void);
 
   TAO::Transport_Cache_Manager &transport_cache (void);
 
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
index 69e96dd37dd..812108edd14 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -32,11 +32,6 @@ class TAO_Thread_Lane_Resources;
 class TAO_LF_Strategy;
 class TAO_MProfile;
 
-namespace CORBA
-{
-  class Environment;
-}
-
 /**
  * @class TAO_Thread_Lane_Resources_Manager
  *
@@ -59,7 +54,7 @@ public:
   virtual void finalize (void) = 0;
 
   /// Open default resources.
-  virtual int open_default_resources (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual int open_default_resources (void) = 0;
 
   /// Shutdown reactor.
   virtual void shutdown_reactor (void) = 0;
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 83f2a3f114d..985ea018653 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -52,7 +52,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
           size_t current_transfer,
           const char *location)
 {
-  ACE_Log_Msg::instance ()->acquire ();
+  ACE_Guard <ACE_Log_Msg> log_guard (*ACE_Log_Msg::instance ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
@@ -110,12 +110,17 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
               ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
               ACE_TEXT ("end of data\n"),
               id, ACE_TEXT_CHAR_TO_TCHAR(location)));
-
-  ACE_Log_Msg::instance ()->release ();
 }
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+TAO::Transport::Stats::~Stats ()
+{
+  // no-op
+}
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
 TAO_Transport::TAO_Transport (CORBA::ULong tag,
                               TAO_ORB_Core *orb_core)
   : tag_ (tag)
@@ -206,6 +211,10 @@ TAO_Transport::~TAO_Transport (void)
   ACE_ASSERT (this->head_ == 0);
   ACE_ASSERT (this->cache_map_entry_ == 0);
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+  delete this->stats_;
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
   /*
    * Hook to add code that cleans up components
    * belong to the concrete protocol implementation.
@@ -1217,7 +1226,10 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
                                       ACE_Time_Value *max_wait_time)
 {
   int ret = 0;
-  size_t message_length = message_block->length ();
+
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+  size_t const message_length = message_block->length ();
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
   switch (message_semantics)
     {
@@ -1238,9 +1250,11 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
         break;
     }
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
   // "Count" the message, only if no error was encountered.
   if (ret != -1 && this->stats_ != 0)
     this->stats_->messages_sent (message_length);
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
   return ret;
 }
@@ -2212,9 +2226,11 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
   // Get the <message_type> that we have received
   const TAO_Pluggable_Message_Type t = qd->msg_type_;
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
   // Update stats, if any
   if (this->stats_ != 0)
     this->stats_->messages_received (qd->msg_block_->length ());
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
   if (t == TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION)
     {
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index ad9a8a25155..94308e15e9d 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -1076,8 +1076,10 @@ private:
   TAO_MMAP_Allocator * const mmap_allocator_;
 #endif  /* TAO_HAS_SENDFILE==1 */
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
   /// Statistics
   TAO::Transport::Stats* stats_;
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
   /*
    * specialization hook to add class members from concrete
@@ -1094,6 +1096,7 @@ private:
 
 //@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
 namespace TAO
 {
   namespace Transport
@@ -1118,6 +1121,7 @@ namespace TAO
     {
     public:
       Stats ();
+      virtual ~Stats ();
 
       void messages_sent (size_t message_length);
       CORBA::LongLong messages_sent (void) const;
@@ -1131,12 +1135,12 @@ namespace TAO
       const ACE_Time_Value& opened_since (void) const;
 
     private:
-      // @NOTE: I could have used bytes_rcvd_.samples_count() instead,
+      // The bytes_rcvd_.samples_count() could have been used instead,
       // however there was a suspicion that 32 bits would be
       // insufficient.
       CORBA::LongLong messages_rcvd_;
 
-      // @NOTE: I could have used bytes_sent_.samples_count() instead,
+      // The bytes_sent_.samples_count() could have been used instead,
       // however there was a suspicion that 32 bits would be
       // insufficient.
       CORBA::LongLong messages_sent_;
@@ -1148,6 +1152,7 @@ namespace TAO
     };
   }
 }
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index e53d2848830..88d3683de7d 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -189,6 +189,8 @@ TAO_Transport::sent_byte_count (void) const
   return this->sent_byte_count_;
 }
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 ACE_INLINE TAO::Transport::Stats*
 TAO_Transport::stats (void) const
 {
@@ -254,6 +256,7 @@ TAO::Transport::Stats::opened_since (void) const
 {
   return this->opened_since_;
 }
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp
index 3dab7b8c310..7fa3bae6832 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/Current_Impl.cpp
@@ -1,13 +1,25 @@
-// $Id$
+/* -*- C++ -*- */
+
+/**
+ * @file Current_Impl.cpp
+ *
+ * $Id$
+ *
+ * @author Iliyan Jeliazkov <iliyan@ociweb.com>
+ *
+ */
 
 #include "tao/Transport.h"
-#include "tao/Transport_Selection_Guard.h"
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+#include "tao/Transport_Selection_Guard.h"
 #include "tao/TransportCurrent/Current_Loader.h"
 #include "tao/TransportCurrent/Current_Impl.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+
 namespace TAO
 {
   namespace Transport
@@ -29,68 +41,63 @@ namespace TAO
     /// if, there was no "current" transport selected on the current
     /// thread.
     const TAO_Transport*
-    Current_Impl::transport (ACE_ENV_SINGLE_ARG_DECL) const
+    Current_Impl::transport (void) const
       ACE_THROW_SPEC ((NoContext))
     {
       Transport_Selection_Guard* topguard =
         Transport_Selection_Guard::current (this->core_, this->tss_slot_id_);
 
       if (topguard == 0)
-        ACE_THROW (NoContext());
-      ACE_CHECK;
+        throw NoContext();
 
       return topguard->get ();
     }
 
     /// Obtains the current transport's stats
     const TAO::Transport::Stats*
-    Current_Impl::transport_stats (ACE_ENV_SINGLE_ARG_DECL) const
+    Current_Impl::transport_stats (void) const
       ACE_THROW_SPEC ((NoContext))
     {
       static const TAO::Transport::Stats dummy;
 
-      const TAO_Transport* t =
-        this->transport (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      const TAO_Transport* t = this->transport ();
 
       return (t==0 || t->stats () == 0) ? &dummy : t->stats ();
     }
 
-    CORBA::Long Current_Impl::id (ACE_ENV_SINGLE_ARG_DECL)
+    CORBA::Long Current_Impl::id (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
-      const TAO_Transport* t =
-        this->transport (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      const TAO_Transport* t = this->transport ();
 
       return (t==0) ? 0 : t->id ();
     }
 
-    CounterT Current_Impl::bytes_sent (ACE_ENV_SINGLE_ARG_DECL)
+    CounterT Current_Impl::bytes_sent (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       return transport_stats ()->bytes_sent ();
     }
 
-    CounterT Current_Impl::bytes_received (ACE_ENV_SINGLE_ARG_DECL)
+    CounterT Current_Impl::bytes_received (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       return transport_stats ()->bytes_received ();
     }
 
-    CounterT Current_Impl::messages_sent (ACE_ENV_SINGLE_ARG_DECL)
+    CounterT Current_Impl::messages_sent (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       return transport_stats ()->messages_sent ();
     }
 
-    CounterT Current_Impl::messages_received (ACE_ENV_SINGLE_ARG_DECL)
+    CounterT Current_Impl::messages_received (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       return transport_stats ()->messages_received ();
     }
 
-    TimeBase::TimeT Current_Impl::open_since (ACE_ENV_SINGLE_ARG_DECL)
+    TimeBase::TimeT Current_Impl::open_since (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
       TimeBase::TimeT msecs = 0;
@@ -104,3 +111,5 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 68731b626ec..9463b35c01c 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -9,6 +9,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 #include "tao/TransportCurrent/TCC.h"
 #include "tao/LocalObject.h"
 
@@ -47,22 +49,22 @@ namespace TAO
          * PortableInterceptor::Current interface.
          */
         //@{
-        virtual CORBA::Long id (ACE_ENV_SINGLE_ARG_DECL)
+        virtual CORBA::Long id (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual CounterT bytes_sent (ACE_ENV_SINGLE_ARG_DECL)
+        virtual CounterT bytes_sent (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual CounterT bytes_received (ACE_ENV_SINGLE_ARG_DECL)
+        virtual CounterT bytes_received (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual CounterT messages_sent (ACE_ENV_SINGLE_ARG_DECL)
+        virtual CounterT messages_sent (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual CounterT messages_received (ACE_ENV_SINGLE_ARG_DECL)
+        virtual CounterT messages_received (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual ::TimeBase::TimeT open_since (ACE_ENV_SINGLE_ARG_DECL)
+        virtual ::TimeBase::TimeT open_since (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
         //@}
 
@@ -73,13 +75,13 @@ namespace TAO
          */
         //@{
         /// A (strategy) method used to obtain the transport ptr
-        const TAO_Transport* transport (ACE_ENV_SINGLE_ARG_DECL) const
+        const TAO_Transport* transport (void) const
           ACE_THROW_SPEC ((NoContext));
 
         /// A Stats instance. If protocol is unavailable (0) or the
         /// TAO_HAS_TRANSPORT_CURRENT macro is defined as anything but
         /// 1, a single static instance will be used.
-        const TAO::Transport::Stats* transport_stats (ACE_ENV_SINGLE_ARG_DECL) const
+        const TAO::Transport::Stats* transport_stats (void) const
           ACE_THROW_SPEC ((NoContext));
         //@}
 
@@ -105,7 +107,6 @@ namespace TAO
 
         // The ORB's TSS slot id for the Transport ptr
         size_t tss_slot_id_;
-
       };
 
   }
@@ -114,6 +115,9 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
+
 #include /**/ "ace/post.h"
 
 #endif /* CURRENT_IMPL_H */
diff --git a/TAO/tao/TransportCurrent/Current_Loader.cpp b/TAO/tao/TransportCurrent/Current_Loader.cpp
index f2ff2564616..40b6dbba38f 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/Current_Loader.cpp
@@ -16,14 +16,17 @@
 
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
-#include "tao/TransportCurrent/Current_ORBInitializer.h"
-#include "tao/TransportCurrent/Current_Loader.h"
-#include "tao/TransportCurrent/Current_Impl.h"
 
 ACE_RCSID (TC,
            Current_Loader,
            "$Id$")
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+#include "tao/TransportCurrent/Current_ORBInitializer.h"
+#include "tao/TransportCurrent/Current_Loader.h"
+#include "tao/TransportCurrent/Current_Impl.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -36,8 +39,6 @@ namespace TAO
     {
     }
 
-
-
     /// Initializes object when dynamic linking occurs.
     int
     Current_Loader::init (int, ACE_TCHAR *[])
@@ -50,13 +51,10 @@ namespace TAO
                           (CORBA::SystemException::_tao_minor_code (TAO::VMCID,
                                                                     ENOMEM),
                            CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
 
       PortableInterceptor::ORBInitializer_var initializer (tmp);
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       return 0;
     }
@@ -68,9 +66,6 @@ namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
-
-
-
 #if defined (TAO_AS_STATIC_LIBS)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -92,10 +87,8 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* defined (TAO_AS_STATIC_LIBS) */
-
-
 
+#endif /* defined (TAO_AS_STATIC_LIBS) */
 
 ACE_STATIC_SVC_DEFINE (TAO_Transport_Current_Loader,
                        ACE_TEXT ("TAO_Transport_Current_Loader"),
@@ -107,3 +100,5 @@ ACE_STATIC_SVC_DEFINE (TAO_Transport_Current_Loader,
 ACE_FACTORY_NAMESPACE_DEFINE (TAO_Transport_Current,
                               TAO_Transport_Current_Loader,
                               TAO::Transport::Current_Loader)
+
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h
index 1cb998ebcd7..e76fdd81453 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.h
+++ b/TAO/tao/TransportCurrent/Current_Loader.h
@@ -23,14 +23,16 @@
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 #include "tao/Versioned_Namespace.h"
-#include "tao/TransportCurrent/Transport_Current_Export.h"
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+#include "tao/TransportCurrent/Transport_Current_Export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  class ORBInitializer_Registry_Adapter;
+  //  class ORBInitializer_Registry_Adapter;
 
   namespace Transport
   {
@@ -47,13 +49,6 @@ namespace TAO
 
       // Protected destructor to enforce reference counting discipline
       virtual ~Current_Loader (void);
-
-      ORBInitializer_Registry_Adapter* orbinitializer_registry (void);
-
-    private:
-
-      /// A cache for the registry pointer
-      ORBInitializer_Registry_Adapter* oir_;
     };
 
   }
@@ -79,6 +74,8 @@ ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Transport_Current,
 ACE_FACTORY_DECLARE (TAO_Transport_Current,
                      TAO_Transport_Current_Loader)
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TRANSPORT_CURRENT_LOADER_H */
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
index 7df02188655..61300fa35aa 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
@@ -27,8 +27,7 @@ namespace TAO
     template <typename Impl>
     TAO::Transport::Current_ptr
     Current_ORBInitializer<Impl>::make_current_instance (TAO_ORB_Core* core,
-                                                         size_t tss_slot_id
-                                                         ACE_ENV_ARG_DECL)
+                                                         size_t tss_slot_id)
       ACE_THROW_SPEC ((CORBA::SystemException))
       {
         // Create the Current
@@ -39,7 +38,6 @@ namespace TAO
                             (CORBA::SystemException::_tao_minor_code (TAO::VMCID,
                                                                       ENOMEM),
                              CORBA::COMPLETED_NO));
-        ACE_CHECK;
 
         return tmp;
       }
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
index bf4d4dda30d..7b1ff98c6a2 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
@@ -41,7 +41,7 @@ namespace TAO
       virtual TAO::Transport::Current_ptr
       make_current_instance (TAO_ORB_Core* c,
                              size_t s
-                             ACE_ENV_ARG_DECL)
+                             )
         ACE_THROW_SPEC ((CORBA::SystemException));
     };
 
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
index bcd2e7d3d3c..816f99d153c 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
+
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/TransportCurrent/Current_ORBInitializer_Base.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -14,25 +14,25 @@ namespace TAO
     Current_ORBInitializer_Base::Current_ORBInitializer_Base(const ACE_TCHAR* id)
       : id_ (id)
     {
+      // do nothing
     }
 
     Current_ORBInitializer_Base::~Current_ORBInitializer_Base(void)
     {
+      // do nothing
     }
 
 
-
     void
-    Current_ORBInitializer_Base::pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                                           ACE_ENV_ARG_DECL_NOT_USED )
-      ACE_THROW_SPEC( (CORBA::SystemException) )
+    Current_ORBInitializer_Base::pre_init (
+      PortableInterceptor::ORBInitInfo_ptr info)
+      ACE_THROW_SPEC((CORBA::SystemException))
     {
       // Narrow to a TAO_ORBInitInfo object to get access to the
       // allocate_tss_slot_id() TAO extension.
       TAO_ORBInitInfo_var tao_info =
         TAO_ORBInitInfo::_narrow (info
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                 );
 
       if (CORBA::is_nil (tao_info.in ()))
         {
@@ -41,21 +41,18 @@ namespace TAO
                         "TAO (%P|%t) TAO::Transport::ORBInitializer::pre_init - "
                         "Panic: unable to narrow the ORBInitInfo_ptr\n"));
 
-          ACE_THROW (CORBA::INTERNAL ());
+          throw ::CORBA::INTERNAL ();
         }
 
       // Reserve a TSS slot in the ORB core internal TSS resources for the
       // thread-specific portion of the Current object.
       size_t tss_slot = tao_info->allocate_tss_slot_id (0
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                                       );
 
       // Create the Current
       Current_var current (this->make_current_instance (tao_info->orb_core (),
                                                         tss_slot
-                                                        ACE_ENV_ARG_PARAMETER));
-      ACE_CHECK;
-
+                                                       ));
 
       info->register_initial_reference (ACE_TEXT_ALWAYS_CHAR (this->id_.fast_rep ()),
                                         current.in ());
@@ -63,10 +60,11 @@ namespace TAO
     }
 
     void
-    Current_ORBInitializer_Base::post_init (PortableInterceptor::ORBInitInfo_ptr
-                                            ACE_ENV_ARG_DECL_NOT_USED )
+    Current_ORBInitializer_Base::post_init (
+      PortableInterceptor::ORBInitInfo_ptr)
       ACE_THROW_SPEC( (CORBA::SystemException) )
     {
+      // do nothing
     }
 
   }
@@ -74,3 +72,5 @@ namespace TAO
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
+
+
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index 38b6cc903dc..cb4ce2fa446 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -15,53 +15,50 @@
 #define CURRENT_ORBINITIALIZER_BASE_H
 
 #include /**/ "ace/pre.h"
-#include /**/ "tao/TransportCurrent/Transport_Current_Export.h"
+
+#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/SString.h"
 #include "tao/PI/PI.h"
-
+#include "tao/LocalObject.h"
 #include "tao/TransportCurrent/TCC.h"
 
+#include "tao/TransportCurrent/Transport_Current_Export.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
   namespace Transport
   {
-
-    class TAO_Transport_Current_Export Current_ORBInitializer_Base :
-      public  PortableInterceptor::ORBInitializer
-      {
-      public:
-        Current_ORBInitializer_Base (const ACE_TCHAR* id);
-        virtual ~Current_ORBInitializer_Base (void);
-
-        virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED )
-          ACE_THROW_SPEC( (CORBA::SystemException) );
-
-        virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                                ACE_ENV_ARG_DECL_NOT_USED )
-          ACE_THROW_SPEC( (CORBA::SystemException) );
-
-      protected:
+    class TAO_Transport_Current_Export Current_ORBInitializer_Base
+      : public virtual PortableInterceptor::ORBInitializer
+      , public virtual TAO_Local_RefCounted_Object
+    {
+    public:
+      Current_ORBInitializer_Base (const ACE_TCHAR* id);
+      virtual ~Current_ORBInitializer_Base (void);
+
+      virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+       virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
+          ACE_THROW_SPEC ((CORBA::SystemException));
+    protected:
         virtual TAO::Transport::Current_ptr
         make_current_instance (TAO_ORB_Core* core,
-                               size_t tss_slot_id
-                               ACE_ENV_ARG_DECL)
+                               size_t tss_slot_id)
           ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    protected:
+      const ACE_TString id_;
+    };
 
-      protected:
-        const ACE_TString id_;
-      };
-
-  }
+  } /* namespace Transport */
 
-}
+} /* namespace TAO */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index 97129f16539..d66306b1aac 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
@@ -5,6 +5,8 @@
 #include "tao/IIOP_Transport.h"
 #include "tao/Transport_Selection_Guard.h"
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 #include "IIOP_Current_Impl.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -22,7 +24,7 @@ namespace TAO
     /// throw NoContext, if no transport has been selected yet.
 
     TAO_IIOP_Connection_Handler*
-    IIOP_Current_Impl::handler (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    IIOP_Current_Impl::handler (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -56,7 +58,7 @@ namespace TAO
     }
 
     CORBA::Long
-    IIOP_Current_Impl::id (ACE_ENV_SINGLE_ARG_DECL)
+    IIOP_Current_Impl::id (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -69,7 +71,7 @@ namespace TAO
     }
 
     ::SSLIOP::Current_ptr
-    IIOP_Current_Impl::ssliop_current (ACE_ENV_SINGLE_ARG_DECL)
+    IIOP_Current_Impl::ssliop_current (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
         ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
@@ -77,7 +79,7 @@ namespace TAO
 
 
     CORBA::Long
-    IIOP_Current_Impl::remote_port (ACE_ENV_SINGLE_ARG_DECL)
+    IIOP_Current_Impl::remote_port (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -94,7 +96,7 @@ namespace TAO
     }
 
     char*
-    IIOP_Current_Impl::remote_host (ACE_ENV_SINGLE_ARG_DECL)
+    IIOP_Current_Impl::remote_host (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -111,7 +113,7 @@ namespace TAO
     }
 
     CORBA::Long
-    IIOP_Current_Impl::local_port (ACE_ENV_SINGLE_ARG_DECL)
+    IIOP_Current_Impl::local_port (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -128,7 +130,7 @@ namespace TAO
     }
 
     char*
-    IIOP_Current_Impl::local_host (ACE_ENV_SINGLE_ARG_DECL)
+    IIOP_Current_Impl::local_host (void)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -149,3 +151,6 @@ namespace TAO
 
 
 TAO_END_VERSIONED_NAMESPACE_DECL
+
+
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index a39f527b50e..acb48edcbe2 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -17,6 +17,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
 #include "tao/TransportCurrent/TC_IIOPC.h"
 #include "tao/TransportCurrent/Current_Impl.h"
 
@@ -49,22 +51,22 @@ namespace TAO
         IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
 
         //@{
-        virtual ::CORBA::Long id (ACE_ENV_SINGLE_ARG_DECL)
+        virtual ::CORBA::Long id (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual ::SSLIOP::Current_ptr ssliop_current (ACE_ENV_SINGLE_ARG_DECL)
+        virtual ::SSLIOP::Current_ptr ssliop_current (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual ::CORBA::Long remote_port (ACE_ENV_SINGLE_ARG_DECL)
+        virtual ::CORBA::Long remote_port (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual char* remote_host (ACE_ENV_SINGLE_ARG_DECL)
+        virtual char* remote_host (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual ::CORBA::Long local_port (ACE_ENV_SINGLE_ARG_DECL)
+        virtual ::CORBA::Long local_port (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
-        virtual char* local_host (ACE_ENV_SINGLE_ARG_DECL)
+        virtual char* local_host (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
         //@}
 
@@ -85,7 +87,7 @@ namespace TAO
         /// Transport. Will throw NO_IMPLEMENT if the (selected) transport
         /// () == 0, or if transport->connection_handler () == 0. Will
         /// throw NoContext, if no transport has been selected yet.
-        TAO_IIOP_Connection_Handler* handler (ACE_ENV_SINGLE_ARG_DECL)
+        TAO_IIOP_Connection_Handler* handler (void)
           ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
 
       private:
@@ -104,6 +106,8 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
 #include /**/ "ace/post.h"
 
 #endif /* IIOP_CURRENT_IMPL_H */
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
index 97d2a1071d4..88caa7ae6d9 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.cpp
@@ -13,20 +13,20 @@
 
 
 #include "ace/Service_Config.h"
-
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/ORB_Constants.h"
-
 #include "tao/PI/PI.h"
 
-#include "tao/TransportCurrent/Current_ORBInitializer.h"
-#include "tao/TransportCurrent/IIOP_Current_Loader.h"
-#include "tao/TransportCurrent/IIOP_Current_Impl.h"
-
 ACE_RCSID (Transport_Current,
            IIOP_Current_Loader,
            "$Id$")
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+#include "tao/TransportCurrent/Current_ORBInitializer.h"
+#include "tao/TransportCurrent/IIOP_Current_Loader.h"
+#include "tao/TransportCurrent/IIOP_Current_Impl.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -45,13 +45,11 @@ namespace TAO
                           CORBA::NO_MEMORY (CORBA::SystemException::_tao_minor_code (TAO::VMCID,
                                                                                      ENOMEM),
                                             CORBA::COMPLETED_NO));
-        ACE_TRY_CHECK;
 
         PortableInterceptor::ORBInitializer_var initializer (tmp);
 
         PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                                      );
 
         return 0;
       }
@@ -71,7 +69,6 @@ namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 
-
 #if defined (TAO_AS_STATIC_LIBS)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -108,3 +105,5 @@ ACE_STATIC_SVC_DEFINE (TAO_Transport_IIOP_Current_Loader,
 ACE_FACTORY_NAMESPACE_DEFINE (TAO_Transport_Current,
                               TAO_Transport_IIOP_Current_Loader,
                               TAO::Transport::IIOP::Current_Loader)
+
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
index 2199de74781..e2b74e217e0 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h
@@ -17,6 +17,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+
 #include "tao/TransportCurrent/Current_Loader.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -67,4 +71,6 @@ ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Transport_Current,
 ACE_FACTORY_DECLARE (TAO_Transport_Current,
                      TAO_Transport_IIOP_Current_Loader)
 
+#endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
+
 #endif /* TAO_TRANSPORT_IIOP_TRAITS_LOADER_H */
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
index 240e309b419..74ed065f013 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -117,7 +117,7 @@ public:
                               CORBA::Short priority) = 0;
 
   /// Return 1 if the @a endpoint has the same address as the acceptor.
-  virtual int is_collocated (const TAO_Endpoint* endpoint) = 0;
+  virtual int is_collocated (const TAO_Endpoint *endpoint) = 0;
 
   /**
    * Returns the number of endpoints this acceptor is listening on.  This
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 1fd2461becb..b24b2ef13ea 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -3,7 +3,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
-#include "tao/Environment.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/debug.h"
 #include "tao/Connect_Strategy.h"
@@ -86,7 +85,7 @@ TAO_Connector::~TAO_Connector (void)
 TAO_Profile *
 TAO_Connector::corbaloc_scan (const char *str,
                               size_t &len
-                              ACE_ENV_ARG_DECL)
+                              )
 {
   if (this->check_prefix (str) != 0)
     return 0;
@@ -99,13 +98,13 @@ TAO_Connector::corbaloc_scan (const char *str,
   else if (comma_pos == 0 || comma_pos > slash_pos)
     len = (slash_pos - str);
   else len = comma_pos - str;
-  return this->make_profile(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->make_profile();
 }
 
 int
 TAO_Connector::make_mprofile (const char *string,
                               TAO_MProfile &mprofile
-                              ACE_ENV_ARG_DECL)
+                              )
 {
   // This method utilizes the "Template Method" design pattern to
   // parse the given URL style IOR for the protocol being used
@@ -243,16 +242,14 @@ TAO_Connector::make_mprofile (const char *string,
           //    `endpoint/object_key'
 
           TAO_Profile *profile =
-            this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            this->make_profile ();
           // Failure:  Problem during profile creation
 
           // Initialize a Profile using the individual endpoint
           // string.
           // @@ Not exception safe!  We need a TAO_Profile_var!
           profile->parse_string (endpoint.c_str ()
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                );
 
           // Give up ownership of the profile.
           if (mprofile.give_profile (profile) == -1)
@@ -298,7 +295,7 @@ TAO_Transport*
 TAO_Connector::parallel_connect (TAO::Profile_Transport_Resolver *r,
                                  TAO_Transport_Descriptor_Interface *desc,
                                  ACE_Time_Value *timeout
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 )
 {
   if (this->supports_parallel_connects() == 0)
     {
@@ -361,7 +358,7 @@ TAO_Transport*
 TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
                         TAO_Transport_Descriptor_Interface *desc,
                         ACE_Time_Value *timeout
-                        ACE_ENV_ARG_DECL)
+                        )
 {
   if (desc == 0 ||
       (this->set_validate_endpoint (desc->endpoint ()) == -1))
@@ -410,7 +407,7 @@ TAO_Connector::connect (TAO::Profile_Transport_Resolver *r,
           return this->connect (r,
                                 desc,
                                 timeout
-                                ACE_ENV_ARG_PARAMETER);
+                               );
         }
 
       return t;
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index 22a99ac0e47..8de3a02fcbb 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -48,11 +48,6 @@ namespace TAO
   class Profile_Transport_Resolver;
 }
 
-namespace CORBA
-{
-  class Environment;
-}
-
 /*
  * Hook to add includes and forward declaration
  * to the Connector class.
@@ -89,10 +84,7 @@ public:
 
   /// Parse a string containing a URL style IOR and return an
   /// MProfile.  Verify that ior is in the correct format.
-  int make_mprofile (
-      const char *ior,
-      TAO_MProfile &mprofile
-      ACE_ENV_ARG_DECL);
+  int make_mprofile (const char *ior, TAO_MProfile &mprofile);
 
   /// Helper function to assist corbaloc parsing. The default simply validates
   /// the protocol identifyier and scans up to the next comma or slash.
@@ -100,13 +92,10 @@ public:
   /// method to  provide a custom scanner.
   /// The profile returned is either null if this the ior does not match or an
   /// empty profile of the correct type, obtained from make_profile().
-  virtual TAO_Profile * corbaloc_scan (const char *ior,
-                                       size_t &len
-                                       ACE_ENV_ARG_DECL);
+  virtual TAO_Profile *corbaloc_scan (const char *ior, size_t &len);
 
   ///  Initialize object and register with reactor.
-  virtual int open (
-      TAO_ORB_Core *orb_core) = 0;
+  virtual int open (TAO_ORB_Core *orb_core) = 0;
 
   /// Shutdown Connector bridge and concrete Connector.
   virtual int close (void) = 0;
@@ -116,29 +105,23 @@ public:
    * connect ()  method so it can be called from the invocation code
    * independent of the actual transport protocol in use.
    */
-  virtual TAO_Transport* connect (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface *desc,
-      ACE_Time_Value *timeout
-      ACE_ENV_ARG_DECL);
+  virtual TAO_Transport *connect (TAO::Profile_Transport_Resolver *r,
+                                  TAO_Transport_Descriptor_Interface *desc,
+                                  ACE_Time_Value *timeout);
 
   /// A variation on connect that will try simultanious connections
   /// on all endpoints listed in the desc.
-  virtual TAO_Transport* parallel_connect (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface *desc,
-      ACE_Time_Value *timeout
-      ACE_ENV_ARG_DECL);
+  virtual TAO_Transport *parallel_connect (TAO::Profile_Transport_Resolver *r,
+                                           TAO_Transport_Descriptor_Interface
+                                           *desc, ACE_Time_Value *timeout);
 
   /// Create a profile for this protocol and initialize it based on the
   /// encapsulation in @a cdr
-  virtual TAO_Profile *create_profile (
-      TAO_InputCDR& cdr) = 0;
+  virtual TAO_Profile *create_profile (TAO_InputCDR &cdr) = 0;
 
   /// Check that the prefix of the provided endpoint is valid for use
   /// with a given pluggable protocol.
-  virtual int check_prefix (
-      const char *endpoint) = 0;
+  virtual int check_prefix (const char *endpoint) = 0;
 
   /// Return the object key delimiter to use or expect.
   virtual char object_key_delimiter (void) const = 0;
@@ -152,17 +135,16 @@ protected:
   virtual int supports_parallel_connects (void) const;
 
   /// Create a profile with a given endpoint.
-  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL) = 0;
+  virtual TAO_Profile *make_profile (void) = 0;
 
   /// Set and validate endpoint. We need to do this to initialize our
   /// remote *_Addr's which have not been done during IOR decode.
   virtual int set_validate_endpoint (TAO_Endpoint *endpoint) = 0;
 
   /// Make a connection
-  virtual TAO_Transport* make_connection (
-      TAO::Profile_Transport_Resolver *r,
-      TAO_Transport_Descriptor_Interface &desc,
-      ACE_Time_Value *timeout) = 0;
+  virtual TAO_Transport *make_connection (TAO::Profile_Transport_Resolver *r,
+                                          TAO_Transport_Descriptor_Interface
+                                          &desc, ACE_Time_Value *timeout) = 0;
 
   /// Make a connection using - not a pure virtual since not all
   /// protocols support this.
@@ -172,8 +154,7 @@ protected:
       ACE_Time_Value *timeout);
 
   /// Cancel the passed cvs handler from the connector
-  virtual int cancel_svc_handler (
-      TAO_Connection_Handler *svc_handler) = 0;
+  virtual int cancel_svc_handler (TAO_Connection_Handler *svc_handler) = 0;
 
   /// Check whether the connection is not closed
   /**
@@ -181,8 +162,8 @@ protected:
    * because an other thread managed to open the handler
    * @retval -1 The connection is closed
    */
-  virtual int check_connection_closure (
-      TAO_Connection_Handler *connection_handler);
+  virtual int check_connection_closure (TAO_Connection_Handler
+                                        *connection_handler);
 
   /**
    * Wait for connection completion. We have a transport that is not
diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp
index fbf6595904a..0baa96ffe6c 100644
--- a/TAO/tao/Transport_Queueing_Strategies.cpp
+++ b/TAO/tao/Transport_Queueing_Strategies.cpp
@@ -92,17 +92,15 @@ namespace TAO
 
     TAO::BufferingConstraint buffering_constraint;
 
-    ACE_TRY_NEW_ENV
+    try
       {
         CORBA::Policy_var bcp_policy =
           stub->get_cached_policy (TAO_CACHED_POLICY_BUFFERING_CONSTRAINT
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                  );
 
         TAO::BufferingConstraintPolicy_var bcpv =
           TAO::BufferingConstraintPolicy::_narrow (bcp_policy.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                                  );
 
         TAO_Buffering_Constraint_Policy* bcp =
           dynamic_cast<TAO_Buffering_Constraint_Policy *> (bcpv.in ());
@@ -112,11 +110,10 @@ namespace TAO
           }
         bcp->get_buffering_constraint (buffering_constraint);
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
         return true;
       }
-    ACE_ENDTRY;
 
 
     if (buffering_constraint.mode == TAO::BUFFER_FLUSH)
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
index 3a8f77cdb6d..398bdc82136 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
@@ -21,7 +21,6 @@ TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal (
   TAO_OutputCDR & cdr,
   CORBA::ULong offset) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -40,7 +39,6 @@ bool
 TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal_kind (
   TAO_OutputCDR & cdr) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -69,7 +67,7 @@ TAO::TypeCodeFactory::Recursive_TypeCode::tao_release (void)
 
 CORBA::Boolean
 TAO::TypeCodeFactory::Recursive_TypeCode::equal_i (CORBA::TypeCode_ptr tc
-                                                   ACE_ENV_ARG_DECL) const
+                                                   ) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -81,12 +79,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::equal_i (CORBA::TypeCode_ptr tc
     }
 
   return this->the_typecode_->equal (tc
-                                     ACE_ENV_ARG_PARAMETER);
+                                    );
 }
 
 CORBA::Boolean
 TAO::TypeCodeFactory::Recursive_TypeCode::equivalent_i (CORBA::TypeCode_ptr tc
-                                                        ACE_ENV_ARG_DECL) const
+                                                        ) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -98,12 +96,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::equivalent_i (CORBA::TypeCode_ptr tc
     }
 
   return this->the_typecode_->equivalent (tc
-                                          ACE_ENV_ARG_PARAMETER);
+                                         );
 }
 
 CORBA::TypeCode_ptr
 TAO::TypeCodeFactory::Recursive_TypeCode::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -115,12 +113,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::get_compact_typecode_i (
     }
 
   return
-    this->the_typecode_->get_compact_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->the_typecode_->get_compact_typecode ();
 }
 
 char const *
 TAO::TypeCodeFactory::Recursive_TypeCode::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
+  void) const
 {
   // Ownership is retained by the TypeCode, as required by the C++
   // mapping.
@@ -129,7 +127,7 @@ TAO::TypeCodeFactory::Recursive_TypeCode::id_i (
 
 char const *
 TAO::TypeCodeFactory::Recursive_TypeCode::name_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -138,12 +136,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::name_i (
                         0);
     }
 
-  return this->the_typecode_->name (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->the_typecode_->name ();
 }
 
 CORBA::ULong
 TAO::TypeCodeFactory::Recursive_TypeCode::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -152,13 +150,13 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_count_i (
                         0);
     }
 
-  return this->the_typecode_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->the_typecode_->member_count ();
 }
 
 char const *
 TAO::TypeCodeFactory::Recursive_TypeCode::member_name_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -168,13 +166,13 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_name_i (
     }
 
   return this->the_typecode_->member_name (index
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
 }
 
 CORBA::TypeCode_ptr
 TAO::TypeCodeFactory::Recursive_TypeCode::member_type_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -184,13 +182,13 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_type_i (
     }
 
   return this->the_typecode_->member_type (index
-                                           ACE_ENV_ARG_PARAMETER);
+                                          );
 }
 
 CORBA::Any *
 TAO::TypeCodeFactory::Recursive_TypeCode::member_label_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -201,12 +199,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_label_i (
 
   return
     this->the_typecode_->member_label (index
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
 }
 
 CORBA::TypeCode_ptr
 TAO::TypeCodeFactory::Recursive_TypeCode::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -216,12 +214,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::discriminator_type_i (
     }
 
   return
-    this->the_typecode_->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->the_typecode_->discriminator_type ();
 }
 
 CORBA::Long
 TAO::TypeCodeFactory::Recursive_TypeCode::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -230,13 +228,13 @@ TAO::TypeCodeFactory::Recursive_TypeCode::default_index_i (
                         0);
     }
 
-  return this->the_typecode_->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->the_typecode_->default_index ();
 }
 
 CORBA::Visibility
 TAO::TypeCodeFactory::Recursive_TypeCode::member_visibility_i (
   CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
+  ) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -246,12 +244,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::member_visibility_i (
     }
 
   return this->the_typecode_->member_visibility (index
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                );
 }
 
 CORBA::ValueModifier
 TAO::TypeCodeFactory::Recursive_TypeCode::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -260,12 +258,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::type_modifier_i (
                         CORBA::VM_NONE);
     }
 
-  return this->the_typecode_->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->the_typecode_->type_modifier ();
 }
 
 CORBA::TypeCode_ptr
 TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
+  void) const
 {
   if (CORBA::is_nil (this->the_typecode_.in ()))
     {
@@ -275,7 +273,7 @@ TAO::TypeCodeFactory::Recursive_TypeCode::concrete_base_type_i (
     }
 
   return
-    this->the_typecode_->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->the_typecode_->concrete_base_type ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
index 0f92a9bdc8b..5b595e66d97 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
@@ -81,29 +81,29 @@ namespace TAO
        */
       //@{
       virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
+                                      ) const;
       virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual char const * id_i (void) const;
+      virtual char const * name_i (void) const;
+      virtual CORBA::ULong member_count_i (void) const;
       virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
+                                          ) const;
       virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
+                                                 ) const;
       virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
+                                           ) const;
       virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
+      virtual CORBA::Long default_index_i (void) const;
       virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
+                                                     ) const;
       virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
       virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
+        void) const;
 
       //@}
 
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
index 2a425197aa7..3fa0eeea203 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
@@ -18,14 +18,12 @@ TAO::TypeCodeFactory::Recursive_TypeCode::the_typecode (CORBA::TypeCode_ptr tc)
 {
   this->the_typecode_ = CORBA::TypeCode::_duplicate (tc);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // @@ Lazy, I know.  :(
   CORBA::TCKind & mutable_kind =
     const_cast<CORBA::TCKind &> (this->kind_);
 
-  mutable_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  mutable_kind = tc->kind ();
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 29fb9ac421f..5840ace6337 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -22,17 +22,12 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc (
     const char * id,
     const char * name,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::StructMemberSeq & members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_struct_tc (id,
-                               name,
-                               members
-                               ACE_ENV_ARG_PARAMETER);
+  return tcf.create_struct_tc (id, name, members);
 }
 
 CORBA::TypeCode_ptr
@@ -40,9 +35,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
     const char * id,
     const char * name,
     CORBA::TypeCode_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::UnionMemberSeq & members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
@@ -51,16 +44,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
                               name,
                               discriminator_type,
                               members
-                              ACE_ENV_ARG_PARAMETER);
+                             );
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
     const char * id,
     const char * name,
-    const CORBA::EnumMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::EnumMemberSeq & members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
@@ -68,16 +59,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
   return tcf.create_enum_tc (id,
                              name,
                              members
-                             ACE_ENV_ARG_PARAMETER);
+                            );
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc (
     const char * id,
     const char * name,
-    CORBA::TypeCode_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr original_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
@@ -85,16 +74,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc (
   return tcf.create_alias_tc (id,
                               name,
                               original_type
-                              ACE_ENV_ARG_PARAMETER);
+                             );
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc (
     const char * id,
     const char * name,
-    const CORBA::StructMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::StructMemberSeq & members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
@@ -102,93 +89,71 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc (
   return tcf.create_exception_tc (id,
                                   name,
                                   members
-                                  ACE_ENV_ARG_PARAMETER);
+                                 );
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc (
     const char * id,
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
+    const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_interface_tc (id,
                                   name
-                                  ACE_ENV_ARG_PARAMETER);
+                                 );
 }
 
 CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
+TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_string_tc (bound
-                               ACE_ENV_ARG_PARAMETER);
+  return tcf.create_string_tc (bound);
 }
 
 CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
+TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_wstring_tc (bound
-                                ACE_ENV_ARG_PARAMETER);
+  return tcf.create_wstring_tc (bound);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc (
     CORBA::UShort digits,
-    CORBA::UShort scale
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::UShort scale)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_fixed_tc (digits,
-                              scale
-                              ACE_ENV_ARG_PARAMETER);
+  return tcf.create_fixed_tc (digits, scale);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc (
     CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr element_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_sequence_tc (bound,
-                                 element_type
-                                 ACE_ENV_ARG_PARAMETER);
+  return tcf.create_sequence_tc (bound, element_type);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_array_tc (
     CORBA::ULong length,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr element_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_array_tc (length,
-                              element_type
-                              ACE_ENV_ARG_PARAMETER);
+  return tcf.create_array_tc (length, element_type);
 }
 
 CORBA::TypeCode_ptr
@@ -197,9 +162,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc (
     const char * name,
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq & members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::ValueMemberSeq & members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
@@ -208,113 +171,83 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc (
                               name,
                               type_modifier,
                               concrete_base,
-                              members
-                              ACE_ENV_ARG_PARAMETER);
+                              members);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc (
     const char * id,
     const char * name,
-    CORBA::TypeCode_ptr boxed_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr boxed_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_value_box_tc (id,
-                                  name,
-                                  boxed_type
-                                  ACE_ENV_ARG_PARAMETER);
+  return tcf.create_value_box_tc (id, name, boxed_type);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_native_tc (
     const char * id,
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
+    const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_native_tc (id,
-                               name
-                               ACE_ENV_ARG_PARAMETER);
+  return tcf.create_native_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc (
-    const char * id
-    ACE_ENV_ARG_DECL
-  )
+TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc (const char * id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_recursive_tc (id
-                                  ACE_ENV_ARG_PARAMETER);
+  return tcf.create_recursive_tc (id);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc (
     const char * id,
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
+    const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_abstract_interface_tc (id,
-                                           name
-                                           ACE_ENV_ARG_PARAMETER);
+  return tcf.create_abstract_interface_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc (
     const char * id,
-    const char * name
-    ACE_ENV_ARG_DECL
-  )
+    const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_local_interface_tc (id,
-                                        name
-                                        ACE_ENV_ARG_PARAMETER);
+  return tcf.create_local_interface_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_component_tc (
     const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+    const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_component_tc (id,
-                                  name
-                                  ACE_ENV_ARG_PARAMETER);
+  return tcf.create_component_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_home_tc (
     const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+    const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_home_tc (id,
-                             name
-                             ACE_ENV_ARG_PARAMETER);
+  return tcf.create_home_tc (id, name);
 }
 
 CORBA::TypeCode_ptr
@@ -323,9 +256,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_event_tc (
     const char *name,
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::ValueMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
@@ -335,7 +266,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_event_tc (
                               type_modifier,
                               concrete_base,
                               members
-                              ACE_ENV_ARG_PARAMETER);
+                             );
 }
 
 // --
@@ -346,7 +277,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
   char const * /* name */,
   ACE_Array_Base<CORBA::String_var> const & /* enumerators */,
   CORBA::ULong /* ncases */
-  ACE_ENV_ARG_DECL)
+  )
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
 }
@@ -360,7 +291,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_except_tc (
     TAO::TypeCode::Struct_Field<CORBA::String_var,
                                 CORBA::TypeCode_var> > const & /* fields */,
   CORBA::ULong /* nfields */
-  ACE_ENV_ARG_DECL)
+  )
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
 }
@@ -376,7 +307,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
   CORBA::Long /* default_index */,
   char const * /* default_case_name */,
   CORBA::TypeCode_ptr /* default_case_type */
-  ACE_ENV_ARG_DECL)
+  )
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
 }
@@ -392,7 +323,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_event_tc (
     TAO::TypeCode::Value_Field<CORBA::String_var,
                                CORBA::TypeCode_var> > const & /* fields */,
   CORBA::ULong /* nfields */
-  ACE_ENV_ARG_DECL)
+  )
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
 }
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
index 5f20f2af5b8..961f84e4f09 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -45,82 +45,60 @@ public:
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const CORBA::StructMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const CORBA::UnionMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const CORBA::EnumMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      CORBA::TypeCode_ptr original_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const CORBA::StructMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_string_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      CORBA::UShort scale)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      CORBA::TypeCode_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      CORBA::TypeCode_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_tc (
@@ -128,58 +106,42 @@ public:
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const CORBA::ValueMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr boxed_type
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      CORBA::TypeCode_ptr boxed_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
-      const char *id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const char *id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_event_tc (
@@ -187,9 +149,7 @@ public:
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
+      const CORBA::ValueMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -204,8 +164,7 @@ public:
     char const * id,
     char const * name,
     ACE_Array_Base<CORBA::String_var> const & enumerators,
-    CORBA::ULong ncases
-    ACE_ENV_ARG_DECL);
+    CORBA::ULong ncases);
 
   /// Create a structure or exception TypeCode.
   virtual CORBA::TypeCode_ptr create_struct_except_tc (
@@ -215,8 +174,7 @@ public:
     ACE_Array_Base<
       TAO::TypeCode::Struct_Field<CORBA::String_var,
                                   CORBA::TypeCode_var> > const & fields,
-    CORBA::ULong nfields
-    ACE_ENV_ARG_DECL);
+    CORBA::ULong nfields);
 
   /// Create a union TypeCode.
   virtual CORBA::TypeCode_ptr create_union_tc (
@@ -228,8 +186,7 @@ public:
     CORBA::ULong ncases,
     CORBA::Long default_index,
     char const * default_case_name,
-    CORBA::TypeCode_ptr default_case_type
-    ACE_ENV_ARG_DECL);
+    CORBA::TypeCode_ptr default_case_type);
 
   /// Create a valuetype or eventtype TypeCode.
   virtual CORBA::TypeCode_ptr create_value_event_tc (
@@ -241,8 +198,7 @@ public:
     ACE_Array_Base<
       TAO::TypeCode::Value_Field<CORBA::String_var,
                                  CORBA::TypeCode_var> > const & fields,
-    CORBA::ULong nfields
-    ACE_ENV_ARG_DECL);
+    CORBA::ULong nfields);
   //@}
 
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index 36d20aeda87..2562e71c5bc 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -32,8 +32,7 @@ TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
 CORBA::Object_ptr
 TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr,
                                            int,
-                                           ACE_TCHAR * []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           ACE_TCHAR * [])
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index 55a524c32b8..9030064bbc6 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -42,7 +42,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            ACE_TCHAR *argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to force the initialization of the ORB code.
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 6183754d39b..c996a43c1f2 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -114,8 +114,7 @@ TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i (void)
 }
 
 TAO_TypeCodeFactory_i *
-TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr _tao_objref
-                                ACE_ENV_ARG_DECL_NOT_USED)
+TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr _tao_objref)
 {
   if (CORBA::is_nil (_tao_objref))
     {
@@ -129,16 +128,13 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_struct_tc (
     const char *id,
     const char *name,
-    const CORBA::StructMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->struct_except_tc_common (id,
                                         name,
                                         members,
-                                        CORBA::tk_struct
-                                        ACE_ENV_ARG_PARAMETER);
+                                        CORBA::tk_struct);
 }
 
 CORBA::TypeCode_ptr
@@ -146,9 +142,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_ptr discriminator_type,
-    const CORBA::UnionMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::UnionMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
@@ -168,9 +162,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
     }
 
   CORBA::Boolean const good_disc_type =
-    this->valid_disc_type (discriminator_type
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
+    this->valid_disc_type (discriminator_type);
 
   if (!good_disc_type)
     {
@@ -207,9 +199,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
           if (ACE_OS::strcmp (member_name, members[i - 1].name) == 0)
             {
               CORBA::Boolean const equiv =
-                member.type.in ()->equivalent (members[i - 1].type.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (tc);
+                member.type.in ()->equivalent (members[i - 1].type.in ());
 
               // If adjacent names are the same and their types are
               // equivalent, then they are duplicate case labels. If
@@ -257,8 +247,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
       // Valid member type?
       CORBA::Boolean const valid_member =
         this->valid_content_type (tc_holder
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
+                                 );
 
       if (!valid_member)
         {
@@ -286,8 +275,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
           CORBA::Boolean const equiv =
             discriminator_type->equivalent (tmp.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (tc);
+                                           );
 
           if (!equiv)
             {
@@ -302,8 +290,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
     this->unique_label_values (members,
                                discriminator_type,
                                raw_default_index
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
+                              );
 
   if (!unique_labels)
     {
@@ -317,8 +304,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
   case_array_type cases (len - dups);
 
   CORBA::TCKind const kind =
-    discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
+    discriminator_type->kind ();
 
   CORBA::ULong ci = 0;  // Case array index.
 
@@ -346,8 +332,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
                                id,
                                member.type.in (),
                                recursive_tc.inout ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
+                              );
 
       // Do not clobber previous positive detection.
       if (recursion_detected)
@@ -413,7 +398,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 ACE_NEW_THROW_EX (the_case,
                                   case_type (label),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
               }
               break;
             case CORBA::tk_ulong:
@@ -435,7 +419,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 ACE_NEW_THROW_EX (the_case,
                                   case_type (label),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
               }
               break;
             case CORBA::tk_long:
@@ -457,7 +440,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 ACE_NEW_THROW_EX (the_case,
                                   case_type (label),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
               }
               break;
             case CORBA::tk_ushort:
@@ -479,7 +461,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 ACE_NEW_THROW_EX (the_case,
                                   case_type (label),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
               }
               break;
             case CORBA::tk_short:
@@ -501,7 +482,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 ACE_NEW_THROW_EX (the_case,
                                   case_type (label),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
               }
               break;
             case CORBA::tk_char:
@@ -523,7 +503,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 ACE_NEW_THROW_EX (the_case,
                                   case_type (label),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
               }
               break;
             case CORBA::tk_boolean:
@@ -545,7 +524,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 ACE_NEW_THROW_EX (the_case,
                                   case_type (label),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
               }
               break;
             case CORBA::tk_longlong:
@@ -567,7 +545,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 ACE_NEW_THROW_EX (the_case,
                                   case_type (label),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
               }
               break;
 #if !defined (ACE_LACKS_LONGLONG_T)
@@ -590,7 +567,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                 ACE_NEW_THROW_EX (the_case,
                                   case_type (label),
                                   CORBA::NO_MEMORY ());
-                ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
               }
               break;
 #endif  /* !ACE_LACKS_LONGLONG_T */
@@ -639,7 +615,6 @@ TAO_TypeCodeFactory_i::create_union_tc (
                                    cases.size (),
                                    default_index),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return tc;
 }
@@ -648,9 +623,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_enum_tc (
     const char *id,
     const char *name,
-    const CORBA::EnumMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::EnumMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
@@ -702,7 +675,6 @@ TAO_TypeCodeFactory_i::create_enum_tc (
                                    enumerators,
                                    len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
 
   return tc;
 }
@@ -711,78 +683,59 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_alias_tc (
     const char *id,
     const char *name,
-    CORBA::TypeCode_ptr original_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr original_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->alias_value_box_tc_common (id,
                                           name,
                                           original_type,
-                                          CORBA::tk_alias
-                                          ACE_ENV_ARG_PARAMETER);
+                                          CORBA::tk_alias);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_exception_tc (
     const char *id,
     const char *name,
-    const CORBA::StructMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::StructMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->struct_except_tc_common (id,
                                         name,
                                         members,
-                                        CORBA::tk_except
-                                        ACE_ENV_ARG_PARAMETER);
+                                        CORBA::tk_except);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_interface_tc (
     const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+    const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_objref
-                                 ACE_ENV_ARG_PARAMETER);
+                                 CORBA::tk_objref);
 }
 
 CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_string_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
+TAO_TypeCodeFactory_i::create_string_tc (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->string_wstring_tc_common (bound,
-                                         CORBA::tk_string
-                                         ACE_ENV_ARG_PARAMETER);
+                                         CORBA::tk_string);
 }
 
 CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_wstring_tc (
-    CORBA::ULong bound
-    ACE_ENV_ARG_DECL
-  )
+TAO_TypeCodeFactory_i::create_wstring_tc (CORBA::ULong bound)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->string_wstring_tc_common (bound,
-                                         CORBA::tk_wstring
-                                         ACE_ENV_ARG_PARAMETER);
+                                         CORBA::tk_wstring);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_fixed_tc (
     CORBA::UShort digits,
-    CORBA::UShort scale
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::UShort scale)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_ptr tc;
@@ -790,7 +743,6 @@ TAO_TypeCodeFactory_i::create_fixed_tc (
                     TAO::TypeCode::Fixed<TAO::True_RefCount_Policy> (digits,
                                                                      scale),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
 
   return tc;
 }
@@ -798,29 +750,23 @@ TAO_TypeCodeFactory_i::create_fixed_tc (
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_sequence_tc (
     CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr element_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return sequence_array_tc_common (bound,
                                    element_type,
-                                   CORBA::tk_sequence
-                                   ACE_ENV_ARG_PARAMETER);
+                                   CORBA::tk_sequence);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_array_tc (
     CORBA::ULong length,
-    CORBA::TypeCode_ptr element_type
-    ACE_ENV_ARG_DECL
-  )
+    CORBA::TypeCode_ptr element_type)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return sequence_array_tc_common (length,
                                    element_type,
-                                   CORBA::tk_array
-                                   ACE_ENV_ARG_PARAMETER);
+                                   CORBA::tk_array);
 }
 
 CORBA::TypeCode_ptr
@@ -830,7 +776,6 @@ TAO_TypeCodeFactory_i::create_value_tc (
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
     const CORBA::ValueMemberSeq &members
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -840,7 +785,7 @@ TAO_TypeCodeFactory_i::create_value_tc (
                                       concrete_base,
                                       members,
                                       CORBA::tk_value
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 }
 
 CORBA::TypeCode_ptr
@@ -848,7 +793,6 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_ptr boxed_type
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -856,28 +800,24 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
                                           name,
                                           boxed_type,
                                           CORBA::tk_value_box
-                                          ACE_ENV_ARG_PARAMETER);
+                                         );
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_native_tc (
     const char *id,
     const char *name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
                                  CORBA::tk_native
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
 }
 
 CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_recursive_tc (
-    const char *id
-    ACE_ENV_ARG_DECL
-  )
+TAO_TypeCodeFactory_i::create_recursive_tc (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
@@ -892,7 +832,6 @@ TAO_TypeCodeFactory_i::create_recursive_tc (
   ACE_NEW_THROW_EX (tc,
                     TAO::TypeCodeFactory::Recursive_TypeCode (id),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
 
   return tc;
 }
@@ -901,56 +840,47 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_abstract_interface_tc (
     const char *id,
     const char *name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
                                  CORBA::tk_abstract_interface
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_local_interface_tc (
     const char *id,
     const char *name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
                                  CORBA::tk_local_interface
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_component_tc (
     const char *id,
     const char *name
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_component
-                                 ACE_ENV_ARG_PARAMETER);
+                                 CORBA::tk_component);
 }
 
 CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::create_home_tc (
-    const char *id,
-    const char *name
-    ACE_ENV_ARG_DECL
-  )
+TAO_TypeCodeFactory_i::create_home_tc (const char *id, const char *name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_home
-                                 ACE_ENV_ARG_PARAMETER);
+                                 CORBA::tk_home);
 }
 
 CORBA::TypeCode_ptr
@@ -959,9 +889,7 @@ TAO_TypeCodeFactory_i::create_event_tc (
     const char *name,
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
-    const CORBA::ValueMemberSeq &members
-    ACE_ENV_ARG_DECL
-  )
+    const CORBA::ValueMemberSeq &members)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_event_tc_common (id,
@@ -969,8 +897,7 @@ TAO_TypeCodeFactory_i::create_event_tc (
                                       type_modifier,
                                       concrete_base,
                                       members,
-                                      CORBA::tk_event
-                                      ACE_ENV_ARG_PARAMETER);
+                                      CORBA::tk_event);
 }
 
 // =====================================================================
@@ -1235,7 +1162,7 @@ TAO_TypeCodeFactory_i::create_tc_common (
     const char *id,
     const char *name,
     CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
+
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1262,7 +1189,6 @@ TAO_TypeCodeFactory_i::create_tc_common (
   ACE_NEW_THROW_EX (tc,
                     typecode_type (kind, id, name),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
 
   return tc;
 }
@@ -1271,7 +1197,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::string_wstring_tc_common (
     CORBA::ULong bound,
     CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1280,7 +1206,6 @@ TAO_TypeCodeFactory_i::string_wstring_tc_common (
                     TAO::TypeCode::String<TAO::True_RefCount_Policy> (kind,
                                                                       bound),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
 
   return tc;
 }
@@ -1290,7 +1215,7 @@ TAO_TypeCodeFactory_i::sequence_array_tc_common (
     CORBA::ULong bound,
     CORBA::TypeCode_ptr element_type,
     CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1298,8 +1223,7 @@ TAO_TypeCodeFactory_i::sequence_array_tc_common (
 
   CORBA::Boolean const valid_element =
     this->valid_content_type (element_type
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
+                             );
 
   if (!valid_element)
     {
@@ -1316,7 +1240,6 @@ TAO_TypeCodeFactory_i::sequence_array_tc_common (
   ACE_NEW_THROW_EX (tc,
                     typecode_type (kind, tmp, bound),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
 
   return tc;
 }
@@ -1327,7 +1250,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
     const char *name,
     const CORBA::StructMemberSeq & members,
     CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
+
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1366,8 +1289,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
 
       CORBA::Boolean const valid_member =
         this->valid_content_type (member_tc
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
+                                 );
 
       if (!valid_member)
         {
@@ -1405,8 +1327,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
                                id,
                                member_tc,
                                recursive_tc.inout ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
+                              );
 
       // Do not clobber previous positive detection.
       if (recursion_detected)
@@ -1435,7 +1356,6 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
                                    fields,
                                    len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
 
   return tc;
 }
@@ -1446,7 +1366,6 @@ TAO_TypeCodeFactory_i::alias_value_box_tc_common (
     const char *name,
     CORBA::TypeCode_ptr underlying_type,
     CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1467,9 +1386,7 @@ TAO_TypeCodeFactory_i::alias_value_box_tc_common (
     }
 
   CORBA::Boolean const valid_content =
-    this->valid_content_type (underlying_type
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (tc);
+    this->valid_content_type (underlying_type);
 
   if (!valid_content)
     {
@@ -1487,7 +1404,6 @@ TAO_TypeCodeFactory_i::alias_value_box_tc_common (
   ACE_NEW_THROW_EX (tc,
                     typecode_type (kind, id, name, tmp),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
 
   return tc;
 }
@@ -1500,7 +1416,7 @@ TAO_TypeCodeFactory_i::value_event_tc_common (
     CORBA::TypeCode_ptr concrete_base,
     const CORBA::ValueMemberSeq &members,
     CORBA::TCKind kind
-    ACE_ENV_ARG_DECL
+
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1537,9 +1453,7 @@ TAO_TypeCodeFactory_i::value_event_tc_common (
       CORBA::TypeCode_ptr const member_tc = members[index].type.in ();
 
       CORBA::Boolean const valid_member =
-        this->valid_content_type (member_tc
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
+        this->valid_content_type (member_tc);
 
       if (!valid_member)
         {
@@ -1574,8 +1488,7 @@ TAO_TypeCodeFactory_i::value_event_tc_common (
                                id,
                                member_tc,
                                recursive_tc.inout ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (tc);
+                              );
 
       // Do not clobber previous positive detection.
       if (recursion_detected)
@@ -1619,7 +1532,6 @@ TAO_TypeCodeFactory_i::value_event_tc_common (
                                    fields,
                                    len),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (tc);
 
   return tc;
 }
@@ -1630,12 +1542,12 @@ TAO_TypeCodeFactory_i::valid_name (const char *name)
   // Empty string is valid for name.
   if (*name == '\0')
     {
-      return 1;
+      return true;
     }
 
   if (!isalpha (*name))
     {
-      return 0;
+      return false;
     }
 
   const char *tmp = name + 1;
@@ -1648,11 +1560,11 @@ TAO_TypeCodeFactory_i::valid_name (const char *name)
         }
       else
         {
-          return 0;
+          return false;
         }
     }
 
-  return 1;
+  return true;
 }
 
 CORBA::Boolean
@@ -1683,23 +1595,20 @@ TAO_TypeCodeFactory_i::valid_id (const char *id)
 }
 
 CORBA::Boolean
-TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL)
+TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc)
 {
   CORBA::TCKind const kind =
-    TAO::unaliased_kind (tc
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    TAO::unaliased_kind (tc);
 
   switch (kind)
   {
     case CORBA::TAO_TC_KIND_COUNT:
-      return 1;  // Recursive TypeCode.
+      return true;  // Recursive TypeCode.
     case CORBA::tk_void:
     case CORBA::tk_except:
-      return 0;
+      return false;
     default:
-      return 1;
+      return true;
   }
 }
 
@@ -1708,10 +1617,9 @@ TAO_TypeCodeFactory_i::unique_label_values (
   const CORBA::UnionMemberSeq &members,
   CORBA::TypeCode_ptr disc_tc,
   CORBA::ULong default_index_slot
-  ACE_ENV_ARG_DECL)
+  )
 {
-  CORBA::TCKind disc_kind = disc_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TCKind disc_kind = disc_tc->kind ();
 
   CORBA::ULong length = members.length ();
 
@@ -1861,10 +1769,9 @@ TAO_TypeCodeFactory_i::unique_label_values (
 
 CORBA::Boolean
 TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc
-                                        ACE_ENV_ARG_DECL)
+                                        )
 {
-  CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::TCKind const kind = tc->kind ();
 
   return
     (kind == CORBA::tk_enum
@@ -1882,8 +1789,7 @@ bool
 TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
                                         char const * id,
                                         CORBA::TypeCode_ptr member,
-                                        CORBA::TypeCode_ptr & recursive_tc
-                                        ACE_ENV_ARG_DECL)
+                                        CORBA::TypeCode_ptr & recursive_tc)
 {
   if (kind != CORBA::tk_struct
       && kind != CORBA::tk_union
@@ -1892,13 +1798,10 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
     return false;
 
   CORBA::TypeCode_var unaliased_member =
-    TAO::unaliased_typecode (member
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    TAO::unaliased_typecode (member);
 
   CORBA::TCKind const unaliased_member_kind =
-    unaliased_member->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    unaliased_member->kind ();
 
   // Recursively iterate through the member and content types until
   // we've exhausted all TypeCodes capable of containing other
@@ -1911,19 +1814,15 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
     case CORBA::tk_event:
       {
         CORBA::ULong const nfields =
-          unaliased_member->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
+          unaliased_member->member_count ();
 
         for (CORBA::ULong i = 0; i < nfields; ++i)
           {
             CORBA::TypeCode_var member_tc =
-              unaliased_member->member_type (i
-                                             ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (false);
+              unaliased_member->member_type (i);
 
             CORBA::TCKind const member_tc_kind =
-              member_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK_RETURN (false);
+              member_tc->kind ();
 
             if (member_tc_kind == CORBA::TAO_TC_KIND_COUNT)
               {
@@ -1934,8 +1833,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
                 if (kind == CORBA::tk_value || kind == CORBA::tk_event)
                   {
                     char const * member_tc_id =
-                      member_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-                    ACE_CHECK_RETURN (false);
+                      member_tc->id ();
 
                     if (ACE_OS::strcmp (id, member_tc_id) == 0)
                       {
@@ -1951,8 +1849,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
                             recursive_tc =
                               this->make_recursive_tc (kind,
                                                        id
-                                                       ACE_ENV_ARG_PARAMETER);
-                            ACE_CHECK_RETURN (false);
+                                                      );
                           }
 
                         // Set the actual recursive TypeCode.
@@ -1980,8 +1877,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
                                          id,
                                          member_tc.in (),
                                          recursive_tc
-                                         ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (false);
+                                        );
 
                 if (recursion_detected)
                   {
@@ -1999,18 +1895,15 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
     case CORBA::tk_array:
       {
         CORBA::TypeCode_var content_tc =
-          unaliased_member->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
+          unaliased_member->content_type ();
 
         CORBA::TCKind const content_tc_kind =
-          content_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK_RETURN (false);
+          content_tc->kind ();
 
         if (content_tc_kind == CORBA::TAO_TC_KIND_COUNT)
           {
             char const * content_tc_id =
-              content_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK_RETURN (false);
+              content_tc->id ();
 
             if (ACE_OS::strcmp (id, content_tc_id) == 0)
               {
@@ -2025,8 +1918,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
                     recursive_tc =
                       this->make_recursive_tc (kind,
                                                id
-                                               ACE_ENV_ARG_PARAMETER);
-                    ACE_CHECK_RETURN (false);
+                                              );
                   }
 
                 // Set the actual recursive TypeCode.
@@ -2042,7 +1934,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
                                       id,
                                       content_tc.in (),
                                       recursive_tc
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
       }
 
     default:
@@ -2053,9 +1945,7 @@ TAO_TypeCodeFactory_i::check_recursion (CORBA::TCKind kind,
 }
 
 CORBA::TypeCode_ptr
-TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind,
-                                          char const * id
-                                          ACE_ENV_ARG_DECL)
+TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind, char const * id)
 {
   CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
 
@@ -2065,14 +1955,12 @@ TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind,
       ACE_NEW_THROW_EX (tc,
                         TCF::Struct::recursive_typecode_type (kind, id),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (tc);
       break;
 
     case CORBA::tk_union:
       ACE_NEW_THROW_EX (tc,
                         TCF::Union::recursive_typecode_type (kind, id),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (tc);
       break;
 
     case CORBA::tk_value:
@@ -2080,7 +1968,6 @@ TAO_TypeCodeFactory_i::make_recursive_tc (CORBA::TCKind kind,
       ACE_NEW_THROW_EX (tc,
                         TCF::Value::recursive_typecode_type (kind, id),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (tc);
       break;
 
     default:  // Should never hit this case.
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index e463d0a4169..2d512cbf276 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -59,89 +59,65 @@ public:
   ~TAO_TypeCodeFactory_i (void);
 
   /// = LocalObject methods
-  static TAO_TypeCodeFactory_i *_narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL);
+  static TAO_TypeCodeFactory_i *_narrow (CORBA::Object_ptr obj);
 
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::StructMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::UnionMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::EnumMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TypeCode_ptr original_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::StructMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_string_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
-      CORBA::ULong bound
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::ULong bound)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::UShort scale)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TypeCode_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TypeCode_ptr element_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_tc (
@@ -149,58 +125,42 @@ public:
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::ValueMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr boxed_type
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TypeCode_ptr boxed_type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
-      const char *id
-      ACE_ENV_ARG_DECL
-    )
+      const char *id)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_event_tc (
@@ -208,9 +168,7 @@ public:
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::ValueMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -224,26 +182,20 @@ private:
   CORBA::TypeCode_ptr create_tc_common (
       const char *id,
       const char *name,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TCKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Code for strings and wstrings is identical except for TCKind.
   CORBA::TypeCode_ptr string_wstring_tc_common (
       CORBA::ULong bound,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TCKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Code for arrays and sequences is identical except for TCKind.
   CORBA::TypeCode_ptr sequence_array_tc_common (
       CORBA::ULong bound,
       CORBA::TypeCode_ptr element_type,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TCKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Code for structs and unions is identical except for TCKind.
@@ -251,9 +203,7 @@ private:
       const char *id,
       const char *name,
       const CORBA::StructMemberSeq &members,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TCKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Code for aliases and boxed valuetypes is identical except for TCKind.
@@ -261,9 +211,7 @@ private:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr underlying_type,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TCKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr value_event_tc_common (
@@ -272,23 +220,18 @@ private:
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA::ValueMemberSeq &members,
-      CORBA::TCKind kind
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TCKind kind)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If any of these fail, we raise a spec-defined minor code
   /// of BAD_PARAM or BAD_TYPECODE.
   CORBA::Boolean valid_name (const char *name);
   CORBA::Boolean valid_id (const char *id);
-  CORBA::Boolean valid_content_type (CORBA::TypeCode_ptr tc
-                                     ACE_ENV_ARG_DECL);
+  CORBA::Boolean valid_content_type (CORBA::TypeCode_ptr tc);
   CORBA::Boolean unique_label_values (const CORBA::UnionMemberSeq &members,
                                       CORBA::TypeCode_ptr disc_tc,
-                                      CORBA::ULong default_index_slot
-                                      ACE_ENV_ARG_DECL);
-  CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc
-                                  ACE_ENV_ARG_DECL);
+                                      CORBA::ULong default_index_slot);
+  CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc);
 
   /// Check @a member for recursive @c TypeCode.
   /**
@@ -300,13 +243,11 @@ private:
   bool check_recursion (CORBA::TCKind kind,
                         char const * id,
                         CORBA::TypeCode_ptr member,
-                        CORBA::TypeCode_ptr & recursive_tc
-                        ACE_ENV_ARG_DECL);
+                        CORBA::TypeCode_ptr & recursive_tc);
 
   /// Make a recursive TypeCode with the given kind and repository ID.
   CORBA::TypeCode_ptr make_recursive_tc (CORBA::TCKind kind,
-                                         char const * id
-                                         ACE_ENV_ARG_DECL);
+                                         char const * id);
 
   /// Prohibited
   TAO_TypeCodeFactory_i (const TAO_TypeCodeFactory_i &src);
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 67353a5d2da..9c954c7a864 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -71,81 +71,65 @@ public:
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::StructMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
-      const CORBA::UnionMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::UnionMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      const CORBA::EnumMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::EnumMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type
-      ACE_ENV_ARG_DECL
-    )
+      CORBA::TypeCode_ptr original_type)
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      const CORBA::StructMemberSeq &members
-      ACE_ENV_ARG_DECL
-    )
+      const CORBA::StructMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_string_tc (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
       CORBA::ULong bound
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
       CORBA::UShort scale
-      ACE_ENV_ARG_DECL
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
       CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
       CORBA::TypeCode_ptr element_type
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
@@ -155,7 +139,6 @@ public:
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
@@ -163,49 +146,37 @@ public:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr boxed_type
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
       const char *name
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
-      const char *id
-      ACE_ENV_ARG_DECL
-    )
+      const char *id)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       const char *id,
-      const char *name
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
+      const char *name)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual CORBA::TypeCode_ptr create_event_tc (
@@ -213,9 +184,7 @@ public:
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
+      const CORBA::ValueMemberSeq &members)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   // --
@@ -233,7 +202,7 @@ public:
     char const * name,
     ACE_Array_Base<CORBA::String_var> const & enumerators,
     CORBA::ULong ncases
-    ACE_ENV_ARG_DECL) = 0;
+    ) = 0;
 
   /// Create a structure or exception TypeCode.
   virtual CORBA::TypeCode_ptr create_struct_except_tc (
@@ -244,7 +213,7 @@ public:
       TAO::TypeCode::Struct_Field<CORBA::String_var,
                                   CORBA::TypeCode_var> > const & fields,
     CORBA::ULong nfields
-    ACE_ENV_ARG_DECL) = 0;
+    ) = 0;
 
   /// Create a union TypeCode.
   virtual CORBA::TypeCode_ptr create_union_tc (
@@ -257,7 +226,7 @@ public:
     CORBA::Long default_index,
     char const * default_case_name,
     CORBA::TypeCode_ptr default_case_type
-    ACE_ENV_ARG_DECL) = 0;
+    ) = 0;
 
   /// Create a valuetype or eventtype TypeCode.
   virtual CORBA::TypeCode_ptr create_value_event_tc (
@@ -270,7 +239,7 @@ public:
       TAO::TypeCode::Value_Field<CORBA::String_var,
                                  CORBA::TypeCode_var> > const & fields,
     CORBA::ULong nfields
-    ACE_ENV_ARG_DECL) = 0;
+    ) = 0;
   //@}
 
 };
diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h
index 34329085baa..e5279f2c4c5 100644
--- a/TAO/tao/UserException.h
+++ b/TAO/tao/UserException.h
@@ -43,20 +43,19 @@ namespace CORBA
   public:
 
     /// Copy constructor.
-    UserException (UserException const & rhs);
+    UserException (UserException const &rhs);
 
     /// Destructor.
     virtual ~UserException (void);
 
     /// Assignment operator.
-    UserException & operator= (UserException const & rhs);
+    UserException &operator= (UserException const &rhs);
 
     /// The narrow operation.
-    static UserException * _downcast (CORBA::Exception * exception);
+    static UserException *_downcast (CORBA::Exception *exception);
 
-        /// The const version of narrow operation
-    static const UserException * _downcast (
-      CORBA::Exception const * exception);
+    /// The const version of narrow operation
+    static const UserException *_downcast (CORBA::Exception const *exception);
 
     virtual void _raise (void) const = 0;
 
@@ -65,8 +64,7 @@ namespace CORBA
     // = TAO specific extension.
 
     /// Constructor from a repository id.
-    UserException (char const * repository_id,
-                   char const * local_name);
+    UserException (char const *repository_id, char const *local_name);
 
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp
index 9e0fb6444f9..b1799cf088b 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -12,27 +12,22 @@ TAO::Utils::Implicit_Deactivation_Functor::operator () (
    PortableServer::ServantBase * servant)
   ACE_THROW_SPEC (())
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa (servant->_default_POA (
-          ACE_ENV_SINGLE_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+          ));
 
       PortableServer::ObjectId_var id (poa->servant_to_id (servant
-                                                           ACE_ENV_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+                                                          ));
 
       poa->deactivate_object (id.in()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             );
     }
-  ACE_CATCHALL
+  catch (...)
     {
       // @@ Cannot let exceptions escape, yet we need to log them!
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp
index 8b8a74220ff..f21bef3f86d 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -11,17 +11,14 @@ void
 TAO::Utils::ORB_Destroyer_Functor::operator() (CORBA::ORB_ptr orb)
   ACE_THROW_SPEC (())
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHALL
+  catch (...)
     {
       // @@ Cannot let exceptions escape, yet we need to log them!
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index d777b683ab8..e07ded0d198 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -41,27 +41,26 @@ TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
 int
 TAO_ORB_Manager::init (int &argc,
                        char **argv
-                       ACE_ENV_ARG_DECL)
+                       )
 {
   return this->init (argc,
                      argv,
                      0
-                     ACE_ENV_ARG_PARAMETER);
+                    );
 }
 
 int
 TAO_ORB_Manager::init (int &argc,
                        char **argv,
                        const char *orb_name
-                       ACE_ENV_ARG_DECL)
+                       )
 {
   if (CORBA::is_nil (this->orb_.in ()))
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     orb_name
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                   );
     }
 
   if (CORBA::is_nil (this->poa_.in ()))
@@ -69,8 +68,7 @@ TAO_ORB_Manager::init (int &argc,
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                               );
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -80,18 +78,16 @@ TAO_ORB_Manager::init (int &argc,
       // Get the POA object.
       this->poa_ =
         PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+                                     );
 
-      ACE_CHECK_RETURN (-1);
     }
 
   if (CORBA::is_nil (this->poa_manager_.in ()))
     {
       // Get the POA_Manager.
       this->poa_manager_ =
-        this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->poa_->the_POAManager ();
 
-      ACE_CHECK_RETURN (-1);
     }
 
   return 0;
@@ -103,14 +99,13 @@ TAO_ORB_Manager::init_child_poa (int& argc,
                                  char **argv,
                                  const char *poa_name,
                                  const char *orb_name
-                                 ACE_ENV_ARG_DECL)
+                                 )
 {
   // check to see if root poa has to be created.
   int init_result = this->init (argc,
                                 argv,
                                 orb_name
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                               );
 
   if (init_result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -125,14 +120,12 @@ TAO_ORB_Manager::init_child_poa (int& argc,
   // Id Assignment policy
   policies[0] =
     this->poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                            );
 
   // Lifespan policy
   policies[1] =
     this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                       );
 
   // We use a different POA, otherwise the user would have to change
   // the object key each time it invokes the server.
@@ -141,10 +134,9 @@ TAO_ORB_Manager::init_child_poa (int& argc,
     this->poa_->create_POA (poa_name,
                             this->poa_manager_.in (),
                             policies
-                            ACE_ENV_ARG_PARAMETER);
+                           );
   // Warning!  If create_POA fails, then the policies won't be
   // destroyed and there will be hell to pay in memory leaks!
-  ACE_CHECK_RETURN (-1);
 
   // Creation of the new POAs over, so destroy the Policy_ptr's.
   for (CORBA::ULong i = 0;
@@ -152,8 +144,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      policy->destroy ();
     }
   return 0;
 }
@@ -162,10 +153,9 @@ TAO_ORB_Manager::init_child_poa (int& argc,
 // Activate POA manager.
 
 int
-TAO_ORB_Manager::activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Manager::activate_poa_manager (void)
 {
-  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_manager_->activate ();
   return 0;
 }
 
@@ -173,42 +163,37 @@ TAO_ORB_Manager::activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ORB_Manager::activate (PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL)
+                           )
 {
   PortableServer::ObjectId_var id =
     this->poa_->activate_object (servant
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                );
 
   CORBA::Object_var obj =
     this->poa_->id_to_reference (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                );
 
   CORBA::String_var str =
     this->orb_->object_to_string (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                 );
 
   return str._retn ();
 }
 
 void
 TAO_ORB_Manager::deactivate (const char *id
-                             ACE_ENV_ARG_DECL)
+                             )
 {
   CORBA::Object_var object =
     this->orb_->string_to_object (id
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 );
 
   PortableServer::ObjectId_var object_id =
     this->poa_->reference_to_id (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                );
 
   this->poa_->deactivate_object (object_id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                );
 }
 
 #if !defined (CORBA_E_MICRO)
@@ -216,7 +201,7 @@ TAO_ORB_Manager::deactivate (const char *id
 char *
 TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
                                            PortableServer::Servant servant
-                                           ACE_ENV_ARG_DECL)
+                                           )
 {
   if (object_name == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -229,39 +214,34 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
 
   this->child_poa_->activate_object_with_id (id.in (),
                                              servant
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                            );
 
   CORBA::Object_var obj =
     this->child_poa_->id_to_reference (id.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                      );
 
   char * str =
     this->orb_->object_to_string (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+                                 );
 
-  ACE_CHECK_RETURN (0);
 
   return str;
 }
 
 void
 TAO_ORB_Manager::deactivate_under_child_poa (const char *id
-                                             ACE_ENV_ARG_DECL)
+                                             )
 {
   CORBA::Object_var object =
     this->orb_->string_to_object (id
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 );
 
   PortableServer::ObjectId_var object_id =
     this->child_poa_->reference_to_id (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      );
 
   this->child_poa_->deactivate_object (object_id.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
 }
 #endif /* CORBA_E_MICRO */
 
@@ -269,40 +249,34 @@ TAO_ORB_Manager::deactivate_under_child_poa (const char *id
 
 int
 TAO_ORB_Manager::run (ACE_Time_Value &tv
-                      ACE_ENV_ARG_DECL)
+                      )
 {
-  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_manager_->activate ();
 
-  this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run (tv);
 
   return 0;
 }
 
 int
-TAO_ORB_Manager::fini (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Manager::fini (void)
 {
-  this->poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_->destroy (1, 1);
 
   this->poa_ = 0;
 
-  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->destroy ();
 
   this->orb_ = 0;
   return 0;
 }
 
 int
-TAO_ORB_Manager::run (ACE_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Manager::run (void)
 {
-  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_manager_->activate ();
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
 
   return 0;
 }
@@ -339,21 +313,19 @@ TAO_ORB_Manager::poa_manager (void)
 
 TAO_ORB_Manager::~TAO_ORB_Manager (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (!CORBA::is_nil (this->poa_.in ()))
         {
           this->poa_->destroy (1,
                                1
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                              );
         }
     }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception&)
     {
       // ignore any exceptions..
     }
-  ACE_ENDTRY;
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h
index 9f06fe7d3ba..db311d817be 100644
--- a/TAO/tao/Utils/ORB_Manager.h
+++ b/TAO/tao/Utils/ORB_Manager.h
@@ -68,7 +68,7 @@ public:
    */
   int init (int &argc,
             char *argv[]
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+            );
 
   /**
    * Initialize the ORB/root POA, using the supplied command line
@@ -80,7 +80,7 @@ public:
   int init (int &argc,
             char *argv[],
             const char *orb_name
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+            );
 
 #if !defined (CORBA_E_MICRO)
   /**
@@ -95,7 +95,7 @@ public:
                       char *argv[],
                       const char *poa_name,
                       const char *orb_name = 0
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                      );
 #endif /* CORBA_E_MICRO */
 
   /**
@@ -104,7 +104,7 @@ public:
    * @retval -1 Failure
    * @retval 0 Success
    */
-  int fini (ACE_ENV_SINGLE_ARG_DECL);
+  int fini (void);
 
   /// Destructor.
   ~TAO_ORB_Manager (void);
@@ -121,7 +121,7 @@ public:
    * @retval -1 Failure
    * @retval 0 Success
    */
-  int activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int activate_poa_manager (void);
 
   /**
    * Activate <servant>, using the POA <activate_object> call.  Users
@@ -132,7 +132,7 @@ public:
    *         memory deallocation of the string.
    */
   char *activate (PortableServer::Servant servant
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                  );
 
   /** Deactivate object in RootPOA.
    *
@@ -140,7 +140,7 @@ public:
    *             of the servant to deactivate in the POA
    */
   void deactivate (const char *id
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                   );
 
 #if !defined (CORBA_E_MICRO)
   /**
@@ -159,7 +159,7 @@ public:
    */
   char *activate_under_child_poa (const char *object_name,
                                   PortableServer::Servant servant
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  );
 
   /**
    * Deactivate object in child POA.
@@ -168,7 +168,7 @@ public:
    *            the object to deactivate in the POA
    */
   void deactivate_under_child_poa (const char *id
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   );
 #endif /* CORBA_E_MICRO */
 
   /**
@@ -179,12 +179,12 @@ public:
    * @retval 0 Success
    */
   int run (ACE_Time_Value &tv
-           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+           );
 
   /**
    * Run the ORB event loop.
    */
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (void);
 
   /**
    * Accessor which returns the ORB pointer.  Following the normal
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp
index 426d841991c..a5acabe07da 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -14,7 +14,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
   ACE_THROW_SPEC (())
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   for (CORBA::ULong i = 0; i != length(); ++i)
     {
@@ -24,15 +23,13 @@ TAO::Utils::PolicyList_Destroyer::~PolicyList_Destroyer()
           continue;
         }
 
-      ACE_TRY
+      try
         {
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
-      ACE_CATCHALL
+      catch (...)
         {
         }
-      ACE_ENDTRY;
 
       (*this)[i] = CORBA::Policy::_nil();
     }
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp
index fad7ef86477..6d5fe007366 100644
--- a/TAO/tao/Utils/RIR_Narrow.cpp
+++ b/TAO/tao/Utils/RIR_Narrow.cpp
@@ -5,47 +5,42 @@
 
 #include "tao/Utils/RIR_Narrow.h"
 #include "tao/SystemException.h"
-#if defined (ACE_HAS_EXCEPTIONS)
-  #include <stdexcept>
-#endif
+#include <stdexcept>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb,
                                    char const * id
-                                   ACE_ENV_ARG_DECL)
+                                   )
 {
   CORBA::Object_var object =
     orb->resolve_initial_references (id
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (T::_nil ());
+                                    );
 
   return RIR_Narrow<T>::narrow_object (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
 }
 
 template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info,
                                    char const * id
-                                   ACE_ENV_ARG_DECL)
+                                   )
 {
   CORBA::Object_var object =
     info->resolve_initial_references (id
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (T::_nil ());
+                                     );
 
   return RIR_Narrow<T>::narrow_object (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
+                                      );
 }
 
 template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object
-                                          ACE_ENV_ARG_DECL)
+                                          )
 {
   _var_type narrowed_object = T::_narrow (object
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (T::_nil ());
+                                         );
 
   if (CORBA::is_nil (narrowed_object.in ()))
   {
diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h
index fdeba60f91e..8afa8931e41 100644
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ b/TAO/tao/Utils/RIR_Narrow.h
@@ -47,17 +47,17 @@ namespace TAO
       /// narrow it.
       static _ptr_type narrow (CORBA::ORB_ptr orb,
                                char const * id
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                               );
 
       /// Use resolve_initial_references to find an object and then
       /// narrow it.
       static _ptr_type narrow (PortableInterceptor::ORBInitInfo_ptr orb,
                                char const * id
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                               );
 
     private:
       static _ptr_type narrow_object (CORBA::Object_ptr object
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      );
     };
 
   } // namespace Utils
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
index be906d9982f..ca6e0e6f9bf 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -11,21 +11,17 @@ template <class T>
 ACE_INLINE T *
 TAO::Utils::Servant_Var<T>::_duplicate (T * p)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (p != 0)
         {
-          p->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          p->_add_ref ();
         }
     }
-  ACE_CATCHALL
+  catch (...)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return p;
 }
@@ -85,19 +81,17 @@ TAO::Utils::Servant_Var<T>::~Servant_Var (void)
   // can't assume that it will not throw.  If it does, then we are in
   // trouble.  In any event, we can't let the exception escape our
   // destructor.
-  ACE_TRY_NEW_ENV
+  try
     {
       if (ptr_ != 0)
         {
-          ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ptr_->_remove_ref ();
         }
     }
-  ACE_CATCHALL
+  catch (...)
     {
       // Forget the exception..
     }
-  ACE_ENDTRY;
 }
 
 #if !defined(ACE_LACKS_MEMBER_TEMPLATES)
diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp
index a4dce4bb8eb..48e39867815 100644
--- a/TAO/tao/Utils/Server_Main.cpp
+++ b/TAO/tao/Utils/Server_Main.cpp
@@ -47,13 +47,12 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
 
   char ** asciiArgv = command_line.get_ASCII_argv ();
 
-  ACE_TRY_NEW_ENV
+  try
   {
     // Initialize the orb
 
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, asciiArgv, name_ ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      CORBA::ORB_init (argc, asciiArgv, name_);
 
     if (! ::CORBA::is_nil(orb.in ()))
     {
@@ -65,8 +64,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
       {
         //////////////////////////////////
         // let the servant register itself
-        result = servant.init (orb.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        result = servant.init (orb.in ());
 
         if (result == 0)
         {
@@ -78,24 +76,19 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
           // Run the event loop for the ORB.
           // Initial run to initialize the orb
           ACE_Time_Value tv (1,0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
 
           // now run event loop
           int quit = 0;
           while (result == 0 && ! quit )
           {
             ACE_Time_Value work_tv (1,0);
-            orb->perform_work(work_tv ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-            quit = servant.idle (result ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            orb->perform_work(work_tv);
+            quit = servant.idle (result);
           }
-          servant.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          servant.fini ();
 
-          orb->shutdown (1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->shutdown (1);
 
           ACE_ERROR ((LM_INFO,
                       "%T %s (%P|%t) Terminated normally. %s\n",
@@ -120,13 +113,11 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[])
       }
     }
   }
-  ACE_CATCHANY
+  catch (const ::CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      name_);
+    ex._tao_print_exception (name_);
     result = -1;
   }
-  ACE_ENDTRY;
   return result;
 }
 
diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h
index c5d3ea2d825..8054c5cd5f9 100644
--- a/TAO/tao/Utils/Server_Main.h
+++ b/TAO/tao/Utils/Server_Main.h
@@ -35,9 +35,9 @@
  *      Xyzzy_i (); // null constructor
  *      ~Xyzzy_i (); // destructor
  *      int parse_args (int argc, char * argv[]);
- *      int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+ *      int init (CORBA::ORB_ptr orb );
  *      int idle(int &result);
- *      int fini (ACE_ENV_SINGLE_ARG_DECL);
+ *      int fini (void);
  *      const char * identity () const;
  *
  *      parse_args, self_register, self_unregister return 0 if ok, nonzero for error.
diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index bcb98847975..9d64485d221 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -172,18 +172,16 @@ CORBA::AbstractBase::_to_value (void)
 }
 
 CORBA::Boolean
-CORBA::AbstractBase::_is_a (const char *type_id
-                            ACE_ENV_ARG_DECL)
+CORBA::AbstractBase::_is_a (const char *type_id)
 {
   if (! CORBA::is_nil (this->equivalent_obj_.in ()))
     {
-      return this->equivalent_obj_->_is_a (type_id
-                                           ACE_ENV_ARG_PARAMETER);
+      return this->equivalent_obj_->_is_a (type_id);
     }
-    
-  int cmp = ACE_OS::strcmp (type_id,
-                            "IDL:omg.org/CORBA/AbstractBase:1.0");
-                            
+
+  int const cmp = ACE_OS::strcmp (type_id,
+                                  "IDL:omg.org/CORBA/AbstractBase:1.0");
+
   return (cmp == 0);
 }
 
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index b8f039290e7..8ebddcab997 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -72,7 +72,7 @@ namespace CORBA
     typedef CORBA::AbstractBase_out _out_type;
 
     static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj
-                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                            );
 
     static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj);
     static CORBA::AbstractBase_ptr _nil (void);
@@ -85,7 +85,7 @@ namespace CORBA
     CORBA::ValueBase *_to_value (void);
 
     virtual CORBA::Boolean _is_a (const char *type_id
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  );
     virtual const char* _interface_repository_id (void) const;
 
     /// TAO specific operation
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
index f3d4dfb60e6..e29418e7154 100644
--- a/TAO/tao/Valuetype/AbstractBase.inl
+++ b/TAO/tao/Valuetype/AbstractBase.inl
@@ -15,7 +15,7 @@ CORBA::AbstractBase::_nil (void)
 
 ACE_INLINE CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              )
 {
   return CORBA::AbstractBase::_duplicate (obj);
 }
diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp
index ff9f03fa562..5c31e1827aa 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_T.cpp
@@ -16,7 +16,7 @@ namespace TAO
       CORBA::AbstractBase_ptr obj,
       const char *repo_id,
       Proxy_Broker_Factory pbf
-      ACE_ENV_ARG_DECL)
+      )
   {
     if (CORBA::is_nil (obj))
       {
@@ -26,9 +26,8 @@ namespace TAO
     CORBA::Boolean const is_it =
       obj->_is_a (
           repo_id
-          ACE_ENV_ARG_PARAMETER
+
         );
-    ACE_CHECK_RETURN (T::_nil ());
 
     if (is_it == false)
       {
@@ -39,7 +38,7 @@ namespace TAO
       AbstractBase_Narrow_Utils<T>::unchecked_narrow (obj,
                                                       repo_id,
                                                       pbf
-                                                      ACE_ENV_ARG_PARAMETER);
+                                                     );
   }
 
   template<typename T>  T *
@@ -49,26 +48,22 @@ namespace TAO
   {
     T *proxy = 0;
 
-    ACE_DECLARE_NEW_CORBA_ENV;
 
-    ACE_TRY
+    try
       {
         proxy =
           AbstractBase_Narrow_Utils<T>::unchecked_narrow (
               obj,
               0,
               pbf
-              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+             );
 
       }
-    ACE_CATCHANY
+    catch (const ::CORBA::Exception&)
       {
         // Consume and return proxy
         return proxy;
       }
-    ACE_ENDTRY;
-    ACE_CHECK_RETURN (proxy);
 
     return proxy;
   }
@@ -78,7 +73,7 @@ namespace TAO
       CORBA::AbstractBase_ptr obj,
       const char *,
       Proxy_Broker_Factory pbf
-      ACE_ENV_ARG_DECL)
+      )
   {
     if (CORBA::is_nil (obj))
       {
@@ -102,7 +97,6 @@ namespace TAO
                              collocated ? 1 : 0,
                              obj->_servant ()),
                           CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (proxy);
       }
     else
       {
diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h
index dced03cf334..79c85ae0d87 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.h
+++ b/TAO/tao/Valuetype/AbstractBase_T.h
@@ -39,7 +39,7 @@ namespace TAO
     static T_ptr narrow (CORBA::AbstractBase_ptr,
                          const char *repo_id,
                          Proxy_Broker_Factory
-                         ACE_ENV_ARG_DECL);
+                        );
 
     static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr,
                                    Proxy_Broker_Factory);
@@ -47,7 +47,7 @@ namespace TAO
     static T_ptr unchecked_narrow (CORBA::AbstractBase_ptr,
                                    const char *repo_id,
                                    Proxy_Broker_Factory
-                                   ACE_ENV_ARG_DECL);
+                                  );
   };
 }
 
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index 3b7376ea2bf..dfa55ef1c7f 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -703,7 +703,7 @@ TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm)
   // Read a long value that might be an endtag, the chunk size or the value tag
   // of the nested valuetype.
   CORBA::Long tag;
-  
+
   if (!strm.read_long (tag))
     {
       return false;
@@ -721,7 +721,7 @@ TAO_ChunkInfo::handle_chunking (TAO_InputCDR &strm)
                              this->value_nesting_level_),
                             false);
         }
-        
+
       this->value_nesting_level_ = - tag;
       this->value_nesting_level_--;
 
@@ -796,7 +796,7 @@ CORBA::ValueBase::_tao_read_repository_id_list (ACE_InputCDR& strm,
                                                 Repository_Id_List& ids)
 {
   CORBA::Long num_ids;
-  
+
   if (!strm.read_long (num_ids))
     {
       return false;
@@ -849,7 +849,7 @@ CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm,
         {
           return false;
         }
-        
+
       buffer_size = -(offset) + sizeof (CORBA::Long);
     }
 
@@ -862,7 +862,7 @@ CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm,
     {
       return false;
     }
-    
+
   indir_stream.read_string (id);
 
   // Since the ID is always read from the indirection cdr we have to skip
@@ -881,11 +881,7 @@ CORBA::ValueBase::_tao_read_repository_id (ACE_InputCDR& strm,
 void
 CORBA::ValueBase::truncation_hook ()
 {
-#if defined (ACE_HAS_EXCEPTIONS)
-      ACE_THROW (CORBA::INTERNAL ());
-#else
-      ACE_OS::abort ();
-#endif /* ACE_HAS_EXCEPTIONS */
+  throw ::CORBA::INTERNAL ();
 }
 
 
diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index 0935bba77a4..6bfd4dd0c14 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -65,7 +65,7 @@ namespace CORBA
     /// In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T)
     /// (see at definition below)
     virtual CORBA::ValueBase * create_for_unmarshal (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
+      void) = 0;
 
     // Not pure virtual because this will be overridden only by valuetypes
     // that support an abstract interface.
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
index 0c58622685d..21093cf9ca7 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp
@@ -16,14 +16,13 @@ TAO_Valuetype_Adapter_Factory_Impl::~TAO_Valuetype_Adapter_Factory_Impl (void)
 }
 
 TAO_Valuetype_Adapter *
-TAO_Valuetype_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Valuetype_Adapter_Factory_Impl::create (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Valuetype_Adapter_Impl *nva = 0;
   ACE_NEW_THROW_EX (nva,
                     TAO_Valuetype_Adapter_Impl (),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (nva);
 
   return nva;
 }
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
index 91b8cbe6e8c..6cac11a715b 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h
@@ -44,7 +44,7 @@ public:
   virtual ~TAO_Valuetype_Adapter_Factory_Impl (void);
 
   virtual TAO_Valuetype_Adapter * create (
-      ACE_ENV_SINGLE_ARG_DECL
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tao/Valuetype_Adapter_Factory.h b/TAO/tao/Valuetype_Adapter_Factory.h
index dabd7e7159a..3e1ab345ee0 100644
--- a/TAO/tao/Valuetype_Adapter_Factory.h
+++ b/TAO/tao/Valuetype_Adapter_Factory.h
@@ -43,7 +43,7 @@ public:
   virtual ~TAO_Valuetype_Adapter_Factory (void);
 
   virtual TAO_Valuetype_Adapter * create (
-      ACE_ENV_SINGLE_ARG_DECL
+
     )
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 40bc92b1281..7ad2c7de82b 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -5,5 +5,5 @@
 
 #define TAO_MAJOR_VERSION 1
 #define TAO_MINOR_VERSION 5 
-#define TAO_BETA_VERSION 4 
-#define TAO_VERSION "1.5.4"
+#define TAO_BETA_VERSION 6 
+#define TAO_VERSION "1.5.6"
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp
index 1a039a0b089..65159a31c69 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -28,11 +28,11 @@ namespace TAO
   public:
     // Maybe we should instead just take in a ptr to
     // TAO_ORB_Core_TSS_Resources?  Or at least ORB_Core*?
-    Nested_Upcall_Guard (TAO_Transport* t)
+    Nested_Upcall_Guard (TAO_Transport *t)
       : t_ (t)
     {
       TAO_ORB_Core_TSS_Resources *tss =
-        t_->orb_core()->get_tss_resources ();
+        t_->orb_core ()->get_tss_resources ();
 
       tss->upcalls_temporarily_suspended_on_this_thread_ = true;
 
@@ -44,30 +44,32 @@ namespace TAO
 
     ~Nested_Upcall_Guard (void)
     {
-      TAO_ORB_Core_TSS_Resources *tss =
-        t_->orb_core()->get_tss_resources ();
+      TAO_ORB_Core_TSS_Resources *tss = t_->orb_core ()->get_tss_resources ();
 
-      tss->upcalls_temporarily_suspended_on_this_thread_ =
-        false;
+      tss->upcalls_temporarily_suspended_on_this_thread_ = false;
 
       if (TAO_debug_level > 6)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait "
-                    "re-enabling upcalls on thread %t\n"));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Wait_On_LF_No_Upcall::wait "
+                      "re-enabling upcalls on thread %t\n"));
+        }
     }
 
   private:
 
-    Nested_Upcall_Guard (void) {}
+    Nested_Upcall_Guard (void)
+    {
+    }
 
     /// Disallow copying and assignment.
     Nested_Upcall_Guard (const Nested_Upcall_Guard&);
-    Nested_Upcall_Guard & operator= (const Nested_Upcall_Guard&);
+    Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&);
 
   private:
 
     /// Pointer to the transport that we plan to use.
-    TAO_Transport* t_;
+    TAO_Transport *t_;
   };
 
 
@@ -95,7 +97,7 @@ namespace TAO
   Wait_On_LF_No_Upcall::can_process_upcalls (void) const
   {
     TAO_ORB_Core_TSS_Resources *tss =
-      this->transport_->orb_core()->get_tss_resources ();
+      this->transport_->orb_core ()->get_tss_resources ();
 
     if ((this->transport_->opened_as () == TAO::TAO_CLIENT_ROLE) &&
         (this->transport_->bidirectional_flag () == 0) &&
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index 6b1237b5b8b..c9afa361710 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -13,7 +13,8 @@ ACE_RCSID (tao,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower (TAO_Transport *transport)
+TAO_Wait_On_Leader_Follower::TAO_Wait_On_Leader_Follower
+  (TAO_Transport *transport)
   : TAO_Wait_Strategy (transport)
 {
 }
@@ -59,19 +60,16 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
 
   // Send the request.
 //@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
-  return this->TAO_Wait_Strategy::sending_request (orb_core,
-                                                   two_way);
+  return this->TAO_Wait_Strategy::sending_request (orb_core, two_way);
 }
 
 int
 TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time,
                                    TAO_Synch_Reply_Dispatcher &rd)
 {
-  TAO_Leader_Follower& leader_follower =
+  TAO_Leader_Follower &leader_follower =
     this->transport_->orb_core ()->leader_follower ();
-  return leader_follower.wait_for_event (&rd,
-                                         this->transport_,
-                                         max_wait_time);
+  return leader_follower.wait_for_event (&rd, this->transport_, max_wait_time);
 }
 
 bool
diff --git a/TAO/tao/Wait_On_Reactor.cpp b/TAO/tao/Wait_On_Reactor.cpp
index 23c5d59df66..768bf83ce3f 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -32,7 +32,7 @@ TAO_Wait_On_Reactor::wait (ACE_Time_Value *max_wait_time,
   ACE_Countdown_Time countdown (max_wait_time);
 
   // Reactor does not change inside the loop.
-  ACE_Reactor* const reactor =
+  ACE_Reactor *const reactor =
     this->transport_->orb_core ()->reactor ();
 
   // Do the event loop, till we fully receive a reply.
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index 25c4b0af51e..9bb05eccd52 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -32,8 +32,7 @@ TAO_Wait_Strategy::~TAO_Wait_Strategy (void)
  */
 //@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_START
 int
-TAO_Wait_Strategy::sending_request (TAO_ORB_Core * /* orb_core */,
-                                    int            /* two_way */)
+TAO_Wait_Strategy::sending_request (TAO_ORB_Core *, int)
 {
   return 0;
 }
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index cf8f249046b..2747d685ec5 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -54,8 +54,7 @@ public:
    * variables because the reply may arrive *before* the user calls
    * wait.
    */
-  virtual int sending_request (TAO_ORB_Core *orb_core,
-                               int two_way);
+  virtual int sending_request (TAO_ORB_Core *orb_core, int two_way);
 
   /// Base class virtual method. Wait till the @c reply_received flag is
   /// true or the time expires.
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 8c7368c54cf..ad6e5150b31 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -127,7 +127,6 @@ void CORBA::WrongTransaction::_raise (void) const
 
 void CORBA::WrongTransaction::_tao_encode (
     TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -135,12 +134,11 @@ void CORBA::WrongTransaction::_tao_encode (
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 void CORBA::WrongTransaction::_tao_decode (
     TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -148,7 +146,7 @@ void CORBA::WrongTransaction::_tao_decode (
       return;
     }
 
-  ACE_THROW (CORBA::MARSHAL ());
+  throw ::CORBA::MARSHAL ();
 }
 
 // TAO extension - the virtual _type method.
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 18d10826955..1fdf4a35e91 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -95,12 +95,10 @@ namespace CORBA
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        ACE_ENV_ARG_DECL
       );
 
     // TAO_IDL - Generated from
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index 96c38a1014a..0fd3bf00610 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -21,21 +21,18 @@ ACE_RCSID (tao,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Exception *
-TAO_Operation_Details::corba_exception (const char *id
-                                        ACE_ENV_ARG_DECL)
+TAO_Operation_Details::corba_exception (const char *id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i != this->ex_count_; ++i)
     {
-      if (ACE_OS::strcmp (id,
-                          this->ex_data_[i].id) != 0)
+      if (ACE_OS::strcmp (id, this->ex_data_[i].id) != 0)
         {
           continue;
         }
 
       // Create an exception object
-      CORBA::Exception *exception =
-        this->ex_data_[i].alloc ();
+      CORBA::Exception *exception = this->ex_data_[i].alloc ();
 
       if (exception == 0)
         {
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index 70e5344e7e7..38cbc0314be 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -132,8 +132,7 @@ public:
    * is not found in the list of exceptions specified by the operation
    * this call would raise an UNKNOWN exception.
    */
-  CORBA::Exception *corba_exception (const char *ex
-                                     ACE_ENV_ARG_DECL)
+  CORBA::Exception *corba_exception (const char *ex)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 69404326b05..7ad3103640d 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -190,14 +190,7 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 # define TAO_NO_COPY_OCTET_SEQUENCES 1
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES */
 
-#if defined (ACE_HAS_EXCEPTIONS)
-# define TAO_HAS_EXCEPTIONS
-// TAO_USE_EXCEPTIONS is only here for backwards compatibility and
-// will go away shortly so don't use it...
-# define TAO_USE_EXCEPTIONS
-#elif (defined (TAO_HAS_EXCEPTIONS) || defined (TAO_USE_EXCEPTIONS)) && !defined (ACE_HAS_EXCEPTIONS)
-# error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them"
-#endif /* TAO_HAS_EXCEPTIONS */
+#define TAO_HAS_EXCEPTIONS
 
 // BC++ seems to have a different convention for detecting Win32 than
 // VC++.
@@ -842,8 +835,6 @@ enum TAO_Policy_Scope
 // Enable TransportCurrent by default
 #if !defined (TAO_HAS_TRANSPORT_CURRENT)
 #    define TAO_HAS_TRANSPORT_CURRENT 1
-#  else
-#    define TAO_HAS_TRANSPORT_CURRENT 0
 #endif  /* ! TAO_HAS_TRANSPORT_CURRENT */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index 5132477c1d8..bb43479af9d 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -83,9 +83,7 @@ public:
    * index. Please see the header file IOPC.h on why a profile index
    * is required.
    */
-  void target_specifier (IOP::IOR &ior,
-                         CORBA::ULong prof_index);
-
+  void target_specifier (IOP::IOR &ior, CORBA::ULong prof_index);
 
   /**
    * Returns the object key after a check of the stored specifier. If
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 60dbc3e8da3..71aea07de15 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -8,19 +8,16 @@ int
 main (int argc, char *argv[])
 {
   int received_expected_exception = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -30,26 +27,23 @@ main (int argc, char *argv[])
                             1);
         }
 
-      ACE_TRY {
+      try{
           Test::Timestamp time = 10;
-          roundtrip->test_method (time ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->test_method (time);
         }
-      ACE_CATCH(Test::ServerOverload, ov)
+      catch (const Test::ServerOverload& )
         {
           ACE_DEBUG ((LM_DEBUG, "Received expected exception\n"));
           received_expected_exception = 1;
 
           roundtrip->shutdown ();
         }
-      ACE_ENDTRY;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ex._tao_print_exception ("");
       return 1;
     }
-  ACE_ENDTRY;
 
   if(!received_expected_exception)
     {
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 4bc543e5537..eedafb22c35 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -15,11 +15,10 @@ public:
   ST_AMH_Servant (CORBA::ORB_ptr orb);
 
   void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                    Test::Timestamp send_time
-                    ACE_ENV_ARG_DECL)
+                    Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh ACE_ENV_ARG_DECL)
+  void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -37,8 +36,7 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb)
 
 void
 ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL)
+                             Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Throw an overload exception
@@ -48,23 +46,21 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
   // Calee owns the memory now.  Need not delete 'ts'
   Test::AMH_RoundtripExceptionHolder holder (ts);
 
-  ACE_TRY
+  try
     {
-      _tao_rh->test_method_excep (&holder ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      _tao_rh->test_method_excep (&holder);
     }
-  ACE_CATCHALL
+  catch (...)
     {}
-  ACE_ENDTRY;
 
   ACE_UNUSED_ARG (send_time);
 }
 
 void
-ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/ ACE_ENV_ARG_DECL)
+ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 /*** Server Declaration ***/
@@ -117,58 +113,48 @@ ST_AMH_Server::ST_AMH_Server (int* argc, char **argv)
 
 ST_AMH_Server::~ST_AMH_Server ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_->destroy (1, 1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
 
 }
 
 int
 ST_AMH_Server::start_orb_and_poa (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB_init (*(this->argc_),
                                     this->argv_,
-                                    "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -176,42 +162,35 @@ ST_AMH_Server::start_orb_and_poa (void)
 void
 ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Test::Roundtrip_var roundtrip =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (roundtrip.in ());
 
       (void) this->write_ior_to_file (ior);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
 }
 
 void
 ST_AMH_Server::run_event_loop ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Time_Value period (0, 11000);
       while (!this->orb_->orb_core ()->has_shutdown ())
         {
               this->orb_->perform_work (&period);
-              ACE_TRY_CHECK;
         }
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {}
-  ACE_ENDTRY;
 }
 
 int
diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp
index 381cc74f8b8..b0995e4103a 100644
--- a/TAO/tests/AMH_Oneway/client.cpp
+++ b/TAO/tests/AMH_Oneway/client.cpp
@@ -27,22 +27,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Roundtrip::_narrow (object.in ());
 
       if (CORBA::is_nil (roundtrip.in ()))
         {
@@ -58,19 +55,17 @@ main (int argc, char *argv[])
       Test::Timestamp time = 10;
       for (int i = 0; i < num_calls; i++)
         {
-          roundtrip->test_method (time ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          roundtrip->test_method (time);
 
           ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i));
         }
       orb->destroy();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ex._tao_print_exception ("");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index 29d8037da8d..24246020a1d 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -41,8 +41,7 @@ public:
   ST_AMH_Servant (CORBA::ORB_ptr orb);
 
   void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                    Test::Timestamp send_time
-                    ACE_ENV_ARG_DECL)
+                    Test::Timestamp send_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -60,8 +59,7 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb)
 
 void
 ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_OS::sleep (1);
@@ -140,58 +138,48 @@ ST_AMH_Server::~ST_AMH_Server ()
 void
 ST_AMH_Server::cleanup ()
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_->destroy (1, 1);
 
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
 
 }
 
 int
 ST_AMH_Server::start_orb_and_poa (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB_init (*(this->argc_),
                                     this->argv_,
-                                    "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "");
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -199,46 +187,39 @@ ST_AMH_Server::start_orb_and_poa (void)
 void
 ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Test::Roundtrip_var roundtrip =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (roundtrip.in ());
 
       (void) this->write_ior_to_file (ior);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
 }
 
 void
 ST_AMH_Server::run_event_loop ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Time_Value period (0, 11000);
       while (1)
         {
               this->orb_->perform_work (&period);
-              ACE_TRY_CHECK;
 
               // when all calls from client have been recieved, exit
               if (calls_received == num_calls )
                 return;
         }
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {}
-  ACE_ENDTRY;
 }
 
 int
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp
index 313677c07a1..cc30da0f035 100644
--- a/TAO/tests/AMI/ami_test_i.cpp
+++ b/TAO/tests/AMI/ami_test_i.cpp
@@ -29,8 +29,7 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
 CORBA::Long
 AMI_Test_i::foo (CORBA::Long_out out_l,
                  CORBA::Long in_l,
-                 const char* in_str
-                 ACE_ENV_ARG_DECL)
+                 const char* in_str)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    A::DidTheRightThing))
 {
@@ -55,7 +54,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 
 
 void
-AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
@@ -63,7 +62,7 @@ AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-AMI_Test_i::yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::yadda (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -73,8 +72,7 @@ AMI_Test_i::yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-AMI_Test_i::yadda (CORBA::Long yadda
-                   ACE_ENV_ARG_DECL_NOT_USED)
+AMI_Test_i::yadda (CORBA::Long yadda)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -83,8 +81,7 @@ AMI_Test_i::yadda (CORBA::Long yadda
 }
 
 void
-AMI_Test_i::inout_arg_test (char *&
-                            ACE_ENV_ARG_DECL_NOT_USED)
+AMI_Test_i::inout_arg_test (char *&)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No action, this operation is to test code generation for INOUT
diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h
index 66ce22677fe..12070d3c5cd 100644
--- a/TAO/tests/AMI/ami_test_i.h
+++ b/TAO/tests/AMI/ami_test_i.h
@@ -31,23 +31,20 @@ public:
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
-                   const char* in_str
-                   ACE_ENV_ARG_DECL)
+                   const char* in_str)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      A::DidTheRightThing));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long yadda (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Long yadda (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void yadda (CORBA::Long yadda
-              ACE_ENV_ARG_DECL)
+  void yadda (CORBA::Long yadda)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void inout_arg_test (char *& str
-                       ACE_ENV_ARG_DECL)
+  void inout_arg_test (char *& str)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index dfebe21b163..c43a3ade875 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -98,8 +98,7 @@ public:
   Handler (void) {};
 
   void foo (CORBA::Long result,
-            CORBA::Long out_l
-            ACE_ENV_ARG_DECL_NOT_USED)
+            CORBA::Long out_l)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -113,29 +112,23 @@ public:
       --number_of_replies;
     };
 
-   void foo_excep (::Messaging::ExceptionHolder * excep_holder
-                  ACE_ENV_ARG_DECL)
+   void foo_excep (::Messaging::ExceptionHolder * excep_holder)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called: \n"));
-      ACE_TRY
+      try
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          excep_holder->raise_exception ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught exception:");
+          ex._tao_print_exception ("Caught exception:");
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     };
 
-  void get_yadda (CORBA::Long result
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda (CORBA::Long result)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -143,23 +136,21 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void set_yadda (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void set_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -169,7 +160,6 @@ public:
 
   void inout_arg_test (
       const char *
-      ACE_ENV_ARG_DECL_NOT_USED
       )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -177,8 +167,7 @@ public:
                 "Callback method <set_yadda_excep> called: \n"));
   }
 
-  void inout_arg_test_excep (::Messaging::ExceptionHolder *
-                             ACE_ENV_ARG_DECL_NOT_USED)
+  void inout_arg_test_excep (::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
@@ -190,23 +179,19 @@ Handler handler;
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       A::AMI_Test_var server =
-        A::AMI_Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        A::AMI_Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -219,8 +204,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -228,15 +212,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Let the client perform the test in a separate thread
 
@@ -263,13 +244,11 @@ main (int argc, char *argv[])
       while (number_of_replies > 0)
         {
           CORBA::Boolean pending =
-            orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending();
 
           if (pending)
             {
-              orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work();
             }
         }
 
@@ -289,19 +268,15 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -313,13 +288,13 @@ Client::Client (A::AMI_Test_ptr server,
                 :  ami_test_var_ (A::AMI_Test::_duplicate (server)),
      niterations_ (niterations)
 {
-  the_handler_var_ = handler._this (/* ACE_ENV_SINGLE_ARG_PARAMETER */);
+  the_handler_var_ = handler._this (/* */);
 }
 
 int
 Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Long number = 931232;
 
@@ -327,9 +302,7 @@ Client::svc (void)
         {
           ami_test_var_->sendc_foo (the_handler_var_.in (),
                                     number,
-                                    "Let's talk AMI."
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                    "Let's talk AMI.");
         }
       if (debug)
         {
@@ -338,11 +311,9 @@ Client::svc (void)
                       niterations));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
+      ex._tao_print_exception ("MT_Client: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index b2868cd1e58..f829e76a50f 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -54,16 +54,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -71,12 +68,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -84,12 +79,10 @@ main (int argc, char *argv[])
       AMI_Test_i ami_test_i (orb.in ());
 
       A::AMI_Test_var ami_test_var =
-        ami_test_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ami_test_i._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (ami_test_var.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -106,29 +99,23 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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 ();
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index 2a22d5164ed..2cde2862715 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -74,8 +74,7 @@ public:
     ~Handler (void) {};
 
   void foo (CORBA::Long ami_return_val,
-            CORBA::Long out_l
-            ACE_ENV_ARG_DECL_NOT_USED)
+            CORBA::Long out_l)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -87,37 +86,32 @@ public:
         }
     };
 
-  void foo_excep (::Messaging::ExceptionHolder * excep_holder
-                  ACE_ENV_ARG_DECL)
+  void foo_excep (::Messaging::ExceptionHolder * excep_holder)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called: \n"
                   "Testing proper exception handling ...\n"));
-      ACE_TRY
+      try
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          excep_holder->raise_exception ();
         }
-      ACE_CATCH (A::DidTheRightThing, ex)
+      catch (const A::DidTheRightThing& )
         {
           ACE_DEBUG ((LM_DEBUG,
                       "... exception received successfully\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ERROR");
+          ex._tao_print_exception ("ERROR");
           ACE_ERROR ((LM_ERROR,
                       "... caught the wrong exception -> ERROR\n"));
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     };
 
 
-  void get_yadda (CORBA::Long result
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda (CORBA::Long result)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -125,23 +119,21 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void get_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void set_yadda (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
-                  ACE_ENV_ARG_DECL_NOT_USED)
+  void set_yadda_excep (::Messaging::ExceptionHolder *)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -150,7 +142,6 @@ public:
 
   void inout_arg_test (
       const char *
-      ACE_ENV_ARG_DECL_NOT_USED
       )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -158,8 +149,7 @@ public:
                 "Callback method <set_yadda_excep> called: \n"));
   }
 
-  void inout_arg_test_excep (::Messaging::ExceptionHolder *
-                             ACE_ENV_ARG_DECL_NOT_USED)
+  void inout_arg_test_excep (::Messaging::ExceptionHolder *)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
@@ -169,39 +159,31 @@ int
 main (int argc, char *argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object_var =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa_var =
-        PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object_var.in ());
 
       PortableServer::POAManager_var poa_manager_var =
-        poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa_var->the_POAManager ();
 
-      poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager_var->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // We reuse the object_var smart pointer!
-      object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object_var = orb->string_to_object (ior);
 
       A::AMI_Test_var ami_test_var =
-        A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        A::AMI_Test::_narrow (object_var.in ());
 
       if (CORBA::is_nil (ami_test_var.in ()))
         {
@@ -214,17 +196,14 @@ main (int argc, char *argv[])
       // Instantiate the ReplyHandler and register that with the POA.
       Handler handler;
       A::AMI_AMI_TestHandler_var the_handler_var =
-        handler._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        handler._this ();
 
       // Try out sending asynchronous messages without a reply handler
       // registered. Things fail if we get an exception.
 
       ami_test_var->sendc_foo (A::AMI_AMI_TestHandler::_nil (),
                                0,
-                               ""
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               "");
 
       // Trigger the DidTheRightThing exception on the server side
       // by sending 0 to it.
@@ -233,9 +212,7 @@ main (int argc, char *argv[])
 
       ami_test_var->sendc_foo (the_handler_var.in (),
                                0,
-                               "Let's talk AMI."
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               "Let's talk AMI.");
 
       CORBA::Long l = 931247;
 
@@ -247,24 +224,16 @@ main (int argc, char *argv[])
 
           ami_test_var->sendc_foo (the_handler_var.in (),
                                    l,
-                                   "Let's talk AMI."
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                   "Let's talk AMI.");
         }
 
       // Begin test of attributes
-      ami_test_var->sendc_get_yadda (the_handler_var.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ami_test_var->sendc_get_yadda (the_handler_var.in ());
 
       ami_test_var->sendc_set_yadda (the_handler_var.in (),
-                                     4711
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     4711);
 
-      ami_test_var->sendc_get_yadda (the_handler_var.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ami_test_var->sendc_get_yadda (the_handler_var.in ());
 
       // End test of attributes
 
@@ -287,9 +256,7 @@ main (int argc, char *argv[])
 
       CORBA::Long number = ami_test_var->foo (l,
                                               l,
-                                              "Let's talk SMI."
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              "Let's talk SMI.");
 
       if (debug)
         {
@@ -300,26 +267,20 @@ main (int argc, char *argv[])
 
       if (shutdown_flag)
         {
-          ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ami_test_var->shutdown ();
         }
 
       poa_var->destroy (1,  // ethernalize objects
                         0  // wait for completion
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
index aaaaf5b0cd2..a85b561d23e 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
@@ -29,58 +29,51 @@ AMI_Buffering::Nest_Guard::~Nest_Guard (void)
 }
 
 void
-AMI_Buffering::receive_data (const Test::Payload &the_payload
-                                ACE_ENV_ARG_DECL)
+AMI_Buffering::receive_data (const Test::Payload &the_payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       AMI_Buffering::Nest_Guard ng(*this);
-      this->admin_->request_received (the_payload.length () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->admin_->request_received (the_payload.length ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) DEBUG: AMI_Buffering::receive_data"));
     }
-  ACE_ENDTRY;
 
-  this->try_shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->try_shutdown();
 }
 
 void
-AMI_Buffering::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Buffering::flush (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-AMI_Buffering::sync (ACE_ENV_SINGLE_ARG_DECL)
+AMI_Buffering::sync (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->admin_->flush ();
 }
 
 void
-AMI_Buffering::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+AMI_Buffering::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->must_shutdown_ = true;
-  this->try_shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->try_shutdown();
 }
 
 void
-AMI_Buffering::try_shutdown(ACE_ENV_SINGLE_ARG_DECL)
+AMI_Buffering::try_shutdown(void)
 {
   if (!this->must_shutdown_ || this->nest_ > 0)
     return;
   if (this->max_nest_ > 1)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) max nesting level: %d\n", max_nest_));
-  this->admin_->shutdown(ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->admin_->shutdown();
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h
index 57b8390347c..e5df2680bee 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h
@@ -18,21 +18,20 @@ public:
                  Test::AMI_Buffering_Admin_ptr admin);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &the_payload
-                             ACE_ENV_ARG_DECL)
+  virtual void receive_data (const Test::Payload &the_payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void flush (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void sync (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// internal implementation of shutdown. This
-  void try_shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void try_shutdown (void);
 
   class Nest_Guard
     {
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
index d196dc0674d..cf00721a861 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
@@ -13,22 +13,21 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::request_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Buffering_Admin::request_count (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_count_;
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::bytes_received_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Buffering_Admin::bytes_received_count (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->bytes_received_count_;
 }
 
 void
-AMI_Buffering_Admin::request_received (CORBA::ULong payload_length
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+AMI_Buffering_Admin::request_received (CORBA::ULong payload_length)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_++;
@@ -36,15 +35,14 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length
 }
 
 void
-AMI_Buffering_Admin::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Buffering_Admin::flush (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-AMI_Buffering_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+AMI_Buffering_Admin::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
index 904b4253ec5..6deca90143b 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
@@ -17,20 +17,19 @@ public:
   AMI_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong request_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong bytes_received_count (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong bytes_received_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void request_received (CORBA::ULong payload_length
-                                 ACE_ENV_ARG_DECL)
+  virtual void request_received (CORBA::ULong payload_length)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void flush (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp
index 6f49c529d36..70a7d6d3414 100644
--- a/TAO/tests/AMI_Buffering/Client_Task.cpp
+++ b/TAO/tests/AMI_Buffering/Client_Task.cpp
@@ -23,26 +23,23 @@ int
 Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       while (1)
         {
           // run the even loop for 1 second...
           ACE_Time_Value tv (1, 0);
-          this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->run (tv);
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
           if (this->terminate_loop_ != 0)
             break;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
index 7c8a210d9d3..ef5d94d28be 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
@@ -10,73 +10,61 @@ Reply_Handler::Reply_Handler (void)
 }
 
 void
-Reply_Handler::receive_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Reply_Handler::receive_data (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder
-                                   ACE_ENV_ARG_DECL)
+Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "receive_data: ");
+      ex._tao_print_exception ("receive_data: ");
     }
-  ACE_ENDTRY;
 }
 
 void
-Reply_Handler::sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Reply_Handler::sync (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder
-                           ACE_ENV_ARG_DECL)
+Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "sync: ");
+      ex._tao_print_exception ("sync: ");
     }
-  ACE_ENDTRY;
 }
 
 void
-Reply_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Reply_Handler::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Reply_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder
-                               ACE_ENV_ARG_DECL)
+Reply_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "shutdown: ");
+      ex._tao_print_exception ("shutdown: ");
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h
index 9d73cbcc70d..34638d1a812 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.h
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.h
@@ -17,22 +17,19 @@ public:
   Reply_Handler (void);
 
   // = The skeleton methods
-  virtual void receive_data (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void receive_data (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void receive_data_excep (::Messaging::ExceptionHolder *holder
-                                   ACE_ENV_ARG_DECL)
+  virtual void receive_data_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void sync (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void sync_excep (::Messaging::ExceptionHolder *holder
-                           ACE_ENV_ARG_DECL)
+  virtual void sync_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
-                               ACE_ENV_ARG_DECL)
+  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index 9c883a1d3f5..2bd2e711252 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +66,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(AMI_buffering_admin_impl);
 
       Test::AMI_Buffering_Admin_var AMI_buffering_admin =
-        AMI_buffering_admin_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        AMI_buffering_admin_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (AMI_buffering_admin.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (AMI_buffering_admin.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -87,27 +81,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) admin - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in admin:");
+      ex._tao_print_exception ("Exception caught in admin:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 2e05c13f86e..cbe44b66b1f 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -93,43 +93,36 @@ parse_args (int argc, char *argv[])
 int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::AMI_Buffering_ptr ami_buffering,
-                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                   ACE_ENV_ARG_DECL);
+                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin);
 int
 run_timeout (CORBA::ORB_ptr orb,
              Test::AMI_Buffering_ptr ami_buffering,
-             Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-             ACE_ENV_ARG_DECL);
+             Test::AMI_Buffering_Admin_ptr ami_buffering_admin);
 
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::AMI_Buffering_ptr oneway_buffering,
-                      Test::AMI_Buffering_Admin_ptr oneway_buffering_admin
-                      ACE_ENV_ARG_DECL);
+                      Test::AMI_Buffering_Admin_ptr oneway_buffering_admin);
 
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::AMI_Buffering_ptr ami_buffering,
-                 Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                 ACE_ENV_ARG_DECL);
+                 Test::AMI_Buffering_Admin_ptr ami_buffering_admin);
 
 int
 main (int argc, char *argv[])
 {
   int test_failed = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -137,22 +130,18 @@ 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 ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(server_ior);
 
       Test::AMI_Buffering_var ami_buffering =
-        Test::AMI_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::AMI_Buffering::_narrow(tmp.in ());
 
       if (CORBA::is_nil (ami_buffering.in ()))
         {
@@ -163,12 +152,10 @@ main (int argc, char *argv[])
         }
 
       tmp =
-        orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(admin_ior);
 
       Test::AMI_Buffering_Admin_var ami_buffering_admin =
-        Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::AMI_Buffering_Admin::_narrow(tmp.in ());
 
       if (CORBA::is_nil (ami_buffering_admin.in ()))
         {
@@ -191,9 +178,7 @@ main (int argc, char *argv[])
           test_failed =
             run_message_count (orb.in (),
                                ami_buffering.in (),
-                               ami_buffering_admin.in ()
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               ami_buffering_admin.in ());
         }
       else if (run_timeout_test)
         {
@@ -202,9 +187,7 @@ main (int argc, char *argv[])
           test_failed =
             run_timeout (orb.in (),
                          ami_buffering.in (),
-                         ami_buffering_admin.in ()
-                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                         ami_buffering_admin.in ());
         }
       else if (run_timeout_reactive_test)
         {
@@ -213,9 +196,7 @@ main (int argc, char *argv[])
           test_failed =
             run_timeout_reactive (orb.in (),
                                   ami_buffering.in (),
-                                  ami_buffering_admin.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                  ami_buffering_admin.in ());
         }
       else if (run_buffer_size_test)
         {
@@ -224,9 +205,7 @@ main (int argc, char *argv[])
           test_failed =
             run_buffer_size (orb.in (),
                              ami_buffering.in (),
-                             ami_buffering_admin.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             ami_buffering_admin.in ());
         }
       else
         {
@@ -238,22 +217,17 @@ main (int argc, char *argv[])
 
       client_task.thr_mgr ()->wait ();
 
-      ami_buffering->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ami_buffering->shutdown ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client:");
+      ex._tao_print_exception ("Exception caught in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return test_failed;
 }
@@ -262,16 +236,13 @@ int
 configure_policies (CORBA::ORB_ptr orb,
                     const TAO::BufferingConstraint &buffering_constraint,
                     Test::AMI_Buffering_ptr ami_buffering,
-                    Test::AMI_Buffering_out flusher
-                    ACE_ENV_ARG_DECL)
+                    Test::AMI_Buffering_out flusher)
 {
   CORBA::Object_var object =
-    orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->resolve_initial_references ("PolicyCurrent");
 
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::PolicyCurrent::_narrow (object.in ());
 
   if (CORBA::is_nil (policy_current.in ()))
     {
@@ -287,23 +258,15 @@ configure_policies (CORBA::ORB_ptr orb,
   CORBA::PolicyList policies (2); policies.length (2);
   policies[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        scope_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        scope_as_any);
   policies[1] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        buffering_as_any);
 
-  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]->destroy ();
+  policies[1]->destroy ();
 
   TAO::BufferingConstraint flush_constraint;
   flush_constraint.mode = TAO::BUFFER_FLUSH;
@@ -315,41 +278,31 @@ configure_policies (CORBA::ORB_ptr orb,
   policies.length (1);
   policies[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        buffering_as_any);
 
   object =
     ami_buffering->_set_policy_overrides (policies,
-                                             CORBA::ADD_OVERRIDE
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                             CORBA::ADD_OVERRIDE);
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]->destroy ();
 
   flusher =
-    Test::AMI_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Test::AMI_Buffering::_narrow (object.in ());
 
   return 0;
 }
 
 void
 sync_server (CORBA::ORB_ptr orb,
-             Test::AMI_Buffering_ptr flusher
-             ACE_ENV_ARG_DECL)
+             Test::AMI_Buffering_ptr flusher)
 {
   // Get back in sync with the server...
-  flusher->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  flusher->sync (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  flusher->flush ();
+  flusher->sync ();
 
   // Drain responses from the queue
   ACE_Time_Value tv (0, 100000);
-  orb->run (tv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  orb->run (tv);
 }
 
 int
@@ -357,19 +310,16 @@ run_liveness_test (CORBA::ORB_ptr orb,
                    Test::AMI_AMI_BufferingHandler_ptr reply_handler,
                    Test::AMI_Buffering_ptr ami_buffering,
                    Test::AMI_Buffering_ptr flusher,
-                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                   ACE_ENV_ARG_DECL)
+                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
 {
   ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n"));
   int test_failed = 0;
 
   // Get back in sync with the server...
-  sync_server (orb, flusher ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  sync_server (orb, flusher);
 
   CORBA::ULong send_count =
-    ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    ami_buffering_admin->request_count ();
 
   int liveness_test_iterations = int(send_count);
   ACE_DEBUG ((LM_DEBUG, " liveness_test_iterations = %d\n",
@@ -384,18 +334,14 @@ run_liveness_test (CORBA::ORB_ptr orb,
   for (int i = 0; i != liveness_test_iterations; ++i)
     {
       ami_buffering->sendc_receive_data (reply_handler,
-                                         payload
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                                         payload);
       send_count++;
 
       CORBA::ULong receive_count =
-        ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        ami_buffering_admin->request_count ();
 
       ACE_Time_Value tv (0, 10 * 1000);
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      orb->run (tv);
 
       // Once the system has sent enough messages we don't
       // expect it to fall too far behind, i.e. at least 90% of the
@@ -412,14 +358,12 @@ run_liveness_test (CORBA::ORB_ptr orb,
                       "expected %u\n",
                       i, receive_count, expected));
 
-          sync_server (orb, flusher ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          sync_server (orb, flusher);
         }
 
       if (depth++ == LIVENESS_MAX_DEPTH)
         {
-          sync_server (orb, flusher ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          sync_server (orb, flusher);
 
           depth = 0;
         }
@@ -431,8 +375,7 @@ run_liveness_test (CORBA::ORB_ptr orb,
 int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::AMI_Buffering_ptr ami_buffering,
-                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                   ACE_ENV_ARG_DECL)
+                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT;
@@ -443,9 +386,7 @@ run_message_count (CORBA::ORB_ptr orb,
   Test::AMI_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        ami_buffering, flusher.out ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        ami_buffering, flusher.out ());
 
   if (test_failed != 0)
     return test_failed;
@@ -462,18 +403,15 @@ run_message_count (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    reply_handler_impl->_this ();
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      sync_server (orb, flusher.in ());
 
       CORBA::ULong initial_receive_count =
-        ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        ami_buffering_admin->request_count ();
 
       if (initial_receive_count != send_count)
         {
@@ -486,18 +424,14 @@ run_message_count (CORBA::ORB_ptr orb,
       while (1)
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
-                                             payload
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                             payload);
           send_count++;
 
           CORBA::ULong receive_count =
-            ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            ami_buffering_admin->request_count ();
 
           ACE_Time_Value tv (0, 10 * 1000);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          orb->run (tv);
 
           CORBA::ULong iteration_count =
             send_count - initial_receive_count;
@@ -535,9 +469,7 @@ run_message_count (CORBA::ORB_ptr orb,
                        reply_handler.in (),
                        ami_buffering,
                        flusher.in (),
-                       ami_buffering_admin
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       ami_buffering_admin);
 
   if (liveness_test_failed)
     test_failed = 1;
@@ -548,8 +480,7 @@ run_message_count (CORBA::ORB_ptr orb,
 int
 run_timeout (CORBA::ORB_ptr orb,
               Test::AMI_Buffering_ptr ami_buffering,
-              Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-              ACE_ENV_ARG_DECL)
+              Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -560,9 +491,7 @@ run_timeout (CORBA::ORB_ptr orb,
   Test::AMI_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        ami_buffering, flusher.out ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        ami_buffering, flusher.out ());
 
   if (test_failed != 0)
     return test_failed;
@@ -579,18 +508,15 @@ run_timeout (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    reply_handler_impl->_this ();
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      sync_server (orb, flusher.in ());
 
       CORBA::ULong initial_receive_count =
-        ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        ami_buffering_admin->request_count ();
 
       if (initial_receive_count != send_count)
         {
@@ -604,18 +530,14 @@ run_timeout (CORBA::ORB_ptr orb,
       while (1)
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
-                                             payload
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                             payload);
           send_count++;
 
           CORBA::ULong receive_count =
-            ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            ami_buffering_admin->request_count ();
 
           ACE_Time_Value tv (0, 10 * 1000);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          orb->run (tv);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
           if (receive_count != initial_receive_count)
@@ -653,9 +575,7 @@ run_timeout (CORBA::ORB_ptr orb,
                        reply_handler.in (),
                        ami_buffering,
                        flusher.in (),
-                       ami_buffering_admin
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       ami_buffering_admin);
 
   if (liveness_test_failed)
     test_failed = 1;
@@ -666,8 +586,7 @@ run_timeout (CORBA::ORB_ptr orb,
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::AMI_Buffering_ptr ami_buffering,
-                      Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                      ACE_ENV_ARG_DECL)
+                      Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -678,9 +597,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   Test::AMI_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        ami_buffering, flusher.out ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        ami_buffering, flusher.out ());
 
   if (test_failed != 0)
     return test_failed;
@@ -697,18 +614,15 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    reply_handler_impl->_this ();
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      sync_server (orb, flusher.in ());
 
       CORBA::ULong initial_receive_count =
-        ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        ami_buffering_admin->request_count ();
 
       if (initial_receive_count != send_count)
         {
@@ -721,20 +635,16 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
       for (int j = 0; j != 20; ++j)
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
-                                             payload
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                             payload);
           send_count++;
         }
       while (1)
         {
           CORBA::ULong receive_count =
-            ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            ami_buffering_admin->request_count ();
 
           ACE_Time_Value tv (0, 10 * 1000);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          orb->run (tv);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
           if (receive_count != initial_receive_count)
@@ -773,9 +683,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
                        reply_handler.in (),
                        ami_buffering,
                        flusher.in (),
-                       ami_buffering_admin
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       ami_buffering_admin);
 
   if (liveness_test_failed)
     test_failed = 1;
@@ -788,8 +696,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::AMI_Buffering_ptr ami_buffering,
-                 Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                 ACE_ENV_ARG_DECL)
+                 Test::AMI_Buffering_Admin_ptr ami_buffering_admin)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES;
@@ -800,9 +707,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
   Test::AMI_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        ami_buffering, flusher.out ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        ami_buffering, flusher.out ());
 
   if (test_failed != 0)
     return test_failed;
@@ -817,18 +722,15 @@ run_buffer_size (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    reply_handler_impl->_this ();
 
   CORBA::ULong bytes_sent = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      sync_server (orb, flusher.in ());
 
       CORBA::ULong initial_bytes_received =
-        ami_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        ami_buffering_admin->bytes_received_count ();
 
       if (initial_bytes_received != bytes_sent)
         {
@@ -841,18 +743,14 @@ run_buffer_size (CORBA::ORB_ptr orb,
       while (1)
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
-                                             payload
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+                                             payload);
           bytes_sent += PAYLOAD_LENGTH;
 
           CORBA::ULong bytes_received =
-            ami_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            ami_buffering_admin->bytes_received_count ();
 
           ACE_Time_Value tv (0, 10 * 1000);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          orb->run (tv);
 
           CORBA::ULong payload_delta =
             bytes_sent - initial_bytes_received;
@@ -895,9 +793,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
                        reply_handler.in (),
                        ami_buffering,
                        flusher.in (),
-                       ami_buffering_admin
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       ami_buffering_admin);
 
   if (liveness_test_failed)
     test_failed = 1;
diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp
index ba5fa487943..53e85d2e7ca 100644
--- a/TAO/tests/AMI_Buffering/server.cpp
+++ b/TAO/tests/AMI_Buffering/server.cpp
@@ -43,19 +43,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,19 +60,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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::AMI_Buffering_Admin_var admin =
-        Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::AMI_Buffering_Admin::_narrow(tmp.in ());
 
       if (CORBA::is_nil (admin.in ()))
         {
@@ -93,12 +87,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(AMI_buffering_impl);
 
       Test::AMI_Buffering_var AMI_buffering =
-        AMI_buffering_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        AMI_buffering_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (AMI_buffering.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (AMI_buffering.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -110,27 +102,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in server:");
+      ex._tao_print_exception ("Exception caught in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index e483bc5d871..d5b81fcd707 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -62,23 +62,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       TimeoutObj_var timeout_var =
-        TimeoutObj::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TimeoutObj::_narrow (object.in ());
 
       if (CORBA::is_nil (timeout_var.in ()))
         {
@@ -91,8 +87,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -100,22 +95,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Instantiate reply handler
       TimeoutHandler_i timeoutHandler_i;
 
       AMI_TimeoutObjHandler_var timeoutHandler_var =
-        timeoutHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        timeoutHandler_i._this ();
 
       // Instantiate client
       TimeoutClient client (orb.in (),
@@ -127,31 +118,26 @@ main (int argc, char *argv[])
       client.activate ();
 
       // ORB loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);  // Fetch responses
-      ACE_TRY_CHECK;
+      orb->run ();  // Fetch responses
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
       // Wait for all the threads to finish before destroying the
       // ORB.
       (void) client.thr_mgr ()->wait ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index b26f765296d..56245f32862 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.cpp
@@ -54,16 +54,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -71,12 +68,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -84,12 +79,10 @@ main (int argc, char *argv[])
       Timeout_i timeout_i (orb.in ());
 
       TimeoutObj_var timeout_var =
-        timeout_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        timeout_i._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (timeout_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (timeout_var.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -106,15 +99,13 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Instantiate reply handler
       TimeoutHandler_i timeoutHandler_i;
 
       AMI_TimeoutObjHandler_var timeoutHandler_var =
-        timeoutHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        timeoutHandler_i._this ();
 
       // Instantiate client
       /*
@@ -126,29 +117,24 @@ main (int argc, char *argv[])
       client->activate ();
       */
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       //delete client;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index 96322b4cf1d..7e748014887 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -47,8 +47,7 @@ TimeoutClient::svc ()
 {
   this->initialize ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
       // Tests timeouts for synchronous
@@ -64,22 +63,19 @@ TimeoutClient::svc ()
       this->none_test ();
 
       // shut down remote ORB
-      timeoutObject_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      timeoutObject_->shutdown ();
 
       ACE_Time_Value tv (0, 20); // wait for the ORB to deliver the shutdonw
       ACE_OS::sleep (tv);
 
       // shut down local ORB
-      orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "TimeoutClient::svc: Done\n\n"));
@@ -90,24 +86,19 @@ TimeoutClient::svc ()
 int
 TimeoutClient::initialize ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var object =
-        orb_->resolve_initial_references ("ORBPolicyManager"
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("ORBPolicyManager");
 
       policy_manager_ =
-        CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (object.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -134,8 +125,7 @@ TimeoutClient::send (CORBA::Boolean async,
 
   CORBA::PolicyList policy_list (1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (normal)
+  try
     {
       if (local_timeout != 0)
         {
@@ -147,22 +137,16 @@ TimeoutClient::send (CORBA::Boolean async,
           policy_list.length (1);
           policy_list[0] =
             orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                 any_orb
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (normal);
+                                 any_orb);
 
           policy_manager_->set_policy_overrides (policy_list,
-                                                 CORBA::SET_OVERRIDE
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (normal);
+                                                 CORBA::SET_OVERRIDE);
         }
       else
         {
           policy_list.length (0);
           policy_manager_->set_policy_overrides (policy_list,
-                                                 CORBA::SET_OVERRIDE
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (normal);
+                                                 CORBA::SET_OVERRIDE);
         }
 
 
@@ -172,18 +156,14 @@ TimeoutClient::send (CORBA::Boolean async,
       if (async)
         {
           timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_.in (),
-                                                remote_sleep
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (normal);
+                                                remote_sleep);
         }
       else // synch
         {
-          timeoutObject_->sendTimeToWait (remote_sleep
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (normal);
+          timeoutObject_->sendTimeToWait (remote_sleep);
         }
     }
-  ACE_CATCH (CORBA::TIMEOUT, timeout)
+  catch (const CORBA::TIMEOUT& )
     {
       local_reply_excep_counter_++;
 
@@ -192,25 +172,20 @@ TimeoutClient::send (CORBA::Boolean async,
                   " timeout "));
 
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   // get rid of the policy, you created before.
-  ACE_TRY_EX (cleanup)
+  try
     {
       if (local_timeout != 0)
         {
-          policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (cleanup);
+          policy_list[0]->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Error: Unexpected exception\n\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   // wait for responses
   ACE_Time_Value tv (0, (local_timeout + remote_sleep)*2000 + 4000);
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index ff9fab96bd8..85e35ccbf46 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -29,8 +29,7 @@ Timeout_i::~Timeout_i ()
 }
 
 void
-Timeout_i::sendTimeToWait (CORBA::Long msec
-                           ACE_ENV_ARG_DECL_NOT_USED)
+Timeout_i::sendTimeToWait (CORBA::Long msec)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG,
@@ -48,7 +47,7 @@ Timeout_i::sendTimeToWait (CORBA::Long msec
 }
 
 void
-Timeout_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Timeout_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   orb_->shutdown ();
@@ -72,7 +71,7 @@ TimeoutHandler_i::~TimeoutHandler_i ()
 }
 
 void
-TimeoutHandler_i::sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TimeoutHandler_i::sendTimeToWait (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -82,29 +81,26 @@ TimeoutHandler_i::sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TimeoutHandler_i::sendTimeToWait_excep (::Messaging::ExceptionHolder *excep_holder
-                                        ACE_ENV_ARG_DECL)
+TimeoutHandler_i::sendTimeToWait_excep (::Messaging::ExceptionHolder *excep_holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   timer_.stop ();
 
-  ACE_TRY
+  try
     {
-      excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      excep_holder->raise_exception ();
     }
-  ACE_CATCH (CORBA::TIMEOUT, timeout)
+  catch (const CORBA::TIMEOUT& )
     {
       ACE_DEBUG ((LM_DEBUG,
                   "timeout"));
       reply_excep_counter_++;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Error: Unexpected exception"));
     }
-  ACE_ENDTRY;
 }
 
 void
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index d4082ac05d2..d82a6c73eee 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -31,11 +31,10 @@ public:
 
   ~Timeout_i ();
 
-  virtual void sendTimeToWait (CORBA::Long msec
-                               ACE_ENV_ARG_DECL)
+  virtual void sendTimeToWait (CORBA::Long msec)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -51,12 +50,11 @@ public:
 
   ~TimeoutHandler_i ();
 
-  virtual void sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void sendTimeToWait (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void sendTimeToWait_excep (
-      ::Messaging::ExceptionHolder * excep_holder
-      ACE_ENV_ARG_DECL)
+      ::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void reset_reply_counter ();
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index 0a26fb84775..0fcf7680569 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -124,12 +124,9 @@ test_state (base_ptr abs)
 }
 
 void
-test_operation (base_ptr abs
-                ACE_ENV_ARG_DECL)
+test_operation (base_ptr abs)
 {
-  CORBA::String_var retval = abs->base_op ("base_op"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var retval = abs->base_op ("base_op");
 
   if (debug)
     {
@@ -140,13 +137,9 @@ test_operation (base_ptr abs
 
   CORBA::Object_var obj = abs->_to_object ();
 
-  foo_var concrete = foo::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  foo_var concrete = foo::_narrow (obj.in ());
 
-  retval = concrete->foo_op ("foo_op"
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  retval = concrete->foo_op ("foo_op");
 
   if (debug)
     {
@@ -155,9 +148,7 @@ test_operation (base_ptr abs
                   retval.in ()));
     }
 
-  retval = concrete->base_op ("base_op"
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  retval = concrete->base_op ("base_op");
 
   if (debug)
     {
@@ -168,12 +159,9 @@ test_operation (base_ptr abs
 }
 
 void
-test_exception (base_ptr abs
-                ACE_ENV_ARG_DECL)
+test_exception (base_ptr abs)
 {
-  CORBA::String_var retval = abs->base_op ("bad_name"
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var retval = abs->base_op ("bad_name");
 
   if (debug)
     {
@@ -188,13 +176,11 @@ main (int argc, char *argv[])
 {
   CORBA::String_var retval;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       if (parse_args (argc, argv) != 0)
         {
@@ -202,9 +188,7 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior_input_file
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior_input_file);
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -213,9 +197,7 @@ main (int argc, char *argv[])
                             -1);
         }
 
-      passer_var objref = passer::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      passer_var objref = passer::_narrow (obj.in ());
 
       if (CORBA::is_nil (objref.in ()))
         {
@@ -235,9 +217,7 @@ main (int argc, char *argv[])
                           1);
 
           orb->register_value_factory (bn_factory->tao_repository_id (),
-                                       bn_factory
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       bn_factory);
           bn_factory->_remove_ref (); // release ownership
 
           // Create and register factory for TreeController.
@@ -247,9 +227,7 @@ main (int argc, char *argv[])
                           1);
 
           orb->register_value_factory (tc_factory->tao_repository_id (),
-                                       tc_factory
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       tc_factory);
           tc_factory->_remove_ref (); // release ownership
 
           // Create and register factory for StringNode.
@@ -259,14 +237,10 @@ main (int argc, char *argv[])
                           1);
 
           orb->register_value_factory (sn_factory->tao_repository_id (),
-                                       sn_factory
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       sn_factory);
           sn_factory->_remove_ref (); // release ownership
 
-          objref->pass_state (package.out ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          objref->pass_state (package.out ());
 
           if (CORBA::is_nil (package.in ()))
             {
@@ -280,9 +254,7 @@ main (int argc, char *argv[])
 
       if (which_test != TEST_STATE)
         {
-          objref->pass_ops (package.out ()
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          objref->pass_ops (package.out ());
 
           if (CORBA::is_nil (package.in ()))
             {
@@ -294,28 +266,22 @@ main (int argc, char *argv[])
 
       if (which_test == TEST_OPERATION || which_test == TEST_ALL)
         {
-          test_operation (package.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_operation (package.in ());
         }
 
       if (which_test == TEST_EXCEPTION || which_test == TEST_ALL)
         {
           which_test = TEST_EXCEPTION;
-          test_exception (package.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_exception (package.in ());
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCH (BadInput, ex)
+  catch (const BadInput& ex)
     {
       if (which_test != TEST_EXCEPTION)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Client: exception caught - ");
+          ex._tao_print_exception ("Client: exception caught - ");
 
           return 1;
         }
@@ -327,14 +293,12 @@ main (int argc, char *argv[])
                       ex.message.in ()));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client: exception caught - ");
+      ex._tao_print_exception ("Client: exception caught - ");
 
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp
index 6a3c9034587..d9dca0ceb04 100644
--- a/TAO/tests/Abstract_Interface/server.cpp
+++ b/TAO/tests/Abstract_Interface/server.cpp
@@ -39,13 +39,11 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       // Create and register factory for BaseNode.
       BaseNode_init *bn_factory = 0;
@@ -54,9 +52,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (bn_factory->tao_repository_id (),
-                                   bn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   bn_factory);
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -66,9 +62,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (tc_factory->tao_repository_id (),
-                                   tc_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   tc_factory);
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -78,15 +72,11 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (sn_factory->tao_repository_id (),
-                                   sn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   sn_factory);
       sn_factory->_remove_ref (); // release ownership
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -96,13 +86,10 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         {
@@ -111,13 +98,10 @@ main (int argc, char *argv[])
 
       passer_i servant;
       passer_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-              orb->object_to_string (server.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+              orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Activated as <%s>\n",
@@ -142,30 +126,22 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_Time_Value tv (10);
-      orb->run (tv
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       // Destroy the POA, waiting until the destruction terminates
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Server: exception caught - ");
+      ex._tao_print_exception ("Server: exception caught - ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index a3e9072788b..b7dbaa3b445 100644
--- a/TAO/tests/Abstract_Interface/test_i.cpp
+++ b/TAO/tests/Abstract_Interface/test_i.cpp
@@ -10,8 +10,7 @@ ACE_RCSID (Abstract_Interface,
 
 
 char *
-foo_i::foo_op (const char * inarg
-               ACE_ENV_ARG_DECL)
+foo_i::foo_op (const char * inarg)
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     BadInput
@@ -33,8 +32,7 @@ foo_i::foo_op (const char * inarg
 }
 
 char *
-foo_i::base_op (const char * inarg
-                ACE_ENV_ARG_DECL)
+foo_i::base_op (const char * inarg)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       BadInput
@@ -56,8 +54,7 @@ foo_i::base_op (const char * inarg
 }
 
 void
-passer_i::pass_ops (base_out outarg
-                    ACE_ENV_ARG_DECL)
+passer_i::pass_ops (base_out outarg)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -66,13 +63,11 @@ passer_i::pass_ops (base_out outarg
   ACE_NEW (servant,
            foo_i);
   PortableServer::ServantBase_var safety (servant);
-  outarg = servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  outarg = servant->_this ();
 }
 
 void
-passer_i::pass_state (base_out outarg
-                      ACE_ENV_ARG_DECL_NOT_USED)
+passer_i::pass_state (base_out outarg)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h
index b9af23803aa..f389142c342 100644
--- a/TAO/tests/Abstract_Interface/test_i.h
+++ b/TAO/tests/Abstract_Interface/test_i.h
@@ -7,15 +7,13 @@
 
 class foo_i : public virtual POA_foo
 {
-  virtual char * foo_op (const char * inarg
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * foo_op (const char * inarg)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       BadInput
     ));
 
-  virtual char * base_op (const char * inarg
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual char * base_op (const char * inarg)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       BadInput
@@ -24,14 +22,12 @@ class foo_i : public virtual POA_foo
 
 class passer_i : public virtual POA_passer
 {
-  virtual void pass_ops (base_out outarg
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pass_ops (base_out outarg)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual void pass_state (base_out outarg
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pass_state (base_out outarg)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp
index 4ad14983990..b023cf9d179 100644
--- a/TAO/tests/Any/Recursive/Hello.cpp
+++ b/TAO/tests/Any/Recursive/Hello.cpp
@@ -14,8 +14,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 CORBA::Any *
-Hello::get_any (CORBA::Any const & the_any
-                ACE_ENV_ARG_DECL)
+Hello::get_any (CORBA::Any const & the_any)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any * retval = 0;
@@ -23,16 +22,14 @@ Hello::get_any (CORBA::Any const & the_any
   ACE_NEW_THROW_EX (retval,
                     CORBA::Any (the_any),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (retval);
 
   return retval;
 }
 
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Any/Recursive/Hello.h b/TAO/tests/Any/Recursive/Hello.h
index 948d883b625..07a967ea5e9 100644
--- a/TAO/tests/Any/Recursive/Hello.h
+++ b/TAO/tests/Any/Recursive/Hello.h
@@ -27,11 +27,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // Return the any provide as an "in" argument.
-  virtual CORBA::Any * get_any (CORBA::Any const & the_any
-                                ACE_ENV_ARG_DECL)
+  virtual CORBA::Any * get_any (CORBA::Any const & the_any)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Any/Recursive/Test.idl b/TAO/tests/Any/Recursive/Test.idl
index d1d5e447c36..a633c1d83b8 100644
--- a/TAO/tests/Any/Recursive/Test.idl
+++ b/TAO/tests/Any/Recursive/Test.idl
@@ -2,6 +2,8 @@
 // $Id$
 //
 
+#include "tao/OctetSeq.pidl"
+
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
 {
@@ -18,6 +20,18 @@ module Test
     RecursiveStructSeq recursive_structs_second;
   };
 
+  struct NestedRecursiveStruct;
+  typedef sequence<NestedRecursiveStruct> NestedRecursiveStructSeq;
+
+  struct NestedRecursiveStruct
+  {
+    struct InnerStruct
+    {
+      NestedRecursiveStructSeq recursive_structs;
+    }    ins;
+    long i;
+  };
+
   // --------------------------
 
   union RecursiveUnion;
@@ -100,6 +114,25 @@ module Test
 
   // --------------------------
 
+  enum PositionEnum { unknownpos };
+
+  struct Position {
+    PositionEnum type;
+  };
+  typedef CORBA::OctetSeq OctetSeq;
+
+  enum ValueSort {
+    POSITION_TYPE,
+    OCTET_SEQ_TYPE
+  };
+
+  union NonRecursiveUnionWithEnum switch (ValueSort) {
+  case POSITION_TYPE:
+    Position position_val;
+  case OCTET_SEQ_TYPE:
+    OctetSeq octet_seq_val;
+  };
+
   /// Simple test interface.
   interface Hello
   {
diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp
index 6bb78f5ed62..a9e1e860ca3 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -65,6 +65,22 @@ dump<Test::RecursiveStruct> (Test::RecursiveStruct * data)
 
 template<>
 void
+dump<Test::NestedRecursiveStruct> (Test::NestedRecursiveStruct * data)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "Test::NestedRecursiveStruct\n"
+              "%d\n"
+              "%u\n"
+              "%d\n"
+              "%d\n",
+              data->i,
+              data->ins.recursive_structs.length (),
+              data->ins.recursive_structs[0].i,
+              data->ins.recursive_structs[1].i));
+}
+
+template<>
+void
 dump<Test::RecursiveUnion> (Test::RecursiveUnion * data)
 {
   ACE_DEBUG ((LM_DEBUG, "Test::RecursiveUnion\n"));
@@ -95,21 +111,18 @@ dump<Test::RecursiveUnion> (Test::RecursiveUnion * data)
 template<typename T>
 void
 perform_invocation (Test::Hello_ptr hello,
-                    CORBA::Any const & the_any
-                    ACE_ENV_ARG_DECL)
+                    CORBA::Any const & the_any)
 {
   // Execute more than once to help verify that mutable recursive
   // TypeCode state is managed correctly.
   for (unsigned int n = 0; n < 2; ++n)
     {
       CORBA::Any_var my_any =
-        hello->get_any (the_any
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        hello->get_any (the_any);
 
       T * my_foo = 0;
       if (!(my_any.in () >>= my_foo))
-        ACE_THROW (Test::Demarshaling_From_Any_Failed ());
+        throw Test::Demarshaling_From_Any_Failed ();
 
 //       ACE_DEBUG ((LM_DEBUG, "Data dump:\n"));
 //       dump<T> (my_foo);
@@ -118,27 +131,22 @@ perform_invocation (Test::Hello_ptr hello,
       CORBA::TypeCode_var my_tc  = my_any->type ();
 
       CORBA::Boolean const equal_tc =
-        the_tc->equal (my_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        the_tc->equal (my_tc.in ());
 
       if (!equal_tc)
-        ACE_THROW (Test::Recursive_Type_In_Any_Test_Failed ());
+        throw Test::Recursive_Type_In_Any_Test_Failed ();
 
       CORBA::Boolean const equiv_tc =
-        the_tc->equivalent (my_tc.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        the_tc->equivalent (my_tc.in ());
 
       if (!equiv_tc)
-        ACE_THROW (Test::Recursive_Type_In_Any_Test_Failed ());
+        throw Test::Recursive_Type_In_Any_Test_Failed ();
     }
 }
 
 void
 recursive_struct_test (CORBA::ORB_ptr /* orb */,
-                       Test::Hello_ptr hello
-                       ACE_ENV_ARG_DECL)
+                       Test::Hello_ptr hello)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing recursive struct test\n"));
@@ -154,15 +162,33 @@ recursive_struct_test (CORBA::ORB_ptr /* orb */,
   the_any <<= foo;
 
   ::perform_invocation<Test::RecursiveStruct> (hello,
-                                               the_any
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               the_any);
+}
+
+void
+nested_recursive_struct_test (CORBA::ORB_ptr /* orb */,
+                       Test::Hello_ptr hello)
+{
+  ACE_DEBUG ((LM_INFO,
+              "Executing nested recursive struct test\n"));
+
+  Test::NestedRecursiveStruct foo;
+
+  foo.ins.recursive_structs.length (2);
+  foo.ins.recursive_structs[0].i = 37;
+  foo.ins.recursive_structs[1].i = 11034;
+  foo.i = 12;
+
+  CORBA::Any the_any;
+  the_any <<= foo;
+
+  ::perform_invocation<Test::NestedRecursiveStruct> (hello,
+                                               the_any);
 }
 
 void
 recursive_union_test (CORBA::ORB_ptr /* orb */,
-                      Test::Hello_ptr hello
-                      ACE_ENV_ARG_DECL)
+                      Test::Hello_ptr hello)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing recursive union test\n"));
@@ -177,9 +203,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
   the_any <<= foo_enum;
 
   ::perform_invocation<Test::EnumUnion> (hello,
-                                         the_any
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         the_any);
 
   // Non-recursive member case.
   foo.i (test_long);
@@ -187,9 +211,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
   the_any <<= foo;
 
   ::perform_invocation<Test::RecursiveUnion> (hello,
-                                              the_any
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              the_any);
 
   // Recursive member case.
   Test::RecursiveUnionSeq seq;
@@ -202,9 +224,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
   the_any <<= foo;
 
   ::perform_invocation<Test::RecursiveUnion> (hello,
-                                              the_any
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              the_any);
 
   // Recursive member case with no default member
   Test::RecursiveUnionSeqNoDefault seqnodefault;
@@ -218,9 +238,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
   the_any <<= foonodefault;
 
   ::perform_invocation<Test::RecursiveUnionNoDefault> (hello,
-                                                       the_any
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                       the_any);
 
   // Recursive member case with enum .
   Test::VSortRecursiveUnionSeq vsortseq;
@@ -234,16 +252,20 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
   the_any <<= vsort_foo;
 
   ::perform_invocation<Test::VSortRecursiveUnion> (hello,
-                                                   the_any
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                   the_any);
+
+  // Non-recursive member case with enum .
+  Test::NonRecursiveUnionWithEnum val;
+  the_any <<= val;
+
+  ::perform_invocation<Test::NonRecursiveUnionWithEnum> (hello,
+                                                         the_any);
 }
 
 
 void
 indirectly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */,
-                                     Test::Hello_ptr /* hello */
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     Test::Hello_ptr /* hello */)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing indirectly recursive valuetype test\n"));
@@ -254,8 +276,7 @@ indirectly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */,
 
 void
 directly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */,
-                                   Test::Hello_ptr /* hello */
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   Test::Hello_ptr /* hello */)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing directly recursive valuetype test\n"));
@@ -268,8 +289,7 @@ directly_recursive_valuetype_test (CORBA::ORB_ptr /* orb */,
 
 void
 recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb,
-                                       Test::Hello_ptr hello
-                                       ACE_ENV_ARG_DECL)
+                                       Test::Hello_ptr hello)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing recursive struct via TypeCodeFactory test\n"));
@@ -285,15 +305,11 @@ recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb,
   the_any <<= foo;
 
   CORBA::TypeCode_var recursive_tc =
-    orb->create_recursive_tc ("IDL:Test/RecursiveStruct:1.0"
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->create_recursive_tc ("IDL:Test/RecursiveStruct:1.0");
 
   CORBA::TypeCode_var seq_tc =
     orb->create_sequence_tc (0,
-                             recursive_tc.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                             recursive_tc.in ());
 
   CORBA::StructMemberSeq members (3);
   members.length (3);
@@ -307,26 +323,19 @@ recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb,
   CORBA::TypeCode_var struct_tc =
     orb->create_struct_tc ("IDL:Test/RecursiveStruct:1.0",
                            "RecursiveStruct",
-                           members
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           members);
 
   // Reset the underlying TypeCode to the one we just created with the
   // TypeCodeFactory.
-  the_any.type (struct_tc.in ()
-                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  the_any.type (struct_tc.in ());
 
   ::perform_invocation<Test::RecursiveStruct> (hello,
-                                               the_any
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               the_any);
 }
 
 void
 recursive_union_typecodefactory_test (CORBA::ORB_ptr /* orb */,
-                                      Test::Hello_ptr /* hello */
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      Test::Hello_ptr /* hello */)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing recursive union via TypeCodeFactory test\n"));
@@ -338,8 +347,7 @@ recursive_union_typecodefactory_test (CORBA::ORB_ptr /* orb */,
 void
 indirectly_recursive_valuetype_typecodefactory_test (
   CORBA::ORB_ptr /* orb */,
-  Test::Hello_ptr /* hello */
-  ACE_ENV_ARG_DECL_NOT_USED)
+  Test::Hello_ptr /* hello */)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing indirectly recursive valuetype via "
@@ -351,8 +359,7 @@ indirectly_recursive_valuetype_typecodefactory_test (
 
 void
 directly_recursive_valuetype_typecodefactory_test (CORBA::ORB_ptr /* orb */,
-                                                   Test::Hello_ptr /* hello */
-                                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                                   Test::Hello_ptr /* hello */)
 {
   ACE_DEBUG ((LM_INFO,
               "Executing directly recursive valuetype via "
@@ -386,23 +393,17 @@ struct Caller : public std::unary_function<T, void>
   /// Function call operator overload.
   void operator() (T f)
   {
-    ACE_DECLARE_NEW_ENV;
-    ACE_TRY
+    try
       {
         f (orb.in (),
-           hello.in ()
-           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+           hello.in ());
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "Exception thrown:");
+        ex._tao_print_exception ("Exception thrown:");
 
         success = false;
       }
-    ACE_ENDTRY;
-    ACE_CHECK;
   }
 
   CORBA::ORB_var orb;
@@ -413,22 +414,19 @@ struct Caller : public std::unary_function<T, void>
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -439,12 +437,12 @@ main (int argc, char *argv[])
         }
 
       typedef void (*test_func) (CORBA::ORB_ptr,
-                                 Test::Hello_ptr
-                                 ACE_ENV_ARG_DECL);
+                                 Test::Hello_ptr);
 
       static test_func const tests[] =
         {
           recursive_struct_test
+          , nested_recursive_struct_test
           , recursive_union_test
           , indirectly_recursive_valuetype_test
           , directly_recursive_valuetype_test
@@ -466,21 +464,17 @@ main (int argc, char *argv[])
                                           hello.in ()));
 
       if (!c.success)
-        ACE_TRY_THROW (Test::Recursive_Type_In_Any_Test_Failed ());
+        throw Test::Recursive_Type_In_Any_Test_Failed ();
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp
index 177aad4d1d8..8c998950dd3 100644
--- a/TAO/tests/Any/Recursive/server.cpp
+++ b/TAO/tests/Any/Recursive/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index d775aabc942..a6523c6733c 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -42,15 +42,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,12 +56,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -73,9 +69,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -83,32 +77,26 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -122,18 +110,14 @@ main (int argc, char *argv[])
       Callback_i callback_impl (orb.in ());
 
       Callback_var callback =
-        callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        callback_impl._this ();
 
       // Send the calback object to the server
-      server->callback_object (callback.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->callback_object (callback.in ());
 
       // A  method to kickstart callbacks from the server
       CORBA::Long r =
-        server->test_method (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->test_method (1);
 
       if (r != 0)
         {
@@ -142,20 +126,16 @@ main (int argc, char *argv[])
                       r));
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index 02f3a672f43..0b8c678b717 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -43,15 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,12 +57,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -74,9 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -84,21 +78,17 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -110,18 +100,13 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("simple_server");
 
       child_poa->activate_object_with_id (id.in (),
-                                          &server_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          &server_impl);
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -144,32 +129,26 @@ main (int argc, char *argv[])
           // Just process one upcall. We know that we would get the
           // clients IOR in that call.
           CORBA::Boolean pending =
-            orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending();
 
           if (pending)
             {
-              orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work();
             }
 
           // Now that hopefully we have the clients IOR, just start
           // making remote calls to the client.
-          retval = server_impl.call_client (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          retval = server_impl.call_client ();
         }
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index 93a1a88ca4d..dedcddd24ec 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -14,15 +14,15 @@
 ACE_RCSID(BiDirectional, test_i, "$Id$")
 
 void
-Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Callback_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method ( /**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -34,7 +34,7 @@ Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_A
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -47,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 
 void
 Simple_Server_i::callback_object (Callback_ptr callback
-                                  ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -55,14 +55,13 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::call_client (void)
 {
   if (this->flag_)
     {
       for (int times = 0; times < this->no_iterations_; ++times)
         {
-          this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->callback_->callback_method ();
 
           // If the cache size has gotten larger this indicates that
           // the connection isn't being shared properly, i.e., a new
@@ -76,8 +75,7 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
             }
         }
 
-      this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->callback_->shutdown ();
       this->flag_ = 0;
 
       return 1;
@@ -88,8 +86,8 @@ Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h
index 9cf3cb4977c..33333f74968 100644
--- a/TAO/tests/BiDirectional/test_i.h
+++ b/TAO/tests/BiDirectional/test_i.h
@@ -31,11 +31,11 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Safe way to shutdown
 
-  void callback_method (ACE_ENV_SINGLE_ARG_DECL)
+  void callback_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -58,18 +58,16 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Boolean do_callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void callback_object (Callback_ptr callback
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void callback_object (Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  int call_client (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int call_client (void);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
index a6b00269d1b..86d6a8a89bb 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
@@ -43,15 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,12 +57,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -74,9 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -84,32 +78,26 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -127,19 +115,15 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(callback_impl);
 
       Callback_var callback =
-        callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        callback_impl->_this ();
 
       // Send the calback object to the server
-      server->callback_object (callback.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->callback_object (callback.in ());
 
       // Call the client that will make remote calls to us again, but
       // not directly, but delayed for a second or so.
       CORBA::Long r =
-        server->test_method (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->test_method (1);
 
       if (r != 0)
         {
@@ -150,24 +134,19 @@ main (int argc, char *argv[])
 
       // Run now the ORB for 5 seconds
       ACE_Time_Value run_time (5);
-      orb->run (run_time ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (run_time);
 
       // Shutdown the server
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
index ef4c284f576..8a882d8bc9c 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
@@ -43,15 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,12 +57,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -74,9 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -84,21 +78,17 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -115,18 +105,13 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("simple_server");
 
       child_poa->activate_object_with_id (id.in (),
-                                          server_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          server_impl);
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -144,21 +129,17 @@ main (int argc, char *argv[])
         }
 
       // Run the event loop
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
index b6c3bc56e36..b79b40c2520 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
@@ -14,15 +14,15 @@
 ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
 
 void
-Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Callback_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Callback_i::callback_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -44,8 +44,7 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &,
         times < this->no_iterations_;
         ++times)
     {
-      this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->callback_->callback_method ();
 
       if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
         {
@@ -56,15 +55,13 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &,
         }
     }
 
-  this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->callback_->shutdown ();
 
   return 0;
 }
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              ACE_ENV_ARG_DECL)
+Simple_Server_i::test_method (CORBA::Boolean do_callback)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -90,7 +87,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 
 void
 Simple_Server_i::callback_object (Callback_ptr callback
-                                  ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -99,8 +96,8 @@ Simple_Server_i::callback_object (Callback_ptr callback
 
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (false ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
index 30b355dcd9c..040bb9a9f53 100644
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
@@ -32,11 +32,11 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Safe way to shutdown
 
-  void callback_method (ACE_ENV_SINGLE_ARG_DECL)
+  void callback_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -58,15 +58,13 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Boolean do_callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void callback_object (Callback_ptr callback
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void callback_object (Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual int handle_timeout (const ACE_Time_Value &current_time,
diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
index d4b0af3a3b9..0a2bcf74537 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
@@ -30,27 +30,21 @@ test_with_bidir_poa (int argc,
                      const char *orb_name,
                      int destroy_orb)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, orb_name);
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager ();
 
-      ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (1);
       policies.length (1);
@@ -59,9 +53,7 @@ test_with_bidir_poa (int argc,
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -69,39 +61,30 @@ test_with_bidir_poa (int argc,
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
       if (destroy_orb)
         {
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised");
-      ACE_CHECK_RETURN (-1);
+      ex._tao_print_exception ("Exception raised");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 184e7ebda37..7825c600db7 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -43,15 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,12 +57,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -74,9 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -84,32 +78,26 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -127,19 +115,15 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(callback_impl);
 
       Callback_var callback =
-        callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        callback_impl->_this ();
 
       // Send the calback object to the server
-      server->callback_object (callback.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->callback_object (callback.in ());
 
       // Call the client that will make remote calls
 
       CORBA::Long r =
-        server->test_method (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->test_method (1);
 
       if (r != 0)
         {
@@ -149,20 +133,16 @@ main (int argc, char *argv[])
         }
 
       // Shutdown the server
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index ef4c284f576..8a882d8bc9c 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -43,15 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,12 +57,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -74,9 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -84,21 +78,17 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -115,18 +105,13 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("simple_server");
 
       child_poa->activate_object_with_id (id.in (),
-                                          server_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          server_impl);
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -144,21 +129,17 @@ main (int argc, char *argv[])
         }
 
       // Run the event loop
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index 6544ddbfbda..2b3eb2fd280 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -13,15 +13,15 @@
 ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
 
 void
-Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Callback_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method ( /**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -32,8 +32,7 @@ Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_A
 // ****************************************************************
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              ACE_ENV_ARG_DECL)
+Simple_Server_i::test_method (CORBA::Boolean do_callback)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -46,8 +45,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
            times < this->no_iterations_;
            ++times)
         {
-          this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
+          this->callback_->callback_method ();
 
           if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
             {
@@ -64,7 +62,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 
 void
 Simple_Server_i::callback_object (Callback_ptr callback
-                                  ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -73,8 +71,8 @@ Simple_Server_i::callback_object (Callback_ptr callback
 
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
index 8573f7a0a0b..8456a5240eb 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
@@ -31,11 +31,11 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Safe way to shutdown
 
-  void callback_method (ACE_ENV_SINGLE_ARG_DECL)
+  void callback_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -57,15 +57,13 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Boolean do_callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void callback_object (Callback_ptr callback
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  void callback_object (Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_AMI/ami_test_i.cpp b/TAO/tests/Big_AMI/ami_test_i.cpp
index 60f2c7559f3..bfaecaaf55f 100644
--- a/TAO/tests/Big_AMI/ami_test_i.cpp
+++ b/TAO/tests/Big_AMI/ami_test_i.cpp
@@ -28,8 +28,7 @@ CORBA::Long
 AMI_Test_i::foo (CORBA::Long_out out_l,
                  CORBA::Long in_l,
                  const char* in_str,
-                 const A::Payload &
-                 ACE_ENV_ARG_DECL_NOT_USED)
+                 const A::Payload &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   out_l = 931233;
@@ -44,7 +43,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 }
 
 void
-AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/Big_AMI/ami_test_i.h b/TAO/tests/Big_AMI/ami_test_i.h
index d61bf0db80f..ab16cfdf41f 100644
--- a/TAO/tests/Big_AMI/ami_test_i.h
+++ b/TAO/tests/Big_AMI/ami_test_i.h
@@ -32,11 +32,10 @@ public:
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
                    const char* in_str,
-                   const A::Payload &the_payload
-                   ACE_ENV_ARG_DECL)
+                   const A::Payload &the_payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp
index 23391b5b797..6c1c78a3e4a 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -84,8 +84,7 @@ public:
   }
 
   void foo (CORBA::Long ami_return_val,
-            CORBA::Long out_l
-            ACE_ENV_ARG_DECL_NOT_USED)
+            CORBA::Long out_l)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ++reply_count_;
@@ -98,8 +97,7 @@ public:
         }
     };
 
-  void foo_excep (::Messaging::ExceptionHolder * excep_holder
-                  ACE_ENV_ARG_DECL)
+  void foo_excep (::Messaging::ExceptionHolder * excep_holder)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ++reply_count_;
@@ -107,18 +105,15 @@ public:
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called: \n"
                                   "Testing proper exception handling ...\n"));
-      ACE_TRY
+      try
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          excep_holder->raise_exception ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "... caught the wrong exception -> ERROR\n"));
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     };
 
 private:
@@ -129,39 +124,31 @@ int
 main (int argc, char *argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object_var =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa_var =
-        PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object_var.in ());
 
       PortableServer::POAManager_var poa_manager_var =
-        poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa_var->the_POAManager ();
 
-      poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager_var->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // We reuse the object_var smart pointer!
-      object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object_var = orb->string_to_object (ior);
 
       A::AMI_Test_var ami_test_var =
-        A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        A::AMI_Test::_narrow (object_var.in ());
 
       if (CORBA::is_nil (ami_test_var.in ()))
         {
@@ -174,8 +161,7 @@ main (int argc, char *argv[])
       // Instantiate the ReplyHandler and register that with the POA.
       Handler handler;
       A::AMI_AMI_TestHandler_var the_handler_var =
-        handler._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        handler._this ();
 
       CORBA::Long l = 931247;
       A::Payload payload (payload_size);
@@ -198,9 +184,7 @@ main (int argc, char *argv[])
           ami_test_var->sendc_foo (the_handler_var.in (),
                                    l,
                                    "Let's talk AMI.",
-                                   payload
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                   payload);
         }
 
       // We are just sending all requests, but we shouldn't get any replies
@@ -227,9 +211,7 @@ main (int argc, char *argv[])
       CORBA::Long number = ami_test_var->foo (l,
                                               l,
                                               "Let's talk SMI.",
-                                              payload
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              payload);
 
       if (debug)
         {
@@ -240,26 +222,20 @@ main (int argc, char *argv[])
 
       if (shutdown_flag)
         {
-          ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ami_test_var->shutdown ();
         }
 
       poa_var->destroy (1,  // ethernalize objects
                         0  // wait for completion
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/Big_AMI/server.cpp b/TAO/tests/Big_AMI/server.cpp
index b2868cd1e58..f829e76a50f 100644
--- a/TAO/tests/Big_AMI/server.cpp
+++ b/TAO/tests/Big_AMI/server.cpp
@@ -54,16 +54,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -71,12 +68,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -84,12 +79,10 @@ main (int argc, char *argv[])
       AMI_Test_i ami_test_i (orb.in ());
 
       A::AMI_Test_var ami_test_var =
-        ami_test_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ami_test_i._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (ami_test_var.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -106,29 +99,23 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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 ();
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 6b6b332a9cc..1cad2f4c83d 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -29,8 +29,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                                   CORBA::ULong payload_size,
                                   CORBA::ULong thread_count,
                                   CORBA::ULong message_count,
-                                  Test::Session_List &session_list
-                                  ACE_ENV_ARG_DECL)
+                                  Test::Session_List &session_list)
 {
   session_list.length (this->peer_count_);
   CORBA::ULong count = 0;
@@ -43,36 +42,30 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                               payload_size,
                               thread_count,
                               message_count,
-                              this->peer_count_
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                              this->peer_count_);
     }
 }
 
 void
-Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL)
+Coordinator::shutdown_all_peers (void)
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
        ++i)
     {
-      ACE_TRY
+      try
         {
-          (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (*i)->shutdown ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Coordinator::shutdown, ignored");
+          ex._tao_print_exception ("Coordinator::shutdown, ignored");
         }
-      ACE_ENDTRY;
     }
 }
 
 void
-Coordinator::add_peer (Test::Peer_ptr peer
-                       ACE_ENV_ARG_DECL_NOT_USED)
+Coordinator::add_peer (Test::Peer_ptr peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index 7879e47752a..76bd88d5fa8 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -25,15 +25,13 @@ public:
                             CORBA::ULong payload_size,
                             CORBA::ULong thread_count,
                             CORBA::ULong message_count,
-                            Test::Session_List &session_list
-                            ACE_ENV_ARG_DECL);
+                            Test::Session_List &session_list);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown_all_peers (void);
 
   // = The skeleton methods
-  virtual void add_peer (Test::Peer_ptr peer
-                         ACE_ENV_ARG_DECL)
+  virtual void add_peer (Test::Peer_ptr peer)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp
index b93f0e3f7b2..d6d4077ac20 100644
--- a/TAO/tests/Big_Oneways/Peer.cpp
+++ b/TAO/tests/Big_Oneways/Peer.cpp
@@ -20,8 +20,7 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong payload_size,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
-                      CORBA::ULong peer_count
-                      ACE_ENV_ARG_DECL)
+                      CORBA::ULong peer_count)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl = 0;
@@ -32,14 +31,13 @@ Peer::create_session (Test::Session_Control_ptr control,
                              message_count,
                              peer_count),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Test::Session::_nil ());
   PortableServer::ServantBase_var transfer_ownership (session_impl);
 
-  return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return session_impl->_this ();
 }
 
 void
-Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Peer::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -47,5 +45,5 @@ Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, shutting down ORB\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index 2a142889512..8f2d18e8445 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.h
@@ -24,10 +24,9 @@ public:
                                             CORBA::ULong payload_size,
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
-                                            CORBA::ULong peer_count
-                                            ACE_ENV_ARG_DECL)
+                                            CORBA::ULong peer_count)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index e6f77c212c6..dd7003cb964 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -33,8 +33,7 @@ Session::svc (void)
   this->barrier_.wait ();
   CORBA::ULong i = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Use the same payload over and over
       Test::Payload payload (this->payload_size_);
@@ -49,8 +48,7 @@ Session::svc (void)
       CORBA::ULong session_count =
         this->other_sessions_.length ();
 
-      this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connections ();
 
       for (; i != this->message_count_; ++i)
         {
@@ -65,9 +63,7 @@ Session::svc (void)
 #endif /* 0 */
           for (CORBA::ULong j = 0; j != session_count; ++j)
             {
-              this->other_sessions_[j]->receive_payload (payload
-                                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->other_sessions_[j]->receive_payload (payload);
             }
         }
 
@@ -79,29 +75,25 @@ Session::svc (void)
             return 0;
           }
       }
-      this->terminate (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->terminate (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                           "(%P|%t) ERROR: Session::svc, "
                           "send %d messages out of %d\n",
                           i, message_count_));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Session::svc - ");
+      ex._tao_print_exception ("Session::svc - ");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->_remove_ref ();
 
   return 0;
 }
 
 void
-Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL)
+Session::validate_connections (void)
 {
   CORBA::ULong session_count =
     this->other_sessions_.length ();
@@ -109,33 +101,30 @@ Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL)
     {
       for (CORBA::ULong j = 0; j != session_count; ++j)
         {
-          ACE_TRY
+          try
             {
-              this->other_sessions_[j]->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->other_sessions_[j]->ping ();
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
             }
-          ACE_ENDTRY;
         }
     }
 }
 
 void
-Session::start (const Test::Session_List &other_sessions
-                ACE_ENV_ARG_DECL)
+Session::start (const Test::Session_List &other_sessions)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Already_Running,
                    Test::No_Peers))
 {
   if (other_sessions.length () == 0)
-    ACE_THROW (Test::No_Peers ());
+    throw Test::No_Peers ();
 
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
     if (this->running_)
-      ACE_THROW (Test::Already_Running ());
+      throw Test::Already_Running ();
 
     this->other_sessions_ = other_sessions;
 
@@ -143,16 +132,14 @@ Session::start (const Test::Session_List &other_sessions
       {
         // Increase the reference count because the new thread will have
         // access to this object....
-        ACE_TRY
+        try
           {
-            this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            this->_add_ref ();
 
             if (this->task_.activate (
                     THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1)
               {
-                this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                this->_remove_ref ();
               }
             else
               {
@@ -160,20 +147,17 @@ Session::start (const Test::Session_List &other_sessions
                 this->active_thread_count_++;
               }
           }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
           {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "Session::start, ignored");
+            ex._tao_print_exception ("Session::start, ignored");
           }
-        ACE_ENDTRY;
       }
 
     if (this->active_thread_count_ != this->thread_count_)
       return;
   }
 
-  this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validate_connections ();
 
   this->barrier_.wait ();
 
@@ -182,17 +166,16 @@ Session::start (const Test::Session_List &other_sessions
 
   /// None of the threads are running, this session is useless at
   /// this point, report the problem and destroy the local objects
-  this->terminate (0 ACE_ENV_ARG_PARAMETER);
+  this->terminate (0);
 }
 
 void
-Session::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
+Session::ping (void) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Session::receive_payload (const Test::Payload &the_payload
-                          ACE_ENV_ARG_DECL)
+Session::receive_payload (const Test::Payload &the_payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
@@ -229,24 +212,21 @@ Session::receive_payload (const Test::Payload &the_payload
     if (this->more_work ())
       return;
   }
-  this->terminate (1 ACE_ENV_ARG_PARAMETER);
+  this->terminate (1);
 }
 
 
 void
-Session::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Session::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (oid.in ());
 }
 
 int
@@ -261,22 +241,17 @@ Session::more_work (void) const
 }
 
 void
-Session::terminate (CORBA::Boolean success
-                    ACE_ENV_ARG_DECL)
+Session::terminate (CORBA::Boolean success)
   ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
-  ACE_TRY_EX(GLOBAL)
+  try
     {
-      this->control_->session_finished (success
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(GLOBAL);
+      this->control_->session_finished (success);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Session::terminate, ignored");
+      ex._tao_print_exception ("Session::terminate, ignored");
     }
-  ACE_ENDTRY;
 
 }
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index ef408f81679..8dc4dcaafab 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -35,27 +35,24 @@ public:
   int svc (void);
 
   // = The skeleton methods
-  virtual void start (const Test::Session_List &other_sessions
-                      ACE_ENV_ARG_DECL)
+  virtual void start (const Test::Session_List &other_sessions)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Already_Running,
                      Test::No_Peers));
 
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_payload (const Test::Payload &the_payload
-                                ACE_ENV_ARG_DECL)
+  virtual void receive_payload (const Test::Payload &the_payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
-  void terminate (CORBA::Boolean success
-                  ACE_ENV_ARG_DECL)
+  void terminate (CORBA::Boolean success)
     ACE_THROW_SPEC (());
 
   /// Return 1 if all the work in this session has been completed
@@ -63,7 +60,7 @@ private:
 
   /// Make sure that all threads have connections avaiable to the
   /// other sessions.
-  void validate_connections (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connections (void);
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index 12f3c2d7566..fdd01686c9d 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -41,8 +41,7 @@ Session_Control::~Session_Control (void)
 }
 
 void
-Session_Control::session_finished (CORBA::Boolean success
-                                   ACE_ENV_ARG_DECL)
+Session_Control::session_finished (CORBA::Boolean success)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -63,13 +62,10 @@ Session_Control::session_finished (CORBA::Boolean success
   if (session_count_ == 0)
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->_default_POA ();
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (oid.in ());
     }
 
 }
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 2f0232be6d8..3e12b1df5e1 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -26,8 +26,7 @@ public:
   int all_sessions_finished (void) const;
 
   // = The skeleton methods
-  virtual void session_finished (CORBA::Boolean success
-                                 ACE_ENV_ARG_DECL)
+  virtual void session_finished (CORBA::Boolean success)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp
index 13465fab43c..ff908dc6fc9 100644
--- a/TAO/tests/Big_Oneways/client.cpp
+++ b/TAO/tests/Big_Oneways/client.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,19 +54,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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Coordinator_var coordinator =
-        Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Coordinator::_narrow(tmp.in ());
 
       if (CORBA::is_nil (coordinator.in ()))
         {
@@ -86,33 +80,26 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var peer_owner_transfer(peer_impl);
 
       Test::Peer_var peer =
-        peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+        peer_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      coordinator->add_peer (peer.in ());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Wait for all the threads.
       ACE_Thread_Manager::instance ()->wait ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 9aa9d7a7522..55a4cbdef12 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -62,19 +62,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,8 +79,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -94,12 +90,10 @@ main (int argc, char *argv[])
                       1);
 
       Test::Coordinator_var coordinator =
-        coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        coordinator_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (coordinator.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -111,8 +105,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . "));
       for (int i = 0;
@@ -120,8 +113,7 @@ main (int argc, char *argv[])
            ++i)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
         }
       ACE_DEBUG ((LM_DEBUG, "done.\n"));
 
@@ -140,17 +132,14 @@ main (int argc, char *argv[])
                       1);
 
       Test::Session_Control_var session_control =
-        session_control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        session_control_impl->_this ();
 
       Test::Session_List session_list;
       coordinator_impl->create_session_list (session_control.in (),
                                              payload_size,
                                              thread_count,
                                              message_count,
-                                             session_list
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             session_list);
 
       ACE_ASSERT (session_list.length () == peer_count);
 
@@ -172,9 +161,7 @@ main (int argc, char *argv[])
                 Test::Session::_duplicate (session_list[k]);
             }
 
-          session_list[j]->start (other_sessions
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          session_list[j]->start (other_sessions);
 
         }
 
@@ -185,8 +172,7 @@ main (int argc, char *argv[])
            ++k)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
         }
 
       if (!session_control_impl->all_sessions_finished ())
@@ -200,31 +186,25 @@ main (int argc, char *argv[])
 
       for (j = 0; j != peer_count; ++j)
         {
-          session_list[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          session_list[j]->destroy ();
 
         }
 
       ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n"));
 
-      coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      coordinator_impl->shutdown_all_peers ();
 
       ACE_DEBUG ((LM_DEBUG, "Shutdown poa and orb . . .\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp
index 40b9cca6846..04f7a0f74ee 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.cpp
+++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp
@@ -14,7 +14,7 @@ Big_Reply_i::~Big_Reply_i (void)
 }
 
 Test::Octet_Seq *
-Big_Reply_i::get_big_reply (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Big_Reply_i::get_big_reply ( /**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Test::Octet_Seq_var reply_mesg =
@@ -26,13 +26,13 @@ Big_Reply_i::get_big_reply (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_AR
 }
 
 void
-Big_Reply_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Big_Reply_i::ping ( /**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Big_Reply_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Big_Reply_i::shutdown ( /**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h
index 8e580b23939..7edf4deb0c8 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.h
+++ b/TAO/tests/Big_Reply/Big_Reply_i.h
@@ -32,13 +32,13 @@ public:
   virtual ~Big_Reply_i (void);
 
   // = The skeleton methods
-  virtual Test::Octet_Seq *get_big_reply (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Test::Octet_Seq *get_big_reply (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp
index 8b640303e68..8e1f4af358e 100644
--- a/TAO/tests/Big_Reply/Client_Task.cpp
+++ b/TAO/tests/Big_Reply/Client_Task.cpp
@@ -26,25 +26,21 @@ Client_Task::svc (void)
 
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting big reply\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Now get the big replies..
-  ACE_TRY
+  try
     {
       for (int i = 0; i != this->event_count_; ++i)
         {
           Test::Octet_Seq_var dummy =
-          this->reply_gen_->get_big_reply (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->reply_gen_->get_big_reply ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception Caught\n");
+      ex._tao_print_exception ("Exception Caught\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
@@ -55,7 +51,6 @@ Client_Task::validate_connection (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Validating connection ..\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Try to setup a connection to the remote server, ignoring all the
   // exceptions that are expected (see bug 189 on why it is so). We
@@ -63,13 +58,11 @@ Client_Task::validate_connection (void)
   // to work with Minimum CORBA builds too..
   for (int i = 0; i != 100; ++i)
     {
-      ACE_TRY
+      try
         {
 
-          this->reply_gen_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->reply_gen_->ping ();
         }
-      ACE_CATCHANY {}
-      ACE_ENDTRY;
+      catch (const CORBA::Exception&){}
     }
 }
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index 05651121792..65b17586ae0 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -35,22 +35,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Big_Reply_var reply_gen =
-        Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Big_Reply::_narrow(tmp.in ());
 
       if (CORBA::is_nil (reply_gen.in ()))
         {
@@ -74,19 +71,15 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Got all the replies...\n"));
 
       // Request the server to shutdown
-      reply_gen->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      reply_gen->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index b09fbd74a0b..e441dc3110e 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -43,15 +43,13 @@ main (int argc, char *argv[])
 {
   ACE_DEBUG ((LM_DEBUG, "Starting server\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,12 +57,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
 
       if (parse_args (argc, argv) != 0)
@@ -81,13 +77,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var big_reply_owner_transfer(big_reply_gen);
 
       Test::Big_Reply_var big_reply =
-        big_reply_gen->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        big_reply_gen->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (big_reply.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (big_reply.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -99,22 +92,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       orb->run ();
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Ending server\n"));
 
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index 385bf7f0bc5..22a6f5d9f3b 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -32,28 +32,26 @@ Client_Task::done(void) const
 }
 
 void
-Client_Task::do_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::do_invocations(Test::Payload& payload)
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t)Client_Task %s sending %d payloads.\n",
              this->id_.c_str(), this->event_count_));
 
   for (int i = 0; i != this->event_count_; ++i)
     {
-      this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->payload_receiver_->more_data (payload);
     }
 }
 
 void
-Client_Task::do_sync_none_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::do_sync_none_invocations(Test::Payload& payload)
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t)Client_Task %s sending %d SYNC_NONE payloads.\n",
              this->id_.c_str(), this->event_count_));
 
   for (int i = 0; i != this->event_count_; ++i)
     {
-      this->payload_receiver_->sync_none_more_data (payload ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->payload_receiver_->sync_none_more_data (payload);
     }
 }
 
@@ -67,19 +65,14 @@ Client_Task::svc (void)
   for (CORBA::ULong j = 0; j != payload.length (); ++j)
     payload[j] = (j % 256);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       CORBA::Any scope_as_any;
       scope_as_any <<= this->sync_scope_;
@@ -89,46 +82,40 @@ Client_Task::svc (void)
       policy_list.length (1);
       policy_list[0] =
         this->orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                                   scope_as_any
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   scope_as_any);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::ADD_OVERRIDE);
 
       if (this->sync_scope_ == Messaging::SYNC_NONE)
-        this->do_sync_none_invocations(payload ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->do_sync_none_invocations(payload);
       else
-        this->do_invocations(payload ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->do_invocations(payload);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG((LM_DEBUG, "(%P|%t)Client_Task %s: ",
                  this->id_.c_str()));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ex._tao_print_exception ("");
       done_ = true;
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG((LM_DEBUG, "(%P|%t)Client_Task %s finished.\n", this->id_.c_str()));
   done_ = true;
   return 0;
 }
 
 void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (void)
 {
-  ACE_TRY
+  try
     {
       Test::Payload payload(0);
       for (int i = 0; i != 100; ++i)
         {
-          (void) this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->payload_receiver_->more_data (payload);
         }
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
 }
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h
index 81c8358c4a2..408d7458438 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.h
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.h
@@ -36,10 +36,10 @@ public:
 private:
   /// Make sure that all threads have connections available to
   /// workaround bug 189
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
-  void do_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL);
-  void do_sync_none_invocations(Test::Payload& payload ACE_ENV_SINGLE_ARG_DECL);
+  void do_invocations(Test::Payload& payload);
+  void do_sync_none_invocations(Test::Payload& payload);
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
index e3203f20359..917276b28f4 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -12,8 +12,7 @@ Payload_Receiver::Payload_Receiver ()
 }
 
 void
-Payload_Receiver::more_data (const Test::Payload& payload
-			     ACE_ENV_ARG_DECL_NOT_USED)
+Payload_Receiver::more_data (const Test::Payload& payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (payload.length() > 0)
@@ -23,8 +22,7 @@ Payload_Receiver::more_data (const Test::Payload& payload
 }
 
 void
-Payload_Receiver::sync_none_more_data (const Test::Payload& payload
-			     ACE_ENV_ARG_DECL_NOT_USED)
+Payload_Receiver::sync_none_more_data (const Test::Payload& payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (payload.length() > 0)
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index 130ebba266e..1aa87ca3735 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
@@ -19,12 +19,10 @@ public:
   Payload_Receiver ();
 
   // = The skeleton methods
-  virtual void more_data (const Test::Payload &payload
-                          ACE_ENV_ARG_DECL)
+  virtual void more_data (const Test::Payload &payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync_none_more_data (const Test::Payload &payload
-                                    ACE_ENV_ARG_DECL)
+  virtual void sync_none_more_data (const Test::Payload &payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   int count(bool sync_none = false) const;
diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp
index 321eed0bd4a..5f9e816cf70 100644
--- a/TAO/tests/Big_Request_Muxing/client.cpp
+++ b/TAO/tests/Big_Request_Muxing/client.cpp
@@ -45,22 +45,19 @@ main (int argc, char *argv[])
 {
   ACE_DEBUG ((LM_DEBUG, "(%P) Starting client\n"));
 
-  ACE_TRY_NEW_ENV
+  try
   {
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      CORBA::ORB_init (argc, argv, "");
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     CORBA::Object_var tmp =
-      orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->string_to_object(ior);
 
     Test::Payload_Receiver_var payload_receiver =
-      Test::Payload_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      Test::Payload_Receiver::_narrow(tmp.in ());
 
     if (CORBA::is_nil (payload_receiver.in ()))
     {
@@ -110,8 +107,7 @@ main (int argc, char *argv[])
     while (ACE_OS::gettimeofday() < end_time)
     {
       ACE_Time_Value tv (0, 100 * 1000);
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
       if (task0.done() && task1.done() && task2.done())
         break;
     }
@@ -122,20 +118,16 @@ main (int argc, char *argv[])
     while (orb->work_pending())
     {
       ACE_Time_Value tv(0, 100 * 1000);
-      orb->run(tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run(tv);
     }
 
-    orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb->destroy ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      "Exception caught:");
+    ex._tao_print_exception ("Exception caught:");
     return 1;
   }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "(%P) Ending client\n"));
 
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index 6b134f43f55..e52c688cbde 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -47,15 +47,13 @@ main (int argc, char *argv[])
 {
   ACE_DEBUG ((LM_DEBUG, "Starting server\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,12 +61,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -80,12 +76,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl);
 
       Test::Payload_Receiver_var payload_receiver =
-        payload_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        payload_receiver_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (payload_receiver.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -97,8 +91,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_DEBUG((LM_DEBUG, "Server waiting for messages...\n"));
 
@@ -113,8 +106,7 @@ main (int argc, char *argv[])
         int prev_count = count;
         int sn_prev_count = sn_count;
         ACE_Time_Value tv(0, 100 * 1000);
-        orb->run (tv ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        orb->run (tv);
         count = payload_receiver_impl->count();
         sn_count = payload_receiver_impl->count(true);
         if ((count < expected && count == prev_count) ||
@@ -156,19 +148,16 @@ main (int argc, char *argv[])
                   count, expected, payload_receiver_impl->count(true),
                   runtime.sec(), runtime.usec()));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Ending server\n"));
 
diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp
index 6b6b332a9cc..1cad2f4c83d 100644
--- a/TAO/tests/Big_Twoways/Coordinator.cpp
+++ b/TAO/tests/Big_Twoways/Coordinator.cpp
@@ -29,8 +29,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                                   CORBA::ULong payload_size,
                                   CORBA::ULong thread_count,
                                   CORBA::ULong message_count,
-                                  Test::Session_List &session_list
-                                  ACE_ENV_ARG_DECL)
+                                  Test::Session_List &session_list)
 {
   session_list.length (this->peer_count_);
   CORBA::ULong count = 0;
@@ -43,36 +42,30 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                               payload_size,
                               thread_count,
                               message_count,
-                              this->peer_count_
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                              this->peer_count_);
     }
 }
 
 void
-Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL)
+Coordinator::shutdown_all_peers (void)
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
        ++i)
     {
-      ACE_TRY
+      try
         {
-          (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (*i)->shutdown ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Coordinator::shutdown, ignored");
+          ex._tao_print_exception ("Coordinator::shutdown, ignored");
         }
-      ACE_ENDTRY;
     }
 }
 
 void
-Coordinator::add_peer (Test::Peer_ptr peer
-                       ACE_ENV_ARG_DECL_NOT_USED)
+Coordinator::add_peer (Test::Peer_ptr peer)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h
index f229f2d0951..8aa64f5ceca 100644
--- a/TAO/tests/Big_Twoways/Coordinator.h
+++ b/TAO/tests/Big_Twoways/Coordinator.h
@@ -24,15 +24,13 @@ public:
                             CORBA::ULong payload_size,
                             CORBA::ULong thread_count,
                             CORBA::ULong message_count,
-                            Test::Session_List &session_list
-                            ACE_ENV_ARG_DECL);
+                            Test::Session_List &session_list);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown_all_peers (void);
 
   // = The skeleton methods
-  virtual void add_peer (Test::Peer_ptr peer
-                         ACE_ENV_ARG_DECL)
+  virtual void add_peer (Test::Peer_ptr peer)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp
index b93f0e3f7b2..d6d4077ac20 100644
--- a/TAO/tests/Big_Twoways/Peer.cpp
+++ b/TAO/tests/Big_Twoways/Peer.cpp
@@ -20,8 +20,7 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong payload_size,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
-                      CORBA::ULong peer_count
-                      ACE_ENV_ARG_DECL)
+                      CORBA::ULong peer_count)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl = 0;
@@ -32,14 +31,13 @@ Peer::create_session (Test::Session_Control_ptr control,
                              message_count,
                              peer_count),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Test::Session::_nil ());
   PortableServer::ServantBase_var transfer_ownership (session_impl);
 
-  return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return session_impl->_this ();
 }
 
 void
-Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Peer::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -47,5 +45,5 @@ Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, shutting down ORB\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h
index 2a142889512..8f2d18e8445 100644
--- a/TAO/tests/Big_Twoways/Peer.h
+++ b/TAO/tests/Big_Twoways/Peer.h
@@ -24,10 +24,9 @@ public:
                                             CORBA::ULong payload_size,
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
-                                            CORBA::ULong peer_count
-                                            ACE_ENV_ARG_DECL)
+                                            CORBA::ULong peer_count)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index a8aac013d5d..82d81a0accb 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -37,8 +37,7 @@ Session::svc (void)
   PortableServer::ServantBase_var auto_decrement (this);
   CORBA::ULong i = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Use the same payload over and over
       Test::Payload payload (this->payload_size_);
@@ -62,9 +61,7 @@ Session::svc (void)
           for (CORBA::ULong j = 0; j != session_count; ++j)
             {
               Test::Payload_var received =
-                this->other_sessions_[j]->echo_payload (payload
-                                                        ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                this->other_sessions_[j]->echo_payload (payload);
             }
         }
 
@@ -76,37 +73,34 @@ Session::svc (void)
             return 0;
           }
       }
-      this->terminate (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->terminate (1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_ERROR ((LM_ERROR,
                           "(%P|%t) ERROR: Session::svc, "
                           "send %d messages out of %d\n",
                           i, message_count_));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Session::svc - ");
+      ex._tao_print_exception ("Session::svc - ");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Session::start (const Test::Session_List &other_sessions
-                ACE_ENV_ARG_DECL)
+Session::start (const Test::Session_List &other_sessions)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Already_Running,
                    Test::No_Peers))
 {
   if (other_sessions.length () == 0)
-    ACE_THROW (Test::No_Peers ());
+    throw Test::No_Peers ();
 
   {
     ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
     if (this->running_)
-      ACE_THROW (Test::Already_Running ());
+      throw Test::Already_Running ();
 
     this->other_sessions_ = other_sessions;
 
@@ -114,16 +108,14 @@ Session::start (const Test::Session_List &other_sessions
       {
         // Increase the reference count because the new thread will have
         // access to this object....
-        ACE_TRY
+        try
           {
-            this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            this->_add_ref ();
 
             if (this->task_.activate (
                     THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1)
               {
-                this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                this->_remove_ref ();
               }
             else
               {
@@ -131,20 +123,17 @@ Session::start (const Test::Session_List &other_sessions
                 this->active_thread_count_++;
               }
           }
-        ACE_CATCHANY
+        catch (const CORBA::Exception& ex)
           {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 "Session::start, ignored");
+            ex._tao_print_exception ("Session::start, ignored");
           }
-        ACE_ENDTRY;
       }
 
     if (this->active_thread_count_ != this->thread_count_)
       return;
   }
 
-  this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->validate_connections ();
 
   this->barrier_.wait ();
 
@@ -153,13 +142,11 @@ Session::start (const Test::Session_List &other_sessions
 
   /// None of the threads are running, this session is useless at
   /// this point, report the problem and destroy the local objects
-  this->terminate (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->terminate (0);
 }
 
 Test::Payload *
-Session::echo_payload (const Test::Payload &the_payload
-                       ACE_ENV_ARG_DECL)
+Session::echo_payload (const Test::Payload &the_payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
@@ -198,27 +185,23 @@ Session::echo_payload (const Test::Payload &the_payload
     if (this->more_work ())
       return retval._retn ();
   }
-  this->terminate (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->terminate (1);
 
   return retval._retn ();
 }
 
 
 void
-Session::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Session::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (oid.in ());
 }
 
 int
@@ -233,50 +216,40 @@ Session::more_work (void) const
 }
 
 void
-Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL)
+Session::validate_connections (void)
   ACE_THROW_SPEC (())
 {
   const CORBA::ULong session_count =
     this->other_sessions_.length ();
   for (CORBA::ULong j = 0; j != session_count; ++j)
     {
-      ACE_TRY
+      try
         {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
           CORBA::PolicyList_var unused;
-          this->other_sessions_[j]->_validate_connection (unused
-                                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->other_sessions_[j]->_validate_connection (unused);
 #else
-          (void) this->other_sessions_[j]->_is_a ("Not_An_IDL_Type"
-                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->other_sessions_[j]->_is_a ("Not_An_IDL_Type");
 #endif /* TAO_HAS_MESSAGING == 1 */
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
         }
-      ACE_ENDTRY;
     }
 }
 
 void
-Session::terminate (CORBA::Boolean success
-                    ACE_ENV_ARG_DECL)
+Session::terminate (CORBA::Boolean success)
   ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
-  ACE_TRY_EX(GLOBAL)
+  try
     {
-      this->control_->session_finished (success
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX(GLOBAL);
+      this->control_->session_finished (success);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Session::terminate, ignored");
+      ex._tao_print_exception ("Session::terminate, ignored");
     }
-  ACE_ENDTRY;
 
 }
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index 94f1f349458..db3d8aed838 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -32,17 +32,15 @@ public:
   int svc (void);
 
   // = The skeleton methods
-  virtual void start (const Test::Session_List &other_sessions
-                      ACE_ENV_ARG_DECL)
+  virtual void start (const Test::Session_List &other_sessions)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Already_Running,
                      Test::No_Peers));
 
-  virtual Test::Payload* echo_payload (const Test::Payload &the_payload
-                                       ACE_ENV_ARG_DECL)
+  virtual Test::Payload* echo_payload (const Test::Payload &the_payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -52,15 +50,14 @@ protected:
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
-  void terminate (CORBA::Boolean success
-                  ACE_ENV_ARG_DECL)
+  void terminate (CORBA::Boolean success)
     ACE_THROW_SPEC (());
 
   /// Return 1 if all the work in this session has been completed
   int more_work (void) const;
 
   /// Validate all the connections
-  void validate_connections (ACE_ENV_SINGLE_ARG_DECL)
+  void validate_connections (void)
     ACE_THROW_SPEC (());
 
 private:
diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp
index 5b5c2e8ee44..daedcf24ace 100644
--- a/TAO/tests/Big_Twoways/Session_Control.cpp
+++ b/TAO/tests/Big_Twoways/Session_Control.cpp
@@ -41,8 +41,7 @@ Session_Control::~Session_Control (void)
 }
 
 void
-Session_Control::session_finished (CORBA::Boolean success
-                                   ACE_ENV_ARG_DECL)
+Session_Control::session_finished (CORBA::Boolean success)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -63,13 +62,10 @@ Session_Control::session_finished (CORBA::Boolean success
   if (session_count_ == 0)
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->_default_POA ();
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        poa->servant_to_id (this);
+      poa->deactivate_object (oid.in ());
     }
 
 }
diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index 2f0232be6d8..3e12b1df5e1 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/Session_Control.h
@@ -26,8 +26,7 @@ public:
   int all_sessions_finished (void) const;
 
   // = The skeleton methods
-  virtual void session_finished (CORBA::Boolean success
-                                 ACE_ENV_ARG_DECL)
+  virtual void session_finished (CORBA::Boolean success)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp
index 48013a64c34..ff908dc6fc9 100644
--- a/TAO/tests/Big_Twoways/client.cpp
+++ b/TAO/tests/Big_Twoways/client.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,19 +54,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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Coordinator_var coordinator =
-        Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Coordinator::_narrow(tmp.in ());
 
       if (CORBA::is_nil (coordinator.in ()))
         {
@@ -86,34 +80,26 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var peer_owner_transfer(peer_impl);
 
       Test::Peer_var peer =
-        peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        peer_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      coordinator->add_peer (peer.in ());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Wait for all the threads.
       ACE_Thread_Manager::instance ()->wait ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index 0dcf180b51a..e2f3fea8702 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -62,19 +62,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,8 +79,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -94,12 +90,10 @@ main (int argc, char *argv[])
                       1);
 
       Test::Coordinator_var coordinator =
-        coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        coordinator_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (coordinator.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -111,8 +105,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . "));
       for (int i = 0;
@@ -120,8 +113,7 @@ main (int argc, char *argv[])
            ++i)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
         }
       ACE_DEBUG ((LM_DEBUG, "done.\n"));
 
@@ -140,17 +132,14 @@ main (int argc, char *argv[])
                       1);
 
       Test::Session_Control_var session_control =
-        session_control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        session_control_impl->_this ();
 
       Test::Session_List session_list;
       coordinator_impl->create_session_list (session_control.in (),
                                              payload_size,
                                              thread_count,
                                              message_count,
-                                             session_list
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             session_list);
 
       ACE_ASSERT (session_list.length () == peer_count);
       ACE_DEBUG ((LM_DEBUG, "done.\n"));
@@ -171,9 +160,7 @@ main (int argc, char *argv[])
                 Test::Session::_duplicate (session_list[k]);
             }
 
-          session_list[j]->start (other_sessions
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          session_list[j]->start (other_sessions);
 
         }
 
@@ -185,8 +172,7 @@ main (int argc, char *argv[])
            ++k)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
         }
 
       if (!session_control_impl->all_sessions_finished ())
@@ -200,34 +186,28 @@ main (int argc, char *argv[])
 
       for (j = 0; j != peer_count; ++j)
         {
-          session_list[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          session_list[j]->destroy ();
 
         }
 
       ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n"));
 
-      coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      coordinator_impl->shutdown_all_peers ();
 
       coordinator_impl->_remove_ref();
       session_control_impl->_remove_ref();
 
       ACE_DEBUG ((LM_DEBUG, "Shutdown poa and orb . . .\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
index 864452afefb..cfd9e6876eb 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
@@ -13,8 +13,7 @@ Blocking_Sync_None::Blocking_Sync_None (CORBA::ORB_ptr orb)
 
 void
 Blocking_Sync_None::slow_operation (const Test::Payload &,
-                                    CORBA::ULong sleep_microseconds
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    CORBA::ULong sleep_microseconds)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value sleep_time (0, sleep_microseconds);
@@ -22,8 +21,8 @@ Blocking_Sync_None::slow_operation (const Test::Payload &,
 }
 
 void
-Blocking_Sync_None::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Blocking_Sync_None::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
index 65a0714374f..293f76eedb3 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
@@ -18,11 +18,10 @@ public:
 
   // = The skeleton methods
   virtual void slow_operation (const Test::Payload &the_payload,
-                               CORBA::ULong sleep_microseconds
-                               ACE_ENV_ARG_DECL)
+                               CORBA::ULong sleep_microseconds)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 2bff1936b7b..422a95b6410 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -45,22 +45,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Blocking_Sync_None_var blocking_sync_none =
-        Test::Blocking_Sync_None::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Blocking_Sync_None::_narrow(tmp.in ());
 
       if (CORBA::is_nil (blocking_sync_none.in ()))
         ACE_ERROR_RETURN ((LM_DEBUG,
@@ -69,12 +66,10 @@ main (int argc, char *argv[])
                           1);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -87,16 +82,11 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       const int payload_length = 65536;
       const unsigned int sleep_milliseconds = 20;
@@ -112,9 +102,7 @@ main (int argc, char *argv[])
           ACE_Time_Value start = ACE_OS::gettimeofday ();
 
           blocking_sync_none->slow_operation (payload,
-                                              sleep_microseconds
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                              sleep_microseconds);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday ();
           elapsed -= start;
@@ -125,11 +113,9 @@ main (int argc, char *argv[])
             }
         }
 
-      blocking_sync_none->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      blocking_sync_none->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       if (blocked_calls > iterations / 20)
         {
@@ -146,13 +132,11 @@ main (int argc, char *argv[])
                       blocked_calls));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp
index a774b6cdf83..8003b059ee1 100644
--- a/TAO/tests/Blocking_Sync_None/server.cpp
+++ b/TAO/tests/Blocking_Sync_None/server.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +66,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(blocking_sync_none_impl);
 
       Test::Blocking_Sync_None_var blocking_sync_none =
-        blocking_sync_none_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        blocking_sync_none_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (blocking_sync_none.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (blocking_sync_none.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -87,27 +81,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
index b29d2a35687..f01893bc102 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp
@@ -14,18 +14,15 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb)
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
index fefd938cd40..4be8b6bf261 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp
@@ -12,8 +12,7 @@ Echo::Echo(CORBA::ORB_ptr orb,
 }
 
 void
-Echo::echo_payload (Test::Payload &
-                    ACE_ENV_ARG_DECL_NOT_USED)
+Echo::echo_payload (Test::Payload &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX,
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.h b/TAO/tests/Bug_1020_Basic_Regression/Echo.h
index 8175f5ec3a3..7a15abb76a1 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.h
@@ -18,8 +18,7 @@ public:
   Echo (CORBA::ORB_ptr orb,
         int abort_counter);
 
-  virtual void echo_payload (Test::Payload & data
-                             ACE_ENV_ARG_DECL)
+  virtual void echo_payload (Test::Payload & data)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
index b1922f2d3e3..15363bf0055 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp
@@ -11,8 +11,7 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
 }
 
 void
-Echo_Caller::start_task(Test::Echo_ptr client
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Echo_Caller::start_task(Test::Echo_ptr client)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   Server_Task task (client,
@@ -32,9 +31,9 @@ Echo_Caller::start_task(Test::Echo_ptr client
 }
 
 void
-Echo_Caller::shutdown(ACE_ENV_SINGLE_ARG_DECL)
+Echo_Caller::shutdown(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
-  orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
+  orb_->shutdown(0);
 }
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
index f7d2688fabd..e1982629dc8 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h
@@ -15,11 +15,10 @@ class Echo_Caller : public POA_Test::Echo_Caller
 public:
   Echo_Caller (CORBA::ORB_ptr orb);
 
-  virtual void start_task (Test::Echo_ptr client
-                           ACE_ENV_ARG_DECL)
+  virtual void start_task (Test::Echo_ptr client)
     ACE_THROW_SPEC((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
index 6e68c8b1c98..e90fc608a61 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp
@@ -20,24 +20,19 @@ Server_Task::svc (void)
   Test::Payload payload (32768);
   payload.length (32768);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Send messages till the remote guy crashes
       for (;;)
         {
-          this->echo_->echo_payload (payload
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->echo_->echo_payload (payload);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_NOTREACHED (return 0);
 }
diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
index 7deb646b538..d3f030ae01e 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
@@ -43,22 +43,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -66,18 +60,13 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -92,17 +81,12 @@ main (int argc, char *argv[])
       policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
 
       policy_current->set_policy_overrides (policies,
-                                            CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -121,18 +105,13 @@ main (int argc, char *argv[])
       }
 
       Test::Echo_var echo =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Echo_Caller_var server =
-        Test::Echo_Caller::_narrow(tmp.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Echo_Caller::_narrow(tmp.in ());
 
       if (CORBA::is_nil (echo.in ()))
         {
@@ -142,14 +121,11 @@ main (int argc, char *argv[])
                             1);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Client_Task ctask (orb.in ());
 
-      server->start_task (echo.in()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->start_task (echo.in());
 
       if (ctask.activate (THR_NEW_LWP | THR_JOINABLE,
                           4,
@@ -167,20 +143,15 @@ main (int argc, char *argv[])
 
       // Actually the code here should never be reached.
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
index 4f62134a66f..f915f225b94 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
@@ -41,22 +41,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -64,8 +58,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -84,13 +77,10 @@ main (int argc, char *argv[])
       }
 
       Test::Echo_Caller_var server =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -102,30 +92,23 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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,
                   "(%P|%t) server - event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1020_Regression/Echo.cpp b/TAO/tests/Bug_1020_Regression/Echo.cpp
index 3bfcf379a01..17b6386b824 100644
--- a/TAO/tests/Bug_1020_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1020_Regression/Echo.cpp
@@ -16,8 +16,7 @@ Echo::Echo(CORBA::ORB_ptr orb)
 }
 
 Test::Payload *
-Echo::echo_payload(Test::Payload const &
-                   ACE_ENV_ARG_DECL_NOT_USED)
+Echo::echo_payload(Test::Payload const &)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_Time_Value tick(0, 10000);
diff --git a/TAO/tests/Bug_1020_Regression/Echo.h b/TAO/tests/Bug_1020_Regression/Echo.h
index e6928d28bb0..33bac647e08 100644
--- a/TAO/tests/Bug_1020_Regression/Echo.h
+++ b/TAO/tests/Bug_1020_Regression/Echo.h
@@ -15,8 +15,7 @@ class Echo : public POA_Test::Echo
 public:
   Echo(CORBA::ORB_ptr orb);
 
-  virtual Test::Payload * echo_payload (Test::Payload const & data
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual Test::Payload * echo_payload (Test::Payload const & data)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1020_Regression/Echo_Callback.h b/TAO/tests/Bug_1020_Regression/Echo_Callback.h
index 8bbc6465755..b70effe7c0c 100644
--- a/TAO/tests/Bug_1020_Regression/Echo_Callback.h
+++ b/TAO/tests/Bug_1020_Regression/Echo_Callback.h
@@ -15,11 +15,9 @@ class Echo_Callback : public POA_Test::AMI_EchoHandler
 public:
   Echo_Callback();
 
-  virtual void echo_payload (Test::Payload const & ami_return_val
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void echo_payload (Test::Payload const & ami_return_val)
     ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void echo_payload_excep (Test::AMI_EchoExceptionHolder * excep_holder
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void echo_payload_excep (Test::AMI_EchoExceptionHolder * excep_holder)
     ACE_THROW_SPEC((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
index 86bdeedf8b3..c2645f8354e 100644
--- a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp
@@ -19,15 +19,12 @@ ORB_Task::ORB_Task(CORBA::ORB_ptr orb)
 int
 ORB_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run();
     }
-  ACE_CATCH(CORBA::Exception, ex)
+  catch (const CORBA::Exception& )
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Regression/Server_Task.cpp
index d3f158f31da..a89ac08487a 100644
--- a/TAO/tests/Bug_1020_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1020_Regression/Server_Task.cpp
@@ -18,24 +18,20 @@ Server_Task::Server_Task(Test::Echo_ptr echo)
 int
 Server_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Test::Payload pload(16); pload.length(16);
   int stop_loop = 0;
   for(int i = 0; i != 1000000 && !stop_loop; ++i)
     {
-      ACE_TRY
+      try
         {
           Test::Payload_var result =
-            this->echo_->echo_payload (pload
-			               ACE_ENV_ARG_PARAMETER);
-	  ACE_TRY_CHECK;
+            this->echo_->echo_payload (pload);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           stop_loop = 1;
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
diff --git a/TAO/tests/Bug_1020_Regression/Server_i.cpp b/TAO/tests/Bug_1020_Regression/Server_i.cpp
index 86127418175..5cc24c66548 100644
--- a/TAO/tests/Bug_1020_Regression/Server_i.cpp
+++ b/TAO/tests/Bug_1020_Regression/Server_i.cpp
@@ -10,8 +10,7 @@ Server::Server(CORBA::ORB_ptr orb)
 }
 
 void
-Server::start_task(Test::Echo_ptr client
-                   ACE_ENV_ARG_DECL_NOT_USED)
+Server::start_task(Test::Echo_ptr client)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   Server_Task * task =
diff --git a/TAO/tests/Bug_1020_Regression/Server_i.h b/TAO/tests/Bug_1020_Regression/Server_i.h
index 75fb33dbdd0..b2f1e875701 100644
--- a/TAO/tests/Bug_1020_Regression/Server_i.h
+++ b/TAO/tests/Bug_1020_Regression/Server_i.h
@@ -16,8 +16,7 @@ class Server : public POA_Test::Server
 public:
   Server(CORBA::ORB_ptr orb);
 
-  virtual void start_task(Test::Echo_ptr client
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start_task(Test::Echo_ptr client)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp
index 63209f90483..7e94826a604 100644
--- a/TAO/tests/Bug_1020_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Regression/client.cpp
@@ -28,22 +28,16 @@ public:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -51,16 +45,13 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -73,16 +64,11 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -101,18 +87,13 @@ main (int argc, char *argv[])
       }
 
       Test::Echo_var echo =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Server_var server =
-        Test::Server::_narrow(tmp.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Server::_narrow(tmp.in ());
 
       if (CORBA::is_nil (echo.in ()))
         {
@@ -122,8 +103,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Crasher crasher;
 
@@ -138,29 +118,22 @@ main (int argc, char *argv[])
       Test::Payload payload(16); payload.length(16);
       for(int i = 0; i != 4; ++i)
         {
-          server->start_task(echo.in()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->start_task(echo.in());
         }
 
       task.wait();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n"));
 
-      root_poa->destroy (1, 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp
index c71b63fba8c..2fac24acb2d 100644
--- a/TAO/tests/Bug_1020_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Regression/server.cpp
@@ -28,22 +28,16 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -51,12 +45,10 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -75,13 +67,10 @@ main (int argc, char *argv[])
       }
 
       Test::Server_var server =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -93,8 +82,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ORB_Task task(orb.in());
       task.activate(THR_NEW_LWP | THR_JOINABLE, 4, 1);
@@ -103,20 +91,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
index e5cd2a202e5..3fbc4fdaa62 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp
@@ -11,11 +11,10 @@ BlobServerImpl::BlobServerImpl (CORBA::ORB_ptr orb)
 }
 
 /// Implement the BlobServer interface
-void 
+void
 BlobServerImpl::test(
             BlobType1& blob1,
             BlobType2& blob2
-            ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -35,8 +34,8 @@ BlobServerImpl::test(
 }
 
 void
-BlobServerImpl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+BlobServerImpl::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h
index 89d707bac6d..54eeb3bfdd8 100644
--- a/TAO/tests/Bug_1254_Regression/BlobServer.h
+++ b/TAO/tests/Bug_1254_Regression/BlobServer.h
@@ -19,12 +19,11 @@ public:
     virtual void test(
         BlobType1& blob1,
         BlobType2& blob2
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1254_Regression/client.cpp b/TAO/tests/Bug_1254_Regression/client.cpp
index 10167eb8195..57ecb1553c5 100644
--- a/TAO/tests/Bug_1254_Regression/client.cpp
+++ b/TAO/tests/Bug_1254_Regression/client.cpp
@@ -34,18 +34,16 @@ parse_args (int argc, char *argv[])
 
 int main(int argc, char* argv[])
 {
-    ACE_TRY_NEW_ENV
+    try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       BlobServer_var blobServer = BlobServer::_narrow(tmp.in());
       if(CORBA::is_nil(blobServer.in()))
@@ -94,19 +92,15 @@ int main(int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - shutdown\n"));
 
-      blobServer->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      blobServer->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp
index 6f4f48cd03f..97c8d6bc4c3 100644
--- a/TAO/tests/Bug_1254_Regression/server.cpp
+++ b/TAO/tests/Bug_1254_Regression/server.cpp
@@ -36,19 +36,16 @@ parse_args (int argc, char *argv[])
 
 int main(int argc, char** argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,8 +53,7 @@ int 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,12 +65,10 @@ int main(int argc, char** argv)
       PortableServer::ServantBase_var owner_transfer(blob_impl);
 
       BlobServer_var blob =
-        blob_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        blob_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (blob.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (blob.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -86,27 +80,21 @@ int main(int argc, char** argv)
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1269_Regression/Echo.cpp b/TAO/tests/Bug_1269_Regression/Echo.cpp
index df84e9fcbf1..32009b9c996 100644
--- a/TAO/tests/Bug_1269_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1269_Regression/Echo.cpp
@@ -19,8 +19,7 @@ Echo::Echo(CORBA::ORB_ptr orb,
 }
 
 void
-Echo::echo_payload(Test::Payload const &
-                   ACE_ENV_ARG_DECL_NOT_USED)
+Echo::echo_payload(Test::Payload const &)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->abort_counter_--;
diff --git a/TAO/tests/Bug_1269_Regression/Echo.h b/TAO/tests/Bug_1269_Regression/Echo.h
index 4f1f2938ca6..676c856d3b1 100644
--- a/TAO/tests/Bug_1269_Regression/Echo.h
+++ b/TAO/tests/Bug_1269_Regression/Echo.h
@@ -16,8 +16,7 @@ public:
   Echo(CORBA::ORB_ptr orb,
        int abort_counter);
 
-  virtual void echo_payload (Test::Payload const & data
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void echo_payload (Test::Payload const & data)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
index 2a8e075b4de..a9fcb25f53c 100644
--- a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp
@@ -18,8 +18,7 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
 }
 
 void
-Echo_Caller::start_task(Test::Echo_ptr client
-                   ACE_ENV_ARG_DECL_NOT_USED)
+Echo_Caller::start_task(Test::Echo_ptr client)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   Server_Timer * task =
@@ -32,9 +31,9 @@ Echo_Caller::start_task(Test::Echo_ptr client
 }
 
 void
-Echo_Caller::shutdown(ACE_ENV_SINGLE_ARG_DECL)
+Echo_Caller::shutdown(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
-  orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
+  orb_->shutdown(0);
 }
diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.h b/TAO/tests/Bug_1269_Regression/Echo_Caller.h
index f9185f51576..3a62bc0d88e 100644
--- a/TAO/tests/Bug_1269_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.h
@@ -15,11 +15,10 @@ class Echo_Caller : public POA_Test::Echo_Caller
 public:
   Echo_Caller(CORBA::ORB_ptr orb);
 
-  virtual void start_task(Test::Echo_ptr client
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start_task(Test::Echo_ptr client)
     ACE_THROW_SPEC((CORBA::SystemException));
 
-  virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown(void)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1269_Regression/ORB_Task.cpp b/TAO/tests/Bug_1269_Regression/ORB_Task.cpp
index 7182d663207..6bb058a7ac9 100644
--- a/TAO/tests/Bug_1269_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1269_Regression/ORB_Task.cpp
@@ -19,15 +19,12 @@ ORB_Task::ORB_Task(CORBA::ORB_ptr orb)
 int
 ORB_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run();
     }
-  ACE_CATCH(CORBA::Exception, ex)
+  catch (const CORBA::Exception& )
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
index 66fbce3ae34..f099a972b94 100644
--- a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp
@@ -34,8 +34,7 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *)
 
   ACE_OS::memset(pload.get_buffer(), pload.length(), 0);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     Test::Echo_var echo =
       Test::Echo::_duplicate (this->echo_.in());
@@ -43,14 +42,12 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *)
     if(CORBA::is_nil (echo.in()))
       return 0;
 
-    echo->echo_payload (pload
-                        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    echo->echo_payload (pload);
 
     ACE_Time_Value tv (0, 20000);
     this->reactor()->schedule_timer (this, 0, tv);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
   {
     this->echo_ = Test::Echo::_nil ();
 
@@ -58,7 +55,6 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *)
 
     return -1;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp
index 50b19d24f84..4a5dff34ca6 100644
--- a/TAO/tests/Bug_1269_Regression/client.cpp
+++ b/TAO/tests/Bug_1269_Regression/client.cpp
@@ -18,22 +18,16 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -41,16 +35,13 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -63,16 +54,11 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -91,18 +77,13 @@ main (int argc, char *argv[])
       }
 
       Test::Echo_var echo =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Echo_Caller_var server =
-        Test::Echo_Caller::_narrow(tmp.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Echo_Caller::_narrow(tmp.in ());
 
       if (CORBA::is_nil (echo.in ()))
         {
@@ -112,33 +93,24 @@ main (int argc, char *argv[])
                             1);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      server->start_task(echo.in()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->start_task(echo.in());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n"));
 
       // Actually the code here should never be reached.
-      root_poa->destroy (1, 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp
index 2e89b271b31..05e28d3be64 100644
--- a/TAO/tests/Bug_1269_Regression/server.cpp
+++ b/TAO/tests/Bug_1269_Regression/server.cpp
@@ -16,22 +16,16 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,12 +33,10 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -63,13 +55,10 @@ main (int argc, char *argv[])
       }
 
       Test::Echo_Caller_var server =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -81,28 +70,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp
index e48142df37f..3061618345f 100644
--- a/TAO/tests/Bug_1269_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp
@@ -13,25 +13,19 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Echo_Caller_var server =
-        Test::Echo_Caller::_narrow (tmp.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Echo_Caller::_narrow (tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -41,19 +35,15 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1270_Regression/Echo.cpp b/TAO/tests/Bug_1270_Regression/Echo.cpp
index df37f3c644b..b41ec6256ab 100644
--- a/TAO/tests/Bug_1270_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1270_Regression/Echo.cpp
@@ -19,8 +19,7 @@ Echo::Echo(CORBA::ORB_ptr orb,
 }
 
 void
-Echo::echo_payload(Test::Payload const &
-                   ACE_ENV_ARG_DECL_NOT_USED)
+Echo::echo_payload(Test::Payload const &)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->abort_counter_--;
diff --git a/TAO/tests/Bug_1270_Regression/Echo.h b/TAO/tests/Bug_1270_Regression/Echo.h
index ba9fc0be452..5e835b6396a 100644
--- a/TAO/tests/Bug_1270_Regression/Echo.h
+++ b/TAO/tests/Bug_1270_Regression/Echo.h
@@ -18,8 +18,7 @@ public:
   Echo(CORBA::ORB_ptr orb,
        int abort_counter);
 
-  virtual void echo_payload (Test::Payload const & data
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void echo_payload (Test::Payload const & data)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
index a208f05a8ed..bf42f0b83d5 100644
--- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp
@@ -18,8 +18,7 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb)
 }
 
 void
-Echo_Caller::start_task(Test::Echo_ptr client
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Echo_Caller::start_task(Test::Echo_ptr client)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   Server_Timer * task =
@@ -32,9 +31,9 @@ Echo_Caller::start_task(Test::Echo_ptr client
 }
 
 void
-Echo_Caller::shutdown(ACE_ENV_SINGLE_ARG_DECL)
+Echo_Caller::shutdown(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
-  orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
+  orb_->shutdown(0);
 }
diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.h b/TAO/tests/Bug_1270_Regression/Echo_Caller.h
index cff3dec424e..e2a476e4052 100644
--- a/TAO/tests/Bug_1270_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.h
@@ -16,11 +16,10 @@ class Echo_Caller : public POA_Test::Echo_Caller
 public:
   Echo_Caller(CORBA::ORB_ptr orb);
 
-  virtual void start_task(Test::Echo_ptr client
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start_task(Test::Echo_ptr client)
     ACE_THROW_SPEC((CORBA::SystemException));
 
-  virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown(void)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp
index a011e89137d..910d86061af 100644
--- a/TAO/tests/Bug_1270_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1270_Regression/ORB_Task.cpp
@@ -19,15 +19,12 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 int
 ORB_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& )
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
index 7deb4156030..5eca7f6b241 100644
--- a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp
@@ -37,8 +37,7 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *)
 
   ACE_OS::memset (pload.get_buffer(), pload.length(), 0);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Test::Echo_var echo =
         Test::Echo::_duplicate (this->echo_.in ());
@@ -46,18 +45,15 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *)
       if(CORBA::is_nil (echo.in ()))
         return 0;
 
-      echo->echo_payload (pload
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      echo->echo_payload (pload);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       this->echo_ = Test::Echo::_nil ();
 
       if (this->reactor ()->cancel_timer (this) != 0)
         refcnt_--;
     }
-  ACE_ENDTRY;
 
   refcnt_--;
   if(refcnt_ == 0)
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index 8405b2d1c0c..9518e5f17e4 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -19,22 +19,16 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -42,16 +36,13 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -64,16 +55,11 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -92,18 +78,13 @@ main (int argc, char *argv[])
       }
 
       Test::Echo_var echo =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Echo_Caller_var server =
-        Test::Echo_Caller::_narrow(tmp.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Echo_Caller::_narrow(tmp.in ());
 
       if (CORBA::is_nil (echo.in ()))
         {
@@ -113,33 +94,24 @@ main (int argc, char *argv[])
                             1);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      server->start_task(echo.in()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->start_task(echo.in());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n"));
 
       // Actually the code here should never be reached.
-      root_poa->destroy (1, 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp
index 361b06dd275..dfd8ef60c30 100644
--- a/TAO/tests/Bug_1270_Regression/server.cpp
+++ b/TAO/tests/Bug_1270_Regression/server.cpp
@@ -16,22 +16,16 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,12 +33,10 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -63,13 +55,10 @@ main (int argc, char *argv[])
       }
 
       Test::Echo_Caller_var server =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -81,28 +70,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp
index 68026a71eec..8b8eb38a93e 100644
--- a/TAO/tests/Bug_1270_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp
@@ -13,25 +13,19 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Echo_Caller_var server =
-        Test::Echo_Caller::_narrow(tmp.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Echo_Caller::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -41,19 +35,15 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.cpp b/TAO/tests/Bug_1330_Regression/Test_i.cpp
index 70ccbb17d47..fee6cd16303 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1330_Regression/Test_i.cpp
@@ -14,7 +14,7 @@ Test_i::~Test_i()
 }
 
 void
-Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::test_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
    // Noop
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h
index acaff8a29b1..e87b72d2120 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.h
+++ b/TAO/tests/Bug_1330_Regression/Test_i.h
@@ -18,7 +18,7 @@ public:
    ~Test_i (void);
 
    /// A method
-   void test_method(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+   void test_method(void)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp
index f317731aeae..043271d2a70 100644
--- a/TAO/tests/Bug_1330_Regression/client.cpp
+++ b/TAO/tests/Bug_1330_Regression/client.cpp
@@ -39,22 +39,19 @@ int
 main (int argc, char *argv[])
 {
   int result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test_var server =
-        Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -65,19 +62,16 @@ main (int argc, char *argv[])
         }
 
 
-      server->test_method(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->test_method();
       result =0;
 
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       result =1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp
index 63308e1c36c..ff3a70b57ca 100644
--- a/TAO/tests/Bug_1330_Regression/server.cpp
+++ b/TAO/tests/Bug_1330_Regression/server.cpp
@@ -37,17 +37,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -55,12 +52,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,24 +64,18 @@ main (int argc, char *argv[])
 
 
 
-      root_poa->activate_object (   &server_impl
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->activate_object (   &server_impl);
 
-      CORBA::Object_var server = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var server = server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       adapter->bind("Name-with-hyphens", ior.in());
 
@@ -107,19 +96,15 @@ main (int argc, char *argv[])
 
       poa_manager->activate();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "SERVER (%P): Caught exception:");
+      ex._tao_print_exception ("SERVER (%P): Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp
index 415abbe7ed3..bc304e7b283 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo.cpp
@@ -20,8 +20,7 @@ Echo::Echo(CORBA::ORB_ptr orb,
 }
 
 void
-Echo::echo_payload(Test::Payload const &
-                   ACE_ENV_ARG_DECL_NOT_USED)
+Echo::echo_payload(Test::Payload const &)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->abort_counter_--;
@@ -36,8 +35,7 @@ Echo::echo_payload(Test::Payload const &
 
 void
 Echo::echo_payload_out (
-                        Test::Payload_out data
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        Test::Payload_out data)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
diff --git a/TAO/tests/Bug_1361_Regression/Echo.h b/TAO/tests/Bug_1361_Regression/Echo.h
index 37812e39b03..3a37b02023d 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.h
+++ b/TAO/tests/Bug_1361_Regression/Echo.h
@@ -19,13 +19,11 @@ public:
   Echo(CORBA::ORB_ptr orb,
        int abort_counter);
 
-  virtual void echo_payload (Test::Payload const & data
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void echo_payload (Test::Payload const & data)
     ACE_THROW_SPEC((CORBA::SystemException));
 
   virtual void echo_payload_out (
         Test::Payload_out data
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
index d6d17bcbfa3..4e20b1ece10 100644
--- a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp
@@ -20,17 +20,16 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb, Thread_Pool *pool)
 }
 
 void
-Echo_Caller::start_task(Test::Echo_ptr client
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Echo_Caller::start_task(Test::Echo_ptr client)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   pool_->put(Test::Echo::_duplicate(client));
 }
 
 void
-Echo_Caller::shutdown(ACE_ENV_SINGLE_ARG_DECL)
+Echo_Caller::shutdown(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n"));
-  orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
+  orb_->shutdown(0);
 }
diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.h b/TAO/tests/Bug_1361_Regression/Echo_Caller.h
index a251e021d88..c0551d40b4d 100644
--- a/TAO/tests/Bug_1361_Regression/Echo_Caller.h
+++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.h
@@ -18,11 +18,10 @@ class Echo_Caller : public POA_Test::Echo_Caller
 public:
   Echo_Caller(CORBA::ORB_ptr orb, Thread_Pool *pool_);
 
-  virtual void start_task(Test::Echo_ptr client
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void start_task(Test::Echo_ptr client)
     ACE_THROW_SPEC((CORBA::SystemException));
 
-  virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown(void)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
index 16ccdeb8661..e916f9b08f4 100644
--- a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
+++ b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp
@@ -20,15 +20,12 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
 int
 ORB_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& )
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index a1183f7bd9c..7c497e26d5a 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -134,7 +134,7 @@ Thread_Pool::svc (void)
       // Keep calling a few times after receiving exceptions
       for(int exception_count = 50; exception_count; --exception_count)
         {
-          ACE_TRY_NEW_ENV
+          try
             {
               // keep calling until get an exception
               while (true)
@@ -145,28 +145,23 @@ Thread_Pool::svc (void)
                       Test::Payload pload (10);
                       pload.length (10);
                       ACE_OS::memset (pload.get_buffer(), pload.length(), 0);
-                      echo->echo_payload (pload
-                                          ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                      echo->echo_payload (pload);
 
                     }
                   else
 #endif /*if 0*/
                     {
                       Test::Payload_var pout;
-                      echo->echo_payload_out (pout.out()
-                                              ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK;
+                      echo->echo_payload_out (pout.out());
 
                       // time_t last_success = ACE_OS::time();
                     }
               }
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception&)
             {
 	      // Just forget the exception and continue
             }
-          ACE_ENDTRY;
         }
 
     }
diff --git a/TAO/tests/Bug_1361_Regression/Server_Timer.cpp b/TAO/tests/Bug_1361_Regression/Server_Timer.cpp
index 0d5ad1bb3e5..d7eeb0b45e4 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Timer.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Timer.cpp
@@ -31,11 +31,10 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *)
 {
   refcnt_++;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Test::Payload pload(1024); pload.length(1024);
   ACE_OS::memset(pload.get_buffer(), pload.length(), 0);
-  ACE_TRY
+  try
   {
     Test::Echo_var echo = Test::Echo::_duplicate(this->echo_.in());
     if(CORBA::is_nil(echo.in()))
@@ -43,14 +42,13 @@ Server_Timer::handle_timeout (ACE_Time_Value const &, void const *)
 
     echo->echo_payload(pload);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
     this->echo_ = Test::Echo::_nil ();
 
     if(this->reactor()->cancel_timer(this) != 0)
       refcnt_--;
   }
-  ACE_ENDTRY;
 
   refcnt_--;
   if(refcnt_ == 0)
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index 76b98781048..4c60feb2a30 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -51,22 +51,16 @@ public:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -74,16 +68,13 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -96,16 +87,11 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -124,18 +110,13 @@ main (int argc, char *argv[])
       }
 
       Test::Echo_var echo =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Echo_Caller_var server =
-        Test::Echo_Caller::_narrow(tmp.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Echo_Caller::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -145,32 +126,27 @@ main (int argc, char *argv[])
                             1);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ORB_Task worker (orb.in());
       worker.activate (THR_NEW_LWP | THR_JOINABLE,
                        serverthreads);
 
-      ACE_TRY_EX (BL)
+      try
         {
           for(int i = serverthreads; i; --i)
             {
-              server->start_task(echo.in()
-                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (BL);
+              server->start_task(echo.in());
             }
         }
-      ACE_CATCHALL
+      catch (...)
         {
         }
-      ACE_ENDTRY;
 
       Client_Timer * task = new Client_Timer (orb->orb_core()->reactor());
       task->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       worker.wait ();
 
@@ -178,20 +154,15 @@ main (int argc, char *argv[])
                   "(%P|%t) client - event loop finished\n"));
 
       // Actually the code here should never be reached.
-      root_poa->destroy (1, 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp
index 5b09f46aa76..12b14a07905 100644
--- a/TAO/tests/Bug_1361_Regression/server.cpp
+++ b/TAO/tests/Bug_1361_Regression/server.cpp
@@ -18,22 +18,16 @@ parse_args (int argc, char *argv[]);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -41,13 +35,10 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,13 +60,10 @@ main (int argc, char *argv[])
       }
 
       Test::Echo_Caller_var server =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -87,15 +75,13 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ORB_Task worker (orb.in ());
       worker.activate (THR_NEW_LWP | THR_JOINABLE,
                        4);
 
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
@@ -104,20 +90,15 @@ main (int argc, char *argv[])
       worker.wait ();
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index 6ea9d05e4e3..26161ebfb6f 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -26,25 +26,19 @@ main (int argc, char *argv[])
 {
   ACE_DEBUG ((LM_DEBUG,
              "Starting shutdown\n"));
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Echo_Caller_var server =
-        Test::Echo_Caller::_narrow(tmp.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Echo_Caller::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -54,19 +48,15 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
index 7e153576cd6..12e18871ff5 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
@@ -25,17 +25,14 @@ Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Apply sync_none policy
       CORBA::Object_var object =
-        orb_->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -48,35 +45,27 @@ Client_Task::svc (void)
       CORBA::PolicyList policies (1); policies.length (1);
       policies[0] =
         orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       for (int i = 0; i != number_; ++i)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) sending oneway invocation %d...\n", i));
 
-          this->sender_->send_ready_message (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->sender_->send_ready_message ();
 
           // Do it slowly.
           ACE_OS::sleep(ACE_Time_Value(0,250000));
          }
        }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "Caught Exception");
+      ex._tao_print_exception ("Caught Exception");
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
index 3a7769ee7fe..311fba07133 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp
@@ -14,8 +14,7 @@ Sender_i::~Sender_i (void)
 }
 
 void
-Sender_i::active_objects (CORBA::ULong no_threads
-                          ACE_ENV_ARG_DECL_NOT_USED)
+Sender_i::active_objects (CORBA::ULong no_threads)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->active_objects_ = no_threads;
@@ -23,7 +22,7 @@ Sender_i::active_objects (CORBA::ULong no_threads
 
 
 void
-Sender_i::send_ready_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Sender_i::send_ready_message (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h
index 387a467f8fd..08a78a7e74d 100644
--- a/TAO/tests/Bug_1476_Regression/Sender_i.h
+++ b/TAO/tests/Bug_1476_Regression/Sender_i.h
@@ -32,11 +32,10 @@ public:
   virtual ~Sender_i (void);
 
   // = The skeleton methods
-  virtual void active_objects (CORBA::ULong ao
-                               ACE_ENV_ARG_DECL)
+  virtual void active_objects (CORBA::ULong ao)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_ready_message (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void send_ready_message (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong get_number_received (void) const;
diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.cpp b/TAO/tests/Bug_1476_Regression/Server_Task.cpp
index c2dbb8c52ba..d52edc68000 100644
--- a/TAO/tests/Bug_1476_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Server_Task.cpp
@@ -17,19 +17,16 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // run the test for at most 30 seconds...
       ACE_Time_Value tv (15, 0);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp
index f08edccd51d..13ba1f5adea 100644
--- a/TAO/tests/Bug_1476_Regression/client.cpp
+++ b/TAO/tests/Bug_1476_Regression/client.cpp
@@ -53,15 +53,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -69,20 +67,16 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -95,27 +89,20 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies (1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+                            scope_as_any);
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      policies[0]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Get the sender reference..
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Sender_var sender =
-        Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Sender::_narrow(tmp.in ());
 
       if (CORBA::is_nil (sender.in ()))
         {
@@ -137,8 +124,7 @@ main (int argc, char *argv[])
       // will have two threads that would make invocations..
       // this is the first oneway we do, so after this we would have a queue
       // on one of the transports
-      sender->active_objects ((CORBA::Short) number_of_client_tasks ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->active_objects ((CORBA::Short) number_of_client_tasks);
 
       TAO::Transport_Cache_Manager& manager = orb->orb_core()->lane_resources ().transport_cache ();
 
@@ -182,21 +168,18 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Event Loop finished\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       if (tranportwithqueue == false)
       {
         return 1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp
index b65d5e2333c..8aa0a4c762b 100644
--- a/TAO/tests/Bug_1476_Regression/server.cpp
+++ b/TAO/tests/Bug_1476_Regression/server.cpp
@@ -41,15 +41,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,12 +55,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -74,12 +70,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(sender_impl);
 
       Test::Sender_var sender =
-        sender_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sender_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sender.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (sender.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -91,8 +85,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Task server_task (orb.in (),
                                ACE_Thread_Manager::instance ());
@@ -125,19 +118,15 @@ main (int argc, char *argv[])
             }
         }
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
index 9710790c0af..3285a62ed18 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
@@ -31,8 +31,7 @@ Client_Task::svc (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       for (CORBA::Long j = 0;
            j != 1000;
@@ -41,33 +40,28 @@ Client_Task::svc (void)
           // Send 25 messages in every loop..
           for (CORBA::Short i = 0; i != 25; ++i)
             {
-              this->receiver_->sendc_next_prime (this->handler_var_.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              this->receiver_->sendc_next_prime (this->handler_var_.in ());
             }
 
           CORBA::Short repl = 0;
           while (repl != 25)
             {
               CORBA::Boolean pending =
-                this->orb_->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                this->orb_->work_pending ();
 
               if (pending)
                 {
-                  this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                  this->orb_->perform_work ();
 
                   ++repl;
                 }
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp
index 40d7a6c63e7..6575cb0bdca 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1482_Regression/Hello.cpp
@@ -18,7 +18,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-Hello::next_prime (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::next_prime (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h
index 58a5fd909b3..7d7fe72e65a 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.h
+++ b/TAO/tests/Bug_1482_Regression/Hello.h
@@ -17,7 +17,7 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong next_prime (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong next_prime (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index 93189526614..cac4a472529 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
@@ -7,8 +7,7 @@ Reply_Handler::Reply_Handler (CORBA::ORB_ptr o)
 }
 
 void
-Reply_Handler::next_prime (CORBA::ULong
-                           ACE_ENV_ARG_DECL_NOT_USED)
+Reply_Handler::next_prime (CORBA::ULong)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
@@ -16,34 +15,27 @@ Reply_Handler::next_prime (CORBA::ULong
 
 void
 Reply_Handler::next_prime_excep (
-    ::Messaging::ExceptionHolder *ex
-    ACE_ENV_ARG_DECL)
+    ::Messaging::ExceptionHolder *ex)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  ACE_TRY
+  try
     {
-      ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ex->raise_exception ();
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, t)
+  catch (const CORBA::COMM_FAILURE& )
     {
       /*ACE_DEBUG ((LM_DEBUG,
                   "Callback method <next_prime_excep> called: \n"));
                   */
 
       ACE_Time_Value tv (10, 0);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
 
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->shutdown (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.h b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
index 03700034b3e..4b59d67cef0 100644
--- a/TAO/tests/Bug_1482_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.h
@@ -14,12 +14,10 @@ public:
   Reply_Handler (CORBA::ORB_ptr o);
 
 
-  void next_prime (CORBA::ULong ami_return_val
-                   ACE_ENV_ARG_DECL)
+  void next_prime (CORBA::ULong ami_return_val)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void next_prime_excep (::Messaging::ExceptionHolder * excep_holder
-                         ACE_ENV_ARG_DECL)
+  void next_prime_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.cpp b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
index 8c0dc31bdd1..f3a3cfadc65 100644
--- a/TAO/tests/Bug_1482_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Server_Task.cpp
@@ -16,17 +16,14 @@ int
 Server_Task::svc (void)
 {
 //   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp
index 78a8635a4e5..c0ffd0e54c3 100644
--- a/TAO/tests/Bug_1482_Regression/client.cpp
+++ b/TAO/tests/Bug_1482_Regression/client.cpp
@@ -38,22 +38,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -64,29 +61,21 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       TimeBase::TimeT timeout_period = 10 * 1000;
 
@@ -97,14 +86,10 @@ main (int argc, char *argv[])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                            timeout_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            timeout_as_any);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::ADD_OVERRIDE);
 
 
       // Let the client perform the test in a separate thread
@@ -122,19 +107,15 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp
index 2204fc213da..fdfbb50b1de 100644
--- a/TAO/tests/Bug_1482_Regression/server.cpp
+++ b/TAO/tests/Bug_1482_Regression/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,8 +83,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Task st (orb.in (),
                       ACE_Thread_Manager::instance ());
@@ -102,24 +95,19 @@ main (int argc, char *argv[])
 
           return -1;
         }
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
index fa080db4265..b9afd9b4960 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp
@@ -14,8 +14,7 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
         // No Op
@@ -23,14 +22,12 @@ Client_ORBInitializer::pre_init (
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   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 ();
@@ -39,13 +36,10 @@ Client_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_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;
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
index 569419fb346..c232ee05e1a 100644
--- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
index 51150d118a7..b9584834a8c 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -24,16 +24,13 @@ Client_Task::Client_Task (const char *input,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corb_->string_to_object (input_);
 
       Bug1495_Regression::Bug1495_var server =
-        Bug1495_Regression::Bug1495::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Bug1495_Regression::Bug1495::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -50,8 +47,7 @@ Client_Task::svc (void)
           // call the thread_id function on the test object
           CORBA::Long remote_thread_id;
 
-          server->get_thread_id (remote_thread_id ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->get_thread_id (remote_thread_id);
 
           ACE_DEBUG ((LM_INFO,
                       "Remote thread ID was %i\n",
@@ -76,13 +72,11 @@ Client_Task::svc (void)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in client task:");
+      ex._tao_print_exception ("Caught exception in client task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
index 9993a624d7f..132b2dd7568 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp
@@ -14,8 +14,7 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
         // No Op
@@ -23,22 +22,18 @@ Server_ORBInitializer::pre_init (
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Install the Echo server request interceptor
   ACE_NEW_THROW_EX (this->server_interceptor_,
                     Echo_Server_Request_Interceptor,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var interceptor =
     this->server_interceptor_;
 
-  info->add_server_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor.in ());
 }
 
 Echo_Server_Request_Interceptor *
diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
index f47e9ce5e68..ee240056609 100644
--- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h
@@ -33,12 +33,10 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the created server request interceptor.  Only valid after
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
index acaf0e35779..c31aeb51c00 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
@@ -30,12 +30,10 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var poa_object =
-        sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sorb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -45,15 +43,12 @@ Server_Task::svc (void)
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Bug1495_i *server_impl = 0;
       ACE_NEW_RETURN (server_impl,
@@ -64,9 +59,7 @@ Server_Task::svc (void)
       Bug1495_Regression::
         Bug1495_var bug1495 = server_impl->_this();
 
-      CORBA::String_var ior = sorb_->object_to_string (bug1495.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var ior = sorb_->object_to_string (bug1495.in ());
 
       if (output_ != 0)
         {
@@ -93,23 +86,18 @@ Server_Task::svc (void)
 
       // The ORB will run for 15 seconds and shut down.
       ACE_Time_Value tv (15, 0);
-      sorb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb_->run (tv);
 
       ACE_DEBUG ((LM_DEBUG,
                    "Event loop finished for the thread server.\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught an exception in server task: ");
+      ex._tao_print_exception ("Caught an exception in server task: ");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
index 99bb3239dfc..6b4d6417695 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
@@ -64,17 +64,14 @@ main (int argc, char *argv[])
       return -1;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter main_args_s (argc, argv);
 
       CORBA::ORB_var sorb =
         CORBA::ORB_init (main_args_s.get_argc (),
                          main_args_s.get_TCHAR_argv (),
-                         "Server_ORB"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "Server_ORB");
 
       ACE_Manual_Event me;
 
@@ -97,9 +94,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (main_args_c.get_argc (),
                          main_args_c.get_TCHAR_argv (),
-                         "Client_ORB"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "Client_ORB");
 
       {
         Client_Task client_task (ior_input_file,
@@ -115,14 +110,12 @@ main (int argc, char *argv[])
         ACE_Thread_Manager::instance ()->wait ();
       }
 
-      corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      corb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // ignore exceptions
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Threaded client ready.\n"));
 
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
index 95cd68db7e7..0a7f011e481 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
@@ -47,7 +47,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Create the ORB initializer.
       Server_ORBInitializer *temp_initializer = 0;
@@ -58,18 +58,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       // Now initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
-                                            "Remote_Server_ORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Remote_Server_ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -79,15 +75,12 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         {
@@ -107,9 +100,7 @@ main (int argc, char *argv[])
         }
 
       // Pull in the ior from the remote server to use as the forward location.
-      CORBA::Object_var forward_location = orb->string_to_object (ior_input_file
-                                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var forward_location = orb->string_to_object (ior_input_file);
 
       if (CORBA::is_nil (forward_location.in ()))
         {
@@ -119,29 +110,21 @@ main (int argc, char *argv[])
                              1);
         }
 
-      server_interceptor->forward_reference (forward_location.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_interceptor->forward_reference (forward_location.in ());
 
       Bug1495_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
       Bug1495_Regression::Bug1495_var server =
-        Bug1495_Regression::Bug1495::_narrow (test_obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Bug1495_Regression::Bug1495::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // Output the server IOR to a file
       if (ior_output_file != 0)
@@ -162,8 +145,7 @@ main (int argc, char *argv[])
 
       ACE_Time_Value tv (15, 0);
 
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       if (server_interceptor->forward_location_done() == false)
         {
@@ -171,16 +153,13 @@ main (int argc, char *argv[])
         }
 
       ACE_DEBUG ((LM_DEBUG, "Threaded Server event loop finished \n"));
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught an exception in server:");
+      ex._tao_print_exception ("Caught an exception in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Threaded Server ready\n"));
 
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
index fc019f046ed..926acd7cc13 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp
@@ -24,22 +24,21 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
@@ -47,8 +46,7 @@ Echo_Client_Request_Interceptor::send_poll (
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -58,8 +56,7 @@ Echo_Client_Request_Interceptor::send_request (
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_UNUSED_ARG (ri);
@@ -68,8 +65,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -79,8 +75,7 @@ Echo_Client_Request_Interceptor::receive_other (
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h
index 2503a4b75b7..705bce07974 100644
--- a/TAO/tests/Bug_1495_Regression/client_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h
@@ -31,33 +31,28 @@ public:
   virtual ~Echo_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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
index c4a32357087..7767288eba5 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp
@@ -29,42 +29,39 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 }
 
 void
-Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location
-                                                    ACE_ENV_ARG_DECL)
+Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location)
                                                     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (forward_location))
-    ACE_THROW (CORBA::INV_OBJREF (
-                 CORBA::SystemException::_tao_minor_code (
-                   TAO::VMCID,
-                   EINVAL),
-                 CORBA::COMPLETED_NO));
+    throw CORBA::INV_OBJREF (
+      CORBA::SystemException::_tao_minor_code (
+        TAO::VMCID,
+        EINVAL),
+      CORBA::COMPLETED_NO);
   this->forward_location_ = CORBA::Object::_duplicate (forward_location);
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.receive_request_service_contexts from "
@@ -84,15 +81,14 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
   ACE_DEBUG ((LM_DEBUG, "Sending LOCATION_FORWARD, current thread %i\n", ACE_Thread::self ()));
 
-  ACE_THROW (PortableInterceptor::ForwardRequest (this->forward_location_));
+  throw PortableInterceptor::ForwardRequest (this->forward_location_);
 
 }
 
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -101,8 +97,7 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     // No op
@@ -111,8 +106,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -122,8 +116,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-             PortableInterceptor::ServerRequestInfo_ptr ri
-             ACE_ENV_ARG_DECL)
+             PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
@@ -131,11 +124,10 @@ Echo_Server_Request_Interceptor::send_other (
   // This will throw an exception if a location forward has not
   // occured.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
-  CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var forward = ri->forward_reference ();
 
   if (CORBA::is_nil (forward.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 }
 
 bool
diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h
index f1f682be9f9..dfcbae7b2c2 100644
--- a/TAO/tests/Bug_1495_Regression/server_interceptor.h
+++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h
@@ -33,39 +33,33 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  void forward_reference (CORBA::Object_ptr forward_location
-                          ACE_ENV_ARG_DECL)
+  void forward_reference (CORBA::Object_ptr forward_location)
                           ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp
index f79564cc0dd..64f9a568282 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.cpp
+++ b/TAO/tests/Bug_1495_Regression/test_i.cpp
@@ -28,7 +28,6 @@ Bug1495_i::~Bug1495_i (void)
 void
 Bug1495_i::get_thread_id (
     CORBA::Long_out thread_id
-    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -39,7 +38,6 @@ Bug1495_i::get_thread_id (
 
 void
 Bug1495_i::shutdown (
-     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -49,10 +47,8 @@ Bug1495_i::shutdown (
                 "Shutting down orb %i\n",
                 ACE_Thread::self()));
 
-    this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    this->_remove_ref ();
 
-    this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    this->orb_->shutdown (0);
 }
 
diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h
index db21e2a6abb..146a65f5c07 100644
--- a/TAO/tests/Bug_1495_Regression/test_i.h
+++ b/TAO/tests/Bug_1495_Regression/test_i.h
@@ -50,11 +50,11 @@ public:
     virtual ~Bug1495_i (void);
 
     virtual
-    void get_thread_id (CORBA::Long_out thread_id ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    void get_thread_id (CORBA::Long_out thread_id)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual
-    void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    void shutdown (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 private:
     CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
index 354a6efdb94..0ed4112568a 100644
--- a/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
+++ b/TAO/tests/Bug_1535_Regression/Bug_1535_Regression.mpc
@@ -5,5 +5,6 @@ project(bug_1535_regression) : taoserver, utils, avoids_minimum_corba, avoids_co
   exename = bug_1535_regression
   Source_Files {
     bug_1535_regression.cpp
+    Test.cpp
   }
 }
diff --git a/TAO/tests/Bug_1535_Regression/Makefile.am b/TAO/tests/Bug_1535_Regression/Makefile.am
index 3f384346b81..7227d62bb5c 100644
--- a/TAO/tests/Bug_1535_Regression/Makefile.am
+++ b/TAO/tests/Bug_1535_Regression/Makefile.am
@@ -54,6 +54,8 @@ bug_1535_regression_CPPFLAGS = \
 
 bug_1535_regression_SOURCES = \
   TestC.cpp \
+  Test.cpp \
+  Test.h \
   TestS.cpp \
   bug_1535_regression.cpp \
   TestC.h \
diff --git a/TAO/tests/Bug_1535_Regression/Test.cpp b/TAO/tests/Bug_1535_Regression/Test.cpp
new file mode 100644
index 00000000000..55daf8fcfc4
--- /dev/null
+++ b/TAO/tests/Bug_1535_Regression/Test.cpp
@@ -0,0 +1,24 @@
+//
+// $Id$
+//
+#include "Test.h"
+
+ACE_RCSID(Hello, Hello, "$Id$")
+
+Hello::Hello (PortableServer::POA_ptr poa) :
+  poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+void
+Hello::print_hello_world (void)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+}
+
+PortableServer::POA_ptr
+Hello::_default_POA (void)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
diff --git a/TAO/tests/Bug_1535_Regression/Test.h b/TAO/tests/Bug_1535_Regression/Test.h
new file mode 100644
index 00000000000..42bccb4ce91
--- /dev/null
+++ b/TAO/tests/Bug_1535_Regression/Test.h
@@ -0,0 +1,29 @@
+//
+// $Id$
+//
+
+#ifndef HELLO_H
+#define HELLO_H
+#include /**/ "ace/pre.h"
+
+#include "TestS.h"
+
+/// Implement the Test::Hello interface
+class Hello
+  : public virtual POA_Test
+{
+public:
+  Hello (PortableServer::POA_ptr poa);
+
+  // = The skeleton methods
+  virtual void print_hello_world (void)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::POA_ptr _default_POA (void);
+
+private:
+  PortableServer::POA_var poa_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* HELLO_H */
diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
index 1bec57c8fde..07f4d5a4038 100644
--- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "TestS.h"
+#include "Test.h"
 #include "tao/Utils/ORB_Destroyer.h"
 #include "tao/Utils/RIR_Narrow.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
@@ -12,64 +12,49 @@ ACE_RCSID (Bug_1535_Regression,
 
 PortableServer::POA_ptr
 create_persistent_POA (PortableServer::POA_ptr parent,
-                       char const * name
-                       ACE_ENV_ARG_DECL)
+                       char const * name)
 {
   TAO::Utils::PolicyList_Destroyer plist (3);
   plist.length(3);
 
   plist[0] =
-    parent->create_lifespan_policy (PortableServer::PERSISTENT
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    parent->create_lifespan_policy (PortableServer::PERSISTENT);
 
   plist[1] =
-    parent->create_id_assignment_policy (PortableServer::USER_ID
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    parent->create_id_assignment_policy (PortableServer::USER_ID);
 
   plist[2] =
     parent->create_implicit_activation_policy (
-      PortableServer::NO_IMPLICIT_ACTIVATION
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+      PortableServer::NO_IMPLICIT_ACTIVATION);
 
   PortableServer::POAManager_var mgr =
-    parent->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    parent->the_POAManager ();
 
   return parent->create_POA (name,
                              mgr.in(),
-                             plist
-                             ACE_ENV_ARG_PARAMETER);
+                             plist);
 }
 
 void
 test_create_object_before_servant_reactivation (
   CORBA::ORB_ptr orb,
-  PortableServer::POA_ptr root_poa
-  ACE_ENV_ARG_DECL)
+  PortableServer::POA_ptr root_poa)
 {
   // Create a persistent POA and then create a reference in it...
   PortableServer::POA_var persistent_poa =
     create_persistent_POA(root_poa,
-                          "T1"
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          "T1");
 
 
   PortableServer::ObjectId_var oid =
     PortableServer::string_to_ObjectId ("TestServant");
 
-  char const * id = _tc_Test->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  char const * id = _tc_Test->id ();
 
   CORBA::Object_var object =
     persistent_poa->create_reference_with_id (
       oid.in (),
-      id
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      id);
 
   if (CORBA::is_nil (object.in ()))
     {
@@ -80,9 +65,7 @@ test_create_object_before_servant_reactivation (
     }
 
   CORBA::String_var ior =
-    orb->object_to_string (object.in ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->object_to_string (object.in ());
 
   // Now destroy the POA...
   persistent_poa->destroy (true,
@@ -91,15 +74,11 @@ test_create_object_before_servant_reactivation (
   // Now create the POA again...
   persistent_poa =
     create_persistent_POA (root_poa,
-                           "T1"
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           "T1");
 
   // And try to create the object again...
   object =
-    orb->string_to_object (ior.in ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->string_to_object (ior.in ());
 
   if(CORBA::is_nil (object.in ()))
     {
@@ -109,35 +88,27 @@ test_create_object_before_servant_reactivation (
     }
 
   persistent_poa->destroy (true,
-                           true
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           true);
 }
 
 void
 test_create_object_before_POA_reactivation(
   CORBA::ORB_ptr orb,
-  PortableServer::POA_ptr root_poa
-  ACE_ENV_ARG_DECL)
+  PortableServer::POA_ptr root_poa)
 {
   // Create a persistent POA and then create a reference in it...
   PortableServer::POA_var persistent_poa =
     create_persistent_POA (root_poa,
-                           "T2"
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           "T2");
 
   PortableServer::ObjectId_var oid =
     PortableServer::string_to_ObjectId ("TestServant");
 
-  char const * id = _tc_Test->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  char const * id = _tc_Test->id ();
 
   CORBA::Object_var object =
     persistent_poa->create_reference_with_id (oid.in (),
-                                              id
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                              id);
 
   if (CORBA::is_nil (object.in ()))
     {
@@ -147,20 +118,14 @@ test_create_object_before_POA_reactivation(
     }
 
   CORBA::String_var ior =
-    orb->object_to_string (object.in ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->object_to_string (object.in ());
 
   // Now destroy the POA...
   persistent_poa->destroy (true,
-                           true
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           true);
 
   // And try to create the object again...
-  object = orb->string_to_object (ior.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  object = orb->string_to_object (ior.in ());
 
   if (CORBA::is_nil (object.in ()))
     {
@@ -171,62 +136,91 @@ test_create_object_before_POA_reactivation(
     }
 
   persistent_poa->destroy (true,
-                           true
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                           true);
+}
+
+void
+test_no_implicit_activation (
+  PortableServer::POA_ptr root_poa)
+{
+  // Create a persistent POA and then create a reference in it...
+  PortableServer::POA_var persistent_poa =
+    create_persistent_POA (root_poa,
+                           "T3");
+
+  Hello myhello (persistent_poa.in ());
+
+  bool succeed = false;
+  try
+    {
+      // Implicit activation should fail
+      Test_var myservant =
+          myhello._this ();
+
+    }
+  catch (const PortableServer::POA::WrongPolicy& )
+    {
+      succeed = true;
+    }
+  catch (const PortableServer::POA::ServantNotActive& )
+    {
+      // This is now the case when looking at the corba spec, raised
+      // an issue 10522 about this
+      succeed = true;
+    }
+  catch (const CORBA::Exception&)
+    {
+    }
+
+  if (!succeed)
+  {
+    ACE_ERROR ((LM_ERROR,
+                "(%t) ERROR, Implicit activation failed with invalid exception\n"));
+  }
+
+  // Now destroy the POA...
+  persistent_poa->destroy (true,
+                           true);
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       TAO::Utils::ORB_Destroyer orb_destroyer (orb.in());
 
       PortableServer::POA_var root_poa =
         TAO::Utils::RIR_Narrow<PortableServer::POA>::narrow (orb.in (),
-                                                             "RootPOA"
-                                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                             "RootPOA");
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       test_create_object_before_POA_reactivation (orb.in(),
-                                                  root_poa.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  root_poa.in ());
 
       test_create_object_before_servant_reactivation (orb.in (),
-                                                      root_poa.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                      root_poa.in ());
+
+      test_no_implicit_activation (root_poa.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught a CORBA exception \n");
+      ex._tao_print_exception ("Caught a CORBA exception \n");
       return 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.cpp b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
index 75a9d31af82..a2eda92853d 100644
--- a/TAO/tests/Bug_1551_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Client_Task.cpp
@@ -26,8 +26,7 @@ Client_Task::svc (void)
 {
   //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("PolicyCurrent");
@@ -54,30 +53,22 @@ Client_Task::svc (void)
       // Start 25 separate concurrent request streams
       for (CORBA::Short i = 0; i != 25; ++i)
       {
-        this->receiver_->sendc_short_sleep (this->handler_var_.in ()
-            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        this->receiver_->sendc_short_sleep (this->handler_var_.in ());
       }
 
       ACE_Time_Value tv(10, 0);
-      orb_->run(tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_->run(tv);
     }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
+  catch (const CORBA::TIMEOUT&)
     {
-      // A CORBA::TIMEOUT exception is expected since
-      // the server aborts itself
-      ACE_UNUSED_ARG (ex);
       ACE_DEBUG ((LM_DEBUG,
                   "Client received an expected CORBA::TIMEOUT exception.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Client_Task - caught exception:");
+      ex._tao_print_exception ("(%P|%t) Client_Task - caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp
index 5c72639015f..bf29d0f14e3 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1551_Regression/Hello.cpp
@@ -15,7 +15,7 @@ Hello::Hello(
 }
 
 void
-Hello::short_sleep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::short_sleep (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long count = atomic_counter_--;
diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h
index 156365e9b6b..9378352de1e 100644
--- a/TAO/tests/Bug_1551_Regression/Hello.h
+++ b/TAO/tests/Bug_1551_Regression/Hello.h
@@ -16,7 +16,7 @@ public:
   /// Constructor
   Hello(CORBA::ORB_ptr orb, bool simulate_crashes);
 
-  virtual void short_sleep (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void short_sleep (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index c6f274953fe..aa2959f4104 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
@@ -15,35 +15,29 @@ Reply_Handler::Reply_Handler (
 }
 
 void
-Reply_Handler::short_sleep (ACE_ENV_SINGLE_ARG_DECL)
+Reply_Handler::short_sleep (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  check_counter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  check_counter();
 
   Test::AMI_HelloHandler_var current =
-    _this(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    _this();
 
-  hello_->sendc_short_sleep(current.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  hello_->sendc_short_sleep(current.in());
 }
 
 void
 Reply_Handler::short_sleep_excep (
-    ::Messaging::ExceptionHolder *ex
-    ACE_ENV_ARG_DECL)
+    ::Messaging::ExceptionHolder *ex)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  check_counter(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  check_counter();
 
-  ACE_TRY
+  try
     {
       if (ex)
         {
-          ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ex->raise_exception ();
         }
       else
         {
@@ -53,34 +47,28 @@ Reply_Handler::short_sleep_excep (
           ACE_ERROR ((LM_ERROR, "ERROR: Got nill exceptionholder\n"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Exceptions are expected and thus ignored in normal runs:
 #if 0
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Reply_Handler - caught exception:");
+      ex._tao_print_exception ("(%P|%t) Reply_Handler - caught exception:");
 #endif /* 0 */
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   Test::AMI_HelloHandler_var current =
-    _this(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    _this();
 
-  hello_->sendc_short_sleep(current.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  hello_->sendc_short_sleep(current.in());
 }
 
 void Reply_Handler::
-check_counter(ACE_ENV_SINGLE_ARG_DECL)
+check_counter(void)
 {
   long const count = --counter_;
   if(count == 0)
   {
     // ACE_DEBUG((LM_DEBUG, "(%P|%t) Shut down client thread\n"));
-    orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    orb_->shutdown(0);
     return;
   }
 #if 0
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
index 26ca559dd07..7ff901d9d20 100644
--- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h
+++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h
@@ -17,15 +17,14 @@ public:
       Test::Hello_ptr hello,
       CORBA::ORB_ptr orb);
 
-  void short_sleep (ACE_ENV_SINGLE_ARG_DECL)
+  void short_sleep (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder
-      ACE_ENV_ARG_DECL)
+  void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void check_counter(ACE_ENV_SINGLE_ARG_DECL);
+  void check_counter(void);
 
 private:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> counter_;
diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.cpp b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
index 541faead41b..9f6f0783b85 100644
--- a/TAO/tests/Bug_1551_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1551_Regression/Server_Task.cpp
@@ -16,17 +16,14 @@ int
 Server_Task::svc (void)
 {
   //   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp
index 1498c96ae47..cc005b58bb3 100644
--- a/TAO/tests/Bug_1551_Regression/client.cpp
+++ b/TAO/tests/Bug_1551_Regression/client.cpp
@@ -48,22 +48,19 @@ main (int argc, char *argv[])
 {
   int retval = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -74,20 +71,15 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
 
       // Let the client perform the test in a separate thread
@@ -118,19 +110,15 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        );
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }
diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp
index 5adc91117fd..21a50c21162 100644
--- a/TAO/tests/Bug_1551_Regression/server.cpp
+++ b/TAO/tests/Bug_1551_Regression/server.cpp
@@ -52,19 +52,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,8 +69,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -82,12 +78,10 @@ main (int argc, char *argv[])
           new Hello(orb.in(), simulate_crashes));
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -99,8 +93,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
 
       Server_Task st (orb.in (),
@@ -118,19 +111,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp
index 44edda43ee7..d1a8e9ecdf1 100644
--- a/TAO/tests/Bug_1568_Regression/client.cpp
+++ b/TAO/tests/Bug_1568_Regression/client.cpp
@@ -43,22 +43,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Baz::C_var cobject =
-        Baz::C::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Baz::C::_narrow (object.in ());
 
       if (CORBA::is_nil (cobject.in ()))
         {
@@ -68,21 +65,16 @@ main (int argc, char *argv[])
                             1);
         }
 
-      cobject->op1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      cobject->op2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      cobject->op3 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      cobject->op4 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      cobject->op1 ();
+      cobject->op2 ();
+      cobject->op3 ();
+      cobject->op4 ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ex._tao_print_exception ("");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp
index fce73b267a5..f14b9ce628d 100644
--- a/TAO/tests/Bug_1568_Regression/server.cpp
+++ b/TAO/tests/Bug_1568_Regression/server.cpp
@@ -28,20 +28,16 @@ public:
   Simple_C (CORBA::ORB_ptr orb);
 
   void op1 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void op2 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void op3 (
-      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void op4 (
-      Baz::AMH_CResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Baz::AMH_CResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -59,38 +55,34 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb)
 
 void
 Simple_C::op1(
-    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
+  _tao_rh->op1();
 }
 
 void
 Simple_C::op2(
-    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op2(ACE_ENV_SINGLE_ARG_PARAMETER);
+  _tao_rh->op2();
 }
 
 void
 Simple_C::op3(
-    Foo::Bar::AMH_BResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
+  _tao_rh->op3();
 }
 
 void
 Simple_C::op4(
-    Baz::AMH_CResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Baz::AMH_CResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op4(ACE_ENV_SINGLE_ARG_PARAMETER);
+  _tao_rh->op4();
 }
 
 // ****************************************************************
@@ -126,19 +118,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -146,8 +135,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -156,12 +144,10 @@ main (int argc, char *argv[])
           new Simple_C(orb.in()));
 
       Baz::C_var simple_c =
-        simple_c_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        simple_c_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (simple_c.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (simple_c.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -173,27 +159,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.cpp b/TAO/tests/Bug_1627_Regression/Test_i.cpp
index 70ccbb17d47..fee6cd16303 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.cpp
+++ b/TAO/tests/Bug_1627_Regression/Test_i.cpp
@@ -14,7 +14,7 @@ Test_i::~Test_i()
 }
 
 void
-Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::test_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
    // Noop
diff --git a/TAO/tests/Bug_1627_Regression/Test_i.h b/TAO/tests/Bug_1627_Regression/Test_i.h
index 43bcb9a548b..369ae33b782 100644
--- a/TAO/tests/Bug_1627_Regression/Test_i.h
+++ b/TAO/tests/Bug_1627_Regression/Test_i.h
@@ -18,7 +18,7 @@ public:
    ~Test_i (void);
 
    /// A method
-   void test_method(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+   void test_method(void)
      ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Bug_1627_Regression/client.cpp b/TAO/tests/Bug_1627_Regression/client.cpp
index f317731aeae..043271d2a70 100644
--- a/TAO/tests/Bug_1627_Regression/client.cpp
+++ b/TAO/tests/Bug_1627_Regression/client.cpp
@@ -39,22 +39,19 @@ int
 main (int argc, char *argv[])
 {
   int result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test_var server =
-        Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -65,19 +62,16 @@ main (int argc, char *argv[])
         }
 
 
-      server->test_method(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->test_method();
       result =0;
 
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       result =1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp
index 63308e1c36c..ff3a70b57ca 100644
--- a/TAO/tests/Bug_1627_Regression/server.cpp
+++ b/TAO/tests/Bug_1627_Regression/server.cpp
@@ -37,17 +37,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -55,12 +52,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,24 +64,18 @@ main (int argc, char *argv[])
 
 
 
-      root_poa->activate_object (   &server_impl
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->activate_object (   &server_impl);
 
-      CORBA::Object_var server = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var server = server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       adapter->bind("Name-with-hyphens", ior.in());
 
@@ -107,19 +96,15 @@ main (int argc, char *argv[])
 
       poa_manager->activate();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "SERVER (%P): Caught exception:");
+      ex._tao_print_exception ("SERVER (%P): Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp
index 9db84a9a4f5..137bf0bd9bb 100644
--- a/TAO/tests/Bug_1635_Regression/client.cpp
+++ b/TAO/tests/Bug_1635_Regression/client.cpp
@@ -6,21 +6,17 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "SERVER (%P): Caught exception:");
+      ex._tao_print_exception ("SERVER (%P): Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1636_Regression/client.cpp b/TAO/tests/Bug_1636_Regression/client.cpp
index 51a28417346..d731b3571f5 100644
--- a/TAO/tests/Bug_1636_Regression/client.cpp
+++ b/TAO/tests/Bug_1636_Regression/client.cpp
@@ -7,25 +7,18 @@
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_NEW_ENV
+  try
   {
     CORBA::ORB_var orb =
       CORBA::ORB_init (argc, argv,
-                       "" /* the ORB name, it can be anything! */
-                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                       "" /* the ORB name, it can be anything! */);
 
     ACE_DEBUG ((LM_DEBUG,"Get reference to the DynAny Factory\n"));
     CORBA::Object_var obj =
-      orb->resolve_initial_references ("DynAnyFactory"
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->resolve_initial_references ("DynAnyFactory");
 
     DynamicAny::DynAnyFactory_var daf =
-      DynamicAny::DynAnyFactory::_narrow (obj.in()
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      DynamicAny::DynAnyFactory::_narrow (obj.in());
 
     UnionIecs::S_i_num s_num;
     s_num.type_num = UnionIecs::E_type_num_called_party_number;
@@ -39,16 +32,11 @@ int main (int argc, char* argv[])
     ACE_DEBUG ((LM_DEBUG,
                 "calling from_any () and to_any () with non-empty union...\n"));
     DynamicAny::DynAny_var dynany1 =
-      daf->create_dyn_any_from_type_code (UnionIecs::_tc_S_num
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      daf->create_dyn_any_from_type_code (UnionIecs::_tc_S_num);
 
-    dynany1->from_any(MyAny1
-                      ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    dynany1->from_any(MyAny1);
     CORBA::Any_var arg1 =
-      dynany1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      dynany1->to_any ();
 
     ACE_DEBUG ((LM_DEBUG, "...done\n"));
 
@@ -60,32 +48,23 @@ int main (int argc, char* argv[])
     ACE_DEBUG ((LM_DEBUG,
                 "calling from_any () and to_any () with empty union...\n" ));
     DynamicAny::DynAny_var dynany2 =
-      daf-> create_dyn_any_from_type_code (UnionIecs::_tc_S_num
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      daf-> create_dyn_any_from_type_code (UnionIecs::_tc_S_num);
 
-    dynany2->from_any (MyAny2
-                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    dynany2->from_any (MyAny2);
 
     CORBA::Any_var arg2 =
-      dynany2->to_any(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      dynany2->to_any();
 
     ACE_DEBUG ((LM_DEBUG,"...done.\nTest passed.\n"));
 
     // Finally destroy the ORB
-    orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb->destroy ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception - test failed:\n");
+      ex._tao_print_exception ("Exception - test failed:\n");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN(1);
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1670_Regression/client.cpp b/TAO/tests/Bug_1670_Regression/client.cpp
index bf5e3b6385c..59b8bdb5210 100644
--- a/TAO/tests/Bug_1670_Regression/client.cpp
+++ b/TAO/tests/Bug_1670_Regression/client.cpp
@@ -43,22 +43,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Baz::C_var cobject =
-        Baz::C::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Baz::C::_narrow (object.in ());
 
       if (CORBA::is_nil (cobject.in ()))
         {
@@ -69,25 +66,20 @@ main (int argc, char *argv[])
         }
 
       CORBA::Long result;
-      result = cobject->op1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = cobject->op1 ();
       ACE_ASSERT(result == 1);
 
-      result = cobject->op2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = cobject->op2 ();
       ACE_ASSERT(result == 2);
 
-      result = cobject->op3 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = cobject->op3 ();
       ACE_ASSERT(result == 3);
 
-      result = cobject->op4 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = cobject->op4 ();
       ACE_ASSERT(result == 4);
 
       Foo::Bar::B_var bobject =
-        Foo::Bar::B::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Foo::Bar::B::_narrow (object.in ());
 
       if (CORBA::is_nil (bobject.in ()))
         {
@@ -97,13 +89,11 @@ main (int argc, char *argv[])
                             1);
         }
 
-      result = bobject->op3 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = bobject->op3 ();
       ACE_ASSERT(result == 3);
 
       Foo::Bar::A_var aobject =
-        Foo::Bar::A::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Foo::Bar::A::_narrow (object.in ());
 
       if (CORBA::is_nil (aobject.in ()))
         {
@@ -113,21 +103,18 @@ main (int argc, char *argv[])
                             1);
         }
 
-      result = aobject->op1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = aobject->op1 ();
       ACE_ASSERT(result == 1);
 
-      result = aobject->op2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      result = aobject->op2 ();
       ACE_ASSERT(result == 2);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
+      ex._tao_print_exception ("");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp
index ca6e5d7aebb..fe192420c7f 100644
--- a/TAO/tests/Bug_1670_Regression/server.cpp
+++ b/TAO/tests/Bug_1670_Regression/server.cpp
@@ -28,20 +28,16 @@ public:
   Simple_C (CORBA::ORB_ptr orb);
 
   void op1 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void op2 (
-      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void op3 (
-      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void op4 (
-      Baz::AMH_CResponseHandler_ptr _tao_rh
-      ACE_ENV_ARG_DECL)
+      Baz::AMH_CResponseHandler_ptr _tao_rh)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -59,38 +55,34 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb)
 
 void
 Simple_C::op1(
-    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op1(1 ACE_ENV_ARG_PARAMETER);
+  _tao_rh->op1(1);
 }
 
 void
 Simple_C::op2(
-    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Foo::Bar::AMH_AResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op2(2 ACE_ENV_ARG_PARAMETER);
+  _tao_rh->op2(2);
 }
 
 void
 Simple_C::op3(
-    Foo::Bar::AMH_BResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Foo::Bar::AMH_BResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op3(3 ACE_ENV_ARG_PARAMETER);
+  _tao_rh->op3(3);
 }
 
 void
 Simple_C::op4(
-    Baz::AMH_CResponseHandler_ptr _tao_rh
-    ACE_ENV_ARG_DECL)
+    Baz::AMH_CResponseHandler_ptr _tao_rh)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  _tao_rh->op4(4 ACE_ENV_ARG_PARAMETER);
+  _tao_rh->op4(4);
 }
 
 // ****************************************************************
@@ -126,19 +118,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -146,8 +135,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -156,12 +144,10 @@ main (int argc, char *argv[])
           new Simple_C(orb.in()));
 
       Baz::C_var simple_c =
-        simple_c_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        simple_c_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (simple_c.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (simple_c.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -173,27 +159,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp
index b0afc671195..6e120fe9bbd 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1676_Regression/Hello.cpp
@@ -12,17 +12,16 @@ Hello::Hello (CORBA::ORB_ptr orb)
 
 #if 0
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 #endif
 
-::Test::StringList * 
+::Test::StringList *
 Hello::get_stringList (
-	// ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+	//
 	)
 	ACE_THROW_SPEC ((
 	::CORBA::SystemException
@@ -43,11 +42,10 @@ Hello::get_stringList (
 	return seq;
 }
 
-void 
+void
 Hello::get_stringList2 (
         ::CORBA::Boolean initialize,
         ::Test::StringList_out osl
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -59,7 +57,7 @@ Hello::get_stringList2 (
     if (initialize) {
         ACE_NEW (osl,
 		    Test::StringList(10));
-        
+
         osl->length(5);
         for (CORBA::ULong i = 0; i<osl->length(); i++)
 	    {
@@ -69,11 +67,10 @@ Hello::get_stringList2 (
 	    }
     }
 }
-    
-void 
+
+void
 Hello::mod_stringList (
         ::Test::StringList & iosl
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -89,10 +86,10 @@ Hello::mod_stringList (
         }
 	}
 }
-    
+
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_1676_Regression/Hello.h b/TAO/tests/Bug_1676_Regression/Hello.h
index d7bd79aab93..dc3314a876c 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.h
+++ b/TAO/tests/Bug_1676_Regression/Hello.h
@@ -18,7 +18,6 @@ public:
 
   // = The skeleton methods
 	virtual ::Test::StringList * get_stringList (
-		ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
 		)
 		ACE_THROW_SPEC ((
 		::CORBA::SystemException
@@ -27,21 +26,19 @@ public:
     virtual void get_stringList2 (
         ::CORBA::Boolean initialize,
         ::Test::StringList_out osl
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
+
     virtual void mod_stringList (
         ::Test::StringList & iosl
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
-    
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index 9687e3ec488..86cba9c8498 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -38,22 +38,19 @@ void get_stringList2(Test::Hello_var hello);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -66,8 +63,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - get_stringList\n"));
 
       Test::StringList_var seq =
-        hello->get_stringList (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_stringList ();
 
       for (CORBA::ULong i = 0; i<seq->length(); i++) {
         CORBA::String_var the_string = CORBA::string_dup ((*seq)[i]);
@@ -79,7 +75,6 @@ main (int argc, char *argv[])
 
       Test::StringList_var seq2;
       hello->get_stringList2(true, seq2.out());
-      ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0; i<seq2->length(); i++) {
         CORBA::String_var the_string = seq2.in()[i];
@@ -94,7 +89,6 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - mod_stringList\n"));
 
       hello->mod_stringList(seq.inout());
-      ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0; i<seq->length(); i++) {
         CORBA::String_var the_string = CORBA::string_dup ((*seq)[i]);
@@ -102,19 +96,15 @@ main (int argc, char *argv[])
                   the_string.in ()));
 	  }
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -123,11 +113,10 @@ void get_stringList2(Test::Hello_var hello)
 {
     Test::StringList_var seq2;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Shutdown the ORB and block until the shutdown is complete.
       hello->get_stringList2(false, seq2.out());
-      ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0; i<seq2->length(); i++) {
         CORBA::String_var the_string = seq2.in()[i];
@@ -135,16 +124,14 @@ void get_stringList2(Test::Hello_var hello)
                   the_string.in ()));
 	  }
     }
-  ACE_CATCH(CORBA::BAD_PARAM, ex)
+  catch (const CORBA::BAD_PARAM& )
     {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - catched expected exception BAD_PARAM\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "get_stringList2");
+      ex._tao_print_exception ("get_stringList2");
     }
-  ACE_ENDTRY;
 
 
     return;
diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp
index 177aad4d1d8..8c998950dd3 100644
--- a/TAO/tests/Bug_1676_Regression/server.cpp
+++ b/TAO/tests/Bug_1676_Regression/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp
index d95a5916742..8baf5225fc2 100644
--- a/TAO/tests/Bug_1693_Test/client.cpp
+++ b/TAO/tests/Bug_1693_Test/client.cpp
@@ -11,26 +11,19 @@ ACE_RCSID (Codec,
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "my_orb"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "my_orb");
 
       // Obtain a reference to the CodecFactory.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("CodecFactory"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("CodecFactory");
 
       IOP::CodecFactory_var codec_factory =
-        IOP::CodecFactory::_narrow (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IOP::CodecFactory::_narrow (obj.in ());
 
       // ----------------------------------------------------------
 
@@ -43,9 +36,7 @@ main (int argc, char *argv[])
 
       // Obtain the CDR encapsulation Codec.
       IOP::Codec_var codec =
-        codec_factory->create_codec (encoding
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        codec_factory->create_codec (encoding);
 
       // ----------------------------------------------------------
       {
@@ -59,15 +50,11 @@ main (int argc, char *argv[])
         tmp <<= l;
 
         encoded_data =
-          codec->encode_value (tmp
-                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          codec->encode_value (tmp);
 
         decoded_data =
           codec->decode_value (encoded_data.in (),
-                               Foo::_tc_type_ulong
-                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                               Foo::_tc_type_ulong);
 
         Foo::type_ulong check = 0;
 
@@ -88,13 +75,11 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Test passed \n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Bug_1693_Test test:");
+      ex._tao_print_exception ("Bug_1693_Test test:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
index 1bf4dbf8ace..327da7c9a13 100644
--- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
@@ -25,17 +25,13 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var poa_object =
-        this->corb_->resolve_initial_references("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->corb_->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -43,8 +39,7 @@ Client_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 ();
 
       Hello *hello_impl = 0;
       ACE_NEW_RETURN (hello_impl,
@@ -54,22 +49,18 @@ Client_Task::svc (void)
 
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
-      Test::Hello_var hello_servant = hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      Test::Hello_var hello_servant = hello_impl->_this ();
+      poa_manager->activate ();
 
       ACE_DEBUG((LM_DEBUG,"Client (%t) optimize_collocation_objects=%d use_global_collocation=%d\n",
                            corb_->orb_core()->optimize_collocation_objects(),
                            corb_->orb_core()->use_global_collocation ()));
 
       CORBA::Object_var tmp =
-        this->corb_->string_to_object (input_
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->corb_->string_to_object (input_);
 
       Test::EventNode_var evNode=
-        Test::EventNode::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::EventNode::_narrow(tmp.in ());
 
       if (CORBA::is_nil (evNode.in ()))
         {
@@ -81,19 +72,15 @@ Client_Task::svc (void)
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client starting\n"));
 
-      evNode->registerHello( hello_servant.in() ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      evNode->registerHello( hello_servant.in() );
 
-      evNode->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      evNode->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
diff --git a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
index a16745c918a..56dd69ca8ae 100644
--- a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
+++ b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
@@ -49,8 +49,7 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 
     // Keep a copy of the ORB options args
@@ -66,9 +65,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -91,9 +88,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc(),
                          catc.get_TCHAR_argv(),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                corb.in (),
@@ -110,18 +105,15 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       // Now that all threads have completed we can destroy the ORB
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
       if (server_orb != client_orb)
         {
-          corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          corb->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp
index 3ce3f1bf30e..ff95b9d3da6 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.cpp
+++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp
@@ -14,7 +14,7 @@ EventNode::EventNode (CORBA::ORB_ptr orb,
 {
 }
 
-void EventNode::registerHello ( ::Test::Hello_ptr h ACE_ENV_ARG_DECL )
+void EventNode::registerHello ( ::Test::Hello_ptr h )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -53,8 +53,8 @@ void EventNode::registerHello ( ::Test::Hello_ptr h ACE_ENV_ARG_DECL )
 }
 
 void
-EventNode::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+EventNode::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h
index e2209a632ac..328da040c9e 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.h
+++ b/TAO/tests/Bug_2084_Regression/EventNode.h
@@ -20,10 +20,10 @@ public:
              ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual void registerHello ( ::Test::Hello_ptr h ACE_ENV_ARG_DECL)
+  virtual void registerHello ( ::Test::Hello_ptr h)
     ACE_THROW_SPEC (( CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp
index e19ff455c09..ffc76400566 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2084_Regression/Hello.cpp
@@ -15,7 +15,7 @@ ACE_RCSID(Hello, Hello, "$Id$")
 }
 
 char *
-Hello::get_string (::CORBA::Long caller_threadid ACE_ENV_ARG_DECL)
+Hello::get_string (::CORBA::Long caller_threadid)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -57,12 +57,12 @@ Hello::get_string (::CORBA::Long caller_threadid ACE_ENV_ARG_DECL)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
   // to avoid BAD_INV_ORDER exceptions on fast dual processor machines.
   ACE_OS::sleep (1);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h
index 30e9552d68c..6ea9baac96d 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.h
+++ b/TAO/tests/Bug_2084_Regression/Hello.h
@@ -20,10 +20,10 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string ( ::CORBA::Long caller_threadid ACE_ENV_ARG_DECL )
+  virtual char * get_string ( ::CORBA::Long caller_threadid )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
index b5e9fb0ffce..7c7706dedfe 100644
--- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
@@ -27,17 +27,13 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -45,21 +41,18 @@ Server_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 ();
 
      EventNode *evnode_impl = new EventNode(this->sorb_.in(),ACE_Thread::self());
      PortableServer::ServantBase_var owner_transfer(evnode_impl);
-     Test::EventNode_var evNode = evnode_impl->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
+     Test::EventNode_var evNode = evnode_impl->_this();
 
      ACE_DEBUG((LM_DEBUG,"Server (%t) optimize_collocation_objects=%d use_global_collocation=%d\n",
                          sorb_->orb_core()->optimize_collocation_objects(),
                         sorb_->orb_core()->use_global_collocation ()));
 
      CORBA::String_var ior =
-       this->sorb_->object_to_string (evNode.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (evNode.in ());
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
@@ -73,30 +66,26 @@ Server_Task::svc (void)
      ACE_OS::fprintf (output_file, "%s", ior.in ());
      ACE_OS::fclose (output_file);
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      // Signal the main thread before we call orb->run ();
      this->me_.signal ();
 
-     this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->run ();
 
      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
    }
- ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+ catch (const CORBA::BAD_INV_ORDER& ex)
    {
      // Periodically we get a bad inv order on fast machines.
      // It's a false negative and is safe to ignore.
      ACE_UNUSED_ARG (ex);
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp
index e5979299664..77c9aba64aa 100644
--- a/TAO/tests/Bug_2134_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2134_Regression/Hello.cpp
@@ -24,50 +24,39 @@ int main(int argc, char* argv[])
   int status = 0;
   CORBA::ORB_var orb = CORBA::ORB::_nil();
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB
       orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // create Hello object
       Test::Hello_impl hello_i;
-      ACE_TRY_CHECK;
 
       Test::Hello_var hello = hello_i._this ();
-      ACE_TRY_CHECK;
 
       // give our object a friendly name
       CORBA::Object_var iorTableObj =
           orb->resolve_initial_references ("IORTable");
-      ACE_TRY_CHECK;
 
       IORTable::Table_var iorTable
           = IORTable::Table::_narrow (iorTableObj.in ());
-      ACE_TRY_CHECK;
 
       CORBA::String_var ior_string = orb->object_to_string (hello.in ());
-      ACE_TRY_CHECK;
 
       iorTable->bind("hello", ior_string.in ());
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Created binding of name 'hello' in IOR table for IOR:\n%s\n", ior_string.in ()));
 
       // Get the root POA
       CORBA::Object_var obj_root = orb->resolve_initial_references ("RootPOA");
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var rootPOA = PortableServer::POA::_narrow (obj_root.in ());
-      ACE_TRY_CHECK;
 
       // Activate the POA manager
       PortableServer::POAManager_var poaManager = rootPOA->the_POAManager ();
-      ACE_TRY_CHECK;
 
       poaManager->activate ();
-      ACE_TRY_CHECK;
 
       // try and access the object with its friendly name
       ACE_CString full_corbaloc (ior_string.in (), 0, 1);
@@ -83,7 +72,6 @@ int main(int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "Trying to access object with object ref:\n%s\n", friendly_corbaloc.c_str ()));
 
       CORBA::Object_var obj = orb->string_to_object (friendly_corbaloc.c_str ());
-      ACE_TRY_CHECK;
 
       TimeBase::TimeT timeout = 10000000;
 
@@ -104,7 +92,6 @@ int main(int argc, char* argv[])
       policy_list[0]->destroy();
 
       Test::Hello_var hello2 = Test::Hello::_narrow (rtt_obj.in ());
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (hello2.in ()))
         {
@@ -116,21 +103,17 @@ int main(int argc, char* argv[])
       else
         {
           hello2->say_hello ();
-          ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Test succeeded !!!\n"));
         }
 
       orb->destroy();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Error - test failed - exception caught:");
+      ex._tao_print_exception ("Error - test failed - exception caught:");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp
index dc0b7923d30..f3325503619 100644
--- a/TAO/tests/Bug_2174_Regression/client.cpp
+++ b/TAO/tests/Bug_2174_Regression/client.cpp
@@ -44,22 +44,19 @@ int result = 1;
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -70,7 +67,6 @@ int main (int argc, char* argv[])
         }
 
       CORBA::Boolean non_existent = server->_non_existent ();
-      ACE_TRY_CHECK;
 
       if (non_existent)
           result = 3;
@@ -81,23 +77,21 @@ int main (int argc, char* argv[])
                   "client (%P) _non_existent() returned %d\n",
                   static_cast<int>(non_existent) ));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  catch (const CORBA::OBJECT_NOT_EXIST& ex)
   {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ERROR: Exception caught:");
+      ex._tao_print_exception ("ERROR: Exception caught:");
       result = 4;
   }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT&)
   {
       result = 5;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ERROR: Exception caught:");
+      ex._tao_print_exception ("ERROR: Exception caught:");
       result = 6;
     }
-  ACE_ENDTRY;
   return result;
 }
diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp
index bc39027c4ac..03628e958c6 100644
--- a/TAO/tests/Bug_2174_Regression/server.cpp
+++ b/TAO/tests/Bug_2174_Regression/server.cpp
@@ -43,18 +43,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -62,22 +60,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       if (remove_object)
       {
@@ -87,7 +81,6 @@ main (int argc, char *argv[])
                       "server (%P) deactivated object immediately\n"
                     ));
       }
-      ACE_TRY_CHECK;
 
 
       // ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -105,18 +98,14 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp
index 9f1bd8537bc..8efe0fe94f0 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2174_Regression/test_i.cpp
@@ -14,8 +14,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 
 CORBA::Long
 Simple_Server_i::echo (CORBA::Long x,
-                       CORBA::Long msecs
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       CORBA::Long msecs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000);
@@ -28,10 +27,10 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2174_Regression/test_i.h b/TAO/tests/Bug_2174_Regression/test_i.h
index 00018fa25d8..8a135bdd767 100644
--- a/TAO/tests/Bug_2174_Regression/test_i.h
+++ b/TAO/tests/Bug_2174_Regression/test_i.h
@@ -32,10 +32,9 @@ public:
 
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
-                    CORBA::Long msecs
-                    ACE_ENV_ARG_DECL_NOT_USED)
+                    CORBA::Long msecs)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp
index 65df3934e3a..d9a502753b9 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2183_Regression/Hello.cpp
@@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h
index 7e1c3042968..78833d61a97 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.h
+++ b/TAO/tests/Bug_2183_Regression/Hello.h
@@ -22,10 +22,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp
index 913d3153ae9..5f794550945 100644
--- a/TAO/tests/Bug_2183_Regression/client.cpp
+++ b/TAO/tests/Bug_2183_Regression/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -62,25 +59,20 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      //hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      //ACE_TRY_CHECK;
+      //hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp
index 4853611a134..72abe515c04 100644
--- a/TAO/tests/Bug_2183_Regression/server.cpp
+++ b/TAO/tests/Bug_2183_Regression/server.cpp
@@ -40,19 +40,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,8 +57,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,12 +69,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -90,27 +84,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp
index c45f7947354..78f86cba94b 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2186_Regression/Hello.cpp
@@ -11,7 +11,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Received call back !!!\n"));
@@ -19,27 +19,26 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Hello::request_callback (Test::Hello_ptr call_me ACE_ENV_ARG_DECL)
+Hello::request_callback (Test::Hello_ptr call_me)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Making call back !!!\n"));
-  ACE_TRY
+  try
     {
       CORBA::String_var result = call_me->get_string ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception attempting to callback client obj ref: \n");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "Exception attempting to callback client obj ref: \n");
+      throw;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Call back succeeded !!!\n"));
 }
diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h
index cf49f8dc3de..177070074eb 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.h
+++ b/TAO/tests/Bug_2186_Regression/Hello.h
@@ -17,13 +17,13 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-        
-  virtual void request_callback (Test::Hello_ptr call_me ACE_ENV_ARG_DECL)
+
+  virtual void request_callback (Test::Hello_ptr call_me)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp
index ca65ab90e14..2b227d1e91d 100644
--- a/TAO/tests/Bug_2186_Regression/client.cpp
+++ b/TAO/tests/Bug_2186_Regression/client.cpp
@@ -40,22 +40,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,8 +60,7 @@ 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 ();
 
       Hello *hello_impl;
       ACE_NEW_RETURN (hello_impl,
@@ -73,12 +69,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -90,16 +84,13 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(server_ior);
 
       Test::Hello_var server =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -111,22 +102,18 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Sending client obj ref to the server and requesting a callback.\n"));
 
-      server->request_callback (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->request_callback (hello.in ());
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Test (client) Succeeded !!!\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_ERROR, "(%P|%t) - Test (client) Failed !!!\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp
index 5c7e9180f09..37675e91a42 100644
--- a/TAO/tests/Bug_2186_Regression/server.cpp
+++ b/TAO/tests/Bug_2186_Regression/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp
index 093af6fc026..694317d73bd 100644
--- a/TAO/tests/Bug_2188_Regression/client.cpp
+++ b/TAO/tests/Bug_2188_Regression/client.cpp
@@ -39,19 +39,17 @@ main (int argc, char *argv[])
   ServerAdmin_var saobj;
   CORBA::ORB_var orb;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb = CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
-      saobj = ServerAdmin::_narrow (tmp.in() ACE_ENV_ARG_PARAMETER);
+      saobj = ServerAdmin::_narrow (tmp.in());
 
       if (CORBA::is_nil (saobj.in ()))
         {
@@ -61,28 +59,23 @@ main (int argc, char *argv[])
                             1);
         }
 
-      ArrayTest_var atobj = saobj->target(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ArrayTest_var atobj = saobj->target();
 
       CharArray_slice * char_array = CharArray_alloc();
       for (int i = 0; i < 10; i++)
         char_array[i] = (char)('a' + i);
-      atobj->a_charArray (char_array ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      atobj->a_charArray (char_array);
 
       ACE_DEBUG ((LM_DEBUG, "a_charArray worked OK.\n"));
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
 
   saobj->shutdown();
 
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  orb->destroy ();
   return 0;
 }
diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp
index 01ef2b0eece..542278071fe 100644
--- a/TAO/tests/Bug_2188_Regression/server.cpp
+++ b/TAO/tests/Bug_2188_Regression/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -71,8 +67,7 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(target_servant);
 
       ArrayTest_var atobj =
-        target_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        target_servant->_this ();
 
       ServerAdmin_i *servant;
       ACE_NEW_RETURN (servant, ServerAdmin_i(atobj.in()),1);
@@ -81,12 +76,10 @@ main (int argc, char *argv[])
       owner_transfer = servant;
 
       ServerAdmin_var saobj =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (saobj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (saobj.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -98,27 +91,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp
index 52180b29d5a..9dbff915efb 100644
--- a/TAO/tests/Bug_2234_Regression/client.cpp
+++ b/TAO/tests/Bug_2234_Regression/client.cpp
@@ -12,21 +12,17 @@ main(
   int    argc,
   char** argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   CORBA::Boolean testFailed= 0;
   ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 (Interceptor arg list with var len out params)\n"));
-  ACE_TRY
+  try
   {
     CORBA::ORB_var
-       orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+       orb= CORBA::ORB_init( argc, argv, 0 );
     CORBA::Object_var
-       object= orb->string_to_object( "file://server.ior" ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+       object= orb->string_to_object( "file://server.ior" );
     Test::Foo_var
-       foo= Test::Foo::_narrow( object.in() ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+       foo= Test::Foo::_narrow( object.in() );
 
     //-----------------------------------------------------------------------
     CORBA::Long
@@ -35,8 +31,7 @@ main(
        cL= 3,
        rL= 0;
     ACE_DEBUG( (LM_INFO, ". Long()            ") );
-    rL= foo->TestLong( aL, bL, cL ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    rL= foo->TestLong( aL, bL, cL);
     ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aL, bL, cL, rL) );
     if (static_cast<CORBA::Long>(1) != aL) {
        ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
@@ -56,8 +51,7 @@ main(
        cS= CORBA::string_dup("3"),
        rS;
     ACE_DEBUG( (LM_INFO, ". String()          ") );
-    rS= foo->TestString( aS.in(), bS.out(), cS.inout() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    rS= foo->TestString( aS.in(), bS.out(), cS.inout());
     ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s:  ", aS.in(), bS.in(), cS.in(), rS.in()) );
     if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(aS.in(), "1"))) {
        ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
@@ -79,8 +73,7 @@ main(
     aFS->val= 1;
     cFS->val= 3;
     ACE_DEBUG( (LM_INFO, ". MyNonVarStruct()  ") );
-    rFS= foo->TestNonVarStruct( aFS.in(), bFS.out(), cFS.inout() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    rFS= foo->TestNonVarStruct( aFS.in(), bFS.out(), cFS.inout());
     ACE_DEBUG( (LM_INFO, "a is %d, b is %d, c is %d, r is %d:  ", aFS.in().val, bFS.in().val, cFS.in().val, rFS.in().val) );
     if (static_cast<CORBA::Long>(1) != aFS->val) {
        ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
@@ -102,8 +95,7 @@ main(
     aVS->val= CORBA::string_dup("1");
     cVS->val= CORBA::string_dup("3");
     ACE_DEBUG( (LM_INFO, ". MyVarStruct()     ") );
-    rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout());
     ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s:  ", aVS->val.in(), bVS->val.in(), cVS->val.in(), rVS->val.in()) );
     if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val, "1"))) {
        ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
@@ -125,8 +117,7 @@ main(
     aFU->valLong( static_cast<CORBA::Long>(1) );
     cFU->valLong( static_cast<CORBA::Long>(3) );
     ACE_DEBUG( (LM_INFO, ". MyNonVarUnion()   ") );
-    rFU= foo->TestNonVarUnion( aFU.in(), bFU.out(), cFU.inout() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    rFU= foo->TestNonVarUnion( aFU.in(), bFU.out(), cFU.inout());
     ACE_DEBUG( (LM_INFO, "a is ") );
     if (static_cast<CORBA::Short>(1) != aFU->_d())
        ACE_DEBUG( (LM_INFO, "?") );
@@ -168,8 +159,7 @@ main(
     aVU->valLong( static_cast<CORBA::Long>(1) );
     cVU->valLong( static_cast<CORBA::Long>(3) );
     ACE_DEBUG( (LM_INFO, ". MyVarUnion()      ") );
-    rVU= foo->TestVarUnion( aVU.in(), bVU.out(), cVU.inout() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    rVU= foo->TestVarUnion( aVU.in(), bVU.out(), cVU.inout());
     ACE_DEBUG( (LM_INFO, "a is ") );
     if (static_cast<CORBA::Short>(1) != aVU->_d())
        ACE_DEBUG( (LM_INFO, "?") );
@@ -213,8 +203,7 @@ main(
     cSL->length(1);
     cSL[0]= static_cast<CORBA::Long>(3);
     ACE_DEBUG( (LM_INFO, ". MySeqOfLong()     ") );
-    rSL= foo->TestSeqOfLong( aSL.in(), bSL.out(), cSL.inout() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    rSL= foo->TestSeqOfLong( aSL.in(), bSL.out(), cSL.inout());
     ACE_DEBUG( (LM_INFO, "a is ") );
     if (1u != aSL->length())
        ACE_DEBUG( (LM_INFO, "?") );
@@ -256,8 +245,7 @@ main(
     aA<<= static_cast<CORBA::Long>(1);
     cA<<= static_cast<CORBA::Long>(3);
     ACE_DEBUG( (LM_INFO, ". Any()             ") );
-    rA= foo->TestAny( aA.in(), bA.out(), cA.inout() ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    rA= foo->TestAny( aA.in(), bA.out(), cA.inout());
     CORBA::Boolean
        aB,
        bB,
@@ -296,31 +284,27 @@ main(
        ACE_DEBUG( (LM_INFO, "OK\n") );
 
     //-----------------------------------------------------------------------
-    foo->ShutdownServer( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    foo->ShutdownServer( );
 
     //-----------------------------------------------------------------------
-    orb->shutdown( true ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
-    orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    orb->shutdown( true );
+    orb->destroy( );
   }
-  ACE_CATCH( CORBA::SystemException, ex )
+  catch (const CORBA::SystemException& ex)
   {
-    ACE_PRINT_EXCEPTION( ex, "CORBA::SystemException: " );
+    ex._tao_print_exception ("CORBA::SystemException: ");
     testFailed= 1;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION, "CORBA::Exception: " );
+    ex._tao_print_exception ("CORBA::Exception: ");
     testFailed= 1;
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_DEBUG( (LM_ERROR, "Unexpected general exception!\n") );
     testFailed= 1;
   }
-  ACE_ENDTRY;
 
   ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 ") );
   if (testFailed)
diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index c4bebf10c1b..fd550b9b327 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -41,7 +41,7 @@ public:
     CORBA::Long a,
     CORBA::Long_out b,
     CORBA::Long &c
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException ) )
   {
     ACE_DEBUG( (LM_INFO, ". in TestLong\n") );
@@ -68,7 +68,7 @@ public:
     const char *a,
     CORBA::String_out b,
     char *&c
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, ". in TestString\n") );
@@ -115,7 +115,7 @@ public:
     const Test::MyNonVarStruct &a,
     Test::MyNonVarStruct_out b,
     Test::MyNonVarStruct &c
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     Test::MyNonVarStruct
@@ -153,7 +153,7 @@ public:
     const Test::MyVarStruct &a,
     Test::MyVarStruct_out b,
     Test::MyVarStruct &c
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC(( CORBA::SystemException ))
   {
     ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n") );
@@ -217,7 +217,7 @@ public:
     const Test::MyNonVarUnion &a,
     Test::MyNonVarUnion_out b,
     Test::MyNonVarUnion &c
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     Test::MyNonVarUnion
@@ -265,7 +265,7 @@ public:
     const Test::MyVarUnion &a,
     Test::MyVarUnion_out b,
     Test::MyVarUnion &c
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC (( CORBA::SystemException ))
   {
     ACE_DEBUG( (LM_INFO, ". in TestVarUnion\n") );
@@ -315,7 +315,7 @@ public:
     const Test::MySeqOfLong &a,
     Test::MySeqOfLong_out b,
     Test::MySeqOfLong &c
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, ". in TestSeqOfLong\n") );
@@ -366,7 +366,7 @@ public:
     const CORBA::Any &a,
     CORBA::Any_out b,
     CORBA::Any &c
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, ". in TestAny\n") );
@@ -420,12 +420,11 @@ public:
   //-----------------------------------------------------------
 
   void ShutdownServer(
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, ". in ShutdownServer\n") );
-    orb->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    orb->shutdown(0);
   }
 };
 
@@ -435,20 +434,20 @@ public:
 class AnInterceptor : public PortableInterceptor::ServerRequestInterceptor
 {
 public:
-  char *name( ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+  char *name( )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     return const_cast<char *>("");
   }
 
-  void destroy( ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+  void destroy( )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
   }
 
   void receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException,
                      PortableInterceptor::ForwardRequest) )
   {
@@ -598,14 +597,13 @@ public:
 
   void receive_request(
     PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException,
                      PortableInterceptor::ForwardRequest) )
   {
     ACE_DEBUG( (LM_INFO, "AnInterceptor::receive_request\n") );
     Dynamic::ParameterList
-      *pArgs= ri->arguments( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_CHECK;
+      *pArgs= ri->arguments( );
     display_arg_list( pArgs );
   }
 
@@ -616,25 +614,23 @@ public:
   // be premiturely deleted before being sent back to the client.
   void send_reply(
     PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
     ACE_DEBUG( (LM_INFO, "AnInterceptor::send_reply\n") );
     Dynamic::ParameterList
-      *pArgs= ri->arguments( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_CHECK;
+      *pArgs= ri->arguments( );
     display_arg_list( pArgs );
     ACE_DEBUG( (LM_INFO, "  result is an ") );
     CORBA::Any
-      *pAny= ri->result( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_CHECK;
+      *pAny= ri->result( );
     display_any( CORBA::Any_var( pAny ).in() );
     ACE_DEBUG( (LM_INFO, "\n") );
   }
 
   void send_exception(
     PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED  )
+  )
     ACE_THROW_SPEC( (CORBA::SystemException,
                      PortableInterceptor::ForwardRequest) )
   {
@@ -642,7 +638,7 @@ public:
 
   void send_other(
     PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException,
                      PortableInterceptor::ForwardRequest) )
   {
@@ -659,14 +655,14 @@ public:
 
   void pre_init(
     PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED )
+ )
     ACE_THROW_SPEC( (CORBA::SystemException) )
   {
   }
 
   void post_init(
      PortableInterceptor::ORBInitInfo_ptr info
-     ACE_ENV_ARG_DECL_NOT_USED )
+ )
      ACE_THROW_SPEC( (CORBA::SystemException) )
    {
      info->add_server_request_interceptor( interceptor_ );
@@ -678,7 +674,7 @@ private:
 
 int main( int argc, char *argv[] )
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     ACE_DEBUG( (LM_INFO, "Server start\n") );
     AnInterceptor
@@ -690,58 +686,47 @@ int main( int argc, char *argv[] )
       initialiser= initialiser_p;
     PortableInterceptor::register_orb_initializer( initialiser.in() );
 
-    orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    orb= CORBA::ORB_init( argc, argv, 0 );
     CORBA::Object_var
-      Object = orb->resolve_initial_references( "RootPOA" ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+      Object = orb->resolve_initial_references( "RootPOA" );
     PortableServer::POA_var rootPOA=
-      PortableServer::POA::_narrow( Object.in() ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+      PortableServer::POA::_narrow( Object.in() );
     PortableServer::POAManager_var
-      rootPOAMgr = rootPOA->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+      rootPOAMgr = rootPOA->the_POAManager( );
 
     FooImpl
       phooey;
     PortableServer::ObjectId_var
-      phooeyId= rootPOA->activate_object( &phooey ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+      phooeyId= rootPOA->activate_object( &phooey );
     CORBA::Object_var
-      phooeyObj= rootPOA->id_to_reference( phooeyId.in() ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+      phooeyObj= rootPOA->id_to_reference( phooeyId.in() );
     CORBA::String_var
-      stringifiedObj= orb->object_to_string( phooeyObj.in() ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+      stringifiedObj= orb->object_to_string( phooeyObj.in() );
     ofstream file( "server.ior" );
     file << stringifiedObj;
     file.close();
 
-    rootPOAMgr->activate( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    rootPOAMgr->activate( );
 
-    orb->run( 0 ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    orb->run( 0 );
 
-    orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
+    orb->destroy( );
   }
-  ACE_CATCH( CORBA::SystemException, exception )
+  catch (const CORBA::SystemException& exception)
   {
-    ACE_PRINT_EXCEPTION( exception, "CORBA::SystemException: " );
+    exception._tao_print_exception ("CORBA::SystemException: ");
     return -1;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION, "CORBA::Exception: " );
+    ex._tao_print_exception ("CORBA::Exception: ");
     return -1;
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_DEBUG( (LM_ERROR, "Unexpected general exception.\n") );
     return -1;
   }
-  ACE_ENDTRY;
 
   ACE_DEBUG( (LM_INFO, "Server stopped\n") );
   return 0;
diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
index da5c2832189..2ceb5662238 100644
--- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
+++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
@@ -4,7 +4,7 @@
 
 #include "MyInterfaceImpl.h"
 
-const char* 
+const char*
 MyInterfaceImpl::my_string = "a string";
 
 MyInterfaceImpl::MyInterfaceImpl (CORBA::ORB_ptr orb)
@@ -12,7 +12,7 @@ MyInterfaceImpl::MyInterfaceImpl (CORBA::ORB_ptr orb)
 {
 }
 CORBA::Boolean
-MyInterfaceImpl::myMethod (const char* mystring ACE_ENV_ARG_DECL)
+MyInterfaceImpl::myMethod (const char* mystring)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return mystring == my_string;
diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
index a7f76261396..4f460c9d3f3 100644
--- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
+++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
@@ -9,11 +9,11 @@ class MyInterfaceImpl
 {
   public:
   MyInterfaceImpl (CORBA::ORB_ptr orb);
-  
+
   static const char* my_string;
 
   // = The skeleton methods
-  virtual CORBA::Boolean myMethod (const char* stringParam ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean myMethod (const char* stringParam)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp
index cb82452c574..1f81988cb77 100644
--- a/TAO/tests/Bug_2289_Regression/client.cpp
+++ b/TAO/tests/Bug_2289_Regression/client.cpp
@@ -42,22 +42,19 @@ int
 main (int argc, char *argv[])
 {
   int result = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,8 +62,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -79,12 +75,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       MyInterface_var test_ref =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test_ref.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test_ref.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -94,16 +88,13 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK
+      poa_manager->activate ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(server_ior);
 
       MyInterface_var server =
-        MyInterface::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        MyInterface::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -112,11 +103,10 @@ main (int argc, char *argv[])
                              ior.in()),
                             1);
         }
-      
 
-      CORBA::Boolean temp = server->myMethod (MyInterfaceImpl::my_string ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+
+      CORBA::Boolean temp = server->myMethod (MyInterfaceImpl::my_string);
+
       if (temp)
         {
           ACE_DEBUG ((LM_DEBUG, "Test succeeded\n"));
@@ -125,21 +115,17 @@ main (int argc, char *argv[])
         {
 	  ACE_DEBUG ((LM_ERROR, "Test failed\n"));
 	  result = 1;
-	}	
+	}
 
-      //hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      //ACE_TRY_CHECK;
+      //hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return result;
 }
diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp
index 47f749d99bd..c79e9ed5cc3 100644
--- a/TAO/tests/Bug_2289_Regression/server.cpp
+++ b/TAO/tests/Bug_2289_Regression/server.cpp
@@ -48,19 +48,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -68,8 +65,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -82,12 +78,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       MyInterface_var test_ref =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test_ref.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test_ref.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -97,17 +91,13 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -115,28 +105,22 @@ main (int argc, char *argv[])
         }
       else
         {
-          adapter->bind ("collocated_ior_bound_in_remote_iortable", client_ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          adapter->bind ("collocated_ior_bound_in_remote_iortable", client_ior);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index 8bf1e026102..935fd16ade1 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -32,8 +32,7 @@ class ST_AMH_Servant
       	ST_AMH_Servant (CORBA::ORB_ptr orb);
 
      	void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                        Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL)
+                        Test::Timestamp send_time)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
     protected:
@@ -124,8 +123,7 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb)
 //
 void
 ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             Test::Timestamp send_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   	printf("Recieved Timestamp # %d \n", calls_received);
@@ -157,16 +155,14 @@ ST_AMH_Server::ST_AMH_Server (int* argc, char **argv)
 //
 ST_AMH_Server::~ST_AMH_Server ()
 {
-  	ACE_TRY_NEW_ENV
+  	try
     	{
-      	this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      	ACE_TRY_CHECK;
+      	this->root_poa_->destroy (1, 1);
     	}
-  	ACE_CATCHANY
+  	catch (const CORBA::Exception& ex)
     	{
-      	ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      	ex._tao_print_exception ("Exception caught:");
     	}
-  	ACE_ENDTRY;
 
 }
 
@@ -174,37 +170,30 @@ ST_AMH_Server::~ST_AMH_Server ()
 //
 int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       this->orb_ = CORBA::ORB::_duplicate(_orb.in ());
-      ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->root_poa_->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -213,45 +202,38 @@ int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb)
 //
 void ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      Test::Roundtrip_var roundtrip = servant->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test::Roundtrip_var roundtrip = servant->_this();
 
       CORBA::String_var iorstr = this->orb_->object_to_string(roundtrip.in ());
-      ACE_TRY_CHECK;
 
       (void) this->write_ior_to_file(iorstr);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
 }
 
 // ------------------------------------------------------------------------
 //
 void ST_AMH_Server::run_event_loop ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Time_Value period (1, 0);
       while (1)
             {
           this->orb_->perform_work (&period);
-          ACE_TRY_CHECK;
 
           // when all calls from client have been recieved, exit
           if (calls_received == num_calls )
             return;
         }
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {}
-  ACE_ENDTRY;
 }
 
 // ------------------------------------------------------------------------
@@ -299,7 +281,6 @@ Test::Timestamp time = 10;
         {
         roundtrip->test_method(time);
         ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i));
-        ACE_TRY_CHECK;
         }
 
 	return 0;
@@ -316,7 +297,6 @@ int main (int argc, char *argv[])
 ST_AMH_Server amh_server (&argc, argv);
 CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
-      ACE_TRY_CHECK;
 
   	amh_server.start_orb_and_poa(orb);
 
@@ -325,10 +305,8 @@ ST_AMH_Servant servant(orb.in());
   	amh_server.register_servant(&servant);
 
     CORBA::Object_var object =  orb->string_to_object(ior);
-    ACE_TRY_CHECK;
 
     Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow(object.in ());
-    ACE_TRY_CHECK;
 
     if (CORBA::is_nil(roundtrip.in()))
       	{
@@ -359,7 +337,6 @@ ST_AMH_Servant servant(orb.in());
     printf("End server\n");
 
    	orb->destroy();
-   	ACE_TRY_CHECK;
 
     return 0;
 }
diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp
index ac4c1c6fe85..ee5dcf4c2a3 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2328_Regression/Hello.cpp
@@ -19,8 +19,8 @@ Hello::get_string (const char * A, const char * B, const char * C)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h
index 4ef97cd1b6c..f93bc8ae434 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.h
+++ b/TAO/tests/Bug_2328_Regression/Hello.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (const char * A, const char * B, const char * C ACE_ENV_ARG_DECL)
+  virtual char * get_string (const char * A, const char * B, const char * C)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2328_Regression/client.cpp b/TAO/tests/Bug_2328_Regression/client.cpp
index d39919e7d85..23ee6799cbd 100644
--- a/TAO/tests/Bug_2328_Regression/client.cpp
+++ b/TAO/tests/Bug_2328_Regression/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -65,25 +62,20 @@ main (int argc, char *argv[])
       CORBA::String_var B = CORBA::string_dup ("kwc");
       CORBA::String_var C = CORBA::string_dup ("MV-files");
       CORBA::String_var the_string =
-        hello->get_string (A.in (), B.in (), C.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string (A.in (), B.in (), C.in ());
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp
index 69fe7692d76..24e55dfc3b7 100644
--- a/TAO/tests/Bug_2328_Regression/server.cpp
+++ b/TAO/tests/Bug_2328_Regression/server.cpp
@@ -40,19 +40,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,8 +57,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,12 +69,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -90,27 +84,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp
index 9e3b0abce15..c4fd6e66f28 100644
--- a/TAO/tests/Bug_2349_Regression/server.cpp
+++ b/TAO/tests/Bug_2349_Regression/server.cpp
@@ -35,20 +35,18 @@ foo_i::destroy ()
 {
   bool expected_exception_raised = false;
 
-  ACE_TRY
+  try
     {
       // This should case an BAD_INV_ORDER exception
       this->orb_->destroy ();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+  catch (const CORBA::BAD_INV_ORDER& ex)
     {
       if ((ex.minor() & 0xFFFU) == 3)
         {
           expected_exception_raised = true;
         }
     }
-  ACE_ENDTRY;
 
   if (!expected_exception_raised)
     ACE_ERROR ((LM_ERROR, "ERROR: Caught incorrect exception\n"));
diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp
index df96fb1565d..dbd4bb9cb20 100644
--- a/TAO/tests/Bug_2417_Regression/client.cpp
+++ b/TAO/tests/Bug_2417_Regression/client.cpp
@@ -17,7 +17,7 @@ private:
 int
 main (int argc, char *argv[])
 {
-	ACE_TRY_NEW_ENV
+	try
     {
 		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 		CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA");
@@ -47,12 +47,11 @@ main (int argc, char *argv[])
 
 		ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 	}
-	ACE_CATCHANY
+	catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-	ACE_ENDTRY;
 
 	return 0;
 }
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
index 7c1084b7be0..9bdb1e53f3c 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
@@ -135,7 +135,6 @@ Publisher_impl::~Publisher_impl()
 
 void subscribe (
                 ::Subscriber_ptr subscriber
-                ACE_ENV_ARG_DECL_WITH_DEFAULTS
                 )
   ACE_THROW_SPEC ((
                    ::CORBA::SystemException
@@ -144,7 +143,6 @@ void subscribe (
 void
 Publisher_impl::subscribe(
                           ::Subscriber_ptr subscriber
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS
                           )
   ACE_THROW_SPEC ((
                    ::CORBA::SystemException
@@ -155,7 +153,6 @@ Publisher_impl::subscribe(
 
 void
 Publisher_impl::shutdown (
-                          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
                           )
   ACE_THROW_SPEC ((
                    ::CORBA::SystemException
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.h b/TAO/tests/Bug_2417_Regression/publisher_impl.h
index 43a62ae54ac..a33a436ded5 100644
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.h
+++ b/TAO/tests/Bug_2417_Regression/publisher_impl.h
@@ -14,14 +14,12 @@ class Publisher_impl : public POA_Publisher
 
     virtual void subscribe (
       ::Subscriber_ptr subscriber
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       ::CORBA::SystemException
     ));
 
   virtual void shutdown (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       ::CORBA::SystemException
diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
index 8a8ba4c1a2c..668321e182a 100644
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ b/TAO/tests/Bug_2417_Regression/server.cpp
@@ -18,7 +18,7 @@ private:
 int
 main (int argc, char *argv[])
 {
-	ACE_TRY_NEW_ENV
+	try
     {
 		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 		CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA");
@@ -63,12 +63,11 @@ main (int argc, char *argv[])
 
 		ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 	}
-	ACE_CATCHANY
+	catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-	ACE_ENDTRY;
 
 	return 0;
 }
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
index 61f25e23349..e6e6c49453a 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
@@ -16,7 +16,6 @@ Subscriber_impl::~Subscriber_impl()
 void
 Subscriber_impl::onData (
       ::CORBA::Double
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       ::CORBA::SystemException
@@ -29,7 +28,6 @@ Subscriber_impl::onData (
 
 ::CORBA::Boolean
 Subscriber_impl::isAlive (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       ::CORBA::SystemException
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.h b/TAO/tests/Bug_2417_Regression/subscriber_impl.h
index 4b37f8f7529..99e9d1b7c71 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.h
+++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.h
@@ -13,13 +13,11 @@ class Subscriber_impl : public POA_Subscriber
 
     virtual void onData (
         ::CORBA::Double value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
     virtual ::CORBA::Boolean isAlive (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.cpp b/TAO/tests/Bug_2429_Regression/ChildServant.cpp
index f6617bc55d9..5f7ad67d59d 100644
--- a/TAO/tests/Bug_2429_Regression/ChildServant.cpp
+++ b/TAO/tests/Bug_2429_Regression/ChildServant.cpp
@@ -19,12 +19,12 @@ ChildServant::parentMethod ()
 ACE_THROW_SPEC((CORBA::SystemException))
 {
    // Just throw an exception
-   ACE_THROW (CORBA::INTERNAL ());
+   throw CORBA::INTERNAL ();
 }
 
 void
 ChildServant::shutdown ()
 ACE_THROW_SPEC((CORBA::SystemException))
 {
-   this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
+   this->orb_->shutdown(0);
 }
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
index ded3a38e9d6..90a229f1e45 100644
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ b/TAO/tests/Bug_2429_Regression/client.cpp
@@ -15,30 +15,28 @@ class Reply_Handler
     }
 
    virtual void
-   childMethod (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+   childMethod (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
 
    virtual void
    childMethod_excep (Messaging::ExceptionHolder *
-                         excep_holder ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                         excep_holder)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      ACE_TRY
+      try
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          excep_holder->raise_exception ();
         }
-      ACE_CATCH (CORBA::SystemException, ex)
+      catch (const CORBA::SystemException& ex)
         {
-          ACE_PRINT_EXCEPTION (ex, "Reply_Handler::childMethod_excep: ");
+          ex._tao_print_exception ("Reply_Handler::childMethod_excep: ");
         }
-      ACE_ENDTRY;
     }
 
    virtual void
-   parentMethod (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+   parentMethod (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -48,25 +46,22 @@ class Reply_Handler
     }
 
    virtual void
-   parentMethod_excep (Messaging::ExceptionHolder * excep_holder
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+   parentMethod_excep (Messaging::ExceptionHolder * excep_holder)
    ACE_THROW_SPEC ((CORBA::SystemException))
    {
-      ACE_TRY
+      try
         {
           ++parentMethod_excep_count;
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          excep_holder->raise_exception ();
         }
-      ACE_CATCH (CORBA::INTERNAL, iex)
+      catch (const CORBA::INTERNAL&)
         {
           ACE_DEBUG ((LM_DEBUG, "Successfully received an Internal Excep*ion as expected.\n"));
         }
-      ACE_CATCH (CORBA::SystemException, ex)
+      catch (const CORBA::SystemException& ex)
         {
-          ACE_PRINT_EXCEPTION (ex, "Reply_Handler::childMethod_excep: ");
+          ex._tao_print_exception ("Reply_Handler::childMethod_excep: ");
         }
-      ACE_ENDTRY;
    }
 
    CORBA::ULong reply_count (void) { return parentMethod_count + parentMethod_excep_count; };
@@ -110,15 +105,13 @@ client_parse_args(int argc, char *argv[])
 int
 main(int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   CORBA::ORB_var orb;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
-      orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb = CORBA::ORB_init(argc, argv, 0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = client_parse_args(argc, argv);
@@ -128,37 +121,29 @@ main(int argc, char *argv[])
         }
 
       CORBA::Object_var object =
-         orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         PortableServer::POA::_narrow (object.in ());
 
       // Get an object reference from the nominated file
       object = orb->string_to_object (server_ior);
 
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-         root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         root_poa->the_POAManager();
 
-      poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate();
 
-      Child_var child = Child::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
+      Child_var child = Child::_narrow (object.in());
 
       Reply_Handler reply_handler_servant;
 
       AMI_ChildHandler_var reply_handler_object =
-         reply_handler_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+         reply_handler_servant._this ();
 
       // Invoke the AMI parentMethod
-      child->sendc_parentMethod (reply_handler_object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child->sendc_parentMethod (reply_handler_object.in ());
 
       // Loop until all replies have been received.
       while (reply_handler_servant.reply_count () == 0)
@@ -168,18 +153,14 @@ main(int argc, char *argv[])
 
       // Shutdown server.
       child->shutdown ();
-      ACE_TRY_CHECK;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
    return 0;
 }
diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp
index 8059c43febb..5658bcbaed4 100644
--- a/TAO/tests/Bug_2429_Regression/server.cpp
+++ b/TAO/tests/Bug_2429_Regression/server.cpp
@@ -34,28 +34,21 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -63,13 +56,10 @@ main (int argc, char *argv[])
       ChildServant servant (orb.in ());
 
       Child_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
@@ -80,26 +70,20 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp
index 25d1df2ae3d..5bc5f85acd0 100644
--- a/TAO/tests/Bug_2494_Regression/client.cpp
+++ b/TAO/tests/Bug_2494_Regression/client.cpp
@@ -81,7 +81,6 @@ struct Worker : ACE_Task_Base
         try
           {
             const char *ret = srv_->test_method (str);
-            ACE_TRY_CHECK;
             if (0 != ACE_OS::strcmp (str, ret)) return 1;
           }
         catch (CORBA::Exception& ex)
diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp
index 8a87e86c160..1c58c0f1449 100644
--- a/TAO/tests/Bug_2494_Regression/server.cpp
+++ b/TAO/tests/Bug_2494_Regression/server.cpp
@@ -128,8 +128,7 @@ main (int argc, char *argv[])
     }
   catch (CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
 
diff --git a/TAO/tests/Bug_2503_Regression/common.cpp b/TAO/tests/Bug_2503_Regression/common.cpp
index c295a6eb141..e534ce75e59 100644
--- a/TAO/tests/Bug_2503_Regression/common.cpp
+++ b/TAO/tests/Bug_2503_Regression/common.cpp
@@ -31,7 +31,7 @@ void report_exception()
   }
   catch(CORBA::Exception & ex)
   {
-    ACE_PRINT_EXCEPTION (ex, "CORBA Exception raised:");
+    ex._tao_print_exception ("CORBA Exception raised:");
   }
   catch(char const * msg)
   {
diff --git a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
index 2d353c4ea24..326acec3275 100644
--- a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
+++ b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp
@@ -9,9 +9,8 @@ ACE_RCSID (Bug_2542_Regression,
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
        CORBA::ORB_var orb = CORBA::ORB_init(argc,argv);
        CORBA::Object_var object =
@@ -30,18 +29,15 @@ int main (int argc, char* argv[])
        CORBA::OctetSeq_var bin = codec->encode(any_o);
        CORBA::Any_var any_n = codec->decode(bin.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught a CORBA exception \n");
+      ex._tao_print_exception ("Caught a CORBA exception \n");
       return 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
index c023d511de6..c5610527539 100644
--- a/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
+++ b/TAO/tests/Bug_2543_Regression/bug_2543_regression.cpp
@@ -9,9 +9,8 @@ ACE_RCSID (Bug_2543_Regression,
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
        CORBA::ORB_var orb = CORBA::ORB_init(argc,argv);
 
@@ -56,18 +55,15 @@ int main (int argc, char* argv[])
 
          orb->destroy();
      }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught a CORBA exception \n");
+      ex._tao_print_exception ("Caught a CORBA exception \n");
       return 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2560_Regression/server.cpp b/TAO/tests/Bug_2560_Regression/server.cpp
index 7922fd05f71..432759ef282 100644
--- a/TAO/tests/Bug_2560_Regression/server.cpp
+++ b/TAO/tests/Bug_2560_Regression/server.cpp
@@ -47,15 +47,15 @@ int main (int argc, char* argv[])
     // Make policies for child POA
     CORBA::PolicyList policies(2) ;
     policies.length(2) ;
-    policies[0] = root_poa->create_lifespan_policy ( PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER ) ;
-    policies[1] = root_poa->create_id_assignment_policy ( PortableServer::USER_ID ACE_ENV_ARG_PARAMETER ) ;
+    policies[0] = root_poa->create_lifespan_policy ( PortableServer::PERSISTENT ) ;
+    policies[1] = root_poa->create_id_assignment_policy ( PortableServer::USER_ID ) ;
 
     PortableServer::POA_var poa = root_poa->create_POA ( "MyPOA", poa_manager.in(), policies );
 
     // Creation of the new POAs over, so destroy the Policy_ptr's.
     for ( size_t  i = 0 ; i < policies.length (); ++i ) {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      policy->destroy ();
     }
 
     // use this poa for making system objects
diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp
index 70af3ea8a11..3bb0a772b76 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2593_Regression/Hello.cpp
@@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h
index 1a404058944..6131e1a3c88 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.h
+++ b/TAO/tests/Bug_2593_Regression/Hello.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2593_Regression/client.cpp b/TAO/tests/Bug_2593_Regression/client.cpp
index f85722246b5..9f58a01ac0f 100644
--- a/TAO/tests/Bug_2593_Regression/client.cpp
+++ b/TAO/tests/Bug_2593_Regression/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -62,25 +59,20 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp
index 3b309f50f0d..d54cee175d5 100644
--- a/TAO/tests/Bug_2593_Regression/server.cpp
+++ b/TAO/tests/Bug_2593_Regression/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp
index b15677087ce..1891607cda1 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2595_Regression/Hello.cpp
@@ -14,7 +14,6 @@ void
 Hello::op (
         ::Test::Fls_out fstruct,
         ::Test::Vls_out vstruct
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -26,8 +25,8 @@ Hello::op (
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h
index 211615c355b..3d09966e3fc 100644
--- a/TAO/tests/Bug_2595_Regression/Hello.h
+++ b/TAO/tests/Bug_2595_Regression/Hello.h
@@ -19,13 +19,12 @@ public:
     virtual void op (
         ::Test::Fls_out fstruct,
         ::Test::Vls_out vstruct
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
       ));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2595_Regression/client.cpp b/TAO/tests/Bug_2595_Regression/client.cpp
index 9b3fa9bbc8f..00ffc6268de 100644
--- a/TAO/tests/Bug_2595_Regression/client.cpp
+++ b/TAO/tests/Bug_2595_Regression/client.cpp
@@ -38,22 +38,19 @@ void get_stringList2(Test::Hello_var hello);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -72,19 +69,15 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) - op test 2\n"));
       hello->op(fstruct, vstruct.out());
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp
index 177aad4d1d8..8c998950dd3 100644
--- a/TAO/tests/Bug_2595_Regression/server.cpp
+++ b/TAO/tests/Bug_2595_Regression/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp
index da7f32dd4df..70c29c92ddc 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.cpp
+++ b/TAO/tests/Bug_2654_Regression/Hello.cpp
@@ -31,8 +31,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 void
-Hello::set_callback (Test::CallBack_ptr cb
-                     ACE_ENV_ARG_DECL_NOT_USED)
+Hello::set_callback (Test::CallBack_ptr cb)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) got callback \n"));
@@ -41,7 +40,7 @@ Hello::set_callback (Test::CallBack_ptr cb
 }
 
 void
-Hello::method (CORBA::Short count ACE_ENV_ARG_DECL_NOT_USED)
+Hello::method (CORBA::Short count)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (++this->count_ > 10)
diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h
index e6ab2e6e949..960867daf74 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.h
+++ b/TAO/tests/Bug_2654_Regression/Hello.h
@@ -17,11 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void method (CORBA::Short count ACE_ENV_ARG_DECL)
+  virtual void method (CORBA::Short count)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_callback (Test::CallBack_ptr cb
-                             ACE_ENV_ARG_DECL)
+  virtual void set_callback (Test::CallBack_ptr cb)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index b7ce8ac336a..1def4e63883 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -27,7 +27,7 @@ const char *ior = "file://test.ior";
 class Callback_i : public POA_Test::CallBack
 {
 public:
-  void method2(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void method2(void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,"(%t) Callback_i::method2 called\n"));
@@ -136,8 +136,7 @@ int
 init_callback (Worker &w)
 {
   CORBA::Object_var obj =
-    w.orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    w.orb_->resolve_initial_references ("RootPOA");
 
   if (CORBA::is_nil (obj.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -145,12 +144,10 @@ init_callback (Worker &w)
                       1);
 
   PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    PortableServer::POA::_narrow (obj.in ());
 
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    root_poa->the_POAManager ();
 
   // Policies for the childPOA to be created.
   CORBA::PolicyList policies (1);
@@ -160,9 +157,7 @@ init_callback (Worker &w)
   pol <<= BiDirPolicy::BOTH;
   policies[0] =
     w.orb_->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                        pol
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+                        pol);
 
   // Create POA as child of RootPOA with the above policies.  This POA
   // will receive request in the same connection in which it sent
@@ -170,9 +165,7 @@ init_callback (Worker &w)
   PortableServer::POA_var child_poa =
     root_poa->create_POA ("childPOA",
                           poa_manager.in (),
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+                          policies);
 
 
   Callback_i *servant = new Callback_i;
@@ -187,12 +180,10 @@ init_callback (Worker &w)
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[i]->destroy ();
     }
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  poa_manager->activate ();
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp
index 3b0c7e4528a..baa8221e271 100644
--- a/TAO/tests/Bug_2654_Regression/server.cpp
+++ b/TAO/tests/Bug_2654_Regression/server.cpp
@@ -40,19 +40,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,8 +57,7 @@ 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 ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -71,9 +67,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -81,17 +75,14 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
       if (parse_args (argc, argv) != 0)
@@ -104,19 +95,15 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner(hello_impl);
 
       PortableServer::ObjectId_var id =
-        child_poa->activate_object(hello_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->activate_object(hello_impl);
 
-      obj = child_poa->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = child_poa->id_to_reference (id.in());
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(obj.in() ACE_ENV_ARG_PARAMETER)
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow (obj.in());
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -128,27 +115,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp
index f840ef82b8b..2bab685d7f8 100644
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ b/TAO/tests/Bug_2669_Regression/client.cpp
@@ -52,28 +52,22 @@ main (int argc, char *argv[])
 {
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "");
-      ACE_TRY_CHECK;
 
       CORBA::Object_var object_var =
         orb->resolve_initial_references ("RootPOA");
-      ACE_TRY_CHECK;
 
       PortableServer::POA_var poa_var =
         PortableServer::POA::_narrow (object_var.in ());
-      ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager_var =
         poa_var->the_POAManager ();
-      ACE_TRY_CHECK;
 
       poa_manager_var->activate ();
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -147,14 +141,11 @@ main (int argc, char *argv[])
       orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return result;
 }
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index 4dba7549ff4..e7119768255 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -106,7 +106,6 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp
index f808568b8ea..28843cc512f 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.cpp
+++ b/TAO/tests/Bug_2683_Regression/test_i.cpp
@@ -10,14 +10,14 @@ test_i::test_i (ORB_Killer *k)
 }
 
 void
-test_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::ping (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) requesting shutdown \n"));
diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h
index 45c844846f8..8bdf00fe6d6 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.h
+++ b/TAO/tests/Bug_2683_Regression/test_i.h
@@ -29,10 +29,10 @@ public:
   test_i (ORB_Killer *k);
 
   // = The skeleton methods
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp
index 3b2d214029c..c326d7de11f 100644
--- a/TAO/tests/Bug_2702_Regression/client.cpp
+++ b/TAO/tests/Bug_2702_Regression/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -61,21 +58,17 @@ main (int argc, char *argv[])
                             1);
         }
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
       ACE_Time_Value duration(20, 0);
       orb->run(duration);
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index a1035e4c150..1fc2260bb62 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -214,13 +214,11 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       ACE_Get_Opt get_opt (argc, argv, "dn:l:");
       int opt;
@@ -276,12 +274,11 @@ main (int argc, char *argv[])
               }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Basic_Types");
+      ex._tao_print_exception ("Basic_Types");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 0b814f3d523..41cc6e8963a 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -36,13 +36,11 @@ ACE_RCSID (CDR,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       static const CORBA::TypeCode_ptr tcs[]=
       {
@@ -112,8 +110,7 @@ main (int argc, char *argv[])
         {
           CORBA::TypeCode_ptr tc = *i;
 
-          CORBA::TCKind k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::TCKind k = tc->kind ();
 
           switch (k)
             {
@@ -124,15 +121,12 @@ main (int argc, char *argv[])
             case CORBA::tk_alias:
             case CORBA::tk_except:
               {
-                const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                const char *id = tc->id ();
 
-                const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                const char *name = tc->name ();
 
                 CORBA::ULong length = 0;
                 // tc->length (TAO_TRY_ENV);
-                // ACE_TRY_CHECK;
 
                 if (TAO_debug_level > 0)
                   {
@@ -160,12 +154,11 @@ main (int argc, char *argv[])
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TC");
+      ex._tao_print_exception ("TC");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/COIOP/COIOP_Simple_Test.cpp b/TAO/tests/COIOP/COIOP_Simple_Test.cpp
new file mode 100644
index 00000000000..48e1e95629f
--- /dev/null
+++ b/TAO/tests/COIOP/COIOP_Simple_Test.cpp
@@ -0,0 +1,91 @@
+//$Id$
+#include "ace/Get_Opt.h"
+#include "Hello.h"
+#include "tao/Strategies/advanced_resource.h"
+
+int
+main (int argc, char *argv[])
+{
+  try
+    {
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Before creating ORB\n"));
+
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Panic: nil RootPOA\n"),
+                          1);
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      Hello *hello_impl = 0;
+      ACE_NEW_RETURN (hello_impl,
+                      Hello (orb.in (),
+                             0),
+                      1);
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Activating servant\n"));
+
+      PortableServer::ServantBase_var owner_transfer(hello_impl);
+
+      Test::Hello_var hello =
+        hello_impl->_this ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Activating POA Manager\n"));
+
+      poa_manager->activate ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Activated POA Manager\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Doing direct call\n"));
+
+      CORBA::String_var the_string_d =
+        hello->get_string ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+        the_string_d.in ()));
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Object to string\n"));
+
+     CORBA::String_var ior =
+       orb->object_to_string (hello.in ());
+
+      CORBA::Object_var tmp =
+        orb->string_to_object (ior.in ());
+
+      Test::Hello_var hello_ref =
+        Test::Hello::_narrow(tmp.in ());
+
+      if (CORBA::is_nil (hello_ref.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil Test::Hello reference <%s>\n",
+                             ior.in ()),
+                             1);
+        }
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Going to call method\n"));
+
+      CORBA::String_var the_string =
+        hello_ref->get_string ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+        the_string.in ()));
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception&)
+    {
+      // Ignore exceptions..
+    }
+  return 0;
+}
diff --git a/TAO/tests/COIOP/COIOP_Test.cpp b/TAO/tests/COIOP/COIOP_Test.cpp
index c1b59fdeb10..a658fe75ebf 100644
--- a/TAO/tests/COIOP/COIOP_Test.cpp
+++ b/TAO/tests/COIOP/COIOP_Test.cpp
@@ -5,6 +5,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/SString.h"
 #include "ace/Manual_Event.h"
+#include "tao/Strategies/advanced_resource.h"
 
 const char *output = "test.ior";
 const char *input = "file://test.ior";
@@ -50,16 +51,13 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -81,9 +79,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                corb.in (),
@@ -101,18 +97,15 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       // Now that all threads have completed we can destroy the ORB
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
       if (server_orb != client_orb)
         {
-          corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          corb->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/COIOP/COIOP_Tests.mpc b/TAO/tests/COIOP/COIOP_Tests.mpc
index e1f228fad83..0e20ade2b85 100644
--- a/TAO/tests/COIOP/COIOP_Tests.mpc
+++ b/TAO/tests/COIOP/COIOP_Tests.mpc
@@ -1,6 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
-project(COIOP_Tests): taoserver, strategies {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
+project(COIOP_Test): taoserver, strategies {
   exename = COIOP_Test
+  after += *idl
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+    COIOP_Test.cpp
+    Client_Task.cpp
+    Server_Task.cpp
+    Hello.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(COIOP_Simple_Test): taoserver, strategies {
+  exename = COIOP_Simple_Test
+  after += *idl
+  Source_Files {
+    TestC.cpp
+    TestS.cpp
+    COIOP_Simple_Test.cpp
+    Hello.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp
index 47d9e5dd99c..fe518deb52b 100644
--- a/TAO/tests/COIOP/Client_Task.cpp
+++ b/TAO/tests/COIOP/Client_Task.cpp
@@ -22,16 +22,13 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var tmp =
-        this->corb_->string_to_object (input_
-				       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->corb_->string_to_object (input_);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -42,8 +39,7 @@ Client_Task::svc (void)
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
 		  the_string.in ()));
@@ -54,10 +50,9 @@ Client_Task::svc (void)
           ACE_ERROR ((LM_ERROR, "(%P|%t) - ERROR: get_string should have failed\n"));
         }
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& ex)
     {
       if (!this->result_)
         {
@@ -67,16 +62,14 @@ Client_Task::svc (void)
           return 0;
         }
 
-      ACE_PRINT_EXCEPTION (ex, "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp
index dd559fd879b..d7339a7eb0b 100644
--- a/TAO/tests/COIOP/Hello.cpp
+++ b/TAO/tests/COIOP/Hello.cpp
@@ -16,7 +16,7 @@ ACE_RCSID(Hello, Hello, "$Id$")
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -59,12 +59,12 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
   // to avoid BAD_INV_ORDER exceptions on fast dual processor machines.
   ACE_OS::sleep (1);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h
index ba9e6637812..63b4ec180be 100644
--- a/TAO/tests/COIOP/Hello.h
+++ b/TAO/tests/COIOP/Hello.h
@@ -20,10 +20,10 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp
index 4ce551c4dc3..5a8b266cc06 100644
--- a/TAO/tests/COIOP/Server_Task.cpp
+++ b/TAO/tests/COIOP/Server_Task.cpp
@@ -26,17 +26,13 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -44,10 +40,9 @@ Server_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 ();
 
-     Hello *hello_impl;
+     Hello *hello_impl = 0;
      ACE_NEW_RETURN (hello_impl,
                      Hello (this->sorb_.in (),
                             ACE_Thread::self ()),
@@ -56,13 +51,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
      Test::Hello_var hello =
-       hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       hello_impl->_this ();
 
      CORBA::String_var ior =
-       this->sorb_->object_to_string (hello.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (hello.in ());
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
@@ -76,25 +68,21 @@ Server_Task::svc (void)
      ACE_OS::fprintf (output_file, "%s", ior.in ());
      ACE_OS::fclose (output_file);
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      // Signal the main thread before we call orb->run ();
      this->me_.signal ();
 
      ACE_Time_Value runtime (10);
      this->sorb_->run (runtime);
-     ACE_TRY_CHECK;
 
      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/COIOP/run_test.pl b/TAO/tests/COIOP/run_test.pl
index 98605585458..4619fc0f26f 100755
--- a/TAO/tests/COIOP/run_test.pl
+++ b/TAO/tests/COIOP/run_test.pl
@@ -70,7 +70,7 @@ if ($sv != 0) {
 unlink $iorfile;
 
 print STDERR "======== Running in no collocation mode and two ORBS \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
+$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation no");
 $sv = $SV->SpawnWaitKill (60);
 
 if ($sv != 0) {
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index 0fbab91f139..fdd9836f70d 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -30,27 +30,20 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
+  int result = this->init(argc, argv);
+  if (result != 0)
     {
       return result;
     }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  this->poa_setup();
+  this->csd_setup();
+  this->client_setup();
+  this->poa_activate();
+  this->run_clients();
+  this->run_orb_event_loop();
 
   // Calling wait on ACE_Thread_Manager singleton to avoid the problem
   // that the main thread might exit before all CSD Threads exit.
@@ -65,10 +58,9 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -80,106 +72,92 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  TheAppShutdown->init(this->orb_.in(), num_servants_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TheAppShutdown->init(this->orb_.in(), num_servants_);
 
   return 0;
 }
 
 
 void
-ClientApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::poa_setup(void)
 {
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_ = this->create_poa(this->orb_.in(),
+                                "ChildPoa");
 }
 
 
 void
-ClientApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::csd_setup(void)
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
+  if (!this->tp_strategy_->apply_to(this->poa_.in()))
     {
       ACE_ERROR((LM_ERROR,
                  "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
+      throw TestAppException();
     }
-  ACE_CHECK;
 }
 
 
 void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::client_setup(void)
 {
   // Turn the ior_ into a Foo_B obj ref.
   Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
+                                                  this->ior_.c_str());
+
   this->servants_.create_and_activate(1, // number of callback servants
-                                      this->poa_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      this->poa_.in());
   ServantListType::T_stub_var cb = this->servants_.objref(0);
 
-  // Create the ClientEngine object, and give it the Foo_B and Callback object 
+  // Create the ClientEngine object, and give it the Foo_B and Callback object
   // references.
-  ClientEngine_Handle engine 
+  ClientEngine_Handle engine
     = new Foo_B_ClientEngine(foo.in(), cb.in (), this->client_id_);
   this->client_task_.add_engine(engine.in());
 }
 
 
 void
-ClientApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::poa_activate(void)
 {
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POAManager_var poa_manager
+    = this->poa_->the_POAManager();
+  poa_manager->activate();
 }
 
 
 void
-ClientApp::run_clients(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::run_clients(void)
 {
   if (this->client_task_.open() != 0)
     {
-      ACE_THROW (TestAppException ());
+      throw TestAppException ();
     }
 }
 
 
 void
-ClientApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::run_orb_event_loop(void)
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_runner.run();
   TheAppShutdown->wait ();
 }
 
 
 PortableServer::POA_ptr
-ClientApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name ACE_ENV_ARG_DECL)
+ClientApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name)
 {
   // Get the Root POA.
   PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb,
+                                                          "RootPOA");
 
   // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -189,9 +167,7 @@ ClientApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name ACE_ENV_ARG_DECL)
   PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
                                                       root_poa.in(),
                                                       poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                      policies);
 
   // Give away the child POA_ptr from the POA_var variable.
   return poa._retn();
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
index 846384224f5..079c4a0e37c 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
@@ -21,19 +21,19 @@ class ClientApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
+    int init(int argc, char* argv[]);
+    void poa_setup(void);
+    void csd_setup(void);
+    void client_setup(void);
+    void poa_activate(void);
+    void run_clients(void);
+    void run_orb_event_loop(void);
     bool check_validity ();
     void cleanup();
 
@@ -50,8 +50,7 @@ class ClientApp : public TestAppBase
     int arg_dependency_checks();
 
     PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
+                                       const char* poa_name);
 
 
     typedef ServantList<Callback_i> ServantListType;
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index e48955f8c06..4d4f7b2af52 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -32,29 +32,21 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
+  int result = this->init(argc, argv);
+  if (result != 0)
     {
       return result;
     }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->collocated_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  this->poa_setup();
+  this->csd_setup();
+  this->servant_setup();
+  this->collocated_setup();
+  this->poa_activate();
+  this->run_collocated_clients();
+  this->run_orb_event_loop();
 
   // Calling wait on ACE_Thread_Manager singleton to avoid the problem
   // that the main thread might exit before all CSD Threads exit.
@@ -68,10 +60,9 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -86,49 +77,43 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
   unsigned num_clients = this->num_remote_clients_ +
                          this->num_collocated_clients_;
 
-  TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TheAppShutdown->init(this->orb_.in(), num_clients);
 
   return 0;
 }
 
 
 void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_setup(void)
 {
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  this->poa_ = this->create_poa(this->orb_.in(),
+                                "ChildPoa");
+
   if (this->num_collocated_clients_ > 0)
     {
-      this->cb_poa_ = this->create_poa(this->orb_.in(), 
-                                       "CallbackPoa" 
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->cb_poa_ = this->create_poa(this->orb_.in(),
+                                       "CallbackPoa");
     }
 }
 
 void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::csd_setup(void)
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
 // We don't apply the strategy for this test to show that the bug isn't
 // part of the CSD ThreadPool Strategy code.
 #if 0
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
+  if (!this->tp_strategy_->apply_to(this->poa_.in()))
     {
       ACE_ERROR((LM_ERROR,
                  "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
+      throw TestAppException();
     }
-  ACE_CHECK;
 #endif
 
   // Use another poa and strategy for callbacks. This would resolve
-  // the deadlock situation that happens when having number of csd 
+  // the deadlock situation that happens when having number of csd
   // threads less than number of collocated clients.
   if (this->num_collocated_clients_ > 0)
     {
@@ -136,43 +121,38 @@ ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
 // We don't apply the strategy for this test to show that the bug isn't
 // part of the CSD ThreadPool Strategy code.
 #if 0
-      if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in() ACE_ENV_ARG_PARAMETER))
+      if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in()))
         {
           ACE_ERROR((LM_ERROR,
             "Failed to apply CSD strategy to callback poa.\n"));
-          ACE_THROW(TestAppException());
-        } 
-  ACE_CHECK;
+          throw TestAppException();
+        }
 #endif
     }
 }
 
 
 void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::servant_setup(void)
 {
   this->foo_servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
                                       this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      this->ior_filename_prefix_.c_str());
 }
 
 
 void
-ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::collocated_setup(void)
 {
   if (this->num_collocated_clients_ == 0)
     return;
 
   this->cb_servants_.create_and_activate(1, // number of callback servants
-                                         this->cb_poa_.in()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         this->cb_poa_.in());
 
   CallbackServantListType::T_stub_var cb = this->cb_servants_.objref(0);
-  
+
   unsigned client_id = this->num_remote_clients_;
 
   for (unsigned i = 0; i < this->num_collocated_clients_; i++)
@@ -181,9 +161,9 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL)
       // Dole out the servant object references in a round-robin fashion.
       unsigned servant_index = i % this->num_servants_;
 
-      FooServantListType::T_stub_var foo 
+      FooServantListType::T_stub_var foo
         = this->foo_servants_.objref(servant_index);
-      ClientEngine_Handle engine 
+      ClientEngine_Handle engine
         = new Foo_B_SimpleClientEngine(foo.in(), cb.in (), client_id, true);
       this->collocated_client_task_.add_engine(engine.in());
     }
@@ -191,35 +171,32 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_activate(void)
 {
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POAManager_var poa_manager
+    = this->poa_->the_POAManager();
+  poa_manager->activate();
 }
 
 
 void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_collocated_clients(void)
 {
   if (this->num_collocated_clients_ > 0)
     {
       if (this->collocated_client_task_.open() == -1)
         {
-          ACE_THROW (TestAppException ());
+          throw TestAppException ();
         }
     }
 }
 
 
 void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_orb_event_loop(void)
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_runner.run();
   TheAppShutdown->wait ();
 }
 
@@ -332,7 +309,7 @@ ServerApp::usage_statement()
 int
 ServerApp::arg_dependency_checks()
 {
-  return (this->num_remote_clients_ 
+  return (this->num_remote_clients_
           + this->num_collocated_clients_) > 0 ? 0 : -1;
 }
 
@@ -361,21 +338,17 @@ ServerApp::set_arg(unsigned&   value,
 
 
 PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name 
-                      ACE_ENV_ARG_DECL)
+ServerApp::create_poa(CORBA::ORB_ptr orb,
+                      const char* poa_name)
 {
   // Get the Root POA.
   PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA" 
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb,
+                                                          "RootPOA");
 
   // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -385,9 +358,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb,
   PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
                                                       root_poa.in(),
                                                       poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                      policies);
 
   // Give away the child POA_ptr from the POA_var variable.
   return poa._retn();
@@ -400,7 +371,7 @@ ServerApp::check_validity ()
   return true;
 #if 0
   // Check whether the clients return any errors.
-  if (this->num_collocated_clients_ > 0 
+  if (this->num_collocated_clients_ > 0
     && this->collocated_client_task_.failure_count () > 0)
     {
       return false;
@@ -408,7 +379,7 @@ ServerApp::check_validity ()
 
   Foo_B_Statistics stats (this->num_remote_clients_,
                           this->num_collocated_clients_);
-  
+
   Foo_B_SimpleClientEngine::expected_results (stats);
 
   for (unsigned i = 0; i < this->num_servants_; i++)
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
index c90b7671534..549cc1bf290 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
@@ -21,20 +21,20 @@ class ServerApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void collocated_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
+    int init(int argc, char* argv[]);
+    void poa_setup(void);
+    void csd_setup(void);
+    void servant_setup(void);
+    void collocated_setup(void);
+    void poa_activate(void);
+    void run_collocated_clients(void);
+    void run_orb_event_loop(void);
     bool check_validity ();
     void cleanup();
 
@@ -53,8 +53,7 @@ class ServerApp : public TestAppBase
 
 
     PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
+                                       const char* poa_name);
 
     typedef ServantList<Foo_B_i> FooServantListType;
     typedef ServantList<Callback_i> CallbackServantListType;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
index db2d1ec202e..8ad2666efe5 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
@@ -4,8 +4,7 @@
 void
 AppHelper::ref_to_file(CORBA::ORB_ptr    orb,
                        CORBA::Object_ptr obj,
-                       const char*       filename
-                       ACE_ENV_ARG_DECL)
+                       const char*       filename)
 {
   CORBA::String_var ior = orb->object_to_string(obj);
 
@@ -14,9 +13,9 @@ AppHelper::ref_to_file(CORBA::ORB_ptr    orb,
   if (ior_file == 0)
     {
       ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Cannot open output file [%s] to write IOR.",
+                 "(%P|%t) Cannot open output file [%s] to write IOR.\n",
                  filename));
-      ACE_THROW (TestAppException());
+      throw TestAppException();
     }
 
   ACE_OS::fprintf(ior_file, "%s", ior.in());
@@ -28,14 +27,11 @@ PortableServer::POA_ptr
 AppHelper::create_poa(const char*                    name,
                       PortableServer::POA_ptr        root_poa,
                       PortableServer::POAManager_ptr mgr,
-                      CORBA::PolicyList&             policies
-                      ACE_ENV_ARG_DECL)
+                      CORBA::PolicyList&             policies)
 {
   PortableServer::POA_var child_poa = root_poa->create_POA(name,
                                                            mgr,
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                           policies);
 
   if (CORBA::is_nil(child_poa.in()))
     {
@@ -50,17 +46,14 @@ AppHelper::create_poa(const char*                    name,
 
 CORBA::Object_ptr
 AppHelper::activate_servant(PortableServer::POA_ptr poa,
-                            PortableServer::Servant servant
-                            ACE_ENV_ARG_DECL)
+                            PortableServer::Servant servant)
 {
   // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = poa->activate_object(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
- 
-  CORBA::Object_var obj 
-    = poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  PortableServer::ObjectId_var oid
+    = poa->activate_object(servant);
+
+  CORBA::Object_var obj
+    = poa->servant_to_reference(servant);
 
   if (CORBA::is_nil(obj.in()))
     {
@@ -78,24 +71,19 @@ AppHelper::validate_connection (CORBA::Object_ptr obj)
 {
   for (CORBA::ULong j = 0; j != 100; ++j)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
           CORBA::PolicyList_var unused;
-          obj->_validate_connection (unused
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          obj->_validate_connection (unused);
 #else
-          obj->_is_a ("Not_An_IDL_Type"
-                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          obj->_is_a ("Not_An_IDL_Type");
 #endif /* TAO_HAS_MESSAGING == 1 */
           return true;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
         }
-      ACE_ENDTRY;
     }
 
   return false;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
index 06a6ac721a2..70d58382e05 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
@@ -16,12 +16,10 @@ struct RefHelper
   typedef typename T::_ptr_type T_ptr;
   typedef typename T::_var_type T_var;
 
-  static T_ptr string_to_ref(CORBA::ORB_ptr orb, 
-                             const char* ior 
-                             ACE_ENV_ARG_DECL)
+  static T_ptr string_to_ref(CORBA::ORB_ptr orb,
+                             const char* ior)
   {
-    CORBA::Object_var obj = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(T::_nil ());
+    CORBA::Object_var obj = orb->string_to_object(ior);
 
     if (CORBA::is_nil(obj.in()))
       {
@@ -30,8 +28,7 @@ struct RefHelper
         ACE_THROW_RETURN (TestAppException(), T::_nil ());
       }
 
-    T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(T::_nil ());
+    T_var t_obj = T::_narrow(obj.in());
 
     if (CORBA::is_nil(t_obj.in()))
       {
@@ -43,13 +40,11 @@ struct RefHelper
     return t_obj._retn();
   }
 
-  static T_ptr resolve_initial_ref(CORBA::ORB_ptr orb, 
-                                   const char* name
-                                   ACE_ENV_ARG_DECL)
+  static T_ptr resolve_initial_ref(CORBA::ORB_ptr orb,
+                                   const char* name)
   {
-    CORBA::Object_var obj 
-      = orb->resolve_initial_references(name ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
+    CORBA::Object_var obj
+      = orb->resolve_initial_references(name);
 
     if (CORBA::is_nil(obj.in()))
       {
@@ -59,8 +54,7 @@ struct RefHelper
         ACE_THROW_RETURN (TestAppException(), T::_nil ());
       }
 
-    T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
+    T_var t_obj = T::_narrow(obj.in());
 
 
     if (CORBA::is_nil(t_obj.in()))
@@ -81,19 +75,16 @@ struct CSD_TP_Test_Export AppHelper
 
   static void ref_to_file(CORBA::ORB_ptr    orb,
                           CORBA::Object_ptr obj,
-                          const char*       filename
-                          ACE_ENV_ARG_DECL);
+                          const char*       filename);
 
   static PortableServer::POA_ptr create_poa
                               (const char*                    name,
                                PortableServer::POA_ptr        root_poa,
                                PortableServer::POAManager_ptr mgr,
-                               CORBA::PolicyList&             policies
-                               ACE_ENV_ARG_DECL);
+                               CORBA::PolicyList&             policies);
 
   static CORBA::Object_ptr activate_servant(PortableServer::POA_ptr poa,
-                                            PortableServer::Servant servant
-                                            ACE_ENV_ARG_DECL);
+                                            PortableServer::Servant servant);
 
   // This helper method is used because there is a chance that the
   // initial CORBA request made to the target ORB will fail during
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
index 53dec90290a..c290dc54c5b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
@@ -17,17 +17,16 @@ AppShutdown::~AppShutdown()
 }
 
 
-void 
-AppShutdown::init(CORBA::ORB_ptr orb, 
-                  unsigned num_clients
-                  ACE_ENV_ARG_DECL)
+void
+AppShutdown::init(CORBA::ORB_ptr orb,
+                  unsigned num_clients)
 {
   if ((!CORBA::is_nil(this->orb_.in())) ||
       (CORBA::is_nil(orb))              ||
-      (num_clients == 0)) 
+      (num_clients == 0))
     {
       // Already init()'ed, or bad argument values.
-      ACE_THROW(TestAppException());
+      throw TestAppException();
     }
   else
     {
@@ -77,7 +76,7 @@ AppShutdown::client_done()
 }
 
 
-AppShutdown* 
+AppShutdown*
 AppShutdown::instance ()
 {
   static AppShutdown app_shutdown;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
index d79c2aababf..f3bc9706e2c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
@@ -13,12 +13,11 @@ class CSD_TP_Test_Export AppShutdown
     AppShutdown();
     virtual ~AppShutdown();
 
-    void init(CORBA::ORB_ptr orb, 
-              unsigned num_clients
-              ACE_ENV_ARG_DECL);
+    void init(CORBA::ORB_ptr orb,
+              unsigned num_clients);
 
     void wait ();
-    
+
     void client_done();
 
     static AppShutdown* instance ();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
index 3fdd3efd233..272b1829c89 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
@@ -32,7 +32,7 @@ class CSD_TP_Test_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<ACE_
     ClientEngine();
     virtual ~ClientEngine();
 
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL) = 0;
+    virtual bool execute(void) = 0;
 };
 
 #endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
index 00d92a17608..388a559c8c1 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
@@ -63,25 +63,24 @@ ClientTask::svc()
     this->engines_.pop_back();
   }
 
-  ACE_TRY_NEW_ENV
+  try
   {
-    bool exec_ret = engine->execute(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    bool exec_ret = engine->execute();
     if (exec_ret == false)
       {
         GuardType guard(this->lock_);
         this->failure_count_ ++;
       }
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "ClientTask::svc Caught exception from execute():");
+    ex._tao_print_exception (
+      "ClientTask::svc Caught exception from execute():");
 
     GuardType guard(this->lock_);
     this->failure_count_ ++;
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
                "(%P|%t) ClientTask::svc caught unknown (...) exception "\
@@ -89,7 +88,6 @@ ClientTask::svc()
     GuardType guard(this->lock_);
     this->failure_count_ ++;
   }
-  ACE_ENDTRY;
 
   if(this->shutdown_after_done_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
index 0cc9c9bd5ad..812495cc732 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
@@ -17,7 +17,7 @@ OrbRunner::~OrbRunner()
 
 
 void
-OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL)
+OrbRunner::run(void)
 {
   ACE_ASSERT(this->num_orb_threads_ > 0);
 
@@ -27,8 +27,7 @@ OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL)
     {
       // Since the num_orb_threads_ is exactly one, we just use the current
       // (mainline) thread to run the ORB event loop.
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->run();
     }
   else
     {
@@ -43,12 +42,11 @@ OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL)
         {
           ACE_ERROR((LM_ERROR,
                      "(%P|%t) Failed to open the OrbTask.\n"));
-          ACE_THROW(TestAppException());
+          throw TestAppException();
         }
 
       // This will use the current (mainline) thread to run the ORB event loop.
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->run();
 
       // Now that the current thread has unblocked from running the orb,
       // make sure to wait for all of the worker threads to complete.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
index 71c7c4e358c..8e3f8138239 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
@@ -12,7 +12,7 @@ class CSD_TP_Test_Export OrbRunner
     OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1);
     virtual ~OrbRunner();
 
-    void run(ACE_ENV_SINGLE_ARG_DECL);
+    void run(void);
 
 
   private:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp
index 79ba1ba3f5e..c64221af9cc 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp
@@ -51,18 +51,16 @@ OrbShutdownTask::open(void*)
 int
 OrbShutdownTask::svc()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->shutdown(0);
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::shutdown() call "
       "in OrbShutdownTask::svc().\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp
index ff6ad717898..a9861cf062a 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp
@@ -75,18 +75,16 @@ OrbTask::open(void*)
 int
 OrbTask::svc()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->orb_->run();
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR,
       "(%P|%t) Exception raised by ORB::run() method. "
       "OrbTask is stopping.\n"));
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
index 2727c975253..5eeabeb2536 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
@@ -19,35 +19,30 @@ ServantList<T>::~ServantList()
 template <typename T>
 void
 ServantList<T>::create_and_activate(unsigned                num_servants,
-                                    CORBA::ORB_ptr          orb, 
+                                    CORBA::ORB_ptr          orb,
                                     PortableServer::POA_ptr poa,
-                                    const char*             ior_fname_prefix
-                                    ACE_ENV_ARG_DECL)
+                                    const char*             ior_fname_prefix)
 {
   for (unsigned i = 0; i < num_servants; i++)
     {
       char buf[32];
       ACE_OS::sprintf(buf, "%02d", i + 1);
-      ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior";  
+      ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior";
       ServantRecord record;
       record.servant_ = new T();
       record.safe_servant_ = record.servant_;
 
-      CORBA::Object_var obj 
-        = AppHelper::activate_servant(poa, 
-                                      record.safe_servant_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-                                     
-      AppHelper::ref_to_file(orb, obj.in(), filename.c_str() ACE_ENV_ARG_PARAMETER); 
-      ACE_CHECK;
+      CORBA::Object_var obj
+        = AppHelper::activate_servant(poa,
+                                      record.safe_servant_.in());
 
-      record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      AppHelper::ref_to_file(orb, obj.in(), filename.c_str());
+
+      record.obj_ = T_stub::_narrow(obj.in());
 
       if (CORBA::is_nil(record.obj_.in()))
         {
-          ACE_THROW (TestAppException());
+          throw TestAppException();
         }
 
       this->servant_records_.push_back(record);
@@ -58,8 +53,7 @@ ServantList<T>::create_and_activate(unsigned                num_servants,
 template <typename T>
 void
 ServantList<T>::create_and_activate(unsigned                num_servants,
-                                    PortableServer::POA_ptr poa
-                                    ACE_ENV_ARG_DECL)
+                                    PortableServer::POA_ptr poa)
 {
   for (unsigned i = 0; i < num_servants; i++)
     {
@@ -67,18 +61,15 @@ ServantList<T>::create_and_activate(unsigned                num_servants,
       record.servant_ = new T();
       record.safe_servant_ = record.servant_;
 
-      CORBA::Object_var obj 
-        = AppHelper::activate_servant(poa, 
-                                      record.safe_servant_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-                                    
-      record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Object_var obj
+        = AppHelper::activate_servant(poa,
+                                      record.safe_servant_.in());
+
+      record.obj_ = T_stub::_narrow(obj.in());
 
       if (CORBA::is_nil(record.obj_.in()))
         {
-          ACE_THROW (TestAppException());
+          throw TestAppException();
         }
 
       this->servant_records_.push_back(record);
@@ -93,28 +84,22 @@ void
 ServantList<T>::deactivate(PortableServer::POA_ptr poa)
 {
   ServantRecord record;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
   {
     PortableServer::ObjectId_var id =
-      poa->servant_to_id(record.safe_servant_.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      poa->servant_to_id(record.safe_servant_.in());
 
-    poa->deactivate_object(id.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    poa->deactivate_object(id.in());
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      "ServantList_T::deactivate_servant ()");
+    ex._tao_print_exception ("ServantList_T::deactivate_servant ()");
   }
-  ACE_CATCHALL
+  catch (...)
   {
     ACE_ERROR((LM_ERROR, "(%P|%t)ServantList_T::deactivate_servant "
     "Caught unknown exception \n"));
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 #endif
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
index 3cc61e42905..8770b8f3ec9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
@@ -24,13 +24,11 @@ class ServantList
     void create_and_activate(unsigned                num_servants,
                              CORBA::ORB_ptr          orb,
                              PortableServer::POA_ptr poa,
-                             const char*             ior_fname_prefix
-                             ACE_ENV_ARG_DECL);
+                             const char*             ior_fname_prefix);
 
     /// Activate servant and not output ior to a file.
     void create_and_activate(unsigned                num_servants,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL);
+                             PortableServer::POA_ptr poa);
 
     // Code not used and not working right now - possible future addition.
     //void deactivate(PortableServer::POA_ptr poa);
@@ -55,7 +53,7 @@ class ServantList
     ServantRecordVector servant_records_;
 };
 
-    
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ServantList_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
index f2a2e97b7a2..8f264fbb111 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
@@ -20,10 +20,9 @@ TestAppBase::name() const
 
 
 int
-TestAppBase::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
+TestAppBase::run(int argc, char* argv[])
 {
-  int rc = this->run_i(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int rc = this->run_i(argc, argv);
 
   // Convert 1 to 0.  Leave 0 and -1 as they are.
   return (rc == 1) ? 0 : rc;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
index 5138ffbf84c..7ba1f36d23b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
@@ -15,7 +15,7 @@ class CSD_TP_Test_Export TestAppBase
     virtual ~TestAppBase();
 
     // Returns 0 for success, and -1 for failure.
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    int run(int argc, char* argv[]);
 
     const char* name() const;
 
@@ -25,7 +25,7 @@ class CSD_TP_Test_Export TestAppBase
     TestAppBase(const char* name);
 
     // Returns -1 for failure, 0 for success
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) = 0;
+    virtual int run_i(int argc, char* argv[]) = 0;
 
 
   private:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
index 062b6fc0c8e..6daf932438e 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
@@ -24,24 +24,22 @@ main(int argc, char* argv[]) \
 \
   APP_TYPE app; \
 \
-  ACE_TRY_NEW_ENV \
+  try\
   { \
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); \
-    ACE_TRY_CHECK; \
+    int ret = app.run(argc,argv); \
+\
     return ret; \
   } \
-  ACE_CATCHANY \
+  catch (const CORBA::Exception& ex)\
   { \
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, \
-                           "Caught exception:"); \
+     ex._tao_print_exception ("Caught exception:"); \
   } \
-  ACE_CATCHALL \
+  catch (...)\
   { \
     ACE_ERROR((LM_ERROR, \
                "(%P|%t) Unknown (...) exception caught in main() " \
                "for App [%d].\n", app.name())); \
   } \
-  ACE_ENDTRY; \
   \
   return 1; \
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
index bb0d1cf1bf7..94e0a9d13d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
@@ -5,8 +5,8 @@
 #include "AppHelper.h"
 #include "ace/Log_Msg.h"
 
-Foo_A_ClientEngine::Foo_A_ClientEngine(Foo_A_ptr obj, 
-                                       unsigned  client_id, 
+Foo_A_ClientEngine::Foo_A_ClientEngine(Foo_A_ptr obj,
+                                       unsigned  client_id,
                                        bool collocated)
   : obj_(Foo_A::_duplicate(obj)),
     client_id_ (client_id),
@@ -21,9 +21,9 @@ Foo_A_ClientEngine::~Foo_A_ClientEngine()
 
 
 bool
-Foo_A_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
+Foo_A_ClientEngine::execute(void)
 {
-  // Make sure the connection is established before making  
+  // Make sure the connection is established before making
   // remote invocations.
   if (AppHelper::validate_connection (this->obj_.in ()) == false)
     {
@@ -37,14 +37,11 @@ Foo_A_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Long i = this->client_id_;
 
-  this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->op1();
 
-  this->obj_->op2(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->op2(i);
 
-  CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::Long value = this->obj_->op3(i);
 
   if (value != i)
     {
@@ -53,31 +50,27 @@ Foo_A_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
 
   for (CORBA::Long j = 1; j <= 5; j++)
     {
-      this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      this->obj_->op4(495 + (i * 5) + j);
     }
 
   bool caught_exception = false;
 
-  ACE_TRY
+  try
   {
-    this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->obj_->op5();
   }
-  ACE_CATCH (FooException, ex)
+  catch (const FooException& )
   {
     // Expected
     caught_exception = true;
   }
-  ACE_ENDTRY;
-  
+
   if (! caught_exception)
     {
       check_validity = false;
     }
 
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->done();
 
   return check_validity;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
index 4f49888f34f..ce83a52896c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
@@ -26,7 +26,7 @@ class CSD_TP_Foo_A_Export Foo_A_ClientEngine : public ClientEngine
     Foo_A_ClientEngine(Foo_A_ptr obj, unsigned  client_id = 0, bool collocated = false);
     virtual ~Foo_A_ClientEngine();
 
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
+    virtual bool execute(void);
 
     static void expected_results(Foo_A_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
index a3bab7748aa..1c0399091fd 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
@@ -18,7 +18,7 @@ Foo_A_i::~Foo_A_i()
 
 
 void
-Foo_A_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_A_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[0] ++;
@@ -26,7 +26,7 @@ Foo_A_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_A_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_A_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[1].push_back (value);
@@ -35,7 +35,7 @@ Foo_A_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_A_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_A_i::op3(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[2].push_back (value);
@@ -45,7 +45,7 @@ Foo_A_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_A_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_A_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[3].push_back (value);
@@ -54,16 +54,16 @@ Foo_A_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_A_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_A_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   this->op_count_[4] ++;
-  ACE_THROW (FooException());
+  throw FooException();
 }
 
 
 void
-Foo_A_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_A_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   TheAppShutdown->client_done();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
index 6361baa6ca7..b55ee063666 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
@@ -14,28 +14,28 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A
     Foo_A_i();
     virtual ~Foo_A_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void op2(CORBA::Long value)
                                  ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(CORBA::Long value)
                                  ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void op4(CORBA::Long value)
                                  ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException, FooException));
 
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)          
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
     void gather_stats (Foo_A_Statistics& stats) ;
 
   private:
-    
+
     LongVector in_values_ [5];
     unsigned op_count_ [5];
 };
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
index 8438b572ce2..d48f56fc505 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
@@ -12,8 +12,8 @@ Callback_i::~Callback_i ()
 }
 
 
-void 
-Callback_i::test_method(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 
+void
+Callback_i::test_method(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->num_callbacks_ ++;
@@ -21,7 +21,7 @@ Callback_i::test_method(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Callback_i::gather_stats(Foo_B_Statistics& stats) 
+Callback_i::gather_stats(Foo_B_Statistics& stats)
 {
   stats.actual_callbacks(this->num_callbacks_);
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
index 8948435ceed..86afee9b4f7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
@@ -16,7 +16,7 @@ class CSD_TP_Foo_B_Export Callback_i
 
     virtual ~Callback_i();
 
-    virtual void test_method(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void test_method(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
     void gather_stats(Foo_B_Statistics& stats);
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
index a928eb12169..f857655fb0c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
@@ -27,7 +27,7 @@ Foo_B_ClientEngine::~Foo_B_ClientEngine()
 
 
 bool
-Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
+Foo_B_ClientEngine::execute(void)
 {
   // Make sure the connection is established before making
   // remote invocations.
@@ -41,14 +41,11 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
   // Verify the return values and return the results.
   bool check_validity = true;
 
-  this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->op1();
 
-  this->obj_->op2(this->client_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->op2(this->client_id_);
 
-  CORBA::Long value = this->obj_->op3(this->client_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::Long value = this->obj_->op3(this->client_id_);
 
   if (value != static_cast<CORBA::Long>(this->client_id_))
     {
@@ -57,23 +54,20 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
 
   for (CORBA::ULong j = 1; j <= 5; j++)
     {
-      this->obj_->op4(495 + (this->client_id_ * 5) + j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      this->obj_->op4(495 + (this->client_id_ * 5) + j);
     }
 
   bool caught_exception = false;
 
-  ACE_TRY
+  try
   {
-    this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->obj_->op5();
   }
-  ACE_CATCH (FooException, ex)
+  catch (const FooException& )
   {
     // Expected
     caught_exception = true;
   }
-  ACE_ENDTRY;
 
   if (! caught_exception)
     {
@@ -93,8 +87,7 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
   // Two-Way calls with "inout" and fixed size "in" arguments.
   CORBA::String_var message = CORBA::string_dup(test_str);
 
-  CORBA::Boolean result = this->obj_->op6( t, message.inout() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::Boolean result = this->obj_->op6( t, message.inout());
 
   ACE_UNUSED_ARG(result);
 
@@ -107,17 +100,14 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
     }
 
   // Callback test.
-  this->obj_->op7 (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->op7 (this->callback_.in ());
 
   // One-Way calls with various arguments.
   CORBA::String_var ub_string = CORBA::string_dup( test_str );
-  this->obj_->test_unbounded_string_arg (ub_string.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->test_unbounded_string_arg (ub_string.in ());
 
   CORBA::String_var bd_string = CORBA::string_dup( test_str );
-  this->obj_->test_bounded_string_arg (bd_string.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->test_bounded_string_arg (bd_string.in ());
 
   Fixed_Array fixed_array;
 
@@ -126,8 +116,7 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
      fixed_array[m] = this->client_id_ + m;
   }
 
-  this->obj_->test_fixed_array_arg (fixed_array ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->test_fixed_array_arg (fixed_array);
 
   Var_Array var_array;
 
@@ -138,42 +127,32 @@ Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
       var_array[k] = CORBA::string_dup(buffer);
     }
 
-  this->obj_->test_var_array_arg (var_array ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->test_var_array_arg (var_array);
 
   Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
 
   bd_var_size_string->replace (ACE_OS::strlen (test_str) + 1,
                                test_str);
-  this->obj_->test_bounded_var_size_arg (bd_var_size_string.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->test_bounded_var_size_arg (bd_var_size_string.in ());
 
   Unbounded_Var_Size_var ub_var_size_string = new Unbounded_Var_Size(100);
   ub_var_size_string->replace (ub_var_size_string->maximum (),
                                ACE_OS::strlen (test_str) + 1,
                                test_str);
-  this->obj_->test_unbounded_var_size_arg (ub_var_size_string.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->test_unbounded_var_size_arg (ub_var_size_string.in ());
 
-  this->obj_->test_fixed_size_arg (t ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->test_fixed_size_arg (t);
 
   this->obj_->test_special_basic_arg (this->client_id_ % 2,
-                                      this->client_id_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+                                      this->client_id_);
 
-  this->obj_->test_objref_arg (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->test_objref_arg (this->callback_.in ());
 
   // Sleep for 5 seconds before invoking done().
   // This is a workaround with the problem that some oneway requests lost
   // when the server has multiple orb threads.
   ACE_OS::sleep (5);
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->done();
 
   return check_validity;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
index a6e8e51667b..e0fb3995fdb 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
@@ -24,14 +24,14 @@ class CSD_TP_Foo_B_Export Foo_B_ClientEngine : public ClientEngine
 {
   public:
 
-    Foo_B_ClientEngine(Foo_B_ptr obj, 
+    Foo_B_ClientEngine(Foo_B_ptr obj,
                        Callback_ptr callback,
                        unsigned client_id = 0,
                        bool collocated = false);
 
     virtual ~Foo_B_ClientEngine();
 
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
+    virtual bool execute(void);
 
     static void expected_results(Foo_B_Statistics& stats);
     static unsigned expected_callbacks ();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
index ec2d97c6bdf..e6075f9cec6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
@@ -9,7 +9,7 @@
 
 extern const char* ONEWAY_ARG_TEST_STR;
 
-Foo_B_SimpleClientEngine::Foo_B_SimpleClientEngine(Foo_B_ptr obj, 
+Foo_B_SimpleClientEngine::Foo_B_SimpleClientEngine(Foo_B_ptr obj,
                                                    Callback_ptr callback,
                                                    unsigned client_id,
                                                    bool collocated)
@@ -27,9 +27,9 @@ Foo_B_SimpleClientEngine::~Foo_B_SimpleClientEngine()
 
 
 bool
-Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
+Foo_B_SimpleClientEngine::execute(void)
 {
-  // Make sure the connection is established before making  
+  // Make sure the connection is established before making
   // remote invocations.
   if (AppHelper::validate_connection (this->obj_.in ()) == false)
     {
@@ -42,7 +42,7 @@ Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
   bool check_validity = true;
 
   // Callback test.
-  ACE_TRY
+  try
   {
     if (CORBA::is_nil(this->callback_.in()))
       {
@@ -50,20 +50,17 @@ Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
                    "The callback_ objref is nil before op7() call!\n"));
       }
 
-    this->obj_->op7 (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->obj_->op7 (this->callback_.in ());
   }
-  ACE_CATCH (FooException, ex)
+  catch (const FooException& )
   {
     ACE_ERROR((LM_ERROR, "(%P|%t)Foo_A_SimpleClientEngine::execute  " \
                "FooException raised by op7() call.\n"));
     check_validity = false;
   }
-  ACE_ENDTRY;
 
   // Tell the servant that this client is done.
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->done();
 
   return check_validity;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
index 38ef6a09bcf..a1c3f535c33 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
@@ -24,14 +24,14 @@ class CSD_TP_Foo_B_Export Foo_B_SimpleClientEngine : public ClientEngine
 {
   public:
 
-    Foo_B_SimpleClientEngine(Foo_B_ptr obj, 
+    Foo_B_SimpleClientEngine(Foo_B_ptr obj,
                               Callback_ptr callback,
                               unsigned client_id = 0,
                               bool collocated = false);
 
     virtual ~Foo_B_SimpleClientEngine();
 
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
+    virtual bool execute(void);
 
     static void expected_results(Foo_B_Statistics& stats);
     static unsigned expected_callbacks ();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 5ee8d0b8690..0870febeb3c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -11,7 +11,7 @@ Foo_B_i::Foo_B_i()
 {
    for (unsigned i = 0; i < 16; i++)
     {
-      op_count_[i] = 0; 
+      op_count_[i] = 0;
     }
 }
 
@@ -22,7 +22,7 @@ Foo_B_i::~Foo_B_i()
 
 
 void
-Foo_B_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_B_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[0] ++;
@@ -30,7 +30,7 @@ Foo_B_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_B_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_B_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[1] ++;
@@ -39,7 +39,7 @@ Foo_B_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_B_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_B_i::op3(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[2] ++;
@@ -49,7 +49,7 @@ Foo_B_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_B_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_B_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[3] ++;
@@ -58,18 +58,17 @@ Foo_B_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_B_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_B_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   this->op_count_[4] ++;
-  ACE_THROW (FooException());
+  throw FooException();
 }
 
 
-CORBA::Boolean 
-Foo_B_i::op6(const TimeOfDay& t, 
-             char*& message
-             ACE_ENV_ARG_DECL_NOT_USED)
+CORBA::Boolean
+Foo_B_i::op6(const TimeOfDay& t,
+             char*& message)
                         ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[5] ++;
@@ -77,14 +76,13 @@ Foo_B_i::op6(const TimeOfDay& t,
   ACE_OS::sprintf (buf, "%s %d:%d:%d", message, t.hour, t.minute, t.second);
   CORBA::string_free (message);
   message = CORBA::string_dup (buf);
-    
+
   return 1;
 }
 
 
-void 
-Foo_B_i::op7(Callback_ptr cb
-             ACE_ENV_ARG_DECL)  
+void
+Foo_B_i::op7(Callback_ptr cb)
   ACE_THROW_SPEC((CORBA::SystemException,
                   FooException))
 {
@@ -95,45 +93,41 @@ Foo_B_i::op7(Callback_ptr cb
       error_count_ ++;
       ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::op7  nil callback error_count %u\n",
         error_count_));
-      ACE_THROW (FooException ());
+      throw FooException ();
     }
   else
     {
-      cb->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      cb->test_method ();
     }
 }
 
 
-void 
-Foo_B_i::test_unbounded_string_arg(const char* message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+void
+Foo_B_i::test_unbounded_string_arg(const char* message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[7] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_string_arg ")
-  //                     ACE_TEXT("got unbounded string %s\n"), 
+  //                     ACE_TEXT("got unbounded string %s\n"),
   //                     message));
   this->in_string_[7].push_back (message);
 }
 
 
-void 
-Foo_B_i::test_bounded_string_arg(const char* message
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+void
+Foo_B_i::test_bounded_string_arg(const char* message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[8] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_string_arg ")
-  //                     ACE_TEXT("got bounded string %s\n"), 
+  //                     ACE_TEXT("got bounded string %s\n"),
   //                     message));
   this->in_string_[8].push_back (message);
 }
 
 
-void 
-Foo_B_i::test_fixed_array_arg(const Fixed_Array message
-                              ACE_ENV_ARG_DECL_NOT_USED)
+void
+Foo_B_i::test_fixed_array_arg(const Fixed_Array message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[9] ++;
@@ -141,7 +135,7 @@ Foo_B_i::test_fixed_array_arg(const Fixed_Array message
   for (unsigned i = 0; i < 19; i++)
     {
       //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_fixed_array_arg ")
-      //                     ACE_TEXT("got fixed array[i] = %d\n"), 
+      //                     ACE_TEXT("got fixed array[i] = %d\n"),
       //                     i, message[i]));
 
       if (message[i] != message[i + 1] -1)
@@ -154,27 +148,25 @@ Foo_B_i::test_fixed_array_arg(const Fixed_Array message
         }
     }
 
-  
+
   this->in_long_[9].push_back (message[0]);
 }
 
 
-void 
-Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+void
+Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message)
                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[10] ++;
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_var_size_arg ")
-  //                    ACE_TEXT("got var array chars %s\n"), 
+  //                    ACE_TEXT("got var array chars %s\n"),
   //                    message.get_buffer ()));
   this->in_string_[10].push_back (message.get_buffer ());
 }
 
 
-void 
-Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+void
+Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message)
                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[11] ++;
@@ -185,9 +177,8 @@ Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message
 }
 
 
-void 
-Foo_B_i::test_fixed_size_arg(const TimeOfDay& t
-                             ACE_ENV_ARG_DECL_NOT_USED)
+void
+Foo_B_i::test_fixed_size_arg(const TimeOfDay& t)
                            ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(t);
@@ -199,9 +190,8 @@ Foo_B_i::test_fixed_size_arg(const TimeOfDay& t
 }
 
 
-void 
-Foo_B_i::test_var_array_arg(const Var_Array messages
-                            ACE_ENV_ARG_DECL_NOT_USED)
+void
+Foo_B_i::test_var_array_arg(const Var_Array messages)
                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[13] ++;
@@ -212,7 +202,7 @@ Foo_B_i::test_var_array_arg(const Var_Array messages
   //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ")
   //                     ACE_TEXT(" %s \n"), messages[2].in ()));
   unsigned cur_client_id = 0;
-  
+
   for (unsigned i = 0 ; i < 3; i ++)
   {
     unsigned client_id = 0;
@@ -231,11 +221,11 @@ Foo_B_i::test_var_array_arg(const Var_Array messages
     {
        cur_client_id = client_id;
     }
-    else if (client_id != cur_client_id) 
+    else if (client_id != cur_client_id)
     {
        error_count_ ++;
        ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_var_array_arg:  client_id checking failed "
-        "- client_id=%u cur_client_id=%u error_count_=%u\n", 
+        "- client_id=%u cur_client_id=%u error_count_=%u\n",
         client_id, cur_client_id, error_count_));
     }
   }
@@ -243,10 +233,9 @@ Foo_B_i::test_var_array_arg(const Var_Array messages
 }
 
 
-void 
-Foo_B_i::test_special_basic_arg(CORBA::Boolean value, 
-                                CORBA::Long client_id
-                                ACE_ENV_ARG_DECL_NOT_USED)
+void
+Foo_B_i::test_special_basic_arg(CORBA::Boolean value,
+                                CORBA::Long client_id)
                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->op_count_[14] ++;
@@ -264,9 +253,8 @@ Foo_B_i::test_special_basic_arg(CORBA::Boolean value,
 }
 
 
-void 
-Foo_B_i::test_objref_arg(Callback_ptr cb
-                         ACE_ENV_ARG_DECL_NOT_USED)
+void
+Foo_B_i::test_objref_arg(Callback_ptr cb)
                             ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(cb);
@@ -277,7 +265,7 @@ Foo_B_i::test_objref_arg(Callback_ptr cb
 
 
 void
-Foo_B_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_B_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   TheAppShutdown->client_done();
@@ -285,7 +273,7 @@ Foo_B_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_B_i::gather_stats (Foo_B_Statistics& stats) 
+Foo_B_i::gather_stats (Foo_B_Statistics& stats)
 {
   for (unsigned i = 0; i < 16; i++)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
index 771eb05eca3..56d8109ed78 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
@@ -14,75 +14,64 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B
     Foo_B_i();
     virtual ~Foo_B_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)              
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void op2(CORBA::Long value)
                                     ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(CORBA::Long value)
                                     ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void op4(CORBA::Long value)
                                     ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)              
+    virtual void op5(void)
       ACE_THROW_SPEC((CORBA::SystemException, FooException));
 
-    virtual CORBA::Boolean op6(const TimeOfDay& t, 
-                               char*& message 
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Boolean op6(const TimeOfDay& t,
+                               char*& message)
                                     ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op7(Callback_ptr cb
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void op7(Callback_ptr cb)
                                     ACE_THROW_SPEC((CORBA::SystemException,
                                                     FooException));
 
-    virtual void test_unbounded_string_arg(const char* message 
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void test_unbounded_string_arg(const char* message)
                                     ACE_THROW_SPEC((CORBA::SystemException));
-  
-    virtual void test_bounded_string_arg(const char* message
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+
+    virtual void test_bounded_string_arg(const char* message)
                                     ACE_THROW_SPEC((CORBA::SystemException));
-  
-    virtual void test_fixed_array_arg(const Fixed_Array message
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+
+    virtual void test_fixed_array_arg(const Fixed_Array message)
                                     ACE_THROW_SPEC((CORBA::SystemException));
-  
-    virtual void test_var_array_arg(const Var_Array messages
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+
+    virtual void test_var_array_arg(const Var_Array messages)
                                     ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message)
                                     ACE_THROW_SPEC((CORBA::SystemException));
-    
-    virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+
+    virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message)
                                     ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void test_fixed_size_arg(const TimeOfDay& t
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void test_fixed_size_arg(const TimeOfDay& t)
                                     ACE_THROW_SPEC((CORBA::SystemException));
 
     virtual void test_special_basic_arg(CORBA::Boolean value,
-                                        CORBA::Long client_id
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                        CORBA::Long client_id)
                                     ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void test_objref_arg(Callback_ptr cb
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void test_objref_arg(Callback_ptr cb)
                                     ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)             
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    void gather_stats (Foo_B_Statistics& stats); 
+    void gather_stats (Foo_B_Statistics& stats);
 
   private:
-  
+
     LongVector in_long_ [16];
     StringVector in_string_ [16];
     unsigned op_count_ [16];
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
index fdd8b4e2671..b84640b56e0 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
@@ -18,12 +18,12 @@ Foo_C_ClientEngine::~Foo_C_ClientEngine()
 
 
 bool
-Foo_C_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
-{  
+Foo_C_ClientEngine::execute(void)
+{
   // Verify the return values and return the results.
   bool check_validity = true;
 
-  // Make sure the connection is established before making  
+  // Make sure the connection is established before making
   // remote invocations.
   if (AppHelper::validate_connection (this->obj_.in ()) == false)
     {
@@ -34,14 +34,11 @@ Foo_C_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Long i = this->client_id_;
 
-  this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->op1();
 
-  this->obj_->op2(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->op2(i);
 
-  CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::Long value = this->obj_->op3(i);
 
   if (value != i)
     {
@@ -50,31 +47,27 @@ Foo_C_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
 
   for (CORBA::Long j = 1; j <= 5; j++)
     {
-      this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      this->obj_->op4(495 + (i * 5) + j);
     }
 
   bool caught_exception = false;
-  
-  ACE_TRY
+
+  try
   {
-    this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->obj_->op5();
   }
-  ACE_CATCH (FooException, ex)
+  catch (const FooException& )
   {
     // Expected
     caught_exception = true;
   }
-  ACE_ENDTRY;
 
   if (! caught_exception)
     {
       check_validity = false;
     }
 
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->obj_->done();
 
   return check_validity;
 }
@@ -84,7 +77,7 @@ void
 Foo_C_ClientEngine::expected_results(Foo_C_Statistics& stats)
 {
   // This ClientEngine is used by remote clients.
-  stats.expected(1, 1, true); 
+  stats.expected(1, 1, true);
   stats.expected(2, 1, true);
   stats.expected(3, 1, true);
   stats.expected(4, 5, true);
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
index 54247223f04..493edfc853d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
@@ -27,7 +27,7 @@ class CSD_TP_Foo_C_Export Foo_C_ClientEngine : public ClientEngine
                        unsigned  client_id);
     virtual ~Foo_C_ClientEngine();
 
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
+    virtual bool execute(void);
 
     static void expected_results(Foo_C_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
index da6b44f7c71..260bf44b3e9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
@@ -21,9 +21,9 @@ Foo_C_Custom_ClientEngine::~Foo_C_Custom_ClientEngine()
 
 
 bool
-Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_ClientEngine::execute(void)
 {
-  // Make sure the connection is established before making  
+  // Make sure the connection is established before making
   // remote invocations.
   if (this->proxy_.validate_connection () == false)
     {
@@ -35,12 +35,9 @@ Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
   bool check_validity = true;
   CORBA::Long i = this->client_id_;
 
-  this->proxy_.op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  this->proxy_.op2(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  CORBA::Long value = this->proxy_.op3(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->proxy_.op1();
+  this->proxy_.op2(i);
+  CORBA::Long value = this->proxy_.op3(i);
 
   if (value != i)
     {
@@ -50,22 +47,19 @@ Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
 
   for (CORBA::Long j = 1; j <= 5; j++)
     {
-      this->proxy_.op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      this->proxy_.op4(495 + (i * 5) + j);
     }
 
   bool caught_exception = false;
-  ACE_TRY_EX (op5)
+  try
     {
-      this->proxy_.op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (op5);
+      this->proxy_.op5();
     }
-  ACE_CATCH (FooException, ex)
+  catch (const FooException& )
     {
       // Expected
       caught_exception = true;
     }
-  ACE_ENDTRY;
 
   if (! caught_exception)
     {
@@ -74,12 +68,9 @@ Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
 
   long cust_i = this->client_id_;
 
-  this->proxy_.cust_op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  this->proxy_.cust_op2(cust_i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  long cust_value = this->proxy_.cust_op3(cust_i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->proxy_.cust_op1();
+  this->proxy_.cust_op2(cust_i);
+  long cust_value = this->proxy_.cust_op3(cust_i);
 
   if (cust_value != i)
     {
@@ -88,32 +79,28 @@ Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
 
   for (long cust_j = 1; cust_j <= 5; cust_j++)
     {
-      this->proxy_.cust_op4(495 + (cust_i * 5) + cust_j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      this->proxy_.cust_op4(495 + (cust_i * 5) + cust_j);
     }
 
   caught_exception = false;
 
-  ACE_TRY_EX (cust_op5)
+  try
     {
-      this->proxy_.cust_op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (cust_op5)
+      this->proxy_.cust_op5();
     }
-  ACE_CATCHANY //(CustomException, ex)
+  catch (const CORBA::Exception&)//(CustomException, ex)
     {
       // Expected
       caught_exception = true;
     }
-  ACE_ENDTRY;
 
   if (! caught_exception)
     {
       check_validity = false;
     }
 
-  this->proxy_.done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  
+  this->proxy_.done();
+
   return check_validity;
 }
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
index 9d51fcddcea..ae66ab13afe 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
@@ -28,7 +28,7 @@ class CSD_TP_Foo_C_Export Foo_C_Custom_ClientEngine : public ClientEngine
                               unsigned               client_id);
     virtual ~Foo_C_Custom_ClientEngine();
 
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
+    virtual bool execute(void);
 
     static void expected_results(Foo_C_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
index 0fc2e22471a..acd49fa4665 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
@@ -15,35 +15,31 @@ Foo_C_Custom_Proxy::Foo_C_Custom_Proxy(Foo_C_i* servant,
     objref_(Foo_C::_duplicate(objref)),
     strategy_(strategy, false)
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_add_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 Foo_C_Custom_Proxy::~Foo_C_Custom_Proxy()
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_remove_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
@@ -55,99 +51,86 @@ Foo_C_Custom_Proxy::validate_connection ()
 
 
 void
-Foo_C_Custom_Proxy::op1(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::op1(void)
 {
-  this->objref_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->objref_->op1();
 }
 
 
 void
-Foo_C_Custom_Proxy::op2(CORBA::Long x ACE_ENV_ARG_DECL)
+Foo_C_Custom_Proxy::op2(CORBA::Long x)
 {
-  this->objref_->op2(x ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->objref_->op2(x);
 }
 
 
 CORBA::Long
-Foo_C_Custom_Proxy::op3(CORBA::Long x ACE_ENV_ARG_DECL)
+Foo_C_Custom_Proxy::op3(CORBA::Long x)
 {
-  CORBA::Long result = this->objref_->op3(x ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::Long result = this->objref_->op3(x);
   return result;
 }
 
 
 void
-Foo_C_Custom_Proxy::op4(CORBA::Long x ACE_ENV_ARG_DECL)
+Foo_C_Custom_Proxy::op4(CORBA::Long x)
 {
-  this->objref_->op4(x ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->objref_->op4(x);
 }
 
 
 void
-Foo_C_Custom_Proxy::op5(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::op5(void)
 {
-  this->objref_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->objref_->op5();
 }
 
 
 void
-Foo_C_Custom_Proxy::done(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::done(void)
 {
-  this->objref_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->objref_->done();
 }
 
 
 void
-Foo_C_Custom_Proxy::cust_op1(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::cust_op1(void)
 {
   Foo_C_cust_op1_Handle op = new Foo_C_cust_op1(this->servant_);
-  this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->strategy_->custom_synch_request(op.in());
 }
 
 
 void
-Foo_C_Custom_Proxy::cust_op2(long x ACE_ENV_ARG_DECL)
+Foo_C_Custom_Proxy::cust_op2(long x)
 {
   Foo_C_cust_op2_Handle op = new Foo_C_cust_op2(this->servant_, x);
-  this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->strategy_->custom_synch_request(op.in());
 }
 
 
 long
-Foo_C_Custom_Proxy::cust_op3(long x ACE_ENV_ARG_DECL)
+Foo_C_Custom_Proxy::cust_op3(long x)
 {
   Foo_C_cust_op3_Handle op = new Foo_C_cust_op3(this->servant_, x);
-  this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  int ret = op->result(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->strategy_->custom_synch_request(op.in());
+  int ret = op->result();
   return ret;
 }
 
 
 void
-Foo_C_Custom_Proxy::cust_op4(long x ACE_ENV_ARG_DECL)
+Foo_C_Custom_Proxy::cust_op4(long x)
 {
   Foo_C_cust_op4_Handle op = new Foo_C_cust_op4(this->servant_,x);
-  this->strategy_->custom_asynch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->strategy_->custom_asynch_request(op.in());
 }
 
 
 void
-Foo_C_Custom_Proxy::cust_op5(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_Custom_Proxy::cust_op5(void)
 {
   Foo_C_cust_op5_Handle op = new Foo_C_cust_op5(this->servant_);
-  this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  op->result(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->strategy_->custom_synch_request(op.in());
+  op->result();
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
index 5cd7eeae55a..c5e19bd73e4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
@@ -30,18 +30,18 @@ public:
 
   bool validate_connection ();
 
-  void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void op2(CORBA::Long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  CORBA::Long op3(CORBA::Long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  void op4(CORBA::Long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  void cust_op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void cust_op2(long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  long cust_op3(long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  void cust_op4(long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  void cust_op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void op1(void);
+  void op2(CORBA::Long x);
+  CORBA::Long op3(CORBA::Long x);
+  void op4(CORBA::Long x);
+  void op5(void);
+  void done(void);
+
+  void cust_op1(void);
+  void cust_op2(long x);
+  long cust_op3(long x);
+  void cust_op4(long x);
+  void cust_op5(void);
 
 private:
   Foo_C_i*                        servant_;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
index 3ca92e4af2e..36734cadf2b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
@@ -9,44 +9,40 @@ Foo_C_cust_op1::Foo_C_cust_op1(Foo_C_i* servant)
     cancelled_(false),
     servant_(servant)
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_add_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 Foo_C_cust_op1::~Foo_C_cust_op1()
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_remove_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 void
-Foo_C_cust_op1::result(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_cust_op1::result(void)
 {
   if (this->cancelled_)
     {
-      ACE_THROW (CancelledException());
+      throw CancelledException();
     }
 }
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
index 553cb27a6d8..b00b7d26290 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
@@ -30,7 +30,7 @@ class CSD_TP_Foo_C_Export Foo_C_cust_op1 : public TAO::CSD::TP_Custom_Request_Op
     Foo_C_cust_op1(Foo_C_i* servant);
     virtual ~Foo_C_cust_op1();
 
-    void result(ACE_ENV_SINGLE_ARG_DECL);
+    void result(void);
 
 
   protected:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
index c0bc62fb2f0..40ffbf190f9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
@@ -10,44 +10,40 @@ Foo_C_cust_op2::Foo_C_cust_op2(Foo_C_i* servant, long arg)
     cancelled_(false),
     servant_(servant)
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_add_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 Foo_C_cust_op2::~Foo_C_cust_op2()
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_remove_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 void
-Foo_C_cust_op2::result(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_cust_op2::result(void)
 {
   if (this->cancelled_)
     {
-      ACE_THROW (CancelledException());
+      throw CancelledException();
     }
 }
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
index 8a319e3b50a..9e5cc914ca7 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
@@ -30,7 +30,7 @@ class CSD_TP_Foo_C_Export Foo_C_cust_op2 : public TAO::CSD::TP_Custom_Request_Op
     Foo_C_cust_op2(Foo_C_i* servant, long arg);
     virtual ~Foo_C_cust_op2();
 
-    void result(ACE_ENV_SINGLE_ARG_DECL);
+    void result(void);
 
 
   protected:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
index b6bfad9dc67..7c65455a471 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
@@ -11,40 +11,36 @@ Foo_C_cust_op3::Foo_C_cust_op3(Foo_C_i* servant, long arg)
     cancelled_(false),
     servant_(servant)
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_add_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 Foo_C_cust_op3::~Foo_C_cust_op3()
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_remove_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 long
-Foo_C_cust_op3::result(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_cust_op3::result(void)
 {
   if (this->cancelled_)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
index 7e86e3c8a53..2f48440f835 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
@@ -30,7 +30,7 @@ class CSD_TP_Foo_C_Export Foo_C_cust_op3 : public TAO::CSD::TP_Custom_Request_Op
     Foo_C_cust_op3(Foo_C_i* servant, long arg);
     virtual ~Foo_C_cust_op3();
 
-    long result(ACE_ENV_SINGLE_ARG_DECL);
+    long result(void);
 
 
   protected:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
index 828e841990f..f4acb9c02d8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
@@ -8,34 +8,30 @@ Foo_C_cust_op4::Foo_C_cust_op4(Foo_C_i* servant, long arg)
     arg_(arg),
     servant_(servant)
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_add_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 Foo_C_cust_op4::~Foo_C_cust_op4()
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_remove_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
index 6f5b6756dda..9a165fe984c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
@@ -11,49 +11,45 @@ Foo_C_cust_op5::Foo_C_cust_op5(Foo_C_i* servant)
     cancelled_(false),
     servant_(servant)
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_add_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 Foo_C_cust_op5::~Foo_C_cust_op5()
 {
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
+  // This try-catch block is not really necessary, but we have to add it to
+  // satisfy the non-exception builds. Since there is actually no exception
   // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
+  try
   {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    servant_->_remove_ref ();
   }
-  ACE_CATCHALL
+  catch (...)
   {
   }
-  ACE_ENDTRY;
 }
 
 
 void
-Foo_C_cust_op5::result(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_cust_op5::result(void)
 {
   if (this->cancelled_)
     {
-      ACE_THROW (CancelledException());
+      throw CancelledException();
     }
 
   if (this->exception_)
     {
-      ACE_THROW (CustomException());
+      throw CustomException();
     }
 }
 
@@ -61,16 +57,14 @@ Foo_C_cust_op5::result(ACE_ENV_SINGLE_ARG_DECL)
 void
 Foo_C_cust_op5::execute_i()
 {
-  ACE_TRY_NEW_ENV
+  try
   {
-    this->servant_->cust_op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    this->servant_->cust_op5();
   }
-  ACE_CATCH (CustomException, ex)
+  catch (const CustomException& )
   {
     this->exception_ = true;
   }
-  ACE_ENDTRY;
 }
 
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
index d6963d31bbe..7c3e239daf2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
@@ -30,7 +30,7 @@ class CSD_TP_Foo_C_Export Foo_C_cust_op5 : public TAO::CSD::TP_Custom_Request_Op
     Foo_C_cust_op5(Foo_C_i* servant);
     virtual ~Foo_C_cust_op5();
 
-    void result(ACE_ENV_SINGLE_ARG_DECL);
+    void result(void);
 
 
   protected:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
index 25fadd9deef..b15bee24580 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
@@ -19,7 +19,7 @@ Foo_C_i::~Foo_C_i()
 
 
 void
-Foo_C_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_C_i::op1(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_[0];
@@ -27,7 +27,7 @@ Foo_C_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_C_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_C_i::op2(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[1].push_back (value);
@@ -36,7 +36,7 @@ Foo_C_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-Foo_C_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_C_i::op3(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[2].push_back (value);
@@ -46,7 +46,7 @@ Foo_C_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_C_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
+Foo_C_i::op4(CORBA::Long value)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->in_values_[3].push_back (value);
@@ -55,16 +55,16 @@ Foo_C_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_C_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
+Foo_C_i::op5(void)
   ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_[4];
-  ACE_THROW (FooException());
+  throw FooException();
 }
 
 
 void
-Foo_C_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
+Foo_C_i::done(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   TheAppShutdown->client_done();
@@ -72,14 +72,14 @@ Foo_C_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Foo_C_i::cust_op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Foo_C_i::cust_op1(void)
 {
   ++this->count_[5];
 }
 
 
 void
-Foo_C_i::cust_op2(long value ACE_ENV_ARG_DECL_NOT_USED)
+Foo_C_i::cust_op2(long value)
 {
   this->in_values_[6].push_back (value);
   ++this->count_[6];
@@ -87,7 +87,7 @@ Foo_C_i::cust_op2(long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 long
-Foo_C_i::cust_op3(long value ACE_ENV_ARG_DECL_NOT_USED)
+Foo_C_i::cust_op3(long value)
 {
   this->in_values_[7].push_back (value);
   ++this->count_[7];
@@ -96,7 +96,7 @@ Foo_C_i::cust_op3(long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_C_i::cust_op4(long value ACE_ENV_ARG_DECL_NOT_USED)
+Foo_C_i::cust_op4(long value)
 {
   this->in_values_[8].push_back (value);
   ++this->count_[8];
@@ -104,10 +104,10 @@ Foo_C_i::cust_op4(long value ACE_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Foo_C_i::cust_op5(ACE_ENV_SINGLE_ARG_DECL)
+Foo_C_i::cust_op5(void)
 {
   ++this->count_[9];
-  ACE_THROW (CustomException());
+  throw CustomException();
 }
 
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
index c58cfb288d4..d804d58ba00 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
@@ -14,30 +14,30 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C
     Foo_C_i();
     virtual ~Foo_C_i();
 
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
+    virtual void op1(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void op2(CORBA::Long value)
                                   ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual CORBA::Long op3(CORBA::Long value)
                                   ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void op4(CORBA::Long value)
                                   ACE_THROW_SPEC((CORBA::SystemException));
 
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
+    virtual void op5(void)
                                   ACE_THROW_SPEC((CORBA::SystemException,
                                                   FooException));
 
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
+    virtual void done(void)
       ACE_THROW_SPEC((CORBA::SystemException));
 
-    void cust_op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    void cust_op2(long value ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    long cust_op3(long value ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    void cust_op4(long value ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    void cust_op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+    void cust_op1(void);
+    void cust_op2(long value);
+    long cust_op3(long value);
+    void cust_op4(long value);
+    void cust_op5(void);
 
     void gather_stats(Foo_C_Statistics& stats);
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
index d51dfbda1b1..53680a6cd93 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
@@ -19,11 +19,10 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run_i(int argc, char* argv[])
 {
   // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
@@ -36,16 +35,13 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
     }
   // Convert the IOR string to a Foo_A object reference.
   Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(orb.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                  this->ior_.c_str());
 
   // Create the appropriate client "engine" object.
   Foo_A_ClientEngine engine(foo.in());
 
   // Execute the client algorithm
-  result = engine.execute(ACE_ENV_SINGLE_ARG_PARAMETER) ? 0 : -1;
-  ACE_CHECK_RETURN (-1);
+  result = engine.execute() ? 0 : -1;
 
   return result;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
index 1af2e9ff6a6..eade3cf3c53 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
@@ -15,7 +15,7 @@ class ClientApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
index eb0d108bfb1..5c4c0603584 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
@@ -24,11 +24,10 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run_i(int argc, char* argv[])
 {
   // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
@@ -40,20 +39,16 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  TheAppShutdown->init(orb.in(), num_clients_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TheAppShutdown->init(orb.in(), num_clients_);
 
   // Get the Root POA
   PortableServer::POA_var root_poa =
            RefHelper<PortableServer::POA>::resolve_initial_ref(orb.in(),
-                                                               "RootPOA"
-                                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                               "RootPOA");
 
   // Get the POAManager from the Root POA.
   PortableServer::POAManager_var poa_manager
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -64,24 +59,21 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
                               AppHelper::create_poa("ChildPoa",
                                                     root_poa.in(),
                                                     poa_manager.in(),
-                                                    policies
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                    policies);
 
 
   // Create the thread pool servant dispatching strategy object, and
   // hold it in a (local) smart pointer variable.
   TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_strategy =
                                                  new TAO::CSD::TP_Strategy();
-                                                 
+
   // Tell the strategy to apply itself to the child poa.
-  if (csd_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
+  if (csd_strategy->apply_to(child_poa.in()) == false)
     {
       ACE_ERROR((LM_ERROR,
                  "Failed to apply CSD strategy to child poa.\n"));
       return -1;
     }
-  ACE_CHECK_RETURN (-1);
 
   // Create the servant object.
   Foo_A_i* servant = new Foo_A_i();
@@ -92,27 +84,21 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   // Obtain the object reference using the servant
   CORBA::Object_var obj = AppHelper::activate_servant(child_poa.in(),
-                                                      servant
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                      servant);
 
   // Stringify and save the object reference to a file
   AppHelper::ref_to_file(orb.in(),
                          obj.in(),
-                         this->ior_filename_.c_str()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                         this->ior_filename_.c_str());
 
   // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
 
   // Run the ORB event loop.
-  orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->run ();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp ORB event loop has completed.\n"));
@@ -128,14 +114,12 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is destroying the Root POA.\n"));
 
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy(1, 1);
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is destroying the ORB.\n"));
 
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->destroy();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp has completed running successfully.\n"));
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
index 3bfe10e6f0a..f86a60b5bf2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
@@ -16,7 +16,7 @@ class ServerApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
index 531dba15f17..cd2c1607b6b 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
@@ -21,30 +21,26 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->init(argc, argv);
   if (result != 0)
     {
       return result;
     }
 
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->client_setup();
 
-  result = this->run_engine(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->run_engine();
   this->cleanup();
   return result;
 }
 
 
 int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -55,13 +51,11 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::client_setup(void)
 {
   // Turn the ior_ into a Foo_A obj ref.
   Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(this->orb_.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  this->ior_.c_str());
 
   // Create the ClientEngine object, and give it the Foo_A obj ref.
   this->engine_ = new Foo_A_ClientEngine(foo.in(), this->client_id_);
@@ -69,10 +63,9 @@ ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-ClientApp::run_engine(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::run_engine(void)
 {
-  bool result = this->engine_->execute(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  bool result = this->engine_->execute();
   return result ? 0 : -1;
 }
 
@@ -107,7 +100,7 @@ ClientApp::parse_args(int argc, char* argv[])
                   c,
                   "client_kind");
           break;
-        
+
         case 'n':
           result = set_arg(this->client_id_,
                   get_opts.opt_arg(),
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
index d5bb80cf800..e49890697b6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
@@ -17,14 +17,14 @@ class ClientApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    int  run_engine(ACE_ENV_SINGLE_ARG_DECL);
+    int init(int argc, char* argv[]);
+    void client_setup(void);
+    int  run_engine(void);
     void cleanup();
 
     // Helper methods used by the methods above.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index f291baacad4..a889a00c118 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -30,101 +30,87 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->init(argc, argv);
   if (result != 0)
     {
       return result;
     }
-  
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  this->poa_setup();
+  this->csd_setup();
+  this->servant_setup();
   this->collocated_setup();
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_activate();
+  this->run_collocated_clients();
+  this->run_orb_event_loop();
 
   // Calling wait on ACE_Thread_Manager singleton to avoid the problem
   // that the main thread might exit before all CSD Threads exit.
 
   // Wait for all CSD task threads exit.
   ACE_Thread_Manager::instance ()->wait ();
-  
+
   this->cleanup();
   return this->check_validity () ? 0 : -1;
 }
 
 
 int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
   int result = this->parse_args(argc, argv);
-  
+
   if (result != 0)
     {
       return result;
     }
-  
+
   unsigned num_clients = this->num_remote_clients_ +
                          this->num_collocated_clients_;
 
-  TheAppShutdown->init (this->orb_.in (), num_clients ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TheAppShutdown->init (this->orb_.in (), num_clients);
 
   return 0;
 }
 
 
 void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_setup(void)
 {
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_ = this->create_poa(this->orb_.in(),
+                                "ChildPoa");
 }
 
 
 void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::csd_setup(void)
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
+  if (!this->tp_strategy_->apply_to(this->poa_.in()))
     {
       ACE_ERROR((LM_ERROR,
                  "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
+      throw TestAppException();
     }
-  ACE_CHECK;
 }
 
 
 void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::servant_setup(void)
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
                                       this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      this->ior_filename_prefix_.c_str());
 }
 
 
@@ -145,36 +131,33 @@ ServerApp::collocated_setup()
 
 
 void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_activate(void)
 {
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POAManager_var poa_manager
+    = this->poa_->the_POAManager();
 
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate();
 }
 
 
 void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_collocated_clients(void)
 {
   if (this->num_collocated_clients_ > 0)
     {
       if (this->collocated_client_task_.open() == -1)
         {
-          ACE_THROW (TestAppException ());
+          throw TestAppException ();
         }
     }
 }
 
 
 void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_orb_event_loop(void)
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_runner.run();
   TheAppShutdown->wait ();
 }
 
@@ -287,7 +270,7 @@ ServerApp::usage_statement()
 int
 ServerApp::arg_dependency_checks()
 {
-  return (this->num_remote_clients_ 
+  return (this->num_remote_clients_
          + this->num_collocated_clients_) > 0 ? 0 : -1;
 }
 
@@ -316,21 +299,17 @@ ServerApp::set_arg(unsigned&   value,
 
 
 PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name
-                      ACE_ENV_ARG_DECL)
+ServerApp::create_poa(CORBA::ORB_ptr orb,
+                      const char* poa_name)
 {
   // Get the Root POA.
   PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb,
+                                                          "RootPOA");
 
   // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -340,9 +319,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb,
   PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
                                                       root_poa.in(),
                                                       poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                      policies);
 
   // Give away the child POA_ptr from the POA_var variable.
   return poa._retn();
@@ -353,7 +330,7 @@ bool
 ServerApp::check_validity ()
 {
   // Check whether the clients return any errors.
-  if (this->num_collocated_clients_ > 0 
+  if (this->num_collocated_clients_ > 0
     && this->collocated_client_task_.failure_count () > 0)
     {
       return false;
@@ -363,7 +340,7 @@ ServerApp::check_validity ()
                          this->num_collocated_clients_;
 
   Foo_A_Statistics stats (num_clients);
-  
+
   Foo_A_ClientEngine::expected_results (stats);
 
   for (unsigned i = 0; i < this->num_servants_; i++)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
index 73b5ccbbd94..e08d7caec33 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
@@ -20,20 +20,20 @@ class ServerApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
+    int init(int argc, char* argv[]);
+    void poa_setup(void);
+    void csd_setup(void);
+    void servant_setup(void);
     void collocated_setup();
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
+    void poa_activate(void);
+    void run_collocated_clients(void);
+    void run_orb_event_loop(void);
     bool check_validity ();
     void cleanup();
 
@@ -52,8 +52,7 @@ class ServerApp : public TestAppBase
 
 
     PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
+                                       const char* poa_name);
 
     typedef ServantList<Foo_A_i> ServantListType;
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index 147b5ca43cf..ef9a37a5987 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -29,26 +29,20 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
+  int result = this->init(argc, argv);
+  if (result != 0)
     {
       return result;
     }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  this->poa_setup();
+  this->csd_setup();
+  this->client_setup();
+  this->poa_activate();
   this->run_clients();
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->run_orb_event_loop();
 
   // Calling wait on ACE_Thread_Manager singleton to avoid the problem
   // that the main thread might exit before all CSD Threads exit.
@@ -64,10 +58,9 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -79,69 +72,59 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  TheAppShutdown->init(this->orb_.in(), num_servants_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TheAppShutdown->init(this->orb_.in(), num_servants_);
 
   return 0;
 }
 
 
 void
-ClientApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::poa_setup(void)
 {
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_ = this->create_poa(this->orb_.in(),
+                                "ChildPoa");
 }
 
 
 void
-ClientApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::csd_setup(void)
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
+  if (!this->tp_strategy_->apply_to(this->poa_.in()))
     {
       ACE_ERROR((LM_ERROR,
                  "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
+      throw TestAppException();
     }
-  ACE_CHECK;
 }
 
 
 void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::client_setup(void)
 {
   // Turn the ior_ into a Foo_B obj ref.
   Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
+                                                  this->ior_.c_str());
+
   this->servants_.create_and_activate(1, // number of callback servants
-                                      this->poa_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      this->poa_.in());
   ServantListType::T_stub_var cb = this->servants_.objref(0);
 
-  // Create the ClientEngine object, and give it the Foo_B and Callback object 
+  // Create the ClientEngine object, and give it the Foo_B and Callback object
   // references.
-  ClientEngine_Handle engine 
+  ClientEngine_Handle engine
     = new Foo_B_ClientEngine(foo.in(), cb.in (), this->client_id_);
   this->client_task_.add_engine(engine.in());
 }
 
 
 void
-ClientApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::poa_activate(void)
 {
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POAManager_var poa_manager
+    = this->poa_->the_POAManager();
+  poa_manager->activate();
 }
 
 
@@ -153,31 +136,26 @@ ClientApp::run_clients()
 
 
 void
-ClientApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::run_orb_event_loop(void)
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_runner.run();
   TheAppShutdown->wait ();
 }
 
 
 PortableServer::POA_ptr
-ClientApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name 
-                      ACE_ENV_ARG_DECL)
+ClientApp::create_poa(CORBA::ORB_ptr orb,
+                      const char* poa_name)
 {
   // Get the Root POA.
   PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb,
+                                                          "RootPOA");
 
   // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -187,9 +165,7 @@ ClientApp::create_poa(CORBA::ORB_ptr orb,
   PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
                                                       root_poa.in(),
                                                       poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                      policies);
 
   // Give away the child POA_ptr from the POA_var variable.
   return poa._retn();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
index 2eb6f23bd39..f39500be7d4 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
@@ -21,19 +21,19 @@ class ClientApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
+    int init(int argc, char* argv[]);
+    void poa_setup(void);
+    void csd_setup(void);
+    void client_setup(void);
+    void poa_activate(void);
     void run_clients();
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
+    void run_orb_event_loop(void);
     bool check_validity ();
     void cleanup();
 
@@ -50,8 +50,7 @@ class ClientApp : public TestAppBase
     int arg_dependency_checks();
 
     PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
+                                       const char* poa_name);
 
 
     typedef ServantList<Callback_i> ServantListType;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 883a0dec322..17e721f012d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -32,33 +32,25 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
+  int result = this->init(argc, argv);
+  if (result != 0)
     {
       return result;
     }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->collocated_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  this->poa_setup();
+  this->csd_setup();
+  this->servant_setup();
+  this->collocated_setup();
+  this->poa_activate();
+  this->run_collocated_clients();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
 
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->run_orb_event_loop();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp ORB event loop has completed.\n"));
@@ -80,10 +72,9 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -98,85 +89,74 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
   unsigned num_clients = this->num_remote_clients_ +
                          this->num_collocated_clients_;
 
-  TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TheAppShutdown->init(this->orb_.in(), num_clients);
 
   return 0;
 }
 
 
 void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_setup(void)
 {
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
+  this->poa_ = this->create_poa(this->orb_.in(),
+                                "ChildPoa");
+
   if (this->num_collocated_clients_ > 0)
     {
-      this->cb_poa_ = this->create_poa(this->orb_.in(), 
-                                       "CallbackPoa" 
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->cb_poa_ = this->create_poa(this->orb_.in(),
+                                       "CallbackPoa");
     }
 }
 
 void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::csd_setup(void)
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
+  if (!this->tp_strategy_->apply_to(this->poa_.in()))
     {
       ACE_ERROR((LM_ERROR,
                  "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
+      throw TestAppException();
     }
-  ACE_CHECK;
 
   // Use another poa and strategy for callbacks. This would resolve
-  // the deadlock situation that happens when having number of csd 
+  // the deadlock situation that happens when having number of csd
   // threads less than number of collocated clients.
   if (this->num_collocated_clients_ > 0)
     {
       this->cb_tp_strategy_ = new TAO::CSD::TP_Strategy();
-      if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in() ACE_ENV_ARG_PARAMETER))
+      if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in()))
         {
           ACE_ERROR((LM_ERROR,
             "Failed to apply CSD strategy to callback poa.\n"));
-          ACE_THROW(TestAppException());
-        } 
-      ACE_CHECK;
+          throw TestAppException();
+        }
     }
 }
 
 
 void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::servant_setup(void)
 {
   this->foo_servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
                                       this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      this->ior_filename_prefix_.c_str());
 }
 
 
 void
-ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::collocated_setup(void)
 {
   if (this->num_collocated_clients_ == 0)
     return;
 
   this->cb_servants_.create_and_activate(1, // number of callback servants
-                                         this->cb_poa_.in()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                         this->cb_poa_.in());
 
   CallbackServantListType::T_stub_var cb = this->cb_servants_.objref(0);
-  
+
   unsigned client_id = this->num_remote_clients_;
 
   for (unsigned i = 0; i < this->num_collocated_clients_; i++)
@@ -185,9 +165,9 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL)
       // Dole out the servant object references in a round-robin fashion.
       unsigned servant_index = i % this->num_servants_;
 
-      FooServantListType::T_stub_var foo 
+      FooServantListType::T_stub_var foo
         = this->foo_servants_.objref(servant_index);
-      ClientEngine_Handle engine 
+      ClientEngine_Handle engine
         = new Foo_B_ClientEngine(foo.in(), cb.in (), client_id, true);
       this->collocated_client_task_.add_engine(engine.in());
     }
@@ -195,35 +175,32 @@ ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_activate(void)
 {
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POAManager_var poa_manager
+    = this->poa_->the_POAManager();
+  poa_manager->activate();
 }
 
 
 void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_collocated_clients(void)
 {
   if (this->num_collocated_clients_ > 0)
     {
       if (this->collocated_client_task_.open() == -1)
         {
-          ACE_THROW (TestAppException ());
+          throw TestAppException ();
         }
     }
 }
 
 
 void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_orb_event_loop(void)
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_runner.run();
   TheAppShutdown->wait ();
 }
 
@@ -336,7 +313,7 @@ ServerApp::usage_statement()
 int
 ServerApp::arg_dependency_checks()
 {
-  return (this->num_remote_clients_ 
+  return (this->num_remote_clients_
           + this->num_collocated_clients_) > 0 ? 0 : -1;
 }
 
@@ -365,21 +342,17 @@ ServerApp::set_arg(unsigned&   value,
 
 
 PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name 
-                      ACE_ENV_ARG_DECL)
+ServerApp::create_poa(CORBA::ORB_ptr orb,
+                      const char* poa_name)
 {
   // Get the Root POA.
   PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA" 
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb,
+                                                          "RootPOA");
 
   // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  PortableServer::POAManager_var poa_manager
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -389,9 +362,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb,
   PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
                                                       root_poa.in(),
                                                       poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                      policies);
 
   // Give away the child POA_ptr from the POA_var variable.
   return poa._retn();
@@ -402,7 +373,7 @@ bool
 ServerApp::check_validity ()
 {
   // Check whether the clients return any errors.
-  if (this->num_collocated_clients_ > 0 
+  if (this->num_collocated_clients_ > 0
     && this->collocated_client_task_.failure_count () > 0)
     {
       return false;
@@ -410,7 +381,7 @@ ServerApp::check_validity ()
 
   Foo_B_Statistics stats (this->num_remote_clients_,
                           this->num_collocated_clients_);
-  
+
   Foo_B_ClientEngine::expected_results (stats);
 
   for (unsigned i = 0; i < this->num_servants_; i++)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
index 12af1ec455b..aafbff9441d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
@@ -21,20 +21,20 @@ class ServerApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int  init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void collocated_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
+    int  init(int argc, char* argv[]);
+    void poa_setup(void);
+    void csd_setup(void);
+    void servant_setup(void);
+    void collocated_setup(void);
+    void poa_activate(void);
+    void run_collocated_clients(void);
+    void run_orb_event_loop(void);
     bool check_validity ();
     void cleanup();
 
@@ -53,8 +53,7 @@ class ServerApp : public TestAppBase
 
 
     PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
+                                       const char* poa_name);
 
     typedef ServantList<Foo_B_i> FooServantListType;
     typedef ServantList<Callback_i> CallbackServantListType;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
index 57520df303c..b05afba0e29 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
@@ -21,20 +21,17 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
+  int result = this->init(argc, argv);
+  if (result != 0)
     {
       return result;
     }
-  ACE_CHECK_RETURN (-1);
 
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->client_setup();
 
-  result = this->run_engine(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  result = this->run_engine();
 
   this->cleanup();
 
@@ -43,10 +40,9 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -57,13 +53,11 @@ ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::client_setup(void)
 {
   // Turn the ior_ into a Foo_C obj ref.
   Foo_C_var foo = RefHelper<Foo_C>::string_to_ref(this->orb_.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                  this->ior_.c_str());
 
   // Create the ClientEngine object, and give it the Foo_C obj ref.
   this->engine_ = new Foo_C_ClientEngine(foo.in(), this->client_id_);
@@ -71,10 +65,9 @@ ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-ClientApp::run_engine(ACE_ENV_SINGLE_ARG_DECL)
+ClientApp::run_engine(void)
 {
-  bool result = this->engine_->execute(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  bool result = this->engine_->execute();
 
   return result ? 0 : -1;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
index e2f7bf6fc06..ef77a2f1c9c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
@@ -17,15 +17,15 @@ class ClientApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    int  run_engine(ACE_ENV_SINGLE_ARG_DECL);
+    int init(int argc, char* argv[]);
+    void client_setup(void);
+    int  run_engine(void);
     void cleanup();
 
     // Helper methods used by the methods above.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 9ce517c4863..00e668c62bc 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -32,28 +32,21 @@ ServerApp::~ServerApp()
 
 
 int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run_i(int argc, char* argv[])
 {
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
+  int result = this->init(argc, argv);
   if (result != 0)
     {
       return result;
     }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+
+  this->poa_setup();
+  this->csd_setup();
+  this->servant_setup();
   this->collocated_setup();
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_activate();
+  this->run_collocated_clients();
+  this->run_orb_event_loop();
 
   // Calling wait on ACE_Thread_Manager singleton to avoid the problem
   // that the main thread might exit before all CSD Threads exit.
@@ -67,10 +60,9 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
 
 int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::init(int argc, char* argv[])
 {
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
@@ -85,47 +77,41 @@ ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
   unsigned num_clients = this->num_remote_clients_ +
                          this->num_collocated_clients_;
 
-  TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TheAppShutdown->init(this->orb_.in(), num_clients);
 
   return 0;
 }
 
 
 void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_setup(void)
 {
   this->poa_ = this->create_poa(this->orb_.in(),
-                                "ChildPoa"
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                "ChildPoa");
 }
 
 
 void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::csd_setup(void)
 {
   this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
 
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
+  if (!this->tp_strategy_->apply_to(this->poa_.in()))
     {
       ACE_ERROR((LM_ERROR,
                  "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
+      throw TestAppException();
     }
-  ACE_CHECK;
 }
 
 
 void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::servant_setup(void)
 {
   this->servants_.create_and_activate(this->num_servants_,
                                       this->orb_.in (),
                                       this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      this->ior_filename_prefix_.c_str());
 }
 
 
@@ -157,36 +143,33 @@ ServerApp::collocated_setup()
 
 
 void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::poa_activate(void)
 {
   PortableServer::POAManager_var poa_manager
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    = this->poa_->the_POAManager();
 
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate();
 }
 
 
 void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_collocated_clients(void)
 {
   if (this->num_collocated_clients_ > 0)
     {
       if (this->collocated_client_task_.open() == -1)
         {
-          ACE_THROW (TestAppException ());
+          throw TestAppException ();
         }
     }
 }
 
 
 void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
+ServerApp::run_orb_event_loop(void)
 {
   OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_runner.run();
   TheAppShutdown->wait ();
 }
 
@@ -340,20 +323,16 @@ ServerApp::set_arg(unsigned&   value,
 
 PortableServer::POA_ptr
 ServerApp::create_poa(CORBA::ORB_ptr orb,
-                      const char* poa_name
-                      ACE_ENV_ARG_DECL)
+                      const char* poa_name)
 {
   // Get the Root POA.
   PortableServer::POA_var root_poa
     = RefHelper<PortableServer::POA>::resolve_initial_ref(orb,
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                                          "RootPOA");
 
   // Get the POAManager from the Root POA.
   PortableServer::POAManager_var poa_manager
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -364,9 +343,7 @@ ServerApp::create_poa(CORBA::ORB_ptr orb,
     = AppHelper::create_poa(poa_name,
                             root_poa.in(),
                             poa_manager.in(),
-                            policies
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                            policies);
 
   // Give away the child POA_ptr from the POA_var variable.
   return poa._retn();
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
index 99f0af758b5..4433a097a07 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
@@ -20,20 +20,20 @@ class ServerApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
 
     // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
+    int init(int argc, char* argv[]);
+    void poa_setup(void);
+    void csd_setup(void);
+    void servant_setup(void);
     void collocated_setup();
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
+    void poa_activate(void);
+    void run_collocated_clients(void);
+    void run_orb_event_loop(void);
     bool check_validity ();
     void cleanup();
 
@@ -52,8 +52,7 @@ class ServerApp : public TestAppBase
 
 
     PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
+                                       const char* poa_name);
 
     typedef ServantList<Foo_C_i> ServantListType;
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
index 70af3ea8a11..3bb0a772b76 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
@@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
index 1a404058944..6131e1a3c88 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
index f85722246b5..9f58a01ac0f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -62,25 +59,20 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
index bd2b023e2b7..02ce72b434d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
@@ -40,19 +40,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,8 +57,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,12 +69,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -90,30 +84,24 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // Wait for all CSD task threads exit.
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
index 38dd8c26647..996275e4897 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
@@ -22,11 +22,10 @@ ClientApp::~ClientApp()
 
 
 int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ClientApp::run_i(int argc, char* argv[])
 {
   // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
@@ -39,16 +38,13 @@ ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
     }
   // Convert the IOR string to a Foo_A object reference.
   Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(orb.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                  this->ior_.c_str());
 
   // Create the appropriate client "engine" object.
   Foo_A_ClientEngine engine(foo.in());
 
   // Execute the client algorithm
-  result = engine.execute(ACE_ENV_SINGLE_ARG_PARAMETER) ? 0 : -1;
-  ACE_CHECK_RETURN (-1);
+  result = engine.execute() ? 0 : -1;
 
   return result;
 }
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
index 1af2e9ff6a6..eade3cf3c53 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
@@ -15,7 +15,7 @@ class ClientApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
index c4af3802881..58ecddfcf36 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
@@ -22,11 +22,10 @@ ServerApp::~ServerApp()
 }
 
 int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
+ServerApp::run_i(int argc, char* argv[])
 {
   // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
   // Parse the command-line args for this application.
   // * Returns -1 if problems are encountered.
@@ -38,20 +37,16 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
       return result;
     }
 
-  TheAppShutdown->init(orb.in(), num_clients_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  TheAppShutdown->init(orb.in(), num_clients_);
 
   // Get the Root POA
   PortableServer::POA_var root_poa =
            RefHelper<PortableServer::POA>::resolve_initial_ref(orb.in(),
-                                                               "RootPOA"
-                                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                               "RootPOA");
 
   // Get the POAManager from the Root POA.
   PortableServer::POAManager_var poa_manager
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    = root_poa->the_POAManager();
 
   // Create the child POA Policies.
   CORBA::PolicyList policies(0);
@@ -62,9 +57,7 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
                               AppHelper::create_poa("ChildPoa",
                                                     root_poa.in(),
                                                     poa_manager.in(),
-                                                    policies
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                    policies);
 
   // Create the servant object.
   Foo_A_i* servant = new Foo_A_i();
@@ -75,27 +68,21 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
 
   // Obtain the object reference using the servant
   CORBA::Object_var obj = AppHelper::activate_servant(child_poa.in(),
-                                                      servant
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                      servant);
 
   // Stringify and save the object reference to a file
   AppHelper::ref_to_file(orb.in(),
                          obj.in(),
-                         this->ior_filename_.c_str()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                         this->ior_filename_.c_str());
 
   // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
 
   // Run the ORB event loop.
-  orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->run ();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp ORB event loop has completed.\n"));
@@ -111,14 +98,12 @@ ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is destroying the Root POA.\n"));
 
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy(1, 1);
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp is destroying the ORB.\n"));
 
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  orb->destroy();
 
   ACE_DEBUG((LM_DEBUG,
              "(%P|%t) ServerApp has completed running successfully.\n"));
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
index 3bfe10e6f0a..f86a60b5bf2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
@@ -16,7 +16,7 @@ class ServerApp : public TestAppBase
 
   protected:
 
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
+    virtual int run_i(int argc, char* argv[]);
 
 
   private:
diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp
index 8d28b7d9bc5..309a24676b8 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.cpp
+++ b/TAO/tests/Cache_Growth_Test/Hello.cpp
@@ -14,7 +14,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
@@ -27,8 +27,8 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h
index 1a404058944..6131e1a3c88 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.h
+++ b/TAO/tests/Cache_Growth_Test/Hello.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp
index 167a3e08b27..375b3e676ff 100644
--- a/TAO/tests/Cache_Growth_Test/client.cpp
+++ b/TAO/tests/Cache_Growth_Test/client.cpp
@@ -42,22 +42,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -68,28 +65,23 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
       if (do_shutdown)
         {
-          hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          hello->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp
index ef867fc77aa..1ffed9e75a4 100644
--- a/TAO/tests/Cache_Growth_Test/server.cpp
+++ b/TAO/tests/Cache_Growth_Test/server.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +66,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -87,27 +81,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp
index 7b310b57b2f..60c5e152398 100644
--- a/TAO/tests/CallbackTest/Callback.cpp
+++ b/TAO/tests/CallbackTest/Callback.cpp
@@ -11,7 +11,7 @@ Callback::Callback (CORBA::ORB_ptr orb)
 }
 
 CORBA::Boolean
-Callback::are_you_there (CORBA::String_out answer ACE_ENV_ARG_DECL_NOT_USED)
+Callback::are_you_there (CORBA::String_out answer)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -23,7 +23,7 @@ Callback::are_you_there (CORBA::String_out answer ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Callback::test_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Callback::test_oneway (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -31,11 +31,11 @@ Callback::test_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Callback::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Callback::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Callback - shutdown!\n"));
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/CallbackTest/Callback.h b/TAO/tests/CallbackTest/Callback.h
index 81f26ac880a..cc0e453bcc1 100644
--- a/TAO/tests/CallbackTest/Callback.h
+++ b/TAO/tests/CallbackTest/Callback.h
@@ -17,13 +17,13 @@ public:
   Callback (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Boolean are_you_there (CORBA::String_out answer ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean are_you_there (CORBA::String_out answer)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void test_oneway (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void test_oneway (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp
index 9eca34c0d58..f1d7494b043 100644
--- a/TAO/tests/CallbackTest/Service.cpp
+++ b/TAO/tests/CallbackTest/Service.cpp
@@ -22,17 +22,14 @@ Service::dump_results (void)
 }
 
 void
-Service::run_test (Test::Callback_ptr callback
-                   ACE_ENV_ARG_DECL)
+Service::run_test (Test::Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int exceptions =
-    this->call_are_you_there (callback ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->call_are_you_there (callback);
 
   exceptions +=
-    this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->call_test_oneway (callback);
 
   if (exceptions != 0)
     {
@@ -43,25 +40,22 @@ Service::run_test (Test::Callback_ptr callback
   /// Increment the number of tests completed
   this->test_count_++;
 
-  ACE_TRY
+  try
     {
-      callback->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      callback->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_ERROR, "(%P|%t) - Service, client shutdown FAILED\n"));
     }
-  ACE_ENDTRY;
 
   // shutdown ourselves
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 
 int
-Service::call_are_you_there (Test::Callback_ptr callback
-                             ACE_ENV_ARG_DECL)
+Service::call_are_you_there (Test::Callback_ptr callback)
   ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n"));
@@ -72,16 +66,14 @@ Service::call_are_you_there (Test::Callback_ptr callback
     {
       char* outstr;
       CORBA::String_out out_str (outstr);
-      ACE_TRY
+      try
         {
-          (void) callback->are_you_there (out_str ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) callback->are_you_there (out_str);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           exception_count++;
         }
-      ACE_ENDTRY;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, answer = %s\n", outstr));
     }
@@ -89,8 +81,7 @@ Service::call_are_you_there (Test::Callback_ptr callback
 }
 
 int
-Service::call_test_oneway (Test::Callback_ptr callback
-                           ACE_ENV_ARG_DECL)
+Service::call_test_oneway (Test::Callback_ptr callback)
   ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n"));
@@ -99,16 +90,14 @@ Service::call_test_oneway (Test::Callback_ptr callback
   int exception_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      ACE_TRY
+      try
         {
-          (void) callback->test_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) callback->test_oneway ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           exception_count++;
         }
-      ACE_ENDTRY;
     }
   return exception_count;
 }
diff --git a/TAO/tests/CallbackTest/Service.h b/TAO/tests/CallbackTest/Service.h
index f8773771eb4..a3b5f905c89 100644
--- a/TAO/tests/CallbackTest/Service.h
+++ b/TAO/tests/CallbackTest/Service.h
@@ -23,8 +23,7 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void run_test (Test::Callback_ptr callback
-                         ACE_ENV_ARG_DECL)
+  virtual void run_test (Test::Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -32,16 +31,14 @@ private:
   /**
    * @return Number of exceptions raised
    */
-  int call_are_you_there (Test::Callback_ptr callback
-                          ACE_ENV_ARG_DECL)
+  int call_are_you_there (Test::Callback_ptr callback)
     ACE_THROW_SPEC (());
 
   /// Call the test_oneway method mutiple times.
   /**
    * @return Number of exceptions raised
    */
-  int call_test_oneway (Test::Callback_ptr callback
-                        ACE_ENV_ARG_DECL)
+  int call_test_oneway (Test::Callback_ptr callback)
     ACE_THROW_SPEC (());
 
 private:
diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp
index c83089e148d..35f36497bd8 100644
--- a/TAO/tests/CallbackTest/client.cpp
+++ b/TAO/tests/CallbackTest/client.cpp
@@ -38,19 +38,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,19 +55,14 @@ 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 ();
 
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_object =
-          orb->resolve_initial_references("ORBPolicyManager"
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->resolve_initial_references("ORBPolicyManager");
         CORBA::PolicyManager_var policy_manager =
-          CORBA::PolicyManager::_narrow(manager_object.in()
-                                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          CORBA::PolicyManager::_narrow(manager_object.in());
 
         if (CORBA::is_nil (policy_manager.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -81,29 +73,22 @@ main (int argc, char *argv[])
         CORBA::PolicyList policies(1); policies.length(1);
         policies[0] =
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         policy_manager->set_policy_overrides (policies,
-                                              CORBA::ADD_OVERRIDE
-                                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                              CORBA::ADD_OVERRIDE);
 
-        policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        policies[0]->destroy ();
       }
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Service_var service =
-        Test::Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Service::_narrow(tmp.in ());
 
       if (CORBA::is_nil (service.in ()))
         {
@@ -120,37 +105,29 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(callback_impl);
 
       Test::Callback_var callback =
-        callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        callback_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) client - starting test\n"));
 
-      service->run_test (callback.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      service->run_test (callback.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) client - running ORB\n"));
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp
index 07c1e010f40..4017a6a9d42 100644
--- a/TAO/tests/CallbackTest/server.cpp
+++ b/TAO/tests/CallbackTest/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,19 +56,14 @@ 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 ();
 
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_object =
-          orb->resolve_initial_references("ORBPolicyManager"
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->resolve_initial_references("ORBPolicyManager");
         CORBA::PolicyManager_var policy_manager =
-          CORBA::PolicyManager::_narrow(manager_object.in()
-                                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          CORBA::PolicyManager::_narrow(manager_object.in());
 
         if (CORBA::is_nil (policy_manager.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,17 +74,12 @@ main (int argc, char *argv[])
         CORBA::PolicyList policies(1); policies.length(1);
         policies[0] =
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         policy_manager->set_policy_overrides (policies,
-                                              CORBA::ADD_OVERRIDE
-                                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                              CORBA::ADD_OVERRIDE);
 
-        policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        policies[0]->destroy ();
       }
 
       if (parse_args (argc, argv) != 0)
@@ -105,12 +92,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(service_impl);
 
       Test::Service_var service =
-        service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        service_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (service.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -122,29 +107,23 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "Event loop finished\n"));
 
       service_impl->dump_results ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp
index 2ae166c58be..1628e3d48d5 100644
--- a/TAO/tests/Client_Leaks/Client_Task.cpp
+++ b/TAO/tests/Client_Leaks/Client_Task.cpp
@@ -24,19 +24,16 @@ int
 Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   int successful_calls = 0;
 
-  ACE_TRY
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       for (int i = 0; i != this->iterations_; ++i)
         {
-          int retval = this->one_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int retval = this->one_iteration ();
 
           if (retval != 0)
             successful_calls++;
@@ -49,13 +46,11 @@ Client_Task::svc (void)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
@@ -65,52 +60,44 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (void)
 {
-  ACE_TRY
+  try
     {
       for (int i = 0; i != 100; ++i)
         {
-          (void) this->process_factory_->noop (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->process_factory_->noop ();
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& )
     {
       // Ignore transient exceptions
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
-Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::one_iteration (void)
 {
-  ACE_TRY
+  try
     {
       Test::Process_var process =
-        this->process_factory_->create_new_process (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->process_factory_->create_new_process ();
 
-      (void) process->get_process_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) process->get_process_id ();
 
-      process->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      process->shutdown ();
 
       return 1;
     }
-  ACE_CATCH(Test::Spawn_Failed, ignored)
+  catch (const Test::Spawn_Failed& )
     {
       // Ignore this exception, it is usually caused by a transient
       // condition
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h
index 573697926b1..b6df65e973e 100644
--- a/TAO/tests/Client_Leaks/Client_Task.h
+++ b/TAO/tests/Client_Leaks/Client_Task.h
@@ -29,10 +29,10 @@ public:
 
 private:
   /// Run one iteration of the test
-  int one_iteration (ACE_ENV_SINGLE_ARG_DECL);
+  int one_iteration (void);
 
   /// Make sure that the thread has a connection available
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp
index 54a6acd58f3..9985fcfdfe0 100644
--- a/TAO/tests/Client_Leaks/Process.cpp
+++ b/TAO/tests/Client_Leaks/Process.cpp
@@ -12,16 +12,15 @@ Process::Process (CORBA::ORB_ptr orb)
 }
 
 CORBA::Long
-Process::get_process_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Process::get_process_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ACE_OS::getpid ();
 }
 
 void
-Process::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Process::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h
index 4118fc33d58..66e56de62de 100644
--- a/TAO/tests/Client_Leaks/Process.h
+++ b/TAO/tests/Client_Leaks/Process.h
@@ -17,10 +17,10 @@ public:
   Process (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Long get_process_id (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long get_process_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index f1039150d26..e4ab9cf4544 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -20,24 +20,21 @@ Process_Factory::shutdown_received (void)
 }
 
 Test::Process_ptr
-Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL)
+Process_Factory::create_new_process (void)
   ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed))
 {
   Startup_Callback *startup_callback_impl;
   ACE_NEW_THROW_EX (startup_callback_impl,
                     Startup_Callback,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Test::Process::_nil ());
 
   PortableServer::ServantBase_var owner_transfer(startup_callback_impl);
 
   Test::Startup_Callback_var startup_callback =
-    startup_callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Test::Process::_nil ());
+    startup_callback_impl->_this ();
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (startup_callback.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Test::Process::_nil ());
+    this->orb_->object_to_string (startup_callback.in ());
 
   const char* argv[3] = {
     "child",
@@ -68,28 +65,23 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i != 500 && !process_has_started; ++i)
     {
       ACE_Time_Value interval (0, 10000);
-      this->orb_->perform_work (interval ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (Test::Process::_nil ());
+      this->orb_->perform_work (interval);
 
       process_has_started =
         startup_callback_impl->process_has_started (the_process.out ());
     }
 
-  ACE_TRY
+  try
     {
       PortableServer::POA_var poa =
-        startup_callback_impl->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        startup_callback_impl->_default_POA ();
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (startup_callback_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (startup_callback_impl);
+      poa->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (process_has_started == 0)
     {
@@ -104,15 +96,15 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Process_Factory::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Process_Factory::noop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Process_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Process_Factory::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->shutdown_received_ = 1;
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h
index 0836a583d84..2aee99b70cf 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.h
+++ b/TAO/tests/Client_Leaks/Process_Factory.h
@@ -20,13 +20,13 @@ public:
   int shutdown_received (void);
 
   // = The skeleton methods
-  virtual Test::Process_ptr create_new_process (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Test::Process_ptr create_new_process (void)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed));
 
-  virtual void noop (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void noop (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp
index 150de719f94..0dd3295e11f 100644
--- a/TAO/tests/Client_Leaks/Server_Task.cpp
+++ b/TAO/tests/Client_Leaks/Server_Task.cpp
@@ -17,19 +17,16 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // run the test for at most 120 seconds...
       // ACE_Time_Value tv (120, 0);
-      this->orb_->run ( /* tv, */ ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ( /* tv, */);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp
index df4d755a97f..ea0b6043c97 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.cpp
+++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp
@@ -22,8 +22,7 @@ Startup_Callback::process_has_started (Test::Process_out the_process)
 }
 
 void
-Startup_Callback::started (Test::Process_ptr process
-                           ACE_ENV_ARG_DECL_NOT_USED)
+Startup_Callback::started (Test::Process_ptr process)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h
index 34e3d8e7412..e8207cc846e 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.h
+++ b/TAO/tests/Client_Leaks/Startup_Callback.h
@@ -24,8 +24,7 @@ public:
   int process_has_started (Test::Process_out the_process);
 
   // = The skeleton methods
-  virtual void started (Test::Process_ptr the_process
-                        ACE_ENV_ARG_DECL)
+  virtual void started (Test::Process_ptr the_process)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index 4ee5c104d0b..ac9d588886b 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -8,18 +8,16 @@ ACE_RCSID(Client_Leaks, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (argc < 2)
         {
           // Paranoia, we should have an auto_ptr-like gadget for
           // this.
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
 
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Usage: %s <ior>\n",
@@ -27,11 +25,9 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (argv[1]);
       Test::Startup_Callback_var startup_callback =
-        Test::Startup_Callback::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Startup_Callback::_narrow (object.in ());
       if (CORBA::is_nil (startup_callback.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -40,12 +36,10 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,8 +47,7 @@ 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 ();
 
       Process *process_impl;
       ACE_NEW_RETURN (process_impl,
@@ -63,32 +56,25 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(process_impl);
 
       Test::Process_var process =
-        process_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        process_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      startup_callback->started (process.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      startup_callback->started (process.in ());
 
       ACE_Time_Value tv (50, 0);
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Do not print error messages, they only make the test output
       // confusing.
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index a06c49b3e8a..b4f3cf3468b 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -48,22 +48,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Process_Factory_var process_factory =
-        Test::Process_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Process_Factory::_narrow(tmp.in ());
 
       if (CORBA::is_nil (process_factory.in ()))
         {
@@ -83,11 +80,9 @@ main (int argc, char *argv[])
         }
       ACE_Thread_Manager::instance ()->wait ();
 
-      process_factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      process_factory->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       // Only pass the test if 90% of the calls worked
       if (client_task.successful_calls () < 0.9 * iterations * threads)
@@ -96,13 +91,11 @@ main (int argc, char *argv[])
                       "ERROR: no calls were successful\n"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp
index 4260fbfd963..d8f43ee9cc9 100644
--- a/TAO/tests/Client_Leaks/server.cpp
+++ b/TAO/tests/Client_Leaks/server.cpp
@@ -36,19 +36,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,8 +53,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,12 +65,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(process_factory_impl);
 
       Test::Process_Factory_var process =
-        process_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        process_factory_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (process.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -86,8 +80,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Task server_task (orb.in (),
                                ACE_Thread_Manager::instance ());
@@ -101,19 +94,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index bc016b1755d..09f6e6e1cc3 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -55,14 +55,12 @@ int main (int argc, char *argv[])
   char buf[1000];
   int error_count = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Init the orb
       CORBA::ORB_var orb= CORBA::ORB_init (argc,
                                            argv,
-                                           ""
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           "");
 
       // Get IOR from command line (or file)
       if (argc != 2)
@@ -76,14 +74,10 @@ int main (int argc, char *argv[])
 
       // The first arg should be the IOR
       CORBA::Object_var object =
-        orb->string_to_object (buf
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (buf);
 
       // Get the server
-      simple_var server = simple::_narrow (object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      simple_var server = simple::_narrow (object.in ());
 
       const char *bare_string = "Hello World";
 
@@ -96,9 +90,7 @@ int main (int argc, char *argv[])
       CORBA::String_var reply =
         server->op1 (bare_string,
                      inarg,
-                     outarg.out ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     outarg.out ());
 
       const char *any_reply;
       outarg >>= any_reply;
@@ -130,13 +122,11 @@ int main (int argc, char *argv[])
 
       server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client:");
+      ex._tao_print_exception ("Exception caught in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return error_count;
 }
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index 1f8cb2c10c2..00d26a6b55a 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -38,8 +38,7 @@ public:
   // implementation of corba interface
   char * op1 (const char * name,
               const CORBA::Any & inany,
-              CORBA::Any_out outany
-              ACE_ENV_ARG_DECL_NOT_USED)
+              CORBA::Any_out outany)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
@@ -59,17 +58,16 @@ public:
     return CORBA::string_dup (name);
   };
 
-  ACE_CDR::WChar * op2 (const ACE_CDR::WChar *s1
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_CDR::WChar * op2 (const ACE_CDR::WChar *s1)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::wstring_dup (s1);
   };
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+    this->orb_->shutdown (0);
   };
 
 private:
@@ -84,20 +82,16 @@ private:
 int main(int argc, char *argv[])
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Init the orb
       CORBA::ORB_var orb= CORBA::ORB_init (argc,
                                            argv,
-                                           ""
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           "");
 
       // Initialize POA
       CORBA::Object_var poa_object=
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Check POA
       if (CORBA::is_nil (poa_object.in ()))
@@ -109,14 +103,11 @@ int main(int argc, char *argv[])
 
       // Get the ROOT POA
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // 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 ();
 
       // Create a C++ implementation of CORBA object
       SimpleImpl* my_impl = 0;
@@ -125,13 +116,10 @@ int main(int argc, char *argv[])
                       -1);
 
       // Create CORBA object for servant and REGISTER with POA
-      simple_var server = my_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      simple_var server = my_impl->_this ();
 
       // Get the IOR for our object
-      CORBA::String_var ior = orb->object_to_string (server.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var ior = orb->object_to_string (server.in ());
 
       FILE *output_file= ACE_OS::fopen ("server.ior", "w");
       if (output_file == 0)
@@ -143,26 +131,20 @@ int main(int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Activate POA manager
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Wait for calls
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in server:");
+      ex._tao_print_exception ("Exception caught in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index a5d874386e6..3c2fff94d02 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -109,9 +109,7 @@ test_codec (IOP::Codec_ptr codec)
 
   // Start out with the encode() method, i.e. the one that
   // includes the TypeCode in the CDR encapsulation.
-  encoded_data = codec->encode (data
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  encoded_data = codec->encode (data);
 
   if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ())
           % ACE_CDR::MAX_ALIGNMENT) == 0)
@@ -119,9 +117,7 @@ test_codec (IOP::Codec_ptr codec)
                     "\nData for decoding are already aligned "
                     "on MAX_ALIGNMENT.\n\n"));
   // Extract the data from the octet sequence.
-  decoded_data = codec->decode (encoded_data.in ()
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  decoded_data = codec->decode (encoded_data.in ());
 
   if (!(decoded_data.in() >>= extracted_value))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -146,9 +142,7 @@ test_codec (IOP::Codec_ptr codec)
 
   // Now use the encode_value() method, i.e. the one that does
   // *not* include the TypeCode in the CDR encapsulation.
-  encoded_data = codec->encode_value (data
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  encoded_data = codec->encode_value (data);
 
   if ((reinterpret_cast<ptrdiff_t> (encoded_data->get_buffer ())
           % ACE_CDR::MAX_ALIGNMENT) == 0)
@@ -159,9 +153,7 @@ test_codec (IOP::Codec_ptr codec)
 
   // Extract the data from the octet sequence.
   decoded_data = codec->decode_value (encoded_data.in (),
-                                      Foo::_tc_Bar
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+                                      Foo::_tc_Bar);
 
   if (!(decoded_data.in() >>= extracted_value))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -185,26 +177,19 @@ int
 main (int argc, char *argv[])
 {
   int retval = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "my_orb"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "my_orb");
 
       // Obtain a reference to the CodecFactory.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("CodecFactory"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("CodecFactory");
 
       IOP::CodecFactory_var codec_factory =
-        IOP::CodecFactory::_narrow (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IOP::CodecFactory::_narrow (obj.in ());
 
       // Set up a structure that contains information necessary to
       // create a GIOP 1.1 CDR encapsulation Codec.
@@ -217,9 +202,7 @@ main (int argc, char *argv[])
 
       // Obtain the CDR encapsulation Codec.
       IOP::Codec_var codec_1_2 =
-        codec_factory->create_codec_with_codesets (encoding_1_2
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        codec_factory->create_codec_with_codesets (encoding_1_2);
 
       retval = test_codec (codec_1_2.in ());
 
@@ -234,19 +217,15 @@ main (int argc, char *argv[])
 
       // Obtain the CDR encapsulation Codec.
       IOP::Codec_var codec =
-        codec_factory->create_codec (encoding
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        codec_factory->create_codec (encoding);
 
       retval = test_codec (codec.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Codec test:");
+      ex._tao_print_exception ("Codec test:");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Codec test passed.\n"));
 
diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp
index 19bd6433a70..81ebab0c792 100644
--- a/TAO/tests/Collocation/Collocation.cpp
+++ b/TAO/tests/Collocation/Collocation.cpp
@@ -7,24 +7,20 @@ ACE_RCSID(Collocation, main, "$Id$")
 
 int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Collocation_Test coll_test;
 
-      coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      coll_test.init (argc, argv);
 
-      coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      coll_test.run ();
 
-      coll_test.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      coll_test.shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Uncaught exception: ");
+      ex._tao_print_exception ("Uncaught exception: ");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 87fba9ceb92..0a9a1a942a7 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -21,20 +21,17 @@ Collocation_Test::Collocation_Test (void)
 }
 
 void
-Collocation_Test::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Test::shutdown (void)
 {
-  this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->root_poa_->destroy (1, 1);
+  this->orb_->destroy ();
 }
 
 int
-Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+Collocation_Test::init (int argc, char *argv[])
 {
   // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init (argc, argv, 0);
 
   int result = this->parse_args (argc, argv);
   if (result != 0)
@@ -42,53 +39,37 @@ Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
   // Get an Object reference to RootPOA.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Narrow the Object reference to a POA reference
   this->root_poa_ =
-    PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (obj.in ());
 
   // Get the POAManager of RootPOA
   this->poa_manager_ =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->the_POAManager ();
 
   // Activate the diamond servant and its base classes under RootPOA.
   PortableServer::ObjectId_var id =
-    this->root_poa_->activate_object (&this->top_servant_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->activate_object (&this->top_servant_);
 
 //    // We only care about the most derived class here.
-//    this->diamond_obj_ = this->diamond_servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-//    ACE_CHECK_RETURN (-1);
+//    this->diamond_obj_ = this->diamond_servant_._this ();
 
   id =
-    this->root_poa_->activate_object (&this->diamond_servant_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->activate_object (&this->diamond_servant_);
 
   // We only care about the most derived class here.
-  this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ());
 
   id =
-    this->root_poa_->activate_object (&this->left_servant_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->activate_object (&this->left_servant_);
 
   id =
-    this->root_poa_->activate_object (&this->right_servant_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->activate_object (&this->right_servant_);
 
   CORBA::String_var str =
-    this->orb_->object_to_string (this->diamond_obj_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (this->diamond_obj_.in ());
 
   ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n",
               str.in()));
@@ -106,51 +87,41 @@ Collocation_Test::parse_args (int /*argc*/,
 }
 
 int
-Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Test::test_narrow (void)
 {
   Diamond::Top_var top =
-    Diamond::Top::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Diamond::Top::_narrow (this->diamond_obj_.in ());
 
   Diamond::Left_var left =
-    Diamond::Left::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Diamond::Left::_narrow (this->diamond_obj_.in ());
 
   Diamond::Right_var right =
-    Diamond::Right::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Diamond::Right::_narrow (this->diamond_obj_.in ());
 
   Diamond::Buttom_var buttom =
-    Diamond::Buttom::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Diamond::Buttom::_narrow (this->diamond_obj_.in ());
 
-  CORBA::String_var str = top->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = top->shape ();
   ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ()));
 
-  str = left->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  str = left->shape ();
   ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ()));
 
-  str = right->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  str = right->shape ();
   ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ()));
 
-  str = buttom->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  str = buttom->shape ();
   ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ()));
 
   return 0;
 }
 
 int
-Collocation_Test::run (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Test::run (void)
 {
-  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_manager_->activate ();
 
-  this->test_narrow (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_narrow ();
 
   return 0;
 }
diff --git a/TAO/tests/Collocation/Collocation_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h
index 131e18003dd..9e04f7c6a74 100644
--- a/TAO/tests/Collocation/Collocation_Tester.h
+++ b/TAO/tests/Collocation/Collocation_Tester.h
@@ -29,19 +29,19 @@ class Collocation_Test
 public:
   Collocation_Test (void);
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL_NOT_USED);
+  int init (int argc, char *argv[]);
   // Initializing the Collocation_Test object.
 
   int parse_args (int argc, char *argv[]);
   // Parse the test specific arguments.
 
-  int test_narrow (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int test_narrow (void);
   // This test narrow an object reference to its base class and see
   // if it works correctly.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int run (void);
   // Run the test.
 
 private:
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
index f94a35d2c4b..1aed52ccf2f 100644
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Collocation/Diamond_i.cpp
@@ -13,7 +13,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Top_i::shape (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -32,7 +32,7 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Left_i::shape (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -41,7 +41,7 @@ Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Left_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Left_i::color (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -60,7 +60,7 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::shape (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -69,7 +69,7 @@ Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::color (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -79,7 +79,7 @@ Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Long
-Right_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::width (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -98,7 +98,7 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::shape (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -107,7 +107,7 @@ Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::color (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -116,7 +116,7 @@ Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Long
-Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::width (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -125,7 +125,7 @@ Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Buttom_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::name (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index 9e248a81dbd..e57cf1a6468 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -17,7 +17,7 @@ public:
   ~Top_i (void);
   // Ctor and dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * shape (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 };
@@ -29,11 +29,11 @@ public:
   ~Left_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * shape (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * color (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 };
@@ -45,15 +45,15 @@ public:
   ~Right_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * shape (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * color (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long width (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 };
@@ -65,19 +65,19 @@ public:
   ~Buttom_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * shape (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * color (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long width (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the name of the object.
 };
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
index f943951cefa..3af6cb1216a 100644
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ b/TAO/tests/CollocationLockup/CollocationLockup.cpp
@@ -28,7 +28,6 @@ namespace
   const size_t N_THREADS = 20;
 #endif
   const size_t N_ITERATIONS = 100;
-  const char* nameString = "myBobject";
 
   CORBA::ORB_var g_pOrb;
   PortableServer::POA_var g_pPoa;
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
index 960fef211e1..a88f7def836 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp
@@ -17,89 +17,77 @@ Client_Task::Client_Task (const char *ior,
 
 void
 Client_Task::test_system_exception (
-  Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL)
+  Test::Hello_ptr hello_ptr)
 {
-  ACE_TRY
+  try
     {
-      hello_ptr->system_exception_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello_ptr->system_exception_test ();
     }
-  ACE_CATCH (CORBA::INTERNAL, ex)
+  catch (const CORBA::INTERNAL& )
     {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Caught internal exception as expected\n"));
       // ignore
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-         "Unexpected exception caught in test_system_exception:");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "Unexpected exception caught in test_system_exception:");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 Client_Task::test_user_exception_expected (
-  Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL)
+  Test::Hello_ptr hello_ptr)
 {
-  ACE_TRY
+  try
     {
-      hello_ptr->user_exception_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello_ptr->user_exception_expected ();
     }
-  ACE_CATCH (::Test::Hello::A, ex)
+  catch (const ::Test::Hello::A& )
     {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Caught user A exception as expected\n"));
       // ignore
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-         "Unexpected exception caught in test_user_exception_expected:");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "Unexpected exception caught in test_user_exception_expected:");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 Client_Task::test_user_exception_not_expected (
-  Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL)
+  Test::Hello_ptr hello_ptr)
 {
-  ACE_TRY
+  try
     {
-      hello_ptr->user_exception_not_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello_ptr->user_exception_not_expected ();
     }
-  ACE_CATCH (CORBA::UNKNOWN, ex)
+  catch (const CORBA::UNKNOWN& )
     {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Caught unknown exception as expected\n"));
       // ignore
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-         "Unexpected exception caught in user_exception_not_expected:");
-      ACE_RE_THROW;
+      ex._tao_print_exception (
+        "Unexpected exception caught in user_exception_not_expected:");
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var tmp =
-        this->corb_->string_to_object (input_
-				       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->corb_->string_to_object (input_);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -110,31 +98,24 @@ Client_Task::svc (void)
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
 		  the_string.in ()));
 
-      this->test_system_exception (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_system_exception (hello.in ());
 
-      this->test_user_exception_expected (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_user_exception_expected (hello.in ());
 
-      this->test_user_exception_not_expected (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_user_exception_not_expected (hello.in ());
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-         "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.h b/TAO/tests/Collocation_Exception_Test/Client_Task.h
index 7d675ac6143..33eb64be258 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.h
@@ -28,9 +28,9 @@ public:
   int svc (void);
 
 private:
-  void test_system_exception (Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL);
-  void test_user_exception_expected (Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL);
-  void test_user_exception_not_expected (Test::Hello_ptr hello_ptr ACE_ENV_ARG_DECL);
+  void test_system_exception (Test::Hello_ptr hello_ptr);
+  void test_user_exception_expected (Test::Hello_ptr hello_ptr);
+  void test_user_exception_not_expected (Test::Hello_ptr hello_ptr);
 
   const char *input_;
 
diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
index f4e4a6b9615..1bb9dcf3336 100644
--- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
@@ -49,16 +49,13 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -80,9 +77,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                corb.in (),
@@ -97,10 +92,9 @@ main (int argc, char *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp
index c9ca732b3cc..4d91591ca64 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp
@@ -15,34 +15,34 @@ ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$")
 }
 
 void
-Hello::system_exception_test (ACE_ENV_SINGLE_ARG_DECL)
+Hello::system_exception_test (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::INTERNAL ());
+  throw CORBA::INTERNAL ();
 }
 
 void
-Hello::user_exception_expected (ACE_ENV_SINGLE_ARG_DECL)
+Hello::user_exception_expected (void)
   ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A))
 {
-  ACE_THROW (::Test::Hello::A ());
+  throw ::Test::Hello::A ();
 }
 
 void
-Hello::user_exception_not_expected (ACE_ENV_SINGLE_ARG_DECL)
+Hello::user_exception_not_expected (void)
   ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A))
 {
-  this->throw_internal_b (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->throw_internal_b ();
 }
 
 void
-Hello::throw_internal_b (ACE_ENV_SINGLE_ARG_DECL)
+Hello::throw_internal_b (void)
 {
-  ACE_THROW (::Test::Hello::B ());
+  throw ::Test::Hello::B ();
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -85,8 +85,8 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h
index 0e0d044b6e9..bb4f2265ec4 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.h
+++ b/TAO/tests/Collocation_Exception_Test/Hello.h
@@ -25,23 +25,23 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void system_exception_test (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void system_exception_test (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void user_exception_expected (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void user_exception_expected (void)
       ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A));
 
-  virtual void user_exception_not_expected (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void user_exception_not_expected (void)
       ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void throw_internal_b (ACE_ENV_SINGLE_ARG_DECL);
+  void throw_internal_b (void);
 
   /// Use an ORB reference to conver strings to objects and shutdown
   /// the application.
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
index 746c3ff7758..c6e578fa422 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
@@ -26,17 +26,13 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -44,8 +40,7 @@ Server_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 ();
 
      Hello *hello_impl;
      ACE_NEW_RETURN (hello_impl,
@@ -56,13 +51,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
      Test::Hello_var hello =
-       hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       hello_impl->_this ();
 
      CORBA::String_var ior =
-       this->sorb_->object_to_string (hello.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (hello.in ());
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
@@ -76,30 +68,24 @@ Server_Task::svc (void)
      ACE_OS::fprintf (output_file, "%s", ior.in ());
      ACE_OS::fclose (output_file);
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      // Signal the main thread before we call orb->run ();
      this->me_.signal ();
 
-     this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->run ();
 
      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-     root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     root_poa->destroy (1, 1);
 
-     this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->destroy ();
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
index 216bcba8cf8..a8ad8f92b03 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
@@ -24,16 +24,13 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var tmp =
-        this->corb_->string_to_object (input_
-				       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->corb_->string_to_object (input_);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -69,12 +66,10 @@ Client_Task::svc (void)
       CORBA::PolicyList polList;
       polList.length(1);
       polList[0] = this->corb_->create_policy(
-        Messaging::SYNC_SCOPE_POLICY_TYPE, anyPolicy ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Messaging::SYNC_SCOPE_POLICY_TYPE, anyPolicy);
 
       CORBA::Object_var tmpGenericVar =
-        tmpVar->_set_policy_overrides(polList,CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        tmpVar->_set_policy_overrides(polList,CORBA::ADD_OVERRIDE);
 
       // do unchecked narrow because ORB's not activated. Otherwise get TRANSIENT exception
       hello = Test::Hello::_narrow(tmpGenericVar.in());
@@ -88,27 +83,22 @@ Client_Task::svc (void)
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
 		  the_string.in ()));
 
-      hello->onewayTest(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->onewayTest();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - returned from onewayTest() call \n"));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
diff --git a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
index f36e0cd48f9..e1e606e0ab4 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
@@ -74,16 +74,13 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -105,9 +102,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                corb.in (),
@@ -123,10 +118,9 @@ main (int argc, char *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
index e4f3c6d80d7..8eb26a89ec3 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp
@@ -15,7 +15,7 @@ ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$")
 }
 
 void
-Hello::onewayTest (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::onewayTest (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -25,7 +25,7 @@ Hello::onewayTest (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -68,8 +68,8 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h
index c145e77f7c1..6ac1109f422 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h
@@ -25,13 +25,13 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void onewayTest (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void onewayTest (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
index 746c3ff7758..c6e578fa422 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
@@ -26,17 +26,13 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -44,8 +40,7 @@ Server_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 ();
 
      Hello *hello_impl;
      ACE_NEW_RETURN (hello_impl,
@@ -56,13 +51,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
      Test::Hello_var hello =
-       hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       hello_impl->_this ();
 
      CORBA::String_var ior =
-       this->sorb_->object_to_string (hello.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (hello.in ());
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
@@ -76,30 +68,24 @@ Server_Task::svc (void)
      ACE_OS::fprintf (output_file, "%s", ior.in ());
      ACE_OS::fclose (output_file);
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      // Signal the main thread before we call orb->run ();
      this->me_.signal ();
 
-     this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->run ();
 
      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-     root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     root_poa->destroy (1, 1);
 
-     this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->destroy ();
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index 28aa663f7aa..94fcf1589b7 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -14,15 +14,14 @@ class test_i :
 public:
 
   test_i (CORBA::ORB_ptr orb,
-          PortableServer::POA_ptr poa
-          ACE_ENV_ARG_DECL);
+          PortableServer::POA_ptr poa);
 
   void set_other (test_ptr test);
 
-  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);
 
   CORBA::ORB_var orb_;
 
@@ -34,22 +33,17 @@ public:
 };
 
 test_i::test_i (CORBA::ORB_ptr orb,
-                PortableServer::POA_ptr poa
-                ACE_ENV_ARG_DECL)
+                PortableServer::POA_ptr poa)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa))
 {
   CORBA::Object_var object;
 
   object =
-    this->orb_->resolve_initial_references ("POACurrent"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("POACurrent");
 
   this->poa_current_ =
-    PortableServer::Current::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::Current::_narrow (object.in ());
 }
 
 void
@@ -59,13 +53,12 @@ test_i::set_other (test_ptr test)
 }
 
 void
-test_i::method (ACE_ENV_SINGLE_ARG_DECL)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->other_.in () != test::_nil ())
     {
-      this->other_->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      this->other_->method ();
     }
   else
     {
@@ -83,8 +76,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL)
         upcall = "remote";
 
       PortableServer::ObjectId_var id =
-        this->poa_current_->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        this->poa_current_->get_object_id ();
 
       CORBA::String_var id_string =
         PortableServer::ObjectId_to_string (id.in ());
@@ -97,7 +89,7 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 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 ());
 }
@@ -122,15 +114,13 @@ Task::Task (CORBA::ORB_ptr orb)
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -138,31 +128,23 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Task task (orb.in ());
 
@@ -175,22 +157,16 @@ main (int argc, char *argv[])
       policies.length (1);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child_poa",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       test_i *base_servant =
         new test_i (orb.in (),
-                    child_poa.in ()
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    child_poa.in ());
 
       PortableServer::ServantBase_var safe_base_servant (base_servant);
 
@@ -198,19 +174,14 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("base");
 
       child_poa->activate_object_with_id (base_oid.in (),
-                                          base_servant
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          base_servant);
 
       test_var base_test =
-        base_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        base_servant->_this ();
 
       test_i *first_servant =
         new test_i (orb.in (),
-                    child_poa.in ()
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    child_poa.in ());
 
       PortableServer::ServantBase_var safe_first_servant (first_servant);
 
@@ -218,109 +189,79 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("first");
 
       child_poa->activate_object_with_id (first_oid.in (),
-                                          first_servant
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          first_servant);
 
       test_var first_test =
-        first_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_servant->_this ();
 
       base_servant->set_other (first_test.in ());
 
-      base_test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      base_test->method ();
 
       PortableServer::ObjectId_var second_oid =
         PortableServer::string_to_ObjectId ("second");
 
       object =
         child_poa->create_reference_with_id (second_oid.in (),
-                                             "IDL:test:1.0"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             "IDL:test:1.0");
 
       test_var second_test =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       test_i *second_servant =
         new test_i (orb.in (),
-                    child_poa.in ()
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    child_poa.in ());
 
       PortableServer::ServantBase_var safe_second_servant (second_servant);
 
       child_poa->activate_object_with_id (second_oid.in (),
-                                          second_servant
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          second_servant);
 
       base_servant->set_other (second_test.in ());
 
-      base_test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      base_test->method ();
 
       PortableServer::ObjectId_var third_oid =
         PortableServer::string_to_ObjectId ("third");
 
       object =
         child_poa->create_reference_with_id (third_oid.in (),
-                                             "IDL:test:1.0"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             "IDL:test:1.0");
 
       CORBA::String_var third_ior =
-        orb->object_to_string (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (object.in ());
 
       object =
-        orb->string_to_object (third_ior.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (third_ior.in ());
 
       test_var third_test =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       test_i *third_servant =
         new test_i (orb.in (),
-                    child_poa.in ()
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    child_poa.in ());
 
       PortableServer::ServantBase_var safe_third_servant (third_servant);
 
       child_poa->activate_object_with_id (third_oid.in (),
-                                          third_servant
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          third_servant);
 
       base_servant->set_other (third_test.in ());
 
-      base_test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      base_test->method ();
 
-      orb->shutdown (1
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (1);
 
       result =
         task.wait ();
       ACE_ASSERT (result != -1);
       ACE_UNUSED_ARG (result);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Collocation_Tests/Client_Task.cpp b/TAO/tests/Collocation_Tests/Client_Task.cpp
index 1b1e5ceed10..aabba8b790e 100644
--- a/TAO/tests/Collocation_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Client_Task.cpp
@@ -20,16 +20,13 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var tmp =
-        this->corb_->string_to_object (input_
-				       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->corb_->string_to_object (input_);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -40,22 +37,18 @@ Client_Task::svc (void)
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
 		  the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
diff --git a/TAO/tests/Collocation_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Tests/Collocated_Test.cpp
index f807f7bf5b3..5c5dae3a745 100644
--- a/TAO/tests/Collocation_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Tests/Collocated_Test.cpp
@@ -47,16 +47,13 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -78,9 +75,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                corb.in (),
@@ -97,18 +92,15 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       // Now that all threads have completed we can destroy the ORB
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
       if (server_orb != client_orb)
         {
-          corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          corb->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp
index 35bc75253ab..fb956dded83 100644
--- a/TAO/tests/Collocation_Tests/Hello.cpp
+++ b/TAO/tests/Collocation_Tests/Hello.cpp
@@ -15,7 +15,7 @@ ACE_RCSID(Hello, Hello, "$Id$")
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -58,12 +58,12 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
   // to avoid BAD_INV_ORDER exceptions on fast dual processor machines.
   ACE_OS::sleep (1);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h
index ba9e6637812..63b4ec180be 100644
--- a/TAO/tests/Collocation_Tests/Hello.h
+++ b/TAO/tests/Collocation_Tests/Hello.h
@@ -20,10 +20,10 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp
index 85d842d34a0..47c69723633 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Server_Task.cpp
@@ -26,17 +26,13 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -44,8 +40,7 @@ Server_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 ();
 
      Hello *hello_impl;
      ACE_NEW_RETURN (hello_impl,
@@ -56,13 +51,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
      Test::Hello_var hello =
-       hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       hello_impl->_this ();
 
      CORBA::String_var ior =
-       this->sorb_->object_to_string (hello.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (hello.in ());
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
@@ -76,24 +68,20 @@ Server_Task::svc (void)
      ACE_OS::fprintf (output_file, "%s", ior.in ());
      ACE_OS::fclose (output_file);
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      // Signal the main thread before we call orb->run ();
      this->me_.signal ();
 
-     this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->run ();
 
      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/Collocation_Tests/run_test.pl b/TAO/tests/Collocation_Tests/run_test.pl
index 2361b7d21ed..914567cdc84 100755
--- a/TAO/tests/Collocation_Tests/run_test.pl
+++ b/TAO/tests/Collocation_Tests/run_test.pl
@@ -70,7 +70,7 @@ if ($sv != 0) {
 unlink $iorfile;
 
 print STDERR "======== Running in no collocation mode and two ORBS \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
+$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation no");
 $sv = $SV->SpawnWaitKill (60);
 
 if ($sv != 0) {
diff --git a/TAO/tests/Compression/server.cpp b/TAO/tests/Compression/server.cpp
index d4bf6f8eb18..5a80b3d0b2d 100644
--- a/TAO/tests/Compression/server.cpp
+++ b/TAO/tests/Compression/server.cpp
@@ -14,22 +14,20 @@ bool
 test_invalid_compression_factory (Compression::CompressionManager_ptr cm)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get an invalid compression factory
       Compression::CompressorFactory_var factory =
         cm->get_factory (100);
-      ACE_TRY_CHECK;
     }
-  ACE_CATCH (Compression::UnknownCompressorId, ex)
+  catch (const Compression::UnknownCompressorId& ex)
     {
       ACE_UNUSED_ARG (ex);
       succeed = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -47,21 +45,19 @@ test_duplicate_compression_factory (
   Compression::CompressorFactory_ptr cf)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Register duplicate
       cm->register_factory (cf);
-      ACE_TRY_CHECK;
     }
-  ACE_CATCH (Compression::FactoryAlreadyRegistered, ex)
+  catch (const Compression::FactoryAlreadyRegistered& ex)
     {
       ACE_UNUSED_ARG (ex);
       succeed = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -77,23 +73,21 @@ test_register_nil_compression_factory (
   Compression::CompressionManager_ptr cm)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Register nil factory
       cm->register_factory (Compression::CompressorFactory::_nil());
-      ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::BAD_PARAM, ex)
+  catch (const CORBA::BAD_PARAM& ex)
     {
       if ((ex.minor() & 0xFFFU) == 44)
         {
           succeed = true;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -109,11 +103,10 @@ int
 main (int argc, char *argv[])
 {
   int retval = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var compression_manager =
         orb->resolve_initial_references("CompressionManager");
@@ -171,16 +164,13 @@ main (int argc, char *argv[])
       if (!test_invalid_compression_factory (manager.in ()))
         retval = 1;
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       retval = 1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp
index ca23555f202..924779e1619 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.cpp
+++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp
@@ -12,15 +12,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h
index 1a404058944..6131e1a3c88 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.h
+++ b/TAO/tests/Connect_Strategy_Test/Hello.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp
index 07d0572d547..1d974b34168 100644
--- a/TAO/tests/Connect_Strategy_Test/client.cpp
+++ b/TAO/tests/Connect_Strategy_Test/client.cpp
@@ -41,22 +41,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -67,28 +64,23 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
       if (do_shutdown)
         {
-          hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          hello->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp
index acd62195b16..4f8227d7664 100644
--- a/TAO/tests/Connect_Strategy_Test/server.cpp
+++ b/TAO/tests/Connect_Strategy_Test/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp
index c9759652961..92d78104359 100644
--- a/TAO/tests/Connection_Failure/client.cpp
+++ b/TAO/tests/Connection_Failure/client.cpp
@@ -15,28 +15,24 @@ const char *ior =
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       // First connection happens here..
-      test::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test::_narrow (tmp.in ());
     }
-  ACE_CATCH (CORBA::TRANSIENT, transient_exception)
+  catch (const CORBA::TRANSIENT& )
     {
       // This exception is correct.
       ACE_DEBUG ((LM_DEBUG,
                   "_narrow() to non-existent object failed correctly.  Test succeeded.\n"));
       return 0;
     }
-  ACE_ENDTRY;
 
   // Should not reach here.
   ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index 3ef97cea443..1762358939a 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/client.cpp
@@ -36,11 +36,10 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -59,12 +58,10 @@ main (int argc, char *argv[])
             {
               iorfile = "file://" + iorfile;
               CORBA::Object_var tmp =
-                orb->string_to_object(iorfile.c_str () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->string_to_object(iorfile.c_str ());
 
               test_var test =
-                test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                test::_narrow(tmp.in ());
 
               if (CORBA::is_nil (test.in ()))
                 {
@@ -74,15 +71,13 @@ main (int argc, char *argv[])
                                     1);
                 }
 
-              test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK
+              test->send_stuff ("Some stuff to send");
 
               // Test for LFU strategy.  The transport to any other
               // server should be removed before the first one.
               if (i == 0)
                 {
-                  test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK
+                  test->send_stuff ("Some stuff to send");
 
                   holder = test;
                 }
@@ -92,8 +87,7 @@ main (int argc, char *argv[])
                                 // removed.
                   if (!CORBA::is_nil(holder.in ()))
                     {
-                      holder->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK
+                      holder->send_stuff ("Some stuff to send");
                     }
                 }
             }
@@ -103,19 +97,15 @@ main (int argc, char *argv[])
             }
         }
 
-      orb->shutdown (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp
index 0a9c8394ebf..2c3fffcf73a 100644
--- a/TAO/tests/Connection_Purging/server.cpp
+++ b/TAO/tests/Connection_Purging/server.cpp
@@ -35,19 +35,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -55,8 +52,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -68,12 +64,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -85,28 +79,22 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
       delete test_impl;
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Connection_Purging/test_i.cpp b/TAO/tests/Connection_Purging/test_i.cpp
index 48b6bc7ccb1..de59e99593c 100644
--- a/TAO/tests/Connection_Purging/test_i.cpp
+++ b/TAO/tests/Connection_Purging/test_i.cpp
@@ -4,8 +4,7 @@
 #include "test_i.h"
 
 void
-test_i::send_stuff (const char* string
-                  ACE_ENV_ARG_DECL_NOT_USED)
+test_i::send_stuff (const char* string)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string));
diff --git a/TAO/tests/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h
index 2670a7a51d8..bebd408b2d0 100644
--- a/TAO/tests/Connection_Purging/test_i.h
+++ b/TAO/tests/Connection_Purging/test_i.h
@@ -13,8 +13,7 @@ class test_i
 {
 public:
   // = The skeleton methods
-  virtual void send_stuff (const char* string
-                           ACE_ENV_ARG_DECL)
+  virtual void send_stuff (const char* string)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp
index 5a8556e908a..8f22c8a14c6 100644
--- a/TAO/tests/Connection_Timeout/client.cpp
+++ b/TAO/tests/Connection_Timeout/client.cpp
@@ -41,17 +41,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL)
+test_timeout (CORBA::Object_ptr object)
 {
   // Start the timer
   profile_timer.start ();
 
-  ACE_TRY
+  try
     {
       // First connection happens here..
       Test::Hello_var hello =
-        Test::Hello::_narrow(object ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(object);
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -62,16 +61,14 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL)
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Stop the timer
       profile_timer.stop ();
@@ -83,20 +80,6 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL)
       // Give a 30% error margin for handling exceptions etc. It is a
       // high margin, though!. But the timeout is too small and wider
       // range would help.
-#if defined (ACE_LACKS_FLOATING_POINT) && (ACE_LACKS_FLOATING_POINT != 0)
-      // The elapsed time is in usecs
-      if (el.real_time > 200000)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%P|%t) ERROR: Too long to timeout: %u \n",
-                             el.real_time),
-                             1);
-        }
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Success, timeout: %u \n",
-                    el.real_time));
-#else
       // The elapsed time is in secs
       if (el.real_time > 0.200)
         {
@@ -109,10 +92,7 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL)
         ACE_DEBUG ((LM_DEBUG,
                     "(%P|%t) Success, timeout: %F \n",
                     el.real_time));
-
-#endif /* ACE_LACKS_FLOATING_POINT == 1*/
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -122,27 +102,22 @@ main (int argc, char *argv[])
 {
   int retval = 1;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       CORBA::Any timeout_as_any;
       timeout_as_any <<= timeout_period;
@@ -151,36 +126,27 @@ main (int argc, char *argv[])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (TAO::CONNECTION_TIMEOUT_POLICY_TYPE,
-                            timeout_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            timeout_as_any);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::ADD_OVERRIDE);
 
       for (CORBA::ULong l = 0;
            l != policy_list.length ();
            ++l)
         {
-          policy_list[l]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy_list[l]->destroy ();
         }
 
-      retval = test_timeout (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = test_timeout (tmp.in ());
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
index 59b0bcb3398..ea9818cc706 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
@@ -10,7 +10,7 @@ Oneway_Receiver::Oneway_Receiver (void)
 }
 
 void
-Oneway_Receiver::receive_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Receiver::receive_oneway (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
index fae5e073bae..167206a943b 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
@@ -17,7 +17,7 @@ public:
   Oneway_Receiver (void);
 
   // = The skeleton methods
-  virtual void receive_oneway (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void receive_oneway (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp
index 92fc7daaf0b..dc438124b4f 100644
--- a/TAO/tests/Crash_On_Write/client.cpp
+++ b/TAO/tests/Crash_On_Write/client.cpp
@@ -41,43 +41,37 @@ parse_args (int argc, char *argv[])
 }
 
 int
-single_iteration (Test::Oneway_Receiver_ptr oneway_receiver
-                  ACE_ENV_ARG_DECL)
+single_iteration (Test::Oneway_Receiver_ptr oneway_receiver)
 {
-  ACE_TRY
+  try
     {
-      oneway_receiver->receive_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      oneway_receiver->receive_oneway ();
       ACE_Time_Value tv (0, 40000);
       ACE_OS::sleep (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Oneway_Receiver_var oneway_receiver =
-        Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Oneway_Receiver::_narrow(tmp.in ());
 
       if (CORBA::is_nil (oneway_receiver.in ()))
         {
@@ -91,9 +85,7 @@ main (int argc, char *argv[])
       int exception_count = 0;
       for (int i = 0; i != iterations; ++i)
         {
-          int result = single_iteration (oneway_receiver.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int result = single_iteration (oneway_receiver.in ());
           if (result)
             exception_count++;
           else
@@ -109,16 +101,13 @@ main (int argc, char *argv[])
       if (normal_count == 0)
         ACE_ERROR ((LM_ERROR, "ERROR: no request was succesful\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp
index 8c25517be99..09818cff227 100644
--- a/TAO/tests/Crash_On_Write/server.cpp
+++ b/TAO/tests/Crash_On_Write/server.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +66,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl);
 
       Test::Oneway_Receiver_var oneway_receiver =
-        oneway_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        oneway_receiver_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (oneway_receiver.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -87,8 +81,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Create a separate thread to crash the server.
       Crash_Task crash_task (ACE_Thread_Manager::instance (), ACE_Time_Value(20));
@@ -99,25 +92,20 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       /*NOTREACHED*/
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index a702cdce43d..5d96a31ec01 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -10,14 +10,14 @@ Crashed_Callback::Crashed_Callback (void)
 }
 
 CORBA::Boolean
-Crashed_Callback::are_you_there (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Crashed_Callback::are_you_there (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
 }
 
 void
-Crashed_Callback::crash_now_please (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Crashed_Callback::crash_now_please (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -34,7 +34,7 @@ Crashed_Callback::crash_now_please (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Crashed_Callback::test_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Crashed_Callback::test_oneway (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h
index 5a0614f1b74..3efa13bd774 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.h
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h
@@ -17,13 +17,13 @@ public:
   Crashed_Callback (void);
 
   // = The skeleton methods
-  virtual CORBA::Boolean are_you_there (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean are_you_there (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void crash_now_please (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void crash_now_please (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void test_oneway (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void test_oneway (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp
index d4786b4fb6c..d6a33d93d7a 100644
--- a/TAO/tests/Crashed_Callback/Service.cpp
+++ b/TAO/tests/Crashed_Callback/Service.cpp
@@ -21,30 +21,25 @@ Service::dump_results (void)
 }
 
 void
-Service::run_test (Test::Crashed_Callback_ptr callback
-                   ACE_ENV_ARG_DECL)
+Service::run_test (Test::Crashed_Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int pre_crash_exceptions =
-    this->call_are_you_there (callback ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->call_are_you_there (callback);
 
   pre_crash_exceptions +=
-    this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->call_test_oneway (callback);
 
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) - Service, calling crash_now_please\n"));
-      callback->crash_now_please (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      callback->crash_now_please ();
     }
-  ACE_CATCHANY {} ACE_ENDTRY;
+  catch (const CORBA::Exception&){}
 
   int pos_crash_exceptions =
-    this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->call_test_oneway (callback);
 
   if (pre_crash_exceptions != 0)
     {
@@ -69,8 +64,7 @@ Service::run_test (Test::Crashed_Callback_ptr callback
 }
 
 int
-Service::call_are_you_there (Test::Crashed_Callback_ptr callback
-                             ACE_ENV_ARG_DECL)
+Service::call_are_you_there (Test::Crashed_Callback_ptr callback)
   ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n"));
@@ -79,23 +73,20 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback
   int exception_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      ACE_TRY
+      try
         {
-          (void) callback->are_you_there (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) callback->are_you_there ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           exception_count++;
         }
-      ACE_ENDTRY;
     }
   return exception_count;
 }
 
 int
-Service::call_test_oneway (Test::Crashed_Callback_ptr callback
-                           ACE_ENV_ARG_DECL)
+Service::call_test_oneway (Test::Crashed_Callback_ptr callback)
   ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n"));
@@ -104,16 +95,14 @@ Service::call_test_oneway (Test::Crashed_Callback_ptr callback
   int exception_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      ACE_TRY
+      try
         {
-          (void) callback->test_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) callback->test_oneway ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           exception_count++;
         }
-      ACE_ENDTRY;
     }
   return exception_count;
 }
diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h
index 6f4de205f13..b0cdc9b35ec 100644
--- a/TAO/tests/Crashed_Callback/Service.h
+++ b/TAO/tests/Crashed_Callback/Service.h
@@ -23,8 +23,7 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void run_test (Test::Crashed_Callback_ptr callback
-                         ACE_ENV_ARG_DECL)
+  virtual void run_test (Test::Crashed_Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -32,16 +31,14 @@ private:
   /**
    * @return Number of exceptions raised
    */
-  int call_are_you_there (Test::Crashed_Callback_ptr callback
-                          ACE_ENV_ARG_DECL)
+  int call_are_you_there (Test::Crashed_Callback_ptr callback)
     ACE_THROW_SPEC (());
 
   /// Call the test_oneway method mutiple times.
   /**
    * @return Number of exceptions raised
    */
-  int call_test_oneway (Test::Crashed_Callback_ptr callback
-                        ACE_ENV_ARG_DECL)
+  int call_test_oneway (Test::Crashed_Callback_ptr callback)
     ACE_THROW_SPEC (());
 
 private:
diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index 4f020c7d89c..09c597bf30a 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/client.cpp
@@ -38,19 +38,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,19 +55,14 @@ 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 ();
 
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_object =
-          orb->resolve_initial_references("ORBPolicyManager"
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->resolve_initial_references("ORBPolicyManager");
         CORBA::PolicyManager_var policy_manager =
-          CORBA::PolicyManager::_narrow(manager_object.in()
-                                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          CORBA::PolicyManager::_narrow(manager_object.in());
 
         if (CORBA::is_nil (policy_manager.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -81,29 +73,22 @@ main (int argc, char *argv[])
         CORBA::PolicyList policies(1); policies.length(1);
         policies[0] =
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         policy_manager->set_policy_overrides (policies,
-                                              CORBA::ADD_OVERRIDE
-                                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                              CORBA::ADD_OVERRIDE);
 
-        policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        policies[0]->destroy ();
       }
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Service_var service =
-        Test::Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Service::_narrow(tmp.in ());
 
       if (CORBA::is_nil (service.in ()))
         {
@@ -120,31 +105,23 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(crashed_callback_impl);
 
       Test::Crashed_Callback_var crashed_callback =
-        crashed_callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        crashed_callback_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      service->run_test (crashed_callback.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      service->run_test (crashed_callback.in ());
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 11b8a975a14..074adc013f5 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,19 +56,14 @@ 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 ();
 
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_object =
-          orb->resolve_initial_references("ORBPolicyManager"
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->resolve_initial_references("ORBPolicyManager");
         CORBA::PolicyManager_var policy_manager =
-          CORBA::PolicyManager::_narrow(manager_object.in()
-                                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          CORBA::PolicyManager::_narrow(manager_object.in());
 
         if (CORBA::is_nil (policy_manager.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,17 +74,12 @@ main (int argc, char *argv[])
         CORBA::PolicyList policies(1); policies.length(1);
         policies[0] =
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         policy_manager->set_policy_overrides (policies,
-                                              CORBA::ADD_OVERRIDE
-                                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                              CORBA::ADD_OVERRIDE);
 
-        policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        policies[0]->destroy ();
       }
 
       if (parse_args (argc, argv) != 0)
@@ -105,12 +92,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(service_impl);
 
       Test::Service_var service =
-        service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        service_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (service.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -122,30 +107,24 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_Time_Value tv (50, 0);
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished\n"));
 
       service_impl->dump_results ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
index f7c3f321248..7d2fd9d39c0 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
@@ -32,12 +32,11 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var obj =
-        this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-     
+        this->corb_->string_to_object (input_);
+
       if (CORBA::is_nil (obj.in ()))
       {
         ACE_ERROR_RETURN ((LM_DEBUG,
@@ -47,9 +46,8 @@ Client_Task::svc (void)
       }
 
       CORBA::Object_var simple_test_obj =
-        this->corb_->string_to_object (simple_test_input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-     
+        this->corb_->string_to_object (simple_test_input_);
+
       if (CORBA::is_nil (simple_test_obj.in ()))
       {
         ACE_ERROR_RETURN ((LM_DEBUG,
@@ -58,42 +56,31 @@ Client_Task::svc (void)
           1);
       }
 
-      Test::Simple_Test_var simple_test 
-        = Test::Simple_Test::_narrow (simple_test_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test::Simple_Test_var simple_test
+        = Test::Simple_Test::_narrow (simple_test_obj.in ());
 
-      CORBA::Request_var req (obj->_request ("test_basic_arg" ACE_ENV_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+      CORBA::Request_var req (obj->_request ("test_basic_arg"));
       req->add_in_arg ("basic") <<= TEST_BASIC_VALUE;
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
+
 
-      req = obj->_request ("test_unbounded_string_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_unbounded_string_arg");
 
       req->add_in_arg ("ub_string") <<= TEST_STR;
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-
-      req = obj->_request ("test_bounded_string_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
+
+
+      req = obj->_request ("test_bounded_string_arg");
+
       ACE_CString bs (TEST_STR);
       bs = bs.substr (0, ::Test::BOUNDED_STRING_SIZE);
 
-      req->add_in_arg ("bd_string") 
+      req->add_in_arg ("bd_string")
         <<= CORBA::Any::from_string (bs.c_str (), ::Test::BOUNDED_STRING_SIZE);
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
 
-      req = obj->_request ("test_fixed_array_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_fixed_array_arg");
 
       ::Test::Fixed_Array fixed_array;
 
@@ -103,181 +90,145 @@ Client_Task::svc (void)
       }
 
       req->add_in_arg ("fixed_array") <<= ::Test::Fixed_Array_forany (fixed_array);
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
+
 
-      req = obj->_request ("test_var_array_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_var_array_arg");
 
       ::Test::Var_Array var_array;
 
       for (CORBA::ULong i = 0; i < ::Test::VAR_ARRAY_SIZE; ++i)
-      { 
+      {
         var_array[i] = CORBA::string_dup(TEST_STR);
       }
 
       req->add_in_arg ("var_array") <<= var_array;
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
 
-      req = obj->_request ("test_bounded_var_size_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_bounded_var_size_arg");
 
       ACE_CString bvs (TEST_STR);
       bvs = bvs.substr (0, ::Test::BOUNDED_VAR_SIZE);
 
-      ::Test::Bounded_Var_Size_Arg* bd_var_size 
+      ::Test::Bounded_Var_Size_Arg* bd_var_size
         = new ::Test::Bounded_Var_Size_Arg();
 
       bd_var_size->replace (::Test::BOUNDED_VAR_SIZE,
         const_cast <CORBA::Char*> (bvs.c_str ()));
 
       req->add_in_arg ("bd_var_size") <<= bd_var_size;
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
+
 
-      req = obj->_request ("test_unbounded_var_size_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_unbounded_var_size_arg");
 
-      ::Test::Unbounded_Var_Size_Arg* ub_var_size 
+      ::Test::Unbounded_Var_Size_Arg* ub_var_size
         = new ::Test::Unbounded_Var_Size_Arg();
       ub_var_size->replace (ub_var_size->maximum (),
         ACE_OS::strlen (TEST_STR),
         TEST_STR);
 
       req->add_in_arg ("ub_var_size") <<= ub_var_size;
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
 
-      req = obj->_request ("test_fixed_size_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_fixed_size_arg");
 
       ::Test::TimeOfDay t;
-      t.hour = TEST_HOUR;  
+      t.hour = TEST_HOUR;
       t.minute = TEST_MINUTE;
       t.second = TEST_SECOND;
 
       req->add_in_arg ("fixed_size") <<= t;
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
+
 
-      req = obj->_request ("test_special_basic_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_special_basic_arg");
 
       req->add_in_arg ("special") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE);
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
+
 
-      req = obj->_request ("test_object_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_object_arg");
 
       req->add_in_arg ("object") <<= simple_test_obj.in ();
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
 
-      req = obj->_request ("test_objref_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_objref_arg");
 
       req->add_in_arg ("objref") <<= simple_test.in ();
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
+
 
-      req = obj->_request ("test_args_1"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_args_1");
 
       req->add_in_arg ("arg1") <<= simple_test_obj.in ();
       req->add_in_arg ("arg2") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE);
       req->add_in_arg ("arg3") <<= simple_test.in ();
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
 
-      req = obj->_request ("test_args_2"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_args_2");
 
       req->add_in_arg ("arg1") <<= TEST_STR;
       req->add_in_arg ("arg2") <<= ::Test::Fixed_Array_forany (fixed_array);
       req->add_in_arg ("arg3") <<= t;
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
+
 
-      req = obj->_request ("test_args_3"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_args_3");
 
-      bd_var_size 
+      bd_var_size
         = new ::Test::Bounded_Var_Size_Arg();
       bd_var_size->replace (::Test::BOUNDED_VAR_SIZE,
         const_cast <CORBA::Char*> (bvs.c_str ()));
 
-      ub_var_size 
+      ub_var_size
         = new ::Test::Unbounded_Var_Size_Arg();
       ub_var_size->replace (ub_var_size->maximum (),
         ACE_OS::strlen (TEST_STR),
         TEST_STR);
 
       for (CORBA::ULong j = 0; j < ::Test::VAR_ARRAY_SIZE; ++j)
-      { 
+      {
         var_array[j] = CORBA::string_dup(TEST_STR);
       }
 
-      req->add_in_arg ("arg1") 
+      req->add_in_arg ("arg1")
         <<= CORBA::Any::from_string (bs.c_str (), ::Test::BOUNDED_STRING_SIZE);
 
       req->add_in_arg ("arg2") <<= bd_var_size;
       req->add_in_arg ("arg3") <<= ub_var_size;
       req->add_in_arg ("arg4") <<= var_array;
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->send_oneway ();
+
+
+      req = obj->_request ("shutdown");
 
-      req = obj->_request ("shutdown"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req->send_oneway ();
 
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       error_count_ ++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       error_count_ ++;
       ACE_ERROR ((LM_ERROR, "(%P|%t)Client_Task::svc - caught unknown exception \n"));
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
 }
 
-CORBA::ULong 
+CORBA::ULong
 Client_Task::error_count () const
 {
   return error_count_;
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
index ccf9170dc2a..0af71b3e567 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp
@@ -56,16 +56,13 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -88,9 +85,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                simple_test_input,
@@ -108,12 +103,10 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       // Now that all threads have completed we can destroy the ORB
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
       if (server_orb != client_orb)
         {
-          corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          corb->destroy ();
         }
 
       CORBA::ULong errors = client_task.error_count () + server_task.error_count ();
@@ -127,10 +120,9 @@ main (int argc, char *argv[])
           return 1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
index 77c4257f203..a6144215762 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
@@ -35,7 +35,6 @@ Test_Simple_Test_i::~Test_Simple_Test_i (void)
 
 void Test_Simple_Test_i::test_method (
     ::CORBA::ULong & error_count
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -52,10 +51,9 @@ Hello::Hello (CORBA::ORB_ptr orb,
 {
 }
 
-void 
+void
 Hello::test_basic_arg (
     ::CORBA::Long basic
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -65,14 +63,13 @@ Hello::test_basic_arg (
     ERROR_COUNT ("Hello::test_basic_arg")
 }
 
-void 
-Hello::test_unbounded_string_arg(const char* message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+void
+Hello::test_unbounded_string_arg(const char* message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_string_arg ")
-                        ACE_TEXT("got unbounded string: %s\n"), 
+                        ACE_TEXT("got unbounded string: %s\n"),
                         message));
   if (ACE_OS::strncmp (message, TEST_STR, strlen (TEST_STR) != 0))
   {
@@ -81,14 +78,13 @@ Hello::test_unbounded_string_arg(const char* message
 }
 
 
-void 
-Hello::test_bounded_string_arg(const char* message
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+void
+Hello::test_bounded_string_arg(const char* message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_string_arg ")
-                        ACE_TEXT("got bounded string: %s\n"), 
+                        ACE_TEXT("got bounded string: %s\n"),
                         message));
   if (ACE_OS::strncmp (message, TEST_STR, ::Test::BOUNDED_STRING_SIZE) != 0)
   {
@@ -97,16 +93,15 @@ Hello::test_bounded_string_arg(const char* message
 }
 
 
-void 
-Hello::test_fixed_array_arg(const ::Test::Fixed_Array message
-                              ACE_ENV_ARG_DECL_NOT_USED)
+void
+Hello::test_fixed_array_arg(const ::Test::Fixed_Array message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
   {
     if (debug)
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_fixed_array_arg ")
-        ACE_TEXT("got fixed array: %d\n"), 
+        ACE_TEXT("got fixed array: %d\n"),
         message[i]));
     if (message[i] != static_cast<CORBA::Long> (i + 999))
       ERROR_COUNT ("Hello::test_fixed_array_arg")
@@ -114,9 +109,8 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message
 }
 
 
-void 
-Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+void
+Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message)
                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -127,9 +121,8 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message
 }
 
 
-void 
-Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+void
+Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message)
                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -140,9 +133,8 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
 }
 
 
-void 
-Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t
-                             ACE_ENV_ARG_DECL_NOT_USED)
+void
+Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t)
                            ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
@@ -150,16 +142,15 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t
                         ACE_TEXT("got timeofday: %d:%d:%d\n"),
                         t.hour, t.minute, t.second));
 
-  if (t.hour != TEST_HOUR 
-      || t.minute != TEST_MINUTE 
+  if (t.hour != TEST_HOUR
+      || t.minute != TEST_MINUTE
       || t.second != TEST_SECOND)
     ERROR_COUNT ("Hello::test_fixed_size_arg")
 }
 
 
-void 
-Hello::test_var_array_arg(const Test::Var_Array messages
-                            ACE_ENV_ARG_DECL_NOT_USED)
+void
+Hello::test_var_array_arg(const Test::Var_Array messages)
                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++)
@@ -173,9 +164,8 @@ Hello::test_var_array_arg(const Test::Var_Array messages
 }
 
 
-void 
-Hello::test_special_basic_arg(CORBA::Char value
-                                ACE_ENV_ARG_DECL_NOT_USED)
+void
+Hello::test_special_basic_arg(CORBA::Char value)
                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -188,7 +178,6 @@ Hello::test_special_basic_arg(CORBA::Char value
 
 void Hello::test_objref_arg (
     ::Test::Simple_Test_ptr test
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -199,14 +188,13 @@ void Hello::test_objref_arg (
 
   if (CORBA::is_nil (test))
     ERROR_COUNT ("Hello::test_objref_arg")
-  else 
+  else
   {
     // Increment the error_count before calling test_method() and decrement
     // the error_count when the server handling the test_method() call.
     CORBA::ULong error_count = 0;
     error_count ++;
-    test->test_method (error_count ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    test->test_method (error_count);
     if (error_count != 0)
     {
       ERROR_COUNT ("Hello::test_objref_arg")
@@ -216,7 +204,6 @@ void Hello::test_objref_arg (
 
 void Hello::test_object_arg (
     ::CORBA::Object_ptr o
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -225,11 +212,10 @@ void Hello::test_object_arg (
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (o);
-  
+
   CORBA::ULong error_count = 0;
   error_count ++;
-  simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  simple_test->test_method (error_count);
   if (error_count != 0)
   {
     ERROR_COUNT ("Hello::test_object_arg")
@@ -240,7 +226,6 @@ void Hello::test_args_1 (
     ::CORBA::Object_ptr arg1,
     ::CORBA::Char arg2,
     ::Test::Simple_Test_ptr arg3
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -249,14 +234,12 @@ void Hello::test_args_1 (
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (arg1);
-  
+
   CORBA::ULong error_count = 0;
   error_count ++;
-  simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  simple_test->test_method (error_count);
   error_count ++;
-  arg3->test_method (error_count ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  arg3->test_method (error_count);
 
   if (error_count != 0)
   {
@@ -271,7 +254,6 @@ void Hello::test_args_2 (
     const char * arg1,
     const ::Test::Fixed_Array arg2,
     const ::Test::TimeOfDay & arg3
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -281,15 +263,15 @@ void Hello::test_args_2 (
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n")));
   if (ACE_OS::strncmp (arg1, TEST_STR, strlen (TEST_STR)) != 0 )
     ERROR_COUNT ("Hello::test_args_2")
-  
+
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
   {
     if (arg2[i] != static_cast<CORBA::Long> (i + 999))
       ERROR_COUNT ("Hello::test_args_2")
   }
 
-  if (arg3.hour != TEST_HOUR 
-      || arg3.minute != TEST_MINUTE 
+  if (arg3.hour != TEST_HOUR
+      || arg3.minute != TEST_MINUTE
       || arg3.second != TEST_SECOND)
     ERROR_COUNT ("Hello::test_args_2")
 }
@@ -299,7 +281,6 @@ void Hello::test_args_3 (
     const ::Test::Bounded_Var_Size_Arg & arg2,
     const ::Test::Unbounded_Var_Size_Arg & arg3,
     const ::Test::Var_Array arg4
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -321,7 +302,7 @@ void Hello::test_args_3 (
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
@@ -359,12 +340,11 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::string_dup ("Hello there!");
 }
 
-char * 
+char *
 Hello::test_unbounded_string (
     const char * s1,
     char *& s2,
     CORBA::String_out s3
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -380,14 +360,14 @@ Hello::test_unbounded_string (
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
   // to avoid BAD_INV_ORDER exceptions on fast dual processor machines.
   ACE_OS::sleep (1);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 CORBA::ULong Hello::error_count () const
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
index 8dde8446d54..8564949a0ff 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -10,20 +10,19 @@
 
 #include "ace/OS.h"
 
-class  Test_Simple_Test_i 
+class  Test_Simple_Test_i
   : public virtual POA_Test::Simple_Test
 {
 public:
-  //Constructor 
+  //Constructor
   Test_Simple_Test_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Test_Simple_Test_i (void);
-  
+
   virtual
   void test_method (
       ::CORBA::ULong & error_count
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -43,7 +42,6 @@ public:
   virtual
   void test_basic_arg (
       ::CORBA::Long basic
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -52,128 +50,115 @@ public:
   virtual
   void test_unbounded_string_arg (
       const char * message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_bounded_string_arg (
       const char * message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_fixed_array_arg (
       const ::Test::Fixed_Array message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_var_array_arg (
       const ::Test::Var_Array messages
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_bounded_var_size_arg (
       const ::Test::Bounded_Var_Size_Arg & message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_unbounded_var_size_arg (
       const ::Test::Unbounded_Var_Size_Arg & message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_fixed_size_arg (
       const ::Test::TimeOfDay & t
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_special_basic_arg (
       ::CORBA::Char value
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_objref_arg (
       ::Test::Simple_Test_ptr test
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_object_arg (
       ::CORBA::Object_ptr o
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_args_1 (
       ::CORBA::Object_ptr arg1,
       ::CORBA::Char arg2,
       ::Test::Simple_Test_ptr arg3
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_args_2 (
       const char * arg1,
       const ::Test::Fixed_Array arg2,
       const ::Test::TimeOfDay & arg3
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_args_3 (
       const char * arg1,
       const ::Test::Bounded_Var_Size_Arg & arg2,
       const ::Test::Unbounded_Var_Size_Arg & arg3,
       const ::Test::Var_Array arg4
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual
@@ -181,13 +166,12 @@ public:
       const char * s1,
       char *& s2,
       CORBA::String_out s3
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong error_count () const;
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
index 15754f7aaf3..22a22d3b099 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
@@ -29,17 +29,13 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -47,8 +43,7 @@ Server_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 ();
 
      Hello *hello_impl;
      ACE_NEW_RETURN (hello_impl,
@@ -59,13 +54,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
      Test::Hello_var hello =
-       hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       hello_impl->_this ();
 
      CORBA::String_var ior =
-       this->sorb_->object_to_string (hello.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (hello.in ());
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
@@ -87,13 +79,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer_simple(simple_impl);
 
      Test::Simple_Test_var simple_test =
-       simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       simple_impl->_this ();
 
      CORBA::String_var simple_test_ior =
-       this->sorb_->object_to_string (simple_test.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (simple_test.in ());
 
      // Output the IOR to the <this->output_>
      FILE *simple_test_output_file= ACE_OS::fopen (this->simple_test_output_,
@@ -107,14 +96,12 @@ Server_Task::svc (void)
      ACE_OS::fprintf (simple_test_output_file, "%s", simple_test_ior.in ());
      ACE_OS::fclose (simple_test_output_file);
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      // Signal the main thread before we call orb->run ();
      this->me_.signal ();
 
-     this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->run ();
 
      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
@@ -124,25 +111,23 @@ Server_Task::svc (void)
 
      error_count_ += errors;
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
      error_count_ ++;
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
- ACE_CATCHALL
+ catch (...)
    {
      error_count_ ++;
      ACE_ERROR ((LM_ERROR, "(%P|%t)Server_Task::svc - caught unknown exception \n"));
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
 
-CORBA::ULong 
+CORBA::ULong
 Server_Task::error_count () const
 {
   return error_count_;
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
index f4bbfe757e4..a6b4a921625 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
@@ -32,12 +32,11 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var obj =
-        this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-     
+        this->corb_->string_to_object (input_);
+
       if (CORBA::is_nil (obj.in ()))
       {
         ACE_ERROR_RETURN ((LM_DEBUG,
@@ -47,9 +46,8 @@ Client_Task::svc (void)
       }
 
       CORBA::Object_var simple_test_obj =
-        this->corb_->string_to_object (simple_test_input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-     
+        this->corb_->string_to_object (simple_test_input_);
+
       if (CORBA::is_nil (simple_test_obj.in ()))
       {
         ACE_ERROR_RETURN ((LM_DEBUG,
@@ -58,46 +56,35 @@ Client_Task::svc (void)
           1);
       }
 
-      Test::Simple_Test_var simple_test 
-        = Test::Simple_Test::_narrow (simple_test_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test::Simple_Test_var simple_test
+        = Test::Simple_Test::_narrow (simple_test_obj.in ());
 CORBA::Long l = 200;
-      CORBA::Request_var req (obj->_request ("test_basic_arg" ACE_ENV_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+      CORBA::Request_var req (obj->_request ("test_basic_arg"));
       req->add_in_arg ("basic") <<= TEST_BASIC_VALUE;
-      req->add_out_arg ("x") <<= l; 
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req->add_out_arg ("x") <<= l;
+      req->invoke ();
       if (req->response_received ())
       {
-        
+
       }
 
-      req = obj->_request ("test_unbounded_string_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_unbounded_string_arg");
 
       req->add_in_arg ("ub_string") <<= TEST_STR;
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-
-      req = obj->_request ("test_bounded_string_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
+
+
+      req = obj->_request ("test_bounded_string_arg");
+
       ACE_CString bs (TEST_STR);
       bs = bs.substr (0, ::Test::BOUNDED_STRING_SIZE);
 
-      req->add_in_arg ("bd_string") 
+      req->add_in_arg ("bd_string")
         <<= CORBA::Any::from_string (bs.c_str (), ::Test::BOUNDED_STRING_SIZE);
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
 
-      req = obj->_request ("test_fixed_array_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_fixed_array_arg");
 
       ::Test::Fixed_Array fixed_array;
 
@@ -107,181 +94,145 @@ CORBA::Long l = 200;
       }
 
       req->add_in_arg ("fixed_array") <<= ::Test::Fixed_Array_forany (fixed_array);
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
+
 
-      req = obj->_request ("test_var_array_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_var_array_arg");
 
       ::Test::Var_Array var_array;
 
       for (CORBA::ULong i = 0; i < ::Test::VAR_ARRAY_SIZE; ++i)
-      { 
+      {
         var_array[i] = CORBA::string_dup(TEST_STR);
       }
 
       req->add_in_arg ("var_array") <<= var_array;
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
 
-      req = obj->_request ("test_bounded_var_size_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_bounded_var_size_arg");
 
       ACE_CString bvs (TEST_STR);
       bvs = bvs.substr (0, ::Test::BOUNDED_VAR_SIZE);
 
-      ::Test::Bounded_Var_Size_Arg* bd_var_size 
+      ::Test::Bounded_Var_Size_Arg* bd_var_size
         = new ::Test::Bounded_Var_Size_Arg();
 
       bd_var_size->replace (::Test::BOUNDED_VAR_SIZE,
         const_cast <CORBA::Char*> (bvs.c_str ()));
 
       req->add_in_arg ("bd_var_size") <<= bd_var_size;
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
+
 
-      req = obj->_request ("test_unbounded_var_size_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_unbounded_var_size_arg");
 
-      ::Test::Unbounded_Var_Size_Arg* ub_var_size 
+      ::Test::Unbounded_Var_Size_Arg* ub_var_size
         = new ::Test::Unbounded_Var_Size_Arg();
       ub_var_size->replace (ub_var_size->maximum (),
         ACE_OS::strlen (TEST_STR),
         TEST_STR);
 
       req->add_in_arg ("ub_var_size") <<= ub_var_size;
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
 
-      req = obj->_request ("test_fixed_size_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_fixed_size_arg");
 
       ::Test::TimeOfDay t;
-      t.hour = TEST_HOUR;  
+      t.hour = TEST_HOUR;
       t.minute = TEST_MINUTE;
       t.second = TEST_SECOND;
 
       req->add_in_arg ("fixed_size") <<= t;
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
+
 
-      req = obj->_request ("test_special_basic_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_special_basic_arg");
 
       req->add_in_arg ("special") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE);
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
+
 
-      req = obj->_request ("test_object_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_object_arg");
 
       req->add_in_arg ("object") <<= simple_test_obj.in ();
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
 
-      req = obj->_request ("test_objref_arg"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_objref_arg");
 
       req->add_in_arg ("objref") <<= simple_test.in ();
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
+
 
-      req = obj->_request ("test_args_1"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_args_1");
 
       req->add_in_arg ("arg1") <<= simple_test_obj.in ();
       req->add_in_arg ("arg2") <<= CORBA::Any::from_char (TEST_SPECIAL_VALUE);
       req->add_in_arg ("arg3") <<= simple_test.in ();
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
 
-      req = obj->_request ("test_args_2"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      req = obj->_request ("test_args_2");
 
       req->add_in_arg ("arg1") <<= TEST_STR;
       req->add_in_arg ("arg2") <<= ::Test::Fixed_Array_forany (fixed_array);
       req->add_in_arg ("arg3") <<= t;
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
+
 
-      req = obj->_request ("test_args_3"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req = obj->_request ("test_args_3");
 
-      bd_var_size 
+      bd_var_size
         = new ::Test::Bounded_Var_Size_Arg();
       bd_var_size->replace (::Test::BOUNDED_VAR_SIZE,
         const_cast <CORBA::Char*> (bvs.c_str ()));
 
-      ub_var_size 
+      ub_var_size
         = new ::Test::Unbounded_Var_Size_Arg();
       ub_var_size->replace (ub_var_size->maximum (),
         ACE_OS::strlen (TEST_STR),
         TEST_STR);
 
       for (CORBA::ULong j = 0; j < ::Test::VAR_ARRAY_SIZE; ++j)
-      { 
+      {
         var_array[j] = CORBA::string_dup(TEST_STR);
       }
 
-      req->add_in_arg ("arg1") 
+      req->add_in_arg ("arg1")
         <<= CORBA::Any::from_string (bs.c_str (), ::Test::BOUNDED_STRING_SIZE);
 
       req->add_in_arg ("arg2") <<= bd_var_size;
       req->add_in_arg ("arg3") <<= ub_var_size;
       req->add_in_arg ("arg4") <<= var_array;
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      req->invoke ();
+
+
+      req = obj->_request ("shutdown");
 
-      req = obj->_request ("shutdown"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req->send_oneway ();
 
-      req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       error_count_ ++;
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       error_count_ ++;
       ACE_ERROR ((LM_ERROR, "(%P|%t)Client_Task::svc - caught unknown exception \n"));
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
 }
 
-CORBA::ULong 
+CORBA::ULong
 Client_Task::error_count () const
 {
   return error_count_;
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
index 3e2bab6c3fc..603fa6b822d 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp
@@ -60,16 +60,13 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -92,9 +89,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                simple_test_input,
@@ -112,12 +107,10 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       // Now that all threads have completed we can destroy the ORB
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
       if (server_orb != client_orb)
         {
-          corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          corb->destroy ();
         }
 
       CORBA::ULong errors = client_task.error_count () + server_task.error_count ();
@@ -131,10 +124,9 @@ main (int argc, char *argv[])
           return 1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
index f11634ae374..d4e2a521bfe 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
@@ -35,7 +35,6 @@ Test_Simple_Test_i::~Test_Simple_Test_i (void)
 
 void Test_Simple_Test_i::test_method (
     ::CORBA::ULong & error_count
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -56,7 +55,6 @@ void
 Hello::test_basic_arg (
     ::CORBA::Long basic,
     ::CORBA::Long_out x
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -69,8 +67,7 @@ Hello::test_basic_arg (
 }
 
 void
-Hello::test_unbounded_string_arg(const char* message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_unbounded_string_arg(const char* message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -85,8 +82,7 @@ Hello::test_unbounded_string_arg(const char* message
 
 
 void
-Hello::test_bounded_string_arg(const char* message
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_bounded_string_arg(const char* message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -101,8 +97,7 @@ Hello::test_bounded_string_arg(const char* message
 
 
 void
-Hello::test_fixed_array_arg(const ::Test::Fixed_Array message
-                              ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_fixed_array_arg(const ::Test::Fixed_Array message)
                             ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
@@ -118,8 +113,7 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message
 
 
 void
-Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message)
                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -131,8 +125,7 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message
 
 
 void
-Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message)
                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -144,8 +137,7 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
 
 
 void
-Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t)
                            ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
@@ -161,8 +153,7 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t
 
 
 void
-Hello::test_var_array_arg(const Test::Var_Array messages
-                            ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_var_array_arg(const Test::Var_Array messages)
                           ACE_THROW_SPEC((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++)
@@ -177,8 +168,7 @@ Hello::test_var_array_arg(const Test::Var_Array messages
 
 
 void
-Hello::test_special_basic_arg(CORBA::Char value
-                                ACE_ENV_ARG_DECL_NOT_USED)
+Hello::test_special_basic_arg(CORBA::Char value)
                            ACE_THROW_SPEC((CORBA::SystemException))
 {
   if (debug)
@@ -191,7 +181,6 @@ Hello::test_special_basic_arg(CORBA::Char value
 
 void Hello::test_objref_arg (
     ::Test::Simple_Test_ptr test
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -202,14 +191,13 @@ void Hello::test_objref_arg (
 
   if (CORBA::is_nil (test))
     ERROR_COUNT ("Hello::test_objref_arg")
-  else 
+  else
   {
     // Increment the error_count before calling test_method() and decrement
     // the error_count when the server handling the test_method() call.
     CORBA::ULong error_count = 0;
     error_count ++;
-    test->test_method (error_count ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    test->test_method (error_count);
     if (error_count != 0)
     {
       ERROR_COUNT ("Hello::test_objref_arg")
@@ -219,7 +207,6 @@ void Hello::test_objref_arg (
 
 void Hello::test_object_arg (
     ::CORBA::Object_ptr o
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -228,11 +215,10 @@ void Hello::test_object_arg (
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (o);
-  
+
   CORBA::ULong error_count = 0;
   error_count ++;
-  simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  simple_test->test_method (error_count);
   if (error_count != 0)
   {
     ERROR_COUNT ("Hello::test_object_arg")
@@ -243,7 +229,6 @@ void Hello::test_args_1 (
     ::CORBA::Object_ptr arg1,
     ::CORBA::Char arg2,
     ::Test::Simple_Test_ptr arg3
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -252,14 +237,12 @@ void Hello::test_args_1 (
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n")));
   ::Test::Simple_Test_var simple_test = ::Test::Simple_Test::_narrow (arg1);
-  
+
   CORBA::ULong error_count = 0;
   error_count ++;
-  simple_test->test_method (error_count ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  simple_test->test_method (error_count);
   error_count ++;
-  arg3->test_method (error_count ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  arg3->test_method (error_count);
 
   if (error_count != 0)
   {
@@ -274,7 +257,6 @@ void Hello::test_args_2 (
     const char * arg1,
     const ::Test::Fixed_Array arg2,
     const ::Test::TimeOfDay & arg3
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -284,15 +266,15 @@ void Hello::test_args_2 (
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n")));
   if (ACE_OS::strncmp (arg1, TEST_STR, strlen (TEST_STR)) != 0 )
     ERROR_COUNT ("Hello::test_args_2")
-  
+
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
   {
     if (arg2[i] != static_cast<CORBA::Long> (i + 999))
       ERROR_COUNT ("Hello::test_args_2")
   }
 
-  if (arg3.hour != TEST_HOUR 
-      || arg3.minute != TEST_MINUTE 
+  if (arg3.hour != TEST_HOUR
+      || arg3.minute != TEST_MINUTE
       || arg3.second != TEST_SECOND)
     ERROR_COUNT ("Hello::test_args_2")
 }
@@ -302,7 +284,6 @@ void Hello::test_args_3 (
     const ::Test::Bounded_Var_Size_Arg & arg2,
     const ::Test::Unbounded_Var_Size_Arg & arg3,
     const ::Test::Var_Array arg4
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -324,7 +305,7 @@ void Hello::test_args_3 (
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (debug)
@@ -362,12 +343,11 @@ Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::string_dup ("Hello there!");
 }
 
-char * 
+char *
 Hello::test_unbounded_string (
     const char * s1,
     char *& s2,
     CORBA::String_out s3
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -383,14 +363,14 @@ Hello::test_unbounded_string (
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
   // to avoid BAD_INV_ORDER exceptions on fast dual processor machines.
   ACE_OS::sleep (1);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 CORBA::ULong Hello::error_count () const
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
index 37271331d77..f97f94609c9 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
@@ -10,20 +10,19 @@
 
 #include "ace/OS.h"
 
-class  Test_Simple_Test_i 
+class  Test_Simple_Test_i
   : public virtual POA_Test::Simple_Test
 {
 public:
-  //Constructor 
+  //Constructor
   Test_Simple_Test_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Test_Simple_Test_i (void);
-  
+
   virtual
   void test_method (
       ::CORBA::ULong & error_count
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -44,7 +43,6 @@ public:
   void test_basic_arg (
       ::CORBA::Long basic,
       ::CORBA::Long_out x
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -53,128 +51,115 @@ public:
   virtual
   void test_unbounded_string_arg (
       const char * message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_bounded_string_arg (
       const char * message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_fixed_array_arg (
       const ::Test::Fixed_Array message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_var_array_arg (
       const ::Test::Var_Array messages
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_bounded_var_size_arg (
       const ::Test::Bounded_Var_Size_Arg & message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_unbounded_var_size_arg (
       const ::Test::Unbounded_Var_Size_Arg & message
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_fixed_size_arg (
       const ::Test::TimeOfDay & t
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_special_basic_arg (
       ::CORBA::Char value
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_objref_arg (
       ::Test::Simple_Test_ptr test
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_object_arg (
       ::CORBA::Object_ptr o
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_args_1 (
       ::CORBA::Object_ptr arg1,
       ::CORBA::Char arg2,
       ::Test::Simple_Test_ptr arg3
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_args_2 (
       const char * arg1,
       const ::Test::Fixed_Array arg2,
       const ::Test::TimeOfDay & arg3
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual
   void test_args_3 (
       const char * arg1,
       const ::Test::Bounded_Var_Size_Arg & arg2,
       const ::Test::Unbounded_Var_Size_Arg & arg3,
       const ::Test::Var_Array arg4
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual
@@ -182,13 +167,12 @@ public:
       const char * s1,
       char *& s2,
       CORBA::String_out s3
-      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong error_count () const;
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
index 4f901730471..2a252386ff0 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
@@ -27,17 +27,13 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -45,8 +41,7 @@ Server_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 ();
 
      Hello *hello_impl = 0;
      ACE_NEW_RETURN (hello_impl,
@@ -57,13 +52,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer(hello_impl);
 
      Test::Hello_var hello =
-       hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       hello_impl->_this ();
 
      CORBA::String_var ior =
-       this->sorb_->object_to_string (hello.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (hello.in ());
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
@@ -85,13 +77,10 @@ Server_Task::svc (void)
      PortableServer::ServantBase_var owner_transfer_simple(simple_impl);
 
      Test::Simple_Test_var simple_test =
-       simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       simple_impl->_this ();
 
      CORBA::String_var simple_test_ior =
-       this->sorb_->object_to_string (simple_test.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->object_to_string (simple_test.in ());
 
      // Output the IOR to the <this->output_>
      FILE *simple_test_output_file= ACE_OS::fopen (this->simple_test_output_,
@@ -105,14 +94,12 @@ Server_Task::svc (void)
      ACE_OS::fprintf (simple_test_output_file, "%s", simple_test_ior.in ());
      ACE_OS::fclose (simple_test_output_file);
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      // Signal the main thread before we call orb->run ();
      this->me_.signal ();
 
-     this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->run ();
 
      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
@@ -122,20 +109,18 @@ Server_Task::svc (void)
 
      error_count_ += errors;
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
      error_count_ ++;
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
- ACE_CATCHALL
+ catch (...)
    {
      error_count_ ++;
      ACE_ERROR ((LM_ERROR, "(%P|%t)Server_Task::svc - caught unknown exception \n"));
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index f6cd461b12e..7c43180ab80 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -65,8 +65,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
   // -----------------------------------------------------------------
   // Boilerplate CORBA/TAO client-side ORB initialization code.
   // -----------------------------------------------------------------
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Prepend a "dummy" program name argument to the Service
       // Configurator argument vector.
@@ -89,9 +88,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
       // Initialize the ORB.
       this->orb_ = CORBA::ORB_init (new_argc,
                                     new_argv.get_buffer (),
-                                    "CLIENT"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "CLIENT");
 
       if (CORBA::is_nil (this->orb_.in ()))
         return -1;
@@ -100,12 +97,10 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var obj =
-        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior);
 
       this->test_ =
-        Test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (obj.in ());
 
       if (CORBA::is_nil (this->test_.in ()))
         {
@@ -115,15 +110,12 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
                             1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Test_Client_Module::init"));
+      ex._tao_print_exception (ACE_TEXT ("Test_Client_Module::init"));
 
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
 #if defined (ACE_HAS_THREADS)
 
@@ -161,16 +153,13 @@ Test_Client_Module::fini (void)
 int
 Test_Client_Module::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Invoke an operation on the Test object.
-      this->test_->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_->invoke_me ();
 
       /// Shutdown the remote ORB.
-      this->test_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_->shutdown ();
 
       // Make sure the ORB is destroyed here - before the thread
       // exits, because it may be holding global resources, owned by
@@ -183,8 +172,7 @@ Test_Client_Module::svc (void)
       // deleted resources.
       if (!CORBA::is_nil (this->orb_.in ()))
         {
-          this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->destroy ();
         }
 
       // This is a bit of a hack.  The ORB Core's lifetime is tied to the
@@ -197,14 +185,11 @@ Test_Client_Module::svc (void)
       (void) this->test_.out ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Test_Client_Module::svc"));
+      ex._tao_print_exception (ACE_TEXT ("Test_Client_Module::svc"));
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index 2bb64be76df..9a1dbb1f1f8 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -66,8 +66,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
   // -----------------------------------------------------------------
   // Boilerplate CORBA/TAO server-side ORB initialization code.
   // -----------------------------------------------------------------
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Add one to the new argc since "dummy" is being added to the
       // argv vector.
@@ -90,16 +89,13 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
       // Initialize the ORB.
       this->orb_ = CORBA::ORB_init (new_argc,
                                     new_argv.get_buffer (),
-                                    "SERVER"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "SERVER");
 
       if (CORBA::is_nil (this->orb_.in ()))
         return -1;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -107,24 +103,19 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
                           1);
 
       this->poa_ =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
-      this->poa_manager_ = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_ = this->poa_->the_POAManager ();
 
-      this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_manager_->activate ();
 
       if (::parse_args (new_argc, new_argv.get_buffer ()) != 0)
         return -1;
 
-      CORBA::Object_var obj = this->servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = this->servant_._this ();
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Servant:\n<%s>\n",
@@ -143,14 +134,11 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
 
       this->servant_.orb (this->orb_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Test_Server_Module::init"));
+      ex._tao_print_exception (ACE_TEXT ("Test_Server_Module::init"));
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
 #if defined (ACE_HAS_THREADS)
 
@@ -188,12 +176,10 @@ Test_Server_Module::fini (void)
 int
 Test_Server_Module::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Run the ORB event loop in its own thread.
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
 
       ACE_DEBUG ((LM_INFO,
                   "Server is being destroyed.\n"));
@@ -209,18 +195,14 @@ Test_Server_Module::svc (void)
       // deleted resources.
       if (!CORBA::is_nil (this->orb_.in ()))
         {
-          this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Test_Server_Module::svc"));
+      ex._tao_print_exception (ACE_TEXT ("Test_Server_Module::svc"));
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index aa8d19ec17b..43deb11f19d 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -12,7 +12,7 @@ Test_i::Test_i (void)
 }
 
 void
-Test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
+Test_i::invoke_me ( /* */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
@@ -20,14 +20,14 @@ Test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAME
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
 
   if (!CORBA::is_nil (this->orb_.in ()))
-    this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+    this->orb_->shutdown (0);
 }
 
 void
diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h
index 9452bce731f..f22788d8dfc 100644
--- a/TAO/tests/DLL_ORB/Test_i.h
+++ b/TAO/tests/DLL_ORB/Test_i.h
@@ -34,11 +34,11 @@ public:
 
   /// Simple two-way operation used to excercise the ORB transport
   /// internals.
-  virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void invoke_me (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the ORB to be shutdown by the shutdown() method in this
diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index 8d1d133fb22..c0d5e122d0e 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -63,11 +63,10 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         {
@@ -75,12 +74,10 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -95,13 +92,11 @@ main (int argc, char *argv[])
 
       if (test_user_exception == 1)
         {
-          server->raise_user_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->raise_user_exception ();
         }
       else if (test_system_exception == 1)
         {
-          server->raise_system_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->raise_system_exception ();
         }
       else
         {
@@ -134,9 +129,7 @@ main (int argc, char *argv[])
                 server->test_method (i,
                                      the_in_structure,
                                      the_out_structure.out (),
-                                     name.inout ()
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                     name.inout ());
 
               if (TAO_debug_level > 0)
                 {
@@ -163,14 +156,12 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
     }
-  ACE_CATCH (test_exception, ex)
+  catch (const test_exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client: exception caught - ");
+      ex._tao_print_exception ("Client: exception caught - ");
 
       ACE_DEBUG ((LM_DEBUG,
                   "error code: %d\n"
@@ -182,20 +173,17 @@ main (int argc, char *argv[])
 
       return 0;
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, ex)
+  catch (const CORBA::NO_PERMISSION& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client: exception caught - ");
+      ex._tao_print_exception ("Client: exception caught - ");
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client: exception caught - ");
+      ex._tao_print_exception ("Client: exception caught - ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp
index 4aade2c1f03..0da6e8dda4d 100644
--- a/TAO/tests/DSI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_Gateway/gateway.cpp
@@ -56,15 +56,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -74,15 +72,12 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         {
@@ -90,25 +85,19 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       DSI_Simple_Server server_impl (orb.in (),
                                      object.in (),
                                      root_poa.in ());
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (&server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&server_impl);
 
       CORBA::Object_var server =
-        root_poa->id_to_reference (oid.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (oid.in ());
 
       CORBA::String_var ior =
-              orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+              orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -129,18 +118,15 @@ main (int argc, char *argv[])
                 ACE_OS::fclose (output_file);
               }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Gateway: exception caught - ");
+      ex._tao_print_exception ("Gateway: exception caught - ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp
index dfe1919fe78..3ee312a38ce 100644
--- a/TAO/tests/DSI_Gateway/server.cpp
+++ b/TAO/tests/DSI_Gateway/server.cpp
@@ -43,15 +43,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -61,12 +59,10 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         {
@@ -76,12 +72,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-              orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+              orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -102,21 +96,17 @@ main (int argc, char *argv[])
                 ACE_OS::fclose (output_file);
               }
 
-      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, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Server: exception caught - ");
+      ex._tao_print_exception ("Server: exception caught - ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index ccd6466a93c..662e7bc2b09 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -11,16 +11,13 @@
 ACE_RCSID(DSI_Gateway, test_dsi, "$Id$")
 
 void
-DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
-                           ACE_ENV_ARG_DECL)
+DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::NVList_ptr list;
-  this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->create_list (0, list);
 
-  request->arguments (list ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  request->arguments (list);
 
   CORBA::Request_var target_request;
 
@@ -31,22 +28,19 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
                                   0, // exception_list,
                                   0, // context_list,
                                   target_request.inout (),
-                                  0
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                  0);
 
   target_request->_tao_lazy_evaluation (1);
 
   // Outgoing request must have the same byte order as the incoming one.
   target_request->_tao_byte_order (request->_tao_incoming_byte_order ());
 
-  ACE_TRY
+  try
     {
       // Updates the byte order state, if necessary.
-      target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      target_request->invoke ();
     }
-  ACE_CATCH (CORBA::UNKNOWN, ex)
+  catch (const CORBA::UNKNOWN& ex)
     {
       ACE_UNUSED_ARG (ex);
 
@@ -57,29 +51,26 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
 
       return;
     }
-  ACE_ENDTRY;
 
   // Outgoing reply must have the same byte order as the incoming one.
   request->_tao_reply_byte_order (target_request->_tao_byte_order ());
 
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->shutdown (0);
     }
 }
 
 CORBA::RepositoryId
 DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
-                                       PortableServer::POA_ptr
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       PortableServer::POA_ptr)
     ACE_THROW_SPEC (())
 {
   return CORBA::string_dup ("IDL:Simple_Server:1.0");
 }
 
 PortableServer::POA_ptr
-DSI_Simple_Server::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+DSI_Simple_Server::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h
index 336f6ce56d7..cd81121075c 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_Gateway/test_dsi.h
@@ -36,19 +36,16 @@ public:
   // ctor
 
   // = The DynamicImplementation methods.
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL)
+  virtual void invoke (CORBA::ServerRequest_ptr request)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL
     )
       ACE_THROW_SPEC (());
 
   virtual PortableServer::POA_ptr _default_POA (
-      ACE_ENV_SINGLE_ARG_DECL
     );
 
 private:
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index 759578e6f6a..c9eeeefa7e4 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -13,8 +13,7 @@ CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x,
                               const Structure& the_in_structure,
                               Structure_out the_out_structure,
-                              char *&name
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              char *&name)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Structure *tmp = 0;
@@ -39,38 +38,36 @@ Simple_Server_i::test_method (CORBA::Long x,
 }
 
 void
-Simple_Server_i::raise_user_exception (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::raise_user_exception (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      test_exception))
 {
-  ACE_THROW (test_exception (33,
-                             "reactor meltdown",
-                             "kaput"));
+  throw test_exception (33, "reactor meltdown", "kaput");
 }
 
 void
-Simple_Server_i::raise_system_exception (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::raise_system_exception (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_PERMISSION ());
+  throw CORBA::NO_PERMISSION ();
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 CORBA::Long
-Simple_Server_i::test_val (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::test_val (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return vlong_;
 }
 
 void
-Simple_Server_i::test_val (CORBA::Long tv ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_val (CORBA::Long tv)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h
index 776a385b9e1..9ec76830813 100644
--- a/TAO/tests/DSI_Gateway/test_i.h
+++ b/TAO/tests/DSI_Gateway/test_i.h
@@ -34,24 +34,23 @@ public:
   CORBA::Long test_method (CORBA::Long x,
                            const Structure& the_in_structure,
                            Structure_out the_out_structure,
-                           char *&name
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           char *&name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-   CORBA::Long test_val (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+   CORBA::Long test_val (void)
      ACE_THROW_SPEC (( CORBA::SystemException));
 
-   void test_val (CORBA::Long test_val ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+   void test_val (CORBA::Long test_val)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void raise_user_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void raise_user_exception (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      test_exception));
 
-  void raise_system_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void raise_system_exception (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp
index 55bad99ed41..529ed21792c 100644
--- a/TAO/tests/DynAny_Test/analyzer.cpp
+++ b/TAO/tests/DynAny_Test/analyzer.cpp
@@ -79,23 +79,20 @@ void DynAnyAnalyzer::resetTab (void)
   level_ = 0;
 }
 
-void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
+void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da)
 {
   CORBA::TypeCode_var tc = da->type ();
 
-  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::TCKind kind = tc->kind ();
 
   CORBA::TypeCode_var dup = CORBA::TypeCode::_duplicate (tc.in ());
 
   // strip aliases
   while (kind == CORBA::tk_alias)
     {
-      dup = dup->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      dup = dup->content_type ();
 
-      kind = dup->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      kind = dup->kind ();
     }
 
   switch (kind)
@@ -103,8 +100,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
      case CORBA::tk_struct:
       {
         DynamicAny::DynStruct_var ds
-          = DynamicAny::DynStruct::_narrow (da ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          = DynamicAny::DynStruct::_narrow (da);
 
         tab (level_);
 
@@ -121,12 +117,10 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
             do
               {
                 DynamicAny::DynAny_var cc =
-                  ds->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK;
+                  ds->current_component ();
 
                 DynamicAny::FieldName_var fn =
-                  ds->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_CHECK;
+                  ds->current_member_name ();
 
                 tab(level_);
 
@@ -138,8 +132,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
 
                 if (!CORBA::is_nil (cc.in ()))
                   {
-                    this->analyze (cc.in () ACE_ENV_ARG_PARAMETER);
-                    ACE_CHECK;
+                    this->analyze (cc.in ());
                   }
 
               } while (da->next ());
@@ -158,8 +151,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
         else
           {
             DynamicAny::DynSequence_var ds =
-              DynamicAny::DynSequence::_narrow (da ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+              DynamicAny::DynSequence::_narrow (da);
 
             int i = 0;
             tab(level_);
@@ -183,12 +175,10 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
                                   "[%d]\n", i));
 
                     DynamicAny::DynAny_var cc (ds->current_component ());
-                    ACE_CHECK;
 
                     if (!CORBA::is_nil (cc.in ()))
                       {
-                        analyze (cc.in () ACE_ENV_ARG_PARAMETER);
-                        ACE_CHECK;
+                        analyze (cc.in ());
                       }
 
                     i++;
@@ -213,8 +203,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
         level_++;
 
         CORBA::ULong const len =
-          dup->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+          dup->length ();
 
         for (CORBA::ULong i = 0 ; i < len; ++i)
           {
@@ -229,8 +218,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
 
             if (!CORBA::is_nil (cc.in ()))
               {
-                analyze (cc.in () ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
+                analyze (cc.in ());
               }
 
             da->next ();
@@ -242,8 +230,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
     case CORBA::tk_union:
       {
         DynamicAny::DynUnion_var value =
-          DynamicAny::DynUnion::_narrow (da ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          DynamicAny::DynUnion::_narrow (da);
 
         if (!value->has_no_active_member ())
           {
@@ -251,8 +238,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
 
             if (!CORBA::is_nil (disc.in ()))
               {
-                this->analyze (disc.in () ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
+                this->analyze (disc.in ());
               }
           }
       }
@@ -264,14 +250,11 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
         CORBA::Any_var any = da->get_any ();
 
         dynany =
-          dynany_factory_->create_dyn_any (any.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          dynany_factory_->create_dyn_any (any.in ());
 
         if (!CORBA::is_nil (dynany.in ()))
           {
-            this->analyze (dynany.in () ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+            this->analyze (dynany.in ());
           }
 
         dynany->destroy ();
@@ -281,8 +264,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
     case CORBA::tk_enum:
       {
         DynamicAny::DynEnum_var value =
-          DynamicAny::DynEnum::_narrow (da ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+          DynamicAny::DynEnum::_narrow (da);
 
         CORBA::String_var s = value->get_as_string ();
         tab (level_);
@@ -325,8 +307,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
         if (debug_)
           {
             CORBA::TCKind const kind =
-              da->get_typecode ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+              da->get_typecode ()->kind ();
 
             ACE_DEBUG ((LM_DEBUG,
                         "  Value (TypeCode) = %d\n",
@@ -342,8 +323,7 @@ void DynAnyAnalyzer::analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL)
         if (debug_)
           {
             CORBA::TCKind const kind =
-              tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
+              tc->kind ();
 
             ACE_DEBUG ((LM_DEBUG,
                         "  unhandled typecode = %d\n",
diff --git a/TAO/tests/DynAny_Test/analyzer.h b/TAO/tests/DynAny_Test/analyzer.h
index 776c24ee9e6..1d071a3384c 100644
--- a/TAO/tests/DynAny_Test/analyzer.h
+++ b/TAO/tests/DynAny_Test/analyzer.h
@@ -23,7 +23,9 @@
 class DynAnyAnalyzer
 {
 public:
-  DynAnyAnalyzer (CORBA::ORB_ptr orb, DynamicAny::DynAnyFactory_ptr dynany_factory, int debug);
+  DynAnyAnalyzer (CORBA::ORB_ptr orb,
+                  DynamicAny::DynAnyFactory_ptr dynany_factory,
+                  int debug);
 
   void tab (int t);
 
@@ -31,8 +33,8 @@ public:
 
   void resetTab (void);
 
-  void analyze (DynamicAny::DynAny_ptr da ACE_ENV_ARG_DECL);
-  
+  void analyze (DynamicAny::DynAny_ptr da);
+
   void analyze_basic_seq (CORBA::TypeCode_ptr tc,
                           DynamicAny::DynAny_ptr da);
 
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index 55422d128f6..786295d28b8 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -36,15 +36,14 @@ Data::Data (CORBA::ORB_var orb)
     m_wchar1 (666),                             m_wchar2 (0),
     orb_ (orb)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       m_shortseq1.length (3UL);
       m_shortseq1[0UL] = 0;
       m_shortseq1[1UL] = 1;
       m_shortseq1[2UL] = 2;
-    
+
       labels[0] = "type boolean";
       labels[1] = "type octet";
       labels[2] = "type char";
@@ -62,14 +61,12 @@ Data::Data (CORBA::ORB_var orb)
       labels[14] = "type any";
       labels[15] = "type objref";
       labels[16] = "type short sequence";
-      
+
 
       // Getting the RootPOA so we can generate object references.
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("RootPOA");
 
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
         {
@@ -79,38 +76,27 @@ Data::Data (CORBA::ORB_var orb)
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ());
 
-      ACE_TRY_CHECK;
 
       // Generate values for the member variables.
      this->m_objref1 =
-        root_poa->create_reference ("foo"
-                                    ACE_ENV_ARG_PARAMETER);
+        root_poa->create_reference ("foo");
 
-      ACE_TRY_CHECK;
 
       this->m_objref2 =
-        root_poa->create_reference ("foo"
-                                    ACE_ENV_ARG_PARAMETER);
+        root_poa->create_reference ("foo");
 
-      ACE_TRY_CHECK;
 
       // Clean up after the POA
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
+                         1);
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in ORB/POA init\n");
+      ex._tao_print_exception ("Exception in ORB/POA init\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 Data::~Data (void)
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index b235f0d1872..5db43f01425 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -66,15 +66,13 @@ Driver::~Driver (void)
 int
 Driver::init (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Retrieve the underlying ORB
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    "local"
-                                    ACE_ENV_ARG_PARAMETER);
+                                    "local");
 
-      ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
       if (this->parse_args (argc, argv) == -1)
@@ -84,13 +82,11 @@ Driver::init (int argc, char* argv[])
                           -1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Driver::init");
+      ex._tao_print_exception ("Driver::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -115,7 +111,7 @@ Driver::parse_args (int argc, char* argv[])
       {
       case 't':
         test_str = get_opts.opt_arg ();
-        
+
         if (!ACE_OS::strcmp (test_str, "dynany"))
           this->test_type_ = TEST_DYNANY;
         else if (!ACE_OS::strcmp (test_str, "dynarray"))
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 35d7e1d1677..5694eb24793 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -43,7 +43,7 @@ Test_DynAny::run_test (void)
 {
   Data data (this->orb_);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
@@ -53,14 +53,10 @@ Test_DynAny::run_test (void)
                  "testing: constructor(Any)/insert/get\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("DynAnyFactory");
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ());
 
       if (CORBA::is_nil (dynany_factory.in ()))
         {
@@ -76,16 +72,12 @@ Test_DynAny::run_test (void)
       CORBA::Any in1;
       in1 <<= data.m_double2;
       DynamicAny::DynAny_var fa1 =
-        dynany_factory->create_dyn_any (in1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any (in1);
 
-      fa1->insert_double (data.m_double1
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa1->insert_double (data.m_double1);
 
       CORBA::Double d_out =
-        fa1->get_double (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        fa1->get_double ();
 
       if (d_out == data.m_double1)
         {
@@ -102,18 +94,12 @@ Test_DynAny::run_test (void)
 
       d_out = data.m_double2;
       DynamicAny::DynAny_var ftc1 =
-        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_double
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_double);
       CORBA::Any in_any1;
       in_any1 <<= data.m_double1;
-      ftc1->from_any (in_any1
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ftc1->from_any (in_any1);
+      analyzer.analyze (ftc1.in());
+      CORBA::Any_var out_any1 = ftc1->to_any ();
       out_any1 >>= d_out;
 
       if (d_out == data.m_double1)
@@ -126,10 +112,8 @@ Test_DynAny::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa1->destroy ();
+      ftc1->destroy ();
 
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
@@ -141,18 +125,12 @@ Test_DynAny::run_test (void)
       CORBA::Any in;
       in <<= data.m_typecode2;
       DynamicAny::DynAny_var fa2 =
-        dynany_factory->create_dyn_any (in
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      fa2->insert_typecode (data.m_typecode1
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any (in);
+      fa2->insert_typecode (data.m_typecode1);
       CORBA::TypeCode_var tc_out =
-        fa2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        fa2->get_typecode ();
 
-      if (tc_out->equal (data.m_typecode1
-                         ACE_ENV_ARG_PARAMETER))
+      if (tc_out->equal (data.m_typecode1))
         {
           ACE_DEBUG ((LM_DEBUG,
                      "++ OK ++\n"));
@@ -162,30 +140,21 @@ Test_DynAny::run_test (void)
           ++this->error_count_;
         }
 
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       DynamicAny::DynAny_var ftc2 =
-        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode);
       CORBA::Any in_any2;
       in_any2 <<= data.m_typecode1;
-      ftc2->from_any (in_any2
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      analyzer.analyze (ftc2.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Any_var out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ftc2->from_any (in_any2);
+      analyzer.analyze (ftc2.in());
+      CORBA::Any_var out_any2 = ftc2->to_any ();
       CORBA::TypeCode_ptr out_tc;
       out_any2 >>= out_tc;
 
-      CORBA::Boolean equal = out_tc->equal (data.m_typecode1
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean equal = out_tc->equal (data.m_typecode1);
 
       if (equal)
         {
@@ -197,13 +166,10 @@ Test_DynAny::run_test (void)
           ++this->error_count_;
         }
 
-      ACE_TRY_CHECK;
 
-      fa2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ftc2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      fa2->destroy ();
+      ftc2->destroy ();
+
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
                  data.labels[16]));
@@ -216,19 +182,14 @@ Test_DynAny::run_test (void)
       ss.length (0UL);
       in3 <<= ss;
       DynamicAny::DynAny_var fa3 =
-        dynany_factory->create_dyn_any (in3
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      fa3->insert_short_seq (data.m_shortseq1
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any (in3);
+      fa3->insert_short_seq (data.m_shortseq1);
       data.m_shortseq2 =
-        fa3->get_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        fa3->get_short_seq ();
+
       bool good =
         data.m_shortseq2->length () == data.m_shortseq1.length ();
-        
+
       if (good)
         {
           for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i)
@@ -251,31 +212,24 @@ Test_DynAny::run_test (void)
           ++this->error_count_;
         }
 
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       DynamicAny::DynAny_var ftc3 =
-        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_ShortSeq
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_ShortSeq);
       CORBA::Any in_any3;
       in_any3 <<= data.m_shortseq1;
-      ftc3->from_any (in_any3
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      analyzer.analyze (ftc3.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Any_var out_any3 = ftc3->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      ftc3->from_any (in_any3);
+      analyzer.analyze (ftc3.in ());
+      CORBA::Any_var out_any3 = ftc3->to_any ();
+
       CORBA::ShortSeq *outseq = 0;
       out_any3.in () >>= outseq;
 
       good =
         outseq->length () == data.m_shortseq1.length ();
-        
+
       if (good)
         {
           for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i)
@@ -298,20 +252,15 @@ Test_DynAny::run_test (void)
           ++this->error_count_;
         }
 
-      ACE_TRY_CHECK;
 
-      fa3->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ftc3->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa3->destroy ();
+      ftc3->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynany::run_test");
+      ex._tao_print_exception ("test_dynany::run_test");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index 26f792b417c..3fdcdddf750 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -45,7 +45,7 @@ Test_DynArray::run_test (void)
 
   DynAnyTests::test_array ta = {0};
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
@@ -55,14 +55,10 @@ Test_DynArray::run_test (void)
                  "testing: constructor(Any)/insert/get/seek/rewind/current_component\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("DynAnyFactory");
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ());
 
       if (CORBA::is_nil (dynany_factory.in ()))
         {
@@ -78,31 +74,21 @@ Test_DynArray::run_test (void)
       CORBA::Any in_any1;
       in_any1 <<= DynAnyTests::test_array_forany (ta);
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        dynany_factory->create_dyn_any (in_any1);
+
       DynamicAny::DynArray_var fa1 =
-        DynamicAny::DynArray::_narrow (dp1.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->seek (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->insert_long (data.m_long1
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        DynamicAny::DynArray::_narrow (dp1.in ());
+
+      fa1->seek (1);
+
+      fa1->insert_long (data.m_long1);
+
+      fa1->rewind ();
+
       CORBA::Long l_out1 = data.m_long2;
-      fa1->seek (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      l_out1 = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa1->seek (1);
+
+      l_out1 = fa1->get_long ();
 
       if (l_out1 == data.m_long1)
         {
@@ -118,14 +104,10 @@ Test_DynArray::run_test (void)
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       DynamicAny::DynAny_var ftc1_base =
-        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array);
 
       DynamicAny::DynArray_var ftc1 =
-        DynamicAny::DynArray::_narrow (ftc1_base.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynArray::_narrow (ftc1_base.in ());
 
       if (CORBA::is_nil (ftc1.in ()))
         {
@@ -138,17 +120,13 @@ Test_DynArray::run_test (void)
       CORBA::Any in_any2;
       in_any2 <<= DynAnyTests::test_array_forany (ta);
 
-      ftc1->from_any (in_any2
-                      ACE_ENV_ARG_PARAMETER);
+      ftc1->from_any (in_any2);
 
-      ACE_TRY_CHECK;
 
-      analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze (ftc1.in ());
 
       CORBA::Any_var out_any1 =
-        ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc1->to_any ();
 
       DynAnyTests::test_array_forany ta_out;
       out_any1.in () >>= ta_out;
@@ -172,13 +150,10 @@ Test_DynArray::run_test (void)
       in_any3 <<= data.m_long1;
       as_in[0] = in_any3;
       as_in[1] = in_any3;
-      ftc1->set_elements (as_in
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      ftc1->set_elements (as_in);
+
       DynamicAny::AnySeq_var as_out =
-        ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc1->get_elements ();
       CORBA::Any out_any2 = as_out[1U];
       CORBA::Long l_out2;
       out_any2 >>= l_out2;
@@ -193,19 +168,15 @@ Test_DynArray::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa1->destroy ();
+
+      ftc1->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynarray::run_test");
+      ex._tao_print_exception ("test_dynarray::run_test");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 229e1460c24..47631c8f55e 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -41,20 +41,16 @@ Test_DynEnum::test_name (void) const
 int
 Test_DynEnum::run_test (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/set_as_string/get_as_ulong\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("DynAnyFactory");
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ());
 
       if (CORBA::is_nil (dynany_factory.in ()))
         {
@@ -71,32 +67,22 @@ Test_DynEnum::run_test (void)
       CORBA::Any in_any1;
       in_any1 <<= te;
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        dynany_factory->create_dyn_any (in_any1);
+
       DynamicAny::DynEnum_var de1 =
-        DynamicAny::DynEnum::_narrow (dp1.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        DynamicAny::DynEnum::_narrow (dp1.in ());
 
-      analyzer.analyze(dp1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze(dp1.in());
 
-      ACE_TRY_CHECK;
-      de1->set_as_string ("TE_FIRST"
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      de1->set_as_string ("TE_FIRST");
 
       CORBA::ULong ul_out1 =
-        de1->get_as_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        de1->get_as_ulong ();
 
-      analyzer.analyze(de1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze(de1.in());
 
       CORBA::Any_var out_any2 =
-        de1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        de1->to_any ();
 
       if (ul_out1 == 1)
         {
@@ -112,12 +98,9 @@ Test_DynEnum::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_as_ulong/get_as_string\n"));
 
-      de1->set_as_ulong (3
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      de1->set_as_ulong (3);
       CORBA::String_var s =
-        de1->get_as_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        de1->get_as_string ();
 
       if (ACE_OS::strcmp (s.in (), "TE_THIRD") == 0)
         {
@@ -134,14 +117,10 @@ Test_DynEnum::run_test (void)
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       DynamicAny::DynAny_var de2_base =
-        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum);
 
       DynamicAny::DynEnum_var de2 =
-        DynamicAny::DynEnum::_narrow (de2_base.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynEnum::_narrow (de2_base.in ());
 
       if (CORBA::is_nil (de2.in ()))
         {
@@ -152,17 +131,13 @@ Test_DynEnum::run_test (void)
 
       CORBA::Any in_any2;
       in_any2 <<= DynAnyTests::TE_THIRD;
-      de2->from_any (in_any2
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      de2->from_any (in_any2);
 
-      analyzer.analyze(de2.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze(de2.in());
 
       CORBA::Any_var out_any1 =
-        de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        de2->to_any ();
+
       out_any1.in () >>= te;
 
       if (te == DynAnyTests::TE_THIRD)
@@ -179,9 +154,7 @@ Test_DynEnum::run_test (void)
                  "testing: equal\n"));
 
       CORBA::Boolean equal =
-        de1->equal (de2.in ()
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        de1->equal (de2.in ());
 
       if (equal)
         {
@@ -193,19 +166,15 @@ Test_DynEnum::run_test (void)
           ++this->error_count_;
         }
 
-      de1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      de2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      de1->destroy ();
+
+      de2->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynenum::run_test");
+      ex._tao_print_exception ("test_dynenum::run_test");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index f9b79d7b952..d5cc2a9d623 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -46,7 +46,7 @@ Test_DynSequence::run_test (void)
   DynAnyTests::test_seq ts (2);
   ts.length (2);
 
-    ACE_TRY_NEW_ENV
+    try
     {
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
@@ -57,14 +57,10 @@ Test_DynSequence::run_test (void)
                  "rewind/current_component\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("DynAnyFactory");
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ());
 
       if (CORBA::is_nil (dynany_factory.in ()))
         {
@@ -87,46 +83,33 @@ Test_DynSequence::run_test (void)
       any <<= shortseq1;
 
       DynamicAny::DynAny_var shortdany =
-        dynany_factory->create_dyn_any (any ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any (any);
 
-      analyzer.analyze(shortdany.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze(shortdany.in ());
 
       CORBA::Any_var any3;
-      any3 = shortdany->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      any3 = shortdany->to_any ();
 
       ts[0] = data.m_string2;
       ts[1] = data.m_string2;
       CORBA::Any in_any1;
       in_any1 <<= ts;
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        dynany_factory->create_dyn_any (in_any1);
+
       DynamicAny::DynSequence_var fa1 =
-        DynamicAny::DynSequence::_narrow (dp1.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->seek (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->insert_string (data.m_string1
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->seek (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        DynamicAny::DynSequence::_narrow (dp1.in ());
+
+      fa1->seek (1);
+
+      fa1->insert_string (data.m_string1);
+
+      fa1->rewind ();
+
+      fa1->seek (1);
+
       CORBA::String_var out_str1 =
-        fa1->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        fa1->get_string ();
 
       if (!ACE_OS::strcmp (out_str1.in (), data.m_string1))
         {
@@ -164,18 +147,13 @@ Test_DynSequence::run_test (void)
         {
           elem_any <<= CORBA::Any::from_string (values[i],
                                                 8);
-          elements[i] = dynany_factory->create_dyn_any (elem_any
-                                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          elements[i] = dynany_factory->create_dyn_any (elem_any);
         }
 
-      fa1->set_elements_as_dyn_any (elements.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa1->set_elements_as_dyn_any (elements.in ());
 
       DynamicAny::DynAnySeq_var out_elems =
-        fa1->get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        fa1->get_elements_as_dyn_any ();
 
       if (out_elems->length () != 3)
         {
@@ -183,20 +161,16 @@ Test_DynSequence::run_test (void)
           return -1;
         }
 
-      analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze (fa1.in());
 
       CORBA::String_var out_str;
 
       for (i = 0; i < length; ++i)
         {
-          out_str = out_elems[i]->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          out_str = out_elems[i]->get_string ();
 
           CORBA::Boolean equal =
-            out_elems[i]->equal (elements[i]
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            out_elems[i]->equal (elements[i]);
 
           if (!equal)
             {
@@ -205,8 +179,7 @@ Test_DynSequence::run_test (void)
 
           // To show that calling destroy() on a component does
           // nothing, as required by the spec.
-          out_elems[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          out_elems[i]->destroy ();
         }
 
       if (this->error_count_ == 0)
@@ -221,14 +194,10 @@ Test_DynSequence::run_test (void)
       DynamicAny::DynAny_var ftc1_base =
         dynany_factory->create_dyn_any_from_type_code (
                             DynAnyTests::_tc_test_seq
-                            ACE_ENV_ARG_PARAMETER
                           );
-      ACE_TRY_CHECK;
 
       DynamicAny::DynSequence_var ftc1 =
-        DynamicAny::DynSequence::_narrow (ftc1_base.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynSequence::_narrow (ftc1_base.in ());
 
       if (CORBA::is_nil (ftc1.in ()))
         {
@@ -240,17 +209,13 @@ Test_DynSequence::run_test (void)
       ts[0] = CORBA::string_dup (data.m_string1);
       CORBA::Any in_any2;
       in_any2 <<= ts;
-      ftc1->from_any (in_any2
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ftc1->from_any (in_any2);
 
-      analyzer.analyze (ftc1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze (ftc1.in());
 
       CORBA::Any_var out_any1 =
-        ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        ftc1->to_any ();
+
       DynAnyTests::test_seq *ts_out;
       out_any1.in () >>= ts_out;
 
@@ -267,17 +232,14 @@ Test_DynSequence::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: length/set_elements/get_elements\n"));
 
-      length = ftc1->get_length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      length = ftc1->get_length ();
 
       if (length != 2)
         {
           ++this->error_count_;
         }
 
-      ftc1->set_length (3
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ftc1->set_length (3);
       DynamicAny::AnySeq as_in (3);
       as_in.length (3);
       CORBA::Any in_any3;
@@ -286,14 +248,11 @@ Test_DynSequence::run_test (void)
       as_in[1] = in_any3;
       in_any3 <<= CORBA::Any::from_string (data.m_string1, 8);
       as_in[2] = in_any3;
-      ftc1->set_elements (as_in
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      ftc1->set_elements (as_in);
+
       DynamicAny::AnySeq_var as_out =
-        ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        ftc1->get_elements ();
+
       CORBA::ULong index = 2;
       CORBA::Any out_any2 = as_out[index];
       char* out_str2;
@@ -310,19 +269,15 @@ Test_DynSequence::run_test (void)
                      "++ OK ++\n"));
         }
 
-      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa1->destroy ();
+
+      ftc1->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynsequence::run_test");
+      ex._tao_print_exception ("test_dynsequence::run_test");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 1281471c19e..65535b8605f 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -50,21 +50,17 @@ Test_DynStruct::run_test (void)
   ts.es.f = data.m_float2;
   ts.es.s = data.m_short2;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "testing: constructor(Any)/insert/get/next/seek/"
                   "rewind/current_component\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("DynAnyFactory");
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ());
 
       if (CORBA::is_nil (dynany_factory.in ()))
         {
@@ -80,72 +76,50 @@ Test_DynStruct::run_test (void)
       CORBA::Any in_any1;
       in_any1 <<= ts;
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        dynany_factory->create_dyn_any (in_any1);
+
       DynamicAny::DynStruct_var fa1 =
-        DynamicAny::DynStruct::_narrow (dp1.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->insert_char (data.m_char1
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->insert_short_seq (data.m_shortseq1
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynStruct::_narrow (dp1.in ());
+
+      fa1->insert_char (data.m_char1);
+
+      fa1->next ();
+
+      fa1->insert_short_seq (data.m_shortseq1);
+
+      fa1->next ();
 
       DynamicAny::DynAny_var cc =
-        fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      cc->insert_float (data.m_float1
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      cc->next (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      cc->insert_short (data.m_short1
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      cc->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        fa1->current_component ();
+
+      cc->insert_float (data.m_float1);
+
+      cc->next ();
+
+      cc->insert_short (data.m_short1);
+      cc->rewind ();
 
       // To show that calling destroy() on a component does
       // nothing, as required by the spec.
-      cc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      cc->destroy ();
+
+      fa1->rewind ();
 
-      fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::Char c = fa1->get_char (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Char c = fa1->get_char ();
 
       if (c != data.m_char1)
         {
           ++this->error_count_;
         }
 
-      fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      fa1->next ();
+
       data.m_shortseq2 =
-        fa1->get_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        fa1->get_short_seq ();
 
       bool good =
         data.m_shortseq2->length () == data.m_shortseq1.length ();
-        
+
       if (good)
         {
           for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i)
@@ -162,17 +136,13 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa1->next ();
+
+      cc = fa1->current_component ();
 
-      cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      cc->seek (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      cc->seek (1);
 
-      CORBA::Short s = cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Short s = cc->get_short ();
 
       if (s != data.m_short1)
         {
@@ -191,14 +161,10 @@ Test_DynStruct::run_test (void)
       DynamicAny::DynAny_var ftc1_base =
         dynany_factory->create_dyn_any_from_type_code (
                             DynAnyTests::_tc_test_struct
-                            ACE_ENV_ARG_PARAMETER
                           );
-      ACE_TRY_CHECK;
 
       DynamicAny::DynStruct_var ftc1 =
-        DynamicAny::DynStruct::_narrow (ftc1_base.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynStruct::_narrow (ftc1_base.in ());
 
       if (CORBA::is_nil (ftc1.in ()))
         {
@@ -213,16 +179,12 @@ Test_DynStruct::run_test (void)
       ts.es.s = data.m_short1;
       CORBA::Any in_any2;
       in_any2 <<= ts;
-      ftc1->from_any (in_any2
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ftc1->from_any (in_any2);
 
-      analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze (ftc1.in ());
 
       CORBA::Any_var out_any1 =
-        ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc1->to_any ();
 
       DynAnyTests::test_struct* ts_out;
       out_any1.in () >>= ts_out;
@@ -245,18 +207,14 @@ Test_DynStruct::run_test (void)
       CORBA::Any_var out_any2 ;
       DynamicAny::DynStruct_var ftc2;
 
-      ACE_TRY_EX (bad_kind)
+      try
         {
           DynamicAny::DynAny_var ftc2_base =
             dynany_factory->create_dyn_any_from_type_code (
                                 DynAnyTests::_tc_test_struct_alias
-                                ACE_ENV_ARG_PARAMETER
                               );
-          ACE_TRY_CHECK_EX (bad_kind);
 
-          ftc2 = DynamicAny::DynStruct::_narrow (ftc2_base.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bad_kind);
+          ftc2 = DynamicAny::DynStruct::_narrow (ftc2_base.in ());
 
           if (CORBA::is_nil (ftc2.in ()))
             {
@@ -271,29 +229,23 @@ Test_DynStruct::run_test (void)
           ts.es.s = data.m_short1;
           CORBA::Any in_any3;
           in_any3 <<= ts;
-          ftc2->from_any (in_any3
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bad_kind);
+          ftc2->from_any (in_any3);
 
 //          char c = ftc2->get_char ();
 //          CORBA::Boolean status = ftc2->next ();
 //          CORBA::Long lo = ftc2->get_long ();
-//          analyzer.analyze (ftc2.in () ACE_ENV_ARG_PARAMETER);
-//          ACE_TRY_CHECK;
+//          analyzer.analyze (ftc2.in ());
 
-          out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bad_kind);
+          out_any2 = ftc2->to_any ();
 
           if (!(out_any2.in () >>= ts_out2)) // problem
             {
               ts_out2 = 0;
             }
         }
-      ACE_CATCH (CORBA::TypeCode::BadKind, ex)
+      catch (const CORBA::TypeCode::BadKind& )
         {
         }
-      ACE_ENDTRY;
-      ACE_TRY_CHECK;
 
       if (ts_out2 != 0 && ts_out2->es.s == data.m_short1)
         {
@@ -309,12 +261,10 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                   "testing: current_member_name/current_member_kind\n"));
 
-      ftc1->seek (2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      ftc1->seek (2);
+
       DynamicAny::FieldName_var fn =
-        ftc1->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc1->current_member_name ();
 
       if (ACE_OS::strcmp (fn.in (), "es"))
         {
@@ -322,8 +272,7 @@ Test_DynStruct::run_test (void)
         }
 
       CORBA::TCKind tk =
-        ftc1->current_member_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc1->current_member_kind ();
 
       if (tk != CORBA::tk_struct)
         {
@@ -339,13 +288,10 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                   "testing: current_member_name/current_member_kind "
                   "with alias\n"));
-      ftc2->seek (2
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ftc2->seek (2);
 
       DynamicAny::FieldName_var fn2 =
-        ftc2->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc2->current_member_name ();
 
       if (ACE_OS::strcmp (fn2.in (), "es"))
         {
@@ -353,8 +299,7 @@ Test_DynStruct::run_test (void)
         }
 
       CORBA::TCKind tk2 =
-        ftc2->current_member_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc2->current_member_kind ();
 
       if (tk2 != CORBA::tk_struct)
         {
@@ -371,20 +316,15 @@ Test_DynStruct::run_test (void)
                   "testing: get_members/set_members\n"));
 
       DynamicAny::NameValuePairSeq_var nvps =
-        fa1->get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        fa1->get_members ();
 
       DynamicAny::DynAny_var sm_base =
         dynany_factory->create_dyn_any_from_type_code (
             DynAnyTests::_tc_test_struct
-            ACE_ENV_ARG_PARAMETER
           );
-      ACE_TRY_CHECK;
 
       DynamicAny::DynStruct_var sm =
-        DynamicAny::DynStruct::_narrow (sm_base.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynStruct::_narrow (sm_base.in ());
 
       if (CORBA::is_nil (sm.in ()))
         {
@@ -393,13 +333,10 @@ Test_DynStruct::run_test (void)
                             -1);
         }
 
-      sm->set_members (nvps.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sm->set_members (nvps.in ());
 
       DynamicAny::NameValuePairSeq_var gm =
-        sm->get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sm->get_members ();
 
       CORBA::ULong index = 2;
 
@@ -408,22 +345,17 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa1->destroy ();
 
-      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ftc1->destroy ();
 
-      sm->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sm->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynstruct::run_test");
+      ex._tao_print_exception ("test_dynstruct::run_test");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 269f161e974..b24a4542d78 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -44,21 +44,17 @@ Test_DynUnion::run_test (void)
 
   DynAnyTests::test_union tu;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
                  data.labels[12]));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("DynAnyFactory");
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ());
 
       if (CORBA::is_nil (dynany_factory.in ()))
         {
@@ -78,24 +74,16 @@ Test_DynUnion::run_test (void)
       CORBA::Any in_any4;
       in_any4 <<= tstring;
       DynamicAny::DynAny_var dp4 =
-        dynany_factory->create_dyn_any (in_any4
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any (in_any4);
       DynamicAny::DynUnion_var fa4 =
-        DynamicAny::DynUnion::_narrow (dp4.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynUnion::_narrow (dp4.in ());
 
-      analyzer.analyze(fa4.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze(fa4.in());
 
-      CORBA::Any_var out_any5 = fa4->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Any_var out_any5 = fa4->to_any ();
 
       DynamicAny::DynAny_var dp5 =
-        dynany_factory->create_dyn_any (out_any5.in()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any (out_any5.in());
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/insert/get\n"));
@@ -105,27 +93,16 @@ Test_DynUnion::run_test (void)
       CORBA::Any in_any1;
       in_any1 <<= tu;
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any (in_any1);
       DynamicAny::DynUnion_var fa1 =
-        DynamicAny::DynUnion::_narrow (dp1.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      fa1->seek (1
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      fa1->insert_typecode (data.m_typecode1
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var s_out1 = fa1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynUnion::_narrow (dp1.in ());
+      fa1->seek (1);
+      fa1->insert_typecode (data.m_typecode1);
+
+      CORBA::TypeCode_var s_out1 = fa1->get_typecode ();
 
       CORBA::Boolean const equal_tc1 =
-        s_out1->equal (data.m_typecode1
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        s_out1->equal (data.m_typecode1);
 
       if (equal_tc1)
         {
@@ -140,20 +117,14 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze (fa1.in());
 
-      CORBA::Any_var out_any1 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Any_var out_any1 = fa1->to_any ();
       DynamicAny::DynAny_var ftc1_base =
-        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union);
 
       DynamicAny::DynUnion_var ftc1 =
-        DynamicAny::DynUnion::_narrow (ftc1_base.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        DynamicAny::DynUnion::_narrow (ftc1_base.in ());
 
       if (CORBA::is_nil (ftc1.in ()))
         {
@@ -162,21 +133,15 @@ Test_DynUnion::run_test (void)
                             -1);
         }
 
-      ftc1->from_any (out_any1.in ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      ftc1->seek (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      ftc1->from_any (out_any1.in ());
+
+      ftc1->seek (1);
+
       CORBA::TypeCode_var s_out2 =
-        ftc1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc1->get_typecode ();
 
       CORBA::Boolean const equal_tc2 =
-        s_out2->equal (data.m_typecode1
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        s_out2->equal (data.m_typecode1);
 
       if (equal_tc2)
         {
@@ -191,25 +156,20 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode alias)/from_any/to_any\n"));
 
-      analyzer.analyze( fa1.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      analyzer.analyze( fa1.in());
 
-      CORBA::Any_var out_any2 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Any_var out_any2 = fa1->to_any ();
 
       CORBA::TypeCode_var s_out3;
 
-      ACE_TRY_EX (bad_kind)
+      try
         {
           DynamicAny::DynAny_var ftc2_base =
             dynany_factory->create_dyn_any_from_type_code
-            (DynAnyTests::_tc_test_union_alias ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bad_kind);
-          
+            (DynAnyTests::_tc_test_union_alias);
+
           DynamicAny::DynUnion_var ftc2 =
-            DynamicAny::DynUnion::_narrow (ftc2_base.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bad_kind);
+            DynamicAny::DynUnion::_narrow (ftc2_base.in ());
 
           if (CORBA::is_nil (ftc2.in ()))
             {
@@ -218,29 +178,21 @@ Test_DynUnion::run_test (void)
                                 -1);
             }
 
-          ftc2->from_any (out_any2.in ()
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bad_kind);
-          
-          ftc2->seek (1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bad_kind);
-          
-          s_out3 = ftc2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (bad_kind);
+          ftc2->from_any (out_any2.in ());
+
+          ftc2->seek (1);
+
+          s_out3 = ftc2->get_typecode ();
         }
-      ACE_CATCH (CORBA::TypeCode::BadKind, ex)
+      catch (const CORBA::TypeCode::BadKind& )
         {
           // Failed to create
         }
-      ACE_ENDTRY;
-      ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (s_out3.in ()))
         {
           CORBA::Boolean const equal_tc =
-            s_out3->equal (data.m_typecode1
-                           ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            s_out3->equal (data.m_typecode1);
 
           if (equal_tc)
             {
@@ -261,19 +213,15 @@ Test_DynUnion::run_test (void)
                  "testing:discriminator/discriminator_kind\n"));
 
       DynamicAny::DynAny_var dp2 =
-        ftc1->get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc1->get_discriminator ();
 
       CORBA::TypeCode_var tc2 =
-        dp2->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dp2->type ();
 
       CORBA::TCKind tc1kind =
-        ftc1->discriminator_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::TCKind tc2kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ftc1->discriminator_kind ();
+
+      CORBA::TCKind tc2kind = tc2->kind ();
 
       if (tc2kind == tc1kind)
         {
@@ -289,25 +237,19 @@ Test_DynUnion::run_test (void)
                  "testing:member/member_kind/member_name\n"));
 
       DynamicAny::DynAny_var dp3 =
-        ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        ftc1->member ();
+
       CORBA::String_var m_nm =
-        ftc1->member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        ftc1->member_name ();
+
       CORBA::TCKind tk =
-        ftc1->member_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        ftc1->member_kind ();
+
       CORBA::TypeCode_var tc3 =
-        dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        dp3->get_typecode ();
 
       CORBA::Boolean const equal_tc3 =
-        data.m_typecode1->equal (tc3.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        data.m_typecode1->equal (tc3.in ());
 
       if (!ACE_OS::strcmp (m_nm.in (), "tc")
           && tk == CORBA::tk_TypeCode
@@ -320,29 +262,21 @@ Test_DynUnion::run_test (void)
         {
           ++this->error_count_;
         }
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_to_default_member\n"));
 
-      ftc1->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      ftc1->seek (1
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      ftc1->insert_short (data.m_short1
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+      ftc1->set_to_default_member ();
+
+      ftc1->seek (1);
+
+      ftc1->insert_short (data.m_short1);
+
       DynamicAny::DynAny_var mem =
-        ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+        ftc1->member ();
+
       CORBA::Short out_s =
-        mem->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        mem->get_short ();
 
       if (out_s == data.m_short1)
         {
@@ -354,11 +288,9 @@ Test_DynUnion::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fa1->destroy ();
+
+      ftc1->destroy ();
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: create_dyn_any with _default()\n"));
@@ -366,24 +298,19 @@ Test_DynUnion::run_test (void)
       CORBA::Any any_union;
 
       test_implicit_def_union._default();
-      ACE_TRY_CHECK;
-      
+
       any_union <<= test_implicit_def_union;
-      ACE_TRY_CHECK;
 
       DynamicAny::DynAny_var da_union =
         dynany_factory->create_dyn_any (any_union);
-      ACE_TRY_CHECK;
 
       // if we get here the create_dyn_any worked.
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "test_dynunion::run_test");
+      ex._tao_print_exception ("test_dynunion::run_test");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp
index 174fa2dc97c..0051d36e0c9 100644
--- a/TAO/tests/Explicit_Event_Loop/client.cpp
+++ b/TAO/tests/Explicit_Event_Loop/client.cpp
@@ -31,15 +31,12 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       // Check arguments.
       if  (argc != 2)
@@ -50,9 +47,7 @@ main (int argc, char *argv[])
         }
 
       // Destringify argv[1].
-      CORBA::Object_var obj = orb->string_to_object (argv[1]
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->string_to_object (argv[1]);
 
       if  (CORBA::is_nil (obj.in ()))
         {
@@ -62,9 +57,7 @@ main (int argc, char *argv[])
         }
 
       // Narrow.
-      Time_var tm = Time::_narrow (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Time_var tm = Time::_narrow (obj.in ());
 
       if  (CORBA::is_nil (tm.in ()))
         {
@@ -74,8 +67,7 @@ main (int argc, char *argv[])
         }
 
       // Get time.
-      TimeOfDay tod = tm->get_gmt (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TimeOfDay tod = tm->get_gmt ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s%s%d:%s%d:%d\n",
@@ -87,20 +79,17 @@ main (int argc, char *argv[])
                   tod.second));
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "client: a CORBA exception occured");
+      ex._tao_print_exception ("client: a CORBA exception occured");
       return 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "client: an unknown exception was caught\n"),
                         1);
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
   return 0;
 }
diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp
index 498c465ec22..c9501977326 100644
--- a/TAO/tests/Explicit_Event_Loop/server.cpp
+++ b/TAO/tests/Explicit_Event_Loop/server.cpp
@@ -59,7 +59,7 @@ parse_args (int argc, char *argv[])
 
 TimeOfDay
 Time_impl::
-get_gmt ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+get_gmt ()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   time_t time_now = time (0);
@@ -85,15 +85,12 @@ void do_something_else()
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       if (parse_args (argc, argv) != 0)
         {
@@ -102,33 +99,24 @@ main (int argc, char *argv[])
 
       // Get reference to Root POA.
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       // Activate POA manager.
       PortableServer::POAManager_var mgr
-        = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       // Create an object.
       Time_impl time_servant;
 
       // Write its stringified reference to stdout.
-      Time_var tm = time_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Time_var tm = time_servant._this ();
 
-      CORBA::String_var str = orb->object_to_string (tm.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var str = orb->object_to_string (tm.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s\n",
@@ -159,13 +147,11 @@ main (int argc, char *argv[])
       while (!done)
         {
           CORBA::Boolean pending =
-            orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->work_pending ();
 
           if (pending)
             {
-              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->perform_work ();
             }
           do_something_else ();
         }
@@ -174,20 +160,18 @@ main (int argc, char *argv[])
       orb->destroy ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "server: a CORBA exception occured");
+      ex._tao_print_exception ("server: a CORBA exception occured");
       return 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "%s\n",
                          "client: an unknown exception was caught\n"),
                          1);
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h
index e5c19b27546..4bf7d7c1b1f 100644
--- a/TAO/tests/Explicit_Event_Loop/server.h
+++ b/TAO/tests/Explicit_Event_Loop/server.h
@@ -26,7 +26,7 @@
 class Time_impl : public virtual POA_Time
 {
 public:
-  virtual TimeOfDay get_gmt (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual TimeOfDay get_gmt (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp
index 4a707034563..c4a63433eb6 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.cpp
+++ b/TAO/tests/Exposed_Policies/Counter_i.cpp
@@ -21,30 +21,29 @@ Counter_Servant::~Counter_Servant (void)
 // Counter Interface Methods Implementation.
 
 void
-Counter_Servant::increment (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Counter_Servant::increment (/**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->count_;
 }
 
 CORBA::Long
-Counter_Servant::get_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Counter_Servant::get_count (/**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->count_;
 }
 
 void
-Counter_Servant::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Counter_Servant::reset (/**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->count_ = 0;
 }
 
 void
-Counter_Servant::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Counter_Servant::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->policy_tester_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  this->policy_tester_->shutdown ();
 }
diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h
index 503d9cd3296..29e6e3e7334 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.h
+++ b/TAO/tests/Exposed_Policies/Counter_i.h
@@ -35,16 +35,16 @@ public:
 
   // = Counter Interface Methods Overloading.
 
-  virtual void increment (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void increment (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long get_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long get_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void reset (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index 217eacdae41..2670017a27f 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -32,39 +32,29 @@ Policy_Tester::~Policy_Tester (void)
 }
 
 void
-Policy_Tester::run (ACE_ENV_SINGLE_ARG_DECL)
+Policy_Tester::run (void)
 {
   PortableServer::POAManager_var poa_manager =
-    this->child_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->child_poa_->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  poa_manager->activate ();
 
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->run ();
 }
 
 int
 Policy_Tester::init (int argc,
-                     char *argv[]
-                     ACE_ENV_ARG_DECL)
+                     char *argv[])
 {
   // ORB Initialization.
   this->orb_ =
-    CORBA::ORB_init (argc, argv, ""
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ORB_init (argc, argv, "");
 
   // Get a reference to the RT-ORB.
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RTORB"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RTORB");
 
-  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ());
 
   // Here we parse the command line paramether passed
   // to the application.
@@ -78,14 +68,12 @@ Policy_Tester::init (int argc,
       if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile")))
         {
           this->rt_poa_properties_ =
-            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            RT_Properties::read_from (arg);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
         {
           this->rt_object_properties_ =
-            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            RT_Properties::read_from (arg);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
         {
@@ -95,7 +83,6 @@ Policy_Tester::init (int argc,
                                 RT_Properties,
                                 CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (-1);
             }
           this->rt_poa_properties_->ior_source (arg);
         }
@@ -107,7 +94,6 @@ Policy_Tester::init (int argc,
                                 RT_Properties,
                                 CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (-1);
             }
           this->rt_object_properties_->ior_source (arg);
         }
@@ -123,8 +109,7 @@ Policy_Tester::init (int argc,
     }
 
   int result =
-    this->create_objects (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->create_objects ();
 
   if (result != 0)
     return result;
@@ -146,7 +131,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object,
 
 
 int
-Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
+Policy_Tester::create_objects (void)
 {
   CORBA::PolicyList poa_policy_list;
   poa_policy_list.length (3);
@@ -155,18 +140,14 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
   RTCORBA::Priority priority = this->rt_poa_properties_->priority ();
   poa_policy_list[0] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
-                                                 priority
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                 priority);
 
       // Create priority Banded Connection Policy.
   RTCORBA::PriorityBands poa_priority_bands =
     this->rt_poa_properties_->priority_bands ();
 
   poa_policy_list[1] =
-    this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands
-                                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands);
 
       // Client Protocol Policy.
   RTCORBA::ProtocolList protocol_list;
@@ -184,12 +165,10 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
     this->rt_orb_->create_client_protocol_policy (protocol_list);
 
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   this->poa_ =
-    PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (object.in ());
 
   PortableServer::POAManager_var poa_mgr =
     PortableServer::POAManager::_nil ();
@@ -197,20 +176,15 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
   object =
     this->poa_->create_POA ("Child_POA",
                             poa_mgr.in (),
-                            poa_policy_list
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                            poa_policy_list);
 
   this->child_poa_ =
-    RTPortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTPortableServer::POA::_narrow (object.in ());
 
   // Create a Corba Object reference, using the policies
   // set at the POA level.
   object =
-    this->child_poa_->create_reference ("IDL:Counter:1.0"
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->child_poa_->create_reference ("IDL:Counter:1.0");
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Reference Created!\n")));
@@ -219,16 +193,14 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
                         "Unable to create Object!\n"))
     return -1;
 
-  Counter_var base_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Counter_var base_object = Counter::_narrow (object.in ());
 
   if (!check_reference (base_object.in(),
                         "Unable to create a Object!\n"))
     return -1;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (base_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (base_object.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Activated as <%s>\n"), ior.in ()));
@@ -252,9 +224,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
   object =
     this->child_poa_->create_reference_with_priority
     ("IDL:Counter:1.0",
-     this->rt_object_properties_->priority ()
-     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+     this->rt_object_properties_->priority ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Reference Created!\n")));
@@ -263,8 +233,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
                         "Unable to create a Counter Object!\n"))
     return -1;
 
-  Counter_var over_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  Counter_var over_object = Counter::_narrow (object.in ());
 
   if (!check_reference (over_object.in(),
                         "Unable to create Object!\n"))
@@ -272,8 +241,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
 
 
   CORBA::String_var o_ior =
-    this->orb_->object_to_string (over_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (over_object.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Activated as <%s>\n"), o_ior.in ()));
@@ -291,8 +259,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Policy_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Policy_Tester::shutdown (void)
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h
index 970ed503b7f..0f484518e18 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.h
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.h
@@ -35,17 +35,16 @@ public:
   Policy_Tester (void);
   ~Policy_Tester (void);
 
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
   // Runs the test.
 
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
 private:
   // Helper method used internally.
-  int create_objects (ACE_ENV_SINGLE_ARG_DECL);
+  int create_objects (void);
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                    const char *msg);
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 4541f43613c..422f0f198ae 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -19,12 +19,10 @@ Policy_Verifier::~Policy_Verifier (void)
 
 bool
 Policy_Verifier::init (int argc,
-                       char *argv[]
-                       ACE_ENV_ARG_DECL)
+                       char *argv[])
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+    CORBA::ORB_init (argc, argv, "");
 
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
@@ -35,16 +33,14 @@ Policy_Verifier::init (int argc,
       if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile")))
         {
           this->rt_poa_properties_ =
-            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (false);
+            RT_Properties::read_from (arg);
           this->priority_bands_ =
             this->rt_poa_properties_->priority_bands ().length ();
         }
       else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
         {
           this->rt_object_properties_ =
-            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (false);
+            RT_Properties::read_from (arg);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
         {
@@ -54,7 +50,6 @@ Policy_Verifier::init (int argc,
                                 RT_Properties,
                                 CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (false);
             }
           this->rt_poa_properties_->ior_source (arg);
           ACE_OS::strcpy (this->base_object_ref_, "file://");
@@ -69,7 +64,6 @@ Policy_Verifier::init (int argc,
                                 RT_Properties,
                                 CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (false);
             }
           this->rt_object_properties_->ior_source (arg);
           ACE_OS::strcpy (this->overridden_object_ref_, "file://");
@@ -90,28 +84,23 @@ Policy_Verifier::init (int argc,
     }
 
   // Get the Object references.
-  CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_);
 
   if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n"))
     return false;
 
-  this->base_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->base_object_ = Counter::_narrow (object.in ());
 
   if (!Policy_Verifier::check_reference (this->base_object_.in (),
                                          "Unable to convert the IOR to the proper object reference.\n"))
     return false;
 
-  object = this->orb_->string_to_object (this->overridden_object_ref_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  object = this->orb_->string_to_object (this->overridden_object_ref_);
 
   if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n"))
     return false;
 
-  this->overridden_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  this->overridden_object_ = Counter::_narrow (object.in ());
 
   if (!Policy_Verifier::check_reference (this->overridden_object_.in (),
                                          "Unable to convert the IOR to the proper object reference.\n"))
@@ -121,31 +110,24 @@ Policy_Verifier::init (int argc,
 }
 
 void
-Policy_Verifier::run (ACE_ENV_SINGLE_ARG_DECL )
+Policy_Verifier::run ( )
 {
   this->verify_reference (this->base_object_.in (),
-                          this->rt_poa_properties_
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          this->rt_poa_properties_);
 
   this->verify_reference (this->overridden_object_.in (),
-                          this->rt_object_properties_
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          this->rt_object_properties_);
 }
 
 void
 Policy_Verifier::verify_reference (Counter_ptr object,
-                                   RT_Properties *rt_properties
-                                   ACE_ENV_ARG_DECL)
+                                   RT_Properties *rt_properties)
 {
 
-  ACE_TRY
+  try
     {
       CORBA::Policy_var policy_var =
-        object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
       if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Policy.\n"))
         {
@@ -153,12 +135,10 @@ Policy_Verifier::verify_reference (Counter_ptr object,
             RTCORBA::PriorityModelPolicy::_narrow (policy_var.in ());
 
           RTCORBA::PriorityModel priority_model =
-            priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            priority_policy->priority_model ();
 
           RTCORBA::Priority priority =
-            priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            priority_policy->server_priority ();
 
           if (priority_model == RTCORBA::SERVER_DECLARED)
             ACE_DEBUG ((LM_DEBUG,
@@ -177,18 +157,14 @@ Policy_Verifier::verify_reference (Counter_ptr object,
                         ACE_TEXT ("Priority Value Mismatch.\n")));
         }
 
-      policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE);
 
       if (Policy_Verifier::check_reference (policy_var.in (),
                                           "Unable to get Priority Banded Policy\n"))
         {
 
           RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy =
-            RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in ());
 
 
           if (Policy_Verifier::check_reference (priority_banded_policy.in (),
@@ -223,20 +199,16 @@ Policy_Verifier::verify_reference (Counter_ptr object,
                 }
             }
         }
-      policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE);
 
       if (Policy_Verifier::check_reference (policy_var.in (),
                                             "Unable to get Client Protocol Policy\n"))
         {
           RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
-            RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in ());
 
           RTCORBA::ProtocolList_var protocol_list =
-            client_protocol_policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            client_protocol_policy->protocols ();
 
           for (unsigned int  i = 0; i < protocol_list->length (); i++)
             ACE_DEBUG ((LM_DEBUG,
@@ -246,12 +218,11 @@ Policy_Verifier::verify_reference (Counter_ptr object,
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "CORBA Exception Raised");
+      ex._tao_print_exception ("CORBA Exception Raised");
     }
 
-  ACE_ENDTRY;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h
index 8eeec72ae89..a37b8bf0396 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.h
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h
@@ -41,16 +41,14 @@ public:
   ~Policy_Verifier (void);
 
   bool init (int argc,
-             char *argv[]
-             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+             char *argv[]);
 
-  void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void run (void);
 
 private:
   // -- Helper methods --
   void verify_reference (Counter_ptr counter,
-                         RT_Properties *rt_properties
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+                         RT_Properties *rt_properties);
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                   const char *msg);
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index 4a23c92f0f5..b284f3e2534 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -21,8 +21,7 @@ RT_Properties::~RT_Properties (void)
 }
 
 RT_Properties *
-RT_Properties::read_from (const char *file_name
-                          ACE_ENV_ARG_DECL)
+RT_Properties::read_from (const char *file_name)
 {
   FILE *fp = ACE_OS::fopen (file_name, "r");
 
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h
index 35166b9d9fa..4fbc06beed0 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.h
+++ b/TAO/tests/Exposed_Policies/RT_Properties.h
@@ -29,8 +29,7 @@ public:
   RT_Properties (void);
   ~RT_Properties (void);
 
-  static RT_Properties * read_from (const char *file_name
-                                    ACE_ENV_ARG_DECL);
+  static RT_Properties * read_from (const char *file_name);
 
   // -- Accessor Methods --
   void priority (RTCORBA::Priority priority);
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index 80bc23f24f3..1295144a34c 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -15,32 +15,28 @@ int
 main (int argc, char *argv[])
 {
   int status = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       Policy_Verifier policy_verifier;
 
-      bool retval = policy_verifier.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      bool retval = policy_verifier.init (argc, argv);
 
       if (retval)
         {
-          policy_verifier.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy_verifier.run ();
         }
       else
         {
           status++;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "CORBA Exception Raised");
+      ex._tao_print_exception ("CORBA Exception Raised");
       status++;
     }
 
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index ecc7d20d022..59e4566d509 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -21,30 +21,25 @@ ACE_RCSID(tao, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       Policy_Tester policy_tester;
 
-      int result = policy_tester.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int result = policy_tester.init (argc, argv);
 
       if (result != 0)
         return result;
 
-      policy_tester.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_tester.run ();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("CORBA Exception Raised."));
+      ex._tao_print_exception (ACE_TEXT ("CORBA Exception Raised."));
       return 1;
     }
 
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 5e55fff3819..52fc9ed1247 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -27,8 +27,7 @@ public:
   void show (void);
   // Call show on all the window objects
 
-  void parse_args (int argc, char *argv[]
-                   ACE_ENV_ARG_DECL);
+  void parse_args (int argc, char *argv[]);
 
 private:
   static void x_cb (Fl_Widget *widget, void* cookie);
@@ -55,11 +54,10 @@ int main (int argc, char* argv[])
 {
   TAO::FlResource_Loader fl_loader;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       Fl_Window window (300, 100);
 
@@ -71,17 +69,15 @@ int main (int argc, char* argv[])
 
       client.show ();
 
-      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.parse_args (argc, argv);
 
       Fl::run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -136,38 +132,33 @@ Client::y_cb (Fl_Widget*, void* cookie)
 void
 Client::x_changed (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Long x = CORBA::Long (this->x_roller_->value ());
-      this->server_->set_x_angle (x ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->server_->set_x_angle (x);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::x_changed");
+      ex._tao_print_exception ("Client::x_changed");
     }
-  ACE_ENDTRY;
 }
 
 void
 Client::y_changed (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Long y = CORBA::Long (this->y_roller_->value ());
-      this->server_->set_y_angle (y ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->server_->set_y_angle (y);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::x_changed");
+      ex._tao_print_exception ("Client::x_changed");
     }
-  ACE_ENDTRY;
 }
 
 void
-Client::parse_args (int argc, char *argv[]
-                    ACE_ENV_ARG_DECL)
+Client::parse_args (int argc, char *argv[])
 {
   const char *ior = "file://test.ior";
 
@@ -190,10 +181,8 @@ Client::parse_args (int argc, char *argv[]
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->string_to_object (ior);
 
   this->server_ =
-    Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    Simple_Server::_narrow (object.in ());
 }
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index f3c3a235446..e7ccab895fc 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -48,11 +48,10 @@ main (int argc, char *argv[])
 
   window.end ();
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -63,8 +62,7 @@ main (int argc, char *argv[])
       sw.show ();
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,22 +70,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Simple_Server_i server_impl (orb.in (), &sw);
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -104,20 +98,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (Fl::run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Fl::run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index 55e557c3341..ce5c85fec29 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -14,21 +14,21 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
 }
 
 void
-Simple_Server_i::set_x_angle (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::set_x_angle (CORBA::Long x)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->window_->set_x_angle (x);
 }
 
 void
-Simple_Server_i::set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::set_y_angle (CORBA::Long y)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->window_->set_y_angle (y);
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
index b2573fa173f..27f2249229f 100644
--- a/TAO/tests/FL_Cube/test_i.h
+++ b/TAO/tests/FL_Cube/test_i.h
@@ -62,11 +62,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void set_x_angle (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  void set_x_angle (CORBA::Long x)
      ACE_THROW_SPEC ((CORBA::SystemException));
-  void set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED)
+  void set_y_angle (CORBA::Long y)
      ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index d7f4cf4e6e0..30fc41d02de 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -68,15 +68,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -84,26 +82,21 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -116,15 +109,12 @@ main (int argc, char *argv[])
       Callback_i callback_impl (orb.in ());
 
       Callback_var callback =
-        callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        callback_impl._this ();
 
       for (int i = 0; i != niterations; ++i)
         {
           CORBA::Long r =
-            server->test_method (0, 0, callback.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            server->test_method (0, 0, callback.in ());
 
           if (r != 0)
             {
@@ -136,59 +126,47 @@ main (int argc, char *argv[])
 
       if (do_abort)
         {
-          ACE_TRY_EX(ABORT)
+          try
             {
-              server->shutdown_now (0 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX(ABORT);
+              server->shutdown_now (0);
             }
-          ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
+          catch (const CORBA::COMM_FAILURE& comm_failure)
             {
               ACE_UNUSED_ARG (comm_failure);
               // Expected exception, continue....
             }
-          ACE_ENDTRY;
-          ACE_TRY_CHECK;
         }
       else if (do_crash)
         {
-          ACE_TRY_EX(CRASH)
+          try
             {
-              server->shutdown_now (1 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX(CRASH);
+              server->shutdown_now (1);
             }
-          ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
+          catch (const CORBA::COMM_FAILURE& comm_failure)
             {
               ACE_UNUSED_ARG (comm_failure);
               // Expected exception, continue....
             }
-          ACE_ENDTRY;
-          ACE_TRY_CHECK;
         }
       else if (do_suicide)
         {
-          (void) server->test_method (1, 0, callback.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) server->test_method (1, 0, callback.in ());
           ACE_DEBUG ((LM_DEBUG, "ERROR: client should have aborted\n"));
         }
       else if (do_self_shutdown)
         {
-          (void) server->test_method (1, 1, callback.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) server->test_method (1, 1, callback.in ());
         }
 
       if (do_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCH (CORBA::COMM_FAILURE, x)
+  catch (const CORBA::COMM_FAILURE& x)
     {
       // For other case this is expected.
       if (do_self_shutdown == 0)
@@ -196,13 +174,11 @@ main (int argc, char *argv[])
           x._tao_print_exception ("ERROR: Unexpected exception \n");
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client:");
+      ex._tao_print_exception ("Exception caught in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 8791dfa0c45..fd50f9f9af2 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -49,15 +49,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,26 +63,21 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -103,12 +96,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(middle_impl);
 
       Simple_Server_var middle =
-        middle_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        middle_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (middle.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (middle.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -125,22 +116,18 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "middle - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in middle:");
+      ex._tao_print_exception ("Exception caught in middle:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index d113c4a8a84..86045e54539 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -37,54 +37,39 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // create child poa with PERSISTENT policy
-      ACE_TRY_CHECK;
       CORBA::PolicyList policies;
       policies.length (2);
       policies[0] =
-        root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy(PortableServer::PERSISTENT);
 
       policies[1] =
-        root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION);
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
-                             policies
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             policies);
+      policies[0]->destroy ();
+      policies[1]->destroy ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -98,12 +83,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(server_impl);
 
       PingObject_var server =
-        server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -120,24 +103,19 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "ping - event loop finished\n"));
 
-      persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      persistent_poa->destroy (1, 1);
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in ping:");
+      ex._tao_print_exception ("Exception caught in ping:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index 1a521363671..a952dec9087 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -9,28 +9,27 @@
 ACE_RCSID(Faults, test_i, "$Id$")
 
 void
-PingObject_i::ping (PingObject_ptr callback
-      ACE_ENV_ARG_DECL)
+PingObject_i::ping (PingObject_ptr callback)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  callback->pong (ACE_ENV_SINGLE_ARG_PARAMETER);
+  callback->pong ();
 }
 
 void
-PingObject_i::pong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+PingObject_i::pong (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-PingObject_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+PingObject_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 PortableServer::POA_ptr
-PingObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+PingObject_i::_default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h
index 21fcda99ec6..00bdba4fee1 100644
--- a/TAO/tests/Faults/ping_i.h
+++ b/TAO/tests/Faults/ping_i.h
@@ -34,15 +34,14 @@ public:
   // ctor
 
   // = The PingObject interface methods
-  void ping (PingObject_ptr callback
-             ACE_ENV_ARG_DECL)
+  void ping (PingObject_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void pong (ACE_ENV_SINGLE_ARG_DECL)
+  void pong (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)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index fbc0b86a42f..da2e90bc26f 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -56,8 +56,7 @@ parse_args (int argc, char *argv[])
 void
 run_client (CORBA::ORB_ptr orb,
             PingObject_ptr server,
-            PingObject_ptr callback
-            ACE_ENV_ARG_DECL)
+            PingObject_ptr callback)
 {
   // Run the client requests in a separate routine to isolate the
   // exceptions...
@@ -66,15 +65,13 @@ run_client (CORBA::ORB_ptr orb,
     {
       ACE_Time_Value tv (0, 1000 * period);
       const char* reason = "";
-      ACE_TRY
+      try
         {
           reason = "Exception during ping call";
-          server->ping (callback ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->ping (callback);
 
           // Run for <period> milliseconds, to receive the reply
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
 
           // Terminate the client if:
           //   - This is the last iteration
@@ -84,93 +81,74 @@ run_client (CORBA::ORB_ptr orb,
             {
               ACE_DEBUG ((LM_DEBUG, "Shutting down server\n"));
               reason = "Exception during server shutdown";
-              server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              server->shutdown ();
             }
         }
-      ACE_CATCH (CORBA::TRANSIENT, t)
+      catch (const CORBA::TRANSIENT&)
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG, "Ignoring transient exception\n"));
           // ACE_PRINT_EXCEPTION (t, reason);
           ACE_OS::sleep (tv);
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, f)
+      catch (const CORBA::COMM_FAILURE&)
         {
           ACE_DEBUG ((LM_DEBUG, "Ignoring comm failure exception\n"));
           // ACE_PRINT_EXCEPTION (f, reason);
           ACE_OS::sleep (tv);
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, reason);
+          ex._tao_print_exception (reason);
           ACE_OS::sleep (tv);
         }
-      ACE_ENDTRY;
     }
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // create child poa with PERSISTENT policy
-      ACE_TRY_CHECK;
       CORBA::PolicyList policies;
       policies.length (2);
       policies[0] =
-        root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy(PortableServer::PERSISTENT);
       policies[1] =
-        root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION);
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
-                             policies
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             policies);
+      policies[0]->destroy ();
+      policies[1]->destroy ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       PingObject_var server =
-        PingObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PingObject::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -184,30 +162,23 @@ main (int argc, char *argv[])
                             persistent_poa.in ());
 
       PingObject_var callback =
-        callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        callback_impl._this ();
 
 
       // If the ior_output_file exists, output the ior to it
       run_client (orb.in (),
                   server.in (),
-                  callback.in ()
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                  callback.in ());
 
-      persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      persistent_poa->destroy (1, 1);
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index 530af043ca7..aea56f47bf8 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -37,15 +37,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,15 +51,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -77,12 +72,10 @@ main (int argc, char *argv[])
 
 
       Simple_Server_var server =
-        server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -99,21 +92,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in server:");
+      ex._tao_print_exception ("Exception caught in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index 19e47d882dc..bf03c9cbc8f 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -11,8 +11,7 @@
 ACE_RCSID(Failure, test_i, "$Id$")
 
 void
-Callback_i::shutdown (CORBA::Boolean is_clean
-                      ACE_ENV_ARG_DECL)
+Callback_i::shutdown (CORBA::Boolean is_clean)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (is_clean == 0)
@@ -29,8 +28,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean
 #endif
       return;
     }
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 
   ACE_DEBUG ((LM_DEBUG, "Shutdown: Performed clean shutdown\n"));
 }
@@ -40,16 +38,14 @@ Callback_i::shutdown (CORBA::Boolean is_clean
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback,
                               CORBA::Boolean is_clean,
-                              Callback_ptr callback
-                              ACE_ENV_ARG_DECL)
+                              Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
     {
       ACE_DEBUG ((LM_DEBUG, "Callback to shutdown client (%d)\n",
                   is_clean));
-      callback->shutdown (is_clean ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      callback->shutdown (is_clean);
     }
   ACE_Time_Value tv (0, 20000);
   ACE_OS::sleep (tv);
@@ -57,8 +53,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback,
 }
 
 void
-Simple_Server_i::shutdown_now (CORBA::Boolean is_clean
-                               ACE_ENV_ARG_DECL)
+Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (is_clean == 0)
@@ -73,14 +68,14 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean
     }
 
   ACE_DEBUG ((LM_DEBUG, "shutdown_now:Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 // ****************************************************************
@@ -88,8 +83,7 @@ Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 CORBA::Long
 Middle_i::test_method (CORBA::Boolean do_callback,
                        CORBA::Boolean is_clean,
-                       Callback_ptr callback
-                       ACE_ENV_ARG_DECL)
+                       Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int i = 0;
@@ -97,51 +91,42 @@ Middle_i::test_method (CORBA::Boolean do_callback,
     {
       this->server_->test_method (0,
                                   0,
-                                  callback
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                  callback);
     }
 
   this->server_->test_method (do_callback,
                               is_clean,
-                              callback
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                              callback);
 
   for (; i != 10; ++i)
     {
       this->server_->test_method (0,
                                   0,
-                                  callback
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+                                  callback);
     }
 
   return 0;
 }
 
 void
-Middle_i::shutdown_now (CORBA::Boolean is_clean
-                        ACE_ENV_ARG_DECL)
+Middle_i::shutdown_now (CORBA::Boolean is_clean)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->server_->shutdown_now (is_clean ACE_ENV_ARG_PARAMETER);
+  this->server_->shutdown_now (is_clean);
 }
 
 void
-Middle_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Middle_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      this->server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->server_->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // ignore them
     }
-  ACE_ENDTRY;
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h
index 85cbb8c524d..fd8310c07f4 100644
--- a/TAO/tests/Faults/test_i.h
+++ b/TAO/tests/Faults/test_i.h
@@ -32,8 +32,7 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (CORBA::Boolean is_clean
-                 ACE_ENV_ARG_DECL)
+  void shutdown (CORBA::Boolean is_clean)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -57,15 +56,13 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback,
                            CORBA::Boolean is_clean,
-                           Callback_ptr callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown_now (CORBA::Boolean is_clean
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  void shutdown_now (CORBA::Boolean is_clean)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -89,15 +86,13 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback,
                            CORBA::Boolean is_clean,
-                           Callback_ptr callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           Callback_ptr callback)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown_now (CORBA::Boolean is_clean
-                     ACE_ENV_ARG_DECL_NOT_USED)
+  void shutdown_now (CORBA::Boolean is_clean)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index 2e74de2a9f9..3622604315c 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -27,10 +27,8 @@ FileImpl::System::System (PortableServer::POA_ptr poa)
     // Create the Default Descriptor Servant
     fd_servant_ (poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   // set the default servant of the POA
-  poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->set_servant (&this->fd_servant_);
 }
 
 FileImpl::System::~System (void)
@@ -38,15 +36,14 @@ FileImpl::System::~System (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FileImpl::System::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
-                        CORBA::Long flags
-                        ACE_ENV_ARG_DECL)
+                        CORBA::Long flags)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
@@ -75,15 +72,12 @@ FileImpl::System::open (const char *file_name,
   // from ACE_HANDLE string
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (oid.in (),
-                                          "IDL:File/Descriptor:1.0"
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (File::Descriptor::_nil ());
+                                          "IDL:File/Descriptor:1.0");
 
   // Narrow the object reference to a File Descriptor
   File::Descriptor_var fd =
-    File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    File::Descriptor::_narrow (obj.in ());
 
-  ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
   return fd._retn ();
 }
@@ -99,59 +93,50 @@ FileImpl::Descriptor::~Descriptor (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FileImpl::Descriptor::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL)
+FileImpl::Descriptor::fd (void)
 {
   //
   // One way of getting our id.
   //
 
   // Get a reference to myself
-  File::Descriptor_var me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+  File::Descriptor_var me = this->_this ();
 
   // Get the ObjectId from the reference
   PortableServer::ObjectId_var oid1 =
-    this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    this->poa_->reference_to_id (me.in ());
 
   //
   // Another way of getting our id.
   //
 
   PortableServer::ObjectId_var oid2 =
-    this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    this->poa_->servant_to_id (this);
 
   //
   // Yet another way of getting our id.
   //
 
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0);
 
   // Get the POA Current object reference
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("POACurrent"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    orb->resolve_initial_references ("POACurrent");
 
   // Narrow the object reference to a POA Current reference
   PortableServer::Current_var poa_current =
-    PortableServer::Current::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    PortableServer::Current::_narrow (obj.in ());
 
   PortableServer::ObjectId_var oid3 =
-    poa_current->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    poa_current->get_object_id ();
 
   ACE_ASSERT (oid1.in () == oid2.in ());
   ACE_ASSERT (oid2.in () == oid3.in ());
@@ -165,13 +150,11 @@ FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Long
-FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
-                             ACE_ENV_ARG_DECL)
+FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_HANDLE file_descriptor = this->fd ();
 
   const CORBA::Octet *data = &buffer[0];
 
@@ -185,13 +168,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
 }
 
 File::Descriptor::DataBuffer *
-FileImpl::Descriptor::read (CORBA::Long num_bytes
-                            ACE_ENV_ARG_DECL)
+FileImpl::Descriptor::read (CORBA::Long num_bytes)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_HANDLE file_descriptor = this->fd ();
 
   CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
   ssize_t length = ACE_OS::read (file_descriptor, buffer, num_bytes);
@@ -208,13 +189,11 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes
 
 CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
-                             CORBA::Long whence
-                             ACE_ENV_ARG_DECL)
+                             CORBA::Long whence)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  ACE_HANDLE file_descriptor = this->fd ();
 
   CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor,
                                                     offset,
@@ -226,12 +205,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
+FileImpl::Descriptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ACE_HANDLE for this object reference
-  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_HANDLE file_descriptor = this->fd ();
 
   // Close the file corresponding to this object reference.
   ACE_OS::close (file_descriptor);
diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h
index ebe06fce403..1a6ba088622 100644
--- a/TAO/tests/File_IO/File_i.h
+++ b/TAO/tests/File_IO/File_i.h
@@ -34,35 +34,32 @@ public:
     ~Descriptor (void);
     // Destructor
 
-    PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+    PortableServer::POA_ptr _default_POA (void);
     // Returns the default POA of this object
 
-    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer
-                               ACE_ENV_ARG_DECL)
+    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // write buffer to File corresponding to this Descriptor
 
-    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes
-                                                ACE_ENV_ARG_DECL)
+    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes)
       ACE_THROW_SPEC ((CORBA::SystemException,
     // Reads num_bytes from the file and returns it
                        File::IOError));
 
     virtual CORBA::ULong lseek (CORBA::ULong offset,
-                                CORBA::Long whence
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Long whence)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // seek to the offset in file from whence
 
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+    virtual void destroy (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
     // closes the file corresponding to the requested ObjectID
 
   private:
 
-    ACE_HANDLE fd (ACE_ENV_SINGLE_ARG_DECL);
+    ACE_HANDLE fd (void);
     // Extracts the ACE_HANDLE from the objectID
 
     PortableServer::POA_var poa_;
@@ -80,12 +77,11 @@ public:
     ~System (void);
     //Destructor
 
-    PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+    PortableServer::POA_ptr _default_POA (void);
     //Returns the default POA of this object
 
     File::Descriptor_ptr open (const char *file_name,
-                               CORBA::Long flags
-                               ACE_ENV_ARG_DECL)
+                               CORBA::Long flags)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // Opens a file ,creates a Descriptor reference with the
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index 189a81e3d59..cfb213a7855 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -80,59 +80,46 @@ parse_args (int argc, char **argv)
 }
 
 void
-validate_connection (CORBA::Object_ptr object
-                     ACE_ENV_ARG_DECL)
+validate_connection (CORBA::Object_ptr object)
 {
   // Try to validate the connection several times, ignoring transient
   // exceptions.  If the connection can still not be setup, return
   // failure.
   for (int i = 0; i < 100; ++i)
     {
-      ACE_TRY
+      try
         {
-          object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          object->_non_existent ();
         }
-      ACE_CATCH (CORBA::TRANSIENT, exception)
+      catch (const CORBA::TRANSIENT& )
         {
           // Ignore...
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Rethrow any other exceptions.
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 static void *
 MTTEST (void *args)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_CString &ior = *(ACE_CString*)args;
-  ACE_TRY
+  try
     {
-      CORBA::Object_var object = orb->string_to_object (ior.c_str ()
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = orb->string_to_object (ior.c_str ());
 
-      validate_connection (object.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      validate_connection (object.in ());
 
       // Narrow the object reference to a File::System
-      File::System_var file_system = File::System::_narrow (object.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      File::System_var file_system = File::System::_narrow (object.in ());
 
       // Creat the file filename i.e "test"
       File::Descriptor_var fd = file_system->open (filename,
-                                                   O_RDONLY
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   O_RDONLY);
 
       for( int i = 0; i < iterations; ++i)
         {
@@ -141,26 +128,21 @@ MTTEST (void *args)
           ACE_DEBUG((LM_DEBUG,"Making request number %d\n",i));
 #endif /*if 0*/
 
-          fd->lseek (0, SEEK_SET ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          fd->lseek (0, SEEK_SET);
 
           // Read back the written message
           // Twice the size of the socket buffer
-          File::Descriptor::DataBuffer_var data_received = fd->read (128*1024
-                                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          File::Descriptor::DataBuffer_var data_received = fd->read (128*1024);
         }
 
       // close the file
-      fd->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      fd->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main");
+      ex._tao_print_exception ("Exception caught in main");
       return 0;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -168,13 +150,11 @@ MTTEST (void *args)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb = CORBA::ORB_init (argc, argv, 0);
 
       // Parse the command-line arguments to get the IOR
       parse_args (argc, argv);
@@ -212,13 +192,11 @@ main (int argc, char **argv)
         }
       ACE_Thread_Manager::instance()->wait();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main");
+      ex._tao_print_exception ("Exception caught in main");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index 7d73730e5dc..6099a4ca342 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -79,12 +79,10 @@ main (int argc, char *argv[])
   ACE_OS::write (handle, "", 1);
   ACE_OS::close (handle);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -92,62 +90,50 @@ main (int argc, char *argv[])
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow the object reference to a POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::PolicyList policies (5);
       policies.length (5);
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT);
 
       // Servant Retention Policy
       policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN);
 
       // Id Uniqueness Policy
       policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa =
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       // Create a File System Implementation object in first_poa
@@ -157,18 +143,14 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("FileSystem");
 
       first_poa->activate_object_with_id (file_system_oid.in (),
-                                          &file_system_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          &file_system_impl);
 
       CORBA::Object_var file_system =
-        first_poa->id_to_reference (file_system_oid.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->id_to_reference (file_system_oid.in ());
 
       // Get the IOR for the "FileSystem" object
       CORBA::String_var file_system_ior =
-        orb->object_to_string (file_system.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (file_system.in ());
 
       ACE_DEBUG ((LM_DEBUG,"%s\n",
                   file_system_ior.in ()));
@@ -184,8 +166,7 @@ main (int argc, char *argv[])
 
       // set the state of the poa_manager to active i.e ready to
       // process requests
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Worker worker (orb.in ());
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -196,22 +177,17 @@ main (int argc, char *argv[])
 
       worker.thr_mgr ()->wait ();
 
-      first_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      first_poa->destroy(1, 1);
 
-      root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy(1, 1);
 
-      orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EXCEPTION CAUGHT");
+      ex._tao_print_exception ("EXCEPTION CAUGHT");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -227,21 +203,17 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Run the ORB for atmost 75 seconds
       ACE_Time_Value tv (75, 0);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Worker::svc");
+      ex._tao_print_exception ("Worker::svc");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index 7d6eee99bb3..14aa76231d8 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -52,7 +52,7 @@ public:
   Worker (CORBA::ORB_ptr orb);
   // Constructor
 
-  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void run_test (void);
   // The actual implementation of the test
 
   // = The Task_Base methods
@@ -66,11 +66,10 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -85,40 +84,32 @@ main (int argc, char *argv[])
 
       ACE_Time_Value tv (5, 0);
 
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       // Now run a test in the main thread, just to confuse matters a
       // little more.
-      worker.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      worker.run_test ();
 
       worker.thr_mgr ()->wait ();
 
       if (do_shutdown)
         {
           CORBA::Object_var object =
-            orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->string_to_object (ior);
 
           Simple_Server_var server =
-            Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            Simple_Server::_narrow (object.in ());
 
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in main:");
+      ex._tao_print_exception ("Exception caught in main:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -133,45 +124,38 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->run_test ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in thread (%t)\n");
+      ex._tao_print_exception ("Exception caught in thread (%t)\n");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Worker::run_test (ACE_ENV_SINGLE_ARG_DECL)
+Worker::run_test (void)
 {
   for (int j = 0; j != niterations; ++j)
     {
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->orb_->string_to_object (ior);
 
       CORBA::Boolean is_simple_server =
-        object->_is_a ("IDL:Simple_Server:1.0" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        object->_is_a ("IDL:Simple_Server:1.0");
       if (!is_simple_server)
         ACE_DEBUG ((LM_DEBUG,
                     "(%P|%t) unexpected result from _is_a()\n"));
     }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->string_to_object (ior);
 
   Simple_Server_var server =
-    Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    Simple_Server::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
     {
@@ -184,8 +168,7 @@ Worker::run_test (ACE_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i != niterations; ++i)
     {
       CORBA::Boolean r =
-        server->test_is_a ("IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        server->test_is_a ("IDL:Foo:1.0");
 
       if (r != 0)
         ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index 788a56c975a..f1133b13c4e 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.cpp
@@ -38,27 +38,23 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -66,26 +62,21 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references("IORTable" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("IORTable");
 
       IORTable::Table_var table =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
       if (CORBA::is_nil (table.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the IORTable.\n"),
                           1);
-      table->bind ("Simple_Server", ior.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      table->bind ("Simple_Server", ior.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -98,21 +89,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp
index cccce97d7df..f133527feaf 100644
--- a/TAO/tests/Forwarding/test_i.cpp
+++ b/TAO/tests/Forwarding/test_i.cpp
@@ -9,8 +9,7 @@
 ACE_RCSID(Forwarding, test_i, "$Id$")
 
 CORBA::Boolean
-Simple_Server_i::test_is_a (const char * /* type */
-                            ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_is_a (const char * /* type */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a %s\n", type));
@@ -18,8 +17,8 @@ Simple_Server_i::test_is_a (const char * /* type */
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h
index 6f61069a79b..36ea3f16ad1 100644
--- a/TAO/tests/Forwarding/test_i.h
+++ b/TAO/tests/Forwarding/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Boolean test_is_a (const char * type ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Boolean test_is_a (const char * type)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
index a6a92dab129..c8696ddd004 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp
@@ -21,16 +21,14 @@ Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Now get the big replies..
-  ACE_TRY
+  try
     {
       for (int i = 0; i != this->event_count_; ++i)
         {
           Test::Octet_Seq_var seq =
-              this->reply_gen_->get_big_reply (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+              this->reply_gen_->get_big_reply ();
 
           CORBA::ULong length = seq->length ();
           for(CORBA::ULong i = 0; i < length; ++i)
@@ -47,13 +45,11 @@ Client_Task::svc (void)
 //          ACE_OS::sleep(tv);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception Caught \n");
+      ex._tao_print_exception ("Exception Caught \n");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
index e900b46cdc1..857550b9eef 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
@@ -40,22 +40,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Big_Reply_var reply_gen =
-        Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Big_Reply::_narrow(tmp.in ());
 
       if (CORBA::is_nil (reply_gen.in ()))
         {
@@ -77,19 +74,15 @@ main (int argc, char *argv[])
         }
       ACE_Thread_Manager::instance ()->wait ();
 
-      reply_gen->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      reply_gen->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
index 3e0c7b01499..a3f70b42eb9 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp
@@ -12,8 +12,7 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Payload_Receiver::more_data (const Test::Payload &payload
-                             ACE_ENV_ARG_DECL)
+Payload_Receiver::more_data (const Test::Payload &payload)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Payload_Receiver::Invalid_Payload))
 {
@@ -24,17 +23,17 @@ Payload_Receiver::more_data (const Test::Payload &payload
     {
       if (payload[i] != 'A')
         {
-          ACE_THROW (Test::Payload_Receiver::Invalid_Payload ());
+          throw Test::Payload_Receiver::Invalid_Payload ();
         }
     }
 }
 
 
 void
-Payload_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Payload_Receiver::shutdown (void)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
index 418f80cbffa..3ea7ab3acaa 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h
@@ -20,12 +20,11 @@ public:
   Payload_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void more_data (const Test::Payload &payload
-                          ACE_ENV_ARG_DECL)
+  virtual void more_data (const Test::Payload &payload)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Payload_Receiver::Invalid_Payload));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   int get_count (void) const;
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
index cbe3a65d928..7205e3bf539 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
@@ -37,15 +37,13 @@ int
 main (int argc, char *argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,12 +51,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +66,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl);
 
       Test::Payload_Receiver_var payload_receiver =
-        payload_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        payload_receiver_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (payload_receiver.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -87,11 +81,9 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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 ();
 
       if (payload_receiver_impl->get_count () != 20)
         {
@@ -102,19 +94,15 @@ main (int argc, char *argv[])
           ++status;
         }
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       ++status;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
index 8dd53b815ec..da443e12eab 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp
@@ -12,8 +12,7 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Payload_Receiver::more_data (const Test::Payload &payload
-                             ACE_ENV_ARG_DECL)
+Payload_Receiver::more_data (const Test::Payload &payload)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Payload_Receiver::Invalid_Payload))
 {
@@ -24,17 +23,17 @@ Payload_Receiver::more_data (const Test::Payload &payload
     {
       if (payload[i] != 'A')
         {
-          ACE_THROW (Test::Payload_Receiver::Invalid_Payload ());
+          throw Test::Payload_Receiver::Invalid_Payload ();
         }
     }
 }
 
 
 void
-Payload_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Payload_Receiver::shutdown (void)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
index b9ced6d7672..e48ab5b2b05 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h
@@ -20,12 +20,11 @@ public:
   Payload_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void more_data (const Test::Payload &payload
-                          ACE_ENV_ARG_DECL)
+  virtual void more_data (const Test::Payload &payload)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Payload_Receiver::Invalid_Payload));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   int get_count (void) const;
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
index 166b514f35c..6a56a1ab3c1 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
@@ -37,15 +37,13 @@ int
 main (int argc, char *argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,12 +51,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -82,18 +78,13 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl);
 
       PortableServer::ObjectId_var id =
-        persistent_poa->activate_object (payload_receiver_impl
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        persistent_poa->activate_object (payload_receiver_impl);
 
       CORBA::Object_var obj =
-        persistent_poa->id_to_reference (id.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        persistent_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -105,11 +96,9 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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 ();
 
       if (payload_receiver_impl->get_count () != 2)
         {
@@ -120,19 +109,15 @@ main (int argc, char *argv[])
           ++status;
         }
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       ++status;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index 066461f895a..bbc4ffedbed 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -63,26 +63,19 @@ namespace Test
 
     virtual int svc (void)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
-      ACE_TRY
+      try
         {
           this->h_->send_stuff ("Testing",
-                                false
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                false);
 
           this->h_->send_stuff ("Testing",
-                                false
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                false);
 
           this->h_->send_stuff ("Testing",
-                                true
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                true);
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, f)
+      catch (const CORBA::COMM_FAILURE& f)
         {
           ACE_UNUSED_ARG (f);
           ACE_DEBUG ((LM_DEBUG,
@@ -93,7 +86,7 @@ namespace Test
 
           return 0;
         }
-      ACE_CATCH (CORBA::Exception, ex)
+      catch (const CORBA::Exception& ex)
         {
           ex._tao_print_exception ("Caught CORBA Exception \n");
 
@@ -102,7 +95,7 @@ namespace Test
 
           return -1;
         }
-      ACE_CATCHALL
+      catch (...)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Caught a C++ exception \n"));
@@ -111,7 +104,6 @@ namespace Test
 
           return -1;
         }
-      ACE_ENDTRY;
 
       return 0;
     }
@@ -129,9 +121,8 @@ namespace Test
 
     virtual int svc (void)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
-      ACE_TRY
+      try
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Calling shutdown \n"));
@@ -143,9 +134,7 @@ namespace Test
           // Start the timer
           profile_timer.start ();
 
-          this->o_->shutdown (blocked
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->o_->shutdown (blocked);
 
           // Stop the timer
           profile_timer.stop ();
@@ -163,7 +152,7 @@ namespace Test
               return 0;
             }
         }
-      ACE_CATCHALL
+      catch (...)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Caught exception during shutdown \n"));
@@ -172,7 +161,6 @@ namespace Test
                       "(%P|%t) Error in test \n"));
           return -1;
         }
-      ACE_ENDTRY;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Returning from shutdown \n"));
@@ -185,29 +173,22 @@ namespace Test
   static int
   try_main (int argc, char *argv[])
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
 
-    ACE_TRY
+    try
       {
         CORBA::ORB_var orb =
           CORBA::ORB_init (argc,
                            argv,
-                           ""
-                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                           "");
 
         if (parse_args (argc, argv) == false)
           return -1;
 
         CORBA::Object_var tmp =
-          orb->string_to_object (ior
-                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->string_to_object (ior);
 
         Hang_var test =
-          Hang::_narrow (tmp.in ()
-                         ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          Hang::_narrow (tmp.in ());
 
         if (CORBA::is_nil (test.in ()))
           {
@@ -236,25 +217,22 @@ namespace Test
 
         ACE_Thread_Manager::instance ()->wait ();
 
-        orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        orb->destroy ();
 
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "CORBA Exception caught \n");
+        ex._tao_print_exception ("CORBA Exception caught \n");
         ACE_ERROR ((LM_ERROR,
                     "(%P|%t) Eror in test \n"));
         return -1;
       }
-    ACE_CATCHALL
+    catch (...)
       {
         ACE_DEBUG ((LM_DEBUG,
                     "(%P|%t) Error in test \n"));
         return -1;
       }
-    ACE_ENDTRY;
 
     return 0;
   }
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index 4f17562b879..8484dce2280 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -12,26 +12,19 @@ namespace Test
   try_main (int argc,
             char *argv[])
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
 
-    ACE_TRY
+    try
       {
         CORBA::ORB_var orb =
           CORBA::ORB_init (argc,
                            argv,
-                           ""
-                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                           "");
 
         CORBA::Object_var poa_object =
-          orb->resolve_initial_references("RootPOA"
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->resolve_initial_references("RootPOA");
 
         PortableServer::POA_var root_poa =
-          PortableServer::POA::_narrow (poa_object.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          PortableServer::POA::_narrow (poa_object.in ());
 
         if (CORBA::is_nil (root_poa.in ()))
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,8 +32,7 @@ namespace Test
                             1);
 
         PortableServer::POAManager_var poa_manager =
-          root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->the_POAManager ();
 
         test_i *test_impl;
         ACE_NEW_RETURN (test_impl,
@@ -49,13 +41,10 @@ namespace Test
         PortableServer::ServantBase_var owner_transfer (test_impl);
 
         Hang_var test =
-          test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          test_impl->_this ();
 
         CORBA::String_var ior =
-          orb->object_to_string (test.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->object_to_string (test.in ());
 
         // If the ior_output_file exists, output the ior to it
         FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -67,8 +56,7 @@ namespace Test
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
 
-        poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        poa_manager->activate ();
 
         ACE_Time_Value tv (10);
 
@@ -78,20 +66,15 @@ namespace Test
                     "(%P|%t) server - event loop finished\n"));
 
         root_poa->destroy (1,
-                           1
-                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                           1);
 
-        orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        orb->destroy ();
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
       {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             "Caught CORBA exception \n");
+        ex._tao_print_exception ("Caught CORBA exception \n");
         return -1;
       }
-    ACE_ENDTRY;
 
     return 0;
   }
diff --git a/TAO/tests/Hang_Shutdown/test_i.h b/TAO/tests/Hang_Shutdown/test_i.h
index 28f6ef82e23..706fc513fee 100644
--- a/TAO/tests/Hang_Shutdown/test_i.h
+++ b/TAO/tests/Hang_Shutdown/test_i.h
@@ -17,8 +17,7 @@ namespace Test
   public:
     // = The skeleton methods
     virtual void send_stuff (const char* str,
-                             CORBA::Boolean flag
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             CORBA::Boolean flag)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp
index 70af3ea8a11..3bb0a772b76 100644
--- a/TAO/tests/Hello/Hello.cpp
+++ b/TAO/tests/Hello/Hello.cpp
@@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h
index 1a404058944..6131e1a3c88 100644
--- a/TAO/tests/Hello/Hello.h
+++ b/TAO/tests/Hello/Hello.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index f85722246b5..9f58a01ac0f 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -62,25 +59,20 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp
index 3b309f50f0d..d54cee175d5 100644
--- a/TAO/tests/Hello/server.cpp
+++ b/TAO/tests/Hello/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp
index bfa97ea05a1..19e8544dde1 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.cpp
+++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp
@@ -13,28 +13,24 @@ Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
 }
 
 Test::HelloWorld_ptr
-Hello::get_helloworld (ACE_ENV_SINGLE_ARG_DECL)
+Hello::get_helloworld (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   HelloWorld *hello_world;
   ACE_NEW_THROW_EX (hello_world,
           HelloWorld,
 		    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Test::HelloWorld::_nil ());
 
   PortableServer::ObjectId_var oid =
-    poa_->activate_object (hello_world
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Test::HelloWorld::_nil ());
+    poa_->activate_object (hello_world);
 
   Test::HelloWorld_var hw = hello_world->_this ();
   return hw._retn ();
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h
index 429a7e10963..c7fe9919faf 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.h
+++ b/TAO/tests/ICMG_Any_Bug/Hello.h
@@ -19,10 +19,10 @@ public:
   /// Constructor
   Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
-  virtual Test::HelloWorld_ptr get_helloworld (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Test::HelloWorld_ptr get_helloworld (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
index e4badcc805c..2c5653bbfdb 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp
@@ -13,7 +13,7 @@ HelloWorld::HelloWorld (void)
 }
 
 char *
-HelloWorld::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+HelloWorld::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO Any Implementation Works!");
diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
index ad60160af2d..85c9da63242 100644
--- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h
+++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h
@@ -18,7 +18,7 @@ public:
   HelloWorld (void);
   /// Constructor
 
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index 3457c09156a..5f1077eee9d 100644
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.cpp
@@ -41,22 +41,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow (tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -73,8 +70,7 @@ main (int argc, char *argv[])
       any <<= "Hi From DOC Group";
       request->arguments ()->add_value ("msg", any, CORBA::ARG_IN);
 
-      request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      request->invoke ();
 
       CORBA::NamedValue_ptr results = request->result ();
       CORBA::Any * obj_any = results->value ();
@@ -89,8 +85,7 @@ main (int argc, char *argv[])
         }
 
       Test::HelloWorld_var hello_world =
-        Test::HelloWorld::_narrow (obj2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::HelloWorld::_narrow (obj2.in ());
 
       if (CORBA::is_nil (hello_world.in ()))
         {
@@ -100,25 +95,20 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello_world->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_world->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp
index e32f495349a..9804e48bca5 100644
--- a/TAO/tests/ICMG_Any_Bug/server.cpp
+++ b/TAO/tests/ICMG_Any_Bug/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer (hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index 02691299c3a..c9edfb66edc 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -25,6 +25,7 @@ project(*Main): taoserver, messaging {
     params.idl
     reopened_modules.idl
     sequence.idl
+    struct.idl
     reopen_include1.idl
     reopen_include2.idl
     typeprefix.idl
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index 2c39344eabf..52b623edf02 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -89,31 +89,24 @@ main (int argc , char *argv[])
 {
   int error_count = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Test of #pragma prefix behavior.
 
       CORBA::Object_var obj;
 
       hello_i h;
-      obj = h._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = h._this ();
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/hello:1.0"))
@@ -124,8 +117,7 @@ main (int argc , char *argv[])
         }
 
       goodbye_i g;
-      obj = g._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = g._this ();
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/goodbye:1.0"))
@@ -136,8 +128,7 @@ main (int argc , char *argv[])
         }
 
       sayonara_i s;
-      obj = s._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = s._this ();
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:hammer.com/salutation/sayonara:1.0"))
@@ -148,8 +139,7 @@ main (int argc , char *argv[])
         }
 
       ciao_i c;
-      obj = c._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = c._this ();
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/ciao:1.0"))
@@ -160,8 +150,7 @@ main (int argc , char *argv[])
         }
 
       aloha_i a;
-      obj = a._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = a._this ();
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/aloha:1.0"))
@@ -353,17 +342,13 @@ main (int argc , char *argv[])
         }
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in main");
+      ex._tao_print_exception ("Unexpected exception in main");
       return 1;
     }
-  ACE_ENDTRY;
 
   return error_count;
 }
diff --git a/TAO/tests/IDL_Test/struct.idl b/TAO/tests/IDL_Test/struct.idl
new file mode 100644
index 00000000000..e339c502ab8
--- /dev/null
+++ b/TAO/tests/IDL_Test/struct.idl
@@ -0,0 +1,22 @@
+// $Id$
+// Double forward declared struct test, created by Martin Corino <mcorino@remedy.nl>
+
+module Test
+{
+  struct S3;
+
+  struct S1
+  {
+    string hello;
+  };
+
+  struct S3;
+
+  typedef sequence<S3> TS3Seq;
+
+  struct S3
+  {
+    TS3Seq m_seq;
+    boolean m_has_more;
+  };
+};
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index 29313aad9b1..e47bdae2f2e 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -33,51 +33,38 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the IORManipulation Tests.\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
                                              argv,
-                                             ""
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             "");
 
       // **********************************************************************
 
       // Get an object reference for the ORBs IORManipulation object!
       CORBA::Object_var IORM =
-        orb_->resolve_initial_references ("IORManipulation"
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("IORManipulation");
 
       TAO_IOP::TAO_IOR_Manipulation_var iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ());
 
       // **********************************************************************
 
       // Create a few fictitious IORs
       CORBA::Object_var name1 =
-        orb_->string_to_object ("corbaloc:iiop:macarena.cs.wustl.edu:6060/xyz"
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->string_to_object ("corbaloc:iiop:macarena.cs.wustl.edu:6060/xyz");
       CORBA::Object_var name2 =
-        orb_->string_to_object ("corbaloc:iiop:tango.cs.wustl.edu:7070/xyz"
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->string_to_object ("corbaloc:iiop:tango.cs.wustl.edu:7070/xyz");
 
       // **********************************************************************
 
       CORBA::String_var name1_ior =
-        orb_->object_to_string (name1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (name1.in ());
       ACE_DEBUG ((LM_DEBUG, "\tFirst made up IOR = %s\n", name1_ior.in ()));
 
       CORBA::String_var name2_ior =
-        orb_->object_to_string (name2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (name2.in ());
       ACE_DEBUG ((LM_DEBUG, "\tSecond made up IOR = %s\n", name2_ior.in ()));
 
       // **********************************************************************
@@ -88,22 +75,16 @@ main (int argc, char *argv[])
       iors [0] = name1;
       iors [1] = name2;
 
-      CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var merged = iorm->merge_iors (iors);
 
       CORBA::String_var merged_ior =
-        orb_->object_to_string (merged.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (merged.in ());
 
-      CORBA::ULong count1 = iorm->get_profile_count (iors [0] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong count1 = iorm->get_profile_count (iors [0]);
 
-      CORBA::ULong count2 = iorm->get_profile_count (iors [1] ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong count2 = iorm->get_profile_count (iors [1]);
 
-      CORBA::ULong count = iorm->get_profile_count (merged.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong count = iorm->get_profile_count (merged.in ());
 
       if (count != (count1 + count2))
         ACE_DEBUG ((LM_ERROR,
@@ -117,9 +98,7 @@ main (int argc, char *argv[])
       // is_in_ior throws an exception if the intersection of the two
       // IORs is NULL.
       CORBA::ULong in_count = iorm->is_in_ior (merged.in (),
-                                               name1.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               name1.in ());
 
       if (count1 != in_count)
         ACE_DEBUG ((LM_ERROR,
@@ -128,9 +107,7 @@ main (int argc, char *argv[])
                     in_count));
 
       in_count = iorm->is_in_ior (merged.in (),
-                                  name2.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  name2.in ());
 
       if (count2 != in_count)
         ACE_DEBUG ((LM_ERROR,
@@ -143,15 +120,12 @@ main (int argc, char *argv[])
       // Verify ability to remove profiles from an IOR
       // First remove the second IOR from the merged IOR
       CORBA::Object_var just1 =
-        iorm->remove_profiles (merged.in (), name2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        iorm->remove_profiles (merged.in (), name2.in ());
 
       CORBA::String_var just1_ior =
-        orb_->object_to_string (just1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (just1.in ());
 
-      count = iorm->get_profile_count (just1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      count = iorm->get_profile_count (just1.in ());
 
       if (count1 != count)
         ACE_DEBUG ((LM_ERROR,
@@ -163,8 +137,7 @@ main (int argc, char *argv[])
                   count,
                   just1_ior.in ()));
 
-      in_count = iorm->is_in_ior (just1.in (), name1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      in_count = iorm->is_in_ior (just1.in (), name1.in ());
 
       if (count1 != in_count)
         ACE_DEBUG ((LM_ERROR,
@@ -176,19 +149,16 @@ main (int argc, char *argv[])
 
       // Now try the add_profiles interface.
       CORBA::Object_var merged2 =
-        iorm->add_profiles (just1.in (), name2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        iorm->add_profiles (just1.in (), name2.in ());
 
-      count = iorm->get_profile_count (merged2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      count = iorm->get_profile_count (merged2.in ());
 
       if (count != (count1 + count2))
         ACE_DEBUG ((LM_ERROR,
                     "**ERROR: add_profile failed profile count test!\n"));
 
       CORBA::String_var merged2_ior =
-        orb_->object_to_string (merged2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (merged2.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "\tAdding 2 back in IOR(%d) = %s\n",
@@ -197,8 +167,7 @@ main (int argc, char *argv[])
 
       // is_in_ior throws an exception if the intersection of the two
       // IORs is NULL.
-      in_count = iorm->is_in_ior (merged2.in (), name1. in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      in_count = iorm->is_in_ior (merged2.in (), name1. in ());
 
       if (count1 != in_count)
         ACE_DEBUG ((LM_ERROR,
@@ -206,8 +175,7 @@ main (int argc, char *argv[])
                     "count bad (%d)!\n",
                     in_count));
 
-      in_count = iorm->is_in_ior (merged2.in (), name2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      in_count = iorm->is_in_ior (merged2.in (), name2.in ());
 
       if (count2 != in_count)
         ACE_DEBUG ((LM_ERROR,
@@ -217,15 +185,12 @@ main (int argc, char *argv[])
       // **********************************************************************
 
       CORBA::Object_var just2 =
-        iorm->remove_profiles (merged2.in (), name1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        iorm->remove_profiles (merged2.in (), name1.in ());
 
       CORBA::String_var just2_ior =
-        orb_->object_to_string (just2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_->object_to_string (just2.in ());
 
-      count = iorm->get_profile_count (just2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      count = iorm->get_profile_count (just2.in ());
 
       if (count2 != count)
         ACE_DEBUG ((LM_ERROR,
@@ -235,8 +200,7 @@ main (int argc, char *argv[])
                   count,
                   just2_ior.in ()));
 
-      in_count = iorm->is_in_ior (just2.in (), name2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      in_count = iorm->is_in_ior (just2.in (), name2.in ());
 
       if (count2 != in_count)
         ACE_DEBUG ((LM_ERROR,
@@ -248,17 +212,15 @@ main (int argc, char *argv[])
       Status = 1;
       // Finally generate an exception and quit.
       // This will generate a NotFound exception.
-      in_count = iorm->is_in_ior (just2.in (), name1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      in_count = iorm->is_in_ior (just2.in (), name1.in ());
 
     }
-  ACE_CATCH (TAO_IOP::EmptyProfileList, userex)
+  catch (const TAO_IOP::EmptyProfileList& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "Unexpected EmptyProfileList Exception!\n");
+      userex._tao_print_exception ("Unexpected EmptyProfileList Exception!\n");
       return -1;
     }
-  ACE_CATCH (TAO_IOP::NotFound, userex)
+  catch (const TAO_IOP::NotFound& userex)
     {
       if (Status == 1)
         {
@@ -276,36 +238,30 @@ main (int argc, char *argv[])
         }
       else
         {
-          ACE_PRINT_EXCEPTION (userex,
-                               "Unexpected NotFound Exception!\n");
+          userex._tao_print_exception ("Unexpected NotFound Exception!\n");
           return -1;
         }
     }
-  ACE_CATCH (TAO_IOP::Duplicate, userex)
+  catch (const TAO_IOP::Duplicate& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "Unexpected Duplicate Exception!\n");
+      userex._tao_print_exception ("Unexpected Duplicate Exception!\n");
       return -1;
     }
-  ACE_CATCH (TAO_IOP::Invalid_IOR, userex)
+  catch (const TAO_IOP::Invalid_IOR& userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "Unexpected Invalid_IOR Exception!\n");
+      userex._tao_print_exception ("Unexpected Invalid_IOR Exception!\n");
       return -1;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,
-                           "Unexpected system Exception!!\n");
+      sysex._tao_print_exception ("Unexpected system Exception!!\n");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected ACE_CATCHANY Exception!\n");
+      ex._tao_print_exception ("Unexpected CORBA Exception!\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   if (Status == 1)
     {
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
index 7e876ea57c8..e9694858821 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp
@@ -13,7 +13,7 @@ bogus::~bogus()
 }
 
 void
-bogus::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+bogus::noop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
index 94a4961f8ff..dceebf65eb0 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
+++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h
@@ -15,7 +15,7 @@ public:
   bogus ();
   virtual ~bogus ();
 
-  virtual void noop (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void noop (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index b4058e4deef..afeda84afa9 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -14,39 +14,33 @@ ACE_RCSID (IOR_Endpoint_Hostnames, generate_ior, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var rp =
-        PortableServer::POA::_narrow(poa_object.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow(poa_object.in());
       if  (CORBA::is_nil (rp.in()))
         ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) panic: nil root poa\n"), 1);
 
       bogus* bogus_impl = new bogus();
       PortableServer::ServantBase_var owner_transfer(bogus_impl);
-      Test::bogus_var b = bogus_impl->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test::bogus_var b = bogus_impl->_this();
       CORBA::String_var ior =
-        orb->object_to_string (b.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (b.in());
 
       printf ("%s\n", ior.in());
-  
+
       orb->shutdown();
       orb->destroy();
     }
-  ACE_CATCH (CORBA::Exception, e)
+  catch (const CORBA::Exception& e)
     {
-      ACE_PRINT_EXCEPTION (e, "Caught exception:");
+      e._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp
index 70af3ea8a11..3bb0a772b76 100644
--- a/TAO/tests/IPV6/Hello.cpp
+++ b/TAO/tests/IPV6/Hello.cpp
@@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h
index 1a404058944..6131e1a3c88 100644
--- a/TAO/tests/IPV6/Hello.h
+++ b/TAO/tests/IPV6/Hello.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp
index 77a6ec4190b..436ff516b0b 100644
--- a/TAO/tests/IPV6/client.cpp
+++ b/TAO/tests/IPV6/client.cpp
@@ -43,22 +43,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -69,35 +66,30 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (expect_error)
         {
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - expected exception occurred!\n%s\n",
-                      ACE_ANY_EXCEPTION._info().c_str()));
+                      ex._info().c_str()));
 
           return 0;
         }
       else
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception caught:");
+          ex._tao_print_exception ("Exception caught:");
           return 1;
         }
     }
-  ACE_ENDTRY;
 
   if (expect_error)
     {
diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp
index 177aad4d1d8..8c998950dd3 100644
--- a/TAO/tests/IPV6/server.cpp
+++ b/TAO/tests/IPV6/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp
index a3c0b51e25a..a702a184f19 100644
--- a/TAO/tests/InterOp-Naming/INS_i.cpp
+++ b/TAO/tests/InterOp-Naming/INS_i.cpp
@@ -24,7 +24,7 @@ INS_i::orb (CORBA::ORB_ptr o)
 }
 
 char *
-INS_i::test_ins (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+INS_i::test_ins (void)
 ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h
index 38687ea246c..28bfc384429 100644
--- a/TAO/tests/InterOp-Naming/INS_i.h
+++ b/TAO/tests/InterOp-Naming/INS_i.h
@@ -33,7 +33,7 @@ public:
   ~INS_i (void);
   // Destructor.
 
-  char * test_ins (ACE_ENV_SINGLE_ARG_DECL)
+  char * test_ins (void)
   ACE_THROW_SPEC (( CORBA::SystemException ));
   // test the INS.
 
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index 0e4ac57360f..e85e052248e 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -13,15 +13,12 @@ main (int argc, char *argv[])
 {
   int i = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve a reference to the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       if (argc < 2)
         {
@@ -38,8 +35,7 @@ main (int argc, char *argv[])
             {
               // List initial services
               CORBA::ORB::ObjectIdList_var list =
-                orb->list_initial_services (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->list_initial_services ();
 
               size_t length = list->length ();
 
@@ -69,8 +65,7 @@ main (int argc, char *argv[])
             }
           else
             {
-              objref = orb->resolve_initial_references (argv[i] ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              objref = orb->resolve_initial_references (argv[i]);
 
               if (CORBA::is_nil (objref.in ()))
                 ACE_ERROR_RETURN ((LM_ERROR,
@@ -78,9 +73,7 @@ main (int argc, char *argv[])
                                    "given name.\n"),
                                   -1);
 
-              INS_var server = INS::_narrow (objref.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              INS_var server = INS::_narrow (objref.in ());
 
               CORBA::String_var iorstr =
                 orb->object_to_string (server.in ());
@@ -90,8 +83,7 @@ main (int argc, char *argv[])
                           iorstr.in()));
 
               CORBA::String_var test_ins_result =
-                server->test_ins (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                server->test_ins ();
 
               ACE_DEBUG ((LM_DEBUG,
                           "\nResult of Remote Call : %s\n",
@@ -99,17 +91,15 @@ main (int argc, char *argv[])
             }
         }
     }
-  ACE_CATCH (CORBA::ORB::InvalidName, name)
+  catch (const CORBA::ORB::InvalidName& )
     {
       ACE_DEBUG ((LM_DEBUG, "Cannot resolve <%s>\n", argv[i]));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      ex._tao_print_exception ("Exception:");
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp
index c45f732a26f..8fbb39a0bad 100644
--- a/TAO/tests/InterOp-Naming/INS_test_server.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp
@@ -13,29 +13,26 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tINS test server\n\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (server.init (argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index ec60caff7ea..1e009356363 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -68,7 +68,7 @@ Server_i::parse_args (void)
 int
 Server_i::add_IOR_to_table (CORBA::String_var ior)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -78,22 +78,17 @@ Server_i::add_IOR_to_table (CORBA::String_var ior)
 
       CORBA::Object_var table_object =
         this->orb_manager_.orb ()->resolve_initial_references (
-            "IORTable"
-            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+            "IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
-      adapter->bind (this->ins_, ior.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      adapter->bind (this->ins_, ior.in ());
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  catch (const CORBA::SystemException& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Exception caugh in add_IOR_to_table");
+      ex._tao_print_exception ("Exception caugh in add_IOR_to_table");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -101,16 +96,13 @@ Server_i::add_IOR_to_table (CORBA::String_var ior)
 // Initialize the server.
 int
 Server_i::init (int argc,
-                char *argv[]
-                ACE_ENV_ARG_DECL)
+                char *argv[])
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   int result = this->orb_manager_.init_child_poa (argc,
                                                   argv,
-                                                  "child_poa"
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                  "child_poa");
 
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -131,13 +123,11 @@ Server_i::init (int argc,
   // Stash our ORB pointer for later reference.
   this->servant_.orb (orb.in ());
 
-  ACE_TRY
+  try
     {
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa ("INS_servant",
-                                                     &this->servant_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                     &this->servant_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
@@ -158,22 +148,21 @@ Server_i::init (int argc,
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\tException in activation of POA");
+      ex._tao_print_exception (
+        "\tException in activation of POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 int
-Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
+Server_i::run (void)
 {
   // Run the main event loop for the ORB.
-  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->orb_manager_.run ();
 
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index 7df2f070c41..389456aa47a 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -37,14 +37,13 @@ public:
   // Destructor.
 
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the Server state - parsing arguments and waiting.
 
   int add_IOR_to_table (CORBA::String_var ior);
   // Add an IOR to the ORB-IOR table.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
 protected:
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index 1711b12b175..8fb575a16be 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -110,9 +110,8 @@ public:
 
   int svc (void)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
-      ACE_TRY
+      try
         {
           u_long work_from_this_thread = 0;
           ACE_Time_Value sleep_for_this_thread;
@@ -135,9 +134,7 @@ public:
                       "Client: Invoking server from thread %t for time %d @ %T\n",
                       work_from_this_thread));
 
-          CORBA::ULong result = this->test_->method (work_from_this_thread
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::ULong result = this->test_->method (work_from_this_thread);
 
           if (work_from_this_thread != result)
             {
@@ -148,15 +145,12 @@ public:
 
           ACE_DEBUG ((LM_DEBUG, "Client: client loop finished for thread %t @ %T\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception caught in thread:");
+          ex._tao_print_exception ("Exception caught in thread:");
           return -1;
         }
-      ACE_ENDTRY;
 
-      ACE_CHECK_RETURN (-1);
 
       return 0;
     }
@@ -186,9 +180,8 @@ public:
 
   int svc (void)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
-      ACE_TRY
+      try
         {
           u_long event_loop_timeout_for_this_thread = 0;
 
@@ -206,20 +199,16 @@ public:
           ACE_Time_Value timeout (0,
                                   event_loop_timeout_for_this_thread * 1000);
 
-          this->orb_->run (timeout ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->run (timeout);
 
           ACE_DEBUG ((LM_DEBUG, "Client: Event loop finished for thread %t @ %T\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception caught in thread:");
+          ex._tao_print_exception ("Exception caught in thread:");
           return -1;
         }
-      ACE_ENDTRY;
 
-      ACE_CHECK_RETURN (-1);
 
       return 0;
     }
@@ -238,17 +227,14 @@ private:
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -257,13 +243,10 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a <server> reference.
-      test_var server = test::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var server = test::_narrow (object.in ());
 
       Client_Task client_task (server.in ());
 
@@ -293,19 +276,15 @@ main (int argc, char **argv)
       // Shutdown server.
       if (shutdown_server)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index 42575677363..dd25883f9b4 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -54,22 +54,17 @@ public:
 
   int svc (void)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
 
-      ACE_TRY
+      try
         {
-          this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->run ();
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception caught in thread:");
+          ex._tao_print_exception ("Exception caught in thread:");
           return -1;
         }
-      ACE_ENDTRY;
 
-      ACE_CHECK_RETURN (-1);
 
       return 0;
     }
@@ -82,31 +77,23 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -114,13 +101,10 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -146,17 +130,13 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Server: Event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index 38f3459b07a..b2794eac59e 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -11,16 +11,14 @@ 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))
 {
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 CORBA::ULong
-test_i::method (CORBA::ULong work
-                ACE_ENV_ARG_DECL_NOT_USED)
+test_i::method (CORBA::ULong work)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h
index b884d8b517f..bee80a1826a 100644
--- a/TAO/tests/Leader_Followers/test_i.h
+++ b/TAO/tests/Leader_Followers/test_i.h
@@ -25,11 +25,10 @@ public:
   // ctor.
 
   // = The test interface methods.
-  CORBA::ULong method (CORBA::ULong work
-                       ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::ULong method (CORBA::ULong work)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 01b2d58bb9e..8d21bac2f63 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -10,27 +10,21 @@ ACE_RCSID (LongUpcalls,
            "$Id$")
 
 static void
-validate_connection (Test::Controller_ptr controller
-                     ACE_ENV_ARG_DECL)
+validate_connection (Test::Controller_ptr controller)
   ACE_THROW_SPEC (())
 {
-  ACE_TRY
+  try
     {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::PolicyList_var unused;
-      controller->_validate_connection (unused
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      controller->_validate_connection (unused);
 #else
-      controller->_is_a ("Not_an_IDL_Type"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      controller->_is_a ("Not_an_IDL_Type");
 #endif
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 }
 
 AMI_Manager::AMI_Manager (CORBA::ORB_ptr orb)
@@ -41,15 +35,12 @@ AMI_Manager::AMI_Manager (CORBA::ORB_ptr orb)
 void
 AMI_Manager::start_workers (CORBA::Short worker_count,
                             CORBA::Long milliseconds,
-                            Test::Controller_ptr controller
-                            ACE_ENV_ARG_DECL)
+                            Test::Controller_ptr controller)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
 
-  validate_connection(controller
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  validate_connection(controller);
 
   // ACE_DEBUG ((LM_DEBUG, "Starting %d workers\n", worker_count));
   Worker worker (&thread_manager,
@@ -62,10 +53,10 @@ AMI_Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-AMI_Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+AMI_Manager::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 // ****************************************************************
@@ -85,8 +76,7 @@ int
 Worker::svc (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_SYNCH_MUTEX mutex;
       int pending_requests = 2;
@@ -100,46 +90,36 @@ Worker::svc (void)
                         -1);
 
         PortableServer::ServantBase_var auto_destroy (handler_impl);
-        handler = handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        handler = handler_impl->_this ();
       }
 
-      validate_connection(this->controller_.in()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      validate_connection(this->controller_.in());
 
-      this->controller_->sendc_worker_started (handler.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->controller_->sendc_worker_started (handler.in ());
 
       // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n"));
 
       ACE_Time_Value tv (0, 1000 * this->milliseconds_);
       ACE_OS::sleep (tv);
 
-      this->controller_->sendc_worker_finished (handler.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->controller_->sendc_worker_finished (handler.in ());
 
       // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
 
       for (;;)
         {
           ACE_Time_Value tv (0, 1000 * this->milliseconds_);
-          this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->run (tv);
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1);
           if (pending_requests == 0)
             break;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in svc() method\n");
+      ex._tao_print_exception ("Exception in svc() method\n");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -153,7 +133,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex,
 }
 
 void
-Controller_Handler::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller_Handler::worker_started (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
@@ -162,26 +142,22 @@ Controller_Handler::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Controller_Handler::worker_started_excep
-    (::Messaging::ExceptionHolder* h
-     ACE_ENV_ARG_DECL)
+    (::Messaging::ExceptionHolder* h)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      h->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Controller_Handler exception raised in"
-                           " worker_started");
+      ex._tao_print_exception (
+        "Controller_Handler exception raised in"" worker_started");
     }
-  ACE_ENDTRY;
 }
 
 void
-Controller_Handler::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller_Handler::worker_finished (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
@@ -190,20 +166,16 @@ Controller_Handler::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Controller_Handler::worker_finished_excep
-    (::Messaging::ExceptionHolder *h
-     ACE_ENV_ARG_DECL)
+    (::Messaging::ExceptionHolder *h)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      h->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Controller_Handler exception raised in"
-                           " worker_finished");
+      ex._tao_print_exception (
+        "Controller_Handler exception raised in"" worker_finished");
     }
-  ACE_ENDTRY;
 }
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 5d7d6a82eec..271f1d5b4c3 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -16,10 +16,9 @@ public:
   // = The skeleton methods
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
-                              Test::Controller_ptr controller
-                              ACE_ENV_ARG_DECL)
+                              Test::Controller_ptr controller)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -61,15 +60,13 @@ public:
                       int *pending_replies);
   // Constructor
 
-  virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void worker_started (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_started_excep (::Messaging::ExceptionHolder*
-                                     ACE_ENV_ARG_DECL)
+  virtual void worker_started_excep (::Messaging::ExceptionHolder*)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void worker_finished (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished_excep (::Messaging::ExceptionHolder*
-                                      ACE_ENV_ARG_DECL)
+  virtual void worker_finished_excep (::Messaging::ExceptionHolder*)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp
index 94008f0a364..69aebe53e9e 100644
--- a/TAO/tests/LongUpcalls/Controller.cpp
+++ b/TAO/tests/LongUpcalls/Controller.cpp
@@ -24,7 +24,7 @@ Controller::dump_results ()
 }
 
 void
-Controller::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller::worker_started (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -34,7 +34,7 @@ Controller::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Controller::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller::worker_finished (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index a3992eb5c59..ac3238e99db 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -16,9 +16,9 @@ public:
   // Print out the results and any errors
 
   // = The skeleton methods
-  virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void worker_started (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void worker_finished (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index 562ff8f262c..429713aa205 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -10,27 +10,21 @@ ACE_RCSID (LongUpcalls,
            "$Id$")
 
 static void
-validate_connection (Test::Controller_ptr controller
-                     ACE_ENV_ARG_DECL)
+validate_connection (Test::Controller_ptr controller)
   ACE_THROW_SPEC (())
 {
-  ACE_TRY
+  try
     {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::PolicyList_var unused;
-      controller->_validate_connection (unused
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      controller->_validate_connection (unused);
 #else
-      controller->_is_a ("Not_an_IDL_Type"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      controller->_is_a ("Not_an_IDL_Type");
 #endif
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 }
 
 Manager::Manager (CORBA::ORB_ptr orb)
@@ -41,15 +35,12 @@ Manager::Manager (CORBA::ORB_ptr orb)
 void
 Manager::start_workers (CORBA::Short worker_count,
                         CORBA::Long milliseconds,
-                        Test::Controller_ptr controller
-                        ACE_ENV_ARG_DECL)
+                        Test::Controller_ptr controller)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
 
-  validate_connection(controller
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  validate_connection(controller);
 
   // ACE_DEBUG ((LM_DEBUG, "Starting %d workers\n", worker_count));
   Worker worker (&thread_manager,
@@ -61,10 +52,10 @@ Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Manager::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 
@@ -83,31 +74,24 @@ int
 Worker::svc (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      validate_connection(this->controller_.in()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      validate_connection(this->controller_.in());
 
-      this->controller_->worker_started (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->controller_->worker_started ();
 
       // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n"));
 
       ACE_Time_Value tv (0, 1000 * this->milliseconds_);
       ACE_OS::sleep (tv);
 
-      this->controller_->worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->controller_->worker_finished ();
 
       // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in svc() method\n");
+      ex._tao_print_exception ("Exception in svc() method\n");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h
index 65e7934f00c..313c0be7b06 100644
--- a/TAO/tests/LongUpcalls/Manager.h
+++ b/TAO/tests/LongUpcalls/Manager.h
@@ -18,10 +18,9 @@ public:
   // = The skeleton methods
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
-                              Test::Controller_ptr controller
-                              ACE_ENV_ARG_DECL)
+                              Test::Controller_ptr controller)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index c1532a2eb86..49964f970a9 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -14,40 +14,32 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager,
 }
 
 void
-Manager_Handler::start_workers (ACE_ENV_SINGLE_ARG_DECL)
+Manager_Handler::start_workers (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       this->manager_->start_workers (CORBA::Short(10),
                                      CORBA::Long(1000),
-                                     this->controller_.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     this->controller_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised in nested start workers: ");
+      ex._tao_print_exception ("Exception raised in nested start workers: ");
     }
-  ACE_ENDTRY;
 }
 
 void
-Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder
-                                      ACE_ENV_ARG_DECL)
+Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      holder->raise_exception ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised in asynch start workers: ");
+      ex._tao_print_exception ("Exception raised in asynch start workers: ");
     }
-  ACE_ENDTRY;
 }
 
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index 8ee1d472c2e..9899fa0b440 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -17,10 +17,9 @@ public:
   // Constructor
 
   // = The skeleton methods
-  virtual void start_workers (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void start_workers (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void start_workers_excep (::Messaging::ExceptionHolder *holder
-                                    ACE_ENV_ARG_DECL)
+  virtual void start_workers_excep (::Messaging::ExceptionHolder *holder)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index e22153a203d..73bddabb7ae 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.cpp
@@ -36,15 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,12 +50,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -65,15 +61,12 @@ main (int argc, char *argv[])
       Controller controller_impl;
 
       Test::Controller_var controller =
-        controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        controller_impl._this ();
 
-      object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->string_to_object (ior);
 
       Test::Manager_var manager =
-        Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Manager::_narrow (object.in ());
 
       if (CORBA::is_nil (manager.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -83,42 +76,32 @@ main (int argc, char *argv[])
       Manager_Handler handler_impl (manager.in (),
                                     controller.in ());
       Test::AMI_ManagerHandler_var handler =
-        handler_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        handler_impl._this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       const CORBA::Short worker_count = 10;
       manager->sendc_start_workers (handler.in (),
                                     worker_count,
                                     CORBA::Long (1000),
-                                    controller.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    controller.in ());
 
       ACE_Time_Value tv (30, 0);
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       controller_impl.dump_results ();
 
-      manager->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager->shutdown ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index ed7307129f9..5217b89ccf7 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -35,15 +35,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -51,12 +49,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -64,12 +60,10 @@ main (int argc, char *argv[])
       AMI_Manager manager_impl (orb.in ());
 
       Test::Manager_var manager =
-        manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        manager_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (manager.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -81,27 +75,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index b914c957950..1321790d3fd 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -35,15 +35,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -51,12 +49,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -64,15 +60,12 @@ main (int argc, char *argv[])
       Controller controller_impl;
 
       Test::Controller_var controller =
-        controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        controller_impl._this ();
 
-      object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->string_to_object (ior);
 
       Test::Manager_var manager =
-        Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Manager::_narrow (object.in ());
 
       if (CORBA::is_nil (manager.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -80,34 +73,26 @@ main (int argc, char *argv[])
                           1);
 
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       const CORBA::Short worker_count = 10;
       manager->start_workers (worker_count,
                               CORBA::Long (1000),
-                              controller.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              controller.in ());
 
       controller_impl.dump_results ();
 
-      manager->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager->shutdown ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index eb5c55c3bf0..80e6b304e2e 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -35,15 +35,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -51,12 +49,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -64,12 +60,10 @@ main (int argc, char *argv[])
       Manager manager_impl (orb.in ());
 
       Test::Manager_var manager =
-        manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        manager_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (manager.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -81,27 +75,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index b25b828894c..10cd0cb76f8 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -49,56 +49,46 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Simple_Server_ptr server
-          ACE_ENV_ARG_DECL);
+run_test (Simple_Server_ptr server);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Primary server
       CORBA::Object_var object_primary =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       //Secondary server
       CORBA::Object_var object_secondary =
-        orb->string_to_object (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (name);
 
       // Get an object reference for the ORBs IORManipultion object!
       CORBA::Object_ptr IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         0);
 
       TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM);
 
       TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
       iors.length(2);
       iors [0] = object_primary;
       iors [1] = object_secondary;
 
-      CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var merged = iorm->merge_iors (iors);
 
       // Combined IOR stuff
       Simple_Server_var server =
-        Simple_Server::_narrow (merged.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (merged.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -108,39 +98,35 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception \n");
+      ex._tao_print_exception ("Caught an exception \n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
-void run_test (Simple_Server_ptr server
-               ACE_ENV_ARG_DECL)
+void run_test (Simple_Server_ptr server)
 {
   for (int loop = 0; loop < 10; loop++)
     {
-      ACE_TRY
+      try
         {
           // Make a remote call
           CORBA::Long ret =
-            server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            server->remote_call ();
 
 	  ACE_UNUSED_ARG (ret);
 
           ACE_OS::sleep (25);
         }
-      ACE_CATCH (CORBA::TRANSIENT, t)
+      catch (const CORBA::TRANSIENT& t)
         {
           if (t.completed () != CORBA::COMPLETED_NO)
             {
-              ACE_PRINT_EXCEPTION (t, "Unexpected kind of TRANSIENT");
+              t._tao_print_exception ("Unexpected kind of TRANSIENT");
             }
           else
             {
@@ -151,19 +137,16 @@ void run_test (Simple_Server_ptr server
               ACE_OS::sleep (1);
             }
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, f)
+      catch (const CORBA::COMM_FAILURE& f)
         {
-          ACE_PRINT_EXCEPTION (f, "A (sort of) expected COMM_FAILURE");
+          f._tao_print_exception ("A (sort of) expected COMM_FAILURE");
           ACE_DEBUG ((LM_DEBUG,
                       "Automagically re-issuing request on COMM_FAILURE\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Unexpected exception");
-          ACE_RE_THROW;
+          ex._tao_print_exception ("Unexpected exception");
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index 12aea589a09..d9183ecd421 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -37,15 +37,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,16 +51,13 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +65,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -93,23 +86,19 @@ main (int argc, char *argv[])
         }
 
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
       ACE_OS::sleep (5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp
index 8135b51217d..76f835f9cf5 100644
--- a/TAO/tests/MProfile/test_i.cpp
+++ b/TAO/tests/MProfile/test_i.cpp
@@ -17,7 +17,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 CORBA::Long
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::remote_call (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -28,7 +28,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h
index f6d4df6ebee..28eb022126c 100644
--- a/TAO/tests/MProfile/test_i.h
+++ b/TAO/tests/MProfile/test_i.h
@@ -34,10 +34,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Long remote_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index 5425b2e0ddd..f32e9f89571 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -54,59 +54,48 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::ULongLong
-run_test (Simple_Server_ptr server
-          ACE_ENV_ARG_DECL);
+run_test (Simple_Server_ptr server);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Primary server
       CORBA::Object_var object_primary =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       //Secondary server
       CORBA::Object_var object_secondary =
-        orb->string_to_object (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (name);
 
       // Get an object reference for the ORBs IORManipultion object!
       CORBA::Object_ptr IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         0);
 
       TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM);
 
       TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
       iors.length(2);
       iors [0] = object_primary;
       iors [1] = object_secondary;
 
-      CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var merged = iorm->merge_iors (iors);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
 
       CORBA::Any timeout_as_any;
@@ -117,29 +106,23 @@ main (int argc, char *argv[])
 
       policy_list[0] =
         orb->create_policy (TAO::CONNECTION_TIMEOUT_POLICY_TYPE,
-                            timeout_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            timeout_as_any);
 
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::ADD_OVERRIDE);
 
 
       for (CORBA::ULong l = 0;
            l != policy_list.length ();
            ++l)
         {
-          policy_list[l]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy_list[l]->destroy ();
         }
 
       // Combined IOR stuff
       Simple_Server_var server =
-        Simple_Server::_narrow (merged.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (merged.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -150,8 +133,7 @@ main (int argc, char *argv[])
         }
 
       CORBA::ULongLong freq =
-        run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        run_test (server.in ());
 
       if (freq != 919263)
         ACE_ERROR ((LM_ERROR,
@@ -161,22 +143,19 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) Shutting server down \n")));
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception \n");
+      ex._tao_print_exception ("Caught an exception \n");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 CORBA::ULongLong
-run_test (Simple_Server_ptr server
-          ACE_ENV_ARG_DECL)
+run_test (Simple_Server_ptr server)
 {
-  return server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return server->remote_call ();
 }
diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp
index 9daac4d75f7..5da4cc7726c 100644
--- a/TAO/tests/MProfile_Connection_Timeout/server.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp
@@ -41,15 +41,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,16 +55,13 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -74,12 +69,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -100,22 +93,18 @@ main (int argc, char *argv[])
       // RUn the event loop if needed
       if (orb_run)
         {
-          orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run ();
         }
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
index a2fccc999ef..39960fc15f9 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp
@@ -24,7 +24,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 CORBA::ULongLong
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::remote_call (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -35,7 +35,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.h b/TAO/tests/MProfile_Connection_Timeout/test_i.h
index b9ce049710b..733094afd73 100644
--- a/TAO/tests/MProfile_Connection_Timeout/test_i.h
+++ b/TAO/tests/MProfile_Connection_Timeout/test_i.h
@@ -34,10 +34,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::ULongLong remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::ULongLong remote_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index 7336bc42523..d7b72b9d388 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -53,37 +53,29 @@ int
 main (int argc,
       char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
 
-  ACE_TRY
+  try
     {
       // Initilaize the ORB, POA etc.
       manager.init (argc,
-                    argv
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    argv);
 
       if (parse_args (argc, argv) == -1)
         return -1;
 
-      manager.activate_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager.activate_servant ();
 
-      manager.make_iors_register (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager.make_iors_register ();
 
-      manager.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      manager.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught");
+      ex._tao_print_exception ("Caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -97,32 +89,25 @@ Manager::Manager (void)
 
 int
 Manager::init (int argc,
-               char *argv[]
-               ACE_ENV_ARG_DECL)
+               char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                0);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (obj_var.in ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
-    root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_var->the_POAManager ();
 
-  poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  poa_manager_var->activate ();
 
   // Policies for the childPOA to be created.
   CORBA::PolicyList policies (4);
@@ -131,36 +116,26 @@ Manager::init (int argc,
   // The next two policies are common to both
   // Id Assignment Policy
   policies[0] =
-    root_poa_var->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_var->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Lifespan policy
   policies[1] =
-    root_poa_var->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_var->create_lifespan_policy (PortableServer::PERSISTENT);
 
   // Tell the POA to use a servant manager
   policies[2] =
-    root_poa_var->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_var->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
   // Servant Retention Policy -> Use a locator
   policies[3] =
-    root_poa_var->create_servant_retention_policy (PortableServer::NON_RETAIN
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    root_poa_var->create_servant_retention_policy (PortableServer::NON_RETAIN);
 
   ACE_CString name = "newPOA";
 
   new_poa_var_ =
     root_poa_var->create_POA (name.c_str (),
                               poa_manager_var.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                              policies);
 
   // Creation of childPOAs is over. Destroy the Policy objects.
   for (CORBA::ULong i = 0;
@@ -168,8 +143,7 @@ Manager::init (int argc,
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      policy->destroy ();
     }
 
   return 0;
@@ -177,21 +151,18 @@ Manager::init (int argc,
 
 
 int
-Manager::activate_servant (ACE_ENV_SINGLE_ARG_DECL)
+Manager::activate_servant (void)
 {
 
   ACE_NEW_THROW_EX (this->servant_locator_,
                     Servant_Locator (this->orb_.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (-1);
 
   this->servant_locator_var_ = this->servant_locator_;
 
   // Set ServantLocator object as the servant Manager of
   // secondPOA.
-  this->new_poa_var_->set_servant_manager (this->servant_locator_
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->new_poa_var_->set_servant_manager (this->servant_locator_);
 
   // Try to create a reference with user created ID in new_poa
   // which uses ServantLocator.
@@ -201,47 +172,37 @@ Manager::activate_servant (ACE_ENV_SINGLE_ARG_DECL)
 
   this->new_manager_ior_ =
     new_poa_var_->create_reference_with_id (second_foo_oid_var.in (),
-                                            "IDL:Simple_Server:1.0" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                            "IDL:Simple_Server:1.0");
 
   return 0;
 }
 
 
 int
-Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL)
+Manager::make_iors_register (void)
 {
   // First  server
   CORBA::Object_var object_primary =
-    this->orb_->string_to_object (first_ior
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->string_to_object (first_ior);
 
   //Second server
   CORBA::Object_var object_secondary =
-    this->orb_->string_to_object (second_ior
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->string_to_object (second_ior);
 
   if (third_ior == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "Here is the culprit \n"));
   // Third Server
   CORBA::Object_var object_tertiary =
-    this->orb_->string_to_object (third_ior
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->string_to_object (third_ior);
 
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_ptr IORM =
     this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                            0);
 
   TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM);
 
 
   // Create the list
@@ -253,8 +214,7 @@ Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL)
 
   // Create a merged set 1;
   CORBA::Object_var merged_set1 =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    iorm->merge_iors (iors);
 
   if (object_secondary.in () == 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -272,8 +232,7 @@ Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL)
 
   // Create merged set 2
   CORBA::Object_var merged_set2 =
-    iorm->merge_iors (iors_again ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    iorm->merge_iors (iors_again);
 
   CORBA::String_var iorref1 =
     this->orb_->object_to_string (merged_set1.in ());
@@ -297,10 +256,9 @@ Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-Manager::run (ACE_ENV_SINGLE_ARG_DECL)
+Manager::run (void)
 {
-  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_->run ();
 
   return 0;
 }
diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h
index 6f14588b3a3..03a1fa9371e 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.h
+++ b/TAO/tests/MProfile_Forwarding/Manager.h
@@ -13,20 +13,19 @@ class Manager
   // Ctor
 
   int init (int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
 
   // Initialize the ORB, POA etc.
 
-  int init_register_name_service (ACE_ENV_SINGLE_ARG_DECL);
+  int init_register_name_service (void);
   // Initialize the Name service, tegister the combined IOR with it
 
-  int activate_servant (ACE_ENV_SINGLE_ARG_DECL);
+  int activate_servant (void);
   // Activate the servant etc.
 
-  int make_iors_register (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int make_iors_register (void);
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the  ORB event loop..
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
index fc690fa5cf4..80edf3be437 100644
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
@@ -43,8 +43,7 @@ PortableServer::Servant
 Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr /* poa_ptr */,
                             const char * /*operation*/,
-                            PortableServer::ServantLocator::Cookie & /* cookie */
-                            ACE_ENV_ARG_DECL)
+                            PortableServer::ServantLocator::Cookie & /* cookie */)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -60,9 +59,7 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
 
   // Combined IOR stuff
   Simple_Server_var server =
-    Simple_Server::_narrow (this->objref_.in ()
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    Simple_Server::_narrow (this->objref_.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "Got the narrowed secondary server too... \n"));
@@ -81,8 +78,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &,
                              PortableServer::POA_ptr ,
                              const char *,
                              PortableServer::ServantLocator::Cookie ,
-                             PortableServer::Servant
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             PortableServer::Servant)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
index ac226fda180..8c717896577 100644
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
@@ -39,8 +39,7 @@ public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
-                                             PortableServer::ServantLocator::Cookie &the_cookie
-                                             ACE_ENV_ARG_DECL)
+                                             PortableServer::ServantLocator::Cookie &the_cookie)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA whenever it receives a request
@@ -50,8 +49,7 @@ public:
                            PortableServer::POA_ptr adapter,
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
-                           PortableServer::Servant the_servant
-                           ACE_ENV_ARG_DECL)
+                           PortableServer::Servant the_servant)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a MyFooServant completes a
   // request.
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index 610899838a9..ce340c6b243 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -35,26 +35,22 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Simple_Server_ptr server
-          ACE_ENV_ARG_DECL);
+run_test (Simple_Server_ptr server);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) == -1)
         return -1;
 
       CORBA::Object_var objref =
         orb->string_to_object (ior_input_file);
-      ACE_TRY_CHECK;
 
       if (objref.in () == 0)
         {
@@ -64,8 +60,7 @@ main (int argc, char *argv[])
         }
 
       Simple_Server_var server =
-        Simple_Server::_narrow (objref.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (objref.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -74,32 +69,28 @@ main (int argc, char *argv[])
                             -1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception \n");
+      ex._tao_print_exception ("Caught an exception \n");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
-void run_test (Simple_Server_ptr server
-               ACE_ENV_ARG_DECL)
+void run_test (Simple_Server_ptr server)
 {
   for (int loop = 0; loop < 10; loop++)
     {
-      ACE_TRY
+      try
         {
           ACE_DEBUG ((LM_DEBUG,
                       "About to make remote call \n"));
           ACE_OS::sleep (2);
 
           // Make a remote call
-          server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->remote_call ();
 
           /*ACE_DEBUG ((LM_DEBUG,
                       "Kill  the primary . . . "));
@@ -107,31 +98,27 @@ void run_test (Simple_Server_ptr server
           ACE_DEBUG ((LM_DEBUG, " hope you did\n")); */
           ACE_DEBUG ((LM_DEBUG,
                       "I am going to shutdown \n"));
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
           ACE_OS::sleep (23);
         }
-      ACE_CATCH (CORBA::UserException, x)
+      catch (const CORBA::UserException& x)
         {
-          ACE_PRINT_EXCEPTION (x, "Caught an ");
+          x._tao_print_exception ("Caught an ");
         }
-      ACE_CATCH (CORBA::TRANSIENT, t)
+      catch (const CORBA::TRANSIENT& t)
         {
-          ACE_PRINT_EXCEPTION (t, "Caught Exception");
+          t._tao_print_exception ("Caught Exception");
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, f)
+      catch (const CORBA::COMM_FAILURE& f)
         {
-          ACE_PRINT_EXCEPTION (f, "A (sort of) expected COMM_FAILURE");
+          f._tao_print_exception ("A (sort of) expected COMM_FAILURE");
           ACE_DEBUG ((LM_DEBUG,
                       "Automagically re-issuing request on COMM_FAILURE\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Unexpected exception");
-          ACE_RE_THROW;
+          ex._tao_print_exception ("Unexpected exception");
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index 04c27ae739f..ef8ad0578e3 100644
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -37,15 +37,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,16 +51,13 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +65,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -93,23 +86,19 @@ main (int argc, char *argv[])
         }
 
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
       ACE_OS::sleep (5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp
index a3f647d2cb3..1ef2fd374ec 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.cpp
+++ b/TAO/tests/MProfile_Forwarding/test_i.cpp
@@ -15,7 +15,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 void
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::remote_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -24,7 +24,7 @@ Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h
index 59156bee2ba..5568f94a471 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.h
+++ b/TAO/tests/MProfile_Forwarding/test_i.h
@@ -34,10 +34,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void remote_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp
index 58b598b90e1..f3661e9aa95 100644
--- a/TAO/tests/MT_BiDir/Client_Task.cpp
+++ b/TAO/tests/MT_BiDir/Client_Task.cpp
@@ -21,19 +21,15 @@ Client_Task::svc (void)
   // Wait for 2 minutes...
   ACE_Time_Value tv (60,0);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Client_Task::svc exception!!!\n");
+      ex._tao_print_exception ("(%P|%t) Client_Task::svc exception!!!\n");
 
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
diff --git a/TAO/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp
index 5a3909f7a26..3be330a230d 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.cpp
+++ b/TAO/tests/MT_BiDir/Receiver_i.cpp
@@ -15,8 +15,7 @@ Receiver_i::Receiver_i (void)
 
 
 void
-Receiver_i::receive_payload (const Receiver::Payload &payload
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Receiver_i::receive_payload (const Receiver::Payload &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h
index 189191d7861..ee0795c0a6c 100644
--- a/TAO/tests/MT_BiDir/Receiver_i.h
+++ b/TAO/tests/MT_BiDir/Receiver_i.h
@@ -23,8 +23,7 @@ public:
   CORBA::Long get_event_count (void);
 
   // = The skeleton methods
-  virtual void receive_payload (const Receiver::Payload &payload
-                                ACE_ENV_ARG_DECL)
+  virtual void receive_payload (const Receiver::Payload &payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index 780f39d18ad..712a2edfaf3 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -29,8 +29,7 @@ Sender_i::Sender_i (int no_clients,
 
 
 CORBA::Long
-Sender_i::receiver_object (Receiver_ptr recv
-                           ACE_ENV_ARG_DECL)
+Sender_i::receiver_object (Receiver_ptr recv)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Sender::Table_Full))
 {
@@ -57,14 +56,12 @@ Sender_i::receiver_object (Receiver_ptr recv
 
 
 void
-Sender_i::send_message (ACE_ENV_SINGLE_ARG_DECL)
+Sender_i::send_message (void)
 {
   // NOTE:No synchronization with purpose. Synchrnozing this is
   // going to spoil the whole purpose of this test.
   int send_to =
     ACE_OS::rand () % this->no_clients_;
 
-  this->receivers_[send_to]->receive_payload (this->payload_
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->receivers_[send_to]->receive_payload (this->payload_);
 }
diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h
index 91b4b729db0..06176105b41 100644
--- a/TAO/tests/MT_BiDir/Sender_i.h
+++ b/TAO/tests/MT_BiDir/Sender_i.h
@@ -24,13 +24,12 @@ public:
             ACE_Manual_Event &event);
 
   // = The skeleton methods
-  virtual CORBA::Long receiver_object (Receiver *recv
-                                       ACE_ENV_ARG_DECL)
+  virtual CORBA::Long receiver_object (Receiver *recv)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Sender::Table_Full));
 
   /// Public method defined locally
-  void send_message (ACE_ENV_SINGLE_ARG_DECL);
+  void send_message (void);
 
 private:
   /// Synchronizing acces to this class
diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp
index 846fde96ea4..c13aefd6fef 100644
--- a/TAO/tests/MT_BiDir/Server_Task.cpp
+++ b/TAO/tests/MT_BiDir/Server_Task.cpp
@@ -42,9 +42,8 @@ Server_Task::svc (void)
 
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Before start
       CORBA::ULong connection_no =
@@ -55,8 +54,7 @@ Server_Task::svc (void)
           if (i%50 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sending message ....\n"));
 
-          this->sender_->send_message (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->sender_->send_message ();
 
           // Sanity check for connections..
           if (connection_no <
@@ -74,12 +72,10 @@ Server_Task::svc (void)
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in iteration.\n");
+      ex._tao_print_exception ("Caught exception in iteration.\n");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index 23566a7d242..f4a30f91d21 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -39,20 +39,17 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,12 +57,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -75,9 +70,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -85,31 +78,23 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::Object_var object =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Sender_var sender =
-        Sender::_narrow (object.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Sender::_narrow (object.in ());
 
       if (CORBA::is_nil (sender.in ()))
         {
@@ -128,13 +113,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer (receiver);
 
       Receiver_var receiver_obj =
-        receiver->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        receiver->_this ();
 
       // Send the calback object to the server
-      sender->receiver_object (receiver_obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->receiver_object (receiver_obj.in ());
 
       // Threads that will handle the call backs
       Client_Task client_task (orb.in (),
@@ -155,17 +137,13 @@ main (int argc, char *argv[])
                   count));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+      ex._tao_print_exception ("Catched exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp
index 7aeeeecdbc8..78067bed264 100644
--- a/TAO/tests/MT_BiDir/server.cpp
+++ b/TAO/tests/MT_BiDir/server.cpp
@@ -57,19 +57,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -77,13 +74,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the childPOA to be created.
       CORBA::PolicyList policies (1);
@@ -93,9 +87,7 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            pol);
 
       // Create POA as child of RootPOA with the above policies.  This POA
       // will receive request in the same connection in which it sent
@@ -103,21 +95,17 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Creation of childPOA is over. Destroy the Policy objects.
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_Manual_Event manual_event;
 
@@ -130,19 +118,13 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer (sender);
 
       PortableServer::ObjectId_var id =
-        child_poa->activate_object (sender
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->activate_object (sender);
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -182,8 +164,7 @@ main (int argc, char *argv[])
           ACE_Time_Value tv (60, 0);
 
           // Call the ORB run from the main thread
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (tv);
 
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n"));
         }
@@ -191,17 +172,13 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index aaab6575632..0f9fcb8e0a2 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -64,7 +64,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void validate_connection (void);
   // Validate the connection
 
 private:
@@ -78,22 +78,19 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -116,20 +113,16 @@ main (int argc, char *argv[])
 
       if (server_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -144,45 +137,40 @@ Client::Client (Simple_Server_ptr server,
 }
 
 void
-Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client::validate_connection (void)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
   // run on minimum CORBA builds too!
   for (int j = 0; j != 100; ++j)
     {
-      ACE_TRY
+      try
         {
-          this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->test_method ();
         }
-      ACE_CATCHANY {} ACE_ENDTRY;
+      catch (const CORBA::Exception&){}
     }
 }
 
 int
 Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       for (int i = 0; i < this->niterations_; ++i)
         {
-          this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->test_method ();
 
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n",
                         i));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
+      ex._tao_print_exception ("MT_Client: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 6a6f1db233d..30ce55d8ec4 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -71,22 +71,19 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "");
-      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;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -107,16 +104,13 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -133,8 +127,7 @@ Client::Client (int niterations,
 int
 Client::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       for (int i = 0; i < this->niterations_; ++i)
         {
@@ -144,16 +137,13 @@ Client::svc (void)
           CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv");
           char* argv[1] = { argv0.inout () };
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::ORB_init (argc, argv, "");
 
           CORBA::Object_var object =
-            orb->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->string_to_object (this->ior_);
 
           Simple_Server_var server =
-            Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            Simple_Server::_narrow (object.in ());
 
           if (CORBA::is_nil (server.in ()))
             {
@@ -163,17 +153,14 @@ Client::svc (void)
                                 1);
             }
 
-          server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->test_method ();
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
+      ex._tao_print_exception ("MT_Client: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index bf5e6312642..099f923d977 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.cpp
@@ -36,15 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,12 +50,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -65,12 +61,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -87,27 +81,21 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index 056dd155a72..8b6b5696d99 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -9,14 +9,14 @@
 ACE_RCSID(MT_Client, test_i, "$Id$")
 
 void
-Simple_Server_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h
index 414abe39862..79dd079bf2d 100644
--- a/TAO/tests/MT_Client/test_i.h
+++ b/TAO/tests/MT_Client/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server 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:
diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp
index 3948231f376..1c4a6ccf3cd 100644
--- a/TAO/tests/MT_Server/client.cpp
+++ b/TAO/tests/MT_Server/client.cpp
@@ -48,22 +48,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -76,8 +73,7 @@ main (int argc, char *argv[])
       for (int i = 0; i != niterations; ++i)
         {
           CORBA::Long r =
-            server->test_method (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            server->test_method (i);
 
           if (r != i)
             {
@@ -89,17 +85,14 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index 982fc2cbc28..70402cf712c 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -63,15 +63,13 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,12 +77,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -92,12 +88,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -114,8 +108,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Worker worker (orb.in ());
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -128,13 +121,11 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -149,15 +140,12 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index c60a8eee1f7..8bb3e551ecb 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -11,7 +11,7 @@
 ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -22,8 +22,8 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h
index 754314ec14b..8934973a678 100644
--- a/TAO/tests/MT_Server/test_i.h
+++ b/TAO/tests/MT_Server/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index 29bb6e0502d..436ff82a7e8 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -47,23 +47,18 @@ Client_Task::too_big_difference_calls (void) const
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   int successful_calls = 0;
   int timed_out_calls = 0;
 
-  ACE_TRY
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       TimeBase::TimeT timeout_period = 10 * this->timeout_;
 
@@ -74,19 +69,14 @@ Client_Task::svc (void)
       policy_list.length (1);
       policy_list[0] =
         this->orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                   timeout_as_any
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   timeout_as_any);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::ADD_OVERRIDE);
 
       for (int i = 0; i != this->iterations_; ++i)
         {
-          int retval = this->one_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          int retval = this->one_iteration ();
 
           if (retval == 1)
             successful_calls++;
@@ -103,13 +93,11 @@ Client_Task::svc (void)
 #endif /* 0 */
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
   this->successful_calls_ += successful_calls;
@@ -119,34 +107,29 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (void)
 {
-  ACE_TRY
+  try
     {
       for (int i = 0; i != 100; ++i)
         {
-          (void) this->sleep_service_->go_to_sleep (0 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          (void) this->sleep_service_->go_to_sleep (0);
         }
     }
-  ACE_CATCH (CORBA::TRANSIENT, ex)
+  catch (const CORBA::TRANSIENT& )
     {
       // Ignore transient exceptions
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
-Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::one_iteration (void)
 {
-  ACE_TRY
+  try
     {
       ACE_Time_Value start = ACE_OS::gettimeofday ();
 
-      this->sleep_service_->go_to_sleep (this->sleep_time_
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sleep_service_->go_to_sleep (this->sleep_time_);
 
       ACE_Time_Value end = ACE_OS::gettimeofday ();
 
@@ -190,18 +173,16 @@ Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL)
 
       return 1;
     }
-  ACE_CATCH(CORBA::TIMEOUT, to_exp)
+  catch (const CORBA::TIMEOUT& )
     {
       // Ignore this exception, it is usually caused by a transient
       // condition
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
 
   return -1;
 }
diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h
index e3affca8bfa..62d419c2ba1 100644
--- a/TAO/tests/MT_Timeout/Client_Task.h
+++ b/TAO/tests/MT_Timeout/Client_Task.h
@@ -55,10 +55,10 @@ public:
 
 private:
   /// Run one iteration of the test
-  int one_iteration (ACE_ENV_SINGLE_ARG_DECL);
+  int one_iteration (void);
 
   /// Make sure that the thread has a connection available
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
 private:
   /// A reference to the ORB
diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp
index 863f5f50c64..3bd6359ebc3 100644
--- a/TAO/tests/MT_Timeout/Server_Task.cpp
+++ b/TAO/tests/MT_Timeout/Server_Task.cpp
@@ -18,16 +18,13 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr,
 int
 Server_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (this->running_time_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (this->running_time_);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp
index 5a6b7d95bcf..e3a26cfb38c 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.cpp
+++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp
@@ -12,8 +12,7 @@ Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb)
 }
 
 void
-Sleep_Service::go_to_sleep (CORBA::ULong microseconds
-                            ACE_ENV_ARG_DECL_NOT_USED)
+Sleep_Service::go_to_sleep (CORBA::ULong microseconds)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong  secs = microseconds / 1000000;
@@ -24,9 +23,9 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds
 }
 
 void
-Sleep_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Sleep_Service::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index bc1c17e9210..c1bdd5a5d2d 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -17,11 +17,10 @@ public:
   Sleep_Service (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void go_to_sleep (CORBA::ULong microseconds
-                            ACE_ENV_ARG_DECL)
+  virtual void go_to_sleep (CORBA::ULong microseconds)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index 21262fc921d..2ec81c8b442 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -48,22 +48,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Sleep_Service_var sleep_service =
-        Test::Sleep_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Sleep_Service::_narrow(tmp.in ());
 
       if (CORBA::is_nil (sleep_service.in ()))
         {
@@ -95,14 +92,11 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       // Get back in sync with the server..
-      sleep_service->go_to_sleep (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sleep_service->go_to_sleep (0);
 
-      sleep_service->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sleep_service->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "Task 0: Successful calls = %d, timed out calls = %d\n",
@@ -149,13 +143,11 @@ main (int argc, char *argv[])
                       "expected for task 1\n"));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index c3a5b91ae3e..b1483d778f4 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -36,19 +36,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,8 +53,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,12 +65,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(sleep_service_impl);
 
       Test::Sleep_Service_var process =
-        sleep_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sleep_service_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (process.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -86,8 +80,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Task server_task (ACE_Thread_Manager::instance (),
                                orb.in (),
@@ -102,19 +95,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp
index 82806ba2af4..01561fca7b5 100644
--- a/TAO/tests/Multiple/Collocation_Tester.cpp
+++ b/TAO/tests/Multiple/Collocation_Tester.cpp
@@ -40,7 +40,7 @@ Collocation_Tester::match_answer (const char *actual_answer,
 }
 
 int
-Collocation_Tester::test_top (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::test_top (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<TOP>-------------------------------\n")));
@@ -59,8 +59,7 @@ Collocation_Tester::test_top (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling all method supported by the Interface Top\n\n")));
 
-  CORBA::String_var msg = top->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::String_var msg = top->top_quote ();
 
   failure += this->match_answer (Quote::top, msg.in (), "top_quote");
 
@@ -75,7 +74,7 @@ Collocation_Tester::test_top (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Collocation_Tester::test_right (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::test_right (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<RIGHT>-------------------------------\n")));
@@ -94,13 +93,11 @@ Collocation_Tester::test_right (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling all method supported by the Interface Right\n\n")));
 
-  CORBA::String_var msg = right->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  CORBA::String_var msg = right->top_quote ();
 
   failure += this->match_answer (Quote::top, msg.in (), "top_quote");
 
-  msg = right->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  msg = right->right_quote ();
 
   failure += this->match_answer (Quote::right, msg.in (), "right_quote");
 
@@ -116,7 +113,7 @@ Collocation_Tester::test_right (ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-Collocation_Tester::test_left (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::test_left (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<LEFT>-------------------------------\n")));
@@ -136,13 +133,11 @@ Collocation_Tester::test_left (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling all method supported by the Interface Left\n\n")));
 
-  CORBA::String_var msg = left->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  CORBA::String_var msg = left->top_quote ();
 
   failure += this->match_answer (Quote::top, msg.in (), "top_quote");
 
-  msg = left->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(1);
+  msg = left->left_quote ();
 
   failure += this->match_answer (Quote::left, msg.in (), "left_quote");
 
@@ -158,7 +153,7 @@ Collocation_Tester::test_left (ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-Collocation_Tester::test_bottom (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::test_bottom (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n-----------------------<BOTTOM>-------------------------------\n")));
@@ -178,23 +173,19 @@ Collocation_Tester::test_bottom (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling all method supported by the Interface Bottom\n\n")));
 
-  CORBA::String_var msg = bottom->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(1);
+  CORBA::String_var msg = bottom->top_quote ();
 
   failure += this->match_answer (Quote::top, msg.in (), "top_quote");
 
-  msg = bottom->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  msg = bottom->left_quote ();
 
   failure += this->match_answer (Quote::left, msg.in (), "left_quote");
 
-  msg = bottom->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(1);
+  msg = bottom->right_quote ();
 
   failure += this->match_answer (Quote::right, msg.in (), "right_quote");
 
-  msg = bottom->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN(1);
+  msg = bottom->bottom_quote ();
 
   failure += this->match_answer (Quote::bottom, msg.in (), "bottom_quote");
 
@@ -209,7 +200,7 @@ Collocation_Tester::test_bottom (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Collocation_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::shutdown (void)
 {
   Multiple::Top_var top =
     Multiple::Top::_narrow (this->object_.in ());
@@ -224,24 +215,19 @@ Collocation_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling ShutDown on Top.\n\n")));
 
-  top->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  top->shutdown ();
 }
 
 void
-Collocation_Tester::run (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::run (void)
 {
-  int failure_num =   this->test_top (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  int failure_num =   this->test_top ();
 
-  failure_num += this->test_left (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  failure_num += this->test_left ();
 
-  failure_num += this->test_right (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  failure_num += this->test_right ();
 
-  failure_num += this->test_bottom (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  failure_num += this->test_bottom ();
 
   if (failure_num)
     ACE_ERROR ((LM_DEBUG,
@@ -250,5 +236,5 @@ Collocation_Tester::run (ACE_ENV_SINGLE_ARG_DECL)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("\n\nThe Test Completed Successfully. Congratulations! ")));
 
-  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown ();
 }
diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h
index 19003092151..e220b07b466 100644
--- a/TAO/tests/Multiple/Collocation_Tester.h
+++ b/TAO/tests/Multiple/Collocation_Tester.h
@@ -41,7 +41,7 @@ public:
   ~Collocation_Tester ();
 
   // -- Command --
-  void run (ACE_ENV_SINGLE_ARG_DECL);
+  void run (void);
   // Runs the test.
 
 
@@ -49,19 +49,19 @@ private:
 
   // -- Helper Methods --
 
-  int  test_top (ACE_ENV_SINGLE_ARG_DECL);
+  int  test_top (void);
   // Tests the method accessible thru the
   // Top interface.
 
-  int test_right (ACE_ENV_SINGLE_ARG_DECL);
+  int test_right (void);
   // Tests the method accessible thru the
   // Right interface.
 
-  int test_left (ACE_ENV_SINGLE_ARG_DECL);
+  int test_left (void);
   // Tests the method accessible thru the
   // Left interface.
 
-  int test_bottom (ACE_ENV_SINGLE_ARG_DECL);
+  int test_bottom (void);
   // Tests the method accessible thru the
   // Bottom interface.
 
@@ -74,7 +74,7 @@ private:
   // is no match (actually 1 is returned if there is
   // no match.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
+  void shutdown (void);
 private:
   CORBA::Object_var object_;
 };
diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index 54e95ead3e1..f24fa6be53b 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -20,38 +20,38 @@ Bottom_Impl::~Bottom_Impl (void)
 }
 
 char *
-Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::top_quote ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::top);
 }
 
 char *
-Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::left_quote ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::left);
 }
 
 char *
-Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::right_quote ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::right);
 }
 
 char *
-Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::bottom_quote ( )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::bottom);
 }
 
 void
-Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Bottom_Impl::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 ///////////////////////////////////////////////////////////
@@ -70,64 +70,59 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void)
 }
 
 char *
-Delegated_Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::top_quote (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <top_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->delegate_->top_quote ();
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::left_quote (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <left_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->delegate_->left_quote ();
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::right_quote (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <right_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->delegate_->right_quote ();
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::bottom_quote (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <bottom_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->delegate_->bottom_quote ();
   return msg._retn ();
 }
 
 void
-Delegated_Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating Shut-Down.\n")));
-  this->delegate_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  //this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->delegate_->shutdown ();
+  //this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h
index e97f97ca80e..e72455225d6 100644
--- a/TAO/tests/Multiple/Multiple_Impl.h
+++ b/TAO/tests/Multiple/Multiple_Impl.h
@@ -40,27 +40,27 @@ public:
   virtual ~Bottom_Impl (void);
 
   // IDL Interface Methods
-  virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * top_quote (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * left_quote (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * right_quote (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual char * bottom_quote (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * bottom_quote (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -89,24 +89,24 @@ public:
   virtual ~Delegated_Bottom_Impl (void);
 
   // IDL Interface Methods.
-  virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * top_quote (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
-  virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * left_quote (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
-  virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * right_quote (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
-  virtual char * bottom_quote (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * bottom_quote (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index 8a2d499abce..0b2c982aa5c 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -6,19 +6,16 @@ ACE_RCSID (tests, client, "$Id$")
 
 int main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // ORB Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO");
 
       CORBA::Object_var object;
 
       // Get The IOR from a file
-      object = orb->string_to_object ("file://s.ior" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->string_to_object ("file://s.ior");
 
       if (CORBA::is_nil (object.in ()))
         {
@@ -27,15 +24,13 @@ int main (int argc, char *argv[])
         }
 
       Collocation_Tester tester (object.in ());
-      tester.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      tester.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "CORBA Exception Raised");
+      ex._tao_print_exception ("CORBA Exception Raised");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index fcaa75221f3..01275412a9e 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -8,25 +8,20 @@ ACE_RCSID (tests, server, "$Id$")
 int main (int argc, char *argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Orb Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO");
 
       CORBA::Object_var object;
-      object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->resolve_initial_references ("RootPOA");
 
-      PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in());
 
 
       // Get the POAManager
-      PortableServer::POAManager_var poa_manager = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POAManager_var poa_manager = poa->the_POAManager();
 
       // Create the servant.
       Bottom_Impl servant (orb.in ());
@@ -42,8 +37,7 @@ int main (int argc, char *argv[])
 
       // Now we stringfy the object reference.
       CORBA::String_var ior =
-        orb->object_to_string (bottom.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (bottom.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -59,16 +53,15 @@ int main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Activate the POAManager
-      poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate();
 
       orb->run();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, "Multiple Execution Interrupted Exception!\n");
+      ex._tao_print_exception (
+        "Multiple Execution Interrupted Exception!\n");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index da21a7210b2..69449348a84 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -9,22 +9,22 @@ class Multiple_Inheritance_i : public POA_D
 public:
   Multiple_Inheritance_i (void);
 
-  virtual char* method1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method1 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method1");
     }
-  virtual char* method2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method2 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method2");
     }
-  virtual char* method3 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method3 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method3");
     }
-  virtual char* method4 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method4 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method4");
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index ce7f8434a2f..793dd8553d0 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -71,13 +71,10 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       // Parse the command-line arguments to get the IOR
       parse_args (argc, argv);
@@ -104,69 +101,54 @@ main (int argc, char **argv)
         }
 
       // Get the object reference with the IOR
-      CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = orb->string_to_object (ior);
 
       CORBA::String_var string;
 
       // Narrow the object reference
-      A_var a = A::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      A_var a = A::_narrow (object.in ());
 
       // Narrow the object reference
-      intB_var b = intB::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      intB_var b = intB::_narrow (a.in ());
 
       // Narrow the object reference
-      C_var c = C::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      C_var c = C::_narrow (a.in ());
 
       // Narrow the object reference
-      D_var d = D::_narrow (c.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      D_var d = D::_narrow (c.in ());
 
-      string = a->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = a->method1 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = b->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = b->method1 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = b->method2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = b->method2 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = c->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = c->method1 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = c->method3 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = c->method3 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = d->method1 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = d->method2 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method3 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = d->method3 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method4 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = d->method4 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
+      ex._tao_print_exception ("client");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index d29978c9163..bce1669808c 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -50,23 +50,18 @@ main (int argc, char **argv)
   TAO_ORB_Manager orb_manager;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tMultiple Inheritance Server\n\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       orb_manager.init_child_poa (argc,
                                   argv,
-                                  "child_poa"
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                  "child_poa");
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::String_var ior =
         orb_manager.activate_under_child_poa ("my_object",
-                                              &servant
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              &servant);
 
       ACE_DEBUG ((LM_DEBUG, "%s\n",
                   ior.in ()));
@@ -84,15 +79,13 @@ main (int argc, char **argv)
           ACE_OS::fclose (output_file);
         }
 
-      orb_manager.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_manager.run ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index 6a9cb60d163..31b4cc6aa38 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -68,7 +68,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void validate_connection (void);
   // Validate the connection
 
 private:
@@ -82,22 +82,19 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -125,13 +122,11 @@ main (int argc, char *argv[])
 
           for (int c = 0; c < (niterations * 2); c++)
             {
-              ACE_TRY_EX (CORBALOC)
+              try
                 {
                   CORBA::Object_var probably_not_exist =
-                    orb->string_to_object(corbaloc_arg
-                                          ACE_ENV_ARG_PARAMETER);
+                    orb->string_to_object(corbaloc_arg);
 
-                  ACE_TRY_CHECK_EX (CORBALOC);
 
                   if (CORBA::is_nil(probably_not_exist.in()))
                     {
@@ -140,9 +135,7 @@ main (int argc, char *argv[])
                   else
                     {
                       Simple_Server_var newserver =
-                        Simple_Server::_narrow (probably_not_exist.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (CORBALOC);
+                        Simple_Server::_narrow (probably_not_exist.in ());
 
                       // should throw an exception
                       if (CORBA::is_nil(newserver.in()))
@@ -155,11 +148,10 @@ main (int argc, char *argv[])
                         }
                     }
                 }
-              ACE_CATCHANY
+              catch (const CORBA::Exception&)
                 {
                   // ACE_DEBUG ((LM_DEBUG, "caught exception\n", corbaloc_arg));
                 }
-              ACE_ENDTRY;
             }
         }
       ACE_DEBUG ((LM_DEBUG,
@@ -172,20 +164,16 @@ main (int argc, char *argv[])
 
       if (server_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -200,45 +188,40 @@ Client::Client (Simple_Server_ptr server,
 }
 
 void
-Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+Client::validate_connection (void)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
   // run on minimum CORBA builds too!
   for (int j = 0; j != 100; ++j)
     {
-      ACE_TRY
+      try
         {
-          this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->test_method (j);
         }
-      ACE_CATCHANY {} ACE_ENDTRY;
+      catch (const CORBA::Exception&){}
     }
 }
 
 int
 Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       for (int i = 0; i < this->niterations_; ++i)
         {
-          this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->test_method (i);
 
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n",
                         i));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
+      ex._tao_print_exception ("MT_Client: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index e911f5aa83c..8cf28f45059 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -101,7 +101,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void validate_connection (void);
   // Validate the connection
 
 private:
@@ -122,15 +122,13 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -138,12 +136,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -156,12 +152,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(server_impl);
 
       Simple_Server_var server =
-        server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -178,8 +172,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Worker worker (orb.in ());
       if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
@@ -202,13 +195,11 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -223,17 +214,14 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Time_Value tv (140, 0);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -248,7 +236,7 @@ SelfClient::SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server,
 }
 
 void
-SelfClient::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+SelfClient::validate_connection (void)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -257,32 +245,28 @@ SelfClient::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 
   for (int j = 0; j != 100; ++j)
     {
-      ACE_TRY
+      try
         {
-          this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->test_method (j);
         }
-      ACE_CATCHANY {} ACE_ENDTRY;
+      catch (const CORBA::Exception&){}
     }
 }
 
 int
 SelfClient::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connection ();
 
       for (int i = 0; i < this->niterations_; ++i)
         {
-          ACE_TRY_EX (CORBALOC)
+          try
             {
               CORBA::Object_var probably_not_exist =
-                orb_->string_to_object (corbaloc_arg
-                                        ACE_ENV_ARG_PARAMETER);
+                orb_->string_to_object (corbaloc_arg);
 
-              ACE_TRY_CHECK_EX (CORBALOC);
 
               if (CORBA::is_nil (probably_not_exist.in()))
                 {
@@ -291,9 +275,7 @@ SelfClient::svc (void)
               else
                 {
                   Simple_Server_var newserver =
-                    Simple_Server::_narrow (probably_not_exist.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (CORBALOC);
+                    Simple_Server::_narrow (probably_not_exist.in ());
 
                   // should throw an exception
                   if (CORBA::is_nil (newserver.in()))
@@ -310,24 +292,19 @@ SelfClient::svc (void)
                 }
 
             }
-          ACE_CATCHANY
+          catch (const CORBA::Exception& ex)
             {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "MT_SelfClient: exception raised");
+              ex._tao_print_exception ("MT_SelfClient: exception raised");
             }
-          ACE_ENDTRY;
 
           // Just make a call
-          this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->test_method (i);
 
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_SelfClient: exception raised");
+      ex._tao_print_exception ("MT_SelfClient: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
index 3b0bc90496b..fb3f743d84d 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
@@ -12,7 +12,7 @@
 ACE_RCSID(MT_Server, test_i, "test_i.cpp,v 1.6 2002/01/29 20:21:08 okellogg Exp")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -23,10 +23,10 @@ Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We dont shutdown the ORB. We allow the server to go away as it
   // wants.
-  // this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  // this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h
index 754314ec14b..8934973a678 100644
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.h
+++ b/TAO/tests/Muxed_GIOP_Versions/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp
index 01960176f11..2002768040c 100644
--- a/TAO/tests/Muxing/Client_Task.cpp
+++ b/TAO/tests/Muxing/Client_Task.cpp
@@ -27,20 +27,17 @@ Client_Task::svc (void)
   for (CORBA::ULong j = 0; j != payload.length (); ++j)
     payload[j] = (j % 256);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       for (int i = 0; i != this->event_count_; ++i)
         {
-          this->receiver_->receive_data (payload ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->receiver_->receive_data (payload);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index d1cd37643c1..051bbb2e124 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -24,8 +24,7 @@ Receiver::dump_results ()
 }
 
 void
-Receiver::receive_data (const Test::Payload &payload
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Receiver::receive_data (const Test::Payload &payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -34,7 +33,7 @@ Receiver::receive_data (const Test::Payload &payload
 }
 
 CORBA::Long
-Receiver::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Receiver::get_event_count (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
@@ -42,8 +41,8 @@ Receiver::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Receiver::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index c297521ed30..8117eab65f2 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -28,13 +28,12 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &payload
-                             ACE_ENV_ARG_DECL)
+  virtual void receive_data (const Test::Payload &payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long get_event_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index b0b3408f831..34e6f5e9edb 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -17,8 +17,7 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if defined (ACE_OPENVMS)
       // OpenVMS typically takes a lot longer...
@@ -27,14 +26,12 @@ Server_Task::svc (void)
       // run the test for at most 120 seconds...
       ACE_Time_Value tv (120, 0);
 #endif
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index e149b323d49..e436d187fa6 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -40,22 +40,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Receiver_var receiver =
-        Test::Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Receiver::_narrow(tmp.in ());
 
       if (CORBA::is_nil (receiver.in ()))
         {
@@ -71,7 +68,7 @@ main (int argc, char *argv[])
         }
       else
         {
-        
+
           Client_Task client_task (receiver.in (),
 #if defined (ACE_OPENVMS)
                                   750, /* test takes much longer on OpenVMS */
@@ -80,29 +77,25 @@ main (int argc, char *argv[])
 #endif
                                   32768,
                                   ACE_Thread_Manager::instance ());
-        
+
           if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
               {
               ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
               }
           ACE_Thread_Manager::instance ()->wait ();
-        
-          CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        
+
+          CORBA::Long count = receiver->get_event_count ();
+
           ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
                       count));
         }
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index ad2a9a98241..7b2cdfe889a 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -36,15 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,12 +50,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,12 +65,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
       Test::Receiver_var receiver =
-        receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        receiver_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (receiver.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (receiver.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -86,8 +80,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Task server_task (orb.in (),
                                ACE_Thread_Manager::instance ());
@@ -100,19 +93,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp
index 67811435ae2..d5d40422f9a 100644
--- a/TAO/tests/Native_Exceptions/client.cpp
+++ b/TAO/tests/Native_Exceptions/client.cpp
@@ -89,7 +89,7 @@ main (int argc, char *argv[])
     }
   catch (CORBA::SystemException &ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
 
diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp
index 6e41137344e..dbcbc127f0c 100644
--- a/TAO/tests/Native_Exceptions/server.cpp
+++ b/TAO/tests/Native_Exceptions/server.cpp
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
     }
   catch (CORBA::SystemException &ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
index 0aa90db52b6..475f8634d6e 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
@@ -38,8 +38,7 @@ MT_Object_i::~MT_Object_i (void)
 
 CORBA::Long
 MT_Object_i::yadda (CORBA::Long hop_count,
-                       MT_Object_ptr partner
-                       ACE_ENV_ARG_DECL)
+                       MT_Object_ptr partner)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #if 0
@@ -52,8 +51,7 @@ MT_Object_i::yadda (CORBA::Long hop_count,
   {
     if (partner != 0)
       return partner->yadda (hop_count + 1,
-                             this->_this (ACE_ENV_SINGLE_ARG_PARAMETER)
-                             ACE_ENV_ARG_PARAMETER) + 1;
+                             this->_this ()) + 1;
   }
 
   return 0;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index de5d9893297..99ac8b12d2b 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -36,8 +36,7 @@ public:
   // Destructor.
 
   virtual CORBA::Long yadda (CORBA::Long hop_count,
-                             MT_Object_ptr partner
-                             ACE_ENV_ARG_DECL)
+                             MT_Object_ptr partner)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index ba1c615cd55..2c32f971f4b 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -149,8 +149,7 @@ MT_Client::parse_args (void)
 int
 MT_Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       for (unsigned long i = 0; i < this->iterations_; i++)
         {
@@ -164,18 +163,14 @@ MT_Client::run (void)
           // call the recursive object MT_Object for nested upcalls
           // testing
           this->mT_Object_var_->yadda (0,
-                                       0
-                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                       0);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client:run");
+      ex._tao_print_exception ("MT_Client:run");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -203,8 +198,7 @@ MT_Client::init (int argc, char **argv,
 
   this->client_number_ = client_number;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       char buf[64];
       ACE_OS::sprintf (buf, "thread_%lx", reinterpret_cast<long> (this));
@@ -212,9 +206,7 @@ MT_Client::init (int argc, char **argv,
       this->orb_var_ =
         CORBA::ORB_init (this->argc_,
                          this->argv_,
-                         buf
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         buf);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -227,18 +219,14 @@ MT_Client::init (int argc, char **argv,
 
 
       CORBA::Object_var object_var =
-        this->orb_var_->string_to_object (this->object_key_
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_var_->string_to_object (this->object_key_);
 
       if (CORBA::is_nil (object_var.in()))
           ACE_ERROR_RETURN ((LM_ERROR,
                              "No proper object has been returned.\n"),
                             -1);
 
-      this->mT_Object_var_ = MT_Object::_narrow (object_var.in()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->mT_Object_var_ = MT_Object::_narrow (object_var.in());
 
       if (CORBA::is_nil (this->mT_Object_var_.in()))
         {
@@ -251,8 +239,7 @@ MT_Client::init (int argc, char **argv,
         ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n"));
 
       CORBA::Object_var poa_object =
-        this->orb_var_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_var_->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -260,23 +247,18 @@ MT_Client::init (int argc, char **argv,
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client::init");
+      ex._tao_print_exception ("MT_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -287,15 +269,12 @@ MT_Client::init (int argc, char **argv,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       TAO_ORB_Manager orb_manager;
 
       int r = orb_manager.init (argc,
-                                argv
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                argv);
 
       if (r != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -354,11 +333,10 @@ main (int argc, char **argv)
 
       return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "main");
+      ex._tao_print_exception ("main");
     }
-  ACE_ENDTRY;
 
   return 1;
 }
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 36e81ffa7c3..9a6d581df91 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -145,26 +145,21 @@ MT_Server::init (int argc,
                        "MT_Server::init: ORB_Manager is nil!\n"),
                        -1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Call the init of TAO_ORB_Manager to create a child POA
       // under the root POA.
       this->orb_manager_ptr_->init_child_poa (argc,
                                               argv,
-                                              "child_poa"
-                                              ACE_ENV_ARG_PARAMETER);
+                                              "child_poa");
 
-      ACE_TRY_CHECK;
 
       this->parse_args ();
       // ~~ check for the return value here
 
       this->str_  =
         this->orb_manager_ptr_->activate_under_child_poa ("MT",
-                                                          &this->mT_Object_i_
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                          &this->mT_Object_i_);
 
 #if 0
       ACE_DEBUG ((LM_DEBUG,
@@ -189,18 +184,14 @@ MT_Server::init (int argc,
       CORBA::ORB_var orb_var = this->orb_manager_ptr_->orb ();
 
       CORBA::Object_var object_var =
-        orb_var->string_to_object (this->object_key_
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_var->string_to_object (this->object_key_);
 
       if (CORBA::is_nil (object_var.in()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "No proper object has been returned.\n"),
                           -1);
 
-      this->mT_Object_var_ = MT_Object::_narrow (object_var.in()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->mT_Object_var_ = MT_Object::_narrow (object_var.in());
 
       if (CORBA::is_nil (this->mT_Object_var_.in()))
         {
@@ -212,12 +203,11 @@ MT_Server::init (int argc,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MT_Client::init");
+      ex._tao_print_exception ("MT_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -225,23 +215,20 @@ MT_Server::init (int argc,
 int
 MT_Server::run ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int r = this->orb_manager_ptr_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int r = this->orb_manager_ptr_->run ();
 
       if (r == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "MT_Server::run"),
                           -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MT_Server::run");
+      ex._tao_print_exception ("MT_Server::run");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -250,19 +237,15 @@ MT_Server::~MT_Server (void)
   if (this->object_key_ != 0)
     ACE_OS::free (this->object_key_);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (this->orb_manager_ptr_)
-        this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "MT_Client::~MT_Client");
+      ex._tao_print_exception ("MT_Client::~MT_Client");
     }
-  ACE_ENDTRY;
 }
 
 
@@ -271,8 +254,7 @@ MT_Server::run_ORB_briefly (void)
 {
   if (this->iterations_ > 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      try
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) MT_Server::run: "
@@ -281,22 +263,17 @@ MT_Server::run_ORB_briefly (void)
           for (unsigned int i = 0; i < this->iterations_; i++)
             {
               MT_Object_var tmp =
-                this->mT_Object_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                this->mT_Object_i_._this ();
 
               this->mT_Object_var_->yadda (0,
-                                           tmp.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                           tmp.in ());
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "MT_Server::run_ORB_briefly");
+          ex._tao_print_exception ("MT_Server::run_ORB_briefly");
           return -1;
         }
-      ACE_ENDTRY;
     }
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index c3e0377bee6..5d1e4de11a9 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -64,16 +64,13 @@ MT_Object_Server::parse_args (void)
 
 int
 MT_Object_Server::init (int argc,
-                       char** argv
-                       ACE_ENV_ARG_DECL)
+                       char** argv)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
-                                     "child_poa"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                     "child_poa");
 
   this->argc_ = argc;
   this->argv_ = argv;
@@ -83,9 +80,7 @@ MT_Object_Server::init (int argc,
 
   CORBA::String_var str;
   str = this->orb_manager_.activate_under_child_poa ("MT_Object",
-                                                     &this->mT_Object_i_
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                     &this->mT_Object_i_);
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -107,10 +102,9 @@ MT_Object_Server::init (int argc,
 
 
 int
-MT_Object_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+MT_Object_Server::run (void)
 {
-  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->orb_manager_.run ();
 
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -131,30 +125,26 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int r = MT_Object_Server.init (argc,argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int r = MT_Object_Server.init (argc,argv);
 
       if (r == -1)
         return 1;
       else
         {
-          MT_Object_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          MT_Object_Server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index 8d57cc0d23e..e4fc7ef94bf 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -48,11 +48,10 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb
 
 private:
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 33dc4890f6a..63b9bdd4b8e 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -40,7 +40,7 @@ Client_Task::Client_Task (client_ptr c,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (!quiet)
         ACE_DEBUG ((LM_DEBUG,
@@ -49,17 +49,13 @@ Client_Task::svc (void)
 
       // Now, we can invoke an operation on the remote side.
       this->server_->start (this->client_.in (),
-                            call_count
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            call_count);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_Task::svc");
+      ex._tao_print_exception ("Client_Task::svc");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -116,49 +112,36 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       int result = parse_args (argc,
                                argv);
       if (result != 0)
         return result;
 
-      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"
-                                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      object = orb->string_to_object (ior
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->string_to_object (ior);
 
-      server_var server = server::_narrow (object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_var server = server::_narrow (object.in ());
 
       // Create an client object to hand to the other side...
       client_i client_servant (quiet,
                                server.in ());
 
-      client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client_var client_object = client_servant._this ();
 
       Client_Task client_tasks (client_object.in (),
                                 server.in ());
@@ -167,21 +150,16 @@ main (int argc,
 
       if (shutdown_server)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "client::main");
+      ex._tao_print_exception ("client::main");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp
index af61f40ba94..e439f6a4461 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp
@@ -10,8 +10,7 @@ client_i::client_i (int quiet,
 }
 
 void
-client_i::ping (CORBA::UShort time_to_live
-                ACE_ENV_ARG_DECL)
+client_i::ping (CORBA::UShort time_to_live)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!this->quiet_)
@@ -23,8 +22,6 @@ client_i::ping (CORBA::UShort time_to_live
 
   if (time_to_live > 0)
     {
-      this->server_->ping (time_to_live
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->server_->ping (time_to_live);
     }
 }
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h
index c90a070e907..e58d414344e 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.h
+++ b/TAO/tests/NestedUpcall/Simple/client_i.h
@@ -9,8 +9,7 @@ public:
             server_ptr s);
   // Constructor.
 
-  void ping (CORBA::UShort time_to_live
-             ACE_ENV_ARG_DECL)
+  void ping (CORBA::UShort time_to_live)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index f9f3763ca91..7c16c359b2a 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -33,17 +33,14 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 int
 Server_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -116,44 +113,33 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       int result = parse_args (argc,
                                argv);
       if (result != 0)
         return result;
 
-      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"
-                                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       server_i server_servant (quiet,
                                orb.in ());
 
-      server_var server_object = server_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_var server_object = server_servant._this ();
 
-      CORBA::String_var ior = orb->object_to_string (server_object.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::String_var ior = orb->object_to_string (server_object.in ());
 
       result = write_ior_to_file (ior.in ());
       if (result != 0)
@@ -173,17 +159,13 @@ main (int argc,
         return result;
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "server::main");
+      ex._tao_print_exception ("server::main");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 6e6a9b7ade4..1a93ac4f244 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -11,21 +11,17 @@ server_i::server_i (int quiet,
 
 void
 server_i::start (client_ptr c,
-                 CORBA::UShort time_to_live
-                 ACE_ENV_ARG_DECL)
+                 CORBA::UShort time_to_live)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->client_ = client::_duplicate (c);
-  this->ping (time_to_live
-              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->ping (time_to_live);
 
   return;
 }
 
 void
-server_i::ping (CORBA::UShort time_to_live
-                ACE_ENV_ARG_DECL)
+server_i::ping (CORBA::UShort time_to_live)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!this->quiet_)
@@ -37,17 +33,13 @@ server_i::ping (CORBA::UShort time_to_live
 
   if (time_to_live > 0)
     {
-      this->client_->ping (time_to_live
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->client_->ping (time_to_live);
     }
 }
 
 void
-server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h
index a92ecc85d08..ce84f3493c8 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.h
+++ b/TAO/tests/NestedUpcall/Simple/server_i.h
@@ -8,16 +8,14 @@ public:
   server_i (int quiet,
             CORBA::ORB_ptr orb);
 
-  void ping (CORBA::UShort time_to_live
-             ACE_ENV_ARG_DECL)
+  void ping (CORBA::UShort time_to_live)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void start (client_ptr c,
-              CORBA::UShort time_to_live
-              ACE_ENV_ARG_DECL)
+              CORBA::UShort time_to_live)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index a014035dc5e..40ac866ae9a 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -43,7 +43,7 @@ Client_Task::Client_Task (client_ptr c,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       if (!quiet)
         ACE_DEBUG ((LM_DEBUG,
@@ -52,19 +52,15 @@ Client_Task::svc (void)
 
       // Now, we can invoke an operation on the remote side.
       this->server_->start (this->client_.in (),
-                            call_count
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            call_count);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_Task::svc");
+      ex._tao_print_exception ("Client_Task::svc");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -125,49 +121,36 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       int result = parse_args (argc,
                                argv);
       if (result != 0)
         return result;
 
-      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"
-                                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      object = orb->string_to_object (ior
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->string_to_object (ior);
 
-      server_var server = server::_narrow (object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_var server = server::_narrow (object.in ());
 
       // Create an client object to hand to the other side...
       client_i client_servant (quiet,
                                server.in ());
 
-      client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client_var client_object = client_servant._this ();
 
       Client_Task client_tasks (client_object.in (),
                                 server.in ());
@@ -177,21 +160,16 @@ main (int argc,
 
       if (shutdown_server)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "client::main");
+      ex._tao_print_exception ("client::main");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index 1f3195d982a..27fac829ee9 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -36,25 +36,22 @@ Initiator_i::~Initiator_i (void)
 }
 
 void
-Initiator_i::foo_object_B (ACE_ENV_SINGLE_ARG_DECL)
+Initiator_i::foo_object_B (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n"));
 
-  ACE_TRY
+  try
     {
-      this->object_B_var_->foo (this->object_A_var_.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->object_B_var_->foo (this->object_A_var_.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Initiator_i::foo_object_B: Returned from call.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the server");
+      ex._tao_print_exception ("calling the server");
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) END Initiator_i::foo_object_B ()\n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
index 50f01bf658f..fcbdd219d2d 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
@@ -35,7 +35,7 @@ public:
   virtual ~Initiator_i (void);
   // Destructor.
 
-  virtual void foo_object_B (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void foo_object_B (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index 0f0e6431660..f36dd401fbf 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -37,28 +37,25 @@ Object_A_i::~Object_A_i (void)
 
 
 void
-Object_A_i::foo (Initiator_ptr theInitiator_ptr
-                    ACE_ENV_ARG_DECL)
+Object_A_i::foo (Initiator_ptr theInitiator_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      theInitiator_ptr->foo_object_B (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      theInitiator_ptr->foo_object_B ();
 
       while (!this->finish_two_way_call_)
         TAO_ORB_Core_instance ()->reactor ()->handle_events ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the initiator");
+      ex._tao_print_exception ("calling the initiator");
     }
-  ACE_ENDTRY;
 
 }
 
 void
-Object_A_i::finish (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_A_i::finish (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->finish_two_way_call_ = 1;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index 83c771f5a6f..af7844e99a3 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -34,11 +34,10 @@ public:
   virtual ~Object_A_i (void);
   // Destructor.
 
-  virtual void foo (Initiator_ptr theInitiator_ptr
-                    ACE_ENV_ARG_DECL)
+  virtual void foo (Initiator_ptr theInitiator_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void finish (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void finish (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   unsigned long finish_two_way_call_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 6d2b87560d5..1d66255420b 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -36,18 +36,16 @@ Object_B_i::~Object_B_i (void)
 
 
 void
-Object_B_i::foo (Object_A_ptr theObject_A_ptr
-                 ACE_ENV_ARG_DECL)
+Object_B_i::foo (Object_A_ptr theObject_A_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n"));
 
-      theObject_A_ptr->finish (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      theObject_A_ptr->finish ();
 
       // Start to wait on this variable, it is set to true
       // by the method finish ()
@@ -57,10 +55,9 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr
       ACE_OS::sleep(pause);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "calling the initiator");
+      ex._tao_print_exception ("calling the initiator");
     }
-  ACE_ENDTRY;
 
 }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index c76b4d2ab80..35c9f311e19 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -34,8 +34,7 @@ public:
   virtual ~Object_B_i (void);
   // Destructor.
 
-  virtual void foo(Object_A_ptr theObject_A_ptr
-                   ACE_ENV_ARG_DECL)
+  virtual void foo(Object_A_ptr theObject_A_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 6e653ca4040..412b73befa7 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -121,16 +121,13 @@ Initiator_Server::parse_args (void)
 
 int
 Initiator_Server::init (int argc,
-                       char** argv
-                       ACE_ENV_ARG_DECL)
+                       char** argv)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
-                                     "child_poa"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                     "child_poa");
 
   this->argc_ = argc;
   this->argv_ = argv;
@@ -144,18 +141,15 @@ Initiator_Server::init (int argc,
                       this->argv_[0]),
                       -1);
 
-  ACE_TRY
+  try
     {
       // Get Object A
 
       CORBA::Object_var object_A_obj_var =
-        this->orb_manager_.orb()->string_to_object (this->object_A_key_
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.orb()->string_to_object (this->object_A_key_);
 
       this->object_A_var_ =
-        Object_A::_narrow (object_A_obj_var.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Object_A::_narrow (object_A_obj_var.in());
 
       if (CORBA::is_nil (this->object_A_var_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -174,13 +168,10 @@ Initiator_Server::init (int argc,
       // Get Object B
 
       CORBA::Object_var object_B_obj_var =
-        this->orb_manager_.orb()->string_to_object (this->object_B_key_
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_manager_.orb()->string_to_object (this->object_B_key_);
 
       this->object_B_var_ =
-        Object_B::_narrow (object_B_obj_var.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Object_B::_narrow (object_B_obj_var.in());
 
       if (CORBA::is_nil (this->object_B_var_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -196,20 +187,18 @@ Initiator_Server::init (int argc,
 
       ACE_DEBUG ((LM_DEBUG, "Object B received OK\n"));
 
-      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_manager_.activate_poa_manager ();
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_NEW_RETURN (this->initiator_i_ptr_,
                   Initiator_i(this->object_A_var_.in(),
@@ -217,9 +206,7 @@ Initiator_Server::init (int argc,
                   -1);
 
   this->str_ =
-    this->orb_manager_.activate (this->initiator_i_ptr_
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_manager_.activate (this->initiator_i_ptr_);
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -232,35 +219,32 @@ Initiator_Server::init (int argc,
 
 
 int
-Initiator_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Initiator_Server::run (void)
 {
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Initiator_Server::run: Trying to invoke "
                   "foo on Object A\n"));
 
       Initiator_var initiator =
-        this->initiator_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->initiator_i_ptr_->_this();
 
-      this->object_A_var_->foo (initiator.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->object_A_var_->foo (initiator.in ());
       ACE_DEBUG ((LM_DEBUG,
                   "Initiator_Server::run: Returned from invoke "
                   "foo on Object A\n"));
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -272,18 +256,15 @@ Initiator_Server::~Initiator_Server (void)
   if (this->object_B_key_ != 0)
     ACE_OS::free (this->object_B_key_);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->orb_manager_.deactivate (this->str_.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_manager_.deactivate (this->str_.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Initiator_Server::~Initiator_Server");
+      ex._tao_print_exception (
+        "Initiator_Server::~Initiator_Server");
     }
-  ACE_ENDTRY;
 
   delete this->initiator_i_ptr_;
 }
@@ -294,33 +275,29 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Initiator_Server initiator_Server;
 
       int retval =
-        initiator_Server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        initiator_Server.init (argc, argv);
 
       if (retval == -1)
         return 1;
       else
         {
-          initiator_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          initiator_Server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index 137f31e0dc6..17487f4027f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -51,11 +51,10 @@ public:
   // read in the IOR's for the two objects A and B
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize the Initiator_Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb
 
 private:
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index 8ab9fe10dfe..ae720385ef4 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -64,17 +64,14 @@ Object_A_Server::parse_args (void)
 
 int
 Object_A_Server::init (int argc,
-                       char** argv
-                       ACE_ENV_ARG_DECL)
+                       char** argv)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
-                                     "child_poa"
-                                     ACE_ENV_ARG_PARAMETER);
+                                     "child_poa");
 
-  ACE_CHECK_RETURN (-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -83,9 +80,7 @@ Object_A_Server::init (int argc,
 
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("object_A",
-                                                 &this->object_A_i_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                 &this->object_A_i_);
 
   if (this->ior_output_file_)
     {
@@ -101,10 +96,9 @@ Object_A_Server::init (int argc,
 
 
 int
-Object_A_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Object_A_Server::run (void)
 {
-  int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int r = this->orb_manager_.run ();
 
   if (r == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -125,31 +119,27 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int retval =
-        object_A_Server.init (argc,argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        object_A_Server.init (argc,argv);
 
       if (retval == -1)
         return 1;
       else
         {
-          object_A_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          object_A_Server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index 842cae01b00..6df7d8d7bb2 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -48,11 +48,10 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb
 
 private:
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index 47837342aaa..0b11e3e61f4 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -64,17 +64,14 @@ Object_B_Server::parse_args (void)
 
 int
 Object_B_Server::init (int argc,
-                       char** argv
-                       ACE_ENV_ARG_DECL)
+                       char** argv)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
-                                     "child_poa"
-                                     ACE_ENV_ARG_PARAMETER);
+                                     "child_poa");
 
-  ACE_CHECK_RETURN (-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -83,9 +80,7 @@ Object_B_Server::init (int argc,
 
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("object_B",
-                                                 &this->object_B_i_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                 &this->object_B_i_);
 
   if (this->ior_output_file_)
     {
@@ -100,10 +95,9 @@ Object_B_Server::init (int argc,
 
 
 int
-Object_B_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Object_B_Server::run (void)
 {
-  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int result = this->orb_manager_.run ();
 
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -125,30 +119,26 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object B Server \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      int retval = object_B_Server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int retval = object_B_Server.init (argc, argv);
 
       if (retval == -1)
         return 1;
       else
         {
-          object_B_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          object_B_Server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index 3661f99bd71..e4634ff7547 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -48,11 +48,10 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv
-            ACE_ENV_ARG_DECL);
+            char **argv);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb
 
 private:
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index ac198b31bd6..0490bb71ad3 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -70,17 +70,14 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -88,60 +85,42 @@ main (int argc, char **argv)
         return parse_args_result;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Get an object reference from the argument string.
-      object = orb->string_to_object (IOR
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a <server> reference.
-      server_var server_object = server::_narrow (object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_var server_object = server::_narrow (object.in ());
 
       client_i servant (server_object.in ());
 
       servant.loop (event_loop_depth,
-                    event_loop_iterations
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    event_loop_iterations);
 
       // Shutdown server.
       if (shutdown_server)
         {
-          server_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server_object->shutdown ();
         }
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp
index 134bd31f46a..04113692445 100644
--- a/TAO/tests/Nested_Event_Loop/server.cpp
+++ b/TAO/tests/Nested_Event_Loop/server.cpp
@@ -38,28 +38,21 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -67,13 +60,10 @@ main (int argc, char *argv[])
       server_i servant (orb.in ());
 
       server_var server_object =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server_object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server_object.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -86,26 +76,20 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp
index 7b27990c225..32603e98df8 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.cpp
+++ b/TAO/tests/Nested_Event_Loop/test_i.cpp
@@ -13,8 +13,7 @@ server_i::server_i (CORBA::ORB_ptr orb)
 void
 server_i::loop (client_ptr remote_partner,
                 CORBA::ULong event_loop_depth,
-                CORBA::ULong event_loop_iterations
-                ACE_ENV_ARG_DECL)
+                CORBA::ULong event_loop_iterations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -23,28 +22,21 @@ server_i::loop (client_ptr remote_partner,
               event_loop_iterations));
 
   this->run_no_ops (remote_partner,
-                    event_loop_iterations / 2
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                    event_loop_iterations / 2);
 
   if (--event_loop_depth != 0)
     {
       remote_partner->loop (event_loop_depth,
-                            event_loop_iterations
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                            event_loop_iterations);
     }
 
   this->run_no_ops (remote_partner,
-                    event_loop_iterations / 2
-                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                    event_loop_iterations / 2);
 }
 
 void
 server_i::run_no_ops (client_ptr remote_partner,
-                      CORBA::ULong iterations
-                      ACE_ENV_ARG_DECL)
+                      CORBA::ULong iterations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   while (iterations != 0)
@@ -72,14 +64,11 @@ server_i::run_no_ops (client_ptr remote_partner,
                       sizeof_pointer_to_flag);
 
       remote_partner->oneway_no_op (act_for_iterations,
-                                    act_for_flag
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    act_for_flag);
 
       while (!got_reply)
         {
-          this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          this->orb_->perform_work ();
         }
     }
 }
@@ -87,8 +76,7 @@ server_i::run_no_ops (client_ptr remote_partner,
 void
 server_i::no_op (client_ptr remote_partner,
                  const act &act_for_iterations,
-                 const act &act_for_flag
-                 ACE_ENV_ARG_DECL)
+                 const act &act_for_flag)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong *pointer_to_iterations = 0;
@@ -111,16 +99,14 @@ server_i::no_op (client_ptr remote_partner,
 
   *pointer_to_flag = 1;
 
-  remote_partner->twoway_no_op (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  remote_partner->twoway_no_op ();
 }
 
 void
-server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 client_i::client_i (server_ptr remote_partner)
@@ -130,8 +116,7 @@ client_i::client_i (server_ptr remote_partner)
 
 void
 client_i::loop (CORBA::ULong event_loop_depth,
-                CORBA::ULong event_loop_iterations
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CORBA::ULong event_loop_iterations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -139,58 +124,45 @@ client_i::loop (CORBA::ULong event_loop_depth,
               event_loop_depth,
               event_loop_iterations));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       client_var self =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       this->remote_partner_->loop (self.in (),
                                    event_loop_depth,
-                                   event_loop_iterations
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   event_loop_iterations);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client_i::loop:");
+      ex._tao_print_exception ("Exception caught in client_i::loop:");
     }
-  ACE_ENDTRY;
 }
 
 void
 client_i::oneway_no_op (const act &act_for_iterations,
-                        const act &act_for_flag
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        const act &act_for_flag)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       client_var self =
-        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->_this ();
 
       this->remote_partner_->no_op (self.in (),
                                     act_for_iterations,
-                                    act_for_flag
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    act_for_flag);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client_i::no_op:");
+      ex._tao_print_exception ("Exception caught in client_i::no_op:");
     }
-  ACE_ENDTRY;
 }
 
 void
-client_i::twoway_no_op (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+client_i::twoway_no_op (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h
index 37d1b80f541..e7f8420ad0b 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.h
+++ b/TAO/tests/Nested_Event_Loop/test_i.h
@@ -9,22 +9,19 @@ public:
 
   void loop (client_ptr remote_partner,
              CORBA::ULong event_loop_depth,
-             CORBA::ULong event_loop_iterations
-             ACE_ENV_ARG_DECL)
+             CORBA::ULong event_loop_iterations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void run_no_ops (client_ptr remote_partner,
-                   CORBA::ULong iterations
-                   ACE_ENV_ARG_DECL)
+                   CORBA::ULong iterations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void no_op (client_ptr remote_partner,
               const act &act_for_iterations,
-              const act &act_for_flag
-              ACE_ENV_ARG_DECL_NOT_USED)
+              const act &act_for_flag)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -37,16 +34,14 @@ public:
   client_i (server_ptr remote_partner);
 
   void loop (CORBA::ULong event_loop_depth,
-             CORBA::ULong event_loop_iterations
-             ACE_ENV_ARG_DECL_NOT_USED)
+             CORBA::ULong event_loop_iterations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void oneway_no_op (const act &act_for_iterations,
-                     const act &act_for_flag
-                     ACE_ENV_ARG_DECL_NOT_USED)
+                     const act &act_for_flag)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void twoway_no_op (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void twoway_no_op (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
index 072e1f6f457..acb1210811c 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp
@@ -30,27 +30,23 @@ Client_Peer::Client_Peer (CORBA::ORB_ptr orb)
 void
 Client_Peer::callme(Test::Peer_ptr callback,
                     CORBA::ULong max_depth,
-                    Test::Payload const &
-                    ACE_ENV_ARG_DECL)
+                    Test::Payload const &)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Received call, depth = %d\n", max_depth));
   if (max_depth > 0)
   {
     Test::Peer_var me =
-      this->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->_this();
 
     Test::Payload return_data;
 
-    callback->callme(me.in(), max_depth - 1, return_data
-                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    callback->callme(me.in(), max_depth - 1, return_data);
   }
 }
 
 void
-Client_Peer::crash(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Peer::crash(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   Crasher * crasher = new Crasher;
@@ -61,7 +57,7 @@ Client_Peer::crash(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Client_Peer::noop(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Peer::noop(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
index bd913ce1782..9f80723f8a1 100644
--- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
+++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h
@@ -19,12 +19,11 @@ public:
 
   void callme(Test::Peer_ptr callback,
               CORBA::ULong max_depth,
-              Test::Payload const &
-              ACE_ENV_ARG_DECL)
+              Test::Payload const &)
     ACE_THROW_SPEC((CORBA::SystemException));
-  void crash(ACE_ENV_SINGLE_ARG_DECL)
+  void crash(void)
     ACE_THROW_SPEC((CORBA::SystemException));
-  void noop(ACE_ENV_SINGLE_ARG_DECL)
+  void noop(void)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
index 658ffeb935a..36c6ad2d83b 100644
--- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp
@@ -23,8 +23,7 @@ Server_Peer::Server_Peer (ACE_RANDR_TYPE seed,
 void
 Server_Peer::callme(Test::Peer_ptr callback,
                     CORBA::ULong max_depth,
-                    Test::Payload const &
-                    ACE_ENV_ARG_DECL)
+                    Test::Payload const &)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   int r = ACE_OS::rand_r(this->seed_) % 50;
@@ -38,44 +37,38 @@ Server_Peer::callme(Test::Peer_ptr callback,
 
   if(r == 0)
   {
-    ACE_TRY
+    try
     {
-      callback->crash(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      callback->crash();
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
     {
     }
-    ACE_ENDTRY;
 
-    // orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-    // ACE_CHECK;
+    // orb_->shutdown (0);
   }
   else if (max_depth > 0)
   {
     Test::Peer_var me =
-      this->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+      this->_this();
 
     Test::Payload extra_data(this->payload_size_);
     extra_data.length(this->payload_size_);
     callback->callme(me.in(),
                      max_depth - 1,
-                     extra_data
-                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                     extra_data);
   }
 }
 
 void
-Server_Peer::crash(ACE_ENV_SINGLE_ARG_DECL)
+Server_Peer::crash(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
-  ACE_THROW(CORBA::NO_IMPLEMENT ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-Server_Peer::noop(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Peer::noop(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
index c1ee59f802f..a165d5372b5 100644
--- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
+++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h
@@ -21,12 +21,11 @@ public:
 
   void callme(Test::Peer_ptr callback,
               CORBA::ULong max_depth,
-              Test::Payload const & extra_data
-              ACE_ENV_ARG_DECL)
+              Test::Payload const & extra_data)
     ACE_THROW_SPEC((CORBA::SystemException));
-  void crash(ACE_ENV_SINGLE_ARG_DECL)
+  void crash(void)
     ACE_THROW_SPEC((CORBA::SystemException));
-  void noop(ACE_ENV_SINGLE_ARG_DECL)
+  void noop(void)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp
index 0bafc403012..5af5dd41596 100644
--- a/TAO/tests/Nested_Upcall_Crash/client.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/client.cpp
@@ -32,22 +32,16 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -55,16 +49,13 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -77,16 +68,11 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -98,18 +84,13 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(impl);
 
       Test::Peer_var local_peer =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Peer_var peer =
-        Test::Peer::_narrow(tmp.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Peer::_narrow(tmp.in ());
 
       if (CORBA::is_nil (peer.in ()))
         {
@@ -119,8 +100,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Timer timer(local_peer.in (), peer.in ());
 
@@ -129,25 +109,19 @@ main (int argc, char *argv[])
       reactor->schedule_timer(&timer, 0, interval, interval);
 
       ACE_Time_Value run_time(120, 0);
-      orb->run (run_time ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (run_time);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - event loop finished\n"));
 
-      root_poa->destroy (1, 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
index ca3ac54ea98..b029f32878e 100644
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -26,22 +26,16 @@ main (int argc, char *argv[])
 {
   int ret_val = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -54,29 +48,20 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Peer_var peer =
-        Test::Peer::_narrow(tmp.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Peer::_narrow(tmp.in ());
 
       if (CORBA::is_nil (peer.in ()))
         {
@@ -88,23 +73,20 @@ main (int argc, char *argv[])
 
       while(1)
       {
-        peer->noop (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        peer->noop ();
       }
 
       /* Warning with TRU 64 builds
        ACE_DEBUG ((LM_DEBUG, "(%P|%t) scavenger - event loop finished\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;*/
+      orb->destroy ();
+      */
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       ret_val = 1;
     }
-  ACE_ENDTRY;
 
   return ret_val;
 }
diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp
index 0b7eb0628fe..df638162a03 100644
--- a/TAO/tests/Nested_Upcall_Crash/server.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/server.cpp
@@ -35,22 +35,16 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA"
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,16 +52,13 @@ 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 ();
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       if (CORBA::is_nil (policy_current.in ()))
         {
@@ -80,17 +71,12 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            scope_as_any);
 
       policy_current->set_policy_overrides (policies,
-                                            CORBA::ADD_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::ADD_OVERRIDE);
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0]->destroy ();
 
       seed = (ACE_RANDR_TYPE) ACE_OS::gethrtime ();
 
@@ -106,13 +92,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(impl);
 
       Test::Peer_var peer =
-        impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (peer.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (peer.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -124,8 +107,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Sleeper sleeper (orb.in ());
 
@@ -134,26 +116,20 @@ main (int argc, char *argv[])
       reactor->schedule_timer(&sleeper, 0, interval, interval);
 
       // ACE_Time_Value run_time(600, 0);
-      // orb->run (run_time ACE_ENV_ARG_PARAMETER);
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      // orb->run (run_time);
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
index 4034e1245c9..f40dfd3392b 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
@@ -74,22 +74,19 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -101,8 +98,7 @@ main (int argc, char *argv[])
 
       if (server_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
       Client client (server.in (), niterations);
@@ -118,16 +114,13 @@ main (int argc, char *argv[])
 
 
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -144,23 +137,21 @@ Client::Client (Simple_Server_ptr server,
 int
 Client::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       for (int i = 0; i < this->niterations_; ++i)
         {
-          this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->test_method ();
 
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n",
                         i));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Expected exceptions \n"));
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
index bf5e6312642..099f923d977 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
@@ -36,15 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,12 +50,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -65,12 +61,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -87,27 +81,21 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
index 32bbdd97bcb..1bc53fd3329 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp
@@ -10,14 +10,14 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Server_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.h b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
index 0189dc49b87..b411d5499b9 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/test_i.h
+++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.h
@@ -18,10 +18,10 @@ public:
   // ctor
 
   // = The Simple_Server 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:
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index 851de09a37c..e273412e2d5 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -12,8 +12,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 
 CORBA::Any*
 Test_impl::get_something (
-    CORBA::Boolean need_vb
-    ACE_ENV_ARG_DECL_NOT_USED)
+    CORBA::Boolean need_vb)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_ptr ret_val_ptr = 0;
@@ -48,8 +47,7 @@ Test_impl::get_something (
 }
 
 OBV_AnyTest::VB *
-Test_impl::get_vb(
-    ACE_ENV_ARG_DECL_NOT_USED)
+Test_impl::get_vb()
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const CORBA::ULong magic = 3145;
@@ -62,8 +60,8 @@ Test_impl::get_vb(
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h
index d7ba0a3f399..610d83162a1 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.h
+++ b/TAO/tests/OBV/Any/AnyS_impl.h
@@ -32,14 +32,13 @@ public:
   // ctor
 
   virtual CORBA::Any * get_something (
-      CORBA::Boolean need_vb
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      CORBA::Boolean need_vb)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual OBV_AnyTest::VB * get_vb (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual OBV_AnyTest::VB * get_vb (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index 2b020e6427c..52cfb6f4f75 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -36,14 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n"));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -56,9 +55,7 @@ main (int argc, char *argv[])
                       1); // supplied by mapping
 
       orb->register_value_factory (va_factory->tao_repository_id (),
-                                   va_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   va_factory);
       va_factory->_remove_ref (); // release ownership
 
 
@@ -68,9 +65,7 @@ main (int argc, char *argv[])
                       1); // supplied by mapping
 
       orb->register_value_factory (vb_factory->tao_repository_id (),
-                                   vb_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   vb_factory);
       vb_factory->_remove_ref (); // release ownership
 
       // Do local test
@@ -134,12 +129,10 @@ main (int argc, char *argv[])
       // Now do remote test
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       OBV_AnyTest::Test_var test =
-        OBV_AnyTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        OBV_AnyTest::Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -152,9 +145,7 @@ main (int argc, char *argv[])
 
       // STEP 1.
       CORBA::Any_var result = test->get_something (
-          0
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          0);
 
       if (!(result.inout () >>= dst) || dst->id () != magic)
         {
@@ -166,9 +157,7 @@ main (int argc, char *argv[])
       // STEP 2.
       OBV_AnyTest::VB* dst_vb = 0;
       result = test->get_something (
-          1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          1);
 
       if (!(result.inout () >>= dst_vb) || dst_vb->id () != magic)
         {
@@ -197,9 +186,7 @@ main (int argc, char *argv[])
 
       // STEP 4. get a VB, but extract to a VA*.
       result = test->get_something (
-          1
-          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          1);
 
       if (!(result.inout () >>= CORBA::Any::to_value(target.out())))
         {
@@ -216,21 +203,17 @@ main (int argc, char *argv[])
         }
 #endif /* TAO_HAS_OPTIMIZED_VALUETYPE_MARSHALING */
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client:");
+      ex._tao_print_exception ("Exception caught in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp
index aadb21d4cd5..1fb435a3eb9 100644
--- a/TAO/tests/OBV/Any/server.cpp
+++ b/TAO/tests/OBV/Any/server.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -71,12 +67,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       OBV_AnyTest::Test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -88,29 +82,23 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop started.\n"));
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished.\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in server:");
+      ex._tao_print_exception ("Exception caught in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
index 3c8697e8415..1c3a2d27b51 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
@@ -17,7 +17,7 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // All factories are kindly provided by
       // compiler so we just to put everything in a right order.
@@ -29,9 +29,7 @@ Client_Task::svc (void)
                       1);
 
       this->corb_->register_value_factory (bn_factory->tao_repository_id (),
-                                   bn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   bn_factory);
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -41,9 +39,7 @@ Client_Task::svc (void)
                       1);
 
       this->corb_->register_value_factory (tc_factory->tao_repository_id (),
-                                   tc_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   tc_factory);
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -53,20 +49,16 @@ Client_Task::svc (void)
                       1);
 
       this->corb_->register_value_factory (sn_factory->tao_repository_id (),
-                                   sn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   sn_factory);
       sn_factory->_remove_ref (); // release ownership
 
       //Well, done with factories.
 
       // Obtain reference to the object.
       CORBA::Object_var tmp =
-        this->corb_->string_to_object(this->input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->corb_->string_to_object(this->input_);
 
-      Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var test = Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -162,8 +154,7 @@ Client_Task::svc (void)
         }
 
       TreeController_var tc_result =
-        test->reflect (tc.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->reflect (tc.in ());
 
       // The following two ifs will fail until bug 1390 is fixed.
       if (is_equal_tree (tc.in (), tc_result.in ()))
@@ -179,18 +170,15 @@ Client_Task::svc (void)
                             1);
         }
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
@@ -201,7 +189,7 @@ Client_Task::is_equal_tree (TreeController * tree1, TreeController * tree2)
 {
   return is_equal_node (tree1->root (), tree2->root ());
 }
-  
+
 
 int
 Client_Task::is_equal_node (BaseNode * node1, BaseNode * node2)
diff --git a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
index be09bb0c6db..3a297b25374 100644
--- a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
@@ -47,16 +47,13 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -78,9 +75,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                corb.in (),
@@ -95,10 +90,9 @@ main (int argc, char *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
index 79efb6141fb..0487ad694e6 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
@@ -23,7 +23,7 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
       // All factories are kindly provided by
       // compiler so we just to put everything in a right order.
@@ -35,9 +35,7 @@ Server_Task::svc (void)
                       1);
 
       this->sorb_->register_value_factory (bn_factory->tao_repository_id (),
-                                   bn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   bn_factory);
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -47,9 +45,7 @@ Server_Task::svc (void)
                       1);
 
       this->sorb_->register_value_factory (tc_factory->tao_repository_id (),
-                                   tc_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   tc_factory);
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -59,20 +55,16 @@ Server_Task::svc (void)
                       1);
 
       this->sorb_->register_value_factory (sn_factory->tao_repository_id (),
-                                   sn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   sn_factory);
       sn_factory->_remove_ref (); // release ownership
 
       //Well, done with factories.
 
       CORBA::Object_var poa_object =
-        this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sorb_->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -80,8 +72,7 @@ Server_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 ();
 
       Test_impl *test_impl;
       ACE_NEW_RETURN (test_impl,
@@ -90,12 +81,10 @@ Server_Task::svc (void)
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var test = test_impl->_this ();
 
       CORBA::String_var ior =
-        this->sorb_->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sorb_->object_to_string (test.in ());
 
       // If the this->output_ exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (this->output_, "w");
@@ -107,29 +96,23 @@ Server_Task::svc (void)
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       this->me_.signal ();
 
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->destroy ();
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
+     ex._tao_print_exception ("Exception caught:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
index 03b0440a092..780ba158671 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp
@@ -27,8 +27,7 @@ reflect_node (BaseNode* bn)
 }
 
 TreeController *
-Test_impl::reflect (TreeController * tc
-                    ACE_ENV_ARG_DECL_NOT_USED)
+Test_impl::reflect (TreeController * tc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (tc != 0)
@@ -40,8 +39,8 @@ Test_impl::reflect (TreeController * tc
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.h b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
index 725369e944a..662273c97f9 100644
--- a/TAO/tests/OBV/Collocated/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.h
@@ -34,11 +34,10 @@ public:
   // ctor
 
   virtual TreeController * reflect (
-      TreeController * tc
-      ACE_ENV_ARG_DECL_NOT_USED)
+      TreeController * tc)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
index ee0512b4177..f2fc37618ad 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
@@ -47,13 +47,12 @@ Value2_init_impl::create (
 }
 
 CORBA::ValueBase *
-Value2_init_impl::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
+Value2_init_impl::create_for_unmarshal (void)
 {
   OBV_FactoryTest::Value2* ret_val = 0;
   ACE_NEW_THROW_EX (ret_val,
                     Value2_impl,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   return ret_val;
 }
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h
index 895d9fb808b..a42c6089ee9 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.h
@@ -57,7 +57,7 @@ public:
 
 public:
 
-  virtual CORBA::ValueBase * create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::ValueBase * create_for_unmarshal (void);
 
 };
 
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index 49bd2e9401b..597f190ba66 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -12,7 +12,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 }
 
 OBV_FactoryTest::BaseValue *
-Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_base_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::BaseValue* ret_val = 0;
@@ -24,7 +24,7 @@ Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 OBV_FactoryTest::Value1 *
-Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value1 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::Value1* ret_val = 0;
@@ -36,7 +36,7 @@ Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 OBV_FactoryTest::Value2 *
-Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value2 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::Value2* ret_val = 0;
@@ -48,8 +48,8 @@ Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h
index 8a1e97a6a5a..271bcdd2788 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.h
@@ -31,16 +31,16 @@ public:
   Test_impl (CORBA::ORB_ptr orb);
   // ctor
 
-  virtual OBV_FactoryTest::BaseValue * get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual OBV_FactoryTest::BaseValue * get_base_value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual OBV_FactoryTest::Value1 * get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual OBV_FactoryTest::Value1 * get_value1 (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual OBV_FactoryTest::Value2 * get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual OBV_FactoryTest::Value2 * get_value2 (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 2b6a232470a..d33f1f43d70 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -38,25 +38,23 @@ bool
 no_factory (OBV_FactoryTest::Test_ptr test)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Calling this without a factory registred should give a marshal
       // exception with minor code 1
       OBV_FactoryTest::BaseValue_var base_value =
-        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_base_value ();
     }
-  ACE_CATCH (CORBA::MARSHAL, ex)
+  catch (const CORBA::MARSHAL& ex)
     {
       if ((ex.minor() & 0xFFFU) == 1)
         {
           succeed = true;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -70,23 +68,20 @@ no_factory (OBV_FactoryTest::Test_ptr test)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Obtain reference to the object
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       OBV_FactoryTest::Test_var test =
-        OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        OBV_FactoryTest::Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -108,9 +103,7 @@ main (int argc, char *argv[])
                       1); // supplied by mapping
 
       orb->register_value_factory (base_factory->tao_repository_id (),
-                                   base_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   base_factory);
       base_factory->_remove_ref (); // release ownership
 
       OBV_FactoryTest::Value1_init *value1_factory = 0;
@@ -119,9 +112,7 @@ main (int argc, char *argv[])
                       1); // supplied by mapping
 
       orb->register_value_factory (value1_factory->tao_repository_id (),
-                                   value1_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value1_factory);
       value1_factory->_remove_ref ();
 
       OBV_FactoryTest::Value2_init *value2_factory = 0;
@@ -130,24 +121,19 @@ main (int argc, char *argv[])
                       1); // custom implementation
 
       orb->register_value_factory (value2_factory->tao_repository_id (),
-                                   value2_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value2_factory);
       value2_factory->_remove_ref ();
 
       // Now perform the test. I don't check return values.
       // I just hope to get MARSHAL.
       OBV_FactoryTest::BaseValue_var base_value =
-        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_base_value ();
 
       OBV_FactoryTest::Value1_var value1 =
-        test->get_value1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_value1 ();
 
       OBV_FactoryTest::Value2_var value2 =
-        test->get_value2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->get_value2 ();
 
       // Test factories.
 
@@ -160,19 +146,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 5f6788e57d4..231bc724184 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -71,12 +67,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       OBV_FactoryTest::Test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -88,27 +82,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index 2a3eb140309..8282676a725 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -30,8 +30,7 @@ reflect_node (BaseNode* bn)
 }
 
 TreeController *
-Test_impl::reflect (TreeController * tc
-                    ACE_ENV_ARG_DECL_NOT_USED)
+Test_impl::reflect (TreeController * tc)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (tc != 0)
@@ -43,8 +42,8 @@ Test_impl::reflect (TreeController * tc
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h
index 745f255ad87..bd5a1eb6726 100644
--- a/TAO/tests/OBV/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Forward/Test_impl.h
@@ -32,11 +32,10 @@ public:
   // ctor
 
   virtual TreeController * reflect (
-      TreeController * tc
-      ACE_ENV_ARG_DECL_NOT_USED)
+      TreeController * tc)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index b61d1544147..62fdb78b03a 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -82,11 +82,10 @@ dump_tree (TreeController *tc)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -101,9 +100,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (bn_factory->tao_repository_id (),
-                                   bn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   bn_factory);
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -113,9 +110,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (tc_factory->tao_repository_id (),
-                                   tc_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   tc_factory);
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -125,20 +120,16 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (sn_factory->tao_repository_id (),
-                                   sn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   sn_factory);
       sn_factory->_remove_ref (); // release ownership
 
       //Well, done with factories.
 
       // Obtain reference to the object.
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
-      Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var test = Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (test.in ()))
       {
@@ -191,28 +182,23 @@ main (int argc, char *argv[])
       dump_tree (tc.in ());
 
       TreeController_var result_tc =
-        test->reflect (tc.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test->reflect (tc.in ());
 
       // Dump the resulting tree.
       dump_tree (result_tc.in ());
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp
index bf17c26cc87..87c4e70ceb0 100644
--- a/TAO/tests/OBV/Forward/server.cpp
+++ b/TAO/tests/OBV/Forward/server.cpp
@@ -41,11 +41,10 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // All factories are kindly provided by
       // compiler so we just to put everything in a right order.
@@ -57,9 +56,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (bn_factory->tao_repository_id (),
-                                   bn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   bn_factory);
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
@@ -69,9 +66,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (tc_factory->tao_repository_id (),
-                                   tc_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   tc_factory);
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
@@ -81,20 +76,16 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (sn_factory->tao_repository_id (),
-                                   sn_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   sn_factory);
       sn_factory->_remove_ref (); // release ownership
 
       //Well, done with factories.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -102,8 +93,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -115,12 +105,10 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var test = test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -132,27 +120,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp
index c3548daf462..bb150ce6abd 100644
--- a/TAO/tests/OBV/Simple/Client_i.cpp
+++ b/TAO/tests/OBV/Simple/Client_i.cpp
@@ -21,36 +21,30 @@ Checkpoint_Client_i::run (const char *name,
   ACE_Time_Value now (ACE_OS::gettimeofday ());
   ACE_OS::srand ((unsigned int) now.sec () );
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_DEBUG ((LM_DEBUG, "Send some random events:\n"));
 
       CORBA::Long value = 64;
       Event_var t_e (static_cast<Event*> (new Event_impl (value)));
       t_e->do_print ();
-      checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      checkpoint->put_event (t_e);
 
       value = 34;
       t_e = new Event_impl (value);
       t_e->do_print ();
-      checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      checkpoint->put_event (t_e);
 
       if (checkpoint.shutdown () == 1)
-        checkpoint->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+        checkpoint->shutdown ();
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI");
+      ex._tao_print_exception ("\n Exception in RMI");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp
index f55cee0af44..6b37d9f1af8 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.cpp
+++ b/TAO/tests/OBV/Simple/OBV_impl.cpp
@@ -26,7 +26,7 @@ Event_impl::_copy_value (void)
 
 
 void
-Event_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_impl::do_print (void)
 {
   ACE_DEBUG((LM_DEBUG, "(value %d)  \n",
              (CORBA::ULong) this->value_()));
@@ -37,7 +37,7 @@ Event_factory::~Event_factory ()
 }
 
 TAO_OBV_CREATE_RETURN_TYPE (Event)
-Event_factory::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_factory::create_for_unmarshal (void)
 {
   return new Event_impl;
 }
diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h
index 1b619553402..7ef69a968b9 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.h
+++ b/TAO/tests/OBV/Simple/OBV_impl.h
@@ -18,7 +18,7 @@ class Event_impl : public virtual OBV_Event,
   virtual CORBA::ValueBase* _copy_value (void);
 
 
-  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (void);
 };
 
 class Event_factory : public CORBA::ValueFactoryBase
@@ -33,7 +33,7 @@ protected:
 
 private:
 
-  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void);
 };
 
 #endif /* OBV_IMPL_H */
diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp
index a429ce1bc3a..4313a82209a 100644
--- a/TAO/tests/OBV/Simple/Server_i.cpp
+++ b/TAO/tests/OBV/Simple/Server_i.cpp
@@ -42,8 +42,7 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
 
 
 void
-Checkpoint_i::put_event (Event *event
-                        ACE_ENV_ARG_DECL_NOT_USED)
+Checkpoint_i::put_event (Event *event)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Let us see what event has arrived
@@ -55,7 +54,7 @@ Checkpoint_i::put_event (Event *event
 // Shutdown the server application.
 
 void
-Checkpoint_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Checkpoint_i::shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/OBV/Simple/Server_i.h b/TAO/tests/OBV/Simple/Server_i.h
index c1a026c25e2..8eec39d2bef 100644
--- a/TAO/tests/OBV/Simple/Server_i.h
+++ b/TAO/tests/OBV/Simple/Server_i.h
@@ -37,12 +37,10 @@ public:
 
   virtual void put_event (
         Event * e
-        ACE_ENV_ARG_DECL
   )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       ::CORBA::SystemException
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 979bc54cc79..b4048168fa0 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -69,21 +69,18 @@ Server<Servant>::parse_args (void)
 template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
-                       char *argv[]
-                       ACE_ENV_ARG_DECL)
+                       char *argv[])
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa"
-                                         ACE_ENV_ARG_PARAMETER) == -1)
+                                         "child_poa") == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
 
-  ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
   this->argv_ = argv;
@@ -102,13 +99,11 @@ Server<Servant>::init (const char *servant_name,
 
   // Make sure that you check for failures here via the ACE_TRY
   // macros?!
-  ACE_TRY
+  try
     {
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
-                                                     &this->servant_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                     &this->servant_);
 
       ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
@@ -123,22 +118,20 @@ Server<Servant>::init (const char *servant_name,
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in activation of POA");
+      ex._tao_print_exception ("Exception in activation of POA");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 template <class Servant>int
-Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
+Server<Servant>::run (void)
 {
     // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
@@ -241,16 +234,13 @@ Client<InterfaceObj, Var>::init (const char *name,
   this->argv_ = argv;
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    name
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    name);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -261,8 +251,7 @@ Client<InterfaceObj, Var>::init (const char *name,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->orb_->string_to_object (this->ior_);
 
 
           if (CORBA::is_nil (server_object.in ()))
@@ -270,9 +259,7 @@ Client<InterfaceObj, Var>::init (const char *name,
                                "invalid ior <%s>\n",
                                this->ior_),
                               -1);
-          this->server_ = InterfaceObj::_narrow (server_object.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_ = InterfaceObj::_narrow (server_object.in ());
         }
       else
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -281,12 +268,11 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client_i::init");
+      ex._tao_print_exception ("Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
 
 
   return 0;
@@ -294,7 +280,7 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client<InterfaceObj, Var>::obtain_initial_references (void)
 {
 
   return 0;
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
index 380dc749dc6..abe49613309 100644
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ b/TAO/tests/OBV/Simple/Simple_util.h
@@ -51,8 +51,7 @@ public:
 
   int init (const char *servant_name,
             int argc,
-            char *argv[]
-            ACE_ENV_ARG_DECL);
+            char *argv[]);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -60,7 +59,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL);
+  int run (void);
   // Run the orb.
 
 protected:
@@ -121,7 +120,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL);
+  int obtain_initial_references (void);
   // Initialize naming service
 
 protected:
diff --git a/TAO/tests/OBV/Simple/server.cpp b/TAO/tests/OBV/Simple/server.cpp
index c5f5140f307..31b84c2b421 100644
--- a/TAO/tests/OBV/Simple/server.cpp
+++ b/TAO/tests/OBV/Simple/server.cpp
@@ -12,32 +12,28 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tCheckpoint Event_Types server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (server.init ("Event_Types_Checkpoint",
                        argc,
-                       argv
-                       ACE_ENV_ARG_PARAMETER) == -1)
+                       argv) == -1)
         return 1;
       else
         {
-          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server.run ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index eeccce8dc1d..a0f58373504 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -13,22 +13,19 @@ vt_graph_impl::vt_graph_impl (void)
 
 // Creates a vt_graph_impl with the given number of nodes. There will be one
 // root node and the rest will be children of it.
-vt_graph_impl::vt_graph_impl (int num_nodes ACE_ENV_ARG_DECL)
+vt_graph_impl::vt_graph_impl (int num_nodes)
 {
   nodes_ ().length (0);
-  add_node ("ROOT" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  add_node ("ROOT");
   for (int i = 1; i < num_nodes; i++)
     {
-      add_node ("CHILD" ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-      nodes_ ()[0]->add_edge (nodes_ ()[i] ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      add_node ("CHILD");
+      nodes_ ()[0]->add_edge (nodes_ ()[i]);
     }
 }
 
 // Get the number of nodes in the vt_graph.
-CORBA::Long vt_graph_impl::size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Long vt_graph_impl::size (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return nodes_ ().length ();
@@ -36,7 +33,7 @@ CORBA::Long vt_graph_impl::size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Add a node to the graph with no edges.
 void
-vt_graph_impl::add_node (const char * name ACE_ENV_ARG_DECL_NOT_USED)
+vt_graph_impl::add_node (const char * name)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Supports_Test::Node * new_node = 0;
@@ -47,7 +44,7 @@ vt_graph_impl::add_node (const char * name ACE_ENV_ARG_DECL_NOT_USED)
 
 // Print out information about each node.
 void
-vt_graph_impl::print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+vt_graph_impl::print (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -94,121 +91,93 @@ test_impl::~test_impl (void)
 
 void
 test_impl::pass_obj_graph_in (
-  Supports_Test::graph * graph_param
-  ACE_ENV_ARG_DECL)
+  Supports_Test::graph * graph_param)
   ACE_THROW_SPEC ((
     CORBA::SystemException))
 {
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-  ACE_CHECK;
-  graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-  ACE_CHECK;
+  ACE_ASSERT (graph_param->size () == 3);
+  graph_param->add_node ("NEW1");
+  ACE_ASSERT (graph_param->size () == 4);
 }
 
 void
 test_impl::pass_vt_graph_in (
-  Supports_Test::vt_graph * vt_graph_param
-  ACE_ENV_ARG_DECL)
+  Supports_Test::vt_graph * vt_graph_param)
   ACE_THROW_SPEC ((
     CORBA::SystemException))
 {
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-  ACE_CHECK;
-  vt_graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-  ACE_CHECK;
+  ACE_ASSERT (vt_graph_param->size () == 3);
+  vt_graph_param->add_node ("NEW1");
+  ACE_ASSERT (vt_graph_param->size () == 4);
 }
 
 void
 test_impl::pass_obj_graph_out (
-  Supports_Test::graph_out graph_param
-  ACE_ENV_ARG_DECL)
+  Supports_Test::graph_out graph_param)
   ACE_THROW_SPEC ((
     CORBA::SystemException))
 {
   vt_graph_impl * the_vt_graph = 0;
-  ACE_NEW (the_vt_graph, vt_graph_impl (4 ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
-  graph_param = the_vt_graph->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-  ACE_CHECK;
-  graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5);
-  ACE_CHECK;
+  ACE_NEW (the_vt_graph, vt_graph_impl (4));
+  graph_param = the_vt_graph->_this ();
+
+  ACE_ASSERT (graph_param->size () == 4);
+  graph_param->add_node ("NEW1");
+  ACE_ASSERT (graph_param->size () == 5);
 }
 
 void
 test_impl::pass_vt_graph_out (
-    Supports_Test::vt_graph_out vt_graph_param
-    ACE_ENV_ARG_DECL)
+    Supports_Test::vt_graph_out vt_graph_param)
   ACE_THROW_SPEC ((
     CORBA::SystemException))
 {
 
   vt_graph_impl * the_vt_graph = 0;
-  ACE_NEW (the_vt_graph, vt_graph_impl (4 ACE_ENV_ARG_PARAMETER));
-  ACE_CHECK;
+  ACE_NEW (the_vt_graph, vt_graph_impl (4));
   vt_graph_param = the_vt_graph;
 
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-  ACE_CHECK;
-  vt_graph_param->add_node ("NEW1" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5);
-  ACE_CHECK;
+  ACE_ASSERT (vt_graph_param->size () == 4);
+  vt_graph_param->add_node ("NEW1");
+  ACE_ASSERT (vt_graph_param->size () == 5);
 
 }
 
 void
 test_impl::pass_obj_graph_inout (
-    Supports_Test::graph * &graph_param
-    ACE_ENV_ARG_DECL)
+    Supports_Test::graph * &graph_param)
   ACE_THROW_SPEC ((
     CORBA::SystemException))
 {
 
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-  ACE_CHECK;
-  graph_param->add_node ("NEW3" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7);
-  ACE_CHECK;
+  ACE_ASSERT (graph_param->size () == 6);
+  graph_param->add_node ("NEW3");
+  ACE_ASSERT (graph_param->size () == 7);
 }
 
 void
 test_impl::pass_vt_graph_inout (
-    Supports_Test::vt_graph * &vt_graph_param
-    ACE_ENV_ARG_DECL)
+    Supports_Test::vt_graph * &vt_graph_param)
   ACE_THROW_SPEC ((
     CORBA::SystemException))
 {
 
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-  ACE_CHECK;
-  vt_graph_param->add_node ("NEW3" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_ASSERT (vt_graph_param->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7);
-  ACE_CHECK;
+  ACE_ASSERT (vt_graph_param->size () == 6);
+  vt_graph_param->add_node ("NEW3");
+  ACE_ASSERT (vt_graph_param->size () == 7);
 
 }
 
 void
-test_impl::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
+test_impl::start (void) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-test_impl::finish (ACE_ENV_SINGLE_ARG_DECL) 
+test_impl::finish (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 }
 
 
@@ -229,7 +198,7 @@ node_impl::node_impl (const char * name)
 
 // Add an edge from this node to neighbor.
 void
-node_impl::add_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL_NOT_USED)
+node_impl::add_edge (Supports_Test::Node * neighbor)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   degree_ (degree_ () + 1);
@@ -241,7 +210,7 @@ node_impl::add_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL_NOT_USED)
 
 // Remove the edge from this node to neighbor.
 void
-node_impl::remove_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL_NOT_USED)
+node_impl::remove_edge (Supports_Test::Node * neighbor)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (unsigned int i = 0; i < neighbors_ ().length (); i++)
@@ -254,14 +223,14 @@ node_impl::remove_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL_NOT_USED
 }
 
 void
-node_impl::change_weight (CORBA::Long new_weight ACE_ENV_ARG_DECL_NOT_USED)
+node_impl::change_weight (CORBA::Long new_weight)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   weight_ (new_weight);
 }
 
 void
-node_impl::print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+node_impl::print (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   cout << "  Name: " << name_ () << endl;
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index 9d0932b1d87..d3b0be1649b 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -22,16 +22,16 @@ public:
 
   node_impl (const char * name);
 
-  virtual void add_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL)
+  virtual void add_edge (Supports_Test::Node * neighbor)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void remove_edge (Supports_Test::Node * neighbor ACE_ENV_ARG_DECL)
+  virtual void remove_edge (Supports_Test::Node * neighbor)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void change_weight (CORBA::Long new_weight ACE_ENV_ARG_DECL)
+  void change_weight (CORBA::Long new_weight)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void print (ACE_ENV_SINGLE_ARG_DECL)
+  void print (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
@@ -59,17 +59,15 @@ class vt_graph_impl :
 
   vt_graph_impl (void);
 
-  vt_graph_impl (int num_nodes
-                 ACE_ENV_ARG_DECL);
+  vt_graph_impl (int num_nodes);
 
-  virtual CORBA::Long size (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long size (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void add_node (const char * name
-                         ACE_ENV_ARG_DECL)
+  virtual void add_node (const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void print (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void print (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
@@ -97,34 +95,28 @@ class test_impl :
 
   virtual ~test_impl (void);
 
-  virtual void pass_obj_graph_in (Supports_Test::graph * graph_param
-				  ACE_ENV_ARG_DECL)
+  virtual void pass_obj_graph_in (Supports_Test::graph * graph_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param
-				 ACE_ENV_ARG_DECL)
+  virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param
-				   ACE_ENV_ARG_DECL)
+  virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param
-				  ACE_ENV_ARG_DECL)
+  virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param
-				     ACE_ENV_ARG_DECL)
+  virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param
-				    ACE_ENV_ARG_DECL)
+  virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void start (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void finish (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void finish (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index 076d397dfa4..3f970fba886 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -40,44 +40,37 @@ int
 main (int argc, char *argv[])
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR," (%P|%t) Nil RootPOA\n"), 1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       /* Create, register factories */
 
       Supports_Test::Node_init * node_factory = 0;
-  
+
       ACE_NEW_RETURN (node_factory, node_init_impl, 1);
 
       CORBA::ValueFactory returned_factory =
         orb->register_value_factory (node_factory->tao_repository_id (),
-                                     node_factory
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-	
+                                     node_factory);
+
       ACE_ASSERT (returned_factory == 0);
 
       node_factory->_remove_ref ();
@@ -89,10 +82,8 @@ main (int argc, char *argv[])
 
       returned_factory =
         orb->register_value_factory (vt_graph_factory->tao_repository_id (),
-                                     vt_graph_factory
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-	
+                                     vt_graph_factory);
+
       ACE_ASSERT (returned_factory == 0);
 
       vt_graph_factory->_remove_ref ();
@@ -101,34 +92,29 @@ main (int argc, char *argv[])
       /* Check return values for register_value_factory */
 
       Supports_Test::Node_init * node_factory2 = 0;
-  
+
       ACE_NEW_RETURN (node_factory2, node_init_impl, 1);
 
       returned_factory =
         orb->register_value_factory (node_factory2->tao_repository_id (),
-                                     node_factory2
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-	
+                                     node_factory2);
+
       ACE_ASSERT (returned_factory == node_factory);
 
       node_factory2->_remove_ref ();
 
-	
+
       /* Get test object reference */
-	
-      CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      CORBA::Object_var tmp = orb->string_to_object (ior);
 
       Supports_Test::test_var my_test =
-        Supports_Test::test::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Supports_Test::test::_narrow (tmp.in ());
 
       if (CORBA::is_nil (my_test.in ()))
         ACE_ERROR_RETURN ((LM_DEBUG, "Nil Supports_Test::test obj ref <%s>\n", ior), 1);
 
-      my_test->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_test->start ();
 
       /* Perform test */
 
@@ -140,97 +126,70 @@ main (int argc, char *argv[])
           // object reference, stored as a graph_var. Increment the reference count
           // of the vt_graph_impl instance.
           vt_graph_impl * the_vt_graph = 0;
-          ACE_NEW_RETURN (the_vt_graph, vt_graph_impl (3 ACE_ENV_ARG_PARAMETER), 1);
+          ACE_NEW_RETURN (the_vt_graph, vt_graph_impl (3), 1);
           Supports_Test::vt_graph_var test_vt_graph = the_vt_graph;
 
           Supports_Test::graph_var test_graph =
-            the_vt_graph->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            the_vt_graph->_this ();
           if (CORBA::is_nil (test_graph.in ()))
             ACE_ERROR_RETURN ((LM_DEBUG, "Nil Supports_Test::graph obj ref\n"), 1);
           the_vt_graph->DefaultValueRefCountBase::_add_ref ();
 
           // At this point, test_vt_graph and test_graph refer to the same object.
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-          ACE_TRY_CHECK;
-          my_test->pass_vt_graph_in (test_vt_graph.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-          ACE_TRY_CHECK;
-
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 3);
-          ACE_TRY_CHECK;
-          my_test->pass_obj_graph_in (test_graph.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 4);
-          ACE_TRY_CHECK;
-
-          test_vt_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          test_graph->add_node ("NEW3" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_vt_graph->size () == 3);
+          my_test->pass_vt_graph_in (test_vt_graph.in ());
+          ACE_ASSERT (test_vt_graph->size () == 3);
+
+          ACE_ASSERT (test_graph->size () == 3);
+          my_test->pass_obj_graph_in (test_graph.in ());
+          ACE_ASSERT (test_graph->size () == 4);
+
+          test_vt_graph->add_node ("NEW2");
+
+          test_graph->add_node ("NEW3");
 
           // After the 'pass_vt_graph_out' call returns, test_vt_graph will refer to
           // a new object.
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-          ACE_TRY_CHECK;
-          my_test->pass_vt_graph_out (test_vt_graph.out () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_vt_graph->size () == 6);
+          my_test->pass_vt_graph_out (test_vt_graph.out ());
+          ACE_ASSERT (test_vt_graph->size () == 5);
 
           // 'test_graph' still refers to the original object, but after the
           // 'pass_obj_graph_out' call returns, it will refer to a new object,
           // residing on the server.
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-          ACE_TRY_CHECK;
-          my_test->pass_obj_graph_out (test_graph.out () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 5);
-          ACE_TRY_CHECK;
+          ACE_ASSERT (test_graph->size () == 6);
+          my_test->pass_obj_graph_out (test_graph.out ());
+          ACE_ASSERT (test_graph->size () == 5);
 
           // test_vt_graph and test_graph now refer to different objects.
-          test_vt_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          test_graph->add_node ("NEW2" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-          ACE_TRY_CHECK;
-          my_test->pass_vt_graph_inout (test_vt_graph.inout () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_vt_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7);
-          ACE_TRY_CHECK;
-
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 6);
-          ACE_TRY_CHECK;
-          my_test->pass_obj_graph_inout (test_graph.inout () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          ACE_ASSERT (test_graph->size (ACE_ENV_SINGLE_ARG_PARAMETER) == 7);
-          ACE_TRY_CHECK;
+          test_vt_graph->add_node ("NEW2");
+
+          test_graph->add_node ("NEW2");
+
+          ACE_ASSERT (test_vt_graph->size () == 6);
+          my_test->pass_vt_graph_inout (test_vt_graph.inout ());
+          ACE_ASSERT (test_vt_graph->size () == 7);
+
+          ACE_ASSERT (test_graph->size () == 6);
+          my_test->pass_obj_graph_inout (test_graph.inout ());
+          ACE_ASSERT (test_graph->size () == 7);
 
         }
 
-      my_test->finish (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      my_test->finish ();
 
       /* Shut down */
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Client (%P.%t) completed test successfully\n", id));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp
index f92eee137c5..c2e58aade67 100644
--- a/TAO/tests/OBV/Supports/server.cpp
+++ b/TAO/tests/OBV/Supports/server.cpp
@@ -8,22 +8,18 @@ const char * ior_output_file = "test.ior";
 int
 main (int argc, char * argv[])
 {
-	ACE_TRY_NEW_ENV
+	try
 	{
 
-		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
-		CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+		CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA");
 
-		PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+		PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in ());
 
 		if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR," (%P|%t) Nil RootPOA\n"), 1);
 
-		PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+    PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
 
 
 		/* Create, register factories */
@@ -32,8 +28,7 @@ main (int argc, char * argv[])
 
 		ACE_NEW_RETURN (node_factory, node_init_impl, 1);
 
-		CORBA::ValueFactory returned_factory = orb->register_value_factory (node_factory->tao_repository_id (), node_factory ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+		CORBA::ValueFactory returned_factory = orb->register_value_factory (node_factory->tao_repository_id (), node_factory);
 
 		ACE_ASSERT (returned_factory == 0);
 
@@ -43,8 +38,7 @@ main (int argc, char * argv[])
 
 		ACE_NEW_RETURN (vt_graph_factory, vt_graph_init_impl, 1);
 
-		returned_factory = orb->register_value_factory (vt_graph_factory->tao_repository_id (), vt_graph_factory ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+		returned_factory = orb->register_value_factory (vt_graph_factory->tao_repository_id (), vt_graph_factory);
 
 		ACE_ASSERT (returned_factory == 0);
 
@@ -56,11 +50,9 @@ main (int argc, char * argv[])
 
     //PortableServer::ServantBase_var owner_transfer = a_test_impl;
 
-      Supports_Test::test_ptr a_test = a_test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+      Supports_Test::test_ptr a_test = a_test_impl->_this ();
 
-      CORBA::String_var ior = orb->object_to_string (a_test ACE_ENV_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+      CORBA::String_var ior = orb->object_to_string (a_test);
 
       FILE * output_file = ACE_OS::fopen (ior_output_file, "w");
 
@@ -70,30 +62,23 @@ main (int argc, char * argv[])
 
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      a_test_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      a_test_impl->_remove_ref ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (0, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (0, 0);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-		ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Server (%P.%t) completed test successfully\n"));
 	}
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp
index 25da5405c51..1fc12bd96bb 100644
--- a/TAO/tests/OBV/TC_Alignment/client.cpp
+++ b/TAO/tests/OBV/TC_Alignment/client.cpp
@@ -3,8 +3,8 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (TC_Alignment, 
-           client, 
+ACE_RCSID (TC_Alignment,
+           client,
            "$Id$")
 
 static const char *ior_input_file = "file://test.ior";
@@ -18,8 +18,7 @@ int debug = 0;
 int do_shutdown = 0;
 
 int
-register_factories (CORBA::ORB_ptr orb
-                    ACE_ENV_ARG_DECL)
+register_factories (CORBA::ORB_ptr orb)
 {
   // Create and register factories.
 
@@ -29,9 +28,7 @@ register_factories (CORBA::ORB_ptr orb
                   -1);
 
   orb->register_value_factory (factory1->tao_repository_id (),
-                               factory1
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                               factory1);
 
   factory1->_remove_ref ();
 
@@ -41,9 +38,7 @@ register_factories (CORBA::ORB_ptr orb
                   -1);
 
   orb->register_value_factory (factory3->tao_repository_id (),
-                               factory3
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                               factory3);
 
   factory3->_remove_ref ();
 
@@ -53,9 +48,7 @@ register_factories (CORBA::ORB_ptr orb
                   -1);
 
   orb->register_value_factory (factory5->tao_repository_id (),
-                               factory5
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                               factory5);
 
   factory5->_remove_ref ();
 
@@ -65,22 +58,17 @@ register_factories (CORBA::ORB_ptr orb
                   -1);
 
   orb->register_value_factory (factory7->tao_repository_id (),
-                               factory7
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                               factory7);
 
   factory7->_remove_ref ();
   return 0;
 }
 
 int
-run_test (test_ptr objref, 
-          CORBA::Long offset
-          ACE_ENV_ARG_DECL)
+run_test (test_ptr objref,
+          CORBA::Long offset)
 {
-  CORBA::Any_var result = objref->get_value (offset
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Any_var result = objref->get_value (offset);
 
   CORBA::Boolean status = 0;
   CORBA::Long member_value = 0;
@@ -159,30 +147,24 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int 
+int
 main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-                                            argv, 
-                                            "" 
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+                                            argv,
+                                            "");
 
       if (parse_args (argc, argv) != 0)
         {
           return 1;
         }
 
-      CORBA::Object_var obj = 
-        orb->string_to_object (ior_input_file
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj =
+        orb->string_to_object (ior_input_file);
 
-      int status = register_factories (orb.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int status = register_factories (orb.in ());
 
       if (status != 0)
         {
@@ -195,14 +177,11 @@ main (int argc, char* argv[])
           return -1;
         }
 
-      test_var objref = test::_narrow (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var objref = test::_narrow (obj.in ());
 
       for (CORBA::Long i = 1; i < 8; i += 2)
         {
-          status = run_test (objref.in (), i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          status = run_test (objref.in (), i);
 
           if (status == 0)
             {
@@ -218,21 +197,17 @@ main (int argc, char* argv[])
         }
 
       if (do_shutdown)
-        { 
-          objref->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+        {
+          objref->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "exception:");
+      ex._tao_print_exception ("exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp
index ba59b23fa58..8d7bc50a35d 100644
--- a/TAO/tests/OBV/TC_Alignment/server.cpp
+++ b/TAO/tests/OBV/TC_Alignment/server.cpp
@@ -12,19 +12,15 @@ const char *ior_output_file = "test.ior";
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         {
@@ -34,24 +30,18 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-              orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+              orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Activated as <%s>\n",
@@ -76,22 +66,17 @@ main (int argc, char *argv[])
                 ACE_OS::fclose (output_file);
               }
 
-      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 ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Server: exception caught - ");
+      ex._tao_print_exception ("Server: exception caught - ");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp
index b495f0bd3c1..c43b35e717f 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.cpp
+++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp
@@ -12,8 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Any *
-test_i::get_value (CORBA::Long offset
-                   ACE_ENV_ARG_DECL)
+test_i::get_value (CORBA::Long offset)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_ptr retval_ptr = 0;
@@ -72,7 +71,7 @@ test_i::get_value (CORBA::Long offset
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.h b/TAO/tests/OBV/TC_Alignment/test_i.h
index 978cd770426..d8cbb71f070 100644
--- a/TAO/tests/OBV/TC_Alignment/test_i.h
+++ b/TAO/tests/OBV/TC_Alignment/test_i.h
@@ -39,11 +39,10 @@ class test_i :public virtual POA_test
 public:
   test_i (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Any *get_value (CORBA::Long offset
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Any *get_value (CORBA::Long offset)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
index 43601e5c165..0c39a541611 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp
@@ -16,7 +16,6 @@ Test_impl::op1 (
     ::OBV_TruncatableTest::BaseValue * iv,
     ::OBV_TruncatableTest::BaseValue_out ov,
     char *& desc
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -45,7 +44,6 @@ Test_impl::op2 (
     const char * id,
     ::OBV_TruncatableTest::TValue1_out ov,
     char *& desc
-    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
@@ -74,7 +72,6 @@ Test_impl::op3 (
   ::OBV_TruncatableTest::TValue4 * iv,
   ::OBV_TruncatableTest::TValue4_out ov,
   char *& desc
-  ACE_ENV_ARG_DECL
 )
 ACE_THROW_SPEC ((
   ::CORBA::SystemException
@@ -112,7 +109,6 @@ Test_impl::op4 (
   ::OBV_TruncatableTest::TValue4 * iv3,
   ::OBV_TruncatableTest::TValue1 * iv4,
   char *& desc
-  ACE_ENV_ARG_DECL
   )
 ACE_THROW_SPEC ((
   ::CORBA::SystemException
@@ -163,7 +159,7 @@ Test_impl::op5 (const CORBA::Any& val,
                 const char * id,
                 ::OBV_TruncatableTest::TValue1_out ov,
                 char *& desc
-                ACE_ENV_ARG_DECL )
+ )
   ACE_THROW_SPEC ((
     ::CORBA::SystemException
   ))
@@ -198,8 +194,8 @@ Test_impl::op5 (const CORBA::Any& val,
 }
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
index 9ae2aa573af..14e2c7bfeee 100644
--- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
+++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h
@@ -36,7 +36,6 @@ public:
         ::OBV_TruncatableTest::BaseValue * iv,
         ::OBV_TruncatableTest::BaseValue_out ov,
         char *& desc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -47,7 +46,6 @@ public:
         const char * id,
         ::OBV_TruncatableTest::TValue1_out ov,
         char *& desc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -58,7 +56,6 @@ public:
         ::OBV_TruncatableTest::TValue4 * iv,
         ::OBV_TruncatableTest::TValue4_out ov,
         char *& desc
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         ::CORBA::SystemException
@@ -72,7 +69,6 @@ public:
       ::OBV_TruncatableTest::TValue4 * iv3,
       ::OBV_TruncatableTest::TValue1 * iv4,
       char *& desc
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       ::CORBA::SystemException
@@ -82,12 +78,12 @@ public:
                     const char * id,
                     ::OBV_TruncatableTest::TValue1_out ov,
                     char *& desc
-                    ACE_ENV_ARG_DECL )
+ )
     ACE_THROW_SPEC ((
       ::CORBA::SystemException
     ));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index 4f75c2cd7c8..372e751b0e2 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -57,11 +57,10 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -74,9 +73,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (base_factory->tao_repository_id (),
-                                   base_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   base_factory);
       base_factory->_remove_ref (); // release ownership
 
 
@@ -87,9 +84,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (value1_factory->tao_repository_id (),
-                                   value1_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value1_factory);
       value1_factory->_remove_ref ();
 
 
@@ -100,9 +95,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (value2_factory->tao_repository_id (),
-                                   value2_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value2_factory);
       value2_factory->_remove_ref ();
 
 
@@ -112,9 +105,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (value3_factory->tao_repository_id (),
-                                   value3_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value3_factory);
       value3_factory->_remove_ref ();
 
       OBV_TruncatableTest::TValue4_init *value4_factory = 0;
@@ -123,9 +114,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (value4_factory->tao_repository_id (),
-                                   value4_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value4_factory);
       value4_factory->_remove_ref ();
 
       OBV_TruncatableTest::TValue5_init *value5_factory = 0;
@@ -134,9 +123,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (value5_factory->tao_repository_id (),
-                                   value5_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value5_factory);
       value5_factory->_remove_ref ();
 
       OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0;
@@ -145,19 +132,15 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (nested_value_factory->tao_repository_id (),
-                                   nested_value_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   nested_value_factory);
       nested_value_factory->_remove_ref ();
 
       // Obtain reference to the object
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       OBV_TruncatableTest::Test_var test =
-        OBV_TruncatableTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        OBV_TruncatableTest::Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (test.in ()))
         {
@@ -181,10 +164,8 @@ main (int argc, char *argv[])
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
 
-        test->op1 ("case1", &v1, ov1.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
+        test->op1 ("case1", &v1, ov1.out (), desc.inout ());
 
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case1: A<-tB, truncate B to A"));
@@ -209,9 +190,7 @@ main (int argc, char *argv[])
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
 
-        test->op1 ("case2", &v2, ov2.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        test->op1 ("case2", &v2, ov2.out (), desc.inout ());
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case2: A<-tB<-tC, truncate C to A"));
@@ -228,9 +207,7 @@ main (int argc, char *argv[])
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
 
-        test->op2 (&v2, "case3", otv1.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        test->op2 (&v2, "case3", otv1.out (), desc.inout ());
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case3: A<-tB<-tC, truncate C to B"));
@@ -254,9 +231,7 @@ main (int argc, char *argv[])
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
 
-        test->op2 (&itv1b, "case3b", otv1b.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        test->op2 (&itv1b, "case3b", otv1b.out (), desc.inout ());
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                 "case3b: A<-tB, truncatable but no truncation"));
@@ -275,7 +250,7 @@ main (int argc, char *argv[])
         v3.data3 (99 * 3);
 
         bool caught_expected_exception = false;
-        ACE_TRY_EX (value3)
+        try
           {
             OBV_TruncatableTest::BaseValue_var ov3;
             desc = CORBA::string_dup
@@ -283,17 +258,14 @@ main (int argc, char *argv[])
             if (verbose)
               ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 4: %s: "),
                           ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
-            test->op1 ("case4", &v3, ov3.out (), desc.inout ()
-                       ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK_EX (value3);
+            test->op1 ("case4", &v3, ov3.out (), desc.inout ());
           }
-        ACE_CATCH (CORBA::MARSHAL, v3ex)
+        catch (const CORBA::MARSHAL&)
           {
             if (verbose)
               ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("passed\n")));
             caught_expected_exception = true;
           }
-        ACE_ENDTRY;
 
         if ( ! caught_expected_exception)
           {
@@ -324,9 +296,7 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 5: %s: "),
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
-        test->op1 ("case5", &v5, ov5.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        test->op1 ("case5", &v5, ov5.out (), desc.inout ());
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
           "case5: A<-tB<-tC, B & C have nested value type, truncate C to A"));
@@ -343,9 +313,7 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 6: %s: "),
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
-        test->op3 ("case6", &v5, otv4.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        test->op3 ("case6", &v5, otv4.out (), desc.inout ());
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
            "case6: A<-tB<-tC, B & C have nested value type, truncate C to B"));
@@ -368,9 +336,7 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 7: %s: "),
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
-        test->op1 ("case7", &iv, ov.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        test->op1 ("case7", &iv, ov.out (), desc.inout ());
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                 "case7: A<-tB, B has no data, truncate B to A"));
@@ -412,9 +378,7 @@ main (int argc, char *argv[])
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
         OBV_TruncatableTest::BaseValue_var ov
-          = test->op4 ("case8", &v1, 5, &v2, &v3, &v4, desc.inout ()
-                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          = test->op4 ("case8", &v1, 5, &v2, &v3, &v4, desc.inout ());
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                  "case8: multiple IN truncatable valuetype parameters"
@@ -442,10 +406,8 @@ main (int argc, char *argv[])
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
 
-        test->op2 (&v1, "case9", ov1.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
+        test->op2 (&v1, "case9", ov1.out (), desc.inout ());
 
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case9: A<-tB, truncate unknown B to A"));
@@ -472,10 +434,8 @@ main (int argc, char *argv[])
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
 
-        test->op5 (a, "case10", ov1.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
+        test->op5 (a, "case10", ov1.out (), desc.inout ());
 
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case10: A<-tB, known truncatable via Any"));
@@ -502,10 +462,8 @@ main (int argc, char *argv[])
                       ACE_TEXT_CHAR_TO_TCHAR(desc.in())));
         pretest = fail;
 
-        test->op5 (a, "case11", ov1.out (), desc.inout ()
-                   ACE_ENV_ARG_PARAMETER);
+        test->op5 (a, "case11", ov1.out (), desc.inout ());
 
-        ACE_TRY_CHECK;
 
         VERIFY (! ACE_OS::strcmp (desc.in (),
                                   "case11: A<-tB, unknown truncatable via Any"));
@@ -520,11 +478,9 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - shutdown orb \n"));
 
 
-      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       if (fail)
         {
@@ -534,13 +490,11 @@ main (int argc, char *argv[])
       else
         ACE_DEBUG((LM_DEBUG, "(%P|%t) client: test passed \n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp
index c097af17c86..9109575558e 100644
--- a/TAO/tests/OBV/Truncatable/server.cpp
+++ b/TAO/tests/OBV/Truncatable/server.cpp
@@ -38,19 +38,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,8 +55,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       OBV_TruncatableTest::Test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,8 +83,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       OBV_TruncatableTest::BaseValue_init *base_factory = 0;
       ACE_NEW_RETURN (base_factory,
@@ -98,9 +91,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (base_factory->tao_repository_id (),
-                                   base_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   base_factory);
       base_factory->_remove_ref (); // release ownership
 
       OBV_TruncatableTest::TValue1_init *value1_factory = 0;
@@ -109,9 +100,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (value1_factory->tao_repository_id (),
-                                   value1_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value1_factory);
       value1_factory->_remove_ref ();
 
       OBV_TruncatableTest::TValue4_init *value4_factory = 0;
@@ -120,9 +109,7 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (value4_factory->tao_repository_id (),
-                                   value4_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   value4_factory);
       value4_factory->_remove_ref ();
 
       OBV_TruncatableTest::NestedValue_init *nested_value_factory = 0;
@@ -131,29 +118,22 @@ main (int argc, char *argv[])
                       1);
 
       orb->register_value_factory (nested_value_factory->tao_repository_id (),
-                                   nested_value_factory
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   nested_value_factory);
       nested_value_factory->_remove_ref ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index 2c74111f3f3..ca91b357be5 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -31,8 +31,7 @@ void rotate_string(char *s)
 
 
 VBlong *
-Test_impl::basic_op1 (VBlong * p1, VBlong *& p2, VBlong_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+Test_impl::basic_op1 (VBlong * p1, VBlong *& p2, VBlong_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_RETURN (p3,
@@ -52,8 +51,7 @@ Test_impl::basic_op1 (VBlong * p1, VBlong *& p2, VBlong_out p3
 vb_basic::M_VBlong *
 Test_impl::basic_op2 (vb_basic::M_VBlong * p1,
                       vb_basic::M_VBlong *& p2,
-                      vb_basic::M_VBlong_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      vb_basic::M_VBlong_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_RETURN (p3,
@@ -72,8 +70,7 @@ Test_impl::basic_op2 (vb_basic::M_VBlong * p1,
 
 ::CORBA::Long
 Test_impl::basic_op3 (::CORBA::Long p1, ::CORBA::Long& p2,
-                      ::CORBA::Long_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      ::CORBA::Long_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   p3 = p2 * 5;
@@ -87,8 +84,7 @@ Test_impl::basic_op3 (::CORBA::Long p1, ::CORBA::Long& p2,
 VBstring *
 Test_impl::string_op1 (::VBstring * p1,
                        ::VBstring *& p2,
-                       ::VBstring_out p3
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       ::VBstring_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   rotate_string (p2->_boxed_inout ());
@@ -110,8 +106,7 @@ Test_impl::string_op1 (::VBstring * p1,
 char *
 Test_impl::string_op2 (const char * p1,
                        char *& p2,
-                       CORBA::String_out p3
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       CORBA::String_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   rotate_string (p2);
@@ -131,8 +126,7 @@ Test_impl::string_op2 (const char * p1,
 ::VBseqlong *
 Test_impl::seq_op1 (::VBseqlong * p1,
                     ::VBseqlong *& p2,
-                    ::VBseqlong_out p3
-                    ACE_ENV_ARG_DECL_NOT_USED)
+                    ::VBseqlong_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_RETURN (p3,
@@ -160,8 +154,7 @@ Test_impl::seq_op1 (::VBseqlong * p1,
 void
 Test_impl::seq_op2 (const ::TDseqlong & p1,
                     ::TDseqlong & p2,
-                    ::TDseqlong_out p3
-                    ACE_ENV_ARG_DECL_NOT_USED)
+                    ::TDseqlong_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW (p3,
@@ -181,8 +174,7 @@ Test_impl::seq_op2 (const ::TDseqlong & p1,
 ::VBfixed_struct1 *
 Test_impl::struct_op1 (::VBfixed_struct1 * p1,
                        ::VBfixed_struct1 *& p2,
-                       ::VBfixed_struct1_out p3
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       ::VBfixed_struct1_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_RETURN (p3,
@@ -209,8 +201,7 @@ Test_impl::struct_op1 (::VBfixed_struct1 * p1,
 void
 Test_impl::struct_op2 (const ::Fixed_Struct1 & p1,
                        ::Fixed_Struct1 & p2,
-                       ::Fixed_Struct1_out p3
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       ::Fixed_Struct1_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   p3 = p1;
@@ -223,8 +214,7 @@ Test_impl::struct_op2 (const ::Fixed_Struct1 & p1,
 ::VBvariable_struct1 *
 Test_impl::struct_op3 (::VBvariable_struct1 * p1,
                        ::VBvariable_struct1 *& p2,
-                       ::VBvariable_struct1_out p3
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       ::VBvariable_struct1_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // transform p2 values
@@ -247,8 +237,7 @@ Test_impl::struct_op3 (::VBvariable_struct1 * p1,
 void
 Test_impl::struct_op4 (const ::Variable_Struct1 & p1,
                        ::Variable_Struct1 & p2,
-                       ::Variable_Struct1_out p3
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       ::Variable_Struct1_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW (p3,
@@ -261,11 +250,10 @@ Test_impl::struct_op4 (const ::Variable_Struct1 & p1,
 }
 
 
-::VBlongarray * 
+::VBlongarray *
 Test_impl::array_op1 (::VBlongarray * p1,
                       ::VBlongarray *& p2,
-                      ::VBlongarray_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      ::VBlongarray_out p3)
                   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long array_len = sizeof(LongArray) / sizeof(CORBA::Long);
@@ -290,8 +278,7 @@ Test_impl::array_op1 (::VBlongarray * p1,
 void
 Test_impl::array_op2 (const ::LongArray p1,
                       ::LongArray p2,
-                      ::LongArray_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      ::LongArray_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long array_len = sizeof(LongArray) / sizeof(CORBA::Long);
@@ -312,8 +299,7 @@ Test_impl::array_op2 (const ::LongArray p1,
 ::VBstringarray *
 Test_impl::array_op3 (::VBstringarray * p1,
                       ::VBstringarray *& p2,
-                      ::VBstringarray_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      ::VBstringarray_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice );
@@ -340,8 +326,7 @@ Test_impl::array_op3 (::VBstringarray * p1,
 void
 Test_impl::array_op4 (const ::StringArray p1,
                       ::StringArray p2,
-                      ::StringArray_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      ::StringArray_out p3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   long array_len = sizeof( ::StringArray  ) / sizeof( StringArray_slice );
@@ -369,8 +354,7 @@ Test_impl::array_op4 (const ::StringArray p1,
 ::VBfixed_union1 *
 Test_impl::union_op1 (::VBfixed_union1 * p1,
                       ::VBfixed_union1 *& p2,
-                      ::VBfixed_union1_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      ::VBfixed_union1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long longValue;
@@ -415,8 +399,7 @@ Test_impl::union_op1 (::VBfixed_union1 * p1,
 void
 Test_impl::union_op2 (const ::Fixed_Union1 & p1,
                       ::Fixed_Union1 & p2,
-                      ::Fixed_Union1_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      ::Fixed_Union1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   p3 = p1;
@@ -436,8 +419,7 @@ Test_impl::union_op2 (const ::Fixed_Union1 & p1,
 ::VBvariable_union1 *
 Test_impl::union_op3 (::VBvariable_union1 * p1,
                       ::VBvariable_union1 *& p2,
-                      ::VBvariable_union1_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      ::VBvariable_union1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long longValue;
@@ -485,8 +467,7 @@ Test_impl::union_op3 (::VBvariable_union1 * p1,
 void
 Test_impl::union_op4 (const ::Variable_Union1 & p1,
                       ::Variable_Union1 & p2,
-                      ::Variable_Union1_out p3
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      ::Variable_Union1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var stringValue;
@@ -521,8 +502,8 @@ Test_impl::union_op4 (const ::Variable_Union1 & p1,
 
 
 void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h
index c870e7270ef..ec82e9947b7 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.h
+++ b/TAO/tests/OBV/ValueBox/Test_impl.h
@@ -29,124 +29,105 @@ public:
   virtual VBlong * basic_op1 (
                        VBlong * p1,
                        VBlong *& p2,
-                       VBlong_out p3
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       VBlong_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual vb_basic::M_VBlong * basic_op2(vb_basic::M_VBlong * p1,
                                          vb_basic::M_VBlong *& p2,
-                                         vb_basic::M_VBlong_out p3
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         vb_basic::M_VBlong_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::CORBA::Long basic_op3 (
                                    ::CORBA::Long p1,
                                    ::CORBA::Long& p2,
-                                   ::CORBA::Long_out p3
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   ::CORBA::Long_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual VBstring * string_op1 (::VBstring * p1,
                                  ::VBstring *& p2,
-                                 ::VBstring_out p3
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 ::VBstring_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * string_op2 (const char * p1,
                              char *& p2,
-                             CORBA::String_out p3
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             CORBA::String_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::VBseqlong * seq_op1 (::VBseqlong * p1,
                                  ::VBseqlong *& p2,
-                                 ::VBseqlong_out p3
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                                 ::VBseqlong_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void seq_op2 (const ::TDseqlong & p1,
                         ::TDseqlong & p2,
-                        ::TDseqlong_out p3
-                        ACE_ENV_ARG_DECL_NOT_USED)
+                        ::TDseqlong_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::VBfixed_struct1 * struct_op1 (
                                           ::VBfixed_struct1 * p1,
                                           ::VBfixed_struct1 *& p2,
-                                          ::VBfixed_struct1_out p3
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          ::VBfixed_struct1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void struct_op2 (const ::Fixed_Struct1 & p1,
                            ::Fixed_Struct1 & p2,
-                           ::Fixed_Struct1_out p3
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           ::Fixed_Struct1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::VBvariable_struct1 * struct_op3 (::VBvariable_struct1 * p1,
                                              ::VBvariable_struct1 *& p2,
-                                             ::VBvariable_struct1_out p3
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+                                             ::VBvariable_struct1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   virtual void struct_op4 (const ::Variable_Struct1 & p1,
                            ::Variable_Struct1 & p2,
-                           ::Variable_Struct1_out p3
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           ::Variable_Struct1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::VBlongarray * array_op1 (::VBlongarray * p1,
                                      ::VBlongarray *& p2,
-                                     ::VBlongarray_out p3
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     ::VBlongarray_out p3)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   virtual void array_op2 (const ::LongArray p1,
                           ::LongArray p2,
-                          ::LongArray_out p3
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          ::LongArray_out p3)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::VBstringarray * array_op3 (::VBstringarray * p1,
                                        ::VBstringarray *& p2,
-                                       ::VBstringarray_out p3
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                       ::VBstringarray_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void array_op4 (const ::StringArray p1,
                           ::StringArray p2,
-                          ::StringArray_out p3
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          ::StringArray_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::VBfixed_union1 * union_op1 (::VBfixed_union1 * p1,
                                         ::VBfixed_union1 *& p2,
-                                        ::VBfixed_union1_out p3
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        ::VBfixed_union1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void union_op2 (const ::Fixed_Union1 & p1,
                           ::Fixed_Union1 & p2,
-                          ::Fixed_Union1_out p3
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          ::Fixed_Union1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual ::VBvariable_union1 * union_op3 (::VBvariable_union1 * p1,
                                            ::VBvariable_union1 *& p2,
-                                           ::VBvariable_union1_out p3
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           ::VBvariable_union1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void union_op4 (const ::Variable_Union1 & p1,
                           ::Variable_Union1 & p2,
-                          ::Variable_Union1_out p3
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          ::Variable_Union1_out p3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index bc264fa3110..fef0f2885fe 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -270,7 +270,7 @@ int test_basic_invocations (Test * test_object)
 {
     int fail = 0;
 
-    ACE_TRY_NEW_ENV
+    try
       {
 
         //============================================================
@@ -292,7 +292,6 @@ int test_basic_invocations (Test * test_object)
 
         VBlong_var result =
           test_object->basic_op1(p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p2->_value () == (53*3));
         OBV_VERITY (p3->_value () == (53*5));
@@ -319,7 +318,6 @@ int test_basic_invocations (Test * test_object)
 
         vb_basic::M_VBlong_var mresult =
           test_object->basic_op2(mp1, mp2, mp3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (mp2->_value () == (53*3));
         OBV_VERITY (mp3->_value () == (53*5));
@@ -335,7 +333,6 @@ int test_basic_invocations (Test * test_object)
         long lresult =
           test_object->basic_op3(p1->_boxed_in(), p2->_boxed_inout(),
                                  p3->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p2->_value () == (93*3));
         OBV_VERITY (p3->_value () == (93*5));
@@ -349,18 +346,17 @@ int test_basic_invocations (Test * test_object)
         mp2->_remove_ref ();
         mp3->_remove_ref ();
       }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ex, "test_basic_invocations");
+      ex._tao_print_exception ("test_basic_invocations");
       fail = 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_basic_invocations: caught a C++ exception \n"));
       fail = 1;
     }
-  ACE_ENDTRY;
 
   return fail;
 }
@@ -470,7 +466,7 @@ int test_boxed_string_invocations (Test * test_object)
 {
     int fail = 0;
 
-    ACE_TRY_NEW_ENV
+    try
       {
 
         //============================================================
@@ -491,7 +487,6 @@ int test_boxed_string_invocations (Test * test_object)
         OBV_VERITY (strcmp(p2->_value (), "string2") == 0);
 
         VBstring_var result = test_object->string_op1(p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (strcmp(p2->_value (), "2string") == 0);
         OBV_VERITY (strcmp(p3->_value (), "2string") == 0);
@@ -506,7 +501,6 @@ int test_boxed_string_invocations (Test * test_object)
         CORBA::String_var sresult =
           test_object->string_op2(p1->_boxed_in(), p2->_boxed_inout(),
                                   p3->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY (strcmp(p2->_value (), "2second string") == 0);
         OBV_VERITY (strcmp(p3->_value (), "2second string") == 0);
@@ -517,19 +511,18 @@ int test_boxed_string_invocations (Test * test_object)
         p3->_remove_ref ();
 
       }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ex, "test_boxed_string_invocations");
+      ex._tao_print_exception ("test_boxed_string_invocations");
       fail = 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_string_invocations: "
                   "caught a C++ exception \n"));
       fail = 1;
     }
-  ACE_ENDTRY;
 
   return fail;
 }
@@ -621,7 +614,7 @@ int test_boxed_sequence_invocations (Test * test_object)
 {
     int fail = 0;
 
-    ACE_TRY_NEW_ENV
+    try
       {
 
         //============================================================
@@ -655,7 +648,6 @@ int test_boxed_sequence_invocations (Test * test_object)
         OBV_VERITY ((*p1)[3] ==  7);
 
         VBseqlong_var result = test_object->seq_op1(p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY ((*p2)[0] == 100*3);
         OBV_VERITY ((*p2)[1] == 99*3);
@@ -674,7 +666,6 @@ int test_boxed_sequence_invocations (Test * test_object)
 
         test_object->seq_op2(p1->_boxed_in(), p2->_boxed_inout(),
                              p3->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY ((*p2)[0] == 100*3*3);
         OBV_VERITY ((*p2)[1] == 99*3*3);
@@ -688,19 +679,18 @@ int test_boxed_sequence_invocations (Test * test_object)
         p2->_remove_ref ();
         p3->_remove_ref ();
       }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ex, "test_boxed_sequence_invocations");
+      ex._tao_print_exception ("test_boxed_sequence_invocations");
       fail = 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_sequence_invocations: "
                   "caught a C++ exception \n"));
       fail = 1;
     }
-  ACE_ENDTRY;
 
   return fail;
 }
@@ -814,7 +804,7 @@ int test_boxed_struct_invocations (Test * test_object)
 {
     int fail = 0;
 
-    ACE_TRY_NEW_ENV
+    try
       {
 
         //============================================================
@@ -848,7 +838,6 @@ int test_boxed_struct_invocations (Test * test_object)
         OBV_VERITY ((p1->abstruct()).s2 ==  21);
 
         VBfixed_struct1_var result = test_object->struct_op1(p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p2->l() == 92*3);
         OBV_VERITY ((p2->abstruct()).s1 == 171*3);
@@ -914,7 +903,6 @@ int test_boxed_struct_invocations (Test * test_object)
         OBV_VERITY (strcmp(p4->str(), "variable1") == 0);
 
         VBvariable_struct1_var result2 = test_object->struct_op3(p4, p5, p6);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p5->l() == vs2.l*3);
         OBV_VERITY (strcmp(p5->str(), "2variable") == 0);
@@ -933,7 +921,6 @@ int test_boxed_struct_invocations (Test * test_object)
 
         test_object->struct_op4(p4->_boxed_in(), p5->_boxed_inout(),
                                 p6->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p5->l() == vs2.l*3*3);
         OBV_VERITY (strcmp(p5->str(), "e2variabl") == 0);
@@ -946,19 +933,18 @@ int test_boxed_struct_invocations (Test * test_object)
         p5->_remove_ref ();
         p6->_remove_ref ();
       }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ex, "test_boxed_struct_invocations");
+      ex._tao_print_exception ("test_boxed_struct_invocations");
       fail = 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_struct_invocations: "
                   "caught a C++ exception \n"));
       fail = 1;
     }
-  ACE_ENDTRY;
 
   return fail;
 }
@@ -1042,7 +1028,7 @@ int test_boxed_array_invocations (Test * test_object)
 {
     int fail = 0;
 
-    ACE_TRY_NEW_ENV
+    try
       {
         //============================================================
         // Array (fixed)
@@ -1076,7 +1062,6 @@ int test_boxed_array_invocations (Test * test_object)
         VBlongarray *p3;
 
         VBlongarray_var result = test_object->array_op1 (p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY ((*p2)[0] == (3101*3)
                 && (*p2)[1] == (3202*3)
@@ -1100,7 +1085,6 @@ int test_boxed_array_invocations (Test * test_object)
 #if 0
         test_object->array_op2(p1->_boxed_in(), p2->_boxed_inout(),
                                p3->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY ((*p2)[0] == (3101*3*3)
                 && (*p2)[1] == (3202*3*3)
@@ -1188,19 +1172,18 @@ int test_boxed_array_invocations (Test * test_object)
         p6->_remove_ref ();
 
       }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ex, "test_boxed_array_invocations");
+      ex._tao_print_exception ("test_boxed_array_invocations");
       fail = 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_array_invocations: "
                   "caught a C++ exception \n"));
       fail = 1;
     }
-  ACE_ENDTRY;
 
   return fail;
 }
@@ -1292,7 +1275,7 @@ int test_boxed_union_invocations (Test * test_object)
 {
     int fail = 0;
 
-    ACE_TRY_NEW_ENV
+    try
       {
         //============================================================
         // Union (fixed)
@@ -1330,7 +1313,6 @@ int test_boxed_union_invocations (Test * test_object)
         VBfixed_union1 * p3;
 
         VBfixed_union1_var result = test_object->union_op1 (p1, p2, p3);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p2->_d () == 2);
         OBV_VERITY (p2->m2 () == 789*3);
@@ -1391,7 +1373,6 @@ int test_boxed_union_invocations (Test * test_object)
         VBvariable_union1 * p6;
 
         VBvariable_union1_var result2 = test_object->union_op3 (p4, p5, p6);
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p5->_d () == 2);
         OBV_VERITY (strcmp(p5->m2 (), "aabracadabr") == 0);
@@ -1409,7 +1390,6 @@ int test_boxed_union_invocations (Test * test_object)
 
         test_object->union_op4(p4->_boxed_in(), p5->_boxed_inout(),
                                p6->_boxed_out());
-        ACE_TRY_CHECK;
 
         OBV_VERITY (p5->_d () == 2);
         OBV_VERITY (strcmp(p5->m2 (), "raabracadab") == 0);
@@ -1422,19 +1402,18 @@ int test_boxed_union_invocations (Test * test_object)
         p6->_remove_ref ();
 
       }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ex, "test_boxed_union_invocations");
+      ex._tao_print_exception ("test_boxed_union_invocations");
       fail = 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) test_boxed_union_invocations: "
                   "caught a C++ exception \n"));
       fail = 1;
     }
-  ACE_ENDTRY;
 
   return fail;
 }
@@ -1446,22 +1425,18 @@ main (int argc, char *argv[])
   CORBA::ORB_var orb;
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (init)
+  try
     {
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (init);
+      orb = CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Obtain reference to the object.
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (init);
+        orb->string_to_object(ior);
 
-      test_object = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (init);
+      test_object = Test::_narrow(tmp.in ());
 
       if (CORBA::is_nil (test_object.in ()))
       {
@@ -1471,18 +1446,17 @@ main (int argc, char *argv[])
                           1);
       }
     }
-  ACE_CATCH (CORBA::Exception, ex)
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION  (ex, "Initialization failure");
+      ex._tao_print_exception ("Initialization failure");
       return 1;
     }
-  ACE_CATCHALL
+  catch (...)
     {
       ACE_DEBUG ((LM_DEBUG,
                 "(%P|%t) Initialization failure: caught a C++ exception \n"));
       return 1;
     }
-  ACE_ENDTRY;
 
   int fail = 0;
 
@@ -1511,23 +1485,19 @@ main (int argc, char *argv[])
   fail += test_boxed_union_invocations (test_object.in ());
 
 
-  ACE_TRY_EX (cleanup)
+  try
     {
-      test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (cleanup);
+      test_object->shutdown ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (cleanup);
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return (fail) ?  1 : 0;
 }
diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp
index 4eaa84c6db0..48ae95f73b4 100644
--- a/TAO/tests/OBV/ValueBox/server.cpp
+++ b/TAO/tests/OBV/ValueBox/server.cpp
@@ -40,19 +40,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,8 +57,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,12 +69,10 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var test = test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -90,26 +84,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
index 346ca6ae926..f02243113b2 100644
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
@@ -131,7 +131,7 @@ testBug1459 (int , ACE_TCHAR *[])
   }
   catch(const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Unhandled exception caught");
+      ex._tao_print_exception ("Unhandled exception caught");
       return -1;
     }
   catch(...)
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index fe629b8d48d..750c68132fe 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -101,8 +101,7 @@ int DllOrb::init (int argc, char *argv[])
   }
   catch(CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ex,
-                         ACE_TEXT ("(%P|%t) init failed:"));
+    ex._tao_print_exception (ACE_TEXT ("(%P|%t) init failed:"));
     return -1;
   }
   catch(...)
@@ -144,8 +143,7 @@ int DllOrb::fini (void)
     }
   catch(CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ex,
-                         ACE_TEXT ("(%P|%t) fini failed:"));
+    ex._tao_print_exception (ACE_TEXT ("(%P|%t) fini failed:"));
     return -1;
   }
   catch(...)
@@ -171,8 +169,9 @@ int DllOrb::fini (void)
     }
   catch(CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ex,
-                         ACE_TEXT ("(%P|%t) init failed to destroy the orb:"));
+    ex._tao_print_exception (
+      ACE_TEXT (
+        "(%P|%t) init failed to destroy the orb:"));
     return -1;
   }
 
@@ -219,8 +218,7 @@ int DllOrb::svc (void)
     }
   catch(CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ex,
-                         ACE_TEXT ("(%P|%t) svc - orb->run() failed:"));
+    ex._tao_print_exception (ACE_TEXT ("(%P|%t) svc - orb->run() failed:"));
     return -1;
   }
   catch(...)
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
index 5e1e673e8c3..38f84d0b505 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp
@@ -111,8 +111,7 @@ Service_Config_ORB_DLL::svc (void)
   ACE_ASSERT (this->worker_.get () != 0);
   ACE_ASSERT (this->argv_.get () != 0);
 
-  ACE_DECLARE_NEW_ENV;
-  ACE_TRY
+  try
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%P|%t) %@ %s is active, argv[%d]=\'%s\'\n"),
@@ -122,9 +121,7 @@ Service_Config_ORB_DLL::svc (void)
                 this->argv_->buf ()));
 
     int ret = this->worker_->test_main (this->argv_->argc (),
-                                        this->argv_->argv ()
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                                        this->argv_->argv ());
 
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%P|%t) %@ %s bows out - so long, cruel world! (%d)\n"),
@@ -133,14 +130,13 @@ Service_Config_ORB_DLL::svc (void)
                 ret));
     return ret;
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION(ACE_ANY_EXCEPTION, ACE_TEXT("Failure:"));
+    ex._tao_print_exception (ACE_TEXT("Failure:"));
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("(%P|%t) Aborting.\n")),
                        -1);
   }
-  ACE_ENDTRY;
 
 }
 
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
index 014c185315d..7ce803ca818 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
@@ -33,7 +33,7 @@ public:
   Abstract_Worker (const char* ior);
   virtual ~Abstract_Worker (void);
   virtual int test_main (int argc,
-                    ACE_TCHAR *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                    ACE_TCHAR *argv[]) = 0;
   virtual const ACE_TCHAR * kind (void) const = 0;
 protected:
   ACE_TString ior_file_;
@@ -47,7 +47,7 @@ class Server_Worker : public Abstract_Worker
 public:
   Server_Worker ();
   ~Server_Worker (void);
-  int test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int test_main (int argc, ACE_TCHAR *argv[]);
   const ACE_TCHAR * kind (void) const;
 
 private:
@@ -62,7 +62,7 @@ class Client_Worker : public Abstract_Worker
 public:
   Client_Worker ();
   ~Client_Worker (void);
-  int test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int test_main (int argc, ACE_TCHAR *argv[]);
   const ACE_TCHAR * kind (void) const;
 
 private:
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
index 97c8347258a..69430847582 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp
@@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
index 1a404058944..6131e1a3c88 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
index 2ae4c53e2c6..50d78473955 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
@@ -44,13 +44,12 @@ Client_Worker::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
+Client_Worker::test_main (int argc, ACE_TCHAR *argv[])
 {
 
   ACE_Argv_Type_Converter cvt (argc, argv);
 
-  CORBA::ORB_var orb = CORBA::ORB_init (cvt.get_argc (), cvt.get_ASCII_argv () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::ORB_var orb = CORBA::ORB_init (cvt.get_argc (), cvt.get_ASCII_argv ());
 
   if (parse_args (cvt.get_argc (), cvt.get_ASCII_argv ()) != 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -65,10 +64,9 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
                 ACE_TEXT ("(%P|%t) Client is ready to proceed - awaiting the server ...\n")));
     ACE_OS::sleep (1);
 
-    ACE_TRY
+    try
     {
-      co = orb->string_to_object(ior_file_.c_str () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      co = orb->string_to_object(ior_file_.c_str ());
 
       if (co == 0)
         {
@@ -79,8 +77,7 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
       CORBA::Object_var tmp (co);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -94,39 +91,34 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
                   ACE_TEXT ("(%P|%t) Successfuly narrowed the Hello interface\n")));
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) String returned from the server <%s>\n"),
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
       attempts_left = 0; // We're done here!
 
     }
-    ACE_CATCH (CORBA::TRANSIENT, ex)
+    catch (const CORBA::TRANSIENT& ex)
     {
       if (!attempts_left)
-        ACE_RE_THROW;
+        throw;
 
-      ACE_PRINT_EXCEPTION (ex, "Temporary problem encountered");
+      ex._tao_print_exception ("Temporary problem encountered");
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) Client was too quick. Pausing ")
                   ACE_TEXT ("while the server gets ready.\n")));
       ACE_OS::sleep (5);
     }
-    ACE_ENDTRY;
   }
 
-  orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  orb->shutdown (0);
 
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  orb->destroy ();
 
   return 0;
 }
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
index b1c130c6057..e44275ac8eb 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp
@@ -53,23 +53,20 @@ Server_Worker::parse_args (int argc, ACE_TCHAR *argv[])
 
 //
 int
-Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
+Server_Worker::test_main (int argc, ACE_TCHAR *argv[])
 {
   // Making sure there are no stale ior files to confuse a client
   ACE_OS::unlink (ior_file_.c_str ());
 
   ACE_Argv_Type_Converter cvt (argc, argv);
   CORBA::ORB_var orb = CORBA::ORB_init (cvt.get_argc (),
-                                        cvt.get_ASCII_argv () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+                                        cvt.get_ASCII_argv ());
 
   CORBA::Object_var poa_object =
-    orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    orb->resolve_initial_references("RootPOA");
 
   PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    PortableServer::POA::_narrow (poa_object.in ());
 
   if (CORBA::is_nil (root_poa.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -77,8 +74,7 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
                       1);
 
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    root_poa->the_POAManager ();
 
   if (parse_args (cvt.get_argc (), cvt.get_ASCII_argv ()) != 0)
     return 1;
@@ -91,25 +87,18 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
   PortableServer::ServantBase_var owner_transfer(hello_impl);
 
   PortableServer::ObjectId_var id =
-    root_poa->activate_object (hello_impl ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    root_poa->activate_object (hello_impl);
 
   CORBA::Object_var hello_obj =
-    root_poa->id_to_reference (id.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    root_poa->id_to_reference (id.in ());
 
   Test::Hello_var hello =
-    Test::Hello::_narrow (hello_obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    Test::Hello::_narrow (hello_obj.in ());
 
   CORBA::String_var ior =
-    orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    orb->object_to_string (hello.in ());
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  poa_manager->activate ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server activated POA manager\n")));
 
@@ -125,22 +114,18 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server entering the event loop\n")));
 
-  orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  orb->run ();
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server exiting the event loop\n")));
 
-  root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  root_poa->destroy (1, 1);
 
   // During normal test execution the ORB would have been destroyed
   // by a request from the client.
 
-  //  orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  //  ACE_CHECK;
+  //  orb->shutdown (0);
 
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  orb->destroy ();
 
   return 0;
 }
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp
index a1d4a89b03e..61ad9caa6d5 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.cpp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp
@@ -30,49 +30,37 @@ test_with_regular_poa_manager (int argc,
                                int destroy_orb,
                                int destroy_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, orb_name);
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (destroy_poa)
         {
-          root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          root_poa->destroy (1, 1);
         }
 
       if (destroy_orb)
         {
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised");
-      ACE_CHECK_RETURN (-1);
+      ex._tao_print_exception ("Exception raised");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -85,52 +73,40 @@ test_with_funky_poa_manager (int argc,
                              int destroy_poa,
                              int funky_poa_manager)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, orb_name);
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       if (funky_poa_manager)
         {
           PortableServer::POAManager_var poa_manager =
-            root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            root_poa->the_POAManager ();
 
-          poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          poa_manager->activate ();
         }
 
       if (destroy_poa)
         {
-          root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          root_poa->destroy (1, 1);
         }
 
       if (destroy_orb)
         {
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception raised");
-      ACE_CHECK_RETURN (-1);
+      ex._tao_print_exception ("Exception raised");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp
index 345f699a8eb..c96d9c59137 100644
--- a/TAO/tests/ORB_init/ORB_init.cpp
+++ b/TAO/tests/ORB_init/ORB_init.cpp
@@ -23,16 +23,14 @@ main (int argc, char *argv[])
 {
   CORBA::ORB_var orb;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       const char orbid[] = "mighty_orb";
 
       CORBA::ORB_ptr my_orb = CORBA::ORB::_nil();
 
       {
-        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid);
 
         my_orb = orb.in ();
 
@@ -48,8 +46,7 @@ main (int argc, char *argv[])
       // used in that scope.
       // -------------------------------------------------------------
 
-      orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb = CORBA::ORB_init (argc, argv, orbid);
 
       // This isn't portable, but TAO implements an ORB_ptr as a
       // pointer so we're okay.
@@ -83,11 +80,9 @@ main (int argc, char *argv[])
       // attempt to initialize a new ORB with the same ORBid.
       // -------------------------------------------------------------
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
-      orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb = CORBA::ORB_init (argc, argv, orbid);
 
       // This isn't portable, but TAO implements an ORB_ptr as a
       // pointer so we're okay.
@@ -112,7 +107,7 @@ main (int argc, char *argv[])
                       "\n",
                       orbid));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       // -------------------------------------------------------------
@@ -122,8 +117,7 @@ main (int argc, char *argv[])
       // -------------------------------------------------------------
 
       CORBA::Object_var object =
-        orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (IOR);
 
       // -------------------------------------------------------------
       // Initialize another two ORBs but don't explicitly destroy them
@@ -131,12 +125,10 @@ main (int argc, char *argv[])
       // clean-up.
       // -------------------------------------------------------------
       CORBA::ORB_var orb2 =
-        CORBA::ORB_init (argc, argv, "ORB number 2" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "ORB number 2");
 
       CORBA::ORB_var orb3 =
-        CORBA::ORB_init (argc, argv, "ORB number 3" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "ORB number 3");
 
       // -------------------------------------------------------------
       // Now try to perform an operation using the destroyed ORB
@@ -145,12 +137,10 @@ main (int argc, char *argv[])
       // ORB itself break when the last ORB is released.
       // -------------------------------------------------------------
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // If we get here, then something went wrong.  A
       // CORBA::OBJECT_NOT_EXIST() exception should have been thrown!.
@@ -164,9 +154,9 @@ main (int argc, char *argv[])
                   "\n",
                   orbid));
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, exc)
+  catch (const CORBA::OBJECT_NOT_EXIST& exc)
     {
       // Do something with the exception to make sure it actually
       // exists.  If it doesn't exist then there is something wrong
@@ -179,10 +169,9 @@ main (int argc, char *argv[])
                   "This exception was expected.  It is safe to ignore it.\n",
                   exc._rep_id ()));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught unexpected exception:");
+      ex._tao_print_exception ("Caught unexpected exception:");
 
 
       ACE_DEBUG ((LM_ERROR,
@@ -191,7 +180,6 @@ main (int argc, char *argv[])
 
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO,
               "\n"
diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp
index e93543879ed..284d0d79b4e 100644
--- a/TAO/tests/ORB_init/Portspan/server.cpp
+++ b/TAO/tests/ORB_init/Portspan/server.cpp
@@ -5,43 +5,31 @@
 int
 main( int argc, char *argv[] )
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
-      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
 
-      CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"
-                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
 
-      PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in()
-                                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in());
 
-      PortableServer::POAManager_var man = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POAManager_var man = poa->the_POAManager();
 
-      man->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      man->activate();
 
       simple_i simp;
 
-      PortableServer::ObjectId_var objId = poa->activate_object(&simp
-                                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var objId = poa->activate_object(&simp);
 
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run();
     }
 
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in main():");
+      ex._tao_print_exception ("Exception in main():");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp
index c0ae870a550..5be30781a60 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.cpp
+++ b/TAO/tests/ORB_init/Portspan/simpleI.cpp
@@ -32,7 +32,6 @@ simple_i::~simple_i (void)
   }
 
 void simple_i::test (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h
index 23faf5eb717..581c88f8aa0 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.h
+++ b/TAO/tests/ORB_init/Portspan/simpleI.h
@@ -39,7 +39,6 @@ public:
   virtual ~simple_i (void);
 
 virtual void test (
-    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index 1ab5469ae50..69b521e5e28 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -11,19 +11,16 @@ ACE_RCSID (Hello,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -31,8 +28,7 @@ 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 ();
 
       Foo_Bar *foobar_impl;
       ACE_NEW_RETURN (foobar_impl,
@@ -40,11 +36,9 @@ main (int argc, char *argv[])
                       1);
 
       Test::Foo_var foo =
-        foobar_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        foobar_impl->_this ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Dont unscope it or move it elsewhere.. It is here with a
       // purpose. If you dont understand this, please re-read the
@@ -57,33 +51,26 @@ main (int argc, char *argv[])
                          0);
 
       // Just run the ORB for a minute..
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) server - shutting down the ORB\n"));
 
-      orb->shutdown (1
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (1);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Finished shutting down the ORB\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Test successful.. \n"));
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index 38fcec43f31..3287952f4e2 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -15,14 +15,14 @@ ORT_test_IORInterceptor::ORT_test_IORInterceptor (void)
 }
 
 char *
-ORT_test_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ORT_test_IORInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ORT_IORInterceptor");
 }
 
 void
-ORT_test_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ORT_test_IORInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (this->establish_count_ > 0
@@ -32,8 +32,7 @@ ORT_test_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 ORT_test_IORInterceptor::establish_components (
-    PortableInterceptor::IORInfo_ptr /* info */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::IORInfo_ptr /* info */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->establish_count_;
@@ -45,8 +44,7 @@ ORT_test_IORInterceptor::establish_components (
 
 void
 ORT_test_IORInterceptor::components_established (
-    PortableInterceptor::IORInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::IORInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->components_establish_count_;
@@ -60,8 +58,7 @@ ORT_test_IORInterceptor::components_established (
 
   // Save a copy of the current ObjectReferenceFactory.
   PortableInterceptor::ObjectReferenceFactory_var old_orf =
-    info->current_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->current_factory ();
 
   PortableInterceptor::ObjectReferenceFactory * tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -71,20 +68,16 @@ ORT_test_IORInterceptor::components_established (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ObjectReferenceFactory_var orf = tmp;
 
-  info->current_factory (orf.in ()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->current_factory (orf.in ());
 }
 
 void
 ORT_test_IORInterceptor::adapter_manager_state_changed (
     const char * id,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::AdapterState)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -94,8 +87,7 @@ ORT_test_IORInterceptor::adapter_manager_state_changed (
 void
 ORT_test_IORInterceptor:: adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::AdapterState)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index 14e17c49529..40a7a2968f3 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -47,34 +47,30 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp
index 77797e82b0b..7d0dc6b4a6f 100644
--- a/TAO/tests/ORT/ORT_test_i.cpp
+++ b/TAO/tests/ORT/ORT_test_i.cpp
@@ -12,16 +12,15 @@ ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Boolean
-ORT_test_i::request_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ORT_test_i::request_server (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 void
-ORT_test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ORT_test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h
index 0046e1fce5a..582438e8795 100644
--- a/TAO/tests/ORT/ORT_test_i.h
+++ b/TAO/tests/ORT/ORT_test_i.h
@@ -26,10 +26,10 @@ public:
 
   ORT_test_i (CORBA::ORB_ptr orb);
 
-  virtual CORBA::Boolean request_server (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean request_server (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp
index 45cb966bc7e..0373edccd29 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.cpp
+++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp
@@ -26,8 +26,7 @@ ObjectReferenceFactory::~ObjectReferenceFactory (void)
 CORBA::Object_ptr
 ObjectReferenceFactory::make_object (
     const char *repository_id,
-    const PortableInterceptor::ObjectId & id
-    ACE_ENV_ARG_DECL)
+    const PortableInterceptor::ObjectId & id)
 {
   ACE_ASSERT (repository_id != 0);
 
@@ -35,6 +34,5 @@ ObjectReferenceFactory::make_object (
               "Invoked custom ObjectReferenceFactory::make_object()\n"));
 
   return this->old_orf_->make_object (repository_id,
-                                      id
-                                      ACE_ENV_ARG_PARAMETER);
+                                      id);
 }
diff --git a/TAO/tests/ORT/ObjectReferenceFactory.h b/TAO/tests/ORT/ObjectReferenceFactory.h
index a6fbe9cdabd..354a7b38a0f 100644
--- a/TAO/tests/ORT/ObjectReferenceFactory.h
+++ b/TAO/tests/ORT/ObjectReferenceFactory.h
@@ -55,8 +55,7 @@ class ObjectReferenceFactory
   //@{
   virtual CORBA::Object_ptr make_object (
       const char *repository_id,
-      const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      const PortableInterceptor::ObjectId & id);
   //@}
 
 protected:
diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp
index 40853060d7b..13c12219c2b 100644
--- a/TAO/tests/ORT/ServerORBInitializer.cpp
+++ b/TAO/tests/ORT/ServerORBInitializer.cpp
@@ -13,34 +13,27 @@ ACE_RCSID (ORT,
 
 void
 ServerORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr /* info */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr /* info */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Object_var obj =
-    info->resolve_initial_references ("POACurrent"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    info->resolve_initial_references ("POACurrent");
 
   PortableServer::Current_var poa_current =
-    PortableServer::Current::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::Current::_narrow (obj.in ());
 
   ACE_ASSERT (!CORBA::is_nil (poa_current.in ()));
 
 
-  CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var orb_id = info->orb_id ();
 
   // Create and register the test's ServerRequestInterceptor
 
@@ -53,13 +46,10 @@ ServerORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var server_interceptor = tmp;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 
 
   // Create and register the test's IORInterceptor
@@ -72,12 +62,9 @@ ServerORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::IORInterceptor_var ior_interceptor =
     ort_test_interceptor;
 
-  info->add_ior_interceptor (ior_interceptor.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_ior_interceptor (ior_interceptor.in ());
 }
diff --git a/TAO/tests/ORT/ServerORBInitializer.h b/TAO/tests/ORT/ServerORBInitializer.h
index d4736dc8efb..6f5d85861ab 100644
--- a/TAO/tests/ORT/ServerORBInitializer.h
+++ b/TAO/tests/ORT/ServerORBInitializer.h
@@ -51,14 +51,12 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 904b4bda66f..6e4b4eee5ac 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -19,22 +19,21 @@ ServerRequestInterceptor::ServerRequestInterceptor (
 }
 
 char *
-ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -42,8 +41,7 @@ ServerRequestInterceptor::receive_request_service_contexts (
 
 void
 ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -51,32 +49,26 @@ ServerRequestInterceptor::receive_request (
   // shutdown operation.  Don't bother displaying output a second
   // time.
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->response_expected ();
 
   if (!response_expected)
     return;
 
   PortableServer::POA_var poa;
 
-  ACE_TRY
+  try
     {
-      poa = this->poa_current_->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa = this->poa_current_->get_POA ();
     }
-  ACE_CATCH (PortableServer::Current::NoContext, ex)
+  catch (const PortableServer::Current::NoContext& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "ServerRequestInterceptor::receive_request");
+      ex._tao_print_exception ("ServerRequestInterceptor::receive_request");
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   PortableServer::POA_var parent_poa =
-    poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->the_parent ();
 
   // Make sure there is more than one POA in the POA hierarchy since
   // the servant should have been registered with a child POA, not the
@@ -84,8 +76,7 @@ ServerRequestInterceptor::receive_request (
   ACE_ASSERT (!CORBA::is_nil (parent_poa.in ()));
 
   PortableInterceptor::AdapterName_var name =
-    ri->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->adapter_name ();
 
 
   ACE_DEBUG ((LM_INFO,
@@ -117,29 +108,25 @@ ServerRequestInterceptor::receive_request (
   // sequence.
   ACE_ASSERT (ACE_OS::strcmp ("RootPOA", name[(CORBA::ULong) 0]) == 0);
 
-  CORBA::String_var orb_id = ri->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var orb_id = ri->orb_id ();
 
   ACE_ASSERT (ACE_OS::strcmp (this->orb_id_.in (), orb_id.in ()) == 0);
 
-  CORBA::String_var server_id = ri->server_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var server_id = ri->server_id ();
 
   ACE_ASSERT (ACE_OS::strcmp (server_id.in (), "ORT_test_server") == 0);
 }
 
 void
 ServerRequestInterceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -147,8 +134,7 @@ ServerRequestInterceptor::send_exception (
 
 void
 ServerRequestInterceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h
index d46cf2612d3..afa56c964ca 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.h
+++ b/TAO/tests/ORT/ServerRequestInterceptor.h
@@ -65,38 +65,33 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp
index a1f0d2219a7..b14e2a4a546 100644
--- a/TAO/tests/ORT/client.cpp
+++ b/TAO/tests/ORT/client.cpp
@@ -36,24 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "client_sum_orb");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       ObjectReferenceTemplate::ORT_test_var server =
-        ObjectReferenceTemplate::ORT_test::_narrow (obj.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ObjectReferenceTemplate::ORT_test::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -64,22 +59,18 @@ main (int argc, char *argv[])
         }
 
       CORBA::Boolean result =
-        server->request_server (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->request_server ();
 
       if (result == 0)
         ACE_DEBUG ((LM_DEBUG, "Successful invocation\n"));
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ORT test on client side :");
+      ex._tao_print_exception ("ORT test on client side :");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp
index d8656cc7c94..53c1aa8df89 100644
--- a/TAO/tests/ORT/server.cpp
+++ b/TAO/tests/ORT/server.cpp
@@ -41,8 +41,7 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr tmp;
 
@@ -52,30 +51,22 @@ int main (int argc, char *argv[])
 
       PortableInterceptor::ORBInitializer_var orb_initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "ORT Test ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "ORT Test ORB");
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Check for nil references
       if (CORBA::is_nil (root_poa.in ()))
@@ -85,12 +76,10 @@ int main (int argc, char *argv[])
 
       // Get poa_manager reference
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Activate it.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::PolicyList policies (0);
       policies.length (0);
@@ -99,47 +88,33 @@ int main (int argc, char *argv[])
       PortableServer::POA_var first_poa =
         root_poa->create_POA ("FIRST_POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       PortableServer::POA_var second_poa =
         first_poa->create_POA ("SECOND_POA",
                                poa_manager.in (),
-                               policies
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               policies);
 
       PortableServer::POA_var third_poa =
         second_poa->create_POA ("THIRD_POA",
                                 poa_manager.in (),
-                                policies
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                policies);
 
       PortableServer::POA_var fourth_poa =
         third_poa->create_POA ("FOURTH_POA",
                                poa_manager.in (),
-                               policies
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                               policies);
 
       ORT_test_i ort_test_impl (orb.in ());
 
       PortableServer::ObjectId_var oid =
-        fourth_poa->activate_object (&ort_test_impl
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        fourth_poa->activate_object (&ort_test_impl);
 
-      obj = fourth_poa->servant_to_reference (&ort_test_impl
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = fourth_poa->servant_to_reference (&ort_test_impl);
 
       // Convert the object reference to a string format.
       CORBA::String_var ior =
-        orb->object_to_string (obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       // Dump it to a file.
       if (ior_output_file != 0)
@@ -155,19 +130,15 @@ int main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ORT test server:");
+      ex._tao_print_exception ("ORT test server:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index 73ae41e115f..953d57e77f3 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -12,41 +12,34 @@ Loader::Loader (void)
 CORBA::Object_ptr
 Loader::create_object (CORBA::ORB_ptr orb,
                        int,
-                       char * []
-                       ACE_ENV_ARG_DECL)
+                       char * [])
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var mgr =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       Test_i *test;
       ACE_NEW_RETURN (test, Test_i (poa.in ()),
                       CORBA::Object::_nil ());
 
       PortableServer::ServantBase_var tmp = test;
-      obj = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = test->_this ();
 
       return obj._retn ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
   return CORBA::Object::_nil ();
 }
 
diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h
index 73b4c5708f4..47c39d4e32c 100644
--- a/TAO/tests/Object_Loader/Loader.h
+++ b/TAO/tests/Object_Loader/Loader.h
@@ -32,8 +32,7 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           char *argv []
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           char *argv [])
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Create a new instance
 };
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 6150714b0a5..7271b79e988 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -14,28 +14,25 @@ Test_i::Test_i (PortableServer::POA_ptr poa)
 }
 
 CORBA::Long
-Test_i::instance_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::instance_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Test_i::instance_count_;
 }
 
 void
-Test_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Test_i::destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_default_POA ();
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
+  poa->deactivate_object (oid.in ());
 }
 
 PortableServer::POA_ptr
-Test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::_default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index 5fc58fc95cd..c1d920b2c7b 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -30,13 +30,13 @@ public:
   Test_i (PortableServer::POA_ptr poa);
   // ctor
 
-  CORBA::Long instance_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Long instance_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  PortableServer::POA_ptr _default_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp
index e7e9b391e0d..5584458efcb 100644
--- a/TAO/tests/Object_Loader/driver.cpp
+++ b/TAO/tests/Object_Loader/driver.cpp
@@ -14,7 +14,7 @@ main (int, char *[])
   int niterations = 10;
   int norbs = 10;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       for (int i = 0; i != niterations; ++i)
         {
@@ -25,21 +25,16 @@ main (int, char *[])
 
               int argc = 0;
               CORBA::ORB_var orb =
-                CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                CORBA::ORB_init (argc, 0, buf);
 
               CORBA::Object_var object =
-                orb->string_to_object ("DLL:Test_Object"
-                                       ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->string_to_object ("DLL:Test_Object");
 
               Test_var test =
-                Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                Test::_narrow (object.in ());
 
               CORBA::Long count =
-                test->instance_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                test->instance_count ();
 
               if (count != norbs*i + j + 1)
                 {
@@ -48,8 +43,7 @@ main (int, char *[])
                               "(%d != %d)\n",
                               count, norbs * i + j + 1));
                 }
-              test->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              test->destroy ();
             }
         }
 
@@ -60,31 +54,23 @@ main (int, char *[])
 
           int argc = 0;
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CORBA::ORB_init (argc, 0, buf);
 
           CORBA::Object_var obj =
-            orb->resolve_initial_references ("RootPOA"
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->resolve_initial_references ("RootPOA");
 
           PortableServer::POA_var poa =
-            PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            PortableServer::POA::_narrow (obj.in ());
 
-          poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          poa->destroy (1, 1);
 
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "main()");
+      ex._tao_print_exception ("main()");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index 3fb96a60ce4..964ba9531e7 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.cpp
@@ -34,31 +34,24 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
 
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb  =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       if (parse_args (argc, argv) == -1)
         return -1;
 
       // Connect to the server
       CORBA::Object_var tmp =
-        orb->string_to_object(ior
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
-      Server_var server = Server::_narrow (tmp.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Server_var server = Server::_narrow (tmp.in ());
 
       // Create object instances
       // This portion of the test was given by Petr Tuma and am just
@@ -82,9 +75,7 @@ main (int argc, char *argv [])
           iAddSize = iSize - iOldSize;
 
           server->CreateExtra (iAddSize,
-                               vAddition.out ()
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               vAddition.out ());
 
 
           vServers->length (iSize);
@@ -112,22 +103,17 @@ main (int argc, char *argv [])
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Call delete on the server \n"));
 
-      server->DeleteExtra (vServers.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->DeleteExtra (vServers.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Calling shutdown \n"));
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
-      ACE_CHECK_RETURN (-1);
+      ex._tao_print_exception ("");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index 3890ff162fb..8b618bb40f1 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -13,15 +13,13 @@ public:
                  CORBA::ORB_ptr orb);
 
   void CreateExtra (CORBA::ULong length,
-                    ServerSequence_out seq
-                    ACE_ENV_ARG_DECL)
+                    ServerSequence_out seq)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void DeleteExtra (const ServerSequence &seq
-                    ACE_ENV_ARG_DECL)
+  void DeleteExtra (const ServerSequence &seq)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -43,8 +41,7 @@ ServerServant::ServerServant (PortableServer::POA_ptr poa,
 /// Servant implementations
 void
 ServerServant::CreateExtra (CORBA::ULong len,
-                            ServerSequence_out seq
-                            ACE_ENV_ARG_DECL)
+                            ServerSequence_out seq)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -79,8 +76,7 @@ ServerServant::CreateExtra (CORBA::ULong len,
 
 
 void
-ServerServant::DeleteExtra (const ServerSequence &seq
-                            ACE_ENV_ARG_DECL)
+ServerServant::DeleteExtra (const ServerSequence &seq)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -99,10 +95,8 @@ ServerServant::DeleteExtra (const ServerSequence &seq
         this->root_poa_->reference_to_servant (seq [cnt]);
 
       this->root_poa_->deactivate_object (oid.in ());
-      servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      servant->_remove_ref ();
+      servant->_remove_ref ();
     }
 
   ACE_DEBUG ((LM_DEBUG,
@@ -111,10 +105,10 @@ ServerServant::DeleteExtra (const ServerSequence &seq
 }
 
 void
-ServerServant::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ServerServant::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 /******************************************************/
@@ -150,30 +144,23 @@ int
 main (int argc, char *argv [])
 
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_TRY
+  try
     {
       // Initialize the broker
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var vRootPOABase =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (vRootPOABase.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (vRootPOABase.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -181,8 +168,7 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POAManager_ptr pRootPOAManager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Instantiate the server
       ServerServant *servant = 0;
@@ -195,14 +181,11 @@ main (int argc, char *argv [])
       PortableServer::ServantBase_var owner_transfer(servant);
 
       Server_var server =
-        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant->_this ();
 
       // Announce the server
       CORBA::String_var obj_ref =
-        orb->object_to_string (server.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -214,27 +197,21 @@ main (int argc, char *argv [])
       ACE_OS::fprintf (output_file, "%s", obj_ref.in ());
       ACE_OS::fclose (output_file);
 
-      pRootPOAManager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      pRootPOAManager->activate ();
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index 995499aca20..97bb5c276d9 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -163,14 +163,11 @@ run (char* buf, size_t bufsize,
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       int n = 64;
       int lo = 128;
@@ -247,11 +244,10 @@ main (int argc, char *argv[])
         return 1;
       delete[] buf;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "OctetSeq");
+      ex._tao_print_exception ("OctetSeq");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index e781734a4b2..757322add9c 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -57,22 +57,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Database_var server =
-        Test::Database::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Database::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -84,8 +81,7 @@ main (int argc, char *argv[])
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
       CORBA::String_var repository_id =
-        server->_repository_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->_repository_id ();
 
       if (ACE_OS::strcmp (repository_id.in (), "IDL:Test/Database:1.0") != 0)
         {
@@ -129,9 +125,7 @@ main (int argc, char *argv[])
                   server->set (Test::Index (j),
                                elements[j],
                                token,
-                               returned_token
-                               ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
+                               returned_token);
 
                   if (token != returned_token)
                     {
@@ -144,8 +138,7 @@ main (int argc, char *argv[])
             }
 
           CORBA::ULong crc_remote =
-            server->get_crc (idx ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            server->get_crc (idx);
 
           CORBA::ULong crc_local =
             ACE::crc32 (elements[idx].get_buffer (),
@@ -165,19 +158,15 @@ main (int argc, char *argv[])
 
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 59e56b30f2d..81cae9d601b 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -4,8 +4,8 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (OctetSeq, 
-           server, 
+ACE_RCSID (OctetSeq,
+           server,
            "$Id$")
 
 const char *ior_output_file = "test.ior";
@@ -38,15 +38,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -54,12 +52,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,12 +65,10 @@ main (int argc, char *argv[])
                                 128); // @@ TODO
 
         Test::Database_var server =
-          server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          server_impl._this ();
 
         CORBA::String_var ior =
-          orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          orb->object_to_string (server.in ());
 
         ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -91,28 +85,22 @@ main (int argc, char *argv[])
             ACE_OS::fclose (output_file);
           }
 
-        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, "event loop finished\n"));
 
-        root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        root_poa->destroy (1, 1);
       }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index d0166961d72..c7ba1fd796d 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -18,12 +18,11 @@ void
 Database_i::set (Test::Index i,
                  const Test::OctetSeq& seq,
                  CORBA::Double verification_token,
-                 CORBA::Double_out returned_token
-                 ACE_ENV_ARG_DECL)
+                 CORBA::Double_out returned_token)
     ACE_THROW_SPEC ((Test::OutOfRange))
 {
   if (i >= this->max_range_)
-    ACE_THROW (Test::OutOfRange (0, this->max_range_));
+    throw Test::OutOfRange (0, this->max_range_);
 
   returned_token = verification_token;
 
@@ -45,8 +44,7 @@ Database_i::set (Test::Index i,
 }
 
 Test::OctetSeq*
-Database_i::get (Test::Index i
-                 ACE_ENV_ARG_DECL)
+Database_i::get (Test::Index i)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
 {
   if (i >= this->max_range_)
@@ -56,13 +54,11 @@ Database_i::get (Test::Index i
   ACE_NEW_THROW_EX (copy,
                     Test::OctetSeq (this->elements_[i]),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
   return copy;
 }
 
 CORBA::ULong
-Database_i::get_crc (Test::Index i
-                     ACE_ENV_ARG_DECL)
+Database_i::get_crc (Test::Index i)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
 {
   if (i >= this->max_range_)
@@ -73,7 +69,7 @@ Database_i::get_crc (Test::Index i
 }
 
 void
-Database_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Database_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h
index d5ca10aac21..4d7b846d38d 100644
--- a/TAO/tests/OctetSeq/test_i.h
+++ b/TAO/tests/OctetSeq/test_i.h
@@ -35,19 +35,16 @@ public:
   void set (Test::Index i,
             const Test::OctetSeq& seq,
             CORBA::Double verification_token,
-            CORBA::Double_out returned_token
-            ACE_ENV_ARG_DECL_NOT_USED)
+            CORBA::Double_out returned_token)
     ACE_THROW_SPEC ((Test::OutOfRange));
 
-  Test::OctetSeq* get (Test::Index i
-                       ACE_ENV_ARG_DECL_NOT_USED)
+  Test::OctetSeq* get (Test::Index i)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
 
-  CORBA::ULong get_crc (Test::Index i
-                        ACE_ENV_ARG_DECL_NOT_USED)
+  CORBA::ULong get_crc (Test::Index i)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp
index 6e0195eff58..bfd8274359a 100644
--- a/TAO/tests/Ondemand_Write/Hello.cpp
+++ b/TAO/tests/Ondemand_Write/Hello.cpp
@@ -22,8 +22,8 @@ Hello::get_string (
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h
index 17f387990e2..2cd11fd1b71 100644
--- a/TAO/tests/Ondemand_Write/Hello.h
+++ b/TAO/tests/Ondemand_Write/Hello.h
@@ -24,7 +24,7 @@ public:
     const char * inputb)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Ondemand_Write/client.cpp b/TAO/tests/Ondemand_Write/client.cpp
index e000950a65a..c48b9ee41fb 100644
--- a/TAO/tests/Ondemand_Write/client.cpp
+++ b/TAO/tests/Ondemand_Write/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -64,24 +61,19 @@ main (int argc, char *argv[])
       CORBA::String_var test_string = CORBA::string_dup ("661234567890123456789012345678901234567890");
       CORBA::String_var the_string =
         hello->get_string (5, test_string.in (), 6, test_string.in ());
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp
index 177aad4d1d8..8c998950dd3 100644
--- a/TAO/tests/Ondemand_Write/server.cpp
+++ b/TAO/tests/Ondemand_Write/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,27 +83,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
index 9942c6020d6..16db8fe73e2 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -13,29 +13,28 @@ Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb,
 }
 
 void
-Oneway_Buffering::receive_data (const Test::Payload &the_payload
-                                ACE_ENV_ARG_DECL)
+Oneway_Buffering::receive_data (const Test::Payload &the_payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->request_received (the_payload.length () ACE_ENV_ARG_PARAMETER);
+  this->admin_->request_received (the_payload.length ());
 }
 
 void
-Oneway_Buffering::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Buffering::flush (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Oneway_Buffering::sync (ACE_ENV_SINGLE_ARG_DECL)
+Oneway_Buffering::sync (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->admin_->flush ();
 }
 
 void
-Oneway_Buffering::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Oneway_Buffering::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
index c1cc0c5144b..9b32c9e4d58 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
@@ -18,17 +18,16 @@ public:
                     Test::Oneway_Buffering_Admin_ptr admin);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &the_payload
-                             ACE_ENV_ARG_DECL)
+  virtual void receive_data (const Test::Payload &the_payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void flush (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void sync (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index a04178e6012..1525b0f0905 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -13,22 +13,21 @@ Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-Oneway_Buffering_Admin::request_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Buffering_Admin::request_count (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_count_;
 }
 
 CORBA::ULong
-Oneway_Buffering_Admin::bytes_received_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Buffering_Admin::bytes_received_count (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->bytes_received_count_;
 }
 
 void
-Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_++;
@@ -36,14 +35,14 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length
 }
 
 void
-Oneway_Buffering_Admin::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Buffering_Admin::flush (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Oneway_Buffering_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Oneway_Buffering_Admin::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
index bf1a4dbbdde..02272fd53bf 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
@@ -17,20 +17,19 @@ public:
   Oneway_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong request_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong bytes_received_count (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong bytes_received_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void request_received (CORBA::ULong payload_length
-                                 ACE_ENV_ARG_DECL)
+  virtual void request_received (CORBA::ULong payload_length)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void flush (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 4ab858a5e46..830ab7969b6 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +66,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_buffering_admin_impl);
 
       Test::Oneway_Buffering_Admin_var oneway_buffering_admin =
-        oneway_buffering_admin_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        oneway_buffering_admin_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (oneway_buffering_admin.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (oneway_buffering_admin.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -87,27 +81,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) admin - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in admin:");
+      ex._tao_print_exception ("Exception caught in admin:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 0c4383016ef..4ad22187b4c 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -91,47 +91,40 @@ parse_args (int argc, char *argv[])
 int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::Oneway_Buffering_ptr oneway_buffering,
-                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                   ACE_ENV_ARG_DECL);
+                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin);
 
 int
 run_timeout (CORBA::ORB_ptr orb,
              Test::Oneway_Buffering_ptr oneway_buffering,
-             Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-             ACE_ENV_ARG_DECL);
+             Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin);
 
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::Oneway_Buffering_ptr oneway_buffering,
-                      Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                      ACE_ENV_ARG_DECL);
+                      Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin);
 
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::Oneway_Buffering_ptr oneway_buffering,
-                 Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                 ACE_ENV_ARG_DECL);
+                 Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin);
 
 int
 main (int argc, char *argv[])
 {
   int test_failed = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(server_ior);
 
       Test::Oneway_Buffering_var oneway_buffering =
-        Test::Oneway_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Oneway_Buffering::_narrow(tmp.in ());
 
       if (CORBA::is_nil (oneway_buffering.in ()))
         {
@@ -142,12 +135,10 @@ main (int argc, char *argv[])
         }
 
       tmp =
-        orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(admin_ior);
 
       Test::Oneway_Buffering_Admin_var oneway_buffering_admin =
-        Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Oneway_Buffering_Admin::_narrow(tmp.in ());
 
       if (CORBA::is_nil (oneway_buffering_admin.in ()))
         {
@@ -164,9 +155,7 @@ main (int argc, char *argv[])
           test_failed =
             run_message_count (orb.in (),
                                oneway_buffering.in (),
-                               oneway_buffering_admin.in ()
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               oneway_buffering_admin.in ());
         }
       else if (run_timeout_test)
         {
@@ -175,9 +164,7 @@ main (int argc, char *argv[])
           test_failed =
             run_timeout (orb.in (),
                          oneway_buffering.in (),
-                         oneway_buffering_admin.in ()
-                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                         oneway_buffering_admin.in ());
         }
       else if (run_timeout_reactive_test)
         {
@@ -186,9 +173,7 @@ main (int argc, char *argv[])
           test_failed =
             run_timeout_reactive (orb.in (),
                                   oneway_buffering.in (),
-                                  oneway_buffering_admin.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                  oneway_buffering_admin.in ());
         }
       else if (run_buffer_size_test)
         {
@@ -197,9 +182,7 @@ main (int argc, char *argv[])
           test_failed =
             run_buffer_size (orb.in (),
                              oneway_buffering.in (),
-                             oneway_buffering_admin.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             oneway_buffering_admin.in ());
         }
       else
         {
@@ -207,22 +190,17 @@ main (int argc, char *argv[])
                       "ERROR: No test was configured\n"));
         }
 
-      oneway_buffering->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      oneway_buffering->shutdown ();
       ACE_OS::sleep(1);
-      oneway_buffering_admin->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      oneway_buffering_admin->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client:");
+      ex._tao_print_exception ("Exception caught in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return test_failed;
 }
@@ -231,16 +209,13 @@ int
 configure_policies (CORBA::ORB_ptr orb,
                     const TAO::BufferingConstraint &buffering_constraint,
                     Test::Oneway_Buffering_ptr oneway_buffering,
-                    Test::Oneway_Buffering_out flusher
-                    ACE_ENV_ARG_DECL)
+                    Test::Oneway_Buffering_out flusher)
 {
   CORBA::Object_var object =
-    orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->resolve_initial_references ("PolicyCurrent");
 
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::PolicyCurrent::_narrow (object.in ());
 
   if (CORBA::is_nil (policy_current.in ()))
     {
@@ -256,23 +231,15 @@ configure_policies (CORBA::ORB_ptr orb,
   CORBA::PolicyList policies (2); policies.length (2);
   policies[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        scope_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        scope_as_any);
   policies[1] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        buffering_as_any);
 
-  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]->destroy ();
+  policies[1]->destroy ();
 
   TAO::BufferingConstraint flush_constraint;
   flush_constraint.mode = TAO::BUFFER_FLUSH;
@@ -284,53 +251,41 @@ configure_policies (CORBA::ORB_ptr orb,
   policies.length (1);
   policies[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        buffering_as_any);
 
   object =
     oneway_buffering->_set_policy_overrides (policies,
-                                             CORBA::ADD_OVERRIDE
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                             CORBA::ADD_OVERRIDE);
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  policies[0]->destroy ();
 
   flusher =
-    Test::Oneway_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Test::Oneway_Buffering::_narrow (object.in ());
 
   return 0;
 }
 
 void
-sync_server (Test::Oneway_Buffering_ptr flusher
-             ACE_ENV_ARG_DECL)
+sync_server (Test::Oneway_Buffering_ptr flusher)
 {
   // Get back in sync with the server...
-  flusher->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  flusher->sync (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  flusher->flush ();
+  flusher->sync ();
 }
 
 int
-run_liveness_test (CORBA::ORB_ptr orb, 
+run_liveness_test (CORBA::ORB_ptr orb,
                    Test::Oneway_Buffering_ptr oneway_buffering,
                    Test::Oneway_Buffering_ptr flusher,
-                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                   ACE_ENV_ARG_DECL)
+                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin)
 {
   ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n"));
   int test_failed = 0;
 
-  sync_server (flusher ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  sync_server (flusher);
 
   CORBA::ULong send_count =
-    oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    oneway_buffering_admin->request_count ();
 
   int liveness_test_iterations = int(send_count);
 
@@ -342,17 +297,14 @@ run_liveness_test (CORBA::ORB_ptr orb,
   int depth = 0;
   for (int i = 0; i != liveness_test_iterations; ++i)
     {
-      oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      oneway_buffering->receive_data (payload);
       send_count++;
 
       CORBA::ULong receive_count =
-        oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        oneway_buffering_admin->request_count ();
 
       ACE_Time_Value tv (0, 10 * 1000);
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      orb->run (tv);
 
       // Once the system has sent enough messages we don't
       // expect it to fall too far behind, i.e. at least 90% of the
@@ -369,14 +321,12 @@ run_liveness_test (CORBA::ORB_ptr orb,
                       "expected %u\n",
                       i, receive_count, expected));
 
-          sync_server (flusher ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          sync_server (flusher);
         }
 
       if (depth++ == LIVENESS_MAX_DEPTH)
         {
-          sync_server (flusher ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          sync_server (flusher);
 
           depth = 0;
         }
@@ -389,8 +339,7 @@ run_liveness_test (CORBA::ORB_ptr orb,
 int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::Oneway_Buffering_ptr oneway_buffering,
-                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                   ACE_ENV_ARG_DECL)
+                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT;
@@ -401,9 +350,7 @@ run_message_count (CORBA::ORB_ptr orb,
   Test::Oneway_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        oneway_buffering, flusher.out ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        oneway_buffering, flusher.out ());
 
   if (test_failed != 0)
     return test_failed;
@@ -416,12 +363,10 @@ run_message_count (CORBA::ORB_ptr orb,
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      sync_server (flusher.in ());
 
       CORBA::ULong initial_receive_count =
-        oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        oneway_buffering_admin->request_count ();
 
       if (initial_receive_count != send_count)
         {
@@ -433,17 +378,14 @@ run_message_count (CORBA::ORB_ptr orb,
 
       while (1)
         {
-          oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          oneway_buffering->receive_data (payload);
           send_count++;
 
           CORBA::ULong receive_count =
-            oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            oneway_buffering_admin->request_count ();
 
           ACE_Time_Value tv (0, 10 * 1000);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          orb->run (tv);
 
           CORBA::ULong iteration_count =
             send_count - initial_receive_count;
@@ -477,12 +419,10 @@ run_message_count (CORBA::ORB_ptr orb,
     }
 
   int liveness_test_failed =
-    run_liveness_test (orb, 
+    run_liveness_test (orb,
                        oneway_buffering,
                        flusher.in (),
-                       oneway_buffering_admin
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       oneway_buffering_admin);
 
   if (liveness_test_failed)
     test_failed = 1;
@@ -493,8 +433,7 @@ run_message_count (CORBA::ORB_ptr orb,
 int
 run_timeout (CORBA::ORB_ptr orb,
               Test::Oneway_Buffering_ptr oneway_buffering,
-              Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-              ACE_ENV_ARG_DECL)
+              Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -505,9 +444,7 @@ run_timeout (CORBA::ORB_ptr orb,
   Test::Oneway_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        oneway_buffering, flusher.out ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        oneway_buffering, flusher.out ());
 
   if (test_failed != 0)
     return test_failed;
@@ -520,12 +457,10 @@ run_timeout (CORBA::ORB_ptr orb,
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      sync_server (flusher.in ());
 
       CORBA::ULong initial_receive_count =
-        oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        oneway_buffering_admin->request_count ();
 
       if (initial_receive_count != send_count)
         {
@@ -538,17 +473,14 @@ run_timeout (CORBA::ORB_ptr orb,
       ACE_Time_Value start = ACE_OS::gettimeofday ();
       while (1)
         {
-          oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          oneway_buffering->receive_data (payload);
           send_count++;
 
           CORBA::ULong receive_count =
-            oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            oneway_buffering_admin->request_count ();
 
           ACE_Time_Value tv (0, 10 * 1000);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          orb->run (tv);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
           if (receive_count != initial_receive_count)
@@ -584,9 +516,7 @@ run_timeout (CORBA::ORB_ptr orb,
   int liveness_test_failed =
     run_liveness_test (orb, oneway_buffering,
                        flusher.in (),
-                       oneway_buffering_admin
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       oneway_buffering_admin);
 
   if (liveness_test_failed)
     test_failed = 1;
@@ -598,8 +528,7 @@ run_timeout (CORBA::ORB_ptr orb,
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::Oneway_Buffering_ptr oneway_buffering,
-                      Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                      ACE_ENV_ARG_DECL)
+                      Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -610,9 +539,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   Test::Oneway_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        oneway_buffering, flusher.out ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        oneway_buffering, flusher.out ());
 
   if (test_failed != 0)
     return test_failed;
@@ -625,12 +552,10 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      sync_server (flusher.in ());
 
       CORBA::ULong initial_receive_count =
-        oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        oneway_buffering_admin->request_count ();
 
       if (initial_receive_count != send_count)
         {
@@ -643,20 +568,17 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
       ACE_Time_Value start = ACE_OS::gettimeofday ();
       for (int j = 0; j != 20; ++j)
         {
-          oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          oneway_buffering->receive_data (payload);
           send_count++;
         }
       while (1)
         {
           CORBA::ULong receive_count =
-            oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            oneway_buffering_admin->request_count ();
 
           ACE_Time_Value tv (0, 10 * 1000);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
+          orb->run (tv);
 
-          ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
           if (receive_count != initial_receive_count)
@@ -692,9 +614,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   int liveness_test_failed =
     run_liveness_test (orb, oneway_buffering,
                        flusher.in (),
-                       oneway_buffering_admin
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       oneway_buffering_admin);
 
   if (liveness_test_failed)
     test_failed = 1;
@@ -706,8 +626,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::Oneway_Buffering_ptr oneway_buffering,
-                 Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                 ACE_ENV_ARG_DECL)
+                 Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES;
@@ -718,9 +637,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
   Test::Oneway_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        oneway_buffering, flusher.out ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                        oneway_buffering, flusher.out ());
 
   if (test_failed != 0)
     return test_failed;
@@ -733,12 +650,10 @@ run_buffer_size (CORBA::ORB_ptr orb,
   CORBA::ULong bytes_sent = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      sync_server (flusher.in ());
 
       CORBA::ULong initial_bytes_received =
-        oneway_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        oneway_buffering_admin->bytes_received_count ();
 
       if (initial_bytes_received != bytes_sent)
         {
@@ -750,17 +665,14 @@ run_buffer_size (CORBA::ORB_ptr orb,
 
       while (1)
         {
-          oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          oneway_buffering->receive_data (payload);
           bytes_sent += PAYLOAD_LENGTH;
 
           CORBA::ULong bytes_received =
-            oneway_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            oneway_buffering_admin->bytes_received_count ();
 
           ACE_Time_Value tv (0, 10 * 1000);
-          orb->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+          orb->run (tv);
 
           CORBA::ULong payload_delta =
             bytes_sent - initial_bytes_received;
@@ -801,9 +713,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
   int liveness_test_failed =
     run_liveness_test (orb, oneway_buffering,
                        flusher.in (),
-                       oneway_buffering_admin
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                       oneway_buffering_admin);
 
   if (liveness_test_failed)
     test_failed = 1;
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index 6997308857d..bd0c5a289e5 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/server.cpp
@@ -43,19 +43,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,19 +60,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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Oneway_Buffering_Admin_var admin =
-        Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Oneway_Buffering_Admin::_narrow(tmp.in ());
 
       if (CORBA::is_nil (admin.in ()))
         {
@@ -93,12 +87,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_buffering_impl);
 
       Test::Oneway_Buffering_var oneway_buffering =
-        oneway_buffering_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        oneway_buffering_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (oneway_buffering.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (oneway_buffering.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -110,27 +102,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in server:");
+      ex._tao_print_exception ("Exception caught in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
index 8f76444fb40..354b30c8bc6 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
@@ -21,26 +21,21 @@ Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       for (int i = 0; i != 1; ++i)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) sending oneways...\n"));
 
-          this->sender_->send_ready_message (this->us_.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->sender_->send_ready_message (this->us_.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "Caught Exception");
+      ex._tao_print_exception ("Caught Exception");
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index e33c63186f9..d9d5b1c20a6 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -19,20 +19,19 @@ Receiver_i::~Receiver_i (void)
 
 
 CORBA::Long
-Receiver_i::receive_call (ACE_ENV_SINGLE_ARG_DECL)
+Receiver_i::receive_call (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t)  Doing a ping... \n"));
 
-  this->sender_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->sender_->ping ();
 
   return this->no_calls_++;
 }
 
 CORBA::Long
-Receiver_i::get_call_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Receiver_i::get_call_count ( /**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->iteration_;
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
index a5f13e29217..cbd618db0a4 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
@@ -33,11 +33,11 @@ public:
   virtual ~Receiver_i (void);
 
   // = The skeleton methods
-  virtual CORBA::Long receive_call (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long receive_call (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Retun the number of calls that every thread would make...
-  virtual CORBA::Long get_call_count (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long get_call_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 8ac983b0163..9e4cf2f22e3 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -16,7 +16,7 @@ Sender_i::~Sender_i (void)
 
 void
 Sender_i::active_objects (CORBA::Short no_threads
-                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER */ )
+ /* */ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->active_objects_ = no_threads;
@@ -24,8 +24,7 @@ Sender_i::active_objects (CORBA::Short no_threads
 
 
 void
-Sender_i::send_ready_message (Test::Receiver_ptr receiver
-                              ACE_ENV_ARG_DECL)
+Sender_i::send_ready_message (Test::Receiver_ptr receiver)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -38,14 +37,13 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver
        i < this->number_;
        ++i)
     {
-      receiver->receive_call (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      receiver->receive_call ();
     }
 
 }
 
 void
-Sender_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Sender_i::ping ( /**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
index 1d372a6707a..57ea386f763 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
@@ -33,15 +33,13 @@ public:
   virtual ~Sender_i (void);
 
   // = The skeleton methods
-  virtual void active_objects (CORBA::Short ao
-                               ACE_ENV_ARG_DECL)
+  virtual void active_objects (CORBA::Short ao)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_ready_message (Test::Receiver_ptr receiver
-                                   ACE_ENV_ARG_DECL)
+  virtual void send_ready_message (Test::Receiver_ptr receiver)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
index db7a0b5a63a..3529e7ac785 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
@@ -17,19 +17,16 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // run the test for at most 60 seconds...
       ACE_Time_Value tv (60, 0);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
index 9d2b4cc90e8..a1a34fda8af 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
@@ -37,15 +37,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,24 +51,20 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Get the sender reference..
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Sender_var sender =
-        Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Sender::_narrow(tmp.in ());
 
       if (CORBA::is_nil (sender.in ()))
         {
@@ -90,12 +84,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
       Test::Receiver_var receiver =
-        receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        receiver_impl->_this ();
 
       // Activate poa manager
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Client_Task client_task (sender.in (),
                                receiver.in (),
@@ -106,8 +98,7 @@ main (int argc, char *argv[])
 
       // Before creating threads we will let the sender know that we
       // will have two threads that would make invocations..
-      sender->active_objects ((CORBA::Short) 2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->active_objects ((CORBA::Short) 2);
 
       if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 2,1) == -1)
         {
@@ -124,16 +115,13 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Event Loop finished \n"));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
index 2c3131b2cda..0856678ad4a 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
@@ -36,15 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,12 +50,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +66,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(sender_impl);
 
       Test::Sender_var sender =
-        sender_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sender_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sender.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (sender.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -87,8 +81,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Task server_task (orb.in (),
                                ACE_Thread_Manager::instance ());
@@ -101,19 +94,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Optimized_Connection/oc_client.cpp b/TAO/tests/Optimized_Connection/oc_client.cpp
index fdbe14bcae0..1725984fb2a 100644
--- a/TAO/tests/Optimized_Connection/oc_client.cpp
+++ b/TAO/tests/Optimized_Connection/oc_client.cpp
@@ -39,22 +39,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -65,29 +62,24 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCH (CORBA::TRANSIENT, e)
+  catch (const CORBA::TRANSIENT& )
     {
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) Expected CORBA::TRANSIENT caught\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp
index a12ae327ee7..715b1b85a73 100644
--- a/TAO/tests/POA/Bug_2511_Regression/server.cpp
+++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp
@@ -32,13 +32,13 @@ public:
 
   test_i (PortableServer::POA_ptr poa);
 
-  void normal (ACE_ENV_SINGLE_ARG_DECL)
+  void normal (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void exceptional (ACE_ENV_SINGLE_ARG_DECL)
+  void exceptional (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void notexisting (ACE_ENV_SINGLE_ARG_DECL)
+  void notexisting (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POA_var poa_;
@@ -50,21 +50,21 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::normal (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::normal (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG, "executing normal\n"));
 }
 
 void
-test_i::exceptional (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::exceptional (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG, "executing exceptional\n"));
 }
 
 void
-test_i::notexisting (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::notexisting (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG, "executing notexisting\n"));
@@ -80,8 +80,7 @@ public:
   ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &,
                                        PortableServer::POA_ptr,
                                        const char *,
-                                       PortableServer::ServantLocator::Cookie &
-                                       ACE_ENV_ARG_DECL)
+                                       PortableServer::ServantLocator::Cookie &)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -89,8 +88,7 @@ public:
                    PortableServer::POA_ptr,
                    const char *,
                    PortableServer::ServantLocator::Cookie,
-                   PortableServer::Servant
-                   ACE_ENV_ARG_DECL)
+                   PortableServer::Servant)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   test_i servant_;
@@ -105,8 +103,7 @@ Servant_Locator::Servant_Locator (PortableServer::POA_ptr poa)
 Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr,
                             const char *op,
-                            PortableServer::ServantLocator::Cookie &
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            PortableServer::ServantLocator::Cookie &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -139,8 +136,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr,
                              const char *op,
                              PortableServer::ServantLocator::Cookie,
-                             PortableServer::Servant
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             PortableServer::Servant)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++postCount;
@@ -164,105 +160,81 @@ main (int argc, char **argv)
 {
   int retval = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::PolicyList policies;
       CORBA::ULong current_length = 0;
 
       policies.length (current_length + 1);
       policies[current_length++] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
       policies.length (current_length + 1);
       policies[current_length++] =
-        root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN);
 
       policies.length (current_length + 1);
       policies[current_length++] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       Servant_Locator* servant_locator = new Servant_Locator(child_poa.in ()) ;
-      child_poa->set_servant_manager (servant_locator
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child_poa->set_servant_manager (servant_locator);
 
       PortableServer::ObjectId_var objectID =
         PortableServer::string_to_ObjectId ("object");
 
       CORBA::Object_var objectREF =
         child_poa->create_reference_with_id (objectID.in (),
-                                             "IDL:test:1.0"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             "IDL:test:1.0");
 
       test_var testObject =
-        test::_narrow (objectREF.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (objectREF.in ());
 
       testObject->normal();
 
       bool caught = false;
-      ACE_TRY
+      try
       {
         testObject->exceptional();
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
       {
         ACE_DEBUG ((LM_DEBUG, "exceptional() yielded exception\n"));
         caught = true;
       }
-      ACE_ENDTRY;
       if (!caught) ++errorCount;
 
       caught = false;
-      ACE_TRY
+      try
       {
         testObject->notexisting();
       }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
       {
         ACE_DEBUG ((LM_DEBUG, "notexisting() yielded exception\n"));
         caught = true;
       }
-      ACE_ENDTRY;
       if (!caught) ++errorCount;
 
       if (!errorCount)
@@ -275,12 +247,11 @@ main (int argc, char **argv)
       }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       retval = -1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }
diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp
index cfb3e541f38..a81a636773a 100644
--- a/TAO/tests/POA/Current/Current.cpp
+++ b/TAO/tests/POA/Current/Current.cpp
@@ -25,52 +25,39 @@
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var object;
 
       object =
-        orb->resolve_initial_references ("POACurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("POACurrent");
 
       PortableServer::Current_var current =
-        PortableServer::Current::_narrow (object.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::Current::_narrow (object.in ());
 
       object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s successful\n",
                   argv[0]));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.cpp b/TAO/tests/POA/Deactivate_Object/Hello.cpp
index 8c6b6e980bc..399e615c228 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.cpp
+++ b/TAO/tests/POA/Deactivate_Object/Hello.cpp
@@ -11,7 +11,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h
index 8ee25ebc312..436fdfcd77f 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.h
+++ b/TAO/tests/POA/Deactivate_Object/Hello.h
@@ -17,7 +17,7 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp
index 13749603e33..9999f8b1483 100644
--- a/TAO/tests/POA/Deactivate_Object/server.cpp
+++ b/TAO/tests/POA/Deactivate_Object/server.cpp
@@ -10,19 +10,16 @@ ACE_RCSID (Hello,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -30,8 +27,7 @@ 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 ();
 
       Hello *hello_impl = 0;
       ACE_NEW_RETURN (hello_impl,
@@ -40,37 +36,28 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      PortableServer::ObjectId_var obj_id = root_poa->activate_object (hello_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var obj_id = root_poa->activate_object (hello_impl);
 
-      CORBA::Object_var obj_var = root_poa->id_to_reference (obj_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj_var = root_poa->id_to_reference (obj_id.in ());
 
-      PortableServer::ObjectId_var new_obj_id = root_poa->reference_to_id (obj_var.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var new_obj_id = root_poa->reference_to_id (obj_var.in ());
 
       // Invoke reference_to_servant(). Should retrieve servant.
       PortableServer::ServantBase_var servant =
-        root_poa->reference_to_servant (obj_var.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->reference_to_servant (obj_var.in ());
 
       // Assert correctness.
       ACE_ASSERT (hello_impl == servant.in());
 
-      root_poa->deactivate_object (new_obj_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->deactivate_object (new_obj_id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
index d0de0aad007..73fdfe91d84 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
@@ -29,24 +29,22 @@ void
 test_get_servant_manager (PortableServer::POA_ptr poa)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Getting the servant manager should give a wrong policy exception
       // exception
       PortableServer::ServantManager_ptr servant_manager =
-        poa->get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->get_servant_manager ();
 
       ACE_UNUSED_ARG (servant_manager);
     }
-  ACE_CATCH (PortableServer::POA::WrongPolicy, ex)
+  catch (const PortableServer::POA::WrongPolicy& )
     {
       succeed = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -59,21 +57,19 @@ void
 test_set_servant_manager (PortableServer::POA_ptr poa)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Setting the servant manager should give a wrong policy exception
       // exception
-      poa->set_servant_manager (PortableServer::ServantManager::_nil() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->set_servant_manager (PortableServer::ServantManager::_nil());
     }
-  ACE_CATCH (PortableServer::POA::WrongPolicy, ex)
+  catch (const PortableServer::POA::WrongPolicy& )
     {
       succeed = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -86,24 +82,22 @@ void
 test_get_servant_with_no_set (PortableServer::POA_ptr poa)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Getting the default servant without one set whould give a NoServant
       // exception
       PortableServer::Servant servant =
-        poa->get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->get_servant ();
 
       ACE_UNUSED_ARG (servant);
     }
-  ACE_CATCH (PortableServer::POA::NoServant, ex)
+  catch (const PortableServer::POA::NoServant& )
     {
       succeed = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -113,33 +107,27 @@ test_get_servant_with_no_set (PortableServer::POA_ptr poa)
 }
 
 void
-test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa
-                                        ACE_ENV_ARG_DECL)
+test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa)
 {
   test_i test;
   CORBA::ULong expected_refcount = 1;
 
   PortableServer::ObjectId* id =
-    root_poa->activate_object (&test ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->activate_object (&test);
   expected_refcount++;
 
   CORBA::Object_var object =
-    root_poa->id_to_reference (*id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->id_to_reference (*id);
 
   PortableServer::ServantBase_var servant =
-    root_poa->reference_to_servant (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->reference_to_servant (object.in ());
   expected_refcount++;
 
-  root_poa->deactivate_object (*id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  root_poa->deactivate_object (*id);
   expected_refcount--;
 
   CORBA::ULong refcount =
-    test._refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    test._refcount_value ();
 
   ACE_UNUSED_ARG (refcount);
   ACE_UNUSED_ARG (expected_refcount);
@@ -150,33 +138,25 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Obtain the RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow to POA.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the new POA.
       CORBA::PolicyList policies (3);
@@ -184,30 +164,22 @@ main (int argc, char **argv)
 
       // Request Processing Policy.
       policies[0] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT);
 
       // Id Uniqueness Policy.
       policies[1] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
       // Servant Retention Policy.
       policies[2] =
-        root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN);
 
       // Create POA to host default servant.
       ACE_CString name = "Default Servant";
       PortableServer::POA_var default_servant_poa =
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Destroy policies.
       for (CORBA::ULong i = 0;
@@ -215,17 +187,13 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy->destroy ();
         }
 
       // Activate POA manager.
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      test_reference_to_servant_active_object(root_poa.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_reference_to_servant_active_object(root_poa.in ());
 
       // Test servant.
       test_i test;
@@ -238,9 +206,7 @@ main (int argc, char **argv)
       (void) test_set_servant_manager (default_servant_poa.in());
 
       // Register default servant.
-      default_servant_poa->set_servant (&test
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      default_servant_poa->set_servant (&test);
       expected_refcount++;
 
       // Create dummy id.
@@ -249,15 +215,11 @@ main (int argc, char **argv)
 
       // Create dummy object.
       object =
-        default_servant_poa->create_reference ("IDL:test:1.0"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        default_servant_poa->create_reference ("IDL:test:1.0");
 
       // Invoke id_to_servant(). Should retrieve default servant.
       PortableServer::ServantBase_var servant =
-        default_servant_poa->id_to_servant (id.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        default_servant_poa->id_to_servant (id.in ());
       expected_refcount++;
 
       // Assert correctness.
@@ -265,9 +227,7 @@ main (int argc, char **argv)
 
       // Invoke reference_to_servant(). Should retrieve default servant.
       servant =
-        default_servant_poa->reference_to_servant (object.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        default_servant_poa->reference_to_servant (object.in ());
       expected_refcount++;
 
       // Assert correctness.
@@ -278,24 +238,20 @@ main (int argc, char **argv)
                   "Default_Servant test successful\n"));
 
       CORBA::ULong refcount =
-        test._refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test._refcount_value ();
 
       ACE_UNUSED_ARG (refcount);
       ACE_UNUSED_ARG (expected_refcount);
       ACE_ASSERT (expected_refcount == refcount);
 
       // Destroy the ORB.
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp
index 70af3ea8a11..3bb0a772b76 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.cpp
+++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp
@@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h
index 1a404058944..6131e1a3c88 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.h
+++ b/TAO/tests/POA/EndpointPolicy/Hello.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp
index 61d7e6af070..2d0cf940897 100644
--- a/TAO/tests/POA/EndpointPolicy/client.cpp
+++ b/TAO/tests/POA/EndpointPolicy/client.cpp
@@ -44,32 +44,27 @@ main (int argc, char *argv[])
   CORBA::ORB_var orb;
   CORBA::Object_var tmp;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb = CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      tmp = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      tmp = orb->string_to_object(ior);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_DEBUG ((LM_DEBUG,"client: Invocation expecting to %s\n",
                   (bad_ior ? "fail" : "work")));
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
 
       if (CORBA::is_nil (hello.in ()))
         {
@@ -80,8 +75,7 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello->get_string ();
 
       if (bad_ior)
         {
@@ -91,22 +85,19 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "client: success!\n"));
 
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      hello->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       if (!bad_ior)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "client: Exception caught:");
+          ex._tao_print_exception ("client: Exception caught:");
           return 1;
         }
       ACE_DEBUG ((LM_DEBUG, "client: success!\n"));
     }
-  ACE_ENDTRY;
 
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  orb->destroy ();
 
   return 0;
 }
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index 1471f38f8b3..fdb86bda753 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -24,7 +24,7 @@
 class test_i : public POA_test
 {
 public:
-  void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+  void method ( /**/)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
@@ -39,7 +39,7 @@ class test_i_with_reference_counting :
   public virtual POA_test
 {
 public:
-  void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void method (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
@@ -54,8 +54,7 @@ class Servant_Activator : public PortableServer::ServantActivator
 {
 public:
   PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                     PortableServer::POA_ptr poa
-                                     ACE_ENV_ARG_DECL)
+                                     PortableServer::POA_ptr poa)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -63,15 +62,13 @@ public:
                     PortableServer::POA_ptr adapter,
                     PortableServer::Servant servant,
                     CORBA::Boolean cleanup_in_progress,
-                    CORBA::Boolean remaining_activations
-                    ACE_ENV_ARG_DECL)
+                    CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 PortableServer::Servant
 Servant_Activator::incarnate (const PortableServer::ObjectId &id,
-                              PortableServer::POA_ptr
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              PortableServer::POA_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -95,8 +92,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id,
                                 PortableServer::POA_ptr ,
                                 PortableServer::Servant servant,
                                 CORBA::Boolean,
-                                CORBA::Boolean
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Boolean)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var object_name =
@@ -111,81 +107,61 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id,
     delete servant;
   else
     {
-      servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      servant->_remove_ref ();
     }
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Obtain the RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::PolicyList policies (3);
       policies.length (3);
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Create servant activator.
       PortableServer::ServantManager_var servant_manager =
         new Servant_Activator;
 
       // Set servant_activator as the servant_manager of child POA.
-      child_poa->set_servant_manager (servant_manager.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child_poa->set_servant_manager (servant_manager.in ());
 
       {
         // Create a reference with user created ID in child POA which
@@ -195,21 +171,14 @@ main (int argc, char **argv)
 
         object =
           child_poa->create_reference_with_id (id.in (),
-                                               "IDL:test:1.0"
-                                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                               "IDL:test:1.0");
 
         test_var test =
-          test::_narrow (object.in ()
-                         ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          test::_narrow (object.in ());
 
-        test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        test->method ();
 
-        child_poa->deactivate_object (id.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        child_poa->deactivate_object (id.in ());
       }
 
       {
@@ -220,21 +189,14 @@ main (int argc, char **argv)
 
         object =
           child_poa->create_reference_with_id (id.in (),
-                                               "IDL:test:1.0"
-                                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                               "IDL:test:1.0");
 
         test_var test =
-          test::_narrow (object.in ()
-                         ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          test::_narrow (object.in ());
 
-        test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        test->method ();
 
-        child_poa->deactivate_object (id.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        child_poa->deactivate_object (id.in ());
       }
 
       {
@@ -245,13 +207,9 @@ main (int argc, char **argv)
 
         object =
           child_poa->create_reference_with_id (id.in (),
-                                               "IDL:test:1.0"
-                                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                               "IDL:test:1.0");
 
-        child_poa->deactivate_object (id.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        child_poa->deactivate_object (id.in ());
       }
 
       {
@@ -262,29 +220,22 @@ main (int argc, char **argv)
 
         object =
           child_poa->create_reference_with_id (id.in (),
-                                               "IDL:test:1.0"
-                                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                               "IDL:test:1.0");
 
         PortableServer::ObjectId_var oid =
-          child_poa->reference_to_id (object.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          child_poa->reference_to_id (object.in ());
 
-        child_poa->deactivate_object (oid.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        child_poa->deactivate_object (oid.in ());
       }
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nEnd of main()\n\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 7880507c3fa..1bdba102e50 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -24,10 +24,10 @@
 class test_i : public POA_test
 {
 public:
-  void deactivate_self (ACE_ENV_SINGLE_ARG_DECL)
+  void deactivate_self (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
   PortableServer::POA_var poa_;
 
@@ -35,40 +35,35 @@ public:
 };
 
 PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+test_i::_default_POA ( /**/)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL)
+test_i::deactivate_self (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->poa_->deactivate_object (this->id_
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->poa_->deactivate_object (this->id_);
 
   // Exception flag
   int expected_exception_raised = 0;
 
-  ACE_TRY
+  try
     {
-      this->poa_->deactivate_object (this->id_
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_->deactivate_object (this->id_);
     }
-  ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
+  catch (const PortableServer::POA::ObjectNotActive& )
     {
       // This is the correct exception! Ignore
       expected_exception_raised = 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught of incorrect type");
+      ex._tao_print_exception (
+        "Exception caught of incorrect type");
       ACE_ASSERT (0);
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   // Make sure an exception was raised and it was of the correct type.
   ACE_ASSERT (expected_exception_raised);
@@ -78,8 +73,7 @@ test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 test_object_deactivation (PortableServer::POA_ptr poa,
-                          const PortableServer::ObjectId &id
-                          ACE_ENV_ARG_DECL)
+                          const PortableServer::ObjectId &id)
 {
   test_i servant;
   int expected_exception_raised = 0;
@@ -87,24 +81,21 @@ test_object_deactivation (PortableServer::POA_ptr poa,
   PortableServer::ObjectId_var invalid_id =
     PortableServer::string_to_ObjectId ("invalid id");
 
-  ACE_TRY_EX (invalid_id)
+  try
     {
-      poa->deactivate_object (invalid_id.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (invalid_id);
+      poa->deactivate_object (invalid_id.in ());
     }
-  ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
+  catch (const PortableServer::POA::ObjectNotActive& )
     {
       // This is the correct exception! Ignore
       expected_exception_raised = 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught of incorrect type");
+      ex._tao_print_exception (
+        "Exception caught of incorrect type");
       ACE_ASSERT (0);
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   // Make sure an exception was raised and it was of the correct
   // type.
@@ -113,44 +104,35 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 
 
   poa->activate_object_with_id (id,
-                                &servant
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                &servant);
 
-  poa->deactivate_object (id
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id);
 
   // Reset flag
   expected_exception_raised = 0;
 
-  ACE_TRY_EX (double_deactivate)
+  try
     {
-      poa->deactivate_object (id
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (double_deactivate);
+      poa->deactivate_object (id);
     }
-  ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
+  catch (const PortableServer::POA::ObjectNotActive& )
     {
       // This is the correct exception! Ignore
       expected_exception_raised = 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught of incorrect type");
+      ex._tao_print_exception (
+        "Exception caught of incorrect type");
       ACE_ASSERT (0);
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   // Make sure an exception was raised and it was of the correct
   // type.
   ACE_ASSERT (expected_exception_raised);
 
   poa->activate_object_with_id (id,
-                                &servant
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                &servant);
 
   servant.poa_ =
     PortableServer::POA::_duplicate (poa);
@@ -158,11 +140,9 @@ test_object_deactivation (PortableServer::POA_ptr poa,
   servant.id_ = id;
 
   test_var test =
-    servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    servant._this ();
 
-  test->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  test->deactivate_self ();
 
   // ACE_ASSERT dissappears in non-debug builds
   ACE_UNUSED_ARG (expected_exception_raised);
@@ -172,74 +152,53 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::PolicyList empty_policies;
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              empty_policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              empty_policies);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       obj =
-        root_poa->create_reference ("IDL:test:1.0"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_reference ("IDL:test:1.0");
 
       PortableServer::ObjectId_var id =
-        root_poa->reference_to_id (obj.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->reference_to_id (obj.in ());
 
       test_object_deactivation (root_poa.in (),
-                                id.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                id.in ());
 
       id = PortableServer::string_to_ObjectId ("good id");
 
       test_object_deactivation (child_poa.in (),
-                                id.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index 1f3265ec6c4..1a2065754ef 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -30,7 +30,7 @@ public:
     {
     }
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  PortableServer::POA_ptr _default_POA (void)
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
@@ -46,85 +46,60 @@ create_poas (PortableServer::POA_ptr root_poa,
              PortableServer::POA_out first_poa,
              PortableServer::POA_out second_poa,
              PortableServer::POA_out third_poa,
-             PortableServer::POA_out forth_poa
-             ACE_ENV_ARG_DECL)
+             PortableServer::POA_out forth_poa)
 {
   // Policies for the new POAs
   CORBA::PolicyList policies (3);
   policies.length (3);
 
-  policies[0] = root_poa->create_lifespan_policy (lifespan_policy
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[0] = root_poa->create_lifespan_policy (lifespan_policy);
 
-  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
-  policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID);
 
   // Creation of the firstPOA
   ACE_CString name = "firstPOA";
   first_poa = root_poa->create_POA (name.c_str (),
                                     PortableServer::POAManager::_nil (),
-                                    policies
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    policies);
 
-  policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[1]->destroy ();
 
-  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID);
 
   // Creation of the secondPOA
   name = "secondPOA";
   second_poa = root_poa->create_POA (name.c_str (),
                                      PortableServer::POAManager::_nil (),
-                                     policies
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                     policies);
 
-  policies[2]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[2]->destroy ();
 
-  policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
   // Creation of the thirdPOA
   name = "thirdPOA";
   third_poa = root_poa->create_POA (name.c_str (),
                                     PortableServer::POAManager::_nil (),
-                                    policies
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    policies);
 
-  policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[1]->destroy ();
 
-  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
   // Creation of the forthPOA
   name = "forthPOA";
   forth_poa = root_poa->create_POA (name.c_str (),
                                     PortableServer::POAManager::_nil (),
-                                    policies
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    policies);
 
   // Creation of the new POAs over, so destroy the policies
   for (CORBA::ULong i = 0;
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      policies[i]->destroy ();
     }
 }
 
@@ -135,50 +110,33 @@ test_poas (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr second_poa,
            PortableServer::POA_ptr third_poa,
            PortableServer::POA_ptr forth_poa,
-           int perform_deactivation_test
-           ACE_ENV_ARG_DECL)
+           int perform_deactivation_test)
 {
   {
     test_i servant (root_poa);
 
-    CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0"
-                                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0");
 
-    CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::String_var string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in ()
-                                                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in ());
 
     root_poa->activate_object_with_id (id.in (),
-                                       &servant
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                       &servant);
 
-    obj = root_poa->id_to_reference (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = root_poa->id_to_reference (id.in ());
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ServantBase_var servant_from_reference =
-      root_poa->reference_to_servant (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      root_poa->reference_to_servant (obj.in ());
 
     PortableServer::ServantBase_var servant_from_id =
-      root_poa->id_to_servant (id.in ()
-                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      root_poa->id_to_servant (id.in ());
 
     if (servant_from_reference.in () != servant_from_id.in ()
         || servant_from_reference.in () != &servant)
@@ -188,128 +146,83 @@ test_poas (CORBA::ORB_ptr orb,
                     "servant_from_id and &servant\n"));
       }
 
-    obj = root_poa->servant_to_reference (&servant
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = root_poa->servant_to_reference (&servant);
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = servant._this ();
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant
-                                                                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant);
 
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
-    root_poa->deactivate_object (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    root_poa->deactivate_object (id.in ());
 
     if (perform_deactivation_test)
       {
         root_poa->activate_object_with_id (id.in (),
-                                           &servant
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                           &servant);
 
-        servant_from_reference = root_poa->reference_to_servant (obj.in ()
-                                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        servant_from_reference = root_poa->reference_to_servant (obj.in ());
 
         ACE_ASSERT (servant_from_reference.in () == &servant);
 
-        root_poa->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        root_poa->deactivate_object (id.in ());
       }
   }
 
   {
     test_i servant (root_poa);
 
-    PortableServer::ObjectId_var id = root_poa->activate_object (&servant
-                                                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id = root_poa->activate_object (&servant);
 
-    CORBA::Object_var obj = root_poa->id_to_reference (id.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::Object_var obj = root_poa->id_to_reference (id.in ());
 
-    CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::String_var string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = root_poa->create_reference_with_id (id.in (),
-                                              "IDL:test:1.0"
-                                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                              "IDL:test:1.0");
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    root_poa->deactivate_object (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    root_poa->deactivate_object (id.in ());
   }
 
   {
     test_i servant (first_poa);
 
-    CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0"
-                                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0");
 
-    CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::String_var string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in ());
 
     first_poa->activate_object_with_id (id.in (),
-                                        &servant
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                        &servant);
 
-    obj = first_poa->id_to_reference (id.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = first_poa->id_to_reference (id.in ());
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ServantBase_var servant_from_reference =
-      first_poa->reference_to_servant (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      first_poa->reference_to_servant (obj.in ());
 
     PortableServer::ServantBase_var servant_from_id =
-      first_poa->id_to_servant (id.in ()
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      first_poa->id_to_servant (id.in ());
 
     if (servant_from_reference .in () != servant_from_id.in ()
         || servant_from_reference.in () != &servant)
@@ -319,103 +232,67 @@ test_poas (CORBA::ORB_ptr orb,
                     "servant_from_id and &servant\n"));
       }
 
-    first_poa->deactivate_object (id.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    first_poa->deactivate_object (id.in ());
 
     if (perform_deactivation_test)
       {
         first_poa->activate_object_with_id (id.in (),
-                                            &servant
-                                            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                            &servant);
 
-        servant_from_reference = first_poa->reference_to_servant (obj.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        servant_from_reference = first_poa->reference_to_servant (obj.in ());
 
         ACE_ASSERT (servant_from_reference.in () == &servant);
 
-        first_poa->deactivate_object (id.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        first_poa->deactivate_object (id.in ());
       }
   }
 
   {
     test_i servant (first_poa);
 
-    PortableServer::ObjectId_var id = first_poa->activate_object (&servant
-                                                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id = first_poa->activate_object (&servant);
 
-    CORBA::Object_var obj = first_poa->id_to_reference (id.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::Object_var obj = first_poa->id_to_reference (id.in ());
 
-    CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::String_var string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = first_poa->create_reference_with_id (id.in (),
-                                               "IDL:test:1.0"
-                                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                               "IDL:test:1.0");
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    first_poa->deactivate_object (id.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    first_poa->deactivate_object (id.in ());
   }
 
   {
     test_i servant (second_poa);
 
-    CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0"
-                                                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0");
 
-    CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::String_var string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in ()
-                                                                   ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in ());
 
     second_poa->activate_object_with_id (id.in (),
-                                         &servant
-                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                         &servant);
 
-    obj = second_poa->id_to_reference (id.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = second_poa->id_to_reference (id.in ());
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ServantBase_var servant_from_reference =
-      second_poa->reference_to_servant (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      second_poa->reference_to_servant (obj.in ());
 
     PortableServer::ServantBase_var servant_from_id =
-      second_poa->id_to_servant (id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      second_poa->id_to_servant (id.in ());
 
     if (servant_from_reference.in () != servant_from_id.in ()
         || servant_from_reference.in () != &servant)
@@ -425,85 +302,56 @@ test_poas (CORBA::ORB_ptr orb,
                     "servant_from_id and &servant\n"));
       }
 
-    obj = second_poa->servant_to_reference (&servant
-                                            ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = second_poa->servant_to_reference (&servant);
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = servant._this ();
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant
-                                                                              ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant);
 
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
-    second_poa->deactivate_object (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    second_poa->deactivate_object (id.in ());
 
     if (perform_deactivation_test)
       {
         second_poa->activate_object_with_id (id.in (),
-                                             &servant
-                                             ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                             &servant);
 
-        servant_from_reference = second_poa->reference_to_servant (obj.in ()
-                                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        servant_from_reference = second_poa->reference_to_servant (obj.in ());
 
         ACE_ASSERT (servant_from_reference.in () == &servant);
 
-        second_poa->deactivate_object (id.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        second_poa->deactivate_object (id.in ());
       }
   }
 
   {
     test_i servant (second_poa);
 
-    PortableServer::ObjectId_var id = second_poa->activate_object (&servant
-                                                                   ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id = second_poa->activate_object (&servant);
 
-    CORBA::Object_var obj = second_poa->id_to_reference (id.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::Object_var obj = second_poa->id_to_reference (id.in ());
 
-    CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::String_var string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = second_poa->create_reference_with_id (id.in (),
-                                                "IDL:test:1.0"
-                                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                                "IDL:test:1.0");
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    second_poa->deactivate_object (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    second_poa->deactivate_object (id.in ());
   }
 
   {
@@ -511,19 +359,13 @@ test_poas (CORBA::ORB_ptr orb,
     PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello");
 
     CORBA::Object_var obj = third_poa->create_reference_with_id (id.in (),
-                                                                 "IDL:test:1.0"
-                                                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                                                 "IDL:test:1.0");
 
-    CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::String_var string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in ()
-                                                                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in ());
 
     string = PortableServer::ObjectId_to_string (id_from_reference.in ());
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
@@ -531,29 +373,19 @@ test_poas (CORBA::ORB_ptr orb,
     ACE_ASSERT (id_from_reference.in () == id.in ());
 
     third_poa->activate_object_with_id (id.in (),
-                                        &servant
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                        &servant);
 
-    obj = third_poa->id_to_reference (id.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = third_poa->id_to_reference (id.in ());
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ServantBase_var servant_from_reference =
-      third_poa->reference_to_servant (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      third_poa->reference_to_servant (obj.in ());
 
     PortableServer::ServantBase_var servant_from_id =
-      third_poa->id_to_servant (id.in ()
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      third_poa->id_to_servant (id.in ());
 
     if (servant_from_reference.in () != servant_from_id.in ()
         || servant_from_reference.in () != &servant)
@@ -563,54 +395,37 @@ test_poas (CORBA::ORB_ptr orb,
                     "servant_from_id and &servant\n"));
       }
 
-    obj = third_poa->servant_to_reference (&servant
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = third_poa->servant_to_reference (&servant);
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = servant._this ();
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant
-                                                                             ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant);
 
     string = PortableServer::ObjectId_to_string (id_from_servant.in ());
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
-    third_poa->deactivate_object (id.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    third_poa->deactivate_object (id.in ());
 
     if (perform_deactivation_test)
       {
         third_poa->activate_object_with_id (id.in (),
-                                            &servant
-                                            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                            &servant);
 
-        servant_from_reference = third_poa->reference_to_servant (obj.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        servant_from_reference = third_poa->reference_to_servant (obj.in ());
 
         ACE_ASSERT (servant_from_reference.in () == &servant);
 
-        third_poa->deactivate_object (id.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        third_poa->deactivate_object (id.in ());
       }
   }
 
@@ -619,19 +434,13 @@ test_poas (CORBA::ORB_ptr orb,
     PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello");
 
     CORBA::Object_var obj = forth_poa->create_reference_with_id (id.in (),
-                                                                 "IDL:test:1.0"
-                                                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                                                 "IDL:test:1.0");
 
-    CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    CORBA::String_var string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in ()
-                                                                                 ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in ());
 
     string = PortableServer::ObjectId_to_string (id_from_reference.in ());
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
@@ -639,29 +448,19 @@ test_poas (CORBA::ORB_ptr orb,
     ACE_ASSERT (id_from_reference.in () == id.in ());
 
     forth_poa->activate_object_with_id (id.in (),
-                                        &servant
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                        &servant);
 
-    obj = forth_poa->id_to_reference (id.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    obj = forth_poa->id_to_reference (id.in ());
 
-    string = orb->object_to_string (obj.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    string = orb->object_to_string (obj.in ());
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ServantBase_var servant_from_reference =
-      forth_poa->reference_to_servant (obj.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      forth_poa->reference_to_servant (obj.in ());
 
     PortableServer::ServantBase_var servant_from_id =
-      forth_poa->id_to_servant (id.in ()
-                                ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      forth_poa->id_to_servant (id.in ());
 
     if (servant_from_reference.in () != servant_from_id.in ()
         || servant_from_reference.in () != &servant)
@@ -676,19 +475,13 @@ test_poas (CORBA::ORB_ptr orb,
     if (perform_deactivation_test)
       {
         forth_poa->activate_object_with_id (id.in (),
-                                            &servant
-                                            ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+                                            &servant);
 
-        servant_from_reference = forth_poa->reference_to_servant (obj.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        servant_from_reference = forth_poa->reference_to_servant (obj.in ());
 
         ACE_ASSERT (servant_from_reference.in () == &servant);
 
-        forth_poa->deactivate_object (id.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        forth_poa->deactivate_object (id.in ());
       }
   }
 }
@@ -696,23 +489,16 @@ test_poas (CORBA::ORB_ptr orb,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ()
-                                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ());
 
       const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
         = TAO_ORB_Core_instance ()->server_factory ()->active_object_map_creation_parameters ();
@@ -729,9 +515,7 @@ main (int argc, char **argv)
                    first_poa.out (),
                    second_poa.out (),
                    third_poa.out (),
-                   forth_poa.out ()
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   forth_poa.out ());
 
       test_poas (orb.in (),
                  root_poa.in (),
@@ -739,38 +523,26 @@ main (int argc, char **argv)
                  second_poa.in (),
                  third_poa.in (),
                  forth_poa.in (),
-                 perform_deactivation_test
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                 perform_deactivation_test);
 
       first_poa->destroy (1,
-                          1
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          1);
 
       second_poa->destroy (1,
-                           1
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           1);
 
       third_poa->destroy (1,
-                          1
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          1);
 
       forth_poa->destroy (1,
-                          1
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          1);
 
       create_poas (root_poa.in (),
                    PortableServer::PERSISTENT,
                    first_poa.out (),
                    second_poa.out (),
                    third_poa.out (),
-                   forth_poa.out ()
-                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                   forth_poa.out ());
 
       test_poas (orb.in (),
                  root_poa.in (),
@@ -778,23 +550,16 @@ main (int argc, char **argv)
                  second_poa.in (),
                  third_poa.in (),
                  forth_poa.in (),
-                 perform_deactivation_test
-                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                 perform_deactivation_test);
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception!");
+      ex._tao_print_exception ("Exception!");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index 11d740642cd..1962a84a629 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -30,7 +30,7 @@ public:
 
   test_i (PortableServer::POA_ptr poa);
 
-  void method (ACE_ENV_SINGLE_ARG_DECL)
+  void method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POA_var poa_;
@@ -42,7 +42,7 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -90,8 +90,7 @@ public:
   ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &,
                                        PortableServer::POA_ptr,
                                        const char *,
-                                       PortableServer::ServantLocator::Cookie &
-                                       ACE_ENV_ARG_DECL)
+                                       PortableServer::ServantLocator::Cookie &)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -99,8 +98,7 @@ public:
                    PortableServer::POA_ptr,
                    const char *,
                    PortableServer::ServantLocator::Cookie,
-                   PortableServer::Servant
-                   ACE_ENV_ARG_DECL)
+                   PortableServer::Servant)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   test_i servant_;
@@ -115,8 +113,7 @@ Servant_Locator::Servant_Locator (PortableServer::POA_ptr poa)
 Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr,
                             const char *,
-                            PortableServer::ServantLocator::Cookie &
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            PortableServer::ServantLocator::Cookie &)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -150,8 +147,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr,
                              const char *,
                              PortableServer::ServantLocator::Cookie,
-                             PortableServer::Servant
-                             ACE_ENV_ARG_DECL_NOT_USED)
+                             PortableServer::Servant)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var name =
@@ -181,25 +177,22 @@ bool
 set_nil_servant_manager (PortableServer::POA_ptr poa)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       // Setting a nil servant manager should give an OBJ_Adapter exception with
       // minor code 4
-      poa->set_servant_manager (PortableServer::ServantManager::_nil()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->set_servant_manager (PortableServer::ServantManager::_nil());
     }
-  ACE_CATCH (CORBA::OBJ_ADAPTER, ex)
+  catch (const CORBA::OBJ_ADAPTER& ex)
     {
       if ((ex.minor() & 0xFFFU) == 4)
         {
           succeed = true;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -214,27 +207,24 @@ bool
 overwrite_servant_manager (PortableServer::POA_ptr poa)
 {
   bool succeed = false;
-  ACE_TRY_NEW_ENV
+  try
     {
       Servant_Locator servant_locator (poa);
 
       // Setting a servant manager after it is already set should give
       // obj_adapter with minor code 6
-      poa->set_servant_manager (&servant_locator
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->set_servant_manager (&servant_locator);
     }
-  ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+  catch (const CORBA::BAD_INV_ORDER& ex)
     {
       if ((ex.minor() & 0xFFFU) == 6)
         {
           succeed = true;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!succeed)
   {
@@ -250,67 +240,49 @@ main (int argc, char **argv)
 {
   int retval = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::PolicyList policies;
       CORBA::ULong current_length = 0;
 
       policies.length (current_length + 1);
       policies[current_length++] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
       policies.length (current_length + 1);
       policies[current_length++] =
-        root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN);
 
       policies.length (current_length + 1);
       policies[current_length++] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       if (!set_nil_servant_manager (child_poa.in()))
         retval = -1;
 
       Servant_Locator servant_locator (child_poa.in ());
-      child_poa->set_servant_manager (&servant_locator
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child_poa->set_servant_manager (&servant_locator);
 
       if (!overwrite_servant_manager (child_poa.in()))
         retval = -1;
@@ -320,28 +292,20 @@ main (int argc, char **argv)
 
       CORBA::Object_var first_object =
         child_poa->create_reference_with_id (first_oid.in (),
-                                             "IDL:test:1.0"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             "IDL:test:1.0");
 
       test_var first_test =
-        test::_narrow (first_object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (first_object.in ());
 
       PortableServer::ObjectId_var second_oid =
         PortableServer::string_to_ObjectId ("second");
 
       CORBA::Object_var second_object =
         child_poa->create_reference_with_id (second_oid.in (),
-                                             "IDL:test:1.0"
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             "IDL:test:1.0");
 
       test_var second_test =
-        test::_narrow (second_object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (second_object.in ());
 
       first_task.object (first_test.in ());
       second_task.object (second_test.in ());
@@ -353,20 +317,17 @@ main (int argc, char **argv)
       second_task.wait ();
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s successful\n",
                   argv[0]));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       retval = -1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index 70b54317789..4e484a4119f 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -31,7 +31,7 @@ public:
 
   ~test_i (void);
 
-  void method (ACE_ENV_SINGLE_ARG_DECL)
+  void method (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POA_var poa_;
@@ -54,7 +54,7 @@ test_i::~test_i (void)
 }
 
 void
-test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -85,7 +85,7 @@ Object_Activator::Object_Activator (ACE_Thread_Manager &thread_manager,
 int
 Object_Activator::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       test_i *servant =
         new test_i (this->poa_.in ());
@@ -93,22 +93,18 @@ Object_Activator::svc (void)
       PortableServer::ServantBase_var safe_servant (servant);
 
       PortableServer::ObjectId_var id =
-        this->poa_->activate_object (servant
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->poa_->activate_object (servant);
 
       this->object_activated_.signal ();
 
-      this->poa_->deactivate_object (id.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->poa_->deactivate_object (id.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in activator thread");
+      ex._tao_print_exception (
+        "Exception caught in activator thread");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -123,8 +119,7 @@ public:
   Servant_Activator (PortableServer::POA_ptr poa);
 
   PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
-                                     PortableServer::POA_ptr poa
-                                     ACE_ENV_ARG_DECL)
+                                     PortableServer::POA_ptr poa)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -132,8 +127,7 @@ public:
                     PortableServer::POA_ptr adapter,
                     PortableServer::Servant servant,
                     CORBA::Boolean cleanup_in_progress,
-                    CORBA::Boolean remaining_activations
-                    ACE_ENV_ARG_DECL)
+                    CORBA::Boolean remaining_activations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POA_var poa_;
@@ -149,8 +143,7 @@ Servant_Activator::Servant_Activator (PortableServer::POA_ptr poa)
 
 PortableServer::Servant
 Servant_Activator::incarnate (const PortableServer::ObjectId &,
-                              PortableServer::POA_ptr
-                              ACE_ENV_ARG_DECL)
+                              PortableServer::POA_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -160,13 +153,9 @@ Servant_Activator::incarnate (const PortableServer::ObjectId &,
   PortableServer::ServantBase_var safe_servant (servant);
 
   this->id_ =
-    this->poa_->activate_object (servant
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+    this->poa_->activate_object (servant);
 
-  this->poa_->deactivate_object (this->id_.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->poa_->deactivate_object (this->id_.in ());
 
   int result =
     global_object_activator->activate ();
@@ -208,78 +197,56 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &,
                                 PortableServer::POA_ptr,
                                 PortableServer::Servant servant,
                                 CORBA::Boolean,
-                                CORBA::Boolean
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Boolean)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  servant->_remove_ref ();
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       CORBA::PolicyList policies;
       CORBA::ULong current_length = 0;
 
       policies.length (current_length + 1);
       policies[current_length++] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER);
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       Servant_Activator servant_activator (child_poa.in ());
-      child_poa->set_servant_manager (&servant_activator
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child_poa->set_servant_manager (&servant_activator);
 
       CORBA::Object_var first_object =
-        child_poa->create_reference ("IDL:test:1.0"
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->create_reference ("IDL:test:1.0");
 
       test_var first_test =
-        test::_narrow (first_object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (first_object.in ());
 
       PortableServer::ObjectId_var id =
-        child_poa->reference_to_id (first_object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->reference_to_id (first_object.in ());
 
       ACE_Thread_Manager thread_manager;
 
@@ -289,27 +256,21 @@ main (int argc, char **argv)
       global_object_activator =
         &object_activator;
 
-      first_test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      first_test->method ();
 
-      child_poa->deactivate_object (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      child_poa->deactivate_object (id.in ());
 
       // Wait for the Object_Activator thread to exit.
       thread_manager.wait ();
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index 11aa293619d..ecac2227ab3 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -49,98 +49,72 @@ test_i::~test_i (void)
 
   if (this->other_)
     {
-      ACE_TRY_NEW_ENV
+      try
         {
-          PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          PortableServer::POA_var poa = this->_default_POA ();
 
-          PortableServer::ObjectId_var id = poa->servant_to_id (this->other_
-                                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          PortableServer::ObjectId_var id = poa->servant_to_id (this->other_);
 
           ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating other servant\n"));
 
-          poa->deactivate_object (id.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          poa->deactivate_object (id.in ());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "test_i::~test_i");
+          ex._tao_print_exception ("test_i::~test_i");
         }
-      ACE_ENDTRY;
     }
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       test_i *servant1 = new test_i (0);
       test_i *servant2 = new test_i (servant1);
 
       PortableServer::ObjectId_var id1 =
-        root_poa->activate_object (servant1
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (servant1);
 
       // Give ownership to POA.
-      servant1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      servant1->_remove_ref ();
 
       PortableServer::ObjectId_var id2 =
-        root_poa->activate_object (servant2
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (servant2);
 
       // Give ownership to POA.
-      servant2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      servant2->_remove_ref ();
 
-      root_poa->deactivate_object (id2.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->deactivate_object (id2.in ());
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 0c5c38a7ddf..98a931f25e0 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -56,7 +56,7 @@ class test_i : public POA_test
 public:
   test_i (ACE_Auto_Event &event);
 
-  void deactivate_self (ACE_ENV_SINGLE_ARG_DECL)
+  void deactivate_self (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -69,22 +69,17 @@ test_i::test_i (ACE_Auto_Event &event)
 }
 
 void
-test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL)
+test_i::deactivate_self (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::ObjectId_var id = poa->servant_to_id (this);
 
   if (debug)
     ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating servant\n"));
 
-  poa->deactivate_object (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 
   if (debug)
     ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete: signaling main thread and going to sleep\n"));
@@ -147,33 +142,27 @@ Activator::svc (void)
   if (debug)
     ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete, trying to activate\n"));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       if (this->task_id_ == "first thread")
         {
           PortableServer::ObjectId_var id =
-            this->poa_->activate_object (this->servant_
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->poa_->activate_object (this->servant_);
         }
       else
         {
           this->poa_->activate_object_with_id (this->id_,
-                                               this->servant_
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                               this->servant_);
         }
 
       if (debug)
         ACE_DEBUG ((LM_DEBUG, "(%t) Activation complete\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Activator::svc");
+      ex._tao_print_exception ("Activator::svc");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -195,34 +184,28 @@ Deactivator::Deactivator (test_ptr t)
 int
 Deactivator::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->test_->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_->deactivate_self ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Deactivator::svc");
+      ex._tao_print_exception ("Deactivator::svc");
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       int parse_args_result =
         parse_args (argc, argv);
@@ -232,23 +215,17 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_Auto_Event event1;
       test_i servant1 (event1);
@@ -256,19 +233,15 @@ main (int argc, char **argv)
       ACE_Auto_Event event2;
       test_i servant2 (event2);
 
-      test_var test_object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test_object1 = servant1._this ();
 
-      test_var test_object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test_object2 = servant2._this ();
 
       PortableServer::ObjectId_var id1 =
         root_poa->reference_to_id (test_object1.in ());
-      ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id2 =
         root_poa->reference_to_id (test_object2.in ());
-      ACE_TRY_CHECK;
 
       Activator activator1 (test_object1.in (),
                             event1,
@@ -300,17 +273,13 @@ main (int argc, char **argv)
         return result;
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
index 349ad507854..be4f89f1607 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp
@@ -70,32 +70,25 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "POAManagerFactoryTest"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "POAManagerFactoryTest");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow to POA.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       if (verbose)
         ACE_DEBUG ((LM_DEBUG,
@@ -124,9 +117,7 @@ main (int argc, char **argv)
       // Explicitly create a POAManager - "POAManager1" .
       PortableServer::POAManager_var poa_manager_1
         = poa_manager_factory->create_POAManager ("POAManager1",
-                                                  policies
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  policies);
 
       VERIFY_CONDITION (!CORBA::is_nil(poa_manager_1.in()));
       if (verbose)
@@ -141,19 +132,16 @@ main (int argc, char **argv)
                     ACE_TEXT("Prevent duplicated POAManagers: ")));
       pretest = fail;
       CORBA::Boolean got_expected_exception = false;
-      ACE_TRY_EX (create)
+      try
       {
         PortableServer::POAManager_var poa_manager
          = poa_manager_factory->create_POAManager ("POAManager1",
-                                                   policies
-                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (create);
+                                                   policies);
       }
-      ACE_CATCH (PortableServer::POAManagerFactory::ManagerAlreadyExists, mae)
+      catch (const PortableServer::POAManagerFactory::ManagerAlreadyExists& )
       {
         got_expected_exception = true;
       }
-      ACE_ENDTRY;
 
       VERIFY_CONDITION (got_expected_exception);
       if (verbose)
@@ -173,12 +161,10 @@ main (int argc, char **argv)
         PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA2",
                               PortableServer::POAManager::_nil (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
+                              policies);
 
         PortableServer::POAManager_var poa_manager_2
-          = child_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          = child_poa->the_POAManager ();
 
         VERIFY_CONDITION (!CORBA::is_nil(poa_manager_2.in()));
         if (verbose)
@@ -189,8 +175,7 @@ main (int argc, char **argv)
           return 1;
 
         CORBA::String_var poa_manager_2_name
-          = poa_manager_2->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          = poa_manager_2->get_id ();
         if (verbose)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT("Implicitly created POAManager's ID: [%s]\n"),
@@ -204,8 +189,7 @@ main (int argc, char **argv)
         pretest = fail;
 
         PortableServer::POAManagerFactory::POAManagerSeq_var managers
-          = poa_manager_factory->list (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          = poa_manager_factory->list ();
 
         VERIFY_CONDITION (managers->length () == 3);
         if (verbose)
@@ -213,13 +197,11 @@ main (int argc, char **argv)
                       (pretest == fail) ? ACE_TEXT ("passed") : ACE_TEXT ("failed")));
 
         PortableServer::POAManager_var root_poa_manager
-          = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          = root_poa->the_POAManager();
 
         for (CORBA::ULong i = 0; i < managers->length(); ++i)
         {
-          CORBA::String_var name = managers[i]->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          CORBA::String_var name = managers[i]->get_id ();
           if (verbose)
             ACE_DEBUG ((LM_DEBUG,
                         ACE_TEXT("Validate listed POAManager [%s]: "),
@@ -255,11 +237,9 @@ main (int argc, char **argv)
         pretest = fail;
 
         PortableServer::POAManager_var manager
-          = poa_manager_factory->find ("POAManager1" ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          = poa_manager_factory->find ("POAManager1");
 
-        CORBA::String_var name = manager->get_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::String_var name = manager->get_id ();
 
         VERIFY_CONDITION ((ACE_OS::strcmp (name.in (), "POAManager1") == 0
                  && manager.in () == poa_manager_1.in ()));
@@ -278,27 +258,22 @@ main (int argc, char **argv)
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager_1.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
-      poa_manager_1->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager_1->activate ();
 
       root_poa->destroy (1, 1);
 
       if (verbose)
         ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("passed\n")));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       fail++;
       if (verbose)
         ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("failed\n")));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT("POAManagerFactory %s\n"),
               (pretest == fail) ? ACE_TEXT ("succeeded") : ACE_TEXT ("failed")));
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
index a35208aa000..899d8fae6ee 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -22,74 +22,58 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy_poa (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 void
-test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
+test_i::destroy_poa (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 0;
   poa->destroy (etherealize_objects,
-                wait_for_completion
-                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                wait_for_completion);
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       test_i servant;
 
-      test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test_object = servant._this ();
 
-      test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_object->destroy_poa ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp
index 45519fdd154..4b22ec2ca25 100644
--- a/TAO/tests/POA/Persistent_ID/client.cpp
+++ b/TAO/tests/POA/Persistent_ID/client.cpp
@@ -61,16 +61,13 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int parse_args_result =
         parse_args (argc, argv);
@@ -78,51 +75,37 @@ main (int argc, char **argv)
         return parse_args_result;
 
       CORBA::Object_var object =
-        orb->string_to_object (IOR
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (IOR);
 
       test_var test1 =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
-      test1->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test1->method ();
 
       test_var test2 =
-        test1->create_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test1->create_POA ();
 
-      test2->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test2->method ();
 
-      test1->destroy_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test1->destroy_POA ();
 
       test_var test3 =
-        test1->create_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test1->create_POA ();
 
-      test2->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test2->method ();
 
-      test3->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test3->method ();
 
       if (shutdown_server)
         {
-          test1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test1->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error!");
+      ex._tao_print_exception ("Error!");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index 15f8272c1a9..4a947ab13cc 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -31,19 +31,19 @@ public:
   test_i (CORBA::ORB_ptr orb_ptr,
           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));
 
-  test_ptr create_POA (ACE_ENV_SINGLE_ARG_DECL)
+  test_ptr create_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy_POA (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy_POA (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (void);
 
 protected:
   CORBA::ORB_var orb_;
@@ -60,26 +60,20 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (ACE_ENV_SINGLE_ARG_DECL)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("POACurrent"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("POACurrent");
 
   PortableServer::Current_var current =
-    PortableServer::Current::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::Current::_narrow (obj.in ());
 
   PortableServer::POA_var poa =
-    current->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    current->get_POA ();
 
   CORBA::String_var poa_name =
-    poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->the_name ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Method invoked on servant in POA = %s\n",
@@ -87,56 +81,46 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 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;
+  this->orb_->shutdown (0);
 }
 
 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 ());
 }
 
 test_ptr
-test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL)
+test_i::create_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::PolicyList policies (2);
   policies.length (2);
 
   policies[0] =
-    this->poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (test::_nil ());
+    this->poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID);
 
   policies[1] =
-    this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (test::_nil ());
+    this->poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (test::_nil ());
+    this->poa_->the_POAManager ();
 
   ACE_CString name = "POA";
   this->child_poa_ =
     this->poa_->create_POA (name.c_str (),
                             poa_manager.in (),
-                            policies
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (test::_nil ());
+                            policies);
 
   // Destroy the policies
   for (CORBA::ULong i = 0;
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      policies[i]->destroy ();
     }
 
   test_i *servant =
@@ -148,32 +132,25 @@ test_i::create_POA (ACE_ENV_SINGLE_ARG_DECL)
   if (this->oid_.ptr () == 0)
     {
       this->oid_ =
-        this->child_poa_->activate_object (servant
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (test::_nil ());
+        this->child_poa_->activate_object (servant);
     }
   else
     {
       this->child_poa_->activate_object_with_id (this->oid_.in (),
-                                                 servant
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (test::_nil ());
+                                                 servant);
     }
 
   test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (test::_nil ());
+    servant->_this ();
 
   return test._retn ();
 }
 
 void
-test_i::destroy_POA (ACE_ENV_SINGLE_ARG_DECL)
+test_i::destroy_POA (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->child_poa_->destroy (1, 0
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->child_poa_->destroy (1, 0);
 }
 
 const char *ior_file = "ior";
@@ -235,64 +212,50 @@ write_ior_to_file (const char *ior)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result = parse_args (argc, argv);
       if (result != 0)
         return result;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       test_i servant (orb.in (),
                       root_poa.in ());
 
       test_var test =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       int write_result =
         write_ior_to_file (ior.in ());
       if (write_result != 0)
         return write_result;
 
-      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_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index 59db0b1e922..1aa17eabfcd 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -28,59 +28,44 @@
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow to POA.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the POA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
 
       {
         PortableServer::ThreadPolicy_var policy1 =
-          root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL
-                                          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL);
 
         CORBA::Any policy_value;
         policy_value <<= PortableServer::ORB_CTRL_MODEL;
 
         CORBA::Policy_var policy =
           orb->create_policy (PortableServer::THREAD_POLICY_ID,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         PortableServer::ThreadPolicy_var policy2 =
-          PortableServer::ThreadPolicy::_narrow (policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          PortableServer::ThreadPolicy::_narrow (policy.in ());
 
         ACE_ASSERT (policy1->value () == policy2->value ());
       }
@@ -89,69 +74,51 @@ main (int argc, char **argv)
 
       {
         PortableServer::LifespanPolicy_var policy1 =
-          root_poa->create_lifespan_policy (PortableServer::TRANSIENT
-                                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_lifespan_policy (PortableServer::TRANSIENT);
 
         CORBA::Any policy_value;
         policy_value <<= PortableServer::TRANSIENT;
 
         CORBA::Policy_var policy =
           orb->create_policy (PortableServer::LIFESPAN_POLICY_ID,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         PortableServer::LifespanPolicy_var policy2 =
-          PortableServer::LifespanPolicy::_narrow (policy.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          PortableServer::LifespanPolicy::_narrow (policy.in ());
 
         ACE_ASSERT (policy1->value () == policy2->value ());
       }
 
       {
         PortableServer::IdUniquenessPolicy_var policy1 =
-          root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID);
 
         CORBA::Any policy_value;
         policy_value <<= PortableServer::UNIQUE_ID;
 
         CORBA::Policy_var policy =
           orb->create_policy (PortableServer::ID_UNIQUENESS_POLICY_ID,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         PortableServer::IdUniquenessPolicy_var policy2 =
-          PortableServer::IdUniquenessPolicy::_narrow (policy.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          PortableServer::IdUniquenessPolicy::_narrow (policy.in ());
 
         ACE_ASSERT (policy1->value () == policy2->value ());
       }
 
       {
         PortableServer::IdAssignmentPolicy_var policy1 =
-          root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_id_assignment_policy (PortableServer::USER_ID);
 
         CORBA::Any policy_value;
         policy_value <<= PortableServer::USER_ID;
 
         CORBA::Policy_var policy =
           orb->create_policy (PortableServer::ID_ASSIGNMENT_POLICY_ID,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         PortableServer::IdAssignmentPolicy_var policy2 =
-          PortableServer::IdAssignmentPolicy::_narrow (policy.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          PortableServer::IdAssignmentPolicy::_narrow (policy.in ());
 
         ACE_ASSERT (policy1->value () == policy2->value ());
       }
@@ -160,69 +127,51 @@ main (int argc, char **argv)
 
       {
         PortableServer::ImplicitActivationPolicy_var policy1 =
-          root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
         CORBA::Any policy_value;
         policy_value <<= PortableServer::IMPLICIT_ACTIVATION;
 
         CORBA::Policy_var policy =
           orb->create_policy (PortableServer::IMPLICIT_ACTIVATION_POLICY_ID,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         PortableServer::ImplicitActivationPolicy_var policy2 =
-          PortableServer::ImplicitActivationPolicy::_narrow (policy.in ()
-                                                             ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          PortableServer::ImplicitActivationPolicy::_narrow (policy.in ());
 
         ACE_ASSERT (policy1->value () == policy2->value ());
       }
 
       {
         PortableServer::ServantRetentionPolicy_var policy1 =
-          root_poa->create_servant_retention_policy (PortableServer::RETAIN
-                                                     ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_servant_retention_policy (PortableServer::RETAIN);
 
         CORBA::Any policy_value;
         policy_value <<= PortableServer::RETAIN;
 
         CORBA::Policy_var policy =
           orb->create_policy (PortableServer::SERVANT_RETENTION_POLICY_ID,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         PortableServer::ServantRetentionPolicy_var policy2 =
-          PortableServer::ServantRetentionPolicy::_narrow (policy.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          PortableServer::ServantRetentionPolicy::_narrow (policy.in ());
 
         ACE_ASSERT (policy1->value () == policy2->value ());
       }
 
       {
         PortableServer::RequestProcessingPolicy_var policy1 =
-          root_poa->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY
-                                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          root_poa->create_request_processing_policy (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
 
         CORBA::Any policy_value;
         policy_value <<= PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY;
 
         CORBA::Policy_var policy =
           orb->create_policy (PortableServer::REQUEST_PROCESSING_POLICY_ID,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         PortableServer::RequestProcessingPolicy_var policy2 =
-          PortableServer::RequestProcessingPolicy::_narrow (policy.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          PortableServer::RequestProcessingPolicy::_narrow (policy.in ());
 
         ACE_ASSERT (policy1->value () == policy2->value ());
       }
@@ -234,13 +183,11 @@ main (int argc, char **argv)
                   argv[0]));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp
index bd7b83a4082..6f4b1e859ce 100644
--- a/TAO/tests/POA/Reference_Counting/test.cpp
+++ b/TAO/tests/POA/Reference_Counting/test.cpp
@@ -21,7 +21,6 @@ public:
   }
 
   virtual void moo (
-      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -31,27 +30,24 @@ public:
 };
 
 CORBA::ULong
-getRefCount (PortableServer::ServantBase * sb ACE_ENV_ARG_DECL)
+getRefCount (PortableServer::ServantBase * sb)
 {
-  return sb->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return sb->_refcount_value ();
 }
 
 int
 main (int argc, char * argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -61,16 +57,13 @@ main (int argc, char * argv[])
       Hello_impl * h = 0;
       ACE_NEW_RETURN (h,Hello_impl, 1);
 
-      CORBA::ULong before_act = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong before_act = h->_refcount_value ();
 
       ACE_DEBUG ((LM_DEBUG, "Before activation: %d\n", before_act));
 
-      PortableServer::ObjectId_var oid = poa->activate_object (h ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableServer::ObjectId_var oid = poa->activate_object (h);
 
-      CORBA::ULong after_act = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong after_act = h->_refcount_value ();
 
       ACE_DEBUG ((LM_DEBUG, "After activation: %d\n", after_act));
         {
@@ -85,17 +78,14 @@ main (int argc, char * argv[])
            */
 
           CORBA::ULong refCountBeforeIdToServant =
-            h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            h->_refcount_value ();
 
           ACE_DEBUG ((LM_DEBUG, "Before id_to_servant:  %d\n", refCountBeforeIdToServant));
 
-          PortableServer::ServantBase_var srv = poa->id_to_servant (oid.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          PortableServer::ServantBase_var srv = poa->id_to_servant (oid.in());
 
           CORBA::ULong refCountAfterIdToServant =
-            srv->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);;
-          ACE_TRY_CHECK;
+            srv->_refcount_value ();;
 
           ACE_DEBUG ((LM_DEBUG, "After id_to_servant:  %d\n", refCountAfterIdToServant));
 
@@ -110,13 +100,11 @@ main (int argc, char * argv[])
            */
         }
 
-      CORBA::ULong before_deact = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong before_deact = h->_refcount_value ();
 
       ACE_DEBUG ((LM_DEBUG, "Before deactivate_object: %d\n", before_deact));
 
-      poa->deactivate_object (oid.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->deactivate_object (oid.in());
 
       /*
        * Because id_to_servant did not increment the reference count, but
@@ -126,28 +114,21 @@ main (int argc, char * argv[])
        * correct.
        */
 
-      CORBA::ULong after_deact = h->_refcount_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ULong after_deact = h->_refcount_value ();
 
       ACE_DEBUG ((LM_DEBUG, "After deactivate_object: %d\n", after_deact));
 
-      h->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      h->_remove_ref ();
 
-      orb->shutdown (1
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index f841fcdfdfd..7626b224f3c 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -28,10 +28,10 @@ class test_i : public virtual POA_test
 public:
   test_i (PortableServer::POA_ptr poa);
 
-  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);
 
 private:
   PortableServer::POA_var poa_;
@@ -45,7 +45,7 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::method (ACE_ENV_SINGLE_ARG_DECL)
+test_i::method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -63,16 +63,14 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL)
       ACE_DEBUG ((LM_DEBUG,
                   "Calling self from %t\n"));
 
-      test_var self = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      test_var self = this->_this ();
 
-      self->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      self->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 ());
 }
@@ -95,17 +93,15 @@ Worker::Worker (test_ptr t)
 int
 Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->test_->method ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in thread");
+      ex._tao_print_exception ("Exception caught in thread");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -113,73 +109,56 @@ Worker::svc (void)
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"
-                                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Policies for the new POA.
       CORBA::PolicyList policies (2);
       policies.length (2);
 
       policies[0] =
-        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
       policies[1] =
-        root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL);
 
       // Creation of the child POA.
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // Destroy the policies
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policies[i]->destroy ();
         }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       test_i servant1 (child_poa.in ());
       test_i servant2 (child_poa.in ());
 
-      test_var object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var object1 = servant1._this ();
 
-      test_var object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var object2 = servant2._this ();
 
       Worker worker1 (object1.in ());
       Worker worker2 (object2.in ());
@@ -196,16 +175,13 @@ main (int argc, char **argv)
       ACE_UNUSED_ARG (result);
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index 8b945a68c1b..b640b83b7c6 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -21,7 +21,7 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
+  void destroy_poa (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void test_poa (PortableServer::POA_ptr poa);
@@ -36,49 +36,38 @@ test_i::test_poa (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
+test_i::destroy_poa (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 1;
   this->poa_->destroy (etherealize_objects,
-                       wait_for_completion
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                       wait_for_completion);
 }
 
 PortableServer::POA_ptr
 init_orb (int argc,
           char **argv,
-          const char *orb_name
-          ACE_ENV_ARG_DECL)
+          const char *orb_name)
 {
   // Initialize the ORB first.
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        orb_name
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+                                        orb_name);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("RootPOA"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    orb->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    PortableServer::POA::_narrow (obj.in ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    root_poa->the_POAManager ();
 
-  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  poa_manager->activate ();
 
   return root_poa._retn ();
 }
@@ -87,49 +76,41 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       PortableServer::POA_var first_poa =
         init_orb (argc,
                   argv,
-                  "first ORB"
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                  "first ORB");
 
       PortableServer::POA_var second_poa =
         init_orb (argc,
                   argv,
-                  "second ORB"
-                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                  "second ORB");
 
       test_i servant;
-      test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test_object = servant._this ();
 
       int expected_exception_raised = 0;
 
-      ACE_TRY_EX (first_poa)
+      try
         {
           servant.test_poa (first_poa.in ());
 
-          test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (first_poa);
+          test_object->destroy_poa ();
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+      catch (const CORBA::BAD_INV_ORDER& )
         {
           // This is the correct exception! Ignore
           expected_exception_raised = 1;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught of incorrect type");
+          ex._tao_print_exception (
+            "Exception caught of incorrect type");
           return -1;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
 
       // Make sure an exception was raised and it was of the correct
       // type.
@@ -140,19 +121,15 @@ main (int argc,
 
       servant.test_poa (second_poa.in ());
 
-      test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_object->destroy_poa ();
 
-      first_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      first_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception caught");
+      ex._tao_print_exception ("Unexpected exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
index bdf487d4a54..b446a7fbe94 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp
@@ -9,15 +9,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
index 0fbcc7a4ab6..244529328a9 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
@@ -19,10 +19,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp
index ee7747bb1ca..f9d6b9e3c81 100644
--- a/TAO/tests/Parallel_Connect_Strategy/client.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/client.cpp
@@ -41,18 +41,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       ACE_High_Res_Timer hrt;
       ACE_hrtime_t elapsed;
@@ -61,8 +59,7 @@ main (int argc, char *argv[])
       hrt.start();
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Hello::_narrow(tmp.in ());
       hrt.stop();
       hrt.elapsed_microseconds (elapsed);
       hrt.reset();
@@ -80,16 +77,14 @@ main (int argc, char *argv[])
         }
       if (kill_server)
         {
-          hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          hello->shutdown ();
         }
       else
         {
           ACE_DEBUG ((LM_DEBUG,"Starting invocation 1 - "));
           hrt.start();
           CORBA::String_var the_string =
-            hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            hello->get_string ();
           hrt.stop();
           hrt.elapsed_microseconds (elapsed);
           ACE_DEBUG ((LM_DEBUG,
@@ -98,24 +93,20 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG,"Starting invocation 2 - "));
           hrt.reset();
           hrt.start();
-          the_string = hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          the_string = hello->get_string ();
           hrt.stop();
           hrt.elapsed_microseconds (elapsed);
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT("call completed in %d usec\n"),
                       elapsed ));
         }
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp
index 153aba883ff..bd186cfbd33 100644
--- a/TAO/tests/Parallel_Connect_Strategy/server.cpp
+++ b/TAO/tests/Parallel_Connect_Strategy/server.cpp
@@ -40,19 +40,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,8 +57,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -73,13 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -92,13 +86,10 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -106,31 +97,24 @@ main (int argc, char *argv[])
         }
       else
         {
-          adapter->bind ("pcs_test", ior.in() ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          adapter->bind ("pcs_test", ior.in());
         }
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index 42d992cd65a..f8e6044ab84 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -20,8 +20,8 @@
 #include "any.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Param_Test, 
-           any, 
+ACE_RCSID (Param_Test,
+           any,
            "$Id$")
 
 // ************************************************************************
@@ -50,7 +50,7 @@ Test_Any::opname (void) const
 }
 
 void
-Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
+Test_Any::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("o1") <<= this->in_;
   req->add_inout_arg ("o2") <<= this->inout_;
@@ -58,22 +58,19 @@ Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
 
   req->set_return_type (CORBA::_tc_any);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   const CORBA::Any *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new CORBA::Any (*tmp);
 }
@@ -94,23 +91,20 @@ static const CORBA::TypeCode_ptr any_table [] =
 #endif /* any_table isn't currently used */
 
 int
-Test_Any::init_parameters (Param_Test_ptr objref
-                           ACE_ENV_ARG_DECL)
+Test_Any::init_parameters (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->cobj_ = objref->make_coffee ();
 
       this->reset_parameters ();
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception doing make_coffee");
+      sysex._tao_print_exception ("System Exception doing make_coffee");
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -271,22 +265,18 @@ Test_Any::reset_parameters (void)
 }
 
 int
-Test_Any::run_sii_test (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL)
+Test_Any::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_any (this->in_,
                                      this->inout_,
-                                     this->out_.out ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                     this->out_.out ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h
index f27f8be3c99..45358671fc4 100644
--- a/TAO/tests/Param_Test/any.h
+++ b/TAO/tests/Param_Test/any.h
@@ -47,15 +47,13 @@ public:
     ANY_LAST_TEST_ITEM
   };
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -70,7 +68,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp
index c15ba6afd10..06176f9e302 100644
--- a/TAO/tests/Param_Test/anyop.cpp
+++ b/TAO/tests/Param_Test/anyop.cpp
@@ -26,8 +26,8 @@
 
 #include "ace/Get_Opt.h"
 
-ACE_RCSID (Param_Test, 
-           anyop, 
+ACE_RCSID (Param_Test,
+           anyop,
            "$Id$")
 
 int
@@ -35,13 +35,11 @@ main (int argc, char *argv[])
 {
   int n = 1024;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            0);
 
       ACE_Get_Opt get_opt (argc, argv, "dn:");
       int opt;
@@ -96,16 +94,13 @@ main (int argc, char *argv[])
 
           {
             CORBA::Object_var obj =
-              orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar"
-                                     ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar");
 
-            Param_Test_var param_test = 
+            Param_Test_var param_test =
               TAO::Narrow_Utils<Param_Test>::unchecked_narrow (
                   obj.in (),
                   _TAO_Param_Test_Proxy_Broker_Factory_function_pointer
                 );
-            ACE_TRY_CHECK;
             TAO_Stub *stub = param_test->_stubobj ();
             stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0");
 
@@ -119,8 +114,7 @@ main (int argc, char *argv[])
                             "Cannot extract Param_Test (oh the horror)\n"));
               }
             CORBA::Boolean equiv =
-              param_test->_is_equivalent (o ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              param_test->_is_equivalent (o);
 
             if (!equiv)
               {
@@ -272,7 +266,7 @@ main (int argc, char *argv[])
 
             any <<= *i;
             Param_Test::Fixed_Struct *o;
-            
+
             if (!(any >>= o)
                 || o->l != i->l
                 || o->c != i->c
@@ -288,7 +282,7 @@ main (int argc, char *argv[])
               }
 
             any <<= i;
-            
+
             if (!(any >>= o)
                 || o->l != i->l
                 || o->c != i->c
@@ -312,7 +306,7 @@ main (int argc, char *argv[])
                             CORBA::LongSeq (len),
                             -1);
             i->length (len);
-        
+
             for (CORBA::ULong k = 0; k < len; ++k)
               {
                 (*i)[k] = k;
@@ -345,13 +339,11 @@ main (int argc, char *argv[])
           }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "IDL Types");
+      ex._tao_print_exception ("IDL Types");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 9c2b6ea098e..18f09817c80 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "bd_array_seq.h"
 
-ACE_RCSID (Param_Test, 
-           bd_array_seq, 
+ACE_RCSID (Param_Test,
+           bd_array_seq,
            "$Id$")
 
 const CORBA::ULong MAX_ARRAYSEQ_LEN = 1;
@@ -52,37 +52,32 @@ Test_Bounded_Array_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req
-                                             ACE_ENV_ARG_DECL)
+Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_ArraySeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Bounded_ArraySeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Bounded_ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_ArraySeq (*tmp);
 }
 
 int
-Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -127,29 +122,24 @@ Test_Bounded_Array_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref
-                                           ACE_ENV_ARG_DECL)
+Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Bounded_ArraySeq_out out (this->out_.out ());
 
       this->ret_ =
         objref->test_bounded_array_sequence (this->in_,
                                              this->inout_.inout (),
-                                             out
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_Array_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Bounded_Array_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h
index 060454b6e71..5c0c29c5e0f 100644
--- a/TAO/tests/Param_Test/bd_array_seq.h
+++ b/TAO/tests/Param_Test/bd_array_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Bounded_Array_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,8 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *
-                       ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 44be6ed3932..c4ab4067cae 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "bd_long_seq.h"
 
-ACE_RCSID (Param_Test, 
-           bd_long_seq, 
+ACE_RCSID (Param_Test,
+           bd_long_seq,
            "$Id$")
 
 // ************************************************************************
@@ -49,37 +49,32 @@ Test_Bounded_Long_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req
-                                            ACE_ENV_ARG_DECL)
+Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_Long_Seq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   const Param_Test::Bounded_Long_Seq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Bounded_Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_Long_Seq (*tmp);
 }
 
 int
-Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr)
 {
   // get some sequence length (32 in this case)
   CORBA::ULong len = this->in_->maximum ();
@@ -116,27 +111,22 @@ Test_Bounded_Long_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref
-                                          ACE_ENV_ARG_DECL)
+Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Bounded_Long_Seq_out out (this->out_.out ());
       this->ret_ = objref->test_bounded_long_sequence (this->in_.in (),
                                                        this->inout_.inout (),
-                                                       out
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                       out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_Long_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Bounded_Long_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h
index 52e9fbdeb02..caaae1236e3 100644
--- a/TAO/tests/Param_Test/bd_long_seq.h
+++ b/TAO/tests/Param_Test/bd_long_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Bounded_Long_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 0faa3656552..60363f53431 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "bd_short_seq.h"
 
-ACE_RCSID (Param_Test, 
-           bd_short_seq, 
+ACE_RCSID (Param_Test,
+           bd_short_seq,
            "$Id$")
 
 // ************************************************************************
@@ -49,37 +49,33 @@ Test_Bounded_Short_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req
-                                             ACE_ENV_ARG_DECL)
+Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_Short_Seq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Bounded_Short_Seq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Bounded_Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_Short_Seq (*tmp);
 }
 
 int
 Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/
-                                              ACE_ENV_ARG_DECL_NOT_USED /*env*/)
+ /*env*/)
 {
   // ACE_UNUSED_ARG (objref);
 
@@ -120,28 +116,23 @@ Test_Bounded_Short_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref
-                                           ACE_ENV_ARG_DECL)
+Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Bounded_Short_Seq_out out (this->out_.out ());
 
       this->ret_ = objref->test_bounded_short_sequence (this->in_.in (),
                                                         this->inout_.inout (),
-                                                        out
-                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                        out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_Short_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Bounded_Short_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h
index 78f402b4f63..9794e21de32 100644
--- a/TAO/tests/Param_Test/bd_short_seq.h
+++ b/TAO/tests/Param_Test/bd_short_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Bounded_Short_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index 5d542556fa8..968ebaaa976 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "bd_str_seq.h"
 
-ACE_RCSID (Param_Test, 
-           bd_str_seq, 
+ACE_RCSID (Param_Test,
+           bd_str_seq,
            "$Id$")
 
 // ************************************************************************
@@ -49,8 +49,7 @@ Test_Bounded_String_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req
-                                              ACE_ENV_ARG_DECL)
+Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -58,29 +57,25 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Bounded_StrSeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   const Param_Test::Bounded_StrSeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Bounded_StrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_StrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_StrSeq (*tmp);
 }
 
 int
-Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr)
 {
   const char *choiceList[] =
   {
@@ -113,28 +108,23 @@ Test_Bounded_String_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref
-                                            ACE_ENV_ARG_DECL)
+Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Bounded_StrSeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_bounded_strseq (this->in_.in (),
                                                 this->inout_.inout (),
-                                                out
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_String_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Bounded_String_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h
index 31936d01fec..2abe9954fb6 100644
--- a/TAO/tests/Param_Test/bd_str_seq.h
+++ b/TAO/tests/Param_Test/bd_str_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Bounded_String_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index 149ac604a6a..36a6aba5130 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "bd_string.h"
 
-ACE_RCSID (Param_Test, 
-           bd_string, 
+ACE_RCSID (Param_Test,
+           bd_string,
            "$Id$")
 
 // ************************************************************************
@@ -57,8 +57,7 @@ Test_Bounded_String::opname (void) const
 }
 
 void
-Test_Bounded_String::dii_req_invoke (CORBA::Request *req
-                                     ACE_ENV_ARG_DECL)
+Test_Bounded_String::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= CORBA::Any::from_string (this->in_, 128);
   req->add_inout_arg ("s2") <<= CORBA::Any::from_string (this->inout_, 128);
@@ -69,29 +68,25 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_short_string);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   char *tmp;
   req->return_value () >>= CORBA::Any::to_string (tmp, 128);
   this->ret_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= CORBA::Any::to_string (tmp, 128);
   this->inout_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= CORBA::Any::to_string (tmp, 128);
   this->out_ = CORBA::string_dup (tmp);
 }
 
 int
-Test_Bounded_String::init_parameters (Param_Test_ptr
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+Test_Bounded_String::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -126,28 +121,23 @@ Test_Bounded_String::reset_parameters (void)
 }
 
 int
-Test_Bounded_String::run_sii_test (Param_Test_ptr objref
-                                   ACE_ENV_ARG_DECL)
+Test_Bounded_String::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       CORBA::String_out str_out (this->out_);
 
       this->ret_ = objref->test_bounded_string (this->in_,
                                                 this->inout_,
-                                                str_out
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                str_out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_String::run_sii_test\n");
+      ex._tao_print_exception ("Test_Bounded_String::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h
index f8024a686ff..8019f18aecb 100644
--- a/TAO/tests/Param_Test/bd_string.h
+++ b/TAO/tests/Param_Test/bd_string.h
@@ -33,15 +33,13 @@ public:
   ~Test_Bounded_String (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index 1c2593b9f40..2c1318e45d0 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "bd_struct_seq.h"
 
-ACE_RCSID (Param_Test, 
-           bd_struct_seq, 
+ACE_RCSID (Param_Test,
+           bd_struct_seq,
            "$Id$")
 
 const CORBA::ULong MAX_STRUCTSEQ_LEN = 1;
@@ -52,37 +52,33 @@ Test_Bounded_Struct_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
-                                              ACE_ENV_ARG_DECL)
+Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_StructSeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Bounded_StructSeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Bounded_StructSeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_StructSeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_StructSeq (*tmp);
 }
 
 int
 Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */
-                                               ACE_ENV_ARG_DECL_NOT_USED /* env */)
+ /* env */)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -118,28 +114,23 @@ Test_Bounded_Struct_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref
-                                            ACE_ENV_ARG_DECL)
+Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Bounded_StructSeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_bounded_struct_sequence (this->in_,
                                                          this->inout_.inout (),
-                                                         out
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                         out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_Struct_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Bounded_Struct_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h
index e59ef86b43e..dc640977d8f 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.h
+++ b/TAO/tests/Param_Test/bd_struct_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Bounded_Struct_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index 16d32473b03..12b9a01ff52 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -20,8 +20,8 @@
 #include "bd_wstr_seq.h"
 #include "ace/OS_NS_wchar.h"
 
-ACE_RCSID (Param_Test, 
-           bd_wstr_seq, 
+ACE_RCSID (Param_Test,
+           bd_wstr_seq,
            "$Id$")
 
 // ************************************************************************
@@ -50,8 +50,7 @@ Test_Bounded_WString_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req
-                                               ACE_ENV_ARG_DECL)
+Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -59,29 +58,25 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Bounded_WStrSeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   const Param_Test::Bounded_WStrSeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Bounded_WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_WStrSeq (*tmp);
 }
 
 int
-Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr
-                                                ACE_ENV_ARG_DECL_NOT_USED)
+Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -113,28 +108,23 @@ Test_Bounded_WString_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref
-                                             ACE_ENV_ARG_DECL)
+Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Bounded_WStrSeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_bounded_wstrseq (this->in_.in (),
                                                  this->inout_.inout (),
-                                                 out
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                 out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_WString_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Bounded_WString_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h
index b1057f513f6..0f0c6b9f7e6 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.h
+++ b/TAO/tests/Param_Test/bd_wstr_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Bounded_WString_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,8 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *
-                       ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index 30689ff028c..4ce873cce40 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -20,8 +20,8 @@
 #include "bd_wstring.h"
 #include "ace/OS_NS_wchar.h"
 
-ACE_RCSID (Param_Test, 
-           bd_wstring, 
+ACE_RCSID (Param_Test,
+           bd_wstring,
            "$Id$")
 
 // ************************************************************************
@@ -58,8 +58,7 @@ Test_Bounded_WString::opname (void) const
 }
 
 void
-Test_Bounded_WString::dii_req_invoke (CORBA::Request *req
-                                      ACE_ENV_ARG_DECL)
+Test_Bounded_WString::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= CORBA::Any::from_wstring (this->in_, 128);
   req->add_inout_arg ("s2") <<= CORBA::Any::from_wstring (this->inout_, 128);
@@ -70,29 +69,25 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_short_wstring);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   CORBA::WChar *tmp;
   req->return_value () >>= CORBA::Any::to_wstring (tmp, 128);
   this->ret_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= CORBA::Any::to_wstring (tmp, 128);
   this->inout_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= CORBA::Any::to_wstring (tmp, 128);
   this->out_ = CORBA::wstring_dup (tmp);
 }
 
 int
-Test_Bounded_WString::init_parameters (Param_Test_ptr
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
+Test_Bounded_WString::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -127,28 +122,23 @@ Test_Bounded_WString::reset_parameters (void)
 }
 
 int
-Test_Bounded_WString::run_sii_test (Param_Test_ptr objref
-                                                            ACE_ENV_ARG_DECL)
+Test_Bounded_WString::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       CORBA::WString_out str_out (this->out_);
 
       this->ret_ = objref->test_bounded_wstring (this->in_,
                                                  this->inout_,
-                                                 str_out
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                 str_out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Bounded_WString::run_sii_test\n");
+      ex._tao_print_exception ("Test_Bounded_WString::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h
index ec0fb098b2e..4e7719f272a 100644
--- a/TAO/tests/Param_Test/bd_wstring.h
+++ b/TAO/tests/Param_Test/bd_wstring.h
@@ -33,15 +33,13 @@ public:
   ~Test_Bounded_WString (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,8 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *
-                       ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index ee1737e545f..d1f01d63033 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -47,8 +47,7 @@ Test_Big_Union::opname (void) const
 }
 
 void
-Test_Big_Union::dii_req_invoke (CORBA::Request *req
-                                ACE_ENV_ARG_DECL)
+Test_Big_Union::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -56,48 +55,43 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Big_Union);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Big_Union *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Big_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Big_Union (*tmp);
 }
 
 int
-Test_Big_Union::init_parameters (Param_Test_ptr objref
-                                 ACE_ENV_ARG_DECL)
+Test_Big_Union::init_parameters (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->cobj_ = objref->make_coffee ();
 
       this->reset_parameters ();
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,"System Exception doing make_coffee");
+      sysex._tao_print_exception ("System Exception doing make_coffee");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "An exception caught in make_coffee");
+      ex._tao_print_exception (
+        "An exception caught in make_coffee");
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -230,26 +224,21 @@ Test_Big_Union::reset_parameters (void)
 }
 
 int
-Test_Big_Union::run_sii_test (Param_Test_ptr objref
-                              ACE_ENV_ARG_DECL)
+Test_Big_Union::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_big_union (this->in_,
                                            this->inout_,
-                                           this->out_
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           this->out_);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Big_Union::run_sii_test\n");
+      ex._tao_print_exception ("Test_Big_Union::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -288,8 +277,7 @@ Test_Big_Union::check_validity (void)
       break;
     case 1:
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY
+        try
           {
             Coffee_ptr in    = this->in_.the_interface ();
             Coffee_ptr inout = this->inout_.the_interface ();
@@ -303,17 +291,13 @@ Test_Big_Union::check_validity (void)
               return 0;
 
             Coffee::Desc_var in_desc =
-              in->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              in->description ();
             Coffee::Desc_var inout_desc =
-              inout->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              inout->description ();
             Coffee::Desc_var out_desc =
-              out->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              out->description ();
             Coffee::Desc_var ret_desc =
-              ret->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              ret->description ();
 
             if (ACE_OS::strcmp (in_desc->name.in (),
                                 inout_desc->name.in ())
@@ -323,11 +307,10 @@ Test_Big_Union::check_validity (void)
                                    ret_desc->name.in ()))
               return 0;
           }
-        ACE_CATCHANY
+        catch (const CORBA::Exception&)
           {
             return 0;
           }
-        ACE_ENDTRY;
       }
       break;
     case 2:
diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h
index f08e0eac9c3..fc304337279 100644
--- a/TAO/tests/Param_Test/big_union.h
+++ b/TAO/tests/Param_Test/big_union.h
@@ -37,15 +37,13 @@ public:
     BIG_UNION_N_BRANCHES = 12
   };
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -60,7 +58,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index 33f7f961f40..87324854779 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -65,11 +65,8 @@ Param_Test_Client<T>::run_sii_test (void)
   this->results_.iterations (opt->loop_count ());
 
   // Declare the Env
-  ACE_DECLARE_NEW_CORBA_ENV;
   // Initialize parameters for the test.
-  int check = this->test_object_->init_parameters (this->param_test_
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int check = this->test_object_->init_parameters (this->param_test_);
 
   if (check == -1)
     {
@@ -84,7 +81,7 @@ Param_Test_Client<T>::run_sii_test (void)
   // Make the calls in a loop.
   for (i = 0; i < opt->loop_count (); i++)
     {
-      ACE_TRY
+      try
         {
           this->results_.call_count (this->results_.call_count () + 1);
           if (opt->debug ())
@@ -97,9 +94,7 @@ Param_Test_Client<T>::run_sii_test (void)
           this->results_.start_timer ();
 
           // make the call
-          this->test_object_->run_sii_test (this->param_test_
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_object_->run_sii_test (this->param_test_);
 
           // stop the timer.
           this->results_.stop_timer ();
@@ -111,11 +106,11 @@ Param_Test_Client<T>::run_sii_test (void)
               this->test_object_->print_values ();
             }
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
 
           this->results_.error_count (this->results_.error_count () + 1);
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, opname);
+          ex._tao_print_exception (opname);
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) client.cpp - run_sii_test:"
                       "run_sii_test exception in iteration %d",
@@ -123,7 +118,6 @@ Param_Test_Client<T>::run_sii_test (void)
           goto loop_around;
 
         }
-      ACE_ENDTRY;
 
       if (!this->test_object_->check_validity ())
         {
@@ -178,11 +172,8 @@ Param_Test_Client<T>::run_dii_test (void)
   this->results_.iterations (opt->loop_count ());
 
   // Environment variable
-  ACE_DECLARE_NEW_CORBA_ENV;
   // initialize parameters for the test
-  int check = this->test_object_->init_parameters (this->param_test_
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int check = this->test_object_->init_parameters (this->param_test_);
 
   if (check == -1)
     {
@@ -205,11 +196,9 @@ Param_Test_Client<T>::run_dii_test (void)
       // create the request
       CORBA::Request_var req;
 
-      ACE_TRY
+      try
         {
-          req = this->param_test_->_request (opname
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          req = this->param_test_->_request (opname);
 
           if (opt->debug ())
             {
@@ -218,19 +207,15 @@ Param_Test_Client<T>::run_dii_test (void)
             }
 
           // Make the invocation, verify the result.
-          this->test_object_->dii_req_invoke (req.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_object_->dii_req_invoke (req.in ());
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           this->results_.error_count (this->results_.error_count () + 1);
 
-          ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,
-                                opname);
+          ex._tao_print_exception (opname);
           goto loop_around;
         }
-      ACE_ENDTRY;
 
       if (opt->debug ())
         {
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index 0dd6c1199fe..efabe515361 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -20,8 +20,8 @@
 #include "complex_any.h"
 #include "tao/debug.h"
 
-ACE_RCSID (Param_Test, 
-           complex_any, 
+ACE_RCSID (Param_Test,
+           complex_any,
            "$Id$")
 
 const int LEVEL_2_LENGTH = 5;
@@ -53,8 +53,7 @@ Test_Complex_Any::opname (void) const
 }
 
 void
-Test_Complex_Any::dii_req_invoke (CORBA::Request *req
-                                  ACE_ENV_ARG_DECL)
+Test_Complex_Any::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -62,29 +61,25 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_any);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   const CORBA::Any *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new CORBA::Any (*tmp);
 }
 
 int
-Test_Complex_Any::init_parameters (Param_Test_ptr
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+Test_Complex_Any::init_parameters (Param_Test_ptr)
 {
   return this->reset_parameters ();
 }
@@ -169,22 +164,18 @@ Test_Complex_Any::reset_parameters (void)
 }
 
 int
-Test_Complex_Any::run_sii_test (Param_Test_ptr objref
-                                ACE_ENV_ARG_DECL)
+Test_Complex_Any::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_complex_any (this->in_,
                                              this->inout_,
-                                             this->out_.out ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             this->out_.out ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h
index 58763ad6761..7eb861c2223 100644
--- a/TAO/tests/Param_Test/complex_any.h
+++ b/TAO/tests/Param_Test/complex_any.h
@@ -33,15 +33,13 @@ public:
   ~Test_Complex_Any (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index 45a45f49b38..174a68185c1 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -63,23 +63,20 @@ int
 Driver::init (int argc, char **argv)
 {
   // environment to track exceptions
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   // retrieve the instance of Options
   Options *opt = OPTIONS::instance ();
 
   char exception_string[256];
 
-  ACE_TRY
+  try
     {
       ACE_OS::strcpy (exception_string, "ORB Initialization");
 
       // Retrieve the underlying ORB
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    "internet"
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                    "internet");
 
       // Parse command line and verify parameters.
       if (opt->parse_args (argc, argv) == -1)
@@ -91,9 +88,8 @@ Driver::init (int argc, char **argv)
       ACE_OS::strcpy (exception_string,"ORB::string_to_object() failed.");
 
       CORBA::Object_var temp =
-        this->orb_->string_to_object (opt->param_test_ior () ACE_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (opt->param_test_ior ());
 
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (temp.in()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -104,17 +100,14 @@ Driver::init (int argc, char **argv)
       // Get the object reference
       ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed.");
 
-      this->objref_ = Param_Test::_narrow (temp.in() ACE_ENV_ARG_PARAMETER);
+      this->objref_ = Param_Test::_narrow (temp.in());
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, exception_string);
+      ex._tao_print_exception (exception_string);
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -615,20 +608,17 @@ Driver::run (void)
     }
 
   // Get in a new environment variable
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       if (opt->shutdown ())
         {
-          this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->objref_->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "during shutdown");
+      ex._tao_print_exception ("during shutdown");
     }
-  ACE_ENDTRY;
 
   return retstatus;
 }
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 959d2459c07..6e349cd191e 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -49,10 +49,9 @@ Test_Exception::opname (void) const
 }
 
 void
-Test_Exception::dii_req_invoke (CORBA::Request_ptr req
-                                ACE_ENV_ARG_DECL)
+Test_Exception::dii_req_invoke (CORBA::Request_ptr req)
 {
-  ACE_TRY
+  try
     {
       this->in_++;
       req->add_in_arg ("s1") <<= this->in_;
@@ -65,24 +64,21 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
                                    Param_Test::_tc_Ooops
                                  ));
 
-      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      req->invoke ();
 
       req->return_value () >>= this->ret_;
 
       CORBA::NamedValue_ptr o2 =
-        req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        req->arguments ()->item (1);
 
       *o2->value () >>= this->inout_;
 
       CORBA::NamedValue_ptr o3 =
-        req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        req->arguments ()->item (2);
 
       *o3->value () >>= this->out_;
     }
-  ACE_CATCH (CORBA::UnknownUserException, user_ex)
+  catch (CORBA::UnknownUserException& user_ex)
     {
       Param_Test::Ooops* oops;
       Param_Test::BadBoy* bad_boy;
@@ -111,9 +107,9 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
         }
       else if (user_ex.exception () >>= bad_boy)
         {
-          ACE_PRINT_EXCEPTION ((*bad_boy),
-                               "Test_Exception::dii_req_invoke - "
-                               "unexpected (but known) user exception\n");
+          (*bad_boy)._tao_print_exception (
+            "Test_Exception::dii_req_invoke - "
+            "unexpected (but known) user exception\n");
 
           // Since 'BadBoy' is not in the exception list the DII request,
           // it should not be caught explicitly. See comment below.
@@ -132,7 +128,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
     }
   // Catch the SystemException type CORBA::NO_MEMORY thrown by the
   // server to test the system exception.
-  ACE_CATCH (CORBA::NO_MEMORY, ex)
+  catch (const CORBA::NO_MEMORY&)
     {
       // 'NO_MEMORY' system exception should be caught here. This
       // happens when the IN arg == 2.
@@ -184,7 +180,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
             }
         }
     }
-  ACE_CATCH (CORBA::UNKNOWN, ex)
+  catch (const CORBA::UNKNOWN&)
     {
       // 'BadBoy' should be caught here. This happens when the IN arg == 3.
       // Otherwise we don't set the other arg values so the validity
@@ -235,13 +231,10 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
             }
         }
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
-Test_Exception::init_parameters (Param_Test_ptr
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+Test_Exception::init_parameters (Param_Test_ptr)
 {
   this->in_ = 0;
   this->inout_ =  0;
@@ -258,19 +251,16 @@ Test_Exception::reset_parameters (void)
 }
 
 int
-Test_Exception::run_sii_test (Param_Test_ptr objref
-                              ACE_ENV_ARG_DECL)
+Test_Exception::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->in_++;
       this->ret_ = objref->test_exception (this->in_,
                                            this->inout_,
-                                           this->out_
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           this->out_);
     }
-  ACE_CATCH (Param_Test::Ooops, ex)
+  catch (const Param_Test::Ooops& ex)
     {
       const char *reason = ex.reason.in ();
 
@@ -305,7 +295,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref
       this->ret_ = this->in_ * 4;
       return 0;
     }
-  ACE_CATCH (CORBA::NO_MEMORY, ex)
+  catch (const CORBA::NO_MEMORY& ex)
     {
       // 'SystemException' should be caught here, 'CORBA::NO_MEMORY'
       // system exception is thrown by the servant when the
@@ -334,9 +324,8 @@ Test_Exception::run_sii_test (Param_Test_ptr objref
 
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ex,
-                               "Test_Exception::run_sii_test - "
-                               "expected system exception\n");
+          ex._tao_print_exception (
+            "Test_Exception::run_sii_test - ""expected system exception\n");
         }
 
       // These weren't passed back because of the exception. We
@@ -347,7 +336,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref
       this->ret_ = this->in_ * 4;
       return 0;
     }
-  ACE_CATCH (CORBA::UNKNOWN, ex)
+  catch (const CORBA::UNKNOWN& ex)
     {
       // 'BadBoy' should be caught here, since generated code for
       // Param_Test::test_exception() knows nothing about it.
@@ -377,9 +366,8 @@ Test_Exception::run_sii_test (Param_Test_ptr objref
 
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ex,
-                               "Test_Exception::run_sii_test - "
-                               "expected unknown exception\n");
+          ex._tao_print_exception (
+            "Test_Exception::run_sii_test - ""expected unknown exception\n");
         }
 
       // These weren't passed back because of the exception. We
@@ -390,16 +378,14 @@ Test_Exception::run_sii_test (Param_Test_ptr objref
       this->ret_ = this->in_ * 4;
       return 0;
     }
-  ACE_CATCH (Param_Test::BadBoy, ex)
+  catch (const Param_Test::BadBoy& ex)
     {
       // We shouldn't end up here. See comment above.
-      ACE_PRINT_EXCEPTION (ex,
-                           "Test_Exception::run_sii_test - "
-                           "unexpected user exception\n");
+      ex._tao_print_exception (
+        "Test_Exception::run_sii_test - ""unexpected user exception\n");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   // Normal reply - no exception thrown.
   return 0;
diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h
index acc0f1c2cb0..b8bf8c3e9e4 100644
--- a/TAO/tests/Param_Test/except.h
+++ b/TAO/tests/Param_Test/except.h
@@ -30,15 +30,13 @@ public:
   ~Test_Exception (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -53,7 +51,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index a8e5fe0f82a..c976b0b690b 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "fixed_array.h"
 
-ACE_RCSID (Param_Test, 
-           fixed_array, 
+ACE_RCSID (Param_Test,
+           fixed_array,
            "$Id$")
 
 // ************************************************************************
@@ -46,30 +46,26 @@ Test_Fixed_Array::opname (void) const
 }
 
 void
-Test_Fixed_Array::dii_req_invoke (CORBA::Request *req
-                                  ACE_ENV_ARG_DECL)
+Test_Fixed_Array::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= Param_Test::Fixed_Array_forany (this->in_);
   req->add_inout_arg ("s2") <<= Param_Test::Fixed_Array_forany (this->inout_);
   req->add_out_arg ("s3") <<= Param_Test::Fixed_Array_forany (this->out_);
   req->set_return_type (Param_Test::_tc_Fixed_Array);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Fixed_Array_forany forany;
   req->return_value () >>= forany;
   Param_Test::Fixed_Array_copy (this->ret_, forany.in ());
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= forany;
   Param_Test::Fixed_Array_copy (this->inout_, forany.in ());
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   Param_Test::Fixed_Array_forany out_any (this->out_);
   *arg3->value () >>= forany;
   Param_Test::Fixed_Array_copy (this->out_, forany.in ());
@@ -77,7 +73,7 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/
-                                   ACE_ENV_ARG_DECL_NOT_USED/*env*/)
+/*env*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -108,26 +104,21 @@ Test_Fixed_Array::reset_parameters (void)
 }
 
 int
-Test_Fixed_Array::run_sii_test (Param_Test_ptr objref
-                                ACE_ENV_ARG_DECL)
+Test_Fixed_Array::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_fixed_array (this->in_,
                                              this->inout_,
-                                             this->out_
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             this->out_);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Fixed_Array::run_sii_test\n");
+      ex._tao_print_exception ("Test_Fixed_Array::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h
index c064b8106fb..4e69fe59287 100644
--- a/TAO/tests/Param_Test/fixed_array.h
+++ b/TAO/tests/Param_Test/fixed_array.h
@@ -33,15 +33,13 @@ public:
   ~Test_Fixed_Array (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index 9447fbf88a1..fee2186e8a8 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "fixed_struct.h"
 
-ACE_RCSID (Param_Test, 
-           fixed_struct, 
+ACE_RCSID (Param_Test,
+           fixed_struct,
            "$Id$")
 
 // ************************************************************************
@@ -45,37 +45,33 @@ Test_Fixed_Struct::opname (void) const
 }
 
 void
-Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req
-                                   ACE_ENV_ARG_DECL)
+Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
   req->add_out_arg ("s3") <<= this->out_;
   req->set_return_type (Param_Test::_tc_Fixed_Struct);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Fixed_Struct *tmp;
   req->return_value () >>= tmp;
   this->ret_ = *tmp;
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= tmp;
   this->out_ = *tmp;
 }
 
 int
 Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/
-                                    ACE_ENV_ARG_DECL_NOT_USED/*env*/)
+/*env*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -107,26 +103,21 @@ Test_Fixed_Struct::reset_parameters (void)
 }
 
 int
-Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref
-                                 ACE_ENV_ARG_DECL)
+Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_fixed_struct (this->in_,
                                               this->inout_,
-                                              this->out_
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              this->out_);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Fixed_Struct::run_sii_test\n");
+      ex._tao_print_exception ("Test_Fixed_Struct::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h
index b791bbe5e3e..07836d0cd7e 100644
--- a/TAO/tests/Param_Test/fixed_struct.h
+++ b/TAO/tests/Param_Test/fixed_struct.h
@@ -33,15 +33,13 @@ public:
   ~Test_Fixed_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index 69b3f3e8f3a..70a10caa970 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -18,8 +18,8 @@
 #include "multdim_array.h"
 
 
-ACE_RCSID (Param_Test, 
-           multdim_array, 
+ACE_RCSID (Param_Test,
+           multdim_array,
            "$Id$")
 
 // ************************************************************************
@@ -48,8 +48,7 @@ Test_Multdim_Array::opname (void) const
 }
 
 void
-Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
-                                    ACE_ENV_ARG_DECL)
+Test_Multdim_Array::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= Param_Test::Multdim_Array_forany (this->in_.inout ());
   req->add_inout_arg ("s2") <<= Param_Test::Multdim_Array_forany (this->inout_.inout ());
@@ -57,8 +56,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Multdim_Array);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
 
   Param_Test::Multdim_Array_forany forany;
@@ -66,21 +64,19 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
   Param_Test::Multdim_Array_copy (this->ret_, forany.in ());
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= forany;
   Param_Test::Multdim_Array_copy (this->inout_, forany.in ());
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= forany;
   Param_Test::Multdim_Array_copy (this->out_, forany.in ());
 }
 
 int
 Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/
-                                     ACE_ENV_ARG_DECL_NOT_USED/*env*/)
+/*env*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -135,24 +131,19 @@ Test_Multdim_Array::reset_parameters (void)
 }
 
 int
-Test_Multdim_Array::run_sii_test (Param_Test_ptr objref
-                                  ACE_ENV_ARG_DECL)
+Test_Multdim_Array::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_multdim_array (this->in_.in (),
                                                this->inout_.inout (),
-                                               this->out_.inout ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               this->out_.inout ());
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Multdim_Array::run_sii_test\n");
+      ex._tao_print_exception ("Test_Multdim_Array::run_sii_test\n");
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h
index a6ab0243884..0539bf803e7 100644
--- a/TAO/tests/Param_Test/multdim_array.h
+++ b/TAO/tests/Param_Test/multdim_array.h
@@ -33,15 +33,13 @@ public:
   ~Test_Multdim_Array (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index b48b8ef65ed..5c93d78c007 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -20,7 +20,7 @@
 #include "nested_struct.h"
 
 ACE_RCSID (Param_Test,
-           nested_struct, 
+           nested_struct,
            "$Id$")
 
 // ************************************************************************
@@ -50,36 +50,32 @@ Test_Nested_Struct::opname (void) const
 }
 
 void
-Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
+Test_Nested_Struct::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Nested_Struct);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Nested_Struct *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Nested_Struct (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Nested_Struct (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Nested_Struct (*tmp);
 }
 
 int
-Test_Nested_Struct::init_parameters (Param_Test_ptr
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+Test_Nested_Struct::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -132,27 +128,22 @@ Test_Nested_Struct::reset_parameters (void)
 }
 
 int
-Test_Nested_Struct::run_sii_test (Param_Test_ptr objref
-                                  ACE_ENV_ARG_DECL)
+Test_Nested_Struct::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Nested_Struct_out out (this->out_.out ());
       this->ret_ = objref->test_nested_struct (this->in_,
                                                this->inout_.inout (),
-                                               out
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Nested_Struct::run_sii_test\n");
+      ex._tao_print_exception ("Test_Nested_Struct::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h
index 50a456bd479..a22145e958c 100644
--- a/TAO/tests/Param_Test/nested_struct.h
+++ b/TAO/tests/Param_Test/nested_struct.h
@@ -34,15 +34,13 @@ public:
   ~Test_Nested_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 4b0986404b4..3bdde5b4cb5 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -20,7 +20,7 @@
 #include "objref.h"
 
 ACE_RCSID (Param_Test,
-           objref, 
+           objref,
            "$Id$")
 
 // ************************************************************************
@@ -45,8 +45,7 @@ Test_ObjRef::opname (void) const
 }
 
 void
-Test_ObjRef::dii_req_invoke (CORBA::Request *req
-                             ACE_ENV_ARG_DECL)
+Test_ObjRef::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -54,22 +53,19 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (_tc_Coffee);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Coffee_ptr tmp;
   req->return_value () >>= tmp;
   this->ret_ = Coffee::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = Coffee::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = Coffee::_duplicate (tmp);
 }
@@ -84,21 +80,19 @@ static const char *Coffee_Flavor [] = {
 };
 
 int
-Test_ObjRef::init_parameters (Param_Test_ptr objref
-                              ACE_ENV_ARG_DECL)
+Test_ObjRef::init_parameters (Param_Test_ptr objref)
 {
   Coffee::Desc desc;
   Generator *gen = GENERATOR::instance (); // value generator
 
   char msg_str[256] = "";
 
-  ACE_TRY
+  try
     {
       ACE_OS::strcpy (msg_str, "make_cofee");
 
       // first get a Coffee object
-      this->in_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->in_ = objref->make_coffee ();
 
       // Get some index into Coffee_Flavor [].
       CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
@@ -106,8 +100,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref
 
       // set the attribute of the object
       ACE_OS::strcpy (msg_str, "set coffee attribute");
-      this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object
-      ACE_TRY_CHECK;
+      this->in_->description (desc); // set the attribute for the in object
 
       this->inout_ = Coffee::_nil ();
       this->out_ = Coffee::_nil ();
@@ -115,11 +108,10 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, msg_str);
+      ex._tao_print_exception (msg_str);
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -127,7 +119,6 @@ int
 Test_ObjRef::reset_parameters (void)
 {
   // Environemnt variable
-  ACE_DECLARE_NEW_CORBA_ENV;
   Coffee::Desc desc;
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -135,18 +126,16 @@ Test_ObjRef::reset_parameters (void)
   CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
   desc.name = Coffee_Flavor [index];
 
-  ACE_TRY
+  try
     {
       // set the attribute of the object
-      this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object
-      ACE_TRY_CHECK;
+      this->in_->description (desc); // set the attribute for the in object
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "set coffee attribute");
+      ex._tao_print_exception ("set coffee attribute");
       return -1;
     }
-  ACE_ENDTRY;
 
   this->inout_ = Coffee::_nil ();
   this->out_ = Coffee::_nil ();
@@ -156,27 +145,22 @@ Test_ObjRef::reset_parameters (void)
 }
 
 int
-Test_ObjRef::run_sii_test (Param_Test_ptr objref
-                           ACE_ENV_ARG_DECL)
+Test_ObjRef::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ =
         objref->test_objref (this->in_.in (),
                              this->inout_.inout (),
-                             this->out_.out ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             this->out_.out ());
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef::run_sii_test\n");
+      ex._tao_print_exception ("Test_ObjRef::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -184,9 +168,8 @@ CORBA::Boolean
 Test_ObjRef::check_validity (void)
 {
   // Environemnt variable
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (this->in_.in ())
           || CORBA::is_nil (this->inout_.in ())
@@ -197,25 +180,21 @@ Test_ObjRef::check_validity (void)
           return 0;
         }
       Coffee::Desc_var in_desc =
-        this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->in_->description ();
 
       const char *in = in_desc->name.in ();
 
       Coffee::Desc_var inout_desc =
-        this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->inout_->description ();
 
       const char *inout = inout_desc->name.in ();
 
       Coffee::Desc_var out_desc =
-        this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->out_->description ();
 
       const char *out = out_desc->name.in ();
 
-      Coffee::Desc_var ret_desc = this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Coffee::Desc_var ret_desc = this->out_->description ();
 
       const char* ret = ret_desc->name.in ();
 
@@ -225,12 +204,11 @@ Test_ObjRef::check_validity (void)
           !ACE_OS::strcmp (in, ret))
         return 1; // success
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Retrieving description");
+      ex._tao_print_exception ("Retrieving description");
       return 0;
     }
-  ACE_ENDTRY;
 
   return 1;
 }
@@ -245,7 +223,6 @@ void
 Test_ObjRef::print_values (void)
 {
   // Env. variable
-  ACE_DECLARE_NEW_CORBA_ENV;
 
   Coffee::Desc_var in_desc;
   Coffee::Desc_var inout_desc;
@@ -255,47 +232,41 @@ Test_ObjRef::print_values (void)
   const char *out = 0;
   const char *inout = 0;
   const char *ret = 0;
-  ACE_TRY
+  try
     {
       if (!CORBA::is_nil (this->in_.in ()))
         {
           in_desc =
-            this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->in_->description ();
           in = in_desc->name.in ();
         }
 
       if (!CORBA::is_nil (this->inout_.in ()))
         {
           inout_desc =
-            this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->inout_->description ();
           inout = inout_desc->name.in ();
         }
 
       if (!CORBA::is_nil (this->out_.in ()))
         {
           out_desc =
-            this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->out_->description ();
           out = out_desc->name.in ();
         }
 
       if (!CORBA::is_nil (this->ret_.in ()))
         {
           ret_desc =
-            this->ret_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->ret_->description ();
           ret = ret_desc->name.in ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Retrieving Description");
+      ex._tao_print_exception ("Retrieving Description");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
 
 
diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h
index 023829729fc..a6d491eb90e 100644
--- a/TAO/tests/Param_Test/objref.h
+++ b/TAO/tests/Param_Test/objref.h
@@ -33,15 +33,13 @@ public:
   ~Test_ObjRef (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index c299f461a8a..b5dc1e676ad 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -20,7 +20,7 @@
 #include "objref_struct.h"
 
 ACE_RCSID (Param_Test,
-           objref_struct, 
+           objref_struct,
            "$Id$")
 
 // ************************************************************************
@@ -50,8 +50,7 @@ Test_Objref_Struct::opname (void) const
 }
 
 void
-Test_Objref_Struct::dii_req_invoke (CORBA::Request *req
-                                    ACE_ENV_ARG_DECL)
+Test_Objref_Struct::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -59,46 +58,39 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Objref_Struct);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Objref_Struct *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Objref_Struct (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Objref_Struct (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Objref_Struct (*tmp);
 }
 
 int
-Test_Objref_Struct::init_parameters (Param_Test_ptr objref
-                                     ACE_ENV_ARG_DECL)
+Test_Objref_Struct::init_parameters (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Generator *gen = GENERATOR::instance (); // value generator
 
       // Set the long member.
       this->in_.x = gen->gen_long ();
 
-      this->in_.y = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->in_.y = objref->make_coffee ();
 
       Coffee::Desc d;
       d.name = gen->gen_string ();
 
-      this->in_.y->description (d
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->in_.y->description (d);
 
             this->inout_->x = 0;
 
@@ -109,13 +101,11 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Struct::init_parameters\n");
+      ex._tao_print_exception ("Test_Objref_Struct::init_parameters\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -137,28 +127,23 @@ Test_Objref_Struct::reset_parameters (void)
 }
 
 int
-Test_Objref_Struct::run_sii_test (Param_Test_ptr objref
-                                  ACE_ENV_ARG_DECL)
+Test_Objref_Struct::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Objref_Struct_out out (this->out_.out ());
 
       this->ret_ = objref->test_objref_struct (this->in_,
                                                this->inout_.inout (),
-                                               out
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Struct::run_sii_test\n");
+      ex._tao_print_exception ("Test_Objref_Struct::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -170,9 +155,8 @@ Test_Objref_Struct::check_validity (void)
       || this->in_.x != this->ret_->x)
     return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (CORBA::is_nil (this->in_.y.in ())
           || CORBA::is_nil (this->out_->y.in ())
@@ -182,17 +166,13 @@ Test_Objref_Struct::check_validity (void)
           return 0;
         }
 
-      Coffee::Desc_var s_in = this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Coffee::Desc_var s_in = this->in_.y->description ();
 
-      Coffee::Desc_var s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Coffee::Desc_var s_out = this->out_->y->description ();
 
-      Coffee::Desc_var s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Coffee::Desc_var s_inout = this->inout_->y->description ();
 
-      Coffee::Desc_var s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Coffee::Desc_var s_ret = this->ret_->y->description ();
 
       if (ACE_OS::strcmp (s_in->name, s_out->name) != 0
           || ACE_OS::strcmp (s_in->name, s_inout->name) != 0
@@ -203,13 +183,11 @@ Test_Objref_Struct::check_validity (void)
 
       return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Struct::check_validity\n");
+      ex._tao_print_exception ("Test_Objref_Struct::check_validity\n");
 
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -233,13 +211,11 @@ Test_Objref_Struct::print_values (void)
               this->out_->x,
               this->ret_->x ));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
-      Coffee::Desc_var s_in = 
-        this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Coffee::Desc_var s_in =
+        this->in_.y->description ();
 
       Coffee::Desc_var s_inout = new Coffee::Desc;
       Coffee::Desc_var s_out = new Coffee::Desc;
@@ -250,20 +226,17 @@ Test_Objref_Struct::print_values (void)
 
       if (!CORBA::is_nil (this->out_->y.in ()))
         {
-          s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          s_out = this->out_->y->description ();
         }
 
       if (!CORBA::is_nil (this->inout_->y.in ()))
         {
-          s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          s_inout = this->inout_->y->description ();
         }
 
       if (!CORBA::is_nil (this->ret_->y.in ()))
         {
-          s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          s_ret = this->ret_->y->description ();
         }
 
       ACE_DEBUG ((LM_DEBUG,
@@ -277,11 +250,8 @@ Test_Objref_Struct::print_values (void)
                   s_out->name.in (),
                   s_ret->name.in () ));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Objref_Struct::print_values\n");
+      ex._tao_print_exception ("Test_Objref_Struct::print_values\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h
index 8a2aaf06665..e9f7164f903 100644
--- a/TAO/tests/Param_Test/objref_struct.h
+++ b/TAO/tests/Param_Test/objref_struct.h
@@ -34,15 +34,13 @@ public:
   ~Test_Objref_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index a1710fd8122..3ab158d6599 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -40,7 +40,7 @@ Coffee_i::~Coffee_i (void)
 
 // get attribute
 Coffee::Desc *
-Coffee_i::description (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/)
+Coffee_i::description ( /*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee::Desc *desc = new Coffee::Desc;
@@ -51,7 +51,7 @@ Coffee_i::description (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/)
 // set attribute
 void
 Coffee_i::description (const Coffee::Desc &description
-                       ACE_ENV_ARG_DECL_NOT_USED /*env*/)
+ /*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->name_ = CORBA::string_dup (description.name);
@@ -79,8 +79,7 @@ Param_Test_i::~Param_Test_i (void)
 CORBA::Short
 Param_Test_i::test_short (CORBA::Short s1,
                           CORBA::Short &s2,
-                          CORBA::Short_out s3
-                          ACE_ENV_ARG_DECL_NOT_USED)
+                          CORBA::Short_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = (CORBA::Short) (s1 * 2);
@@ -98,8 +97,7 @@ Param_Test_i::test_short (CORBA::Short s1,
 CORBA::ULongLong
 Param_Test_i::test_ulonglong (CORBA::ULongLong s1,
                               CORBA::ULongLong &s2,
-                              CORBA::ULongLong_out s3
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              CORBA::ULongLong_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1 * 2;
@@ -113,8 +111,7 @@ Param_Test_i::test_ulonglong (CORBA::ULongLong s1,
 char *
 Param_Test_i::test_unbounded_string (const char *s1,
                                      char *&s2,
-                                     CORBA::String_out s3
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     CORBA::String_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
@@ -132,8 +129,7 @@ Param_Test_i::test_unbounded_string (const char *s1,
 char *
 Param_Test_i::test_bounded_string (const char *s1,
                                    char *&s2,
-                                   CORBA::String_out s3
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   CORBA::String_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
@@ -151,8 +147,7 @@ Param_Test_i::test_bounded_string (const char *s1,
 CORBA::WChar *
 Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1,
                                       CORBA::WChar *&ws2,
-                                      CORBA::WString_out ws3
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      CORBA::WString_out ws3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::WChar *retwstr = CORBA::wstring_dup (ws1);
@@ -174,8 +169,7 @@ Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1,
 CORBA::WChar *
 Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1,
                                     CORBA::WChar *&ws2,
-                                    CORBA::WString_out ws3
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    CORBA::WString_out ws3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::WChar *retwstr = CORBA::wstring_dup (ws1);
@@ -195,8 +189,7 @@ Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1,
 Param_Test::Fixed_Struct
 Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                                  Param_Test::Fixed_Struct &s2,
-                                 Param_Test::Fixed_Struct_out s3
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+                                 Param_Test::Fixed_Struct_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1;
@@ -209,8 +202,7 @@ Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
 CORBA::LongSeq *
 Param_Test_i::test_long_sequence (const CORBA::LongSeq & s1,
                                   CORBA::LongSeq & s2,
-                                  CORBA::LongSeq_out s3
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  CORBA::LongSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::LongSeq
@@ -227,8 +219,7 @@ Param_Test_i::test_long_sequence (const CORBA::LongSeq & s1,
 CORBA::ShortSeq *
 Param_Test_i::test_short_sequence (const CORBA::ShortSeq & s1,
                                    CORBA::ShortSeq & s2,
-                                   CORBA::ShortSeq_out s3
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   CORBA::ShortSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ShortSeq
@@ -245,8 +236,7 @@ Param_Test_i::test_short_sequence (const CORBA::ShortSeq & s1,
 Param_Test::Bounded_Short_Seq *
 Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & s1,
                                            Param_Test::Bounded_Short_Seq & s2,
-                                           Param_Test::Bounded_Short_Seq_out s3
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           Param_Test::Bounded_Short_Seq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Short_Seq
@@ -263,8 +253,7 @@ Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq &
 Param_Test::Bounded_Long_Seq *
 Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s1,
                                           Param_Test::Bounded_Long_Seq & s2,
-                                          Param_Test::Bounded_Long_Seq_out s3
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          Param_Test::Bounded_Long_Seq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Long_Seq
@@ -281,8 +270,7 @@ Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s
 CORBA::StringSeq *
 Param_Test_i::test_strseq (const CORBA::StringSeq &s1,
                            CORBA::StringSeq &s2,
-                           CORBA::StringSeq_out s3
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           CORBA::StringSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -317,8 +305,7 @@ Param_Test_i::test_strseq (const CORBA::StringSeq &s1,
 Param_Test::Bounded_StrSeq *
 Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1,
                                    Param_Test::Bounded_StrSeq & s2,
-                                   Param_Test::Bounded_StrSeq_out s3
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   Param_Test::Bounded_StrSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -338,8 +325,7 @@ Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1,
 CORBA::WStringSeq *
 Param_Test_i::test_wstrseq (const CORBA::WStringSeq &ws1,
                             CORBA::WStringSeq &ws2,
-                            CORBA::WStringSeq_out ws3
-                            ACE_ENV_ARG_DECL_NOT_USED)
+                            CORBA::WStringSeq_out ws3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -359,8 +345,7 @@ Param_Test_i::test_wstrseq (const CORBA::WStringSeq &ws1,
 Param_Test::Bounded_WStrSeq *
 Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1,
                                     Param_Test::Bounded_WStrSeq & ws2,
-                                    Param_Test::Bounded_WStrSeq_out ws3
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    Param_Test::Bounded_WStrSeq_out ws3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -381,8 +366,7 @@ Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1,
 Param_Test::StructSeq *
 Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1,
                                     Param_Test::StructSeq &s2,
-                                    Param_Test::StructSeq_out s3
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    Param_Test::StructSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -404,8 +388,7 @@ Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1,
 Param_Test::Bounded_StructSeq *
 Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq & s1,
                                             Param_Test::Bounded_StructSeq & s2,
-                                            Param_Test::Bounded_StructSeq_out s3
-                                            ACE_ENV_ARG_DECL_NOT_USED)
+                                            Param_Test::Bounded_StructSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_StructSeq
@@ -423,8 +406,7 @@ Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq
 Param_Test::PathSpec *
 Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1,
                                               Param_Test::PathSpec & s2,
-                                              Param_Test::PathSpec_out s3
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+                                              Param_Test::PathSpec_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::PathSpec
@@ -456,8 +438,7 @@ Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1,
 Param_Test::ArraySeq *
 Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1,
                                    Param_Test::ArraySeq &s2,
-                                   Param_Test::ArraySeq_out s3
-                                   ACE_ENV_ARG_DECL_NOT_USED)
+                                   Param_Test::ArraySeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -479,8 +460,7 @@ Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1,
 Param_Test::Bounded_ArraySeq *
 Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq & s1,
                                            Param_Test::Bounded_ArraySeq & s2,
-                                           Param_Test::Bounded_ArraySeq_out s3
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+                                           Param_Test::Bounded_ArraySeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_ArraySeq
@@ -497,8 +477,7 @@ Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq &
 Param_Test::Coffee_Mix *
 Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1,
                               Param_Test::Coffee_Mix & s2,
-                              Param_Test::Coffee_Mix_out s3
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Param_Test::Coffee_Mix_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Coffee_Mix
@@ -540,8 +519,7 @@ Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1,
 Param_Test::Bounded_Coffee_Mix *
 Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1,
                                       Param_Test::Bounded_Coffee_Mix & s2,
-                                      Param_Test::Bounded_Coffee_Mix_out s3
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      Param_Test::Bounded_Coffee_Mix_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Coffee_Mix
@@ -583,8 +561,7 @@ Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1,
 CORBA::AnySeq *
 Param_Test_i::test_anyseq (const CORBA::AnySeq &s1,
                            CORBA::AnySeq &s2,
-                           CORBA::AnySeq_out s3
-                           ACE_ENV_ARG_DECL_NOT_USED)
+                           CORBA::AnySeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -607,8 +584,7 @@ Param_Test_i::test_anyseq (const CORBA::AnySeq &s1,
 Param_Test::Var_Struct *
 Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1,
                                Param_Test::Var_Struct &s2,
-                               Param_Test::Var_Struct_out s3
-                               ACE_ENV_ARG_DECL_NOT_USED)
+                               Param_Test::Var_Struct_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -629,8 +605,7 @@ Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1,
 Param_Test::Nested_Struct *
 Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1,
                                   Param_Test::Nested_Struct &s2,
-                                  Param_Test::Nested_Struct_out s3
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  Param_Test::Nested_Struct_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -651,8 +626,7 @@ Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1,
 Param_Test::Recursive_Struct *
 Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1,
                                      Param_Test::Recursive_Struct &s2,
-                                     Param_Test::Recursive_Struct_out s3
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+                                     Param_Test::Recursive_Struct_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" structs into all the inout, out and return sequences.
@@ -672,8 +646,7 @@ Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1,
 Param_Test::Objref_Struct *
 Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
                                   Param_Test::Objref_Struct &s2,
-                                  Param_Test::Objref_Struct_out s3
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  Param_Test::Objref_Struct_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -692,33 +665,29 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
 
 // make a Coffee object
 Coffee_ptr
-Param_Test_i::make_coffee (ACE_ENV_SINGLE_ARG_DECL)
+Param_Test_i::make_coffee (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->obj_._this ();
 }
 
 // test for object references
 Coffee_ptr
 Param_Test_i::test_objref (Coffee_ptr o1,
                            Coffee_ptr &o2,
-                           Coffee_out o3
-                           ACE_ENV_ARG_DECL)
+                           Coffee_out o3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee_ptr ret = Coffee::_nil ();
 
-  ACE_TRY
+  try
     {
-      Coffee_var myobj = obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Coffee_var myobj = obj_._this ();
 
       if (!CORBA::is_nil (o2))
         CORBA::release (o2);
 
-      CORBA::Boolean equiv = myobj->_is_equivalent (o1
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Boolean equiv = myobj->_is_equivalent (o1);
 
       if (equiv)
         {
@@ -732,17 +701,16 @@ Param_Test_i::test_objref (Coffee_ptr o1,
           o3 = Coffee::_nil ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       // env.exception (TAO_TRY_ENV.exception ());
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       // env.exception (TAO_TRY_ENV.exception ());
     }
-  ACE_ENDTRY;
 
   return ret;
 }
@@ -752,7 +720,7 @@ CORBA::TypeCode_ptr
 Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1,
                              CORBA::TypeCode_ptr &t2,
                              CORBA::TypeCode_out t3
-                             ACE_ENV_ARG_DECL_NOT_USED/*env*/)
+/*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we simply assign t1 to the others
@@ -766,8 +734,7 @@ Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1,
 CORBA::Any *
 Param_Test_i::test_any (const CORBA::Any &a1,
                         CORBA::Any &a2,
-                        CORBA::Any_out a3
-                        ACE_ENV_ARG_DECL)
+                        CORBA::Any_out a3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any *ret;
@@ -789,8 +756,7 @@ Param_Test_i::test_any (const CORBA::Any &a1,
   if (TAO_debug_level > 0)
     {
       CORBA::TypeCode_var tc = a1.type ();
-      int kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      int kind = tc->kind ();
 
       ACE_DEBUG ((LM_DEBUG,
                   "Received any contents are <%d>\n",
@@ -933,8 +899,7 @@ Param_Test_i::test_any (const CORBA::Any &a1,
 Param_Test::Fixed_Array_slice *
 Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1,
                                 Param_Test::Fixed_Array a2,
-                                Param_Test::Fixed_Array_out a3
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                Param_Test::Fixed_Array_out a3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Fixed_Array_slice *ret;
@@ -949,8 +914,7 @@ Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1,
 Param_Test::Var_Array_slice *
 Param_Test_i::test_var_array (const Param_Test::Var_Array a1,
                               Param_Test::Var_Array a2,
-                              Param_Test::Var_Array_out a3
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Param_Test::Var_Array_out a3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Var_Array_slice *ret;
@@ -964,8 +928,7 @@ Param_Test_i::test_var_array (const Param_Test::Var_Array a1,
 CORBA::ULong
 Param_Test_i::test_exception (CORBA::ULong s1,
                               CORBA::ULong& s2,
-                              CORBA::ULong_out s3
-                              ACE_ENV_ARG_DECL)
+                              CORBA::ULong_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Param_Test::Ooops))
 {
@@ -994,8 +957,7 @@ Param_Test_i::test_exception (CORBA::ULong s1,
   // warning that test_exception is throwing an exception
   // not in its THROW_SPEC, but still test TAO's
   // conversion of such an exception to UNKNOWN.
-  this->throw_badboy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  this->throw_badboy ();
 
   return 0;
 }
@@ -1003,8 +965,7 @@ Param_Test_i::test_exception (CORBA::ULong s1,
 Param_Test::Big_Union*
 Param_Test_i::test_big_union (const Param_Test::Big_Union& u1,
                               Param_Test::Big_Union& u2,
-                              Param_Test::Big_Union_out u3
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              Param_Test::Big_Union_out u3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1));
@@ -1016,8 +977,7 @@ Param_Test_i::test_big_union (const Param_Test::Big_Union& u1,
 Param_Test::Small_Union
 Param_Test_i::test_small_union (const Param_Test::Small_Union& u1,
                                 Param_Test::Small_Union& u2,
-                                Param_Test::Small_Union_out u3
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                Param_Test::Small_Union_out u3)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u2 = u1;
@@ -1028,8 +988,7 @@ Param_Test_i::test_small_union (const Param_Test::Small_Union& u1,
 Param_Test::Recursive_Union*
 Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1,
                                     Param_Test::Recursive_Union& ru2,
-                                    Param_Test::Recursive_Union_out ru3
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+                                    Param_Test::Recursive_Union_out ru3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Recursive_Union_var ret (new Param_Test::Recursive_Union (ru1));
@@ -1041,8 +1000,7 @@ Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1,
 CORBA::Any*
 Param_Test_i::test_complex_any (const CORBA::Any &a1,
                                 CORBA::Any &a2,
-                                CORBA::Any_out a3
-                                ACE_ENV_ARG_DECL_NOT_USED)
+                                CORBA::Any_out a3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_var ret (new CORBA::Any (a1));
@@ -1054,8 +1012,7 @@ Param_Test_i::test_complex_any (const CORBA::Any &a1,
 Param_Test::Multdim_Array_slice *
 Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
                                   Param_Test::Multdim_Array a2,
-                                  Param_Test::Multdim_Array_out a3
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  Param_Test::Multdim_Array_out a3)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Multdim_Array_slice *ret;
@@ -1067,14 +1024,14 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
 }
 
 void
-Param_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Param_Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
 
 void
-Param_Test_i::throw_badboy (ACE_ENV_SINGLE_ARG_DECL)
+Param_Test_i::throw_badboy (void)
 {
-  ACE_THROW (Param_Test::BadBoy ());
+  throw Param_Test::BadBoy ();
 }
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 8f9307c3266..500fa3ad36f 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -31,12 +31,11 @@ public:
 
   // =methods for the attribute
 
-  virtual Coffee::Desc * description (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Coffee::Desc * description (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // get attribute
 
-  virtual void description (const Coffee::Desc &description
-                            ACE_ENV_ARG_DECL)
+  virtual void description (const Coffee::Desc &description)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // set attribute
 
@@ -62,51 +61,44 @@ public:
 
   virtual CORBA::Short test_short (CORBA::Short s1,
                                    CORBA::Short &s2,
-                                   CORBA::Short_out s3
-                                   ACE_ENV_ARG_DECL)
+                                   CORBA::Short_out s3)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for shorts
 
   virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1,
                                            CORBA::ULongLong &s2,
-                                           CORBA::ULongLong_out s3
-                                           ACE_ENV_ARG_DECL)
+                                           CORBA::ULongLong_out s3)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unsigned long long
 
   virtual char *test_unbounded_string (const char *s1,
                                        char *&s2,
-                                       CORBA::String_out s3
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::String_out s3)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unbounded strings
 
   virtual char *test_bounded_string (const char *s1,
                                      char *&s2,
-                                     CORBA::String_out s3
-                                     ACE_ENV_ARG_DECL)
+                                     CORBA::String_out s3)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for bounded strings
 
   virtual CORBA::WChar *test_unbounded_wstring (const CORBA::WChar *ws1,
                                                 CORBA::WChar *&ws2,
-                                                CORBA::WString_out ws3
-                                                ACE_ENV_ARG_DECL)
+                                                CORBA::WString_out ws3)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unbounded wstrings
 
   virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1,
                                               CORBA::WChar *&ws2,
-                                              CORBA::WString_out ws3
-                                              ACE_ENV_ARG_DECL)
+                                              CORBA::WString_out ws3)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for bounded wstrings
 
   virtual Param_Test::Fixed_Struct
   test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                      Param_Test::Fixed_Struct &s2,
-                     Param_Test::Fixed_Struct_out s3
-                     ACE_ENV_ARG_DECL)
+                     Param_Test::Fixed_Struct_out s3)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for fixed structures
 
@@ -114,221 +106,190 @@ public:
   virtual CORBA::LongSeq * test_long_sequence (
       const CORBA::LongSeq & s1,
       CORBA::LongSeq & s2,
-      CORBA::LongSeq_out s3
-      ACE_ENV_ARG_DECL)
+      CORBA::LongSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence (
       const Param_Test::Bounded_Long_Seq & s1,
       Param_Test::Bounded_Long_Seq & s2,
-      Param_Test::Bounded_Long_Seq_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::Bounded_Long_Seq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ShortSeq * test_short_sequence (
       const CORBA::ShortSeq & s1,
       CORBA::ShortSeq & s2,
-      CORBA::ShortSeq_out s3
-      ACE_ENV_ARG_DECL)
+      CORBA::ShortSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence (
           const Param_Test::Bounded_Short_Seq & s1,
       Param_Test::Bounded_Short_Seq & s2,
-      Param_Test::Bounded_Short_Seq_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::Bounded_Short_Seq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::StringSeq * test_strseq (
       const CORBA::StringSeq & s1,
       CORBA::StringSeq & s2,
-      CORBA::StringSeq_out s3
-      ACE_ENV_ARG_DECL)
+      CORBA::StringSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_StrSeq * test_bounded_strseq (
       const Param_Test::Bounded_StrSeq & s1,
       Param_Test::Bounded_StrSeq & s2,
-      Param_Test::Bounded_StrSeq_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::Bounded_StrSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::WStringSeq * test_wstrseq (
       const CORBA::WStringSeq & ws1,
       CORBA::WStringSeq & ws2,
-      CORBA::WStringSeq_out ws3
-      ACE_ENV_ARG_DECL)
+      CORBA::WStringSeq_out ws3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_WStrSeq * test_bounded_wstrseq (
       const Param_Test::Bounded_WStrSeq & ws1,
       Param_Test::Bounded_WStrSeq & ws2,
-      Param_Test::Bounded_WStrSeq_out ws3
-      ACE_ENV_ARG_DECL)
+      Param_Test::Bounded_WStrSeq_out ws3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::StructSeq * test_struct_sequence (
       const Param_Test::StructSeq & s1,
       Param_Test::StructSeq & s2,
-      Param_Test::StructSeq_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::StructSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::PathSpec * test_unbounded_struct_sequence (
       const Param_Test::PathSpec & s1,
       Param_Test::PathSpec & s2,
-      Param_Test::PathSpec_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::PathSpec_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence (
       const Param_Test::Bounded_StructSeq & s1,
       Param_Test::Bounded_StructSeq & s2,
-      Param_Test::Bounded_StructSeq_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::Bounded_StructSeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::ArraySeq * test_array_sequence (
       const Param_Test::ArraySeq & s1,
       Param_Test::ArraySeq & s2,
-      Param_Test::ArraySeq_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::ArraySeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_ArraySeq * test_bounded_array_sequence (
       const Param_Test::Bounded_ArraySeq & s1,
       Param_Test::Bounded_ArraySeq & s2,
-      Param_Test::Bounded_ArraySeq_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::Bounded_ArraySeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Coffee_Mix * test_coffe_mix (
       const Param_Test::Coffee_Mix & s1,
       Param_Test::Coffee_Mix & s2,
-      Param_Test::Coffee_Mix_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::Coffee_Mix_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix (
       const Param_Test::Bounded_Coffee_Mix & s1,
       Param_Test::Bounded_Coffee_Mix & s2,
-      Param_Test::Bounded_Coffee_Mix_out s3
-      ACE_ENV_ARG_DECL)
+      Param_Test::Bounded_Coffee_Mix_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::AnySeq * test_anyseq (
           const CORBA::AnySeq & s1,
           CORBA::AnySeq & s2,
-          CORBA::AnySeq_out s3
-          ACE_ENV_ARG_DECL)
+          CORBA::AnySeq_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // = End of sequences tests....
 
   virtual Param_Test::Var_Struct *
   test_var_struct (const Param_Test::Var_Struct &s1,
                    Param_Test::Var_Struct &s2,
-                   Param_Test::Var_Struct_out s3
-                   ACE_ENV_ARG_DECL)
+                   Param_Test::Var_Struct_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for variable structs
 
   virtual Param_Test::Nested_Struct *
   test_nested_struct (const Param_Test::Nested_Struct &s1,
                       Param_Test::Nested_Struct &s2,
-                      Param_Test::Nested_Struct_out s3
-                      ACE_ENV_ARG_DECL)
+                      Param_Test::Nested_Struct_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for nested structs
 
   virtual Param_Test::Recursive_Struct *
     test_recursive_struct (const Param_Test::Recursive_Struct &rs1,
                            Param_Test::Recursive_Struct &rs2,
-                           Param_Test::Recursive_Struct_out rs3
-                           ACE_ENV_ARG_DECL)
+                           Param_Test::Recursive_Struct_out rs3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for recursive structs
 
   virtual Param_Test::Objref_Struct *
   test_objref_struct (const Param_Test::Objref_Struct &s1,
                       Param_Test::Objref_Struct &s2,
-                      Param_Test::Objref_Struct_out s3
-                      ACE_ENV_ARG_DECL)
+                      Param_Test::Objref_Struct_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Coffee_ptr
-  make_coffee (ACE_ENV_SINGLE_ARG_DECL)
+  make_coffee (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // make a coffee object
 
   virtual Coffee_ptr
   test_objref (Coffee_ptr o1,
                Coffee_ptr &o2,
-               Coffee_out o3
-               ACE_ENV_ARG_DECL)
+               Coffee_out o3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for object references
 
   virtual CORBA::TypeCode_ptr
   test_typecode (CORBA::TypeCode_ptr t1,
                  CORBA::TypeCode_ptr &o2,
-                 CORBA::TypeCode_out o3
-                 ACE_ENV_ARG_DECL)
+                 CORBA::TypeCode_out o3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for typecodes
 
   virtual CORBA::Any *
   test_any (const CORBA::Any &a1,
             CORBA::Any &a2,
-            CORBA::Any_out a3
-            ACE_ENV_ARG_DECL)
+            CORBA::Any_out a3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for Anys
 
   virtual Param_Test::Fixed_Array_slice *
   test_fixed_array (const Param_Test::Fixed_Array a1,
                     Param_Test::Fixed_Array a2,
-                    Param_Test::Fixed_Array_out a3
-                    ACE_ENV_ARG_DECL)
+                    Param_Test::Fixed_Array_out a3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for fixed size arrays
 
   virtual Param_Test::Var_Array_slice *
   test_var_array (const Param_Test::Var_Array a1,
                   Param_Test::Var_Array a2,
-                  Param_Test::Var_Array_out a3
-                  ACE_ENV_ARG_DECL)
+                  Param_Test::Var_Array_out a3)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for arrays of variable types
 
   virtual CORBA::ULong test_exception (CORBA::ULong s1,
                                        CORBA::ULong& s2,
-                                       CORBA::ULong_out s3
-                                       ACE_ENV_ARG_DECL)
+                                       CORBA::ULong_out s3)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Param_Test::Ooops));
 
   virtual Param_Test::Big_Union*
     test_big_union (const Param_Test::Big_Union& u1,
                     Param_Test::Big_Union& u2,
-                    Param_Test::Big_Union_out u3
-                    ACE_ENV_ARG_DECL)
+                    Param_Test::Big_Union_out u3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Param_Test::Small_Union
     test_small_union (const Param_Test::Small_Union& u1,
                       Param_Test::Small_Union& u2,
-                      Param_Test::Small_Union_out u3
-                      ACE_ENV_ARG_DECL)
+                      Param_Test::Small_Union_out u3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Param_Test::Recursive_Union*
     test_recursive_union (const Param_Test::Recursive_Union& ru1,
                           Param_Test::Recursive_Union& ru2,
-                          Param_Test::Recursive_Union_out ru3
-                          ACE_ENV_ARG_DECL)
+                          Param_Test::Recursive_Union_out ru3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any*
     test_complex_any (const CORBA::Any &a1,
                       CORBA::Any &a2,
-                      CORBA::Any_out a3
-                      ACE_ENV_ARG_DECL)
+                      CORBA::Any_out a3)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Test for multi dimensional arrays
   virtual Param_Test::Multdim_Array_slice *
   test_multdim_array (const Param_Test::Multdim_Array,
                       Param_Test::Multdim_Array ,
-                      Param_Test::Multdim_Array_out
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      Param_Test::Multdim_Array_out)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -339,7 +300,7 @@ private:
   Coffee_i obj_;
   // the coffee object reference we maintain
 
-  void throw_badboy (ACE_ENV_SINGLE_ARG_DECL);
+  void throw_badboy (void);
   // Called by test_exception. This will avoid the compiler
   // warning that test_exception is throwing an exception
   // not in its THROW_SPEC, but still test TAO's
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 18d49fd2779..8558d1ac351 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -19,7 +19,7 @@
 #include "recursive_struct.h"
 
 ACE_RCSID (Param_Test,
-           recursive_struct, 
+           recursive_struct,
            "$Id$")
 
 const CORBA::ULong MAX_DEPTH = 5;
@@ -49,8 +49,7 @@ Test_Recursive_Struct::opname (void) const
 }
 
 void
-Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req
-                                       ACE_ENV_ARG_DECL)
+Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -58,29 +57,25 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Recursive_Struct);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Recursive_Struct *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Recursive_Struct (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Recursive_Struct (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Recursive_Struct (*tmp);
 }
 
 int
-Test_Recursive_Struct::init_parameters (Param_Test_ptr
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+Test_Recursive_Struct::init_parameters (Param_Test_ptr)
 {
   // The client calls init_parameters() before the first
   // call and reset_parameters() after each call. For this
@@ -118,28 +113,23 @@ Test_Recursive_Struct::reset_parameters (void)
 }
 
 int
-Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref
-                                     ACE_ENV_ARG_DECL)
+Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Recursive_Struct_out out (this->out_.out ());
 
       this->ret_ = objref->test_recursive_struct (this->in_,
                                                   this->inout_.inout (),
-                                                  out
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Recursive_Struct::run_sii_test\n");
+      ex._tao_print_exception ("Test_Recursive_Struct::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h
index 18175cb53bd..77d1ee7dabc 100644
--- a/TAO/tests/Param_Test/recursive_struct.h
+++ b/TAO/tests/Param_Test/recursive_struct.h
@@ -35,15 +35,13 @@ public:
   ~Test_Recursive_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -58,8 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *
-                       ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 5fc3c86506f..1129f5b22cc 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -19,7 +19,7 @@
 #include "recursive_union.h"
 
 ACE_RCSID (Param_Test,
-           recursive_union, 
+           recursive_union,
            "$Id$")
 
 const CORBA::ULong MAX_DEPTH = 3;
@@ -49,8 +49,7 @@ Test_Recursive_Union::opname (void) const
 }
 
 void
-Test_Recursive_Union::dii_req_invoke (CORBA::Request *req
-                                      ACE_ENV_ARG_DECL)
+Test_Recursive_Union::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -58,29 +57,25 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Recursive_Union);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Recursive_Union *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Recursive_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Recursive_Union (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Recursive_Union (*tmp);
 }
 
 int
-Test_Recursive_Union::init_parameters (Param_Test_ptr
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+Test_Recursive_Union::init_parameters (Param_Test_ptr)
 {
   // The client calls init_parameters() before the first
   // call and reset_parameters() after each call. For this
@@ -120,28 +115,23 @@ Test_Recursive_Union::reset_parameters (void)
 }
 
 int
-Test_Recursive_Union::run_sii_test (Param_Test_ptr objref
-                                    ACE_ENV_ARG_DECL)
+Test_Recursive_Union::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Recursive_Union_out out (this->out_.out ());
 
       this->ret_ = objref->test_recursive_union (this->in_,
                                                  this->inout_.inout (),
-                                                 out
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                 out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Recursive_Union::run_sii_test\n");
+      ex._tao_print_exception ("Test_Recursive_Union::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h
index 5ebeaac1dd7..6f41e85292c 100644
--- a/TAO/tests/Param_Test/recursive_union.h
+++ b/TAO/tests/Param_Test/recursive_union.h
@@ -35,15 +35,13 @@ public:
   ~Test_Recursive_Union (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -58,8 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *
-                       ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index b2a12a29bd5..29299e2945e 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -21,7 +21,7 @@
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (Param_Test,
-           results, 
+           results,
            "results.cpp,v 1.8 1999/06/23 14:50:14 parsons Exp")
 
 Results::Results (void)
@@ -104,8 +104,7 @@ Results::print_stats (void)
 }
 
 void
-Results::print_exception (const char * /* call_name */
-                          ACE_ENV_ARG_DECL_NOT_USED)
+Results::print_exception (const char * /* call_name */)
 {
   //ACE_PRINT_EXCEPTION (call_name);
 }
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index 7c7857acd6c..e04e26e5f3c 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -47,8 +47,7 @@ public:
   void print_stats (void);
   // prints the time stats
 
-  void print_exception (const char *call_name
-                        ACE_ENV_ARG_DECL_NOT_USED);
+  void print_exception (const char *call_name);
   // print the exception
 
   void start_timer (void);
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index c66e703967f..f519529eb28 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -61,55 +61,43 @@ main (int argc, char *argv[])
   PortableServer::POA_var oa_ptr;
   Param_Test_i *param_test = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       const char *orb_name = "";
       CORBA::ORB_var orb_ptr =
-        CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, orb_name);
 
       CORBA::Object_var temp; // holder for the myriad of times we get
                               // an object which we then have to narrow.
 
       // Get the Root POA
 
-      temp = orb_ptr->resolve_initial_references ("RootPOA"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      temp = orb_ptr->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (temp.in()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Unable to get root poa reference.\n"),
                           1);
 
-      oa_ptr = PortableServer::POA::_narrow (temp.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      oa_ptr = PortableServer::POA::_narrow (temp.in());
 
       PortableServer::POAManager_var poa_manager =
-        oa_ptr->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        oa_ptr->the_POAManager ();
 
       CORBA::PolicyList policies (2);
       policies.length (2);
       policies[0] =
-        oa_ptr->create_id_assignment_policy (PortableServer::USER_ID
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        oa_ptr->create_id_assignment_policy (PortableServer::USER_ID);
 
       policies[1] =
-        oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT);
 
       // We use a different POA, otherwise the user would have to
       // change the object key each time it invokes the server.
       PortableServer::POA_var good_poa =
         oa_ptr->create_POA ("child_poa",
                             poa_manager.in (),
-                            policies
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            policies);
 
       // Parse remaining command line and verify parameters.
       parse_args (argc, argv);
@@ -126,21 +114,16 @@ main (int argc, char *argv[])
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("param_test");
       good_poa->activate_object_with_id (id.in (),
-                                         param_test
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         param_test);
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
 
-      temp = good_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      temp = good_poa->id_to_reference (id.in ());
 
       CORBA::String_var str =
-        orb_ptr->object_to_string (temp.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb_ptr->object_to_string (temp.in ());
 
       if (TAO_debug_level > 0)
         {
@@ -166,34 +149,26 @@ main (int argc, char *argv[])
 
 
       // Make the POAs controlled by this manager active
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      orb_ptr->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_ptr->run ();
 
       good_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
       oa_ptr->destroy (1,
-                       1
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                       1);
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      sysex._tao_print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  catch (const CORBA::UserException& userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      userex._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   // Free resources
   delete param_test;
 
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index adaa7219c30..b6975dfe98e 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "short.h"
 
-ACE_RCSID (Param_Test, 
-           short, 
+ACE_RCSID (Param_Test,
+           short,
            "$Id$")
 
 // ************************************************************************
@@ -45,8 +45,7 @@ Test_Short::opname (void) const
 }
 
 void
-Test_Short::dii_req_invoke (CORBA::Request *req
-                            ACE_ENV_ARG_DECL)
+Test_Short::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -54,25 +53,21 @@ Test_Short::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_short);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   req->return_value () >>= this->ret_;
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= this->inout_;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= this->out_;
 }
 
 int
-Test_Short::init_parameters (Param_Test_ptr /*objref*/
-                             ACE_ENV_ARG_DECL_NOT_USED)
+Test_Short::init_parameters (Param_Test_ptr /*objref*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -91,26 +86,21 @@ Test_Short::reset_parameters (void)
 }
 
 int
-Test_Short::run_sii_test (Param_Test_ptr objref
-                          ACE_ENV_ARG_DECL)
+Test_Short::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_short (this->in_,
                                        this->inout_,
-                                       this->out_
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       this->out_);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Short::run_sii_test\n");
+      ex._tao_print_exception ("Test_Short::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h
index 5157b673c74..2396e70663f 100644
--- a/TAO/tests/Param_Test/short.h
+++ b/TAO/tests/Param_Test/short.h
@@ -33,15 +33,13 @@ public:
   ~Test_Short (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index 81a771b66ea..2947a1221f0 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -20,7 +20,7 @@
 #include "small_union.h"
 
 ACE_RCSID (Param_Test,
-           small_union, 
+           small_union,
            "$Id$")
 
 // ************************************************************************
@@ -47,8 +47,7 @@ Test_Small_Union::opname (void) const
 }
 
 void
-Test_Small_Union::dii_req_invoke (CORBA::Request *req
-                                  ACE_ENV_ARG_DECL)
+Test_Small_Union::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -56,48 +55,43 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Small_Union);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Small_Union *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Small_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Small_Union (*tmp);
 }
 
 int
-Test_Small_Union::init_parameters (Param_Test_ptr objref
-                                   ACE_ENV_ARG_DECL)
+Test_Small_Union::init_parameters (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->cobj_ = objref->make_coffee ();
 
       this->reset_parameters ();
       return 0;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,"System Exception doing make_coffee");
+      sysex._tao_print_exception ("System Exception doing make_coffee");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "An exception caught in make_coffee");
+      ex._tao_print_exception (
+        "An exception caught in make_coffee");
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -131,26 +125,21 @@ Test_Small_Union::reset_parameters (void)
 }
 
 int
-Test_Small_Union::run_sii_test (Param_Test_ptr objref
-                                ACE_ENV_ARG_DECL)
+Test_Small_Union::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_small_union (this->in_,
                                            this->inout_,
-                                           this->out_
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           this->out_);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Small_Union::run_sii_test\n");
+      ex._tao_print_exception ("Test_Small_Union::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h
index bea055565b4..8e3b1834cab 100644
--- a/TAO/tests/Param_Test/small_union.h
+++ b/TAO/tests/Param_Test/small_union.h
@@ -33,15 +33,13 @@ public:
   ~Test_Small_Union (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index 551ef486f39..d9477651899 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -20,7 +20,7 @@
 #include "typecode.h"
 
 ACE_RCSID (Param_Test,
-           typecode, 
+           typecode,
            "$Id$")
 
 // ************************************************************************
@@ -45,8 +45,7 @@ Test_TypeCode::opname (void) const
 }
 
 void
-Test_TypeCode::dii_req_invoke (CORBA::Request *req
-                               ACE_ENV_ARG_DECL)
+Test_TypeCode::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -54,29 +53,25 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_TypeCode);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   CORBA::TypeCode_ptr tmp;
   req->return_value () >>= tmp;
   this->ret_ = CORBA::TypeCode::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = CORBA::TypeCode::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = CORBA::TypeCode::_duplicate (tmp);
 }
 
 int
-Test_TypeCode::init_parameters (Param_Test_ptr
-                                ACE_ENV_ARG_DECL_NOT_USED)
+Test_TypeCode::init_parameters (Param_Test_ptr)
 {
   static CORBA::TypeCode_ptr tc_table [] =
     {
@@ -117,66 +112,51 @@ Test_TypeCode::reset_parameters (void)
 }
 
 int
-Test_TypeCode::run_sii_test (Param_Test_ptr objref
-                             ACE_ENV_ARG_DECL)
+Test_TypeCode::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
-      this->init_parameters (objref ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->init_parameters (objref);
 
       CORBA::TypeCode_out out (this->out_);
 
       this->ret_ = objref->test_typecode (this->in_.in (),
                                           this->inout_.inout (),
-                                          out
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                          out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_TypeCode::run_sii_test\n");
+      ex._tao_print_exception ("Test_TypeCode::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
 CORBA::Boolean
 Test_TypeCode::check_validity (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::Boolean one, two, three;
 
-      one = this->in_.in ()->equal (this->inout_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      one = this->in_.in ()->equal (this->inout_.in ());
 
-      two = this->in_.in ()->equal (this->out_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      two = this->in_.in ()->equal (this->out_.in ());
 
-      three = this->in_.in ()->equal (this->ret_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      three = this->in_.in ()->equal (this->ret_.in ());
 
       if (one && two && three)
         return 1;
       else
         return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_TypeCode::check_validity\n");
+      ex._tao_print_exception ("Test_TypeCode::check_validity\n");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h
index bb369324d6e..1b4a2183f50 100644
--- a/TAO/tests/Param_Test/typecode.h
+++ b/TAO/tests/Param_Test/typecode.h
@@ -33,15 +33,13 @@ public:
   ~Test_TypeCode (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index dd5277d5924..e9863a613ac 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -21,7 +21,7 @@
 #include "tao/debug.h"
 
 ACE_RCSID (Param_Test,
-           ub_any_seq, 
+           ub_any_seq,
            "$Id$")
 
 const CORBA::ULong TEST_SEQ_LENGTH = 5;
@@ -53,8 +53,7 @@ Test_AnySeq::opname (void) const
 }
 
 void
-Test_AnySeq::dii_req_invoke (CORBA::Request *req
-                             ACE_ENV_ARG_DECL)
+Test_AnySeq::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -62,29 +61,25 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_AnySeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   CORBA::AnySeq* tmp;
   req->return_value () >>= tmp;
   this->ret_ = new CORBA::AnySeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new CORBA::AnySeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new CORBA::AnySeq (*tmp);
 }
 
 int
-Test_AnySeq::init_parameters (Param_Test_ptr objref
-                              ACE_ENV_ARG_DECL)
+Test_AnySeq::init_parameters (Param_Test_ptr objref)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -123,23 +118,21 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref
                   if (TAO_debug_level > 0)
                     ACE_DEBUG ((LM_DEBUG,
                           "setting coffee object \n" ));
-            ACE_TRY
+            try
               {
                 // get access to a Coffee Object
-                Coffee_var cobj = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
-                ACE_TRY_CHECK;
+                Coffee_var cobj = objref->make_coffee ();
 
                 // insert the coffee object into the Any
                 this->in_[i] <<= cobj.in ();
                 this->inout_[i] <<= 0; // different from in_
               }
-            ACE_CATCH (CORBA::SystemException, sysex)
+            catch (const CORBA::SystemException& sysex)
               {
-                ACE_PRINT_EXCEPTION (sysex,
-                                     "System Exception doing make_coffee");
+                sysex._tao_print_exception (
+                  "System Exception doing make_coffee");
                 return -1;
               }
-            ACE_ENDTRY;
           }
           break;
         case 3:
@@ -199,28 +192,23 @@ Test_AnySeq::reset_parameters (void)
 
 
 int
-Test_AnySeq::run_sii_test (Param_Test_ptr objref
-                           ACE_ENV_ARG_DECL)
+Test_AnySeq::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       CORBA::AnySeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_anyseq (this->in_.in (),
                                         this->inout_.inout (),
-                                        out
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_AnySeq::run_sii_test\n");
+      ex._tao_print_exception ("Test_AnySeq::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h
index 3a2d6c72577..c5431e8314c 100644
--- a/TAO/tests/Param_Test/ub_any_seq.h
+++ b/TAO/tests/Param_Test/ub_any_seq.h
@@ -33,15 +33,13 @@ public:
   ~Test_AnySeq (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index 104c4885c74..821163fe4a7 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -19,8 +19,8 @@
 #include "helper.h"
 #include "ub_array_seq.h"
 
-ACE_RCSID (Param_Test, 
-           ub_array_seq, 
+ACE_RCSID (Param_Test,
+           ub_array_seq,
            "$Id$")
 
 // ************************************************************************
@@ -50,8 +50,7 @@ Test_Array_Sequence::opname (void) const
 }
 
 void
-Test_Array_Sequence::dii_req_invoke (CORBA::Request *req
-                                     ACE_ENV_ARG_DECL)
+Test_Array_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -59,29 +58,25 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_ArraySeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::ArraySeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::ArraySeq (*tmp);
 }
 
 int
-Test_Array_Sequence::init_parameters (Param_Test_ptr
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+Test_Array_Sequence::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -129,28 +124,23 @@ Test_Array_Sequence::reset_parameters (void)
 }
 
 int
-Test_Array_Sequence::run_sii_test (Param_Test_ptr objref
-                                   ACE_ENV_ARG_DECL)
+Test_Array_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::ArraySeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_array_sequence (this->in_,
                                                 this->inout_.inout (),
-                                                out
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Array_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Array_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h
index ce888926d2e..258c2531567 100644
--- a/TAO/tests/Param_Test/ub_array_seq.h
+++ b/TAO/tests/Param_Test/ub_array_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Array_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,8 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *
-                       ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index 32ef0cba131..698c50e153b 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -20,7 +20,7 @@
 #include "ub_long_seq.h"
 
 ACE_RCSID (Param_Test,
-           ub_long_seq, 
+           ub_long_seq,
            "$Id$")
 
 // ************************************************************************
@@ -49,8 +49,7 @@ Test_Long_Sequence::opname (void) const
 }
 
 void
-Test_Long_Sequence::dii_req_invoke (CORBA::Request *req
-                                    ACE_ENV_ARG_DECL)
+Test_Long_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -58,29 +57,25 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_LongSeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   CORBA::LongSeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = CORBA::LongSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = CORBA::LongSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = CORBA::LongSeq (*tmp);
 }
 
 int
-Test_Long_Sequence::init_parameters (Param_Test_ptr
-                                     ACE_ENV_ARG_DECL_NOT_USED)
+Test_Long_Sequence::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -109,28 +104,23 @@ Test_Long_Sequence::reset_parameters (void)
 }
 
 int
-Test_Long_Sequence::run_sii_test (Param_Test_ptr objref
-                                  ACE_ENV_ARG_DECL)
+Test_Long_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       CORBA::LongSeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_long_sequence (this->in_.in (),
                                                this->inout_.inout (),
-                                               out
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Long_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Long_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h
index 6cfdef9dc3d..4787743e140 100644
--- a/TAO/tests/Param_Test/ub_long_seq.h
+++ b/TAO/tests/Param_Test/ub_long_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Long_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index d15d6f0baac..8f796313893 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -20,7 +20,7 @@
 #include "ub_objref_seq.h"
 
 ACE_RCSID (Param_Test,
-           ub_objref_seq, 
+           ub_objref_seq,
            "$Id$")
 
 // ************************************************************************
@@ -59,8 +59,7 @@ Test_ObjRef_Sequence::opname (void) const
 }
 
 void
-Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req
-                                      ACE_ENV_ARG_DECL)
+Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -68,31 +67,27 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Coffee_Mix);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Coffee_Mix *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Coffee_Mix (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Coffee_Mix (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Coffee_Mix (*tmp);
 }
 
 int
-Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref
-                                       ACE_ENV_ARG_DECL)
+Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Coffee::Desc desc;
       Generator *gen = GENERATOR::instance (); // value generator
@@ -108,8 +103,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref
         {
           // generate some arbitrary string to be filled into the ith location in
           // the sequence
-          this->in_[i] = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->in_[i] = objref->make_coffee ();
 
           // select a Coffee flavor at random
           CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
@@ -118,20 +112,16 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref
           // set the attribute for the in object
           Coffee_ptr tmp = this->in_[i];
 
-          tmp->description (desc
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          tmp->description (desc);
         }
 
         return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef_Sequence::init_parameters\n");
+      ex._tao_print_exception ("Test_ObjRef_Sequence::init_parameters\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -145,62 +135,48 @@ Test_ObjRef_Sequence::reset_parameters (void)
 }
 
 int
-Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref
-                                    ACE_ENV_ARG_DECL)
+Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Coffee_Mix_out out (this->out_.out ());
 
       this->ret_ = objref->test_coffe_mix (this->in_,
                                            this->inout_.inout (),
-                                           out
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_ObjRef_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
 CORBA::Boolean
 Test_ObjRef_Sequence::check_validity (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       this->compare (this->in_,
-                     this->inout_.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     this->inout_.in ());
 
       this->compare (this->in_,
-                     this->out_.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     this->out_.in ());
 
       this->compare (this->in_,
-                     this->ret_.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     this->ret_.in ());
 
       return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef_Sequence::check_validity");
+      ex._tao_print_exception ("Test_ObjRef_Sequence::check_validity");
 
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -234,10 +210,9 @@ Test_ObjRef_Sequence::print_values (void)
 
 CORBA::Boolean
 Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
-                               const Param_Test::Coffee_Mix &s2
-                               ACE_ENV_ARG_DECL)
+                               const Param_Test::Coffee_Mix &s2)
 {
-  ACE_TRY
+  try
     {
       if (s1.maximum () != s2.maximum ())
         {
@@ -263,13 +238,11 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
               return 0;
             }
 
-          Coffee::Desc_var desc1 = vs1->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          Coffee::Desc_var desc1 = vs1->description ();
 
           CORBA::String_var n1 = desc1->name.in ();
 
-          Coffee::Desc_var desc2 = vs2->description (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          Coffee::Desc_var desc2 = vs2->description ();
 
           CORBA::String_var n2 = desc2->name.in ();
 
@@ -281,13 +254,11 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
 
       return 1; // success
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ObjRef_Sequence::compare");
+      ex._tao_print_exception ("Test_ObjRef_Sequence::compare");
 
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h
index f087101b08b..21f3639dd08 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.h
+++ b/TAO/tests/Param_Test/ub_objref_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_ObjRef_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,13 +55,12 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
   CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1,
-                          const Param_Test::Coffee_Mix &s2
-                          ACE_ENV_ARG_DECL);
+                          const Param_Test::Coffee_Mix &s2);
   // compare
 
   void print_sequence (const Param_Test::Coffee_Mix &s);
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index c7740c69fdb..3319e89c703 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -20,7 +20,7 @@
 #include "ub_short_seq.h"
 
 ACE_RCSID (Param_Test,
-           ub_short_seq, 
+           ub_short_seq,
            "$Id$")
 
 // ************************************************************************
@@ -49,8 +49,7 @@ Test_Short_Sequence::opname (void) const
 }
 
 void
-Test_Short_Sequence::dii_req_invoke (CORBA::Request *req
-                                     ACE_ENV_ARG_DECL)
+Test_Short_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -58,29 +57,25 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_ShortSeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   CORBA::ShortSeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new CORBA::ShortSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new CORBA::ShortSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new CORBA::ShortSeq (*tmp);
 }
 
 int
-Test_Short_Sequence::init_parameters (Param_Test_ptr
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+Test_Short_Sequence::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -111,28 +106,23 @@ Test_Short_Sequence::reset_parameters (void)
 }
 
 int
-Test_Short_Sequence::run_sii_test (Param_Test_ptr objref
-                                   ACE_ENV_ARG_DECL)
+Test_Short_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       CORBA::ShortSeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_short_sequence (this->in_.in (),
                                                 this->inout_.inout (),
-                                                out
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Short_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Short_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h
index 7cf0a4499f5..a200873eadd 100644
--- a/TAO/tests/Param_Test/ub_short_seq.h
+++ b/TAO/tests/Param_Test/ub_short_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Short_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 730701506f0..db7eead2aa5 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -20,7 +20,7 @@
 #include "ub_str_seq.h"
 
 ACE_RCSID (Param_Test,
-           ub_str_seq, 
+           ub_str_seq,
            "$Id$")
 
 // ************************************************************************
@@ -49,8 +49,7 @@ Test_String_Sequence::opname (void) const
 }
 
 void
-Test_String_Sequence::dii_req_invoke (CORBA::Request *req
-                                      ACE_ENV_ARG_DECL)
+Test_String_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -58,29 +57,25 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_StringSeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   CORBA::StringSeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new CORBA::StringSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new CORBA::StringSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new CORBA::StringSeq (*tmp);
 }
 
 int
-Test_String_Sequence::init_parameters (Param_Test_ptr
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+Test_String_Sequence::init_parameters (Param_Test_ptr)
 {
   const char *choiceList[] =
   {
@@ -115,28 +110,23 @@ Test_String_Sequence::reset_parameters (void)
 }
 
 int
-Test_String_Sequence::run_sii_test (Param_Test_ptr objref
-                                    ACE_ENV_ARG_DECL)
+Test_String_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       CORBA::StringSeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_strseq (this->in_.in (),
                                         this->inout_.inout (),
-                                        out
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_String_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_String_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h
index 069bdf2351e..b58373550da 100644
--- a/TAO/tests/Param_Test/ub_str_seq.h
+++ b/TAO/tests/Param_Test/ub_str_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_String_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index 1392df320c0..ae253a1e54b 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -20,7 +20,7 @@
 #include "ub_string.h"
 
 ACE_RCSID (Param_Test,
-           ub_string, 
+           ub_string,
            "$Id$")
 
 // ************************************************************************
@@ -57,8 +57,7 @@ Test_Unbounded_String::opname (void) const
 }
 
 void
-Test_Unbounded_String::dii_req_invoke (CORBA::Request *req
-                                       ACE_ENV_ARG_DECL)
+Test_Unbounded_String::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -69,29 +68,25 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_string);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   const char *tmp;
   req->return_value () >>= tmp;
   this->ret_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = CORBA::string_dup (tmp);
 }
 
 int
-Test_Unbounded_String::init_parameters (Param_Test_ptr
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+Test_Unbounded_String::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -127,28 +122,23 @@ Test_Unbounded_String::reset_parameters (void)
 }
 
 int
-Test_Unbounded_String::run_sii_test (Param_Test_ptr objref
-                                     ACE_ENV_ARG_DECL)
+Test_Unbounded_String::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       CORBA::String_out str_out (this->out_);
 
       this->ret_ = objref->test_unbounded_string (this->in_,
                                                   this->inout_,
-                                                  str_out
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                  str_out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Unbounded_String::run_sii_test\n");
+      ex._tao_print_exception ("Test_Unbounded_String::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h
index ed721972028..834c4bfbcb2 100644
--- a/TAO/tests/Param_Test/ub_string.h
+++ b/TAO/tests/Param_Test/ub_string.h
@@ -33,15 +33,13 @@ public:
   ~Test_Unbounded_String (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 805ecf71579..fbe85b62655 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -20,7 +20,7 @@
 #include "ub_struct_seq.h"
 
 ACE_RCSID (Param_Test,
-           ub_struct_seq, 
+           ub_struct_seq,
            "$Id$")
 
 // ************************************************************************
@@ -50,8 +50,7 @@ Test_Struct_Sequence::opname (void) const
 }
 
 void
-Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req
-                                      ACE_ENV_ARG_DECL)
+Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -59,29 +58,25 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_StructSeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::StructSeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::StructSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::StructSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::StructSeq (*tmp);
 }
 
 int
-Test_Struct_Sequence::init_parameters (Param_Test_ptr
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+Test_Struct_Sequence::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -112,28 +107,23 @@ Test_Struct_Sequence::reset_parameters (void)
 }
 
 int
-Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref
-                                    ACE_ENV_ARG_DECL)
+Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::StructSeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_struct_sequence (this->in_,
                                                  this->inout_.inout (),
-                                                 out
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                 out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Struct_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_Struct_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
@@ -257,8 +247,7 @@ Test_Unbounded_Struct_Sequence::opname (void) const
 }
 
 void
-Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
-                                                ACE_ENV_ARG_DECL)
+Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -266,29 +255,25 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_PathSpec);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::PathSpec *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::PathSpec (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::PathSpec (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::PathSpec (*tmp);
 }
 
 int
-Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr
-                                                 ACE_ENV_ARG_DECL_NOT_USED)
+Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -320,15 +305,12 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void)
 }
 
 int
-Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref
-                                              ACE_ENV_ARG_DECL)
+Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
 {
   Param_Test::PathSpec_out out (this->out_.out ());
   this->ret_ = objref->test_unbounded_struct_sequence (this->in_,
                                                        this->inout_.inout (),
-                                                       out
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                                       out);
 
   return 0;
 }
diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h
index 00ce057526d..7459c7892f1 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.h
+++ b/TAO/tests/Param_Test/ub_struct_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_Struct_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
@@ -97,15 +95,13 @@ public:
   ~Test_Unbounded_Struct_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                        ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -120,7 +116,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index e082cc19817..5761f22f962 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -21,7 +21,7 @@
 #include "ace/OS_NS_wchar.h"
 
 ACE_RCSID (Param_Test,
-           ub_wstr_seq, 
+           ub_wstr_seq,
            "$Id$")
 
 // ************************************************************************
@@ -50,8 +50,7 @@ Test_WString_Sequence::opname (void) const
 }
 
 void
-Test_WString_Sequence::dii_req_invoke (CORBA::Request *req
-                                       ACE_ENV_ARG_DECL)
+Test_WString_Sequence::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -59,29 +58,25 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_WStringSeq);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   CORBA::WStringSeq *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new CORBA::WStringSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new CORBA::WStringSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new CORBA::WStringSeq (*tmp);
 }
 
 int
-Test_WString_Sequence::init_parameters (Param_Test_ptr
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+Test_WString_Sequence::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -111,28 +106,23 @@ Test_WString_Sequence::reset_parameters (void)
 }
 
 int
-Test_WString_Sequence::run_sii_test (Param_Test_ptr objref
-                                     ACE_ENV_ARG_DECL)
+Test_WString_Sequence::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       CORBA::WStringSeq_out out (this->out_.out ());
 
       this->ret_ = objref->test_wstrseq (this->in_.in (),
                                          this->inout_.inout (),
-                                         out
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_WString_Sequence::run_sii_test\n");
+      ex._tao_print_exception ("Test_WString_Sequence::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h
index 6c212efc388..5351240f41c 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.h
+++ b/TAO/tests/Param_Test/ub_wstr_seq.h
@@ -34,15 +34,13 @@ public:
   ~Test_WString_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,8 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *
-                       ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index a74134ff06b..fe1d49c4f69 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -21,7 +21,7 @@
 #include "ace/OS_NS_wchar.h"
 
 ACE_RCSID (Param_Test,
-           ub_wstring, 
+           ub_wstring,
            "$Id$")
 
 // ************************************************************************
@@ -58,8 +58,7 @@ Test_Unbounded_WString::opname (void) const
 }
 
 void
-Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req
-                                        ACE_ENV_ARG_DECL)
+Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -70,29 +69,25 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_wstring);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   const CORBA::WChar *tmp;
   req->return_value () >>= tmp;
   this->ret_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = CORBA::wstring_dup (tmp);
 }
 
 int
-Test_Unbounded_WString::init_parameters (Param_Test_ptr
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+Test_Unbounded_WString::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -127,28 +122,23 @@ Test_Unbounded_WString::reset_parameters (void)
 }
 
 int
-Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref
-                                      ACE_ENV_ARG_DECL)
+Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       CORBA::WString_out str_out (this->out_);
 
       this->ret_ = objref->test_unbounded_wstring (this->in_,
                                                    this->inout_,
-                                                   str_out
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                   str_out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Unbounded_WString::run_sii_test\n");
+      ex._tao_print_exception ("Test_Unbounded_WString::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h
index 04497648c11..0c11b453c98 100644
--- a/TAO/tests/Param_Test/ub_wstring.h
+++ b/TAO/tests/Param_Test/ub_wstring.h
@@ -33,15 +33,13 @@ public:
   ~Test_Unbounded_WString (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,8 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *
-                       ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index d8104652da1..3098bf9f256 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -20,7 +20,7 @@
 #include "ulonglong.h"
 
 ACE_RCSID (Param_Test,
-           ulonglong, 
+           ulonglong,
            "$Id$")
 
 Test_ULongLong::Test_ULongLong (void)
@@ -41,8 +41,7 @@ Test_ULongLong::opname (void) const
 }
 
 void
-Test_ULongLong::dii_req_invoke (CORBA::Request *req
-                                ACE_ENV_ARG_DECL)
+Test_ULongLong::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -50,25 +49,21 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_ulonglong);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   req->return_value () >>= this->ret_;
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= this->inout_;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= this->out_;
 }
 
 int
-Test_ULongLong::init_parameters (Param_Test_ptr
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+Test_ULongLong::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -87,27 +82,22 @@ Test_ULongLong::reset_parameters (void)
 }
 
 int
-Test_ULongLong::run_sii_test (Param_Test_ptr objref
-                              ACE_ENV_ARG_DECL)
+Test_ULongLong::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       this->ret_ = objref->test_ulonglong (this->in_,
                                            this->inout_,
-                                           this->out_
-                                           ACE_ENV_ARG_PARAMETER);
+                                           this->out_);
 
-      ACE_TRY_CHECK;
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_ULongLong::run_sii_test\n");
+      ex._tao_print_exception ("Test_ULongLong::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h
index db9e1fa86a4..c143ef00a70 100644
--- a/TAO/tests/Param_Test/ulonglong.h
+++ b/TAO/tests/Param_Test/ulonglong.h
@@ -30,15 +30,13 @@ public:
   ~Test_ULongLong (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -53,7 +51,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index f07192921e5..96d64aa76c9 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -20,7 +20,7 @@
 #include "var_array.h"
 
 ACE_RCSID (Param_Test,
-           var_array, 
+           var_array,
            "$Id$")
 
 // ************************************************************************
@@ -47,8 +47,7 @@ Test_Var_Array::opname (void) const
 }
 
 void
-Test_Var_Array::dii_req_invoke (CORBA::Request *req
-                                ACE_ENV_ARG_DECL)
+Test_Var_Array::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= Param_Test::Var_Array_forany (this->in_);
   req->add_inout_arg ("s2") <<= Param_Test::Var_Array_forany (this->inout_);
@@ -56,8 +55,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Var_Array);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Var_Array_forany forany;
 
@@ -65,21 +63,18 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req
   this->ret_ = Param_Test::Var_Array_dup (forany.in ());
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= forany;
   Param_Test::Var_Array_copy (this->inout_, forany.in ());
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= forany;
   this->out_ = Param_Test::Var_Array_dup (forany.in ());
 }
 
 int
-Test_Var_Array::init_parameters (Param_Test_ptr
-                                 ACE_ENV_ARG_DECL_NOT_USED)
+Test_Var_Array::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -105,27 +100,22 @@ Test_Var_Array::reset_parameters (void)
 }
 
 int
-Test_Var_Array::run_sii_test (Param_Test_ptr objref
-                              ACE_ENV_ARG_DECL)
+Test_Var_Array::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Var_Array_out out_arr (this->out_.out ());
       this->ret_ = objref->test_var_array (this->in_,
                                            this->inout_,
-                                           out_arr
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                           out_arr);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Var_Array::run_sii_test\n");
+      ex._tao_print_exception ("Test_Var_Array::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h
index 07d33162104..1a9b4e5c08f 100644
--- a/TAO/tests/Param_Test/var_array.h
+++ b/TAO/tests/Param_Test/var_array.h
@@ -33,15 +33,13 @@ public:
   ~Test_Var_Array (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +54,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 679ed7b3db3..5bf90ad5044 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -20,7 +20,7 @@
 #include "var_struct.h"
 
 ACE_RCSID (Param_Test,
-           var_struct, 
+           var_struct,
            "$Id$")
 
 // ************************************************************************
@@ -50,8 +50,7 @@ Test_Var_Struct::opname (void) const
 }
 
 void
-Test_Var_Struct::dii_req_invoke (CORBA::Request *req
-                                 ACE_ENV_ARG_DECL)
+Test_Var_Struct::dii_req_invoke (CORBA::Request *req)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -59,29 +58,25 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Var_Struct);
 
-  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  req->invoke ();
 
   Param_Test::Var_Struct *tmp;
   req->return_value () >>= tmp;
   this->ret_ = new Param_Test::Var_Struct (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (1);
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Var_Struct (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    req->arguments ()->item (2);
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Var_Struct (*tmp);
 }
 
 int
-Test_Var_Struct::init_parameters (Param_Test_ptr
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+Test_Var_Struct::init_parameters (Param_Test_ptr)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -135,27 +130,22 @@ Test_Var_Struct::reset_parameters (void)
 }
 
 int
-Test_Var_Struct::run_sii_test (Param_Test_ptr objref
-                               ACE_ENV_ARG_DECL)
+Test_Var_Struct::run_sii_test (Param_Test_ptr objref)
 {
-  ACE_TRY
+  try
     {
       Param_Test::Var_Struct_out out (this->out_.out ());
       this->ret_ = objref->test_var_struct (this->in_,
                                             this->inout_.inout (),
-                                            out
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            out);
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test_Var_Struct::run_sii_test\n");
+      ex._tao_print_exception ("Test_Var_Struct::run_sii_test\n");
 
     }
-  ACE_ENDTRY;
   return -1;
 }
 
diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h
index aab34fe5247..79f15ff4ded 100644
--- a/TAO/tests/Param_Test/var_struct.h
+++ b/TAO/tests/Param_Test/var_struct.h
@@ -34,15 +34,13 @@ public:
   ~Test_Var_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref
-                    ACE_ENV_ARG_DECL);
+  int run_sii_test (Param_Test_ptr objref);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref
-                       ACE_ENV_ARG_DECL);
+  int init_parameters (Param_Test_ptr objref);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +55,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp
index 21fbd5409bd..cf3e5176b71 100644
--- a/TAO/tests/Permanent_Forward/StubTest.cpp
+++ b/TAO/tests/Permanent_Forward/StubTest.cpp
@@ -74,11 +74,9 @@ equal_endpoint (TAO_Profile *profile, TAO_Profile *other)
 static bool
 marshaled_equal_to_other (CORBA::ORB_ptr orb, CORBA::Object_ptr obj, TAO_MProfile *other_mprofile)
 {
-  CORBA::String_var str = orb->object_to_string (obj ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::String_var str = orb->object_to_string (obj);
 
-  CORBA::Object_var obj_copy = orb->string_to_object (str.in () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj_copy = orb->string_to_object (str.in ());
 
   TAO_Stub *stub_copy = obj_copy->_stubobj ();
   TAO_MProfile *copy_mprofile  = &(stub_copy->base_profiles ());
@@ -101,12 +99,10 @@ marshaled_equal_to_other (CORBA::ORB_ptr orb, CORBA::Object_ptr obj, TAO_MProfil
 static void
 test_forward_permanent (CORBA::ORB_ptr orb)
 {
-  CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService");
 
   // the permanent profile
-  CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService");
 
   TAO_Stub *stub1 = obj1->_stubobj ();
   TAO_Stub *stub4 = obj4->_stubobj ();
@@ -148,20 +144,15 @@ test_forward_permanent (CORBA::ORB_ptr orb)
 static void
 test_forward_permanent_mix (CORBA::ORB_ptr orb)
 {
-  CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService");
 
-  CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService");
 
-  CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService");
 
-  CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService");
 
-  CORBA::Object_var obj5 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:5555,iiop:192.168.1.3:5555/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj5 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:5555,iiop:192.168.1.3:5555/NameService");
 
   TAO_Stub *stub1 = obj1->_stubobj ();
   TAO_Stub *stub2 = obj2->_stubobj ();
@@ -264,14 +255,11 @@ test_forward_permanent_mix (CORBA::ORB_ptr orb)
 static void
 test_forward (CORBA::ORB_ptr orb)
 {
-  CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService");
 
-  CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService");
 
-  CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService");
 
   TAO_Stub *stub1 = obj1->_stubobj ();
   TAO_Stub *stub2 = obj2->_stubobj ();
@@ -336,33 +324,27 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the Stub Tests.\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Retrieve the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       test_forward (orb.in());
       test_forward_permanent (orb.in());
       test_forward_permanent_mix (orb.in());
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  catch (const CORBA::SystemException& sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,
-                           "Unexpected system Exception!!\n");
+      sysex._tao_print_exception ("Unexpected system Exception!!\n");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected ACE_CATCHANY Exception!\n");
+      ex._tao_print_exception ("Unexpected CORBA Exception!\n");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG, "Stub Tests Successfully Completed!\n"));
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index d3f78ece1b0..2154ce2ba29 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -66,8 +66,7 @@ private:
   void perform_iteration (ACE_RANDR_TYPE &seed,
                           CORBA::PolicyList_var &policies,
                           CORBA::PolicyManager_ptr policy_manager,
-                          CORBA::PolicyCurrent_ptr policy_current
-                          ACE_ENV_ARG_DECL);
+                          CORBA::PolicyCurrent_ptr policy_current);
 
 private:
   CORBA::ORB_var orb_;
@@ -83,25 +82,21 @@ private:
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object ("corbaloc:iiop:localhost:12345/FakeIOR"
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object ("corbaloc:iiop:localhost:12345/FakeIOR");
 
       Test_var test =
 	TAO::Narrow_Utils<Test>::unchecked_narrow (
 	   object.in (),
 	   _TAO_Test_Proxy_Broker_Factory_function_pointer);
-      ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
         {
@@ -124,13 +119,11 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -150,10 +143,9 @@ void
 Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
                                  CORBA::PolicyList_var &policies,
                                  CORBA::PolicyManager_ptr policy_manager,
-                                 CORBA::PolicyCurrent_ptr policy_current
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::PolicyCurrent_ptr policy_current)
 {
-  ACE_TRY
+  try
     {
       int r = ACE_OS::rand_r (seed);
 
@@ -211,9 +203,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
             }
 
           policy = this->orb_->create_policy (policy_type,
-                                              any
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                              any);
 
           CORBA::SetOverrideType override_type = CORBA::SET_OVERRIDE;
           if (operation == ADD_OBJECT_POLICY
@@ -232,52 +222,41 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
             {
               CORBA::Object_var tmp =
                 this->test_->_set_policy_overrides (policy_list,
-                                                    override_type
-                                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                    override_type);
             }
           else if (operation == ADD_CURRENT_POLICY
                    || operation == SET_CURRENT_POLICY)
             {
               policy_current->set_policy_overrides (policy_list,
-                                                    override_type
-                                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                    override_type);
             }
           else
             {
               // operation == ADD_CURRENT_POLICY
               // || operation == SET_CURRENT_POLICY)
               policy_manager->set_policy_overrides (policy_list,
-                                                    override_type
-                                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                    override_type);
             }
-          policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy_list[0]->destroy ();
         }
       else if (operation == SAVE_CURRENT_POLICIES)
         {
           CORBA::PolicyTypeSeq types;
           policies =
-            policy_current->get_policy_overrides (types ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            policy_current->get_policy_overrides (types);
         }
       else if (operation == SAVE_MANAGER_POLICIES)
         {
           CORBA::PolicyTypeSeq types;
           policies =
-            policy_manager->get_policy_overrides (types ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            policy_manager->get_policy_overrides (types);
         }
       else if (operation == RESTORE_CURRENT_POLICIES)
         {
           if (policies.ptr () != 0)
             {
               policy_current->set_policy_overrides (policies.in (),
-                                                    CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                    CORBA::SET_OVERRIDE);
             }
         }
       else // operation == RESTORE_MANAGER_POLICIES)
@@ -285,24 +264,21 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
           if (policies.ptr () != 0)
             {
               policy_manager->set_policy_overrides (policies.in (),
-                                                    CORBA::SET_OVERRIDE
-                                                    ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                                                    CORBA::SET_OVERRIDE);
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore all exceptions
     }
-  ACE_ENDTRY;
 }
 
 
 int
 Manipulation::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 #ifndef ACE_LACKS_LONGLONG_T
       ACE_RANDR_TYPE seed =
@@ -312,22 +288,16 @@ Manipulation::svc (void)
         static_cast<ACE_RANDR_TYPE> (ACE_OS::gethrtime().lo());
 #endif
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("ORBPolicyManager"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
 
       for (int i = 0; i != this->niterations_; ++i)
@@ -336,16 +306,12 @@ Manipulation::svc (void)
           this->perform_iteration (seed,
                                    policies,
                                    policy_manager.in (),
-                                   policy_current.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                   policy_current.in ());
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Manipulation: exception raised");
+      ex._tao_print_exception ("Manipulation: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
index ed90dd7815f..0a472efebf6 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp
@@ -30,33 +30,31 @@ Echo_Client_Request_Interceptor (void)
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Echo_Client_Interceptor");
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ERROR((LM_ERROR,
              "ERROR, unexpected interception point called send_poll()\n"));
-  ACE_THROW(CORBA::BAD_PARAM ());
+  throw CORBA::BAD_PARAM ();
 }
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -69,15 +67,11 @@ Echo_Client_Request_Interceptor::send_request (
 
   // Add this context to the service context list.
   ri->add_request_service_context (sc,
-                                   0
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                   0);
 
   // Check that the request service context can be retrieved.
   IOP::ServiceContext_var rc =
-    ri->get_request_service_context (::service_id
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   if (rc->context_data.length() != magic_cookie_len
       || ACE_OS::memcmp(
@@ -85,7 +79,7 @@ Echo_Client_Request_Interceptor::send_request (
              magic_cookie_len) != 0
       )
     {
-      ACE_THROW(CORBA::BAD_PARAM());
+      throw CORBA::BAD_PARAM();
     }
 
   Echo_Client_Request_Interceptor::request_count++;
@@ -93,15 +87,12 @@ Echo_Client_Request_Interceptor::send_request (
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check that the request service context can be retrieved.
   IOP::ServiceContext_var rc =
-    ri->get_request_service_context (::service_id
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   if (rc->context_data.length() != magic_cookie_len
       || ACE_OS::memcmp(
@@ -109,7 +100,7 @@ Echo_Client_Request_Interceptor::receive_reply (
              magic_cookie_len) != 0
       )
     {
-      ACE_THROW(CORBA::BAD_PARAM());
+      throw CORBA::BAD_PARAM();
     }
 
   Echo_Client_Request_Interceptor::reply_count++;
@@ -117,16 +108,13 @@ Echo_Client_Request_Interceptor::receive_reply (
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   // Check that the request service context can be retrieved.
   IOP::ServiceContext_var rc =
-    ri->get_request_service_context (::service_id
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   if (rc->context_data.length() != magic_cookie_len
       || ACE_OS::memcmp(
@@ -134,7 +122,7 @@ Echo_Client_Request_Interceptor::receive_other (
              magic_cookie_len) != 0
       )
     {
-      ACE_THROW (CORBA::BAD_PARAM ());
+      throw CORBA::BAD_PARAM ();
     }
 
   Echo_Client_Request_Interceptor::other_count++;
@@ -142,8 +130,7 @@ Echo_Client_Request_Interceptor::receive_other (
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
index f775ebe2052..2faafc7f5c5 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h
@@ -25,33 +25,28 @@ public:
   static unsigned long other_count;
   static unsigned long exception_count;
 
-  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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 };
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp
index 46ecb32ca03..f06678f33a8 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp
@@ -17,22 +17,18 @@ Client_ORBInitializer::Client_ORBInitializer ()
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_var interceptor(
       new Echo_Client_Request_Interceptor);
 
-  info->add_client_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
index 41c892cfb4f..c0425f701fa 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h
@@ -20,12 +20,10 @@ class Client_ORBInitializer
 public:
   Client_ORBInitializer ();
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
index 677ebee90b9..89e5f53ca1a 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp
@@ -15,16 +15,15 @@ Echo::Echo(CORBA::ORB_ptr orb)
 }
 
 char *
-Echo::echo_operation(char const * the_input
-           ACE_ENV_ARG_DECL_NOT_USED)
+Echo::echo_operation(char const * the_input)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   return CORBA::string_dup(the_input);
 }
 
 void
-Echo::shutdown(ACE_ENV_SINGLE_ARG_DECL)
+Echo::shutdown(void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
-  this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown(0);
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h
index de20793bbde..3fce554f5bd 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h
@@ -17,10 +17,9 @@ class Echo
 public:
   Echo(CORBA::ORB_ptr orb);
 
-  virtual char * echo_operation(char const * the_input
-                      ACE_ENV_ARG_DECL)
+  virtual char * echo_operation(char const * the_input)
     ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown(void)
     ACE_THROW_SPEC((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
index 3dc6be77b96..026b56bd3dc 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
@@ -19,29 +19,26 @@ Echo_Handler::Echo_Handler(void)
 }
 
 void
-Echo_Handler::echo_operation (char const *
-                              ACE_ENV_ARG_DECL_NOT_USED)
+Echo_Handler::echo_operation (char const *)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->replies_;
 }
 
 void
-Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder *
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
 void
-Echo_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Handler::shutdown (void)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
 void
-Echo_Handler::shutdown_excep (::Messaging::ExceptionHolder *
-                              ACE_ENV_ARG_DECL_NOT_USED)
+Echo_Handler::shutdown_excep (::Messaging::ExceptionHolder *)
   ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
index 76517aa76f2..e95865e1e9a 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h
@@ -17,16 +17,13 @@ class Echo_Handler
 public:
   Echo_Handler(void);
 
-  virtual void echo_operation(char const * retval
-                              ACE_ENV_ARG_DECL)
+  virtual void echo_operation(char const * retval)
     ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void echo_operation_excep(::Messaging::ExceptionHolder * h
-                                    ACE_ENV_ARG_DECL)
+  virtual void echo_operation_excep(::Messaging::ExceptionHolder * h)
     ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown(void)
     ACE_THROW_SPEC((CORBA::SystemException));
-  virtual void shutdown_excep(::Messaging::ExceptionHolder * h
-                              ACE_ENV_ARG_DECL)
+  virtual void shutdown_excep(::Messaging::ExceptionHolder * h)
     ACE_THROW_SPEC((CORBA::SystemException));
 
   CORBA::ULong replies (void) const;
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
index 4e8e110e4cd..1d2ff768d21 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp
@@ -22,51 +22,47 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Echo_Server_Interceptor");
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0)
     return;
 
   IOP::ServiceId id = ::service_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (id);
 
   if (sc->context_data.length() != magic_cookie_len
       || ACE_OS::memcmp(
                 magic_cookie, sc->context_data.get_buffer(),
                 magic_cookie_len) != 0)
     {
-      ACE_THROW(CORBA::BAD_PARAM());
+      throw CORBA::BAD_PARAM();
     }
 }
 
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -74,16 +70,14 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -91,8 +85,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-             PortableInterceptor::ServerRequestInfo_ptr
-             ACE_ENV_ARG_DECL_NOT_USED)
+             PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
index 6ccb824bc8a..6d770bb6290 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h
@@ -20,34 +20,29 @@ class Echo_Server_Request_Interceptor
 public:
   Echo_Server_Request_Interceptor ();
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 };
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
index dc409dd644e..f2d80031d8e 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp
@@ -19,22 +19,18 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_var interceptor(
       new Echo_Server_Request_Interceptor);
 
-  info->add_server_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
index f02c068b74f..e65fe5085ce 100644
--- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h
@@ -20,12 +20,10 @@ class Server_ORBInitializer
 public:
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp
index 571ccf476a0..450801a6190 100644
--- a/TAO/tests/Portable_Interceptors/AMI/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp
@@ -43,41 +43,32 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-static void test_synchronous (Test::Echo_ptr echo
-                              ACE_ENV_ARG_DECL);
+static void test_synchronous (Test::Echo_ptr echo);
 
 static void test_ami (CORBA::ORB_ptr orb,
-                      Test::Echo_ptr echo
-                      ACE_ENV_ARG_DECL);
+                      Test::Echo_ptr echo);
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       {
         PortableInterceptor::ORBInitializer_var initializer (
             new Client_ORBInitializer);
-        PortableInterceptor::register_orb_initializer (initializer.in()
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        PortableInterceptor::register_orb_initializer (initializer.in());
       }
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -85,19 +76,15 @@ 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 ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test::Echo_var echo =
-        Test::Echo::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Echo::_narrow (tmp.in ());
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (CORBA::is_nil (echo.in ()))
         {
@@ -107,20 +94,14 @@ main (int argc, char *argv[])
                             1);
         }
 
-      test_synchronous (echo.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_synchronous (echo.in ());
 
       test_ami (orb.in (),
-                echo.in ()
-                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                echo.in ());
 
-      echo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      echo->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       unsigned long request_count =
         Echo_Client_Request_Interceptor::request_count;
@@ -149,20 +130,17 @@ main (int argc, char *argv[])
                       "ERROR: No response handled "));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return exit_status;
 }
 
 static void
-test_synchronous (Test::Echo_ptr echo
-                  ACE_ENV_ARG_DECL)
+test_synchronous (Test::Echo_ptr echo)
 {
   unsigned long initial_request_count =
     Echo_Client_Request_Interceptor::request_count;
@@ -172,9 +150,7 @@ test_synchronous (Test::Echo_ptr echo
   for (unsigned long i = 0; i != ITERATIONS; ++i)
     {
       CORBA::String_var s =
-        echo->echo_operation ("dummy message"
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        echo->echo_operation ("dummy message");
     }
 
   unsigned long total_request_count =
@@ -207,8 +183,7 @@ test_synchronous (Test::Echo_ptr echo
 
 static void
 test_ami (CORBA::ORB_ptr orb,
-          Test::Echo_ptr echo
-          ACE_ENV_ARG_DECL)
+          Test::Echo_ptr echo)
 {
   Test::AMI_EchoHandler_var echo_handler;
   Echo_Handler * echo_handler_impl = new Echo_Handler;
@@ -216,8 +191,7 @@ test_ami (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var safe_echo_handler = echo_handler_impl;
 
   echo_handler =
-    echo_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    echo_handler_impl->_this ();
 
   unsigned long initial_request_count =
     Echo_Client_Request_Interceptor::request_count;
@@ -228,9 +202,7 @@ test_ami (CORBA::ORB_ptr orb,
     {
       echo->sendc_echo_operation (
         echo_handler.in (),
-        "dummy message"
-        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        "dummy message");
     }
 
   unsigned long total_request_count =
@@ -256,13 +228,11 @@ test_ami (CORBA::ORB_ptr orb,
   while (echo_handler_impl->replies () != ITERATIONS)
     {
       CORBA::Boolean pending =
-        orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        orb->work_pending ();
 
       if (pending)
         {
-          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          orb->perform_work ();
         }
 
     }
@@ -286,34 +256,28 @@ test_ami (CORBA::ORB_ptr orb,
 #if 0
 static void
 wait_for_exception (CORBA::ORB_ptr orb,
-                    Test::Echo_ptr echo
-                    ACE_ENV_ARG_DECL)
+                    Test::Echo_ptr echo)
 {
   ACE_Time_Value tv (1, 0);
-  orb->run (tv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  orb->run (tv);
 
   bool exception_detected = false;
 
   while(!exception_detected)
     {
-      ACE_TRY
+      try
         {
           CORBA::String_var dummy =
-            echo->echo_operation ("foo"
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            echo->echo_operation ("foo");
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
           exception_detected = true;
         }
-      ACE_ENDTRY;
     }
 
   tv = ACE_Time_Value (1, 0);
-  orb->run (tv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  orb->run (tv);
 }
 
 #endif /*if 0*/
diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp
index 0c52ac89b18..220549ac69a 100644
--- a/TAO/tests/Portable_Interceptors/AMI/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp
@@ -43,27 +43,22 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       {
         PortableInterceptor::ORBInitializer_var initializer(
             new Server_ORBInitializer);
-        PortableInterceptor::register_orb_initializer(initializer.in()
-                                                      ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        PortableInterceptor::register_orb_initializer(initializer.in());
       }
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -71,8 +66,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -84,12 +78,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(echo_impl);
 
       Test::Echo_var echo =
-        echo_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        echo_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (echo.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (echo.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -101,27 +93,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
index 1a1256f6ad7..780cad1d12a 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
@@ -124,7 +124,7 @@ public:
   virtual void
   send_reply (ServerRequestInfo_ptr ri) throw (SystemException)
   {
-    CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
+    CORBA::String_var op = ri->operation ();
 
     if (ACE_OS::strcmp (op.in (), "number") != 0)
       return; // Don't mess with PICurrent if not invoking test method.
@@ -181,7 +181,7 @@ public:
         ACE_ERROR ((LM_ERROR,
                     "(%P|%t) ERROR: Could not resolve PICurrent object.\n"));
 
-        ACE_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
       }
 
     ServerRequestInterceptor_var interceptor (new ReplicaController (pi_current.in ()));
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
index 4cad9dde31b..b982a6ee210 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
@@ -16,16 +16,14 @@ Client_ORBInitializer::Client_ORBInitializer (int interceptor_type)
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -63,11 +61,8 @@ Client_ORBInitializer::post_init (
         break;
       }
     }
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var interceptor = tmp;
 
-  info->add_client_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
index f26c625ffbe..1a0b10ba5cb 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Client_ORBInitializer (int interceptor_type);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
index 5ab4c2336d5..3b021b51eb8 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
@@ -18,16 +18,14 @@ Server_ORBInitializer::Server_ORBInitializer (int interceptor_type)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -65,11 +63,8 @@ Server_ORBInitializer::post_init (
         break;
       }
     }
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp;
 
-  info->add_server_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
index 599301a17d9..1907dcab0db 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Server_ORBInitializer (int interceptor_type);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index a874f7d3121..440d3a26d00 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -51,8 +51,7 @@ parse_args (int argc, char *argv[])
 
 
 void
-run_test (Test_Interceptors::Secure_Vault_ptr server
-          ACE_ENV_ARG_DECL)
+run_test (Test_Interceptors::Secure_Vault_ptr server)
 {
   int i = 0;
   const char user[] = "root";
@@ -70,8 +69,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
       // Record current time.
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-      server->ready (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      server->ready ();
 
       // Grab timestamp again.
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -81,14 +79,13 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
                      now - latency_base,
                      1);
 
-      ACE_CHECK;
       if (TAO_debug_level > 0 && i % 100 == 0)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
     }
 
   marker.dump_stats ("Ready method  ", gsf, 1);
 
-  ACE_TRY
+  try
     {
       marker.accumulate_into (throughput, 2);
       throughput_base = ACE_OS::gethrtime ();
@@ -98,8 +95,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
           // Record current time.
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-          server->authenticate (user ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->authenticate (user);
 
           // Grab timestamp again.
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -114,12 +110,10 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
         }
       marker.dump_stats ("Authenticate method  ", gsf, 2);
     }
-  ACE_CATCH (Test_Interceptors::Invalid, userex)
+  catch (const Test_Interceptors::Invalid&)
     {
       ACE_DEBUG ((LM_DEBUG, "Invalid user\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   Test_Interceptors::Secure_Vault::Record record;
   record.check_num = 1;
@@ -135,9 +129,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
       server->update_records (id,
-                              record
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                              record);
 
       // Grab timestamp again.
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -147,7 +139,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
                      now - latency_base,
                      3);
 
-      ACE_CHECK;
       if (TAO_debug_level > 0 && i % 100 == 0)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
 
@@ -183,7 +174,7 @@ main (int argc, char *argv[])
   int interceptor_type;
   get_interceptor_type (argc, argv, interceptor_type);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
 
@@ -193,25 +184,19 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test_Interceptors::Secure_Vault_var server =
-        Test_Interceptors::Secure_Vault::_narrow (object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Secure_Vault::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -226,19 +211,15 @@ main (int argc, char *argv[])
       // This test is useful for  benchmarking the differences when
       // the same method is intercepted by different interceptors
       // wanting to achieve different functionality.
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
      return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
index 0086a292ed7..93ed136976e 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
@@ -24,22 +24,21 @@ Vault_Client_Request_Interceptor::~Vault_Client_Request_Interceptor ()
 }
 
 char *
-Vault_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
@@ -47,14 +46,12 @@ Vault_Client_Request_Interceptor::send_poll (
 
 void
 Vault_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
@@ -72,15 +69,13 @@ Vault_Client_Request_Interceptor::send_request (
       sc.context_data.replace (string_len, string_len, buf, 1);
 
       // Add this context to the service context list.
-      ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_request_service_context (sc, 0);
     }
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       Test_Interceptors::Secure_Vault::Record *record;
       CORBA::Long id;
@@ -93,19 +88,16 @@ Vault_Client_Request_Interceptor::send_request (
 
 void
 Vault_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       CORBA::Long result;
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
     }
@@ -113,8 +105,7 @@ Vault_Client_Request_Interceptor::receive_reply (
 
 void
 Vault_Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -123,23 +114,19 @@ Vault_Client_Request_Interceptor::receive_other (
 
 void
 Vault_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Any_var any = ri->received_exception ();
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *id = tc->id ();
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
     ACE_ERROR ((LM_ERROR,
@@ -161,24 +148,21 @@ Vault_Client_Request_Context_Interceptor::~Vault_Client_Request_Context_Intercep
 }
 
 char *
-Vault_Client_Request_Context_Interceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Context_Interceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Client_Request_Context_Interceptor::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Context_Interceptor::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Client_Request_Context_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
@@ -186,8 +170,7 @@ Vault_Client_Request_Context_Interceptor::send_poll (
 
 void
 Vault_Client_Request_Context_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -202,21 +185,18 @@ Vault_Client_Request_Context_Interceptor::send_request (
   ACE_NEW_THROW_EX (buf,
                     CORBA::Octet [string_len],
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   ACE_OS::strcpy (reinterpret_cast<char *> (buf), passwd);
 
   sc.context_data.replace (string_len, string_len, buf, 1);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ri->add_request_service_context (sc, 0);
 }
 
 void
 Vault_Client_Request_Context_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -225,8 +205,7 @@ Vault_Client_Request_Context_Interceptor::receive_other (
 
 void
 Vault_Client_Request_Context_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -234,23 +213,19 @@ Vault_Client_Request_Context_Interceptor::receive_reply (
 
 void
 Vault_Client_Request_Context_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Any_var any = ri->received_exception ();
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *id = tc->id ();
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
     ACE_ERROR ((LM_ERROR,
@@ -272,24 +247,21 @@ Vault_Client_Request_Dynamic_Interceptor::~Vault_Client_Request_Dynamic_Intercep
 }
 
 char *
-Vault_Client_Request_Dynamic_Interceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Dynamic_Interceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Client_Request_Dynamic_Interceptor::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Dynamic_Interceptor::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Client_Request_Dynamic_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
@@ -297,20 +269,17 @@ Vault_Client_Request_Dynamic_Interceptor::send_poll (
 
 void
 Vault_Client_Request_Dynamic_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
  if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       const char *user;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -321,8 +290,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request (
  if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       Test_Interceptors::Secure_Vault::Record *record;
       CORBA::Long id;
@@ -335,20 +303,17 @@ Vault_Client_Request_Dynamic_Interceptor::send_request (
 
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "ready") == 0)
     {
       CORBA::Short result;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
     }
@@ -357,8 +322,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply (
     {
       CORBA::Long result;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
     }
@@ -366,8 +330,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply (
 
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -376,23 +339,19 @@ Vault_Client_Request_Dynamic_Interceptor::receive_other (
 
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Any_var any = ri->received_exception ();
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *id = tc->id ();
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
     ACE_ERROR ((LM_ERROR,
@@ -414,23 +373,21 @@ Vault_Client_Request_NOOP_Interceptor::~Vault_Client_Request_NOOP_Interceptor ()
 }
 
 char *
-Vault_Client_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_NOOP_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Client_Request_NOOP_Interceptor::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_NOOP_Interceptor::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Client_Request_NOOP_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
@@ -438,8 +395,7 @@ Vault_Client_Request_NOOP_Interceptor::send_poll (
 
 void
 Vault_Client_Request_NOOP_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -448,8 +404,7 @@ Vault_Client_Request_NOOP_Interceptor::send_request (
 
 void
 Vault_Client_Request_NOOP_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -458,8 +413,7 @@ Vault_Client_Request_NOOP_Interceptor::receive_other (
 
 void
 Vault_Client_Request_NOOP_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -467,23 +421,19 @@ Vault_Client_Request_NOOP_Interceptor::receive_reply (
 
 void
 Vault_Client_Request_NOOP_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Any_var any = ri->received_exception ();
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *id = tc->id ();
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
     ACE_ERROR ((LM_ERROR,
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
index 75f8d621f40..bdc6760fe89 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h
@@ -31,33 +31,28 @@ public:
   virtual ~Vault_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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
@@ -76,33 +71,28 @@ public:
   virtual ~Vault_Client_Request_Context_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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
@@ -121,33 +111,28 @@ public:
   virtual ~Vault_Client_Request_Dynamic_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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
@@ -166,33 +151,28 @@ public:
   virtual ~Vault_Client_Request_NOOP_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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index c556aed2940..22878410b94 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   int interceptor_type;
   get_interceptor_type (argc, argv, interceptor_type);
 
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
 
@@ -55,56 +55,42 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Secure_Vault_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (&server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
       Test_Interceptors::Secure_Vault_var server =
-        Test_Interceptors::Secure_Vault::_narrow (test_obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Secure_Vault::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Test_Interceptors::Secure_Vault: <%s>\n",
@@ -123,21 +109,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
index a11b66691d3..8cc0f504334 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
@@ -24,22 +24,21 @@ Vault_Server_Request_Interceptor::~Vault_Server_Request_Interceptor ()
 }
 
 char *
-Vault_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -48,34 +47,30 @@ Vault_Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Vault_Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
       IOP::ServiceId id = request_ctx_id;
       IOP::ServiceContext_var sc =
-        ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->get_request_service_context (id);
 
       const char *buf =
         reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
       if (ACE_OS::strcmp (buf, "root123") != 0)
-        ACE_THROW (CORBA::NO_PERMISSION ());
+        throw CORBA::NO_PERMISSION ();
     }
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       Test_Interceptors::Secure_Vault::Record *record;
       CORBA::Long id;
@@ -88,19 +83,16 @@ Vault_Server_Request_Interceptor::receive_request (
 
 void
 Vault_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       CORBA::Long result;
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
     }
@@ -108,8 +100,7 @@ Vault_Server_Request_Interceptor::send_reply (
 
 void
 Vault_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -118,8 +109,7 @@ Vault_Server_Request_Interceptor::send_exception (
 
 void
 Vault_Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -139,24 +129,21 @@ Vault_Server_Request_Context_Interceptor::~Vault_Server_Request_Context_Intercep
 }
 
 char *
-Vault_Server_Request_Context_Interceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Context_Interceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Server_Request_Context_Interceptor::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Context_Interceptor::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Server_Request_Context_Interceptor::receive_request_service_contexts(
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -165,27 +152,24 @@ Vault_Server_Request_Context_Interceptor::receive_request_service_contexts(
 
 void
 Vault_Server_Request_Context_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   IOP::ServiceId id = request_ctx_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (id);
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
   if (ACE_OS::strcmp (buf, "root123") !=0)
-    ACE_THROW (CORBA::NO_PERMISSION ());
+    throw CORBA::NO_PERMISSION ();
 }
 
 void
 Vault_Server_Request_Context_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -193,8 +177,7 @@ Vault_Server_Request_Context_Interceptor::send_reply (
 
 void
 Vault_Server_Request_Context_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -202,8 +185,7 @@ Vault_Server_Request_Context_Interceptor::send_exception (
 
 void
 Vault_Server_Request_Context_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -222,36 +204,31 @@ Vault_Server_Request_Dynamic_Interceptor::~Vault_Server_Request_Dynamic_Intercep
 }
 
 char *
-Vault_Server_Request_Dynamic_Interceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Dynamic_Interceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Server_Request_Dynamic_Interceptor::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Dynamic_Interceptor::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Server_Request_Dynamic_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       const char *user;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -262,8 +239,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       Test_Interceptors::Secure_Vault::Record *record;
       CORBA::Long id;
@@ -276,8 +252,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request (
 
 void
 Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts(
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -286,19 +261,16 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts(
 
 void
 Vault_Server_Request_Dynamic_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "ready") == 0)
     {
       CORBA::Short result;
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
     }
@@ -306,8 +278,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       CORBA::Long result;
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
     }
@@ -315,8 +286,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply (
 
 void
 Vault_Server_Request_Dynamic_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -324,8 +294,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_exception (
 
 void
 Vault_Server_Request_Dynamic_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -344,23 +313,21 @@ Vault_Server_Request_NOOP_Interceptor::~Vault_Server_Request_NOOP_Interceptor ()
 }
 
 char *
-Vault_Server_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_NOOP_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Server_Request_NOOP_Interceptor::destroy (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_NOOP_Interceptor::destroy ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Vault_Server_Request_NOOP_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -368,8 +335,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request (
 
 void
 Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts(
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -378,8 +344,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts(
 
 void
 Vault_Server_Request_NOOP_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -387,8 +352,7 @@ Vault_Server_Request_NOOP_Interceptor::send_reply (
 
 void
 Vault_Server_Request_NOOP_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -396,8 +360,7 @@ Vault_Server_Request_NOOP_Interceptor::send_exception (
 
 void
 Vault_Server_Request_NOOP_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
index 3adc2fe8424..3d8481368d5 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h
@@ -31,35 +31,30 @@ public:
   ~Vault_Server_Request_Interceptor ();
   // dotr.
 
-  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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
@@ -78,35 +73,30 @@ public:
   ~Vault_Server_Request_Context_Interceptor ();
   // dotr.
 
-  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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
@@ -125,35 +115,30 @@ public:
   ~Vault_Server_Request_Dynamic_Interceptor ();
   // dotr.
 
-  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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
@@ -172,35 +157,30 @@ public:
   ~Vault_Server_Request_NOOP_Interceptor ();
   // dotr.
 
-  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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
index f94c81f5efd..bc2945f2fed 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
@@ -13,35 +13,33 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb)
 // ctor
 
 CORBA::Short
-Secure_Vault_i::ready (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Secure_Vault_i::ready (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
 }
 
 void
-Secure_Vault_i::authenticate (const char * user
-              ACE_ENV_ARG_DECL)
+Secure_Vault_i::authenticate (const char * user)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Invalid))
 {
   if (ACE_OS::strcmp (user, "root") != 0)
-    ACE_THROW (Test_Interceptors::Invalid ());
+    throw Test_Interceptors::Invalid ();
 
 }
 
 CORBA::Long
 Secure_Vault_i::update_records (CORBA::Long,
-                const Test_Interceptors::Secure_Vault::Record &
-                ACE_ENV_ARG_DECL_NOT_USED)
+                const Test_Interceptors::Secure_Vault::Record &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 return 1;
 }
 
 void
-Secure_Vault_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Secure_Vault_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
index 1e91333a22d..9516f9babe1 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
@@ -27,21 +27,19 @@ public:
   Secure_Vault_i (CORBA::ORB_ptr orb);
   // ctor
 
-  virtual CORBA::Short ready (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short ready (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void authenticate (const char * user
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void authenticate (const char * user)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Invalid));
   // Passwd sent in the service context list
 
   virtual CORBA::Long update_records (CORBA::Long id,
-                                      const Test_Interceptors::Secure_Vault::Record & val
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      const Test_Interceptors::Secure_Vault::Record & val)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
index fd053e810f0..81394e0fdbd 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
@@ -14,22 +14,19 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   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 +35,10 @@ Client_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_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;
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
index 569419fb346..c232ee05e1a 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
index b5590a28f3b..379d2a83186 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
@@ -15,30 +15,25 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Install the Echo server request interceptor
   ACE_NEW_THROW_EX (this->server_interceptor_,
                     Echo_Server_Request_Interceptor,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var interceptor =
     this->server_interceptor_;
 
-  info->add_server_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor.in ());
 }
 
 Echo_Server_Request_Interceptor *
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
index 1cd2c636db6..6db28e5db35 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
@@ -32,12 +32,10 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the created server request interceptor.  Only valid after
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
index 09231faacf2..94337f645e1 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
@@ -36,49 +36,40 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
+run_test (Test_Interceptors::Visual_ptr server)
 {
 
-  server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  server->normal (10);
 
   ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n"));
 
-  server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  server->nothing ();
 
   ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n"));
 
-  ACE_TRY
+  try
     {
-      server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->user ();
     }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
+  catch (const Test_Interceptors::Silly&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught Silly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY_EX (SYS)
+  try
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
+      server->system ();
     }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
+  catch (const CORBA::INV_OBJREF&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
 
@@ -88,24 +79,19 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -115,19 +101,15 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in client:");
+      ex._tao_print_exception ("Caught exception in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
index a9ea659b832..44121112bd8 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
@@ -29,22 +29,21 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
@@ -52,8 +51,7 @@ Echo_Client_Request_Interceptor::send_poll (
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -61,22 +59,17 @@ Echo_Client_Request_Interceptor::send_request (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
   CORBA::String_var operation =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   CORBA::Object_var target =
-    ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target ();
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->object_to_string (target.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.send_request "
@@ -87,17 +80,15 @@ Echo_Client_Request_Interceptor::send_request (
 
   send_request_count++;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ri->get_request_service_context (::service_id);
     }
-  ACE_CATCH (CORBA::BAD_PARAM, error)
+  catch (const CORBA::BAD_PARAM&)
     {
       // This is supposed to happen
       exception_count++;
     }
-  ACE_ENDTRY;
 
   if (send_request_count == 1)
     {
@@ -120,13 +111,11 @@ Echo_Client_Request_Interceptor::send_request (
       sc.context_data.replace (string_len, string_len, buf, 1);
 
       // Add this context to the service context list.
-      ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_request_service_context (sc, 0);
 
       // Check that the request service context can be retrieved.
       IOP::ServiceContext_var sc2 =
-        ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->get_request_service_context (::service_id);
 
       const char *buf2 =
         reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
@@ -161,13 +150,11 @@ Echo_Client_Request_Interceptor::send_request (
 
       sc.context_data.replace (string_len, string_len, buf, 1);
       // Add this context to the service context list.
-      ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_request_service_context (sc, 0);
 
       // Check that the request service context can be retrieved.
       IOP::ServiceContext_var sc2 =
-        ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->get_request_service_context (::service_id);
 
       const char *buf2 =
         reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
@@ -190,8 +177,7 @@ Echo_Client_Request_Interceptor::send_request (
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -199,22 +185,17 @@ Echo_Client_Request_Interceptor::receive_reply (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
   CORBA::String_var operation =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   CORBA::Object_var target =
-    ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target ();
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->object_to_string (target.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.receive_reply from "
@@ -226,8 +207,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -244,8 +224,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
   // Check that no one has messed with the request service context.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 =
     reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
@@ -264,8 +243,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -276,15 +254,12 @@ Echo_Client_Request_Interceptor::receive_other (
                                     this->orb_id_.in ());
     }
 
-  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;
+    this->orb_->object_to_string (target.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.receive_other from "
@@ -295,8 +270,7 @@ Echo_Client_Request_Interceptor::receive_other (
 
   // Check that no one has messed with the request service context.
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -313,8 +287,7 @@ Echo_Client_Request_Interceptor::receive_other (
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -323,20 +296,15 @@ Echo_Client_Request_Interceptor::receive_exception (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
-  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;
+    this->orb_->object_to_string (target.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.received_exception "
@@ -348,8 +316,7 @@ Echo_Client_Request_Interceptor::receive_exception (
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -366,8 +333,7 @@ Echo_Client_Request_Interceptor::receive_exception (
 
   // Check that no one has messed with the request service context.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 =
     reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
index 2503a4b75b7..705bce07974 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
@@ -31,33 +31,28 @@ public:
   virtual ~Echo_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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
index 35f0c3ada75..20870c8b227 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       Server_ORBInitializer * temp_initializer = 0;
 
@@ -50,18 +50,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       // Now we can create the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -69,15 +65,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -85,22 +78,16 @@ main (int argc, char *argv[])
       Visual_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (&server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&server_impl);
 
       // Create a second object to receive forwarded requests
       Visual_i forward_server_impl (orb.in ());
 
       PortableServer::ObjectId_var forward_id =
-        root_poa->activate_object (&forward_server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&forward_server_impl);
 
       CORBA::Object_var forward_test_obj =
-        root_poa->id_to_reference (forward_id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (forward_id.in ());
 
       Echo_Server_Request_Interceptor * server_interceptor =
         temp_initializer->server_interceptor ();
@@ -111,23 +98,16 @@ main (int argc, char *argv[])
                            "server request interceptor.\n"),
                           -1);
 
-      server_interceptor->forward_reference (forward_test_obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_interceptor->forward_reference (forward_test_obj.in ());
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Test_Interceptors::Visual: <%s>\n",
@@ -146,21 +126,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in server:");
+      ex._tao_print_exception ("Caught exception in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
index 7739e548ed1..f6e6374bcb4 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
@@ -33,42 +33,39 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 }
 
 void
-Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location
-                                                    ACE_ENV_ARG_DECL)
+Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location)
                                                     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (forward_location))
-    ACE_THROW (CORBA::INV_OBJREF (
-                 CORBA::SystemException::_tao_minor_code (
-                   TAO::VMCID,
-                   EINVAL),
-                 CORBA::COMPLETED_NO));
+    throw CORBA::INV_OBJREF (
+      CORBA::SystemException::_tao_minor_code (
+        TAO::VMCID,
+        EINVAL),
+      CORBA::COMPLETED_NO);
   this->forward_location_ = CORBA::Object::_duplicate (forward_location);
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.receive_request_service_contexts from "
@@ -85,8 +82,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
   IOP::ServiceId id = ::service_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (id);
 
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -96,7 +92,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   if (ACE_OS::strcmp (buf, request_msg) == 0)
     {
       ACE_DEBUG ((LM_DEBUG, "Sending LOCATION_FORWARD\n"));
-      ACE_THROW (PortableInterceptor::ForwardRequest (this->forward_location_));
+      throw PortableInterceptor::ForwardRequest (this->forward_location_);
     }
   else if (ACE_OS::strcmp (buf, forward_msg) == 0)
     {
@@ -113,8 +109,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
       scc.context_data.replace (string_len, string_len, buff, 1);
 
       // Add this context to the service context list.
-      ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      ri->add_reply_service_context (scc, 0);
     }
   else
     {
@@ -129,8 +124,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -139,13 +133,11 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.send_reply from \"%s\"\n",
@@ -154,8 +146,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
@@ -172,8 +163,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
@@ -190,14 +180,12 @@ Echo_Server_Request_Interceptor::send_reply (
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.send_exception from \"%s\"\n",
@@ -206,8 +194,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
@@ -224,8 +211,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
@@ -242,13 +228,11 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-             PortableInterceptor::ServerRequestInfo_ptr ri
-             ACE_ENV_ARG_DECL)
+             PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.send_other from \"%s\"\n",
@@ -257,8 +241,7 @@ Echo_Server_Request_Interceptor::send_other (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
@@ -278,9 +261,8 @@ Echo_Server_Request_Interceptor::send_other (
   // This will throw an exception if a location forward has not
   // occured.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
-  CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var forward = ri->forward_reference ();
 
   if (CORBA::is_nil (forward.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
index 81924ce2902..064060a82ed 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
@@ -33,39 +33,33 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  void forward_reference (CORBA::Object_ptr forward_location
-                          ACE_ENV_ARG_DECL)
+  void forward_reference (CORBA::Object_ptr forward_location)
                           ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
index 503c7a5b423..925f856c0b5 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
@@ -13,41 +13,39 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 }
 
 void
-Visual_i::normal (CORBA::Long arg
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Visual_i::normal (CORBA::Long arg)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
 
 void
-Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Visual_i::nothing (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::user (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test_Interceptors::Silly))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
-  ACE_THROW (Test_Interceptors::Silly ());
+  throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::system (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
-  ACE_THROW (CORBA::INV_OBJREF ());
+  throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
index 5a6df58c457..cda32b963d9 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
@@ -28,21 +28,20 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void normal (CORBA::Long arg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void nothing (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void user (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Silly));
 
-  void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void system (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
index db9719164d0..f34df67521f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp
@@ -15,23 +15,21 @@ Client_ORBInitializer::Client_ORBInitializer (void) :
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   pre_init_called = true;
 
-  ACE_THROW (CORBA::NO_MEMORY ());
+  throw CORBA::NO_MEMORY ();
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   post_init_called = true;
 
-  ACE_THROW (CORBA::NO_MEMORY ());
+  throw CORBA::NO_MEMORY ();
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
index 9e1d7b79009..7a957b49449 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   bool pre_init_called;
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
index 2b3ff3f6fbb..2a78a1a66ec 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
@@ -27,33 +27,26 @@ main (int argc, char *argv[])
   PortableInterceptor::ORBInitializer_var initializer_var2 =
     initializer2;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      PortableInterceptor::register_orb_initializer (initializer_var1.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer_var1.in ());
 
-      PortableInterceptor::register_orb_initializer (initializer_var2.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer_var2.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
     }
-  ACE_CATCH (CORBA::NO_MEMORY, ex)
+  catch (const CORBA::NO_MEMORY&)
     {
       // Initializer1 throws this exception and we should get it here
       caught_exception = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in client:");
+      ex._tao_print_exception ("Caught exception in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   // Only the pre init for initalizer 1 must be called, other initializers
   // shouldn't be caught
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
index acceb91568b..488e02da7a1 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp
@@ -14,16 +14,14 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::SlotId slot_id = info->allocate_slot_id ();
@@ -35,14 +33,11 @@ Client_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_Client_Request_Interceptor (),
                     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;
+  info->add_client_request_interceptor (client_interceptor.in ());
 
   ACE_UNUSED_ARG (slot_id);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
index 569419fb346..c232ee05e1a 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
index db5aab77b1d..b3b7e6c0aff 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp
@@ -16,16 +16,14 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // allocate a slot
@@ -36,14 +34,11 @@ Server_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (this->server_interceptor_,
                     Echo_Server_Request_Interceptor,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var interceptor =
     this->server_interceptor_;
 
-  info->add_server_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor.in ());
 }
 
 Echo_Server_Request_Interceptor *
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
index 1cd2c636db6..6db28e5db35 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h
@@ -32,12 +32,10 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the created server request interceptor.  Only valid after
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
index b95896c27ad..e1677d80510 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp
@@ -40,25 +40,22 @@ static ACE_THR_FUNC_RETURN run_test(void* pData)
 {
     Test_Interceptors::Visual_ptr server = static_cast<Test_Interceptors::Visual_ptr>(pData);
 
-    ACE_TRY
+    try
     {
-        server->normal (10 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        server->normal (10);
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-        ACE_PRINT_EXCEPTION (ex, "Exception thrown in run_test()\n");
+        ex._tao_print_exception ("Exception thrown in run_test()\n");
     }
-    ACE_ENDTRY;
-    ACE_CHECK;
-  
+
     return (ACE_THR_FUNC_RETURN)0;
 }
 
 int
 main (int argc, char *argv[])
 {
-    ACE_TRY_NEW_ENV
+    try
     {
         PortableInterceptor::ORBInitializer_ptr temp_initializer;
 
@@ -68,24 +65,19 @@ main (int argc, char *argv[])
         PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-        PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        PortableInterceptor::register_orb_initializer (initializer.in ());
 
         CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
         if (parse_args (argc, argv) != 0)
         return 1;
 
         CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
         Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (object.in ());
 
         if (CORBA::is_nil (server.in ()))
         {
@@ -97,7 +89,7 @@ main (int argc, char *argv[])
 
         ACE_hthread_t threadHandle;
         if ( ACE_Thread::spawn(	run_test,
-                                static_cast<void*>(server.in()), 
+                                static_cast<void*>(server.in()),
 						        THR_NEW_LWP | THR_JOINABLE ,
                                 0,
                                 & threadHandle
@@ -107,20 +99,16 @@ main (int argc, char *argv[])
         }
 
         ACE_Thread::join (threadHandle);
-        ACE_TRY_CHECK;
 
-        server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        server->shutdown ();
     }
 
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in client:");
+        ex._tao_print_exception ("Caught exception in client:");
         return 1;
     }
-    
-    ACE_ENDTRY;
+
 
     return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
index b4f1e4e37cb..1eeb8900fbf 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp
@@ -24,22 +24,21 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
@@ -47,18 +46,15 @@ Echo_Client_Request_Interceptor::send_poll (
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   CORBA::Object_var target =
-    ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target ();
 
   ACE_DEBUG ((LM_DEBUG,"%s.send_request from %s\n", this->myname_, operation.in ()));
 
@@ -73,55 +69,45 @@ Echo_Client_Request_Interceptor::send_request (
   sc.context_data.replace (string_len, string_len, buf, 1);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ri->add_request_service_context (sc, 0);
 }
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var operation =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   CORBA::Object_var target =
-    ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target ();
 
   ACE_DEBUG ((LM_DEBUG,"%s.receive_reply from %s\n", this->myname_, operation.in ()));
 }
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  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 ();
 
   ACE_DEBUG ((LM_DEBUG,"%s.receive_other from %s\n", this->myname_, operation.in ()));
 }
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  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 ();
 
   ACE_DEBUG ((LM_DEBUG,"%s.receive_exception from %s\n", this->myname_, operation.in ()));
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
index 95c3e21346f..422b2b85d2b 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h
@@ -31,33 +31,28 @@ public:
   virtual ~Echo_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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
index 74e0c0a7227..d591eae147a 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp
@@ -40,7 +40,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // create initializer
       Server_ORBInitializer * temp_initializer = 0;
@@ -50,16 +50,13 @@ main (int argc, char *argv[])
                       -1);  // No exceptions yet!
       PortableInterceptor::ORBInitializer_var initializer = temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
+      PortableInterceptor::register_orb_initializer (initializer.in ());
       // Now create an ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -67,15 +64,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -83,23 +77,16 @@ main (int argc, char *argv[])
       Visual_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (&server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Test_Interceptors::Visual: <%s>\n",
@@ -118,21 +105,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in server:");
+      ex._tao_print_exception ("Caught exception in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
index 60b8e2eb1d2..3fab15a987f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp
@@ -20,28 +20,26 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.receive_request_service_contexts from "
@@ -56,8 +54,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   // retrieve the context
   IOP::ServiceId id = ::service_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (id);
 
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -78,19 +75,17 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
     CORBA::Any data;
     data <<= buf;
 
-    ACE_TRY
+    try
     {
         ri->set_slot (slotId, data);
         ACE_DEBUG ((LM_DEBUG, "receive_request_service_contexts filled Slot %d\n",(int)slotId));
-        ACE_TRY_CHECK;
     }
-    ACE_CATCHANY
+    catch (const CORBA::Exception& ex)
     {
-        ACE_PRINT_EXCEPTION (ex, "Exception thrown in receive_request_service_contexts()\n");
-        ACE_TRY_THROW (CORBA::INTERNAL ());
+        ex._tao_print_exception (
+          "Exception thrown in receive_request_service_contexts()\n");
+        throw CORBA::INTERNAL ();
     }
-    ACE_ENDTRY;
-    ACE_CHECK;
 
   }
 }
@@ -98,8 +93,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -108,8 +102,7 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
@@ -117,8 +110,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -127,8 +119,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-             PortableInterceptor::ServerRequestInfo_ptr
-             ACE_ENV_ARG_DECL)
+             PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
index f6af5ee88c2..a557c28d97e 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h
@@ -31,35 +31,30 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
index 2686a6bfa70..66cf0bea079 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp
@@ -16,8 +16,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 }
 
 void
-Visual_i::normal (CORBA::Long arg
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Visual_i::normal (CORBA::Long arg)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
@@ -26,28 +25,27 @@ Visual_i::normal (CORBA::Long arg
   CORBA::Object_var piobj = orb_->resolve_initial_references ("PICurrent");
   PortableInterceptor::Current_var pi_current =
       PortableInterceptor::Current::_narrow (piobj.in () );
-  
-  if (CORBA::is_nil (pi_current.in ())) 
+
+  if (CORBA::is_nil (pi_current.in ()))
   {
     ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : Unable to obtain PICurrent reference\n"));
     throw CORBA::INTERNAL();
   }
 
   CORBA::Any_var retrieved_any;
-  ACE_TRY
+  try
   {
       retrieved_any = pi_current->get_slot(slotId);
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-      ACE_PRINT_EXCEPTION (ex, "Visual_i::normal : get_slot() threw Exception\n");
+      ex._tao_print_exception (
+        "Visual_i::normal : get_slot() threw Exception\n");
       throw;
   }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   const char *str = 0;
-  if (! (retrieved_any.in() >>= str) ) 
+  if (! (retrieved_any.in() >>= str) )
   {
     ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : Problem extracting data from CORBA::Any\n"));
     throw CORBA::INTERNAL();
@@ -59,9 +57,8 @@ Visual_i::normal (CORBA::Long arg
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
index bda46fa2346..335729c2d2c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h
@@ -28,10 +28,9 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void normal (CORBA::Long arg)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
index aa829e678f1..a26f61237ab 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp
@@ -21,16 +21,14 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::Object_var object =
-        corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corb_->string_to_object (input_);
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -40,19 +38,15 @@ Client_Task::svc (void)
                             1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client task:");
+      ex._tao_print_exception ("Exception caught in client task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
@@ -60,39 +54,29 @@ Client_Task::svc (void)
 
 
 void
-Client_Task::run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
+Client_Task::run_test (Test_Interceptors::Visual_ptr server)
 {
-  server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  server->normal (10);
 
   CORBA::Long one = 1, two = 1;
   (void) server->calculate (one,
-                            two
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            two);
 
-  ACE_TRY
+  try
     {
-      (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) server->user ();
     }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
+  catch (const Test_Interceptors::Silly&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught Silly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY_EX (SYS)
+  try
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
+      server->system ();
     }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
+  catch (const CORBA::INV_OBJREF&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
index def1f6d2bb4..c986c8b63db 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
@@ -27,8 +27,7 @@ public:
   /// Thread entry point
   int svc (void);
 
-  void run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL);
+  void run_test (Test_Interceptors::Visual_ptr server);
 
 private:
   const char *input_;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
index 1aaceae2c8c..390c62e60d1 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
@@ -48,8 +48,7 @@ main (int argc, char *argv[])
   server_orb.set ("server_orb");
   client_orb.set ("client_orb");
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -60,17 +59,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -92,9 +87,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                corb.in (),
@@ -109,8 +102,7 @@ main (int argc, char *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
 
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
 
       CORBA::ULong number_called =
         Echo_Server_Request_Interceptor::server_interceptor_check_;
@@ -129,10 +121,9 @@ main (int argc, char *argv[])
                   " properly\n"));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
index 879b3549b22..40b23b8c661 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp
@@ -9,21 +9,18 @@
 
 void
 Echo_Collocated_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Collocated_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id =
-    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->orb_id ();
 
   if (!ACE_OS::strcmp (orb_id.in (), "client_orb"))
     {
@@ -34,14 +31,11 @@ Echo_Collocated_ORBInitializer::post_init (
       ACE_NEW_THROW_EX (interceptor,
                         Echo_Client_Request_Interceptor,
                         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;
+      info->add_client_request_interceptor (client_interceptor.in ());
     }
   else if (!ACE_OS::strcmp (orb_id.in (), "server_orb"))
     {
@@ -52,14 +46,11 @@ Echo_Collocated_ORBInitializer::post_init (
       ACE_NEW_THROW_EX (interceptor,
                         Echo_Server_Request_Interceptor,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       PortableInterceptor::ServerRequestInterceptor_var
         server_interceptor = interceptor;
 
-      info->add_server_request_interceptor (server_interceptor.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      info->add_server_request_interceptor (server_interceptor.in ());
     }
   else
   {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
index 7a18eb9b37a..4865ea54fbe 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h
@@ -29,12 +29,10 @@ class Echo_Collocated_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index a9db6a71b8a..1d1ef6bcbc8 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -26,12 +26,11 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
 
       CORBA::Object_var poa_object =
-        sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sorb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,37 +38,27 @@ Server_Task::svc (void)
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Visual_i * server_impl = 0;
       ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1);
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sorb_->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
 
@@ -89,21 +78,17 @@ Server_Task::svc (void)
       // Signal the main thread before we call orb->run ();
       this->me_.signal ();
 
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
+     ex._tao_print_exception ("Exception caught in server task:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index 907a3e1193f..6a3f8ba9884 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -26,14 +26,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -41,7 +41,6 @@ Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED
     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -50,16 +49,14 @@ Echo_Client_Request_Interceptor::send_poll (
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
   CORBA::String_var op =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -75,8 +72,7 @@ Echo_Client_Request_Interceptor::send_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -93,15 +89,13 @@ Echo_Client_Request_Interceptor::send_request (
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-  PortableInterceptor::ClientRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -113,14 +107,12 @@ Echo_Client_Request_Interceptor::receive_other (
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   client_interceptor_check_++;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -132,8 +124,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -144,8 +135,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -153,8 +143,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -170,19 +159,16 @@ Echo_Client_Request_Interceptor::receive_reply (
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::received_exception "
@@ -204,22 +190,21 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -227,19 +212,16 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   ++server_interceptor_check_;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   PortableInterceptor::ObjectId_var test_oid =
-    ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->object_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n",
@@ -248,8 +230,7 @@ Echo_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -263,8 +244,7 @@ Echo_Server_Request_Interceptor::receive_request (
      }
 
   CORBA::String_var tmdi =
-    ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target_most_derived_interface ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Target most derived interface: %s\n",
@@ -273,14 +253,12 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++server_interceptor_check_;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n",
@@ -289,8 +267,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -304,8 +281,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result = 0;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -313,8 +289,7 @@ Echo_Server_Request_Interceptor::send_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -328,15 +303,13 @@ Echo_Server_Request_Interceptor::send_reply (
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   ++server_interceptor_check_;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::send_exception "
@@ -345,13 +318,11 @@ Echo_Server_Request_Interceptor::send_exception (
 
 
   CORBA::Any_var any =
-    ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->sending_exception ();
 
   CORBA::TypeCode_var type = any->type ();
 
-  const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *exception_id = type->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Exception ID = %s\n",
@@ -360,8 +331,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
index 244270d4a37..2655dcf2fde 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h
@@ -33,39 +33,34 @@ public:
   virtual ~Echo_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
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
         ));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
@@ -86,38 +81,33 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  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 receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableInterceptor::ForwardRequest
       ));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
index 949bea21eb6..b95b285602e 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -12,8 +12,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
   // ctor
 
 void
-Visual_i::normal (CORBA::Long
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Visual_i::normal (CORBA::Long)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
@@ -21,8 +20,7 @@ Visual_i::normal (CORBA::Long
 
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
-                     CORBA::Long two
-                     ACE_ENV_ARG_DECL_NOT_USED)
+                     CORBA::Long two)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
@@ -30,27 +28,26 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::user (void)
   ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
-  ACE_THROW (Test_Interceptors::Silly ());
+  throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::system (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
-  ACE_THROW (CORBA::INV_OBJREF ());
+  throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
index f31756fb10a..841d3ef41df 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h
@@ -27,23 +27,21 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_NOT_USED)
+  void normal (CORBA::Long arg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Long calculate (
                          CORBA::Long one,
-                         CORBA::Long two
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         CORBA::Long two)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void user (void)
     ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
 
-  void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void system (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
index c068138c6b8..917096aa300 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp
@@ -20,15 +20,13 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var obj =
-        this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->corb_->string_to_object (input_);
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -38,58 +36,44 @@ Client_Task::svc (void)
                              1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
       this->corb_->destroy();
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client task:");
+      ex._tao_print_exception ("Exception caught in client task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-Client_Task::run_test (Test_Interceptors::Visual_ptr server
-                       ACE_ENV_ARG_DECL)
+Client_Task::run_test (Test_Interceptors::Visual_ptr server)
 {
-  server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  server->normal (10);
 
 
-  server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  server->nothing ();
 
-  ACE_TRY
+  try
     {
-      server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->user ();
     }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
+  catch (const Test_Interceptors::Silly&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught Silly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY_EX (SYS)
+  try
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
+      server->system ();
     }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
+  catch (const CORBA::INV_OBJREF&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
index 080096a550b..9448c093314 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
@@ -27,8 +27,7 @@ public:
   /// Thread entry point
   int svc (void);
 
-  void run_test (Test_Interceptors::Visual_ptr server
-                 ACE_ENV_ARG_DECL);
+  void run_test (Test_Interceptors::Visual_ptr server);
 
 private:
   const char *input_;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
index b53c358a387..be0762f3add 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp
@@ -10,22 +10,19 @@ Collocated_ORBInitializer::Collocated_ORBInitializer (void)
 
 void
 Collocated_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Collocated_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var orb_id =
-    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->orb_id ();
 
   if (!ACE_OS::strcmp (orb_id.in (), "client_orb"))
     {
@@ -36,14 +33,11 @@ Collocated_ORBInitializer::post_init (
       ACE_NEW_THROW_EX (interceptor,
                         Echo_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;
+      info->add_client_request_interceptor (client_interceptor.in ());
     }
 
   else if (!ACE_OS::strcmp (orb_id.in (), "server_orb"))
@@ -55,14 +49,11 @@ Collocated_ORBInitializer::post_init (
       ACE_NEW_THROW_EX (interceptor,
                         Echo_Server_Request_Interceptor,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       PortableInterceptor::ServerRequestInterceptor_var
         server_interceptor = interceptor;
 
-      info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      info->add_server_request_interceptor (server_interceptor.in ());
     }
 
   else
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
index 42b2ea926a4..94f2002627f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h
@@ -28,12 +28,10 @@ public:
   /// Constructor
   Collocated_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
index 27644baab31..e8a8fa5e368 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
@@ -50,8 +50,7 @@ main (int argc, char *argv[])
   server_orb.set ("server_orb");
   client_orb.set ("client_orb");
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
 
@@ -61,18 +60,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       ACE_Argv_Type_Converter satc (argc, argv);
 
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
 
@@ -95,9 +90,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                corb.in (),
@@ -112,11 +105,10 @@ main (int argc, char *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Ignore exceptions..
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
index e25f9e30637..948f11293bd 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
@@ -20,17 +20,13 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
      CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       this->sorb_->resolve_initial_references("RootPOA");
 
      PortableServer::POA_var root_poa =
-       PortableServer::POA::_narrow (poa_object.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       PortableServer::POA::_narrow (poa_object.in ());
 
      if (CORBA::is_nil (root_poa.in ()))
        ACE_ERROR_RETURN ((LM_ERROR,
@@ -38,34 +34,25 @@ Server_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 ();
 
-     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     poa_manager->activate ();
 
      Visual_i *vi = 0;
      ACE_NEW_RETURN (vi, Visual_i (sorb_.in ()), 1);
      PortableServer::ServantBase_var server_impl = vi;
 
      PortableServer::ObjectId_var id =
-       root_poa->activate_object (server_impl.in()
-                                  ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       root_poa->activate_object (server_impl.in());
 
      CORBA::Object_var test_obj =
-       root_poa->id_to_reference (id.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       root_poa->id_to_reference (id.in ());
 
      Test_Interceptors::Visual_var server =
-       Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+       Test_Interceptors::Visual::_narrow (test_obj.in ());
 
      CORBA::String_var ior =
-       sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+       sorb_->object_to_string (server.in ());
 
      // If the ior_output_file exists, output the ior to it
      if (output_ != 0)
@@ -83,26 +70,21 @@ Server_Task::svc (void)
      // Signal the main thread before we call orb->run ();
      this->me_.signal ();
 
-     sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     sorb_->run ();
 
      struct timespec ts = {0,250000000}; // quarter second
      ACE_OS::nanosleep (&ts);
      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server task - event loop finished\n"));
 
-     root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     root_poa->destroy (1, 1);
 
-     this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
+     this->sorb_->destroy ();
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
+     ex._tao_print_exception ("Exception caught in server task:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index 58260168b5e..a660fab5984 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -25,22 +25,21 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
@@ -48,8 +47,7 @@ Echo_Client_Request_Interceptor::send_poll (
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -58,21 +56,16 @@ Echo_Client_Request_Interceptor::send_request (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
   CORBA::String_var operation =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    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;
+    this->orb_->object_to_string (target.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.send_request "
@@ -93,13 +86,11 @@ Echo_Client_Request_Interceptor::send_request (
   sc.context_data.replace (string_len, string_len, buf, 1);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ri->add_request_service_context (sc, 0);
 
   // Check that the request service context can be retrieved.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 =
     reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
@@ -118,8 +109,7 @@ Echo_Client_Request_Interceptor::send_request (
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -127,22 +117,17 @@ Echo_Client_Request_Interceptor::receive_reply (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
   CORBA::String_var operation =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   CORBA::Object_var target =
-    ri->target (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target ();
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->object_to_string (target.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.receive_reply from "
@@ -150,14 +135,12 @@ Echo_Client_Request_Interceptor::receive_reply (
               this->myname_,
               operation.in ()));
 
-  ACE_TRY
+  try
     {
       // Check that the reply service context was received as
       // expected.
       IOP::ServiceContext_var sc =
-        ri->get_reply_service_context (::service_id
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_reply_service_context (::service_id);
 
       const char *buf =
         reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -174,9 +157,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
       // Check that no one has messed with the request service context.
       IOP::ServiceContext_var sc2 =
-        ri->get_request_service_context (::service_id
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_request_service_context (::service_id);
 
       const char *buf2 =
         reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
@@ -190,19 +171,16 @@ Echo_Client_Request_Interceptor::receive_reply (
                       buf2));
         }
     }
-  ACE_CATCH (CORBA::BAD_PARAM, ex)
+  catch (const CORBA::BAD_PARAM&)
     {
       ACE_ERROR ((LM_ERROR,
                   "ERROR: Service Context Error \n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -213,8 +191,7 @@ Echo_Client_Request_Interceptor::receive_other (
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -222,20 +199,15 @@ Echo_Client_Request_Interceptor::receive_exception (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
-  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;
+    this->orb_->object_to_string (target.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.received_exception "
@@ -243,14 +215,12 @@ Echo_Client_Request_Interceptor::receive_exception (
               this->myname_,
               operation.in ()));
 
-    ACE_TRY
+    try
     {
       // Check that the reply service context was received as
       // expected.
       IOP::ServiceContext_var sc =
-        ri->get_reply_service_context (::service_id
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_reply_service_context (::service_id);
 
       const char *buf =
         reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -267,9 +237,7 @@ Echo_Client_Request_Interceptor::receive_exception (
 
       // Check that no one has messed with the request service context.
       IOP::ServiceContext_var sc2 =
-        ri->get_request_service_context (::service_id
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_request_service_context (::service_id);
 
       const char *buf2 =
         reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
@@ -283,13 +251,11 @@ Echo_Client_Request_Interceptor::receive_exception (
                       buf2));
         }
     }
-  ACE_CATCH (CORBA::BAD_PARAM, ex)
+  catch (const CORBA::BAD_PARAM&)
     {
       ACE_ERROR ((LM_ERROR,
                   "ERROR: Service Context Error \n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
@@ -303,27 +269,25 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t)%s.receive_request_service_contexts from "
@@ -333,8 +297,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
   IOP::ServiceId id = ::service_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (id);
 
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -363,15 +326,13 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   scc.context_data.replace (string_len, string_len, buff, 1);
 
   // Add this context to the service context list.
-  ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ri->add_reply_service_context (scc, 0);
 }
 
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -380,13 +341,11 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t)%s.send_reply from \"%s\"\n",
@@ -395,8 +354,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
@@ -413,8 +371,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
@@ -431,14 +388,12 @@ Echo_Server_Request_Interceptor::send_reply (
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t)%s.send_exception from \"%s\"\n",
@@ -447,8 +402,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
@@ -465,8 +419,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
@@ -483,8 +436,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-             PortableInterceptor::ServerRequestInfo_ptr
-             ACE_ENV_ARG_DECL_NOT_USED)
+             PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
index 29904bf2b55..1f7697c2b2c 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h
@@ -30,33 +30,28 @@ public:
   virtual ~Echo_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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
@@ -82,35 +77,30 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
index 0b76048e39b..1698c9deb89 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp
@@ -13,44 +13,41 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 }
 
 void
-Visual_i::normal (CORBA::Long
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Visual_i::normal (CORBA::Long)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 //   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
 
 void
-Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Visual_i::nothing (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 //  ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::user (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test_Interceptors::Silly))
 {
  // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
-  ACE_THROW (Test_Interceptors::Silly ());
+  throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::system (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
-  ACE_THROW (CORBA::INV_OBJREF ());
+  throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  //  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  //  ACE_CHECK;
+  //  this->_remove_ref ();
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
index 76a767d6a6a..3462b7381bc 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h
@@ -26,21 +26,20 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void normal (CORBA::Long arg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void nothing (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void user (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Silly));
 
-  void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void system (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
index e67eb2afb3c..8ac0bdf1e27 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
@@ -12,16 +12,14 @@ ACE_RCSID (Dynamic, Echo_Client_ORBInitializer, "$Id$")
 
 void
 Echo_Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -32,14 +30,11 @@ Echo_Client_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_Client_Request_Interceptor,
                     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;
+  info->add_client_request_interceptor (client_interceptor.in ());
 
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
index cd09fcce9bd..ed54836594f 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
@@ -31,12 +31,10 @@ class Echo_Client_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
index cdb8f91338e..6644b46f786 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
@@ -12,16 +12,14 @@ ACE_RCSID (Dynamic, Echo_Server_ORBInitializer, "$Id$")
 
 void
 Echo_Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -32,14 +30,11 @@ Echo_Server_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_Server_Request_Interceptor,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = interceptor;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
index 26b483304c7..260321c8c22 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
@@ -31,12 +31,10 @@ class Echo_Server_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index c3d906faeb3..c0358e99f27 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -40,29 +40,23 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
+run_test (Test_Interceptors::Visual_ptr server)
 {
   CORBA::String_var msg;
 
   server->normal (10,
-                  msg.out ()
-                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                  msg.out ());
 
   CORBA::Long one = 1, two = 1, result = 0;
   result = server->calculate (one,
-                              two
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                              two);
 
   ACE_DEBUG ((LM_DEBUG,
               "calculate() result = %d\n",
               result));
 
   Test_Interceptors::Visual::VarLenStruct_var v =
-    server->the_structure (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    server->the_structure ();
 
   ACE_DEBUG ((LM_DEBUG,
               "the_structure() result is:\n"
@@ -71,35 +65,29 @@ run_test (Test_Interceptors::Visual_ptr server
               v->flag,
               v->message.in ()));
 
-  ACE_TRY
+  try
     {
-      server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->user ();
     }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
+  catch (const Test_Interceptors::Silly&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught Silly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY_EX (SYS)
+  try
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
+      server->system ();
     }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
+  catch (const CORBA::INV_OBJREF&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -111,25 +99,20 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -139,18 +122,15 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
+      run_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 40b8274fa4e..75d06c89160 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -24,14 +24,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -39,7 +39,6 @@ Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED
     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -48,14 +47,12 @@ Echo_Client_Request_Interceptor::send_poll (
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::send_request from "
@@ -67,8 +64,7 @@ Echo_Client_Request_Interceptor::send_request (
                       "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       if (paramlist->length () != 2)
         {
@@ -102,14 +98,12 @@ Echo_Client_Request_Interceptor::send_request (
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-  PortableInterceptor::ClientRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::receive_other "
@@ -119,13 +113,11 @@ Echo_Client_Request_Interceptor::receive_other (
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::receive_reply "
@@ -137,8 +129,7 @@ Echo_Client_Request_Interceptor::receive_reply (
                       "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       if (paramlist->length () != 2)
         {
@@ -187,8 +178,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -196,8 +186,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -210,8 +199,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
   if (ACE_OS::strcmp (op.in (), "_get_the_structure") == 0)
     {
-      CORBA::Any_var a = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var a = ri->result ();
 
       Test_Interceptors::Visual::VarLenStruct * v;
 
@@ -228,14 +216,12 @@ Echo_Client_Request_Interceptor::receive_reply (
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::received_exception "
@@ -244,8 +230,7 @@ Echo_Client_Request_Interceptor::receive_exception (
 
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Exception ID = %s\n",
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
index d2de8b3455a..4c46a2ca34e 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h
@@ -28,42 +28,37 @@ public:
   Echo_Client_Request_Interceptor (void);
   // ctor.
 
-  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
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         ));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
         ));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index 2197bc560bb..b8cbed4702f 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -53,18 +53,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,15 +68,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -88,23 +81,16 @@ main (int argc, char *argv[])
       Visual_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (&server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
 
@@ -121,21 +107,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index 3e1cf79ca24..07796958db9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -24,22 +24,21 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -47,14 +46,12 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n",
@@ -63,8 +60,7 @@ Echo_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -78,8 +74,7 @@ Echo_Server_Request_Interceptor::receive_request (
      }
 
   CORBA::String_var tmdi =
-    ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target_most_derived_interface ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Target most derived interface: %s\n",
@@ -88,13 +83,11 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n",
@@ -103,8 +96,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -118,8 +110,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result = 0;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -127,8 +118,7 @@ Echo_Server_Request_Interceptor::send_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -142,14 +132,12 @@ Echo_Server_Request_Interceptor::send_reply (
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::send_exception "
@@ -158,13 +146,11 @@ Echo_Server_Request_Interceptor::send_exception (
 
 
   CORBA::Any_var any =
-    ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->sending_exception ();
 
   CORBA::TypeCode_var type = any->type ();
 
-  const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *exception_id = type->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Exception ID = %s\n",
@@ -173,8 +159,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
index f536de965c0..c6965925c02 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h
@@ -27,39 +27,34 @@ public:
   Echo_Server_Request_Interceptor (void);
   // cotr.
 
-  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 receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableInterceptor::ForwardRequest
       ));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
index 80c51203166..d13cfebd6c9 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
@@ -14,8 +14,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long arg,
-                  CORBA::String_out msg
-                  ACE_ENV_ARG_DECL_NOT_USED)
+                  CORBA::String_out msg)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
@@ -24,8 +23,7 @@ Visual_i::normal (CORBA::Long arg,
 
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
-                     CORBA::Long two
-                     ACE_ENV_ARG_DECL_NOT_USED)
+                     CORBA::Long two)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
@@ -33,7 +31,7 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 Test_Interceptors::Visual::VarLenStruct *
-Visual_i::the_structure (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::the_structure (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Test_Interceptors::Visual::VarLenStruct * s;
@@ -41,7 +39,6 @@ Visual_i::the_structure (ACE_ENV_SINGLE_ARG_DECL)
   ACE_NEW_THROW_EX (s,
                     Test_Interceptors::Visual::VarLenStruct,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
 
   Test_Interceptors::Visual::VarLenStruct_var safe_s = s;
 
@@ -52,23 +49,23 @@ Visual_i::the_structure (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::user (void)
   ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
-  ACE_THROW (Test_Interceptors::Silly ());
+  throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::system (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
-  ACE_THROW (CORBA::INV_OBJREF ());
+  throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Visual_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
index b174c34a422..6999c24bd2b 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
@@ -22,26 +22,23 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
 
   virtual CORBA::Long calculate (CORBA::Long one,
-                                 CORBA::Long two
-                                 ACE_ENV_ARG_DECL)
+                                 CORBA::Long two)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void normal (CORBA::Long arg,
-               CORBA::String_out msg
-               ACE_ENV_ARG_DECL)
+               CORBA::String_out msg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Test_Interceptors::Visual::VarLenStruct * the_structure (
-      ACE_ENV_SINGLE_ARG_DECL)
+  virtual Test_Interceptors::Visual::VarLenStruct * the_structure ()
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void user (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void user (void)
     ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly));
 
-  virtual void system (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void system (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index 4845a04bed7..3502e13a75d 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -16,23 +16,19 @@ ACE_RCSID (ForwardRequest,
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var orb_id = info->orb_id ();
 
-  CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::StringSeq_var args = info->arguments ();
 
   CORBA::String_var forward_str;
 
@@ -55,14 +51,11 @@ Client_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = interceptor;
 
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (client_interceptor.in ());
 
 }
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
index 10386969df0..4ed3c09f374 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
@@ -42,12 +42,10 @@ class Client_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index 949746c9d36..c652aac506f 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -20,31 +20,28 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 }
 
 char *
-Client_Request_Interceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Request_Interceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 void
-Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_Request_Interceptor::send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   ++this->request_count_;
 
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->response_expected ();
 
   if (!response_expected)   // A one-way request.
     return;
@@ -59,20 +56,14 @@ Client_Request_Interceptor::send_request (
           int argc = 0;
           this->orb_ = CORBA::ORB_init (argc,
                                         0,
-                                        this->orb_id_.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                        this->orb_id_.in ());
         }
 
       CORBA::Object_var forward =
-        this->orb_->string_to_object (this->forward_str_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->orb_->string_to_object (this->forward_str_.in ());
 
       CORBA::String_var forward_str =
-        this->orb_->object_to_string (forward.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->orb_->object_to_string (forward.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "CLIENT (%P|%t) Request %d will be forwarded "
@@ -81,30 +72,27 @@ Client_Request_Interceptor::send_request (
                   this->request_count_));
 
       // Notice that this is not a permanent forward.
-      ACE_THROW (PortableInterceptor::ForwardRequest (forward.in ()));
+      throw PortableInterceptor::ForwardRequest (forward.in ());
     }
 }
 
 void
 Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -112,23 +100,20 @@ Client_Request_Interceptor::receive_exception (
 
 void
 Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->response_expected ();
 
   // Oneway
   if (!response_expected)
     return;
 
   PortableInterceptor::ReplyStatus reply_status =
-    ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->reply_status ();
 
   if (reply_status == PortableInterceptor::TRANSPORT_RETRY)
     return;
@@ -140,11 +125,10 @@ Client_Request_Interceptor::receive_other (
   // This will throw an exception if a location forward has not
   // occured.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
-  CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var forward = ri->forward_reference ();
 
   if (CORBA::is_nil (forward.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 
   ACE_DEBUG ((LM_DEBUG,
               "CLIENT (%P|%t) Received LOCATION_FORWARD reply.\n"));
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index b39c5ae1297..5473606c20a 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -65,37 +65,32 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index af8304f1cbb..fefe4eb0c3d 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -19,16 +19,14 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
@@ -40,13 +38,10 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   this->server_interceptor_ = interceptor;
 
-  info->add_server_request_interceptor (interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor);
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
index 90be3b9571a..289899370ec 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
@@ -48,12 +48,10 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the created server request interceptor.  Only valid after
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index 10ad41353cf..6f113992989 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -24,30 +24,29 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 void
 Server_Request_Interceptor::forward_references (
   CORBA::Object_ptr obj1,
-  CORBA::Object_ptr obj2
-  ACE_ENV_ARG_DECL)
+  CORBA::Object_ptr obj2)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
-    ACE_THROW (CORBA::INV_OBJREF (
-                 CORBA::SystemException::_tao_minor_code (
-                   TAO::VMCID,
-                   EINVAL),
-                 CORBA::COMPLETED_NO));
+    throw CORBA::INV_OBJREF (
+      CORBA::SystemException::_tao_minor_code (
+        TAO::VMCID,
+        EINVAL),
+      CORBA::COMPLETED_NO);
 
   this->obj_[0] = CORBA::Object::_duplicate (obj1);
   this->obj_[1] = CORBA::Object::_duplicate (obj2);
 }
 
 char *
-Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::release (this->obj_[0]);
@@ -56,16 +55,14 @@ Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   this->request_count_++;
 
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->response_expected ();
 
   if (!response_expected)   // A one-way request.
     return;
@@ -87,20 +84,18 @@ Server_Request_Interceptor::receive_request_service_contexts (
                   "receive_request_service_contexts().\n",
                   this->request_count_));
 
-      ACE_THROW (PortableInterceptor::ForwardRequest (this->obj_[0]));
+      throw PortableInterceptor::ForwardRequest (this->obj_[0]);
     }
 }
 
 void
 Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->response_expected ();
 
   if (!response_expected)   // A one-way request.
     return;
@@ -126,22 +121,20 @@ Server_Request_Interceptor::receive_request (
       // "request_count_ - 1" is used above since there was a location
       // forward.
 
-      ACE_THROW (PortableInterceptor::ForwardRequest (this->obj_[1]));
+      throw PortableInterceptor::ForwardRequest (this->obj_[1]);
     }
 }
 
 void
 Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -149,14 +142,12 @@ Server_Request_Interceptor::send_exception (
 
 void
 Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->response_expected ();
 
   if (!response_expected)   // A one-way request.
     return;
@@ -167,9 +158,8 @@ Server_Request_Interceptor::send_other (
   // This will throw an exception if a location forward has not
   // occured.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
-  CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_var forward = ri->forward_reference ();
 
   if (CORBA::is_nil (forward.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    throw CORBA::INTERNAL ();
 }
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
index 382097c50a0..299f1a5bc62 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
@@ -65,8 +65,7 @@ public:
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
-                                   CORBA::Object_ptr obj2
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   CORBA::Object_ptr obj2)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -79,38 +78,33 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
index c04cfbaf890..b1e1b4a439f 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
@@ -52,8 +52,7 @@ main (int argc, char *argv[])
 {
   int status = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -65,16 +64,12 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Client ORB");
 
       if (::parse_args (argc, argv) != 0)
         return -1;
@@ -83,12 +78,10 @@ main (int argc, char *argv[])
       // IOR occurs during the various interceptions executed during
       // this test.
       CORBA::Object_var object =
-        orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior1);
 
       ForwardRequestTest::test_var server =
-        ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ForwardRequestTest::test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -114,9 +107,8 @@ main (int argc, char *argv[])
           if (i > 1)
             old_number = number;
 
-          number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER);
+          number = server->number ();
 
-          ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_INFO,
                       "CLIENT: Request %d handled by object %d.\n",
@@ -143,16 +135,13 @@ main (int argc, char *argv[])
             }
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   if (status != -1)
     ACE_DEBUG ((LM_INFO,
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
index 286a18b98c0..f38e3a462f5 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
@@ -60,8 +60,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
       Server_ORBInitializer *temp_initializer = 0;
@@ -71,18 +70,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "Server ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -90,12 +85,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (::parse_args (argc, argv) != 0)
         return -1;
@@ -108,23 +101,16 @@ main (int argc, char *argv[])
       PortableServer::POA_var first_poa =
         root_poa->create_POA ("first POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       PortableServer::ObjectId_var oid1 =
-        first_poa->activate_object (&servant1
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->activate_object (&servant1);
 
       CORBA::Object_var obj1 =
-        first_poa->servant_to_reference (&servant1
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->servant_to_reference (&servant1);
 
       CORBA::String_var ior1 =
-        orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj1.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "ForwardRequestTest::test servant 1: <%s>\n",
@@ -136,30 +122,22 @@ main (int argc, char *argv[])
       PortableServer::POA_var second_poa =
         root_poa->create_POA ("second POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       PortableServer::ObjectId_var oid2 =
-        second_poa->activate_object (&servant2
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        second_poa->activate_object (&servant2);
 
       CORBA::Object_var obj2 =
-        second_poa->servant_to_reference (&servant2
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        second_poa->servant_to_reference (&servant2);
 
       CORBA::String_var ior2 =
-        orb->object_to_string (obj2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj2.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "ForwardRequestTest::test servant 2: <%s>\n",
                   ior2.in ()));
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
 #if TAO_HAS_INTERCEPTORS == 1
       // Set the forward references in the server request interceptor.
@@ -168,8 +146,7 @@ main (int argc, char *argv[])
 
       ForwardRequestTest::ServerRequestInterceptor_var interceptor =
         ForwardRequestTest::ServerRequestInterceptor::_narrow (
-           server_interceptor.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+           server_interceptor.in ());
 
       if (CORBA::is_nil (interceptor.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -178,9 +155,7 @@ main (int argc, char *argv[])
                           -1);
 
       interceptor->forward_references (obj1.in (),
-                                       obj2.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       obj2.in ());
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       // Write each IOR to a file.
@@ -207,24 +182,19 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Run the ORB event loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index adafe5be28d..283aae38b3c 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -18,18 +18,18 @@ test_i::~test_i (void)
 }
 
 CORBA::Short
-test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::number (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
               this->number_));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
index 51c142c2de3..8b1d8091b62 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
@@ -37,11 +37,11 @@ public:
   ~test_i (void);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short number (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index 2bf02d1ef30..afe0aa159a9 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -17,23 +17,21 @@ FOO_ClientRequestInterceptor::FOO_ClientRequestInterceptor (
 }
 
 char *
-FOO_ClientRequestInterceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FOO_ClientRequestInterceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FOO_ClientRequestInterceptor");
 }
 
 void
-FOO_ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FOO_ClientRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -41,9 +39,7 @@ FOO_ClientRequestInterceptor::send_request (
   // into the IOR by the FOO_IORInterceptor is actually in the IOR
   // profile.
   IOP::TaggedComponent_var component =
-    ri->get_effective_component (FOO::COMPONENT_ID
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_effective_component (FOO::COMPONENT_ID);
 
   // The correct tagged component appears to exist.  Display the
   // contents of the component data, which should be a NULL terminated
@@ -57,7 +53,7 @@ FOO_ClientRequestInterceptor::send_request (
       ACE_ERROR ((LM_ERROR,
                   "Internal test error.  Empty tagged component.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   CORBA::ULong maximum   = component->component_data.maximum ();
@@ -70,9 +66,7 @@ FOO_ClientRequestInterceptor::send_request (
   // Extract the data from the octet sequence.
   CORBA::Any_var decoded_data =
     this->codec_->decode_value (data,
-                                CORBA::_tc_string
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                CORBA::_tc_string);
 
   const char * name = 0;
 
@@ -82,7 +76,7 @@ FOO_ClientRequestInterceptor::send_request (
                   "ERROR: Unable to extract tagged component "
                   "data from Any.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   ACE_DEBUG ((LM_DEBUG,
@@ -93,24 +87,21 @@ FOO_ClientRequestInterceptor::send_request (
 
 void
 FOO_ClientRequestInterceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -118,8 +109,7 @@ FOO_ClientRequestInterceptor::receive_exception (
 
 void
 FOO_ClientRequestInterceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index abe9074a545..8af1cbf2dcb 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -60,37 +60,32 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
index f999b2f22bb..733cbfe45b3 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
@@ -12,20 +12,18 @@ ACE_RCSID (IORInterceptor,
 void
 FOO_Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::CodecFactory_var codec_factory =
-    info->codec_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->codec_factory ();
 
   // Set up a structure that contains information necessary to
   // create a GIOP 1.2 CDR encapsulation Codec.
@@ -36,9 +34,7 @@ FOO_Client_ORBInitializer::post_init (
 
   // Obtain the CDR encapsulation Codec.
   IOP::Codec_var codec =
-    codec_factory->create_codec (encoding
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    codec_factory->create_codec (encoding);
 
   PortableInterceptor::ClientRequestInterceptor_ptr foo;
   ACE_NEW_THROW_EX (foo,
@@ -48,12 +44,9 @@ FOO_Client_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var interceptor =
     foo;
 
-  info->add_client_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
index a047658b5a8..4b69449d50b 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
@@ -54,14 +54,12 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index c29013285ff..f776640a8e6 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -14,22 +14,21 @@ FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec)
 }
 
 char *
-FOO_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FOO_IORInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FOO_IORInterceptor");
 }
 
 void
-FOO_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+FOO_IORInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_IORInterceptor::establish_components (
-    PortableInterceptor::IORInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::IORInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // According to the Portable Interceptors specification,
@@ -38,16 +37,13 @@ FOO_IORInterceptor::establish_components (
   // does the right thing, and ignores any IOR interceptors that throw
   // an exception.
 
-  CORBA::String_var name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var name = this->name ();
 
   CORBA::Any data;
   data <<= name.in ();
 
   CORBA::OctetSeq_var encoded_data =
-    this->codec_->encode_value (data
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->codec_->encode_value (data);
 
   // Construct a tagged component.
   IOP::TaggedComponent component;
@@ -67,9 +63,7 @@ FOO_IORInterceptor::establish_components (
   ACE_ASSERT (component.component_data.length () == length);
 
   // Add the tagged component to all profiles.
-  info->add_ior_component (component
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_ior_component (component);
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Added tagged component containing the\n"
@@ -79,9 +73,7 @@ FOO_IORInterceptor::establish_components (
 
   // Add the tagged component to all IIOP profiles.
   info->add_ior_component_to_profile (component,
-                                      IOP::TAG_INTERNET_IOP
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      IOP::TAG_INTERNET_IOP);
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Added tagged component containing the\n"
@@ -89,31 +81,26 @@ FOO_IORInterceptor::establish_components (
               name.in ()));
 
 
-  ACE_TRY
+  try
     {
       // Verify that policy retrieval internals work, and do not cause
       // memory access violations.
       CORBA::Policy_var policy =
-        info->get_effective_policy (PortableServer::THREAD_POLICY_ID
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        info->get_effective_policy (PortableServer::THREAD_POLICY_ID);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Successfully retrieved effective policy.\n"));
     }
-  ACE_CATCH (CORBA::INV_POLICY, ex)
+  catch (const CORBA::INV_POLICY& ex)
     {
       if (ex.minor () != (CORBA::OMGVMCID | 3))
-        ACE_RE_THROW;
+        throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 FOO_IORInterceptor::components_established (
-    PortableInterceptor::IORInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::IORInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Construct a dummy tagged component.
@@ -123,34 +110,29 @@ FOO_IORInterceptor::components_established (
   component.component_data.length (1);
 
 
-  ACE_TRY_EX (ALL)
+  try
     {
       // Add the tagged component to all profiles.
       //
       // This call should fail since it shouldn't be possible to add
       // an IOR component after establish_components() has been
       // called.
-      info->add_ior_component (component
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (ALL);
+      info->add_ior_component (component);
 
       // The above call should NOT have succeeded.
-      ACE_TRY_THROW_EX (CORBA::INTERNAL (), ALL);
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+  catch (const CORBA::BAD_INV_ORDER& ex)
     {
       if (ex.minor () != (CORBA::OMGVMCID | 14))
         {
-          ACE_PRINT_EXCEPTION (ex,
-                               "Unexpected exception");
+          ex._tao_print_exception ("Unexpected exception");
 
-          ACE_RE_THROW_EX (ALL);
+          throw;
         }
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY_EX (PROFILE)
+  try
     {
       // Add the tagged component to all profiles.
       //
@@ -158,32 +140,26 @@ FOO_IORInterceptor::components_established (
       // an IOR component after establish_components() has been
       // called.
       info->add_ior_component_to_profile (component,
-                                          IOP::TAG_INTERNET_IOP
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (PROFILE);
+                                          IOP::TAG_INTERNET_IOP);
 
       // The above call should NOT have succeeded.
-      ACE_TRY_THROW_EX (CORBA::INTERNAL (), PROFILE);
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+  catch (const CORBA::BAD_INV_ORDER& ex)
     {
       if (ex.minor () != (CORBA::OMGVMCID | 14))
         {
-          ACE_PRINT_EXCEPTION (ex,
-                               "Unexpected exception");
+          ex._tao_print_exception ("Unexpected exception");
 
-          ACE_RE_THROW_EX (PROFILE);
+          throw;
         }
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 FOO_IORInterceptor::adapter_manager_state_changed (
     const char *,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::AdapterState)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -191,8 +167,7 @@ FOO_IORInterceptor::adapter_manager_state_changed (
 void
 FOO_IORInterceptor:: adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
-    PortableInterceptor::AdapterState
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::AdapterState)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 4fc980070d1..2072514f20b 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -59,36 +59,32 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::AdapterState state)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
index 1930da1d6b0..b1c050af679 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
@@ -13,20 +13,18 @@ ACE_RCSID (IORInterceptor,
 void
 FOO_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_IORInterceptor_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::CodecFactory_var codec_factory =
-    info->codec_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->codec_factory ();
 
   // Set up a structure that contains information necessary to
   // create a GIOP 1.2 CDR encapsulation Codec.
@@ -37,9 +35,7 @@ FOO_IORInterceptor_ORBInitializer::post_init (
 
   // Obtain the CDR encapsulation Codec.
   IOP::Codec_var codec =
-    codec_factory->create_codec (encoding
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    codec_factory->create_codec (encoding);
 
   PortableInterceptor::IORInterceptor_ptr foo;
   ACE_NEW_THROW_EX (foo,
@@ -49,12 +45,9 @@ FOO_IORInterceptor_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::IORInterceptor_var ior_interceptor =
     foo;
 
-  info->add_ior_interceptor (ior_interceptor.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_ior_interceptor (ior_interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
index 62daa94f1ae..3904a3b239d 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
@@ -54,14 +54,12 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
index a482b81963e..133e8e99a6f 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
@@ -39,8 +39,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -52,25 +51,20 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "client_orb");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       FOO::test_var server =
-        FOO::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        FOO::test::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -80,16 +74,13 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "IORInterceptor test (client-side):");
+      ex._tao_print_exception ("IORInterceptor test (client-side):");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index a91cf021548..93559fb7899 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -42,8 +42,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -55,26 +54,19 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "test_orb"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "test_orb");
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,23 +74,18 @@ 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 ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       test_i server_impl (orb.in ());
 
-      obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = server_impl._this ();
 
-      FOO::test_var server = FOO::test::_narrow (obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      FOO::test_var server = FOO::test::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -107,8 +94,7 @@ main (int argc, char *argv[])
                           -1);
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_INFO, "FOO::test: <%s>\n", ior.in ()));
 
@@ -126,23 +112,19 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_INFO, "Event loop finished.\n"));
 
       // The interceptors will be destroyed when we call this
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "IORInterceptor test (server-side):");
+      ex._tao_print_exception ("IORInterceptor test (server-side):");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index ecdb6b3560f..1856b7702c3 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -12,10 +12,10 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "\"test_i\" is shutting down.\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
index a712ff5c8d7..d21f3a0833f 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
@@ -34,7 +34,7 @@ public:
   test_i (CORBA::ORB_ptr orb);
 
   /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
index 04262d84180..3809deb700b 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
@@ -19,16 +19,14 @@ Server_ORBInitializer::Server_ORBInitializer (bool & destroy_called)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
@@ -39,14 +37,11 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var server_interceptor =
     interceptor;
 
-  info->add_server_request_interceptor (interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor);
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
index 1498e7c020c..d4f62cd34eb 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h
@@ -46,12 +46,10 @@ public:
   /// Constructor.
   Server_ORBInitializer (bool & destroy_called);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
index d7cd081e6d3..431b7adbf59 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp
@@ -21,14 +21,14 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 }
 
 char *
-Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->destroy_called_ = true;
@@ -36,8 +36,7 @@ Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -47,8 +46,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 
@@ -59,8 +57,7 @@ Server_Request_Interceptor::receive_request (
 
 void
 Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Interceptor::destroy() should not have been called yet.
@@ -69,8 +66,7 @@ Server_Request_Interceptor::send_reply (
 
 void
 Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -80,8 +76,7 @@ Server_Request_Interceptor::send_exception (
 
 void
 Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
index 10e3add572b..df187106cb7 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h
@@ -60,38 +60,33 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
index ca70543c315..770d8e4b86b 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
@@ -41,26 +41,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Client ORB");
 
       if (::parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
-      test_var server = test::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var server = test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -70,19 +63,15 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->hello (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->hello ();
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO,
               "PortableInterceptor ORB::shutdown() test passed.\n"));
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
index 000fda92d76..8c92a58148a 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
@@ -41,8 +41,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       bool destroy_called = false;
 
@@ -54,18 +53,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "Server ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -73,15 +68,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (::parse_args (argc, argv) != 0)
         return -1;
@@ -89,13 +81,10 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       CORBA::Object_var obj =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "test servant: <%s>\n",
@@ -113,26 +102,21 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Run the ORB event loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_ASSERT (destroy_called == true);
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
index 8e96015a4c1..b1d46d1d3d7 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp
@@ -16,19 +16,18 @@ test_i::~test_i (void)
 }
 
 void
-test_i::hello (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::hello (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Hello!\n"));
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Shutting down ORB.\n"));
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
index 4ada828b0c2..f05d76ad2e1 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h
@@ -36,11 +36,11 @@ public:
   ~test_i (void);
 
   /// Say hello.
-  virtual void hello (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void hello (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
index 425c916436e..dbccc32eb01 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
@@ -18,37 +18,31 @@ PortableInterceptor::SlotId slot_id = 2093843211;
 void
 ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
-    info->resolve_initial_references ("PICurrent"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    info->resolve_initial_references ("PICurrent");
 
   PortableInterceptor::Current_var pi_current =
-    PortableInterceptor::Current::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableInterceptor::Current::_narrow (obj.in ());
 
   if (CORBA::is_nil (pi_current.in ()))
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) ERROR: Could not resolve PICurrent object.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
-  ::slot_id = info->allocate_slot_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ::slot_id = info->allocate_slot_id ();
 
   PortableInterceptor::ClientRequestInterceptor_ptr foo;
   ACE_NEW_THROW_EX (foo,
@@ -59,12 +53,9 @@ ClientORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var interceptor =
     foo;
 
-  info->add_client_request_interceptor (interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
index f540262ca7b..2dd48ca5938 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h
@@ -61,14 +61,12 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
index 66a253f3074..822b84bd545 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp
@@ -20,48 +20,43 @@ ClientRequestInterceptor::ClientRequestInterceptor (
 }
 
 char *
-ClientRequestInterceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ClientRequestInterceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ClientRequestInterceptor");
 }
 
 void
-ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ClientRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor::send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "invoke_me") != 0)
     return; // Don't mess with PICurrent if not invoking test method.
 
-  ACE_TRY
+  try
     {
       // Retrieve data from the RSC (request scope current).
       CORBA::Long number = 0;
 
       CORBA::Any_var data =
-        ri->get_slot (this->slot_id_
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_slot (this->slot_id_);
 
       if (!(data.in () >>= number))
         {
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ERROR: Unable to extract data from Any.\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       ACE_DEBUG ((LM_DEBUG,
@@ -77,18 +72,14 @@ ClientRequestInterceptor::send_request (
       // Now reset the contents of our slot in the thread-scope
       // current (TSC).
       this->pi_current_->set_slot (this->slot_id_,
-                                   new_data
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   new_data);
 
       // Now retrieve the data from the RSC again.  It should not have
       // changed!
       CORBA::Long number2 = -1;
 
       CORBA::Any_var data2 =
-        ri->get_slot (this->slot_id_
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_slot (this->slot_id_);
 
       if (!(data2.in () >>= number2)
           || number != number2)
@@ -97,24 +88,20 @@ ClientRequestInterceptor::send_request (
                       "(%P|%t) ERROR: RSC was modified after "
                       "TSC was modified.\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
     }
-  ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
+  catch (const PortableInterceptor::InvalidSlot& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Exception thrown in "
-                           "send_request()\n");
+      ex._tao_print_exception ("Exception thrown in ""send_request()\n");
 
       ACE_DEBUG ((LM_DEBUG,
                   "Invalid slot: %u\n",
                   this->slot_id_));
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_DEBUG ((LM_INFO,
               "(%P|%t) Client side RSC/TSC semantics appear "
@@ -123,24 +110,21 @@ ClientRequestInterceptor::send_request (
 
 void
 ClientRequestInterceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -148,8 +132,7 @@ ClientRequestInterceptor::receive_exception (
 
 void
 ClientRequestInterceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
index c4709fff0a6..dbae0fbfff3 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h
@@ -60,37 +60,32 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
index 5eae8540505..2dc2ce44b33 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp
@@ -17,33 +17,30 @@ ClientRequestInterceptor2::ClientRequestInterceptor2 (
 }
 
 char *
-ClientRequestInterceptor2::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ClientRequestInterceptor2::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ClientRequestInterceptor2");
 }
 
 void
-ClientRequestInterceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ClientRequestInterceptor2::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor2::send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "invoke_you") != 0)
     return; // Don't mess with PICurrent if not invoking test method.
 
-  ACE_TRY
+  try
     {
       // The goal of this test is to verify that a request scope
       // current was successfully shallow copied from a TSC that
@@ -55,9 +52,7 @@ ClientRequestInterceptor2::send_request (
       CORBA::Long number = 0;
 
       CORBA::Any_var data =
-        ri->get_slot (this->slot_id_
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_slot (this->slot_id_);
 
       if (!(data.in () >>= number))
         {
@@ -65,7 +60,7 @@ ClientRequestInterceptor2::send_request (
                       "(%P|%t) ERROR: Unable to extract data from "
                       "CORBA::Any retrieved from RSC.\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       ACE_DEBUG ((LM_DEBUG,
@@ -73,20 +68,16 @@ ClientRequestInterceptor2::send_request (
                   number,
                   this->slot_id_));
     }
-  ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
+  catch (const PortableInterceptor::InvalidSlot& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Exception thrown in "
-                           "send_request()\n");
+      ex._tao_print_exception ("Exception thrown in ""send_request()\n");
 
       ACE_DEBUG ((LM_DEBUG,
                   "Invalid slot: %u\n",
                   this->slot_id_));
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_DEBUG ((LM_INFO,
               "(%P|%t) RSC->TSC->RSC copying appears to be working.\n"));
@@ -94,24 +85,21 @@ ClientRequestInterceptor2::send_request (
 
 void
 ClientRequestInterceptor2::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor2::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientRequestInterceptor2::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -119,8 +107,7 @@ ClientRequestInterceptor2::receive_exception (
 
 void
 ClientRequestInterceptor2::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
index cfca53a52d6..f33802ab240 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h
@@ -56,37 +56,32 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
index daa05dfb4ad..f5a3bb414e6 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
@@ -15,37 +15,31 @@ PortableInterceptor::SlotId slot_id = 2093843221;
 void
 ServerORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
-    info->resolve_initial_references ("PICurrent"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    info->resolve_initial_references ("PICurrent");
 
   PortableInterceptor::Current_var pi_current =
-    PortableInterceptor::Current::_narrow (obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableInterceptor::Current::_narrow (obj.in ());
 
   if (CORBA::is_nil (pi_current.in ()))
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) ERROR: Could not resolve PICurrent object.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
-  ::slot_id = info->allocate_slot_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  ::slot_id = info->allocate_slot_id ();
 
   PortableInterceptor::ServerRequestInterceptor_ptr server_tmp;
   ACE_NEW_THROW_EX (server_tmp,
@@ -56,14 +50,11 @@ ServerORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var server_interceptor =
     server_tmp;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 
   PortableInterceptor::ClientRequestInterceptor_ptr client_tmp;
   ACE_NEW_THROW_EX (client_tmp,
@@ -73,14 +64,11 @@ ServerORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var client_interceptor =
     client_tmp;
 
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (client_interceptor.in ());
 
   // Disable collocation -- TAO-specific!!!
   //
@@ -89,9 +77,7 @@ ServerORBInitializer::post_init (
   // invocations yet, and we need to force a client request
   // interceptor to be invoked in this server.
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_ORBInitInfo::_narrow (info);
 
   tao_info->orb_core ()->optimize_collocation_objects (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
index 9c997d45f6c..0f58ff3827b 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
@@ -62,14 +62,12 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index a76d1d5b774..f4c58199740 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -20,33 +20,31 @@ ServerRequestInterceptor::ServerRequestInterceptor (
 }
 
 char *
-ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerRequestInterceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "invoke_me") != 0)
     return; // Don't mess with PICurrent if not invoking test method.
 
-  ACE_TRY
+  try
     {
       // Insert data into the RSC (request scope current).
 
@@ -55,37 +53,32 @@ ServerRequestInterceptor::receive_request_service_contexts (
       CORBA::Any data;
       data <<= number;
 
-      ri->set_slot (this->slot_id_, data ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ri->set_slot (this->slot_id_, data);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Inserted number <%d> into RSC.\n",
                   number));
     }
-  ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
+  catch (const PortableInterceptor::InvalidSlot& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Exception thrown in "
-                           "receive_request_service_contexts()\n");
+      ex._tao_print_exception (
+        "Exception thrown in ""receive_request_service_contexts()\n");
 
       ACE_DEBUG ((LM_DEBUG,
                   "Invalid slot: %u\n",
                   this->slot_id_));
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  ACE_TRY
+  try
     {
       CORBA::Any new_data;
       CORBA::Long number = 19;
@@ -93,16 +86,12 @@ ServerRequestInterceptor::receive_request (
 
       // Set a value in RSC, this should not effect TSC anymore
       ri->set_slot (this->slot_id_,
-                    new_data
-                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    new_data);
 
       // Now retrieve the data from the TSC again.  It should not have
       // changed to the new value
       CORBA::Any_var data2 =
-        this->pi_current_->get_slot (this->slot_id_
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->pi_current_->get_slot (this->slot_id_);
 
       CORBA::Long number2 = 0;
       if ((data2.in () >>= number2)
@@ -112,23 +101,19 @@ ServerRequestInterceptor::receive_request (
                       "(%P|%t) ERROR: TSC was modified because "
                       "RSC was modified.\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
     }
-  ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
+  catch (const PortableInterceptor::InvalidSlot& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Exception thrown in "
-                           "send_reply()\n");
+      ex._tao_print_exception ("Exception thrown in ""send_reply()\n");
 
       ACE_DEBUG ((LM_DEBUG,
                   "Invalid slot: %u\n",
                   this->slot_id_));
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_DEBUG ((LM_INFO,
               "(%P|%t) Server side RSC/TSC semantics appear "
@@ -138,18 +123,16 @@ ServerRequestInterceptor::receive_request (
 
 void
 ServerRequestInterceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   if (ACE_OS::strcmp (op.in (), "invoke_me") != 0)
     return; // Don't mess with PICurrent if not invoking test method.
 
-  ACE_TRY
+  try
     {
       CORBA::Any_var data;
 
@@ -157,8 +140,7 @@ ServerRequestInterceptor::send_reply (
       // should be different from the original data (a CORBA::Long)
       // stored into the RSC by the receive_request_service_contexts()
       // interception point.
-      data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      data = ri->get_slot (this->slot_id_);
 
       // The original data in the RSC was of type CORBA::Long.  If the
       // following extraction from the CORBA::Any fails, then the
@@ -177,7 +159,7 @@ ServerRequestInterceptor::send_reply (
                       "(%P|%t) Unable to extract data (a string) "
                       "from the RSC.\n"));
 
-          ACE_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
       // Now verify that the RSC is truly independent of the TSC.  In
@@ -191,16 +173,12 @@ ServerRequestInterceptor::send_reply (
       // Now reset the contents of our slot in the thread-scope
       // current (TSC).
       this->pi_current_->set_slot (this->slot_id_,
-                                   new_data
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   new_data);
 
       // Now retrieve the data from the RSC again.  It should not have
       // changed!
       CORBA::Any_var data2 =
-        ri->get_slot (this->slot_id_
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_slot (this->slot_id_);
 
       const char *str2 = 0;
       if (!(data2.in () >>= str2)
@@ -210,23 +188,19 @@ ServerRequestInterceptor::send_reply (
                       "(%P|%t) ERROR: RSC was modified after "
                       "TSC was modified.\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
     }
-  ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
+  catch (const PortableInterceptor::InvalidSlot& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Exception thrown in "
-                           "send_reply()\n");
+      ex._tao_print_exception ("Exception thrown in ""send_reply()\n");
 
       ACE_DEBUG ((LM_DEBUG,
                   "Invalid slot: %u\n",
                   this->slot_id_));
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_DEBUG ((LM_INFO,
               "(%P|%t) Server side RSC/TSC semantics appear "
@@ -235,8 +209,7 @@ ServerRequestInterceptor::send_reply (
 
 void
 ServerRequestInterceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -244,8 +217,7 @@ ServerRequestInterceptor::send_exception (
 
 void
 ServerRequestInterceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
index b9cd7bf2c5d..b328d594e77 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
@@ -59,38 +59,33 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index 2cd36a5cd9c..4b08ee9fd3c 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -41,8 +41,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -53,30 +52,22 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "client_orb"
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "client_orb");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Get the PICurrent object.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("PICurrent"
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PICurrent");
 
       PortableInterceptor::Current_var pi_current =
-        PortableInterceptor::Current::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableInterceptor::Current::_narrow (obj.in ());
 
       if (CORBA::is_nil (pi_current.in ()))
         {
@@ -95,18 +86,14 @@ main (int argc, char *argv[])
       // Now reset the contents of our slot in the thread-scope
       // current (TSC).
       pi_current->set_slot (::slot_id,
-                            data
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            data);
 
       // Resolve the target object, and perform the invocation.
       obj =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       PICurrentTest::test_var server =
-        PICurrentTest::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PICurrentTest::test::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -125,7 +112,7 @@ main (int argc, char *argv[])
         {
             ACE_ERROR ((LM_ERROR,
                         "(%P|%t) _get_policy_overrides returned nill pointer\n"));
-            ACE_TRY_THROW (CORBA::INTERNAL ());
+            throw CORBA::INTERNAL ();
         }
       else
         {
@@ -134,17 +121,14 @@ main (int argc, char *argv[])
             {
               ACE_ERROR ((LM_ERROR,
                           "(%P|%t) _get_policy_overrides returned list with size not equal 0\n"));
-              ACE_TRY_THROW (CORBA::INTERNAL ());
+              throw CORBA::INTERNAL ();
             }
         }
 
-      server->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->invoke_me ();
 
       CORBA::Any_var new_data =
-        pi_current->get_slot (::slot_id
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        pi_current->get_slot (::slot_id);
 
       // The original data in the TSC was of type CORBA::Long.  If the
       // following extraction from the CORBA::Any fails, then the
@@ -163,26 +147,21 @@ main (int argc, char *argv[])
                       "(%P|%t) Unable to extract data (a string) "
                       "from the TSC.\n"));
 
-          ACE_TRY_THROW (CORBA::INTERNAL ());
+          throw CORBA::INTERNAL ();
         }
 
-      server->invoke_we (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->invoke_we ();
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
       ACE_OS::sleep(1);
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "PICurrent test (client-side):");
+      ex._tao_print_exception ("PICurrent test (client-side):");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index 46f5cde72a1..a19ef3514fb 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -46,8 +46,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -58,24 +57,17 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "test_orb"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "test_orb");
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -83,21 +75,17 @@ 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 ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
-      obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = orb->resolve_initial_references ("PICurrent");
 
       PortableInterceptor::Current_var pi_current =
-        PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableInterceptor::Current::_narrow (obj.in ());
 
       if (CORBA::is_nil (pi_current.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -108,13 +96,10 @@ main (int argc, char *argv[])
                           ::slot_id,
                           orb.in ());
 
-      obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = server_impl._this ();
 
       PICurrentTest::test_var server =
-        PICurrentTest::test::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PICurrentTest::test::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -123,8 +108,7 @@ main (int argc, char *argv[])
                           -1);
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_INFO, "PICurrentTest::test: <%s>\n", ior.in ()));
 
@@ -142,23 +126,19 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_OS::sleep(1);
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_INFO, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "PICurrent test (server-side):");
+      ex._tao_print_exception ("PICurrent test (server-side):");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
index 453c16429aa..334832663a7 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -20,7 +20,7 @@ test_i::~test_i (void)
 }
 
 void
-test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL)
+test_i::invoke_me (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -44,43 +44,35 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL)
   // By this point all of step 1 has occurred.  Step 2 will now
   // occur.
   PICurrentTest::test_var my_ref =
-    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    this->_this ();
 
   // ----------------------------------------------------
 
   CORBA::Any_var retrieved_any;
 
-  ACE_TRY
+  try
     {
       // Retrieve data placed into RSC PICurrent by the
       // receive_request_service_contexts() interception point, and
       // then copied into the TSC current.
       retrieved_any =
-        this->current_->get_slot (this->slot_id_
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->current_->get_slot (this->slot_id_);
     }
-  ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
+  catch (const PortableInterceptor::InvalidSlot& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Exception thrown in "
-                           "test_i::invoke_me() when calling "
-                           "Current::get_slot\n");
+      ex._tao_print_exception (
+        "Exception thrown in ""test_i::invoke_me() when calling ""Current::get_slot\n");
 
       ACE_DEBUG ((LM_DEBUG,
                   "Invalid slot: %u\n",
                   this->slot_id_));
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception\n");
+      ex._tao_print_exception ("Unexpected exception\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   CORBA::Long retrieved;
   if (retrieved_any.in() >>= retrieved)
@@ -93,7 +85,7 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL)
                   "(%P|%t) Problem extracting data from "
                   "CORBA::Any retrieved from TSC.\n"));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
   // ----------------------------------------------------
 
@@ -102,8 +94,7 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL)
   // (ClientRequestInterceptor2) to be invoked.  This assumes that
   // DIRECT collocation (and possibly THRU_POA collocation) is
   // disabled.
-  my_ref->invoke_you (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  my_ref->invoke_you ();
 
   // ----------------------------------------------------
 
@@ -114,28 +105,22 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL)
 
   data <<= str;
 
-  ACE_TRY_EX (foo)
+  try
     {
       this->current_->set_slot (this->slot_id_,
-                                data
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (foo);
+                                data);
     }
-  ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
+  catch (const PortableInterceptor::InvalidSlot& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Exception thrown in "
-                           "test_i::invoke_me() when calling "
-                           "Current::set_slot\n");
+      ex._tao_print_exception (
+        "Exception thrown in ""test_i::invoke_me() when calling ""Current::set_slot\n");
 
       ACE_DEBUG ((LM_DEBUG,
                   "Invalid slot: %u\n",
                   this->slot_id_));
 
-      ACE_TRY_THROW_EX (CORBA::INTERNAL (), foo);
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) String \"%s\" inserted into TSC.\n",
@@ -143,7 +128,7 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-test_i::invoke_you (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::invoke_you (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Nothing to be tested here.  This method is here just so that we
@@ -151,7 +136,7 @@ test_i::invoke_you (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-test_i::invoke_we (ACE_ENV_SINGLE_ARG_DECL)
+test_i::invoke_we (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Insert some data into the TSC PICurrent object.
@@ -161,28 +146,22 @@ test_i::invoke_we (ACE_ENV_SINGLE_ARG_DECL)
 
   data <<= str;
 
-  ACE_TRY_EX (foo)
+  try
     {
       this->current_->set_slot (this->slot_id_,
-                                data
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (foo);
+                                data);
     }
-  ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
+  catch (const PortableInterceptor::InvalidSlot& ex)
     {
-      ACE_PRINT_EXCEPTION (ex,
-                           "Exception thrown in "
-                           "test_i::invoke_me() when calling "
-                           "Current::set_slot\n");
+      ex._tao_print_exception (
+        "Exception thrown in ""test_i::invoke_me() when calling ""Current::set_slot\n");
 
       ACE_DEBUG ((LM_DEBUG,
                   "Invalid slot: %u\n",
                   this->slot_id_));
 
-      ACE_TRY_THROW_EX (CORBA::INTERNAL (), foo);
+      throw CORBA::INTERNAL ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) String \"%s\" inserted into TSC.\n",
@@ -190,12 +169,11 @@ test_i::invoke_we (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,
               "(%P|%t) Server is shutting down.\n"));
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
index c9de94d10a0..02c15fffba3 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
@@ -41,21 +41,21 @@ public:
   ~test_i (void);
 
   /// Main servant test method.
-  virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void invoke_me (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// No-op method used so that a client request interceptor will be
   /// invoked when invoking this method from the above invoke_me()
   /// method.  Say that 10 times fast. :-)
-  virtual void invoke_you (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void invoke_you (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Test just a set slot
-  virtual void invoke_we (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void invoke_we (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
index 5c9cae1b492..8d6ecaa29de 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -18,14 +18,14 @@ IORInterceptor::~IORInterceptor (void)
 }
 
 char *
-IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+IORInterceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("");
 }
 
 void
-IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+IORInterceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_ASSERT (this->success_);
@@ -33,46 +33,36 @@ IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 IORInterceptor::establish_components (
-    PortableInterceptor::IORInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::IORInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
       PortableInterceptor::ObjectReferenceTemplate_var t =
-        info->adapter_template (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        info->adapter_template ();
 
       PortableInterceptor::AdapterName_var a =
-        t->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        t->adapter_name ();
 
       // Only execute if POA is not RootPOA.  The RootPOA will not
       // have our custom policy, but the child POA we created will.
       if (a->length () > 1)
         {
           CORBA::Policy_var policy (
-            info->get_effective_policy (Test::POLICY_TYPE
-                                        ACE_ENV_ARG_PARAMETER));
-          ACE_TRY_CHECK;
+            info->get_effective_policy (Test::POLICY_TYPE));
 
           Test::Policy_var test_policy (Test::Policy::_narrow (
-            policy.in ()
-            ACE_ENV_ARG_PARAMETER));
-          ACE_TRY_CHECK;
+            policy.in ()));
 
           this->success_ = true;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "EXCEPTION: "
-                           "IORInterceptor::establish_components:");
+      ex._tao_print_exception (
+        "EXCEPTION: ""IORInterceptor::establish_components:");
 
       ACE_ASSERT (false);
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
index c2ab7cf6602..7699f7b0d33 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -58,17 +58,16 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::IORInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
index 5c9266495e9..f8838b1e9f4 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp
@@ -19,34 +19,33 @@ Policy::~Policy (void)
 }
 
 CORBA::ULong
-Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Policy::value (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 CORBA::PolicyType
-Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Test::POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Policy_ptr p;
   ACE_NEW_THROW_EX (p,
                     Policy (this->value_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return p;
 }
 
 void
-Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
index 834e8918745..2843358dcbd 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h
@@ -36,16 +36,16 @@ public:
   Policy (CORBA::ULong val);
 
   /// Test method defined in test IDL.
-  virtual CORBA::ULong value (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong value (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
index 495bc24a325..6164f1d6270 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
@@ -10,8 +10,7 @@ ACE_RCSID (PolicyFactory,
 
 CORBA::Policy_ptr
 PolicyFactory::create_policy (CORBA::PolicyType type,
-                              const CORBA::Any & value
-                              ACE_ENV_ARG_DECL)
+                              const CORBA::Any & value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -30,7 +29,6 @@ PolicyFactory::create_policy (CORBA::PolicyType type,
   ACE_NEW_THROW_EX (p,
                     Policy (val),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return p;
 }
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
index 62baa04f807..0b6943c92e1 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h
@@ -54,8 +54,7 @@ public:
 
   /// Construct a Test::Policy object as a test.
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any & value
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           const CORBA::Any & value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
index e6369e699fa..e454a4f0ccf 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
@@ -18,15 +18,14 @@ ACE_RCSID (PolicyFactory,
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    ACE_ENV_ARG_DECL_NOT_USED)
+    )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::PolicyFactory_ptr p;
@@ -37,14 +36,11 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::PolicyFactory_var policy_factory (p);
 
   info->register_policy_factory (Test::POLICY_TYPE,
-                                 policy_factory.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policy_factory.in ());
 
   PortableInterceptor::IORInterceptor_ptr i;
   ACE_NEW_THROW_EX (i,
@@ -54,11 +50,8 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::IORInterceptor_var ior_interceptor (i);
 
-  info->add_ior_interceptor (ior_interceptor.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_ior_interceptor (ior_interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
index 89be36a2898..960e020d009 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h
@@ -54,14 +54,12 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
index 1a52aa6b982..50181bc40e1 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
@@ -15,8 +15,7 @@ ACE_RCSID (PolicyFactory,
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -27,15 +26,11 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "test_orb"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "test_orb");
 
       // Create the test policy.
 
@@ -44,38 +39,28 @@ main (int argc, char *argv[])
       any <<= val;
 
       CORBA::Policy_var p (orb->create_policy (Test::POLICY_TYPE,
-                                               any
-                                               ACE_ENV_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+                                               any));
 
       const CORBA::PolicyType ptype =
-        p->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        p->policy_type ();
 
       // Sanity check.
       if (ptype != Test::POLICY_TYPE)
-        ACE_TRY_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
-      Test::Policy_var policy (Test::Policy::_narrow (p.in ()
-                                                      ACE_ENV_ARG_PARAMETER));
-      ACE_TRY_CHECK;
+      Test::Policy_var policy (Test::Policy::_narrow (p.in ()));
 
-      const CORBA::ULong pval = policy->value (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      const CORBA::ULong pval = policy->value ();
 
       // Sanity check.
       if (val != pval)
-        ACE_TRY_THROW (CORBA::INTERNAL ());
+        throw CORBA::INTERNAL ();
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -83,46 +68,36 @@ 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 ();
 
       CORBA::PolicyList policies (1);
       policies.length (1);
 
-      policies[0] = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policies[0] = policy->copy ();
 
       PortableServer::POA_var poa =
         root_poa->create_POA ("Test POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
-      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy->destroy ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_INFO,
                   "\n"
                   "PolicyFactory test succeeded.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "PolicyFactory test:");
+      ex._tao_print_exception ("PolicyFactory test:");
 
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
index fca62b6fe50..2ab4f6778cb 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
@@ -21,16 +21,14 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::Object_var object =
-        corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corb_->string_to_object (input_);
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -40,19 +38,15 @@ Client_Task::svc (void)
                             1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client task:");
+      ex._tao_print_exception ("Exception caught in client task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
@@ -60,39 +54,29 @@ Client_Task::svc (void)
 
 
 void
-Client_Task::run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
+Client_Task::run_test (Test_Interceptors::Visual_ptr server)
 {
-  server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  server->normal (10);
 
   CORBA::Long one = 1, two = 1;
   (void) server->calculate (one,
-                            two
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            two);
 
-  ACE_TRY
+  try
     {
-      (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) server->user ();
     }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
+  catch (const Test_Interceptors::Silly&)
     {
       ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY_EX (SYS)
+  try
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
+      server->system ();
     }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
+  catch (const CORBA::INV_OBJREF&)
     {
       ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
index 49074e04e89..b0a73533925 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
@@ -27,8 +27,7 @@ public:
   /// Thread entry point
   int svc (void);
 
-  void run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL);
+  void run_test (Test_Interceptors::Visual_ptr server);
 
   /// The status of the svc loop
   int status (void) const;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
index 41d8c39fec7..f8d5a53b5cc 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
@@ -61,8 +61,7 @@ main (int argc, char *argv[])
   server_orb.set ("server_orb");
   client_orb.set ("client_orb");
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -132,17 +131,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
         CORBA::ORB_init (satc.get_argc (),
                          satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         server_orb.c_str ());
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -164,9 +159,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var corb =
         CORBA::ORB_init (catc.get_argc (),
                          catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         client_orb.c_str ());
 
       Client_Task client_task (input,
                                corb.in (),
@@ -181,8 +174,7 @@ main (int argc, char *argv[])
 
       ACE_Thread_Manager::instance ()->wait ();
 
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sorb->destroy ();
 
       bool failed_check = false;
 
@@ -215,12 +207,11 @@ main (int argc, char *argv[])
           return 1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) ERROR: Some exception was caught in main().\n"));
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
index b9773fde351..ff60616bcad 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
@@ -18,45 +18,36 @@ Echo_Collocated_ORBInitializer::Echo_Collocated_ORBInitializer (
 
 void
 Echo_Collocated_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Collocated_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id =
-    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->orb_id ();
 
   // TAO-Specific way to get to the ORB Core (and thus, the ORB).
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_ORBInitInfo::_narrow (info);
 
   CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb());
 
   if (CORBA::is_nil(orb.in()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
+      throw CORBA::INTERNAL ();
     }
 
   PortableInterceptor::ORBInitInfo_3_1_var info_3_1 =
-    PortableInterceptor::ORBInitInfo_3_1::_narrow(info
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableInterceptor::ORBInitInfo_3_1::_narrow(info);
 
   if (CORBA::is_nil(info_3_1.in()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
+      throw CORBA::INTERNAL ();
     }
 
   if (!ACE_OS::strcmp (orb_id.in (), "client_orb"))
@@ -68,7 +59,6 @@ Echo_Collocated_ORBInitializer::post_init (
       ACE_NEW_THROW_EX (interceptor,
                         Echo_Client_Request_Interceptor,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       PortableInterceptor::ClientRequestInterceptor_var
         client_interceptor = interceptor;
@@ -81,18 +71,13 @@ Echo_Collocated_ORBInitializer::post_init (
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
-                            client_proc_mode_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                            client_proc_mode_as_any);
 
       info_3_1->add_client_request_interceptor_with_policy (
                                         client_interceptor.in (),
-                                        policy_list
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                        policy_list);
 
-      policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      policy_list[0]->destroy ();
       policy_list[0] = CORBA::Policy::_nil ();
     }
   else if (!ACE_OS::strcmp (orb_id.in (), "server_orb"))
@@ -104,7 +89,6 @@ Echo_Collocated_ORBInitializer::post_init (
       ACE_NEW_THROW_EX (interceptor,
                         Echo_Server_Request_Interceptor,
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       PortableInterceptor::ServerRequestInterceptor_var
         server_interceptor = interceptor;
@@ -117,18 +101,13 @@ Echo_Collocated_ORBInitializer::post_init (
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
-                            server_proc_mode_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                            server_proc_mode_as_any);
 
       info_3_1->add_server_request_interceptor_with_policy (
                                             server_interceptor.in (),
-                                            policy_list
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                            policy_list);
 
-      policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      policy_list[0]->destroy ();
       policy_list[0] = CORBA::Policy::_nil ();
     }
   else
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
index 57d361b7b9a..20ccaf9ce43 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
@@ -35,12 +35,10 @@ public:
     (PortableInterceptor::ProcessingMode server_proc_mode,
      PortableInterceptor::ProcessingMode client_proc_mode);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
index a9db6a71b8a..1d1ef6bcbc8 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
@@ -26,12 +26,11 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
 
       CORBA::Object_var poa_object =
-        sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sorb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,37 +38,27 @@ Server_Task::svc (void)
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Visual_i * server_impl = 0;
       ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1);
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sorb_->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
 
@@ -89,21 +78,17 @@ Server_Task::svc (void)
       // Signal the main thread before we call orb->run ();
       this->me_.signal ();
 
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
+     ex._tao_print_exception ("Exception caught in server task:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
index 2082c0d81c9..90b479eda64 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -28,14 +28,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -43,7 +43,6 @@ Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED
     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -52,14 +51,12 @@ Echo_Client_Request_Interceptor::send_poll (
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var op =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -78,8 +75,7 @@ Echo_Client_Request_Interceptor::send_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -94,14 +90,12 @@ Echo_Client_Request_Interceptor::send_request (
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-  PortableInterceptor::ClientRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -116,13 +110,11 @@ Echo_Client_Request_Interceptor::receive_other (
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -138,8 +130,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -150,8 +141,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -159,8 +149,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -174,14 +163,12 @@ Echo_Client_Request_Interceptor::receive_reply (
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -190,8 +177,7 @@ Echo_Client_Request_Interceptor::receive_exception (
     }
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::received_exception "
@@ -213,22 +199,21 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -236,14 +221,12 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -252,8 +235,7 @@ Echo_Server_Request_Interceptor::receive_request (
     }
 
   PortableInterceptor::ObjectId_var test_oid =
-    ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->object_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n",
@@ -262,8 +244,7 @@ Echo_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -277,8 +258,7 @@ Echo_Server_Request_Interceptor::receive_request (
      }
 
   CORBA::String_var tmdi =
-    ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target_most_derived_interface ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Target most derived interface: %s\n",
@@ -287,13 +267,11 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -308,8 +286,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -323,8 +300,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result = 0;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -332,8 +308,7 @@ Echo_Server_Request_Interceptor::send_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -347,14 +322,12 @@ Echo_Server_Request_Interceptor::send_reply (
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   // Do not count the _is_a calls
   if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
@@ -369,13 +342,11 @@ Echo_Server_Request_Interceptor::send_exception (
 
 
   CORBA::Any_var any =
-    ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->sending_exception ();
 
   CORBA::TypeCode_var type = any->type ();
 
-  const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *exception_id = type->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Exception ID = %s\n",
@@ -384,8 +355,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
index c136eb18144..26521b44c3c 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
@@ -32,39 +32,34 @@ public:
   virtual ~Echo_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
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
         ));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
@@ -85,38 +80,33 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  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 receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableInterceptor::ForwardRequest
       ));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
index 31585a94528..10d6a5c709b 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
@@ -12,8 +12,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
   // ctor
 
 void
-Visual_i::normal (CORBA::Long
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Visual_i::normal (CORBA::Long)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
@@ -21,8 +20,7 @@ Visual_i::normal (CORBA::Long
 
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
-                     CORBA::Long two
-                     ACE_ENV_ARG_DECL_NOT_USED)
+                     CORBA::Long two)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
@@ -30,27 +28,26 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::user (void)
   ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
-  ACE_THROW (Test_Interceptors::Silly ());
+  throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::system (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
-  ACE_THROW (CORBA::INV_OBJREF ());
+  throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 
   // Give the client thread time to return from the collocated
   // call to this method before shutting down the ORB.  We sleep
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
index f31756fb10a..841d3ef41df 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
@@ -27,23 +27,21 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_NOT_USED)
+  void normal (CORBA::Long arg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Long calculate (
                          CORBA::Long one,
-                         CORBA::Long two
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         CORBA::Long two)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void user (void)
     ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
 
-  void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void system (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
index 0990fd47209..6b4c210d7ab 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
@@ -21,16 +21,14 @@ Client_Task::Client_Task (const char *ior,
 int
 Client_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       CORBA::Object_var object =
-        corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        corb_->string_to_object (input_);
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -40,19 +38,15 @@ Client_Task::svc (void)
                             1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client task:");
+      ex._tao_print_exception ("Exception caught in client task:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 
@@ -60,39 +54,29 @@ Client_Task::svc (void)
 
 
 void
-Client_Task::run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
+Client_Task::run_test (Test_Interceptors::Visual_ptr server)
 {
-  server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  server->normal (10);
 
   CORBA::Long one = 1, two = 1;
   (void) server->calculate (one,
-                            two
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                            two);
 
-  ACE_TRY
+  try
     {
-      (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      (void) server->user ();
     }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
+  catch (const Test_Interceptors::Silly&)
     {
       ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY_EX (SYS)
+  try
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
+      server->system ();
     }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
+  catch (const CORBA::INV_OBJREF&)
     {
       ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
index 3678e806775..3ea2451e0bc 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
@@ -27,8 +27,7 @@ public:
   /// Thread entry point
   int svc (void);
 
-  void run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL);
+  void run_test (Test_Interceptors::Visual_ptr server);
 
   /// The status of the svc loop
   int status (void) const;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
index 15751d6f087..97154274ed7 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
@@ -16,41 +16,33 @@ Echo_Client_ORBInitializer::Echo_Client_ORBInitializer (
 
 void
 Echo_Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TAO-Specific way to get to the ORB Core (and thus, the ORB).
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_ORBInitInfo::_narrow (info);
 
   CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb());
 
   if (CORBA::is_nil(orb.in()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
+      throw CORBA::INTERNAL ();
     }
 
   PortableInterceptor::ORBInitInfo_3_1_var info_3_1 =
-    PortableInterceptor::ORBInitInfo_3_1::_narrow(info
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableInterceptor::ORBInitInfo_3_1::_narrow(info);
 
   if (CORBA::is_nil(info_3_1.in()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
+      throw CORBA::INTERNAL ();
     }
 
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
@@ -60,7 +52,6 @@ Echo_Client_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_Client_Request_Interceptor,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = interceptor;
@@ -73,18 +64,13 @@ Echo_Client_ORBInitializer::post_init (
   policy_list.length (1);
   policy_list[0] =
     orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
-                        client_proc_mode_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        client_proc_mode_as_any);
 
   info_3_1->add_client_request_interceptor_with_policy (
                                     client_interceptor.in (),
-                                    policy_list
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                    policy_list);
 
-  policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policy_list[0]->destroy ();
   policy_list[0] = CORBA::Policy::_nil ();
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
index 58506555153..ad6ce6e6549 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
@@ -35,12 +35,10 @@ public:
   Echo_Client_ORBInitializer
     (PortableInterceptor::ProcessingMode proc_mode);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
index 9136e25e126..be6737a8e45 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
@@ -16,45 +16,36 @@ Echo_Server_ORBInitializer::Echo_Server_ORBInitializer (
 
 void
 Echo_Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var orb_id =
-    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    info->orb_id ();
 
   // TAO-Specific way to get to the ORB Core (and thus, the ORB).
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    TAO_ORBInitInfo::_narrow (info);
 
   CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb());
 
   if (CORBA::is_nil(orb.in()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
+      throw CORBA::INTERNAL ();
     }
 
   PortableInterceptor::ORBInitInfo_3_1_var info_3_1 =
-    PortableInterceptor::ORBInitInfo_3_1::_narrow(info
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableInterceptor::ORBInitInfo_3_1::_narrow(info);
 
   if (CORBA::is_nil(info_3_1.in()))
     {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
+      throw CORBA::INTERNAL ();
     }
 
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
@@ -64,7 +55,6 @@ Echo_Server_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_Server_Request_Interceptor,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = interceptor;
@@ -77,18 +67,13 @@ Echo_Server_ORBInitializer::post_init (
   policy_list.length (1);
   policy_list[0] =
     orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
-                        proc_mode_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        proc_mode_as_any);
 
   info_3_1->add_server_request_interceptor_with_policy (
                                         server_interceptor.in (),
-                                        policy_list
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                        policy_list);
 
-  policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policy_list[0]->destroy ();
   policy_list[0] = CORBA::Policy::_nil ();
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
index f3af07cc4ae..c0e4e83fda7 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
@@ -34,12 +34,10 @@ public:
   Echo_Server_ORBInitializer
     (PortableInterceptor::ProcessingMode proc_mode);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
index 7fbab820892..b0b383cf047 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
@@ -26,12 +26,11 @@ Server_Task::Server_Task (const char *output,
 int
 Server_Task::svc (void)
 {
- ACE_TRY_NEW_ENV
+ try
    {
 
       CORBA::Object_var poa_object =
-        sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sorb_->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -39,37 +38,27 @@ Server_Task::svc (void)
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Visual_i * server_impl = 0;
       ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1);
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->sorb_->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
 
@@ -89,24 +78,19 @@ Server_Task::svc (void)
       // Signal the main thread before we call orb->run ();
       this->me_.signal ();
 
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->sorb_->destroy ();
    }
- ACE_CATCHANY
+ catch (const CORBA::Exception& ex)
    {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
+     ex._tao_print_exception ("Exception caught in server task:");
      return 1;
    }
- ACE_ENDTRY;
 
  return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
index 399025fa883..14b1bef3587 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
@@ -25,14 +25,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -40,7 +40,6 @@ Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED
     )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -49,16 +48,14 @@ Echo_Client_Request_Interceptor::send_poll (
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
   CORBA::String_var op =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::send_request\n"));
@@ -71,8 +68,7 @@ Echo_Client_Request_Interceptor::send_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -87,15 +83,13 @@ Echo_Client_Request_Interceptor::send_request (
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-  PortableInterceptor::ClientRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::receive_other "
@@ -105,14 +99,12 @@ Echo_Client_Request_Interceptor::receive_other (
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   client_interceptor_check_++;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::receive_reply "
@@ -122,8 +114,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -134,8 +125,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -143,8 +133,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -158,19 +147,16 @@ Echo_Client_Request_Interceptor::receive_reply (
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
 {
   client_interceptor_check_++;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->received_exception_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Client_Request_Interceptor::received_exception "
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
index fc49396097a..1f4d73fbdd2 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
@@ -31,39 +31,34 @@ public:
   virtual ~Echo_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
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
         PortableInterceptor::ClientRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
         ));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
index 78a62bdf25e..802548bb6d8 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
@@ -46,8 +46,7 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -88,17 +87,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       ACE_Argv_Type_Converter atc (argc, argv);
       CORBA::ORB_var orb =
         CORBA::ORB_init (atc.get_argc (),
                          atc.get_TCHAR_argv (),
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       Client_Task client_task (input,
                                orb.in (),
@@ -125,12 +120,11 @@ main (int argc, char *argv[])
           return 1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) ERROR: Some exception was caught in main().\n"));
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
index 9889379c63d..4ad894b3f41 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
@@ -25,22 +25,21 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -48,19 +47,16 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   ++server_interceptor_check_;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   PortableInterceptor::ObjectId_var test_oid =
-    ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->object_id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n",
@@ -69,8 +65,7 @@ Echo_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -84,8 +79,7 @@ Echo_Server_Request_Interceptor::receive_request (
      }
 
   CORBA::String_var tmdi =
-    ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->target_most_derived_interface ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Target most derived interface: %s\n",
@@ -94,14 +88,12 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++server_interceptor_check_;
 
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n",
@@ -110,8 +102,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -125,8 +116,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       CORBA::Long param1, param2, result = 0;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -134,8 +124,7 @@ Echo_Server_Request_Interceptor::send_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::Any_var result_any = ri->result ();
 
       (result_any.in ()) >>= result;
 
@@ -149,13 +138,11 @@ Echo_Server_Request_Interceptor::send_reply (
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var op = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Echo_Server_Request_Interceptor::send_exception "
@@ -164,8 +151,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 
   CORBA::Any_var any =
-    ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->sending_exception ();
 
   CORBA::TypeCode_var type = any->type ();
   if (0 == type.in())
@@ -173,13 +159,12 @@ Echo_Server_Request_Interceptor::send_exception (
       ACE_DEBUG ((LM_DEBUG,
                   "No TypeCode information available; perhaps the user IDL\n"
                   "  has been compiled with TAO_IDL \"-St -Sa\" options?\n"));
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      throw CORBA::NO_IMPLEMENT ();
     }
 
   ++server_interceptor_check_;
 
-  const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  const char *exception_id = type->id ();
 
   ACE_DEBUG ((LM_DEBUG,
               "Exception ID = %s\n",
@@ -188,8 +173,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
index 1c6f50936a3..51b6ba53736 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
@@ -31,38 +31,33 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  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 receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableInterceptor::ForwardRequest
       ));
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
index 720d51ab9ad..2c39f5bbd01 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
@@ -46,8 +46,7 @@ main (int argc, char *argv[])
                   argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -88,17 +87,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       ACE_Argv_Type_Converter atc (argc, argv);
       CORBA::ORB_var orb =
         CORBA::ORB_init (atc.get_argc (),
                          atc.get_TCHAR_argv (),
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       ACE_Manual_Event me;
       Server_Task server_task (output,
@@ -127,12 +122,11 @@ main (int argc, char *argv[])
           return 1;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) ERROR: Some exception was caught in main().\n"));
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
index bf5fe31c9f8..9b5c7b32e41 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
@@ -11,8 +11,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
   // ctor
 
 void
-Visual_i::normal (CORBA::Long
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Visual_i::normal (CORBA::Long)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
@@ -20,8 +19,7 @@ Visual_i::normal (CORBA::Long
 
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
-                     CORBA::Long two
-                     ACE_ENV_ARG_DECL_NOT_USED)
+                     CORBA::Long two)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
@@ -29,27 +27,26 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::user (void)
   ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
-  ACE_THROW (Test_Interceptors::Silly ());
+  throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::system (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
-  ACE_THROW (CORBA::INV_OBJREF ());
+  throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->_remove_ref ();
 
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
index f31756fb10a..841d3ef41df 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
@@ -27,23 +27,21 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_NOT_USED)
+  void normal (CORBA::Long arg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Long calculate (
                          CORBA::Long one,
-                         CORBA::Long two
-                         ACE_ENV_ARG_DECL_NOT_USED)
+                         CORBA::Long two)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void user (void)
     ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
 
-  void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void system (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
index 881b1f2987f..4c9307fbfcb 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp
@@ -19,17 +19,14 @@ Client_ORBInitializer::Client_ORBInitializer (Client_ORBInitializer *second) :
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++pre_init_called;
 
   if (second_ != 0)
     {
-      PortableInterceptor::register_orb_initializer (second_
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      PortableInterceptor::register_orb_initializer (second_);
 
       // Registered the initializer, clear the pointer so that we only do it
       // once
@@ -39,8 +36,7 @@ Client_ORBInitializer::pre_init (
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++post_init_called;
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
index 15b78e94a6e..677200a461a 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Client_ORBInitializer (Client_ORBInitializer *second);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   int pre_init_called;
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
index 9f716e09ada..20cda8787f3 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
@@ -27,27 +27,21 @@ main (int argc, char *argv[])
   PortableInterceptor::ORBInitializer_var initializer_var2 =
     initializer2;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      PortableInterceptor::register_orb_initializer (initializer_var1.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer_var1.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::ORB_var orb2 =
-        CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "SecondORB");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in client:");
+      ex._tao_print_exception ("Caught exception in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   // The first ORBInitializer should be called twice, the second only once
   ACE_ASSERT (initializer1->pre_init_called == 2);
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
index 9633a8d5413..4cc398ba54a 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp
@@ -15,23 +15,19 @@ ACE_RCSID (Redirection,
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var orb_id = info->orb_id ();
 
-  CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::StringSeq_var args = info->arguments ();
 
   CORBA::String_var forward_str;
 
@@ -54,14 +50,11 @@ Client_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = interceptor;
 
-  info->add_client_request_interceptor (client_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (client_interceptor.in ());
 
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
index dde588fb113..4b0c0c76dba 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h
@@ -30,12 +30,10 @@ class Client_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
index 9cf394aa5b5..5ab71be7307 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
@@ -72,7 +72,7 @@ Client_Request_Interceptor::receive_exception (
   this->orb_->string_to_object (this->forward_str_.in ());
 
   // Notice that this is not a permanent forward.
-  ACE_THROW (PortableInterceptor::ForwardRequest (forward.in ()));
+  throw PortableInterceptor::ForwardRequest (forward.in ());
 }
 
 void
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
index 822a351436d..6484f63d591 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp
@@ -17,16 +17,14 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
@@ -37,11 +35,8 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
-  info->add_server_request_interceptor (interceptor
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (interceptor);
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
index fffd3e7b89c..4c9e39a2d38 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h
@@ -36,12 +36,10 @@ public:
   /// Constructor.
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
index 9ab80aa7110..78622ae0627 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp
@@ -19,22 +19,21 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 }
 
 char *
-Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -43,8 +42,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -52,8 +50,7 @@ Server_Request_Interceptor::receive_request (
 
 void
 Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (crash_point == 1 && this->request_count_ == 2) ACE_OS::exit (1);
@@ -61,8 +58,7 @@ Server_Request_Interceptor::send_reply (
 
 void
 Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -70,8 +66,7 @@ Server_Request_Interceptor::send_exception (
 
 void
 Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
index 4dc535962a1..2bb20759f75 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h
@@ -42,38 +42,33 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
index 8da1c03c45b..4dab792cc64 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/client.cpp
@@ -48,8 +48,7 @@ main (int argc, char *argv[])
 {
   int status = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -61,27 +60,21 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Client ORB");
 
       if (::parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior1);
 
       RedirectionTest::test_var server =
-        RedirectionTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RedirectionTest::test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -98,8 +91,7 @@ main (int argc, char *argv[])
                       "CLIENT: Issuing request %d.\n",
                       i));
 
-          number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          number = server->number ();
 
           ACE_DEBUG ((LM_INFO,
                       "CLIENT: Request %d handled by object %d.\n",
@@ -107,16 +99,13 @@ main (int argc, char *argv[])
                       number));
         }
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   if (status != -1)
     ACE_DEBUG ((LM_INFO,
diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
index 6ea299edcb3..4fc9c966cd7 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp
@@ -49,8 +49,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
 #if TAO_HAS_INTERCEPTORS == 1
       Server_ORBInitializer *temp_initializer = 0;
@@ -60,18 +59,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "Server ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,12 +74,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (::parse_args (argc, argv) != 0)
         return -1;
@@ -94,12 +87,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer (test_impl);
 
       RedirectionTest::test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       FILE *output_file= ACE_OS::fopen (ior_file, "w");
       if (output_file == 0)
@@ -111,28 +102,22 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Run the ORB event loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
index 631d5a349e1..e5a76646be9 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp
@@ -18,18 +18,18 @@ test_i::~test_i (void)
 }
 
 CORBA::Short
-test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::number (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
               this->number_));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
index 643fb36e3c7..6a733639a65 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h
@@ -26,11 +26,11 @@ public:
   ~test_i (void);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short number (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
index 87e209cd234..b9fc8aa89e3 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp
@@ -18,86 +18,73 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr orbinitinfo
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr orbinitinfo)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   POA_TestModule::test* test = 0;
   ACE_NEW (test,
            test_i);
 
-  CORBA::Object_ptr object = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::Object_ptr object = test->_this ();
 
   orbinitinfo->register_initial_reference ("MyService",
-                                           object
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                           object);
 
   bool invalid_name = false;
-  ACE_TRY
+  try
     {
       // Registering with an empty string should give an exception
       orbinitinfo->register_initial_reference ("",
-                                               object
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               object);
     }
-  ACE_CATCH (PortableInterceptor::ORBInitInfo::InvalidName, ex)
+  catch (const PortableInterceptor::ORBInitInfo::InvalidName&)
     {
       invalid_name = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!invalid_name)
     ACE_ERROR ((LM_ERROR, "ERROR: Registering with an empty string doesn't "
                           "throw an exception\n"));
 
   bool duplicate_name = false;
-  ACE_TRY_EX (duplicate)
+  try
     {
       // Registering with an duplicate string should give an exception
       orbinitinfo->register_initial_reference ("MyService",
-                                               object
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (duplicate) ;
+                                               object);
     }
-  ACE_CATCH (PortableInterceptor::ORBInitInfo::InvalidName, ex)
+  catch (const PortableInterceptor::ORBInitInfo::InvalidName&)
     {
       duplicate_name = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!duplicate_name)
     ACE_ERROR ((LM_ERROR, "ERROR: Registering with a duplicate with ORBInitInfo "
                           "doesn't throw the expected exception\n"));
 
   bool invalid_object = false;
-  ACE_TRY_EX (invalid)
+  try
     {
       // Registering with a nil object
       orbinitinfo->register_initial_reference ("NilServer",
-                                               CORBA::Object::_nil()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (invalid);
+                                               CORBA::Object::_nil());
     }
-  ACE_CATCH (CORBA::BAD_PARAM , ex)
+  catch (const CORBA::BAD_PARAM& ex)
     {
       if (ex.minor () == (CORBA::OMGVMCID | 27))
         {
           invalid_object = true;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!invalid_object)
     ACE_ERROR ((LM_ERROR, "ERROR: Registering with a nil object to ORBInitInfo "
@@ -106,8 +93,7 @@ Server_ORBInitializer::pre_init (
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
index 3b9e5407eaf..d9c602a0dec 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h
@@ -32,12 +32,10 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
index efac5ba2c36..29f8f3a3424 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(Recursive_ORBInitializer,
           "$Id$")
 
 
-int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+int test_orb (CORBA::ORB_ptr orb)
 {
   int errors = 0;
 
@@ -17,31 +17,25 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   ACE_NEW_RETURN (test,
                   test_i, 1);
 
-  CORBA::Object_ptr object = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+  CORBA::Object_ptr object = test->_this ();
 
   orb->register_initial_reference ("ORBMyService",
-                                    object
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
+                                    object);
 
   bool invalid_name = false;
-  ACE_TRY
+  try
     {
       // Registering with an empty string should give an exception
       orb->register_initial_reference ("",
-                                       object
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       object);
     }
-  ACE_CATCH (CORBA::ORB::InvalidName, ex)
+  catch (const CORBA::ORB::InvalidName&)
     {
       invalid_name = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!invalid_name)
     {
@@ -51,22 +45,19 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
   bool duplicate_name = false;
-  ACE_TRY_EX (duplicate)
+  try
     {
       // Registering with an duplicate string should give an exception
       orb->register_initial_reference ("ORBMyService",
-                                        object
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (duplicate);
+                                        object);
     }
-  ACE_CATCH (CORBA::ORB::InvalidName, ex)
+  catch (const CORBA::ORB::InvalidName&)
     {
       duplicate_name = true;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!duplicate_name)
     {
@@ -76,25 +67,22 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     }
 
   bool invalid_object = false;
-  ACE_TRY_EX (invalid)
+  try
     {
       // Registering with a nil object
       orb->register_initial_reference ("ORBNilServer",
-                                       CORBA::Object::_nil()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (invalid);
+                                       CORBA::Object::_nil());
     }
-  ACE_CATCH (CORBA::BAD_PARAM , ex)
+  catch (const CORBA::BAD_PARAM& ex)
     {
       if ((ex.minor() & 0xFFFU) == 27)
         {
           invalid_object = true;
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
   if (!invalid_object)
     {
@@ -119,30 +107,23 @@ main (int argc, char *argv[])
   PortableInterceptor::ORBInitializer_var initializer_var =
     initializer;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
-      retval = test_orb (orb.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = test_orb (orb.in ());
 
-      PortableInterceptor::register_orb_initializer (initializer_var.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer_var.in ());
 
       CORBA::ORB_var second_orb =
-        CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "SecondORB");
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in server:");
+      ex._tao_print_exception ("Caught exception in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
index ceb1ab95ee1..047efb616ff 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
@@ -13,16 +13,14 @@ ACE_RCSID (Request_Interceptor_Flow,
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -36,14 +34,11 @@ Client_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_var ci_interceptor =
     ci;
 
-  info->add_client_request_interceptor (ci_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (ci_interceptor.in ());
 
   ACE_NEW_THROW_EX (ci,
                     Client_Request_Interceptor ("CLIENT B"),
@@ -52,13 +47,10 @@ Client_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   ci_interceptor = ci;
 
-  info->add_client_request_interceptor (ci_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (ci_interceptor.in ());
 
   ACE_NEW_THROW_EX (ci,
                     Client_Request_Interceptor ("CLIENT C"),
@@ -67,11 +59,8 @@ Client_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   ci_interceptor = ci;
 
-  info->add_client_request_interceptor (ci_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_client_request_interceptor (ci_interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
index 9a14c62287c..affe429a3c5 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
@@ -45,12 +45,10 @@ class Client_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index dba6578f6f2..c9404a9a380 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -18,14 +18,12 @@ Client_Request_Interceptor::Client_Request_Interceptor (const char *name)
 
 void
 Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   CORBA::Boolean client_side =
-    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_side_test (ri);
 
   if (!client_side)
     return;  // Don't continue if the server side is being tested.
@@ -38,8 +36,7 @@ Client_Request_Interceptor::send_request (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       Test::TestScenario scenario;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -57,7 +54,7 @@ Client_Request_Interceptor::send_request (
               // (NO_PERMISSION, in this case).
               ACE_DEBUG ((LM_DEBUG,
                           " raised CORBA::NO_PERMISSION exception\n"));
-              ACE_THROW (CORBA::NO_PERMISSION ());  // Expected exception.
+              throw CORBA::NO_PERMISSION ();  // Expected exception.
 
             default:
               break;
@@ -77,14 +74,12 @@ Client_Request_Interceptor::send_request (
 
 void
 Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_side_test (ri);
 
   if (!client_side)
     return;  // Don't continue if the server side is being tested.
@@ -98,14 +93,12 @@ Client_Request_Interceptor::send_poll (
 
 void
 Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_side_test (ri);
 
   if (!client_side)
     return;  // Don't continue if the server side is being tested.
@@ -120,8 +113,7 @@ Client_Request_Interceptor::receive_reply (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       Test::TestScenario scenario;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -139,7 +131,7 @@ Client_Request_Interceptor::receive_reply (
               // (NO_PERMISSION, in this case).
               ACE_DEBUG ((LM_DEBUG,
                           " raised CORBA::NO_PERMISSION exception\n"));
-              ACE_THROW (CORBA::NO_PERMISSION ());  // Expected exception.
+              throw CORBA::NO_PERMISSION ();  // Expected exception.
 
             default:
               break;
@@ -157,15 +149,13 @@ Client_Request_Interceptor::receive_reply (
 
 void
 Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_side_test (ri);
 
   if (!client_side)
     return;  // Don't continue if the server side is being tested.
@@ -180,8 +170,7 @@ Client_Request_Interceptor::receive_exception (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       Test::TestScenario scenario;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -195,13 +184,11 @@ Client_Request_Interceptor::receive_exception (
           switch (scenario)
             {
             case 4:
-              exception = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              exception = ri->received_exception ();
 
               tc = exception->type ();
 
-              id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              id = tc->id ();
 
               if (ACE_OS::strcmp (id, "IDL:Test/X:1.0") == 0)
                 {
@@ -216,7 +203,7 @@ Client_Request_Interceptor::receive_exception (
                               "CORBA::NO_PERMISSION exception\n"));
 
                   // Expected exception.
-                  ACE_THROW (CORBA::NO_PERMISSION ());
+                  throw CORBA::NO_PERMISSION ();
                 }
               else
                 {
@@ -241,15 +228,13 @@ Client_Request_Interceptor::receive_exception (
 
 void
 Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->client_side_test (ri);
 
   if (!client_side)
     return;  // Don't continue if the server side is being tested.
@@ -263,11 +248,9 @@ Client_Request_Interceptor::receive_other (
 
 CORBA::Boolean
 Client_Request_Interceptor::client_side_test (
-  PortableInterceptor::ClientRequestInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ClientRequestInfo_ptr info)
 {
-  CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::String_var op = info->operation ();
 
   return ACE_OS::strcmp (op.in (), "client_test") == 0 ? 1 : 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
index bb1f24cbdcc..e9ca7b9d507 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
@@ -60,30 +60,25 @@ public:
    */
   //@{
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
@@ -93,8 +88,7 @@ private:
   // Returns 1 if the client-side test is currently being run, and 0
   // otherwise.
   CORBA::Boolean client_side_test (
-    PortableInterceptor::ClientRequestInfo_ptr info
-    ACE_ENV_ARG_DECL);
+    PortableInterceptor::ClientRequestInfo_ptr info);
 
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
index c918a767b2c..5c715ff03e3 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
@@ -14,15 +14,14 @@ Request_Interceptor::Request_Interceptor (const char *name)
 }
 
 char *
-Request_Interceptor::name (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Request_Interceptor::name ()
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
-Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -40,7 +39,7 @@ Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
                   "is zero\n", s_count,
                   this->name_.in ()));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (e_count == 0)
@@ -51,7 +50,7 @@ Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
                   "is zero\n",
                   e_count, this->name_.in ()));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   if (s_count != e_count)
@@ -67,6 +66,6 @@ Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
                   s_count,
                   e_count));
 
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
index ade0ae89891..6f41abec934 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
@@ -58,10 +58,10 @@ public:
    */
   //@{
   /// Return the name of this Requestinterceptor.
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
index eaf11509671..d9f79479560 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
@@ -11,16 +11,14 @@ ACE_RCSID (Request_Interceptor_Flow,
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -34,14 +32,11 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var si_interceptor =
     si;
 
-  info->add_server_request_interceptor (si_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (si_interceptor.in ());
 
   ACE_NEW_THROW_EX (si,
                     Server_Request_Interceptor ("SERVER B"),
@@ -50,13 +45,10 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   si_interceptor = si;
 
-  info->add_server_request_interceptor (si_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (si_interceptor.in ());
 
   ACE_NEW_THROW_EX (si,
                     Server_Request_Interceptor ("SERVER C"),
@@ -65,11 +57,8 @@ Server_ORBInitializer::post_init (
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK;
 
   si_interceptor = si;
 
-  info->add_server_request_interceptor (si_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (si_interceptor.in ());
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
index 0d011a67032..f8819bb9bc3 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
@@ -45,12 +45,10 @@ class Server_ORBInitializer :
 {
 public:
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index 45e9c1b1650..44952a79f1d 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -21,15 +21,13 @@ Server_Request_Interceptor::Server_Request_Interceptor (const char *name)
 
 void
 Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_side_test (ri);
 
   if (!server_side)
     return;  // Don't continue if the client side is being tested.
@@ -53,7 +51,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
           // (NO_PERMISSION, in this case).
           ACE_DEBUG ((LM_DEBUG,
                       " raised CORBA::NO_PERMISSION exception\n"));
-          ACE_THROW (CORBA::NO_PERMISSION ());  // Expected exception.
+          throw CORBA::NO_PERMISSION ();  // Expected exception.
 
         default:
           break;
@@ -68,15 +66,13 @@ Server_Request_Interceptor::receive_request_service_contexts (
 
 void
 Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_side_test (ri);
 
   if (!server_side)
     return;  // Don't continue if the client side is being tested.
@@ -88,14 +84,12 @@ Server_Request_Interceptor::receive_request (
 
 void
 Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_side_test (ri);
 
   if (!server_side)
     return;  // Don't continue if the client side is being tested.
@@ -110,8 +104,7 @@ Server_Request_Interceptor::send_reply (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       Test::TestScenario scenario;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -129,7 +122,7 @@ Server_Request_Interceptor::send_reply (
               // (NO_PERMISSION, in this case).
               ACE_DEBUG ((LM_DEBUG,
                           " raised CORBA::NO_PERMISSION exception\n"));
-              ACE_THROW (CORBA::NO_PERMISSION ());  // Expected exception.
+              throw CORBA::NO_PERMISSION ();  // Expected exception.
 
             default:
               break;
@@ -147,15 +140,13 @@ Server_Request_Interceptor::send_reply (
 
 void
 Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_side_test (ri);
 
   if (!server_side)
     return;  // Don't continue if the client side is being tested.
@@ -170,8 +161,7 @@ Server_Request_Interceptor::send_exception (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+        ri->arguments ();
 
       Test::TestScenario scenario;
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
@@ -185,13 +175,11 @@ Server_Request_Interceptor::send_exception (
           switch (scenario)
             {
             case 4:
-              exception = ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              exception = ri->sending_exception ();
 
               tc = exception->type ();
 
-              id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              id = tc->id ();
 
               if (ACE_OS::strcmp (id, "IDL:Test/X:1.0") == 0)
                 {
@@ -206,7 +194,7 @@ Server_Request_Interceptor::send_exception (
                               "CORBA::NO_PERMISSION exception\n"));
 
                   // Expected exception.
-                  ACE_THROW (CORBA::NO_PERMISSION ());
+                  throw CORBA::NO_PERMISSION ();
                 }
               else
                 {
@@ -231,15 +219,13 @@ Server_Request_Interceptor::send_exception (
 
 void
 Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->server_side_test (ri);
 
   if (!server_side)
     return;  // Don't continue if the client side is being tested.
@@ -253,11 +239,9 @@ Server_Request_Interceptor::send_other (
 
 CORBA::Boolean
 Server_Request_Interceptor::server_side_test (
-  PortableInterceptor::ServerRequestInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ServerRequestInfo_ptr info)
 {
-  CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+  CORBA::String_var op = info->operation ();
 
   return ACE_OS::strcmp (op.in (), "server_test") == 0 ? 1 : 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
index e0a9c66c947..ac5b56bff1e 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
@@ -60,31 +60,26 @@ public:
    */
   //@{
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
@@ -94,8 +89,7 @@ private:
   /// Returns 1 if the server-side test is currently being run, and 0
   /// otherwise.
   CORBA::Boolean server_side_test (
-    PortableInterceptor::ServerRequestInfo_ptr info
-    ACE_ENV_ARG_DECL);
+    PortableInterceptor::ServerRequestInfo_ptr info);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
index 52caf89e452..035b3959bd2 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
@@ -43,7 +43,7 @@ parse_args (int argc, char *argv[])
 }
 
 void
-client_test (Test_ptr server ACE_ENV_ARG_DECL)
+client_test (Test_ptr server)
 {
   // Currently, there are only four scenarios for the client side
   // tests.
@@ -56,10 +56,9 @@ client_test (Test_ptr server ACE_ENV_ARG_DECL)
                   "------------------\n",
                   i));
 
-      ACE_TRY
+      try
         {
-          server->client_test (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->client_test (i);
 
           if (i == 1)
             {
@@ -68,37 +67,35 @@ client_test (Test_ptr server ACE_ENV_ARG_DECL)
               "operation.\n"));
             }
         }
-      ACE_CATCH (Test::X, ex)
+      catch (const Test::X&)
         {
           // Expected exception.  Ignore it.
         }
-      ACE_CATCH (CORBA::NO_PERMISSION, ex)
+      catch (const CORBA::NO_PERMISSION&)
         {
           // Expected exception.  Ignore it.
         }
-      ACE_CATCH (Test::UnknownScenario, ex)
+      catch (const Test::UnknownScenario& ex)
         {
           ACE_ERROR ((LM_ERROR,
                       "\nERROR: Unknown scenario <%d> condition "
                       "returned from client_test() "
                       "operation.\n",
                       ex.scenario));
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           ACE_ERROR ((LM_ERROR,
                       "\nERROR: Exception thrown from client_test() "
                       "operation.\n"));
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 void
-server_test (Test_ptr server ACE_ENV_ARG_DECL)
+server_test (Test_ptr server)
 {
   // Currently, there are only four scenarios for the server side
   // tests.
@@ -111,11 +108,10 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL)
                   "------------------\n",
                   i));
 
-      ACE_TRY
+      try
         {
           CORBA::ULongSeq_var ulongseq;
-          server->server_test (i, ulongseq.out () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->server_test (i, ulongseq.out ());
 
           if (i == 1)
             {
@@ -124,40 +120,37 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL)
                           "operation.\n"));
             }
         }
-      ACE_CATCH (Test::X, ex)
+      catch (const Test::X&)
         {
           // Expected exception.  Ignore it.
         }
-      ACE_CATCH (CORBA::NO_PERMISSION, ex)
+      catch (const CORBA::NO_PERMISSION&)
         {
           // Expected exception.  Ignore it.
         }
-      ACE_CATCH (Test::UnknownScenario, ex)
+      catch (const Test::UnknownScenario& ex)
         {
           ACE_ERROR ((LM_ERROR,
                       "\nERROR: Unknown scenario <%d> condition "
                       "returned from server_test() "
                       "operation.\n",
                       ex.scenario));
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           ACE_ERROR ((LM_ERROR,
                       "\nERROR: Exception thrown from server_test() "
                       "operation.\n"));
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
         PortableInterceptor::ORBInitializer::_nil ();
@@ -168,26 +161,20 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB"
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "Client ORB");
 
       if (::parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test_var server =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -197,25 +184,19 @@ main (int argc, char *argv[])
                             1);
         }
 
-      ::client_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ::client_test (server.in ());
 
-      ::server_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ::server_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO,
               "Request interceptor flow test passed.\n"));
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
index 6e4fa0d21d3..d8d4fd6b79a 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
@@ -46,8 +46,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       Server_ORBInitializer *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -56,17 +55,13 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "Server ORB");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -74,31 +69,26 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (::parse_args (argc, argv) != 0)
         return -1;
 
       test_i servant (orb.in ());
 
-      CORBA::Object_var obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (obj.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Servant:\n<%s>\n",
                   ior.in ()));
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Write IOR to a file.
       FILE *output_file= ACE_OS::fopen (ior_file, "w");
@@ -112,24 +102,19 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Run the ORB event loop.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
index 17dee50ac55..2a9f74f7eca 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
@@ -12,8 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::client_test (Test::TestScenario scenario
-                     ACE_ENV_ARG_DECL)
+test_i::client_test (Test::TestScenario scenario)
   ACE_THROW_SPEC ((Test::X,
                    Test::UnknownScenario,
                    CORBA::SystemException))
@@ -24,19 +23,18 @@ test_i::client_test (Test::TestScenario scenario
     case 4:
       // Both the client-side and server-side tests throw this
       // exception in these scenarios.
-      ACE_THROW (Test::X ());  // Expected test exception
+      throw Test::X ();  // Expected test exception
     case 2:
     case 3:
       break;
     default:
-      ACE_THROW (Test::UnknownScenario (scenario));  // Unexpected!
+      throw Test::UnknownScenario (scenario);  // Unexpected!
     }
 }
 
 void
 test_i::server_test (Test::TestScenario scenario,
-                     CORBA::ULongSeq_out myseq
-                     ACE_ENV_ARG_DECL)
+                     CORBA::ULongSeq_out myseq)
   ACE_THROW_SPEC ((Test::X,
                    Test::UnknownScenario,
                    CORBA::SystemException))
@@ -49,21 +47,21 @@ test_i::server_test (Test::TestScenario scenario,
     case 4:
       // Both the client-side and server-side tests throw this
       // exception in these scenarios.
-      ACE_THROW (Test::X ());  // Expected test exception
+      throw Test::X ();  // Expected test exception
     case 2:
     case 3:
       break;
     default:
-      ACE_THROW (Test::UnknownScenario (scenario));  // Unexpected!
+      throw Test::UnknownScenario (scenario);  // Unexpected!
     }
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
 
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
index 604d4ffb432..ad5b2be3b75 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
@@ -33,22 +33,20 @@ public:
   test_i (CORBA::ORB_ptr orb);
 
   /// The client-side test operation.
-  virtual void client_test (Test::TestScenario scenario
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void client_test (Test::TestScenario scenario)
     ACE_THROW_SPEC ((Test::X,
                      Test::UnknownScenario,
                      CORBA::SystemException));
 
   /// The server-side test operation.
   virtual void server_test (Test::TestScenario scenario,
-                            CORBA::ULongSeq_out myseq
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                            CORBA::ULongSeq_out myseq)
     ACE_THROW_SPEC ((Test::X,
                      Test::UnknownScenario,
                      CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
index fd053e810f0..81394e0fdbd 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
@@ -14,22 +14,19 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   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 +35,10 @@ Client_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_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;
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
index 569419fb346..c232ee05e1a 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
index 0ad8960c819..98962f028bc 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
@@ -14,16 +14,14 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 
 void
 Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
@@ -33,13 +31,10 @@ Server_ORBInitializer::post_init (
   ACE_NEW_THROW_EX (interceptor,
                     Echo_Server_Request_Interceptor,
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = interceptor;
 
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  info->add_server_request_interceptor (server_interceptor.in ());
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
index 992070c71e1..b43bcf07b7d 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index 80c6cfad678..f8c76885c57 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -37,49 +37,40 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
+run_test (Test_Interceptors::Visual_ptr server)
 {
 
-  server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  server->normal (10);
 
   ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n"));
 
-  server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  server->nothing ();
 
   ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n"));
 
-  ACE_TRY
+  try
     {
-      server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->user ();
     }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
+  catch (const Test_Interceptors::Silly&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught Silly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 
-  ACE_TRY_EX (SYS)
+  try
     {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
+      server->system ();
     }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
+  catch (const CORBA::INV_OBJREF&)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
 
@@ -89,24 +80,19 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -116,19 +102,15 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      run_test (server.in ());
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in client:");
+      ex._tao_print_exception ("Caught exception in client:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
index e9ef8474a32..e6318e00110 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
@@ -26,22 +26,21 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 }
 
 char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
@@ -49,8 +48,7 @@ Echo_Client_Request_Interceptor::send_poll (
 
 void
 Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -59,20 +57,15 @@ Echo_Client_Request_Interceptor::send_request (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
-  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;
+    this->orb_->object_to_string (target.in ());
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -98,13 +91,11 @@ Echo_Client_Request_Interceptor::send_request (
   sc.context_data.replace (string_len, string_len, buf, 1);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ri->add_request_service_context (sc, 0);
 
   // Check that the request service context can be retrieved.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 =
     reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
@@ -122,8 +113,7 @@ Echo_Client_Request_Interceptor::send_request (
 
 void
 Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -131,20 +121,15 @@ Echo_Client_Request_Interceptor::receive_reply (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
-  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;
+    this->orb_->object_to_string (target.in ());
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -158,8 +143,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -178,8 +162,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
   // Check that no one has messed with the request service context.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 =
     reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
@@ -196,8 +179,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
 void
 Echo_Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -208,8 +190,7 @@ Echo_Client_Request_Interceptor::receive_other (
 
 void
 Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -218,20 +199,15 @@ Echo_Client_Request_Interceptor::receive_exception (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
-  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;
+    this->orb_->object_to_string (target.in ());
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -245,8 +221,7 @@ Echo_Client_Request_Interceptor::receive_exception (
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -266,8 +241,7 @@ Echo_Client_Request_Interceptor::receive_exception (
 
   // Check that no one has messed with the request service context.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 =
     reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
index 10fcbd62f70..af32be9e149 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h
@@ -31,33 +31,28 @@ public:
   virtual ~Echo_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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index bb361528705..6b1af478aef 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
 
@@ -51,18 +51,14 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       // Now we can create the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -70,15 +66,12 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -86,23 +79,16 @@ main (int argc, char *argv[])
       Visual_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (&server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->activate_object (&server_impl);
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->id_to_reference (id.in ());
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test_Interceptors::Visual::_narrow (test_obj.in ());
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG,
                   "Test_Interceptors::Visual: <%s>\n",
@@ -121,21 +107,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception in server:");
+      ex._tao_print_exception ("Caught exception in server:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
index d253b1ab045..ef37b2b4ab4 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
@@ -24,28 +24,26 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 }
 
 char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.receive_request_service_contexts from "
@@ -55,8 +53,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
   IOP::ServiceId id = ::service_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (id);
 
   const char *buf =
     reinterpret_cast<const char *> (sc->context_data.get_buffer ());
@@ -87,15 +84,13 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   scc.context_data.replace (string_len, string_len, buff, 1);
 
   // Add this context to the service context list.
-  ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ri->add_reply_service_context (scc, 0);
 }
 
 
 void
 Echo_Server_Request_Interceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -104,13 +99,11 @@ Echo_Server_Request_Interceptor::receive_request (
 
 void
 Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.send_reply from \"%s\"\n",
@@ -119,8 +112,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
@@ -140,8 +132,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
@@ -158,14 +149,12 @@ Echo_Server_Request_Interceptor::send_reply (
 
 void
 Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::String_var operation = ri->operation ();
 
 #if 0
   ACE_DEBUG ((LM_DEBUG,
@@ -176,8 +165,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_reply_service_context (::service_id);
 
   const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ());
 
@@ -197,8 +185,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    ri->get_request_service_context (::service_id);
 
   const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ());
 
@@ -215,8 +202,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
 void
 Echo_Server_Request_Interceptor::send_other (
-             PortableInterceptor::ServerRequestInfo_ptr
-             ACE_ENV_ARG_DECL_NOT_USED)
+             PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
index 9549d70f549..cc14ce6591b 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h
@@ -31,35 +31,30 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+        PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
index 503c7a5b423..925f856c0b5 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
@@ -13,41 +13,39 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 }
 
 void
-Visual_i::normal (CORBA::Long arg
-                  ACE_ENV_ARG_DECL_NOT_USED)
+Visual_i::normal (CORBA::Long arg)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
 
 void
-Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Visual_i::nothing (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::user (void)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test_Interceptors::Silly))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
-  ACE_THROW (Test_Interceptors::Silly ());
+  throw Test_Interceptors::Silly ();
 }
 
 void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::system (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
-  ACE_THROW (CORBA::INV_OBJREF ());
+  throw CORBA::INV_OBJREF ();
 }
 
 void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Visual_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
index 5a6df58c457..cda32b963d9 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
@@ -28,21 +28,20 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  void normal (CORBA::Long arg)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void nothing (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void user (void)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Silly));
 
-  void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void system (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 0139cdf6672..061af3a31b4 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -14,22 +14,18 @@ main (int argc, char *argv[])
   QApplication app (argc, argv);
   TAO::QtResource_Loader qt_resources (&app);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       Client client (orb.in (), app);
 
-      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.parse_args (argc, argv);
 
       // Creates the Qt widgets
-      client.create_widgets (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.create_widgets ();
 
       // This may look a bit suspect, but Qt wants the manager widget
       // as the toplevel widget unlike Xt for display purposes.
@@ -40,12 +36,11 @@ main (int argc, char *argv[])
 
       app.exec ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -64,8 +59,7 @@ Client::~Client (void)
 
 void
 Client::parse_args (int argc,
-                    char *argv[]
-                    ACE_ENV_ARG_DECL)
+                    char *argv[])
 {
   const char *ior = "file://test.ior";
 
@@ -88,12 +82,10 @@ Client::parse_args (int argc,
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->string_to_object (ior);
 
   this->server_ =
-    LCD_Display::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    LCD_Display::_narrow (object.in ());
 
   if (CORBA::is_nil(this->server_.in ()))
     {
@@ -103,7 +95,7 @@ Client::parse_args (int argc,
 }
 
 void
-Client::create_widgets (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Client::create_widgets (/**/)
 {
   // Ewsize the box
   this->box_.resize (200,120);
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index e4b50c40a70..0b1d9be90c4 100644
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -35,13 +35,12 @@ public:
   ~Client (void);
   //Dtor..
 
-  void create_widgets (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void create_widgets (void);
   // Adds the callbacks to the GUI underneath.....
 
   void show (void);
 
-  void parse_args (int argc, char *argv[]
-                   ACE_ENV_ARG_DECL);
+  void parse_args (int argc, char *argv[]);
 
   QVBox box_;
   // A box widget..
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 68ed428b4b6..28fef907bfc 100644
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -57,16 +57,13 @@ main (int argc, char *argv[])
   QApplication app (argc, argv);
   TAO::QtResource_Loader qt_resources (&app);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -74,20 +71,17 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Create the Qt stuff..
       // Instantiate the LCD_Display implementation class
       LCD_Display_imp display_impl (orb.in ());
 
       LCD_Display_var server =
-        display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        display_impl._this ();
 
       // Create the LCD after the QVbox is created.
       QVBox box;
@@ -109,8 +103,7 @@ main (int argc, char *argv[])
       // End of QT specific stuff..
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -127,19 +120,16 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
       }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // We choose to run the main Qt event loop..
       app.exec ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 0d961989108..1f58c4db4ae 100644
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -13,7 +13,7 @@ LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
 }
 
 void
-LCD_Display_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+LCD_Display_imp::shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -23,8 +23,7 @@ LCD_Display_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-LCD_Display_imp::send_val (CORBA::Long val
-                           ACE_ENV_ARG_DECL_NOT_USED)
+LCD_Display_imp::send_val (CORBA::Long val)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index ac04d36afc9..1305ce328e4 100644
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -36,11 +36,10 @@ public:
 
   // ctor
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void send_val (CORBA::Long val
-                 ACE_ENV_ARG_DECL_NOT_USED)
+  void send_val (CORBA::Long val)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  signals:
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
index 8dd1103b673..f32e7ebb006 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
@@ -23,45 +23,30 @@ public:
 
 int main(int, char**)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       int argc = 0;
       CORBA::ORB_var orb1 =
-                    CORBA::ORB_init(argc, 0, "orb1" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    CORBA::ORB_init(argc, 0, "orb1");
       CORBA::ORB_var orb2 =
-                    CORBA::ORB_init(argc, 0, "orb2" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    CORBA::ORB_init(argc, 0, "orb2");
 
       CORBA::Object_var poaObj_var =
-                    orb1->resolve_initial_references ("RootPOA"
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    orb1->resolve_initial_references ("RootPOA");
       PortableServer::POA_var rootPoa =
-                    PortableServer::POA::_narrow (poaObj_var.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    PortableServer::POA::_narrow (poaObj_var.in ());
       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;
+                    orb2->resolve_initial_references ("RootPOA");
       PortableServer::POA_var rootPoa2 =
-                    PortableServer::POA::_narrow (poaObj_var2.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    PortableServer::POA::_narrow (poaObj_var2.in ());
       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);
@@ -72,38 +57,24 @@ int main(int, char**)
       PortableServer::ServantBase_var m2_var = m2;
 
       PortableServer::ObjectId_var monitorableId1_var =
-                    rootPoa->activate_object (monitorable_var.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    rootPoa->activate_object (monitorable_var.in ());
       CORBA::Object_var obj1 =
-                    rootPoa->id_to_reference (monitorableId1_var.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    rootPoa->id_to_reference (monitorableId1_var.in ());
       Arch_Idl::Monitorable_var monitorable1 =
-                    Arch_Idl::Monitorable::_narrow (obj1.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    Arch_Idl::Monitorable::_narrow (obj1.in ());
 
       PortableServer::ObjectId_var monitorableId2_var =
-                    rootPoa2->activate_object (m2_var.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    rootPoa2->activate_object (m2_var.in ());
       CORBA::Object_var obj2 =
-                    rootPoa2->id_to_reference (monitorableId2_var.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    rootPoa2->id_to_reference (monitorableId2_var.in ());
       Arch_Idl::Monitorable_var monitorable2 =
-                    Arch_Idl::Monitorable::_narrow (obj2.in ()
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                    Arch_Idl::Monitorable::_narrow (obj2.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index 248fb4b0f2e..ac6b8e192bf 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -42,24 +42,19 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Short
-get_server_priority (Test_ptr server
-                     ACE_ENV_ARG_DECL)
+get_server_priority (Test_ptr server)
 {
   // Get the Priority Model Policy from the stub.
   CORBA::Policy_var policy =
-    server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
   // Narrow down to correct type.
   RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
   // 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,40 +62,35 @@ 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
 invocation_exception_test (Test_ptr obj,
-                           CORBA::Short priority
-                           ACE_ENV_ARG_DECL)
+                           CORBA::Short priority)
 {
-  ACE_TRY
+  try
     {
       // Invoke method on test object.
       obj->test_method (1,
-                        priority
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                        priority);
 
       // This next line of code should not run because an exception
       // should have been raised.
       ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n"));
     }
-  ACE_CATCH (CORBA::INV_POLICY, ex)
+  catch (const CORBA::INV_POLICY& )
     {
       // Expected exception.
       ACE_DEBUG ((LM_DEBUG,
                   "INV_POLICY exception is caught as expected.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Unexpected exception.
       ACE_DEBUG ((LM_DEBUG, "Error: unexpected exception caught\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 class Task : public ACE_Task_Base
@@ -126,48 +116,34 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Get the RTORB.
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       // Get the RTCurrent.
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       // Test object 1 (with CLIENT_PROPAGATED priority model).
       object =
-        this->orb_->string_to_object (ior1
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior1);
 
       Test_var client_propagated_obj =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       // Test object 2 (with SERVER_DECLARED priority model).
-      object = this->orb_->string_to_object (ior2
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = this->orb_->string_to_object (ior2);
 
       Test_var server_declared_obj =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       // Test: Attempt to set priority bands that do not match server
       // resource configuration on the <client_propagated_obj>.
@@ -185,34 +161,25 @@ Task::svc (void)
       CORBA::PolicyList policies;
       policies.length (1);
       policies[0] =
-        rt_orb->create_priority_banded_connection_policy (false_bands
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_priority_banded_connection_policy (false_bands);
 
       // Set false bands at the object level.  Note that a new object
       // is returned.
       object =
         client_propagated_obj->_set_policy_overrides (policies,
-                                                      CORBA::SET_OVERRIDE
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                      CORBA::SET_OVERRIDE);
 
       client_propagated_obj =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       // 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;
+                                 0);
 
       // 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;
+        server_declared_obj->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE);
 
       RTCORBA::PriorityBandedConnectionPolicy_var bands_policy =
         RTCORBA::PriorityBandedConnectionPolicy::_narrow (policies[0]);
@@ -224,14 +191,11 @@ Task::svc (void)
       // object is returned.
       object =
         client_propagated_obj->_set_policy_overrides (policies,
-                                                      CORBA::SET_OVERRIDE
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                      CORBA::SET_OVERRIDE);
 
       // Overwrite existing <client_propagated_obj>.
       client_propagated_obj =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       // Test: Attempt invocation on <client_propagated_obj> with
       // client thread priority not matching any of the bands.  Should
@@ -245,16 +209,12 @@ Task::svc (void)
         bands[bands->length () - 1].high + 1;
 
       // Reset the current thread's priority.
-      current->the_priority (client_priority
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      current->the_priority (client_priority);
 
       // 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;
+                                 client_priority);
 
       // Test: Make invocations on the <client_propagated_obj>.
       ACE_DEBUG ((LM_DEBUG,
@@ -270,15 +230,11 @@ Task::svc (void)
             (bands[i].low + bands[i].high) / 2;
 
           // Reset the current thread's priority.
-          current->the_priority (client_priority
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          current->the_priority (client_priority);
 
           // Invoke test method on server.
           client_propagated_obj->test_method (1, // CLIENT_PROPAGATED
-                                              client_priority
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                              client_priority);
         }
 
       // Test: Attempt invocation with the same thread priority, but
@@ -288,27 +244,21 @@ Task::svc (void)
 
       // Get the <server_priority> from the stub.
       CORBA::Short server_priority =
-        get_server_priority (server_declared_obj.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        get_server_priority (server_declared_obj.in ());
 
       // Invoke test method on server.
       server_declared_obj->test_method (0, // SERVER_DECLARED
-                                        server_priority
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        server_priority);
 
       // Testing over. Shut down Server ORB.
-      server_declared_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server_declared_obj->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Banded_Connections test client:");
+      ex._tao_print_exception (
+        "Unexpected exception in Banded_Connections test client:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -316,15 +266,13 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       // Parse arguments.
       int result =
@@ -375,13 +323,12 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Banded_Connections test client:");
+      ex._tao_print_exception (
+        "Unexpected exception in Banded_Connections test client:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index b45fef9cba9..69c5979a187 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -11,15 +11,13 @@ class Test_i : public POA_Test
 {
 public:
   Test_i (CORBA::ORB_ptr orb,
-          RTCORBA::PriorityBands &bands
-          ACE_ENV_ARG_DECL);
+          RTCORBA::PriorityBands &bands);
 
   void test_method (CORBA::Boolean client_propagated,
-                    CORBA::Short priority
-                    ACE_ENV_ARG_DECL_NOT_USED)
+                    CORBA::Short priority)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -29,34 +27,27 @@ private:
 };
 
 Test_i::Test_i (CORBA::ORB_ptr orb,
-                RTCORBA::PriorityBands &bands
-                ACE_ENV_ARG_DECL)
+                RTCORBA::PriorityBands &bands)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      bands_ (bands),
      rt_current_ ()
 {
   // We resolve and store the RT Current for later use.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RTCurrent"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("RTCurrent");
 
   this->rt_current_ =
-    RTCORBA::Current::_narrow (obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::Current::_narrow (obj.in ());
 }
 
 void
 Test_i::test_method (CORBA::Boolean client_propagated,
-                     CORBA::Short client_priority
-                     ACE_ENV_ARG_DECL)
+                     CORBA::Short client_priority)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // 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 +107,10 @@ 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;
+  this->orb_->shutdown (0);
 }
 
 //*************************************************************************
@@ -232,26 +221,19 @@ int
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
-               const char *filename
-               ACE_ENV_ARG_DECL)
+               const char *filename)
 {
   // Register servant with the POA.
   PortableServer::ObjectId_var id;
-  id = poa->activate_object (server_impl
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  id = poa->activate_object (server_impl);
 
   // Create object reference.
   CORBA::Object_var server =
-    poa->id_to_reference (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->id_to_reference (id.in ());
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in ()
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (server.in ());
 
   // Print ior to the file.
   if (filename != 0)
@@ -275,72 +257,62 @@ create_object (PortableServer::POA_ptr poa,
 void
 object_activation_exception_test (RTPortableServer::POA_ptr poa,
                                   Test_i *server_impl,
-                                  CORBA::Short priority
-                                  ACE_ENV_ARG_DECL)
+                                  CORBA::Short priority)
 {
-  ACE_TRY
+  try
     {
       // Register servant with POA.
       PortableServer::ObjectId_var id =
         poa->activate_object_with_priority (server_impl,
-                                            priority
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            priority);
 
       // This next line of code should not run because an exception
       // should have been raised.
       ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n"));
     }
-  ACE_CATCH (CORBA::BAD_PARAM, ex)
+  catch (const CORBA::BAD_PARAM&)
     {
       // Expected exception.
       ACE_DEBUG ((LM_DEBUG,
                   "BAD_PARAM exception is caught as expected.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Unexpected exception.
       ACE_DEBUG ((LM_DEBUG, "ERROR: unexpected exception caught\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 poa_creation_exception_test (PortableServer::POA_ptr root_poa,
                              PortableServer::POAManager_ptr manager,
-                             CORBA::PolicyList &policies
-                             ACE_ENV_ARG_DECL)
+                             CORBA::PolicyList &policies)
 {
-  ACE_TRY
+  try
     {
       // Create a POA with invalid policies.
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               manager,
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       // This next line of code should not run because an exception
       // should have been raised.
       ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n"));
     }
-  ACE_CATCH (PortableServer::POA::InvalidPolicy, ex)
+  catch (const PortableServer::POA::InvalidPolicy&)
     {
       // Expected exception.
       ACE_DEBUG ((LM_DEBUG,
                   "InvalidPolicy exception is caught as expected.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       // Unexpected exception.
       ACE_DEBUG ((LM_DEBUG, "ERROR: unexpected exception\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
@@ -348,15 +320,13 @@ main (int argc, char *argv[])
 {
   CORBA::ORB_var orb;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize ORB.
       orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       // Parse arguments.
       int result =
@@ -372,29 +342,21 @@ main (int argc, char *argv[])
 
       // Get the RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       // Get the RootPOA.
       object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       // 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.
@@ -438,9 +400,7 @@ main (int argc, char *argv[])
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              max_request_buffer_size);
 
       // Test: Attempt to create a POA with priority bands that do not
       // match the lanes.  Should get POA::InvalidPolicy exception.
@@ -457,23 +417,17 @@ main (int argc, char *argv[])
 
       // Create a bands policy.
       poa_policy_list[0] =
-        rt_orb->create_priority_banded_connection_policy (false_bands
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_priority_banded_connection_policy (false_bands);
 
       // Create a thread-pool policy.
       poa_policy_list[1] =
-        rt_orb->create_threadpool_policy (threadpool_id
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id);
 
       // Try to create a POA with invalid policies.  Should throw an
       // exception.
       poa_creation_exception_test (root_poa.in (),
                                    poa_manager.in (),
-                                   poa_policy_list
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   poa_policy_list);
 
       // Two policies for the next POA.
       poa_policy_list.length (2);
@@ -481,24 +435,18 @@ main (int argc, char *argv[])
       // Create a priority model policy.
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              0
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              0);
 
       // Create a thread-pool policy.
       poa_policy_list[1] =
-        rt_orb->create_threadpool_policy (threadpool_id
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id);
 
       // Create POA with CLIENT_PROPAGATED priority model, with lanes
       // but no bands.
       PortableServer::POA_var client_propagated_poa =
         root_poa->create_POA ("client_propagated_poa",
                               poa_manager.in (),
-                              poa_policy_list
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              poa_policy_list);
 
       // Three policies for the next POA.
       poa_policy_list.length (3);
@@ -510,30 +458,22 @@ main (int argc, char *argv[])
       // Create a priority model policy.
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
-                                              poa_priority
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              poa_priority);
 
       // Create a bands policy.
       poa_policy_list[1] =
-        rt_orb->create_priority_banded_connection_policy (bands
-                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_priority_banded_connection_policy (bands);
 
       // Create a thread-pool policy.
       poa_policy_list[2] =
-        rt_orb->create_threadpool_policy (threadpool_id
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id);
 
       // Create POA with SERVER_DECLARED priority model, with bands
       // and lanes.
       PortableServer::POA_var server_declared_poa =
         root_poa->create_POA ("server_declared_poa",
                               poa_manager.in (),
-                              poa_policy_list
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              poa_policy_list);
 
       // Test: Attempt to register an object with priority that
       // doesn't match lanes.  Should get BAD_PARAM exception.
@@ -541,58 +481,44 @@ main (int argc, char *argv[])
                   "\n<---Test--->: Servant priority does not match lanes\n\n"));
 
       RTPortableServer::POA_var rt_server_declared_poa =
-        RTPortableServer::POA::_narrow (server_declared_poa.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTPortableServer::POA::_narrow (server_declared_poa.in ());
 
       // Activation with incorrect priority should fail.
       CORBA::Short wrong_priority = 10000;
       object_activation_exception_test (rt_server_declared_poa.in (),
                                         0,
-                                        wrong_priority
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                        wrong_priority);
 
       // Create first servant and register with <client_propagated_poa>.
       Test_i server_impl (orb.in (),
-                          bands
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                          bands);
       result = create_object (client_propagated_poa.in (),
                               orb.in (),
                               &server_impl,
-                              ior_output_file1
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              ior_output_file1);
       if (result != 0)
         return result;
 
       // Create second servant and register with <server_declared_poa>.
       Test_i server_impl2 (orb.in (),
-                           bands
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                           bands);
       result = create_object (server_declared_poa.in (),
                               orb.in (),
                               &server_impl2,
-                              ior_output_file2
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              ior_output_file2);
       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)
+  catch (const CORBA::INTERNAL& exception)
     {
       int minor_code =
         exception.minor ();
@@ -620,13 +546,12 @@ main (int argc, char *argv[])
         // Unexpected error.
         ACE_ASSERT (0);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in Banded_Connections test server:");
+      ex._tao_print_exception (
+        "Unexpected exception caught in Banded_Connections test server:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
index d57bc36ba7f..5c4740ebcc8 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
@@ -14,22 +14,19 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 
 void
 Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   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 +35,10 @@ 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;
+  info->add_client_request_interceptor (client_interceptor.in ());
 }
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
index 569419fb346..c232ee05e1a 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
@@ -31,12 +31,10 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index dc1fe8657cd..87af90bca4c 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -60,15 +60,13 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior);
 
       Test_var server =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -81,13 +79,10 @@ Task::svc (void)
       // Check that the object is configured with CLIENT_PROPAGATED
       // PriorityModelPolicy.
       CORBA::Policy_var policy =
-        server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
       RTCORBA::PriorityModelPolicy_var priority_policy =
-        RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
       if (CORBA::is_nil (priority_policy.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -95,8 +90,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,
@@ -107,19 +101,13 @@ Task::svc (void)
       // Make several invocation, changing the priority of this thread
       // for each.
       object =
-        this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
-      object = this->orb_->resolve_initial_references ("PriorityMappingManager"
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = this->orb_->resolve_initial_references ("PriorityMappingManager");
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityMappingManager::_narrow (object.in ());
 
       RTCORBA::PriorityMapping *pm =
         mapping_manager->mapping ();
@@ -145,12 +133,10 @@ Task::svc (void)
 
       for (int i = 0; i < 3; ++i)
         {
-          current->the_priority (desired_priority ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          current->the_priority (desired_priority);
 
           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,
@@ -159,30 +145,25 @@ Task::svc (void)
                               -1);
 
 
-          server->test_method (priority ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->test_method (priority);
 
           desired_priority++;
         }
 
       // Shut down Server ORB.
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCH (CORBA::DATA_CONVERSION, ex)
+  catch (const CORBA::DATA_CONVERSION& ex)
     {
-      ACE_PRINT_EXCEPTION(ex,
-                          "Most likely, this is due to the in-ability "
-                          "to set the thread priority.");
+      ex._tao_print_exception (
+        "Most likely, this is due to the in-ability ""to set the thread priority.");
       return -1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -190,7 +171,7 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Register the interceptors to check for the RTCORBA
       // service contexts in the reply messages.
@@ -202,14 +183,11 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (initializer.in ());
 
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -256,13 +234,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index bd250e433e7..5b6980c223a 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -20,22 +20,21 @@ 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))
 {
 }
 
 void
 Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
@@ -43,8 +42,7 @@ Client_Request_Interceptor::send_poll (
 
 void
 Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -53,36 +51,31 @@ Client_Request_Interceptor::send_request (
 
 void
 Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  ACE_TRY
+  try
     {
       // Try to get the RTCorbaPriority context.  If its not there,
       // report the fact via an exception.
       IOP::ServiceContext_var sc =
-        ri->get_reply_service_context (IOP::RTCorbaPriority ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ri->get_reply_service_context (IOP::RTCorbaPriority);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
 
       ACE_DEBUG ((LM_DEBUG, "EXCEPTION was most likely caused by the lack "
                             "of an IOP::RTCorbaPriority context in the reply.\n"));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 
 }
 
 void
 Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -90,8 +83,7 @@ Client_Request_Interceptor::receive_other (
 
 void
 Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr ri)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -100,20 +92,15 @@ Client_Request_Interceptor::receive_exception (
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                    this->orb_id_.in ());
     }
 
-  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;
+    this->orb_->object_to_string (target.in ());
 
   ACE_DEBUG ((LM_DEBUG,
               "%s.received_exception "
@@ -121,11 +108,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;
+    ri->get_reply_service_context (IOP::RTCorbaPriority);
 }
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
index 414fa636345..83872792775 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
@@ -32,33 +32,28 @@ 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
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index 463429c1312..9c134b8a815 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -18,11 +18,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Short priority
-                    ACE_ENV_ARG_DECL_NOT_USED)
+  void test_method (CORBA::Short priority)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -36,27 +35,23 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (CORBA::Short priority
-                     ACE_ENV_ARG_DECL)
+Test_i::test_method (CORBA::Short priority)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use RTCurrent to find out the CORBA priority of the current
   // thread.
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("RTCurrent");
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::Current::_narrow (obj.in ());
 
   if (CORBA::is_nil (obj.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    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,10 +66,10 @@ 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);
+  this->orb_->shutdown (0);
 }
 
 //*************************************************************************
@@ -131,15 +126,13 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -147,21 +140,15 @@ 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 ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       // Create POA with CLIENT_PROPAGATED PriorityModelPolicy,
       // and register Test object with it.
@@ -169,32 +156,24 @@ Task::svc (void)
       poa_policy_list.length (1);
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              0
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              0);
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
-                              poa_policy_list
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              poa_policy_list);
 
       Test_i server_impl (this->orb_.in ());
 
       PortableServer::ObjectId_var id =
-        child_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->activate_object (&server_impl);
 
       CORBA::Object_var server =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->id_to_reference (id.in ());
 
       // Print Object IOR.
       CORBA::String_var ior =
-        this->orb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ()));
 
@@ -212,22 +191,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,
@@ -241,13 +216,11 @@ Task::svc (void)
                     " = its initial priority\n"));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -255,14 +228,13 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Standard initialization:
       // parse arguments and get all the references (ORB,
       // RootPOA, RTORB, RTCurrent, POAManager).
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -309,12 +281,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index 2ef31055c8f..1043ff145e0 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -64,39 +64,34 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 
 void
 exception_test (Test_ptr server,
-                const char *msg
-                ACE_ENV_ARG_DECL)
+                const char *msg)
 {
-  ACE_TRY
+  try
     {
-      server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->test_method ();
     }
-  ACE_CATCH (CORBA::INV_POLICY, ex)
+  catch (const CORBA::INV_POLICY& )
     {
       ACE_DEBUG ((LM_DEBUG,
                   "INV_POLICY exception is caught as expected.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG, msg));
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -104,49 +99,36 @@ 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;
+        orb->resolve_initial_references ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
       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;
+      object = orb->resolve_initial_references ("ORBPolicyManager");
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (object.in ());
       if (check_for_nil (policy_manager.in (), "PolicyManager")
           == -1)
         return -1;
 
       // PolicyCurrent.
-      object = orb->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      object = orb->resolve_initial_references ("PolicyCurrent");
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
       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;
+      object = orb->string_to_object (ior1);
+      Test_var server1 = Test::_narrow (object.in ());
       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;
+      object = orb->string_to_object (ior2);
+      Test_var server2 = Test::_narrow (object.in ());
       if (check_for_nil (server2.in (), "server2") == -1)
         return -1;
 
@@ -156,8 +138,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
@@ -176,18 +157,13 @@ main (int argc, char *argv[])
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_client_protocol_policy (protocols);
 
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
       exception_test (server1.in (),
-                      "ERROR: Test 2 failed\n" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      "ERROR: Test 2 failed\n");
 
       // Test 3: Attempt the invocation on the second object reference
       // (the one that didn't have ClientProtocolPolicy set on the
@@ -195,8 +171,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
@@ -212,18 +187,13 @@ main (int argc, char *argv[])
       protocols[1].protocol_type = 4;
       protocols[2].protocol_type = 5;
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_client_protocol_policy (protocols);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
       exception_test (server2.in (),
-                      "ERROR: Test 4 failed\n" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                      "ERROR: Test 4 failed\n");
 
       // Test 5: Override ClientProtocolPolicy on the Current level
       // again.  This time use the sequence in which the first
@@ -235,35 +205,28 @@ main (int argc, char *argv[])
       protocols[0].protocol_type = 3;
       protocols[1].protocol_type = protocol_type;
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_client_protocol_policy (protocols);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
-      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.
       ACE_OS::sleep (5);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in ClientProtocolPolicy test client:");
+      ex._tao_print_exception (
+        "Unexpected exception caught in ClientProtocolPolicy test client:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 6b4cc59125f..28137e09aa0 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:
@@ -33,7 +33,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+Test_i::test_method ( /**/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -41,12 +41,12 @@ 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,
               "(%P|%t) Shutting down \n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 //*************************************************************************
@@ -114,23 +114,18 @@ int
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
-               const char *filename
-               ACE_ENV_ARG_DECL)
+               const char *filename)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->activate_object (server_impl);
 
   CORBA::Object_var server =
-    poa->id_to_reference (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->id_to_reference (id.in ());
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (server.in ());
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
 
@@ -153,12 +148,11 @@ create_object (PortableServer::POA_ptr poa,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -166,28 +160,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;
+        orb->resolve_initial_references ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
       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;
+        orb->resolve_initial_references("RootPOA");
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       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;
@@ -203,16 +191,12 @@ main (int argc, char *argv[])
       CORBA::PolicyList poa_policy_list;
       poa_policy_list.length (1);
       poa_policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_client_protocol_policy (protocols);
 
       PortableServer::POA_var poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
-                              poa_policy_list
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              poa_policy_list);
 
       // Servant.
       Test_i server_impl (orb.in ());
@@ -221,35 +205,30 @@ main (int argc, char *argv[])
       int result;
       ACE_DEBUG ((LM_DEBUG, "\nActivated object one as "));
       result = create_object (poa.in (), orb.in (), &server_impl,
-                              ior_output_file1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              ior_output_file1);
       if (result == -1)
         return -1;
 
       // Create object 2.
       ACE_DEBUG ((LM_DEBUG, "\nActivated object two as "));
       result = create_object (root_poa.in (), orb.in (), &server_impl,
-                              ior_output_file2 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              ior_output_file2);
       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"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in ClientProtocolPolicy: test server");
+      ex._tao_print_exception (
+        "Unexpected exception caught in ClientProtocolPolicy: test server");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index fa40bd0ca34..efbdd6407a8 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -26,24 +26,22 @@ typedef ACE_Array_Base<Test_Object_And_Servant> Tests;
 void
 setup_test_parameters (Test_Object_And_Servant *test,
                        RTCORBA::Current_ptr current,
-                       CORBA::ORB_ptr orb
-                       ACE_ENV_ARG_DECL);
+                       CORBA::ORB_ptr orb);
 class test_i :
   public POA_test
 {
 public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa,
-          Tests &tests
-          ACE_ENV_ARG_DECL);
+          Tests &tests);
 
-  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);
 
@@ -99,8 +97,7 @@ private:
 
 test_i::test_i (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa,
-                Tests &tests
-                ACE_ENV_ARG_DECL)
+                Tests &tests)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa)),
     tests_ (tests),
@@ -111,14 +108,10 @@ test_i::test_i (CORBA::ORB_ptr orb,
     invocation_priority_ (0)
 {
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RTCurrent"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("RTCurrent");
 
   this->current_ =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::Current::_narrow (object.in ());
 }
 
 int
@@ -214,7 +207,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,
@@ -233,30 +226,20 @@ test_i::start (ACE_ENV_SINGLE_ARG_DECL)
 
       setup_test_parameters (test,
                              this->current_.in (),
-                             this->orb_.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             this->orb_.in ());
 
-      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;
+        this->orb_->object_to_string (test->object_.in ());
 
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        this->orb_->string_to_object (ior.in ());
 
       test_var test_from_string =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        test::_narrow (object.in ());
 
-      test_from_string->method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      test_from_string->method ();
 
       iterator.advance ();
     }
@@ -304,14 +287,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 ());
 }
@@ -319,12 +302,10 @@ test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 setup_test_parameters (Test_Object_And_Servant *test,
                        RTCORBA::Current_ptr current,
-                       CORBA::ORB_ptr orb
-                       ACE_ENV_ARG_DECL)
+                       CORBA::ORB_ptr orb)
 {
   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 ())
@@ -374,20 +355,17 @@ setup_test_parameters (Test_Object_And_Servant *test,
 class Server
 {
 public:
-  Server (CORBA::ORB_ptr orb
-          ACE_ENV_ARG_DECL);
+  Server (CORBA::ORB_ptr orb);
 
-  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
-                                              ACE_ENV_ARG_DECL);
+                                              RTCORBA::PriorityModel priority_model);
   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);
+                                                         RTCORBA::PriorityModel priority_model);
+  void test (void);
+  void start_testing (void);
+  void shutdown (void);
 
   CORBA::ORB_var orb_;
   RTCORBA::RTORB_var rt_orb_;
@@ -406,8 +384,7 @@ public:
   CORBA::ULong max_request_buffer_size_;
 };
 
-Server::Server (CORBA::ORB_ptr orb
-                ACE_ENV_ARG_DECL)
+Server::Server (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     stacksize_ (0),
     static_threads_ (1),
@@ -418,58 +395,41 @@ Server::Server (CORBA::ORB_ptr orb
     max_request_buffer_size_ (0)
 {
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RTORB"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("RTORB");
 
   this->rt_orb_ =
-    RTCORBA::RTORB::_narrow (object.in ()
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::RTORB::_narrow (object.in ());
 
   object =
-    this->orb_->resolve_initial_references ("RTCurrent"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("RTCurrent");
 
   this->current_ =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::Current::_narrow (object.in ());
 
   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->orb_->resolve_initial_references ("RootPOA");
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (object.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    PortableServer::POA::_narrow (object.in ());
 
   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,
                     test_i (this->orb_.in (),
                             this->root_poa_.in (),
-                            this->tests_
-                            ACE_ENV_ARG_PARAMETER),
+                            this->tests_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   servant->invocation_pool_and_lane (0, 0);
   servant->in_lane (0);
@@ -481,15 +441,13 @@ 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
 Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
                                                int set_priority_model,
-                                               RTCORBA::PriorityModel priority_model
-                                               ACE_ENV_ARG_DECL)
+                                               RTCORBA::PriorityModel priority_model)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     this->rt_orb_->create_threadpool (this->stacksize_,
@@ -498,20 +456,14 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
                                       default_thread_priority,
                                       this->allow_request_buffering_,
                                       this->max_buffered_requests_,
-                                      this->max_request_buffer_size_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      this->max_request_buffer_size_);
 
   CORBA::Policy_var threadpool_policy =
-    this->rt_orb_->create_threadpool_policy (threadpool_id
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->rt_orb_->create_threadpool_policy (threadpool_id);
 
   CORBA::Policy_var priority_model_policy =
     this->rt_orb_->create_priority_model_policy (priority_model,
-                                                 default_thread_priority
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                 default_thread_priority);
 
   CORBA::PolicyList policies;
 
@@ -529,23 +481,17 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (poa_name,
                                  this->poa_manager_.in (),
-                                 policies
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policies);
 
   RTPortableServer::POA_var rt_poa =
-    RTPortableServer::POA::_narrow (poa.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTPortableServer::POA::_narrow (poa.in ());
 
   test_i *servant1 = 0;
   ACE_NEW_THROW_EX (servant1,
                     test_i (this->orb_.in (),
                             poa.in (),
-                            this->tests_
-                            ACE_ENV_ARG_PARAMETER),
+                            this->tests_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   servant1->in_lane (0);
 
@@ -559,9 +505,7 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
           servant1->client_propagated (1);
 
           id1 =
-            rt_poa->activate_object (servant1
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+            rt_poa->activate_object (servant1);
         }
       else
         {
@@ -570,10 +514,8 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
           ACE_NEW_THROW_EX (servant2,
                             test_i (this->orb_.in (),
                                     poa.in (),
-                                    this->tests_
-                                    ACE_ENV_ARG_PARAMETER),
+                                    this->tests_),
                             CORBA::NO_MEMORY ());
-          ACE_CHECK;
 
           servant2->in_lane (0);
 
@@ -590,28 +532,20 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
 
           id1 =
             rt_poa->activate_object_with_priority (servant1,
-                                                   default_thread_priority + 1
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                                   default_thread_priority + 1);
 
           id2 =
             rt_poa->activate_object_with_priority (servant2,
-                                                   default_thread_priority
-                                                   ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+                                                   default_thread_priority);
 
           CORBA::Object_var object2 =
-            poa->id_to_reference (id2.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+            poa->id_to_reference (id2.in ());
 
           this->tests_.size (this->tests_.size () + 1);
           this->tests_[this->tests_.size () - 1].object_ =
-            test::_narrow (object2.in ()
-                           ACE_ENV_ARG_PARAMETER);
+            test::_narrow (object2.in ());
           this->tests_[this->tests_.size () - 1].servant_ =
             servant2;
-          ACE_CHECK;
         }
     }
   else
@@ -619,31 +553,24 @@ Server::create_poa_and_servant_with_tp_policy (const char *poa_name,
       servant1->invocation_pool_and_lane (3, 0);
 
       id1 =
-        rt_poa->activate_object (servant1
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rt_poa->activate_object (servant1);
     }
 
   PortableServer::ServantBase_var safe_servant (servant1);
 
   CORBA::Object_var object1 =
-    poa->id_to_reference (id1.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id_to_reference (id1.in ());
 
   this->tests_.size (this->tests_.size () + 1);
   this->tests_[this->tests_.size () - 1].object_ =
-    test::_narrow (object1.in ()
-                   ACE_ENV_ARG_PARAMETER);
+    test::_narrow (object1.in ());
   this->tests_[this->tests_.size () - 1].servant_ =
     servant1;
-  ACE_CHECK;
 }
 
 void
 Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
-                                                          RTCORBA::PriorityModel priority_model
-                                                          ACE_ENV_ARG_DECL)
+                                                          RTCORBA::PriorityModel priority_model)
 {
   RTCORBA::ThreadpoolLanes lanes (2);
   lanes.length (2);
@@ -662,20 +589,14 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                                  this->allow_borrowing_,
                                                  this->allow_request_buffering_,
                                                  this->max_buffered_requests_,
-                                                 this->max_request_buffer_size_
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                 this->max_request_buffer_size_);
 
   CORBA::Policy_var threadpool_policy =
-    this->rt_orb_->create_threadpool_policy (threadpool_id
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->rt_orb_->create_threadpool_policy (threadpool_id);
 
   CORBA::Policy_var priority_model_policy =
     this->rt_orb_->create_priority_model_policy (priority_model,
-                                                 default_thread_priority
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                 default_thread_priority);
 
   CORBA::PolicyList policies;
 
@@ -690,23 +611,17 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (poa_name,
                                  this->poa_manager_.in (),
-                                 policies
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policies);
 
   RTPortableServer::POA_var rt_poa =
-    RTPortableServer::POA::_narrow (poa.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTPortableServer::POA::_narrow (poa.in ());
 
   test_i *servant1 = 0;
   ACE_NEW_THROW_EX (servant1,
                     test_i (this->orb_.in (),
                             poa.in (),
-                            this->tests_
-                            ACE_ENV_ARG_PARAMETER),
+                            this->tests_),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK;
 
   servant1->in_lane (1);
 
@@ -720,9 +635,7 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
       servant1->client_propagated (1);
 
       id1 =
-        rt_poa->activate_object (servant1
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        rt_poa->activate_object (servant1);
     }
   else
     {
@@ -731,10 +644,8 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
       ACE_NEW_THROW_EX (servant2,
                         test_i (this->orb_.in (),
                                 poa.in (),
-                                this->tests_
-                                ACE_ENV_ARG_PARAMETER),
+                                this->tests_),
                         CORBA::NO_MEMORY ());
-      ACE_CHECK;
 
       servant2->in_lane (1);
 
@@ -751,46 +662,34 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
 
       id1 =
         rt_poa->activate_object_with_priority (servant1,
-                                               default_thread_priority + 1
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               default_thread_priority + 1);
 
       id2 =
         rt_poa->activate_object_with_priority (servant2,
-                                               default_thread_priority
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                               default_thread_priority);
 
       CORBA::Object_var object2 =
-        poa->id_to_reference (id2.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        poa->id_to_reference (id2.in ());
 
       this->tests_.size (this->tests_.size () + 1);
       this->tests_[this->tests_.size () - 1].object_ =
-        test::_narrow (object2.in ()
-                       ACE_ENV_ARG_PARAMETER);
+        test::_narrow (object2.in ());
       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;
+    poa->id_to_reference (id1.in ());
 
   this->tests_.size (this->tests_.size () + 1);
   this->tests_[this->tests_.size () - 1].object_ =
-    test::_narrow (object1.in ()
-                   ACE_ENV_ARG_PARAMETER);
+    test::_narrow (object1.in ());
   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 ())
@@ -800,42 +699,33 @@ Server::start_testing (ACE_ENV_SINGLE_ARG_DECL)
 
       setup_test_parameters (test,
                              this->current_.in (),
-                             this->orb_.in ()
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                             this->orb_.in ());
 
-      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->current_->the_priority (default_thread_priority + 1);
 
-  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_->shutdown (1);
 
-  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->destroy ();
 }
 
 class Task : public ACE_Task_Base
@@ -861,56 +751,39 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      Server server (this->orb_.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Server server (this->orb_.in ());
 
-      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;
+                                                    RTCORBA::CLIENT_PROPAGATED);
 
       server.create_poa_and_servant_with_tp_policy ("tp_server_declared_poa",
                                                     1,
-                                                    RTCORBA::SERVER_DECLARED
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    RTCORBA::SERVER_DECLARED);
 
       server.create_poa_and_servant_with_tp_policy ("tp_no_priority_model_poa",
                                                     0,
-                                                    RTCORBA::CLIENT_PROPAGATED
-                                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                    RTCORBA::CLIENT_PROPAGATED);
 
       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;
+                                                               RTCORBA::CLIENT_PROPAGATED);
 
       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;
+                                                               RTCORBA::SERVER_DECLARED);
 
-      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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -918,14 +791,12 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       // Make sure we can support multiple priorities that are
       // required for this test.
@@ -969,13 +840,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index ed68835f061..d934d699c75 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -43,8 +43,7 @@ parse_args (int argc, char *argv[])
 }
 
 RTCORBA::ThreadpoolId
-create_threadpool (RTCORBA::RTORB_ptr rt_orb
-                   ACE_ENV_ARG_DECL)
+create_threadpool (RTCORBA::RTORB_ptr rt_orb)
 {
   RTCORBA::ThreadpoolId id =
     rt_orb->create_threadpool (stacksize,
@@ -53,16 +52,13 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb
                                default_thread_priority,
                                allow_request_buffering,
                                max_buffered_requests,
-                               max_request_buffer_size
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                               max_request_buffer_size);
 
   return id;
 }
 
 RTCORBA::ThreadpoolId
-create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb
-                              ACE_ENV_ARG_DECL)
+create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb)
 {
   RTCORBA::ThreadpoolLanes lanes (2);
   lanes.length (2);
@@ -81,9 +77,7 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb
                                           allow_borrowing,
                                           allow_request_buffering,
                                           max_buffered_requests,
-                                          max_request_buffer_size
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+                                          max_request_buffer_size);
 
   return id;
 }
@@ -91,38 +85,27 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        orb->resolve_initial_references ("RTCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       int result =
         parse_args (argc, argv);
@@ -135,34 +118,23 @@ main (int argc, char *argv[])
            ++i)
         {
           RTCORBA::ThreadpoolId id =
-            create_threadpool (rt_orb.in ()
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            create_threadpool (rt_orb.in ());
 
-          rt_orb->destroy_threadpool (id
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          rt_orb->destroy_threadpool (id);
 
           id =
-            create_threadpool_with_lanes (rt_orb.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            create_threadpool_with_lanes (rt_orb.in ());
 
-          rt_orb->destroy_threadpool (id
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          rt_orb->destroy_threadpool (id);
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp
index 1956eb1e5ac..c2eafe73c8d 100644
--- a/TAO/tests/RTCORBA/Diffserv/client.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/client.cpp
@@ -26,16 +26,13 @@ change_network_priority (int enable_network_priority,
                          Test_var &server,
                          CORBA::ORB_ptr orb)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       // Set the tcp protocol protperties
       RTCORBA::TCPProtocolProperties_var tcp_properties =
@@ -44,9 +41,7 @@ change_network_priority (int enable_network_priority,
                                                 1,
                                                 0,
                                                 1,
-                                                enable_network_priority
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                enable_network_priority);
 
       RTCORBA::ProtocolList protocols;
       protocols.length (1);
@@ -59,27 +54,20 @@ change_network_priority (int enable_network_priority,
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_client_protocol_policy (protocols);
 
       switch (level)
         {
           // Change policy at ORB level
         case ORB:
           {
-            object = orb->resolve_initial_references ("ORBPolicyManager"
-                                                      ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            object = orb->resolve_initial_references ("ORBPolicyManager");
 
             CORBA::PolicyManager_var policy_manager =
-              CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              CORBA::PolicyManager::_narrow (object.in ());
 
             policy_manager->set_policy_overrides (policy_list,
-                                                  CORBA::SET_OVERRIDE
-                                                  ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                                                  CORBA::SET_OVERRIDE);
 
             break;
           }
@@ -88,18 +76,13 @@ change_network_priority (int enable_network_priority,
         case THREAD:
           {
             object =
-              orb->resolve_initial_references ("PolicyCurrent"
-                                               ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              orb->resolve_initial_references ("PolicyCurrent");
 
             CORBA::PolicyCurrent_var policy_current =
-              CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+              CORBA::PolicyCurrent::_narrow (object.in ());
 
             policy_current->set_policy_overrides (policy_list,
-                                                  CORBA::SET_OVERRIDE
-                                                  ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                                                  CORBA::SET_OVERRIDE);
 
             break;
           }
@@ -108,23 +91,18 @@ change_network_priority (int enable_network_priority,
         case OBJECT:
           {
             CORBA::Object_var object = server->_set_policy_overrides (policy_list,
-                                                                      CORBA::SET_OVERRIDE
-                                                                      ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+                                                                      CORBA::SET_OVERRIDE);
 
-            server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            server = Test::_narrow (object.in ());
 
             break;
           }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
 }
 
 int
@@ -185,34 +163,27 @@ toggle (int &i)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       // 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;
+        orb->string_to_object (ior);
 
       Test_var server =
-        Test::_narrow (client_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (client_object.in ());
 
       // Resolve the Network priority Mapping Manager
       CORBA::Object_var object =
-        orb->resolve_initial_references ("NetworkPriorityMappingManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NetworkPriorityMappingManager");
 
       RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
-        RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ());
 
       // Initialize the custom priority mapping
       Custom_Network_Priority_Mapping *cnpm = 0;
@@ -250,24 +221,20 @@ 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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index cee01e1b4f7..076f959d777 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,10 +39,10 @@ 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);
+  this->orb_->shutdown (0);
 }
 
 static const char *simple_servant_ior_file = "simple_servant.ior";
@@ -79,23 +79,17 @@ void
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                PortableServer::Servant servant,
-               const char *filename
-               ACE_ENV_ARG_DECL)
+               const char *filename)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (servant
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->activate_object (servant);
 
   CORBA::Object_var object =
-    poa->id_to_reference (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id_to_reference (id.in ());
 
   CORBA::String_var ior =
-    orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->object_to_string (object.in ());
 
   FILE *output_file= ACE_OS::fopen (filename, "w");
   ACE_OS::fprintf (output_file, "%s", ior.in ());
@@ -105,15 +99,13 @@ create_object (PortableServer::POA_ptr poa,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object;
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -121,18 +113,14 @@ main (int argc, char *argv[])
 
       // RootPOA.
       object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       // 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 ());
@@ -141,19 +129,13 @@ main (int argc, char *argv[])
       create_object (root_poa.in (),
                      orb.in (),
                      &servant,
-                     simple_servant_ior_file
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     simple_servant_ior_file);
 
       object =
-        orb->resolve_initial_references ("NetworkPriorityMappingManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NetworkPriorityMappingManager");
 
       RTCORBA::NetworkPriorityMappingManager_var mapping_manager =
-        RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::NetworkPriorityMappingManager::_narrow (object.in ());
 
       Custom_Network_Priority_Mapping *cnpm = 0;
       ACE_NEW_RETURN  (cnpm,
@@ -166,14 +148,10 @@ main (int argc, char *argv[])
 
       // RTORB.
       object =
-        orb->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       // Set transport protocol properties
       RTCORBA::TCPProtocolProperties_var tcp_properties =
@@ -182,9 +160,7 @@ main (int argc, char *argv[])
                                                 1,
                                                 0,
                                                 1,
-                                                1
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                1);
 
       RTCORBA::ProtocolList protocols;
       protocols.length (1);
@@ -198,43 +174,33 @@ main (int argc, char *argv[])
       policy_list.length (1);
 
       policy_list[0] =
-        rt_orb->create_server_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_server_protocol_policy (protocols);
 
       // Create POA with Diffserv enabled
       PortableServer::POA_var poa_with_diffserv =
         root_poa->create_POA ("POA_WITH_DS",
                               poa_manager.in (),
-                              policy_list
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policy_list);
 
       // Create object 2.
       create_object (poa_with_diffserv.in (),
                      orb.in (),
                      &servant,
-                     diffserv_servant_ior_file
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     diffserv_servant_ior_file);
 
       // 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"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught:");
+      ex._tao_print_exception ("Unexpected exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
index abe1dd456ec..9570ad96270 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
@@ -75,15 +75,13 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior);
 
       test_var test =
-        test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       pid_t pid =
         ACE_OS::getpid ();
@@ -96,9 +94,7 @@ Task::svc (void)
           CORBA::Long r =
             test->method (pid,
                           i,
-                          mtc
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                          mtc);
 
           // Each 2 iterations sleep 5 seconds
           if (i % 2 == 0)
@@ -129,8 +125,7 @@ Task::svc (void)
       CORBA::Long re =
         test->method (pid,
                       0,
-                      end
-                      ACE_ENV_ARG_PARAMETER);
+                      end);
 
       ACE_ASSERT (re == 0);
       // Assert disappears on with optimizations on.
@@ -143,17 +138,14 @@ Task::svc (void)
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -161,11 +153,10 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       int result =
         parse_args (argc, argv);
@@ -214,12 +205,11 @@ main (int argc, char *argv[])
           ACE_ERROR_RETURN ((LM_ERROR, "ERROR: Number of threads didn't decrease\n"), -1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
index ea5dc6db558..384c3944762 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
@@ -59,13 +59,10 @@ parse_args (int argc, char *argv[])
 
 int
 write_ior_to_file (CORBA::ORB_ptr orb,
-                   test_ptr test
-                   ACE_ENV_ARG_DECL)
+                   test_ptr test)
 {
   CORBA::String_var ior =
-    orb->object_to_string (test
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (test);
 
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
@@ -98,8 +95,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
                                  PortableServer::POAManager_ptr poa_manager,
                                  PortableServer::POA_ptr root_poa,
                                  CORBA::ORB_ptr orb,
-                                 RTCORBA::RTORB_ptr rt_orb
-                                 ACE_ENV_ARG_DECL)
+                                 RTCORBA::RTORB_ptr rt_orb)
 {
   // Policies for the firstPOA to be created.
   CORBA::PolicyList policies (3); policies.length (3);
@@ -107,9 +103,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   // Implicit_activation policy.
   policies[0] =
     root_poa->create_implicit_activation_policy
-    (PortableServer::IMPLICIT_ACTIVATION
-     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    (PortableServer::IMPLICIT_ACTIVATION);
 
   // Thread pool policy.
   policies[1] =
@@ -118,25 +112,20 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   // Priority Model policy.
   policies[2] =
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                          0);
 
   // Create the POA under the RootPOA.
   PortableServer::POA_var poa =
     root_poa->create_POA (poa_name,
                           poa_manager,
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                          policies);
 
   // 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 +137,11 @@ 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);
+                       test.in ());
 
   return result;
 }
@@ -183,64 +169,46 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       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;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       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;
+                           test.in ());
 
       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;
@@ -254,14 +222,10 @@ Task::svc (void)
                                    default_thread_priority,
                                    allow_request_buffering,
                                    max_buffered_requests,
-                                   max_request_buffer_size
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   max_request_buffer_size);
 
       CORBA::Policy_var threadpool_policy_1 =
-        rt_orb->create_threadpool_policy (threadpool_id_1
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id_1);
 
       CORBA::Boolean allow_borrowing = 0;
       RTCORBA::ThreadpoolLanes lanes (1);
@@ -277,14 +241,10 @@ Task::svc (void)
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              max_request_buffer_size);
 
       CORBA::Policy_var threadpool_policy_2 =
-        rt_orb->create_threadpool_policy (threadpool_id_2
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id_2);
 
       result =
         create_POA_and_register_servant (threadpool_policy_1.in (),
@@ -292,9 +252,7 @@ Task::svc (void)
                                          poa_manager.in (),
                                          root_poa.in (),
                                          this->orb_.in (),
-                                         rt_orb.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         rt_orb.in ());
       if (result != 0)
         return result;
 
@@ -304,25 +262,19 @@ Task::svc (void)
                                          poa_manager.in (),
                                          root_poa.in (),
                                          this->orb_.in (),
-                                         rt_orb.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         rt_orb.in ());
       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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -330,14 +282,12 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       int result =
         parse_args (argc, argv);
@@ -386,12 +336,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
index 6fbd244dd26..231ed2d2f02 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
@@ -20,8 +20,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 CORBA::Long
 test_i::method (CORBA::Long client_id,
                 CORBA::Long iteration,
-                CORBA::Long_out thread_count
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CORBA::Long_out thread_count)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
@@ -56,16 +55,14 @@ 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;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
index 7951ca0854c..dbceb65c9ab 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
@@ -22,16 +22,15 @@ public:
   /// Test method.
   CORBA::Long method (CORBA::Long client_id,
                       CORBA::Long iteration,
-                      CORBA::Long_out thread_count
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      CORBA::Long_out thread_count)
     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..1ef938988dd 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -48,14 +48,13 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB, parse arguments, and resolve references.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -63,30 +62,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;
+        orb->resolve_initial_references ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
       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;
+      object = orb->resolve_initial_references ("PolicyCurrent");
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
       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;
+      object = orb->string_to_object (ior);
+      Test_var server = Test::_narrow (object.in ());
       if (check_for_nil (server.in (), "server") == -1)
         return -1;
 
@@ -107,22 +98,16 @@ main (int argc, char *argv[])
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_client_protocol_policy (protocols);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 1\n"));
 
       CORBA::PolicyList_var pols;
-      int status = server->_validate_connection (pols.out ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      int status = server->_validate_connection (pols.out ());
 
       if (!status)
         ACE_DEBUG ((LM_DEBUG,
@@ -134,8 +119,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
@@ -149,18 +133,12 @@ main (int argc, char *argv[])
 
       protocols[0].protocol_type = TAO_TAG_UIOP_PROFILE;
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_client_protocol_policy (protocols);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
-      status = server->_validate_connection (pols.out ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      status = server->_validate_connection (pols.out ());
 
       if (status)
         ACE_DEBUG ((LM_DEBUG,
@@ -185,30 +163,24 @@ main (int argc, char *argv[])
       // Testing over.  Shut down Server ORB.
       protocols[0].protocol_type = TAO_TAG_SHMEM_PROFILE;
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_client_protocol_policy (protocols);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
       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);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in Explicit_Binding test client:");
+      ex._tao_print_exception (
+        "Unexpected exception caught in Explicit_Binding test client:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index 7c434d0c2e5..eb3ba8daff6 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:
@@ -34,7 +34,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
+Test_i::test_method (/* */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -42,10 +42,10 @@ 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);
+  this->orb_->shutdown (0);
 }
 
 //*************************************************************************
@@ -95,24 +95,19 @@ int
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
-               const char *filename
-               ACE_ENV_ARG_DECL)
+               const char *filename)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
+    poa->activate_object (server_impl);
 
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
-    poa->id_to_reference (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->id_to_reference (id.in ());
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (server.in ());
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
 
@@ -135,12 +130,11 @@ create_object (PortableServer::POA_ptr poa,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -148,18 +142,15 @@ main (int argc, char *argv[])
 
       // RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       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 ());
@@ -169,28 +160,23 @@ main (int argc, char *argv[])
       result = create_object (root_poa.in (),
                               orb.in (),
                               &server_impl,
-                              ior_output_file
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              ior_output_file);
       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"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in Explicit_Binding test server:");
+      ex._tao_print_exception (
+        "Unexpected exception caught in Explicit_Binding test server:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index 6588b34f7a4..3f5f1a6179c 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
@@ -108,57 +108,47 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
   int current_attempt = 0;
   for (;;)
     {
-      ACE_TRY
+      try
         {
           ++current_attempt;
-          this->test_->_validate_connection (inconsistent_policies.out ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_->_validate_connection (inconsistent_policies.out ());
 
           // If successful, we are done.
           return;
         }
-      ACE_CATCH (CORBA::TRANSIENT, exception)
+      catch (const CORBA::TRANSIENT& )
         {
           // If we have reach our maximum number of tries, throw exception.
           if (current_attempt == max_attempts)
-            ACE_RE_THROW;
+            throw;
           // Otherwise, ignore...
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Rethrow any other exceptions.
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 int
 Worker_Thread::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->current_->the_priority (this->priority_
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_->the_priority (this->priority_);
 
-      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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Worker Thread exception:");
+      ex._tao_print_exception ("Worker Thread exception:");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -185,51 +175,33 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
-      current->the_priority (0
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      current->the_priority (0);
 
       object =
-        this->orb_->resolve_initial_references ("ORBPolicyManager"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (object.in ());
 
       object =
-        this->orb_->string_to_object (ior
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior);
 
       test_var test =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       ULong_Array priorities;
       int result =
@@ -248,16 +220,12 @@ Task::svc (void)
                             bands_file,
                             rt_orb.in (),
                             policies,
-                            debug
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            debug);
       if (result != 0)
         return result;
 
       policy_manager->set_policy_overrides (policies,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
       u_long i = 0;
 
@@ -305,16 +273,14 @@ Task::svc (void)
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!");
+      ex._tao_print_exception ("Unexpected exception!");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -322,14 +288,12 @@ Task::svc (void)
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result =
         parse_args (argc, argv);
@@ -378,12 +342,11 @@ main (int argc, char **argv)
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!");
+      ex._tao_print_exception ("Unexpected exception!");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 9129c0f3ee9..c48b57143ca 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,19 +45,17 @@ 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,
               "test_i::shutdown\n"));
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 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 ());
 }
@@ -115,17 +113,14 @@ parse_args (int argc, char **argv)
 static void
 write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb,
-                    const char *filename
-                    ACE_ENV_ARG_DECL)
+                    const char *filename)
 {
   FILE *file =
     ACE_OS::fopen (filename, "w");
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
-    orb->object_to_string (object
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->object_to_string (object);
 
   u_int result = 0;
   result =
@@ -162,31 +157,22 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       CORBA::PolicyList policies;
 
@@ -195,9 +181,7 @@ Task::svc (void)
                             bands_file,
                             rt_orb.in (),
                             policies,
-                            debug
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            debug);
       if (result != 0)
         return result;
 
@@ -213,23 +197,17 @@ Task::svc (void)
                             max_request_buffer_size,
                             allow_borrowing,
                             policies,
-                            debug
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            debug);
       if (result != 0)
         return result;
 
       CORBA::Policy_var priority_model_policy =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              0
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              0);
 
       // 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;
+        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
       policies.length (policies.length () + 1);
       policies[policies.length () - 1] =
@@ -242,44 +220,34 @@ Task::svc (void)
       PortableServer::POA_var poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
       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;
+                          ior);
 
-      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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -287,14 +255,12 @@ Task::svc (void)
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result =
         parse_args (argc, argv);
@@ -343,12 +309,11 @@ main (int argc, char **argv)
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index de8d374edf7..44c955037cf 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -163,17 +163,13 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Priority Mapping Manager.
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("PriorityMappingManager"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PriorityMappingManager");
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityMappingManager::_narrow (object.in ());
       if (check_for_nil (mapping_manager.in (), "Mapping Manager") == -1)
         return -1;
 
@@ -182,40 +178,32 @@ Task::svc (void)
 
       // RTCurrent.
       object =
-        this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
       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;
+        this->orb_->string_to_object (ior);
+      Test_var server = Test::_narrow (object.in ());
       if (check_for_nil (server.in (), "Test object") == -1)
         return -1;
 
       // Check that test object is configured with CLIENT_PROPAGATED
       // PriorityModelPolicy.
       CORBA::Policy_var policy =
-        server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
       RTCORBA::PriorityModelPolicy_var priority_policy =
-        RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
       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 != "
@@ -274,18 +262,15 @@ 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;
+      current->the_priority (priority1);
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in MT_Client_Protocol_Priority test client:");
+      ex._tao_print_exception (
+        "Unexpected exception in MT_Client_Protocol_Priority test client:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -293,14 +278,13 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -348,13 +332,12 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in MT_Client_Protocol_Priority test client:");
+      ex._tao_print_exception (
+        "Unexpected exception in MT_Client_Protocol_Priority test client:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -375,26 +358,20 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb,
 int
 Worker_Thread::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // 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;
+        this->orb_->resolve_initial_references ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 0;
 
       // PolicyCurrent.
       object =
-        this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("PolicyCurrent");
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return 0;
@@ -411,14 +388,10 @@ Worker_Thread::svc (void)
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_client_protocol_policy (protocols);
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
       // Wait for other threads.
       this->synchronizer_->wait ();
@@ -426,15 +399,12 @@ 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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Worker Thread exception:");
+      ex._tao_print_exception ("Worker Thread exception:");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 893dbddf688..d54be8f5548 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:
@@ -35,17 +35,17 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
+Test_i::test_method ( /* */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "test_method invoked\n"));
 }
 
 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);
+  this->orb_->shutdown (0);
 }
 
 //*************************************************************************
@@ -114,65 +114,51 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // 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;
+        this->orb_->resolve_initial_references ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
       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;
+        this->orb_->resolve_initial_references("RootPOA");
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       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;
       poa_policy_list.length (1);
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              0
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              0);
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
-                              poa_policy_list
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              poa_policy_list);
 
       // 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;
+        child_poa->activate_object (&server_impl);
 
       CORBA::Object_var server =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        child_poa->id_to_reference (id.in ());
 
       // Print Object IOR.
       CORBA::String_var ior =
-        this->orb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ()));
 
@@ -189,22 +175,19 @@ 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"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in MT_Client_Protocol_Priority test server:");
+      ex._tao_print_exception (
+        "Unexpected exception caught in MT_Client_Protocol_Priority test server:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -212,12 +195,11 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -265,12 +247,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
index 9277febd56e..b0f03a3e6a5 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
@@ -19,7 +19,7 @@ test_multiple_orbs (const char *test_name,
   RTCORBA::RTORB_var *rt_orbs =
     new RTCORBA::RTORB_var[iterations];
 
-  ACE_TRY_NEW_ENV
+  try
     {
       for (int i = 0;
            i < iterations;
@@ -31,21 +31,15 @@ test_multiple_orbs (const char *test_name,
           orbs[i] =
             CORBA::ORB_init (argc,
                              argv,
-                             name
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                             name);
 
           if (rt_orb)
             {
               CORBA::Object_var object =
-                orbs[i]->resolve_initial_references ("RTORB"
-                                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orbs[i]->resolve_initial_references ("RTORB");
 
               rt_orbs[i] =
-                RTCORBA::RTORB::_narrow (object.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                RTCORBA::RTORB::_narrow (object.in ());
 
               ACE_ASSERT (rt_orbs[i].in () != RTCORBA::RTORB::_nil ());
             }
@@ -57,18 +51,15 @@ test_multiple_orbs (const char *test_name,
                i < iterations;
                ++i)
             {
-              orbs[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orbs[i]->destroy ();
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in ORB_init");
+      ex._tao_print_exception ("Unexpected exception caught in ORB_init");
       return -1;
     }
-  ACE_ENDTRY;
 
   delete[] rt_orbs;
   delete[] orbs;
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index 6e9b26cbec7..17818644116 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -52,14 +52,12 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result =
         parse_args (argc, argv);
@@ -67,14 +65,10 @@ main (int argc, char **argv)
         return result;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       test_var test =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       if (CORBA::is_nil (test.in ()))
         {
@@ -86,22 +80,19 @@ 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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!");
+      ex._tao_print_exception ("Unexpected exception!");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index d75fb4a6afd..e11d09b1640 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,19 +43,17 @@ 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,
               "test_i::shutdown\n"));
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 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 ());
 }
@@ -118,17 +116,14 @@ parse_args (int argc, char *argv[])
 static void
 write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb,
-                    const char *filename
-                    ACE_ENV_ARG_DECL)
+                    const char *filename)
 {
   FILE *file =
     ACE_OS::fopen (filename, "w");
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
-    orb->object_to_string (object
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->object_to_string (object);
 
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
@@ -151,20 +146,15 @@ write_iors_to_file (CORBA::Object_ptr object,
 void
 create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
                                                PortableServer::POA_ptr root_poa,
-                                               PortableServer::POAManager_ptr poa_manager
-                                               ACE_ENV_ARG_DECL)
+                                               PortableServer::POAManager_ptr poa_manager)
 {
   CORBA::PolicyList policies;
 
   CORBA::Policy_var implicit_activation_policy =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   CORBA::Policy_var lifespan_policy =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -177,36 +167,29 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
   PortableServer::POA_var poa =
     root_poa->create_POA ("persistent_child",
                           poa_manager,
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          policies);
 
   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;
+                      persistent_ior);
 }
 
 void
 create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
                                        RTCORBA::RTORB_ptr rt_orb,
                                        PortableServer::POA_ptr root_poa,
-                                       PortableServer::POAManager_ptr poa_manager
-                                       ACE_ENV_ARG_DECL)
+                                       PortableServer::POAManager_ptr poa_manager)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     rt_orb->create_threadpool (stacksize,
@@ -215,19 +198,13 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
                                default_thread_priority,
                                allow_request_buffering,
                                max_buffered_requests,
-                               max_request_buffer_size
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               max_request_buffer_size);
 
   CORBA::Policy_var threadpool_policy =
-    rt_orb->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rt_orb->create_threadpool_policy (threadpool_id);
 
   CORBA::Policy_var implicit_activation_policy =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   CORBA::PolicyList policies;
 
@@ -242,36 +219,29 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
   PortableServer::POA_var poa =
     root_poa->create_POA ("tp_child",
                           poa_manager,
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          policies);
 
   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;
+                      transient_ior);
 }
 
 void
 create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb,
                                           RTCORBA::RTORB_ptr rt_orb,
                                           PortableServer::POA_ptr root_poa,
-                                          PortableServer::POAManager_ptr poa_manager
-                                          ACE_ENV_ARG_DECL)
+                                          PortableServer::POAManager_ptr poa_manager)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     rt_orb->create_threadpool (stacksize,
@@ -280,24 +250,16 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb,
                                default_thread_priority,
                                allow_request_buffering,
                                max_buffered_requests,
-                               max_request_buffer_size
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                               max_request_buffer_size);
 
   CORBA::Policy_var threadpool_policy =
-    rt_orb->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rt_orb->create_threadpool_policy (threadpool_id);
 
   CORBA::Policy_var implicit_activation_policy =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   CORBA::Policy_var lifespan_policy =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT);
 
   CORBA::PolicyList policies;
 
@@ -316,41 +278,33 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb,
   PortableServer::POA_var poa =
     root_poa->create_POA ("tp_persistent_child",
                           poa_manager,
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          policies);
 
   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;
+                      tp_persistent_ior);
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result =
         parse_args (argc, argv);
@@ -358,73 +312,50 @@ main (int argc, char **argv)
         return result;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        orb->resolve_initial_references ("RTCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       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;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       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;
+                                             poa_manager.in ());
 
       create_poa_and_servant_with_persistent_policy (orb.in (),
                                                      root_poa.in  (),
-                                                     poa_manager.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                     poa_manager.in ());
 
       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.in ());
 
-      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)
+  catch (const CORBA::INTERNAL& ex)
     {
       if ((ex.minor() & 0x1F) == 9) {
         ACE_DEBUG ((LM_DEBUG, "You must be superuser to run "
@@ -432,16 +363,15 @@ main (int argc, char **argv)
         return 0;
       }
       else {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+        ex._tao_print_exception ("Exception caught");
         return -1;
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp
index 63d97ab4717..bfbb1fb858c 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.cpp
+++ b/TAO/tests/RTCORBA/Policies/Policies.cpp
@@ -27,27 +27,20 @@
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rtorb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       /*
        * The following code should be reenabled once the OMG spec has
@@ -57,9 +50,7 @@ main (int argc, char **argv)
       {
         RTCORBA::PriorityModelPolicy_var policy1 =
           rtorb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                               RTCORBA::minPriority
-                                               ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                               RTCORBA::minPriority);
 
         CORBA::Any policy_value;
         policy_value <<= RTCORBA::CLIENT_PROPAGATED;
@@ -67,14 +58,10 @@ main (int argc, char **argv)
 
         CORBA::Policy_var policy =
           orb->create_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         RTCORBA::PriorityModelPolicy_var policy2 =
-          RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
         ACE_ASSERT (policy1->priority_model () == policy2->priority_model ());
         ACE_ASSERT (policy1->server_priority () == policy2->server_priority ());
@@ -86,23 +73,17 @@ main (int argc, char **argv)
         RTCORBA::ThreadpoolId poolid = 0;
 
         RTCORBA::ThreadpoolPolicy_var policy1 =
-          rtorb->create_threadpool_policy (poolid
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          rtorb->create_threadpool_policy (poolid);
 
         CORBA::Any policy_value;
         policy_value <<= poolid;
 
         CORBA::Policy_var policy =
           orb->create_policy (RTCORBA::THREADPOOL_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         RTCORBA::ThreadpoolPolicy_var policy2 =
-          RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          RTCORBA::ThreadpoolPolicy::_narrow (policy.in ());
 
         ACE_ASSERT (policy1->threadpool () == policy2->threadpool ());
       }
@@ -111,23 +92,17 @@ main (int argc, char **argv)
         RTCORBA::ProtocolList empty_protocols;
 
         RTCORBA::ServerProtocolPolicy_var policy1 =
-          rtorb->create_server_protocol_policy (empty_protocols
-                                                ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          rtorb->create_server_protocol_policy (empty_protocols);
 
         CORBA::Any policy_value;
         policy_value <<= empty_protocols;
 
         CORBA::Policy_var policy =
           orb->create_policy (RTCORBA::SERVER_PROTOCOL_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         RTCORBA::ServerProtocolPolicy_var policy2 =
-          RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          RTCORBA::ServerProtocolPolicy::_narrow (policy.in ());
 
         RTCORBA::ProtocolList_var protocols1 =
           policy1->protocols ();
@@ -141,23 +116,17 @@ main (int argc, char **argv)
         RTCORBA::ProtocolList empty_protocols;
 
         RTCORBA::ClientProtocolPolicy_var policy1 =
-          rtorb->create_client_protocol_policy (empty_protocols
-                                                ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          rtorb->create_client_protocol_policy (empty_protocols);
 
         CORBA::Any policy_value;
         policy_value <<= empty_protocols;
 
         CORBA::Policy_var policy =
           orb->create_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         RTCORBA::ClientProtocolPolicy_var policy2 =
-          RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          RTCORBA::ClientProtocolPolicy::_narrow (policy.in ());
 
         RTCORBA::ProtocolList_var protocols1 =
           policy1->protocols ();
@@ -169,44 +138,33 @@ 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;
 
         CORBA::Policy_var policy =
           orb->create_policy (RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         RTCORBA::PrivateConnectionPolicy_var policy2 =
-          RTCORBA::PrivateConnectionPolicy::_narrow (policy.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          RTCORBA::PrivateConnectionPolicy::_narrow (policy.in ());
       }
 
       {
         RTCORBA::PriorityBands empty_priority_bands;
 
         RTCORBA::PriorityBandedConnectionPolicy_var policy1 =
-          rtorb->create_priority_banded_connection_policy (empty_priority_bands
-                                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          rtorb->create_priority_banded_connection_policy (empty_priority_bands);
 
         CORBA::Any policy_value;
         policy_value <<= empty_priority_bands;
 
         CORBA::Policy_var policy =
           orb->create_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE,
-                              policy_value
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                              policy_value);
 
         RTCORBA::PriorityBandedConnectionPolicy_var policy2 =
-          RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ());
 
         RTCORBA::PriorityBands_var priority_bands1 =
           policy1->priority_bands ();
@@ -221,13 +179,11 @@ main (int argc, char **argv)
                   argv[0]));
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_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..d29036173e9 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -76,65 +76,48 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       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;
+        this->orb_->string_to_object (ior);
 
       test_var test =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       for (int i = 0; i < iterations; i++)
         {
-          current->the_priority (default_thread_priority
-                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          current->the_priority (default_thread_priority);
 
           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;
+              current->the_priority (priority);
 
-              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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!");
+      ex._tao_print_exception ("Unexpected exception!");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -142,14 +125,12 @@ Task::svc (void)
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result =
         parse_args (argc, argv);
@@ -207,12 +188,11 @@ main (int argc, char **argv)
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!");
+      ex._tao_print_exception ("Unexpected exception!");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index db378d994bd..6030be5d764 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,17 @@ 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;
+    this->orb_->resolve_initial_references ("RTCurrent");
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::Current::_narrow (object.in ());
 
   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,19 +79,17 @@ 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,
               "test_i::shutdown\n"));
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 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 ());
 }
@@ -146,17 +139,14 @@ parse_args (int argc, char **argv)
 static void
 write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb,
-                    const char *filename
-                    ACE_ENV_ARG_DECL)
+                    const char *filename)
 {
   FILE *file =
     ACE_OS::fopen (filename, "w");
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
-    orb->object_to_string (object
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->object_to_string (object);
 
   u_int result = 0;
   result =
@@ -178,87 +168,78 @@ 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,
                                          CORBA::Short client_priority,
-                                         const char *test_name
-                                         ACE_ENV_ARG_DECL);
+                                         const char *test_name);
 
   void test_default_pool_poa (CORBA::Short server_priority,
                               CORBA::Short client_priority,
                               server::test_function function,
-                              const char *test_name
-                              ACE_ENV_ARG_DECL);
+                              const char *test_name);
 
   void test_bands_poa (CORBA::PolicyList &policies,
                        CORBA::Short server_priority,
                        CORBA::Short client_priority,
                        server::test_function function,
-                       const char *test_name
-                       ACE_ENV_ARG_DECL);
+                       const char *test_name);
 
   void test_no_lanes_poa (CORBA::Short server_priority,
                           CORBA::Short client_priority,
                           server::test_function function,
-                          const char *test_name
-                          ACE_ENV_ARG_DECL);
+                          const char *test_name);
 
   void test_lanes_poa (CORBA::Short server_priority,
                        CORBA::Short client_priority,
                        server::test_function function,
-                       const char *test_name
-                       ACE_ENV_ARG_DECL);
+                       const char *test_name);
 
   void test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                             CORBA::Short server_priority,
                                             CORBA::Short client_priority,
-                                            const char *test_name
-                                            ACE_ENV_ARG_DECL);
+                                            const char *test_name);
 
   void test_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                          CORBA::Short server_priority,
                                          CORBA::Short client_priority,
-                                         const char *test_name
-                                         ACE_ENV_ARG_DECL);
+                                         const char *test_name);
 
   void test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
                                           CORBA::Short server_priority,
                                           CORBA::Short client_priority,
-                                          const char *test_name
-                                          ACE_ENV_ARG_DECL);
+                                          const char *test_name);
 
   void test_bands_server_declared_poa (CORBA::PolicyList &policies,
                                        CORBA::Short server_priority,
                                        CORBA::Short client_priority,
-                                       const char *test_name
-                                       ACE_ENV_ARG_DECL);
+                                       const char *test_name);
 
-  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 +261,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 +270,29 @@ 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;
+                      "root");
 }
 
 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;
+    this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA ("child",
                                  this->poa_manager_.in (),
-                                 policies
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policies);
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -328,35 +301,28 @@ 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;
+                      "child");
 }
 
 void
 server::test_default_pool_poa (CORBA::Short server_priority,
                                CORBA::Short client_priority,
                                server::test_function function,
-                               const char *test_name
-                               ACE_ENV_ARG_DECL)
+                               const char *test_name)
 {
   CORBA::PolicyList empty_policies;
   (this->*function) (empty_policies,
                      server_priority,
                      client_priority,
-                     test_name
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                     test_name);
 }
 
 void
@@ -364,8 +330,7 @@ server::test_bands_poa (CORBA::PolicyList &policies,
                         CORBA::Short server_priority,
                         CORBA::Short client_priority,
                         server::test_function function,
-                        const char *test_name
-                        ACE_ENV_ARG_DECL)
+                        const char *test_name)
 {
   RTCORBA::PriorityBands bands;
   bands.length (3);
@@ -379,24 +344,19 @@ server::test_bands_poa (CORBA::PolicyList &policies,
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
-    this->rt_orb_->create_priority_banded_connection_policy (bands
-                                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->rt_orb_->create_priority_banded_connection_policy (bands);
 
   (this->*function) (policies,
                      server_priority,
                      client_priority,
-                     test_name
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                     test_name);
 }
 
 void
 server::test_no_lanes_poa (CORBA::Short server_priority,
                            CORBA::Short client_priority,
                            server::test_function function,
-                           const char *test_name
-                           ACE_ENV_ARG_DECL)
+                           const char *test_name)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     this->rt_orb_->create_threadpool (stacksize,
@@ -405,14 +365,10 @@ server::test_no_lanes_poa (CORBA::Short server_priority,
                                       default_thread_priority,
                                       allow_request_buffering,
                                       max_buffered_requests,
-                                      max_request_buffer_size
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                      max_request_buffer_size);
 
   CORBA::Policy_var threadpool_policy =
-    this->rt_orb_->create_threadpool_policy (threadpool_id
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->rt_orb_->create_threadpool_policy (threadpool_id);
 
   CORBA::PolicyList policies;
   policies.length (1);
@@ -422,17 +378,14 @@ server::test_no_lanes_poa (CORBA::Short server_priority,
   (this->*function) (policies,
                      server_priority,
                      client_priority,
-                     test_name
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                     test_name);
 }
 
 void
 server::test_lanes_poa (CORBA::Short server_priority,
                         CORBA::Short client_priority,
                         server::test_function function,
-                        const char *test_name
-                        ACE_ENV_ARG_DECL)
+                        const char *test_name)
 {
   RTCORBA::ThreadpoolLanes lanes;
   lanes.length (3);
@@ -455,14 +408,10 @@ server::test_lanes_poa (CORBA::Short server_priority,
                                                  allow_borrowing,
                                                  allow_request_buffering,
                                                  max_buffered_requests,
-                                                 max_request_buffer_size
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                 max_request_buffer_size);
 
   CORBA::Policy_var threadpool_policy =
-    this->rt_orb_->create_threadpool_policy (threadpool_id
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->rt_orb_->create_threadpool_policy (threadpool_id);
 
   CORBA::PolicyList policies;
   policies.length (1);
@@ -472,36 +421,27 @@ server::test_lanes_poa (CORBA::Short server_priority,
   (this->*function) (policies,
                      server_priority,
                      client_priority,
-                     test_name
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                     test_name);
 }
 
 void
 server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                              CORBA::Short server_priority,
                                              CORBA::Short client_priority,
-                                             const char *test_name
-                                             ACE_ENV_ARG_DECL)
+                                             const char *test_name)
 {
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                                 default_thread_priority
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                 default_thread_priority);
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (test_name,
                                  this->poa_manager_.in (),
-                                 policies
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policies);
 
   RTPortableServer::POA_var rt_poa =
-    RTPortableServer::POA::_narrow (poa.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTPortableServer::POA::_narrow (poa.in ());
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -510,107 +450,85 @@ 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;
+    rt_poa->activate_object (servant);
 
   CORBA::Object_var object =
-    poa->id_to_reference (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id_to_reference (id.in ());
 
   write_iors_to_file (object.in (),
                       this->orb_.in (),
-                      test_name
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                      test_name);
 }
 
 void
 server::test_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                           CORBA::Short server_priority,
                                           CORBA::Short client_priority,
-                                          const char *test_name
-                                          ACE_ENV_ARG_DECL)
+                                          const char *test_name)
 {
   this->test_bands_poa (policies,
                         server_priority,
                         client_priority,
                         &server::test_no_bands_client_propagated_poa,
-                        test_name
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        test_name);
 }
 
 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;
+                               "default_pool_no_bands_client_propagated");
 }
 
 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;
+                           "no_lanes_no_bands_client_propagated");
 }
 
 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;
+                        "lanes_no_bands_client_propagated");
 }
 
 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;
+                               "default_pool_bands_client_propagated");
 }
 
 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;
+                           "no_lanes_bands_client_propagated");
 }
 
 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;
+                        "lanes_bands_client_propagated");
 
 }
 
@@ -618,27 +536,20 @@ void
 server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
                                            CORBA::Short server_priority,
                                            CORBA::Short client_priority,
-                                           const char *test_name
-                                           ACE_ENV_ARG_DECL)
+                                           const char *test_name)
 {
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
-                                                 default_thread_priority
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                                 default_thread_priority);
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (test_name,
                                  this->poa_manager_.in (),
-                                 policies
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                 policies);
 
   RTPortableServer::POA_var rt_poa =
-    RTPortableServer::POA::_narrow (poa.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTPortableServer::POA::_narrow (poa.in ());
 
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -647,108 +558,86 @@ 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);
 
   PortableServer::ObjectId_var id =
     rt_poa->activate_object_with_priority (servant,
-                                           ::server_priority
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                           ::server_priority);
 
   CORBA::Object_var object =
-    poa->id_to_reference (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->id_to_reference (id.in ());
 
   write_iors_to_file (object.in (),
                       this->orb_.in (),
-                      test_name
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                      test_name);
 }
 
 void
 server::test_bands_server_declared_poa (CORBA::PolicyList &policies,
                                         CORBA::Short server_priority,
                                         CORBA::Short client_priority,
-                                        const char *test_name
-                                        ACE_ENV_ARG_DECL)
+                                        const char *test_name)
 {
   this->test_bands_poa (policies,
                         server_priority,
                         client_priority,
                         &server::test_no_bands_server_declared_poa,
-                        test_name
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        test_name);
 }
 
 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;
+                               "default_pool_no_bands_server_declared");
 }
 
 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;
+                           "no_lanes_no_bands_server_declared");
 }
 
 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;
+                        "lanes_no_bands_server_declared");
 }
 
 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;
+                               "default_pool_bands_server_declared");
 }
 
 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;
+                           "no_lanes_bands_server_declared");
 }
 
 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;
+                        "lanes_bands_server_declared");
 }
 
 class Task : public ACE_Task_Base
@@ -774,17 +663,13 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       // The following sets the current thread to the lowest priority
       // for this scheduling policy.  This will give us the biggest
@@ -806,18 +691,13 @@ Task::svc (void)
         return result;
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        current->the_priority ();
 
       client_priority =
         default_thread_priority + 2;
@@ -826,81 +706,58 @@ Task::svc (void)
         default_thread_priority + 5;
 
       object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -908,14 +765,12 @@ Task::svc (void)
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result =
         parse_args (argc, argv);
@@ -964,12 +819,11 @@ main (int argc, char **argv)
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index d33a71f3f25..e2417379d80 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -82,39 +82,28 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior);
 
       test_var test =
-        test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var rt_current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       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;
@@ -134,28 +123,19 @@ Task::svc (void)
           CORBA::PolicyList policies;
           policies.length (1);
           policies[0] =
-            rt_orb->create_priority_banded_connection_policy (bands
-                                                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            rt_orb->create_priority_banded_connection_policy (bands);
 
           object =
             test->_set_policy_overrides (policies,
-                                         CORBA::SET_OVERRIDE
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                         CORBA::SET_OVERRIDE);
 
           test =
-            test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            test::_narrow (object.in ());
         }
 
-      rt_current->the_priority (low_priority
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rt_current->the_priority (low_priority);
 
-      test->initialize (iterations * 2
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test->initialize (iterations * 2);
 
       int i = 0;
       char iteration_description[BUFSIZ];
@@ -163,31 +143,23 @@ Task::svc (void)
         {
           ACE_OS::sprintf (iteration_description, "L:%02d", i);
           test->method (work,
-                        iteration_description
-                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                        iteration_description);
         }
 
-      rt_current->the_priority (high_priority
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rt_current->the_priority (high_priority);
 
       for (i = 0; i != iterations; ++i)
         {
           ACE_OS::sprintf (iteration_description, "H:%02d", i);
           test->method (work,
-                        iteration_description
-                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                        iteration_description);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -195,11 +167,10 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       int result =
         parse_args (argc, argv);
@@ -248,12 +219,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index b14c292ffe6..bdb6107a94c 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -58,13 +58,10 @@ parse_args (int argc, char *argv[])
 
 int
 write_ior_to_file (CORBA::ORB_ptr orb,
-                   test_ptr test
-                   ACE_ENV_ARG_DECL)
+                   test_ptr test)
 {
   CORBA::String_var ior =
-    orb->object_to_string (test
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (test);
 
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
@@ -98,8 +95,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
                                  PortableServer::POAManager_ptr poa_manager,
                                  PortableServer::POA_ptr root_poa,
                                  CORBA::ORB_ptr orb,
-                                 RTCORBA::RTORB_ptr rt_orb
-                                 ACE_ENV_ARG_DECL)
+                                 RTCORBA::RTORB_ptr rt_orb)
 {
   // Policies for the firstPOA to be created.
   CORBA::PolicyList policies (3); policies.length (3);
@@ -107,9 +103,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   // Implicit_activation policy.
   policies[0] =
     root_poa->create_implicit_activation_policy
-    (PortableServer::IMPLICIT_ACTIVATION
-     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    (PortableServer::IMPLICIT_ACTIVATION);
 
   // Thread pool policy.
   policies[1] =
@@ -118,25 +112,20 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   // Priority Model policy.
   policies[2] =
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                          0);
 
   // Create the POA under the RootPOA.
   PortableServer::POA_var poa =
     root_poa->create_POA (poa_name,
                           poa_manager,
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                          policies);
 
   // 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 +138,11 @@ 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);
+                       test.in ());
 
   return result;
 }
@@ -184,51 +170,36 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       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;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       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;
@@ -242,14 +213,10 @@ Task::svc (void)
                                    low_priority,
                                    allow_request_buffering,
                                    max_buffered_requests,
-                                   max_request_buffer_size
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   max_request_buffer_size);
 
       CORBA::Policy_var threadpool_policy_1 =
-        rt_orb->create_threadpool_policy (threadpool_id_1
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id_1);
 
       CORBA::Boolean allow_borrowing = 0;
       RTCORBA::ThreadpoolLanes lanes (2);
@@ -269,14 +236,10 @@ Task::svc (void)
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              max_request_buffer_size);
 
       CORBA::Policy_var threadpool_policy_2 =
-        rt_orb->create_threadpool_policy (threadpool_id_2
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id_2);
 
       int result =
         create_POA_and_register_servant (threadpool_policy_1.in (),
@@ -284,9 +247,7 @@ Task::svc (void)
                                          poa_manager.in (),
                                          root_poa.in (),
                                          this->orb_.in (),
-                                         rt_orb.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         rt_orb.in ());
       if (result != 0)
         return result;
 
@@ -296,25 +257,19 @@ Task::svc (void)
                                          poa_manager.in (),
                                          root_poa.in (),
                                          this->orb_.in (),
-                                         rt_orb.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         rt_orb.in ());
       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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -322,14 +277,12 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       int result =
         parse_args (argc, argv);
@@ -378,12 +331,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
index e4ae87b051b..3399bf97feb 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp
@@ -21,34 +21,28 @@ test_i::test_i (CORBA::ORB_ptr orb,
     current_iteration_ (0),
     total_iterations_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       this->rt_current_ =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
+        RTCORBA::Current::_narrow (object.in ());
 
       this->work_iterations_in_one_sec_ =
         this->estimate_iterations ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
-      ACE_RE_THROW;
+      throw;
     }
-  ACE_ENDTRY;
 }
 
 void
 test_i::method (CORBA::ULong work,
-                const char * iteration
-                ACE_ENV_ARG_DECL)
+                const char * iteration)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
@@ -60,8 +54,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_)
@@ -97,21 +90,18 @@ test_i::method (CORBA::ULong work,
 
   if (this->current_iteration_ == this->total_iterations_)
     {
-      this->orb_->shutdown (0
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      this->orb_->shutdown (0);
     }
 }
 
 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::initialize (CORBA::ULong total_iterations
-                    ACE_ENV_ARG_DECL_NOT_USED)
+test_i::initialize (CORBA::ULong total_iterations)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->total_iterations_ = total_iterations;
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..986f17c75e4 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h
@@ -22,18 +22,16 @@ public:
           RTCORBA::Priority high_priority);
 
   /// Initialize the server.
-  void initialize (CORBA::ULong total_iterations
-                   ACE_ENV_ARG_DECL)
+  void initialize (CORBA::ULong total_iterations)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Test method.
   void method (CORBA::ULong work,
-               const char *iteration
-               ACE_ENV_ARG_DECL)
+               const char *iteration)
     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..23d1e298db5 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp
@@ -51,14 +51,13 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -66,38 +65,28 @@ 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;
+        orb->resolve_initial_references ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
       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;
+      object = orb->resolve_initial_references ("PolicyCurrent");
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
       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;
+      object = orb->string_to_object (ior1);
+      Test_var server1 = Test::_narrow (object.in ());
       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;
+      object = orb->string_to_object (ior2);
+      Test_var server2 = Test::_narrow (object.in ());
       if (check_for_nil (server2.in (), "server2") == -1)
         return -1;
 
@@ -106,34 +95,28 @@ 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
-                                            ACE_ENV_ARG_PARAMETER);
+                                            CORBA::SET_OVERRIDE);
 
       // Make four invocations on test objects again.  This time,
       // since RTCORBA::PrivateConnectionPolicy is set, we expect a
@@ -143,37 +126,31 @@ 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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in Private_Connection test client:");
+      ex._tao_print_exception (
+        "Unexpected exception caught in Private_Connection test client:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 07a844b3abb..2ad7c3ce16a 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:
@@ -33,7 +33,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
+Test_i::test_method (/* */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -41,10 +41,10 @@ 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);
+  this->orb_->shutdown (0);
 }
 
 //*************************************************************************
@@ -100,24 +100,19 @@ int
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
-               const char *filename
-               ACE_ENV_ARG_DECL)
+               const char *filename)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
+    poa->activate_object (server_impl);
 
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
-    poa->id_to_reference (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->id_to_reference (id.in ());
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (server.in ());
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
 
@@ -140,12 +135,11 @@ create_object (PortableServer::POA_ptr poa,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -153,18 +147,15 @@ main (int argc, char *argv[])
 
       // RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       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 ());
@@ -175,37 +166,30 @@ main (int argc, char *argv[])
       result = create_object (root_poa.in (),
                               orb.in (),
                               &server_impl1,
-                              ior_output_file1
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              ior_output_file1);
       if (result == -1)
         return -1;
 
       result = create_object (root_poa.in (),
                               orb.in (),
                               &server_impl2,
-                              ior_output_file2
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              ior_output_file2);
       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"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in Private_Connection test server:");
+      ex._tao_print_exception (
+        "Unexpected exception caught in Private_Connection test server:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index 61acf71eab9..e7db2d0dbcc 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -105,20 +105,17 @@ 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);
+  void priority_invocations (int debug);
 
-  void set_client_protocols_policies (int debug
-                                      ACE_ENV_ARG_DECL);
+  void set_client_protocols_policies (int debug);
 
-  void set_priority_bands (int debug
-                           ACE_ENV_ARG_DECL);
+  void set_priority_bands (int debug);
 
-  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 +139,7 @@ public:
 
   int svc (void);
 
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connection (void);
 
 private:
   Client client_;
@@ -165,7 +162,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
@@ -175,54 +172,44 @@ Worker_Thread::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
   int current_attempt = 0;
   for (;;)
     {
-      ACE_TRY
+      try
         {
           ++current_attempt;
-          this->test_->_validate_connection (inconsistent_policies.out ()
-                                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->test_->_validate_connection (inconsistent_policies.out ());
 
           // If successful, we are done.
           return;
         }
-      ACE_CATCH (CORBA::TRANSIENT, exception)
+      catch (const CORBA::TRANSIENT& )
         {
           // If we have reach our maximum number of tries, throw exception.
           if (current_attempt == max_attempts)
-            ACE_RE_THROW;
+            throw;
           // Otherwise, ignore...
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception&)
         {
           // Rethrow any other exceptions.
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
 int
 Worker_Thread::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->current_->the_priority (this->priority_
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_->the_priority (this->priority_);
 
-      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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Worker Thread exception:");
+      ex._tao_print_exception ("Worker Thread exception:");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -240,18 +227,16 @@ 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 ();
     }
 }
 
 void
-Client::priority_invocations (int debug
-                              ACE_ENV_ARG_DECL)
+Client::priority_invocations (int debug)
 {
   ULong_Array priorities;
   int result =
@@ -317,8 +302,7 @@ Client::priority_invocations (int debug
 }
 
 void
-Client::set_client_protocols_policies (int debug
-                                       ACE_ENV_ARG_DECL)
+Client::set_client_protocols_policies (int debug)
 {
   CORBA::PolicyList policies;
 
@@ -327,9 +311,7 @@ Client::set_client_protocols_policies (int debug
                    protocols_file,
                    this->rt_orb_.in (),
                    policies,
-                   debug
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                   debug);
   if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -339,14 +321,11 @@ Client::set_client_protocols_policies (int debug
     }
 
   this->policy_manager_->set_policy_overrides (policies,
-                                               CORBA::ADD_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::ADD_OVERRIDE);
 }
 
 void
-Client::set_priority_bands (int debug
-                            ACE_ENV_ARG_DECL)
+Client::set_priority_bands (int debug)
 {
   CORBA::PolicyList policies;
 
@@ -355,9 +334,7 @@ Client::set_priority_bands (int debug
                         bands_file,
                         this->rt_orb_.in (),
                         policies,
-                        debug
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        debug);
   if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -367,36 +344,29 @@ Client::set_priority_bands (int debug
     }
 
   this->policy_manager_->set_policy_overrides (policies,
-                                               CORBA::ADD_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::ADD_OVERRIDE);
 }
 
 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;
+                                               CORBA::ADD_OVERRIDE);
 }
 
 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;
+                                               CORBA::SET_OVERRIDE);
 }
 
 class Task : public ACE_Task_Base
@@ -422,51 +392,33 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("ORBPolicyManager"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
-      current->the_priority (0
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      current->the_priority (0);
 
       object =
-        this->orb_->string_to_object (ior
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior);
 
       test_var test =
-        test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       Client client (test.in (),
                      this->orb_.in (),
@@ -474,86 +426,56 @@ 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.set_client_protocols_policies (debug);
 
-      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.set_priority_bands (debug);
 
-      client.priority_invocations (debug
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.priority_invocations (debug);
 
-      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.priority_invocations (debug);
 
-      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_priority_bands (debug);
 
-      client.set_client_protocols_policies (0
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.set_client_protocols_policies (0);
 
-      client.priority_invocations (0
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.priority_invocations (0);
 
-      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.priority_invocations (debug);
 
-      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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error!");
+      ex._tao_print_exception ("Error!");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -561,16 +483,13 @@ Task::svc (void)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int parse_args_result =
         parse_args (argc, argv);
@@ -619,13 +538,11 @@ main (int argc, char **argv)
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Error!");
+      ex._tao_print_exception ("Error!");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_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..abd328de089 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,20 +77,18 @@ 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)
     ACE_DEBUG ((LM_DEBUG,
                 "test_i::shutdown\n"));
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
 
 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 ());
 }
@@ -140,8 +138,7 @@ parse_args (int argc, char **argv)
 
 static void
 write_iors_to_file (CORBA::Object_ptr object,
-                    CORBA::ORB_ptr orb
-                    ACE_ENV_ARG_DECL)
+                    CORBA::ORB_ptr orb)
 {
   char filename[BUFSIZ];
   sprintf (filename,
@@ -155,9 +152,7 @@ write_iors_to_file (CORBA::Object_ptr object,
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
-    orb->object_to_string (object
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->object_to_string (object);
 
   u_int result = 0;
   result =
@@ -174,15 +169,12 @@ write_iors_to_file (CORBA::Object_ptr object,
 void
 vanilla_poa (CORBA::ORB_ptr orb,
              PortableServer::POA_ptr root_poa,
-             PortableServer::POAManager_ptr poa_manager
-             ACE_ENV_ARG_DECL)
+             PortableServer::POAManager_ptr poa_manager)
 {
   CORBA::PolicyList policies;
 
   CORBA::Policy_var implicit_activation_policy =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -191,35 +183,28 @@ vanilla_poa (CORBA::ORB_ptr orb,
   PortableServer::POA_var poa =
     root_poa->create_POA ("child",
                           poa_manager,
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          policies);
 
   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;
+                      orb);
 }
 
 void
 rt_poa (CORBA::ORB_ptr orb,
         RTCORBA::RTORB_ptr rt_orb,
         PortableServer::POA_ptr root_poa,
-        PortableServer::POAManager_ptr poa_manager
-        ACE_ENV_ARG_DECL)
+        PortableServer::POAManager_ptr poa_manager)
 {
   CORBA::PolicyList policies;
 
@@ -228,9 +213,7 @@ rt_poa (CORBA::ORB_ptr orb,
                         bands_file,
                         rt_orb,
                         policies,
-                        debug
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        debug);
   if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -251,9 +234,7 @@ rt_poa (CORBA::ORB_ptr orb,
                         max_request_buffer_size,
                         allow_borrowing,
                         policies,
-                        debug
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        debug);
   if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -264,15 +245,11 @@ rt_poa (CORBA::ORB_ptr orb,
 
   CORBA::Policy_var priority_model_policy =
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          0);
 
   // Implicit_activation policy.
   CORBA::Policy_var implicit_activation_policy =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -285,27 +262,21 @@ rt_poa (CORBA::ORB_ptr orb,
   PortableServer::POA_var poa =
     root_poa->create_POA ("rt_poa",
                           poa_manager,
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                          policies);
 
   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;
+                      orb);
 }
 
 class Task : public ACE_Task_Base
@@ -331,60 +302,43 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       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;
+                   poa_manager.in ());
 
       rt_poa (this->orb_.in (),
               rt_orb.in (),
               root_poa.in (),
-              poa_manager.in ()
-              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+              poa_manager.in ());
 
-      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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -392,14 +346,12 @@ Task::svc (void)
 int
 main (int argc, char **argv)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       int result =
         parse_args (argc, argv);
@@ -448,12 +400,11 @@ main (int argc, char **argv)
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index 425db1603fb..bf326a9dfb3 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -63,36 +63,29 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
 {
   // Test the basic interface of the RTCORBA::Mutex This test should
   // run even on platforms without thread support.
-  ACE_TRY_NEW_ENV
+  try
     {
       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;
+      rt_orb->destroy_mutex (my_mutex.in ());
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in test_mutex_simple()");
+      ex._tao_print_exception (
+        "Unexpected exception caught in test_mutex_simple()");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -103,15 +96,14 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
 {
   // Test the basic interface of the named RTCORBA::Mutex(es) This
   // test should run even on platforms without thread support.
-  ACE_TRY_NEW_ENV
+  try
     {
       RTCORBA::Mutex_var larry_mutex1;
       RTCORBA::Mutex_var moe_mutex1;
       CORBA::Boolean created_flag;
 
       larry_mutex1 = rt_orb->create_named_mutex ("larry",
-                                                 created_flag ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                 created_flag);
 
       if (created_flag != 1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -119,28 +111,22 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                           -1);
 
       moe_mutex1 = rt_orb->create_named_mutex ("moe",
-                                               created_flag
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                               created_flag);
 
       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
       {
         RTCORBA::Mutex_var larry_mutex2;
         larry_mutex2 = rt_orb->create_named_mutex ("larry",
-                                                   created_flag
-                                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+                                                   created_flag);
 
         if (created_flag != 0)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -154,19 +140,15 @@ 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
       {
         RTCORBA::Mutex_var larry_mutex3;
-        larry_mutex3 = rt_orb->open_named_mutex ("larry"
-                                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        larry_mutex3 = rt_orb->open_named_mutex ("larry");
 
         // test the pointers...
         if (reinterpret_cast<void *> (larry_mutex1.in ())
@@ -175,33 +157,26 @@ 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 (larry_mutex1.in ());
 
-      rt_orb->destroy_mutex (moe_mutex1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      rt_orb->destroy_mutex (moe_mutex1.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in test_named_mutex_simple()");
+      ex._tao_print_exception (
+        "Unexpected exception caught in test_named_mutex_simple()");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -213,28 +188,26 @@ test_named_mutex_exception (RTCORBA::RTORB_ptr rt_orb)
   // name isn't found.
 
   // This test should run even on platforms without thread support.
-  ACE_TRY_NEW_ENV
+  try
     {
       RTCORBA::Mutex_var larry_mutex1;
 
-      larry_mutex1 = rt_orb->open_named_mutex ("larry" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      larry_mutex1 = rt_orb->open_named_mutex ("larry");
 
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Expected a MutexNotFound exception, but didn't get one.\n"),
                         -1);
     }
-  ACE_CATCH (RTCORBA::RTORB::MutexNotFound, ex)
+  catch (const RTCORBA::RTORB::MutexNotFound& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "Caught expected MutexNotFound exception.\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in test_named_mutex_exception()");
+      ex._tao_print_exception (
+        "Unexpected exception caught in test_named_mutex_exception()");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -261,7 +234,7 @@ mutex_test_thread (void *args)
 
   ACE_OS::srand (ACE_OS::time (0));
 
-  ACE_TRY_NEW_ENV
+  try
     {
       for (size_t i = 0; i < MAX_ITERATIONS / 2; i++)
         {
@@ -269,7 +242,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,20 +274,18 @@ 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"),
                       i));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in mutex_test_thread()");
+      ex._tao_print_exception (
+        "Unexpected exception caught in mutex_test_thread()");
       *data->error_flag = 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -333,10 +303,9 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb)
   int shared_var = 0;
   int error_flag = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      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;
@@ -356,13 +325,12 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb)
       CORBA::release (mutex);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in test_mutex_threads()");
+      ex._tao_print_exception (
+        "Unexpected exception caught in test_mutex_threads()");
       return -1;
     }
-  ACE_ENDTRY;
 
   return error_flag;
 }
@@ -376,12 +344,11 @@ mutex_test_try_lock_thread (void *args)
   RTCORBA::Mutex_ptr mutex = data->mutex;
   CORBA::Boolean result;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       // 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;
+      result = mutex->try_lock (0u);
 
       if (result)
         {
@@ -400,8 +367,7 @@ mutex_test_try_lock_thread (void *args)
                       "attempting try_lock (5 sec) - expect failure after 5 secs (but no exceptions)\n"));
 
           timer.start ();
-          result = mutex->try_lock (50000000u /*5sec*/ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          result = mutex->try_lock (50000000u /*5sec*/);
           timer.stop ();
 
           if (result)
@@ -429,13 +395,12 @@ mutex_test_try_lock_thread (void *args)
             }
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in mutex_test_try_lock_thread()");
+      ex._tao_print_exception (
+        "Unexpected exception caught in mutex_test_try_lock_thread()");
       *data->error_flag = 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -449,15 +414,13 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
   int shared_var = 0;
   int error_flag = 0;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      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;
+      result = mutex->try_lock (0u);
       if (!result)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "try_lock failed\n"),
@@ -484,13 +447,12 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
       CORBA::release (mutex);
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in test_mutex_try_lock()");
+      ex._tao_print_exception (
+        "Unexpected exception caught in test_mutex_try_lock()");
       return -1;
     }
-  ACE_ENDTRY;
 
   return error_flag;
 }
@@ -500,11 +462,10 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -512,11 +473,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;
+        orb->resolve_initial_references ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return -1;
 
@@ -559,13 +517,12 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Mutex test finished\n\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in Mutex test server:");
+      ex._tao_print_exception (
+        "Unexpected exception caught in Mutex test server:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index 9ac3ce834d6..1e52bba6f1f 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -49,44 +49,38 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 }
 
 CORBA::Short
-check_policy (Test_ptr server
-              ACE_ENV_ARG_DECL)
+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);
+    server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE);
 
   RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in ());
 
   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
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -94,20 +88,16 @@ main (int argc, char *argv[])
 
       // Test object 1.
       CORBA::Object_var object =
-        orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior1);
 
-      Test_var server1 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var server1 = Test::_narrow (object.in ());
       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;
+      object = orb->string_to_object (ior2);
 
-      Test_var server2 = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      Test_var server2 = Test::_narrow (object.in ());
       if (check_for_nil (server2.in (), "server2") == -1)
         return -1;
 
@@ -116,41 +106,35 @@ main (int argc, char *argv[])
 
       // Test object 1.
       CORBA::Short server1_priority =
-        check_policy (server1.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        check_policy (server1.in ());
 
       if (server1_priority == -1)
         return -1;
 
       // Test object 2.
       CORBA::Short server2_priority =
-        check_policy (server2.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        check_policy (server2.in ());
       if (server2_priority == -1)
         return -1;
 
       // Testing: make several invocations on test objects.
       for (int i = 0; i < 5; ++i)
         {
-          server1->test_method (server1_priority ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server1->test_method (server1_priority);
 
-          server2->test_method (server2_priority ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server2->test_method (server2_priority);
         }
 
       // Testing over. Shut down Server ORB.
-      server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server1->shutdown ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Server_Declared test client:");
+      ex._tao_print_exception (
+        "Unexpected exception in Server_Declared test client:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index 6594427f846..c6322ced276 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -17,11 +17,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (CORBA::Short priority
-                    ACE_ENV_ARG_DECL_NOT_USED)
+  void test_method (CORBA::Short priority)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -35,27 +34,23 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (CORBA::Short priority
-                     ACE_ENV_ARG_DECL)
+Test_i::test_method (CORBA::Short priority)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use RTCurrent to find out the CORBA priority of the current
   // thread.
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RTCurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->resolve_initial_references ("RTCurrent");
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    RTCORBA::Current::_narrow (obj.in ());
 
   if (CORBA::is_nil (obj.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
+    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,10 +65,10 @@ 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);
+  this->orb_->shutdown (0);
 }
 
 //*************************************************************************
@@ -161,30 +156,24 @@ create_object (RTPortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
                CORBA::Short priority,
-               const char *filename
-               ACE_ENV_ARG_DECL)
+               const char *filename)
 {
   // Register with poa.
   PortableServer::ObjectId_var id;
 
   if (priority > -1)
     id = poa->activate_object_with_priority (server_impl,
-                                             priority
-                                             ACE_ENV_ARG_PARAMETER);
+                                             priority);
   else
-    id = poa->activate_object (server_impl ACE_ENV_ARG_PARAMETER);
+    id = poa->activate_object (server_impl);
 
-  ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
-    poa->id_to_reference (id.in ()
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    poa->id_to_reference (id.in ());
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (server.in ());
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
 
@@ -227,32 +216,26 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // 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;
+        this->orb_->resolve_initial_references ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
       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;
+        this->orb_->resolve_initial_references("RootPOA");
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
       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
@@ -261,25 +244,18 @@ Task::svc (void)
       poa_policy_list.length (2);
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
-                                              poa_priority
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              poa_priority);
 
       poa_policy_list[1] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID);
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
-                              poa_policy_list
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              poa_policy_list);
 
       RTPortableServer::POA_var rt_poa =
-        RTPortableServer::POA::_narrow (child_poa.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTPortableServer::POA::_narrow (child_poa.in ());
       if (check_for_nil (rt_poa.in (), "RTPOA") == -1)
         return -1;
 
@@ -290,36 +266,31 @@ Task::svc (void)
       int result;
       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;
+                              -1, ior_output_file1);
       if (result == -1)
         return -1;
 
       // Create object 2 (override POA's priority).
       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;
+                              object_priority, ior_output_file2);
       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"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception caught in Server_Declared test server:");
+      ex._tao_print_exception (
+        "Unexpected exception caught in Server_Declared test server:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -327,12 +298,11 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse arguments.
       if (parse_args (argc, argv) != 0)
@@ -380,12 +350,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index 7dd24cdb9b5..e70b49ff04d 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
@@ -35,23 +35,20 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Test_var server =
-        Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -62,16 +59,13 @@ 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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index 5ca5342d11e..1a154a92130 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,12 +32,12 @@ 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,
               "Received request to shut down the ORB\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
 
 //*************************************************************************
@@ -87,8 +87,7 @@ parse_args (int argc, char *argv[])
 
 int
 check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
-                                   PortableServer::POA_ptr poa
-                                   ACE_ENV_ARG_DECL)
+                                   PortableServer::POA_ptr poa)
 {
   // Users should never write code like below.
   // It is for testing purposes only! (Unfortunately, there
@@ -100,14 +99,10 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
     tao_poa.policies ();
 
   CORBA::Policy_var server_protocol =
-    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
   RTCORBA::ServerProtocolPolicy_var policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in ());
 
   if (CORBA::is_nil (policy.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -115,8 +110,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 "
@@ -135,9 +129,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
       if (protocol_type == IOP::TAG_INTERNET_IOP)
         {
           RTCORBA::TCPProtocolProperties_var tcp_properties =
-            RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            RTCORBA::TCPProtocolProperties::_narrow (properties.in ());
 
           if (!CORBA::is_nil (tcp_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -158,9 +150,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
       else if (protocol_type == TAO_TAG_UIOP_PROFILE)
         {
           RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
-            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ());
 
           if (!CORBA::is_nil (uiop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -173,9 +163,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
       else if (protocol_type == TAO_TAG_SHMEM_PROFILE)
         {
           RTCORBA::SharedMemoryProtocolProperties_var shmem_properties =
-            RTCORBA::SharedMemoryProtocolProperties::_narrow (properties.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            RTCORBA::SharedMemoryProtocolProperties::_narrow (properties.in ());
 
           if (!CORBA::is_nil (shmem_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -200,9 +188,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
       else if (protocol_type == TAO_TAG_DIOP_PROFILE)
         {
           RTCORBA::UserDatagramProtocolProperties_var diop_properties =
-            RTCORBA::UserDatagramProtocolProperties::_narrow (properties.in ()
-                                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            RTCORBA::UserDatagramProtocolProperties::_narrow (properties.in ());
 
           if (!CORBA::is_nil (diop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -213,9 +199,7 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
       else if (protocol_type == TAO_TAG_SCIOP_PROFILE)
         {
           RTCORBA::StreamControlProtocolProperties_var sciop_properties =
-            RTCORBA::StreamControlProtocolProperties::_narrow (properties.in ()
-                                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
+            RTCORBA::StreamControlProtocolProperties::_narrow (properties.in ());
 
           if (!CORBA::is_nil (sciop_properties.in ()))
             ACE_DEBUG ((LM_DEBUG,
@@ -242,22 +226,19 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -265,20 +246,14 @@ 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;
+      object = orb->resolve_initial_references ("RTORB");
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ());
 
       // Check ServerProtocol configurations.
       int result = check_server_protocol_at_root_poa (orb.in (),
-                                                      root_poa.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                      root_poa.in ());
       if (result != 0)
         return -1;
 
@@ -298,9 +273,7 @@ main (int argc, char *argv[])
       CORBA::PolicyList poa_policy_list;
       poa_policy_list.length (1);
       poa_policy_list[0] =
-        rt_orb->create_server_protocol_policy (protocols
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_server_protocol_policy (protocols);
 
       PortableServer::POA_var poa;
 
@@ -309,32 +282,25 @@ main (int argc, char *argv[])
           poa =
             root_poa->create_POA ("Child_POA",
                                   poa_manager.in (),
-                                  poa_policy_list
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                  poa_policy_list);
         }
 
       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;
+        poa->activate_object (&server_impl);
 
       CORBA::Object_var server =
-        poa->id_to_reference (id.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        poa->id_to_reference (id.in ());
 
       // Print Object IOR.
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "\nActivated as <%s>\n\n", ior.in ()));
 
@@ -351,21 +317,17 @@ 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"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index 727015a2353..a53a2b0a4da 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -74,15 +74,13 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (ior);
 
       test_var test =
-        test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test::_narrow (object.in ());
 
       pid_t pid =
         ACE_OS::getpid ();
@@ -91,9 +89,7 @@ Task::svc (void)
         {
           CORBA::Long r =
             test->method (pid,
-                          i
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                          i);
 
           ACE_ASSERT (r == i);
           // Assert disappears on with optimizations on.
@@ -102,17 +98,14 @@ Task::svc (void)
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -120,11 +113,10 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       int result =
         parse_args (argc, argv);
@@ -168,12 +160,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 5dd811de9bd..dcf82a74e24 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -60,13 +60,10 @@ parse_args (int argc, char *argv[])
 
 int
 write_ior_to_file (CORBA::ORB_ptr orb,
-                   test_ptr test
-                   ACE_ENV_ARG_DECL)
+                   test_ptr test)
 {
   CORBA::String_var ior =
-    orb->object_to_string (test
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (test);
 
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
@@ -99,8 +96,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
                                  PortableServer::POAManager_ptr poa_manager,
                                  PortableServer::POA_ptr root_poa,
                                  CORBA::ORB_ptr orb,
-                                 RTCORBA::RTORB_ptr rt_orb
-                                 ACE_ENV_ARG_DECL)
+                                 RTCORBA::RTORB_ptr rt_orb)
 {
   // Policies for the firstPOA to be created.
   CORBA::PolicyList policies (3); policies.length (3);
@@ -108,9 +104,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   // Implicit_activation policy.
   policies[0] =
     root_poa->create_implicit_activation_policy
-    (PortableServer::IMPLICIT_ACTIVATION
-     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    (PortableServer::IMPLICIT_ACTIVATION);
 
   // Thread pool policy.
   policies[1] =
@@ -119,25 +113,20 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   // Priority Model policy.
   policies[2] =
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                          0);
 
   // Create the POA under the RootPOA.
   PortableServer::POA_var poa =
     root_poa->create_POA (poa_name,
                           poa_manager,
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                          policies);
 
   // 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 +138,11 @@ 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);
+                       test.in ());
 
   return result;
 }
@@ -184,64 +170,46 @@ Task::Task (ACE_Thread_Manager &thread_manager,
 int
 Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (object.in ());
 
       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;
+        this->orb_->resolve_initial_references ("RTORB");
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::RTORB::_narrow (object.in ());
 
       object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("RTCurrent");
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        RTCORBA::Current::_narrow (object.in ());
 
       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;
+                           test.in ());
 
       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;
@@ -255,14 +223,10 @@ Task::svc (void)
                                    default_thread_priority,
                                    allow_request_buffering,
                                    max_buffered_requests,
-                                   max_request_buffer_size
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                   max_request_buffer_size);
 
       CORBA::Policy_var threadpool_policy_1 =
-        rt_orb->create_threadpool_policy (threadpool_id_1
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id_1);
 
       CORBA::Boolean allow_borrowing = 0;
       RTCORBA::ThreadpoolLanes lanes (1);
@@ -278,14 +242,10 @@ Task::svc (void)
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                              max_request_buffer_size);
 
       CORBA::Policy_var threadpool_policy_2 =
-        rt_orb->create_threadpool_policy (threadpool_id_2
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        rt_orb->create_threadpool_policy (threadpool_id_2);
 
       result =
         create_POA_and_register_servant (threadpool_policy_1.in (),
@@ -293,9 +253,7 @@ Task::svc (void)
                                          poa_manager.in (),
                                          root_poa.in (),
                                          this->orb_.in (),
-                                         rt_orb.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         rt_orb.in ());
       if (result != 0)
         return result;
 
@@ -305,25 +263,19 @@ Task::svc (void)
                                          poa_manager.in (),
                                          root_poa.in (),
                                          this->orb_.in (),
-                                         rt_orb.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         rt_orb.in ());
       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
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
@@ -331,14 +283,12 @@ Task::svc (void)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       int result =
         parse_args (argc, argv);
@@ -387,12 +337,11 @@ main (int argc, char *argv[])
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ex._tao_print_exception ("Exception caught");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index aab3f451e2b..4a7e623ef80 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -19,8 +19,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 CORBA::Long
 test_i::method (CORBA::Long client_id,
-                CORBA::Long iteration
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CORBA::Long iteration)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
@@ -50,16 +49,14 @@ 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;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
index 14234e78d65..1bcbf6173cd 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
@@ -21,16 +21,15 @@ public:
 
   /// Test method.
   CORBA::Long method (CORBA::Long client_id,
-                      CORBA::Long iteration
-                      ACE_ENV_ARG_DECL_NOT_USED)
+                      CORBA::Long iteration)
     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..4c72811ab86 100644
--- a/TAO/tests/RTCORBA/common_args.cpp
+++ b/TAO/tests/RTCORBA/common_args.cpp
@@ -13,8 +13,7 @@ get_priority_bands (const char *test_type,
                     const char *bands_file,
                     RTCORBA::RTORB_ptr rt_orb,
                     CORBA::PolicyList &policies,
-                    int debug
-                    ACE_ENV_ARG_DECL)
+                    int debug)
 {
   //
   // Read bands from a file.
@@ -97,9 +96,7 @@ get_priority_bands (const char *test_type,
                 "\n\n"));
 
   CORBA::Policy_var banded_connection_policy =
-    rt_orb->create_priority_banded_connection_policy (bands
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    rt_orb->create_priority_banded_connection_policy (bands);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -206,8 +203,7 @@ get_priority_lanes (const char *test_type,
                     CORBA::ULong max_request_buffer_size,
                     CORBA::Boolean allow_borrowing,
                     CORBA::PolicyList &policies,
-                    int debug
-                    ACE_ENV_ARG_DECL)
+                    int debug)
 {
   ULong_Array priorities;
   int result =
@@ -238,14 +234,10 @@ get_priority_lanes (const char *test_type,
                                           allow_borrowing,
                                           allow_request_buffering,
                                           max_buffered_requests,
-                                          max_request_buffer_size
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                          max_request_buffer_size);
 
   CORBA::Policy_var threadpool_policy =
-    rt_orb->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    rt_orb->create_threadpool_policy (threadpool_id);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -259,8 +251,7 @@ get_protocols (const char *test_type,
                const char *lanes_file,
                RTCORBA::RTORB_ptr rt_orb,
                CORBA::PolicyList &policies,
-               int debug
-               ACE_ENV_ARG_DECL)
+               int debug)
 {
   ULong_Array protocol_values;
   int result =
@@ -289,9 +280,7 @@ 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);
+    rt_orb->create_client_protocol_policy (protocols);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
@@ -311,8 +300,7 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes,
                                    CORBA::ULong max_request_buffer_size,
                                    CORBA::Boolean allow_borrowing,
                                    CORBA::PolicyList &policies,
-                                   int debug
-                                   ACE_ENV_ARG_DECL)
+                                   int debug)
 {
   RTCORBA::ThreadpoolLanes lanes;
   lanes.length (number_of_lanes);
@@ -369,20 +357,14 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes,
                                           allow_borrowing,
                                           allow_request_buffering,
                                           max_buffered_requests,
-                                          max_request_buffer_size
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                          max_request_buffer_size);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
-    rt_orb->create_priority_banded_connection_policy (bands
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rt_orb->create_priority_banded_connection_policy (bands);
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
-    rt_orb->create_threadpool_policy (threadpool_id
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    rt_orb->create_threadpool_policy (threadpool_id);
 }
 
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
index a12629ada7b..246a0842a3a 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
@@ -13,7 +13,7 @@ int
 Thread_Task::activate_task (int thr_count)
 {
 
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_NEW_RETURN (shutdown_lock_,
                       TAO_SYNCH_MUTEX,
@@ -25,67 +25,54 @@ Thread_Task::activate_task (int thr_count)
 
       active_thread_count_ = thr_count;
 
-      CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
-									      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current");
 
-      this->current_ = RTScheduling::Current::_narrow (current_obj.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_ = RTScheduling::Current::_narrow (current_obj.in ());
 
       const char * name = 0;
       CORBA::Policy_ptr sched_param = 0;
       CORBA::Policy_ptr implicit_sched_param = 0;
 
-      ACE_TRY_EX (ESS_out_of_cxt)
+      try
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Making an end_scheduling_segment call without first calling begin_scheduling_segment\n"));
-          this->current_->end_scheduling_segment (name
-                                                  ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(ESS_out_of_cxt);
+          this->current_->end_scheduling_segment (name);
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, thr_ex)
+      catch (const CORBA::BAD_INV_ORDER& )
         {
           ACE_DEBUG ((LM_DEBUG,
             "End Scheduling Segment is out of context - Expected Exception\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "\n");
+          ex._tao_print_exception ("\n");
         }
-      ACE_ENDTRY;
 
-      ACE_TRY_EX(USS_out_of_cxt)
+      try
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Making an update_scheduling_segment call without first calling begin_scheduling_segment\n"));
 
           this->current_->update_scheduling_segment (name,
                                                      sched_param,
-                                                     implicit_sched_param
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX(USS_out_of_cxt);
+                                                     implicit_sched_param);
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, thr_ex)
+      catch (const CORBA::BAD_INV_ORDER& )
         {
         ACE_DEBUG ((LM_DEBUG,
               "Update Scheduling Segment is out of context - Expected Exception\n"));
         }
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Update Scheduling Segment is out of context:");
+          ex._tao_print_exception (
+            "Update Scheduling Segment is out of context:");
         }
-      ACE_ENDTRY;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception:");
+      ex._tao_print_exception ("Exception:");
     }
-  ACE_ENDTRY;
 
   long flags = THR_NEW_LWP | THR_JOINABLE;
   if (this->activate (flags,
@@ -102,7 +89,7 @@ Thread_Task::activate_task (int thr_count)
 int
 Thread_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char * name = 0;
       CORBA::Policy_ptr sched_param = 0;
@@ -110,9 +97,7 @@ Thread_Task::svc (void)
 
       this->current_->begin_scheduling_segment ("Fellowship of the Rings",
                                                 sched_param,
-                                                implicit_sched_param
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                implicit_sched_param);
 
       size_t count = 0;
       ACE_OS::memcpy (&count,
@@ -126,21 +111,16 @@ Thread_Task::svc (void)
       //Start - Nested Scheduling Segment
       this->current_->begin_scheduling_segment ("Two Towers",
                                                 sched_param,
-                                                implicit_sched_param
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                implicit_sched_param);
 
       //Start - Nested Scheduling Segment
       this->current_->begin_scheduling_segment ("The Return of the King",
                                                 sched_param,
-                                                implicit_sched_param
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                implicit_sched_param);
 
 
       RTScheduling::Current::NameList_var segment_name_list =
-        this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        this->current_->current_scheduling_segment_names ();
 
       {
         ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *lock_, -1);
@@ -156,18 +136,12 @@ Thread_Task::svc (void)
           }
       }
 
-      this->current_->end_scheduling_segment (name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_->end_scheduling_segment (name);
       //End - Nested Scheduling Segment
 
-      this->current_->end_scheduling_segment (name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_->end_scheduling_segment (name);
 
-      this->current_->end_scheduling_segment (name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_->end_scheduling_segment (name);
       //End - Nested Scheduling Segment
 
       ACE_DEBUG ((LM_DEBUG,
@@ -183,18 +157,15 @@ Thread_Task::svc (void)
             // exceptions on fast dual processor machines.
             ACE_OS::sleep (1);
 
-            orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-            ACE_TRY_CHECK;
+            orb_->shutdown (0);
           }
       }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTScheduling/Current/test.cpp b/TAO/tests/RTScheduling/Current/test.cpp
index ffcf6dbf8a3..c840d3937d0 100644
--- a/TAO/tests/RTScheduling/Current/test.cpp
+++ b/TAO/tests/RTScheduling/Current/test.cpp
@@ -7,22 +7,16 @@
 int
 main (int argc, char* argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
-                                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager");
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
-                                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
       TAO_Scheduler scheduler (orb.in ());
 
@@ -32,22 +26,18 @@ main (int argc, char* argv [])
 
       task.activate_task (4);
 
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Wait until all threads are ready.
       ACE_Thread_Manager::instance ()->wait ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
index 37da9a5de01..d84ab87c1e1 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -20,8 +20,7 @@ public RTScheduling::ThreadAction
  public:
   Test_Thread_Action (void);
 
-  virtual void _cxx_do (CORBA::VoidData data
-			ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void _cxx_do (CORBA::VoidData data)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -33,8 +32,7 @@ Test_Thread_Action::Test_Thread_Action (void)
 }
 
 void
-Test_Thread_Action::_cxx_do (CORBA::VoidData data
-			     ACE_ENV_ARG_DECL)
+Test_Thread_Action::_cxx_do (CORBA::VoidData data)
      ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -53,8 +51,7 @@ Test_Thread_Action::_cxx_do (CORBA::VoidData data
 	      count));
 
   RTScheduling::Current::NameList_var segment_name_list =
-    tmp->current->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    tmp->current->current_scheduling_segment_names ();
 
   ACE_DEBUG ((LM_DEBUG,
 	      "Segment Names for DT %d:\n",
diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
index fab57bcd8ce..32616d1aeb1 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp
+++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
@@ -11,28 +11,22 @@ main (int argc, char* argv [])
 {
   CORBA::ORB_var orb;
   RTScheduling::Current_var current;
-		    
+
   const char * name = 0;
   CORBA::Policy_ptr sched_param = 0;
   CORBA::Policy_ptr implicit_sched_param = 0;
 
   Test_Thread_Action thread_action;
 
-  ACE_TRY_NEW_ENV
+  try
     {
       orb = CORBA::ORB_init (argc,
 			     argv,
-			     ""
-			     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+			     "");
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
-								       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager");
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
-									      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
       TAO_Scheduler* scheduler;
       ACE_NEW_RETURN (scheduler,
@@ -42,15 +36,11 @@ main (int argc, char* argv [])
 
       manager->rtscheduler (scheduler);
 
-      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
-								       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      current = RTScheduling::Current::_narrow (current_obj.in ()
-						ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      ACE_TRY_EX (block1)
+      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current");
+
+      current = RTScheduling::Current::_narrow (current_obj.in ());
+
+      try
 	{
 
 	  ACE_DEBUG ((LM_DEBUG,
@@ -63,45 +53,39 @@ main (int argc, char* argv [])
 			  sched_param,
 			  implicit_sched_param,
 			  0,
-			  0
-			  ACE_ENV_ARG_PARAMETER);
-	  ACE_TRY_CHECK_EX (block1);
+			  0);
 	}
-      ACE_CATCH (CORBA::BAD_INV_ORDER, thr_ex)
+      catch (const CORBA::BAD_INV_ORDER& )
 	{
 	  ACE_DEBUG ((LM_DEBUG,
 		      "Spawn should be in the context of a Scheduling Segment - Expected Exception\n"));
 	}
-      ACE_CATCHANY
+      catch (const CORBA::Exception& ex)
 	{
-	  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			       "\n");
+	  ex._tao_print_exception ("\n");
 	}
-      ACE_ENDTRY;
-      
+
       ACE_DEBUG ((LM_DEBUG,
 		  "Start - Scheduling Segment...\n"));
 
       current->begin_scheduling_segment ("Potter",
 					 sched_param,
-					 implicit_sched_param
-					 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+					 implicit_sched_param);
+
       size_t count = 0;
       ACE_OS::memcpy (&count,
 		      current->id ()->get_buffer (),
 		      current->id ()->length ());
-      
+
       ACE_DEBUG ((LM_DEBUG,
 		  "The Current DT Guid is %d\n",
 		  count));
-      
+
       //Initialize data to be passed to the Thread_Action::do method
       Data spawn_data;
       spawn_data.data = "Harry Potter";
       spawn_data.current = RTScheduling::Current::_duplicate (current.in ());
-      
+
       ACE_DEBUG ((LM_DEBUG,
 		  "Spawning a new DT...\n"));
       RTScheduling::DistributableThread_var dt =
@@ -111,27 +95,21 @@ main (int argc, char* argv [])
 		      sched_param,
 		      implicit_sched_param,
 		      0,
-		      0
-		      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      current->end_scheduling_segment (name
-				       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+		      0);
+
+      current->end_scheduling_segment (name);
       ACE_DEBUG ((LM_DEBUG,
 		  "End - Scheduling Segment %d\n",
 		  count));
-     
-    } 
-  ACE_CATCHANY
+
+    }
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Caught Exception\n");
+      ex._tao_print_exception ("Caught Exception\n");
     }
-  ACE_ENDTRY; 
-  
+
   ACE_Thread_Manager::instance ()->wait ();
-  
+
   return 0;
 }
 
diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp
index 885e7ba2fd7..b6bf436b6fd 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -5,16 +5,12 @@
 #include "ace/Atomic_Op.h"
 #include "tao/RTScheduling/Request_Interceptor.h"
 
-TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb)
 {
   CORBA::Object_var current_obj =
-    orb->resolve_initial_references ("RTScheduler_Current"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("RTScheduler_Current");
 
-  current_ = RTScheduling::Current::_narrow (current_obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  current_ = RTScheduling::Current::_narrow (current_obj.in ());
 }
 
 TAO_Scheduler::~TAO_Scheduler (void)
@@ -22,28 +18,27 @@ TAO_Scheduler::~TAO_Scheduler (void)
 }
 
 CORBA::PolicyList*
-TAO_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Scheduler::scheduling_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 void
-TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &
-                                    ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyList*
-TAO_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Scheduler::poa_policies (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
 
 char *
-TAO_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Scheduler::scheduling_discipline_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -51,8 +46,7 @@ TAO_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 RTScheduling::ResourceManager_ptr
 TAO_Scheduler::create_resource_manager (const char *,
-                                        CORBA::Policy_ptr
-                                        ACE_ENV_ARG_DECL_NOT_USED)
+                                        CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -61,8 +55,7 @@ TAO_Scheduler::create_resource_manager (const char *,
 void
 TAO_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                          const char *,
-                                         CORBA::Policy_ptr
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+                                         CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -71,8 +64,7 @@ void
 TAO_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &,
                                              const char *,
                                              CORBA::Policy_ptr,
-                                             CORBA::Policy_ptr
-                                             ACE_ENV_ARG_DECL_NOT_USED)
+                                             CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -82,8 +74,7 @@ void
 TAO_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                                 const char *,
                                                 CORBA::Policy_ptr,
-                                                CORBA::Policy_ptr
-                                                ACE_ENV_ARG_DECL_NOT_USED)
+                                                CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -93,8 +84,7 @@ void
 TAO_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &,
                                           const char *,
                                           CORBA::Policy_ptr,
-                                          CORBA::Policy_ptr
-                                          ACE_ENV_ARG_DECL_NOT_USED)
+                                          CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
@@ -102,8 +92,7 @@ TAO_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &,
 
 void
 TAO_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &,
-                                       const char *
-                                       ACE_ENV_ARG_DECL_NOT_USED)
+                                       const char *)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -111,16 +100,14 @@ TAO_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &,
 void
 TAO_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
                                               const char *,
-                                              CORBA::Policy_ptr
-                                              ACE_ENV_ARG_DECL_NOT_USED)
+                                              CORBA::Policy_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 
 void
-TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info
-                             ACE_ENV_ARG_DECL)
+TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -128,9 +115,8 @@ TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
   srv_con->context_id = Client_Interceptor::SchedulingInfo;
   srv_con->context_data.length (sizeof (size_t));
   ACE_OS::memcpy (srv_con->context_data.get_buffer (),
-                  current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (),
+                  current_->id ()->get_buffer (),
                   sizeof (size_t));
-  ACE_CHECK;
   request_info->add_request_service_context (*srv_con,
                                              0);
 }
@@ -140,18 +126,15 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
                                 RTScheduling::Current::IdType_out guid_out,
                                 CORBA::String_out /*name*/,
                                 CORBA::Policy_out /*sched_param*/,
-                                CORBA::Policy_out /*implicit_sched_param*/
-                                ACE_ENV_ARG_DECL)
+                                CORBA::Policy_out /*implicit_sched_param*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   IOP::ServiceContext_var serv_cxt;
 
-  ACE_TRY
+  try
     {
-      serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo);
 
       size_t gu_id;
       ACE_OS::memcpy (&gu_id,
@@ -173,71 +156,62 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
 
       guid_out.ptr () = guid;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Invalid Service Context\n"));
     }
-  ACE_ENDTRY;
 }
 
 void
-TAO_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-TAO_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-TAO_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-TAO_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
-                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-TAO_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-TAO_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-TAO_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 }
 
 void
-TAO_Scheduler::cancel (const RTScheduling::Current::IdType &
-                       ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Scheduler::cancel (const RTScheduling::Current::IdType &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h
index c54895ac089..27bb8751f52 100644
--- a/TAO/tests/RTScheduling/Scheduler.h
+++ b/TAO/tests/RTScheduling/Scheduler.h
@@ -11,71 +11,62 @@ public RTScheduling::Scheduler,
 {
  public:
 
-  TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  TAO_Scheduler (CORBA::ORB_ptr orb);
 
   ~TAO_Scheduler (void);
 
-  virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * scheduling_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyList * poa_policies (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * scheduling_discipline_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name,
-                                                                     CORBA::Policy_ptr scheduling_parameter
-                                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                     CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_scheduling_parameter (PortableServer::Servant & resource,
                                          const char * name,
-                                         CORBA::Policy_ptr scheduling_parameter
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         CORBA::Policy_ptr scheduling_parameter)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                              const char * name,
                                              CORBA::Policy_ptr sched_param,
-                                             CORBA::Policy_ptr implicit_sched_param
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                                 const char * name,
                                                 CORBA::Policy_ptr sched_param,
-                                                CORBA::Policy_ptr implicit_sched_param
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                           const char * name,
                                           CORBA::Policy_ptr sched_param,
-                                          CORBA::Policy_ptr implicit_sched_param
-                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          CORBA::Policy_ptr implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE));
 
   virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid,
-                                       const char * name
-                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       const char * name)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid,
                                               const char * name,
-                                              CORBA::Policy_ptr outer_sched_param
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              CORBA::Policy_ptr outer_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
@@ -83,46 +74,37 @@ public RTScheduling::Scheduler,
                                 RTScheduling::Current::IdType_out guid,
                                 CORBA::String_out name,
                                 CORBA::Policy_out sched_param,
-                                CORBA::Policy_out implicit_sched_param
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                CORBA::Policy_out implicit_sched_param)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
-  virtual void cancel (const RTScheduling::Current::IdType & guid
-                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void cancel (const RTScheduling::Current::IdType & guid)
     ACE_THROW_SPEC ((CORBA::SystemException));
  private:
   RTScheduling::Current_var current_;
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index 14c947939fb..83f368dbc91 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -42,25 +42,19 @@ main (int argc, char* argv [])
   test_var server;
   RTScheduling::Scheduler_var safe_scheduler;
 
-  ACE_TRY_NEW_ENV
+  try
     {
 
       orb = CORBA::ORB_init (argc,
                              argv,
-                             ""
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             "");
 
       if (parse_args (argc, argv) == -1)
         return (-1);
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
-                                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager");
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
-                                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
       TAO_Scheduler* scheduler;
       ACE_NEW_RETURN (scheduler,
@@ -72,13 +66,9 @@ main (int argc, char* argv [])
 
 
       CORBA::Object_var object =
-        orb->string_to_object (ior.c_str ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior.c_str ());
 
-      server = test::_narrow (object.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server = test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -88,13 +78,9 @@ main (int argc, char* argv [])
                             1);
         }
 
-      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
-								       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current");
 
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
-                                                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ());
 
       const char * name = 0;
       CORBA::Policy_ptr sched_param = 0;
@@ -102,9 +88,7 @@ main (int argc, char* argv [])
 
       current->begin_scheduling_segment (name,
                                          sched_param,
-                                         implicit_sched_param
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                         implicit_sched_param);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Making a one-way request\n"));
@@ -112,29 +96,23 @@ main (int argc, char* argv [])
 
       ACE_DEBUG ((LM_DEBUG,
                   "Making a two-way request\n"));
-      server->two_way (ior.c_str ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->two_way (ior.c_str ());
 
-      current->end_scheduling_segment (name
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      current->end_scheduling_segment (name);
 
     }
-  ACE_CATCH (CORBA::THREAD_CANCELLED, thr_ex)
+  catch (const CORBA::THREAD_CANCELLED& )
     {
       ACE_DEBUG ((LM_DEBUG,
 		  "Distributable Thread Cancelled - Expected Exception\n"));
       server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
 
       return 0;
     }
-  ACE_ENDTRY;
 
   orb->destroy ();
 
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index 73e333552ca..85301c079f7 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -11,43 +11,38 @@ const char* filename = "test.ior";
 class test_impl : public POA_test
 {
 public:
-  
+
   test_impl (CORBA::ORB_ptr orb,
 	     RTScheduling::Current_ptr current)
-    : orb_ (orb), 
+    : orb_ (orb),
     current_ (RTScheduling::Current::_duplicate (current))
   {
   }
-  
-  virtual void one_way (const char * message
-			ACE_ENV_ARG_DECL_NOT_USED)
+
+  virtual void one_way (const char * message)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
 		"One-Way Message = %s\n",
 		message));
   }
-  
-  virtual char * two_way (const char * message
-			  ACE_ENV_ARG_DECL)
+
+  virtual char * two_way (const char * message)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG,
 		"Two-Way Message = %s\n",
 		message));
-    
-    RTScheduling::DistributableThread_var DT = 
-      this->current_->lookup (*(this->current_->id ())
-			      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-    
-    DT->cancel (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-    
+
+    RTScheduling::DistributableThread_var DT =
+      this->current_->lookup (*(this->current_->id ()));
+
+    DT->cancel ();
+
     return CORBA::string_dup (message);
   }
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     orb_->shutdown ();
@@ -58,7 +53,7 @@ private:
   RTScheduling::Current_var current_;
 };
 
-int 
+int
 parse_args (int argc,
 	    ACE_TCHAR* argv [])
 {
@@ -84,84 +79,62 @@ parse_args (int argc,
 int
 main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
 	CORBA::ORB_init (argc,
 			 argv,
-			 ""
-			 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+			 "");
 
       parse_args (argc, argv);
 
       CORBA::Object_var object =
-	orb->resolve_initial_references ("RootPOA"
-					 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+	orb->resolve_initial_references ("RootPOA");
+
       PortableServer::POA_var root_poa =
-	PortableServer::POA::_narrow (object.in ()
-				      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
+	PortableServer::POA::_narrow (object.in ());
+
       PortableServer::POAManager_var poa_manager =
-	root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
-								       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
-									  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  root_poa->the_POAManager ();
+
+      poa_manager->activate ();
+
+      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current");
+
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ());
 
       test_impl* test_i;
       ACE_NEW_RETURN (test_i,
 		      test_impl (orb.in (),
 				 current.in ()),
 		      -1);
-      
+
       PortableServer::ObjectId_var id;
-      
-      id = root_poa->activate_object (test_i
-				      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+
+      id = root_poa->activate_object (test_i);
 
       CORBA::Object_var server =
-	root_poa->id_to_reference (id.in ()
-				   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+	root_poa->id_to_reference (id.in ());
 
       CORBA::String_var ior;
       if (!CORBA::is_nil (server.in ()))
 	{
-	  ior = orb->object_to_string (server.in ()
-				       ACE_ENV_ARG_PARAMETER);
-	  ACE_TRY_CHECK;
+	  ior = orb->object_to_string (server.in ());
 	}
-      else 
+      else
 	{
 	  ACE_ERROR_RETURN ((LM_ERROR,
 			     "Failed to activate test object\n"),
 			    -1);
 	}
-      
+
       ACE_DEBUG ((LM_DEBUG,
 		  "IOR = %s\n",
 		  ior.in ()));
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
-								       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager");
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
-									      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
       TAO_Scheduler scheduler (orb.in ());
       manager->rtscheduler (&scheduler);
@@ -181,13 +154,11 @@ main (int argc, char* argv[])
 
       orb->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY; 
 
   return 0;
 }
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index 9ad3f1430d0..b33e02a1080 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -17,7 +17,7 @@ Thread_Task::guids (void)
 int
 Thread_Task::activate_task (CORBA::ORB_ptr orb)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       ACE_NEW_RETURN (shutdown_lock_,
                       ACE_Lock_Adapter <TAO_SYNCH_MUTEX>,
@@ -29,20 +29,14 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb)
 
       this->orb_ = CORBA::ORB::_duplicate (orb);
 
-      CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
-                                                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current");
 
-      this->current_ = RTScheduling::Current::_narrow (current_obj.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_ = RTScheduling::Current::_narrow (current_obj.in ());
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception:");
+      ex._tao_print_exception ("Exception:");
     }
-  ACE_ENDTRY;
 
   long flags = THR_NEW_LWP | THR_JOINABLE;
   if (this->ACE_Task <ACE_SYNCH>::activate (flags,
@@ -65,7 +59,7 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb)
 int
 Thread_Task::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       const char * name = 0;
       CORBA::Policy_ptr sched_param = 0;
@@ -74,9 +68,7 @@ Thread_Task::svc (void)
       //Start - Nested Scheduling Segment
       this->current_->begin_scheduling_segment ("Chamber of Secrets",
                                                 sched_param,
-                                                implicit_sched_param
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                implicit_sched_param);
 
       size_t count = 0;
       ACE_OS::memcpy (&count,
@@ -86,24 +78,19 @@ Thread_Task::svc (void)
 
       this->current_->begin_scheduling_segment ("Potter",
                                                 sched_param,
-                                                implicit_sched_param
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                implicit_sched_param);
 
       this->guid_[guid_index++] = *(this->current_->id ());
 
       //Start - Nested Scheduling Segment
       this->current_->begin_scheduling_segment ("Harry",
                                                 sched_param,
-                                                implicit_sched_param
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                                implicit_sched_param);
 
 
       {
         ACE_GUARD_RETURN (ACE_Lock, ace_mon, *shutdown_lock_,-1);
-        RTScheduling::Current::NameList_var name_list = this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        RTScheduling::Current::NameList_var name_list = this->current_->current_scheduling_segment_names ();
 
         ACE_DEBUG ((LM_DEBUG,
                     "Scheduling Segments for DT %d :\n",
@@ -119,25 +106,19 @@ Thread_Task::svc (void)
 
       ACE_OS::sleep (50);
 
-      this->current_->end_scheduling_segment (name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_->end_scheduling_segment (name);
       //  End - Nested Scheduling Segment
 
 
 
-      this->current_->end_scheduling_segment (name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_->end_scheduling_segment (name);
       //  End - Nested Scheduling Segment
 
-      this->current_->end_scheduling_segment (name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->current_->end_scheduling_segment (name);
 
 
     }
-  ACE_CATCH (CORBA::THREAD_CANCELLED, thr_ex)
+  catch (const CORBA::THREAD_CANCELLED& )
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Distributable Thread Cancelled - Expected Exception\n"));
@@ -150,11 +131,9 @@ Thread_Task::svc (void)
 
       return 0;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index 42a390c4b01..3501ebf87f8 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -9,22 +9,16 @@
 int
 main (int argc, char* argv [])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
 	CORBA::ORB_init (argc,
 			 argv,
-			 ""
-			 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+			 "");
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
-								       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager");
 
-      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ()
-									      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in ());
 
       TAO_Scheduler scheduler (orb.in ());
 
@@ -44,35 +38,26 @@ main (int argc, char* argv [])
       ACE_DEBUG ((LM_DEBUG,
 		  "Cancelling Threads.....\n"));
 
-      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
-								       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current");
 
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
-									  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ());
 
       for (int i = 0; i < 4; i++)
         {
-          RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i]
-                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          RTScheduling::DistributableThread_var DT = current->lookup ((task.guids ())[i]);
 
-          DT->cancel (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          DT->cancel ();
         }
 
       orb->run ();
 
       ACE_Thread_Manager::instance ()->wait ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/RTScheduling/VoidData/test.h b/TAO/tests/RTScheduling/VoidData/test.h
index ae4181971a9..c0331b431bf 100644
--- a/TAO/tests/RTScheduling/VoidData/test.h
+++ b/TAO/tests/RTScheduling/VoidData/test.h
@@ -5,7 +5,7 @@
 class test_impl :public test
 {
  public:
-  virtual void bar (CORBA::VoidData something ACE_ENV_ARG_DECL_NOT_USED)
+  virtual void bar (CORBA::VoidData something)
     ACE_THROW_SPEC ((CORBA::SystemException))
 
   {
diff --git a/TAO/tests/RTScheduling/VoidData/test_client.cpp b/TAO/tests/RTScheduling/VoidData/test_client.cpp
index 087080ddbba..c222feaef8c 100644
--- a/TAO/tests/RTScheduling/VoidData/test_client.cpp
+++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp
@@ -7,28 +7,24 @@ int
 main (int argc, char* argv [])
 {
   CORBA::ORB_var orb;
-  ACE_TRY_NEW_ENV
+  try
     {
       orb = CORBA::ORB_init (argc,
                              argv,
-                             ""
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             "");
 
       test_impl foo_i;
       int something = 28;
       foo_i.bar ((CORBA::VoidData) &something);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
 
       orb->shutdown ();
       orb->destroy ();
       return 0;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
index 106c14a0ec0..a674abae643 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -12,38 +12,34 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Oneway_Receiver::raise_no_permission (ACE_ENV_SINGLE_ARG_DECL)
+Oneway_Receiver::raise_no_permission (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::NO_PERMISSION ());
+  throw CORBA::NO_PERMISSION ();
 }
 
 void
-Oneway_Receiver::destroy (ACE_ENV_SINGLE_ARG_DECL)
+Oneway_Receiver::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  PortableServer::POA_var poa = this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    poa->servant_to_id (this);
 
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  poa->deactivate_object (id.in ());
 }
 
 Test::Shutdown_Helper_ptr
-Oneway_Receiver::get_shutdown_helper (ACE_ENV_SINGLE_ARG_DECL)
+Oneway_Receiver::get_shutdown_helper (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Shutdown_Helper *shutdown_helper;
   ACE_NEW_THROW_EX (shutdown_helper,
                     Shutdown_Helper (this->orb_.in ()),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Test::Shutdown_Helper::_nil ());
 
   PortableServer::ServantBase_var transfer_ownership(shutdown_helper);
 
-  return shutdown_helper->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return shutdown_helper->_this ();
 }
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
index fdf0a36b9c5..0f7cadff68f 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
@@ -17,13 +17,13 @@ public:
   Oneway_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void raise_no_permission (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void raise_no_permission (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Test::Shutdown_Helper_ptr get_shutdown_helper (ACE_ENV_SINGLE_ARG_DECL)
+  virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
index 38ffc90ed4b..fe72789790a 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
@@ -11,8 +11,8 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb)
 }
 
 void
-Shutdown_Helper::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Shutdown_Helper::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
index e4b764f3497..935bd5d96aa 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
@@ -17,7 +17,7 @@ public:
   Shutdown_Helper (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index 259e1be4ea6..7fa211ab60d 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -70,35 +70,28 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-void run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver
-                                ACE_ENV_ARG_DECL);
-void run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
-                                ACE_ENV_ARG_DECL);
-void run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver
-                                   ACE_ENV_ARG_DECL);
-void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver
-                         ACE_ENV_ARG_DECL);
+void run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver);
+void run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver);
+void run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver);
+void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver);
 
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Oneway_Receiver_var oneway_receiver =
-        Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Oneway_Receiver::_narrow(tmp.in ());
 
       if (CORBA::is_nil (oneway_receiver.in ()))
         {
@@ -111,37 +104,28 @@ main (int argc, char *argv[])
       if (test_sync_with_target)
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TARGET\n"));
-          run_test_sync_with_target (oneway_receiver.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          run_test_sync_with_target (oneway_receiver.in ());
         }
       else if (test_sync_with_server)
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_SERVER\n"));
-          run_test_sync_with_server (oneway_receiver.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          run_test_sync_with_server (oneway_receiver.in ());
         }
       else if (test_sync_with_transport)
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TRANSPORT\n"));
-          run_test_sync_with_transport (oneway_receiver.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          run_test_sync_with_transport (oneway_receiver.in ());
         }
       else
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_NONE\n"));
-          run_test_sync_none (oneway_receiver.in ()
-                              ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          run_test_sync_none (oneway_receiver.in ());
         }
 
       // Run the orb for 3 seconds, this way we make sure things are flushed
       // to the transport.
       ACE_Time_Value time (3, 0);
-      orb->run (time ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (time);
 
       if (successful_calls == 0)
         ACE_ERROR ((LM_ERROR, "ERROR: No requests were successful\n"));
@@ -155,35 +139,28 @@ main (int argc, char *argv[])
                     "ERROR: Mismatched number of calls (%d + %d != %d)\n",
                     successful_calls, failed_calls, iterations));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
 
 void
-set_sync_scope_policy (Messaging::SyncScope sync_scope
-                       ACE_ENV_ARG_DECL)
+set_sync_scope_policy (Messaging::SyncScope sync_scope)
 {
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "");
 
   CORBA::Object_var object =
-    orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("PolicyCurrent");
 
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    CORBA::PolicyCurrent::_narrow (object.in ());
 
   if (CORBA::is_nil (policy_current.in ()))
     {
@@ -196,48 +173,38 @@ set_sync_scope_policy (Messaging::SyncScope sync_scope
   CORBA::PolicyList policies(1); policies.length (1);
   policies[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        scope_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        scope_as_any);
 
-  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
 
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policies[0]->destroy ();
 }
 
 void
 run_one_iteration (int i,
                    Test::Oneway_Receiver_ptr oneway_receiver,
-                   Test::Shutdown_Helper_ptr shutdown_helper
-                   ACE_ENV_ARG_DECL)
+                   Test::Shutdown_Helper_ptr shutdown_helper)
 {
-  ACE_TRY
+  try
     {
       if (i == iterations / 3)
         {
           ACE_DEBUG ((LM_DEBUG, "Destroying object\n"));
           server_status = DESTROYED;
-          oneway_receiver->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          oneway_receiver->destroy ();
         }
       if (i == 2 * iterations / 3)
         {
           ACE_DEBUG ((LM_DEBUG, "Shutting down server process\n"));
           server_status = SHUTDOWN;
-          shutdown_helper->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          shutdown_helper->shutdown ();
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
     }
-  ACE_ENDTRY;
 
-  oneway_receiver->raise_no_permission (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  oneway_receiver->raise_no_permission ();
 }
 
 /// Helper routine to set breakpoints during failures
@@ -246,44 +213,39 @@ call_failed (const CORBA::SystemException &ex)
 {
   failed_calls++;
 
-  ACE_PRINT_EXCEPTION (ex, "Exception raised");
+  ex._tao_print_exception ("Exception raised");
 }
 
 void
-run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver
-                           ACE_ENV_ARG_DECL)
+run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver)
 {
-  set_sync_scope_policy (Messaging::SYNC_WITH_TARGET ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  set_sync_scope_policy (Messaging::SYNC_WITH_TARGET);
 
   Test::Shutdown_Helper_var shutdown_helper =
-    oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    oneway_receiver->get_shutdown_helper ();
 
   int had_comm_failure = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      ACE_TRY
+      try
         {
-          run_one_iteration (i, oneway_receiver, shutdown_helper.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          run_one_iteration (i, oneway_receiver, shutdown_helper.in ());
         }
-      ACE_CATCH (CORBA::NO_PERMISSION, ex)
+      catch (const CORBA::NO_PERMISSION& ex)
         {
           if (server_status == ALIVE)
             successful_calls++;
           else
             call_failed (ex);
         }
-      ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+      catch (const CORBA::OBJECT_NOT_EXIST& ex)
         {
           if (server_status == DESTROYED)
             successful_calls++;
           else
             call_failed (ex);
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, ex)
+      catch (const CORBA::COMM_FAILURE& ex)
         {
           if (server_status == SHUTDOWN && had_comm_failure == 0)
             successful_calls++;
@@ -291,40 +253,34 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver
             call_failed (ex);
           had_comm_failure = 1;
         }
-      ACE_CATCH (CORBA::TRANSIENT, ex)
+      catch (const CORBA::TRANSIENT& ex)
         {
           if (server_status == SHUTDOWN)
             successful_calls++;
           else
             call_failed (ex);
         }
-      ACE_CATCH (CORBA::SystemException, ex)
+      catch (const CORBA::SystemException& ex)
         {
           call_failed (ex);
         }
-      ACE_ENDTRY;
     }
 }
 
 void
-run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
-                           ACE_ENV_ARG_DECL)
+run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver)
 {
-  set_sync_scope_policy (Messaging::SYNC_WITH_SERVER ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  set_sync_scope_policy (Messaging::SYNC_WITH_SERVER);
 
   Test::Shutdown_Helper_var shutdown_helper =
-    oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    oneway_receiver->get_shutdown_helper ();
 
   int had_comm_failure = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      ACE_TRY
+      try
         {
-          run_one_iteration (i, oneway_receiver, shutdown_helper.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          run_one_iteration (i, oneway_receiver, shutdown_helper.in ());
 
           if (server_status == DESTROYED
               || server_status == SHUTDOWN)
@@ -332,18 +288,18 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
           else
             successful_calls++;
         }
-      ACE_CATCH (CORBA::NO_PERMISSION, ex)
+      catch (const CORBA::NO_PERMISSION& ex)
         {
           call_failed (ex);
         }
-      ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+      catch (const CORBA::OBJECT_NOT_EXIST& ex)
         {
           if (server_status == DESTROYED)
             successful_calls++;
           else
             call_failed (ex);
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, ex)
+      catch (const CORBA::COMM_FAILURE& ex)
         {
           if (server_status == SHUTDOWN && had_comm_failure == 0)
             successful_calls++;
@@ -351,66 +307,54 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
             call_failed (ex);
           had_comm_failure = 1;
         }
-      ACE_CATCH (CORBA::TRANSIENT, ex)
+      catch (const CORBA::TRANSIENT& ex)
         {
           if (server_status == SHUTDOWN)
             successful_calls++;
           else
             call_failed (ex);
         }
-      ACE_CATCH (CORBA::SystemException, ex)
+      catch (const CORBA::SystemException& ex)
         {
           call_failed (ex);
         }
-      ACE_ENDTRY;
     }
 }
 
 /// Helper routine to run the sync_with_transport and sync_none tests.
 void
-run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver
-                     ACE_ENV_ARG_DECL);
+run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver);
 
 void
-run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver
-                              ACE_ENV_ARG_DECL)
+run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver)
 {
-  set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT);
 
-  run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  run_test_unreliable (oneway_receiver);
 }
 
 void
-run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver
-                    ACE_ENV_ARG_DECL)
+run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver)
 {
-  set_sync_scope_policy (Messaging::SYNC_NONE ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  set_sync_scope_policy (Messaging::SYNC_NONE);
 
-  run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  run_test_unreliable (oneway_receiver);
 }
 
 
 void
-run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver
-                     ACE_ENV_ARG_DECL)
+run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver)
 {
   Test::Shutdown_Helper_var shutdown_helper =
-    oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+    oneway_receiver->get_shutdown_helper ();
 
   int undetected = 0;
   int had_transient = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      ACE_TRY
+      try
         {
-          run_one_iteration (i, oneway_receiver, shutdown_helper.in ()
-                             ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          run_one_iteration (i, oneway_receiver, shutdown_helper.in ());
 
           // A few failures can go undetected...
           if (server_status == SHUTDOWN)
@@ -422,19 +366,19 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver
           else
             successful_calls++;
         }
-      ACE_CATCH (CORBA::NO_PERMISSION, ex)
+      catch (const CORBA::NO_PERMISSION& ex)
         {
           call_failed (ex);
         }
-      ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+      catch (const CORBA::OBJECT_NOT_EXIST& ex)
         {
           call_failed (ex);
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, ex)
+      catch (const CORBA::COMM_FAILURE& ex)
         {
           call_failed (ex);
         }
-      ACE_CATCH (CORBA::TRANSIENT, ex)
+      catch (const CORBA::TRANSIENT& ex)
         {
           if (server_status == SHUTDOWN)
             successful_calls++;
@@ -442,11 +386,10 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver
             call_failed (ex);
           had_transient = 1;
         }
-      ACE_CATCH (CORBA::SystemException, ex)
+      catch (const CORBA::SystemException& ex)
         {
           call_failed (ex);
         }
-      ACE_ENDTRY;
     }
   ACE_DEBUG ((LM_DEBUG, "Undetected TRANSIENT count = %d\n",
               undetected));
diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp
index 05aa3251a36..b435475d19b 100644
--- a/TAO/tests/Reliable_Oneways/server.cpp
+++ b/TAO/tests/Reliable_Oneways/server.cpp
@@ -37,19 +37,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -70,12 +66,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl);
 
       Test::Oneway_Receiver_var oneway_receiver =
-        oneway_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        oneway_receiver_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (oneway_receiver.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -87,27 +81,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
index 6095fe48373..2ca4fe3f756 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp
@@ -11,7 +11,7 @@ One_Impl::One_Impl (CORBA::ORB_ptr orb)
 }
 
 char *
-One_Impl::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+One_Impl::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("One_Impl there!");
@@ -23,7 +23,7 @@ Two_Impl::Two_Impl (CORBA::ORB_ptr orb)
 }
 
 char *
-Two_Impl::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Two_Impl::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("One_Impl there!");
@@ -36,7 +36,7 @@ Three_Impl::Three_Impl (CORBA::ORB_ptr orb)
 }
 
 char *
-Three_Impl::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Three_Impl::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Three_Impl there!");
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h
index 4ff3dd09b6e..c514c184b73 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.h
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h
@@ -16,7 +16,7 @@ public:
   One_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -33,7 +33,7 @@ public:
   Two_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -50,7 +50,7 @@ public:
   Three_Impl (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp
index 65139d0cd63..6285c8e221f 100644
--- a/TAO/tests/Servant_To_Reference_Test/server.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/server.cpp
@@ -37,37 +37,27 @@ private:
 int
 MT_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       for (CORBA::Long i = 0;
            i != 2000;
            ++i)
         {
           CORBA::Object_var one_ref =
-            this->p_->servant_to_reference (this->one_
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->p_->servant_to_reference (this->one_);
 
           CORBA::Object_var two_ref =
-            this->p_->servant_to_reference (this->two_
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->p_->servant_to_reference (this->two_);
 
           CORBA::Object_var three_ref =
-            this->p_->servant_to_reference (this->three_
-                                            ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            this->p_->servant_to_reference (this->three_);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Caugh exception \n");
+      ex._tao_print_exception ("(%P|%t) Caugh exception \n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -101,19 +91,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -121,8 +108,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -151,25 +137,17 @@ main (int argc, char *argv[])
       PortableServer::POA_var first_poa =
         root_poa->create_POA ("first POA",
                               poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                              policies);
 
 
       PortableServer::ObjectId_var oid1 =
-        first_poa->activate_object (one_impl
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->activate_object (one_impl);
 
       PortableServer::ObjectId_var oid2 =
-        first_poa->activate_object (two_impl
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->activate_object (two_impl);
 
       PortableServer::ObjectId_var oid3 =
-        first_poa->activate_object (three_impl
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        first_poa->activate_object (three_impl);
 
 
       MT_Task task (first_poa.in (),
@@ -185,24 +163,19 @@ main (int argc, char *argv[])
 
       task.thr_mgr ()->wait ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - test finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp
index da045e2503f..ac237e4501d 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.cpp
+++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp
@@ -4,8 +4,7 @@
 #include "Test_i.h"
 
 void
-test_i::send_stuff (const char* string
-                    ACE_ENV_ARG_DECL_NOT_USED)
+test_i::send_stuff (const char* string)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string));
diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h
index 0f6e923322d..7bb9a6d777e 100644
--- a/TAO/tests/Server_Connection_Purging/Test_i.h
+++ b/TAO/tests/Server_Connection_Purging/Test_i.h
@@ -13,8 +13,7 @@ class test_i
 {
 public:
   // = The skeleton methods
-  virtual void send_stuff (const char* string
-                           ACE_ENV_ARG_DECL)
+  virtual void send_stuff (const char* string)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp
index 52c7b5e6395..009e401c408 100644
--- a/TAO/tests/Server_Connection_Purging/server.cpp
+++ b/TAO/tests/Server_Connection_Purging/server.cpp
@@ -30,21 +30,17 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,8 +48,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -65,12 +60,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       test_var test =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        test_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (test.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -82,29 +75,23 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_Time_Value tv (120, 0);
 
-      orb->run (&tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (&tv);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp
index 31cf7652b1a..b2392e6dea6 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.cpp
+++ b/TAO/tests/Server_Leaks/Ping_Service.cpp
@@ -11,14 +11,14 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb)
 }
 
 void
-Ping_Service::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Ping_Service::ping (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Ping_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Ping_Service::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h
index 8136914b8ce..cf83b5bc6d9 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.h
+++ b/TAO/tests/Server_Leaks/Ping_Service.h
@@ -17,10 +17,10 @@ public:
   Ping_Service (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp
index c8263903192..2c75dd5197f 100644
--- a/TAO/tests/Server_Leaks/client.cpp
+++ b/TAO/tests/Server_Leaks/client.cpp
@@ -42,22 +42,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Ping_Service_var ping_service =
-        Test::Ping_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Ping_Service::_narrow(tmp.in ());
 
       if (CORBA::is_nil (ping_service.in ()))
         {
@@ -69,26 +66,21 @@ main (int argc, char *argv[])
 
       for (int i = 0; i != 10; ++i)
         {
-          ping_service->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ping_service->ping ();
         }
 
       if (do_shutdown)
         {
-          ping_service->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          ping_service->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp
index 0a037cdb95d..1e4701d7cdb 100644
--- a/TAO/tests/Server_Leaks/server.cpp
+++ b/TAO/tests/Server_Leaks/server.cpp
@@ -36,19 +36,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,8 +53,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -69,12 +65,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(ping_service_impl);
 
       Test::Ping_Service_var ping_service =
-        ping_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        ping_service_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (ping_service.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (ping_service.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -86,27 +80,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp
index 457b7da1064..379c52e6aa5 100644
--- a/TAO/tests/Server_Port_Zero/Hello.cpp
+++ b/TAO/tests/Server_Port_Zero/Hello.cpp
@@ -13,15 +13,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Hello::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h
index 1a404058944..6131e1a3c88 100644
--- a/TAO/tests/Server_Port_Zero/Hello.h
+++ b/TAO/tests/Server_Port_Zero/Hello.h
@@ -17,10 +17,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp
index 4375a5c4b06..8745f87ed5f 100644
--- a/TAO/tests/Server_Port_Zero/server.cpp
+++ b/TAO/tests/Server_Port_Zero/server.cpp
@@ -39,19 +39,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -59,8 +56,7 @@ 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 ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -72,12 +68,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        hello_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (hello.in ());
 
       // Output the IOR to the <ior_output_file>
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,29 +83,23 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       ACE_Time_Value tv (3, 0);
 
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index 7e69d9350cf..1b6ef1afe6d 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -71,17 +71,14 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -90,14 +87,10 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a <test> reference.
-      test_var test_object = test::_narrow (object.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test_object = test::_narrow (object.in ());
 
       test::data the_data0 (data_bytes);
       the_data0.length (data_bytes);
@@ -118,21 +111,15 @@ main (int argc, char **argv)
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data0
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               the_data0);
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data1
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               the_data1);
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data2
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               the_data2);
         }
 
       // Shutdown server.
@@ -140,8 +127,7 @@ main (int argc, char **argv)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Sending a shutdown call..\n"));
-          test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_object->shutdown ();
         }
 
       // Destroy the ORB.  On some platforms, e.g., Win32, the socket
@@ -150,18 +136,14 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index 20af40930ea..fe5f4460bcb 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/server.cpp
@@ -37,28 +37,21 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -66,13 +59,10 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -85,26 +75,20 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 5125a7c9c22..edf2618af87 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -12,8 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::method (CORBA::ULong request_number,
-                const test::data &
-                ACE_ENV_ARG_DECL_NOT_USED)
+                const test::data &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -28,11 +27,10 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shudown... "));
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h
index 39387592b14..e55503154a7 100644
--- a/TAO/tests/Single_Read/test_i.h
+++ b/TAO/tests/Single_Read/test_i.h
@@ -29,11 +29,10 @@ public:
 
   // = The test interface methods.
   void method (CORBA::ULong request_number,
-               const test::data &
-               ACE_ENV_ARG_DECL_NOT_USED)
+               const test::data &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index 949c299e773..4caca817ffd 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -8,8 +8,7 @@ Smart_Test_Factory::Smart_Test_Factory (void)
 }
 
 Test_ptr
-Smart_Test_Factory::create_proxy (Test_ptr proxy
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+Smart_Test_Factory::create_proxy (Test_ptr proxy)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -28,13 +27,12 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 }
 
 CORBA::Short
-Smart_Test_Proxy::box_prices (ACE_ENV_SINGLE_ARG_DECL)
+Smart_Test_Proxy::box_prices (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->price_ == 0)
     {
-      this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
+      this->price_ = TAO_Test_Smart_Proxy_Base::box_prices ();
     }
   return this->price_;
 }
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
index b3ac7e0c5d9..df80c6814f4 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
@@ -7,8 +7,7 @@ public:
 
   Smart_Test_Factory (void);
 
-  virtual Test_ptr create_proxy (Test_ptr proxy
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual Test_ptr create_proxy (Test_ptr proxy);
   // This method will create the smart_proxy.
 };
 
@@ -17,7 +16,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short box_prices(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short box_prices(void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // "Smartify" the method call!
 
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 34732cdac90..5d72b276cb3 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -117,22 +117,18 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      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;
+        orb->string_to_object (ior);
       if (register_smart_proxy == 1)
         {
           // To use the smart proxy it is necessary to allocate the
@@ -152,9 +148,7 @@ main (int argc, char *argv[])
         }
 
       Test_var server =
-        Test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -177,8 +171,7 @@ main (int argc, char *argv[])
            // Record current time.
            ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-           price = server->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER);
-           ACE_TRY_CHECK;
+           price = server->box_prices ();
 
            if (price < 300)
              cost = server->tickets (5);
@@ -190,21 +183,17 @@ main (int argc, char *argv[])
            marker.sample (now - throughput_base,
                           now - latency_base);
 
-           ACE_TRY_CHECK;
            if (TAO_debug_level > 0 && i % 100 == 0)
              ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
          }
 
        marker.dump_stats ("buying tickets ", gsf);
 
-       server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+       server->shutdown ();
       /*
 
       Test_var server1 =
-        Test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server1.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -227,8 +216,7 @@ main (int argc, char *argv[])
            // Record current time.
            ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-           price1 = server1->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER);
-           ACE_TRY_CHECK;
+           price1 = server1->box_prices ();
 
            if (price1 < 300)
              cost = server1->tickets (5);
@@ -240,24 +228,20 @@ main (int argc, char *argv[])
            marker.sample (now - throughput_base1,
                           now - latency_base);
 
-           ACE_TRY_CHECK;
            if (TAO_debug_level > 0 && i % 100 == 0)
              ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
          }
 
        marker1.dump_stats ("buying tickets using a default proxy ", gsf1);
 
-       server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+       server1->shutdown ();
       */
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client-side exception:");
+      ex._tao_print_exception ("Client-side exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index ca2acbcbec2..183d5451e8f 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -29,14 +29,13 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short box_prices  (ACE_ENV_SINGLE_ARG_DECL)
+  CORBA::Short box_prices  (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long tickets  (CORBA::Short number
-                        ACE_ENV_ARG_DECL)
+  CORBA::Long tickets  (CORBA::Short number)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown  (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown  (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -50,25 +49,24 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i::box_prices (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::box_prices (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125;
 }
 
 CORBA::Long
-Test_i::tickets (CORBA::Short number
-                 ACE_ENV_ARG_DECL_NOT_USED)
+Test_i::tickets (CORBA::Short number)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125 * number;
 }
 
 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);
+  this->orb_->shutdown (0);
 }
 
 static const char *ior_output_file = 0;
@@ -101,45 +99,34 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
 
-      ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Test_var Test_object =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (Test_object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (Test_object.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -159,26 +146,20 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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,
                   "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in setting up server");
+      ex._tao_print_exception ("Exception in setting up server");
       ACE_ASSERT (0);
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index fce6e571c50..27abe97ce77 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -22,11 +22,10 @@ Collocation_Test::Collocation_Test (void)
 }
 
 int
-Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+Collocation_Test::init (int argc, char *argv[])
 {
   // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->orb_ = CORBA::ORB_init (argc, argv, 0);
 
   int result = this->parse_args (argc, argv);
   if (result != 0)
@@ -34,53 +33,37 @@ Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
   // Get an Object reference to RootPOA.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Narrow the Object reference to a POA reference
   this->root_poa_ =
-    PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (obj.in ());
 
   // Get the POAManager of RootPOA
   this->poa_manager_ =
-    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->the_POAManager ();
 
   // Activate the diamond servant and its base classes under RootPOA.
   PortableServer::ObjectId_var id =
-    this->root_poa_->activate_object (&this->top_servant_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->activate_object (&this->top_servant_);
 
 //    // We only care about the most derived class here.
-//    this->diamond_obj_ = this->diamond_servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-//    ACE_CHECK_RETURN (-1);
+//    this->diamond_obj_ = this->diamond_servant_._this ();
 
   id =
-    this->root_poa_->activate_object (&this->diamond_servant_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->activate_object (&this->diamond_servant_);
 
   // We only care about the most derived class here.
-  this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ()
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ());
 
   id =
-    this->root_poa_->activate_object (&this->left_servant_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->activate_object (&this->left_servant_);
 
   id =
-    this->root_poa_->activate_object (&this->right_servant_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->root_poa_->activate_object (&this->right_servant_);
 
   CORBA::String_var str =
-    this->orb_->object_to_string (this->diamond_obj_.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->object_to_string (this->diamond_obj_.in ());
 
   ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n",
               str.in()));
@@ -99,7 +82,7 @@ Collocation_Test::parse_args (int argc, char *argv[])
 }
 
 int
-Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Test::test_narrow (void)
 {
   // Ensure that the smart proxy is the one which is used by registering
   // the user-defined factory. Its necessary to create one on the heap so
@@ -110,48 +93,38 @@ Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL)
                   -1);
 
   Diamond::Top_var top =
-    Diamond::Top::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Diamond::Top::_narrow (this->diamond_obj_.in());
 
   Diamond::Left_var left =
-    Diamond::Left::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Diamond::Left::_narrow (this->diamond_obj_.in());
 
   Diamond::Right_var right =
-    Diamond::Right::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Diamond::Right::_narrow (this->diamond_obj_.in());
 
   Diamond::Buttom_var buttom =
-    Diamond::Buttom::_narrow (this->diamond_obj_.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    Diamond::Buttom::_narrow (this->diamond_obj_.in());
 
-  CORBA::String_var str = top->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = top->shape ();
   ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ()));
 
-  str = left->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  str = left->shape ();
   ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ()));
 
-  str = right->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  str = right->shape ();
   ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ()));
 
-  str = buttom->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  str = buttom->shape ();
   ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ()));
 
   return 0;
 }
 
 int
-Collocation_Test::run (ACE_ENV_SINGLE_ARG_DECL)
+Collocation_Test::run (void)
 {
-  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->poa_manager_->activate ();
 
-  this->test_narrow (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  this->test_narrow ();
 
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
index 9e91a8f045b..7d502a7c8b6 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
@@ -28,17 +28,17 @@ class Collocation_Test
 public:
   Collocation_Test (void);
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL_NOT_USED);
+  int init (int argc, char *argv[]);
   // Initializing the Collocation_Test object.
 
   int parse_args (int argc, char *argv[]);
   // Parse the test specific arguments.
 
-  int test_narrow (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int test_narrow (void);
   // This test narrow an object reference to its base class and see
   // if it works correctly.
 
-  int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int run (void);
   // Run the test.
 
 private:
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
index f94a35d2c4b..1aed52ccf2f 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
@@ -13,7 +13,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Top_i::shape (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -32,7 +32,7 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Left_i::shape (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -41,7 +41,7 @@ Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Left_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Left_i::color (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -60,7 +60,7 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::shape (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -69,7 +69,7 @@ Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::color (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -79,7 +79,7 @@ Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Long
-Right_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::width (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -98,7 +98,7 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::shape (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -107,7 +107,7 @@ Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::color (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -116,7 +116,7 @@ Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Long
-Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::width (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -125,7 +125,7 @@ Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Buttom_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::name (void)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
index 853f34ff03d..6200a2ec1d3 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
@@ -17,7 +17,7 @@ public:
   ~Top_i (void);
   // Ctor and dtor.
 
-  virtual char* shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* shape (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 };
@@ -29,11 +29,11 @@ public:
   ~Left_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 };
@@ -45,15 +45,15 @@ public:
   ~Right_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 };
@@ -65,19 +65,19 @@ public:
   ~Buttom_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * name (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the name of the object.
 };
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index 8de0a3ed17d..e7124f4340f 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -12,7 +12,6 @@ Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void)
 
 Diamond::Top_ptr
 Smart_Diamond_Top_Factory::create_proxy (Diamond::Top_ptr proxy
-                                                 ACE_ENV_ARG_DECL_NOT_USED
                                                     )
  {
    ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n"));
@@ -30,7 +29,7 @@ Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy)
 }
 
 char *
-Smart_Diamond_Top_Proxy::shape ( ACE_ENV_SINGLE_ARG_DECL)
+Smart_Diamond_Top_Proxy::shape ()
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -38,24 +37,21 @@ Smart_Diamond_Top_Proxy::shape ( ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG, "Smart_proxy: This is "));
 
   char *ans= 0;
-  ACE_TRY
+  try
     {
       ans =
         ACE_OS::strdup (
                 Diamond::TAO_Diamond_Top_Smart_Proxy_Base::shape (
-                ACE_ENV_SINGLE_ARG_PARAMETER
               )
           );
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "%s\n", ans));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Uncaught Exception");
+      ex._tao_print_exception ("Uncaught Exception");
       return 0;
     }
-  ACE_ENDTRY;
 
   return ans;
 }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
index 35930cf52cf..1ad82aba624 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
@@ -12,8 +12,7 @@ class MY_Stub_Export Smart_Diamond_Top_Factory : public virtual Diamond::TAO_Dia
 
   Smart_Diamond_Top_Factory (void);
 
-  virtual Diamond::Top_ptr create_proxy (Diamond::Top_ptr proxy
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual Diamond::Top_ptr create_proxy (Diamond::Top_ptr proxy);
 
   // This method will create the smart_proxy.
 };
@@ -25,8 +24,7 @@ class MY_Stub_Export Smart_Diamond_Top_Proxy : public virtual Diamond::TAO_Diamo
 
   Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy);
 
-  virtual char * shape (
-                       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * shape ()
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp
index dff11cb451f..2b5dc93744b 100644
--- a/TAO/tests/Smart_Proxies/Collocation/main.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp
@@ -9,19 +9,16 @@ int main (int argc, char *argv[])
 {
   Collocation_Test coll_test;
 
-  ACE_TRY_NEW_ENV
+  try
     {
-      coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      coll_test.init (argc, argv);
 
-      coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      coll_test.run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Uncaught exception: ");
+      ex._tao_print_exception ("Uncaught exception: ");
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
index 62e5232517a..0e5e1502cbb 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
@@ -7,8 +7,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 }
 
 CORBA::Short
-Smart_Test_Proxy::method (CORBA::Short boo
-                          ACE_ENV_ARG_DECL)
+Smart_Test_Proxy::method (CORBA::Short boo)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -16,19 +15,15 @@ Smart_Test_Proxy::method (CORBA::Short boo
               "Yahoo, I am smart\n"));
 
   CORBA::Short retval = 0;
-  ACE_TRY
+  try
     {
-      retval = TAO_Test_Smart_Proxy_Base::method (boo
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = TAO_Test_Smart_Proxy_Base::method (boo);
     }
-  ACE_CATCH (Test::Oops, reason)
+  catch (const Test::Oops& reason)
     {
-      ACE_PRINT_EXCEPTION (reason,
-                           "User Exception");
+      reason._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
index a31d8556f36..e8207d93640 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
@@ -7,8 +7,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short method (CORBA::Short boo
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short method (CORBA::Short boo)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
index 1d8380fc600..a6d5caa0f2e 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
@@ -9,8 +9,7 @@ Smart_Test_Factory::Smart_Test_Factory (void)
 }
 
 Test_ptr
-Smart_Test_Factory::create_proxy (Test_ptr proxy
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+Smart_Test_Factory::create_proxy (Test_ptr proxy)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
index fcfcc2a7517..21f7cef8bef 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
@@ -14,8 +14,7 @@ public:
   Smart_Test_Factory (void);
 
   // This method will create the smart_proxy.
-  virtual Test_ptr create_proxy (Test_ptr proxy
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual Test_ptr create_proxy (Test_ptr proxy);
 };
 
 // The following Factory is used by the ACE_Service_Config to
diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
index 2ba4e74ca80..572b80866fd 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
@@ -53,30 +53,24 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      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;
+        orb->string_to_object (ior);
 
       // To use the smart proxy just enter it as a svc.conf
       // entry.
 
       Test_var server =
-        Test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -86,17 +80,14 @@ main (int argc, char *argv[])
 
       server->method (0);
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown ();
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client-side exception:");
+      ex._tao_print_exception ("Client-side exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index 5f0ebde1ffa..a517bd7deeb 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -29,12 +29,11 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo
-                        ACE_ENV_ARG_DECL)
+  CORBA::Short method  (CORBA::Short boo)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
-  void shutdown  (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown  (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -48,8 +47,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i :: method (CORBA::Short boo
-                  ACE_ENV_ARG_DECL)
+Test_i :: method (CORBA::Short boo)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -63,7 +61,7 @@ Test_i :: method (CORBA::Short boo
 }
 
 void
-Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
@@ -99,45 +97,34 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
 
-      ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Test_var Test_object =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (Test_object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (Test_object.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -157,25 +144,19 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in setting up server");
+      ex._tao_print_exception ("Exception in setting up server");
       ACE_ASSERT (0);
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
index 4123f962892..fe230c1a052 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
@@ -10,8 +10,7 @@ Smart_Test_Factory::Smart_Test_Factory (int one_shot_factory)
 }
 
 Test_ptr
-Smart_Test_Factory::create_proxy (Test_ptr proxy
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+Smart_Test_Factory::create_proxy (Test_ptr proxy)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -29,8 +28,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 }
 
 CORBA::Short
-Smart_Test_Proxy::method (CORBA::Short boo
-                          ACE_ENV_ARG_DECL)
+Smart_Test_Proxy::method (CORBA::Short boo)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -38,19 +36,15 @@ Smart_Test_Proxy::method (CORBA::Short boo
               "Yahoo, I am smart\n"));
 
   CORBA::Short retval = 0;
-  ACE_TRY
+  try
     {
-      retval = TAO_Test_Smart_Proxy_Base::method (boo
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = TAO_Test_Smart_Proxy_Base::method (boo);
     }
-  ACE_CATCH (Test::Oops, reason)
+  catch (const Test::Oops& reason)
     {
-      ACE_PRINT_EXCEPTION (reason,
-                           "User Exception");
+      reason._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
index f024b4b69f7..73515c2109e 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
@@ -8,8 +8,7 @@ public:
 
   Smart_Test_Factory (int one_shot_factory = 1);
 
-  virtual Test_ptr create_proxy (Test_ptr proxy
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual Test_ptr create_proxy (Test_ptr proxy);
   // This method will create the smart_proxy.
 };
 
@@ -18,8 +17,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short method (CORBA::Short boo
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short method (CORBA::Short boo)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp
index a54fa3856f3..e2b02924fcc 100644
--- a/TAO/tests/Smart_Proxies/Policy/client.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/client.cpp
@@ -63,27 +63,21 @@ run_test (CORBA::ORB_ptr orb_ptr,
 {
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr);
   CORBA::Object_var object;
-  ACE_TRY_NEW_ENV
+  try
     {
       if (target == 1)
         {
           object =
-            orb->string_to_object (ior1
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->string_to_object (ior1);
         }
       else
         {
           object =
-            orb->string_to_object (ior2
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            orb->string_to_object (ior2);
         }
 
       Test_var server =
-        Test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -92,29 +86,24 @@ run_test (CORBA::ORB_ptr orb_ptr,
 
       server->method (0);
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client-side exception:");
+      ex._tao_print_exception ("Client-side exception:");
     }
-  ACE_ENDTRY;
 return 0;
 }
 
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -139,15 +128,12 @@ main (int argc, char *argv[])
       run_test (orb.in (), 1);
       run_test (orb.in (), 2);
 
-      ACE_TRY_CHECK;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client-side exception:");
+      ex._tao_print_exception ("Client-side exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 7e000c323d3..66f7a13e3d0 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -29,12 +29,11 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo
-                        ACE_ENV_ARG_DECL)
+  CORBA::Short method  (CORBA::Short boo)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
-  void shutdown  (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown  (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -48,8 +47,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i :: method (CORBA::Short boo
-                  ACE_ENV_ARG_DECL)
+Test_i :: method (CORBA::Short boo)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -63,10 +61,10 @@ Test_i :: method (CORBA::Short boo
 }
 
 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);
+  this->orb_->shutdown (0);
 }
 
 static const char *ior_output_file = 0;
@@ -99,45 +97,34 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
 
-      ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Test_var Test_object =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (Test_object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (Test_object.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -157,26 +144,20 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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,
                   "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in setting up server");
+      ex._tao_print_exception ("Exception in setting up server");
       ACE_ASSERT (0);
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index b2bd94142ee..bb3bf989309 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -11,8 +11,7 @@ Smart_Test_Factory::Smart_Test_Factory (void)
 }
 
 Test_ptr
-Smart_Test_Factory::create_proxy (Test_ptr proxy
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+Smart_Test_Factory::create_proxy (Test_ptr proxy)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -46,8 +45,7 @@ Smart_Test_Proxy::convert_to_ior (bool,
 }
 
 CORBA::Short
-Smart_Test_Proxy::method (CORBA::Short boo
-                          ACE_ENV_ARG_DECL)
+Smart_Test_Proxy::method (CORBA::Short boo)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -55,19 +53,15 @@ Smart_Test_Proxy::method (CORBA::Short boo
               "Yahoo, I am smart\n"));
 
   CORBA::Short retval = 0;
-  ACE_TRY
+  try
     {
-      retval = TAO_Test_Smart_Proxy_Base::method (boo
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      retval = TAO_Test_Smart_Proxy_Base::method (boo);
     }
-  ACE_CATCH (Test::Oops, reason)
+  catch (const Test::Oops& reason)
     {
-      ACE_PRINT_EXCEPTION (reason,
-                           "User Exception");
+      reason._tao_print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
 
   return retval;
 }
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index 76d38be6245..f31fe5eecff 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -9,8 +9,7 @@ public:
 
   Smart_Test_Factory (void);
 
-  virtual Test_ptr create_proxy (Test_ptr proxy
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual Test_ptr create_proxy (Test_ptr proxy);
   // This method will create the smart_proxy.
 };
 
@@ -21,11 +20,10 @@ public:
 
   virtual bool can_convert_to_ior (void) const;
 
-  virtual char* convert_to_ior (bool use_omg_ior_format,       
+  virtual char* convert_to_ior (bool use_omg_ior_format,
                                 const char* ior_prefix) const;
 
-  virtual CORBA::Short method (CORBA::Short boo
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short method (CORBA::Short boo)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp
index 2fc36491398..d92fa486932 100644
--- a/TAO/tests/Smart_Proxies/client.cpp
+++ b/TAO/tests/Smart_Proxies/client.cpp
@@ -55,22 +55,18 @@ int
 main (int argc, char *argv[])
 {
   int status = 0;
-  ACE_TRY_NEW_ENV
+  try
     {
       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;
+        orb->string_to_object (ior);
 
       // To use the smart proxy it is necessary to allocate the
       // user-defined smart factory on the heap as the smart proxy
@@ -87,9 +83,7 @@ main (int argc, char *argv[])
       ACE_UNUSED_ARG (test_factory);
 
       Test_var server =
-        Test::_narrow (object.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -113,15 +107,12 @@ main (int argc, char *argv[])
       catch (const CORBA::MARSHAL& ex)
         {
           status = 1;
-          ACE_PRINT_EXCEPTION (ex,
-                               "Unexpected MARSHAL exception:");
+          ex._tao_print_exception ("Unexpected MARSHAL exception:");
         }
 
-      server->method (0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->method (0);
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
       // The following sleep is a hack to make sure the above oneway
       // request gets sent before we exit. Otherwise, at least on
@@ -129,16 +120,13 @@ main (int argc, char *argv[])
       ACE_Time_Value tv (0, 100000);
       ACE_OS::sleep(tv);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client-side exception:");
+      ex._tao_print_exception ("Client-side exception:");
       status = 1;
     }
-  ACE_ENDTRY;
 
   return status;
 }
diff --git a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp
index 33354c75f64..39dcc2ce692 100644
--- a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.cpp
@@ -3,8 +3,7 @@
 #include "Smart_Proxy_Impl.h"
 
 Test_ptr
-Test_Smart_Factory::create_proxy (Test_ptr proxy
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+Test_Smart_Factory::create_proxy (Test_ptr proxy)
 {
   // creat Smart_Proxy
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h
index 481a410487a..8161ff23d2d 100644
--- a/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/dtor/Smart_Proxy_Impl.h
@@ -14,6 +14,5 @@ public:
 class  Test_Smart_Factory: public TAO_Test_Default_Proxy_Factory
 {
 public:
-  virtual Test_ptr create_proxy (Test_ptr proxy
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual Test_ptr create_proxy (Test_ptr proxy);
 };
diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp
index 47c2c88884b..18c29ca92c1 100644
--- a/TAO/tests/Smart_Proxies/dtor/client.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/client.cpp
@@ -35,20 +35,16 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
   {
     CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                           argv,
-                                          ""
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                                          "");
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
-    CORBA::Object_var obj = orb->string_to_object (ior
-                                                   ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::Object_var obj = orb->string_to_object (ior);
 
     // force a scope to see the destruction of the server object
     {
@@ -60,9 +56,7 @@ int main (int argc, char* argv[])
       ACE_UNUSED_ARG (test_factory);
 
       Test_var server =
-        Test::_narrow(obj.in()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::_narrow(obj.in());
 
       if (CORBA::is_nil (server.in())) {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -77,8 +71,7 @@ int main (int argc, char* argv[])
       // Testing the _non_existent function
       ACE_DEBUG ((LM_DEBUG, "Testing _non_existent()\n"));
       CORBA::Boolean ne =
-        server->_non_existent(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->_non_existent();
       if (ne)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Not a Messenger object reference\n"),
@@ -87,8 +80,7 @@ int main (int argc, char* argv[])
         ACE_DEBUG ((LM_DEBUG,"Successfully called _non_existent()\n"));
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-      server->shutdown(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown();
 
       // The following sleep is a hack to make sure the above oneway
       // request gets sent before we exit. Otherwise, at least on
@@ -102,16 +94,13 @@ int main (int argc, char* argv[])
                         "The Smart proxy is not deleted\n"),1);
     }
 
-    orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb->destroy();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "Client-side exception:");
+    ex._tao_print_exception ("Client-side exception:");
     return 1;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index fa9eadf988b..85bb22271ad 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -9,11 +9,10 @@ class Test_i: public virtual POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  void hello (CORBA::Long howmany
-              ACE_ENV_ARG_DECL)
+  void hello (CORBA::Long howmany)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown  (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown  (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -26,18 +25,17 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::hello (CORBA::Long howmany
-               ACE_ENV_ARG_DECL_NOT_USED)
+Test_i::hello (CORBA::Long howmany)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "hello called with : %i \n", howmany));
 }
 
 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);
+  this->orb_->shutdown (0);
 }
 
 static const char *ior_output_file = 0;
@@ -69,52 +67,37 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
   {
     CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                           argv,
-                                          ""
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                                          "");
 
     if (parse_args (argc, argv) != 0)
       return 1;
 
     // Obtain RootPOA.
-    CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"
-                                                             ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
-    PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in()
-                                                                     ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in());
 
     // Get the POAManager of the RootPOA
     PortableServer::POAManager_var poa_mgr =
-      root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      root_poa->the_POAManager ();
 
-    poa_mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    poa_mgr->activate ();
 
     // Create a servant
     Test_i servant (orb.in ());
 
     PortableServer::ObjectId_var oid =
-      root_poa->activate_object (&servant
-                                 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      root_poa->activate_object (&servant);
 
-    obj = root_poa->id_to_reference (oid.in()
-                                     ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    obj = root_poa->id_to_reference (oid.in());
 
     CORBA::String_var ior =
-      orb->object_to_string (obj.in()
-                             ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->object_to_string (obj.in());
 
     // If the ior_output_file exists, output the ior to it
     if (ior_output_file != 0)
@@ -134,26 +117,20 @@ int main (int argc, char* argv[])
     else
       ACE_ERROR_RETURN ((LM_ERROR,"ior file name is null\n"),1);
 
-    orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb->run ();
 
     ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
     root_poa->destroy (1,
-                       1
-                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+                       1);
 
-    orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    orb->destroy ();
   }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "Exception in setting up server");
+    ex._tao_print_exception ("Exception in setting up server");
     return 1;
   }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index 0fc44b24f0f..f1a83fa6b95 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -29,12 +29,11 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo
-                        ACE_ENV_ARG_DECL)
+  CORBA::Short method  (CORBA::Short boo)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
-  void shutdown  (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown  (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -48,8 +47,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i :: method (CORBA::Short boo
-                  ACE_ENV_ARG_DECL)
+Test_i :: method (CORBA::Short boo)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -63,10 +61,10 @@ Test_i :: method (CORBA::Short boo
 }
 
 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);
+  this->orb_->shutdown (0);
 }
 
 static const char *ior_output_file = 0;
@@ -99,15 +97,12 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -115,29 +110,21 @@ main (int argc, char *argv[])
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in ());
 
-      ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Test_var Test_object =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (Test_object.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (Test_object.in ());
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -157,28 +144,21 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in setting up server");
+      ex._tao_print_exception ("Exception in setting up server");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp
index 58747bad1e4..7cf844a765f 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Client_Task.cpp
@@ -24,11 +24,9 @@ Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->validate_connections ();
 
       for (int i = 0; i != this->event_count_; ++i)
         {
@@ -41,32 +39,28 @@ Client_Task::svc (void)
           Test::Payload_var pl = new Test::Payload;
           Test::Payload_out payload (pl.out ());
           this->sender_->get_data (this->event_size_,
-                                   payload
-                                   ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                   payload);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
   return 0;
 }
 
 
 void
-Client_Task::validate_connections (ACE_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connections (void)
 {
   for (int i = 0 ; i != 100; i++)
     {
-      ACE_TRY
+      try
         {
-          this->sender_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->sender_->ping ();
 
         }
-      ACE_CATCHANY {} ACE_ENDTRY;
+      catch (const CORBA::Exception&){}
     }
 }
diff --git a/TAO/tests/Stack_Recursion/Client_Task.h b/TAO/tests/Stack_Recursion/Client_Task.h
index b52629ef5af..1858bf6c12c 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.h
+++ b/TAO/tests/Stack_Recursion/Client_Task.h
@@ -30,7 +30,7 @@ public:
 private:
 
   /// Simple pings to prune up the connections
-  void validate_connections (ACE_ENV_SINGLE_ARG_DECL);
+  void validate_connections (void);
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index 7f897c4deee..1cbbf0bc8ea 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -34,8 +34,7 @@ Sender::is_done (void) const
 
 CORBA::Boolean
 Sender::get_data (CORBA::ULong size,
-                  Test::Payload_out payload
-                  ACE_ENV_ARG_DECL_NOT_USED)
+                  Test::Payload_out payload)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
@@ -53,7 +52,7 @@ Sender::get_data (CORBA::ULong size,
 }
 
 CORBA::Long
-Sender::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Sender::get_event_count (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
@@ -65,14 +64,14 @@ Sender::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Sender::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Sender::ping (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
 }
 
 void
-Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Sender::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->is_done_ == false)
diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h
index be1663cabe6..3acc8583883 100644
--- a/TAO/tests/Stack_Recursion/Sender.h
+++ b/TAO/tests/Stack_Recursion/Sender.h
@@ -27,17 +27,16 @@ public:
 
   // = The skeleton methods
   virtual CORBA::Boolean get_data (CORBA::ULong size,
-                                   Test::Payload_out payload
-                                   ACE_ENV_ARG_DECL)
+                                   Test::Payload_out payload)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long get_event_count (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void ping (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Stack_Recursion/Server_Task.cpp b/TAO/tests/Stack_Recursion/Server_Task.cpp
index 9961c2fde5e..ffacc6abae5 100644
--- a/TAO/tests/Stack_Recursion/Server_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Server_Task.cpp
@@ -22,23 +22,20 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       while (!this->sender_->is_done ())
         {
           // run the test for at most 120 seconds...
           ACE_Time_Value tv (240, 0);
-          this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->orb_->run (tv);
         }
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception&)
     {
       return -1;
     }
-  ACE_ENDTRY;
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server task finished\n"));
   return 0;
 }
diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp
index b9db252871c..b072572d38c 100644
--- a/TAO/tests/Stack_Recursion/client.cpp
+++ b/TAO/tests/Stack_Recursion/client.cpp
@@ -37,22 +37,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       Test::Sender_var sender =
-        Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Sender::_narrow(tmp.in ());
 
       if (CORBA::is_nil (sender.in ()))
         {
@@ -75,28 +72,23 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       CORBA::Long count =
-        sender->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sender->get_event_count ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
                   count));
 
       // shutdown the remote ORB
-      sender->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      sender->shutdown ();
 
 
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp
index baa7bca0b5d..dacec2af3a7 100644
--- a/TAO/tests/Stack_Recursion/server.cpp
+++ b/TAO/tests/Stack_Recursion/server.cpp
@@ -38,15 +38,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -54,12 +52,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -71,13 +67,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(sender_impl);
 
       Test::Sender_var sender =
-        sender_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        sender_impl->_this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (sender.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (sender.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -89,8 +82,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       Server_Task server_task (orb.in (),
                                sender_impl,
@@ -105,20 +97,15 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp
index a554f94fea5..d10616be198 100644
--- a/TAO/tests/Strategies/client.cpp
+++ b/TAO/tests/Strategies/client.cpp
@@ -64,22 +64,19 @@ Client::Client ()
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -91,8 +88,7 @@ main (int argc, char *argv[])
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        server->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server->print_status ();
 
       if (ret_value == 0)
         {
@@ -103,20 +99,16 @@ main (int argc, char *argv[])
 
       if (server_shutdown)
         {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          server->shutdown ();
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp
index 9e1de742de4..5f462b25f03 100644
--- a/TAO/tests/Strategies/server.cpp
+++ b/TAO/tests/Strategies/server.cpp
@@ -36,15 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,12 +50,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
@@ -65,12 +61,10 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -87,27 +81,21 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp
index 2e695e7fbd1..aa869165adf 100644
--- a/TAO/tests/Strategies/simple_test_i.cpp
+++ b/TAO/tests/Strategies/simple_test_i.cpp
@@ -10,7 +10,7 @@
 ACE_RCSID(tests, simple_test_i, "$Id$")
 
 CORBA::Boolean
-Simple_Server_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::print_status (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -20,7 +20,7 @@ Simple_Server_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h
index c9cb80d4476..bb4e73a24e3 100644
--- a/TAO/tests/Strategies/simple_test_i.h
+++ b/TAO/tests/Strategies/simple_test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Boolean print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean print_status (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 1773da31417..d09ed7dc969 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -119,7 +119,7 @@ parse_args (int argc, char **argv)
 }
 
 test_ptr
-setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL)
+setup_policies (CORBA::ORB_ptr orb, test_ptr object)
 {
 
   test_var object_with_policy;
@@ -137,22 +137,15 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL)
       rt_timeout_any <<= rt_timeout;
       policy_list[0] =
         orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                            rt_timeout_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                            rt_timeout_any);
 
       CORBA::Object_var object_temp =
         object->_set_policy_overrides (policy_list,
-                                       CORBA::ADD_OVERRIDE
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+                                       CORBA::ADD_OVERRIDE);
 
-      object_with_policy = test::_narrow (object_temp.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+      object_with_policy = test::_narrow (object_temp.in ());
 
-      policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      policy_list[0]->destroy ();
     }
 
   Messaging::SyncScope sync =
@@ -164,22 +157,15 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL)
   policy_list.length (1);
   policy_list[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        sync_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                        sync_any);
 
   CORBA::Object_var object_temp =
     object_with_policy->_set_policy_overrides (policy_list,
-                                               CORBA::ADD_OVERRIDE
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+                                               CORBA::ADD_OVERRIDE);
 
-  test_var object_with_two_policies = test::_narrow (object_temp.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  test_var object_with_two_policies = test::_narrow (object_temp.in ());
 
-  policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  policy_list[0]->destroy ();
 
   return object_with_two_policies._retn ();
 }
@@ -187,17 +173,14 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object ACE_ENV_ARG_DECL)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         0);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -206,20 +189,14 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a <test> reference.
-      test_var test_object_no_policy = test::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_var test_object_no_policy = test::_narrow (object.in ());
 
       // Setup buffering and timeout
       test_var test_object = setup_policies (orb.in (),
-                                             test_object_no_policy.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                             test_object_no_policy.in ());
 
       test::data the_data (data_bytes);
       the_data.length (data_bytes);
@@ -231,9 +208,7 @@ main (int argc, char **argv)
           test_object->method (i,
                                start.msec (),
                                the_data,
-                               work
-                               ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                               work);
 
           ACE_Time_Value end = ACE_OS::gettimeofday ();
 
@@ -246,25 +221,21 @@ main (int argc, char **argv)
 
           // If we don't run the orb, then no data will be sent, and no
           // connection will be made initially.
-          orb->run (sleep_interval ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->run (sleep_interval);
         }
 
       ACE_DEBUG ((LM_DEBUG, "client: flushing\n"));
-      test_object_no_policy->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      test_object_no_policy->flush ();
 
       ACE_DEBUG ((LM_DEBUG, "client: Shutting down...\n"));
       if (shutdown_server)
         {
           ACE_DEBUG ((LM_DEBUG,"client killing server\n"));
           long now = ACE_OS::gettimeofday ().msec ();
-          test_object_no_policy->shutdown (now ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_object_no_policy->shutdown (now);
         }
 
-      orb->shutdown (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->shutdown (1);
 
       // Destroy the ORB.  On some platforms, e.g., Win32, the socket
       // library is closed at the end of main().  This means that any
@@ -272,18 +243,14 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client side exception caught:");
+      ex._tao_print_exception ("Client side exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index 19009369e80..040327785a9 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp
@@ -37,28 +37,21 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -66,13 +59,10 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        servant._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -85,26 +75,20 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         1);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Server side exception caught:");
+      ex._tao_print_exception ("Server side exception caught:");
       return -1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index b29d2773ea3..cc2786bbc7f 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -16,8 +16,7 @@ void
 test_i::method (CORBA::ULong request_number,
                 CORBA::Long start_time,
                 const test::data &,
-                CORBA::ULong work
-                ACE_ENV_ARG_DECL_NOT_USED)
+                CORBA::ULong work)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value start (0);
@@ -35,20 +34,19 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::flush (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "server: got flush request\n"));
 }
 
 void
-test_i::shutdown (CORBA::Long start_time ACE_ENV_ARG_DECL)
+test_i::shutdown (CORBA::Long start_time)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value start (0);
   start.msec (start_time);
   ACE_DEBUG ((LM_DEBUG, "server: Shutting down... (%dms)\n",
               (ACE_OS::gettimeofday() - start).msec ()));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h
index ef92af5e074..a08938cf539 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.h
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h
@@ -32,14 +32,13 @@ public:
   void method (CORBA::ULong request_number,
                CORBA::Long start_time,
                const test::data &,
-               CORBA::ULong work
-               ACE_ENV_ARG_DECL_NOT_USED)
+               CORBA::ULong work)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void flush (ACE_ENV_SINGLE_ARG_DECL)
+  void flush (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Long start_time ACE_ENV_ARG_DECL)
+  void shutdown (CORBA::Long start_time)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index 9a7d1fe603c..841ac2318f2 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -57,17 +57,15 @@ static int in_time_count[4] = {0, 0, 0, 0};
 void
 send_echo (TO_TYPE ctype, CORBA::ORB_ptr orb,
            Simple_Server_ptr server,
-           CORBA::Long t
-           ACE_ENV_ARG_DECL)
+           CORBA::Long t)
 {
-  ACE_TRY
+  try
     {
-      server->echo (0, t ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->echo (0, t);
 
       in_time_count[ctype]++;
     }
-  ACE_CATCH (CORBA::TIMEOUT, timeout)
+  catch (const CORBA::TIMEOUT& )
     {
       timeout_count[ctype]++;
 
@@ -82,31 +80,26 @@ send_echo (TO_TYPE ctype, CORBA::ORB_ptr orb,
       // This is a non-standard TAO call that's used to give the
       // client ORB a chance to cleanup the reply that's come back
       // from the server.
-      orb->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run (tv);
     }
-  ACE_ENDTRY;
 }
 
 
 int main (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -117,22 +110,16 @@ int main (int argc, char* argv[])
         }
 
       object =
-        orb->resolve_initial_references ("ORBPolicyManager"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("ORBPolicyManager");
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyManager::_narrow (object.in ());
 
       object =
-        orb->resolve_initial_references ("PolicyCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::PolicyCurrent::_narrow (object.in ());
 
       TimeBase::TimeT mid_value =
         10000 * (min_timeout + max_timeout) / 2; // convert from msec to "TimeT" (0.1 usec units)
@@ -148,21 +135,15 @@ int main (int argc, char* argv[])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                            any_object
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                            any_object);
       object =
         server->_set_policy_overrides (policy_list,
-                                       CORBA::SET_OVERRIDE
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                       CORBA::SET_OVERRIDE);
 
       Simple_Server_var timeout_server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Simple_Server::_narrow (object.in ());
 
-      policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      policy_list[0]->destroy ();
       policy_list[0] = CORBA::Policy::_nil ();
 
       ACE_DEBUG ((LM_DEBUG,
@@ -180,16 +161,11 @@ int main (int argc, char* argv[])
 
           policy_list.length (0);
           policy_manager->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                CORBA::SET_OVERRIDE);
           policy_current->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                CORBA::SET_OVERRIDE);
 
-          send_echo (none, orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          send_echo (none, orb.in (), server.in (), t);
 
 
 
@@ -200,20 +176,14 @@ int main (int argc, char* argv[])
           policy_list.length (1);
           policy_list[0] =
             orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                any_orb
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                any_orb);
 
           policy_manager->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                CORBA::SET_OVERRIDE);
 
-          send_echo (orb1, orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          send_echo (orb1, orb.in (), server.in (), t);
 
-          policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy_list[0]->destroy ();
 
 
 
@@ -227,20 +197,14 @@ int main (int argc, char* argv[])
           policy_list.length (1);
           policy_list[0] =
             orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                any_thread
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                any_thread);
 
           policy_current->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE
-                                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+                                                CORBA::SET_OVERRIDE);
 
-          send_echo (thread1, orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          send_echo (thread1, orb.in (), server.in (), t);
 
-          policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          policy_list[0]->destroy ();
 
 
 
@@ -250,8 +214,7 @@ int main (int argc, char* argv[])
 
           ACE_DEBUG ((LM_DEBUG,
                       "client(%P) Use the object policies\n"));
-          send_echo (object1, orb.in (), timeout_server.in (), t ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          send_echo (object1, orb.in (), timeout_server.in (), t);
         }
 
       ACE_DEBUG ((LM_DEBUG,
@@ -259,19 +222,13 @@ int main (int argc, char* argv[])
                   "resynch with server\n"));
       policy_list.length (0);
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            CORBA::SET_OVERRIDE);
 
-      send_echo (none, orb.in (), server.in (), 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      send_echo (none, orb.in (), server.in (), 0);
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
       int timeout_count_total = 0;
       int in_time_count_total = 0;
@@ -294,14 +251,12 @@ int main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "in_time_count_total = %d, timeout_count_total = %d\n",
                   in_time_count_total, timeout_count_total));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
index 3fd05a6c9db..ee46faa451c 100644
--- a/TAO/tests/Timeout/server.cpp
+++ b/TAO/tests/Timeout/server.cpp
@@ -38,18 +38,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,22 +55,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -89,20 +83,16 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index d145a925fd4..c4da7f0887c 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -17,8 +17,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 
 CORBA::Long
 Simple_Server_i::echo (CORBA::Long x,
-                       CORBA::Long msecs
-                       ACE_ENV_ARG_DECL_NOT_USED)
+                       CORBA::Long msecs)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000);
@@ -39,10 +38,10 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h
index 00018fa25d8..8a135bdd767 100644
--- a/TAO/tests/Timeout/test_i.h
+++ b/TAO/tests/Timeout/test_i.h
@@ -32,10 +32,9 @@ public:
 
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
-                    CORBA::Long msecs
-                    ACE_ENV_ARG_DECL_NOT_USED)
+                    CORBA::Long msecs)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
index 63ed4f9c5ef..d2b11d0485c 100644
--- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
@@ -22,14 +22,14 @@ Current_Test_Impl::~Current_Test_Impl (void)
 }
 
 ::CORBA::Long
-Current_Test_Impl::self_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+Current_Test_Impl::self_test (void)
         ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   return 0;
 }
 
 void
-Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL)
+Current_Test_Impl::test_transport_current (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
@@ -38,31 +38,22 @@ Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL)
   }
 
   CORBA::Object_var tcobject =
-    orb_->resolve_initial_references ("TAO::Transport::Current"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    orb_->resolve_initial_references ("TAO::Transport::Current");
 
   TAO::Transport::Current_var tc =
-    TAO::Transport::Current::_narrow (tcobject.in ()
-                                      ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
+    TAO::Transport::Current::_narrow (tcobject.in ());
 
   if (TAO_debug_level >= 1)
     {
-      ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
+      ::CORBA::Long id = tc->id ();
 
-      ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
+      ::TAO::CounterT bs = tc->bytes_sent ();
 
-      ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
+      ::TAO::CounterT br = tc->bytes_received ();
 
-      ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
+      ::TAO::CounterT rs = tc->messages_sent ();
 
-      ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
+      ::TAO::CounterT rr = tc->messages_received ();
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Current_Test_Impl (%P|%t) Transport [%q] - Sent/Received [bytes=%q/%q, messages=%q/%q]\n"),
@@ -80,29 +71,27 @@ Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL)
+Current_Test_Impl::invoked_by_client (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_TRY
+  try
     {
-      this->invoked_by_client_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->invoked_by_client_i ();
     }
-  ACE_CATCH (TAO::Transport::NoContext, ex)
+  catch (const TAO::Transport::NoContext&)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) server - Caught a Transport::NoContext exception\n")));
     }
-  ACE_CATCH (CORBA::SystemException, ex1)
+  catch (const CORBA::SystemException&)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) server - Caught a CORBA::SystemException exception\n")));
     }
-  ACE_ENDTRY;
 }
 
 void
-Current_Test_Impl::invoked_by_client_i (ACE_ENV_SINGLE_ARG_DECL)
+Current_Test_Impl::invoked_by_client_i (void)
   ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext))
 {
   if (TAO_debug_level > 2) {
@@ -110,28 +99,22 @@ Current_Test_Impl::invoked_by_client_i (ACE_ENV_SINGLE_ARG_DECL)
                 ACE_TEXT ("(%P|%t) server - Testing inside an upcall\n")));
   }
 
-  this->test_transport_current (ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
+  this->test_transport_current ();
 
   if (this->do_collocated_calls_)
     {
       CORBA::Object_var selfobject =
-        poa_->servant_to_reference (this
-                                    ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
+        poa_->servant_to_reference (this);
 
       Test::Transport::CurrentTest_var self =
-        Test::Transport::CurrentTest::_narrow (selfobject.in ()
-                                               ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
+        Test::Transport::CurrentTest::_narrow (selfobject.in ());
 
       if (TAO_debug_level >= 1)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) server - Testing a collocated call\n")));
         }
-      self->invoked_during_upcall (ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      self->invoked_during_upcall ();
     }
   else
     {
@@ -144,7 +127,7 @@ Current_Test_Impl::invoked_by_client_i (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Current_Test_Impl::invoked_during_upcall (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
@@ -156,7 +139,7 @@ Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Current_Test_Impl::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
@@ -164,6 +147,5 @@ Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
                 ACE_TEXT ("(%P|%t) server - shutting down.\n")));
   }
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
index 21c1227fbf3..244c46764e4 100644
--- a/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Server_Main.cpp
@@ -10,14 +10,19 @@ int server_main (int argc,
                  Test::Server_Request_Interceptor *cri);
 
 int
-test_transport_current (CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL)  ACE_THROW_SPEC ((CORBA::SystemException,
+test_transport_current (CORBA::ORB_ptr orb)  ACE_THROW_SPEC ((CORBA::SystemException,
                                                             CORBA::UserException));
 
 int
 ACE_TMAIN (int argc,
            ACE_TCHAR *argv[])
 {
-  Test::Server_Request_Interceptor cri ("test_orb", test_transport_current);
-  return server_main (argc, argv, &cri);
+  Test::Server_Request_Interceptor* cri = 0;
+  ACE_NEW_RETURN (cri,
+                  Test::Server_Request_Interceptor ("test_orb",
+                                                    test_transport_current),
+                  -1);
+  PortableInterceptor::ServerRequestInterceptor_var cri_safe (cri);
+
+  return server_main (argc, argv, cri);
 }
diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp
index eef52de80fa..abaa7635727 100644
--- a/TAO/tests/TransportCurrent/Framework/Tester.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp
@@ -9,25 +9,19 @@ using namespace TAO;
 /// or a client-side interceptor
 
 int
-test_transport_current (Transport::Current_ptr tc
-                        ACE_ENV_ARG_DECL)
+test_transport_current (Transport::Current_ptr tc)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::UserException))
 {
-  CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  CORBA::Long id = tc->id ();
 
-  TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  TAO::CounterT bs = tc->bytes_sent ();
 
-  TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  TAO::CounterT br = tc->bytes_received ();
 
-  TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  TAO::CounterT rs = tc->messages_sent ();
 
-  TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  TAO::CounterT rr = tc->messages_received ();
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Tester (%P|%t) Transport [%q] - Sent/Received [bytes=%q/%q, messages=%q/%q]\n"),
@@ -41,21 +35,16 @@ test_transport_current (Transport::Current_ptr tc
 }
 
 int
-test_transport_current (CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL)
+test_transport_current (CORBA::ORB_ptr orb)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::UserException))
 {
   // Get the Current object.
   CORBA::Object_var tcobject =
-    orb->resolve_initial_references ("TAO::Transport::Current"
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    orb->resolve_initial_references ("TAO::Transport::Current");
 
   Transport::Current_var tc =
-    Transport::Current::_narrow (tcobject.in ()
-                                      ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
+    Transport::Current::_narrow (tcobject.in ());
 
   if (CORBA::is_nil (tc.in ()))
     {
@@ -63,7 +52,7 @@ test_transport_current (CORBA::ORB_ptr orb
                   ACE_TEXT ("(%P|%t) client - ERROR: Could not resolve ")
                   ACE_TEXT ("TAOTransportCurrent object.\n")));
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   return test_transport_current (tc.in ());
diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp
index 12207234dd4..65be75cb715 100644
--- a/TAO/tests/TransportCurrent/Framework/client.cpp
+++ b/TAO/tests/TransportCurrent/Framework/client.cpp
@@ -20,8 +20,7 @@ ACE_RCSID (PICurrent,
 // Prototype
 
 int
-test_transport_current (CORBA::ORB_ptr
-                        ACE_ENV_ARG_DECL)  ACE_THROW_SPEC ((CORBA::SystemException,
+test_transport_current (CORBA::ORB_ptr)  ACE_THROW_SPEC ((CORBA::SystemException,
                                                             CORBA::UserException));
 
 using namespace TAO;
@@ -108,7 +107,7 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server,
 int
 Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       for (int i = 0; i < this->niterations_; ++i)
@@ -124,14 +123,11 @@ Worker::svc (void)
                           ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via DII\n")));
 
               CORBA::Request_var request =
-                this->server_->_request ("invoked_by_client"
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                this->server_->_request ("invoked_by_client");
 
               request->set_return_type (CORBA::_tc_void);
 
-              request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              request->invoke ();
             }
 
 #endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */
@@ -139,20 +135,17 @@ Worker::svc (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n")));
 
-          this->server_->invoked_by_client (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->invoked_by_client ();
 
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Iteration = %d\n"),
                         i));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client: exception raised");
+      ex._tao_print_exception ("Client: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -161,31 +154,29 @@ Worker::svc (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      Test::Client_Request_Interceptor cri (CLIENT_ORB_ID, test_transport_current);
+#if TAO_HAS_TRANSPORT_CURRENT == 1
 
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
+  try
+    {
+      Test::Client_Request_Interceptor* cri = 0;
+      ACE_NEW_RETURN (cri,
+                      Test::Client_Request_Interceptor (CLIENT_ORB_ID,
+                                                        test_transport_current),
+                      -1);
+      PortableInterceptor::ClientRequestInterceptor_var cri_safe (cri);
 
+      PortableInterceptor::ORBInitializer_ptr temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
-                      Test::Client_ORBInitializer (&cri),
+                      Test::Client_ORBInitializer (cri),
                       -1);
+      PortableInterceptor::ORBInitializer_var orb_initializer (temp_initializer);
 
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         CLIENT_ORB_ID
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         CLIENT_ORB_ID);
 
       if (parse_args (argc, argv) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -194,10 +185,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                           -1);
 
 
-      ACE_TRY
+      try
         {
-          test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_transport_current (orb.in ());
 
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("Client (%P|%t) ERROR: ")
@@ -206,22 +196,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                              ACE_TEXT (" Expected exception was not thrown\n")),
                             -1);
         }
-      ACE_CATCH (Transport::NoContext, ex)
+      catch (const Transport::NoContext& )
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Client (%P|%t) Expected exception occured when trying ")
                       ACE_TEXT ("to access traits outside the ")
                       ACE_TEXT ("interceptor or upcall context.\n")));
         }
-      ACE_ENDTRY;
 
       // Resolve the target object
-      CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->string_to_object (ior);
 
       Test::Transport::CurrentTest_var server =
-        Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Transport::CurrentTest::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -256,7 +243,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::Long result = 0;
 
       // Verify enough interception points have been triggered
-      if (cri.interceptions () != 2 *             // request & response
+      if (cri->interceptions () != 2 *             // request & response
                                   niterations *   // iterations
                                   nthreads *      // threads
                                   (2*use_dii))    // sii and dii, if needed
@@ -264,7 +251,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("Client (%P|%t) Expected %d client-side interceptions, but detected %d\n"),
                       2 * niterations * nthreads * (2*use_dii),
-                      cri.interceptions ()));
+                      cri->interceptions ()));
         }
       else
         {
@@ -272,8 +259,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n")));
 
           // Self-test the server side
-          result = server->self_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          result = server->self_test ();
 
           if (result != 0)
             ACE_ERROR ((LM_ERROR,
@@ -282,22 +268,27 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking oneway server->shutdown()\n")));
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking orb->destroy ()\n")));
+
+      orb->destroy ();
 
       ACE_DEBUG ((LM_INFO,
-                  ACE_TEXT ("Client (%P|%t) Completed %s\n"),
+                  ACE_TEXT ("Client (%P|%t) Completed %s.\n"),
                   ((result == 0) ? ACE_TEXT ("successfuly") : ACE_TEXT ("with failure"))));
       return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Client: Transport Current test (client-side) failed:"));
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "Client: Transport Current test (client-side) failed:"));
       return -1;
     }
-  ACE_ENDTRY;
+
+#else /*  TAO_HAS_TRANSPORT_CURRENT == 1 */
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("Client (%P|%t) Need TAO_HAS_TRANSPORT_CURRENT enabled to run.\n")));
+  return 0;
+#endif /*  TAO_HAS_TRANSPORT_CURRENT == 1 */
 }
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
index 579f11d7726..9cf0a5f5c7b 100644
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ b/TAO/tests/TransportCurrent/Framework/server.cpp
@@ -85,17 +85,14 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Server: exception raised");
+      ex._tao_print_exception ("Server: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -108,39 +105,30 @@ server_main (int argc,
              ACE_TCHAR *argv[],
              Test::Server_Request_Interceptor *cri)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+  try
+    {
+      PortableInterceptor::ORBInitializer_ptr temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
                       Test::Server_ORBInitializer (cri),
                       -1);  // No exceptions yet!
 
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
+      PortableInterceptor::ORBInitializer_var orb_initializer (temp_initializer);
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ACE_TEXT ("test_orb")
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            ACE_TEXT ("test_orb"));
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -149,11 +137,9 @@ server_main (int argc,
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -162,13 +148,10 @@ server_main (int argc,
                                      root_poa.in (),
                                      use_collocated_call);
 
-      obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = server_impl._this ();
 
       Test::Transport::CurrentTest_var server =
-        Test::Transport::CurrentTest::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Transport::CurrentTest::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -177,8 +160,7 @@ server_main (int argc,
                           -1);
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
@@ -205,7 +187,11 @@ server_main (int argc,
                            ACE_TEXT ("Server (%P|%t) Cannot activate %d threads\n"),
                            nthreads),
                           -1);
-      worker.thr_mgr ()->wait ();
+      if(worker.thr_mgr ()->wait () != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("Server (%P|%t) wait() Cannot wait for all %d threads\n"),
+                           nthreads),
+                          -1);
 #else
       if (nthreads > 1)
         ACE_ERROR ((LM_WARNING,
@@ -221,22 +207,26 @@ server_main (int argc,
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n")));
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
+
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Server (%P|%t) Invoking orb->destroy ()\n")));
+
+      orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Server (%P|%t) ERROR: "));
+      ex._tao_print_exception (ACE_TEXT ("Server (%P|%t) ERROR: "));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Completed successfuly.\n")));
   return 0;
+#else /*  TAO_HAS_TRANSPORT_CURRENT == 1 */
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Need TAO_HAS_TRANSPORT_CURRENT enabled to run.\n")));
+  return 0;
+#endif /*  TAO_HAS_TRANSPORT_CURRENT == 1 */
 }
diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp
index 2b945f788c1..6221c47dcc3 100644
--- a/TAO/tests/TransportCurrent/Framework/simple.cpp
+++ b/TAO/tests/TransportCurrent/Framework/simple.cpp
@@ -19,9 +19,7 @@ testCurrentORBInitializer (int argc, char *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to create orb\n")), -1);
 
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("TAO::Transport::Current"
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    orb->resolve_initial_references ("TAO::Transport::Current");
 
   if (obj.in () == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index 8687263dbc3..bb9e52f8542 100644
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -24,14 +24,14 @@ Current_Test_Impl::~Current_Test_Impl (void)
 }
 
 ::CORBA::Long
-Current_Test_Impl::self_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+Current_Test_Impl::self_test (void)
         ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   return 0;
 }
 
 void
-Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL)
+Current_Test_Impl::test_transport_current (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
@@ -40,20 +40,16 @@ Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL)
   }
 
   CORBA::Object_var tcobject =
-    this->orb_->resolve_initial_references ("TAO::Transport::IIOP::Current"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    this->orb_->resolve_initial_references ("TAO::Transport::IIOP::Current");
 
   TAO::Transport::IIOP::Current_var tc =
-    TAO::Transport::IIOP::Current::_narrow (tcobject.in ()
-                                            ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
+    TAO::Transport::IIOP::Current::_narrow (tcobject.in ());
 
   if (CORBA::is_nil (tc.in()))
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("Unable to narrow down to TAO::Transport::IIOP::Current\n")));
-      ACE_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
   CORBA::String_var rhost (tc->remote_host ());
@@ -72,7 +68,7 @@ Current_Test_Impl::test_transport_current (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL)
+Current_Test_Impl::invoked_by_client (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level >= 1) {
@@ -80,27 +76,21 @@ Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL)
                 ACE_TEXT ("(%P|%t) server - Test method invoked by client.\n")));
   }
 
-  this->test_transport_current (ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
+  this->test_transport_current ();
 
   if (this->do_collocated_calls_)
     {
       CORBA::Object_var selfobject =
-        poa_->servant_to_reference (this
-                                    ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
+        poa_->servant_to_reference (this);
 
       Test::Transport::CurrentTest_var self =
-        Test::Transport::CurrentTest::_narrow (selfobject.in ()
-                                               ACE_ENV_SINGLE_ARG_DECL);
-      ACE_TRY_CHECK;
+        Test::Transport::CurrentTest::_narrow (selfobject.in ());
 
       if (TAO_debug_level >= 1) {
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("(%P|%t) server - Making a collocated invocation to invoked_during_upcall().\n")));
       }
-      self->invoked_during_upcall (ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      self->invoked_during_upcall ();
     }
   else
     {
@@ -115,7 +105,7 @@ Current_Test_Impl::invoked_by_client (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Current_Test_Impl::invoked_during_upcall (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
@@ -126,7 +116,7 @@ Current_Test_Impl::invoked_during_upcall (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Current_Test_Impl::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
@@ -134,6 +124,5 @@ Current_Test_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
                 ACE_TEXT ("(%P|%t) server - shutting down.\n")));
   }
 
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
index cce444d8662..64dceb697d2 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp
@@ -10,14 +10,19 @@ int server_main (int argc,
                  Test::Server_Request_Interceptor *cri);
 
 int
-test_transport_current (CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL)  ACE_THROW_SPEC ((CORBA::SystemException,
+test_transport_current (CORBA::ORB_ptr orb)  ACE_THROW_SPEC ((CORBA::SystemException,
                                                             CORBA::UserException));
 
 int
 ACE_TMAIN (int argc,
            ACE_TCHAR *argv[])
 {
-  Test::IIOP_Server_Request_Interceptor cri ("test_orb", test_transport_current);
-  return server_main (argc, argv, &cri);
+  Test::IIOP_Server_Request_Interceptor* cri = 0;
+  ACE_NEW_RETURN (cri,
+                  Test::IIOP_Server_Request_Interceptor ("test_orb",
+                                                         test_transport_current),
+                  -1);
+  PortableInterceptor::ServerRequestInterceptor_var cri_safe (cri);
+
+  return server_main (argc, argv, cri);
 }
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index f51936d5d35..27819ca3900 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -26,7 +26,7 @@ namespace Test {
   }
 
   char *
-  IIOP_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  IIOP_Server_Request_Interceptor::name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup ("II SRI");
@@ -34,8 +34,7 @@ namespace Test {
 
   ///
   TAO::Transport::IIOP::Current_ptr
-  IIOP_Server_Request_Interceptor::resolve_iiop_transport_current (const char* orbid
-                                                                   ACE_ENV_ARG_DECL)
+  IIOP_Server_Request_Interceptor::resolve_iiop_transport_current (const char* orbid)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
@@ -43,31 +42,24 @@ namespace Test {
     int tmpargc = 0;
     CORBA::ORB_var orb = CORBA::ORB_init (tmpargc,
                                           0,
-                                          orbid
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+                                          orbid);
 
     CORBA::Object_var tcobject =
-      orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current")
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current"));
 
-    return TAO::Transport::IIOP::Current::_narrow (tcobject.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+    return TAO::Transport::IIOP::Current::_narrow (tcobject.in ());
   }
 
   /// On every request, a client-supplied (via the context) id is used
   /// as index in an array, where we store the endpoint
   void
-  IIOP_Server_Request_Interceptor::push_request_info (size_t requestID
-                                                      ACE_ENV_ARG_DECL)
+  IIOP_Server_Request_Interceptor::push_request_info (size_t requestID)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
 
     TAO::Transport::IIOP::Current_var tc =
-      resolve_iiop_transport_current (this->orb_id_.in ()
-                                      ACE_ENV_ARG_PARAMETER);
+      resolve_iiop_transport_current (this->orb_id_.in ());
 
     CORBA::String_var host (tc->remote_host());
     EndPoint ep (tc->remote_port(), host.in ());
@@ -116,11 +108,10 @@ namespace Test {
       }
 
 
-    ACE_TRY
+    try
       {
         TAO::Transport::IIOP::Current_var tc =
-          resolve_iiop_transport_current (this->orb_id_.in ()
-                                          ACE_ENV_ARG_PARAMETER);
+          resolve_iiop_transport_current (this->orb_id_.in ());
 
         CORBA::String_var host (tc->remote_host());
         EndPoint ep (tc->remote_port(), host.in ());
@@ -135,14 +126,13 @@ namespace Test {
             return;
           }
       }
-    ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+    catch (const CORBA::BAD_INV_ORDER& )
       {
         // Last reply after the orb has been shut down. Calling
         // resolve_iiop_transport_current in this case will cause
         // BAD_INV_ORDER, so instead we swallow the exception and bid
         // goodbye.
       }
-    ACE_ENDTRY;
 
     endPoints_[requestID] = dummy;
   }
@@ -178,13 +168,11 @@ namespace Test {
 
 
   void
-  IIOP_Server_Request_Interceptor::inbound_process_context  (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                         ACE_ENV_ARG_DECL)
+  IIOP_Server_Request_Interceptor::inbound_process_context  (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
-    CORBA::String_var op (ri->operation(ACE_ENV_ARG_PARAMETER));
-    ACE_CHECK;
+    CORBA::String_var op (ri->operation());
 
     if (TAO_debug_level >=1)
       ACE_DEBUG ((LM_DEBUG,
@@ -192,13 +180,11 @@ namespace Test {
                   name.in (),
                   op.in ()));
 
-    ACE_TRY
+    try
       {
         IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag;
         IOP::ServiceContext_var sc =
-          ri->get_request_service_context (id
-                                           ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+          ri->get_request_service_context (id);
 
         const char *buf =
           reinterpret_cast <const char *> (sc->context_data.get_buffer ());
@@ -207,7 +193,7 @@ namespace Test {
 
         this->push_request_info (requestID);
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("%s (%P|%t) Service context")
@@ -217,20 +203,17 @@ namespace Test {
                     name.in (),
                     op.in ()));
       }
-    ACE_ENDTRY;
 
   }
 
   void
-  IIOP_Server_Request_Interceptor::outbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                             ACE_ENV_ARG_DECL)
+  IIOP_Server_Request_Interceptor::outbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag;
 
     IOP::ServiceContext_var sc =
-      ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+      ri->get_request_service_context (id);
 
     const char *buf =
       reinterpret_cast <const char *> (sc->context_data.get_buffer ());
@@ -244,17 +227,15 @@ namespace Test {
 
 
   void
-  IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri
-                                                                     ACE_ENV_ARG_DECL)
+  IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
-    ACE_TRY
+    try
       {
-        inbound_process_context (ri ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        inbound_process_context (ri);
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
         CORBA::String_var name (this->name ());
         ACE_ERROR ((LM_ERROR,
@@ -262,26 +243,22 @@ namespace Test {
                     ACE_TEXT(" receive_request_service_contexts.\n"),
                     name.in ()));
       }
-    ACE_ENDTRY;
 
-    Server_Request_Interceptor::receive_request_service_contexts (ri ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Server_Request_Interceptor::receive_request_service_contexts (ri);
 
   }
 
 
   void
-  IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                           ACE_ENV_ARG_DECL_NOT_USED)
+  IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_TRY
+    try
       {
-        outbound_process_context (ri ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        outbound_process_context (ri);
 
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
         CORBA::String_var name (this->name ());
         ACE_ERROR ((LM_ERROR,
@@ -289,27 +266,23 @@ namespace Test {
                     ACE_TEXT("send_reply.\n"),
                     name.in ()));
       }
-    ACE_ENDTRY;
 
-    Server_Request_Interceptor::send_reply (ri ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Server_Request_Interceptor::send_reply (ri);
 
   }
 
   void
-  IIOP_Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                                               ACE_ENV_ARG_DECL_NOT_USED)
+  IIOP_Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
-    ACE_TRY
+    try
       {
-        outbound_process_context (ri ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        outbound_process_context (ri);
 
 
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
         CORBA::String_var name (this->name ());
         ACE_ERROR ((LM_ERROR,
@@ -318,24 +291,20 @@ namespace Test {
                     name.in ()));
 
       }
-    ACE_ENDTRY;
 
-    Server_Request_Interceptor::send_exception (ri ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Server_Request_Interceptor::send_exception (ri);
   }
 
   void
-  IIOP_Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                                           ACE_ENV_ARG_DECL)
+  IIOP_Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
   {
-    ACE_TRY
+    try
       {
-        outbound_process_context (ri ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        outbound_process_context (ri);
       }
-    ACE_CATCHANY
+    catch (const CORBA::Exception&)
       {
         CORBA::String_var name (this->name ());
         ACE_ERROR ((LM_ERROR,
@@ -343,10 +312,8 @@ namespace Test {
                     ACE_TEXT("send_other.\n"),
                     name.in ()));
       }
-    ACE_ENDTRY;
 
-    Server_Request_Interceptor::send_other (ri ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    Server_Request_Interceptor::send_other (ri);
   }
 
 }
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
index 00cd81bdb31..d87ec6b1f5d 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
@@ -55,29 +55,25 @@ namespace Test
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * name (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// incomming interception point
-    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr
-                                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
     /// outgoing interception point
-    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// outgoing interception point
-    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
     /// outgoing interception point
-    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
     //@}
@@ -86,26 +82,22 @@ namespace Test
 
     /// process incomming requests context
     void inbound_process_context
-    (PortableInterceptor::ServerRequestInfo_ptr ri
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    (PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// process outgoing requests context
     void outbound_process_context
-    (PortableInterceptor::ServerRequestInfo_ptr ri
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    (PortableInterceptor::ServerRequestInfo_ptr ri)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// saves the incomming request info
-    void push_request_info (size_t requestID
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    void push_request_info (size_t requestID)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// clears the outgoing request info
     void pop_request_info (size_t requestID);
 
-    TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid
-                                                                      ACE_ENV_ARG_DECL)
+    TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
index 7e94ff502e5..6544b23169b 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
@@ -22,16 +22,13 @@ using namespace TAO;
 /// or a client-side interceptor
 
 int
-test_transport_current (CORBA::ORB_ptr orb
-                        ACE_ENV_ARG_DECL)
+test_transport_current (CORBA::ORB_ptr orb)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::UserException))
 {
   // Get the Current object.
   CORBA::Object_var tcobject =
-    orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current")
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+    orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current"));
 
 
   if (TAO_debug_level >= 1)
@@ -39,9 +36,7 @@ test_transport_current (CORBA::ORB_ptr orb
                 ACE_TEXT ("Tester (%P|%t) Resolved initial reference for IIOP::Current\n")));
 
   Transport::IIOP::Current_var tc =
-    Transport::IIOP::Current::_narrow (tcobject.in ()
-                                       ACE_ENV_SINGLE_ARG_DECL);
-  ACE_TRY_CHECK;
+    Transport::IIOP::Current::_narrow (tcobject.in ());
 
   if (TAO_debug_level >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -53,36 +48,29 @@ test_transport_current (CORBA::ORB_ptr orb
                   ACE_TEXT ("Tester (%P|%t) ERROR: Could not resolve ")
                   ACE_TEXT ("TAO::Transport::IIOP::Current object.\n")));
 
-      ACE_TRY_THROW (CORBA::INTERNAL ());
+      throw CORBA::INTERNAL ();
     }
 
-  ::CORBA::String_var rhost (tc->remote_host (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_TRY_CHECK;
+  ::CORBA::String_var rhost (tc->remote_host ());
 
-  ::CORBA::String_var lhost (tc->local_host (ACE_ENV_SINGLE_ARG_PARAMETER));
-  ACE_TRY_CHECK;
+  ::CORBA::String_var lhost (tc->local_host ());
 
-  ::CORBA::Long id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  ::CORBA::Long id = tc->id ();
 
-  ::TAO::CounterT bs = tc->bytes_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  ::TAO::CounterT bs = tc->bytes_sent ();
 
-  ::TAO::CounterT br = tc->bytes_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  ::TAO::CounterT br = tc->bytes_received ();
 
-  ::TAO::CounterT rs = tc->messages_sent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  ::TAO::CounterT rs = tc->messages_sent ();
 
-  ::TAO::CounterT rr = tc->messages_received (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_TRY_CHECK;
+  ::TAO::CounterT rr = tc->messages_received ();
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Tester (%P|%t) Transport [%q] [%s:%d -> %s:%d] ")
               ACE_TEXT ("Sent/Received [bytes=%q/%q, messages=%q/%q]\n"),
               (ACE_UINT64)id,
-              rhost.in (), tc->remote_port (ACE_ENV_SINGLE_ARG_PARAMETER),
-              lhost.in (), tc->local_port (ACE_ENV_SINGLE_ARG_PARAMETER),
+              rhost.in (), tc->remote_port (),
+              lhost.in (), tc->local_port (),
               (ACE_UINT64)bs,
               (ACE_UINT64)br,
               (ACE_UINT64)rs,
diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp
index 3cb8df90cc0..c125e60d0b9 100644
--- a/TAO/tests/TransportCurrent/IIOP/client.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/client.cpp
@@ -20,8 +20,7 @@ ACE_RCSID (IIOP,
 // Prototype
 
 int
-test_transport_current (CORBA::ORB_ptr
-                        ACE_ENV_ARG_DECL)  ACE_THROW_SPEC ((CORBA::SystemException,
+test_transport_current (CORBA::ORB_ptr)  ACE_THROW_SPEC ((CORBA::SystemException,
                                                             CORBA::UserException));
 
 using namespace TAO;
@@ -108,7 +107,7 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server,
 int
 Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
 
       for (int i = 0; i < this->niterations_; ++i)
@@ -124,14 +123,11 @@ Worker::svc (void)
                           ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via DII\n")));
 
               CORBA::Request_var request =
-                this->server_->_request ("invoked_by_client"
-                                         ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                this->server_->_request ("invoked_by_client");
 
               request->set_return_type (CORBA::_tc_void);
 
-              request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK;
+              request->invoke ();
             }
 
 #endif /* (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) */
@@ -139,20 +135,17 @@ Worker::svc (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Client (%P|%t) Invoking server->invoked_by_client() via SII\n")));
 
-          this->server_->invoked_by_client (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          this->server_->invoked_by_client ();
 
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Iteration = %d\n"),
                         i));
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client: exception raised");
+      ex._tao_print_exception ("Client: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -161,31 +154,29 @@ Worker::svc (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      Test::Client_Request_Interceptor cri (CLIENT_ORB_ID, test_transport_current);
+#if TAO_HAS_TRANSPORT_CURRENT == 1
 
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
+  try
+    {
+      Test::Client_Request_Interceptor* cri = 0;
+      ACE_NEW_RETURN (cri,
+                      Test::Client_Request_Interceptor (CLIENT_ORB_ID,
+                                                        test_transport_current),
+                      -1);
+      PortableInterceptor::ClientRequestInterceptor_var cri_safe (cri);
 
+      PortableInterceptor::ORBInitializer_ptr temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
-                      Test::Client_ORBInitializer (&cri),
+                      Test::Client_ORBInitializer (cri),
                       -1);
+      PortableInterceptor::ORBInitializer_var orb_initializer (temp_initializer);
 
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         CLIENT_ORB_ID
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                         CLIENT_ORB_ID);
 
       if (parse_args (argc, argv) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -194,10 +185,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                           -1);
 
 
-      ACE_TRY
+      try
         {
-          test_transport_current (orb.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          test_transport_current (orb.in ());
 
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("Client (%P|%t) ERROR: ")
@@ -206,22 +196,19 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                              ACE_TEXT (" Expected exception was not thrown\n")),
                             -1);
         }
-      ACE_CATCH (Transport::NoContext, ex)
+      catch (const Transport::NoContext& )
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("Client (%P|%t) Expected exception occured when trying ")
                       ACE_TEXT ("to access traits outside the ")
                       ACE_TEXT ("interceptor or upcall context.\n")));
         }
-      ACE_ENDTRY;
 
       // Resolve the target object
-      CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->string_to_object (ior);
 
       Test::Transport::CurrentTest_var server =
-        Test::Transport::CurrentTest::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Transport::CurrentTest::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -256,7 +243,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       CORBA::Long result = 0;
 
       // Verify enough interception points have been triggered
-      if (cri.interceptions () != 2 *             // request & response
+      if (cri->interceptions () != 2 *             // request & response
                                   niterations *   // iterations
                                   nthreads *      // threads
                                   (2*use_dii))    // sii and dii, if needed
@@ -264,7 +251,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("Client (%P|%t) Expected %d client-side interceptions, but detected %d\n"),
                       2 * niterations * nthreads * (2*use_dii),
-                      cri.interceptions ()));
+                      cri->interceptions ()));
         }
       else
         {
@@ -272,8 +259,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n")));
 
           // Self-test the server side
-          result = server->self_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          result = server->self_test ();
 
           if (result != 0)
             ACE_ERROR ((LM_ERROR,
@@ -282,22 +268,25 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking oneway server->shutdown()\n")));
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
       ACE_DEBUG ((LM_INFO,
                   ACE_TEXT ("Client (%P|%t) Completed %s\n"),
                   ((result == 0) ? ACE_TEXT ("successfuly") : ACE_TEXT ("with failure"))));
       return result;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Client: Transport Current test (client-side) failed:"));
+      ex._tao_print_exception (
+        ACE_TEXT (
+          "Client: Transport Current test (client-side) failed:"));
       return -1;
     }
-  ACE_ENDTRY;
+
+#else /*  TAO_HAS_TRANSPORT_CURRENT == 1 */
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("Client (%P|%t) Need TAO_HAS_TRANSPORT_CURRENT enabled to run.\n")));
+  return 0;
+#endif /*  TAO_HAS_TRANSPORT_CURRENT == 1 */
 }
diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp
index 579f11d7726..f2c42df3512 100644
--- a/TAO/tests/TransportCurrent/IIOP/server.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/server.cpp
@@ -85,17 +85,14 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_TRY_NEW_ENV
+  try
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Server: exception raised");
+      ex._tao_print_exception ("Server: exception raised");
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -108,39 +105,30 @@ server_main (int argc,
              ACE_TCHAR *argv[],
              Test::Server_Request_Interceptor *cri)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
 
+#if TAO_HAS_TRANSPORT_CURRENT == 1
+
+  try
+    {
+      PortableInterceptor::ORBInitializer_ptr temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
                       Test::Server_ORBInitializer (cri),
                       -1);  // No exceptions yet!
 
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
+      PortableInterceptor::ORBInitializer_var orb_initializer (temp_initializer);
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
 
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            ACE_TEXT ("test_orb")
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                                            ACE_TEXT ("test_orb"));
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (obj.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -149,11 +137,9 @@ server_main (int argc,
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -162,13 +148,10 @@ server_main (int argc,
                                      root_poa.in (),
                                      use_collocated_call);
 
-      obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      obj = server_impl._this ();
 
       Test::Transport::CurrentTest_var server =
-        Test::Transport::CurrentTest::_narrow (obj.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Test::Transport::CurrentTest::_narrow (obj.in ());
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -177,8 +160,7 @@ server_main (int argc,
                           -1);
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       // If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
@@ -221,22 +203,22 @@ server_main (int argc,
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("Server (%P|%t) ERROR: Interceptor self_test failed\n")));
 
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->shutdown ();
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
 
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           ACE_TEXT ("Server (%P|%t) ERROR: "));
+      ex._tao_print_exception (ACE_TEXT ("Server (%P|%t) ERROR: "));
 
       return -1;
     }
-  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Completed successfuly.\n")));
   return 0;
+#else /*  TAO_HAS_TRANSPORT_CURRENT == 1 */
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("Server (%P|%t) Need TAO_HAS_TRANSPORT_CURRENT enabled to run.\n")));
+  return 0;
+#endif /*  TAO_HAS_TRANSPORT_CURRENT == 1 */
 }
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
index dcafa6638f4..8e7477ba8fe 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
@@ -22,17 +22,19 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI/PI.h"
+#include "tao/LocalObject.h"
 #include "tao/PortableInterceptorC.h"
 
 namespace Test
 {
 
   class Current_Test_Export Client_ORBInitializer :
-    public PortableInterceptor::ORBInitializer
+    public virtual PortableInterceptor::ORBInitializer,
+    public virtual TAO_Local_RefCounted_Object
   {
   public:
     Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
-    ~Client_ORBInitializer (void);
+    virtual ~Client_ORBInitializer (void);
 
     virtual void pre_init(PortableInterceptor::ORBInitInfo*)
       throw (CORBA::SystemException);
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
index 6a00e61fca1..f4a0c96fb07 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
@@ -13,26 +13,27 @@
 #ifndef SERVER_ORBINITIALIZER_T_H
 #define SERVER_ORBINITIALIZER_T_H
 #include /**/ "ace/pre.h"
-#include /**/ "ace/config.h"
-
-#include /**/ "Current_Test_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI/PI.h"
+#include "tao/LocalObject.h"
 #include "tao/PortableInterceptorC.h"
 
+#include "Current_Test_Export.h"
+
 namespace Test
 {
 
   class Current_Test_Export Server_ORBInitializer :
-    public PortableInterceptor::ORBInitializer
+    public virtual PortableInterceptor::ORBInitializer,
+    public virtual TAO_Local_RefCounted_Object
   {
   public:
     Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
-    ~Server_ORBInitializer (void);
+    virtual ~Server_ORBInitializer (void);
 
     virtual void pre_init(PortableInterceptor::ORBInitInfo*)
       throw (CORBA::SystemException);
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index b275e55e0be..83b7b630015 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -18,7 +18,7 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done)
 }
 
 void
-First_i::oneway_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+First_i::oneway_method (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n"));
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 6fa70f53749..9c0b161be6a 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -22,7 +22,7 @@ public:
   First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done);
 
   /// Interface methods..
-  void oneway_method (ACE_ENV_SINGLE_ARG_DECL)
+  void oneway_method (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp
index 368c3aa94ed..3f134825124 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.cpp
+++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp
@@ -18,7 +18,7 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len)
 
 //factory method to create first object
 Two_Objects_Test::First_ptr
-Object_Factory_i::create_first (ACE_ENV_SINGLE_ARG_DECL)
+Object_Factory_i::create_first (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   First_i *first_impl;
@@ -29,14 +29,14 @@ Object_Factory_i::create_first (ACE_ENV_SINGLE_ARG_DECL)
                     CORBA::NO_MEMORY() );
 
   Two_Objects_Test::First_var first =
-    first_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER );
+    first_impl->_this ( );
 
   return first._retn();
 }
 
 //factory method to create second object
 Two_Objects_Test::Second_ptr
-Object_Factory_i::create_second (ACE_ENV_SINGLE_ARG_DECL)
+Object_Factory_i::create_second (void)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Second_i *second_impl;
@@ -47,8 +47,7 @@ Object_Factory_i::create_second (ACE_ENV_SINGLE_ARG_DECL)
                     CORBA::NO_MEMORY ());
 
   Two_Objects_Test::Second_var second =
-    second_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Two_Objects_Test::Second::_nil ());
+    second_impl->_this ();
 
   return second._retn();
 }
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index fbfd2ef094c..f9d09a6c974 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -21,10 +21,10 @@ public:
   Object_Factory_i (CORBA::ORB_ptr orb,
                     CORBA::ULong len);
 
-  Two_Objects_Test::First_ptr create_first (ACE_ENV_SINGLE_ARG_DECL)
+  Two_Objects_Test::First_ptr create_first (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  Two_Objects_Test::Second_ptr create_second (ACE_ENV_SINGLE_ARG_DECL)
+  Two_Objects_Test::Second_ptr create_second (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index cf3c9f5abff..828e9b67d22 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -23,7 +23,7 @@ Second_i::Second_i (CORBA::ORB_ptr orb,
 }
 
 Two_Objects_Test::Octet_Seq *
-Second_i::twoway_method (ACE_ENV_SINGLE_ARG_DECL)
+Second_i::twoway_method (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Two_Objects_Test::Octet_Seq  *preply_mesg;
@@ -55,9 +55,9 @@ Second_i::twoway_method (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Second_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Second_i::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index aa0375c9b2f..be08514e3e9 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -21,10 +21,10 @@ public:
              CORBA::ULong len, ACE_Auto_Event &two_way_done);
 
   Two_Objects_Test::Octet_Seq *
-    twoway_method (ACE_ENV_SINGLE_ARG_DECL)
+    twoway_method (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  void shutdown (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp
index d93a387409a..7591fa100b9 100644
--- a/TAO/tests/Two_Objects/client.cpp
+++ b/TAO/tests/Two_Objects/client.cpp
@@ -37,14 +37,12 @@ int
 main (int argc, char *argv[])
 {
   // Used to declare the CORBA::Environment variable
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Parse the arguments
       if (parse_args (argc, argv) != 0)
@@ -54,14 +52,11 @@ main (int argc, char *argv[])
       // The object reference obtained is a reference to the factory
       // object.
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       // Narrow the object reference to the appropriate type
       Two_Objects_Test::Object_Factory_var factory =
-        Two_Objects_Test::Object_Factory::_narrow(tmp.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        Two_Objects_Test::Object_Factory::_narrow(tmp.in ());
 
       if (CORBA::is_nil (factory.in ()))
         {
@@ -79,28 +74,23 @@ main (int argc, char *argv[])
       second = factory->create_second();
 
       // Call the oneway method
-      first->oneway_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      first->oneway_method ();
 
       ACE_DEBUG ((LM_DEBUG, "Client : one way call done\n"));
 
       Two_Objects_Test::Octet_Seq_var reply_seq =
-      second->twoway_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      second->twoway_method ();
 
       ACE_DEBUG ((LM_DEBUG, "Client : length of returned data is %d\n",
                      reply_seq->length() ));
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 0e6d5a8e9f2..903166e80ad 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -57,22 +57,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       // Get initial reference to the Root POA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       // Narrow down to the appropriate type
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -81,8 +78,7 @@ main (int argc, char *argv[])
 
       // Get referencee to the POA manager
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       // Parse the arguments
       if (parse_args (argc, argv) != 0)
@@ -101,14 +97,12 @@ main (int argc, char *argv[])
       // _this method registers the object withe the POA and returns
       // an object reference
       Two_Objects_Test::Object_Factory_var factory =
-        factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        factory_impl->_this ();
 
       // Convert the object reference to a string so that it can
       // be saved in a file and used by clinet programs later
       CORBA::String_var ior =
-        orb->object_to_string (factory.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (factory.in ());
 
       // If the ior_output_file exists, output the ior to it
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -123,8 +117,7 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Activate the POA manager
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       // Instantiate the specified # of worker threads
       Worker worker (orb.in (), orb_timeout);
@@ -140,19 +133,15 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp
index ae0889a419a..e3de9ceefa2 100644
--- a/TAO/tests/Two_Objects/worker.cpp
+++ b/TAO/tests/Two_Objects/worker.cpp
@@ -13,21 +13,17 @@ Worker::Worker (CORBA::ORB_ptr orb, int time)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       ACE_Time_Value tv (orb_timeout_);
 
       // orb times out after <timeout> seconds
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run (tv);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
     }
-  ACE_ENDTRY;
   return 0;
 }
diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp
index 4637dc4b943..cea17607721 100644
--- a/TAO/tests/Typedef_String_Array/client.cpp
+++ b/TAO/tests/Typedef_String_Array/client.cpp
@@ -36,22 +36,19 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->string_to_object(ior);
 
       SimpleStrings_var server =
-        SimpleStrings::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        SimpleStrings::_narrow(tmp.in ());
 
       if (CORBA::is_nil (server.in ()))
         {
@@ -62,24 +59,20 @@ main (int argc, char *argv[])
         }
 
       ArrayOfString_var the_strings;
-      server->get_strings (the_strings.out () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      server->get_strings (the_strings.out ());
 
       for(size_t i = 0; i < 15; i++)
         {
           ACE_DEBUG ((LM_DEBUG, "%s\n", the_strings[i].in ()));
         }
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp
index 51f5f7792af..882a15f1834 100644
--- a/TAO/tests/Typedef_String_Array/server.cpp
+++ b/TAO/tests/Typedef_String_Array/server.cpp
@@ -36,15 +36,13 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,24 +50,20 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       TestImpl test_impl (orb.in ());
 
-      SimpleStrings_var server = test_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      SimpleStrings_var server = test_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -86,27 +80,21 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      root_poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
+      ex._tao_print_exception ("Exception caught:");
       return 1;
     }
-  ACE_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/Typedef_String_Array/testImpl.cpp b/TAO/tests/Typedef_String_Array/testImpl.cpp
index a71deedee5f..11f65c2a3be 100644
--- a/TAO/tests/Typedef_String_Array/testImpl.cpp
+++ b/TAO/tests/Typedef_String_Array/testImpl.cpp
@@ -27,8 +27,7 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb)
 
 
 void
-TestImpl::get_strings (ArrayOfString_out strings
-                       ACE_ENV_ARG_DECL_NOT_USED)
+TestImpl::get_strings (ArrayOfString_out strings)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW (strings, ArrayOfString);
diff --git a/TAO/tests/Typedef_String_Array/testImpl.h b/TAO/tests/Typedef_String_Array/testImpl.h
index dc1c3e5b890..be1e7cb1c69 100644
--- a/TAO/tests/Typedef_String_Array/testImpl.h
+++ b/TAO/tests/Typedef_String_Array/testImpl.h
@@ -7,8 +7,7 @@ class TestImpl: public POA_SimpleStrings
 public:
   TestImpl(CORBA::ORB_ptr orb);
 
-  virtual void get_strings (ArrayOfString_out strings
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void get_strings (ArrayOfString_out strings)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index 2beb08f85fa..30833dba14c 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -32,8 +32,8 @@ public:
   void unknown_exception_during_deactivation (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void _add_ref (void);
+  void _remove_ref (void);
 
   CORBA::ORB_var orb_;
 
@@ -84,7 +84,7 @@ test_i::unknown_exception_during_deactivation (void)
 }
 
 void
-test_i::_add_ref (ACE_ENV_SINGLE_ARG_DECL)
+test_i::_add_ref (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::_add_ref() called; current refcount = %d\n",
@@ -92,7 +92,7 @@ test_i::_add_ref (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-test_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL)
+test_i::_remove_ref (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::_remove_ref() called; current refcount = %d\n",
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index 978e0f3c3b1..206f8899825 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -47,8 +47,7 @@ public:
   void add_callback (Control &);
   // Adds the callbacks to the GUI underneath.....
 
-  void parse_args (int argc, char *argv[]
-                   ACE_ENV_ARG_DECL);
+  void parse_args (int argc, char *argv[]);
 private:
 
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 713ddb68f84..ad52d1c0d40 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -27,18 +27,15 @@ main (int argc, char *argv[])
 
   Control control (toplevel);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       Client client (orb.in ());
 
-      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      client.parse_args (argc, argv);
 
       client.add_callback (control);
 
@@ -47,12 +44,11 @@ main (int argc, char *argv[])
       XtRealizeWidget (toplevel);
       XtAppMainLoop (app);
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
@@ -67,8 +63,7 @@ Client::~Client (void)
 
 void
 Client::parse_args (int argc,
-                    char *argv[]
-                    ACE_ENV_ARG_DECL)
+                    char *argv[])
 {
   const char *ior = "file://test.ior";
 
@@ -91,12 +86,10 @@ Client::parse_args (int argc,
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    this->orb_->string_to_object (ior);
 
   this->server_ =
-    Stopwatch::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    Stopwatch::_narrow (object.in ());
 
   if (CORBA::is_nil(this->server_.in ()))
     {
@@ -144,37 +137,30 @@ Client::stop_callback (Widget /*widget*/,
 void
 Client::start_hook (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->server_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->server_->start ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception in the start button callback");
+      ex._tao_print_exception (
+        "Caught an exception in the start button callback");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
 void
 Client::stop_hook (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
-      this->server_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->server_->stop ();
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught an exception in the stop button callback");
+      ex._tao_print_exception (
+        "Caught an exception in the stop button callback");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
 }
 
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index 374dcb368f0..bc6fa6e49a5 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -63,17 +63,14 @@ main (int argc, char *argv[])
 
   Stopwatch_display stopwatch (toplevel);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -81,12 +78,10 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        PortableServer::POA::_narrow (poa_object.in ());
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager ();
 
       stopwatch.manage ();
 
@@ -96,12 +91,10 @@ main (int argc, char *argv[])
       Stopwatch_imp server_impl (orb.in (), &timer);
 
       Stopwatch_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        server_impl._this ();
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (server.in ());
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
@@ -118,8 +111,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
       }
 
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa_manager->activate ();
 
       XtRealizeWidget (toplevel);
       /* Looks like there seems to be a problem with ST cases using
@@ -134,13 +126,11 @@ main (int argc, char *argv[])
       orb->run ();
 #endif /*ACE_HAS_THREADS*/
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+      ex._tao_print_exception ("Caught exception:");
       return 1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index de99f651892..60e7c2775e1 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -11,21 +11,21 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
 }
 
 void
-Stopwatch_imp::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stopwatch_imp::start (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->timer_->start ();
 }
 
 void
-Stopwatch_imp::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stopwatch_imp::stop (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->timer_->stop ();
 }
 
 void
-Stopwatch_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stopwatch_imp::shutdown (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index 33e4e0e826f..ba92631590d 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -33,13 +33,13 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void start (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void stop (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 479fdec29bf..da693a78d17 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -38,8 +38,7 @@
 #include "orbsvcs/CosNamingC.h"
 
 CORBA::Boolean
-catiiop (char* string
-         ACE_ENV_ARG_DECL)
+catiiop (char* string)
 {
   // NIL objref encodes as just "iiop:" ... which has already been
   // removed, so we see it as an empty string.
@@ -155,8 +154,7 @@ CORBA::Boolean
 cat_profile_helper(TAO_InputCDR& stream, const char *protocol);
 
 CORBA::Boolean
-catior (char const * str
-        ACE_ENV_ARG_DECL_NOT_USED)
+catior (char const * str)
 {
   // Unhex the bytes, and make a CDR deencapsulation stream from the
   // resulting data.
@@ -341,8 +339,7 @@ catior (char const * str
 // : interface_marker
 
 CORBA::Boolean
-catpoop (char* string
-        ACE_ENV_ARG_DECL)
+catpoop (char* string)
 {
   if (!string || !*string)
     return 0;
@@ -459,11 +456,10 @@ catpoop (char* string
 int
 ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_Argv_Type_Converter argcon (argcw, argvw);
   CORBA::ORB_var orb_var =  CORBA::ORB_init (argcon.get_argc (),
                                              argcon.get_ASCII_argv (),
-                                             "TAO" ACE_ENV_ARG_PARAMETER);
+                                             "TAO");
   CORBA::Boolean b = 0;
   CORBA::Boolean have_argument = 0;
   int opt;
@@ -489,15 +485,13 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 
             CORBA::Object_var server_object;
 
-            ACE_TRY
+            try
               {
                 // Find the Naming Service.
                 CORBA::Object_var naming_context_object =
-                  orb_var->resolve_initial_references ("NameService"
-                                                       ACE_ENV_ARG_PARAMETER);
+                  orb_var->resolve_initial_references ("NameService");
                 CosNaming::NamingContextExt_var naming_context =
-                  CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
+                  CosNaming::NamingContextExt::_narrow (naming_context_object.in ());
 
                 if (CORBA::is_nil (naming_context.in ()))
                 {
@@ -507,13 +501,11 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                 }
 
                 CosNaming::Name *name =
-                  naming_context->to_name (get_opt.opt_arg ()
-                                           ACE_ENV_ARG_PARAMETER);
+                  naming_context->to_name (get_opt.opt_arg ());
 
-                ACE_TRY_EX (RESOLUTION)
+                try
                   {
-                    server_object = naming_context->resolve (*name
-                                                         ACE_ENV_ARG_PARAMETER);
+                    server_object = naming_context->resolve (*name);
                       if (CORBA::is_nil (server_object.in ()))
                       {
                         ACE_ERROR_RETURN ((LM_ERROR,
@@ -521,7 +513,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                           -1);
                       }
                   }
-                ACE_CATCH (const CosNaming::NamingContext::NotFound, nf)
+                catch (const CosNaming::NamingContext::NotFound& nf)
                   {
                     const char     *reason;
 
@@ -546,7 +538,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                       reason),
                                      -1);
                   }
-                ACE_CATCH (const CosNaming::NamingContext::InvalidName, in)
+                catch (const CosNaming::NamingContext::InvalidName&)
                   {
                     ACE_ERROR_RETURN ((LM_ERROR,
                                    "%s cannot be resolved, exception reason = "
@@ -555,7 +547,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                       get_opt.opt_arg ()),
                                      -1);
                   }
-                ACE_CATCH (const CosNaming::NamingContext::CannotProceed, cp)
+                catch (const CosNaming::NamingContext::CannotProceed&)
                   {
                     ACE_ERROR_RETURN ((LM_ERROR,
                                    "%s cannot be resolved, exception reason = "
@@ -564,7 +556,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                       get_opt.opt_arg ()),
                                      -1);
                   }
-                ACE_CATCHANY
+                catch (const CORBA::Exception&)
                   {
                     ACE_ERROR_RETURN ((LM_ERROR,
                                    "%s cannot be resolved, exception reason = "
@@ -573,12 +565,10 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                        argvw[0]),
                                       -1);
                   }
-                ACE_ENDTRY;
 
                 ACE_CString aString;
 
-                aString = orb_var->object_to_string (server_object.in ()
-                                                   ACE_ENV_ARG_PARAMETER);
+                aString = orb_var->object_to_string (server_object.in ());
 
                 ACE_DEBUG ((LM_DEBUG,
                             "\nhere is the IOR\n%s\n\n",
@@ -599,7 +589,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                          aString.length () - prefixLength);
                     subString[subString.length ()] = '\0';
                     str = subString.rep ();
-                    b = catior (str ACE_ENV_ARG_PARAMETER);
+                    b = catior (str);
                   }
                 else if (aString.find ("iiop:") == 0)
                   {
@@ -614,7 +604,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                          aString.length () - prefixLength);
                     //subString[subString.length () - 1] = '\0';
                     str = subString.rep ();
-                    b = catiiop (str ACE_ENV_ARG_PARAMETER);
+                    b = catiiop (str);
                   }
                 else if (aString.find (":IR:") > 0)
                   {
@@ -622,7 +612,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                 "decoding an POOP IOR\n"));
 
                     str = aString.rep ();
-                    b = catpoop (str ACE_ENV_ARG_PARAMETER);
+                    b = catpoop (str);
                   }
                 else
                   ACE_ERROR ((LM_ERROR,
@@ -630,7 +620,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 
                 delete [] str;
               }
-            ACE_CATCHANY
+            catch (const CORBA::Exception&)
               {
                 ACE_ERROR_RETURN ((LM_ERROR,
                                    "%s cannot be resolved, exception reason = "
@@ -639,7 +629,6 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                    argvw[0]),
                                   -1);
               }
-            ACE_ENDTRY;
 
             if (b == 1)
               ACE_DEBUG ((LM_DEBUG,
@@ -770,7 +759,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                          aString.length () - prefixLength);
                     subString[subString.length ()] = '\0';
                     str = subString.rep ();
-                    b = catior (str ACE_ENV_ARG_PARAMETER);
+                    b = catior (str);
                   }
                 else if (aString.find ("iiop:") == 0)
                   {
@@ -785,7 +774,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                          aString.length () - prefixLength);
                     //subString[subString.length () - 1] = '\0';
                     str = subString.rep ();
-                    b = catiiop (str ACE_ENV_ARG_PARAMETER);
+                    b = catiiop (str);
                   }
                 else if (aString.find (":IR:") > 0)
                   {
@@ -793,7 +782,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                 "decoding an POOP IOR\n"));
 
                     str = aString.rep ();
-                    b = catpoop (str ACE_ENV_ARG_PARAMETER);
+                    b = catpoop (str);
                   }
                 else
                   ACE_ERROR ((LM_ERROR,
@@ -925,7 +914,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                          aString.length () - prefixLength);
                     subString[subString.length ()] = '\0';
                     str = subString.rep ();
-                    b = catior (str ACE_ENV_ARG_PARAMETER);
+                    b = catior (str);
                   }
                 else if (aString.find ("iiop:") == 0)
                   {
@@ -940,7 +929,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                          aString.length () - prefixLength);
                     //subString[subString.length () - 1] = '\0';
                     str = subString.rep ();
-                    b = catiiop (str ACE_ENV_ARG_PARAMETER);
+                    b = catiiop (str);
                   }
                 else if (aString.find (":IR:") > 0)
                   {
@@ -948,7 +937,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                                 "decoding an POOP IOR\n"));
 
                     str = aString.rep ();
-                    b = catpoop (str ACE_ENV_ARG_PARAMETER);
+                    b = catpoop (str);
                   }
                 else
                   ACE_ERROR ((LM_ERROR,
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index cf6b6970fcc..055d25e55ee 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -30,18 +30,16 @@ int showNSonly = 0;
 int
 ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   CosNaming::Name the_name (0);
   CORBA::ORB_var orb;
   const char *ior = 0;
 
-  ACE_TRY
+  try
     {
       // Contact the orb
       ACE_Argv_Type_Converter argcon (argcw, argvw);
       orb = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
-                             "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             "");
 
       // Scan through the command line options
       bool
@@ -202,28 +200,24 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
             "Displays all ID/Kinds found/created on path unless --quiet\n"
             "is given.\n",
             pname, pname, pname));
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
           return 1;
         }
 
       // Contact the name service
       CORBA::Object_var nc_obj;
       if (nameService)
-        nc_obj = orb->string_to_object (nameService ACE_ENV_ARG_PARAMETER);
+        nc_obj = orb->string_to_object (nameService);
       else
-        nc_obj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        nc_obj = orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (nc_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (nc_obj.in ());
       if (CORBA::is_nil (root_nc.in ()))
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Error: nil naming context\n"));
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
           return 1;
         }
 
@@ -231,8 +225,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
       CORBA::Object_var obj;
       if (ior)
         {
-          obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          obj = orb->string_to_object (ior);
         }
 
       // Assemble the name from the user string given
@@ -252,26 +245,24 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
         }
 
       // Now attempt the (re)bind
-      ACE_TRY_EX (inner)
+      try
         {
           if (!ior)
-            obj= root_nc->bind_new_context (the_name ACE_ENV_ARG_PARAMETER);
+            obj= root_nc->bind_new_context (the_name);
           else if (context)
             {
               CosNaming::NamingContext_var this_nc =
-                CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK_EX (inner);
+                CosNaming::NamingContext::_narrow (obj.in ());
 
               if (rebind)
-                root_nc->rebind_context (the_name, this_nc.in () ACE_ENV_ARG_PARAMETER);
+                root_nc->rebind_context (the_name, this_nc.in ());
               else
-                root_nc->bind_context (the_name, this_nc.in () ACE_ENV_ARG_PARAMETER);
+                root_nc->bind_context (the_name, this_nc.in ());
             }
           else if (rebind)
-            root_nc->rebind (the_name, obj.in () ACE_ENV_ARG_PARAMETER);
+            root_nc->rebind (the_name, obj.in ());
           else
-            root_nc->bind (the_name, obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (inner);
+            root_nc->bind (the_name, obj.in ());
           if (!quiet)
             {
               unsigned int index;
@@ -299,10 +290,10 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
               ACE_DEBUG ((LM_DEBUG, "\n"));
             }
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, nf)
+      catch (const CosNaming::NamingContext::NotFound& nf)
         {
           if (CosNaming::NamingContext::missing_node != nf.why)
-            ACE_RE_THROW; // report error to outer try/catch
+            throw; // report error to outer try/catch
 
           CosNaming::Name fullName (the_name);
           int
@@ -347,8 +338,8 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                 }
 
               CosNaming::NamingContext_var this_nc =
-                root_nc->bind_new_context (the_name ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK; // report error to outer try/catch
+                root_nc->bind_new_context (the_name);
+// report error to outer try/catch
               ++index;
             }
 
@@ -374,25 +365,22 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
               if (context)
                 {
                   CosNaming::NamingContext_var this_nc =
-                    CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK; // This is not a naming context, report to outer
+                    CosNaming::NamingContext::_narrow (obj.in ());
+// This is not a naming context, report to outer
 
                   if (rebind)
-                    root_nc->rebind_context (the_name, this_nc.in () ACE_ENV_ARG_PARAMETER);
+                    root_nc->rebind_context (the_name, this_nc.in ());
                   else
-                    root_nc->bind_context (the_name, this_nc.in () ACE_ENV_ARG_PARAMETER);
+                    root_nc->bind_context (the_name, this_nc.in ());
                 }
               else if (rebind)
-                root_nc->rebind (the_name, obj.in () ACE_ENV_ARG_PARAMETER);
+                root_nc->rebind (the_name, obj.in ());
               else
-                root_nc->bind (the_name, obj.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                root_nc->bind (the_name, obj.in ());
             }
         }
-      ACE_ENDTRY;
-      ACE_TRY_CHECK;
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, nf)
+  catch (const CosNaming::NamingContext::NotFound& nf)
     {
       unsigned int index;
       ACE_DEBUG ((LM_DEBUG, "\nError:\n"));
@@ -419,7 +407,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
           why= "\nThe following is a naming context, not a final object binding";
           break;
         }
-      ACE_PRINT_EXCEPTION (nf, why );
+      nf._tao_print_exception (why);
       for (index= 0u; index < nf.rest_of_name.length(); ++index)
         {
           if (nf.rest_of_name[index].kind && nf.rest_of_name[index].kind[0])
@@ -430,20 +418,18 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
              ACE_DEBUG ((LM_DEBUG, "ID: %s\n",
                nf.rest_of_name[index].id.in()));
         }
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy ();
       return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "\nError:\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in nsadd");
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ex._tao_print_exception ("Exception in nsadd");
+      orb->destroy ();
       return 1;
     }
-  ACE_ENDTRY;
 
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  orb->destroy ();
   return 0;
 }
 
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 95655ffff09..99a9c958fd9 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -27,17 +27,15 @@
 int
 ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
   CosNaming::Name the_name (0);
   CORBA::ORB_var orb;
 
-  ACE_TRY
+  try
     {
       // Contact the orb
       ACE_Argv_Type_Converter argcon (argcw, argvw);
       orb = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
-                             "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             "");
 
       // Scan through the command line options
       bool
@@ -168,29 +166,25 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
                       "unless --ns is given. Displays all ID/Kinds found\n"
                       "on path unless --quiet is given.\n",
                       pname));
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
           return 1;
         }
 
       // Contact the name service
       CORBA::Object_var nc_obj;
       if (nameService)
-        nc_obj = orb->string_to_object (nameService ACE_ENV_ARG_PARAMETER);
+        nc_obj = orb->string_to_object (nameService);
       else
-        nc_obj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        nc_obj = orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (nc_obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (nc_obj.in ());
 
       if (CORBA::is_nil (root_nc.in ()))
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Error: nil naming context\n"));
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
           return 1;
         }
 
@@ -212,33 +206,28 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 
       // Attempt to locate the object and destroy/unbind it
       CORBA::Object_var
-        obj = root_nc->resolve( the_name ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+        obj = root_nc->resolve( the_name );
       CosNaming::NamingContext_var this_nc =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (obj.in ());
       if (!CORBA::is_nil (this_nc.in ()))
         {
           if (destroy)
             {
               if (!quiet)
                 ACE_DEBUG ((LM_DEBUG,"Destroying\n"));
-              this_nc->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-              ACE_TRY_CHECK;
+              this_nc->destroy( );
             }
           else if (!quiet)
             {
               CORBA::String_var str =
-                orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+                orb->object_to_string (obj.in ());
               ACE_DEBUG ((LM_DEBUG,
                          "\n*** Possiably Orphaned Naming Context ***\n%s\n\n", str.in()));
             }
         }
       else if (destroy && !quiet)
         ACE_DEBUG ((LM_DEBUG,"Can't Destroy object, it is not a naming context!\n"));
-      root_nc->unbind (the_name ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
+      root_nc->unbind (the_name );
       if (!quiet)
         {
           unsigned int index;
@@ -260,7 +249,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
           ACE_DEBUG ((LM_DEBUG, "\n"));
         }
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, nf)
+  catch (const CosNaming::NamingContext::NotFound& nf)
     {
       unsigned int index;
       const unsigned int limit= the_name.length()-nf.rest_of_name.length();
@@ -288,7 +277,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
           why= "\nThe following is a naming context, not a final object binding";
           break;
         }
-      ACE_PRINT_EXCEPTION (nf, why );
+      nf._tao_print_exception (why);
       for (index= 0u; index < nf.rest_of_name.length(); ++index)
         {
           if (nf.rest_of_name[index].kind && nf.rest_of_name[index].kind[0])
@@ -299,19 +288,17 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
              ACE_DEBUG ((LM_DEBUG, "ID: %s\n",
                nf.rest_of_name[index].id.in()));
         }
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy ();
       return 1;
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
       ACE_DEBUG ((LM_DEBUG, "\nError:\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in nsdel");
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ex._tao_print_exception ("Exception in nsdel");
+      orb->destroy ();
       return 1;
     }
-  ACE_ENDTRY;
 
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  orb->destroy ();
   return 0;
 }
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index 27fa07cfbfe..ff0f04d6b8b 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -41,8 +41,7 @@ namespace
     maxDepth= 0;        // Limit to display depth (default unlimited)
 
   void list_context (const CosNaming::NamingContext_ptr,
-                     int level
-                     ACE_ENV_ARG_DECL);
+                     int level);
 
   //==========================================================================
   class NestedNamingContexts
@@ -175,8 +174,7 @@ namespace
   void
   show_chunk (const CosNaming::NamingContext_ptr nc,
               const CosNaming::BindingList &bl,
-              int level
-              ACE_ENV_ARG_DECL)
+              int level)
   {
     for (CORBA::ULong i = 0;
          i < bl.length ();
@@ -200,8 +198,7 @@ namespace
         Name[0].kind =
           CORBA::string_dup (bl[i].binding_name[0].kind);
 
-        CORBA::Object_var obj = nc->resolve (Name ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
+        CORBA::Object_var obj = nc->resolve (Name);
 
         // If this is a context node, follow it down to the next level...
         if (bl[i].binding_type == CosNaming::ncontext)
@@ -209,20 +206,16 @@ namespace
             ACE_DEBUG ((LM_DEBUG, ": Naming context"));
 
             CosNaming::NamingContext_var xc;
-            ACE_TRY_EX (inner)
+            try
               {
-                xc = CosNaming::NamingContext::_narrow (obj.in ()
-                                                        ACE_ENV_ARG_PARAMETER);
-                ACE_TRY_CHECK_EX (inner);
+                xc = CosNaming::NamingContext::_narrow (obj.in ());
               }
-            ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
+            catch (const CORBA::OBJECT_NOT_EXIST& not_used)
               {
                  ACE_UNUSED_ARG (not_used);
                  xc= 0;
                 ACE_DEBUG ((LM_DEBUG, " {Destroyed}"));
               }
-            ACE_ENDTRY;
-            ACE_CHECK;
 
             if (const int backwards= NestedNamingContexts::hasBeenSeen (xc.in ()))
               {
@@ -247,9 +240,7 @@ namespace
                 if (showCtxIOR)
                   {
                     CORBA::String_var str =
-                      orb->object_to_string (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-                    ACE_CHECK;
+                      orb->object_to_string (obj.in ());
                     ACE_DEBUG ((LM_DEBUG, ": %s", str.in ()));
                   }
 
@@ -258,8 +249,7 @@ namespace
                     ACE_DEBUG ((LM_DEBUG, "\n"));
                     if (xc.in ())
                       {
-                        list_context (xc.in (), level + 1 ACE_ENV_ARG_PARAMETER);
-                        ACE_CHECK;
+                        list_context (xc.in (), level + 1);
                       }
                   }
                 else
@@ -276,9 +266,7 @@ namespace
             if (showIOR)
               {
                 CORBA::String_var str =
-                  orb->object_to_string (obj.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK;
+                  orb->object_to_string (obj.in ());
                 ACE_DEBUG ((LM_DEBUG, ": %s\n", str.in ()));
               }
             else if (CORBA::is_nil (obj.in ()))
@@ -292,19 +280,16 @@ namespace
   //==========================================================================
   void
   list_context (const CosNaming::NamingContext_ptr nc,
-                const int level
-                ACE_ENV_ARG_DECL)
+                const int level)
   {
     CosNaming::BindingIterator_var it;
     CosNaming::BindingList_var bl;
     const CORBA::ULong CHUNK = 100;
 
     NestedNamingContexts::add (nc);
-    nc->list (CHUNK, bl, it ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    nc->list (CHUNK, bl, it);
 
-    show_chunk (nc, bl.in (), level ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
+    show_chunk (nc, bl.in (), level);
 
     if (!CORBA::is_nil (it.in ()))
       {
@@ -313,12 +298,10 @@ namespace
         do
           {
             more = it->next_n (CHUNK, bl);
-            show_chunk (nc, bl.in (), level ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
+            show_chunk (nc, bl.in (), level);
           } while (more);
 
-        it->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
+        it->destroy ();
       }
 
     NestedNamingContexts::remove ();
@@ -329,14 +312,12 @@ namespace
 int
 ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  try
     {
       // Contact the orb
       ACE_Argv_Type_Converter argcon (argcw, argvw);
       orb = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv (),
-                             "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                             "");
 
       // Scan through the command line options
       bool
@@ -605,8 +586,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
             "  --kindsep <character> {<name> ID/Kind separation character, default .}\n"
             "  --max <number>        {If given, limits displayed sub-context depth}\n",
             pname));
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
           return 1;
         }
 
@@ -617,20 +597,17 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
       // Contact the name service
       CORBA::Object_var obj;
       if (nameService)
-        obj = orb->string_to_object (nameService ACE_ENV_ARG_PARAMETER);
+        obj = orb->string_to_object (nameService);
       else
-        obj = orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        obj = orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (obj.in ());
       if (CORBA::is_nil (root_nc.in ()))
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Error: nil root naming context\n"));
-          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          orb->destroy ();
           return 1;
         }
       if (name)
@@ -653,25 +630,20 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
             }
 
           // Now find this sub-context and replace the root with it.
-          obj = root_nc->resolve( the_name ACE_ENV_ARG_PARAMETER );
-          ACE_TRY_CHECK;
+          obj = root_nc->resolve( the_name );
           root_nc =
-            CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+            CosNaming::NamingContext::_narrow (obj.in ());
           if (CORBA::is_nil (root_nc.in ()))
             {
               ACE_DEBUG ((LM_DEBUG,
                          "Error: Can't find naming context\n    %s\n", name));
-              orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
+              orb->destroy ();
               return 1;
             }
         }
 
       CORBA::String_var str =
-        orb->object_to_string (root_nc.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (root_nc.in ());
 
       if (showNSonly)
         {
@@ -683,19 +655,16 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
           ACE_DEBUG ((LM_DEBUG,
                      "Naming Service: %s\n---------------\n",
                      ((showCtxIOR)? str.in () : "")));
-          list_context (root_nc.in (), 1 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          list_context (root_nc.in (), 1);
         }
     }
-  ACE_CATCHANY
+  catch (const CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in nslist");
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ex._tao_print_exception ("Exception in nslist");
+      orb->destroy ();
       return -1;
     }
-  ACE_ENDTRY;
 
-  orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+  orb->destroy ();
   return 0;
 }
diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
index d2ee1b52b8d..6c87e29d5cf 100644
--- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
@@ -208,21 +208,19 @@ void WxViewIORDialog::decodeIOR()
   for( CORBA::ULong slot = 0; slot < count; slot++) {
 
     const TAO_Profile* profile = baseProfiles.get_profile( slot);
-    ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY {
+    try{
 
       // The need to const_cast should disappear in TAO 1.1.2 BUT IT DIDN'T
       char* profileString =
-          const_cast<TAO_Profile*>(profile)->to_string(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+          const_cast<TAO_Profile*>(profile)->to_string();
       profiles->AppendItem( rootItem, profileString);
       delete [] profileString;
 
-    } ACE_CATCH( CORBA::Exception, ex) {
+    } catch (const CORBA::Exception& ex) {
 
       wxMessageBox( ex._info().c_str(), "CORBA::Exception");
 
-    } ACE_ENDTRY;
+    }
 
   }
   profiles->Expand( rootItem);